Changes 0.9.23:

  - Massive update of printf formats for Win64 compatibility.
  - Dynamic drive support on MacOSX.
  - Still more MSI fixes and improvements.
  - Lots of bug fixes.

Changes  0.9.22:
  - The usual assortment of MSI improvements.
  - Several bug fixes to the various common controls.
  - Pixel shaders enabled by default in D3D.
  - Various improvements to the build process.
  - Many translation updates.
  - Lots of bug fixes.

Changes 0.9.20:
  - XEmbed system tray support.
  - Many improvements to NTLM support.
  - Many messages made localizable instead of hardcoded to English.
  - Improved support for various OpenGL platforms.
  - More improvements to the IDL compiler.
  - Lots of bug fixes.

6 files changed, 82 insertions, 78 deletions

diff --git a/emulators/wine/patches/patch-aa b/emulators/wine/patches/patch-aa
index 7d2d9c47ec3..74b008bfb03 100644
--- a/emulators/wine/patches/patch-aa
+++ b/emulators/wine/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.22 2006/07/28 13:04:35 adam Exp $
+$NetBSD: patch-aa,v 1.23 2006/10/18 20:37:21 adam Exp $
 
---- Make.rules.in.orig	2006-07-27 16:55:50.000000000 +0200
+--- Make.rules.in.orig	2006-09-13 21:10:25.000000000 +0200
 +++ Make.rules.in
-@@ -110,7 +110,7 @@ conf_manext     = 5
+@@ -111,7 +111,7 @@ conf_manext     = 5
  CLEAN_FILES     = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
-                   *.flc *.tab.c *.tab.h @LEX_OUTPUT_ROOT@.c core
+                   *.flc *.res *.mc.rc *.tab.[ch] *.yy.c core
  
--OBJS = $(C_SRCS:.c=.o) $(EXTRA_OBJS)
-+OBJS = $(EXTRA_OBJS) $(C_SRCS:.c=.o)
+-OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(EXTRA_OBJS)
++OBJS = $(EXTRA_OBJS) $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o)
  
  RCOBJS = $(RC_SRCS:.rc=.res.o)
  LINTS  = $(C_SRCS:.c=.ln)
diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac
index c9d4de96d76..19f384a4dbc 100644
--- a/emulators/wine/patches/patch-ac
+++ b/emulators/wine/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.32 2006/07/28 13:04:35 adam Exp $
+$NetBSD: patch-ac,v 1.33 2006/10/18 20:37:21 adam Exp $
 
---- configure.orig	2006-07-27 16:55:50.000000000 +0200
+--- configure.orig	2006-10-13 16:43:39.000000000 +0200
 +++ configure
-@@ -20903,7 +20903,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -20169,7 +20169,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.32 2006/07/28 13:04:35 adam Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -22920,7 +22920,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22186,7 +22186,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
    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 8e7676fb541..ee46e2b3a43 100644
--- a/emulators/wine/patches/patch-ae
+++ b/emulators/wine/patches/patch-ae
@@ -1,12 +1,12 @@
-$NetBSD: patch-ae,v 1.11 2005/05/25 08:23:43 adam Exp $
+$NetBSD: patch-ae,v 1.12 2006/10/18 20:37:21 adam Exp $
 
---- programs/winetest/winetest.rc.orig	2005-04-18 09:54:24.000000000 +0000
-+++ programs/winetest/winetest.rc
-@@ -21,7 +21,6 @@
- #include <windows.h>
- #include <winres.h>
- #include "resource.h"
--#include "tests.rc"
- 
- IDD_TAG DIALOG 0, 0, 150, 65
- STYLE WS_POPUP
+--- dlls/winex11.drv/opengl.c.orig	2006-09-15 08:03:29.000000000 +0200
++++ dlls/winex11.drv/opengl.c
+@@ -48,6 +48,7 @@ WINE_DECLARE_DEBUG_CHANNEL(opengl);
+ #endif
+ #ifdef HAVE_GL_GLX_H
+ # include <GL/glx.h>
++# include <GL/glxext.h>
+ #endif
+ #ifdef HAVE_GL_GLEXT_H
+ # include <GL/glext.h>
diff --git a/emulators/wine/patches/patch-af b/emulators/wine/patches/patch-af
index 861058422e8..267624e7929 100644
--- a/emulators/wine/patches/patch-af
+++ b/emulators/wine/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.18 2006/10/08 01:05:55 wiz Exp $
+$NetBSD: patch-af,v 1.19 2006/10/18 20:37:21 adam Exp $
 
---- dlls/ntdll/signal_i386.c.orig	2006-07-27 14:55:50.000000000 +0000
+--- dlls/ntdll/signal_i386.c.orig	2006-10-13 16:43:39.000000000 +0200
 +++ dlls/ntdll/signal_i386.c
