Changes 0.9.33:

- Many Direct3D fixes and performance improvements.
- More comctl32 tests and some bug fixes.
- Compatibility improvements in cmd.exe.
- Still more fixes to builtin OLE.
- Support for process control on Solaris.
- Lots of bug fixes.

5 files changed, 25 insertions, 32 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index ce8b6351479..47d477ec635 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.125 2007/03/05 22:12:30 adam Exp $
+# $NetBSD: Makefile,v 1.126 2007/03/17 23:07:57 adam Exp $
 
-DISTNAME=	wine-0.9.32
+DISTNAME=	wine-0.9.33
 CATEGORIES=	emulators
 MASTER_SITES=	http://ibiblio.org/pub/linux/system/emulators/wine/ \
 		${MASTER_SITE_SOURCEFORGE:=wine/}
diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST
index 41da3bbde6c..b5a807aa3c6 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.57 2007/03/05 22:12:30 adam Exp $
+@comment $NetBSD: PLIST,v 1.58 2007/03/17 23:07:58 adam Exp $
 bin/bin2res
 bin/fnt2bdf
 bin/function_grep.pl
@@ -504,6 +504,7 @@ lib/wine/dmusic32.dll.so
 lib/wine/dnsapi.dll.so
 lib/wine/dplay.dll.so
 lib/wine/dplayx.dll.so
+lib/wine/dpnaddr.dll.so
 lib/wine/dpnet.dll.so
 lib/wine/dpnhpast.dll.so
 lib/wine/dsound.dll.so
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index af3cd4b7ec1..bebddca95c7 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.63 2007/03/05 22:12:30 adam Exp $
+$NetBSD: distinfo,v 1.64 2007/03/17 23:07:58 adam Exp $
 
-SHA1 (wine-0.9.32.tar.bz2) = f8ece3e8b7a356243b2c5eb82420238ba3ef276c
-RMD160 (wine-0.9.32.tar.bz2) = ec66f5fff514c40bb8424205ea94b00e0a1547d5
-Size (wine-0.9.32.tar.bz2) = 11688886 bytes
-SHA1 (patch-aa) = 3878ed2683dcefc5919e8a1616c982ea29ec3bfe
+SHA1 (wine-0.9.33.tar.bz2) = e08827d917185b29294e15ed82ae6184f6ab3dd9
+RMD160 (wine-0.9.33.tar.bz2) = a93ddf4b3913932f5015d4d582472aa720f48a15
+Size (wine-0.9.33.tar.bz2) = 11708829 bytes
+SHA1 (patch-aa) = 13006794c5c93ab377880f8eb8b8b875bf5ceafe
 SHA1 (patch-ab) = 66c1f1ec98674d15c7a72e8ac16105c28aa25e91
 SHA1 (patch-ad) = 21b66f430149cae8319eb80a30cf8ad890d1b1ef
 SHA1 (patch-ae) = a4f39995baf5511ddc70b4e1c006a159a86eeb22
-SHA1 (patch-af) = d5f68fa775e9ec605c5430d0a2aa76f8f34aa4e2
+SHA1 (patch-af) = 413d6ebc5fa7f176d7e14cbc62007c96476bb111
 SHA1 (patch-ag) = c4bf5a592ad5cad67ff933c5da418c58d6e1367a
 SHA1 (patch-ai) = a334ee48b949f9f5d4356beed3b422ee032619c2
 SHA1 (patch-aj) = fa9d3baad8d3b895edc6275c2b6da23daa941a09
diff --git a/emulators/wine/patches/patch-aa b/emulators/wine/patches/patch-aa
index 61492409fe7..e5a15e3b298 100644
--- a/emulators/wine/patches/patch-aa
+++ b/emulators/wine/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.26 2007/02/17 10:19:38 adam Exp $
+$NetBSD: patch-aa,v 1.27 2007/03/17 23:07:58 adam Exp $
 
---- Make.rules.in.orig	2007-02-16 15:48:13.000000000 +0100
+--- Make.rules.in.orig	2007-03-16 17:40:46.000000000 +0100
 +++ Make.rules.in
-@@ -119,7 +119,7 @@ CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_
+@@ -118,7 +118,7 @@ CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_
                  $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) \
                  $(MC_SRCS:.mc=.mc.rc) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res)
  
diff --git a/emulators/wine/patches/patch-af b/emulators/wine/patches/patch-af
index af4d7c7de0a..a7fa184bd63 100644
--- a/emulators/wine/patches/patch-af
+++ b/emulators/wine/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.21 2007/01/30 13:11:04 adam Exp $
+$NetBSD: patch-af,v 1.22 2007/03/17 23:07:58 adam Exp $
 
---- dlls/ntdll/signal_i386.c.orig	2007-01-25 16:53:50.000000000 +0100
+--- dlls/ntdll/signal_i386.c.orig	2007-03-16 17:40:46.000000000 +0100
 +++ dlls/ntdll/signal_i386.c
-@@ -163,7 +163,7 @@ typedef struct trapframe SIGCONTEXT;
+@@ -167,7 +167,7 @@ typedef struct trapframe SIGCONTEXT;
  
  #endif /* bsdi */
  
@@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.21 2007/01/30 13:11:04 adam Exp $
  
  typedef struct sigcontext SIGCONTEXT;
  
-@@ -268,6 +268,43 @@ typedef ucontext_t SIGCONTEXT;
+@@ -290,6 +290,43 @@ typedef ucontext_t SIGCONTEXT;
  
  #endif /* __APPLE__ */
  
@@ -52,32 +52,24 @@ $NetBSD: patch-af,v 1.21 2007/01/30 13:11:04 adam Exp $
 +
 +#endif /* __NetBSD__ */
 +
- #include "wine/exception.h"
- #include "wine/debug.h"
+ WINE_DEFAULT_DEBUG_CHANNEL(seh);
  
-@@ -303,8 +340,10 @@ enum i386_trap_code
+ typedef int (*wine_signal_handler)(unsigned int sig);
+@@ -322,8 +359,13 @@ 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__)
++#if defined(__NetBSD__)
++    TRAP_x86_MCHK       = T_MCA,        /* Machine check exception */
++    TRAP_x86_CACHEFLT   = T_XMM         /* Cache flush exception */
++#else
      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 */
-@@ -1152,8 +1191,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;
-     }
-@@ -1342,7 +1383,11 @@ BOOL SIGNAL_Init(void)
+@@ -1376,7 +1418,11 @@ BOOL SIGNAL_Init(void)
  #endif  /* HAVE_SIGALTSTACK */
  
      sig_act.sa_mask = server_block_set;