Changes 0.9.6:

  - A bunch of OLE fixes and improvements.
  - DirectSound improvements, including full duplex support.
  - Fix for the Windows metafile vulnerability.
  - Many static control improvements.
  - Some fixes for copy protection support.
  - Lots of bug fixes.

10 files changed, 122 insertions, 33 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 950c78729ac..23617ed3962 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.95 2006/01/06 15:10:03 wiz Exp $
+# $NetBSD: Makefile,v 1.96 2006/01/20 14:58:17 adam Exp $
 
-DISTNAME=	wine-0.9
-PKGREVISION=	1
+DISTNAME=	wine-0.9.6
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wine/} \
 		http://ibiblio.org/pub/linux/system/emulators/wine/
@@ -16,22 +15,22 @@ BUILD_DEPENDS+=	fontforge-[0-9]*:../../fonts/fontforge
 ONLY_FOR_PLATFORM=	NetBSD-1.5Z*-i386 NetBSD-1.6*-i386 NetBSD-[2-9]*-i386
 ONLY_FOR_PLATFORM+=	FreeBSD-*-i386 Linux-*-i386 SunOS-*-i386 Darwin-*-i386
 
-WRKSRC=		 	${WRKDIR}/${DISTNAME:S/W/w/}
+WRKSRC=			${WRKDIR}/${DISTNAME:S/W/w/}
 USE_LIBTOOL=		yes
 USE_NCURSES=		yes
 USE_TOOLS+=		bison gmake mktemp
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--disable-debug
+#CONFIGURE_ARGS+=	--disable-debug
 CONFIGURE_ARGS+=	--disable-trace
 UNLIMIT_RESOURCES=	datasize
 
-REPLACE_PERL=		tools/winemaker tools/winedump/function_grep.pl
+REPLACE_PERL+=		tools/winemaker tools/winedump/function_grep.pl
 
 # The Wine configure script has problems locating the libraries in the
 # buildlink directory, so prepend all of the LDFLAGS necessary to link
 # against the libraries.
 #
-CONFIGURE_ENV+=		X_LIBS=${LDFLAGS:M*:Q}
+CONFIGURE_ENV+=		X_LIBS="${LDFLAGS:M*:Q}"
 CONFIGURE_ENV+=		CFLAGS="${CFLAGS} -DDEVOSSAUDIO=\"${DEVOSSAUDIO}\""
 LIBS+=			${LDFLAGS}
 
diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST
index 48b97f79cd6..378152bdc43 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2005/10/26 08:32:59 adam Exp $
+@comment $NetBSD: PLIST,v 1.36 2006/01/20 14:58:17 adam Exp $
 bin/function_grep.pl
 bin/msiexec
 bin/notepad
@@ -122,6 +122,7 @@ include/wine/windows/dciman.h
 include/wine/windows/dde.h
 include/wine/windows/ddeml.h
 include/wine/windows/ddk/cfgmgr32.h
+include/wine/windows/ddk/ntddser.h
 include/wine/windows/ddk/wdm.h
 include/wine/windows/ddk/winsplp.h
 include/wine/windows/ddraw.h
@@ -157,10 +158,12 @@ include/wine/windows/dpaddr.h
 include/wine/windows/dplay.h
 include/wine/windows/dplay8.h
 include/wine/windows/dplobby.h
+include/wine/windows/dplobby8.h
 include/wine/windows/dsconf.h
 include/wine/windows/dsdriver.h
 include/wine/windows/dshow.h
 include/wine/windows/dsound.h
+include/wine/windows/dsrole.h
 include/wine/windows/dxdiag.h
 include/wine/windows/dxerr8.h
 include/wine/windows/dxerr9.h
@@ -340,6 +343,7 @@ include/wine/windows/unknwn.h
 include/wine/windows/unknwn.idl
 include/wine/windows/urlmon.h
 include/wine/windows/urlmon.idl
+include/wine/windows/usp10.h
 include/wine/windows/uuids.h
 include/wine/windows/uxtheme.h
 include/wine/windows/ver.h
