Changes 0.9.40:

- Many MSHTML improvements
- A few more sound fixes
- Many Direct3D fixes
- Lots of bug fixes

5 files changed, 23 insertions, 15 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index aa51eaec827..d94d0e104cc 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.133 2007/06/16 07:42:36 adam Exp $
+# $NetBSD: Makefile,v 1.134 2007/07/01 10:04:26 adam Exp $
 
-DISTNAME=	wine-0.9.39
+DISTNAME=	wine-0.9.40
 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 b9da22e2517..f7c99f1d3b6 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.63 2007/06/16 07:42:37 adam Exp $
+@comment $NetBSD: PLIST,v 1.64 2007/07/01 10:04:26 adam Exp $
 bin/bin2res
 bin/fnt2bdf
 bin/function_grep.pl
@@ -323,6 +323,8 @@ include/wine/windows/oleidl.h
 include/wine/windows/oleidl.idl
 include/wine/windows/optary.h
 include/wine/windows/optary.idl
+include/wine/windows/pdh.h
+include/wine/windows/pdhmsg.h
 include/wine/windows/pktdef.h
 include/wine/windows/poppack.h
 include/wine/windows/powrprof.h
@@ -424,6 +426,7 @@ include/wine/windows/winnetwk.h
 include/wine/windows/winnls.h
 include/wine/windows/winnls32.h
 include/wine/windows/winnt.h
+include/wine/windows/winperf.h
 include/wine/windows/winreg.h
 include/wine/windows/winres.h
 include/wine/windows/winresrc.h
@@ -527,6 +530,7 @@ lib/wine/dpnet.dll.so
 lib/wine/dpnhpast.dll.so
 lib/wine/dsound.dll.so
 lib/wine/dswave.dll.so
+lib/wine/dwmapi.dll.so
 lib/wine/dxdiagn.dll.so
 lib/wine/eject.exe.so
 lib/wine/expand.exe.so
@@ -541,6 +545,7 @@ lib/wine/hh.exe.so
 lib/wine/hhctrl.ocx.so
 lib/wine/hid.dll.so
 lib/wine/hlink.dll.so
+lib/wine/hnetcfg.dll.so
 lib/wine/iccvid.dll.so
 lib/wine/icinfo.exe.so
 lib/wine/icmp.dll.so
@@ -593,6 +598,7 @@ lib/wine/libdplay.def
 lib/wine/libdplayx.def
 lib/wine/libdpnet.def
 lib/wine/libdsound.def
+lib/wine/libdwmapi.def
 lib/wine/libdxerr8.a
 lib/wine/libdxerr9.a
 lib/wine/libdxguid.a
@@ -737,6 +743,7 @@ lib/wine/notepad.exe.so
 lib/wine/ntdll.dll.so
 lib/wine/ntdsapi.dll.so
 lib/wine/ntoskrnl.exe.so
+lib/wine/ntprint.dll.so
 lib/wine/objsel.dll.so
 lib/wine/odbc32.dll.so
 lib/wine/odbccp32.dll.so
@@ -759,6 +766,7 @@ ${WINE_OPENGL}lib/wine/opengl32.dll.so
 lib/wine/oleview.exe.so
 lib/wine/pdh.dll.so
 lib/wine/powrprof.dll.so
+lib/wine/printui.dll.so
 lib/wine/progman.exe.so
 lib/wine/psapi.dll.so
 lib/wine/pstorec.dll.so
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 409328479d0..36f04cc3f97 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.69 2007/06/16 07:42:37 adam Exp $
+$NetBSD: distinfo,v 1.70 2007/07/01 10:04:26 adam Exp $
 
-SHA1 (wine-0.9.39.tar.bz2) = 17a39c3d1ca1bbca6737530801303ad06f0db29b
-RMD160 (wine-0.9.39.tar.bz2) = 228677cc0ae44bb0dc99e13f0c32082837fa7fea
-Size (wine-0.9.39.tar.bz2) = 12093172 bytes
-SHA1 (patch-aa) = 13006794c5c93ab377880f8eb8b8b875bf5ceafe
+SHA1 (wine-0.9.40.tar.bz2) = e4b6b04e135d11b1158a82a27a5c3dc540f6302c
+RMD160 (wine-0.9.40.tar.bz2) = f04365a737c9056fa1f6dcf9b268f33658a424ae
+Size (wine-0.9.40.tar.bz2) = 12091160 bytes
+SHA1 (patch-aa) = 3b84f2f7693b79ed5de432a6ab8faf4ec258f57a
 SHA1 (patch-ab) = 66c1f1ec98674d15c7a72e8ac16105c28aa25e91
 SHA1 (patch-ad) = 21b66f430149cae8319eb80a30cf8ad890d1b1ef
 SHA1 (patch-ae) = a4f39995baf5511ddc70b4e1c006a159a86eeb22
@@ -11,4 +11,4 @@ SHA1 (patch-af) = ff365b8c6f60adfe0cc47113db53de1dd27bb064
 SHA1 (patch-ag) = c4bf5a592ad5cad67ff933c5da418c58d6e1367a
 SHA1 (patch-ai) = a334ee48b949f9f5d4356beed3b422ee032619c2
 SHA1 (patch-aj) = fa9d3baad8d3b895edc6275c2b6da23daa941a09
-SHA1 (patch-ak) = c240101fe1d1c7f981cc24e41168b0a14a1bc1a0
+SHA1 (patch-ak) = 5f9836d5b6c957a2a6828b1979c1beeb4e900b31
diff --git a/emulators/wine/patches/patch-aa b/emulators/wine/patches/patch-aa
index e5a15e3b298..49360e39ad4 100644
--- a/emulators/wine/patches/patch-aa
+++ b/emulators/wine/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.27 2007/03/17 23:07:58 adam Exp $
+$NetBSD: patch-aa,v 1.28 2007/07/01 10:04:26 adam Exp $
 
---- Make.rules.in.orig	2007-03-16 17:40:46.000000000 +0100
+--- Make.rules.in.orig	2007-06-29 19:36:20.000000000 +0200
 +++ Make.rules.in
-@@ -118,7 +118,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-ak b/emulators/wine/patches/patch-ak
index 13e494f2519..d85560a0598 100644
--- a/emulators/wine/patches/patch-ak
+++ b/emulators/wine/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.14 2007/06/16 07:42:37 adam Exp $
+$NetBSD: patch-ak,v 1.15 2007/07/01 10:04:27 adam Exp $
 
---- dlls/ntdll/file.c.orig	2007-06-15 16:51:04.000000000 +0200
+--- dlls/ntdll/file.c.orig	2007-06-29 19:36:20.000000000 +0200
 +++ dlls/ntdll/file.c
-@@ -1855,6 +1855,35 @@ static NTSTATUS get_device_info( int fd,
+@@ -1843,6 +1843,35 @@ static NTSTATUS get_device_info( int fd,
              info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM;
              break;
          }