Update from the stable 1.6 releases series of Wine to Wine 1.8 and the

1.8 release series.  This represents 17 months of development and around
13,000 individual changes.

This port now also supports amd64.

It generally syncs with the emulators/wine-devel port (from where we
have been syncing various packaging changes over time), now configures
--without-gettext in addition to --without-gettextpo and still refers
to emulators/wine-gecko-devel and emulators/wine-mono-devel for the
time being, but remains without a dependency on sysutils/prelink.

At a more detailed level, changes include:

== Text and fonts

- DirectWrite is implemented, and works for a number of applications.
  Functionality includes:
  - Font file loading from system or custom font collections.
  - Building font families by combining similar font faces.
  - Font matching algorithm using weight/width/slope model.
  - Basic text layout support.
  - Bi-directional level resolution and line breaks resolution.
  - GDI interoperability API, including rendering to DIB section base target.
  - Rendering to arbitrary target with generic rendering interface.
  - Generating black&white and grayscale alpha bitmaps.
- Bold glyphs can be synthesized for outline fonts.
- Multiple replacements can be specified for a single font by using a
  multi-string entry under HKCU\Software\Wine\Fonts\Replacements.
- Vertical text uses the Unicode data tables for more accurate character
  ranges support.
- Character tables are based on version 8.0.0 of the Unicode Standard.
- The built-in Wingdings font contains more glyphs.
- Unicode bracketing pairs are supported in Uniscribe.
- The RichEdit control uses Uniscribe for more accurate text rendering.

== Graphics

- Direct2D is supported. This includes:
  - DXGI surface and WIC bitmap render targets.
  - Geometries defined by straight lines and cubic Bézier curves.
  - Drawing text.
  - Bitmaps.
  - Solid color brushes and bitmap brushes.
  - Opacity brushes.
- PNG files can be encoded in interlaced mode.
- Gamma information can be loaded from PNG files.
- Animated GIFs are correctly supported in GdiPlus.

== Direct3D

- Direct3D 11 is supported, to about the same level as Direct3D 10.
- Simple applications using Direct3D 10 are supported. There are still
  many unimplemented features. Direct3D 10 requires support for at
  least OpenGL 3.2 and GLSL 1.50. Changes include:
  - Several resource update operations are implemented.
  - Many more shader model 4 opcode are recognized.
  - Constant buffers are supported.
  - The various resource views are implemented.
  - The various state objects are implemented.
  - Stateblocks are implemented.
- A number of new DXGI 1.1 interfaces are implemented. This benefits
  Direct3D 10 and 11 applications.
- Direct3D applications correctly minimize and restore the display
  mode on focus loss.
- Fixed function vertex blending is implemented. This requires GLSL support.
- Per-vertex point sizes are supported. This requires GLSL support.
- The wined3d graphics card database recognizes more graphics cards.
  The graphics card detection code is simplified and improved. More
  reasonable fallbacks are picked for unrecognized graphics cards.
- On drivers that support it, GL_ARB_texture_mirror_clamp_to_edge or
  GL_EXT_texture_mirror_clamp are used to implement the "mirror once"
  texture addressing mode.
- GL_ARB_depth_clamp is no longer required to correctly draw pre-transformed
  vertices with disabled z-buffering. This helps older graphics cards that
  can't correctly implement GL_ARB_depth_clamp.
- On drivers that support it, GL_ARB_blend_func_extended is used to
  implement the D3DBLEND_SRCALPHASAT blend factor.
- On drivers that support it, GL_ARB_sampler_objects is used to apply
  sampler states independently of the texture object they apply
  to. This helps applications that bind the same texture to multiple
  texture stages, but with different sampler states.
- On drivers that support it, GL_EXT_texture_snorm is used to support
  signed (normalized) texture formats. These are typically used for
  bump mapping. Previously these formats required either
  GL_NV_texture_shader, or fixups when loading and using them.
- On drivers that support is, GL_ARB_timer_query is used to support
  Direct3D 9 timestamp queries.
- Texture format restrictions are more strictly enforced. This allows
  applications to fall back to a different format instead of continuing
  with broken rendering.
- Direct3D 9 D3DTSS_CONSTANT texture stage constants are supported.
- Color keyed blits can be done by the graphics card. Previously these
  needed to be done by the CPU.
- NV12 surfaces are supported. This is used by some applications for
  playing back video.
- ATI1N textures and surfaces are supported, in addition to ATI2N
  textures and surfaces. This requires support for
  GL_ARB_texture_compression_rgtc from the OpenGL driver.
- When GLSL is supported, lighting for Direct3D 1-3 is more correct.
  However, for most application the difference will only be very slight.
- The IDirect3DSwapChain9Ex interface is supported.
- OpenGL core contexts, OpenGL ES contexts, and multi-threaded OpenGL
  command submission (known as "CSMT") have been added, however that
  work is not finished yet.

== DirectDraw

- SetCooperativeLevel() works better, affecting DirectDraw exclusive
  mode in particular.
- DirectDraw surface flipping is more correct. This affects applications
  that use more than 1 back buffer in particular.
- DirectDraw palette handling is better supported. This mostly affects
  older applications using 8-bpp display modes (but not exclusively.)
- "Client memory" surfaces are better supported, in particular related
  to the handling of pitch and texture compression.

== Audio and video

- A Pulse Audio driver is implemented. It is selected automatically
  when Pulse Audio is running.
- 5.1 surround sound is supported in DirectSound. Stereo is the
  default, but other speaker configurations can be set through the
  Audio tab in Winecfg.
- XAudio2 is implemented, based on the OpenAL Soft library.
- The OpenAL library defaults to the native version.
- The Video Mixing Renderer version 7 is implemented.
- AVI file encoding and compression is implemented.

== Kernel

- Wine can be configured to report the Windows version as 'Windows
  8.1' and 'Windows 10'.
- Keyed event synchronization objects are implemented.
- The "init once" synchronization mechanism is supported.
- Condition variables are implemented.
- Slim Reader/Writer locks are implemented.
- Activation contexts are used for loading DLLs, type libraries, and
  COM classes, avoiding the need for explicit registration.
- Windows devices support read and write operations in addition to I/O
  controls. They can be remapped directly to existing Unix devices.
- Thread local storage is supported in dynamically loaded libraries.
- Process jobs are implemented.
- The Task Scheduler service is implemented.
- The UTF-7 encoding is supported.
- ATL thunk emulation supports a wider range of possible instructions.
- Process and thread affinity is supported even with a large number of
  processors.