@@ -455,7 +459,9 @@ lib/wine/dpnhpast.dll.so
 lib/wine/dsound.dll.so
 lib/wine/dswave.dll.so
 lib/wine/dxdiagn.dll.so
+lib/wine/eject.exe.so
 lib/wine/expand.exe.so
+lib/wine/explorer.exe.so
 lib/wine/gdi.exe.so
 lib/wine/gdi32.dll.so
 lib/wine/glu32.dll.so
@@ -671,6 +677,7 @@ lib/wine/rsabase.dll.so
 lib/wine/rsaenh.dll.so
 lib/wine/rundll32.exe.so
 lib/wine/secur32.dll.so
+lib/wine/security.dll.so
 lib/wine/sensapi.dll.so
 lib/wine/serialui.dll.so
 lib/wine/setupapi.dll.so
@@ -681,7 +688,7 @@ lib/wine/shell32.dll.so
 lib/wine/shfolder.dll.so
 lib/wine/shlwapi.dll.so
 lib/wine/snmpapi.dll.so
-lib/wine/sound.dll.so
+lib/wine/sound.drv.so
 lib/wine/start.exe.so
 lib/wine/stdole2.tlb.so
 lib/wine/stdole32.tlb.so
@@ -741,7 +748,6 @@ lib/wine/winepath.exe.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
diff --git a/emulators/wine/buildlink3.mk b/emulators/wine/buildlink3.mk
index d69ffcd97b7..59d89665c6e 100644
--- a/emulators/wine/buildlink3.mk
+++ b/emulators/wine/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/01/06 15:10:03 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/01/20 14:58:17 adam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 WINE_BUILDLINK3_MK:=	${WINE_BUILDLINK3_MK}+
@@ -22,4 +22,4 @@ BUILDLINK_PKGSRCDIR.wine?=	../../emulators/wine
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index f77d5b10aa3..1f9caad369a 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,13 +1,16 @@
-$NetBSD: distinfo,v 1.38 2005/10/26 08:32:59 adam Exp $
+$NetBSD: distinfo,v 1.39 2006/01/20 14:58:17 adam Exp $
 
-SHA1 (wine-0.9.tar.bz2) = d29921bc9d1f3dd3342fb35a8b62de31efa51802
-RMD160 (wine-0.9.tar.bz2) = cd330cd0d8bd7010874d7dfd2784611c1d719780
-Size (wine-0.9.tar.bz2) = 10036834 bytes
-SHA1 (patch-aa) = 731b1a861597cd9ca9a772bf3dec8d2e891f6282
+SHA1 (wine-0.9.6.tar.bz2) = 8fde8657c67929da25449431cfa7baebb36add4f
+RMD160 (wine-0.9.6.tar.bz2) = 5fb3005c84318e837782bd1b78d0694f3f7ce576
+Size (wine-0.9.6.tar.bz2) = 10454441 bytes
+SHA1 (patch-aa) = 21f26a1d1a2e6c07f5c9b795d8e8636409573519
 SHA1 (patch-ab) = 66c1f1ec98674d15c7a72e8ac16105c28aa25e91
-SHA1 (patch-ac) = 422df60c75a3dca01f969eb3a6727822d4b6defa
+SHA1 (patch-ac) = 6622a244112e29d617beb4ee3942872c25e2a015
 SHA1 (patch-ad) = 92abc177dc37ed983ec6079cd08ad7a1472e178a
 SHA1 (patch-ae) = dbd40183fb8e1f1d7af9ab4e51910a2227524e3c
-SHA1 (patch-af) = eb852f31e451db81692a25fadf81b7e20f2c4d9b
+SHA1 (patch-af) = 672c95b9eec3f0cfcb096a40022500c64e5dc9c4
 SHA1 (patch-ag) = 656f9667da542489595d1db65c84579b3dfce279
 SHA1 (patch-ah) = f6df19bd14ea8760933ca3787d55b6699897b8db
