Changes 0.9.37:

- MSI automation with JScript/VBScript support.
- Various MSHTML improvements.
- The usual assortment of Direct3D fixes.
- Support for a few more exe protection schemes.
- Lots of bug fixes.

6 files changed, 16 insertions, 28 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 7c4d0a96338..61db4abde80 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.131 2007/05/02 13:28:28 tnn Exp $
+# $NetBSD: Makefile,v 1.132 2007/05/12 20:40:43 adam Exp $
 
-DISTNAME=	wine-0.9.36
+DISTNAME=	wine-0.9.37
 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 50c7d41903e..02c930da55f 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.61 2007/04/29 12:48:05 adam Exp $
+@comment $NetBSD: PLIST,v 1.62 2007/05/12 20:40:43 adam Exp $
 bin/bin2res
 bin/fnt2bdf
 bin/function_grep.pl
@@ -710,6 +710,7 @@ lib/wine/msvideo.dll16
 lib/wine/mswsock.dll.so
 lib/wine/msxml3.dll.so
 lib/wine/nddeapi.dll.so
+lib/wine/net.exe.so
 lib/wine/netapi32.dll.so
 lib/wine/newdev.dll.so
 lib/wine/notepad.exe.so
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 078c536d018..471af6b8a7f 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.67 2007/04/29 12:48:05 adam Exp $
+$NetBSD: distinfo,v 1.68 2007/05/12 20:40:43 adam Exp $
 
-SHA1 (wine-0.9.36.tar.bz2) = 1635943190c32f34b34dc0f40749c974c3bbfc64
-RMD160 (wine-0.9.36.tar.bz2) = 41e77069e07d6bb3db7d18b55e95a5b463ac4227
-Size (wine-0.9.36.tar.bz2) = 11843261 bytes
+SHA1 (wine-0.9.37.tar.bz2) = e1f420c1554d4e05e7846e7053d512b702373890
+RMD160 (wine-0.9.37.tar.bz2) = 9f63acab539687b8b02d9251ef9f96de13d9eb5d
+Size (wine-0.9.37.tar.bz2) = 11915704 bytes
 SHA1 (patch-aa) = 13006794c5c93ab377880f8eb8b8b875bf5ceafe
 SHA1 (patch-ab) = 66c1f1ec98674d15c7a72e8ac16105c28aa25e91
 SHA1 (patch-ad) = 21b66f430149cae8319eb80a30cf8ad890d1b1ef
 SHA1 (patch-ae) = a4f39995baf5511ddc70b4e1c006a159a86eeb22
-SHA1 (patch-af) = 413d6ebc5fa7f176d7e14cbc62007c96476bb111
+SHA1 (patch-af) = ff365b8c6f60adfe0cc47113db53de1dd27bb064
 SHA1 (patch-ag) = c4bf5a592ad5cad67ff933c5da418c58d6e1367a
 SHA1 (patch-ai) = a334ee48b949f9f5d4356beed3b422ee032619c2
 SHA1 (patch-aj) = fa9d3baad8d3b895edc6275c2b6da23daa941a09
-SHA1 (patch-ak) = 6d1b1490b30c7894483bdf93410490a6f326baea
-SHA1 (patch-al) = 4233cdc5d9b4db0a2ffebc037810af8fc94b7c2d
+SHA1 (patch-ak) = 638e0fa0fc3bb7246caf1d879e813ab09c645789
diff --git a/emulators/wine/patches/patch-af b/emulators/wine/patches/patch-af
index a7fa184bd63..d3ce5c2b078 100644
--- a/emulators/wine/patches/patch-af
+++ b/emulators/wine/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.22 2007/03/17 23:07:58 adam Exp $
+$NetBSD: patch-af,v 1.23 2007/05/12 20:40:43 adam Exp $
 
---- dlls/ntdll/signal_i386.c.orig	2007-03-16 17:40:46.000000000 +0100
+--- dlls/ntdll/signal_i386.c.orig	2007-05-11 19:35:02.000000000 +0200
 +++ dlls/ntdll/signal_i386.c
 @@ -167,7 +167,7 @@ typedef struct trapframe SIGCONTEXT;
  
@@ -69,7 +69,7 @@ $NetBSD: patch-af,v 1.22 2007/03/17 23:07:58 adam Exp $
  #else
      TRAP_x86_DIVIDE     = 0,   /* Division by zero exception */
      TRAP_x86_TRCTRAP    = 1,   /* Single-step exception */
-@@ -1376,7 +1418,11 @@ BOOL SIGNAL_Init(void)
+@@ -1385,7 +1427,11 @@ BOOL SIGNAL_Init(void)
  #endif  /* HAVE_SIGALTSTACK */
  
      sig_act.sa_mask = server_block_set;
diff --git a/emulators/wine/patches/patch-ak b/emulators/wine/patches/patch-ak
index 851089203a4..b3dc0b10e1a 100644
--- a/emulators/wine/patches/patch-ak
+++ b/emulators/wine/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.12 2007/04/29 12:48:05 adam Exp $
+$NetBSD: patch-ak,v 1.13 2007/05/12 20:40:43 adam Exp $
 
---- dlls/ntdll/file.c.orig	2007-04-27 16:48:53.000000000 +0200
+--- dlls/ntdll/file.c.orig	2007-05-11 19:35:02.000000000 +0200
 +++ dlls/ntdll/file.c
-@@ -1809,6 +1809,35 @@ static NTSTATUS get_device_info( int fd,
+@@ -1833,6 +1833,35 @@ static NTSTATUS get_device_info( int fd,
              info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM;
              break;
          }
diff --git a/emulators/wine/patches/patch-al b/emulators/wine/patches/patch-al
deleted file mode 100644
index 2934ffaf5a0..00000000000
--- a/emulators/wine/patches/patch-al
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-al,v 1.7 2007/02/17 10:19:38 adam Exp $
-
---- dlls/riched20/tests/editor.c.orig	2007-02-16 15:48:13.000000000 +0100
-+++ dlls/riched20/tests/editor.c
-@@ -19,6 +19,7 @@
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
- 
-+#include <winsock.h>
- #include <wine/test.h>
- #include <windows.h>
- #include <richedit.h>