Changes 0.9.31:

- Many Direct3D fixes and performance improvements.
- Several new comctl32 test cases.
- IDL compiler improvements.
- More OLE32 marshalling fixes.
- Lots of bug fixes.

6 files changed, 45 insertions, 36 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 75f68f395d4..81194dcee55 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.123 2007/01/30 13:11:04 adam Exp $
+# $NetBSD: Makefile,v 1.124 2007/02/17 10:19:37 adam Exp $
 
-DISTNAME=	wine-0.9.30
+DISTNAME=	wine-0.9.31
 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 588a6713356..bbfd49eb49f 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.55 2007/01/30 13:11:04 adam Exp $
+@comment $NetBSD: PLIST,v 1.56 2007/02/17 10:19:38 adam Exp $
 bin/bin2res
 bin/fnt2bdf
 bin/function_grep.pl
@@ -130,6 +130,7 @@ include/wine/windows/dciman.h
 include/wine/windows/dde.h
 include/wine/windows/ddeml.h
 include/wine/windows/ddk/compstui.h
+include/wine/windows/ddk/hidsdi.h
 include/wine/windows/ddk/ntddcdvd.h
 include/wine/windows/ddk/ntddser.h
 include/wine/windows/ddk/ntddtape.h
@@ -451,6 +452,7 @@ lib/wine/atl.dll.so
 lib/wine/avicap32.dll.so
 lib/wine/avifil32.dll.so
 lib/wine/avifile.dll16
+lib/wine/browseui.dll.so
 lib/wine/cabinet.dll.so
 lib/wine/capi2032.dll.so
 lib/wine/cards.dll.so
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 8ab0e438054..e6ca3ab078c 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.60 2007/01/30 13:11:04 adam Exp $
+$NetBSD: distinfo,v 1.61 2007/02/17 10:19:38 adam Exp $
 
-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 (wine-0.9.31.tar.bz2) = 7e8d2472c0aa17fca438983f7c28dfd1bd70863e
+RMD160 (wine-0.9.31.tar.bz2) = 3f4d39cf919122932077ef4d4c578c9ee1614a5a
+Size (wine-0.9.31.tar.bz2) = 11586104 bytes
+SHA1 (patch-aa) = 3878ed2683dcefc5919e8a1616c982ea29ec3bfe
 SHA1 (patch-ab) = 66c1f1ec98674d15c7a72e8ac16105c28aa25e91
-SHA1 (patch-ad) = 7f34f406e712a3f13c7b6cc0e5219de38a2754cf
+SHA1 (patch-ad) = d8cc315e1268bd590d0d139897f15fab24a87db2
 SHA1 (patch-ae) = a4f39995baf5511ddc70b4e1c006a159a86eeb22
 SHA1 (patch-af) = d5f68fa775e9ec605c5430d0a2aa76f8f34aa4e2
 SHA1 (patch-ag) = c4bf5a592ad5cad67ff933c5da418c58d6e1367a
 SHA1 (patch-ai) = a334ee48b949f9f5d4356beed3b422ee032619c2
 SHA1 (patch-aj) = fa9d3baad8d3b895edc6275c2b6da23daa941a09
 SHA1 (patch-ak) = b1820ff79ef47da0df8cc57ddd29591097d8e46e
-SHA1 (patch-al) = 7ee943a4060d526dab328cb2a8a7308b98514949
+SHA1 (patch-al) = 4233cdc5d9b4db0a2ffebc037810af8fc94b7c2d
diff --git a/emulators/wine/patches/patch-aa b/emulators/wine/patches/patch-aa
index e8c7a263453..61492409fe7 100644
--- a/emulators/wine/patches/patch-aa
+++ b/emulators/wine/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.25 2007/01/10 09:09:49 adam Exp $
+$NetBSD: patch-aa,v 1.26 2007/02/17 10:19:38 adam Exp $
 
---- Make.rules.in.orig	2007-01-09 16:42:47.000000000 +0100
+--- Make.rules.in.orig	2007-02-16 15:48:13.000000000 +0100
 +++ Make.rules.in
-@@ -117,7 +117,7 @@ CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_
+@@ -119,7 +119,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-ad b/emulators/wine/patches/patch-ad
index 2524920afec..05dd18aaadc 100644
--- a/emulators/wine/patches/patch-ad
+++ b/emulators/wine/patches/patch-ad
@@ -1,22 +1,29 @@
-$NetBSD: patch-ad,v 1.10 2006/12/09 19:42:43 adam Exp $
+$NetBSD: patch-ad,v 1.11 2007/02/17 10:19:38 adam Exp $
 
---- tools/wineshelllink.orig	2006-12-09 20:04:14.000000000 +0100
-+++ tools/wineshelllink
-@@ -101,7 +101,7 @@ directory_entry()
- [Desktop Entry]
- Type=Directory
- EOF
--    if [ "$1" == "wine" ] ; then
-+    if [ "$1" = "wine" ] ; then
-         echo "Name=Wine"
-         echo "Icon=wine"
-     else
-@@ -208,7 +208,7 @@ if [ $mode = "menu" ] ; then
-     mkdir -p "$xdg_data_dir/applications/wine/`dirname "$link"`"
+--- dlls/iphlpapi/ipstats.c.orig	2007-02-16 22:05:36.000000000 +0100
++++ dlls/iphlpapi/ipstats.c
+@@ -627,7 +627,11 @@ DWORD getNumRoutes(void)
  
-     linkpath=`dirname "$link" | sed 's!/!-!g'`
--    if [ "$linkpath" == "." ] ; then 
-+    if [ "$linkpath" = "." ] ; then 
-         linkpath=""
-     else
-         linkpath="-$linkpath"
+       /* Ignore all entries except for gateway routes which aren't
+          multicast */
++#if !defined(RTF_MULTICAST)
++      if (!(rtm->rtm_flags & RTF_GATEWAY))
++#else
+       if (!(rtm->rtm_flags & RTF_GATEWAY) || (rtm->rtm_flags & RTF_MULTICAST))
++#endif
+          continue;
+ 
+       RouteCount++;
+@@ -700,8 +704,12 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE 
+ 
+           /* Ignore all entries except for gateway routes which aren't
+              multicast */
++#if !defined(RTF_MULTICAST)
++          if (!(rtm->rtm_flags & RTF_GATEWAY))
++#else
+           if (!(rtm->rtm_flags & RTF_GATEWAY) ||
+               (rtm->rtm_flags & RTF_MULTICAST))
++#endif
+              continue;
+ 
+           memset (&table->table[table->dwNumEntries], 0,
diff --git a/emulators/wine/patches/patch-al b/emulators/wine/patches/patch-al
index ab8e148902c..2934ffaf5a0 100644
--- a/emulators/wine/patches/patch-al
+++ b/emulators/wine/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.6 2006/05/26 09:40:33 adam Exp $
+$NetBSD: patch-al,v 1.7 2007/02/17 10:19:38 adam Exp $
 
---- dlls/riched20/tests/editor.c.orig	2006-05-24 19:40:04.000000000 +0200
+--- dlls/riched20/tests/editor.c.orig	2007-02-16 15:48:13.000000000 +0100
 +++ dlls/riched20/tests/editor.c
-@@ -18,6 +18,7 @@
+@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */