From 2c548cb2d28ae52b4958e493cf4797e95abb49e1 Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 14 Jan 2005 13:00:05 +0000 Subject: Changes 20050111: - Many OLE bug fixes and improvements. - A lot more work on the MSI dll. - Update regions now handled in the Wine server. - Beginnings of typelib generation in the IDL compiler. - Many janitorial cleanups. - Lots of bug fixes. --- emulators/wine/Makefile | 6 ++-- emulators/wine/PLIST | 66 +++++++++++++++++++++++++++++++++++++++-- emulators/wine/distinfo | 17 +++++------ emulators/wine/patches/patch-aa | 6 ++-- emulators/wine/patches/patch-ab | 4 +-- emulators/wine/patches/patch-ac | 8 ++--- emulators/wine/patches/patch-ad | 6 ++-- emulators/wine/patches/patch-ae | 23 +++++++------- emulators/wine/patches/patch-af | 17 ----------- 9 files changed, 96 insertions(+), 57 deletions(-) delete mode 100644 emulators/wine/patches/patch-af diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 891be16531f..efdffaade7d 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,9 +1,7 @@ -# $NetBSD: Makefile,v 1.75 2004/10/03 00:14:41 tv Exp $ -# +# $NetBSD: Makefile,v 1.76 2005/01/14 13:00:05 adam Exp $ -DISTNAME= Wine-20040505 +DISTNAME= Wine-20050111 PKGNAME= ${DISTNAME:S/W/w/} -PKGREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://www.ibiblio.org/pub/Linux/ALPHA/wine/development/ \ ${MASTER_SITE_SOURCEFORGE:=wine/} \ diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST index bb315973ec1..5fb32ceec70 100644 --- a/emulators/wine/PLIST +++ b/emulators/wine/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.26 2004/05/06 15:51:35 adam Exp $ +@comment $NetBSD: PLIST,v 1.27 2005/01/14 13:00:05 adam Exp $ bin/function_grep.pl bin/notepad bin/progman @@ -12,7 +12,6 @@ bin/wineboot bin/winebrowser bin/winebuild bin/winecfg -bin/wineclipsrv bin/wineconsole bin/winecpp bin/winedbg @@ -70,6 +69,9 @@ include/wine/msvcrt/wchar.h include/wine/msvcrt/wctype.h include/wine/unicode.h include/wine/windows/accctrl.h +include/wine/windows/aclapi.h +include/wine/windows/activscp.h +include/wine/windows/activscp.idl include/wine/windows/amstream.h include/wine/windows/amstream.idl include/wine/windows/amvideo.h @@ -82,6 +84,7 @@ include/wine/windows/axcore.idl include/wine/windows/axextend.idl include/wine/windows/basetsd.h include/wine/windows/cderr.h +include/wine/windows/cfgmgr32.h include/wine/windows/cguid.h include/wine/windows/comcat.h include/wine/windows/comcat.idl @@ -113,9 +116,12 @@ include/wine/windows/ddrawi.h include/wine/windows/ddstream.h include/wine/windows/ddstream.idl include/wine/windows/devenum.idl +include/wine/windows/devguid.h include/wine/windows/digitalv.h include/wine/windows/dinput.h include/wine/windows/dispdib.h +include/wine/windows/dispex.h +include/wine/windows/dispex.idl include/wine/windows/dlgs.h include/wine/windows/dls1.h include/wine/windows/dls2.h @@ -143,6 +149,7 @@ include/wine/windows/dsound.h include/wine/windows/dxdiag.h include/wine/windows/dxerr8.h include/wine/windows/dxerr9.h +include/wine/windows/dxfile.h include/wine/windows/dyngraph.idl include/wine/windows/evcode.h include/wine/windows/excpt.h @@ -161,6 +168,9 @@ include/wine/windows/iphlpapi.h include/wine/windows/ipifcons.h include/wine/windows/iprtrmib.h include/wine/windows/iptypes.h +include/wine/windows/ks.h +include/wine/windows/ksguid.h +include/wine/windows/ksmedia.h include/wine/windows/lm.h include/wine/windows/lmaccess.h include/wine/windows/lmapibuf.h @@ -185,6 +195,8 @@ include/wine/windows/mcx.h include/wine/windows/mediaerr.h include/wine/windows/mediaobj.h include/wine/windows/minmax.h +include/wine/windows/mlang.h +include/wine/windows/mlang.idl include/wine/windows/mmddk.h include/wine/windows/mmreg.h include/wine/windows/mmstream.h @@ -193,6 +205,10 @@ include/wine/windows/mmsystem.h include/wine/windows/msacm.h include/wine/windows/msacmdlg.h include/wine/windows/msacmdrv.h +include/wine/windows/mscat.h +include/wine/windows/mshtmdid.h +include/wine/windows/mshtml.h +include/wine/windows/mshtml.idl include/wine/windows/msi.h include/wine/windows/msiquery.h include/wine/windows/mssip.h @@ -222,6 +238,8 @@ include/wine/windows/oleidl.h include/wine/windows/oleidl.idl include/wine/windows/pktdef.h include/wine/windows/poppack.h +include/wine/windows/propidl.h +include/wine/windows/propidl.idl include/wine/windows/prsht.h include/wine/windows/psapi.h include/wine/windows/pshpack1.h @@ -240,7 +258,9 @@ include/wine/windows/rpcdcep.h include/wine/windows/rpcndr.h include/wine/windows/rpcnterr.h include/wine/windows/rpcproxy.h +include/wine/windows/schemadef.h include/wine/windows/sddl.h +include/wine/windows/secext.h include/wine/windows/servprov.h include/wine/windows/servprov.idl include/wine/windows/setupapi.h @@ -287,6 +307,7 @@ include/wine/windows/wininet.h include/wine/windows/winioctl.h include/wine/windows/winnetwk.h include/wine/windows/winnls.h +include/wine/windows/winnls32.h include/wine/windows/winnt.h include/wine/windows/winreg.h include/wine/windows/winres.h @@ -298,6 +319,7 @@ include/wine/windows/winsvc.h include/wine/windows/wintab.h include/wine/windows/wintabx.h include/wine/windows/winternl.h +include/wine/windows/wintrust.h include/wine/windows/winuser.h include/wine/windows/winver.h include/wine/windows/wnaspi32.h @@ -306,6 +328,7 @@ include/wine/windows/ws2spi.h include/wine/windows/ws2tcpip.h include/wine/windows/wshisotp.h include/wine/windows/wsipx.h +include/wine/windows/wsnwlink.h include/wine/windows/wtypes.h include/wine/windows/wtypes.idl include/wine/windows/xcmc.h @@ -316,6 +339,7 @@ lib/libwine_unicode.so lib/libwine_unicode.so.1 lib/wine/advapi32.dll.so lib/wine/amstream.dll.so +lib/wine/atl.dll.so lib/wine/avicap32.dll.so lib/wine/avifil32.dll.so lib/wine/avifile.dll.so @@ -341,7 +365,9 @@ lib/wine/ctl3dv2.dll.so lib/wine/d3d8.dll.so lib/wine/d3d9.dll.so lib/wine/d3dim.dll.so +lib/wine/d3drm.dll.so lib/wine/d3dx8.dll.so +lib/wine/d3dxof.dll.so lib/wine/dbghelp.dll.so lib/wine/dciman32.dll.so lib/wine/ddeml.dll.so @@ -382,12 +408,14 @@ lib/wine/imagehlp.dll.so lib/wine/imm.dll.so lib/wine/imm32.dll.so lib/wine/iphlpapi.dll.so +lib/wine/itss.dll.so lib/wine/joystick.drv.so lib/wine/kernel32.dll.so lib/wine/keyboard.drv.so lib/wine/krnl386.exe.so lib/wine/libadvapi32.def lib/wine/libamstream.def +lib/wine/libatl.def lib/wine/libavicap32.def lib/wine/libavifil32.def lib/wine/libcabinet.def @@ -403,7 +431,9 @@ lib/wine/libctl3d32.def lib/wine/libd3d8.def lib/wine/libd3d9.def lib/wine/libd3dim.def +lib/wine/libd3drm.def lib/wine/libd3dx8.def +lib/wine/libd3dxof.def lib/wine/libdbghelp.def lib/wine/libdciman32.def lib/wine/libddraw.def @@ -437,9 +467,11 @@ lib/wine/libicmp.def lib/wine/libimagehlp.def lib/wine/libimm32.def lib/wine/libiphlpapi.def +lib/wine/libitss.def lib/wine/libkernel32.def lib/wine/liblz32.def lib/wine/libmapi32.def +lib/wine/libmlang.def lib/wine/libmpr.def lib/wine/libmsacm32.def lib/wine/libmsdmo.def @@ -474,6 +506,7 @@ lib/wine/librasapi32.def lib/wine/libriched32.def lib/wine/librpcrt4.def lib/wine/librsabase.def +lib/wine/librsaenh.def lib/wine/libsecur32.def lib/wine/libserialui.def lib/wine/libsetupapi.def @@ -483,6 +516,7 @@ lib/wine/libshfolder.def lib/wine/libshlwapi.def lib/wine/libsnmpapi.def lib/wine/libsti.def +lib/wine/libstrmiids.a lib/wine/libtapi32.def lib/wine/libttydrv.def lib/wine/libtwain_32.def @@ -518,6 +552,7 @@ lib/wine/mcicda.drv.so lib/wine/mciseq.drv.so lib/wine/mciwave.drv.so lib/wine/midimap.drv.so +lib/wine/mlang.dll.so lib/wine/mmdevldr.vxd.so lib/wine/mmsystem.dll.so lib/wine/monodebg.vxd.so @@ -531,6 +566,7 @@ lib/wine/msdmo.dll.so lib/wine/msg711.acm.so lib/wine/mshtml.dll.so lib/wine/msi.dll.so +lib/wine/msiexec.exe.so lib/wine/msimg32.dll.so lib/wine/msisys.ocx.so lib/wine/msnet32.dll.so @@ -576,6 +612,7 @@ lib/wine/riched32.dll.so lib/wine/rpcrt4.dll.so lib/wine/rpcss.exe.so lib/wine/rsabase.dll.so +lib/wine/rsaenh.dll.so lib/wine/rundll32.exe.so lib/wine/secur32.dll.so lib/wine/serialui.dll.so @@ -597,6 +634,7 @@ lib/wine/tapi32.dll.so lib/wine/taskmgr.exe.so lib/wine/toolhelp.dll.so lib/wine/ttydrv.dll.so +lib/wine/twain.dll.so lib/wine/twain_32.dll.so lib/wine/typelib.dll.so lib/wine/unicows.dll.so @@ -665,18 +703,42 @@ lib/wine/x11drv.dll.so man/man1/widl.1 man/man1/wine.1 man/man1/winebuild.1 +man/man1/winedbg.1 man/man1/winedump.1 man/man1/winemaker.1 man/man1/wmc.1 man/man1/wrc.1 man/man5/wine.conf.5 share/aclocal/wine.m4 +share/applications/wine.desktop +share/fonts/wine/wine_coure.fon +share/fonts/wine/wine_couree.fon +share/fonts/wine/wine_courer.fon +share/fonts/wine/wine_marlett.ttf +share/fonts/wine/wine_sserife.fon +share/fonts/wine/wine_sserifee.fon +share/fonts/wine/wine_sserifer.fon +share/fonts/wine/wine_vgasys.fon +share/fonts/wine/wine_vgasyse.fon +share/fonts/wine/wine_vgasysr.fon share/wine/config share/wine/generic.ppd share/wine/wine.inf @dirrm share/wine +@dirrm share/fonts/wine @dirrm lib/wine @dirrm include/wine/windows @dirrm include/wine/msvcrt/sys @dirrm include/wine/msvcrt @dirrm include/wine +include/wine/windows/advpub.h +include/wine/windows/control.idl +include/wine/windows/exdispid.h +include/wine/windows/htmlhelp.h +include/wine/windows/mediaobj.idl +include/wine/windows/reason.h +include/wine/windows/richole.idl +lib/wine/advpack.dll.so +lib/wine/libadvpack.def +lib/wine/libmscms.def +lib/wine/mscms.dll.so diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo index 5595fa21775..681ca8ccd7a 100644 --- a/emulators/wine/distinfo +++ b/emulators/wine/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.26 2004/08/28 21:09:08 ben Exp $ +$NetBSD: distinfo,v 1.27 2005/01/14 13:00:05 adam Exp $ -SHA1 (Wine-20040505.tar.gz) = 42de0d3323cfe001eb6c720d25cd1c531ec7928d -Size (Wine-20040505.tar.gz) = 10499070 bytes -SHA1 (patch-aa) = 1e08fd0443c7c34271aab16b8434457105f93588 -SHA1 (patch-ab) = 313180ea924c224ebecad0b8764584230497f8ed -SHA1 (patch-ac) = e0b2c811a7bbcd07a7ca65d7eda30e1a7e4acef7 -SHA1 (patch-ad) = 28c15181eab48f1e82d10046b77fa1ebac3c4ef6 -SHA1 (patch-ae) = 691113bab9f24bcbabd786e7f1ff2fe0933d721f -SHA1 (patch-af) = 4cc9be69097560f0b25730c693a18b4875282404 +SHA1 (Wine-20050111.tar.gz) = 797aedd455bee27095543f5f9895f2e09732ce8f +Size (Wine-20050111.tar.gz) = 11477802 bytes +SHA1 (patch-aa) = 951e96ae5e09c7579249bbb1266fc70a2b13f8c2 +SHA1 (patch-ab) = 7feb8eaad0005ea3b501967ca070a4b397d707c2 +SHA1 (patch-ac) = 95749cc7b7c898d5ec3eb1f323ffa73c27090dbd +SHA1 (patch-ad) = 92abc177dc37ed983ec6079cd08ad7a1472e178a +SHA1 (patch-ae) = a18b1c01d61d26fbe1a82dca82ea0d76df0c8bcd diff --git a/emulators/wine/patches/patch-aa b/emulators/wine/patches/patch-aa index 92f91d69749..9f6b73ddcd4 100644 --- a/emulators/wine/patches/patch-aa +++ b/emulators/wine/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.13 2004/04/09 12:44:22 adam Exp $ +$NetBSD: patch-aa,v 1.14 2005/01/14 13:00:05 adam Exp $ ---- Make.rules.in.orig 2004-03-24 03:34:01.000000000 +0000 +--- Make.rules.in.orig 2004-09-13 18:14:55.000000000 +0000 +++ Make.rules.in -@@ -103,7 +103,7 @@ conf_manext = 5 +@@ -106,7 +106,7 @@ conf_manext = 5 CLEAN_FILES = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \ *.flc *.spec.c *.spec.def *.dbg.c *.tab.c *.tab.h @LEX_OUTPUT_ROOT@.c core diff --git a/emulators/wine/patches/patch-ab b/emulators/wine/patches/patch-ab index 4cd5bad0e4c..e832ae2fd40 100644 --- a/emulators/wine/patches/patch-ab +++ b/emulators/wine/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.16 2003/10/17 13:54:18 adam Exp $ +$NetBSD: patch-ab,v 1.17 2005/01/14 13:00:05 adam Exp $ ---- dlls/ntdll/cdrom.c.orig 2003-10-08 04:59:22.000000000 +0200 +--- dlls/ntdll/cdrom.c.orig 2004-06-15 00:45:01.000000000 +0000 +++ dlls/ntdll/cdrom.c @@ -61,6 +61,16 @@ #endif diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac index 7426fee2dd2..36907a5d173 100644 --- a/emulators/wine/patches/patch-ac +++ b/emulators/wine/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.15 2004/05/06 15:51:35 adam Exp $ +$NetBSD: patch-ac,v 1.16 2005/01/14 13:00:05 adam Exp $ ---- configure.orig 2004-05-06 00:40:39.000000000 +0000 +--- configure.orig 2005-01-11 19:08:58.000000000 +0000 +++ configure -@@ -17852,7 +17852,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -17810,7 +17810,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.15 2004/05/06 15:51:35 adam Exp $ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -19522,7 +19522,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c +@@ -19480,7 +19480,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-ad b/emulators/wine/patches/patch-ad index 37175db5dd6..23bd41e66ee 100644 --- a/emulators/wine/patches/patch-ad +++ b/emulators/wine/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.6 2003/12/16 11:10:47 adam Exp $ +$NetBSD: patch-ad,v 1.7 2005/01/14 13:00:05 adam Exp $ ---- dlls/iphlpapi/ifenum.c.orig 2003-11-30 06:03:21.000000000 +0000 +--- dlls/iphlpapi/ifenum.c.orig 2004-12-23 18:41:05.000000000 +0000 +++ dlls/iphlpapi/ifenum.c -@@ -56,6 +56,7 @@ +@@ -55,6 +55,7 @@ #endif #include diff --git a/emulators/wine/patches/patch-ae b/emulators/wine/patches/patch-ae index a1c0537b6c6..d43a0955622 100644 --- a/emulators/wine/patches/patch-ae +++ b/emulators/wine/patches/patch-ae @@ -1,15 +1,12 @@ -$NetBSD: patch-ae,v 1.9 2004/02/16 14:07:35 adam Exp $ +$NetBSD: patch-ae,v 1.10 2005/01/14 13:00:05 adam Exp $ ---- programs/winedbg/elf.c.orig 2004-02-16 14:40:16.000000000 +0000 -+++ programs/winedbg/elf.c -@@ -69,6 +69,10 @@ +--- programs/winetest/winetest.rc.orig 2004-06-18 15:12:26.000000000 +0000 ++++ programs/winetest/winetest.rc +@@ -21,7 +21,6 @@ + #include + #include + #include "resource.h" +-#include "tests.rc" - WINE_DEFAULT_DEBUG_CHANNEL(winedbg); - -+#ifndef STN_UNDEF -+# define STN_UNDEF 0 -+#endif -+ - typedef struct tagELF_DBG_INFO - { - void *elf_addr; + IDD_STATUS DIALOG 0, 0, 160, 140 + STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX diff --git a/emulators/wine/patches/patch-af b/emulators/wine/patches/patch-af deleted file mode 100644 index 96a4d67ac76..00000000000 --- a/emulators/wine/patches/patch-af +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-af,v 1.8 2004/08/28 21:09:08 ben Exp $ - ---- dlls/winmm/wineoss/audio.c.orig Tue May 4 18:09:24 2004 -+++ dlls/winmm/wineoss/audio.c -@@ -958,10 +958,10 @@ LONG OSS_WaveInit(void) - for (i = 0; i < MAX_WAVEDRV; ++i) - { - if (i == 0) { -- sprintf((char *)OSS_Devices[i].dev_name, "/dev/dsp"); -+ sprintf((char *)OSS_Devices[i].dev_name, DEVOSSAUDIO); - sprintf((char *)OSS_Devices[i].mixer_name, "/dev/mixer"); - } else { -- sprintf((char *)OSS_Devices[i].dev_name, "/dev/dsp%d", i); -+ sprintf((char *)OSS_Devices[i].dev_name, "%s%d", DEVOSSAUDIO, i); - sprintf((char *)OSS_Devices[i].mixer_name, "/dev/mixer%d", i); - } - -- cgit v1.2.3