Changes 0.9.30:

- Many improvements to Direct3D shaders and state management.
- Support for inter-process memory allocations.
- OLE32 marshalling fixes.
- Lots of bug fixes.

6 files changed, 26 insertions, 23 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 562af17708a..75f68f395d4 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.122 2007/01/10 09:09:49 adam Exp $
+# $NetBSD: Makefile,v 1.123 2007/01/30 13:11:04 adam Exp $
 
-DISTNAME=	wine-0.9.29
+DISTNAME=	wine-0.9.30
 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 61bacf062d2..588a6713356 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.54 2007/01/10 09:09:49 adam Exp $
+@comment $NetBSD: PLIST,v 1.55 2007/01/30 13:11:04 adam Exp $
 bin/bin2res
 bin/fnt2bdf
 bin/function_grep.pl
@@ -466,6 +466,7 @@ lib/wine/commdlg.dll16
 lib/wine/compobj.dll16
 lib/wine/compstui.dll.so
 lib/wine/control.exe.so
+lib/wine/credui.dll.so
 lib/wine/crtdll.dll.so
 lib/wine/crypt32.dll.so
 lib/wine/cryptdll.dll.so
@@ -626,6 +627,7 @@ lib/wine/libsensapi.def
 lib/wine/libserialui.def
 lib/wine/libsetupapi.def
 lib/wine/libsfc.def
+lib/wine/libsfc_os.def
 lib/wine/libshdocvw.def
 lib/wine/libshell32.def
 lib/wine/libshfolder.def
@@ -752,6 +754,7 @@ lib/wine/serialui.dll.so
 lib/wine/setupapi.dll.so
 lib/wine/setupx.dll16
 lib/wine/sfc.dll.so
+lib/wine/sfc_os.dll.so
 lib/wine/shdoclc.dll.so
 lib/wine/shdocvw.dll.so
 lib/wine/shell.dll16
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index a02fa115910..8ab0e438054 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.59 2007/01/10 09:09:49 adam Exp $
+$NetBSD: distinfo,v 1.60 2007/01/30 13:11:04 adam Exp $
 
-SHA1 (wine-0.9.29.tar.bz2) = 6bab2eb5426f5a4c88ff82cad7ef71fae30ed166
-RMD160 (wine-0.9.29.tar.bz2) = f97c417c92e2548574e558eaa966dce8df836648
-Size (wine-0.9.29.tar.bz2) = 11447017 bytes
+SHA1 (wine-0.9.30.tar.bz2) = c3cfe44b65d079553df84f34f3c71b78958eb889
+RMD160 (wine-0.9.30.tar.bz2) = 432feee3dea642fa91c4a422a96b0f8727d31d93
+Size (wine-0.9.30.tar.bz2) = 11542261 bytes
 SHA1 (patch-aa) = d2e381ee03022c77c36dc2e63f98c39db7a0ad9c
 SHA1 (patch-ab) = 66c1f1ec98674d15c7a72e8ac16105c28aa25e91
 SHA1 (patch-ad) = 7f34f406e712a3f13c7b6cc0e5219de38a2754cf
 SHA1 (patch-ae) = a4f39995baf5511ddc70b4e1c006a159a86eeb22
-SHA1 (patch-af) = 81718bf578bf3be11fa1eea5702eb9c2de4c7825
+SHA1 (patch-af) = d5f68fa775e9ec605c5430d0a2aa76f8f34aa4e2
 SHA1 (patch-ag) = c4bf5a592ad5cad67ff933c5da418c58d6e1367a
 SHA1 (patch-ai) = a334ee48b949f9f5d4356beed3b422ee032619c2
-SHA1 (patch-aj) = 9ad0a5e641f86756018bf460a969c0187aae17a0
-SHA1 (patch-ak) = 08bdf2115f8373d1f439af6f2e6262901e5b4b42
+SHA1 (patch-aj) = fa9d3baad8d3b895edc6275c2b6da23daa941a09
+SHA1 (patch-ak) = b1820ff79ef47da0df8cc57ddd29591097d8e46e
 SHA1 (patch-al) = 7ee943a4060d526dab328cb2a8a7308b98514949
diff --git a/emulators/wine/patches/patch-af b/emulators/wine/patches/patch-af
index 70ed8ecb711..af4d7c7de0a 100644
--- a/emulators/wine/patches/patch-af
+++ b/emulators/wine/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.20 2007/01/02 15:33:33 adam Exp $
+$NetBSD: patch-af,v 1.21 2007/01/30 13:11:04 adam Exp $
 
---- dlls/ntdll/signal_i386.c.orig	2006-12-22 17:17:47.000000000 +0100
+--- dlls/ntdll/signal_i386.c.orig	2007-01-25 16:53:50.000000000 +0100
 +++ dlls/ntdll/signal_i386.c
 @@ -163,7 +163,7 @@ typedef struct trapframe SIGCONTEXT;
  
@@ -77,15 +77,15 @@ $NetBSD: patch-af,v 1.20 2007/01/02 15:33:33 adam Exp $
          rec->ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION;
          break;
      }
-@@ -1345,7 +1386,11 @@ BOOL SIGNAL_Init(void)
-     sigaddset( &sig_act.sa_mask, SIGINT );
-     sigaddset( &sig_act.sa_mask, SIGUSR1 );
-     sigaddset( &sig_act.sa_mask, SIGUSR2 );
+@@ -1342,7 +1383,11 @@ BOOL SIGNAL_Init(void)
+ #endif  /* HAVE_SIGALTSTACK */
+ 
+     sig_act.sa_mask = server_block_set;
 +#if defined(__NetBSD__) && (__NetBSD_Version__ < 200000000)
 +    sig_act.sa_flags = SA_RESTART;
 +#else
      sig_act.sa_flags = SA_SIGINFO | SA_RESTART;
 +#endif
- 
  #ifdef SA_ONSTACK
      sig_act.sa_flags |= SA_ONSTACK;
+ #endif
diff --git a/emulators/wine/patches/patch-aj b/emulators/wine/patches/patch-aj
index b5b03cc1f7d..aafaa7f35d2 100644
--- a/emulators/wine/patches/patch-aj
+++ b/emulators/wine/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.5 2006/01/20 14:58:53 adam Exp $
+$NetBSD: patch-aj,v 1.6 2007/01/30 13:11:04 adam Exp $
 
---- dlls/winmm/wineoss/oss.c.orig	2005-12-24 10:24:01.000000000 +0100
-+++ dlls/winmm/wineoss/oss.c
+--- dlls/wineoss.drv/oss.c.orig	2005-12-24 10:24:01.000000000 +0100
++++ dlls/wineoss.drv/oss.c
 @@ -42,7 +42,9 @@ static LRESULT OSS_drvLoad(void)
  {
      TRACE("()\n");
diff --git a/emulators/wine/patches/patch-ak b/emulators/wine/patches/patch-ak
index 19712f52e8a..aa6677a2a00 100644
--- a/emulators/wine/patches/patch-ak
+++ b/emulators/wine/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.9 2006/11/25 13:23:14 adam Exp $
+$NetBSD: patch-ak,v 1.10 2007/01/30 13:11:04 adam Exp $
 
---- dlls/ntdll/file.c.orig	2006-11-24 17:18:04.000000000 +0100
+--- dlls/ntdll/file.c.orig	2007-01-25 16:53:50.000000000 +0100
 +++ dlls/ntdll/file.c
-@@ -1765,6 +1765,35 @@ static NTSTATUS get_device_info( int fd,
+@@ -1773,6 +1773,35 @@ static NTSTATUS get_device_info( int fd,
              info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM;
              break;
          }