Changes 20050419:

- Mailslot support.
- Support for side mouse buttons (X buttons).
- More Richedit improvements.
- Loading of Windows registry files disabled for now.
- Many code cleanups.
- Lots of bug fixes.

Changes 20050524:
- Many MSI improvements.
- More features in the file manager.
- Better compatibility for Winelib import libraries.
- SGML documentation moved out of the source tree.
- Header files cleanups.
- Lots of bug fixes.

9 files changed, 68 insertions, 45 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index f41ee83856e..8bc86e2d14c 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.84 2005/05/22 20:28:47 jlam Exp $
+# $NetBSD: Makefile,v 1.85 2005/05/25 08:23:43 adam Exp $
 
-DISTNAME=	Wine-20050310
+DISTNAME=	Wine-20050524
 PKGNAME=	${DISTNAME:S/W/w/}
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wine/} \
@@ -23,7 +23,7 @@ USE_TOOLS+=		bison gmake
 USE_LIBTOOL=		yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--without-curses #--disable-debug --disable-trace
+CONFIGURE_ARGS+=	--without-curses --disable-trace #--disable-debug
 CONFIGURE_ENV+=		ac_cv_path_ARTSCCONFIG=${TRUE}
 CONFIGURE_ENV+=		ac_cv_prog_sane_devel=no
 UNLIMIT_RESOURCES=	datasize
diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST
index fed72e92afa..fd6d08f8020 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.30 2005/03/22 14:53:28 adam Exp $
+@comment $NetBSD: PLIST,v 1.31 2005/05/25 08:23:43 adam Exp $
 bin/function_grep.pl
+bin/msiexec
 bin/notepad
 bin/progman
 bin/regedit
@@ -53,6 +54,7 @@ include/wine/msvcrt/process.h
 include/wine/msvcrt/search.h
 include/wine/msvcrt/setjmp.h
 include/wine/msvcrt/share.h
+include/wine/msvcrt/signal.h
 include/wine/msvcrt/stddef.h
 include/wine/msvcrt/stdio.h
 include/wine/msvcrt/stdlib.h
@@ -112,6 +114,8 @@ include/wine/windows/d3dvec.inl
 include/wine/windows/d3dx8core.h
 include/wine/windows/dbghelp.h
 include/wine/windows/dbt.h
+include/wine/windows/dciddi.h
+include/wine/windows/dciman.h
 include/wine/windows/dde.h
 include/wine/windows/ddeml.h
 include/wine/windows/ddraw.h
@@ -155,6 +159,7 @@ include/wine/windows/dxerr9.h
 include/wine/windows/dxfile.h
 include/wine/windows/dyngraph.idl
 include/wine/windows/evcode.h
+include/wine/windows/evntrace.h
 include/wine/windows/excpt.h
 include/wine/windows/exdisp.h
 include/wine/windows/exdisp.idl
@@ -214,6 +219,8 @@ include/wine/windows/msacmdlg.h
 include/wine/windows/msacmdrv.h
 include/wine/windows/mscat.h
 include/wine/windows/mshtmdid.h
+include/wine/windows/mshtmhst.h
+include/wine/windows/mshtmhst.idl
 include/wine/windows/mshtml.h
 include/wine/windows/mshtml.idl
 include/wine/windows/msi.h
@@ -221,6 +228,9 @@ include/wine/windows/msidefs.h
 include/wine/windows/msiquery.h
 include/wine/windows/mssip.h
 include/wine/windows/mswsock.h
+include/wine/windows/msxml.h
+include/wine/windows/msxml.idl
+include/wine/windows/msxmldid.h
 include/wine/windows/nb30.h
 include/wine/windows/npapi.h
 include/wine/windows/nspapi.h
@@ -246,6 +256,7 @@ include/wine/windows/oleidl.h
 include/wine/windows/oleidl.idl
 include/wine/windows/pktdef.h
 include/wine/windows/poppack.h
+include/wine/windows/powrprof.h
 include/wine/windows/propidl.h
 include/wine/windows/propidl.idl
 include/wine/windows/prsht.h
@@ -268,7 +279,9 @@ include/wine/windows/rpcdcep.h
 include/wine/windows/rpcndr.h
 include/wine/windows/rpcnterr.h
 include/wine/windows/rpcproxy.h
+include/wine/windows/schannel.h
 include/wine/windows/schemadef.h
+include/wine/windows/schnlsp.h
 include/wine/windows/sddl.h
 include/wine/windows/secext.h
 include/wine/windows/sensapi.h