- Dynamic DST (Daylight Saving Time) is supported through the
  registry. Timezone data is updated for a number of timezones.
- USER_SHARED_DATA access is emulated on x86-64 platforms.
- The new thread pool API is supported.
- OpenMP (parallel programming API) is implemented.
- Preliminary support for HID devices is implemented, but it's not
  enabled yet.

== User interface

- There is an optional Start Menu in desktop mode, that can be enabled
  on a per-desktop basis by setting "EnableShell" to "Y" under
  HKCU\Software\Wine\Explorer\Desktops\<name>.
- The standard Open File dialog supports a drop-down menu for file
  manipulations.
- 'My Documents' links to the XDG 'Documents' folder if it exists.
- Many more shell Known Folders are supported.
- Scrollbar theming is implemented. Theming of other controls also
  works better.
- The Toolbar common control can save and restore its state.

== X11 driver

- X Drag & Drop protocol version 5 is supported.
- Flashing a window caption is implemented in the X11 driver using the
  NET_WM_STATE_DEMANDS_ATTENTION style.

== OLE / COM

- OLE Storage files support file locking, and sizes larger than 4 GB.
- Type libraries are registered correctly on 64-bit setups.
- 32-bit type libraries can be loaded from 64-bit programs.
- The OLE data cache supports DIB images.
- The RPC interface to control Windows services is compatible with the
  native version.
- OLE Accessible Objects are implemented for better accessibility support.

== Internet and networking

- The Gecko engine is updated to the version from Firefox 40. Many
  more objects and properties are implemented in MSHTML.
- Internet proxies can be configured automatically.
- RPC over HTTP supports the NTLM and Negotiate authentication
  schemes.
- The Web Services API is partially implemented.
- Download of Gecko and Mono add-ons can be canceled from the
  progress dialog.
- Conditional compilation is supported in JavaScript.
- Arrays, math functions, and exception unwinding are implemented in
  VBScript.
- Remote network shares can be configured using Samba's NetAPI library.
- The Packet Capture DLL is implemented.
- Network interface change notifications are implemented.
- IPv6 DNS addresses are supported in IphlpAPI.
- The Deflate content encoding is supported in Wininet.
- The TransmitFile API is implemented in Windows Sockets.
- The BITS file transfer service is better supported.

== Printing

- Vertical text is supported when printing through the PostScript driver.
- The PostScript driver generates standard glyph names when possible.
- Monochrome printers are better supported, in particular when
  printing color images.
- Collation is supported in the PostScript driver.

== Miscellaneous

- Windows Management Instrumentation (WMI) implements several more
  WBEM system classes.
- Applying installation patches is better supported in MSI.
- Hyperlink controls are supported in installers.
- More recent versions of the C/C++ runtimes are supported, including
  the new UCRTBASE library. The old MSVCIRT C++ runtime is also
  partially implemented.
- Version 9, 10, and 11 of ATL (Active Template Library) are
  implemented.
- The Windows Scripting Runtime supports many more classes, including
  file and folder collections and dictionaries.
- Writing XML files is implemented.
- The Invariant locale is supported.

== Built-in applications

- The 'taskmgr' application displays whether processes are running
  under WoW64.
- The 'regedit' tool better supports import/export of registry files.
- The 'wineconsole' tool supports configuring the insert/overwrite
  mode in the settings dialog.

== Known issues

- Since the support for OpenGL core contexts in WineD3D is not
  complete enough yet, Direct3D 10 and 11 need to be supported in a
  legacy context / the compatibility profile, which means that they
  currently don't work on Mesa.
- Setting the PULSE_LATENCY_MSEC variable was sometimes necessary with
  the Alsa audio driver, but it can cause trouble with the Pulse
  driver. It is recommended to unset the variable.

4 files changed, 641 insertions, 147 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 2dfcd5b3a8f3..ff15c5941f08 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wine
-DISTVERSION=	1.6.2
-PORTREVISION=	10
+DISTVERSION=	1.8
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
@@ -27,7 +26,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--verbose --disable-tests \
 		--without-alsa --without-capi --without-dbus \
-		--without-gettextpo \
+		--without-gettext --without-gettextpo \
 		--without-gphoto --without-gsm --without-gstreamer \
 		--without-opencl \
 		--without-osmesa \
@@ -35,20 +34,20 @@ CONFIGURE_ARGS+=--verbose --disable-tests \
 		--without-sane \
 		--without-tiff \
 		--without-xinerama
-CONFIGURE_ENV=	FLEX="${LOCALBASE}/bin/flex"
+CONFIGURE_ENV=	CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex"
 WINELIBDIR?=	${PREFIX}/lib
 .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 \
+SHEBANG_FILES=	tools/make_requests tools/winemaker/winemaker \
 		tools/winedump/function_grep.pl
 
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-PORTDATA=	generic.ppd l_intl.nls wine.inf
+PORTDATA=	l_intl.nls wine.inf
 
 OPTIONS_DEFINE=	CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL V4L WINEMAKER X11 GECKO MONO
 OPTIONS_DEFAULT=X11
@@ -67,7 +66,7 @@ CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
 
 DOSBOX_RUN_DEPENDS=	dosbox:${PORTSDIR}/emulators/dosbox
 
-GECKO_RUN_DEPENDS=	${DATADIR}/gecko/wine_gecko-2.21-x86.msi:${PORTSDIR}/emulators/wine-gecko
+GECKO_RUN_DEPENDS=	${DATADIR}/gecko/wine_gecko-2.40-x86.msi:${PORTSDIR}/emulators/wine-gecko-devel
 
 GNUTLS_CONFIGURE_WITH=	gnutls
 GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
@@ -81,7 +80,7 @@ LDAP_USE=		OPENLDAP=yes
 LIBXSLT_CONFIGURE_WITH=	xslt
 LIBXSLT_LIB_DEPENDS=	libxslt.so:${PORTSDIR}/textproc/libxslt
 
-MONO_RUN_DEPENDS=	${DATADIR}/mono/wine-mono-0.0.8.msi:${PORTSDIR}/emulators/wine-mono
+MONO_RUN_DEPENDS=	${DATADIR}/mono/wine-mono-4.5.6.msi:${PORTSDIR}/emulators/wine-mono-devel
 
 MPG123_CONFIGURE_WITH=	mpg123
 MPG123_LIB_DEPENDS=	libmpg123.so:${PORTSDIR}/audio/mpg123