+SHA1 (patch-ai) = a334ee48b949f9f5d4356beed3b422ee032619c2
+SHA1 (patch-aj) = 9ad0a5e641f86756018bf460a969c0187aae17a0
+SHA1 (patch-ak) = a04c52387feca981a66edaceb5d0563558c7cbaa
diff --git a/emulators/wine/patches/patch-aa b/emulators/wine/patches/patch-aa
index bea9ca23726..e7ad33a4969 100644
--- a/emulators/wine/patches/patch-aa
+++ b/emulators/wine/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.18 2005/10/10 08:32:23 adam Exp $
+$NetBSD: patch-aa,v 1.19 2006/01/20 14:58:18 adam Exp $
 
---- Make.rules.in.orig	2005-09-28 18:34:01.000000000 +0000
+--- Make.rules.in.orig	2005-10-06 18:06:04.000000000 +0200
 +++ Make.rules.in
 @@ -109,7 +109,7 @@ conf_manext     = 5
  CLEAN_FILES     = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac
index e55102bce2b..8b3b14e0d4c 100644
--- a/emulators/wine/patches/patch-ac
+++ b/emulators/wine/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.21 2005/10/10 08:32:23 adam Exp $
+$NetBSD: patch-ac,v 1.22 2006/01/20 14:58:18 adam Exp $
 
---- configure.orig	2005-09-30 12:02:39.000000000 +0000
+--- configure.orig	2006-01-19 15:13:50.000000000 +0100
 +++ configure
-@@ -16049,7 +16049,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -16166,7 +16166,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.21 2005/10/10 08:32:23 adam Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -17951,7 +17951,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -18068,7 +18068,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-af b/emulators/wine/patches/patch-af
index 0fac23fac73..b86508709ab 100644
--- a/emulators/wine/patches/patch-af
+++ b/emulators/wine/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.14 2005/10/10 08:32:23 adam Exp $
+$NetBSD: patch-af,v 1.15 2006/01/20 14:58:18 adam Exp $
 
---- dlls/ntdll/signal_i386.c.orig	2005-09-27 09:36:15.000000000 +0000
+--- dlls/ntdll/signal_i386.c.orig	2006-01-19 15:14:04.000000000 +0100
 +++ dlls/ntdll/signal_i386.c
 @@ -204,7 +204,7 @@ typedef struct trapframe SIGCONTEXT;
  
@@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.14 2005/10/10 08:32:23 adam Exp $
  
  typedef struct sigcontext SIGCONTEXT;
  
-@@ -325,7 +325,40 @@ typedef ucontext_t SIGCONTEXT;
+@@ -328,7 +328,45 @@ typedef ucontext_t SIGCONTEXT;
  
  #endif /* __APPLE__ */
  
@@ -21,10 +21,7 @@ $NetBSD: patch-af,v 1.14 2005/10/10 08:32:23 adam Exp $
 +# include <sys/types.h>
 +# include <signal.h>
 +
-+typedef struct __ucontext SIGCONTEXT;
-+
-+#define HANDLER_DEF(name) void name( int __signal, int code, SIGCONTEXT *__context )
-+#define HANDLER_CONTEXT __context
++typedef ucontext_t SIGCONTEXT;
 +
 +#define EAX_sig(context)     ((context)->uc_mcontext.__gregs[_REG_EAX])
 +#define EBX_sig(context)     ((context)->uc_mcontext.__gregs[_REG_EBX])
@@ -44,7 +41,15 @@ $NetBSD: patch-af,v 1.14 2005/10/10 08:32:23 adam Exp $
 +#define EFL_sig(context)     ((context)->uc_mcontext.__gregs[_REG_EFL])
 +
 +#define EIP_sig(context)     (*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_EIP]))
-+#define ESP_sig(context)     (*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_EIP]))
++#define ESP_sig(context)     (*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_ESP]))
++
++#define TRAP_sig(context)    ((context)->uc_mcontext.__gregs[_REG_TRAPNO])
++#define ERROR_sig(context)   ((context)->uc_mcontext.__gregs[_REG_ERR])
++
++#define FAULT_ADDRESS        (__siginfo->si_addr)
++
++#define HANDLER_DEF(name) void name( int __signal, siginfo_t *__siginfo, SIGCONTEXT *__context )
++#define HANDLER_CONTEXT (__context)
 +
 +#endif	/* NetBSD */
 +