@@ -335,6 +348,7 @@ include/wine/windows/winternl.h
 include/wine/windows/wintrust.h
 include/wine/windows/winuser.h
 include/wine/windows/winver.h
+include/wine/windows/wmistr.h
 include/wine/windows/wnaspi32.h
 include/wine/windows/wownt32.h
 include/wine/windows/ws2spi.h
@@ -457,6 +471,7 @@ lib/wine/libdciman32.def
 lib/wine/libddraw.def
 lib/wine/libdevenum.def
 lib/wine/libdinput.def
+lib/wine/libdinput.def.a
 lib/wine/libdinput8.def
 lib/wine/libdmband.def
 lib/wine/libdmcompos.def
@@ -474,9 +489,6 @@ lib/wine/libdpnhpast.def
 lib/wine/libdsound.def
 lib/wine/libdswave.def
 lib/wine/libdxdiagn.def
-lib/wine/libdxerr8.a
-lib/wine/libdxerr9.a
-lib/wine/libdxguid.a
 lib/wine/libgdi32.def
 lib/wine/libglu32.def
 lib/wine/libglut32.def
@@ -510,6 +522,7 @@ lib/wine/libnetapi32.def
 lib/wine/libnewdev.def
 lib/wine/libntdll.def
 lib/wine/libodbc32.def
+lib/wine/libodbccp32.def
 lib/wine/libole32.def
 lib/wine/liboleacc.def
 lib/wine/liboleaut32.def
@@ -518,6 +531,7 @@ lib/wine/liboledlg.def
 lib/wine/libolepro32.def
 lib/wine/libolesvr32.def
 lib/wine/libopengl32.def
+lib/wine/libpowrprof.def
 lib/wine/libpsapi.def
 lib/wine/libqcap.def
 lib/wine/libquartz.def
@@ -537,22 +551,18 @@ lib/wine/libshfolder.def
 lib/wine/libshlwapi.def
 lib/wine/libsnmpapi.def
 lib/wine/libsti.def
-lib/wine/libstrmiids.a
 lib/wine/libtapi32.def
-lib/wine/libttydrv.def
 lib/wine/libtwain_32.def
 lib/wine/libunicows.def
 lib/wine/liburl.def
 lib/wine/liburlmon.def
 lib/wine/libuser32.def
-lib/wine/libuuid.a
 lib/wine/libuxtheme.def
 lib/wine/libvdmdbg.def
 lib/wine/libversion.def
 lib/wine/libw32skrnl.def
 lib/wine/libwined3d.def
 lib/wine/libwinedos.def
-lib/wine/libwineps.def
 lib/wine/libwininet.def
 lib/wine/libwinmm.def
 lib/wine/libwinnls32.def
@@ -564,7 +574,6 @@ lib/wine/libwow32.def
 lib/wine/libws2_32.def
 lib/wine/libwsock32.def
 lib/wine/libwtsapi32.def
-lib/wine/libx11drv.def
 lib/wine/lz32.dll.so
 lib/wine/lzexpand.dll.so
 lib/wine/mapi32.dll.so
@@ -607,6 +616,7 @@ lib/wine/newdev.dll.so
 lib/wine/notepad.exe.so
 lib/wine/ntdll.dll.so
 lib/wine/odbc32.dll.so
+lib/wine/odbccp32.dll.so
 lib/wine/ole2.dll.so
 lib/wine/ole2conv.dll.so
 lib/wine/ole2disp.dll.so
@@ -623,6 +633,7 @@ lib/wine/olepro32.dll.so
 lib/wine/olesvr.dll.so
 lib/wine/olesvr32.dll.so
 lib/wine/opengl32.dll.so
+lib/wine/powrprof.dll.so
 lib/wine/progman.exe.so
 lib/wine/psapi.dll.so
 lib/wine/qcap.dll.so
@@ -659,7 +670,6 @@ lib/wine/system.drv.so
 lib/wine/tapi32.dll.so
 lib/wine/taskmgr.exe.so
 lib/wine/toolhelp.dll.so
-lib/wine/ttydrv.dll.so
 lib/wine/twain.dll.so
 lib/wine/twain_32.dll.so
 lib/wine/typelib.dll.so
@@ -704,10 +714,12 @@ lib/wine/winemp3.acm.so
 lib/wine/winenas.drv.so
 lib/wine/wineoss.drv.so
 lib/wine/winepath.exe.so
-lib/wine/wineps.dll.so
+lib/wine/wineps.drv.so
 lib/wine/wineps16.drv.so
 lib/wine/winetest.exe.so
