Changes 1.1.13:

* Freedesktop.org-compliant startup notifications.
* Many fixes for 64-bit application support.
* Improved graphics support in Internet Explorer.
* Various Richedit improvements.
* Better certificate manager dialog.
* Various bug fixes.

8 files changed, 106 insertions, 32 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 78e70a94af6..f53c6d0df2f 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2009/01/03 20:12:43 adam Exp $
+# $NetBSD: Makefile,v 1.8 2009/01/17 10:11:14 adam Exp $
 
-DISTNAME=	wine-1.1.12
+DISTNAME=	wine-1.1.13
 CATEGORIES=	emulators
 MASTER_SITES=	http://ibiblio.org/pub/linux/system/emulators/wine/ \
 		${MASTER_SITE_SOURCEFORGE:=wine/}
diff --git a/emulators/wine-devel/PLIST.common b/emulators/wine-devel/PLIST.common
index 807261593e1..bda5ad09b03 100644
--- a/emulators/wine-devel/PLIST.common
+++ b/emulators/wine-devel/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.3 2008/12/21 02:17:27 jmcneill Exp $
+@comment $NetBSD: PLIST.common,v 1.4 2009/01/17 10:11:14 adam Exp $
 bin/fnt2bdf
 bin/function_grep.pl
 bin/msiexec
@@ -34,8 +34,8 @@ include/wine/itss.idl
 include/wine/library.h
 include/wine/msvcrt/conio.h
 include/wine/msvcrt/crtdbg.h
-include/wine/msvcrt/ctype.h
 include/wine/msvcrt/crtdefs.h
+include/wine/msvcrt/ctype.h
 include/wine/msvcrt/direct.h
 include/wine/msvcrt/dirent.h
 include/wine/msvcrt/dos.h
@@ -121,6 +121,8 @@ include/wine/windows/corhdr.h
 include/wine/windows/cpl.h
 include/wine/windows/cryptdlg.h
 include/wine/windows/cryptuiapi.h
+include/wine/windows/ctxtcall.h
+include/wine/windows/ctxtcall.idl
 include/wine/windows/custcntl.h
 include/wine/windows/cvconst.h
 include/wine/windows/d3d.h
@@ -260,6 +262,7 @@ include/wine/windows/hlink.idl
 include/wine/windows/htiframe.h
 include/wine/windows/htiframe.idl
 include/wine/windows/htmlhelp.h
+include/wine/windows/http.h
 include/wine/windows/i_cryptasn1tls.h
 include/wine/windows/iads.h
 include/wine/windows/iads.idl
@@ -301,6 +304,7 @@ include/wine/windows/lmstats.h
 include/wine/windows/lmuse.h
 include/wine/windows/lmuseflg.h
 include/wine/windows/lmwksta.h
+include/wine/windows/loadperf.h
 include/wine/windows/lzexpand.h
 include/wine/windows/mapi.h
 include/wine/windows/mapicode.h
@@ -521,6 +525,7 @@ include/wine/windows/winnt.h
 include/wine/windows/winperf.h
 include/wine/windows/winreg.h
 include/wine/windows/winresrc.h
+include/wine/windows/winsafer.h
 include/wine/windows/winscard.h
 include/wine/windows/winsmcrd.h
 include/wine/windows/winsock.h
@@ -572,6 +577,7 @@ lib/wine/avifil32.dll.so
 lib/wine/avifile.dll16
 lib/wine/browseui.dll.so
 lib/wine/cabinet.dll.so
+lib/wine/cacls.exe.so
 lib/wine/capi2032.dll.so
 lib/wine/cards.dll.so
 lib/wine/cfgmgr32.dll.so
@@ -669,6 +675,7 @@ lib/wine/hhctrl.ocx.so
 lib/wine/hid.dll.so
 lib/wine/hlink.dll.so
 lib/wine/hnetcfg.dll.so
+lib/wine/httpapi.dll.so
 lib/wine/iccvid.dll.so
 lib/wine/icinfo.exe.so
 lib/wine/icmp.dll.so
@@ -836,6 +843,7 @@ lib/wine/libws2_32.def
 lib/wine/libwsock32.def
 lib/wine/libwtsapi32.def
 lib/wine/libxinput.def
+lib/wine/loadperf.dll.so
 lib/wine/localspl.dll.so
 lib/wine/localui.dll.so
 lib/wine/lz32.dll.so
@@ -917,8 +925,8 @@ lib/wine/olesvr32.dll.so
 lib/wine/olethk32.dll.so
 lib/wine/oleview.exe.so
 ${PLIST.opengl}lib/wine/opengl32.dll.so
-lib/wine/pidgen.dll.so
 lib/wine/pdh.dll.so