@@ -102,6 +101,38 @@ X11_LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
 			liblcms2.so:${PORTSDIR}/graphics/lcms2 \
 			libpng.so:${PORTSDIR}/graphics/png
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == amd64
+# Wine is composed of three parts:
+#  - wine (aka this port) is the 32-bit component and runs 32-bit programs (on FreeBSD/i386)
+#  - wine64 (aka this part of this port) is the 64-bit component and runs 64-bit programs
+#    (on FreeBSD/amd64)
+#  - wow64 (a subset of emulators/i386-wine-devel) is a part of the 64-bit component that runs
+#    32-bit programs (on FreeBSD/amd64)
+# We also currently have:
+#  - "wine32" (aka emulators/i386-wine-devel) is the 32-bit component and runs 32-bit programs
+#    (on FreeBSD/amd64).  This will be superseded by wow64.
+
+# --libdir is required since Wine defaults to "${PREFIX}/lib64" on amd64.
+CONFIGURE_ARGS+=	--enable-win64 --libdir=${PREFIX}/lib
+PLIST_SUB+=		WINE32="@comment " WINE64=""
+
+.if ${CHOSEN_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
+
+# Wine assumes a WoW64 package is available however WoW64 is not yet available on FreeBSD.
+post-patch:
+	${REINPLACE_CMD} 's|/wine|/wine64|g' ${WRKSRC}/tools/wineapploader.in
+
+.else
+PLIST_SUB+=		WINE32="" WINE64="@comment "
+.endif
+
 pre-build:
 	cd ${WRKSRC} && ${MAKE_CMD} depend
 
@@ -116,4 +147,4 @@ post-install:
 	${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>
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index c8ae7c852b39..d07e363ac5e1 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,2 +1,2 @@
-SHA256 (wine-1.6.2.tar.bz2) = f0ab9eede5a0ccacbf6e50682649f9377b9199e49cf55641f1787cf72405acbe
-SIZE (wine-1.6.2.tar.bz2) = 21252985
+SHA256 (wine-1.8.tar.bz2) = f33b45c18112b2071fbf9edee0e8c575407f9e2a9855ca4ee918ed33efa7c6f4
+SIZE (wine-1.8.tar.bz2) = 22843418
diff --git a/emulators/wine/files/patch-dlls_kernel32_Makefile.in b/emulators/wine/files/patch-dlls_kernel32_Makefile.in
new file mode 100644
index 000000000000..f1f6b3a040b4
--- /dev/null
+++ b/emulators/wine/files/patch-dlls_kernel32_Makefile.in
@@ -0,0 +1,25 @@
+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.
+
+--- UTC
+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 \
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index b0e0ff9493de..a24d6ca7898d 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -4,7 +4,8 @@ bin/notepad
 bin/regedit
 bin/regsvr32
 bin/widl
-bin/wine
+%%WINE32%%bin/wine
+%%WINE64%%bin/wine64
 bin/wineboot
 bin/winebuild
 bin/winecfg
@@ -93,6 +94,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
@@ -111,15 +113,26 @@ include/wine/windows/axextend.idl
 include/wine/windows/basetsd.h
 include/wine/windows/basetyps.h
 include/wine/windows/bcrypt.h
+include/wine/windows/bdaiface.h
+include/wine/windows/bdaiface.idl
+include/wine/windows/bdaiface_enums.h
+include/wine/windows/bdatypes.h
 include/wine/windows/binres.idl
 include/wine/windows/bits.h
 include/wine/windows/bits.idl
 include/wine/windows/bits1_5.h
 include/wine/windows/bits1_5.idl
+include/wine/windows/bits2_0.h
+include/wine/windows/bits2_0.idl
+include/wine/windows/bits2_5.h
+include/wine/windows/bits2_5.idl
+include/wine/windows/bits3_0.h
+include/wine/windows/bits3_0.idl
 include/wine/windows/bitsmsg.h
 include/wine/windows/cderr.h
 include/wine/windows/cfgmgr32.h
 include/wine/windows/cguid.h
+include/wine/windows/chprst.idl
 include/wine/windows/cierror.h
 include/wine/windows/clusapi.h
 include/wine/windows/cmdbas.idl
@@ -150,6 +163,10 @@ include/wine/windows/ctxtcall.h
 include/wine/windows/ctxtcall.idl
 include/wine/windows/custcntl.h
 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
@@ -161,6 +178,10 @@ 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
 include/wine/windows/d3d8.h
 include/wine/windows/d3d8caps.h
@@ -179,6 +200,10 @@ include/wine/windows/d3drmobj.h
 include/wine/windows/d3drmwin.h
 include/wine/windows/d3dtypes.h
 include/wine/windows/d3dvec.inl
+include/wine/windows/d3dx10.h
+include/wine/windows/d3dx10async.h
+include/wine/windows/d3dx10core.h
+include/wine/windows/d3dx10core.idl
 include/wine/windows/d3dx9.h
 include/wine/windows/d3dx9anim.h
 include/wine/windows/d3dx9core.h
@@ -190,6 +215,7 @@ include/wine/windows/d3dx9shader.h
 include/wine/windows/d3dx9shape.h
 include/wine/windows/d3dx9tex.h
 include/wine/windows/d3dx9xof.h
+include/wine/windows/davclnt.h
 include/wine/windows/dbccmd.idl
 include/wine/windows/dbcses.idl
 include/wine/windows/dbdsad.idl
@@ -209,6 +235,7 @@ include/wine/windows/ddrawgdi.h
 include/wine/windows/ddrawi.h
 include/wine/windows/ddstream.h
 include/wine/windows/ddstream.idl
+include/wine/windows/delayloadhandler.h
 include/wine/windows/devenum.idl
 include/wine/windows/devguid.h
 include/wine/windows/devicetopology.h
@@ -257,24 +284,32 @@ 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
 include/wine/windows/errorrep.h
 include/wine/windows/errors.h
+include/wine/windows/errrec.idl
 include/wine/windows/evcode.h
 include/wine/windows/evntprov.h
 include/wine/windows/evntrace.h
@@ -284,6 +319,7 @@ include/wine/windows/exdisp.idl
 include/wine/windows/exdispid.h
 include/wine/windows/fci.h
 include/wine/windows/fdi.h
+include/wine/windows/fileapi.h
 include/wine/windows/fltdefs.h
 include/wine/windows/fusion.h
 include/wine/windows/fusion.idl
@@ -292,6 +328,7 @@ include/wine/windows/gameux.idl
 include/wine/windows/gdiplus.h
 include/wine/windows/gdipluscolor.h
 include/wine/windows/gdipluscolormatrix.h
+include/wine/windows/gdipluseffects.h
 include/wine/windows/gdiplusenums.h
 include/wine/windows/gdiplusflat.h
 include/wine/windows/gdiplusgpstubs.h
@@ -302,9 +339,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
@@ -326,6 +367,8 @@ include/wine/windows/iextag.h
 include/wine/windows/iextag.idl
 include/wine/windows/ifdef.h
 include/wine/windows/ifmib.h
+include/wine/windows/iimgctx.h
+include/wine/windows/iimgctx.idl
 include/wine/windows/imagehlp.h
 include/wine/windows/imm.h
 include/wine/windows/imnact.h
@@ -337,6 +380,12 @@ include/wine/windows/inaddr.h
 include/wine/windows/indexsrv.h
 include/wine/windows/indexsrv.idl
 include/wine/windows/initguid.h
+include/wine/windows/inputscope.h
+include/wine/windows/inputscope.idl
+include/wine/windows/inseng.h
+include/wine/windows/inseng.idl
+include/wine/windows/inspectable.h
+include/wine/windows/inspectable.idl
 include/wine/windows/intshcut.h
 include/wine/windows/ipexport.h
 include/wine/windows/iphlpapi.h
@@ -349,6 +398,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
@@ -365,6 +415,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
@@ -382,6 +433,10 @@ include/wine/windows/mediaobj.h
 include/wine/windows/mediaobj.idl
 include/wine/windows/metahost.h
 include/wine/windows/metahost.idl
+include/wine/windows/mfapi.h
+include/wine/windows/mferror.h
+include/wine/windows/mfobjects.h
+include/wine/windows/mfobjects.idl
 include/wine/windows/midles.h
 include/wine/windows/mimeinfo.h
 include/wine/windows/mimeinfo.idl
@@ -404,6 +459,7 @@ include/wine/windows/mprerror.h
 include/wine/windows/msacm.h
 include/wine/windows/msacmdlg.h
 include/wine/windows/msacmdrv.h
+include/wine/windows/msasn1.h
 include/wine/windows/mscat.h
 include/wine/windows/mscoree.h
 include/wine/windows/mscoree.idl
@@ -443,10 +499,15 @@ 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/netioapi.h
+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
@@ -454,6 +515,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
@@ -494,9 +556,11 @@ 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
+include/wine/windows/prntvpt.h
 include/wine/windows/profinfo.h
 include/wine/windows/propidl.h
 include/wine/windows/propidl.idl
@@ -527,8 +591,11 @@ 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
+include/wine/windows/rowpsc.idl
 include/wine/windows/rpc.h
 include/wine/windows/rpcasync.h
 include/wine/windows/rpcdce.h
@@ -578,6 +645,7 @@ include/wine/windows/softpub.h
 include/wine/windows/sql.h
 include/wine/windows/sqlext.h
 include/wine/windows/sqltypes.h
+include/wine/windows/srcrst.idl
 include/wine/windows/srrestoreptapi.h
 include/wine/windows/sspi.h
 include/wine/windows/stdole2.idl
@@ -591,7 +659,10 @@ include/wine/windows/structuredquerycondition.idl
 include/wine/windows/svrapi.h
 include/wine/windows/t2embapi.h
 include/wine/windows/tapi.h
+include/wine/windows/taskschd.h
+include/wine/windows/taskschd.idl
 include/wine/windows/tchar.h
+include/wine/windows/tcpestats.h
 include/wine/windows/tcpmib.h
 include/wine/windows/textserv.h
 include/wine/windows/textstor.h
@@ -635,12 +706,19 @@ 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
+include/wine/windows/wbemdisp.idl
 include/wine/windows/wbemprov.h
 include/wine/windows/wbemprov.idl
+include/wine/windows/wct.h
+include/wine/windows/webservices.h
 include/wine/windows/werapi.h
 include/wine/windows/wfext.h
 include/wine/windows/wia.h
@@ -648,6 +726,7 @@ include/wine/windows/wia_lh.h
 include/wine/windows/wia_lh.idl
 include/wine/windows/wia_xp.h
 include/wine/windows/wia_xp.idl
+include/wine/windows/wiadef.h
 include/wine/windows/winbase.h
 include/wine/windows/wincodec.h
 include/wine/windows/wincodec.idl
@@ -658,6 +737,8 @@ include/wine/windows/wincred.h
 include/wine/windows/wincrypt.h
 include/wine/windows/windef.h
 include/wine/windows/windns.h
+include/wine/windows/windows.foundation.h
+include/wine/windows/windows.foundation.idl
 include/wine/windows/windows.h
 include/wine/windows/windowsx.h
 include/wine/windows/winerror.h
@@ -679,9 +760,11 @@ include/wine/windows/winresrc.h
 include/wine/windows/winsafer.h
 include/wine/windows/winscard.h
 include/wine/windows/winsmcrd.h
+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
@@ -695,6 +778,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
@@ -715,6 +800,14 @@ include/wine/windows/wtypes.h
 include/wine/windows/wtypes.idl
 include/wine/windows/wuapi.h
 include/wine/windows/wuapi.idl
+include/wine/windows/x3daudio.h
+include/wine/windows/xapo.h
+include/wine/windows/xapo.idl
+include/wine/windows/xapofx.h
+include/wine/windows/xaudio2.h
+include/wine/windows/xaudio2.idl
+include/wine/windows/xaudio2fx.h
+include/wine/windows/xaudio2fx.idl
 include/wine/windows/xcmc.h
 include/wine/windows/xinput.h
 include/wine/windows/xmldom.h
@@ -726,17 +819,25 @@ include/wine/windows/xmllite.h
 include/wine/windows/xmllite.idl
 include/wine/windows/zmouse.h
 include/wine/windows/ddk/compstui.h
+include/wine/windows/ddk/csq.h
+include/wine/windows/ddk/hidclass.h
+include/wine/windows/ddk/hidpi.h
+include/wine/windows/ddk/hidport.h
 include/wine/windows/ddk/hidsdi.h
+include/wine/windows/ddk/hidtypes.h
 include/wine/windows/ddk/imm.h
 include/wine/windows/ddk/mountmgr.h
 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
 include/wine/windows/ddk/usbdlib.h
+include/wine/windows/ddk/usbioctl.h
+include/wine/windows/ddk/usbiodef.h
 include/wine/windows/ddk/wdm.h
 include/wine/windows/ddk/winddiui.h
 include/wine/windows/ddk/winsplp.h
@@ -749,10 +850,81 @@ 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-0.dll.so
+lib/wine/api-ms-win-core-debug-l1-1-1.dll.so
+lib/wine/api-ms-win-core-errorhandling-l1-1-0.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-1-0.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-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-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-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-0.dll.so
+lib/wine/api-ms-win-core-memory-l1-1-1.dll.so
+lib/wine/api-ms-win-core-misc-l1-1-0.dll.so
+lib/wine/api-ms-win-core-namedpipe-l1-1-0.dll.so
+lib/wine/api-ms-win-core-namedpipe-l1-2-0.dll.so
+lib/wine/api-ms-win-core-processenvironment-l1-1-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-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-1-0.dll.so
+lib/wine/api-ms-win-core-synch-l1-2-0.dll.so
+lib/wine/api-ms-win-core-sysinfo-l1-1-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-crt-conio-l1-1-0.dll.so
+lib/wine/api-ms-win-crt-convert-l1-1-0.dll.so
+lib/wine/api-ms-win-crt-environment-l1-1-0.dll.so
+lib/wine/api-ms-win-crt-filesystem-l1-1-0.dll.so
+lib/wine/api-ms-win-crt-heap-l1-1-0.dll.so
+lib/wine/api-ms-win-crt-locale-l1-1-0.dll.so
+lib/wine/api-ms-win-crt-math-l1-1-0.dll.so
+lib/wine/api-ms-win-crt-multibyte-l1-1-0.dll.so
+lib/wine/api-ms-win-crt-private-l1-1-0.dll.so
+lib/wine/api-ms-win-crt-process-l1-1-0.dll.so
+lib/wine/api-ms-win-crt-runtime-l1-1-0.dll.so
+lib/wine/api-ms-win-crt-stdio-l1-1-0.dll.so
+lib/wine/api-ms-win-crt-string-l1-1-0.dll.so
+lib/wine/api-ms-win-crt-time-l1-1-0.dll.so
+lib/wine/api-ms-win-crt-utility-l1-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
@@ -762,21 +934,33 @@ 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
 lib/wine/aspnet_regiis.exe.so
 lib/wine/atl.dll.so
 lib/wine/atl100.dll.so
+lib/wine/atl110.dll.so
 lib/wine/atl80.dll.so
+lib/wine/atl90.dll.so
 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
+%%WINE32%%lib/wine/avifile.dll16.so
 lib/wine/avrt.dll.so
 lib/wine/bcrypt.dll.so
+lib/wine/bluetoothapis.dll.so
 lib/wine/browseui.dll.so
+lib/wine/bthprops.cpl.so
 lib/wine/cabarc.exe.so
 lib/wine/cabinet.dll.so
 lib/wine/cacls.exe.so
@@ -786,28 +970,34 @@ 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
+%%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
+lib/wine/connect.dll.so
 lib/wine/control.exe.so
 lib/wine/credui.dll.so
 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
+%%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
 lib/wine/d3d10core.dll.so
 lib/wine/d3d11.dll.so
 lib/wine/d3d8.dll.so
@@ -823,6 +1013,8 @@ lib/wine/d3dcompiler_40.dll.so
 lib/wine/d3dcompiler_41.dll.so
 lib/wine/d3dcompiler_42.dll.so
 lib/wine/d3dcompiler_43.dll.so
+lib/wine/d3dcompiler_46.dll.so
+lib/wine/d3dcompiler_47.dll.so
 lib/wine/d3dim.dll.so
 lib/wine/d3drm.dll.so
 lib/wine/d3dx10_33.dll.so
@@ -836,6 +1028,8 @@ lib/wine/d3dx10_40.dll.so
 lib/wine/d3dx10_41.dll.so
 lib/wine/d3dx10_42.dll.so
 lib/wine/d3dx10_43.dll.so
+lib/wine/d3dx11_42.dll.so
+lib/wine/d3dx11_43.dll.so
 lib/wine/d3dx9_24.dll.so
 lib/wine/d3dx9_25.dll.so
 lib/wine/d3dx9_26.dll.so
@@ -857,10 +1051,11 @@ lib/wine/d3dx9_41.dll.so
 lib/wine/d3dx9_42.dll.so
 lib/wine/d3dx9_43.dll.so
 lib/wine/d3dxof.dll.so
+lib/wine/davclnt.dll.so
 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
@@ -868,9 +1063,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
+%%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
@@ -887,6 +1082,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
@@ -897,10 +1094,14 @@ 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/esent.dll.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
@@ -909,10 +1110,81 @@ 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-0.dll
+lib/wine/fakedlls/api-ms-win-core-debug-l1-1-1.dll
+lib/wine/fakedlls/api-ms-win-core-errorhandling-l1-1-0.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-1-0.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-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-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-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-0.dll
+lib/wine/fakedlls/api-ms-win-core-memory-l1-1-1.dll
+lib/wine/fakedlls/api-ms-win-core-misc-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-namedpipe-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-namedpipe-l1-2-0.dll
+lib/wine/fakedlls/api-ms-win-core-processenvironment-l1-1-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-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-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-synch-l1-2-0.dll
+lib/wine/fakedlls/api-ms-win-core-sysinfo-l1-1-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-crt-conio-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-crt-convert-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-crt-environment-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-crt-filesystem-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-crt-heap-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-crt-locale-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-crt-math-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-crt-multibyte-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-crt-private-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-crt-process-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-crt-runtime-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-crt-stdio-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-crt-string-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-crt-time-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-crt-utility-l1-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
@@ -922,21 +1194,33 @@ 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
 lib/wine/fakedlls/aspnet_regiis.exe
 lib/wine/fakedlls/atl.dll
 lib/wine/fakedlls/atl100.dll
+lib/wine/fakedlls/atl110.dll
 lib/wine/fakedlls/atl80.dll
+lib/wine/fakedlls/atl90.dll
 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
+%%WINE32%%lib/wine/fakedlls/avifile.dll16
 lib/wine/fakedlls/avrt.dll
 lib/wine/fakedlls/bcrypt.dll
+lib/wine/fakedlls/bluetoothapis.dll
 lib/wine/fakedlls/browseui.dll
+lib/wine/fakedlls/bthprops.cpl
 lib/wine/fakedlls/cabarc.exe
 lib/wine/fakedlls/cabinet.dll
 lib/wine/fakedlls/cacls.exe
@@ -946,28 +1230,34 @@ 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
+%%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
+lib/wine/fakedlls/connect.dll
 lib/wine/fakedlls/control.exe
 lib/wine/fakedlls/credui.dll
 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
+%%WINE32%%lib/wine/fakedlls/ctl3d.dll16
 lib/wine/fakedlls/ctl3d32.dll
-lib/wine/fakedlls/ctl3dv2.dll16
+%%WINE32%%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
@@ -983,6 +1273,8 @@ lib/wine/fakedlls/d3dcompiler_40.dll
 lib/wine/fakedlls/d3dcompiler_41.dll
 lib/wine/fakedlls/d3dcompiler_42.dll
 lib/wine/fakedlls/d3dcompiler_43.dll
+lib/wine/fakedlls/d3dcompiler_46.dll
+lib/wine/fakedlls/d3dcompiler_47.dll
 lib/wine/fakedlls/d3dim.dll
 lib/wine/fakedlls/d3drm.dll
 lib/wine/fakedlls/d3dx10_33.dll
@@ -996,6 +1288,8 @@ lib/wine/fakedlls/d3dx10_40.dll
 lib/wine/fakedlls/d3dx10_41.dll
 lib/wine/fakedlls/d3dx10_42.dll
 lib/wine/fakedlls/d3dx10_43.dll
+lib/wine/fakedlls/d3dx11_42.dll
+lib/wine/fakedlls/d3dx11_43.dll
 lib/wine/fakedlls/d3dx9_24.dll
 lib/wine/fakedlls/d3dx9_25.dll
 lib/wine/fakedlls/d3dx9_26.dll
@@ -1017,10 +1311,11 @@ lib/wine/fakedlls/d3dx9_41.dll
 lib/wine/fakedlls/d3dx9_42.dll
 lib/wine/fakedlls/d3dx9_43.dll
 lib/wine/fakedlls/d3dxof.dll
+lib/wine/fakedlls/davclnt.dll
 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
@@ -1028,9 +1323,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
+%%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
@@ -1047,6 +1342,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
@@ -1057,18 +1354,25 @@ 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/esent.dll
+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/fltmgr.sys
+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
+%%WINE32%%lib/wine/fakedlls/gdi.exe16
 lib/wine/fakedlls/gdi32.dll
 lib/wine/fakedlls/gdiplus.dll
 %%X11%%lib/wine/fakedlls/glu32.dll
@@ -1078,6 +1382,7 @@ lib/wine/fakedlls/hal.dll
 lib/wine/fakedlls/hh.exe
 lib/wine/fakedlls/hhctrl.ocx
 lib/wine/fakedlls/hid.dll
+lib/wine/fakedlls/hidclass.sys
 lib/wine/fakedlls/hlink.dll
 lib/wine/fakedlls/hnetcfg.dll
 lib/wine/fakedlls/hostname.exe
@@ -1087,10 +1392,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
+%%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
@@ -1105,16 +1410,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
+%%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
 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
+%%WINE32%%lib/wine/fakedlls/lzexpand.dll16
 lib/wine/fakedlls/mapi32.dll
 lib/wine/fakedlls/mapistub.dll
 lib/wine/fakedlls/mciavi32.dll
@@ -1122,28 +1429,34 @@ lib/wine/fakedlls/mcicda.dll
 lib/wine/fakedlls/mciqtz32.dll
 lib/wine/fakedlls/mciseq.dll
 lib/wine/fakedlls/mciwave.dll
+lib/wine/fakedlls/mf.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
+%%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
+lib/wine/fakedlls/msasn1.dll
 lib/wine/fakedlls/mscat32.dll
 lib/wine/fakedlls/mscms.dll
 lib/wine/fakedlls/mscoree.dll
 lib/wine/fakedlls/msctf.dll
+lib/wine/fakedlls/msctfp.dll
 lib/wine/fakedlls/msdaps.dll
+lib/wine/fakedlls/msdelta.dll
 lib/wine/fakedlls/msdmo.dll
 lib/wine/fakedlls/msftedit.dll
 lib/wine/fakedlls/msg711.acm
@@ -1163,6 +1476,7 @@ lib/wine/fakedlls/msls31.dll
 lib/wine/fakedlls/msnet32.dll
 lib/wine/fakedlls/mspatcha.dll
 lib/wine/fakedlls/msrle32.dll
+lib/wine/fakedlls/msscript.ocx
 lib/wine/fakedlls/mssign32.dll
 lib/wine/fakedlls/mssip32.dll
 lib/wine/fakedlls/mstask.dll
@@ -1171,6 +1485,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
@@ -1178,6 +1494,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
@@ -1188,7 +1506,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
+%%WINE32%%lib/wine/fakedlls/msvideo.dll16
 lib/wine/fakedlls/mswsock.dll
 lib/wine/fakedlls/msxml.dll
 lib/wine/fakedlls/msxml2.dll
@@ -1196,8 +1514,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
@@ -1205,6 +1526,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
@@ -1213,26 +1535,27 @@ 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
+%%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
 %%OPENAL%%lib/wine/fakedlls/openal32.dll
 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
@@ -1241,6 +1564,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
@@ -1251,7 +1575,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
+%%WINE32%%lib/wine/fakedlls/rasapi16.dll16
 lib/wine/fakedlls/rasapi32.dll
 lib/wine/fakedlls/rasdlg.dll
 lib/wine/fakedlls/reg.exe
@@ -1269,7 +1593,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
+%%WINE32%%lib/wine/fakedlls/rundll.exe16
 lib/wine/fakedlls/rundll32.exe
 lib/wine/fakedlls/samlib.dll
 lib/wine/fakedlls/sane.ds
@@ -1277,9 +1601,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
@@ -1288,12 +1614,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
+%%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
@@ -1301,29 +1627,33 @@ 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
+%%WINE32%%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
+%%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
 lib/wine/fakedlls/taskkill.exe
+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
+%%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/ucrtbase.dll
 lib/wine/fakedlls/unicows.dll
 lib/wine/fakedlls/uninstaller.exe
 lib/wine/fakedlls/unlodctr.exe
@@ -1331,7 +1661,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
+%%WINE32%%lib/wine/fakedlls/user.exe16
 lib/wine/fakedlls/user32.dll
 lib/wine/fakedlls/userenv.dll
 lib/wine/fakedlls/usp10.dll
@@ -1339,28 +1669,35 @@ lib/wine/fakedlls/uxtheme.dll
 lib/wine/fakedlls/vbscript.dll
 lib/wine/fakedlls/vcomp.dll
 lib/wine/fakedlls/vcomp100.dll
+lib/wine/fakedlls/vcomp110.dll
+lib/wine/fakedlls/vcomp120.dll
 lib/wine/fakedlls/vcomp90.dll
-lib/wine/fakedlls/vdhcp.vxd
+lib/wine/fakedlls/vcruntime140.dll
+%%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
-lib/wine/fakedlls/vtdapi.vxd
-lib/wine/fakedlls/vwin32.vxd
-lib/wine/fakedlls/w32skrnl.dll
-lib/wine/fakedlls/w32sys.dll16
+%%WINE32%%lib/wine/fakedlls/vmm.vxd
+%%WINE32%%lib/wine/fakedlls/vnbt.vxd
+%%WINE32%%lib/wine/fakedlls/vnetbios.vxd
+lib/wine/fakedlls/vssapi.dll
+%%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
 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
+lib/wine/fakedlls/wimgapi.dll
+%%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
@@ -1379,24 +1716,24 @@ lib/wine/fakedlls/winemsibuilder.exe
 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
@@ -1405,10 +1742,13 @@ 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/wmplayer.exe
 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
 lib/wine/fakedlls/wscript.exe
@@ -1419,11 +1759,32 @@ lib/wine/fakedlls/wtsapi32.dll
 lib/wine/fakedlls/wuapi.dll
 lib/wine/fakedlls/wuaueng.dll
 lib/wine/fakedlls/wusa.exe
+lib/wine/fakedlls/x3daudio1_0.dll
+lib/wine/fakedlls/x3daudio1_1.dll
+lib/wine/fakedlls/x3daudio1_2.dll
+lib/wine/fakedlls/x3daudio1_3.dll
+lib/wine/fakedlls/x3daudio1_4.dll
+lib/wine/fakedlls/x3daudio1_5.dll
+lib/wine/fakedlls/x3daudio1_6.dll
+lib/wine/fakedlls/x3daudio1_7.dll
 lib/wine/fakedlls/xapofx1_1.dll
+lib/wine/fakedlls/xapofx1_2.dll
+lib/wine/fakedlls/xapofx1_3.dll
+lib/wine/fakedlls/xapofx1_4.dll
+lib/wine/fakedlls/xapofx1_5.dll
+lib/wine/fakedlls/xaudio2_0.dll
+lib/wine/fakedlls/xaudio2_1.dll
+lib/wine/fakedlls/xaudio2_2.dll
+lib/wine/fakedlls/xaudio2_3.dll
+lib/wine/fakedlls/xaudio2_4.dll
+lib/wine/fakedlls/xaudio2_5.dll
+lib/wine/fakedlls/xaudio2_6.dll
+lib/wine/fakedlls/xaudio2_8.dll
 lib/wine/fakedlls/xcopy.exe
 lib/wine/fakedlls/xinput1_1.dll
 lib/wine/fakedlls/xinput1_2.dll
 lib/wine/fakedlls/xinput1_3.dll
+lib/wine/fakedlls/xinput1_4.dll
 lib/wine/fakedlls/xinput9_1_0.dll
 lib/wine/fakedlls/xmllite.dll
 lib/wine/fakedlls/xolehlp.dll
@@ -1432,10 +1793,13 @@ lib/wine/fakedlls/xpssvcs.dll
 lib/wine/faultrep.dll.so
 lib/wine/findstr.exe.so
 lib/wine/fltlib.dll.so
+lib/wine/fltmgr.sys.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
+%%WINE32%%lib/wine/gdi.exe16.so
 lib/wine/gdi32.dll.so
 lib/wine/gdiplus.dll.so
 %%X11%%lib/wine/glu32.dll.so
@@ -1445,6 +1809,7 @@ lib/wine/hal.dll.so
 lib/wine/hh.exe.so
 lib/wine/hhctrl.ocx.so
 lib/wine/hid.dll.so
+lib/wine/hidclass.sys.so
 lib/wine/hlink.dll.so
 lib/wine/hnetcfg.dll.so
 lib/wine/hostname.exe.so
@@ -1454,10 +1819,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
+%%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
@@ -1472,9 +1837,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
+%%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
 lib/wine/libactiveds.def
@@ -1495,6 +1862,7 @@ lib/wine/libclusapi.def
 lib/wine/libcomctl32.def
 lib/wine/libcomdlg32.def
 lib/wine/libcompstui.def
+lib/wine/libcomsvcs.def
 lib/wine/libcredui.def
 lib/wine/libcrtdll.def
 lib/wine/libcrypt32.def
@@ -1502,13 +1870,17 @@ 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/libd3d11.def
 lib/wine/libd3d8.def
 lib/wine/libd3d9.def
 lib/wine/libd3dcompiler.def
 lib/wine/libd3dim.def
 lib/wine/libd3drm.def
+lib/wine/libd3dx10.def
 lib/wine/libd3dx9.def
 lib/wine/libd3dxof.def
 lib/wine/libdbgeng.def
@@ -1535,6 +1907,7 @@ lib/wine/libgdi32.def
 lib/wine/libgdiplus.def
 lib/wine/libglu32.def
 lib/wine/libhid.def
+lib/wine/libhidclass.def
 lib/wine/libhlink.def
 lib/wine/libhtmlhelp.def
 lib/wine/libieframe.def
@@ -1542,7 +1915,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
+%%WINE32%%lib/wine/libkernel.def
 lib/wine/libkernel32.def
 lib/wine/libloadperf.def
 lib/wine/liblz32.def
@@ -1551,13 +1925,20 @@ 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
 lib/wine/libmsi.def
 lib/wine/libmsimg32.def
+lib/wine/libmspatcha.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
+lib/wine/libmsvcr90.def
 lib/wine/libmsvcrt.def
 lib/wine/libmsvcrt20.def
 lib/wine/libmsvcrt40.def
@@ -1638,17 +2019,20 @@ lib/wine/libwintab32.def
 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
 lib/wine/libwtsapi32.def
+lib/wine/libxaudio2_8.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
+%%WINE32%%lib/wine/lzexpand.dll16.so
 lib/wine/mapi32.dll.so
 lib/wine/mapistub.dll.so
 lib/wine/mciavi32.dll.so
@@ -1656,28 +2040,34 @@ lib/wine/mcicda.dll.so
 lib/wine/mciqtz32.dll.so
 lib/wine/mciseq.dll.so
 lib/wine/mciwave.dll.so
+lib/wine/mf.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
+%%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
+lib/wine/msasn1.dll.so
 lib/wine/mscat32.dll.so
 lib/wine/mscms.dll.so
 lib/wine/mscoree.dll.so
 lib/wine/msctf.dll.so
+lib/wine/msctfp.dll.so
 lib/wine/msdaps.dll.so
+lib/wine/msdelta.dll.so
 lib/wine/msdmo.dll.so
 lib/wine/msftedit.dll.so
 lib/wine/msg711.acm.so
@@ -1697,6 +2087,7 @@ lib/wine/msls31.dll.so
 lib/wine/msnet32.dll.so
 lib/wine/mspatcha.dll.so
 lib/wine/msrle32.dll.so
+lib/wine/msscript.ocx.so
 lib/wine/mssign32.dll.so
 lib/wine/mssip32.dll.so
 lib/wine/mstask.dll.so
@@ -1705,6 +2096,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
@@ -1712,6 +2105,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
@@ -1722,7 +2117,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
+%%WINE32%%lib/wine/msvideo.dll16.so
 lib/wine/mswsock.dll.so
 lib/wine/msxml.dll.so
 lib/wine/msxml2.dll.so
@@ -1730,8 +2125,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
@@ -1739,6 +2137,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
@@ -1747,26 +2146,27 @@ 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
+%%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
 %%OPENAL%%lib/wine/openal32.dll.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
@@ -1775,6 +2175,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
@@ -1785,7 +2186,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
+%%WINE32%%lib/wine/rasapi16.dll16.so
 lib/wine/rasapi32.dll.so
 lib/wine/rasdlg.dll.so
 lib/wine/reg.exe.so
@@ -1803,7 +2204,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
+%%WINE32%%lib/wine/rundll.exe16.so
 lib/wine/rundll32.exe.so
 lib/wine/samlib.dll.so
 lib/wine/sane.ds.so
@@ -1811,9 +2212,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
@@ -1822,12 +2225,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
+%%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
@@ -1835,29 +2238,33 @@ 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
+%%WINE32%%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
+%%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
 lib/wine/taskkill.exe.so
+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
+%%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/ucrtbase.dll.so
 lib/wine/unicows.dll.so
 lib/wine/uninstaller.exe.so
 lib/wine/unlodctr.exe.so
@@ -1865,7 +2272,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
+%%WINE32%%lib/wine/user.exe16.so
 lib/wine/user32.dll.so
 lib/wine/userenv.dll.so
 lib/wine/usp10.dll.so
@@ -1873,28 +2280,35 @@ lib/wine/uxtheme.dll.so
 lib/wine/vbscript.dll.so
 lib/wine/vcomp.dll.so
 lib/wine/vcomp100.dll.so
+lib/wine/vcomp110.dll.so
+lib/wine/vcomp120.dll.so
 lib/wine/vcomp90.dll.so
-lib/wine/vdhcp.vxd.so
+lib/wine/vcruntime140.dll.so
+%%WINE32%%lib/wine/vdhcp.vxd.so
 lib/wine/vdmdbg.dll.so
-lib/wine/ver.dll16.so
+lib/wine/wimgapi.dll.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
-lib/wine/vtdapi.vxd.so
-lib/wine/vwin32.vxd.so
-lib/wine/w32skrnl.dll.so
-lib/wine/w32sys.dll16.so
+%%WINE32%%lib/wine/vmm.vxd.so
+%%WINE32%%lib/wine/vnbt.vxd.so
+%%WINE32%%lib/wine/vnetbios.vxd.so
+lib/wine/vssapi.dll.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
 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
+%%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
@@ -1908,29 +2322,29 @@ lib/wine/winefile.exe.so
 lib/wine/winemapi.dll.so
 lib/wine/winemenubuilder.exe.so
 lib/wine/winemine.exe.so
-%%MPG123%%lib/wine/winemp3.acm.so
 lib/wine/winemsibuilder.exe.so
 lib/wine/wineoss.drv.so
+%%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
@@ -1939,10 +2353,13 @@ 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/wmplayer.exe.so
 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
 lib/wine/wscript.exe.so
@@ -1953,20 +2370,41 @@ lib/wine/wtsapi32.dll.so
 lib/wine/wuapi.dll.so
 lib/wine/wuaueng.dll.so
 lib/wine/wusa.exe.so
+lib/wine/x3daudio1_0.dll.so
+lib/wine/x3daudio1_1.dll.so
+lib/wine/x3daudio1_2.dll.so
+lib/wine/x3daudio1_3.dll.so
+lib/wine/x3daudio1_4.dll.so
+lib/wine/x3daudio1_5.dll.so
+lib/wine/x3daudio1_6.dll.so
+lib/wine/x3daudio1_7.dll.so
 lib/wine/xapofx1_1.dll.so
+lib/wine/xapofx1_2.dll.so
+lib/wine/xapofx1_3.dll.so
+lib/wine/xapofx1_4.dll.so
+lib/wine/xapofx1_5.dll.so
+lib/wine/xaudio2_0.dll.so
+lib/wine/xaudio2_1.dll.so
+lib/wine/xaudio2_2.dll.so
+lib/wine/xaudio2_3.dll.so
+lib/wine/xaudio2_4.dll.so
+lib/wine/xaudio2_5.dll.so
+lib/wine/xaudio2_6.dll.so
+lib/wine/xaudio2_8.dll.so
 lib/wine/xcopy.exe.so
 lib/wine/xinput1_1.dll.so
 lib/wine/xinput1_2.dll.so
 lib/wine/xinput1_3.dll.so
+lib/wine/xinput1_4.dll.so
 lib/wine/xinput9_1_0.dll.so
 lib/wine/xmllite.dll.so
 lib/wine/xolehlp.dll.so
 lib/wine/xpsprint.dll.so
 lib/wine/xpssvcs.dll.so
-man/de.UTF-8/man1/wine.1.gz
+%%WINE32%%man/de.UTF-8/man1/wine.1.gz
 man/de.UTF-8/man1/winemaker.1.gz
 man/de.UTF-8/man1/wineserver.1.gz
-man/fr.UTF-8/man1/wine.1.gz
+%%WINE32%%man/fr.UTF-8/man1/wine.1.gz
 man/fr.UTF-8/man1/winemaker.1.gz
 man/fr.UTF-8/man1/wineserver.1.gz
 man/man1/msiexec.1.gz
@@ -1974,7 +2412,7 @@ man/man1/notepad.1.gz
 man/man1/regedit.1.gz
 man/man1/regsvr32.1.gz
 man/man1/widl.1.gz
-man/man1/wine.1.gz
+%%WINE32%%man/man1/wine.1.gz
 man/man1/wineboot.1.gz
 man/man1/winebuild.1.gz
 man/man1/winecfg.1.gz
@@ -1991,7 +2429,7 @@ man/man1/winepath.1.gz
 man/man1/wineserver.1.gz
 man/man1/wmc.1.gz
 man/man1/wrc.1.gz
-man/pl.UTF-8/man1/wine.1.gz
+%%WINE32%%man/pl.UTF-8/man1/wine.1.gz
 share/applications/wine.desktop
 %%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS