Changes 20040408:

* DOS devices and drives are now configured through symlinks.
* Many shell32 improvements.
* New task manager merged from ReactOS.
* First version of wineprefixcreate tool for initial setup.
* Lots of bug fixes.

6 files changed, 42 insertions, 16 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 74cd13e5892..34f3d5ba04e 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.70 2004/03/12 11:13:48 adam Exp $
+# $NetBSD: Makefile,v 1.71 2004/04/09 12:44:22 adam Exp $
 #
 
-DISTNAME=	Wine-20040309
+DISTNAME=	Wine-20040408
 PKGNAME=	${DISTNAME:S/W/w/}
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.ibiblio.org/pub/Linux/ALPHA/wine/development/ \
diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST
index 7998871e1d5..faf90ff6a98 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2004/03/12 11:13:48 adam Exp $
+@comment $NetBSD: PLIST,v 1.25 2004/04/09 12:44:22 adam Exp $
 bin/function_grep.pl
 bin/notepad
 bin/progman
@@ -24,6 +24,7 @@ bin/winelauncher
 bin/winemaker
 bin/winemine
 bin/winepath
+bin/wineprefixcreate
 bin/wineserver
 bin/wineshelllink
 bin/winhelp
@@ -41,6 +42,7 @@ include/wine/msvcrt/dos.h
 include/wine/msvcrt/eh.h
 include/wine/msvcrt/errno.h
 include/wine/msvcrt/fcntl.h
+include/wine/msvcrt/float.h
 include/wine/msvcrt/io.h
 include/wine/msvcrt/limits.h
 include/wine/msvcrt/locale.h
@@ -89,6 +91,7 @@ include/wine/windows/compobj.h
 include/wine/windows/control.h
 include/wine/windows/cpl.h
 include/wine/windows/custcntl.h
+include/wine/windows/cvconst.h
 include/wine/windows/d3d.h
 include/wine/windows/d3d8.h
 include/wine/windows/d3d8caps.h
@@ -190,6 +193,7 @@ include/wine/windows/mssip.h
 include/wine/windows/mswsock.h
 include/wine/windows/nb30.h
 include/wine/windows/netspi.h
+include/wine/windows/npapi.h
 include/wine/windows/nspapi.h
 include/wine/windows/ntddcdrm.h
 include/wine/windows/ntddscsi.h
@@ -308,6 +312,7 @@ lib/wine/aviinfo.exe.so
 lib/wine/aviplay.exe.so
 lib/wine/cabinet.dll.so
 lib/wine/capi2032.dll.so
+lib/wine/cards.dll.so
 lib/wine/cfgmgr32.dll.so
 lib/wine/clock.exe.so
 lib/wine/comcat.dll.so
@@ -326,6 +331,7 @@ lib/wine/d3d8.dll.so
 lib/wine/d3d9.dll.so
 lib/wine/d3dim.dll.so
 lib/wine/d3dx8.dll.so
+lib/wine/dbghelp.dll.so
 lib/wine/dciman32.dll.so
 lib/wine/ddeml.dll.so
 lib/wine/ddraw.dll.so
@@ -345,6 +351,7 @@ lib/wine/dmusic.dll.so
 lib/wine/dmusic32.dll.so
 lib/wine/dplay.dll.so
 lib/wine/dplayx.dll.so
+lib/wine/dpnet.dll.so
 lib/wine/dpnhpast.dll.so
 lib/wine/dsound.dll.so
 lib/wine/dswave.dll.so
@@ -372,6 +379,7 @@ lib/wine/libavicap32.def
 lib/wine/libavifil32.def
 lib/wine/libcabinet.def
 lib/wine/libcapi2032.def
+lib/wine/libcards.def
 lib/wine/libcfgmgr32.def
 lib/wine/libcomcat.def
 lib/wine/libcomctl32.def
@@ -383,6 +391,7 @@ lib/wine/libd3d8.def
 lib/wine/libd3d9.def
 lib/wine/libd3dim.def
 lib/wine/libd3dx8.def
+lib/wine/libdbghelp.def
 lib/wine/libdciman32.def
 lib/wine/libddraw.def
 lib/wine/libdevenum.def
@@ -399,6 +408,7 @@ lib/wine/libdmusic.def
 lib/wine/libdmusic32.def
 lib/wine/libdplay.def
 lib/wine/libdplayx.def
+lib/wine/libdpnet.def
 lib/wine/libdpnhpast.def
 lib/wine/libdsound.def
 lib/wine/libdswave.def
@@ -468,6 +478,7 @@ lib/wine/liburlmon.def
 lib/wine/libuser32.def
 lib/wine/libuuid.a
 lib/wine/libuxtheme.def
