Changes 20050211:

* Still more work on the MSI dll.
* More OLE work, including a builtin stdole32.tlb.
* Fixed inter-process window resize and repaint.
* Lots of bug fixes.

2 files changed, 59 insertions, 4 deletions

diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac
index 36907a5d173..652af11ee14 100644
--- a/emulators/wine/patches/patch-ac
+++ b/emulators/wine/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.16 2005/01/14 13:00:05 adam Exp $
+$NetBSD: patch-ac,v 1.17 2005/02/16 12:22:11 adam Exp $
 
---- configure.orig	2005-01-11 19:08:58.000000000 +0000
+--- configure.orig	2005-02-11 13:34:18.000000000 +0000
 +++ configure
-@@ -17810,7 +17810,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -17811,7 +17811,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.16 2005/01/14 13:00:05 adam Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -19480,7 +19480,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -19481,7 +19481,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
new file mode 100644
index 00000000000..a6a0b99e45a
--- /dev/null
+++ b/emulators/wine/patches/patch-af
@@ -0,0 +1,55 @@
+$NetBSD: patch-af,v 1.10 2005/02/16 12:22:11 adam Exp $
+
+--- dlls/ntdll/signal_i386.c.orig	2005-02-16 10:30:28.000000000 +0000
++++ dlls/ntdll/signal_i386.c
+@@ -206,7 +206,7 @@ typedef struct trapframe SIGCONTEXT;
+ 
+ #endif /* bsdi */
+ 
+-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__)
+ 
+ typedef struct sigcontext SIGCONTEXT;
+ 
+@@ -306,7 +306,40 @@ typedef struct ucontext SIGCONTEXT;
+ 
+ #endif /* __APPLE__ */
+ 
+-#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) ||\
++#if defined(__NetBSD__) 
++# include <sys/ucontext.h>
++# 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
++
++#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 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]))
++
++#endif	/* NetBSD */
++
++
++#if defined(linux) || defined(__FreeBSD__) ||\
+     defined(__OpenBSD__) || defined(__EMX__) || defined(__CYGWIN__)
+ 
+ #define EAX_sig(context)     ((context)->sc_eax)