diff options
author | adam <adam@pkgsrc.org> | 2015-02-09 13:30:44 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2015-02-09 13:30:44 +0000 |
commit | 2d2b6f8912d0a3a561cb460979d2ab922e128429 (patch) | |
tree | cd0d7b2617a41d149b48de130f6a431b8d69cebb /emulators/wine-devel | |
parent | a10c49a74e60991bec38301e3246ead00491707c (diff) | |
download | pkgsrc-2d2b6f8912d0a3a561cb460979d2ab922e128429.tar.gz |
Changes 1.7.36:
Some preliminary 64-bit support for Mac OS X.
Support for configuring speakers in Winecfg.
Improved support for Mac OS X Trash folder.
Support for typographic features in DirectWrite.
Various bug fixes.
Diffstat (limited to 'emulators/wine-devel')
-rw-r--r-- | emulators/wine-devel/Makefile | 30 | ||||
-rw-r--r-- | emulators/wine-devel/PLIST.Darwin | 6 | ||||
-rw-r--r-- | emulators/wine-devel/PLIST.common | 494 | ||||
-rw-r--r-- | emulators/wine-devel/distinfo | 18 | ||||
-rw-r--r-- | emulators/wine-devel/options.mk | 9 | ||||
-rw-r--r-- | emulators/wine-devel/patches/patch-configure | 40 | ||||
-rw-r--r-- | emulators/wine-devel/patches/patch-dlls_ntdll_signal__x86__64.c | 69 | ||||
-rw-r--r-- | emulators/wine-devel/patches/patch-dlls_wbemprox_builtin.c | 20 | ||||
-rw-r--r-- | emulators/wine-devel/patches/patch-dlls_wineoss.drv_mmdevdrv.c | 42 | ||||
-rw-r--r-- | emulators/wine-devel/patches/patch-include_msvcrt_crtdefs.h | 13 | ||||
-rw-r--r-- | emulators/wine-devel/patches/patch-include_windef.h | 16 | ||||
-rw-r--r-- | emulators/wine-devel/patches/patch-include_wine_test.h | 22 |
12 files changed, 532 insertions, 247 deletions
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 90398d0ff39..c68adf0ebca 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.48 2014/06/18 09:28:16 wiz Exp $ +# $NetBSD: Makefile,v 1.49 2015/02/09 13:30:44 adam Exp $ -DISTNAME= wine-1.7.11 -PKGREVISION= 4 +DISTNAME= wine-1.7.36 CATEGORIES= emulators MASTER_SITES= http://ibiblio.org/pub/linux/system/emulators/wine/ \ ${MASTER_SITE_SOURCEFORGE:=wine/} @@ -24,6 +23,7 @@ USE_NCURSES= yes USE_TOOLS+= bison flex gmake mktemp msgfmt FLEX_REQD= 2.5.33 GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --disable-tests UNLIMIT_RESOURCES= datasize REPLACE_PERL+= tools/winemaker tools/winedump/function_grep.pl @@ -36,25 +36,36 @@ CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q}\ -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\"" CONFIGURE_ENV+= LDD=${LDD:Q} LIBS+= ${LDFLAGS} +PLIST_VARS+= oss wine16 wine32 wine64 # If we're doing a 32-bit build, make sure that the appropriate multilib # options are passed through as these values are used with winegcc # (which wrapper doesn't handle). +# XXX seems not needed anymore; to be removed on next update .include "../../mk/bsd.prefs.mk" .if !empty(MACHINE_ARCH:Mi386) -CONFIGURE_ENV+= ac_cv_prog_CC=${CC:Q}\ -m32 -CONFIGURE_ENV+= ac_cv_prog_CXX=${CXX:Q}\ -m32 -CONFIGURE_ENV+= ac_cv_prog_AS=${AS:Q}\ --32 -CONFIGURE_ENV+= ac_cv_prog_LD=${LD:Q}\ -m\ elf_i386 +#CONFIGURE_ENV+= ac_cv_prog_CC=${CC:Q}\ -m32 +#CONFIGURE_ENV+= ac_cv_prog_CXX=${CXX:Q}\ -m32 +#CONFIGURE_ENV+= ac_cv_prog_AS=${AS:Q}\ --32 +#CONFIGURE_ENV+= ac_cv_prog_LD=${LD:Q}\ -m\ elf_i386 +PLIST.wine16= yes +PLIST.wine32= yes .endif -# Needs GCC >= 4.4 +# Needs GCC >= 4.4; Experimental .if !empty(MACHINE_ARCH:Mx86_64) -CONFIGURE_ARGS+= --disable-win16 CONFIGURE_ARGS+= --enable-win64 +PLIST.wine64= yes +.endif + +.if ${OPSYS} != "Darwin" +PLIST.oss= yes +.include "../../fonts/fontconfig/buildlink3.mk" +.include "../../mk/oss.buildlink3.mk" .endif .include "options.mk" .include "../../devel/ncurses/buildlink3.mk" +.include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/lcms2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" @@ -63,7 +74,6 @@ CONFIGURE_ARGS+= --enable-win64 .include "../../textproc/libxml2/buildlink3.mk" .include "../../graphics/giflib/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" -.include "../../mk/oss.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/wine-devel/PLIST.Darwin b/emulators/wine-devel/PLIST.Darwin index 7f6ed18bb5a..d43da245b11 100644 --- a/emulators/wine-devel/PLIST.Darwin +++ b/emulators/wine-devel/PLIST.Darwin @@ -1,13 +1,13 @@ -@comment $NetBSD: PLIST.Darwin,v 1.1 2011/05/02 21:23:28 adam Exp $ +@comment $NetBSD: PLIST.Darwin,v 1.2 2015/02/09 13:30:44 adam Exp $ lib/wine/fakedlls/openal32.dll lib/wine/fakedlls/opencl.dll lib/wine/fakedlls/winecoreaudio.drv +lib/wine/fakedlls/winemac.drv lib/wine/fakedlls/winemp3.acm lib/wine/fakedlls/wineqtdecoder.dll -lib/wine/fakedlls/winequartz.drv lib/wine/openal32.dll.so lib/wine/opencl.dll.so lib/wine/winecoreaudio.drv.so +lib/wine/winemac.drv.so lib/wine/winemp3.acm.so lib/wine/wineqtdecoder.dll.so -lib/wine/winequartz.drv.so diff --git a/emulators/wine-devel/PLIST.common b/emulators/wine-devel/PLIST.common index 7146164e2d0..37203f0f721 100644 --- a/emulators/wine-devel/PLIST.common +++ b/emulators/wine-devel/PLIST.common @@ -1,25 +1,26 @@ -@comment $NetBSD: PLIST.common,v 1.15 2014/01/19 10:58:23 adam Exp $ +@comment $NetBSD: PLIST.common,v 1.16 2015/02/09 13:30:44 adam Exp $ bin/function_grep.pl bin/msiexec bin/notepad bin/regedit bin/regsvr32 bin/widl -bin/wine -bin/wineboot -bin/winebuild -bin/winecfg -bin/wineconsole -bin/winecpp -bin/winedbg -bin/winedump -bin/winefile -bin/wineg++ -bin/winegcc -bin/winemaker -bin/winemine -bin/winepath -bin/wineserver +${PLIST.wine32}bin/wine +${PLIST.wine64}bin/wine64 +${PLIST.wine32}bin/wineboot +${PLIST.wine32}bin/winebuild +${PLIST.wine32}bin/winecfg +${PLIST.wine32}bin/wineconsole +${PLIST.wine32}bin/winecpp +${PLIST.wine32}bin/winedbg +${PLIST.wine32}bin/winedump +${PLIST.wine32}bin/winefile +${PLIST.wine32}bin/wineg++ +${PLIST.wine32}bin/winegcc +${PLIST.wine32}bin/winemaker +${PLIST.wine32}bin/winemine +${PLIST.wine32}bin/winepath +${PLIST.wine32}bin/wineserver bin/wmc bin/wrc include/wine/debug.h @@ -94,6 +95,7 @@ include/wine/windows/asptlb.idl include/wine/windows/asynot.idl include/wine/windows/asysta.idl include/wine/windows/atlbase.h +include/wine/windows/atlcom.h include/wine/windows/atliface.h include/wine/windows/atliface.idl include/wine/windows/atlwin.h @@ -161,6 +163,7 @@ include/wine/windows/cvconst.h include/wine/windows/d2d1.h include/wine/windows/d2d1.idl include/wine/windows/d2dbasetypes.h +include/wine/windows/d2derr.h include/wine/windows/d3d.h include/wine/windows/d3d10.h include/wine/windows/d3d10.idl @@ -172,6 +175,8 @@ include/wine/windows/d3d10misc.h include/wine/windows/d3d10shader.h include/wine/windows/d3d11.h include/wine/windows/d3d11.idl +include/wine/windows/d3d11_1.h +include/wine/windows/d3d11_1.idl include/wine/windows/d3d11sdklayers.h include/wine/windows/d3d11sdklayers.idl include/wine/windows/d3d11shader.h @@ -218,6 +223,7 @@ include/wine/windows/dde.h include/wine/windows/dde.rh include/wine/windows/ddeml.h include/wine/windows/ddk/compstui.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 @@ -225,6 +231,7 @@ include/wine/windows/ddk/ntddcdvd.h include/wine/windows/ddk/ntddk.h include/wine/windows/ddk/ntddser.h include/wine/windows/ddk/ntddtape.h +include/wine/windows/ddk/ntifs.h include/wine/windows/ddk/usb.h include/wine/windows/ddk/usb100.h include/wine/windows/ddk/usb200.h @@ -288,19 +295,26 @@ include/wine/windows/dshow.h include/wine/windows/dsound.h include/wine/windows/dsrole.h include/wine/windows/dvdmedia.h +include/wine/windows/dvoice.h include/wine/windows/dwmapi.h include/wine/windows/dwrite.h include/wine/windows/dwrite.idl include/wine/windows/dwrite_1.h include/wine/windows/dwrite_1.idl +include/wine/windows/dwrite_2.h +include/wine/windows/dwrite_2.idl include/wine/windows/dxdiag.h include/wine/windows/dxerr8.h include/wine/windows/dxerr9.h include/wine/windows/dxfile.h include/wine/windows/dxgi.h include/wine/windows/dxgi.idl +include/wine/windows/dxgi1_2.h +include/wine/windows/dxgi1_2.idl include/wine/windows/dxgiformat.h include/wine/windows/dxgitype.h +include/wine/windows/dxva2api.h +include/wine/windows/dxva2api.idl include/wine/windows/dyngraph.idl include/wine/windows/endpointvolume.h include/wine/windows/endpointvolume.idl @@ -335,9 +349,13 @@ include/wine/windows/gdiplusmetaheader.h include/wine/windows/gdipluspixelformats.h include/wine/windows/gdiplustypes.h include/wine/windows/guiddef.h +include/wine/windows/hidusage.h +include/wine/windows/highlevelmonitorconfigurationapi.h include/wine/windows/hlguids.h include/wine/windows/hlink.h include/wine/windows/hlink.idl +include/wine/windows/hstring.h +include/wine/windows/hstring.idl include/wine/windows/htiface.h include/wine/windows/htiface.idl include/wine/windows/htiframe.h @@ -384,6 +402,7 @@ include/wine/windows/knownfolders.h include/wine/windows/ks.h include/wine/windows/ksguid.h include/wine/windows/ksmedia.h +include/wine/windows/ksuuids.h include/wine/windows/lm.h include/wine/windows/lmaccess.h include/wine/windows/lmapibuf.h @@ -400,6 +419,7 @@ include/wine/windows/lmuse.h include/wine/windows/lmuseflg.h include/wine/windows/lmwksta.h include/wine/windows/loadperf.h +include/wine/windows/lowlevelmonitorconfigurationapi.h include/wine/windows/lzexpand.h include/wine/windows/mapi.h include/wine/windows/mapicode.h @@ -417,6 +437,7 @@ include/wine/windows/mediaobj.h include/wine/windows/mediaobj.idl include/wine/windows/metahost.h include/wine/windows/metahost.idl +include/wine/windows/mferror.h include/wine/windows/midles.h include/wine/windows/mimeinfo.h include/wine/windows/mimeinfo.idl @@ -478,10 +499,14 @@ include/wine/windows/msxml6did.h include/wine/windows/msxmldid.h include/wine/windows/nb30.h include/wine/windows/ndrtypes.h +include/wine/windows/netcfgx.h +include/wine/windows/netcfgx.idl include/wine/windows/netcon.h include/wine/windows/netcon.idl include/wine/windows/netfw.h include/wine/windows/netfw.idl +include/wine/windows/netlistmgr.h +include/wine/windows/netlistmgr.idl include/wine/windows/nldef.h include/wine/windows/npapi.h include/wine/windows/nspapi.h @@ -489,6 +514,7 @@ include/wine/windows/ntddcdrm.h include/wine/windows/ntddndis.h include/wine/windows/ntddscsi.h include/wine/windows/ntddstor.h +include/wine/windows/ntdef.h include/wine/windows/ntdsapi.h include/wine/windows/ntquery.h include/wine/windows/ntsecapi.h @@ -529,6 +555,7 @@ include/wine/windows/pdh.h include/wine/windows/pdhmsg.h include/wine/windows/perhist.h include/wine/windows/perhist.idl +include/wine/windows/physicalmonitorenumerationapi.h include/wine/windows/pktdef.h include/wine/windows/poppack.h include/wine/windows/powrprof.h @@ -562,6 +589,7 @@ include/wine/windows/richole.idl include/wine/windows/rmxfguid.h include/wine/windows/rmxftmpl.h include/wine/windows/rmxftmpl.x +include/wine/windows/roapi.h include/wine/windows/row.idl include/wine/windows/rowchg.idl include/wine/windows/rowpos.idl @@ -675,8 +703,11 @@ include/wine/windows/vfwmsgs.h include/wine/windows/vmr9.h include/wine/windows/vmr9.idl include/wine/windows/vmrender.idl +include/wine/windows/vss.h +include/wine/windows/vss.idl include/wine/windows/vsstyle.h include/wine/windows/vssym32.h +include/wine/windows/vswriter.h include/wine/windows/wbemcli.h include/wine/windows/wbemcli.idl include/wine/windows/wbemdisp.h @@ -725,6 +756,7 @@ include/wine/windows/winsnmp.h include/wine/windows/winsock.h include/wine/windows/winsock2.h include/wine/windows/winspool.h +include/wine/windows/winstring.h include/wine/windows/winsvc.h include/wine/windows/winsxs.h include/wine/windows/winsxs.idl @@ -738,6 +770,8 @@ include/wine/windows/winver.h include/wine/windows/wmistr.h include/wine/windows/wmiutils.h include/wine/windows/wmiutils.idl +include/wine/windows/wmp.h +include/wine/windows/wmp.idl include/wine/windows/wmsbuffer.h include/wine/windows/wmsbuffer.idl include/wine/windows/wmsdkidl.h @@ -758,6 +792,8 @@ include/wine/windows/wtypes.h include/wine/windows/wtypes.idl include/wine/windows/wuapi.h include/wine/windows/wuapi.idl +include/wine/windows/xaudio2.h +include/wine/windows/xaudio2.idl include/wine/windows/xcmc.h include/wine/windows/xinput.h include/wine/windows/xmldom.h @@ -778,18 +814,53 @@ lib/wine/actxprxy.dll.so lib/wine/advapi32.dll.so lib/wine/advpack.dll.so 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 +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 +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 +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 lib/wine/api-ms-win-core-interlocked-l1-2-0.dll.so +lib/wine/api-ms-win-core-io-l1-1-1.dll.so +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 +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 +lib/wine/api-ms-win-core-namedpipe-l1-2-0.dll.so +lib/wine/api-ms-win-core-processenvironment-l1-2-0.dll.so lib/wine/api-ms-win-core-processthreads-l1-1-0.dll.so lib/wine/api-ms-win-core-processthreads-l1-1-1.dll.so +lib/wine/api-ms-win-core-processthreads-l1-1-2.dll.so lib/wine/api-ms-win-core-profile-l1-1-0.dll.so +lib/wine/api-ms-win-core-psapi-l1-1-0.dll.so +lib/wine/api-ms-win-core-registry-l1-1-0.dll.so +lib/wine/api-ms-win-core-rtlsupport-l1-2-0.dll.so +lib/wine/api-ms-win-core-shlwapi-legacy-l1-1-0.dll.so lib/wine/api-ms-win-core-string-l1-1-0.dll.so +lib/wine/api-ms-win-core-synch-l1-2-0.dll.so lib/wine/api-ms-win-core-sysinfo-l1-2-0.dll.so +lib/wine/api-ms-win-core-sysinfo-l1-2-1.dll.so +lib/wine/api-ms-win-core-threadpool-legacy-l1-1-0.dll.so +lib/wine/api-ms-win-core-timezone-l1-1-0.dll.so +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 +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 +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 @@ -799,7 +870,14 @@ lib/wine/api-ms-win-downlevel-shlwapi-l1-1-0.dll.so lib/wine/api-ms-win-downlevel-shlwapi-l2-1-0.dll.so lib/wine/api-ms-win-downlevel-user32-l1-1-0.dll.so lib/wine/api-ms-win-downlevel-version-l1-1-0.dll.so +lib/wine/api-ms-win-eventing-provider-l1-1-0.dll.so +lib/wine/api-ms-win-ntuser-dc-access-l1-1-0.dll.so lib/wine/api-ms-win-security-base-l1-1-0.dll.so +lib/wine/api-ms-win-security-base-l1-2-0.dll.so +lib/wine/api-ms-win-security-sddl-l1-1-0.dll.so +lib/wine/api-ms-win-service-core-l1-1-1.dll.so +lib/wine/api-ms-win-service-management-l1-1-0.dll.so +lib/wine/api-ms-win-service-winsvc-l1-2-0.dll.so lib/wine/apphelp.dll.so lib/wine/appwiz.cpl.so lib/wine/arp.exe.so @@ -813,7 +891,7 @@ lib/wine/attrib.exe.so lib/wine/authz.dll.so lib/wine/avicap32.dll.so lib/wine/avifil32.dll.so -lib/wine/avifile.dll16.so +${PLIST.wine16}lib/wine/avifile.dll16.so lib/wine/avrt.dll.so lib/wine/bcrypt.dll.so lib/wine/browseui.dll.so @@ -826,12 +904,13 @@ lib/wine/cfgmgr32.dll.so lib/wine/clock.exe.so lib/wine/clusapi.dll.so lib/wine/cmd.exe.so +lib/wine/combase.dll.so 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 +${PLIST.wine16}lib/wine/comm.drv16.so +${PLIST.wine16}lib/wine/commdlg.dll16.so +${PLIST.wine16}lib/wine/compobj.dll16.so lib/wine/compstui.dll.so lib/wine/comsvcs.dll.so lib/wine/conhost.exe.so @@ -841,14 +920,17 @@ lib/wine/crtdll.dll.so lib/wine/crypt32.dll.so lib/wine/cryptdlg.dll.so lib/wine/cryptdll.dll.so +lib/wine/cryptext.dll.so lib/wine/cryptnet.dll.so lib/wine/cryptui.dll.so lib/wine/cscript.exe.so lib/wine/ctapi32.dll.so -lib/wine/ctl3d.dll16.so +${PLIST.wine16}lib/wine/ctl3d.dll16.so lib/wine/ctl3d32.dll.so -lib/wine/ctl3dv2.dll16.so +${PLIST.wine16}lib/wine/ctl3dv2.dll16.so +lib/wine/d2d1.dll.so lib/wine/d3d10.dll.so +lib/wine/d3d10_1.dll.so lib/wine/d3d10core.dll.so lib/wine/d3d11.dll.so lib/wine/d3d8.dll.so @@ -903,7 +985,7 @@ lib/wine/d3dxof.dll.so lib/wine/dbgeng.dll.so lib/wine/dbghelp.dll.so lib/wine/dciman32.dll.so -lib/wine/ddeml.dll16.so +${PLIST.wine16}lib/wine/ddeml.dll16.so lib/wine/ddraw.dll.so lib/wine/ddrawex.dll.so lib/wine/devenum.dll.so @@ -911,9 +993,9 @@ lib/wine/dhcpcsvc.dll.so lib/wine/difxapi.dll.so lib/wine/dinput.dll.so lib/wine/dinput8.dll.so -lib/wine/dispdib.dll16.so +${PLIST.wine16}lib/wine/dispdib.dll16.so lib/wine/dispex.dll.so -lib/wine/display.drv16.so +${PLIST.wine16}lib/wine/display.drv16.so lib/wine/dmband.dll.so lib/wine/dmcompos.dll.so lib/wine/dmime.dll.so @@ -930,6 +1012,8 @@ lib/wine/dpnaddr.dll.so lib/wine/dpnet.dll.so lib/wine/dpnhpast.dll.so lib/wine/dpnlobby.dll.so +lib/wine/dpnsvr.exe.so +lib/wine/dpvoice.dll.so lib/wine/dpwsockx.dll.so lib/wine/drmclien.dll.so lib/wine/dsound.dll.so @@ -940,10 +1024,13 @@ lib/wine/dwrite.dll.so lib/wine/dxdiag.exe.so lib/wine/dxdiagn.dll.so lib/wine/dxgi.dll.so +lib/wine/dxva2.dll.so lib/wine/eject.exe.so +lib/wine/evr.dll.so lib/wine/expand.exe.so lib/wine/explorer.exe.so lib/wine/explorerframe.dll.so +lib/wine/ext-ms-win-gdi-devcaps-l1-1-0.dll.so lib/wine/extrac32.exe.so lib/wine/fakedlls/acledit.dll lib/wine/fakedlls/aclui.dll @@ -952,18 +1039,53 @@ lib/wine/fakedlls/actxprxy.dll lib/wine/fakedlls/advapi32.dll lib/wine/fakedlls/advpack.dll 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 +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 +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 +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 lib/wine/fakedlls/api-ms-win-core-interlocked-l1-2-0.dll +lib/wine/fakedlls/api-ms-win-core-io-l1-1-1.dll +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 +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 +lib/wine/fakedlls/api-ms-win-core-namedpipe-l1-2-0.dll +lib/wine/fakedlls/api-ms-win-core-processenvironment-l1-2-0.dll lib/wine/fakedlls/api-ms-win-core-processthreads-l1-1-0.dll lib/wine/fakedlls/api-ms-win-core-processthreads-l1-1-1.dll +lib/wine/fakedlls/api-ms-win-core-processthreads-l1-1-2.dll lib/wine/fakedlls/api-ms-win-core-profile-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-core-psapi-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-core-registry-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-core-rtlsupport-l1-2-0.dll +lib/wine/fakedlls/api-ms-win-core-shlwapi-legacy-l1-1-0.dll lib/wine/fakedlls/api-ms-win-core-string-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-core-synch-l1-2-0.dll lib/wine/fakedlls/api-ms-win-core-sysinfo-l1-2-0.dll +lib/wine/fakedlls/api-ms-win-core-sysinfo-l1-2-1.dll +lib/wine/fakedlls/api-ms-win-core-threadpool-legacy-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-core-timezone-l1-1-0.dll +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 +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 +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 @@ -973,7 +1095,14 @@ lib/wine/fakedlls/api-ms-win-downlevel-shlwapi-l1-1-0.dll lib/wine/fakedlls/api-ms-win-downlevel-shlwapi-l2-1-0.dll lib/wine/fakedlls/api-ms-win-downlevel-user32-l1-1-0.dll lib/wine/fakedlls/api-ms-win-downlevel-version-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-eventing-provider-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-ntuser-dc-access-l1-1-0.dll lib/wine/fakedlls/api-ms-win-security-base-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-security-base-l1-2-0.dll +lib/wine/fakedlls/api-ms-win-security-sddl-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-service-core-l1-1-1.dll +lib/wine/fakedlls/api-ms-win-service-management-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-service-winsvc-l1-2-0.dll lib/wine/fakedlls/apphelp.dll lib/wine/fakedlls/appwiz.cpl lib/wine/fakedlls/arp.exe @@ -987,7 +1116,7 @@ lib/wine/fakedlls/attrib.exe lib/wine/fakedlls/authz.dll lib/wine/fakedlls/avicap32.dll lib/wine/fakedlls/avifil32.dll -lib/wine/fakedlls/avifile.dll16 +${PLIST.wine16}lib/wine/fakedlls/avifile.dll16 lib/wine/fakedlls/avrt.dll lib/wine/fakedlls/bcrypt.dll lib/wine/fakedlls/browseui.dll @@ -1000,12 +1129,13 @@ lib/wine/fakedlls/cfgmgr32.dll lib/wine/fakedlls/clock.exe lib/wine/fakedlls/clusapi.dll lib/wine/fakedlls/cmd.exe +lib/wine/fakedlls/combase.dll 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 +${PLIST.wine16}lib/wine/fakedlls/comm.drv16 +${PLIST.wine16}lib/wine/fakedlls/commdlg.dll16 +${PLIST.wine16}lib/wine/fakedlls/compobj.dll16 lib/wine/fakedlls/compstui.dll lib/wine/fakedlls/comsvcs.dll lib/wine/fakedlls/conhost.exe @@ -1015,14 +1145,17 @@ lib/wine/fakedlls/crtdll.dll lib/wine/fakedlls/crypt32.dll lib/wine/fakedlls/cryptdlg.dll lib/wine/fakedlls/cryptdll.dll +lib/wine/fakedlls/cryptext.dll lib/wine/fakedlls/cryptnet.dll lib/wine/fakedlls/cryptui.dll lib/wine/fakedlls/cscript.exe lib/wine/fakedlls/ctapi32.dll -lib/wine/fakedlls/ctl3d.dll16 +${PLIST.wine16}lib/wine/fakedlls/ctl3d.dll16 lib/wine/fakedlls/ctl3d32.dll -lib/wine/fakedlls/ctl3dv2.dll16 +${PLIST.wine16}lib/wine/fakedlls/ctl3dv2.dll16 +lib/wine/fakedlls/d2d1.dll lib/wine/fakedlls/d3d10.dll +lib/wine/fakedlls/d3d10_1.dll lib/wine/fakedlls/d3d10core.dll lib/wine/fakedlls/d3d11.dll lib/wine/fakedlls/d3d8.dll @@ -1077,7 +1210,7 @@ lib/wine/fakedlls/d3dxof.dll lib/wine/fakedlls/dbgeng.dll lib/wine/fakedlls/dbghelp.dll lib/wine/fakedlls/dciman32.dll -lib/wine/fakedlls/ddeml.dll16 +${PLIST.wine16}lib/wine/fakedlls/ddeml.dll16 lib/wine/fakedlls/ddraw.dll lib/wine/fakedlls/ddrawex.dll lib/wine/fakedlls/devenum.dll @@ -1085,9 +1218,9 @@ lib/wine/fakedlls/dhcpcsvc.dll lib/wine/fakedlls/difxapi.dll lib/wine/fakedlls/dinput.dll lib/wine/fakedlls/dinput8.dll -lib/wine/fakedlls/dispdib.dll16 +${PLIST.wine16}lib/wine/fakedlls/dispdib.dll16 lib/wine/fakedlls/dispex.dll -lib/wine/fakedlls/display.drv16 +${PLIST.wine16}lib/wine/fakedlls/display.drv16 lib/wine/fakedlls/dmband.dll lib/wine/fakedlls/dmcompos.dll lib/wine/fakedlls/dmime.dll @@ -1104,6 +1237,8 @@ lib/wine/fakedlls/dpnaddr.dll lib/wine/fakedlls/dpnet.dll lib/wine/fakedlls/dpnhpast.dll lib/wine/fakedlls/dpnlobby.dll +lib/wine/fakedlls/dpnsvr.exe +lib/wine/fakedlls/dpvoice.dll lib/wine/fakedlls/dpwsockx.dll lib/wine/fakedlls/drmclien.dll lib/wine/fakedlls/dsound.dll @@ -1114,21 +1249,26 @@ lib/wine/fakedlls/dwrite.dll lib/wine/fakedlls/dxdiag.exe lib/wine/fakedlls/dxdiagn.dll lib/wine/fakedlls/dxgi.dll +lib/wine/fakedlls/dxva2.dll lib/wine/fakedlls/eject.exe +lib/wine/fakedlls/evr.dll lib/wine/fakedlls/expand.exe lib/wine/fakedlls/explorer.exe lib/wine/fakedlls/explorerframe.dll +lib/wine/fakedlls/ext-ms-win-gdi-devcaps-l1-1-0.dll lib/wine/fakedlls/extrac32.exe lib/wine/fakedlls/faultrep.dll lib/wine/fakedlls/findstr.exe lib/wine/fakedlls/fltlib.dll +lib/wine/fakedlls/fntcache.dll +lib/wine/fakedlls/fontsub.dll lib/wine/fakedlls/fusion.dll lib/wine/fakedlls/fwpuclnt.dll lib/wine/fakedlls/gameux.dll -lib/wine/fakedlls/gdi.exe16 +${PLIST.wine16}lib/wine/fakedlls/gdi.exe16 lib/wine/fakedlls/gdi32.dll lib/wine/fakedlls/gdiplus.dll -lib/wine/fakedlls/glu32.dll +${PLIST.x11}lib/wine/fakedlls/glu32.dll lib/wine/fakedlls/gphoto2.ds lib/wine/fakedlls/gpkcsp.dll lib/wine/fakedlls/hal.dll @@ -1144,10 +1284,10 @@ lib/wine/fakedlls/icinfo.exe lib/wine/fakedlls/icmp.dll lib/wine/fakedlls/ieframe.dll lib/wine/fakedlls/iexplore.exe -lib/wine/fakedlls/ifsmgr.vxd +${PLIST.wine16}lib/wine/fakedlls/ifsmgr.vxd lib/wine/fakedlls/imaadp32.acm lib/wine/fakedlls/imagehlp.dll -lib/wine/fakedlls/imm.dll16 +${PLIST.wine16}lib/wine/fakedlls/imm.dll16 lib/wine/fakedlls/imm32.dll lib/wine/fakedlls/inetcomm.dll lib/wine/fakedlls/inetcpl.cpl @@ -1162,16 +1302,18 @@ lib/wine/fakedlls/itircl.dll lib/wine/fakedlls/itss.dll lib/wine/fakedlls/joy.cpl 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 +${PLIST.wine16}lib/wine/fakedlls/keyboard.drv16 +${PLIST.wine16}lib/wine/fakedlls/krnl386.exe16 +lib/wine/fakedlls/ksuser.dll lib/wine/fakedlls/ktmw32.dll lib/wine/fakedlls/loadperf.dll lib/wine/fakedlls/localspl.dll lib/wine/fakedlls/localui.dll lib/wine/fakedlls/lodctr.exe lib/wine/fakedlls/lz32.dll -lib/wine/fakedlls/lzexpand.dll16 +${PLIST.wine16}lib/wine/fakedlls/lzexpand.dll16 lib/wine/fakedlls/mapi32.dll lib/wine/fakedlls/mapistub.dll lib/wine/fakedlls/mciavi32.dll @@ -1179,23 +1321,26 @@ lib/wine/fakedlls/mcicda.dll lib/wine/fakedlls/mciqtz32.dll lib/wine/fakedlls/mciseq.dll lib/wine/fakedlls/mciwave.dll +lib/wine/fakedlls/mfplat.dll +lib/wine/fakedlls/mfreadwrite.dll lib/wine/fakedlls/mgmtapi.dll lib/wine/fakedlls/midimap.dll lib/wine/fakedlls/mlang.dll lib/wine/fakedlls/mmcndmgr.dll lib/wine/fakedlls/mmdevapi.dll -lib/wine/fakedlls/mmdevldr.vxd -lib/wine/fakedlls/mmsystem.dll16 +${PLIST.wine16}lib/wine/fakedlls/mmdevldr.vxd +${PLIST.wine16}lib/wine/fakedlls/mmsystem.dll16 lib/wine/fakedlls/mofcomp.exe -lib/wine/fakedlls/monodebg.vxd +${PLIST.wine16}lib/wine/fakedlls/monodebg.vxd lib/wine/fakedlls/mountmgr.sys -lib/wine/fakedlls/mouse.drv16 +${PLIST.wine16}lib/wine/fakedlls/mouse.drv16 lib/wine/fakedlls/mpr.dll lib/wine/fakedlls/mprapi.dll -lib/wine/fakedlls/msacm.dll16 +${PLIST.wine16}lib/wine/fakedlls/msacm.dll16 lib/wine/fakedlls/msacm32.dll lib/wine/fakedlls/msacm32.drv lib/wine/fakedlls/msadp32.acm +lib/wine/fakedlls/msasn1.dll lib/wine/fakedlls/mscat32.dll lib/wine/fakedlls/mscms.dll lib/wine/fakedlls/mscoree.dll @@ -1228,6 +1373,8 @@ lib/wine/fakedlls/msvcm80.dll lib/wine/fakedlls/msvcm90.dll lib/wine/fakedlls/msvcp100.dll lib/wine/fakedlls/msvcp110.dll +lib/wine/fakedlls/msvcp120.dll +lib/wine/fakedlls/msvcp120_app.dll lib/wine/fakedlls/msvcp60.dll lib/wine/fakedlls/msvcp70.dll lib/wine/fakedlls/msvcp71.dll @@ -1235,6 +1382,8 @@ lib/wine/fakedlls/msvcp80.dll lib/wine/fakedlls/msvcp90.dll lib/wine/fakedlls/msvcr100.dll lib/wine/fakedlls/msvcr110.dll +lib/wine/fakedlls/msvcr120.dll +lib/wine/fakedlls/msvcr120_app.dll lib/wine/fakedlls/msvcr70.dll lib/wine/fakedlls/msvcr71.dll lib/wine/fakedlls/msvcr80.dll @@ -1245,7 +1394,7 @@ lib/wine/fakedlls/msvcrt40.dll lib/wine/fakedlls/msvcrtd.dll lib/wine/fakedlls/msvfw32.dll lib/wine/fakedlls/msvidc32.dll -lib/wine/fakedlls/msvideo.dll16 +${PLIST.wine16}lib/wine/fakedlls/msvideo.dll16 lib/wine/fakedlls/mswsock.dll lib/wine/fakedlls/msxml.dll lib/wine/fakedlls/msxml2.dll @@ -1253,9 +1402,11 @@ lib/wine/fakedlls/msxml3.dll lib/wine/fakedlls/msxml4.dll lib/wine/fakedlls/msxml6.dll lib/wine/fakedlls/nddeapi.dll +lib/wine/fakedlls/ndis.sys lib/wine/fakedlls/net.exe lib/wine/fakedlls/netapi32.dll lib/wine/fakedlls/netcfgx.dll +lib/wine/fakedlls/netprofm.dll lib/wine/fakedlls/netsh.exe lib/wine/fakedlls/netstat.exe lib/wine/fakedlls/newdev.dll @@ -1263,6 +1414,7 @@ lib/wine/fakedlls/ngen.exe lib/wine/fakedlls/normaliz.dll lib/wine/fakedlls/notepad.exe lib/wine/fakedlls/npmshtml.dll +lib/wine/fakedlls/npptools.dll lib/wine/fakedlls/ntdll.dll lib/wine/fakedlls/ntdsapi.dll lib/wine/fakedlls/ntoskrnl.exe @@ -1271,25 +1423,26 @@ lib/wine/fakedlls/objsel.dll 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 +${PLIST.wine16}lib/wine/fakedlls/ole2.dll16 +${PLIST.wine16}lib/wine/fakedlls/ole2conv.dll16 +${PLIST.wine16}lib/wine/fakedlls/ole2disp.dll16 +${PLIST.wine16}lib/wine/fakedlls/ole2nls.dll16 +${PLIST.wine16}lib/wine/fakedlls/ole2prox.dll16 +${PLIST.wine16}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 +${PLIST.wine16}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 +${PLIST.wine16}lib/wine/fakedlls/olesvr.dll16 lib/wine/fakedlls/olesvr32.dll lib/wine/fakedlls/olethk32.dll lib/wine/fakedlls/oleview.exe lib/wine/fakedlls/opengl32.dll +lib/wine/fakedlls/packager.dll lib/wine/fakedlls/pdh.dll lib/wine/fakedlls/photometadatahandler.dll lib/wine/fakedlls/pidgen.dll @@ -1298,6 +1451,7 @@ lib/wine/fakedlls/plugplay.exe lib/wine/fakedlls/powrprof.dll lib/wine/fakedlls/presentationfontcache.exe lib/wine/fakedlls/printui.dll +lib/wine/fakedlls/prntvpt.dll lib/wine/fakedlls/progman.exe lib/wine/fakedlls/propsys.dll lib/wine/fakedlls/psapi.dll @@ -1308,7 +1462,7 @@ lib/wine/fakedlls/qmgr.dll lib/wine/fakedlls/qmgrprxy.dll lib/wine/fakedlls/quartz.dll lib/wine/fakedlls/query.dll -lib/wine/fakedlls/rasapi16.dll16 +${PLIST.wine16}lib/wine/fakedlls/rasapi16.dll16 lib/wine/fakedlls/rasapi32.dll lib/wine/fakedlls/rasdlg.dll lib/wine/fakedlls/reg.exe @@ -1326,7 +1480,7 @@ lib/wine/fakedlls/rsabase.dll lib/wine/fakedlls/rsaenh.dll lib/wine/fakedlls/rstrtmgr.dll lib/wine/fakedlls/rtutils.dll -lib/wine/fakedlls/rundll.exe16 +${PLIST.wine16}lib/wine/fakedlls/rundll.exe16 lib/wine/fakedlls/rundll32.exe lib/wine/fakedlls/samlib.dll lib/wine/fakedlls/sane.ds @@ -1334,9 +1488,11 @@ lib/wine/fakedlls/sc.exe lib/wine/fakedlls/scarddlg.dll lib/wine/fakedlls/sccbase.dll lib/wine/fakedlls/schannel.dll +lib/wine/fakedlls/schedsvc.dll lib/wine/fakedlls/schtasks.exe lib/wine/fakedlls/scrrun.dll lib/wine/fakedlls/scsiport.sys +lib/wine/fakedlls/sdbinst.exe lib/wine/fakedlls/secedit.exe lib/wine/fakedlls/secur32.dll lib/wine/fakedlls/security.dll @@ -1345,12 +1501,12 @@ lib/wine/fakedlls/serialui.dll lib/wine/fakedlls/servicemodelreg.exe lib/wine/fakedlls/services.exe lib/wine/fakedlls/setupapi.dll -lib/wine/fakedlls/setupx.dll16 +${PLIST.wine16}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 +${PLIST.wine16}lib/wine/fakedlls/shell.dll16 lib/wine/fakedlls/shell32.dll lib/wine/fakedlls/shfolder.dll lib/wine/fakedlls/shlwapi.dll @@ -1358,19 +1514,20 @@ lib/wine/fakedlls/slbcsp.dll lib/wine/fakedlls/slc.dll lib/wine/fakedlls/snmpapi.dll lib/wine/fakedlls/softpub.dll -lib/wine/fakedlls/sound.drv16 +${PLIST.wine16}lib/wine/fakedlls/sound.drv16 lib/wine/fakedlls/spoolss.dll lib/wine/fakedlls/spoolsv.exe lib/wine/fakedlls/start.exe 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 +${PLIST.wine16}lib/wine/fakedlls/storage.dll16 +${PLIST.wine16}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 +${PLIST.wine16}lib/wine/fakedlls/system.drv16 +lib/wine/fakedlls/systeminfo.exe lib/wine/fakedlls/t2embed.dll lib/wine/fakedlls/tapi32.dll lib/wine/fakedlls/taskkill.exe @@ -1378,11 +1535,11 @@ lib/wine/fakedlls/tasklist.exe lib/wine/fakedlls/taskmgr.exe lib/wine/fakedlls/taskschd.dll lib/wine/fakedlls/termsv.exe -lib/wine/fakedlls/toolhelp.dll16 +${PLIST.wine16}lib/wine/fakedlls/toolhelp.dll16 lib/wine/fakedlls/traffic.dll -lib/wine/fakedlls/twain.dll16 +${PLIST.wine16}lib/wine/fakedlls/twain.dll16 lib/wine/fakedlls/twain_32.dll -lib/wine/fakedlls/typelib.dll16 +${PLIST.wine16}lib/wine/fakedlls/typelib.dll16 lib/wine/fakedlls/unicows.dll lib/wine/fakedlls/uninstaller.exe lib/wine/fakedlls/unlodctr.exe @@ -1390,7 +1547,7 @@ lib/wine/fakedlls/updspapi.dll lib/wine/fakedlls/url.dll lib/wine/fakedlls/urlmon.dll lib/wine/fakedlls/usbd.sys -lib/wine/fakedlls/user.exe16 +${PLIST.wine16}lib/wine/fakedlls/user.exe16 lib/wine/fakedlls/user32.dll lib/wine/fakedlls/userenv.dll lib/wine/fakedlls/usp10.dll @@ -1399,28 +1556,30 @@ lib/wine/fakedlls/vbscript.dll lib/wine/fakedlls/vcomp.dll lib/wine/fakedlls/vcomp100.dll lib/wine/fakedlls/vcomp90.dll -lib/wine/fakedlls/vdhcp.vxd +${PLIST.wine16}lib/wine/fakedlls/vdhcp.vxd lib/wine/fakedlls/vdmdbg.dll -lib/wine/fakedlls/ver.dll16 +${PLIST.wine16}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 -lib/wine/fakedlls/vtdapi.vxd -lib/wine/fakedlls/vwin32.vxd -lib/wine/fakedlls/w32skrnl.dll -lib/wine/fakedlls/w32sys.dll16 +${PLIST.wine16}lib/wine/fakedlls/vmm.vxd +${PLIST.wine16}lib/wine/fakedlls/vnbt.vxd +${PLIST.wine16}lib/wine/fakedlls/vnetbios.vxd +lib/wine/fakedlls/vssapi.dll +${PLIST.wine16}lib/wine/fakedlls/vtdapi.vxd +${PLIST.wine16}lib/wine/fakedlls/vwin32.vxd +${PLIST.wine16}lib/wine/fakedlls/w32skrnl.dll +${PLIST.wine16}lib/wine/fakedlls/w32sys.dll16 lib/wine/fakedlls/wbemdisp.dll lib/wine/fakedlls/wbemprox.dll lib/wine/fakedlls/webservices.dll lib/wine/fakedlls/wer.dll 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 +${PLIST.wine16}lib/wine/fakedlls/win32s16.dll16 +${PLIST.wine16}lib/wine/fakedlls/win87em.dll16 +${PLIST.wine16}lib/wine/fakedlls/winaspi.dll16 +${PLIST.wine16}lib/wine/fakedlls/windebug.dll16 lib/wine/fakedlls/windowscodecs.dll lib/wine/fakedlls/windowscodecsext.dll lib/wine/fakedlls/wineboot.exe @@ -1435,27 +1594,27 @@ lib/wine/fakedlls/winemapi.dll lib/wine/fakedlls/winemenubuilder.exe lib/wine/fakedlls/winemine.exe lib/wine/fakedlls/winemsibuilder.exe -lib/wine/fakedlls/wineoss.drv +${PLIST.oss}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 -lib/wine/fakedlls/winex11.drv -lib/wine/fakedlls/wing.dll16 +${PLIST.x11}lib/wine/fakedlls/winex11.drv +${PLIST.wine16}lib/wine/fakedlls/wineps16.drv16 +${PLIST.wine16}lib/wine/fakedlls/winevdm.exe +${PLIST.wine16}lib/wine/fakedlls/wing.dll16 lib/wine/fakedlls/wing32.dll -lib/wine/fakedlls/winhelp.exe16 +${PLIST.wine16}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 +${PLIST.wine16}lib/wine/fakedlls/winnls.dll16 lib/wine/fakedlls/winnls32.dll -lib/wine/fakedlls/winoldap.mod16 +${PLIST.wine16}lib/wine/fakedlls/winoldap.mod16 lib/wine/fakedlls/winscard.dll -lib/wine/fakedlls/winsock.dll16 +${PLIST.wine16}lib/wine/fakedlls/winsock.dll16 lib/wine/fakedlls/winspool.drv lib/wine/fakedlls/winsta.dll -lib/wine/fakedlls/wintab.dll16 +${PLIST.wine16}lib/wine/fakedlls/wintab.dll16 lib/wine/fakedlls/wintab32.dll lib/wine/fakedlls/wintrust.dll lib/wine/fakedlls/winver.exe @@ -1464,10 +1623,12 @@ lib/wine/fakedlls/wldap32.dll lib/wine/fakedlls/wmi.dll lib/wine/fakedlls/wmic.exe lib/wine/fakedlls/wmiutils.dll +lib/wine/fakedlls/wmp.dll lib/wine/fakedlls/wmvcore.dll lib/wine/fakedlls/wnaspi32.dll lib/wine/fakedlls/wordpad.exe -lib/wine/fakedlls/wow32.dll +${PLIST.wine16}lib/wine/fakedlls/wow32.dll +lib/wine/fakedlls/wpcap.dll lib/wine/fakedlls/write.exe lib/wine/fakedlls/ws2_32.dll lib/wine/fakedlls/wscript.exe @@ -1478,7 +1639,9 @@ lib/wine/fakedlls/wtsapi32.dll lib/wine/fakedlls/wuapi.dll lib/wine/fakedlls/wuaueng.dll lib/wine/fakedlls/wusa.exe +lib/wine/fakedlls/x3daudio1_7.dll lib/wine/fakedlls/xapofx1_1.dll +lib/wine/fakedlls/xaudio2_7.dll lib/wine/fakedlls/xcopy.exe lib/wine/fakedlls/xinput1_1.dll lib/wine/fakedlls/xinput1_2.dll @@ -1492,13 +1655,15 @@ lib/wine/fakedlls/xpssvcs.dll lib/wine/faultrep.dll.so lib/wine/findstr.exe.so lib/wine/fltlib.dll.so +lib/wine/fntcache.dll.so +lib/wine/fontsub.dll.so lib/wine/fusion.dll.so lib/wine/fwpuclnt.dll.so lib/wine/gameux.dll.so -lib/wine/gdi.exe16.so +${PLIST.wine16}lib/wine/gdi.exe16.so lib/wine/gdi32.dll.so lib/wine/gdiplus.dll.so -lib/wine/glu32.dll.so +${PLIST.x11}lib/wine/glu32.dll.so lib/wine/gphoto2.ds.so lib/wine/gpkcsp.dll.so lib/wine/hal.dll.so @@ -1514,10 +1679,10 @@ lib/wine/icinfo.exe.so lib/wine/icmp.dll.so lib/wine/ieframe.dll.so lib/wine/iexplore.exe.so -lib/wine/ifsmgr.vxd.so +${PLIST.wine16}lib/wine/ifsmgr.vxd.so lib/wine/imaadp32.acm.so lib/wine/imagehlp.dll.so -lib/wine/imm.dll16.so +${PLIST.wine16}lib/wine/imm.dll16.so lib/wine/imm32.dll.so lib/wine/inetcomm.dll.so lib/wine/inetcpl.cpl.so @@ -1532,9 +1697,11 @@ lib/wine/itircl.dll.so lib/wine/itss.dll.so lib/wine/joy.cpl.so 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 +${PLIST.wine16}lib/wine/keyboard.drv16.so +${PLIST.wine16}lib/wine/krnl386.exe16.so +lib/wine/ksuser.dll.so lib/wine/ktmw32.dll.so lib/wine/libaclui.def lib/wine/libactiveds.def @@ -1563,7 +1730,9 @@ lib/wine/libcryptdll.def lib/wine/libcryptnet.def lib/wine/libcryptui.def lib/wine/libctl3d32.def +lib/wine/libd2d1.def lib/wine/libd3d10.def +lib/wine/libd3d10_1.def lib/wine/libd3d10core.def lib/wine/libd3d8.def lib/wine/libd3d9.def @@ -1603,7 +1772,8 @@ lib/wine/libimagehlp.def lib/wine/libimm32.def lib/wine/libinetcomm.def lib/wine/libiphlpapi.def -lib/wine/libkernel.def +lib/wine/libjsproxy.def +${PLIST.wine16}lib/wine/libkernel.def lib/wine/libkernel32.def lib/wine/libloadperf.def lib/wine/liblz32.def @@ -1612,6 +1782,7 @@ lib/wine/libmlang.def lib/wine/libmpr.def lib/wine/libmprapi.def lib/wine/libmsacm32.def +lib/wine/libmsasn1.def lib/wine/libmscms.def lib/wine/libmsdmo.def lib/wine/libmshtml.def @@ -1619,6 +1790,7 @@ lib/wine/libmsi.def lib/wine/libmsimg32.def lib/wine/libmsvcr100.def lib/wine/libmsvcr110.def +lib/wine/libmsvcr120.def lib/wine/libmsvcr70.def lib/wine/libmsvcr71.def lib/wine/libmsvcr80.def @@ -1703,18 +1875,19 @@ lib/wine/libwintab32.def lib/wine/libwintrust.def lib/wine/libwldap32.def lib/wine/libwnaspi32.def -lib/wine/libwow32.def +${PLIST.wine16}lib/wine/libwow32.def lib/wine/libws2_32.def lib/wine/libwsnmp32.def lib/wine/libwsock32.def lib/wine/libwtsapi32.def lib/wine/libxinput.def +lib/wine/libxmllite.def lib/wine/loadperf.dll.so lib/wine/localspl.dll.so lib/wine/localui.dll.so lib/wine/lodctr.exe.so lib/wine/lz32.dll.so -lib/wine/lzexpand.dll16.so +${PLIST.wine16}lib/wine/lzexpand.dll16.so lib/wine/mapi32.dll.so lib/wine/mapistub.dll.so lib/wine/mciavi32.dll.so @@ -1722,23 +1895,26 @@ lib/wine/mcicda.dll.so lib/wine/mciqtz32.dll.so lib/wine/mciseq.dll.so lib/wine/mciwave.dll.so +lib/wine/mfplat.dll.so +lib/wine/mfreadwrite.dll.so lib/wine/mgmtapi.dll.so lib/wine/midimap.dll.so 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 +${PLIST.wine16}lib/wine/mmdevldr.vxd.so +${PLIST.wine16}lib/wine/mmsystem.dll16.so lib/wine/mofcomp.exe.so -lib/wine/monodebg.vxd.so +${PLIST.wine16}lib/wine/monodebg.vxd.so lib/wine/mountmgr.sys.so -lib/wine/mouse.drv16.so +${PLIST.wine16}lib/wine/mouse.drv16.so lib/wine/mpr.dll.so lib/wine/mprapi.dll.so -lib/wine/msacm.dll16.so +${PLIST.wine16}lib/wine/msacm.dll16.so lib/wine/msacm32.dll.so lib/wine/msacm32.drv.so lib/wine/msadp32.acm.so +lib/wine/msasn1.dll.so lib/wine/mscat32.dll.so lib/wine/mscms.dll.so lib/wine/mscoree.dll.so @@ -1771,6 +1947,8 @@ lib/wine/msvcm80.dll.so lib/wine/msvcm90.dll.so lib/wine/msvcp100.dll.so lib/wine/msvcp110.dll.so +lib/wine/msvcp120.dll.so +lib/wine/msvcp120_app.dll.so lib/wine/msvcp60.dll.so lib/wine/msvcp70.dll.so lib/wine/msvcp71.dll.so @@ -1778,6 +1956,8 @@ lib/wine/msvcp80.dll.so lib/wine/msvcp90.dll.so lib/wine/msvcr100.dll.so lib/wine/msvcr110.dll.so +lib/wine/msvcr120.dll.so +lib/wine/msvcr120_app.dll.so lib/wine/msvcr70.dll.so lib/wine/msvcr71.dll.so lib/wine/msvcr80.dll.so @@ -1788,7 +1968,7 @@ lib/wine/msvcrt40.dll.so lib/wine/msvcrtd.dll.so lib/wine/msvfw32.dll.so lib/wine/msvidc32.dll.so -lib/wine/msvideo.dll16.so +${PLIST.wine16}lib/wine/msvideo.dll16.so lib/wine/mswsock.dll.so lib/wine/msxml.dll.so lib/wine/msxml2.dll.so @@ -1796,9 +1976,11 @@ lib/wine/msxml3.dll.so lib/wine/msxml4.dll.so lib/wine/msxml6.dll.so lib/wine/nddeapi.dll.so +lib/wine/ndis.sys.so lib/wine/net.exe.so lib/wine/netapi32.dll.so lib/wine/netcfgx.dll.so +lib/wine/netprofm.dll.so lib/wine/netsh.exe.so lib/wine/netstat.exe.so lib/wine/newdev.dll.so @@ -1806,6 +1988,7 @@ lib/wine/ngen.exe.so lib/wine/normaliz.dll.so lib/wine/notepad.exe.so lib/wine/npmshtml.dll.so +lib/wine/npptools.dll.so lib/wine/ntdll.dll.so lib/wine/ntdsapi.dll.so lib/wine/ntoskrnl.exe.so @@ -1814,25 +1997,26 @@ lib/wine/objsel.dll.so 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 +${PLIST.wine16}lib/wine/ole2.dll16.so +${PLIST.wine16}lib/wine/ole2conv.dll16.so +${PLIST.wine16}lib/wine/ole2disp.dll16.so +${PLIST.wine16}lib/wine/ole2nls.dll16.so +${PLIST.wine16}lib/wine/ole2prox.dll16.so +${PLIST.wine16}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 +${PLIST.wine16}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 +${PLIST.wine16}lib/wine/olesvr.dll16.so lib/wine/olesvr32.dll.so lib/wine/olethk32.dll.so lib/wine/oleview.exe.so lib/wine/opengl32.dll.so +lib/wine/packager.dll.so lib/wine/pdh.dll.so lib/wine/photometadatahandler.dll.so lib/wine/pidgen.dll.so @@ -1841,6 +2025,7 @@ lib/wine/plugplay.exe.so lib/wine/powrprof.dll.so lib/wine/presentationfontcache.exe.so lib/wine/printui.dll.so +lib/wine/prntvpt.dll.so lib/wine/progman.exe.so lib/wine/propsys.dll.so lib/wine/psapi.dll.so @@ -1851,7 +2036,7 @@ lib/wine/qmgr.dll.so lib/wine/qmgrprxy.dll.so lib/wine/quartz.dll.so lib/wine/query.dll.so -lib/wine/rasapi16.dll16.so +${PLIST.wine16}lib/wine/rasapi16.dll16.so lib/wine/rasapi32.dll.so lib/wine/rasdlg.dll.so lib/wine/reg.exe.so @@ -1869,7 +2054,7 @@ lib/wine/rsabase.dll.so lib/wine/rsaenh.dll.so lib/wine/rstrtmgr.dll.so lib/wine/rtutils.dll.so -lib/wine/rundll.exe16.so +${PLIST.wine16}lib/wine/rundll.exe16.so lib/wine/rundll32.exe.so lib/wine/samlib.dll.so lib/wine/sane.ds.so @@ -1877,9 +2062,11 @@ lib/wine/sc.exe.so lib/wine/scarddlg.dll.so lib/wine/sccbase.dll.so lib/wine/schannel.dll.so +lib/wine/schedsvc.dll.so lib/wine/schtasks.exe.so lib/wine/scrrun.dll.so lib/wine/scsiport.sys.so +lib/wine/sdbinst.exe.so lib/wine/secedit.exe.so lib/wine/secur32.dll.so lib/wine/security.dll.so @@ -1888,12 +2075,12 @@ lib/wine/serialui.dll.so lib/wine/servicemodelreg.exe.so lib/wine/services.exe.so lib/wine/setupapi.dll.so -lib/wine/setupx.dll16.so +${PLIST.wine16}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 +${PLIST.wine16}lib/wine/shell.dll16.so lib/wine/shell32.dll.so lib/wine/shfolder.dll.so lib/wine/shlwapi.dll.so @@ -1901,19 +2088,20 @@ lib/wine/slbcsp.dll.so lib/wine/slc.dll.so lib/wine/snmpapi.dll.so lib/wine/softpub.dll.so -lib/wine/sound.drv16.so +${PLIST.wine16}lib/wine/sound.drv16.so lib/wine/spoolss.dll.so lib/wine/spoolsv.exe.so lib/wine/start.exe.so 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 +${PLIST.wine16}lib/wine/storage.dll16.so +${PLIST.wine16}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 +${PLIST.wine16}lib/wine/system.drv16.so +lib/wine/systeminfo.exe.so lib/wine/t2embed.dll.so lib/wine/tapi32.dll.so lib/wine/taskkill.exe.so @@ -1921,11 +2109,11 @@ lib/wine/tasklist.exe.so lib/wine/taskmgr.exe.so lib/wine/taskschd.dll.so lib/wine/termsv.exe.so -lib/wine/toolhelp.dll16.so +${PLIST.wine16}lib/wine/toolhelp.dll16.so lib/wine/traffic.dll.so -lib/wine/twain.dll16.so +${PLIST.wine16}lib/wine/twain.dll16.so lib/wine/twain_32.dll.so -lib/wine/typelib.dll16.so +${PLIST.wine16}lib/wine/typelib.dll16.so lib/wine/unicows.dll.so lib/wine/uninstaller.exe.so lib/wine/unlodctr.exe.so @@ -1933,7 +2121,7 @@ lib/wine/updspapi.dll.so lib/wine/url.dll.so lib/wine/urlmon.dll.so lib/wine/usbd.sys.so -lib/wine/user.exe16.so +${PLIST.wine16}lib/wine/user.exe16.so lib/wine/user32.dll.so lib/wine/userenv.dll.so lib/wine/usp10.dll.so @@ -1942,28 +2130,30 @@ lib/wine/vbscript.dll.so lib/wine/vcomp.dll.so lib/wine/vcomp100.dll.so lib/wine/vcomp90.dll.so -lib/wine/vdhcp.vxd.so +${PLIST.wine16}lib/wine/vdhcp.vxd.so lib/wine/vdmdbg.dll.so -lib/wine/ver.dll16.so +${PLIST.wine16}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 -lib/wine/vtdapi.vxd.so -lib/wine/vwin32.vxd.so -lib/wine/w32skrnl.dll.so -lib/wine/w32sys.dll16.so +${PLIST.wine16}lib/wine/vmm.vxd.so +${PLIST.wine16}lib/wine/vnbt.vxd.so +${PLIST.wine16}lib/wine/vnetbios.vxd.so +lib/wine/vssapi.dll.so +${PLIST.wine16}lib/wine/vtdapi.vxd.so +${PLIST.wine16}lib/wine/vwin32.vxd.so +${PLIST.wine16}lib/wine/w32skrnl.dll.so +${PLIST.wine16}lib/wine/w32sys.dll16.so lib/wine/wbemdisp.dll.so lib/wine/wbemprox.dll.so lib/wine/webservices.dll.so lib/wine/wer.dll.so 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 +${PLIST.wine16}lib/wine/win32s16.dll16.so +${PLIST.wine16}lib/wine/win87em.dll16.so +${PLIST.wine16}lib/wine/winaspi.dll16.so +${PLIST.wine16}lib/wine/windebug.dll16.so lib/wine/windowscodecs.dll.so lib/wine/windowscodecsext.dll.so lib/wine/wineboot.exe.so @@ -1978,27 +2168,27 @@ lib/wine/winemapi.dll.so lib/wine/winemenubuilder.exe.so lib/wine/winemine.exe.so lib/wine/winemsibuilder.exe.so -lib/wine/wineoss.drv.so +${PLIST.oss}lib/wine/wineoss.drv.so lib/wine/winepath.exe.so lib/wine/wineps.drv.so -lib/wine/wineps16.drv16.so -lib/wine/winevdm.exe.so -lib/wine/winex11.drv.so -lib/wine/wing.dll16.so +${PLIST.x11}lib/wine/winex11.drv.so +${PLIST.wine16}lib/wine/wineps16.drv16.so +${PLIST.wine16}lib/wine/winevdm.exe.so +${PLIST.wine16}lib/wine/wing.dll16.so lib/wine/wing32.dll.so -lib/wine/winhelp.exe16.so +${PLIST.wine16}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 +${PLIST.wine16}lib/wine/winnls.dll16.so lib/wine/winnls32.dll.so -lib/wine/winoldap.mod16.so +${PLIST.wine16}lib/wine/winoldap.mod16.so lib/wine/winscard.dll.so -lib/wine/winsock.dll16.so +${PLIST.wine16}lib/wine/winsock.dll16.so lib/wine/winspool.drv.so lib/wine/winsta.dll.so -lib/wine/wintab.dll16.so +${PLIST.wine16}lib/wine/wintab.dll16.so lib/wine/wintab32.dll.so lib/wine/wintrust.dll.so lib/wine/winver.exe.so @@ -2007,10 +2197,12 @@ lib/wine/wldap32.dll.so lib/wine/wmi.dll.so lib/wine/wmic.exe.so lib/wine/wmiutils.dll.so +lib/wine/wmp.dll.so lib/wine/wmvcore.dll.so lib/wine/wnaspi32.dll.so lib/wine/wordpad.exe.so -lib/wine/wow32.dll.so +${PLIST.wine16}lib/wine/wow32.dll.so +lib/wine/wpcap.dll.so lib/wine/write.exe.so lib/wine/ws2_32.dll.so lib/wine/wscript.exe.so @@ -2021,7 +2213,9 @@ lib/wine/wtsapi32.dll.so lib/wine/wuapi.dll.so lib/wine/wuaueng.dll.so lib/wine/wusa.exe.so +lib/wine/x3daudio1_7.dll.so lib/wine/xapofx1_1.dll.so +lib/wine/xaudio2_7.dll.so lib/wine/xcopy.exe.so lib/wine/xinput1_1.dll.so lib/wine/xinput1_2.dll.so diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index 3f5dfd67f0c..9efa244fc41 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1,10 +1,12 @@ -$NetBSD: distinfo,v 1.23 2014/06/29 18:11:32 dholland Exp $ +$NetBSD: distinfo,v 1.24 2015/02/09 13:30:44 adam Exp $ -SHA1 (wine-1.7.11.tar.bz2) = ebe30cf1a93782a958e8b1e3ed898310c37676fe -RMD160 (wine-1.7.11.tar.bz2) = ea565f9f46eeabf803cc5ab319469831a4afa93d -Size (wine-1.7.11.tar.bz2) = 21359534 bytes -SHA1 (patch-configure) = 2d540b149e59298ca0fcc43d50873c986fbe0140 -SHA1 (patch-dlls_ntdll_signal__x86__64.c) = cb253b0de7a13ed6cbc61a3bb950ab30e8f9c045 -SHA1 (patch-dlls_wbemprox_builtin.c) = a11f910d8b94047f2dcf8b45c27fb1c6c3f3ce59 -SHA1 (patch-dlls_wineoss.drv_mmdevdrv.c) = fc44346b889ee7486a92e9704a8447334f48f4d1 +SHA1 (wine-1.7.36.tar.bz2) = 69c8bf7116572a4c1e5b1113612f461d88489663 +RMD160 (wine-1.7.36.tar.bz2) = 2cde7505154c656eb58145b4ad7df55251362931 +Size (wine-1.7.36.tar.bz2) = 22010371 bytes +SHA1 (patch-configure) = 77b5259dfe3644ca17bb9af8aa1be045b5f88c7f +SHA1 (patch-dlls_ntdll_signal__x86__64.c) = 92ad434b5d8de9d4dcca5004d2fadede58cfeea8 +SHA1 (patch-dlls_wineoss.drv_mmdevdrv.c) = 89f9d1c08dbfbed3eac971ee534944f7403246a4 SHA1 (patch-dlls_ws2__32_socket.c) = 98ebaa7b0831e558f49a484ffb3a1b28adb9bcf2 +SHA1 (patch-include_msvcrt_crtdefs.h) = a0ceb8e03b6c85133a8cb4b6c91018b2f2bcc860 +SHA1 (patch-include_windef.h) = af09d491cdbdd50a1cc78442c656e26364a53c39 +SHA1 (patch-include_wine_test.h) = af33ec675c67e2fc56cf52e9c6634cab3e6fdfd2 diff --git a/emulators/wine-devel/options.mk b/emulators/wine-devel/options.mk index d6f70546f14..591e2a178a5 100644 --- a/emulators/wine-devel/options.mk +++ b/emulators/wine-devel/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2014/06/18 09:26:09 wiz Exp $ +# $NetBSD: options.mk,v 1.7 2015/02/09 13:30:44 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.wine PKG_SUPPORTED_OPTIONS= cups dbus esound hal ldap opengl sane ssl x11 @@ -38,15 +38,13 @@ CONFIGURE_ARGS+= --without-ldap .endif .if !empty(PKG_OPTIONS:Mssl) -.include "../../security/openssl/buildlink3.mk" +.include "../../security/gnutls/buildlink3.mk" .else -CONFIGURE_ARGS+= --without-openssl +CONFIGURE_ARGS+= --without-gnutls .endif .if !empty(PKG_OPTIONS:Mx11) PLIST.x11= yes -.include "../../fonts/fontconfig/buildlink3.mk" -.include "../../graphics/freetype2/buildlink3.mk" .include "../../x11/libICE/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" @@ -59,7 +57,6 @@ PLIST.x11= yes .include "../../x11/libXrender/buildlink3.mk" .include "../../x11/libXxf86vm/buildlink3.mk" .else -CONFIGURE_ARGS+= --without-freetype CONFIGURE_ARGS+= --without-x .endif diff --git a/emulators/wine-devel/patches/patch-configure b/emulators/wine-devel/patches/patch-configure index ae205939d07..426d281fc0f 100644 --- a/emulators/wine-devel/patches/patch-configure +++ b/emulators/wine-devel/patches/patch-configure @@ -1,10 +1,42 @@ -$NetBSD: patch-configure,v 1.1 2014/01/19 10:58:23 adam Exp $ +$NetBSD: patch-configure,v 1.2 2015/02/09 13:30:44 adam Exp $ +Clang does not support __builtin_ms_va_list; make a work-around. +Do not install 64-bit libraries into ${PREFIX}/lib64. +Use correct -install_name on Darwin. Configure for OSS v3 support for NetBSD. ---- configure.orig 2014-01-03 19:00:47.000000000 +0000 +--- configure.orig 2015-02-07 08:14:10.000000000 +0000 +++ configure -@@ -12325,14 +12325,25 @@ then +@@ -4895,6 +4894,9 @@ $as_echo_n "checking whether $CC support + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <stdarg.h> ++#ifdef __clang__ ++#define __builtin_ms_va_list va_list ++#endif + int + main () + { +@@ -4968,9 +4970,6 @@ then + fi + enable_fonts=${enable_fonts:-no} + enable_server=${enable_server:-no} +-elif test "x$enable_win64" = "xyes" +-then +- test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the directory containing the Wine tools" >&5 +@@ -8048,7 +8047,7 @@ OBJS = \$(C_SRCS:.c=.o) \$(EXTRA_OBJS) + all: libwine.dylib + + libwine.$libwine_version.dylib: \$(OBJS) +- \$(CC) -dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath,@loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version \$(OBJS) \$(EXTRALIBS) \$(LDFLAGS) \$(LIBS) -o \$@ ++ \$(CC) -dynamiclib -install_name \$(PREFIX)/lib/libwine.$libwine_soversion.dylib -compatibility_version $libwine_soversion -current_version $libwine_version \$(OBJS) \$(EXTRALIBS) \$(LDFLAGS) \$(LIBS) -o \$@ + + libwine.$libwine_soversion.dylib: libwine.$libwine_version.dylib + \$(RM) \$@ && \$(LN_S) libwine.$libwine_version.dylib \$@ +@@ -12593,14 +12592,25 @@ then if test "x$ac_cv_header_sys_soundcard_h" = xyes; then : ac_fn_c_check_member "$LINENO" "oss_sysinfo" "numaudioengines" "ac_cv_member_oss_sysinfo_numaudioengines" "#include <sys/soundcard.h> " @@ -16,7 +48,7 @@ Configure for OSS v3 support for NetBSD. +#define HAVE_OSSv4 1 _ACEOF - OSS4INCL="$ac_oss_incl" + OSS4_CFLAGS="$ac_oss_incl" +else +ac_cv_member_oss_sysinfo_numaudioengines=yes diff --git a/emulators/wine-devel/patches/patch-dlls_ntdll_signal__x86__64.c b/emulators/wine-devel/patches/patch-dlls_ntdll_signal__x86__64.c index 0c474446075..be26e829f03 100644 --- a/emulators/wine-devel/patches/patch-dlls_ntdll_signal__x86__64.c +++ b/emulators/wine-devel/patches/patch-dlls_ntdll_signal__x86__64.c @@ -1,27 +1,46 @@ -$NetBSD: patch-dlls_ntdll_signal__x86__64.c,v 1.2 2014/06/29 18:11:32 dholland Exp $ +$NetBSD: patch-dlls_ntdll_signal__x86__64.c,v 1.3 2015/02/09 13:30:44 adam Exp $ -Teach this how to set %gs on NetBSD. Not actually tested as so far -Wine doesn't actually run, but fixes a build failure. - ---- dlls/ntdll/signal_x86_64.c~ 2014-01-17 19:48:48.000000000 +0000 +--- dlls/ntdll/signal_x86_64.c.orig 2015-01-20 11:56:36.000000000 +0000 +++ dlls/ntdll/signal_x86_64.c -@@ -199,8 +199,9 @@ extern int arch_prctl(int func, void *pt - #define FPU_sig(context) ((XMM_SAVE_AREA32 *)((context)->uc_mcontext.mc_fpstate)) - - #elif defined(__NetBSD__) --#include <sys/ucontext.h> - #include <sys/types.h> -+#include <x86/sysarch.h> -+#include <sys/ucontext.h> - #include <signal.h> - - #define RAX_sig(context) ((context)->uc_mcontext.__gregs[_REG_RAX]) -@@ -2457,6 +2458,8 @@ void signal_init_thread( TEB *teb ) - arch_prctl( ARCH_SET_GS, teb ); - #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) - amd64_set_gsbase( teb ); -+#elif defined (__NetBSD__) -+ sysarch(X86_SET_GSBASE, &teb); - #else - # error Please define setting %gs for your architecture - #endif +@@ -694,7 +694,9 @@ struct dwarf_fde + unsigned int cie_offset; + }; + ++#ifdef __linux__ + extern const struct dwarf_fde *_Unwind_Find_FDE (void *, struct dwarf_eh_bases *); ++#endif + + static unsigned char dwarf_get_u1( const unsigned char **p ) + { +@@ -2108,6 +2110,7 @@ static NTSTATUS call_stack_handlers( EXC + + if (!module || (module->Flags & LDR_WINE_INTERNAL)) + { ++#ifdef __linux__ + struct dwarf_eh_bases bases; + const struct dwarf_fde *fde = _Unwind_Find_FDE( (void *)(context.Rip - 1), &bases ); + +@@ -2124,6 +2127,7 @@ static NTSTATUS call_stack_handlers( EXC + } + goto unwind_done; + } ++#endif + } + else WARN( "exception data not found in %s\n", debugstr_w(module->BaseDllName.Buffer) ); + +@@ -3108,6 +3112,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame + + if (!module || (module->Flags & LDR_WINE_INTERNAL)) + { ++#ifdef __linux__ + struct dwarf_eh_bases bases; + const struct dwarf_fde *fde = _Unwind_Find_FDE( (void *)(context->Rip - 1), &bases ); + +@@ -3124,6 +3129,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame + } + goto unwind_done; + } ++#endif + } + else WARN( "exception data not found in %s\n", debugstr_w(module->BaseDllName.Buffer) ); + diff --git a/emulators/wine-devel/patches/patch-dlls_wbemprox_builtin.c b/emulators/wine-devel/patches/patch-dlls_wbemprox_builtin.c deleted file mode 100644 index ebeac340716..00000000000 --- a/emulators/wine-devel/patches/patch-dlls_wbemprox_builtin.c +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-dlls_wbemprox_builtin.c,v 1.1 2014/01/19 10:58:23 adam Exp $ - -Reorder includes to fix 'select' being redefined error on NetBSD. - ---- dlls/wbemprox/builtin.c.orig 2014-01-03 19:00:47.000000000 +0000 -+++ dlls/wbemprox/builtin.c -@@ -25,12 +25,12 @@ - - #include "ntstatus.h" - #define WIN32_NO_STATUS -+#include "winsock2.h" - #include "windef.h" - #include "winbase.h" - #include "initguid.h" - #include "wbemcli.h" - #include "wbemprov.h" --#include "winsock2.h" - #include "iphlpapi.h" - #include "tlhelp32.h" - #include "d3d10.h" diff --git a/emulators/wine-devel/patches/patch-dlls_wineoss.drv_mmdevdrv.c b/emulators/wine-devel/patches/patch-dlls_wineoss.drv_mmdevdrv.c index be703b14461..bcaa629c1d2 100644 --- a/emulators/wine-devel/patches/patch-dlls_wineoss.drv_mmdevdrv.c +++ b/emulators/wine-devel/patches/patch-dlls_wineoss.drv_mmdevdrv.c @@ -1,8 +1,8 @@ -$NetBSD: patch-dlls_wineoss.drv_mmdevdrv.c,v 1.1 2014/01/19 10:58:23 adam Exp $ +$NetBSD: patch-dlls_wineoss.drv_mmdevdrv.c,v 1.2 2015/02/09 13:30:44 adam Exp $ Restore OSSv3 support for NetBSD. ---- dlls/wineoss.drv/mmdevdrv.c.orig 2014-01-03 19:00:47.000000000 +0000 +--- dlls/wineoss.drv/mmdevdrv.c.orig 2015-01-09 19:48:24.000000000 +0000 +++ dlls/wineoss.drv/mmdevdrv.c @@ -55,6 +55,10 @@ @@ -14,7 +14,7 @@ Restore OSSv3 support for NetBSD. + #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) - static const REFERENCE_TIME DefaultPeriod = 200000; + static const REFERENCE_TIME DefaultPeriod = 100000; @@ -112,7 +116,9 @@ struct ACImpl { float *vols; @@ -25,7 +25,7 @@ Restore OSSv3 support for NetBSD. char devnode[OSS_DEVNODE_SIZE]; BOOL initted, playing; -@@ -270,7 +276,9 @@ enum DriverPriority { +@@ -267,7 +273,9 @@ enum DriverPriority { int WINAPI AUDDRV_GetPriority(void) { int mixer_fd; @@ -35,7 +35,7 @@ Restore OSSv3 support for NetBSD. /* Attempt to determine if we are running on OSS or ALSA's OSS * compatibility layer. There is no official way to do that, so just check -@@ -283,6 +291,7 @@ int WINAPI AUDDRV_GetPriority(void) +@@ -280,6 +288,7 @@ int WINAPI AUDDRV_GetPriority(void) return Priority_Unavailable; } @@ -43,7 +43,7 @@ Restore OSSv3 support for NetBSD. sysinfo.version[0] = 0xFF; sysinfo.versionnum = ~0; if(ioctl(mixer_fd, SNDCTL_SYSINFO, &sysinfo) < 0){ -@@ -290,9 +299,11 @@ int WINAPI AUDDRV_GetPriority(void) +@@ -287,9 +296,11 @@ int WINAPI AUDDRV_GetPriority(void) close(mixer_fd); return Priority_Unavailable; } @@ -55,7 +55,7 @@ Restore OSSv3 support for NetBSD. if(sysinfo.version[0] < '4' || sysinfo.version[0] > '9'){ TRACE("Priority_Low: sysinfo.version[0]: %x\n", sysinfo.version[0]); return Priority_Low; -@@ -301,6 +312,7 @@ int WINAPI AUDDRV_GetPriority(void) +@@ -298,6 +309,7 @@ int WINAPI AUDDRV_GetPriority(void) TRACE("Priority_Low: sysinfo.versionnum: %x\n", sysinfo.versionnum); return Priority_Low; } @@ -63,7 +63,7 @@ Restore OSSv3 support for NetBSD. TRACE("Priority_Preferred: Seems like valid OSS!\n"); -@@ -407,29 +419,34 @@ static UINT get_default_index(EDataFlow +@@ -404,29 +416,34 @@ static UINT get_default_index(EDataFlow { int fd = -1, err; UINT i; @@ -100,7 +100,7 @@ Restore OSSv3 support for NetBSD. TRACE("Default devnode: %s\n", ai.devnode); devnode = oss_clean_devnode(ai.devnode); i = 0; -@@ -440,6 +457,7 @@ static UINT get_default_index(EDataFlow +@@ -437,6 +454,7 @@ static UINT get_default_index(EDataFlow ++i; } } @@ -108,7 +108,7 @@ Restore OSSv3 support for NetBSD. WARN("Couldn't find default device! Choosing first.\n"); return 0; -@@ -449,7 +467,9 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDa +@@ -446,7 +464,9 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDa UINT *num, UINT *def_index) { int i, mixer_fd; @@ -118,7 +118,7 @@ Restore OSSv3 support for NetBSD. static int print_once = 0; static const WCHAR outW[] = {'O','u','t',':',' ',0}; -@@ -463,6 +483,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDa +@@ -460,6 +480,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDa return AUDCLNT_E_SERVICE_NOT_RUNNING; } @@ -126,7 +126,7 @@ Restore OSSv3 support for NetBSD. if(ioctl(mixer_fd, SNDCTL_SYSINFO, &sysinfo) < 0){ close(mixer_fd); -@@ -575,6 +596,55 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDa +@@ -572,6 +593,55 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDa } } @@ -182,7 +182,7 @@ Restore OSSv3 support for NetBSD. close(mixer_fd); *def_index = get_default_index(flow); -@@ -634,6 +704,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(G +@@ -631,6 +701,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(G This->dataflow = oss_dev->flow; @@ -190,7 +190,7 @@ Restore OSSv3 support for NetBSD. This->ai.dev = -1; if(ioctl(This->fd, SNDCTL_ENGINEINFO, &This->ai) < 0){ WARN("Unable to get audio info for device %s: %d (%s)\n", oss_dev->devnode, -@@ -642,9 +713,11 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(G +@@ -639,9 +710,11 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(G HeapFree(GetProcessHeap(), 0, This); return E_FAIL; } @@ -202,7 +202,7 @@ Restore OSSv3 support for NetBSD. TRACE("OSS audioinfo:\n"); TRACE("devnode: %s\n", This->ai.devnode); TRACE("name: %s\n", This->ai.name); -@@ -657,6 +730,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(G +@@ -654,6 +727,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(G TRACE("max_rate: %d\n", This->ai.max_rate); TRACE("min_channels: %d\n", This->ai.min_channels); TRACE("max_channels: %d\n", This->ai.max_channels); @@ -210,7 +210,7 @@ Restore OSSv3 support for NetBSD. This->IAudioClient_iface.lpVtbl = &AudioClient_Vtbl; This->IAudioRenderClient_iface.lpVtbl = &AudioRenderClient_Vtbl; -@@ -807,10 +881,12 @@ static int get_oss_format(const WAVEFORM +@@ -816,10 +890,12 @@ static int get_oss_format(const WAVEFORM return AFMT_U8; case 16: return AFMT_S16_LE; @@ -223,7 +223,7 @@ Restore OSSv3 support for NetBSD. } return -1; } -@@ -1254,10 +1330,14 @@ static HRESULT WINAPI AudioClient_IsForm +@@ -1265,10 +1341,14 @@ static HRESULT WINAPI AudioClient_IsForm outpwfx = NULL; } @@ -238,7 +238,7 @@ Restore OSSv3 support for NetBSD. if(fd < 0){ WARN("Unable to open device %s: %d (%s)\n", This->devnode, errno, -@@ -1267,7 +1347,9 @@ static HRESULT WINAPI AudioClient_IsForm +@@ -1278,7 +1358,9 @@ static HRESULT WINAPI AudioClient_IsForm ret = setup_oss_device(mode, fd, pwfx, outpwfx); @@ -248,7 +248,7 @@ Restore OSSv3 support for NetBSD. return ret; } -@@ -1285,11 +1367,19 @@ static HRESULT WINAPI AudioClient_GetMix +@@ -1296,11 +1378,19 @@ static HRESULT WINAPI AudioClient_GetMix return E_POINTER; *pwfx = NULL; @@ -271,7 +271,7 @@ Restore OSSv3 support for NetBSD. return E_UNEXPECTED; fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE)); -@@ -1308,12 +1398,14 @@ static HRESULT WINAPI AudioClient_GetMix +@@ -1319,12 +1409,14 @@ static HRESULT WINAPI AudioClient_GetMix }else if(formats & AFMT_U8){ fmt->Format.wBitsPerSample = 8; fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; @@ -286,7 +286,7 @@ Restore OSSv3 support for NetBSD. }else{ WARN("Didn't recognize any available OSS formats: %x\n", formats); CoTaskMemFree(fmt); -@@ -1322,16 +1414,22 @@ static HRESULT WINAPI AudioClient_GetMix +@@ -1333,16 +1425,22 @@ static HRESULT WINAPI AudioClient_GetMix /* some OSS drivers are buggy, so set reasonable defaults if * the reported values seem wacky */ diff --git a/emulators/wine-devel/patches/patch-include_msvcrt_crtdefs.h b/emulators/wine-devel/patches/patch-include_msvcrt_crtdefs.h new file mode 100644 index 00000000000..21727b43f96 --- /dev/null +++ b/emulators/wine-devel/patches/patch-include_msvcrt_crtdefs.h @@ -0,0 +1,13 @@ +$NetBSD: patch-include_msvcrt_crtdefs.h,v 1.1 2015/02/09 13:30:44 adam Exp $ + +--- include/msvcrt/crtdefs.h.orig 2015-01-20 11:09:23.000000000 +0000 ++++ include/msvcrt/crtdefs.h +@@ -76,7 +76,7 @@ + #endif /* __cdecl */ + + #ifndef __ms_va_list +-# if defined(__x86_64__) && defined (__GNUC__) ++# if defined(__x86_64__) && defined(__GNUC__) && !defined(__clang__) + # define __ms_va_list __builtin_ms_va_list + # define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg) + # define __ms_va_end(list) __builtin_ms_va_end(list) diff --git a/emulators/wine-devel/patches/patch-include_windef.h b/emulators/wine-devel/patches/patch-include_windef.h new file mode 100644 index 00000000000..88b1b295f62 --- /dev/null +++ b/emulators/wine-devel/patches/patch-include_windef.h @@ -0,0 +1,16 @@ +$NetBSD: patch-include_windef.h,v 1.1 2015/02/09 13:30:44 adam Exp $ + +Clang does not have __builtin_ms_va_list. +See http://reviews.llvm.org/D1622?id=4152 + +--- include/windef.h.orig 2015-01-20 09:29:53.000000000 +0000 ++++ include/windef.h +@@ -85,7 +85,7 @@ extern "C" { + #endif /* __cdecl */ + + #ifndef __ms_va_list +-# if defined(__x86_64__) && defined (__GNUC__) ++# if defined(__x86_64__) && defined(__GNUC__) && !defined(__clang__) + # define __ms_va_list __builtin_ms_va_list + # define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg) + # define __ms_va_end(list) __builtin_ms_va_end(list) diff --git a/emulators/wine-devel/patches/patch-include_wine_test.h b/emulators/wine-devel/patches/patch-include_wine_test.h new file mode 100644 index 00000000000..0cf4f05fa5e --- /dev/null +++ b/emulators/wine-devel/patches/patch-include_wine_test.h @@ -0,0 +1,22 @@ +$NetBSD: patch-include_wine_test.h,v 1.1 2015/02/09 13:30:44 adam Exp $ + +--- include/wine/test.h.orig 2015-01-20 09:39:59.000000000 +0000 ++++ include/wine/test.h +@@ -85,7 +85,7 @@ static inline int winetest_strcmpW( cons + #define START_TEST(name) void func_##name(void) + #endif + +-#if defined(__x86_64__) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) ++#if defined(__x86_64__) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) && !defined(__clang__) + #define __winetest_cdecl __cdecl + #define __winetest_va_list __builtin_ms_va_list + #else +@@ -180,7 +180,7 @@ extern void __winetest_cdecl winetest_tr + #include <stdio.h> + #include <excpt.h> + +-#if defined(__x86_64__) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) ++#if defined(__x86_64__) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) && !defined(__clang__) + # define __winetest_va_start(list,arg) __builtin_ms_va_start(list,arg) + # define __winetest_va_end(list) __builtin_ms_va_end(list) + #else |