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.

6 files changed, 95 insertions, 14 deletions

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;
+