From b39464b6f5210dcb1581211e8da369d66501ef76 Mon Sep 17 00:00:00 2001
From: adam <adam>
Date: Sat, 17 Feb 2007 10:19:37 +0000
Subject: 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.

---
 emulators/wine/patches/patch-aa |  6 +++---
 emulators/wine/patches/patch-ad | 47 +++++++++++++++++++++++------------------
 emulators/wine/patches/patch-al |  6 +++---
 3 files changed, 33 insertions(+), 26 deletions(-)

(limited to 'emulators/wine/patches')

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
  */
  
-- 
cgit v1.2.3