Changes 20050725:

* Beginnings of theme support in common controls.
* Many MSHTML improvements.
* A bunch of OLE fixes for InstallShield installers.
* Many Direct3D fixes and improvements.
* Beginnings of LDAP support.
* Various cleanups after removal of the config file.
* Lots of bug fixes.

8 files changed, 79 insertions, 37 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 830d11a7480..70f1fde7bad 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.87 2005/06/01 18:02:48 jlam Exp $
+# $NetBSD: Makefile,v 1.88 2005/07/26 13:24:36 adam Exp $
 
-DISTNAME=	Wine-20050524
+DISTNAME=	Wine-20050725
 PKGNAME=	${DISTNAME:S/W/w/}
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wine/} \
@@ -19,10 +19,10 @@ ONLY_FOR_PLATFORM=	NetBSD-1.5Z*-i386 NetBSD-1.6*-i386 NetBSD-[2-9]*-i386
 ONLY_FOR_PLATFORM+=	FreeBSD*-i386 Linux*-i386 SunOS*-i386 Darwin*-i386
 
 WRKSRC=		 	${WRKDIR}/${DISTNAME:S/W/w/}
-USE_TOOLS+=		bison gmake
 USE_LIBTOOL=		yes
+USE_TOOLS+=		bison gmake
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--without-curses --disable-trace #--disable-debug
+CONFIGURE_ARGS+=	--without-curses --disable-trace --disable-debug
 CONFIGURE_ENV+=		ac_cv_path_ARTSCCONFIG=${TRUE}
 CONFIGURE_ENV+=		ac_cv_prog_sane_devel=no
 UNLIMIT_RESOURCES=	datasize
@@ -39,13 +39,6 @@ LIBS+=			${LDFLAGS}
 
 .include "options.mk"
 
-EGDIR=			${PREFIX}/share/wine
-
-post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/documentation/samples/config ${EGDIR}/config
-	${RMDIR} ${PREFIX}/man/man3w
-
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
@@ -53,7 +46,6 @@ post-install:
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
-
 .include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST
index fd6d08f8020..912ec21f29e 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2005/05/25 08:23:43 adam Exp $
+@comment $NetBSD: PLIST,v 1.32 2005/07/26 13:24:36 adam Exp $
 bin/function_grep.pl
 bin/msiexec
 bin/notepad
@@ -79,6 +79,7 @@ include/wine/windows/amstream.h
 include/wine/windows/amstream.idl
 include/wine/windows/amvideo.h
 include/wine/windows/amvideo.idl
+include/wine/windows/appmgmt.h
 include/wine/windows/audevcod.h
 include/wine/windows/austream.h
 include/wine/windows/austream.idl
@@ -86,6 +87,7 @@ include/wine/windows/aviriff.h
 include/wine/windows/axcore.idl
 include/wine/windows/axextend.idl
 include/wine/windows/basetsd.h
+include/wine/windows/basetyps.h
 include/wine/windows/cderr.h
 include/wine/windows/cfgmgr32.h
 include/wine/windows/cguid.h
@@ -145,6 +147,8 @@ include/wine/windows/dmusici.h
 include/wine/windows/dmusics.h
 include/wine/windows/docobj.h
 include/wine/windows/docobj.idl
+include/wine/windows/downloadmgr.h
+include/wine/windows/downloadmgr.idl
 include/wine/windows/dpaddr.h
 include/wine/windows/dplay.h
 include/wine/windows/dplay8.h
@@ -170,6 +174,7 @@ include/wine/windows/guiddef.h
 include/wine/windows/htmlhelp.h
 include/wine/windows/icm.h
 include/wine/windows/icmpapi.h
+include/wine/windows/idispids.h
 include/wine/windows/imagehlp.h
 include/wine/windows/imm.h
 include/wine/windows/initguid.h
@@ -206,6 +211,8 @@ include/wine/windows/mcx.h
 include/wine/windows/mediaerr.h
 include/wine/windows/mediaobj.h
 include/wine/windows/mediaobj.idl