+lib/wine/libvdmdbg.def
 lib/wine/libversion.def
 lib/wine/libw32skrnl.def
 lib/wine/libwined3d.def
@@ -569,6 +580,7 @@ lib/wine/storage.dll.so
 lib/wine/stress.dll.so
 lib/wine/system.drv.so
 lib/wine/tapi32.dll.so
+lib/wine/taskmgr.exe.so
 lib/wine/toolhelp.dll.so
 lib/wine/ttydrv.dll.so
 lib/wine/twain_32.dll.so
@@ -581,6 +593,7 @@ lib/wine/user.exe.so
 lib/wine/user32.dll.so
 lib/wine/uxtheme.dll.so
 lib/wine/vdhcp.vxd.so
+lib/wine/vdmdbg.dll.so
 lib/wine/ver.dll.so
 lib/wine/version.dll.so
 lib/wine/vmm.vxd.so
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index ab4c2f46788..2f6971c0910 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.23 2004/03/12 11:13:48 adam Exp $
+$NetBSD: distinfo,v 1.24 2004/04/09 12:44:22 adam Exp $
 
-SHA1 (Wine-20040309.tar.gz) = a6125bc2127898f5add300a017698d2ced52299a
-Size (Wine-20040309.tar.gz) = 10060696 bytes
-SHA1 (patch-aa) = 5bb5b286cb43794e945c637afe03012a339db946
+SHA1 (Wine-20040408.tar.gz) = d15664ffe1dda11e224cab29d98ec8521ac4ca6d
+Size (Wine-20040408.tar.gz) = 10354583 bytes
+SHA1 (patch-aa) = 1e08fd0443c7c34271aab16b8434457105f93588
 SHA1 (patch-ab) = 313180ea924c224ebecad0b8764584230497f8ed
-SHA1 (patch-ac) = 7f63d8e6b763b8d8ec451fa28ad2acafa440b77a
+SHA1 (patch-ac) = f47c96b54560c1f68ea09461819b35e87cee5662
 SHA1 (patch-ad) = 28c15181eab48f1e82d10046b77fa1ebac3c4ef6
 SHA1 (patch-ae) = 691113bab9f24bcbabd786e7f1ff2fe0933d721f
+SHA1 (patch-af) = 67612117fcd87d54619a8b521209e182cd0c0065
diff --git a/emulators/wine/patches/patch-aa b/emulators/wine/patches/patch-aa
index f0d97af04d0..92f91d69749 100644
--- a/emulators/wine/patches/patch-aa
+++ b/emulators/wine/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.12 2004/03/12 11:13:48 adam Exp $
+$NetBSD: patch-aa,v 1.13 2004/04/09 12:44:22 adam Exp $
 
---- Make.rules.in.orig	2004-03-03 20:30:46.000000000 +0000
+--- Make.rules.in.orig	2004-03-24 03:34:01.000000000 +0000
 +++ Make.rules.in
-@@ -105,7 +105,7 @@ conf_manext     = 5
+@@ -103,7 +103,7 @@ conf_manext     = 5
  CLEAN_FILES     = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
-                   *.flc *.spec.c *.spec.def *.dbg.c y.tab.c y.tab.h @LEX_OUTPUT_ROOT@.c core
+                   *.flc *.spec.c *.spec.def *.dbg.c *.tab.c *.tab.h @LEX_OUTPUT_ROOT@.c core
  
 -OBJS = $(C_SRCS:.c=.o) $(EXTRA_OBJS)
 +OBJS = $(EXTRA_OBJS) $(C_SRCS:.c=.o)
diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac
index 324db20f9a3..4f1bedf4bbf 100644
--- a/emulators/wine/patches/patch-ac
+++ b/emulators/wine/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.13 2004/03/12 11:13:48 adam Exp $
+$NetBSD: patch-ac,v 1.14 2004/04/09 12:44:22 adam Exp $
 
---- configure.orig	2004-03-10 03:37:58.000000000 +0000
+--- configure.orig	2004-04-08 22:38:17.000000000 +0000
 +++ configure
-@@ -17894,7 +17894,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -17850,7 +17850,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.13 2004/03/12 11:13:48 adam Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -19564,7 +19564,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -19520,7 +19520,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
diff --git a/emulators/wine/patches/patch-af b/emulators/wine/patches/patch-af
new file mode 100644
index 00000000000..a38a6e8b4a8
--- /dev/null
+++ b/emulators/wine/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.6 2004/04/09 12:44:22 adam Exp $
+
+--- programs/winetest/util.c.orig	2004-04-09 14:30:40.000000000 +0000
++++ programs/winetest/util.c
+@@ -19,7 +19,6 @@
+  *
+  */
+ #include <windows.h>
+-#include <unistd.h>
+ #include <errno.h>
+ 
+ #include "winetest.h"