diff --git a/emulators/wine/patches/patch-ai b/emulators/wine/patches/patch-ai
new file mode 100644
index 00000000000..15924abad12
--- /dev/null
+++ b/emulators/wine/patches/patch-ai
@@ -0,0 +1,12 @@
+$NetBSD: patch-ai,v 1.8 2006/01/20 14:58:53 adam Exp $
+
+--- include/winternl.h.orig	2005-11-11 09:56:44.000000000 +0100
++++ include/winternl.h
+@@ -22,6 +22,7 @@
+ #define __WINE_WINTERNL_H
+ 
+ #include <windef.h>
++#include <stdarg.h>
+ 
+ #ifdef __cplusplus
+ extern "C" {
diff --git a/emulators/wine/patches/patch-aj b/emulators/wine/patches/patch-aj
new file mode 100644
index 00000000000..b5b03cc1f7d
--- /dev/null
+++ b/emulators/wine/patches/patch-aj
@@ -0,0 +1,24 @@
+$NetBSD: patch-aj,v 1.5 2006/01/20 14:58:53 adam Exp $
+
+--- dlls/winmm/wineoss/oss.c.orig	2005-12-24 10:24:01.000000000 +0100
++++ dlls/winmm/wineoss/oss.c
+@@ -42,7 +42,9 @@ static LRESULT OSS_drvLoad(void)
+ {
+     TRACE("()\n");
+     OSS_WaveInit();
++#ifdef HAVE_OSS_MIDI
+     OSS_MidiInit();
++#endif
+     OSS_MixerInit();
+     OSS_AuxInit();
+     return 1;
+@@ -55,7 +57,9 @@ static LRESULT OSS_drvFree(void)
+ {
+     TRACE("()\n");
+     OSS_WaveExit();
++#ifdef HAVE_OSS_MIDI
+     OSS_MidiExit();
++#endif
+     OSS_MixerExit();
+     OSS_AuxExit();
+     return 1;
diff --git a/emulators/wine/patches/patch-ak b/emulators/wine/patches/patch-ak
new file mode 100644
index 00000000000..2bac5841175
--- /dev/null
+++ b/emulators/wine/patches/patch-ak
@@ -0,0 +1,40 @@
+$NetBSD: patch-ak,v 1.4 2006/01/20 14:58:18 adam Exp $
+
+--- dlls/ntdll/file.c.orig	2006-01-20 14:08:25.000000000 +0100
++++ dlls/ntdll/file.c
+@@ -1587,6 +1587,35 @@ NTSTATUS FILE_GetDeviceInfo( int fd, FIL
+             info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM;
+             break;
+         }
++#elif defined(__NetBSD__)
++	struct statvfs stfs;
++
++	if (fstatvfs( fd, &stfs) < 0)
++	    info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM;
++	else if (!strncmp("cd9660", stfs.f_fstypename,
++			sizeof(stfs.f_fstypename)))
++	{
++	    info->DeviceType = FILE_DEVICE_CD_ROM_FILE_SYSTEM;
++	    info->Characteristics |= FILE_REMOVABLE_MEDIA;
++	}
++	else if (!strncmp("nfs", stfs.f_fstypename,
++			sizeof(stfs.f_fstypename)))
++	{
++	    info->DeviceType = FILE_DEVICE_NETWORK_FILE_SYSTEM;
++	    info->Characteristics |= FILE_REMOTE_DEVICE;
++	}
++	else if (!strncmp("procfs", stfs.f_fstypename,
++			sizeof(stfs.f_fstypename)))
++	    info->DeviceType = FILE_DEVICE_VIRTUAL_DISK;
++	else
++	    info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM;
++	if (stfs.f_flag & MNT_RDONLY)
++	    info->Characteristics |= FILE_READ_ONLY_DEVICE;
++	if (!(stfs.f_flag & MNT_LOCAL))
++	{
++	    info->DeviceType = FILE_DEVICE_NETWORK_FILE_SYSTEM;
++	    info->Characteristics |= FILE_REMOTE_DEVICE;
++	}
+ #elif defined(__FreeBSD__)
+         struct statfs stfs;
+