Changes 0.9.39:

- Many MSHTML improvements.
- Several improvements to the sound support.
- A number of Winsock fixes.
- Several new supported constructs in the IDL compiler.
- Many Direct3D threading fixes.
- Lots of bug fixes.

4 files changed, 35 insertions, 11 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 61db4abde80..aa51eaec827 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.132 2007/05/12 20:40:43 adam Exp $
+# $NetBSD: Makefile,v 1.133 2007/06/16 07:42:36 adam Exp $
 
-DISTNAME=	wine-0.9.37
+DISTNAME=	wine-0.9.39
 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 02c930da55f..b9da22e2517 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.62 2007/05/12 20:40:43 adam Exp $
+@comment $NetBSD: PLIST,v 1.63 2007/06/16 07:42:37 adam Exp $
 bin/bin2res
 bin/fnt2bdf
 bin/function_grep.pl
@@ -192,6 +192,14 @@ include/wine/windows/exdisp.idl
 include/wine/windows/exdispid.h
 include/wine/windows/fci.h
 include/wine/windows/fdi.h
+include/wine/windows/gdiplus.h
+include/wine/windows/gdiplusenums.h
+include/wine/windows/gdiplusflat.h
+include/wine/windows/gdiplusgpstubs.h
+include/wine/windows/gdiplusinit.h
+include/wine/windows/gdiplusmem.h
+include/wine/windows/gdipluspixelformats.h
+include/wine/windows/gdiplustypes.h
 include/wine/windows/guiddef.h
 include/wine/windows/hlguids.h
 include/wine/windows/hlink.h
@@ -201,6 +209,8 @@ include/wine/windows/htiframe.idl
 include/wine/windows/htmlhelp.h
 include/wine/windows/iads.h
 include/wine/windows/iads.idl
+include/wine/windows/icftypes.h
+include/wine/windows/icftypes.idl
 include/wine/windows/icm.h
 include/wine/windows/icmpapi.h
 include/wine/windows/idispids.h
@@ -277,6 +287,8 @@ include/wine/windows/msxml2did.h
 include/wine/windows/msxmldid.h
 include/wine/windows/nb30.h
 include/wine/windows/ndrtypes.h
+include/wine/windows/netfw.h
+include/wine/windows/netfw.idl
 include/wine/windows/npapi.h
 include/wine/windows/nspapi.h
 include/wine/windows/ntddcdrm.h
@@ -338,6 +350,7 @@ include/wine/windows/rpcdcep.h
 include/wine/windows/rpcndr.h
 include/wine/windows/rpcnterr.h
 include/wine/windows/rpcproxy.h
+include/wine/windows/scarderr.h
 include/wine/windows/schannel.h
 include/wine/windows/schemadef.h
 include/wine/windows/schnlsp.h
@@ -414,6 +427,8 @@ include/wine/windows/winnt.h
 include/wine/windows/winreg.h
 include/wine/windows/winres.h
 include/wine/windows/winresrc.h
+include/wine/windows/winscard.h
+include/wine/windows/winsmcrd.h
 include/wine/windows/winsock.h
 include/wine/windows/winsock2.h
 include/wine/windows/winspool.h
@@ -518,8 +533,10 @@ lib/wine/expand.exe.so
 lib/wine/explorer.exe.so
 lib/wine/gdi.exe16
 lib/wine/gdi32.dll.so
+lib/wine/gdiplus.dll.so
 ${WINE_OPENGL}lib/wine/glu32.dll.so
 lib/wine/gphoto2.ds.so
+lib/wine/hal.dll.so
 lib/wine/hh.exe.so
 lib/wine/hhctrl.ocx.so
 lib/wine/hid.dll.so
@@ -580,6 +597,7 @@ lib/wine/libdxerr8.a
 lib/wine/libdxerr9.a
 lib/wine/libdxguid.a
 lib/wine/libgdi32.def
+lib/wine/libgdiplus.def
 ${WINE_OPENGL}lib/wine/libglu32.def
 lib/wine/libhid.def
 lib/wine/libhlink.def