+lib/wine/winetty.drv.so
 lib/wine/winevdm.exe.so
+lib/wine/winex11.drv.so
 lib/wine/wing.dll.so
 lib/wine/winhelp.exe.so
 lib/wine/wininet.dll.so
@@ -726,7 +738,6 @@ lib/wine/wprocs.dll.so
 lib/wine/ws2_32.dll.so
 lib/wine/wsock32.dll.so
 lib/wine/wtsapi32.dll.so
-lib/wine/x11drv.dll.so
 man/man1/widl.1
 man/man1/wine.1
 man/man1/winebuild.1
@@ -751,7 +762,6 @@ share/fonts/wine/wine_vgasys.fon
 share/fonts/wine/wine_vgasyse.fon
 share/fonts/wine/wine_vgasysr.fon
 share/wine/config
-share/wine/generic.ppd
 share/wine/wine.inf
 @dirrm share/wine
 @dirrm share/fonts/wine
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 89528c47cef..623d412b3cd 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.31 2005/03/22 14:53:28 adam Exp $
+$NetBSD: distinfo,v 1.32 2005/05/25 08:23:43 adam Exp $
 
-SHA1 (Wine-20050310.tar.gz) = 5a1186c30ef43544857cbaa128231b980e976f25
-RMD160 (Wine-20050310.tar.gz) = fc6aaf36e1bfd669bbd6f68aaab4487d9424e12e
-Size (Wine-20050310.tar.gz) = 11798040 bytes
-SHA1 (patch-aa) = 951e96ae5e09c7579249bbb1266fc70a2b13f8c2
-SHA1 (patch-ab) = 7feb8eaad0005ea3b501967ca070a4b397d707c2
-SHA1 (patch-ac) = 8c909b1683185e0ac12f2be6024e26da40addf1c
+SHA1 (Wine-20050524.tar.gz) = 109fac3a1b9158a4d23ca8c003f6716dd8caf73f
+RMD160 (Wine-20050524.tar.gz) = 682795fd1cd156203c5766554f74e19e5060fa34
+Size (Wine-20050524.tar.gz) = 11844661 bytes
+SHA1 (patch-aa) = b4a38d650eb96b122691d2fe17bc3a5a425e203c
+SHA1 (patch-ab) = 90577d30a02af40cef0a55156a9c23231f3d746b
+SHA1 (patch-ac) = 113ca5d720aa951ed5dfb19df18ce691f5da7c28
 SHA1 (patch-ad) = 92abc177dc37ed983ec6079cd08ad7a1472e178a
-SHA1 (patch-ae) = a18b1c01d61d26fbe1a82dca82ea0d76df0c8bcd
-SHA1 (patch-af) = 72a5d77dc4dc2d67e87e90603f4f00e6b6ed5851
+SHA1 (patch-ae) = dbd40183fb8e1f1d7af9ab4e51910a2227524e3c
+SHA1 (patch-af) = 803e74ff592ce39f520c631a503d90b8abee190d
+SHA1 (patch-ag) = ba62e1ac2c38c37865f0b74b4a74e810fa1c060f
diff --git a/emulators/wine/patches/patch-aa b/emulators/wine/patches/patch-aa
index 9f6b73ddcd4..c7f4a724031 100644
--- a/emulators/wine/patches/patch-aa
+++ b/emulators/wine/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.14 2005/01/14 13:00:05 adam Exp $
+$NetBSD: patch-aa,v 1.15 2005/05/25 08:23:43 adam Exp $
 
---- Make.rules.in.orig	2004-09-13 18:14:55.000000000 +0000
+--- Make.rules.in.orig	2005-05-07 12:39:58.000000000 +0000
 +++ Make.rules.in
-@@ -106,7 +106,7 @@ conf_manext     = 5
+@@ -107,7 +107,7 @@ conf_manext     = 5
  CLEAN_FILES     = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
-                   *.flc *.spec.c *.spec.def *.dbg.c *.tab.c *.tab.h @LEX_OUTPUT_ROOT@.c core
+                   *.flc *.spec.c *.dbg.c *.tab.c *.tab.h @LEX_OUTPUT_ROOT@.c core
  
 -OBJS = $(C_SRCS:.c=.o) $(EXTRA_OBJS)
 +OBJS = $(EXTRA_OBJS) $(C_SRCS:.c=.o)