+lib/wine/pidgen.dll.so
 lib/wine/powrprof.dll.so
 lib/wine/printui.dll.so
 lib/wine/progman.exe.so
@@ -988,6 +996,7 @@ lib/wine/twain_32.dll.so
 lib/wine/typelib.dll16
 lib/wine/unicows.dll.so
 lib/wine/uninstaller.exe.so
+lib/wine/updspapi.dll.so
 lib/wine/url.dll.so
 lib/wine/urlmon.dll.so
 lib/wine/user.exe16
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index 1fa19eef9f1..ca6019e60e5 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,19 +1,20 @@
-$NetBSD: distinfo,v 1.5 2009/01/03 20:12:43 adam Exp $
+$NetBSD: distinfo,v 1.6 2009/01/17 10:11:14 adam Exp $
 
-SHA1 (wine-1.1.12.tar.bz2) = ab93dc886d38a67fcb01223de746cf35ce7fafd5
-RMD160 (wine-1.1.12.tar.bz2) = 7591294784ecffb92d67b4734712edcfd87c1f2a
-Size (wine-1.1.12.tar.bz2) = 14794095 bytes
+SHA1 (wine-1.1.13.tar.bz2) = 97e781ffc7dee84ba42b0e0c11ec526c66a2a48b
+RMD160 (wine-1.1.13.tar.bz2) = e0d52905fd61afb8e23027b370891488e80787e0
+Size (wine-1.1.13.tar.bz2) = 14875035 bytes
 SHA1 (patch-aa) = 91e612766286d8bc05d419a3dfd0c1b8a1852a54
 SHA1 (patch-ab) = 90cb810b02d22f8e96389e6c1d4f230c11fb1d8c
 SHA1 (patch-ac) = 81816d4e04cfb13ce407355140d61135a1d494e6
-SHA1 (patch-ad) = 140e86db716cd1b1ab256bff0c7edec9423f9384
+SHA1 (patch-ad) = 706b616d326fd2d4598c85ea9a32ca420d9fe18f
 SHA1 (patch-ae) = 23bd992e3b56e1838e27753d8cc48112d7de7bcb
-SHA1 (patch-af) = 942ebee58342bff6be7da5ca54ed63376a2fd671
+SHA1 (patch-af) = 7bb565dd195a4da5d10494b901a5bab5780e1ca5
 SHA1 (patch-ag) = c4bf5a592ad5cad67ff933c5da418c58d6e1367a
+SHA1 (patch-ah) = c3a71cf650b88dacbfe2f1ca6b3c279909fc5821
 SHA1 (patch-ai) = 54453ed21f52d1da6a7f89bc437f7b318db5058f
 SHA1 (patch-aj) = fa9d3baad8d3b895edc6275c2b6da23daa941a09
 SHA1 (patch-ak) = ff41f617d2ae7bbff57af52dda85647bc4fba354
-SHA1 (patch-ba) = 709816fa039bded228590031bde5c2077eb6f7be
+SHA1 (patch-ba) = dfb6462898222ba528ba57f23643daa74b54d104
 SHA1 (patch-bb) = 77cad41a7e8e34f12243e53f6c1cec998bedefda
 SHA1 (patch-bc) = bf8b1f4aed78de9326824e227df7831e5c8b4dc3
-SHA1 (patch-ca) = 1383c03cc83cefe6099b58340db2bc468c7524bb
+SHA1 (patch-ca) = 90df667407765c473f1331ec8113088fdddc58e5
diff --git a/emulators/wine-devel/patches/patch-ad b/emulators/wine-devel/patches/patch-ad
index 9906ccbd629..f5b713609cc 100644
--- a/emulators/wine-devel/patches/patch-ad
+++ b/emulators/wine-devel/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $
+$NetBSD: patch-ad,v 1.2 2009/01/17 10:11:14 adam Exp $
 
---- dlls/iphlpapi/ipstats.c.orig	2008-07-11 17:55:55.000000000 +0200
+--- dlls/iphlpapi/ipstats.c.orig	2009-01-16 17:28:07.000000000 +0100
 +++ dlls/iphlpapi/ipstats.c
 @@ -28,6 +28,10 @@
  #include <stdlib.h>
@@ -13,7 +13,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $
  #ifdef HAVE_ALIAS_H
  #include <alias.h>
  #endif