@@ -610,6 +628,7 @@ lib/wine/libnetapi32.def
 lib/wine/libnewdev.def
 lib/wine/libntdll.def
 lib/wine/libntdsapi.def
+lib/wine/libntoskrnl.exe.def
 lib/wine/libodbc32.def
 lib/wine/libodbccp32.def
 lib/wine/libole32.def
@@ -658,6 +677,7 @@ lib/wine/libwinedos.def
 lib/wine/libwininet.def
 lib/wine/libwinmm.def
 lib/wine/libwinnls32.def
+lib/wine/libwinscard.def
 lib/wine/libwinspool.def
 lib/wine/libwintab32.def
 lib/wine/libwintrust.def
@@ -716,6 +736,7 @@ lib/wine/newdev.dll.so
 lib/wine/notepad.exe.so
 lib/wine/ntdll.dll.so
 lib/wine/ntdsapi.dll.so
+lib/wine/ntoskrnl.exe.so
 lib/wine/objsel.dll.so
 lib/wine/odbc32.dll.so
 lib/wine/odbccp32.dll.so
@@ -736,6 +757,7 @@ lib/wine/olesvr.dll16
 lib/wine/olesvr32.dll.so
 ${WINE_OPENGL}lib/wine/opengl32.dll.so
 lib/wine/oleview.exe.so
+lib/wine/pdh.dll.so
 lib/wine/powrprof.dll.so
 lib/wine/progman.exe.so
 lib/wine/psapi.dll.so
@@ -823,6 +845,7 @@ lib/wine/wineconsole.exe.so
 lib/wine/winecoreaudio.drv.so
 ${WINE_OPENGL}lib/wine/wined3d.dll.so
 lib/wine/winedbg.exe.so
+lib/wine/winedevice.exe.so
 lib/wine/winedos.dll.so
 lib/wine/wineesd.drv.so
 lib/wine/winefile.exe.so
@@ -845,6 +868,7 @@ lib/wine/wininet.dll.so
 lib/wine/winmm.dll.so
 lib/wine/winnls.dll16
 lib/wine/winnls32.dll.so
+lib/wine/winscard.dll.so
 lib/wine/winsock.dll16
 lib/wine/winspool.drv.so
 lib/wine/wintab.dll16
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 471af6b8a7f..409328479d0 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.68 2007/05/12 20:40:43 adam Exp $
+$NetBSD: distinfo,v 1.69 2007/06/16 07:42:37 adam Exp $
 
-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 (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 (patch-ab) = 66c1f1ec98674d15c7a72e8ac16105c28aa25e91
 SHA1 (patch-ad) = 21b66f430149cae8319eb80a30cf8ad890d1b1ef
@@ -11,4 +11,4 @@ SHA1 (patch-af) = ff365b8c6f60adfe0cc47113db53de1dd27bb064
 SHA1 (patch-ag) = c4bf5a592ad5cad67ff933c5da418c58d6e1367a
 SHA1 (patch-ai) = a334ee48b949f9f5d4356beed3b422ee032619c2
 SHA1 (patch-aj) = fa9d3baad8d3b895edc6275c2b6da23daa941a09
-SHA1 (patch-ak) = 638e0fa0fc3bb7246caf1d879e813ab09c645789
+SHA1 (patch-ak) = c240101fe1d1c7f981cc24e41168b0a14a1bc1a0
diff --git a/emulators/wine/patches/patch-ak b/emulators/wine/patches/patch-ak
index b3dc0b10e1a..13e494f2519 100644
--- a/emulators/wine/patches/patch-ak
+++ b/emulators/wine/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.13 2007/05/12 20:40:43 adam Exp $
+$NetBSD: patch-ak,v 1.14 2007/06/16 07:42:37 adam Exp $
 
---- dlls/ntdll/file.c.orig	2007-05-11 19:35:02.000000000 +0200
+--- dlls/ntdll/file.c.orig	2007-06-15 16:51:04.000000000 +0200
 +++ dlls/ntdll/file.c
-@@ -1833,6 +1833,35 @@ static NTSTATUS get_device_info( int fd,
+@@ -1855,6 +1855,35 @@ static NTSTATUS get_device_info( int fd,
              info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM;
              break;
          }