+include/wine/windows/mimeinfo.h
+include/wine/windows/mimeinfo.idl
 include/wine/windows/minmax.h
 include/wine/windows/mlang.h
 include/wine/windows/mlang.idl
@@ -231,6 +238,9 @@ include/wine/windows/mswsock.h
 include/wine/windows/msxml.h
 include/wine/windows/msxml.idl
 include/wine/windows/msxmldid.h
+include/wine/windows/msxml2.h
+include/wine/windows/msxml2.idl
+include/wine/windows/msxml2did.h
 include/wine/windows/nb30.h
 include/wine/windows/npapi.h
 include/wine/windows/nspapi.h
@@ -301,6 +311,7 @@ include/wine/windows/shobjidl.idl
 include/wine/windows/shtypes.h
 include/wine/windows/shtypes.idl
 include/wine/windows/sipbase.h
+include/wine/windows/snmp.h
 include/wine/windows/sql.h
 include/wine/windows/sqlext.h
 include/wine/windows/sqltypes.h
@@ -310,6 +321,7 @@ include/wine/windows/strmif.h
 include/wine/windows/strmif.idl
 include/wine/windows/tapi.h
 include/wine/windows/tchar.h
+include/wine/windows/textserv.h
 include/wine/windows/tlhelp32.h
 include/wine/windows/tmschema.h
 include/wine/windows/unknwn.h
@@ -331,6 +343,7 @@ include/wine/windows/winerror.h
 include/wine/windows/wingdi.h
 include/wine/windows/wininet.h
 include/wine/windows/winioctl.h
+include/wine/windows/winldap.h
 include/wine/windows/winnetwk.h
 include/wine/windows/winnls.h
 include/wine/windows/winnls32.h
@@ -360,11 +373,18 @@ include/wine/windows/wtsapi32.h
 include/wine/windows/wtypes.h
 include/wine/windows/wtypes.idl
 include/wine/windows/xcmc.h
+include/wine/windows/xmldom.h
+include/wine/windows/xmldom.idl
+include/wine/windows/xmldomdid.h
+include/wine/windows/xmldso.h
+include/wine/windows/xmldso.idl
+include/wine/windows/xmldsodid.h
 include/wine/windows/zmouse.h
 lib/libwine.so
 lib/libwine.so.1
 lib/libwine_unicode.so
 lib/libwine_unicode.so.1
+lib/wine/activeds.dll.so
 lib/wine/advapi32.dll.so
 lib/wine/advpack.dll.so
 lib/wine/amstream.dll.so
@@ -428,6 +448,7 @@ lib/wine/gdi.exe.so
 lib/wine/gdi32.dll.so
 lib/wine/glu32.dll.so
 lib/wine/glut32.dll.so
+lib/wine/hh.exe.so
 lib/wine/hhctrl.ocx.so
 lib/wine/iccvid.dll.so
 lib/wine/icinfo.exe.so
@@ -443,6 +464,7 @@ lib/wine/joystick.drv.so
 lib/wine/kernel32.dll.so
 lib/wine/keyboard.drv.so
 lib/wine/krnl386.exe.so
+lib/wine/libactiveds.def
 lib/wine/libadvapi32.def
 lib/wine/libadvpack.def
 lib/wine/libamstream.def
@@ -569,6 +591,7 @@ lib/wine/libwinnls32.def
 lib/wine/libwinspool.def
 lib/wine/libwintab32.def
 lib/wine/libwintrust.def
+lib/wine/libwldap32.def
 lib/wine/libwnaspi32.def
 lib/wine/libwow32.def
 lib/wine/libws2_32.def
@@ -582,7 +605,7 @@ lib/wine/mciavi.drv.so
 lib/wine/mcicda.drv.so
 lib/wine/mciseq.drv.so
 lib/wine/mciwave.drv.so
-lib/wine/midimap.drv.so
+lib/wine/midimap.dll.so
 lib/wine/mlang.dll.so
 lib/wine/mmdevldr.vxd.so
 lib/wine/mmsystem.dll.so
@@ -662,6 +685,7 @@ lib/wine/shlwapi.dll.so
 lib/wine/snmpapi.dll.so
 lib/wine/sound.dll.so
 lib/wine/start.exe.so