diff --git a/emulators/wine/patches/patch-ab b/emulators/wine/patches/patch-ab
index e832ae2fd40..e1ad0a89ca0 100644
--- a/emulators/wine/patches/patch-ab
+++ b/emulators/wine/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.17 2005/01/14 13:00:05 adam Exp $
+$NetBSD: patch-ab,v 1.18 2005/05/25 08:23:43 adam Exp $
 
---- dlls/ntdll/cdrom.c.orig	2004-06-15 00:45:01.000000000 +0000
+--- dlls/ntdll/cdrom.c.orig	2005-05-06 16:22:55.000000000 +0000
 +++ dlls/ntdll/cdrom.c
-@@ -61,6 +61,16 @@
+@@ -63,6 +63,16 @@
  #endif
  #ifdef HAVE_LINUX_CDROM_H
  # include <linux/cdrom.h>
diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac
index 652af11ee14..843cae3bb5e 100644
--- a/emulators/wine/patches/patch-ac
+++ b/emulators/wine/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.17 2005/02/16 12:22:11 adam Exp $
+$NetBSD: patch-ac,v 1.18 2005/05/25 08:23:43 adam Exp $
 
---- configure.orig	2005-02-11 13:34:18.000000000 +0000
+--- configure.orig	2005-05-24 14:16:16.000000000 +0000
 +++ configure
-@@ -17811,7 +17811,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -17799,7 +17799,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.17 2005/02/16 12:22:11 adam Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -19481,7 +19481,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -19469,7 +19469,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
diff --git a/emulators/wine/patches/patch-ae b/emulators/wine/patches/patch-ae
index d43a0955622..8e7676fb541 100644
--- a/emulators/wine/patches/patch-ae
+++ b/emulators/wine/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.10 2005/01/14 13:00:05 adam Exp $
+$NetBSD: patch-ae,v 1.11 2005/05/25 08:23:43 adam Exp $
 
---- programs/winetest/winetest.rc.orig	2004-06-18 15:12:26.000000000 +0000
+--- programs/winetest/winetest.rc.orig	2005-04-18 09:54:24.000000000 +0000
 +++ programs/winetest/winetest.rc
 @@ -21,7 +21,6 @@
  #include <windows.h>
@@ -8,5 +8,5 @@ $NetBSD: patch-ae,v 1.10 2005/01/14 13:00:05 adam Exp $
  #include "resource.h"
 -#include "tests.rc"
  
- IDD_STATUS DIALOG 0, 0, 160, 140
- STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX
+ IDD_TAG DIALOG 0, 0, 150, 65
+ STYLE WS_POPUP
diff --git a/emulators/wine/patches/patch-af b/emulators/wine/patches/patch-af
index f96ce031c60..4893934f30d 100644
--- a/emulators/wine/patches/patch-af
+++ b/emulators/wine/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.11 2005/03/11 21:18:15 rillig Exp $
+$NetBSD: patch-af,v 1.12 2005/05/25 08:23:43 adam Exp $
 
---- dlls/ntdll/signal_i386.c.orig	Thu Dec  2 19:19:25 2004
-+++ dlls/ntdll/signal_i386.c	Fri Feb 25 01:31:18 2005
-@@ -206,7 +206,7 @@ typedef struct trapframe SIGCONTEXT;
+--- dlls/ntdll/signal_i386.c.orig	2005-05-16 17:52:10.000000000 +0000
++++ dlls/ntdll/signal_i386.c
+@@ -205,7 +205,7 @@ typedef struct trapframe SIGCONTEXT;
  
  #endif /* bsdi */
  
@@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.11 2005/03/11 21:18:15 rillig Exp $
  
  typedef struct sigcontext SIGCONTEXT;
  
-@@ -306,7 +306,40 @@ typedef struct ucontext SIGCONTEXT;
+@@ -305,7 +305,40 @@ typedef struct ucontext SIGCONTEXT;
  
  #endif /* __APPLE__ */
  
diff --git a/emulators/wine/patches/patch-ag b/emulators/wine/patches/patch-ag
new file mode 100644
index 00000000000..c11f5e408f7
--- /dev/null
+++ b/emulators/wine/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.4 2005/05/25 08:23:43 adam Exp $
+
+--- dlls/kernel/sync.c.orig	2005-04-20 11:06:24.000000000 +0000
++++ dlls/kernel/sync.c
+@@ -40,6 +40,7 @@
+ #endif
+ #include <stdarg.h>
+ #include <stdio.h>
++#include <machine/limits.h>
+ 
+ #define NONAMELESSUNION
+ #define NONAMELESSSTRUCT