Attachment 153157 Details for Bug 197798 – WIne64 support

[patch] WIne64 support

wine-devel2.diff (text/plain), 30.83 KB, created by David Naylor on 2015-02-18 18:54:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Naylor

Created: 2015-02-18 18:54:46 UTC

Size: 30.83 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 378655)
>+++ Makefile	(working copy)
>@@ -42,7 +42,7 @@
> .if !defined(USE_LDCONFIG32)
> USE_LDCONFIG=	${WINELIBDIR} ${WINELIBDIR}/wine
> .endif
>-ONLY_FOR_ARCHS=	i386
>+ONLY_FOR_ARCHS=	i386 amd64
> USES=		bison compiler:c11 desktop-file-utils gmake shebangfix tar:bzip2
> SHEBANG_FILES=	tools/make_requests tools/winemaker \
> 		tools/winedump/function_grep.pl
>@@ -103,8 +103,26 @@
> 			liblcms2.so:${PORTSDIR}/graphics/lcms2 \
> 			libpng.so:${PORTSDIR}/graphics/png
> 
>-.include <bsd.port.options.mk>
>+.include <bsd.port.pre.mk>
> 
>+.if ${ARCH} == amd64
>+CONFIGURE_ARGS+=	--enable-win64 --libdir=${PREFIX}/lib
>+PLIST_SUB+=		WINE32="@comment " WINE64=""
>+
>+.if ${COMPILER_TYPE} == clang
>+CPPFLAGS+=		-D__builtin_ms_va_list=__builtin_va_list \
>+			-D__builtin_ms_va_start=__builtin_va_start \
>+			-D__builtin_ms_va_end=__builtin_va_end \
>+			-D__builtin_ms_va_copy=__builtin_va_copy
>+.endif
>+
>+post-patch:
>+	${REINPLACE_CMD} 's|/wine|/wine64|g' ${WRKSRC}/tools/wineapploader.in
>+
>+.else 
>+PLIST_SUB+=		WINE32="" WINE64="@comment "
>+.endif
>+
> .if ${PORT_OPTIONS:MCOMPHOLIO}
> MASTER_SITES+=	https://github.com/compholio/wine-compholio-daily/archive/:cho
> COMP_DIST=	v${DISTVERSION}.tar.gz
>@@ -135,4 +153,4 @@
> 	${INSTALL_DATA} ${WRKSRC}/programs/winedbg/README ${STAGEDIR}${DOCSDIR}/README.winedbg
> 	${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${STAGEDIR}${DOCSDIR}/README.winedump
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 0)
>+++ files/patch-configure	(working copy)
>@@ -0,0 +1,70 @@
>+commit 1625bb8e07d1dee8f0b6c98466e0185c7c7431be
>+Author: David Naylor <naylor.b.david@gmail.com>
>+Date:   Tue Jan 20 21:55:03 2015 +0200
>+
>+    configure: explicitly set host_cpu for 'amd64'.
>+    
>+    In the case of host starting with 'amd64', the host_cpu variable will not be
>+    set to the correct CPU value of 'x86_64'.  Set it explicitly to the correct
>+    value.
>+
>+diff --git a/configure b/configure
>+index bc2f434..62b2ca3 100755
>+--- configure
>++++ configure
>+@@ -4912,6 +4912,7 @@ $as_echo "no" >&6; }
>+ fi
>+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
>+       fi
>++      host_cpu="x86_64"
>+       TARGETFLAGS="-m64"
>+ 
>+     fi
>+diff --git a/configure.ac b/configure.ac
>+index db26333..9579245 100644
>+--- configure.ac
>++++ configure.ac
>+@@ -165,6 +165,7 @@ case $host in
>+                           [AC_MSG_RESULT([no])
>+                            AC_MSG_ERROR([You need gcc >= 4.4 to build Wine as 64-bit.])])
>+       fi
>++      host_cpu="x86_64"
>+       AC_SUBST(TARGETFLAGS,"-m64")
>+     fi
>+     ;;
>+
>+commit 0d268d62ad93ca1d1cf1c2fead43e2143b5529b3
>+Author: David Naylor <naylor.b.david@gmail.com>
>+Date:   Tue Jan 20 17:54:38 2015 +0200
>+
>+    configure: recognise host starting in 'amd64'.
>+    
>+    FreeBSD uses amd64 to identify a CPU architecture based on AMD's 64-bit
>+    instruction set.
>+
>+diff --git a/configure b/configure
>+index 0431209..bc2f434 100755
>+--- configure
>++++ configure
>+@@ -4852,7 +4852,7 @@ case $host in
>+     fi
>+     with_fontconfig=${with_fontconfig:-no}
>+     ;;
>+-  x86_64*)
>++  x86_64*|amd64*)
>+     if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes"
>+     then
>+       CC="$CC -m32"
>+diff --git a/configure.ac b/configure.ac
>+index a931730..db26333 100644
>+--- configure.ac
>++++ configure.ac
>+@@ -143,7 +143,7 @@ case $host in
>+     fi
>+     with_fontconfig=${with_fontconfig:-no}
>+     ;;
>+-  x86_64*)
>++  x86_64*|amd64*)
>+     if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes"
>+     then
>+       CC="$CC -m32"
>
>Property changes on: files/patch-configure
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-dlls_kernel32_Makefile.in
>===================================================================
>--- files/patch-dlls_kernel32_Makefile.in	(revision 0)
>+++ files/patch-dlls_kernel32_Makefile.in	(working copy)
>@@ -0,0 +1,24 @@
>+commit 595a3ccfe8aa02ccc287f9a4b23a3f177ae220b9
>+Author: David Naylor <naylor.b.david@gmail.com>
>+Date:   Mon Feb 2 22:10:55 2015 +0200
>+
>+    kernel32: force 4096 byte page alignment.
>+    
>+    FreeBSD prefers to use a 0x200000 (super) page alignment however this causes
>+    the image base to be displaced from the requested 0x7b800000.  Forcing a
>+    smaller page size ensures FreeBSD can place the image startin at 0x7b800000.
>+
>+diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in
>+index c09771d..a006c2c 100644
>+--- dlls/kernel32/Makefile.in
>++++ dlls/kernel32/Makefile.in
>+@@ -3,7 +3,8 @@ MODULE    = kernel32.dll
>+ IMPORTLIB = kernel32
>+ IMPORTS   = winecrt0 ntdll
>+ EXTRALIBS = $(COREFOUNDATION_LIBS) $(POLL_LIBS)
>+-EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000
>++EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000 \
>++	-Wl,-z,max-page-size=0x1000
>+ 
>+ C_SRCS = \
>+ 	actctx.c \
>
>Property changes on: files/patch-dlls_kernel32_Makefile.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 378655)
>+++ pkg-plist	(working copy)
>@@ -4,7 +4,8 @@
> bin/regedit
> bin/regsvr32
> bin/widl
>-bin/wine
>+%%WINE32%%bin/wine
>+%%WINE64%%bin/wine64
> bin/wineboot
> bin/winebuild
> bin/winecfg
>@@ -415,7 +416,7 @@
> include/wine/windows/mediaobj.idl
> include/wine/windows/metahost.h
> include/wine/windows/metahost.idl
>-%%COMPHOLIO%%include/wine/windows/mferror.h
>+include/wine/windows/mferror.h
> include/wine/windows/midles.h
> include/wine/windows/mimeinfo.h
> include/wine/windows/mimeinfo.idl
>@@ -493,7 +494,7 @@
> include/wine/windows/ntddscsi.h
> include/wine/windows/ntddstor.h
> include/wine/windows/ntdsapi.h
>-%%COMPHOLIO%%include/wine/windows/ntifs.h
>+%%WINE32%%include/wine/windows/ntifs.h
> include/wine/windows/ntquery.h
> include/wine/windows/ntsecapi.h
> include/wine/windows/ntsecpkg.h
>@@ -783,7 +784,7 @@
> include/wine/windows/xmllite.idl
> include/wine/windows/zmouse.h
> include/wine/windows/ddk/compstui.h
>-%%COMPHOLIO%%include/wine/windows/ddk/csq.h
>+include/wine/windows/ddk/csq.h
> include/wine/windows/ddk/hidsdi.h
> include/wine/windows/ddk/imm.h
> include/wine/windows/ddk/mountmgr.h
>@@ -812,16 +813,16 @@
> lib/wine/amstream.dll.so
> lib/wine/api-ms-win-core-com-l1-1-0.dll.so
> lib/wine/api-ms-win-core-console-l1-1-0.dll.so
>-%%COMPHOLIO%%lib/wine/api-ms-win-core-datetime-l1-1-0.dll.so
>-%%COMPHOLIO%%lib/wine/api-ms-win-core-datetime-l1-1-1.dll.so
>+lib/wine/api-ms-win-core-datetime-l1-1-0.dll.so
>+lib/wine/api-ms-win-core-datetime-l1-1-1.dll.so
> lib/wine/api-ms-win-core-debug-l1-1-1.dll.so
> lib/wine/api-ms-win-core-errorhandling-l1-1-1.dll.so
> lib/wine/api-ms-win-core-errorhandling-l1-1-2.dll.so
>-%%COMPHOLIO%%lib/wine/api-ms-win-core-fibers-l1-1-0.dll.so
>-%%COMPHOLIO%%lib/wine/api-ms-win-core-fibers-l1-1-1.dll.so
>+lib/wine/api-ms-win-core-fibers-l1-1-0.dll.so
>+lib/wine/api-ms-win-core-fibers-l1-1-1.dll.so
> lib/wine/api-ms-win-core-file-l1-2-0.dll.so
>+lib/wine/api-ms-win-core-file-l2-1-0.dll.so
> lib/wine/api-ms-win-core-file-l2-1-1.dll.so
>-%%COMPHOLIO%%lib/wine/api-ms-win-core-file-l2-1-0.dll.so
> lib/wine/api-ms-win-core-handle-l1-1-0.dll.so
> lib/wine/api-ms-win-core-heap-l1-2-0.dll.so
> lib/wine/api-ms-win-core-heap-obsolete-l1-1-0.dll.so
>@@ -830,7 +831,7 @@
> lib/wine/api-ms-win-core-kernel32-legacy-l1-1-0.dll.so
> lib/wine/api-ms-win-core-libraryloader-l1-1-1.dll.so
> lib/wine/api-ms-win-core-localization-l1-2-0.dll.so
>-%%COMPHOLIO%%lib/wine/api-ms-win-core-localization-l1-2-1.dll.so
>+lib/wine/api-ms-win-core-localization-l1-2-1.dll.so
> lib/wine/api-ms-win-core-localization-obsolete-l1-1-0.dll.so
> lib/wine/api-ms-win-core-localregistry-l1-1-0.dll.so
> lib/wine/api-ms-win-core-memory-l1-1-1.dll.so
>@@ -853,10 +854,10 @@
> lib/wine/api-ms-win-core-url-l1-1-0.dll.so
> lib/wine/api-ms-win-core-util-l1-1-0.dll.so
> lib/wine/api-ms-win-core-winrt-error-l1-1-0.dll.so
>-%%COMPHOLIO%%lib/wine/api-ms-win-core-winrt-error-l1-1-1.dll.so
>-%%COMPHOLIO%%lib/wine/api-ms-win-core-winrt-l1-1-0.dll.so
>+lib/wine/api-ms-win-core-winrt-error-l1-1-1.dll.so
>+lib/wine/api-ms-win-core-winrt-l1-1-0.dll.so
> lib/wine/api-ms-win-core-winrt-string-l1-1-0.dll.so
>-%%COMPHOLIO%%lib/wine/api-ms-win-core-xstate-l2-1-0.dll.so
>+lib/wine/api-ms-win-core-xstate-l2-1-0.dll.so
> lib/wine/api-ms-win-downlevel-advapi32-l1-1-0.dll.so
> lib/wine/api-ms-win-downlevel-advapi32-l2-1-0.dll.so
> lib/wine/api-ms-win-downlevel-normaliz-l1-1-0.dll.so
>@@ -887,7 +888,7 @@
> lib/wine/authz.dll.so
> lib/wine/avicap32.dll.so
> lib/wine/avifil32.dll.so
>-lib/wine/avifile.dll16.so
>+%%WINE32%%lib/wine/avifile.dll16.so
> lib/wine/avrt.dll.so
> lib/wine/bcrypt.dll.so
> lib/wine/browseui.dll.so
>@@ -904,9 +905,9 @@
> lib/wine/comcat.dll.so
> lib/wine/comctl32.dll.so
> lib/wine/comdlg32.dll.so
>-lib/wine/comm.drv16.so
>-lib/wine/commdlg.dll16.so
>-lib/wine/compobj.dll16.so
>+%%WINE32%%lib/wine/comm.drv16.so
>+%%WINE32%%lib/wine/commdlg.dll16.so
>+%%WINE32%%lib/wine/compobj.dll16.so
> lib/wine/compstui.dll.so
> lib/wine/comsvcs.dll.so
> lib/wine/conhost.exe.so
>@@ -921,9 +922,9 @@
> lib/wine/cryptui.dll.so
> lib/wine/cscript.exe.so
> lib/wine/ctapi32.dll.so
>-lib/wine/ctl3d.dll16.so
>+%%WINE32%%lib/wine/ctl3d.dll16.so
> lib/wine/ctl3d32.dll.so
>-lib/wine/ctl3dv2.dll16.so
>+%%WINE32%%lib/wine/ctl3dv2.dll16.so
> lib/wine/d2d1.dll.so
> lib/wine/d3d10.dll.so
> lib/wine/d3d10_1.dll.so
>@@ -981,7 +982,7 @@
> lib/wine/dbgeng.dll.so
> lib/wine/dbghelp.dll.so
> lib/wine/dciman32.dll.so
>-lib/wine/ddeml.dll16.so
>+%%WINE32%%lib/wine/ddeml.dll16.so
> lib/wine/ddraw.dll.so
> lib/wine/ddrawex.dll.so
> lib/wine/devenum.dll.so
>@@ -989,9 +990,9 @@
> lib/wine/difxapi.dll.so
> lib/wine/dinput.dll.so
> lib/wine/dinput8.dll.so
>-lib/wine/dispdib.dll16.so
>+%%WINE32%%lib/wine/dispdib.dll16.so
> lib/wine/dispex.dll.so
>-lib/wine/display.drv16.so
>+%%WINE32%%lib/wine/display.drv16.so
> lib/wine/dmband.dll.so
> lib/wine/dmcompos.dll.so
> lib/wine/dmime.dll.so
>@@ -1036,16 +1037,16 @@
> lib/wine/fakedlls/amstream.dll
> lib/wine/fakedlls/api-ms-win-core-com-l1-1-0.dll
> lib/wine/fakedlls/api-ms-win-core-console-l1-1-0.dll
>-%%COMPHOLIO%%lib/wine/fakedlls/api-ms-win-core-datetime-l1-1-0.dll
>-%%COMPHOLIO%%lib/wine/fakedlls/api-ms-win-core-datetime-l1-1-1.dll
>+lib/wine/fakedlls/api-ms-win-core-datetime-l1-1-0.dll
>+lib/wine/fakedlls/api-ms-win-core-datetime-l1-1-1.dll
> lib/wine/fakedlls/api-ms-win-core-debug-l1-1-1.dll
> lib/wine/fakedlls/api-ms-win-core-errorhandling-l1-1-1.dll
> lib/wine/fakedlls/api-ms-win-core-errorhandling-l1-1-2.dll
>-%%COMPHOLIO%%lib/wine/fakedlls/api-ms-win-core-fibers-l1-1-0.dll
>-%%COMPHOLIO%%lib/wine/fakedlls/api-ms-win-core-fibers-l1-1-1.dll
>+lib/wine/fakedlls/api-ms-win-core-fibers-l1-1-0.dll
>+lib/wine/fakedlls/api-ms-win-core-fibers-l1-1-1.dll
> lib/wine/fakedlls/api-ms-win-core-file-l1-2-0.dll
>+lib/wine/fakedlls/api-ms-win-core-file-l2-1-0.dll
> lib/wine/fakedlls/api-ms-win-core-file-l2-1-1.dll
>-%%COMPHOLIO%%lib/wine/fakedlls/api-ms-win-core-file-l2-1-0.dll
> lib/wine/fakedlls/api-ms-win-core-handle-l1-1-0.dll
> lib/wine/fakedlls/api-ms-win-core-heap-l1-2-0.dll
> lib/wine/fakedlls/api-ms-win-core-heap-obsolete-l1-1-0.dll
>@@ -1054,7 +1055,7 @@
> lib/wine/fakedlls/api-ms-win-core-kernel32-legacy-l1-1-0.dll
> lib/wine/fakedlls/api-ms-win-core-libraryloader-l1-1-1.dll
> lib/wine/fakedlls/api-ms-win-core-localization-l1-2-0.dll
>-%%COMPHOLIO%%lib/wine/fakedlls/api-ms-win-core-localization-l1-2-1.dll
>+lib/wine/fakedlls/api-ms-win-core-localization-l1-2-1.dll
> lib/wine/fakedlls/api-ms-win-core-localization-obsolete-l1-1-0.dll
> lib/wine/fakedlls/api-ms-win-core-localregistry-l1-1-0.dll
> lib/wine/fakedlls/api-ms-win-core-memory-l1-1-1.dll
>@@ -1077,10 +1078,10 @@
> lib/wine/fakedlls/api-ms-win-core-url-l1-1-0.dll
> lib/wine/fakedlls/api-ms-win-core-util-l1-1-0.dll
> lib/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-0.dll
>-%%COMPHOLIO%%lib/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-1.dll
>-%%COMPHOLIO%%lib/wine/fakedlls/api-ms-win-core-winrt-l1-1-0.dll
>+lib/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-1.dll
>+lib/wine/fakedlls/api-ms-win-core-winrt-l1-1-0.dll
> lib/wine/fakedlls/api-ms-win-core-winrt-string-l1-1-0.dll
>-%%COMPHOLIO%%lib/wine/fakedlls/api-ms-win-core-xstate-l2-1-0.dll
>+lib/wine/fakedlls/api-ms-win-core-xstate-l2-1-0.dll
> lib/wine/fakedlls/api-ms-win-downlevel-advapi32-l1-1-0.dll
> lib/wine/fakedlls/api-ms-win-downlevel-advapi32-l2-1-0.dll
> lib/wine/fakedlls/api-ms-win-downlevel-normaliz-l1-1-0.dll
>@@ -1111,7 +1112,7 @@
> lib/wine/fakedlls/authz.dll
> lib/wine/fakedlls/avicap32.dll
> lib/wine/fakedlls/avifil32.dll
>-lib/wine/fakedlls/avifile.dll16
>+%%WINE32%%lib/wine/fakedlls/avifile.dll16
> lib/wine/fakedlls/avrt.dll
> lib/wine/fakedlls/bcrypt.dll
> lib/wine/fakedlls/browseui.dll
>@@ -1128,9 +1129,9 @@
> lib/wine/fakedlls/comcat.dll
> lib/wine/fakedlls/comctl32.dll
> lib/wine/fakedlls/comdlg32.dll
>-lib/wine/fakedlls/comm.drv16
>-lib/wine/fakedlls/commdlg.dll16
>-lib/wine/fakedlls/compobj.dll16
>+%%WINE32%%lib/wine/fakedlls/comm.drv16
>+%%WINE32%%lib/wine/fakedlls/commdlg.dll16
>+%%WINE32%%lib/wine/fakedlls/compobj.dll16
> lib/wine/fakedlls/compstui.dll
> lib/wine/fakedlls/comsvcs.dll
> lib/wine/fakedlls/conhost.exe
>@@ -1145,9 +1146,9 @@
> lib/wine/fakedlls/cryptui.dll
> lib/wine/fakedlls/cscript.exe
> lib/wine/fakedlls/ctapi32.dll
>-lib/wine/fakedlls/ctl3d.dll16
>+%%WINE32%%lib/wine/fakedlls/ctl3d.dll16
> lib/wine/fakedlls/ctl3d32.dll
>-lib/wine/fakedlls/ctl3dv2.dll16
>+%%WINE32%%%%WINE32%%lib/wine/fakedlls/ctl3dv2.dll16
> lib/wine/fakedlls/d2d1.dll
> lib/wine/fakedlls/d3d10.dll
> lib/wine/fakedlls/d3d10_1.dll
>@@ -1205,7 +1206,7 @@
> lib/wine/fakedlls/dbgeng.dll
> lib/wine/fakedlls/dbghelp.dll
> lib/wine/fakedlls/dciman32.dll
>-lib/wine/fakedlls/ddeml.dll16
>+%%WINE32%%lib/wine/fakedlls/ddeml.dll16
> lib/wine/fakedlls/ddraw.dll
> lib/wine/fakedlls/ddrawex.dll
> lib/wine/fakedlls/devenum.dll
>@@ -1213,9 +1214,9 @@
> lib/wine/fakedlls/difxapi.dll
> lib/wine/fakedlls/dinput.dll
> lib/wine/fakedlls/dinput8.dll
>-lib/wine/fakedlls/dispdib.dll16
>+%%WINE32%%lib/wine/fakedlls/dispdib.dll16
> lib/wine/fakedlls/dispex.dll
>-lib/wine/fakedlls/display.drv16
>+%%WINE32%%lib/wine/fakedlls/display.drv16
> lib/wine/fakedlls/dmband.dll
> lib/wine/fakedlls/dmcompos.dll
> lib/wine/fakedlls/dmime.dll
>@@ -1259,7 +1260,7 @@
> lib/wine/fakedlls/fusion.dll
> lib/wine/fakedlls/fwpuclnt.dll
> lib/wine/fakedlls/gameux.dll
>-lib/wine/fakedlls/gdi.exe16
>+%%WINE32%%lib/wine/fakedlls/gdi.exe16
> lib/wine/fakedlls/gdi32.dll
> lib/wine/fakedlls/gdiplus.dll
> %%X11%%lib/wine/fakedlls/glu32.dll
>@@ -1278,10 +1279,10 @@
> lib/wine/fakedlls/icmp.dll
> lib/wine/fakedlls/ieframe.dll
> lib/wine/fakedlls/iexplore.exe
>-lib/wine/fakedlls/ifsmgr.vxd
>+%%WINE32%%lib/wine/fakedlls/ifsmgr.vxd
> lib/wine/fakedlls/imaadp32.acm
> lib/wine/fakedlls/imagehlp.dll
>-lib/wine/fakedlls/imm.dll16
>+%%WINE32%%lib/wine/fakedlls/imm.dll16
> lib/wine/fakedlls/imm32.dll
> lib/wine/fakedlls/inetcomm.dll
> lib/wine/fakedlls/inetcpl.cpl
>@@ -1298,8 +1299,8 @@
> lib/wine/fakedlls/jscript.dll
> lib/wine/fakedlls/jsproxy.dll
> lib/wine/fakedlls/kernel32.dll
>-lib/wine/fakedlls/keyboard.drv16
>-lib/wine/fakedlls/krnl386.exe16
>+%%WINE32%%lib/wine/fakedlls/keyboard.drv16
>+%%WINE32%%lib/wine/fakedlls/krnl386.exe16
> lib/wine/fakedlls/ksuser.dll
> lib/wine/fakedlls/ktmw32.dll
> lib/wine/fakedlls/loadperf.dll
>@@ -1307,7 +1308,7 @@
> lib/wine/fakedlls/localui.dll
> lib/wine/fakedlls/lodctr.exe
> lib/wine/fakedlls/lz32.dll
>-lib/wine/fakedlls/lzexpand.dll16
>+%%WINE32%%lib/wine/fakedlls/lzexpand.dll16
> lib/wine/fakedlls/mapi32.dll
> lib/wine/fakedlls/mapistub.dll
> lib/wine/fakedlls/mciavi32.dll
>@@ -1320,17 +1321,17 @@
> lib/wine/fakedlls/mgmtapi.dll
> lib/wine/fakedlls/midimap.dll
> lib/wine/fakedlls/mlang.dll
>-lib/wine/fakedlls/mmcndmgr.dll
>+%%WINE32%%lib/wine/fakedlls/mmcndmgr.dll
> lib/wine/fakedlls/mmdevapi.dll
>-lib/wine/fakedlls/mmdevldr.vxd
>-lib/wine/fakedlls/mmsystem.dll16
>+%%WINE32%%lib/wine/fakedlls/mmdevldr.vxd
>+%%WINE32%%lib/wine/fakedlls/mmsystem.dll16
> lib/wine/fakedlls/mofcomp.exe
>-lib/wine/fakedlls/monodebg.vxd
>+%%WINE32%%lib/wine/fakedlls/monodebg.vxd
> lib/wine/fakedlls/mountmgr.sys
>-lib/wine/fakedlls/mouse.drv16
>+%%WINE32%%lib/wine/fakedlls/mouse.drv16
> lib/wine/fakedlls/mpr.dll
> lib/wine/fakedlls/mprapi.dll
>-lib/wine/fakedlls/msacm.dll16
>+%%WINE32%%lib/wine/fakedlls/msacm.dll16
> lib/wine/fakedlls/msacm32.dll
> lib/wine/fakedlls/msacm32.drv
> lib/wine/fakedlls/msadp32.acm
>@@ -1388,7 +1389,7 @@
> lib/wine/fakedlls/msvcrtd.dll
> lib/wine/fakedlls/msvfw32.dll
> lib/wine/fakedlls/msvidc32.dll
>-lib/wine/fakedlls/msvideo.dll16
>+%%WINE32%%lib/wine/fakedlls/msvideo.dll16
> lib/wine/fakedlls/mswsock.dll
> lib/wine/fakedlls/msxml.dll
> lib/wine/fakedlls/msxml2.dll
>@@ -1417,21 +1418,21 @@
> lib/wine/fakedlls/odbc32.dll
> lib/wine/fakedlls/odbccp32.dll
> lib/wine/fakedlls/odbccu32.dll
>-lib/wine/fakedlls/ole2.dll16
>-lib/wine/fakedlls/ole2conv.dll16
>-lib/wine/fakedlls/ole2disp.dll16
>-lib/wine/fakedlls/ole2nls.dll16
>-lib/wine/fakedlls/ole2prox.dll16
>-lib/wine/fakedlls/ole2thk.dll16
>+%%WINE32%%lib/wine/fakedlls/ole2.dll16
>+%%WINE32%%lib/wine/fakedlls/ole2conv.dll16
>+%%WINE32%%lib/wine/fakedlls/ole2disp.dll16
>+%%WINE32%%lib/wine/fakedlls/ole2nls.dll16
>+%%WINE32%%lib/wine/fakedlls/ole2prox.dll16
>+%%WINE32%%lib/wine/fakedlls/ole2thk.dll16
> lib/wine/fakedlls/ole32.dll
> lib/wine/fakedlls/oleacc.dll
> lib/wine/fakedlls/oleaut32.dll
>-lib/wine/fakedlls/olecli.dll16
>+%%WINE32%%lib/wine/fakedlls/olecli.dll16
> lib/wine/fakedlls/olecli32.dll
> lib/wine/fakedlls/oledb32.dll
> lib/wine/fakedlls/oledlg.dll
> lib/wine/fakedlls/olepro32.dll
>-lib/wine/fakedlls/olesvr.dll16
>+%%WINE32%%lib/wine/fakedlls/olesvr.dll16
> lib/wine/fakedlls/olesvr32.dll
> lib/wine/fakedlls/olethk32.dll
> lib/wine/fakedlls/oleview.exe
>@@ -1457,7 +1458,7 @@
> lib/wine/fakedlls/qmgrprxy.dll
> lib/wine/fakedlls/quartz.dll
> lib/wine/fakedlls/query.dll
>-lib/wine/fakedlls/rasapi16.dll16
>+%%WINE32%%lib/wine/fakedlls/rasapi16.dll16
> lib/wine/fakedlls/rasapi32.dll
> lib/wine/fakedlls/rasdlg.dll
> lib/wine/fakedlls/reg.exe
>@@ -1475,7 +1476,7 @@
> lib/wine/fakedlls/rsaenh.dll
> lib/wine/fakedlls/rstrtmgr.dll
> lib/wine/fakedlls/rtutils.dll
>-lib/wine/fakedlls/rundll.exe16
>+%%WINE32%%lib/wine/fakedlls/rundll.exe16
> lib/wine/fakedlls/rundll32.exe
> lib/wine/fakedlls/samlib.dll
> lib/wine/fakedlls/sane.ds
>@@ -1496,12 +1497,12 @@
> lib/wine/fakedlls/servicemodelreg.exe
> lib/wine/fakedlls/services.exe
> lib/wine/fakedlls/setupapi.dll
>-lib/wine/fakedlls/setupx.dll16
>+%%WINE32%%lib/wine/fakedlls/setupx.dll16
> lib/wine/fakedlls/sfc.dll
> lib/wine/fakedlls/sfc_os.dll
> lib/wine/fakedlls/shdoclc.dll
> lib/wine/fakedlls/shdocvw.dll
>-lib/wine/fakedlls/shell.dll16
>+%%WINE32%%lib/wine/fakedlls/shell.dll16
> lib/wine/fakedlls/shell32.dll
> lib/wine/fakedlls/shfolder.dll
> lib/wine/fakedlls/shlwapi.dll
>@@ -1509,7 +1510,7 @@
> lib/wine/fakedlls/slc.dll
> lib/wine/fakedlls/snmpapi.dll
> lib/wine/fakedlls/softpub.dll
>-lib/wine/fakedlls/sound.drv16
>+%%WINE32%%lib/wine/fakedlls/sound.drv16
> lib/wine/fakedlls/spoolss.dll
> lib/wine/fakedlls/spoolsv.exe
> lib/wine/fakedlls/start.exe
>@@ -1516,12 +1517,12 @@
> lib/wine/fakedlls/stdole2.tlb
> lib/wine/fakedlls/stdole32.tlb
> lib/wine/fakedlls/sti.dll
>-lib/wine/fakedlls/storage.dll16
>-lib/wine/fakedlls/stress.dll16
>+%%WINE32%%lib/wine/fakedlls/storage.dll16
>+%%WINE32%%lib/wine/fakedlls/stress.dll16
> lib/wine/fakedlls/svchost.exe
> lib/wine/fakedlls/svrapi.dll
> lib/wine/fakedlls/sxs.dll
>-lib/wine/fakedlls/system.drv16
>+%%WINE32%%lib/wine/fakedlls/system.drv16
> lib/wine/fakedlls/systeminfo.exe
> lib/wine/fakedlls/t2embed.dll
> lib/wine/fakedlls/tapi32.dll
>@@ -1530,11 +1531,11 @@
> lib/wine/fakedlls/taskmgr.exe
> lib/wine/fakedlls/taskschd.dll
> lib/wine/fakedlls/termsv.exe
>-lib/wine/fakedlls/toolhelp.dll16
>+%%WINE32%%lib/wine/fakedlls/toolhelp.dll16
> lib/wine/fakedlls/traffic.dll
>-lib/wine/fakedlls/twain.dll16
>+%%WINE32%%lib/wine/fakedlls/twain.dll16
> lib/wine/fakedlls/twain_32.dll
>-lib/wine/fakedlls/typelib.dll16
>+%%WINE32%%lib/wine/fakedlls/typelib.dll16
> lib/wine/fakedlls/unicows.dll
> lib/wine/fakedlls/uninstaller.exe
> lib/wine/fakedlls/unlodctr.exe
>@@ -1542,7 +1543,7 @@
> lib/wine/fakedlls/url.dll
> lib/wine/fakedlls/urlmon.dll
> lib/wine/fakedlls/usbd.sys
>-lib/wine/fakedlls/user.exe16
>+%%WINE32%%lib/wine/fakedlls/user.exe16
> lib/wine/fakedlls/user32.dll
> lib/wine/fakedlls/userenv.dll
> lib/wine/fakedlls/usp10.dll
>@@ -1551,19 +1552,19 @@
> lib/wine/fakedlls/vcomp.dll
> lib/wine/fakedlls/vcomp100.dll
> lib/wine/fakedlls/vcomp90.dll
>-lib/wine/fakedlls/vdhcp.vxd
>+%%WINE32%%lib/wine/fakedlls/vdhcp.vxd
> lib/wine/fakedlls/vdmdbg.dll
>-lib/wine/fakedlls/ver.dll16
>+%%WINE32%%lib/wine/fakedlls/ver.dll16
> lib/wine/fakedlls/version.dll
> lib/wine/fakedlls/view.exe
>-lib/wine/fakedlls/vmm.vxd
>-lib/wine/fakedlls/vnbt.vxd
>-lib/wine/fakedlls/vnetbios.vxd
>+%%WINE32%%lib/wine/fakedlls/vmm.vxd
>+%%WINE32%%lib/wine/fakedlls/vnbt.vxd
>+%%WINE32%%lib/wine/fakedlls/vnetbios.vxd
> lib/wine/fakedlls/vssapi.dll
>-lib/wine/fakedlls/vtdapi.vxd
>-lib/wine/fakedlls/vwin32.vxd
>-lib/wine/fakedlls/w32skrnl.dll
>-lib/wine/fakedlls/w32sys.dll16
>+%%WINE32%%lib/wine/fakedlls/vtdapi.vxd
>+%%WINE32%%lib/wine/fakedlls/vwin32.vxd
>+%%WINE32%%lib/wine/fakedlls/w32skrnl.dll
>+%%WINE32%%lib/wine/fakedlls/w32sys.dll16
> lib/wine/fakedlls/wbemdisp.dll
> lib/wine/fakedlls/wbemprox.dll
> lib/wine/fakedlls/webservices.dll
>@@ -1571,10 +1572,10 @@
> lib/wine/fakedlls/wevtapi.dll
> lib/wine/fakedlls/wevtutil.exe
> lib/wine/fakedlls/wiaservc.dll
>-lib/wine/fakedlls/win32s16.dll16
>-lib/wine/fakedlls/win87em.dll16
>-lib/wine/fakedlls/winaspi.dll16
>-lib/wine/fakedlls/windebug.dll16
>+%%WINE32%%lib/wine/fakedlls/win32s16.dll16
>+%%WINE32%%lib/wine/fakedlls/win87em.dll16
>+%%WINE32%%lib/wine/fakedlls/winaspi.dll16
>+%%WINE32%%lib/wine/fakedlls/windebug.dll16
> lib/wine/fakedlls/windowscodecs.dll
> lib/wine/fakedlls/windowscodecsext.dll
> lib/wine/fakedlls/wineboot.exe
>@@ -1594,24 +1595,24 @@
> lib/wine/fakedlls/wineoss.drv
> lib/wine/fakedlls/winepath.exe
> lib/wine/fakedlls/wineps.drv
>-lib/wine/fakedlls/wineps16.drv16
>-lib/wine/fakedlls/winevdm.exe
>+%%WINE32%%lib/wine/fakedlls/wineps16.drv16
>+%%WINE32%%lib/wine/fakedlls/winevdm.exe
> %%X11%%lib/wine/fakedlls/winex11.drv
>-lib/wine/fakedlls/wing.dll16
>+%%WINE32%%lib/wine/fakedlls/wing.dll16
> lib/wine/fakedlls/wing32.dll
>-lib/wine/fakedlls/winhelp.exe16
>+%%WINE32%%lib/wine/fakedlls/winhelp.exe16
> lib/wine/fakedlls/winhlp32.exe
> lib/wine/fakedlls/winhttp.dll
> lib/wine/fakedlls/wininet.dll
> lib/wine/fakedlls/winmm.dll
>-lib/wine/fakedlls/winnls.dll16
>+%%WINE32%%lib/wine/fakedlls/winnls.dll16
> lib/wine/fakedlls/winnls32.dll
>-lib/wine/fakedlls/winoldap.mod16
>+%%WINE32%%lib/wine/fakedlls/winoldap.mod16
> lib/wine/fakedlls/winscard.dll
>-lib/wine/fakedlls/winsock.dll16
>+%%WINE32%%lib/wine/fakedlls/winsock.dll16
> lib/wine/fakedlls/winspool.drv
> lib/wine/fakedlls/winsta.dll
>-lib/wine/fakedlls/wintab.dll16
>+%%WINE32%%lib/wine/fakedlls/wintab.dll16
> lib/wine/fakedlls/wintab32.dll
> lib/wine/fakedlls/wintrust.dll
> lib/wine/fakedlls/winver.exe
>@@ -1624,7 +1625,7 @@
> lib/wine/fakedlls/wmvcore.dll
> lib/wine/fakedlls/wnaspi32.dll
> lib/wine/fakedlls/wordpad.exe
>-lib/wine/fakedlls/wow32.dll
>+%%WINE32%%lib/wine/fakedlls/wow32.dll
> lib/wine/fakedlls/wpcap.dll
> lib/wine/fakedlls/write.exe
> lib/wine/fakedlls/ws2_32.dll
>@@ -1657,7 +1658,7 @@
> lib/wine/fusion.dll.so
> lib/wine/fwpuclnt.dll.so
> lib/wine/gameux.dll.so
>-lib/wine/gdi.exe16.so
>+%%WINE32%%lib/wine/gdi.exe16.so
> lib/wine/gdi32.dll.so
> lib/wine/gdiplus.dll.so
> %%X11%%lib/wine/glu32.dll.so
>@@ -1676,10 +1677,10 @@
> lib/wine/icmp.dll.so
> lib/wine/ieframe.dll.so
> lib/wine/iexplore.exe.so
>-lib/wine/ifsmgr.vxd.so
>+%%WINE32%%lib/wine/ifsmgr.vxd.so
> lib/wine/imaadp32.acm.so
> lib/wine/imagehlp.dll.so
>-lib/wine/imm.dll16.so
>+%%WINE32%%lib/wine/imm.dll16.so
> lib/wine/imm32.dll.so
> lib/wine/inetcomm.dll.so
> lib/wine/inetcpl.cpl.so
>@@ -1696,8 +1697,8 @@
> lib/wine/jscript.dll.so
> lib/wine/jsproxy.dll.so
> lib/wine/kernel32.dll.so
>-lib/wine/keyboard.drv16.so
>-lib/wine/krnl386.exe16.so
>+%%WINE32%%lib/wine/keyboard.drv16.so
>+%%WINE32%%lib/wine/krnl386.exe16.so
> lib/wine/ksuser.dll.so
> lib/wine/ktmw32.dll.so
> lib/wine/libaclui.def
>@@ -1770,7 +1771,7 @@
> lib/wine/libinetcomm.def
> lib/wine/libiphlpapi.def
> lib/wine/libjsproxy.def
>-lib/wine/libkernel.def
>+%%WINE32%%lib/wine/libkernel.def
> lib/wine/libkernel32.def
> lib/wine/libloadperf.def
> lib/wine/liblz32.def
>@@ -1872,7 +1873,7 @@
> lib/wine/libwintrust.def
> lib/wine/libwldap32.def
> lib/wine/libwnaspi32.def
>-lib/wine/libwow32.def
>+%%WINE32%%lib/wine/libwow32.def
> lib/wine/libws2_32.def
> lib/wine/libwsnmp32.def
> lib/wine/libwsock32.def
>@@ -1884,7 +1885,7 @@
> lib/wine/localui.dll.so
> lib/wine/lodctr.exe.so
> lib/wine/lz32.dll.so
>-lib/wine/lzexpand.dll16.so
>+%%WINE32%%lib/wine/lzexpand.dll16.so
> lib/wine/mapi32.dll.so
> lib/wine/mapistub.dll.so
> lib/wine/mciavi32.dll.so
>@@ -1899,15 +1900,15 @@
> lib/wine/mlang.dll.so
> lib/wine/mmcndmgr.dll.so
> lib/wine/mmdevapi.dll.so
>-lib/wine/mmdevldr.vxd.so
>-lib/wine/mmsystem.dll16.so
>+%%WINE32%%lib/wine/mmdevldr.vxd.so
>+%%WINE32%%lib/wine/mmsystem.dll16.so
> lib/wine/mofcomp.exe.so
>-lib/wine/monodebg.vxd.so
>+%%WINE32%%lib/wine/monodebg.vxd.so
> lib/wine/mountmgr.sys.so
>-lib/wine/mouse.drv16.so
>+%%WINE32%%lib/wine/mouse.drv16.so
> lib/wine/mpr.dll.so
> lib/wine/mprapi.dll.so
>-lib/wine/msacm.dll16.so
>+%%WINE32%%lib/wine/msacm.dll16.so
> lib/wine/msacm32.dll.so
> lib/wine/msacm32.drv.so
> lib/wine/msadp32.acm.so
>@@ -1965,7 +1966,7 @@
> lib/wine/msvcrtd.dll.so
> lib/wine/msvfw32.dll.so
> lib/wine/msvidc32.dll.so
>-lib/wine/msvideo.dll16.so
>+%%WINE32%%lib/wine/msvideo.dll16.so
> lib/wine/mswsock.dll.so
> lib/wine/msxml.dll.so
> lib/wine/msxml2.dll.so
>@@ -1994,21 +1995,21 @@
> lib/wine/odbc32.dll.so
> lib/wine/odbccp32.dll.so
> lib/wine/odbccu32.dll.so
>-lib/wine/ole2.dll16.so
>-lib/wine/ole2conv.dll16.so
>-lib/wine/ole2disp.dll16.so
>-lib/wine/ole2nls.dll16.so
>-lib/wine/ole2prox.dll16.so
>-lib/wine/ole2thk.dll16.so
>+%%WINE32%%lib/wine/ole2.dll16.so
>+%%WINE32%%lib/wine/ole2conv.dll16.so
>+%%WINE32%%lib/wine/ole2disp.dll16.so
>+%%WINE32%%lib/wine/ole2nls.dll16.so
>+%%WINE32%%lib/wine/ole2prox.dll16.so
>+%%WINE32%%lib/wine/ole2thk.dll16.so
> lib/wine/ole32.dll.so
> lib/wine/oleacc.dll.so
> lib/wine/oleaut32.dll.so
>-lib/wine/olecli.dll16.so
>+%%WINE32%%lib/wine/olecli.dll16.so
> lib/wine/olecli32.dll.so
> lib/wine/oledb32.dll.so
> lib/wine/oledlg.dll.so
> lib/wine/olepro32.dll.so
>-lib/wine/olesvr.dll16.so
>+%%WINE32%%lib/wine/olesvr.dll16.so
> lib/wine/olesvr32.dll.so
> lib/wine/olethk32.dll.so
> lib/wine/oleview.exe.so
>@@ -2034,7 +2035,7 @@
> lib/wine/qmgrprxy.dll.so
> lib/wine/quartz.dll.so
> lib/wine/query.dll.so
>-lib/wine/rasapi16.dll16.so
>+%%WINE32%%lib/wine/rasapi16.dll16.so
> lib/wine/rasapi32.dll.so
> lib/wine/rasdlg.dll.so
> lib/wine/reg.exe.so
>@@ -2052,7 +2053,7 @@
> lib/wine/rsaenh.dll.so
> lib/wine/rstrtmgr.dll.so
> lib/wine/rtutils.dll.so
>-lib/wine/rundll.exe16.so
>+%%WINE32%%lib/wine/rundll.exe16.so
> lib/wine/rundll32.exe.so
> lib/wine/samlib.dll.so
> lib/wine/sane.ds.so
>@@ -2073,12 +2074,12 @@
> lib/wine/servicemodelreg.exe.so
> lib/wine/services.exe.so
> lib/wine/setupapi.dll.so
>-lib/wine/setupx.dll16.so
>+%%WINE32%%lib/wine/setupx.dll16.so
> lib/wine/sfc.dll.so
> lib/wine/sfc_os.dll.so
> lib/wine/shdoclc.dll.so
> lib/wine/shdocvw.dll.so
>-lib/wine/shell.dll16.so
>+%%WINE32%%lib/wine/shell.dll16.so
> lib/wine/shell32.dll.so
> lib/wine/shfolder.dll.so
> lib/wine/shlwapi.dll.so
>@@ -2086,7 +2087,7 @@
> lib/wine/slc.dll.so
> lib/wine/snmpapi.dll.so
> lib/wine/softpub.dll.so
>-lib/wine/sound.drv16.so
>+%%WINE32%%lib/wine/sound.drv16.so
> lib/wine/spoolss.dll.so
> lib/wine/spoolsv.exe.so
> lib/wine/start.exe.so
>@@ -2093,12 +2094,12 @@
> lib/wine/stdole2.tlb.so
> lib/wine/stdole32.tlb.so
> lib/wine/sti.dll.so
>-lib/wine/storage.dll16.so
>-lib/wine/stress.dll16.so
>+%%WINE32%%lib/wine/storage.dll16.so
>+%%WINE32%%lib/wine/stress.dll16.so
> lib/wine/svchost.exe.so
> lib/wine/svrapi.dll.so
> lib/wine/sxs.dll.so
>-lib/wine/system.drv16.so
>+%%WINE32%%lib/wine/system.drv16.so
> lib/wine/systeminfo.exe.so
> lib/wine/t2embed.dll.so
> lib/wine/tapi32.dll.so
>@@ -2107,11 +2108,11 @@
> lib/wine/taskmgr.exe.so
> lib/wine/taskschd.dll.so
> lib/wine/termsv.exe.so
>-lib/wine/toolhelp.dll16.so
>+%%WINE32%%lib/wine/toolhelp.dll16.so
> lib/wine/traffic.dll.so
>-lib/wine/twain.dll16.so
>+%%WINE32%%lib/wine/twain.dll16.so
> lib/wine/twain_32.dll.so
>-lib/wine/typelib.dll16.so
>+%%WINE32%%lib/wine/typelib.dll16.so
> lib/wine/unicows.dll.so
> lib/wine/uninstaller.exe.so
> lib/wine/unlodctr.exe.so
>@@ -2119,7 +2120,7 @@
> lib/wine/url.dll.so
> lib/wine/urlmon.dll.so
> lib/wine/usbd.sys.so
>-lib/wine/user.exe16.so
>+%%WINE32%%lib/wine/user.exe16.so
> lib/wine/user32.dll.so
> lib/wine/userenv.dll.so
> lib/wine/usp10.dll.so
>@@ -2128,19 +2129,19 @@
> lib/wine/vcomp.dll.so
> lib/wine/vcomp100.dll.so
> lib/wine/vcomp90.dll.so
>-lib/wine/vdhcp.vxd.so
>+%%WINE32%%lib/wine/vdhcp.vxd.so
> lib/wine/vdmdbg.dll.so
>-lib/wine/ver.dll16.so
>+%%WINE32%%lib/wine/ver.dll16.so
> lib/wine/version.dll.so
> lib/wine/view.exe.so
>-lib/wine/vmm.vxd.so
>-lib/wine/vnbt.vxd.so
>-lib/wine/vnetbios.vxd.so
>+%%WINE32%%lib/wine/vmm.vxd.so
>+%%WINE32%%lib/wine/vnbt.vxd.so
>+%%WINE32%%lib/wine/vnetbios.vxd.so
> lib/wine/vssapi.dll.so
>-lib/wine/vtdapi.vxd.so
>-lib/wine/vwin32.vxd.so
>-lib/wine/w32skrnl.dll.so
>-lib/wine/w32sys.dll16.so
>+%%WINE32%%lib/wine/vtdapi.vxd.so
>+%%WINE32%%lib/wine/vwin32.vxd.so
>+%%WINE32%%lib/wine/w32skrnl.dll.so
>+%%WINE32%%lib/wine/w32sys.dll16.so
> lib/wine/wbemdisp.dll.so
> lib/wine/wbemprox.dll.so
> lib/wine/webservices.dll.so
>@@ -2148,10 +2149,10 @@
> lib/wine/wevtapi.dll.so
> lib/wine/wevtutil.exe.so
> lib/wine/wiaservc.dll.so
>-lib/wine/win32s16.dll16.so
>-lib/wine/win87em.dll16.so
>-lib/wine/winaspi.dll16.so
>-lib/wine/windebug.dll16.so
>+%%WINE32%%lib/wine/win32s16.dll16.so
>+%%WINE32%%lib/wine/win87em.dll16.so
>+%%WINE32%%lib/wine/winaspi.dll16.so
>+%%WINE32%%lib/wine/windebug.dll16.so
> lib/wine/windowscodecs.dll.so
> lib/wine/windowscodecsext.dll.so
> lib/wine/wineboot.exe.so
>@@ -2171,24 +2172,24 @@
> %%MPG123%%lib/wine/winemp3.acm.so
> lib/wine/winepath.exe.so
> lib/wine/wineps.drv.so
>-lib/wine/wineps16.drv16.so
>-lib/wine/winevdm.exe.so
>+%%WINE32%%lib/wine/wineps16.drv16.so
>+%%WINE32%%lib/wine/winevdm.exe.so
> %%X11%%lib/wine/winex11.drv.so
>-lib/wine/wing.dll16.so
>+%%WINE32%%lib/wine/wing.dll16.so
> lib/wine/wing32.dll.so
>-lib/wine/winhelp.exe16.so
>+%%WINE32%%lib/wine/winhelp.exe16.so
> lib/wine/winhlp32.exe.so
> lib/wine/winhttp.dll.so
> lib/wine/wininet.dll.so
> lib/wine/winmm.dll.so
>-lib/wine/winnls.dll16.so
>+%%WINE32%%lib/wine/winnls.dll16.so
> lib/wine/winnls32.dll.so
>-lib/wine/winoldap.mod16.so
>+%%WINE32%%lib/wine/winoldap.mod16.so
> lib/wine/winscard.dll.so
>-lib/wine/winsock.dll16.so
>+%%WINE32%%lib/wine/winsock.dll16.so
> lib/wine/winspool.drv.so
> lib/wine/winsta.dll.so
>-lib/wine/wintab.dll16.so
>+%%WINE32%%lib/wine/wintab.dll16.so
> lib/wine/wintab32.dll.so
> lib/wine/wintrust.dll.so
> lib/wine/winver.exe.so
>@@ -2201,7 +2202,7 @@
> lib/wine/wmvcore.dll.so
> lib/wine/wnaspi32.dll.so
> lib/wine/wordpad.exe.so
>-lib/wine/wow32.dll.so
>+%%WINE32%%lib/wine/wow32.dll.so
> lib/wine/wpcap.dll.so
> lib/wine/write.exe.so
> lib/wine/ws2_32.dll.so

Actions: View | Diff

Attachments on bug 197798: 153157 | 153692 | 153693 | 153694 | 153850