+lib/wine/stdole2.tlb.so
 lib/wine/stdole32.tlb.so
 lib/wine/sti.dll.so
 lib/wine/storage.dll.so
@@ -732,6 +756,7 @@ lib/wine/wintab.dll.so
 lib/wine/wintab32.dll.so
 lib/wine/wintrust.dll.so
 lib/wine/winver.exe.so
+lib/wine/wldap32.dll.so
 lib/wine/wnaspi32.dll.so
 lib/wine/wow32.dll.so
 lib/wine/wprocs.dll.so
@@ -748,7 +773,6 @@ man/man1/winegcc.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
@@ -761,7 +785,7 @@ 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
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index cc6948180b0..fa34c96d9bf 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.33 2005/06/05 06:14:17 minskim Exp $
+$NetBSD: distinfo,v 1.34 2005/07/26 13:24:36 adam Exp $
 
-SHA1 (Wine-20050524.tar.gz) = 109fac3a1b9158a4d23ca8c003f6716dd8caf73f
-RMD160 (Wine-20050524.tar.gz) = 682795fd1cd156203c5766554f74e19e5060fa34
-Size (Wine-20050524.tar.gz) = 11844661 bytes
-SHA1 (patch-aa) = b4a38d650eb96b122691d2fe17bc3a5a425e203c
-SHA1 (patch-ab) = 90577d30a02af40cef0a55156a9c23231f3d746b
-SHA1 (patch-ac) = 113ca5d720aa951ed5dfb19df18ce691f5da7c28
+SHA1 (Wine-20050725.tar.gz) = dfda93cc903b9ad9eeab076e9fbdbbb09ca59c49
+RMD160 (Wine-20050725.tar.gz) = a86fda53cf9c3a36ab3bf42ecb66740bdcbe3174
+Size (Wine-20050725.tar.gz) = 12205994 bytes
+SHA1 (patch-aa) = 51116310baa1e00d6eeb444e0dd3a9639c02505a
+SHA1 (patch-ab) = 66c1f1ec98674d15c7a72e8ac16105c28aa25e91
+SHA1 (patch-ac) = c9098a31acfa7b5f22024f1437b813f2dac53e95
 SHA1 (patch-ad) = 92abc177dc37ed983ec6079cd08ad7a1472e178a
 SHA1 (patch-ae) = dbd40183fb8e1f1d7af9ab4e51910a2227524e3c
-SHA1 (patch-af) = 803e74ff592ce39f520c631a503d90b8abee190d
+SHA1 (patch-af) = a8eb0a12b990ce5431498bff51bd2ad6a0b9d7b8
 SHA1 (patch-ag) = 656f9667da542489595d1db65c84579b3dfce279
+SHA1 (patch-ah) = 9be209efc28693b98354624af96e81b64d2fbc6c
diff --git a/emulators/wine/patches/patch-aa b/emulators/wine/patches/patch-aa
index c7f4a724031..25e12babd8b 100644
--- a/emulators/wine/patches/patch-aa
+++ b/emulators/wine/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.15 2005/05/25 08:23:43 adam Exp $
+$NetBSD: patch-aa,v 1.16 2005/07/26 13:24:36 adam Exp $
 
---- Make.rules.in.orig	2005-05-07 12:39:58.000000000 +0000
+--- Make.rules.in.orig	2005-07-20 17:48:26.000000000 +0000
 +++ Make.rules.in
 @@ -107,7 +107,7 @@ conf_manext     = 5
  CLEAN_FILES     = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
diff --git a/emulators/wine/patches/patch-ab b/emulators/wine/patches/patch-ab
index e1ad0a89ca0..5c41b4dac04 100644
--- a/emulators/wine/patches/patch-ab
+++ b/emulators/wine/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.18 2005/05/25 08:23:43 adam Exp $
+$NetBSD: patch-ab,v 1.19 2005/07/26 13:24:36 adam Exp $
 
---- dlls/ntdll/cdrom.c.orig	2005-05-06 16:22:55.000000000 +0000
+--- dlls/ntdll/cdrom.c.orig	2005-07-20 10:28:27.000000000 +0000
 +++ dlls/ntdll/cdrom.c