-@@ -463,7 +467,7 @@ DWORD getICMPStats(MIB_ICMP *stats)
+@@ -467,7 +471,7 @@ DWORD getICMPStats(MIB_ICMP *stats)
  
  DWORD getIPStats(PMIB_IPSTATS stats)
  {
@@ -22,7 +22,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $
    int mib[] = {CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS};
  #define MIB_LEN (sizeof(mib) / sizeof(mib[0]))
    int ip_ttl, ip_forwarding;
-@@ -632,7 +636,7 @@ DWORD getIPStats(PMIB_IPSTATS stats)
+@@ -636,7 +640,7 @@ DWORD getIPStats(PMIB_IPSTATS stats)
  
  DWORD getTCPStats(MIB_TCPSTATS *stats)
  {
@@ -31,7 +31,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $
  #ifndef TCPTV_MIN  /* got removed in Mac OS X for some reason */
  #define TCPTV_MIN 2
  #define TCPTV_REXMTMAX 128
-@@ -769,7 +773,7 @@ DWORD getTCPStats(MIB_TCPSTATS *stats)
+@@ -773,7 +777,7 @@ DWORD getTCPStats(MIB_TCPSTATS *stats)
  
  DWORD getUDPStats(MIB_UDPSTATS *stats)
  {
@@ -40,7 +40,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $
    int mib[] = {CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS};
  #define MIB_LEN (sizeof(mib) / sizeof(mib[0]))
    struct udpstat udp_stat;
-@@ -1011,7 +1015,11 @@ DWORD getNumRoutes(void)
+@@ -1015,7 +1019,11 @@ DWORD getNumRoutes(void)
  
        /* Ignore all entries except for gateway routes which aren't
           multicast */
@@ -52,7 +52,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $
           continue;
  
        RouteCount++;
-@@ -1087,8 +1095,12 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE 
+@@ -1091,8 +1099,12 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE 
  
            /* Ignore all entries except for gateway routes which aren't
               multicast */
@@ -65,7 +65,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $
               continue;
  
            memset (&table->table[table->dwNumEntries], 0,
-@@ -1249,7 +1261,7 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE 
+@@ -1253,7 +1265,7 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE 
  
  DWORD getNumArpEntries(void)
  {
@@ -74,7 +74,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $
    int mib[] = {CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_FLAGS, RTF_LLINFO};
  #define MIB_LEN (sizeof(mib) / sizeof(mib[0]))
    DWORD arpEntries = 0;
-@@ -1305,7 +1317,7 @@ DWORD getArpTable(PMIB_IPNETTABLE *ppIpN
+@@ -1309,7 +1321,7 @@ DWORD getArpTable(PMIB_IPNETTABLE *ppIpN
      if (numEntries > 1)
        size += (numEntries - 1) * sizeof(MIB_IPNETROW);
      table = HeapAlloc(heap, flags, size);
diff --git a/emulators/wine-devel/patches/patch-af b/emulators/wine-devel/patches/patch-af
index a8665662a57..a00ad8aa7b9 100644
--- a/emulators/wine-devel/patches/patch-af
+++ b/emulators/wine-devel/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.3 2008/12/07 00:43:03 adam Exp $
+$NetBSD: patch-af,v 1.4 2009/01/17 10:11:14 adam Exp $
 
---- dlls/ntdll/signal_i386.c.orig	2008-12-05 17:57:45.000000000 +0100
+--- dlls/ntdll/signal_i386.c.orig	2009-01-16 17:28:07.000000000 +0100
 +++ dlls/ntdll/signal_i386.c
 @@ -199,7 +199,7 @@ typedef struct trapframe SIGCONTEXT;
  
@@ -65,7 +65,7 @@ $NetBSD: patch-af,v 1.3 2008/12/07 00:43:03 adam Exp $
  #else
      TRAP_x86_DIVIDE     = 0,   /* Division by zero exception */
      TRAP_x86_TRCTRAP    = 1,   /* Single-step exception */
-@@ -1602,7 +1640,11 @@ void signal_init_process(void)
+@@ -1601,7 +1639,11 @@ void signal_init_process(void)
      struct sigaction sig_act;
  
      sig_act.sa_mask = server_block_set;
diff --git a/emulators/wine-devel/patches/patch-ah b/emulators/wine-devel/patches/patch-ah
new file mode 100644
index 00000000000..c4b1b65a3a7
--- /dev/null
+++ b/emulators/wine-devel/patches/patch-ah
@@ -0,0 +1,64 @@
+$NetBSD: patch-ah,v 1.3 2009/01/17 10:11:14 adam Exp $
+
+--- dlls/kernel32/cpu.c.orig	2009-01-17 08:46:08.000000000 +0100
++++ dlls/kernel32/cpu.c
+@@ -551,7 +551,7 @@ VOID WINAPI GetSystemInfo(
+              size_t val_len;
+              char model[256];
+              char *cpuclass;
+-             FILE *f = fopen ("/var/run/dmesg.boot", "r");
++             //FILE *f = fopen ("/var/run/dmesg.boot", "r");
+ 
+              /* first deduce as much as possible from the sysctls */
+              mib[0] = CTL_MACHDEP;
+@@ -570,7 +570,7 @@ VOID WINAPI GetSystemInfo(
+ #endif
+ #ifdef CPU_SSE2
+              mib[1] = CPU_SSE2;  /* this should imply MMX */
+-             value[1] = sizeof(value);
++             val_len = sizeof(value);
+              if (sysctl(mib, 2, &value, &val_len, NULL, 0) >= 0)
+                  if (value) PF[PF_MMX_INSTRUCTIONS_AVAILABLE] = TRUE;
+ #endif
+@@ -579,7 +579,7 @@ VOID WINAPI GetSystemInfo(
+              val_len = sizeof(value);
+              if (sysctl(mib, 2, &value, &val_len, NULL, 0) >= 0)
+                  if (value > cachedsi.dwNumberOfProcessors)
+-                    cachedsi.dwNumberOfProcessors = value[0];
++                    cachedsi.dwNumberOfProcessors = value;
+              mib[1] = HW_MODEL;
+              val_len = sizeof(model)-1;
+              if (sysctl(mib, 2, model, &val_len, NULL, 0) >= 0) {
+@@ -612,19 +612,20 @@ VOID WINAPI GetSystemInfo(
+                 additional information such as CX8, MMX and TSC
+                 (however this information should be considered less
+                  reliable than that from the sysctl calls) */
++#if 0
+              if (f != NULL)
+              {
+ 	         while (fgets(model, 255, f) != NULL) {
+                         if (sscanf(model,"cpu%d: features %x<", value, value+1) == 2) {
+                             /* we could scan the string but it is easier
+                                to test the bits directly */
+-                            if (value[1] & 0x1)
++                            if (value & 0x1)
+                                 PF[PF_FLOATING_POINT_EMULATED] = TRUE;
+-                            if (value[1] & 0x10)
++                            if (value & 0x10)
+                                 PF[PF_RDTSC_INSTRUCTION_AVAILABLE] = TRUE;
+-                            if (value[1] & 0x100)
++                            if (value & 0x100)
+                                 PF[PF_COMPARE_EXCHANGE_DOUBLE] = TRUE;
+-                            if (value[1] & 0x800000)
++                            if (value & 0x800000)
+                                 PF[PF_MMX_INSTRUCTIONS_AVAILABLE] = TRUE;
+ 
+                             break;
+@@ -632,6 +633,7 @@ VOID WINAPI GetSystemInfo(
+                  }
+                  fclose(f);
+              }
++#endif
+ 
+         }
+ #elif defined(__FreeBSD__)
diff --git a/emulators/wine-devel/patches/patch-ba b/emulators/wine-devel/patches/patch-ba
index b9c10fc4a6a..cdcdc27e165 100644
--- a/emulators/wine-devel/patches/patch-ba
+++ b/emulators/wine-devel/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.4 2009/01/03 20:12:44 adam Exp $
+$NetBSD: patch-ba,v 1.5 2009/01/17 10:11:14 adam Exp $
 
---- configure.orig	2009-01-02 17:24:09.000000000 +0100
+--- configure.orig	2009-01-16 17:28:07.000000000 +0100
 +++ configure
-@@ -17708,6 +17708,11 @@ MAIN_BINARY="wine-pthread"
+@@ -17923,6 +17923,11 @@ MAIN_BINARY="wine-pthread"
  
          EXTRA_BINARIES="wine-pthread"
   ;;
diff --git a/emulators/wine-devel/patches/patch-ca b/emulators/wine-devel/patches/patch-ca
index 7b2919b9420..63f8c4f0c27 100644
--- a/emulators/wine-devel/patches/patch-ca
+++ b/emulators/wine-devel/patches/patch-ca
@@ -1,8 +1,8 @@
-$NetBSD: patch-ca,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $
+$NetBSD: patch-ca,v 1.2 2009/01/17 10:11:14 adam Exp $
 
---- dlls/winex11.drv/settings.c.orig	2008-06-27 11:42:50.000000000 -0400
-+++ dlls/winex11.drv/settings.c	2008-06-27 11:43:40.000000000 -0400
-@@ -431,6 +431,16 @@
+--- dlls/winex11.drv/settings.c.orig	2009-01-16 17:28:07.000000000 +0100
++++ dlls/winex11.drv/settings.c
+@@ -432,6 +432,16 @@ LONG CDECL X11DRV_ChangeDisplaySettingsE
          return DISP_CHANGE_SUCCESSFUL;
      }