-@@ -215,7 +215,7 @@ typedef struct trapframe SIGCONTEXT;
+@@ -163,7 +163,7 @@ typedef struct trapframe SIGCONTEXT;
  
  #endif /* bsdi */
  
@@ -11,12 +11,10 @@ $NetBSD: patch-af,v 1.18 2006/10/08 01:05:55 wiz Exp $
  
  typedef struct sigcontext SIGCONTEXT;
  
-@@ -339,8 +339,45 @@ typedef ucontext_t SIGCONTEXT;
+@@ -268,6 +268,43 @@ typedef ucontext_t SIGCONTEXT;
  
  #endif /* __APPLE__ */
  
--#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ||\
--    defined(__OpenBSD__) || defined(__EMX__) || defined(__CYGWIN__)
 +#if defined(__NetBSD__) && (__NetBSD_Version__ >= 200000000)
 +# include <sys/ucontext.h>
 +# include <sys/types.h>
@@ -24,50 +22,70 @@ $NetBSD: patch-af,v 1.18 2006/10/08 01:05:55 wiz Exp $
 +
 +typedef ucontext_t SIGCONTEXT;
 +
-+#define EAX_sig(context)     ((context)->uc_mcontext.__gregs[_REG_EAX])
-+#define EBX_sig(context)     ((context)->uc_mcontext.__gregs[_REG_EBX])
-+#define ECX_sig(context)     ((context)->uc_mcontext.__gregs[_REG_ECX])
-+#define EDX_sig(context)     ((context)->uc_mcontext.__gregs[_REG_EDX])
-+#define ESI_sig(context)     ((context)->uc_mcontext.__gregs[_REG_ESI])
-+#define EDI_sig(context)     ((context)->uc_mcontext.__gregs[_REG_EDI])
-+#define EBP_sig(context)     ((context)->uc_mcontext.__gregs[_REG_EBP])
++#define EAX_sig(context)	((context)->uc_mcontext.__gregs[_REG_EAX])
++#define EBX_sig(context)	((context)->uc_mcontext.__gregs[_REG_EBX])
++#define ECX_sig(context)	((context)->uc_mcontext.__gregs[_REG_ECX])
++#define EDX_sig(context)	((context)->uc_mcontext.__gregs[_REG_EDX])
++#define ESI_sig(context)	((context)->uc_mcontext.__gregs[_REG_ESI])
++#define EDI_sig(context)	((context)->uc_mcontext.__gregs[_REG_EDI])
++#define EBP_sig(context)	((context)->uc_mcontext.__gregs[_REG_EBP])
 +
-+#define CS_sig(context)      ((context)->uc_mcontext.__gregs[_REG_CS])
-+#define DS_sig(context)      ((context)->uc_mcontext.__gregs[_REG_DS])
-+#define ES_sig(context)      ((context)->uc_mcontext.__gregs[_REG_ES])
-+#define FS_sig(context)      ((context)->uc_mcontext.__gregs[_REG_FS])
-+#define GS_sig(context)      ((context)->uc_mcontext.__gregs[_REG_GS])
-+#define SS_sig(context)      ((context)->uc_mcontext.__gregs[_REG_SS])
++#define CS_sig(context)		((context)->uc_mcontext.__gregs[_REG_CS])
++#define DS_sig(context)		((context)->uc_mcontext.__gregs[_REG_DS])
++#define ES_sig(context)		((context)->uc_mcontext.__gregs[_REG_ES])
++#define FS_sig(context)		((context)->uc_mcontext.__gregs[_REG_FS])
++#define GS_sig(context)		((context)->uc_mcontext.__gregs[_REG_GS])
++#define SS_sig(context)		((context)->uc_mcontext.__gregs[_REG_SS])
 +
-+#define EFL_sig(context)     ((context)->uc_mcontext.__gregs[_REG_EFL])
++#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_ESP]))
++#define EIP_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 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 FAULT_ADDRESS		(__siginfo->si_addr)
 +
 +#define HANDLER_DEF(name) void name( int __signal, siginfo_t *__siginfo, SIGCONTEXT *__context )
 +#define HANDLER_CONTEXT (__context)
 +
-+#endif	/* NetBSD */
++#endif /* __NetBSD__ */
 +
-+#if defined(linux) || (defined(__NetBSD__) && (__NetBSD_Version__ < 200000000)) || defined(__FreeBSD__) ||\
-+    defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__EMX__) || defined(__CYGWIN__)
+ #include "wine/exception.h"
+ #include "wine/debug.h"
  