-@@ -63,6 +63,16 @@
+@@ -64,6 +64,16 @@
  #endif
  #ifdef HAVE_LINUX_CDROM_H
  # include <linux/cdrom.h>
diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac
index 843cae3bb5e..316d1a34bc0 100644
--- a/emulators/wine/patches/patch-ac
+++ b/emulators/wine/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.18 2005/05/25 08:23:43 adam Exp $
+$NetBSD: patch-ac,v 1.19 2005/07/26 13:24:36 adam Exp $
 
---- configure.orig	2005-05-24 14:16:16.000000000 +0000
+--- configure.orig	2005-07-25 12:22:05.000000000 +0000
 +++ configure
-@@ -17799,7 +17799,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -17692,7 +17692,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.18 2005/05/25 08:23:43 adam Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -19469,7 +19469,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -19594,7 +19594,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
index 4893934f30d..f7aea013548 100644
--- a/emulators/wine/patches/patch-af
+++ b/emulators/wine/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.12 2005/05/25 08:23:43 adam Exp $
+$NetBSD: patch-af,v 1.13 2005/07/26 13:24:36 adam Exp $
 
---- dlls/ntdll/signal_i386.c.orig	2005-05-16 17:52:10.000000000 +0000
+--- dlls/ntdll/signal_i386.c.orig	2005-07-03 11:24:54.000000000 +0000
 +++ dlls/ntdll/signal_i386.c
-@@ -205,7 +205,7 @@ typedef struct trapframe SIGCONTEXT;
+@@ -204,7 +204,7 @@ typedef struct trapframe SIGCONTEXT;
  
  #endif /* bsdi */
  
@@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.12 2005/05/25 08:23:43 adam Exp $
  
  typedef struct sigcontext SIGCONTEXT;
  
-@@ -305,7 +305,40 @@ typedef struct ucontext SIGCONTEXT;
+@@ -324,7 +324,40 @@ typedef struct sigcontext SIGCONTEXT;
  
  #endif /* __APPLE__ */
  
diff --git a/emulators/wine/patches/patch-ah b/emulators/wine/patches/patch-ah
new file mode 100644
index 00000000000..c7592f580fb
--- /dev/null
+++ b/emulators/wine/patches/patch-ah
@@ -0,0 +1,25 @@
+$NetBSD: patch-ah,v 1.5 2005/07/26 13:24:36 adam Exp $
+
+--- tools/Makefile.in.orig	2005-07-26 12:12:26.000000000 +0000
++++ tools/Makefile.in
+@@ -49,16 +49,16 @@ make_ctests: make_ctests.o
+ 	$(CC) $(CFLAGS) -o make_ctests make_ctests.o
+ 
+ fnt2bdf: fnt2bdf.o
+-	$(CC) $(CFLAGS) -o fnt2bdf fnt2bdf.o $(LIBPORT)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o fnt2bdf fnt2bdf.o $(LIBPORT)
+ 
+ fnt2fon: fnt2fon.o
+-	$(CC) $(CFLAGS) -o fnt2fon fnt2fon.o $(LIBPORT)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o fnt2fon fnt2fon.o $(LIBPORT)
+ 
+ sfnt2fnt: sfnt2fnt.o
+-	$(CC) $(CFLAGS) -o sfnt2fnt sfnt2fnt.o $(LIBUNICODE) $(LIBPORT) $(FREETYPELIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o sfnt2fnt sfnt2fnt.o $(LIBUNICODE) $(LIBPORT) $(FREETYPELIBS)
+ 
+ bin2res: bin2res.o
+-	$(CC) $(CFLAGS) -o bin2res bin2res.o $(LIBPORT)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o bin2res bin2res.o $(LIBPORT)
+ 
+ wineprefixcreate: wineprefixcreate.in
+ 	sed -e 's,@dlldir\@,$(dlldir),g' -e 's,@datadir\@,$(datadir),g' $(SRCDIR)/wineprefixcreate.in >$@ || ($(RM) $@ && false)