Update to the 2002.12.19 snapshot of Wine. The structure in $PREFIX/lib

and $PREFIX/include has completely changed.

Approved by:	obrien (mentor)

12 files changed, 600 insertions, 492 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 4029dee376dd..b7a8b1ca82a3 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	2002.10.31
+PORTVERSION=	2002.12.19
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index c8fced633e39..38af0d97df5f 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1 +1 @@
-MD5 (Wine-20021031.tar.gz) = 98079fb3deb111b8fddc777a047d1fe3
+MD5 (Wine-20021219.tar.gz) = 0091d9173290430a98f7d772b9deb06f
diff --git a/emulators/wine-devel/files/patch-context_i386 b/emulators/wine-devel/files/patch-context_i386
deleted file mode 100644
index 10b35c7c7f52..000000000000
--- a/emulators/wine-devel/files/patch-context_i386
+++ /dev/null
@@ -1,51 +0,0 @@
---- server/context_i386.c.orig	Wed Aug 14 13:59:03 2002
-+++ server/context_i386.c	Thu Nov  7 14:54:01 2002
-@@ -371,14 +371,15 @@
-     {
- #ifdef PTRACE_GETDBREGS
- 	struct dbreg dbregs;
--        if (ptrace( PTRACE_GETDBREGS, pid, (caddr_t) &dbregs, 0 ) == -1)
-+	struct dbreg *dbregs_ptr = &dbregs; /* ptr to workaround buggy macro */
-+        if (ptrace( PTRACE_GETDBREGS, pid, (caddr_t) dbregs_ptr, 0 ) == -1)
- 		goto error;
--	context->Dr0 = dbregs.dr0;
--	context->Dr1 = dbregs.dr1;
--	context->Dr2 = dbregs.dr2;
--	context->Dr3 = dbregs.dr3;
--	context->Dr6 = dbregs.dr6;
--	context->Dr7 = dbregs.dr7;
-+	context->Dr0 = DBREG_DRX(dbregs_ptr, 0);
-+	context->Dr1 = DBREG_DRX(dbregs_ptr, 1);
-+	context->Dr2 = DBREG_DRX(dbregs_ptr, 2);
-+	context->Dr3 = DBREG_DRX(dbregs_ptr, 3);
-+	context->Dr6 = DBREG_DRX(dbregs_ptr, 6);
-+	context->Dr7 = DBREG_DRX(dbregs_ptr, 7);
- #endif
-     }
-     if (flags & CONTEXT_FLOATING_POINT)
-@@ -437,15 +438,16 @@
-     {
- #ifdef PTRACE_SETDBREGS
- 	struct dbreg dbregs;
--	dbregs.dr0 = context->Dr0;
--	dbregs.dr1 = context->Dr1;
--	dbregs.dr2 = context->Dr2;
--	dbregs.dr3 = context->Dr3;
--	dbregs.dr4 = 0;
--	dbregs.dr5 = 0;
--	dbregs.dr6 = context->Dr6;
--	dbregs.dr7 = context->Dr7;
--        if (ptrace( PTRACE_SETDBREGS, pid, (caddr_t) &dbregs, 0 ) == -1)
-+	struct dbreg *dbregs_ptr = &dbregs; /* ptr to workaround buggy macro */
-+	DBREG_DRX(dbregs_ptr, 0) = context->Dr0;
-+	DBREG_DRX(dbregs_ptr, 1) = context->Dr1;
-+	DBREG_DRX(dbregs_ptr, 2) = context->Dr2;
-+	DBREG_DRX(dbregs_ptr, 3) = context->Dr3;
-+	DBREG_DRX(dbregs_ptr, 4) = 0;
-+	DBREG_DRX(dbregs_ptr, 5) = 0;
-+	DBREG_DRX(dbregs_ptr, 6) = context->Dr6;
-+	DBREG_DRX(dbregs_ptr, 7) = context->Dr7;
-+        if (ptrace( PTRACE_SETDBREGS, pid, (caddr_t) dbregs_ptr, 0 ) == -1)
- 		goto error;
- #endif
-     }
diff --git a/emulators/wine-devel/files/patch-dlls-cabinet b/emulators/wine-devel/files/patch-dlls-cabinet
new file mode 100644
index 000000000000..bf717630902d
--- /dev/null
+++ b/emulators/wine-devel/files/patch-dlls-cabinet
@@ -0,0 +1,11 @@
+--- dlls/cabinet/cabextract.c.orig	19 Dec 2002 21:16:56 -0000	1.1
++++ dlls/cabinet/cabextract.c	26 Dec 2002 21:29:22 -0000
+@@ -472,7 +472,7 @@ BOOL cabinet_read_entries(struct cabinet
+     }
+ 
+     fol->cab[0]     = cab;
+-    fol->offset[0]  = base_offset + (off_t) EndGetI32(buf+cffold_DataOffset);
++    fol->offset[0]  = base_offset + (cab_off_t) EndGetI32(buf+cffold_DataOffset);
+     fol->num_blocks = EndGetI16(buf+cffold_NumBlocks);
+     fol->comp_type  = EndGetI16(buf+cffold_CompType);
+ 
diff --git a/emulators/wine-devel/files/patch-gb b/emulators/wine-devel/files/patch-gb
index f33701ad54cd..3182a5a0a7c2 100644
--- a/emulators/wine-devel/files/patch-gb
+++ b/emulators/wine-devel/files/patch-gb
@@ -1,9 +1,9 @@
---- Makefile.in.orig	Fri Aug  2 21:34:21 2002
-+++ Makefile.in	Mon Aug  5 13:10:16 2002
-@@ -91,18 +91,6 @@ install-lib:: $(INSTALLLIBSUBDIRS:%=%/__
- install-dev:: $(INSTALLDEVSUBDIRS:%=%/__install__) install-aclocal
+--- Makefile.in.orig	Thu Dec 12 23:03:14 2002
++++ Makefile.in	Wed Dec 25 17:08:41 2002
+@@ -88,18 +88,6 @@ install-lib:: $(INSTALLLIBSUBDIRS:%=%/__
+ install-dev:: $(INSTALLDEVSUBDIRS:%=%/__install__) $(INSTALLBOTHSUBDIRS:%=%/__install-dev__) install-aclocal
  
- install:: install-aclocal
+ install:: install-lib install-dev install-aclocal
 -	-$(LDCONFIG)
 -	@if test -n "`LANG=C $(LDD) $(bindir)/wine|grep not.found`";	\
 -	then								\
@@ -17,5 +17,5 @@
 -		echo "*************************************************" ; \
 -	fi
  
- uninstall::
+ uninstall:: $(INSTALLBOTHSUBDIRS:%=%/__uninstall__)
  	$(RM) $(datadir)/aclocal/wine.m4
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index a7b74384539b..23aad8dddf75 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -24,64 +24,39 @@ bin/wmc
 bin/wrc
 @unexec if cmp -s %D/etc/wine.conf %D/etc/wine.conf.sample; then rm -f %D/etc/wine.conf; fi
 etc/wine.conf.sample
-include/wine/audevcod.h
-include/wine/basetsd.h
-include/wine/cderr.h
-include/wine/cguid.h
-include/wine/comcat.h
-include/wine/commctrl.h
-include/wine/commdlg.h
-include/wine/compobj.h
-include/wine/cpl.h
-include/wine/custcntl.h
-include/wine/d3d.h
-include/wine/d3d8.h
-include/wine/d3d8caps.h
-include/wine/d3d8types.h
-include/wine/d3dcaps.h
-include/wine/d3dtypes.h
-include/wine/d3dvec.inl
-include/wine/dde.h
-include/wine/ddeml.h
-include/wine/ddraw.h
-include/wine/digitalv.h
-include/wine/dinput.h
-include/wine/dispdib.h
-include/wine/dlgs.h
-include/wine/dmo.h
-include/wine/dmoreg.h
-include/wine/dmort.h
-include/wine/docobj.h
-include/wine/dplay.h
-include/wine/dplobby.h
-include/wine/dshow.h
-include/wine/dsound.h
-include/wine/guiddef.h
-include/wine/imagehlp.h
-include/wine/imm.h
-include/wine/initguid.h
-include/wine/instance.h
-include/wine/lm.h
-include/wine/lmaccess.h
-include/wine/lmapibuf.h
-include/wine/lmbrowsr.h
-include/wine/lmcons.h
-include/wine/lmerr.h
-include/wine/lmwksta.h
-include/wine/lzexpand.h
-include/wine/mapi.h
-include/wine/mapicode.h
-include/wine/mapidefs.h
-include/wine/mciavi.h
-include/wine/mcx.h
-include/wine/mediaerr.h
-include/wine/mediaobj.h
-include/wine/minmax.h
-include/wine/mmreg.h
-include/wine/mmsystem.h
-include/wine/msacm.h
-include/wine/msacmdlg.h
-include/wine/mssip.h
+include/wine/debug.h
+include/wine/exception.h
+include/wine/library.h
+include/wine/obj_base.h
+include/wine/obj_cache.h
+include/wine/obj_comcat.h
+include/wine/obj_commdlgbrowser.h
+include/wine/obj_connection.h
+include/wine/obj_contextmenu.h
+include/wine/obj_control.h
+include/wine/obj_dockingwindowframe.h
+include/wine/obj_dragdrop.h
+include/wine/obj_dragdrophelper.h
+include/wine/obj_enumguid.h
+include/wine/obj_enumidlist.h
+include/wine/obj_errorinfo.h
+include/wine/obj_extracticon.h
+include/wine/obj_inplace.h
+include/wine/obj_oleaut.h
+include/wine/obj_olefont.h
+include/wine/obj_oleobj.h
+include/wine/obj_oleundo.h
+include/wine/obj_oleview.h
+include/wine/obj_picture.h
+include/wine/obj_property.h
+include/wine/obj_serviceprovider.h
+include/wine/obj_shellbrowser.h
+include/wine/obj_shellextinit.h
+include/wine/obj_shellfolder.h
+include/wine/obj_shelllink.h
+include/wine/obj_shellview.h
+include/wine/obj_webbrowser.h
+include/wine/unicode.h
 include/wine/msvcrt/conio.h
 include/wine/msvcrt/crtdbg.h
 include/wine/msvcrt/ctype.h
@@ -89,7 +64,6 @@ include/wine/msvcrt/direct.h
 include/wine/msvcrt/dos.h
 include/wine/msvcrt/eh.h
 include/wine/msvcrt/errno.h
-include/wine/msvcrt/excpt.h
 include/wine/msvcrt/fcntl.h
 include/wine/msvcrt/io.h
 include/wine/msvcrt/locale.h
@@ -112,132 +86,165 @@ include/wine/msvcrt/sys/utime.h
 include/wine/msvcrt/time.h
 include/wine/msvcrt/wchar.h
 include/wine/msvcrt/wctype.h
-include/wine/mswsock.h
-include/wine/nb30.h
-include/wine/nspapi.h
-include/wine/ntsecapi.h
-include/wine/ntstatus.h
-include/wine/oaidl.h
-include/wine/objbase.h
-include/wine/objidl.h
-include/wine/ocidl.h
-include/wine/ole2.h
-include/wine/ole2ver.h
-include/wine/oleauto.h
-include/wine/olectl.h
-include/wine/oledlg.h
-include/wine/oleidl.h
-include/wine/poppack.h
-include/wine/prsht.h
-include/wine/psapi.h
-include/wine/pshpack1.h
-include/wine/pshpack2.h
-include/wine/pshpack4.h
-include/wine/pshpack8.h
-include/wine/ras.h
-include/wine/regstr.h
-include/wine/richedit.h
-include/wine/richole.h
-include/wine/rpc.h
-include/wine/rpcdce.h
-include/wine/rpcdcep.h
-include/wine/rpcndr.h
-include/wine/rpcnterr.h
-include/wine/rpcproxy.h
-include/wine/servprov.h
-include/wine/setupapi.h
-include/wine/shellapi.h
-include/wine/shlguid.h
-include/wine/shlobj.h
-include/wine/shlwapi.h
-include/wine/sipbase.h
-include/wine/sql.h
-include/wine/sqlext.h
-include/wine/sqltypes.h
-include/wine/storage.h
-include/wine/tapi.h
-include/wine/tchar.h
-include/wine/tlhelp32.h
-include/wine/unknwn.h
-include/wine/urlmon.h
-include/wine/uuids.h
-include/wine/ver.h
-include/wine/vfw.h
-include/wine/vfwmsgs.h
-include/wine/winbase.h
-include/wine/wincon.h
-include/wine/wincrypt.h
-include/wine/windef.h
-include/wine/windows.h
-include/wine/windowsx.h
-include/wine/wine/debug.h
-include/wine/wine/exception.h
-include/wine/wine/icmpapi.h
-include/wine/wine/ipexport.h
-include/wine/wine/library.h
-include/wine/wine/obj_base.h
-include/wine/wine/obj_cache.h
-include/wine/wine/obj_channel.h
-include/wine/wine/obj_clientserver.h
-include/wine/wine/obj_comcat.h
-include/wine/wine/obj_commdlgbrowser.h
-include/wine/wine/obj_connection.h
-include/wine/wine/obj_contextmenu.h
-include/wine/wine/obj_control.h
-include/wine/wine/obj_dataobject.h
-include/wine/wine/obj_dockingwindowframe.h
-include/wine/wine/obj_dragdrop.h
-include/wine/wine/obj_dragdrophelper.h
-include/wine/wine/obj_enumguid.h
-include/wine/wine/obj_enumidlist.h
-include/wine/wine/obj_errorinfo.h
-include/wine/wine/obj_extracticon.h
-include/wine/wine/obj_inplace.h
-include/wine/wine/obj_marshal.h
-include/wine/wine/obj_misc.h
-include/wine/wine/obj_moniker.h
-include/wine/wine/obj_oleaut.h
-include/wine/wine/obj_olefont.h
-include/wine/wine/obj_oleobj.h
-include/wine/wine/obj_oleundo.h
-include/wine/wine/obj_oleview.h
-include/wine/wine/obj_picture.h
-include/wine/wine/obj_property.h
-include/wine/wine/obj_propertystorage.h
-include/wine/wine/obj_serviceprovider.h
-include/wine/wine/obj_shellbrowser.h
-include/wine/wine/obj_shellextinit.h
-include/wine/wine/obj_shellfolder.h
-include/wine/wine/obj_shelllink.h
-include/wine/wine/obj_shellview.h
-include/wine/wine/obj_storage.h
-include/wine/wine/obj_webbrowser.h
-include/wine/wine/unicode.h
-include/wine/winerror.h
-include/wine/wingdi.h
-include/wine/wininet.h
-include/wine/winioctl.h
-include/wine/winnetwk.h
-include/wine/winnls.h
-include/wine/winnt.h
-include/wine/winreg.h
-include/wine/winres.h
-include/wine/winresrc.h
-include/wine/winsock.h
-include/wine/winsock2.h
-include/wine/winspool.h
-include/wine/winsvc.h
-include/wine/winternl.h
-include/wine/winuser.h
-include/wine/winver.h
-include/wine/wnaspi32.h
-include/wine/wownt32.h
-include/wine/ws2spi.h
-include/wine/ws2tcpip.h
-include/wine/wshisotp.h
-include/wine/wsipx.h
-include/wine/wtypes.h
-include/wine/zmouse.h
+include/wine/windows/accctrl.h
+include/wine/windows/audevcod.h
+include/wine/windows/basetsd.h
+include/wine/windows/cderr.h
+include/wine/windows/cguid.h
+include/wine/windows/comcat.h
+include/wine/windows/commctrl.h
+include/wine/windows/commdlg.h
+include/wine/windows/compobj.h
+include/wine/windows/cpl.h
+include/wine/windows/custcntl.h
+include/wine/windows/d3d.h
+include/wine/windows/d3d8.h
+include/wine/windows/d3d8caps.h
+include/wine/windows/d3d8types.h
+include/wine/windows/d3dcaps.h
+include/wine/windows/d3dhal.h
+include/wine/windows/d3dtypes.h
+include/wine/windows/d3dvec.inl
+include/wine/windows/d3dx8core.h
+include/wine/windows/dde.h
+include/wine/windows/ddeml.h
+include/wine/windows/ddraw.h
+include/wine/windows/ddrawi.h
+include/wine/windows/digitalv.h
+include/wine/windows/dinput.h
+include/wine/windows/dispdib.h
+include/wine/windows/dlgs.h
+include/wine/windows/dmo.h
+include/wine/windows/dmoreg.h
+include/wine/windows/dmort.h
+include/wine/windows/docobj.h
+include/wine/windows/dplay.h
+include/wine/windows/dplobby.h
+include/wine/windows/dshow.h
+include/wine/windows/dsdriver.h
+include/wine/windows/dsound.h
+include/wine/windows/excpt.h
+include/wine/windows/fci.h
+include/wine/windows/fdi.h
+include/wine/windows/guiddef.h
+include/wine/windows/icmpapi.h
+include/wine/windows/imagehlp.h
+include/wine/windows/imm.h
+include/wine/windows/initguid.h
+include/wine/windows/instance.h
+include/wine/windows/ipexport.h
+include/wine/windows/lm.h
+include/wine/windows/lmaccess.h
+include/wine/windows/lmapibuf.h
+include/wine/windows/lmbrowsr.h
+include/wine/windows/lmcons.h
+include/wine/windows/lmerr.h
+include/wine/windows/lmwksta.h
+include/wine/windows/lzexpand.h
+include/wine/windows/mapi.h
+include/wine/windows/mapicode.h
+include/wine/windows/mapidefs.h
+include/wine/windows/mciavi.h
+include/wine/windows/mcx.h
+include/wine/windows/mediaerr.h
+include/wine/windows/mediaobj.h
+include/wine/windows/minmax.h
+include/wine/windows/mmddk.h
+include/wine/windows/mmreg.h
+include/wine/windows/mmsystem.h
+include/wine/windows/msacm.h
+include/wine/windows/msacmdlg.h
+include/wine/windows/mssip.h
+include/wine/windows/mswsock.h
+include/wine/windows/nb30.h
+include/wine/windows/netspi.h
+include/wine/windows/nspapi.h
+include/wine/windows/ntddcdrm.h
+include/wine/windows/ntddscsi.h
+include/wine/windows/ntddstor.h
+include/wine/windows/ntsecapi.h
+include/wine/windows/ntstatus.h
+include/wine/windows/oaidl.h
+include/wine/windows/objbase.h
+include/wine/windows/objidl.h
+include/wine/windows/ocidl.h
+include/wine/windows/ole2.h
+include/wine/windows/ole2ver.h
+include/wine/windows/oleauto.h
+include/wine/windows/olectl.h
+include/wine/windows/oledlg.h
+include/wine/windows/oleidl.h
+include/wine/windows/pktdef.h
+include/wine/windows/poppack.h
+include/wine/windows/prsht.h
+include/wine/windows/psapi.h
+include/wine/windows/pshpack1.h
+include/wine/windows/pshpack2.h
+include/wine/windows/pshpack4.h
+include/wine/windows/pshpack8.h
+include/wine/windows/ras.h
+include/wine/windows/regstr.h
+include/wine/windows/richedit.h
+include/wine/windows/richole.h
+include/wine/windows/rpc.h
+include/wine/windows/rpcdce.h
+include/wine/windows/rpcdcep.h
+include/wine/windows/rpcndr.h
+include/wine/windows/rpcnterr.h
+include/wine/windows/rpcproxy.h
+include/wine/windows/servprov.h
+include/wine/windows/setupapi.h
+include/wine/windows/shellapi.h
+include/wine/windows/shlguid.h
+include/wine/windows/shlobj.h
+include/wine/windows/shlwapi.h
+include/wine/windows/sipbase.h
+include/wine/windows/sql.h
+include/wine/windows/sqlext.h
+include/wine/windows/sqltypes.h
+include/wine/windows/storage.h
+include/wine/windows/tapi.h
+include/wine/windows/tchar.h
+include/wine/windows/tlhelp32.h
+include/wine/windows/unknwn.h
+include/wine/windows/urlmon.h
+include/wine/windows/uuids.h
+include/wine/windows/ver.h
+include/wine/windows/vfw.h
+include/wine/windows/vfwmsgs.h
+include/wine/windows/winbase.h
+include/wine/windows/wincon.h
+include/wine/windows/wincrypt.h
+include/wine/windows/windef.h
+include/wine/windows/windows.h
+include/wine/windows/windowsx.h
+include/wine/windows/winerror.h
+include/wine/windows/wingdi.h
+include/wine/windows/wininet.h
+include/wine/windows/winioctl.h
+include/wine/windows/winnetwk.h
+include/wine/windows/winnls.h
+include/wine/windows/winnt.h
+include/wine/windows/winreg.h
+include/wine/windows/winres.h
+include/wine/windows/winresrc.h
+include/wine/windows/winsock.h
+include/wine/windows/winsock2.h
+include/wine/windows/winspool.h
+include/wine/windows/winsvc.h
+include/wine/windows/wintab.h
+include/wine/windows/wintabx.h
+include/wine/windows/winternl.h
+include/wine/windows/winuser.h
+include/wine/windows/winver.h
+include/wine/windows/wnaspi32.h
+include/wine/windows/wownt32.h
+include/wine/windows/ws2spi.h
+include/wine/windows/ws2tcpip.h
+include/wine/windows/wshisotp.h
+include/wine/windows/wsipx.h
+include/wine/windows/wtypes.h
+include/wine/windows/zmouse.h
 lib/wine/advapi32.dll.so
 lib/wine/avicap32.dll.so
 lib/wine/avifil32.dll.so
@@ -245,6 +252,7 @@ lib/wine/avifile.dll.so
 lib/wine/aviinfo.exe.so
 lib/wine/aviplay.exe.so
 lib/wine/bug_report.pl
+lib/wine/cabinet.dll.so
 lib/wine/clock.exe.so
 lib/wine/comcat.dll.so
 lib/wine/comctl32.dll.so
@@ -256,6 +264,7 @@ lib/wine/control.exe.so
 lib/wine/crtdll.dll.so
 lib/wine/crypt32.dll.so
 lib/wine/d3d8.dll.so
+lib/wine/d3dx8.dll.so
 lib/wine/dciman32.dll.so
 lib/wine/ddeml.dll.so
 lib/wine/ddraw.dll.so
@@ -280,12 +289,93 @@ lib/wine/joystick.drv.so
 lib/wine/kernel32.dll.so
 lib/wine/keyboard.dll.so
 lib/wine/krnl386.exe.so
+lib/wine/libadvapi32.def
+lib/wine/libavicap32.def
+lib/wine/libavifil32.def
+lib/wine/libcabinet.def
+lib/wine/libcomcat.def
+lib/wine/libcomctl32.def
+lib/wine/libcomdlg32.def
+lib/wine/libcrtdll.def
+lib/wine/libcrypt32.def
+lib/wine/libd3d8.def
+lib/wine/libd3dx8.def
+lib/wine/libdciman32.def
+lib/wine/libddraw.def
+lib/wine/libdevenum.def
+lib/wine/libdinput.def
+lib/wine/libdinput8.def
+lib/wine/libdplay.def
+lib/wine/libdplayx.def
+lib/wine/libdsound.def
+lib/wine/libgdi32.def
+lib/wine/libglu32.def
+lib/wine/libicmp.def
+lib/wine/libimagehlp.def
+lib/wine/libimm32.def
+lib/wine/libkernel32.def
+lib/wine/liblz32.def
+lib/wine/libmapi32.def
+lib/wine/libmpr.def
+lib/wine/libmsacm32.def
+lib/wine/libmsdmo.def
+lib/wine/libmsimg32.def
+lib/wine/libmsnet32.def
+lib/wine/libmsrle32.def
+lib/wine/libmsvcrt.def
+lib/wine/libmsvcrt20.def
+lib/wine/libmsvfw32.def
+lib/wine/libnetapi32.def
+lib/wine/libntdll.def
 lib/wine/libntdll.dll.so
+lib/wine/libodbc32.def
+lib/wine/libole32.def
+lib/wine/liboleaut32.def
+lib/wine/libolecli32.def
+lib/wine/liboledlg.def
+lib/wine/libolepro32.def
+lib/wine/libolesvr32.def
+lib/wine/libopengl32.def
+lib/wine/libpsapi.def
+lib/wine/libqcap.def
+lib/wine/libquartz.def
+lib/wine/librasapi32.def
+lib/wine/libriched32.def
+lib/wine/librpcrt4.def
+lib/wine/libserialui.def
+lib/wine/libsetupapi.def
+lib/wine/libshdocvw.def
+lib/wine/libshell32.def
+lib/wine/libshfolder.def
+lib/wine/libshlwapi.def
+lib/wine/libsnmpapi.def
+lib/wine/libsti.def
+lib/wine/libtapi32.def
+lib/wine/libttydrv.def
+lib/wine/libtwain_32.def
+lib/wine/liburl.def
+lib/wine/liburlmon.def
+lib/wine/libuser32.def
+lib/wine/libversion.def
+lib/wine/libw32skrnl.def
 lib/wine/libwine.so
 lib/wine/libwine.so.1
+lib/wine/libwinedos.def
+lib/wine/libwineps.def
 lib/wine/libwine_unicode.so
 lib/wine/libwine_unicode.so.1
 lib/wine/libwine_uuid.a
+lib/wine/libwininet.def
+lib/wine/libwinmm.def
+lib/wine/libwinnls32.def
+lib/wine/libwinspool.def
+lib/wine/libwintab32.def
+lib/wine/libwintrust.def
+lib/wine/libwnaspi32.def
+lib/wine/libwow32.def
+lib/wine/libws2_32.def
+lib/wine/libwsock32.def
+lib/wine/libx11drv.def
 lib/wine/lz32.dll.so
 lib/wine/lzexpand.dll.so
 lib/wine/mapi32.dll.so
@@ -340,6 +430,8 @@ lib/wine/regedit.exe.so
 lib/wine/regsvr32.exe.so
 lib/wine/riched32.dll.so
 lib/wine/rpcrt4.dll.so
+lib/wine/rpcss.exe.so
+lib/wine/rundll32.exe.so
 lib/wine/serialui.dll.so
 lib/wine/setupapi.dll.so
 lib/wine/setupx.dll.so
@@ -379,8 +471,8 @@ lib/wine/wineaudioio.drv.so
 lib/wine/wineconsole.exe.so
 lib/wine/winedbg.exe.so
 lib/wine/winedos.dll.so
-lib/wine/winedos16.dll.so
 lib/wine/winefile.exe.so
+lib/wine/winejack.drv.so
 lib/wine/winemine.exe.so
 lib/wine/winemp3.acm.so
 lib/wine/wineoss.drv.so
@@ -396,6 +488,8 @@ lib/wine/winnls.dll.so
 lib/wine/winnls32.dll.so
 lib/wine/winsock.dll.so
 lib/wine/winspool.drv.so
+lib/wine/wintab.dll.so
+lib/wine/wintab32.dll.so
 lib/wine/wintrust.dll.so
 lib/wine/winver.exe.so
 lib/wine/wnaspi32.dll.so
@@ -420,5 +514,5 @@ lib/wine/winedefault.reg
 @dirrm lib/wine
 @dirrm include/wine/msvcrt/sys
 @dirrm include/wine/msvcrt
-@dirrm include/wine/wine
+@dirrm include/wine/windows
 @dirrm include/wine
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 4029dee376dd..b7a8b1ca82a3 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	2002.10.31
+PORTVERSION=	2002.12.19
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index c8fced633e39..38af0d97df5f 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1 +1 @@
-MD5 (Wine-20021031.tar.gz) = 98079fb3deb111b8fddc777a047d1fe3
+MD5 (Wine-20021219.tar.gz) = 0091d9173290430a98f7d772b9deb06f
diff --git a/emulators/wine/files/patch-context_i386 b/emulators/wine/files/patch-context_i386
deleted file mode 100644
index 10b35c7c7f52..000000000000
--- a/emulators/wine/files/patch-context_i386
+++ /dev/null
@@ -1,51 +0,0 @@
---- server/context_i386.c.orig	Wed Aug 14 13:59:03 2002
-+++ server/context_i386.c	Thu Nov  7 14:54:01 2002
-@@ -371,14 +371,15 @@
-     {
- #ifdef PTRACE_GETDBREGS
- 	struct dbreg dbregs;
--        if (ptrace( PTRACE_GETDBREGS, pid, (caddr_t) &dbregs, 0 ) == -1)
-+	struct dbreg *dbregs_ptr = &dbregs; /* ptr to workaround buggy macro */
-+        if (ptrace( PTRACE_GETDBREGS, pid, (caddr_t) dbregs_ptr, 0 ) == -1)
- 		goto error;
--	context->Dr0 = dbregs.dr0;
--	context->Dr1 = dbregs.dr1;
--	context->Dr2 = dbregs.dr2;
--	context->Dr3 = dbregs.dr3;
--	context->Dr6 = dbregs.dr6;
--	context->Dr7 = dbregs.dr7;
-+	context->Dr0 = DBREG_DRX(dbregs_ptr, 0);
-+	context->Dr1 = DBREG_DRX(dbregs_ptr, 1);
-+	context->Dr2 = DBREG_DRX(dbregs_ptr, 2);
-+	context->Dr3 = DBREG_DRX(dbregs_ptr, 3);
-+	context->Dr6 = DBREG_DRX(dbregs_ptr, 6);
-+	context->Dr7 = DBREG_DRX(dbregs_ptr, 7);
- #endif
-     }
-     if (flags & CONTEXT_FLOATING_POINT)
-@@ -437,15 +438,16 @@
-     {
- #ifdef PTRACE_SETDBREGS
- 	struct dbreg dbregs;
--	dbregs.dr0 = context->Dr0;
--	dbregs.dr1 = context->Dr1;
--	dbregs.dr2 = context->Dr2;
--	dbregs.dr3 = context->Dr3;
--	dbregs.dr4 = 0;
--	dbregs.dr5 = 0;
--	dbregs.dr6 = context->Dr6;
--	dbregs.dr7 = context->Dr7;
--        if (ptrace( PTRACE_SETDBREGS, pid, (caddr_t) &dbregs, 0 ) == -1)
-+	struct dbreg *dbregs_ptr = &dbregs; /* ptr to workaround buggy macro */
-+	DBREG_DRX(dbregs_ptr, 0) = context->Dr0;
-+	DBREG_DRX(dbregs_ptr, 1) = context->Dr1;
-+	DBREG_DRX(dbregs_ptr, 2) = context->Dr2;
-+	DBREG_DRX(dbregs_ptr, 3) = context->Dr3;
-+	DBREG_DRX(dbregs_ptr, 4) = 0;
-+	DBREG_DRX(dbregs_ptr, 5) = 0;
-+	DBREG_DRX(dbregs_ptr, 6) = context->Dr6;
-+	DBREG_DRX(dbregs_ptr, 7) = context->Dr7;
-+        if (ptrace( PTRACE_SETDBREGS, pid, (caddr_t) dbregs_ptr, 0 ) == -1)
- 		goto error;
- #endif
-     }
diff --git a/emulators/wine/files/patch-dlls-cabinet b/emulators/wine/files/patch-dlls-cabinet
new file mode 100644
index 000000000000..bf717630902d
--- /dev/null
+++ b/emulators/wine/files/patch-dlls-cabinet
@@ -0,0 +1,11 @@
+--- dlls/cabinet/cabextract.c.orig	19 Dec 2002 21:16:56 -0000	1.1
++++ dlls/cabinet/cabextract.c	26 Dec 2002 21:29:22 -0000
+@@ -472,7 +472,7 @@ BOOL cabinet_read_entries(struct cabinet
+     }
+ 
+     fol->cab[0]     = cab;
+-    fol->offset[0]  = base_offset + (off_t) EndGetI32(buf+cffold_DataOffset);
++    fol->offset[0]  = base_offset + (cab_off_t) EndGetI32(buf+cffold_DataOffset);
+     fol->num_blocks = EndGetI16(buf+cffold_NumBlocks);
+     fol->comp_type  = EndGetI16(buf+cffold_CompType);
+ 
diff --git a/emulators/wine/files/patch-gb b/emulators/wine/files/patch-gb
index f33701ad54cd..3182a5a0a7c2 100644
--- a/emulators/wine/files/patch-gb
+++ b/emulators/wine/files/patch-gb
@@ -1,9 +1,9 @@
---- Makefile.in.orig	Fri Aug  2 21:34:21 2002
-+++ Makefile.in	Mon Aug  5 13:10:16 2002
-@@ -91,18 +91,6 @@ install-lib:: $(INSTALLLIBSUBDIRS:%=%/__
- install-dev:: $(INSTALLDEVSUBDIRS:%=%/__install__) install-aclocal
+--- Makefile.in.orig	Thu Dec 12 23:03:14 2002
++++ Makefile.in	Wed Dec 25 17:08:41 2002
+@@ -88,18 +88,6 @@ install-lib:: $(INSTALLLIBSUBDIRS:%=%/__
+ install-dev:: $(INSTALLDEVSUBDIRS:%=%/__install__) $(INSTALLBOTHSUBDIRS:%=%/__install-dev__) install-aclocal
  
- install:: install-aclocal
+ install:: install-lib install-dev install-aclocal
 -	-$(LDCONFIG)
 -	@if test -n "`LANG=C $(LDD) $(bindir)/wine|grep not.found`";	\
 -	then								\
@@ -17,5 +17,5 @@
 -		echo "*************************************************" ; \
 -	fi
  
- uninstall::
+ uninstall:: $(INSTALLBOTHSUBDIRS:%=%/__uninstall__)
  	$(RM) $(datadir)/aclocal/wine.m4
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index a7b74384539b..23aad8dddf75 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -24,64 +24,39 @@ bin/wmc
 bin/wrc
 @unexec if cmp -s %D/etc/wine.conf %D/etc/wine.conf.sample; then rm -f %D/etc/wine.conf; fi
 etc/wine.conf.sample
-include/wine/audevcod.h
-include/wine/basetsd.h
-include/wine/cderr.h
-include/wine/cguid.h
-include/wine/comcat.h
-include/wine/commctrl.h
-include/wine/commdlg.h
-include/wine/compobj.h
-include/wine/cpl.h
-include/wine/custcntl.h
-include/wine/d3d.h
-include/wine/d3d8.h
-include/wine/d3d8caps.h
-include/wine/d3d8types.h
-include/wine/d3dcaps.h
-include/wine/d3dtypes.h
-include/wine/d3dvec.inl
-include/wine/dde.h
-include/wine/ddeml.h
-include/wine/ddraw.h
-include/wine/digitalv.h
-include/wine/dinput.h
-include/wine/dispdib.h
-include/wine/dlgs.h
-include/wine/dmo.h
-include/wine/dmoreg.h
-include/wine/dmort.h
-include/wine/docobj.h
-include/wine/dplay.h
-include/wine/dplobby.h
-include/wine/dshow.h
-include/wine/dsound.h
-include/wine/guiddef.h
-include/wine/imagehlp.h
-include/wine/imm.h
-include/wine/initguid.h
-include/wine/instance.h
-include/wine/lm.h
-include/wine/lmaccess.h
-include/wine/lmapibuf.h
-include/wine/lmbrowsr.h
-include/wine/lmcons.h
-include/wine/lmerr.h
-include/wine/lmwksta.h
-include/wine/lzexpand.h
-include/wine/mapi.h
-include/wine/mapicode.h
-include/wine/mapidefs.h
-include/wine/mciavi.h
-include/wine/mcx.h
-include/wine/mediaerr.h
-include/wine/mediaobj.h
-include/wine/minmax.h
-include/wine/mmreg.h
-include/wine/mmsystem.h
-include/wine/msacm.h
-include/wine/msacmdlg.h
-include/wine/mssip.h
+include/wine/debug.h
+include/wine/exception.h
+include/wine/library.h
+include/wine/obj_base.h
+include/wine/obj_cache.h
+include/wine/obj_comcat.h
+include/wine/obj_commdlgbrowser.h
+include/wine/obj_connection.h
+include/wine/obj_contextmenu.h
+include/wine/obj_control.h
+include/wine/obj_dockingwindowframe.h
+include/wine/obj_dragdrop.h
+include/wine/obj_dragdrophelper.h
+include/wine/obj_enumguid.h
+include/wine/obj_enumidlist.h
+include/wine/obj_errorinfo.h
+include/wine/obj_extracticon.h
+include/wine/obj_inplace.h
+include/wine/obj_oleaut.h
+include/wine/obj_olefont.h
+include/wine/obj_oleobj.h
+include/wine/obj_oleundo.h
+include/wine/obj_oleview.h
+include/wine/obj_picture.h
+include/wine/obj_property.h
+include/wine/obj_serviceprovider.h
+include/wine/obj_shellbrowser.h
+include/wine/obj_shellextinit.h
+include/wine/obj_shellfolder.h
+include/wine/obj_shelllink.h
+include/wine/obj_shellview.h
+include/wine/obj_webbrowser.h
+include/wine/unicode.h
 include/wine/msvcrt/conio.h
 include/wine/msvcrt/crtdbg.h
 include/wine/msvcrt/ctype.h
@@ -89,7 +64,6 @@ include/wine/msvcrt/direct.h
 include/wine/msvcrt/dos.h
 include/wine/msvcrt/eh.h
 include/wine/msvcrt/errno.h
-include/wine/msvcrt/excpt.h
 include/wine/msvcrt/fcntl.h
 include/wine/msvcrt/io.h
 include/wine/msvcrt/locale.h
@@ -112,132 +86,165 @@ include/wine/msvcrt/sys/utime.h
 include/wine/msvcrt/time.h
 include/wine/msvcrt/wchar.h
 include/wine/msvcrt/wctype.h
-include/wine/mswsock.h
-include/wine/nb30.h
-include/wine/nspapi.h
-include/wine/ntsecapi.h
-include/wine/ntstatus.h
-include/wine/oaidl.h
-include/wine/objbase.h
-include/wine/objidl.h
-include/wine/ocidl.h
-include/wine/ole2.h
-include/wine/ole2ver.h
-include/wine/oleauto.h
-include/wine/olectl.h
-include/wine/oledlg.h
-include/wine/oleidl.h
-include/wine/poppack.h
-include/wine/prsht.h
-include/wine/psapi.h
-include/wine/pshpack1.h
-include/wine/pshpack2.h
-include/wine/pshpack4.h
-include/wine/pshpack8.h
-include/wine/ras.h
-include/wine/regstr.h
-include/wine/richedit.h
-include/wine/richole.h
-include/wine/rpc.h
-include/wine/rpcdce.h
-include/wine/rpcdcep.h
-include/wine/rpcndr.h
-include/wine/rpcnterr.h
-include/wine/rpcproxy.h
-include/wine/servprov.h
-include/wine/setupapi.h
-include/wine/shellapi.h
-include/wine/shlguid.h
-include/wine/shlobj.h
-include/wine/shlwapi.h
-include/wine/sipbase.h
-include/wine/sql.h
-include/wine/sqlext.h
-include/wine/sqltypes.h
-include/wine/storage.h
-include/wine/tapi.h
-include/wine/tchar.h
-include/wine/tlhelp32.h
-include/wine/unknwn.h
-include/wine/urlmon.h
-include/wine/uuids.h
-include/wine/ver.h
-include/wine/vfw.h
-include/wine/vfwmsgs.h
-include/wine/winbase.h
-include/wine/wincon.h
-include/wine/wincrypt.h
-include/wine/windef.h
-include/wine/windows.h
-include/wine/windowsx.h
-include/wine/wine/debug.h
-include/wine/wine/exception.h
-include/wine/wine/icmpapi.h
-include/wine/wine/ipexport.h
-include/wine/wine/library.h
-include/wine/wine/obj_base.h
-include/wine/wine/obj_cache.h
-include/wine/wine/obj_channel.h
-include/wine/wine/obj_clientserver.h
-include/wine/wine/obj_comcat.h
-include/wine/wine/obj_commdlgbrowser.h
-include/wine/wine/obj_connection.h
-include/wine/wine/obj_contextmenu.h
-include/wine/wine/obj_control.h
-include/wine/wine/obj_dataobject.h
-include/wine/wine/obj_dockingwindowframe.h
-include/wine/wine/obj_dragdrop.h
-include/wine/wine/obj_dragdrophelper.h
-include/wine/wine/obj_enumguid.h
-include/wine/wine/obj_enumidlist.h
-include/wine/wine/obj_errorinfo.h
-include/wine/wine/obj_extracticon.h
-include/wine/wine/obj_inplace.h
-include/wine/wine/obj_marshal.h
-include/wine/wine/obj_misc.h
-include/wine/wine/obj_moniker.h
-include/wine/wine/obj_oleaut.h
-include/wine/wine/obj_olefont.h
-include/wine/wine/obj_oleobj.h
-include/wine/wine/obj_oleundo.h
-include/wine/wine/obj_oleview.h
-include/wine/wine/obj_picture.h
-include/wine/wine/obj_property.h
-include/wine/wine/obj_propertystorage.h
-include/wine/wine/obj_serviceprovider.h
-include/wine/wine/obj_shellbrowser.h
-include/wine/wine/obj_shellextinit.h
-include/wine/wine/obj_shellfolder.h
-include/wine/wine/obj_shelllink.h
-include/wine/wine/obj_shellview.h
-include/wine/wine/obj_storage.h
-include/wine/wine/obj_webbrowser.h
-include/wine/wine/unicode.h
-include/wine/winerror.h
-include/wine/wingdi.h
-include/wine/wininet.h
-include/wine/winioctl.h
-include/wine/winnetwk.h
-include/wine/winnls.h
-include/wine/winnt.h
-include/wine/winreg.h
-include/wine/winres.h
-include/wine/winresrc.h
-include/wine/winsock.h
-include/wine/winsock2.h
-include/wine/winspool.h
-include/wine/winsvc.h
-include/wine/winternl.h
-include/wine/winuser.h
-include/wine/winver.h
-include/wine/wnaspi32.h
-include/wine/wownt32.h
-include/wine/ws2spi.h
-include/wine/ws2tcpip.h
-include/wine/wshisotp.h
-include/wine/wsipx.h
-include/wine/wtypes.h
-include/wine/zmouse.h
+include/wine/windows/accctrl.h
+include/wine/windows/audevcod.h
+include/wine/windows/basetsd.h
+include/wine/windows/cderr.h
+include/wine/windows/cguid.h
+include/wine/windows/comcat.h
+include/wine/windows/commctrl.h
+include/wine/windows/commdlg.h
+include/wine/windows/compobj.h
+include/wine/windows/cpl.h
+include/wine/windows/custcntl.h
+include/wine/windows/d3d.h
+include/wine/windows/d3d8.h
+include/wine/windows/d3d8caps.h
+include/wine/windows/d3d8types.h
+include/wine/windows/d3dcaps.h
+include/wine/windows/d3dhal.h
+include/wine/windows/d3dtypes.h
+include/wine/windows/d3dvec.inl
+include/wine/windows/d3dx8core.h
+include/wine/windows/dde.h
+include/wine/windows/ddeml.h
+include/wine/windows/ddraw.h
+include/wine/windows/ddrawi.h
+include/wine/windows/digitalv.h
+include/wine/windows/dinput.h
+include/wine/windows/dispdib.h
+include/wine/windows/dlgs.h
+include/wine/windows/dmo.h
+include/wine/windows/dmoreg.h
+include/wine/windows/dmort.h
+include/wine/windows/docobj.h
+include/wine/windows/dplay.h
+include/wine/windows/dplobby.h
+include/wine/windows/dshow.h
+include/wine/windows/dsdriver.h
+include/wine/windows/dsound.h
+include/wine/windows/excpt.h
+include/wine/windows/fci.h
+include/wine/windows/fdi.h
+include/wine/windows/guiddef.h
+include/wine/windows/icmpapi.h
+include/wine/windows/imagehlp.h
+include/wine/windows/imm.h
+include/wine/windows/initguid.h
+include/wine/windows/instance.h
+include/wine/windows/ipexport.h
+include/wine/windows/lm.h
+include/wine/windows/lmaccess.h
+include/wine/windows/lmapibuf.h
+include/wine/windows/lmbrowsr.h
+include/wine/windows/lmcons.h
+include/wine/windows/lmerr.h
+include/wine/windows/lmwksta.h
+include/wine/windows/lzexpand.h
+include/wine/windows/mapi.h
+include/wine/windows/mapicode.h
+include/wine/windows/mapidefs.h
+include/wine/windows/mciavi.h
+include/wine/windows/mcx.h
+include/wine/windows/mediaerr.h
+include/wine/windows/mediaobj.h
+include/wine/windows/minmax.h
+include/wine/windows/mmddk.h
+include/wine/windows/mmreg.h
+include/wine/windows/mmsystem.h
+include/wine/windows/msacm.h
+include/wine/windows/msacmdlg.h
+include/wine/windows/mssip.h
+include/wine/windows/mswsock.h
+include/wine/windows/nb30.h
+include/wine/windows/netspi.h
+include/wine/windows/nspapi.h
+include/wine/windows/ntddcdrm.h
+include/wine/windows/ntddscsi.h
+include/wine/windows/ntddstor.h
+include/wine/windows/ntsecapi.h
+include/wine/windows/ntstatus.h
+include/wine/windows/oaidl.h
+include/wine/windows/objbase.h
+include/wine/windows/objidl.h
+include/wine/windows/ocidl.h
+include/wine/windows/ole2.h
+include/wine/windows/ole2ver.h
+include/wine/windows/oleauto.h
+include/wine/windows/olectl.h
+include/wine/windows/oledlg.h
+include/wine/windows/oleidl.h
+include/wine/windows/pktdef.h
+include/wine/windows/poppack.h
+include/wine/windows/prsht.h
+include/wine/windows/psapi.h
+include/wine/windows/pshpack1.h
+include/wine/windows/pshpack2.h
+include/wine/windows/pshpack4.h
+include/wine/windows/pshpack8.h
+include/wine/windows/ras.h
+include/wine/windows/regstr.h
+include/wine/windows/richedit.h
+include/wine/windows/richole.h
+include/wine/windows/rpc.h
+include/wine/windows/rpcdce.h
+include/wine/windows/rpcdcep.h
+include/wine/windows/rpcndr.h
+include/wine/windows/rpcnterr.h
+include/wine/windows/rpcproxy.h
+include/wine/windows/servprov.h
+include/wine/windows/setupapi.h
+include/wine/windows/shellapi.h
+include/wine/windows/shlguid.h
+include/wine/windows/shlobj.h
+include/wine/windows/shlwapi.h
+include/wine/windows/sipbase.h
+include/wine/windows/sql.h
+include/wine/windows/sqlext.h
+include/wine/windows/sqltypes.h
+include/wine/windows/storage.h
+include/wine/windows/tapi.h
+include/wine/windows/tchar.h
+include/wine/windows/tlhelp32.h
+include/wine/windows/unknwn.h
+include/wine/windows/urlmon.h
+include/wine/windows/uuids.h
+include/wine/windows/ver.h
+include/wine/windows/vfw.h
+include/wine/windows/vfwmsgs.h
+include/wine/windows/winbase.h
+include/wine/windows/wincon.h
+include/wine/windows/wincrypt.h
+include/wine/windows/windef.h
+include/wine/windows/windows.h
+include/wine/windows/windowsx.h
+include/wine/windows/winerror.h
+include/wine/windows/wingdi.h
+include/wine/windows/wininet.h
+include/wine/windows/winioctl.h
+include/wine/windows/winnetwk.h
+include/wine/windows/winnls.h
+include/wine/windows/winnt.h
+include/wine/windows/winreg.h
+include/wine/windows/winres.h
+include/wine/windows/winresrc.h
+include/wine/windows/winsock.h
+include/wine/windows/winsock2.h
+include/wine/windows/winspool.h
+include/wine/windows/winsvc.h
+include/wine/windows/wintab.h
+include/wine/windows/wintabx.h
+include/wine/windows/winternl.h
+include/wine/windows/winuser.h
+include/wine/windows/winver.h
+include/wine/windows/wnaspi32.h
+include/wine/windows/wownt32.h
+include/wine/windows/ws2spi.h
+include/wine/windows/ws2tcpip.h
+include/wine/windows/wshisotp.h
+include/wine/windows/wsipx.h
+include/wine/windows/wtypes.h
+include/wine/windows/zmouse.h
 lib/wine/advapi32.dll.so
 lib/wine/avicap32.dll.so
 lib/wine/avifil32.dll.so
@@ -245,6 +252,7 @@ lib/wine/avifile.dll.so
 lib/wine/aviinfo.exe.so
 lib/wine/aviplay.exe.so
 lib/wine/bug_report.pl
+lib/wine/cabinet.dll.so
 lib/wine/clock.exe.so
 lib/wine/comcat.dll.so
 lib/wine/comctl32.dll.so
@@ -256,6 +264,7 @@ lib/wine/control.exe.so
 lib/wine/crtdll.dll.so
 lib/wine/crypt32.dll.so
 lib/wine/d3d8.dll.so
+lib/wine/d3dx8.dll.so
 lib/wine/dciman32.dll.so
 lib/wine/ddeml.dll.so
 lib/wine/ddraw.dll.so
@@ -280,12 +289,93 @@ lib/wine/joystick.drv.so
 lib/wine/kernel32.dll.so
 lib/wine/keyboard.dll.so
 lib/wine/krnl386.exe.so
+lib/wine/libadvapi32.def
+lib/wine/libavicap32.def
+lib/wine/libavifil32.def
+lib/wine/libcabinet.def
+lib/wine/libcomcat.def
+lib/wine/libcomctl32.def
+lib/wine/libcomdlg32.def
+lib/wine/libcrtdll.def
+lib/wine/libcrypt32.def
+lib/wine/libd3d8.def
+lib/wine/libd3dx8.def
+lib/wine/libdciman32.def
+lib/wine/libddraw.def
+lib/wine/libdevenum.def
+lib/wine/libdinput.def
+lib/wine/libdinput8.def
+lib/wine/libdplay.def
+lib/wine/libdplayx.def
+lib/wine/libdsound.def
+lib/wine/libgdi32.def
+lib/wine/libglu32.def
+lib/wine/libicmp.def
+lib/wine/libimagehlp.def
+lib/wine/libimm32.def
+lib/wine/libkernel32.def
+lib/wine/liblz32.def
+lib/wine/libmapi32.def
+lib/wine/libmpr.def
+lib/wine/libmsacm32.def
+lib/wine/libmsdmo.def
+lib/wine/libmsimg32.def
+lib/wine/libmsnet32.def
+lib/wine/libmsrle32.def
+lib/wine/libmsvcrt.def
+lib/wine/libmsvcrt20.def
+lib/wine/libmsvfw32.def
+lib/wine/libnetapi32.def
+lib/wine/libntdll.def
 lib/wine/libntdll.dll.so
+lib/wine/libodbc32.def
+lib/wine/libole32.def
+lib/wine/liboleaut32.def
+lib/wine/libolecli32.def
+lib/wine/liboledlg.def
+lib/wine/libolepro32.def
+lib/wine/libolesvr32.def
+lib/wine/libopengl32.def
+lib/wine/libpsapi.def
+lib/wine/libqcap.def
+lib/wine/libquartz.def
+lib/wine/librasapi32.def
+lib/wine/libriched32.def
+lib/wine/librpcrt4.def
+lib/wine/libserialui.def
+lib/wine/libsetupapi.def
+lib/wine/libshdocvw.def
+lib/wine/libshell32.def
+lib/wine/libshfolder.def
+lib/wine/libshlwapi.def
+lib/wine/libsnmpapi.def
+lib/wine/libsti.def
+lib/wine/libtapi32.def
+lib/wine/libttydrv.def
+lib/wine/libtwain_32.def
+lib/wine/liburl.def
+lib/wine/liburlmon.def
+lib/wine/libuser32.def
+lib/wine/libversion.def
+lib/wine/libw32skrnl.def
 lib/wine/libwine.so
 lib/wine/libwine.so.1
+lib/wine/libwinedos.def
+lib/wine/libwineps.def
 lib/wine/libwine_unicode.so
 lib/wine/libwine_unicode.so.1
 lib/wine/libwine_uuid.a
+lib/wine/libwininet.def
+lib/wine/libwinmm.def
+lib/wine/libwinnls32.def
+lib/wine/libwinspool.def
+lib/wine/libwintab32.def
+lib/wine/libwintrust.def
+lib/wine/libwnaspi32.def
+lib/wine/libwow32.def
+lib/wine/libws2_32.def
+lib/wine/libwsock32.def
+lib/wine/libx11drv.def
 lib/wine/lz32.dll.so
 lib/wine/lzexpand.dll.so
 lib/wine/mapi32.dll.so
@@ -340,6 +430,8 @@ lib/wine/regedit.exe.so
 lib/wine/regsvr32.exe.so
 lib/wine/riched32.dll.so
 lib/wine/rpcrt4.dll.so
+lib/wine/rpcss.exe.so
+lib/wine/rundll32.exe.so
 lib/wine/serialui.dll.so
 lib/wine/setupapi.dll.so
 lib/wine/setupx.dll.so
@@ -379,8 +471,8 @@ lib/wine/wineaudioio.drv.so
 lib/wine/wineconsole.exe.so
 lib/wine/winedbg.exe.so
 lib/wine/winedos.dll.so
-lib/wine/winedos16.dll.so
 lib/wine/winefile.exe.so
+lib/wine/winejack.drv.so
 lib/wine/winemine.exe.so
 lib/wine/winemp3.acm.so
 lib/wine/wineoss.drv.so
@@ -396,6 +488,8 @@ lib/wine/winnls.dll.so
 lib/wine/winnls32.dll.so
 lib/wine/winsock.dll.so
 lib/wine/winspool.drv.so
+lib/wine/wintab.dll.so
+lib/wine/wintab32.dll.so
 lib/wine/wintrust.dll.so
 lib/wine/winver.exe.so
 lib/wine/wnaspi32.dll.so
@@ -420,5 +514,5 @@ lib/wine/winedefault.reg
 @dirrm lib/wine
 @dirrm include/wine/msvcrt/sys
 @dirrm include/wine/msvcrt
-@dirrm include/wine/wine
+@dirrm include/wine/windows
 @dirrm include/wine