- #define EAX_sig(context)     ((context)->sc_eax)
- #define EBX_sig(context)     ((context)->sc_ebx)
-@@ -1440,9 +1477,9 @@ static int set_handler( int sig, int hav
+@@ -303,8 +340,10 @@ enum i386_trap_code
+     TRAP_x86_PAGEFLT    = T_PAGEFLT,    /* Page fault */
+     TRAP_x86_ARITHTRAP  = T_ARITHTRAP,  /* Floating point exception */
+     TRAP_x86_ALIGNFLT   = T_ALIGNFLT,   /* Alignment check exception */
++#if !defined(__NetBSD__)
+     TRAP_x86_MCHK       = T_MCHK,       /* Machine check exception */
+     TRAP_x86_CACHEFLT   = T_XMMFLT      /* Cache flush exception */
++#endif
+ #else
+     TRAP_x86_DIVIDE     = 0,   /* Division by zero exception */
+     TRAP_x86_TRCTRAP    = 1,   /* Single-step exception */
+@@ -1148,8 +1187,10 @@ static void segv_handler( int signal, si
+     case TRAP_x86_DNA:       /* Device not available exception */
+     case TRAP_x86_DOUBLEFLT: /* Double fault exception */
+     case TRAP_x86_TSSFLT:    /* Invalid TSS exception */
++#if !defined(__NetBSD__)
+     case TRAP_x86_MCHK:      /* Machine check exception */
+     case TRAP_x86_CACHEFLT:  /* Cache flush exception */
++#endif
+         rec->ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION;
+         break;
+     }
+@@ -1341,7 +1382,11 @@ BOOL SIGNAL_Init(void)
+     sigaddset( &sig_act.sa_mask, SIGINT );
      sigaddset( &sig_act.sa_mask, SIGUSR1 );
      sigaddset( &sig_act.sa_mask, SIGUSR2 );
- 
--#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
-+#if defined(linux) || (defined(__NetBSD__) && (__NetBSD_Version__ < 200000000)) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
-     sig_act.sa_flags = SA_RESTART;
--#elif defined (__svr4__) || defined(_SCO_DS) || defined(__APPLE__)
-+#elif defined (__svr4__) || defined(_SCO_DS) || defined(__APPLE__) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 200000000))
++#if defined(__NetBSD__) && (__NetBSD_Version__ < 200000000)
++    sig_act.sa_flags = SA_RESTART;
++#else
      sig_act.sa_flags = SA_SIGINFO | SA_RESTART;
- #else
-     sig_act.sa_flags = 0;
++#endif
+ 
+ #ifdef SA_ONSTACK
+     sig_act.sa_flags |= SA_ONSTACK;
diff --git a/emulators/wine/patches/patch-ag b/emulators/wine/patches/patch-ag
deleted file mode 100644
index 9bf81dbb754..00000000000
--- a/emulators/wine/patches/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ag,v 1.5 2005/06/05 06:14:17 minskim Exp $
-
---- dlls/kernel/sync.c.orig	2005-04-24 12:36:34.000000000 -0500
-+++ dlls/kernel/sync.c
-@@ -40,6 +40,9 @@
- #endif
- #include <stdarg.h>
- #include <stdio.h>
-+#ifdef HAVE_MACHINE_LIMITS_H
-+#include <machine/limits.h>
-+#endif
- 
- #define NONAMELESSUNION
- #define NONAMELESSSTRUCT
diff --git a/emulators/wine/patches/patch-ak b/emulators/wine/patches/patch-ak
index dc23947a6c2..d714add90e9 100644
--- a/emulators/wine/patches/patch-ak
+++ b/emulators/wine/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.7 2006/06/12 09:07:22 adam Exp $
+$NetBSD: patch-ak,v 1.8 2006/10/18 20:37:21 adam Exp $
 
---- dlls/ntdll/file.c.orig	2006-06-08 17:06:38.000000000 +0200
+--- dlls/ntdll/file.c.orig	2006-10-13 16:43:39.000000000 +0200
 +++ dlls/ntdll/file.c
-@@ -1629,6 +1629,35 @@ NTSTATUS FILE_GetDeviceInfo( int fd, FIL
+@@ -1624,6 +1624,35 @@ NTSTATUS FILE_GetDeviceInfo( int fd, FIL
              info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM;
              break;
          }
@@ -35,6 +35,6 @@ $NetBSD: patch-ak,v 1.7 2006/06/12 09:07:22 adam Exp $
 +	    info->DeviceType = FILE_DEVICE_NETWORK_FILE_SYSTEM;
 +	    info->Characteristics |= FILE_REMOTE_DEVICE;
 +	}
- #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__)
          struct statfs stfs;