wine: Update to 4.0 (most recent stable version known to build on NetBSD)

The most recent stable version (5.0) is known to be problematic due to
the need for individual programs to link against msvcrt.

Based partially on zerous's "wine32" package in pkgsrc-wip.

Includes several years of changes.

This package does not include WoW64 support, so you can't run 32-bit
binaries on a 64-bit system. That's for later...

19 files changed, 1283 insertions, 674 deletions

diff --git a/emulators/wine/DESCR b/emulators/wine/DESCR
index 451e0373278..aecc0bba98e 100644
--- a/emulators/wine/DESCR
+++ b/emulators/wine/DESCR
@@ -1,6 +1,9 @@
-Wine is a program which allows running Microsoft Windows programs
-(including DOS, Windows 3.x and Win32 executables) on Unix.  It consists
-of a program loader which loads and executes an Microsoft Windows binary,
-and a library that implements Windows API calls using their Unix or X11
-equivalents.  The library may also be used for porting Win32 code into
-native Unix executables.
+Wine is a compatibility layer capable of running Windows applications on
+several POSIX-compliant operating systems. Instead of simulating internal
+Windows logic like a virtual machine or emulator, Wine translates Windows
+API calls into POSIX calls on-the-fly, eliminating the performance and memory
+penalties of other methods and allowing you to cleanly integrate Windows
+applications into your desktop.
+
+On 32-bit systems this package supports only 32-bit applications, and on
+64-bit systems it supports only 64-bit applications.
diff --git a/emulators/wine/MESSAGE.NetBSD b/emulators/wine/MESSAGE.NetBSD
new file mode 100644
index 00000000000..d7d3a90fba2
--- /dev/null
+++ b/emulators/wine/MESSAGE.NetBSD
@@ -0,0 +1,11 @@
+===========================================================================
+$NetBSD: MESSAGE.NetBSD,v 1.1 2020/05/22 17:44:41 nia Exp $
+
+If you are experiencing crashes, it may be due to a security measure
+blocking the mapping of the NULL page.
+
+You can disable this (at a security cost) with the following command:
+
+# sysctl -w vm.user_va0_disable=0
+
+===========================================================================
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 9cd8e6ecbfa..c5d6560de9f 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,74 +1,99 @@
-# $NetBSD: Makefile,v 1.212 2020/05/22 10:56:06 adam Exp $
+# $NetBSD: Makefile,v 1.213 2020/05/22 17:44:41 nia Exp $
 
-DISTNAME=	wine-1.6.2
-PKGREVISION=	28
+DISTNAME=	wine-4.0
 CATEGORIES=	emulators
-MASTER_SITES=	http://ibiblio.org/pub/linux/system/emulators/wine/
-MASTER_SITES+=	${MASTER_SITE_SOURCEFORGE:=wine/}
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	https://dl.winehq.org/wine/source/4.0/
+MASTER_SITES+=	http://mirrors.ibiblio.org/wine/source/4.0/
+EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	adam@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.winehq.org/
-COMMENT=	Free implementation of Windows on Unix
+COMMENT=	Compatibility layer for running Microsoft Windows applications
 LICENSE=	gnu-lgpl-v2.1
 
-BUILD_DEPENDS+=	fontforge-[0-9]*:../../fonts/fontforge
+GNU_CONFIGURE=	yes
+USE_LANGUAGES=	c c++
+USE_TOOLS+=	bison flex gmake mktemp msgfmt perl
 
-ONLY_FOR_PLATFORM+=	*-*-i386 #*-*-x86_64
+REPLACE_PERL+=	tools/winemaker/winemaker
+REPLACE_PERL+=	tools/winedump/function_grep.pl
 
-PKG_DESTDIR_SUPPORT=	user-destdir
+ONLY_FOR_PLATFORM+=	*-*-i386 *-*-x86_64
 
-USE_LANGUAGES=		c c99
-USE_LIBTOOL=		yes
-USE_NCURSES=		yes
-USE_TOOLS+=		bison flex gmake mktemp msgfmt
-FLEX_REQD=		2.5.33
-GNU_CONFIGURE=		yes
 UNLIMIT_RESOURCES=	datasize
 
-REPLACE_PERL+=		tools/winemaker tools/winedump/function_grep.pl
+CONFIGURE_ARGS+=	--without-capi
+CONFIGURE_ARGS+=	--without-gphoto
+CONFIGURE_ARGS+=	--without-gssapi
+CONFIGURE_ARGS+=	--without-hal
+CONFIGURE_ARGS+=	--without-krb5
+CONFIGURE_ARGS+=	--without-opencl
+CONFIGURE_ARGS+=	--without-udev
+CONFIGURE_ARGS+=	--without-v4l
+CONFIGURE_ARGS+=	--without-vkd3d
+CONFIGURE_ARGS+=	--without-vulkan
 
-# The Wine configure script has problems locating the libraries in the
-# buildlink directory, so prepend all of the LDFLAGS necessary to link
-# against the libraries.
-CONFIGURE_ENV+=		X_LIBS=${LDFLAGS:M*:Q}
-CONFIGURE_ENV+=		CFLAGS=${CFLAGS:M*:Q}\ -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
-CONFIGURE_ENV+=		LDD=${LDD:Q}
-LIBS+=			${LDFLAGS}
-
-# 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).
 .include "../../mk/bsd.prefs.mk"
-.if ${MACHINE_ARCH} == "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
-.endif
-# Needs GCC >= 4.4
+
+PLIST_VARS+=		lp32 lp64
 .if ${MACHINE_ARCH} == "x86_64"
-CONFIGURE_ARGS+=	--disable-win16
+PLIST.lp64=		yes
 CONFIGURE_ARGS+=	--enable-win64
+NOT_PAX_MPROTECT_SAFE+=	bin/wine64
+.else
+PLIST.lp32=		yes
+NOT_PAX_MPROTECT_SAFE+=	bin/wine
 .endif
 
 .if ${OPSYS} == "NetBSD"
+.  if !empty(OS_VERSION:M[0-8].*)
+# Disable new_dtags as NetBSD versions prior to 9.0 don't honor DT_RUNPATH
+CONFIGURE_ENV+=		ac_cv_cflags__Wl___enable_new_dtags=no
+.  endif
 # gethostbyname_r is in libc, but has a different calling convention
-CONFIGURE_ARGS+=	wine_cv_linux_gethostbyname_r_6=no
+CONFIGURE_ENV+=		wine_cv_linux_gethostbyname_r_6=no
 .endif
 
-.include "options.mk"
+.include "../../mk/oss.buildlink3.mk"
+
+PLIST_VARS+=		oss
+.if ${OSS_TYPE} != "none"
+PLIST.oss=		yes
+LDFLAGS+=		${LIBOSSAUDIO}
+SUBST_CLASSES+=		oss
+SUBST_STAGE.oss=	pre-configure
+SUBST_MESSAGE.oss=	Correcting the path to the OSS device.
+SUBST_FILES.oss+=	dlls/wineoss.drv/mmdevdrv.c
+SUBST_SED.oss+=		-e "s,/dev/dsp,${DEVOSSAUDIO},g"
+.else
+CONFIGURE_ARGS+=	--without-oss
+.endif
+
+# Fix warning due to _FORTIFY_SOURCE being redefined
+CONFIGURE_ENV+=		ac_cv_c_fortify_enabled=no
 
-.include "../../devel/ncurses/buildlink3.mk"
+.include "options.mk"
+.include "../../audio/faudio/buildlink3.mk"
+.include "../../audio/gsm/buildlink3.mk"
+.include "../../audio/mpg123/buildlink3.mk"
+.include "../../audio/openal-soft/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.include "../../multimedia/gstreamer1/buildlink3.mk"
+.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../graphics/giflib/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
+.include "../../mk/curses.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/PLIST.common b/emulators/wine/PLIST
index 57145d2eac5..86b1c21b300 100644
--- a/emulators/wine/PLIST.common
+++ b/emulators/wine/PLIST
@@ -1,11 +1,12 @@
-@comment $NetBSD: PLIST.common,v 1.5 2014/01/17 09:01:58 adam Exp $
+@comment $NetBSD: PLIST,v 1.70 2020/05/22 17:44:41 nia Exp $
 bin/function_grep.pl
 bin/msiexec
 bin/notepad
 bin/regedit
 bin/regsvr32
 bin/widl
-bin/wine
+${PLIST.lp32}bin/wine
+${PLIST.lp64}bin/wine64
 bin/wineboot
 bin/winebuild
 bin/winecfg
@@ -39,6 +40,7 @@ include/wine/msvcrt/eh.h
 include/wine/msvcrt/errno.h
 include/wine/msvcrt/fcntl.h
 include/wine/msvcrt/float.h
+include/wine/msvcrt/fpieee.h
 include/wine/msvcrt/io.h
 include/wine/msvcrt/limits.h
 include/wine/msvcrt/locale.h
@@ -73,6 +75,8 @@ include/wine/windows/accctrl.h
 include/wine/windows/access.idl
 include/wine/windows/aclapi.h
 include/wine/windows/aclui.h
+include/wine/windows/activation.h
+include/wine/windows/activation.idl
 include/wine/windows/activaut.h
 include/wine/windows/activaut.idl
 include/wine/windows/activdbg.h
@@ -89,11 +93,13 @@ include/wine/windows/amvideo.h
 include/wine/windows/amvideo.idl
 include/wine/windows/appcompatapi.h
 include/wine/windows/appmgmt.h
+include/wine/windows/appmodel.h
 include/wine/windows/asptlb.h
 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
@@ -105,6 +111,7 @@ include/wine/windows/audiopolicy.idl
 include/wine/windows/audiosessiontypes.h
 include/wine/windows/austream.h
 include/wine/windows/austream.idl
+include/wine/windows/authz.h
 include/wine/windows/aviriff.h
 include/wine/windows/avrt.h
 include/wine/windows/axcore.idl
@@ -112,19 +119,35 @@ 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/bluetoothapis.h
+include/wine/windows/bthsdpdef.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
 include/wine/windows/cmdtxt.idl
+include/wine/windows/cmnquery.h
+include/wine/windows/cmnquery.idl
+include/wine/windows/colinf.idl
 include/wine/windows/comcat.h
 include/wine/windows/comcat.idl
 include/wine/windows/commctrl.h
@@ -133,6 +156,8 @@ include/wine/windows/commdlg.h
 include/wine/windows/commoncontrols.h
 include/wine/windows/commoncontrols.idl
 include/wine/windows/compobj.h
+include/wine/windows/comsvcs.h
+include/wine/windows/comsvcs.idl
 include/wine/windows/control.h
 include/wine/windows/control.idl
 include/wine/windows/cor.h
@@ -151,6 +176,14 @@ 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/d2d1_1.h
+include/wine/windows/d2d1_1.idl
+include/wine/windows/d2d1_2.h
+include/wine/windows/d2d1_2.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
@@ -159,10 +192,26 @@ include/wine/windows/d3d10_1.idl
 include/wine/windows/d3d10_1shader.h
 include/wine/windows/d3d10effect.h
 include/wine/windows/d3d10misc.h
+include/wine/windows/d3d10sdklayers.h
+include/wine/windows/d3d10sdklayers.idl
 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/d3d11_2.h
+include/wine/windows/d3d11_2.idl
+include/wine/windows/d3d11_3.h
+include/wine/windows/d3d11_3.idl
+include/wine/windows/d3d11_4.h
+include/wine/windows/d3d11_4.idl
+include/wine/windows/d3d11on12.h
+include/wine/windows/d3d11on12.idl
+include/wine/windows/d3d11sdklayers.h
+include/wine/windows/d3d11sdklayers.idl
 include/wine/windows/d3d11shader.h
+include/wine/windows/d3d12.h
+include/wine/windows/d3d12.idl
 include/wine/windows/d3d8.h
 include/wine/windows/d3d8caps.h
 include/wine/windows/d3d8types.h
@@ -179,7 +228,19 @@ include/wine/windows/d3drmdef.h
 include/wine/windows/d3drmobj.h
 include/wine/windows/d3drmwin.h
 include/wine/windows/d3dtypes.h
+include/wine/windows/d3dukmdt.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/d3dx10math.h
+include/wine/windows/d3dx10tex.h
+include/wine/windows/d3dx11.h
+include/wine/windows/d3dx11async.h
+include/wine/windows/d3dx11core.h
+include/wine/windows/d3dx11core.idl
+include/wine/windows/d3dx11tex.h
 include/wine/windows/d3dx9.h
 include/wine/windows/d3dx9anim.h
 include/wine/windows/d3dx9core.h
@@ -191,6 +252,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
@@ -202,21 +264,33 @@ include/wine/windows/dbt.h
 include/wine/windows/dciddi.h
 include/wine/windows/dciman.h
 include/wine/windows/dcommon.h
+include/wine/windows/dcommon.idl
 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/d3dkmthk.h
+include/wine/windows/ddk/fltkernel.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/ndis.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
@@ -225,12 +299,17 @@ 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
 include/wine/windows/devicetopology.idl
 include/wine/windows/devpkey.h
 include/wine/windows/devpropdef.h
+include/wine/windows/dhcpcsdk.h
+include/wine/windows/dhtmldid.h
+include/wine/windows/dhtmled.h
+include/wine/windows/dhtmled.idl
 include/wine/windows/difxapi.h
 include/wine/windows/digitalv.h
 include/wine/windows/dimm.h
@@ -267,40 +346,68 @@ include/wine/windows/dplay8.h
 include/wine/windows/dplobby.h
 include/wine/windows/dplobby8.h
 include/wine/windows/dpnathlp.h
+include/wine/windows/drmexternals.h
+include/wine/windows/drmexternals.idl
 include/wine/windows/dsconf.h
 include/wine/windows/dsgetdc.h
 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/dwrite_3.h
+include/wine/windows/dwrite_3.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/dxgi1_3.h
+include/wine/windows/dxgi1_3.idl
+include/wine/windows/dxgi1_4.h
+include/wine/windows/dxgi1_4.idl
+include/wine/windows/dxgi1_5.h
+include/wine/windows/dxgi1_5.idl
+include/wine/windows/dxgi1_6.h
+include/wine/windows/dxgi1_6.idl
+include/wine/windows/dxgicommon.h
+include/wine/windows/dxgicommon.idl
 include/wine/windows/dxgiformat.h
+include/wine/windows/dxgiformat.idl
 include/wine/windows/dxgitype.h
+include/wine/windows/dxgitype.idl
+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
+include/wine/windows/evr.h
+include/wine/windows/evr.idl
 include/wine/windows/excpt.h
 include/wine/windows/exdisp.h
 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/fontsub.h
 include/wine/windows/fusion.h
 include/wine/windows/fusion.idl
 include/wine/windows/gameux.h
@@ -308,6 +415,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
@@ -318,9 +426,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
@@ -338,11 +450,16 @@ include/wine/windows/icftypes.idl
 include/wine/windows/icm.h
 include/wine/windows/icmpapi.h
 include/wine/windows/idispids.h
+include/wine/windows/ieautomation.h
+include/wine/windows/ieautomation.idl
 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/ime.h
 include/wine/windows/imm.h
 include/wine/windows/imnact.h
 include/wine/windows/imnact.idl
@@ -353,6 +470,13 @@ 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/interactioncontext.h
 include/wine/windows/intshcut.h
 include/wine/windows/ipexport.h
 include/wine/windows/iphlpapi.h
@@ -365,6 +489,8 @@ 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/libloaderapi.h
 include/wine/windows/lm.h
 include/wine/windows/lmaccess.h
 include/wine/windows/lmapibuf.h
@@ -381,6 +507,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
@@ -398,6 +525,16 @@ 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/mfidl.h
+include/wine/windows/mfidl.idl
+include/wine/windows/mfobjects.h
+include/wine/windows/mfobjects.idl
+include/wine/windows/mfreadwrite.h
+include/wine/windows/mfreadwrite.idl
+include/wine/windows/mftransform.h
+include/wine/windows/mftransform.idl
 include/wine/windows/midles.h
 include/wine/windows/mimeinfo.h
 include/wine/windows/mimeinfo.idl
@@ -420,6 +557,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,7 +581,10 @@ include/wine/windows/msident.idl
 include/wine/windows/msinkaut.h
 include/wine/windows/msinkaut.idl
 include/wine/windows/msiquery.h
+include/wine/windows/msopc.h
+include/wine/windows/msopc.idl
 include/wine/windows/mssip.h
+include/wine/windows/msstkppg.h
 include/wine/windows/mstask.h
 include/wine/windows/mstask.idl
 include/wine/windows/mstcpip.h
@@ -457,20 +598,34 @@ include/wine/windows/msxml6.h
 include/wine/windows/msxml6.idl
 include/wine/windows/msxml6did.h
 include/wine/windows/msxmldid.h
+include/wine/windows/mtxdm.h
+include/wine/windows/multimon.h
+include/wine/windows/natupnp.h
+include/wine/windows/natupnp.idl
 include/wine/windows/nb30.h
+include/wine/windows/ncrypt.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/nserror.h
 include/wine/windows/nspapi.h
 include/wine/windows/ntddcdrm.h
 include/wine/windows/ntddndis.h
 include/wine/windows/ntddscsi.h
 include/wine/windows/ntddstor.h
+include/wine/windows/ntddvdeo.h
+include/wine/windows/ntdef.h
 include/wine/windows/ntdsapi.h
+include/wine/windows/ntlsa.h
 include/wine/windows/ntquery.h
 include/wine/windows/ntsecapi.h
 include/wine/windows/ntsecpkg.h
@@ -502,17 +657,24 @@ include/wine/windows/oledberr.h
 include/wine/windows/oledlg.h
 include/wine/windows/oleidl.h
 include/wine/windows/oleidl.idl
+include/wine/windows/opcbase.idl
+include/wine/windows/opcobjectmodel.idl
+include/wine/windows/opcparturi.idl
 include/wine/windows/opnrst.idl
 include/wine/windows/optary.h
 include/wine/windows/optary.idl
 include/wine/windows/patchapi.h
+include/wine/windows/pathcch.h
 include/wine/windows/pdh.h
 include/wine/windows/pdhmsg.h
+include/wine/windows/perflib.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
@@ -531,6 +693,7 @@ include/wine/windows/pstore.h
 include/wine/windows/pstore.idl
 include/wine/windows/qedit.h
 include/wine/windows/qedit.idl
+include/wine/windows/qos2.h
 include/wine/windows/ras.h
 include/wine/windows/rasdlg.h
 include/wine/windows/raserror.h
@@ -543,8 +706,13 @@ 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/roparameterizediid.h
+include/wine/windows/roparameterizediid.idl
 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
@@ -558,6 +726,11 @@ include/wine/windows/rstinf.idl
 include/wine/windows/rstloc.idl
 include/wine/windows/rstnot.idl
 include/wine/windows/rtutils.h
+include/wine/windows/sal.h
+include/wine/windows/sapi.h
+include/wine/windows/sapi.idl
+include/wine/windows/sapiddk.h
+include/wine/windows/sapiddk.idl
 include/wine/windows/scarderr.h
 include/wine/windows/schannel.h
 include/wine/windows/schemadef.h
@@ -577,6 +750,9 @@ include/wine/windows/shdeprecated.h
 include/wine/windows/shdeprecated.idl
 include/wine/windows/shdispid.h
 include/wine/windows/shellapi.h
+include/wine/windows/shellscalingapi.h
+include/wine/windows/shimgdata.h
+include/wine/windows/shimgdata.idl
 include/wine/windows/shldisp.h
 include/wine/windows/shldisp.idl
 include/wine/windows/shlguid.h
@@ -591,12 +767,16 @@ include/wine/windows/slerror.h
 include/wine/windows/slpublic.h
 include/wine/windows/snmp.h
 include/wine/windows/softpub.h
+include/wine/windows/sperror.h
 include/wine/windows/sql.h
 include/wine/windows/sqlext.h
 include/wine/windows/sqltypes.h
+include/wine/windows/sqlucode.h
+include/wine/windows/srcrst.idl
 include/wine/windows/srrestoreptapi.h
 include/wine/windows/sspi.h
 include/wine/windows/stdole2.idl
+include/wine/windows/stgprop.h
 include/wine/windows/sti.h
 include/wine/windows/storage.h
 include/wine/windows/strmif.h
@@ -605,9 +785,13 @@ include/wine/windows/strsafe.h
 include/wine/windows/structuredquerycondition.h
 include/wine/windows/structuredquerycondition.idl
 include/wine/windows/svrapi.h
+include/wine/windows/synchapi.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
@@ -627,12 +811,16 @@ include/wine/windows/txcoord.idl
 include/wine/windows/txdtc.h
 include/wine/windows/txdtc.idl
 include/wine/windows/udpmib.h
+include/wine/windows/uianimation.h
+include/wine/windows/uianimation.idl
 include/wine/windows/uiautomation.h
 include/wine/windows/uiautomationclient.h
 include/wine/windows/uiautomationclient.idl
 include/wine/windows/uiautomationcore.h
 include/wine/windows/uiautomationcore.idl
 include/wine/windows/uiautomationcoreapi.h
+include/wine/windows/uiribbon.h
+include/wine/windows/uiribbon.idl
 include/wine/windows/unknwn.h
 include/wine/windows/unknwn.idl
 include/wine/windows/urlhist.h
@@ -648,15 +836,23 @@ include/wine/windows/ver.h
 include/wine/windows/verrsrc.h
 include/wine/windows/vfw.h
 include/wine/windows/vfwmsgs.h
+include/wine/windows/virtdisk.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
@@ -664,6 +860,8 @@ 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/wimgapi.h
 include/wine/windows/winbase.h
 include/wine/windows/wincodec.h
 include/wine/windows/wincodec.idl
@@ -674,6 +872,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
@@ -695,9 +895,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
@@ -708,11 +910,21 @@ include/wine/windows/wintrust.h
 include/wine/windows/winuser.h
 include/wine/windows/winuser.rh
 include/wine/windows/winver.h
+include/wine/windows/wlanapi.h
+include/wine/windows/wmcodecdsp.h
+include/wine/windows/wmcodecdsp.idl
+include/wine/windows/wmdrmsdk.h
+include/wine/windows/wmdrmsdk.idl
 include/wine/windows/wmistr.h
+include/wine/windows/wmium.h
 include/wine/windows/wmiutils.h
 include/wine/windows/wmiutils.idl
+include/wine/windows/wmp.h
+include/wine/windows/wmp.idl
+include/wine/windows/wmpids.h
 include/wine/windows/wmsbuffer.h
 include/wine/windows/wmsbuffer.idl
+include/wine/windows/wmsdk.h
 include/wine/windows/wmsdkidl.h
 include/wine/windows/wmsdkidl.idl
 include/wine/windows/wnaspi32.h
@@ -723,6 +935,16 @@ include/wine/windows/ws2def.h
 include/wine/windows/ws2ipdef.h
 include/wine/windows/ws2spi.h
 include/wine/windows/ws2tcpip.h
+include/wine/windows/wsdapi.h
+include/wine/windows/wsdbase.h
+include/wine/windows/wsdbase.idl
+include/wine/windows/wsddisco.h
+include/wine/windows/wsddisco.idl
+include/wine/windows/wsdtypes.h
+include/wine/windows/wsdutil.h
+include/wine/windows/wsdxml.h
+include/wine/windows/wsdxml.idl
+include/wine/windows/wsdxmldom.h
 include/wine/windows/wshisotp.h
 include/wine/windows/wsipx.h
 include/wine/windows/wsnwlink.h
@@ -731,6 +953,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
@@ -748,13 +978,163 @@ lib/wine/acledit.dll.so
 lib/wine/aclui.dll.so
 lib/wine/activeds.dll.so
 lib/wine/actxprxy.dll.so
+lib/wine/adsldp.dll.so
+lib/wine/adsldpc.dll.so
 lib/wine/advapi32.dll.so
 lib/wine/advpack.dll.so
 lib/wine/amstream.dll.so
+lib/wine/api-ms-win-appmodel-identity-l1-1-0.dll.so
+lib/wine/api-ms-win-appmodel-runtime-l1-1-1.dll.so
+lib/wine/api-ms-win-appmodel-runtime-l1-1-2.dll.so
+lib/wine/api-ms-win-core-apiquery-l1-1-0.dll.so
+lib/wine/api-ms-win-core-appcompat-l1-1-1.dll.so
+lib/wine/api-ms-win-core-appinit-l1-1-0.dll.so
+lib/wine/api-ms-win-core-atoms-l1-1-0.dll.so
+lib/wine/api-ms-win-core-bem-l1-1-0.dll.so
+lib/wine/api-ms-win-core-com-l1-1-0.dll.so
+lib/wine/api-ms-win-core-com-l1-1-1.dll.so
+lib/wine/api-ms-win-core-com-private-l1-1-0.dll.so
+lib/wine/api-ms-win-core-comm-l1-1-0.dll.so
+lib/wine/api-ms-win-core-console-l1-1-0.dll.so
+lib/wine/api-ms-win-core-console-l2-1-0.dll.so
+lib/wine/api-ms-win-core-crt-l1-1-0.dll.so
+lib/wine/api-ms-win-core-crt-l2-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-delayload-l1-1-0.dll.so
+lib/wine/api-ms-win-core-delayload-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-errorhandling-l1-1-3.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-l1-2-1.dll.so
+lib/wine/api-ms-win-core-file-l1-2-2.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-file-l2-1-2.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-l2-1-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-0.dll.so
+lib/wine/api-ms-win-core-io-l1-1-1.dll.so
+lib/wine/api-ms-win-core-job-l1-1-0.dll.so
+lib/wine/api-ms-win-core-job-l2-1-0.dll.so
+lib/wine/api-ms-win-core-kernel32-legacy-l1-1-0.dll.so
+lib/wine/api-ms-win-core-kernel32-legacy-l1-1-1.dll.so
+lib/wine/api-ms-win-core-kernel32-private-l1-1-1.dll.so
+lib/wine/api-ms-win-core-largeinteger-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-libraryloader-l1-2-0.dll.so
+lib/wine/api-ms-win-core-libraryloader-l1-2-1.dll.so
+lib/wine/api-ms-win-core-libraryloader-l1-2-2.dll.so
+lib/wine/api-ms-win-core-localization-l1-1-0.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-l2-1-0.dll.so
+lib/wine/api-ms-win-core-localization-obsolete-l1-1-0.dll.so
+lib/wine/api-ms-win-core-localization-obsolete-l1-2-0.dll.so
+lib/wine/api-ms-win-core-localization-obsolete-l1-3-0.dll.so
+lib/wine/api-ms-win-core-localization-private-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-memory-l1-1-2.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-namespace-l1-1-0.dll.so
+lib/wine/api-ms-win-core-normalization-l1-1-0.dll.so
+lib/wine/api-ms-win-core-path-l1-1-0.dll.so
+lib/wine/api-ms-win-core-privateprofile-l1-1-1.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-processthreads-l1-1-3.dll.so
+lib/wine/api-ms-win-core-processtopology-obsolete-l1-1-0.dll.so
+lib/wine/api-ms-win-core-profile-l1-1-0.dll.so
+lib/wine/api-ms-win-core-psapi-ansi-l1-1-0.dll.so
+lib/wine/api-ms-win-core-psapi-l1-1-0.dll.so
+lib/wine/api-ms-win-core-psapi-obsolete-l1-1-0.dll.so
+lib/wine/api-ms-win-core-quirks-l1-1-0.dll.so
+lib/wine/api-ms-win-core-realtime-l1-1-0.dll.so
+lib/wine/api-ms-win-core-registry-l1-1-0.dll.so
+lib/wine/api-ms-win-core-registry-l2-1-0.dll.so
+lib/wine/api-ms-win-core-registryuserspecific-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-shlwapi-obsolete-l1-1-0.dll.so
+lib/wine/api-ms-win-core-shlwapi-obsolete-l1-2-0.dll.so
+lib/wine/api-ms-win-core-shutdown-l1-1-0.dll.so
+lib/wine/api-ms-win-core-sidebyside-l1-1-0.dll.so
+lib/wine/api-ms-win-core-string-l1-1-0.dll.so
+lib/wine/api-ms-win-core-string-l2-1-0.dll.so
+lib/wine/api-ms-win-core-string-obsolete-l1-1-0.dll.so
+lib/wine/api-ms-win-core-stringansi-l1-1-0.dll.so
+lib/wine/api-ms-win-core-stringloader-l1-1-1.dll.so
+lib/wine/api-ms-win-core-synch-ansi-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-synch-l1-2-1.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-l1-1-0.dll.so
+lib/wine/api-ms-win-core-threadpool-l1-2-0.dll.so
+lib/wine/api-ms-win-core-threadpool-legacy-l1-1-0.dll.so
+lib/wine/api-ms-win-core-threadpool-private-l1-1-0.dll.so
+lib/wine/api-ms-win-core-timezone-l1-1-0.dll.so
+lib/wine/api-ms-win-core-toolhelp-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-version-l1-1-0.dll.so
+lib/wine/api-ms-win-core-version-l1-1-1.dll.so
+lib/wine/api-ms-win-core-version-private-l1-1-0.dll.so
+lib/wine/api-ms-win-core-versionansi-l1-1-0.dll.so
+lib/wine/api-ms-win-core-windowserrorreporting-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-errorprivate-l1-1-1.dll.so
+lib/wine/api-ms-win-core-winrt-l1-1-0.dll.so
+lib/wine/api-ms-win-core-winrt-registration-l1-1-0.dll.so
+lib/wine/api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll.so
 lib/wine/api-ms-win-core-winrt-string-l1-1-0.dll.so
+lib/wine/api-ms-win-core-winrt-string-l1-1-1.dll.so
+lib/wine/api-ms-win-core-wow64-l1-1-0.dll.so
+lib/wine/api-ms-win-core-wow64-l1-1-1.dll.so
+lib/wine/api-ms-win-core-xstate-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-devices-config-l1-1-0.dll.so
+lib/wine/api-ms-win-devices-config-l1-1-1.dll.so
+lib/wine/api-ms-win-devices-query-l1-1-1.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
@@ -764,52 +1144,113 @@ 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-dx-d3dkmt-l1-1-0.dll.so
+lib/wine/api-ms-win-eventing-classicprovider-l1-1-0.dll.so
+lib/wine/api-ms-win-eventing-consumer-l1-1-0.dll.so
+lib/wine/api-ms-win-eventing-controller-l1-1-0.dll.so
+lib/wine/api-ms-win-eventing-legacy-l1-1-0.dll.so
+lib/wine/api-ms-win-eventing-provider-l1-1-0.dll.so
+lib/wine/api-ms-win-eventlog-legacy-l1-1-0.dll.so
+lib/wine/api-ms-win-gdi-dpiinfo-l1-1-0.dll.so
+lib/wine/api-ms-win-mm-joystick-l1-1-0.dll.so
+lib/wine/api-ms-win-mm-misc-l1-1-1.dll.so
+lib/wine/api-ms-win-mm-mme-l1-1-0.dll.so
+lib/wine/api-ms-win-mm-time-l1-1-0.dll.so
+lib/wine/api-ms-win-ntuser-dc-access-l1-1-0.dll.so
+lib/wine/api-ms-win-ntuser-rectangle-l1-1-0.dll.so
+lib/wine/api-ms-win-ntuser-sysparams-l1-1-0.dll.so
+lib/wine/api-ms-win-perf-legacy-l1-1-0.dll.so
+lib/wine/api-ms-win-power-base-l1-1-0.dll.so
+lib/wine/api-ms-win-power-setting-l1-1-0.dll.so
+lib/wine/api-ms-win-rtcore-ntuser-draw-l1-1-0.dll.so
+lib/wine/api-ms-win-rtcore-ntuser-private-l1-1-0.dll.so
+lib/wine/api-ms-win-rtcore-ntuser-private-l1-1-4.dll.so
+lib/wine/api-ms-win-rtcore-ntuser-window-l1-1-0.dll.so
+lib/wine/api-ms-win-rtcore-ntuser-winevent-l1-1-0.dll.so
+lib/wine/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.dll.so
+lib/wine/api-ms-win-rtcore-ntuser-wmpointer-l1-1-3.dll.so
+lib/wine/api-ms-win-security-activedirectoryclient-l1-1-0.dll.so
+lib/wine/api-ms-win-security-audit-l1-1-1.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-base-private-l1-1-1.dll.so
+lib/wine/api-ms-win-security-credentials-l1-1-0.dll.so
+lib/wine/api-ms-win-security-cryptoapi-l1-1-0.dll.so
+lib/wine/api-ms-win-security-grouppolicy-l1-1-0.dll.so
+lib/wine/api-ms-win-security-lsalookup-l1-1-0.dll.so
+lib/wine/api-ms-win-security-lsalookup-l1-1-1.dll.so
+lib/wine/api-ms-win-security-lsalookup-l2-1-0.dll.so
+lib/wine/api-ms-win-security-lsalookup-l2-1-1.dll.so
+lib/wine/api-ms-win-security-lsapolicy-l1-1-0.dll.so
+lib/wine/api-ms-win-security-provider-l1-1-0.dll.so
+lib/wine/api-ms-win-security-sddl-l1-1-0.dll.so
+lib/wine/api-ms-win-security-systemfunctions-l1-1-0.dll.so
+lib/wine/api-ms-win-service-core-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-management-l2-1-0.dll.so
+lib/wine/api-ms-win-service-private-l1-1-1.dll.so
+lib/wine/api-ms-win-service-winsvc-l1-1-0.dll.so
+lib/wine/api-ms-win-service-winsvc-l1-2-0.dll.so
+lib/wine/api-ms-win-shcore-obsolete-l1-1-0.dll.so
+lib/wine/api-ms-win-shcore-scaling-l1-1-1.dll.so
+lib/wine/api-ms-win-shcore-stream-l1-1-0.dll.so
+lib/wine/api-ms-win-shcore-thread-l1-1-0.dll.so
+lib/wine/api-ms-win-shell-shellcom-l1-1-0.dll.so
+lib/wine/api-ms-win-shell-shellfolders-l1-1-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/atmlib.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
 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
 lib/wine/capi2032.dll.so
 lib/wine/cards.dll.so
+lib/wine/cdosys.dll.so
 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
 lib/wine/compstui.dll.so
+lib/wine/comsvcs.dll.so
+lib/wine/concrt140.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
 lib/wine/ctl3d32.dll.so
-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
@@ -825,6 +1266,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
@@ -838,6 +1281,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
@@ -859,20 +1304,20 @@ 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
 lib/wine/ddraw.dll.so
 lib/wine/ddrawex.dll.so
 lib/wine/devenum.dll.so
 lib/wine/dhcpcsvc.dll.so
+lib/wine/dhtmled.ocx.so
 lib/wine/difxapi.dll.so
 lib/wine/dinput.dll.so
 lib/wine/dinput8.dll.so
-lib/wine/dispdib.dll16.so
+lib/wine/dism.exe.so
 lib/wine/dispex.dll.so
-lib/wine/display.drv16.so
 lib/wine/dmband.dll.so
 lib/wine/dmcompos.dll.so
 lib/wine/dmime.dll.so
@@ -889,32 +1334,228 @@ 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
+lib/wine/dsquery.dll.so
 lib/wine/dssenh.dll.so
 lib/wine/dswave.dll.so
 lib/wine/dwmapi.dll.so
 lib/wine/dwrite.dll.so
+lib/wine/dx8vb.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-authz-context-l1-1-0.dll.so
+lib/wine/ext-ms-win-domainjoin-netjoin-l1-1-0.dll.so
+lib/wine/ext-ms-win-dwmapi-ext-l1-1-0.dll.so
+lib/wine/ext-ms-win-gdi-dc-create-l1-1-1.dll.so
+lib/wine/ext-ms-win-gdi-dc-l1-2-0.dll.so
+lib/wine/ext-ms-win-gdi-devcaps-l1-1-0.dll.so
+lib/wine/ext-ms-win-gdi-draw-l1-1-1.dll.so
+lib/wine/ext-ms-win-gdi-render-l1-1-0.dll.so
+lib/wine/ext-ms-win-kernel32-package-current-l1-1-0.dll.so
+lib/wine/ext-ms-win-kernel32-package-l1-1-1.dll.so
+lib/wine/ext-ms-win-ntuser-draw-l1-1-0.dll.so
+lib/wine/ext-ms-win-ntuser-gui-l1-3-0.dll.so
+lib/wine/ext-ms-win-ntuser-keyboard-l1-3-0.dll.so
+lib/wine/ext-ms-win-ntuser-message-l1-1-1.dll.so
+lib/wine/ext-ms-win-ntuser-misc-l1-2-0.dll.so
+lib/wine/ext-ms-win-ntuser-misc-l1-5-1.dll.so
+lib/wine/ext-ms-win-ntuser-mouse-l1-1-0.dll.so
+lib/wine/ext-ms-win-ntuser-private-l1-1-1.dll.so
+lib/wine/ext-ms-win-ntuser-private-l1-3-1.dll.so
+lib/wine/ext-ms-win-ntuser-rectangle-ext-l1-1-0.dll.so
+lib/wine/ext-ms-win-ntuser-uicontext-ext-l1-1-0.dll.so
+lib/wine/ext-ms-win-ntuser-window-l1-1-1.dll.so
+lib/wine/ext-ms-win-ntuser-window-l1-1-4.dll.so
+lib/wine/ext-ms-win-ntuser-windowclass-l1-1-1.dll.so
+lib/wine/ext-ms-win-oleacc-l1-1-0.dll.so
+lib/wine/ext-ms-win-ras-rasapi32-l1-1-0.dll.so
+lib/wine/ext-ms-win-rtcore-gdi-devcaps-l1-1-0.dll.so
+lib/wine/ext-ms-win-rtcore-gdi-object-l1-1-0.dll.so
+lib/wine/ext-ms-win-rtcore-gdi-rgn-l1-1-0.dll.so
+lib/wine/ext-ms-win-rtcore-ntuser-cursor-l1-1-0.dll.so
+lib/wine/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0.dll.so
+lib/wine/ext-ms-win-rtcore-ntuser-dpi-l1-1-0.dll.so
+lib/wine/ext-ms-win-rtcore-ntuser-dpi-l1-2-0.dll.so
+lib/wine/ext-ms-win-rtcore-ntuser-rawinput-l1-1-0.dll.so
+lib/wine/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.dll.so
+lib/wine/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.dll.so
+lib/wine/ext-ms-win-security-credui-l1-1-0.dll.so
+lib/wine/ext-ms-win-security-cryptui-l1-1-0.dll.so
+lib/wine/ext-ms-win-uxtheme-themes-l1-1-0.dll.so
 lib/wine/extrac32.exe.so
 lib/wine/fakedlls/acledit.dll
 lib/wine/fakedlls/aclui.dll
 lib/wine/fakedlls/activeds.dll
 lib/wine/fakedlls/actxprxy.dll
+lib/wine/fakedlls/adsldp.dll
+lib/wine/fakedlls/adsldpc.dll
 lib/wine/fakedlls/advapi32.dll
 lib/wine/fakedlls/advpack.dll
 lib/wine/fakedlls/amstream.dll
+lib/wine/fakedlls/api-ms-win-appmodel-identity-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-appmodel-runtime-l1-1-1.dll
+lib/wine/fakedlls/api-ms-win-appmodel-runtime-l1-1-2.dll
+lib/wine/fakedlls/api-ms-win-core-apiquery-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-appcompat-l1-1-1.dll
+lib/wine/fakedlls/api-ms-win-core-appinit-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-atoms-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-bem-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-com-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-com-l1-1-1.dll
+lib/wine/fakedlls/api-ms-win-core-com-private-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-comm-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-console-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-console-l2-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-crt-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-crt-l2-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-delayload-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-delayload-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-errorhandling-l1-1-3.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-l1-2-1.dll
+lib/wine/fakedlls/api-ms-win-core-file-l1-2-2.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-file-l2-1-2.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-l2-1-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-0.dll
+lib/wine/fakedlls/api-ms-win-core-io-l1-1-1.dll
+lib/wine/fakedlls/api-ms-win-core-job-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-job-l2-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-kernel32-legacy-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-kernel32-legacy-l1-1-1.dll
+lib/wine/fakedlls/api-ms-win-core-kernel32-private-l1-1-1.dll
+lib/wine/fakedlls/api-ms-win-core-largeinteger-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-libraryloader-l1-2-0.dll
+lib/wine/fakedlls/api-ms-win-core-libraryloader-l1-2-1.dll
+lib/wine/fakedlls/api-ms-win-core-libraryloader-l1-2-2.dll
+lib/wine/fakedlls/api-ms-win-core-localization-l1-1-0.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-l2-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-localization-obsolete-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-localization-obsolete-l1-2-0.dll
+lib/wine/fakedlls/api-ms-win-core-localization-obsolete-l1-3-0.dll
+lib/wine/fakedlls/api-ms-win-core-localization-private-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-memory-l1-1-2.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-namespace-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-normalization-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-path-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-privateprofile-l1-1-1.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-processthreads-l1-1-3.dll
+lib/wine/fakedlls/api-ms-win-core-processtopology-obsolete-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-profile-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-psapi-ansi-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-psapi-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-psapi-obsolete-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-quirks-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-realtime-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-registry-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-registry-l2-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-registryuserspecific-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-shlwapi-obsolete-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-shlwapi-obsolete-l1-2-0.dll
+lib/wine/fakedlls/api-ms-win-core-shutdown-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-sidebyside-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-string-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-string-l2-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-string-obsolete-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-stringansi-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-stringloader-l1-1-1.dll
+lib/wine/fakedlls/api-ms-win-core-synch-ansi-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-synch-l1-2-1.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-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-threadpool-l1-2-0.dll
+lib/wine/fakedlls/api-ms-win-core-threadpool-legacy-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-threadpool-private-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-timezone-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-toolhelp-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-version-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-version-l1-1-1.dll
+lib/wine/fakedlls/api-ms-win-core-version-private-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-versionansi-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-windowserrorreporting-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-errorprivate-l1-1-1.dll
+lib/wine/fakedlls/api-ms-win-core-winrt-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-winrt-registration-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-winrt-string-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-winrt-string-l1-1-1.dll
+lib/wine/fakedlls/api-ms-win-core-wow64-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-wow64-l1-1-1.dll
+lib/wine/fakedlls/api-ms-win-core-xstate-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-devices-config-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-devices-config-l1-1-1.dll
+lib/wine/fakedlls/api-ms-win-devices-query-l1-1-1.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
@@ -924,52 +1565,113 @@ 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-dx-d3dkmt-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-eventing-classicprovider-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-eventing-consumer-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-eventing-controller-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-eventing-legacy-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-eventing-provider-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-eventlog-legacy-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-gdi-dpiinfo-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-mm-joystick-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-mm-misc-l1-1-1.dll
+lib/wine/fakedlls/api-ms-win-mm-mme-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-mm-time-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-ntuser-dc-access-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-ntuser-rectangle-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-ntuser-sysparams-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-perf-legacy-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-power-base-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-power-setting-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-rtcore-ntuser-draw-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-rtcore-ntuser-private-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-rtcore-ntuser-private-l1-1-4.dll
+lib/wine/fakedlls/api-ms-win-rtcore-ntuser-window-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-rtcore-ntuser-winevent-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-3.dll
+lib/wine/fakedlls/api-ms-win-security-activedirectoryclient-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-security-audit-l1-1-1.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-base-private-l1-1-1.dll
+lib/wine/fakedlls/api-ms-win-security-credentials-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-security-cryptoapi-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-security-grouppolicy-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-security-lsalookup-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-security-lsalookup-l1-1-1.dll
+lib/wine/fakedlls/api-ms-win-security-lsalookup-l2-1-0.dll
+lib/wine/fakedlls/api-ms-win-security-lsalookup-l2-1-1.dll
+lib/wine/fakedlls/api-ms-win-security-lsapolicy-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-security-provider-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-security-sddl-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-security-systemfunctions-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-service-core-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-management-l2-1-0.dll
+lib/wine/fakedlls/api-ms-win-service-private-l1-1-1.dll
+lib/wine/fakedlls/api-ms-win-service-winsvc-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-service-winsvc-l1-2-0.dll
+lib/wine/fakedlls/api-ms-win-shcore-obsolete-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-shcore-scaling-l1-1-1.dll
+lib/wine/fakedlls/api-ms-win-shcore-stream-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-shcore-thread-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-shell-shellcom-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-shell-shellfolders-l1-1-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/atmlib.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
 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
 lib/wine/fakedlls/capi2032.dll
 lib/wine/fakedlls/cards.dll
+lib/wine/fakedlls/cdosys.dll
 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
 lib/wine/fakedlls/compstui.dll
+lib/wine/fakedlls/comsvcs.dll
+lib/wine/fakedlls/concrt140.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
 lib/wine/fakedlls/ctl3d32.dll
-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
@@ -985,6 +1687,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
@@ -998,6 +1702,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
@@ -1019,20 +1725,20 @@ 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
 lib/wine/fakedlls/ddraw.dll
 lib/wine/fakedlls/ddrawex.dll
 lib/wine/fakedlls/devenum.dll
 lib/wine/fakedlls/dhcpcsvc.dll
+lib/wine/fakedlls/dhtmled.ocx
 lib/wine/fakedlls/difxapi.dll
 lib/wine/fakedlls/dinput.dll
 lib/wine/fakedlls/dinput8.dll
-lib/wine/fakedlls/dispdib.dll16
+lib/wine/fakedlls/dism.exe
 lib/wine/fakedlls/dispex.dll
-lib/wine/fakedlls/display.drv16
 lib/wine/fakedlls/dmband.dll
 lib/wine/fakedlls/dmcompos.dll
 lib/wine/fakedlls/dmime.dll
@@ -1049,28 +1755,80 @@ 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
+lib/wine/fakedlls/dsquery.dll
 lib/wine/fakedlls/dssenh.dll
 lib/wine/fakedlls/dswave.dll
 lib/wine/fakedlls/dwmapi.dll
 lib/wine/fakedlls/dwrite.dll
+lib/wine/fakedlls/dx8vb.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-authz-context-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-domainjoin-netjoin-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-dwmapi-ext-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-gdi-dc-create-l1-1-1.dll
+lib/wine/fakedlls/ext-ms-win-gdi-dc-l1-2-0.dll
+lib/wine/fakedlls/ext-ms-win-gdi-devcaps-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-gdi-draw-l1-1-1.dll
+lib/wine/fakedlls/ext-ms-win-gdi-render-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-kernel32-package-current-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-kernel32-package-l1-1-1.dll
+lib/wine/fakedlls/ext-ms-win-ntuser-draw-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-ntuser-gui-l1-3-0.dll
+lib/wine/fakedlls/ext-ms-win-ntuser-keyboard-l1-3-0.dll
+lib/wine/fakedlls/ext-ms-win-ntuser-message-l1-1-1.dll
+lib/wine/fakedlls/ext-ms-win-ntuser-misc-l1-2-0.dll
+lib/wine/fakedlls/ext-ms-win-ntuser-misc-l1-5-1.dll
+lib/wine/fakedlls/ext-ms-win-ntuser-mouse-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-ntuser-private-l1-1-1.dll
+lib/wine/fakedlls/ext-ms-win-ntuser-private-l1-3-1.dll
+lib/wine/fakedlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-ntuser-window-l1-1-1.dll
+lib/wine/fakedlls/ext-ms-win-ntuser-window-l1-1-4.dll
+lib/wine/fakedlls/ext-ms-win-ntuser-windowclass-l1-1-1.dll
+lib/wine/fakedlls/ext-ms-win-oleacc-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-ras-rasapi32-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-rtcore-gdi-devcaps-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-rtcore-gdi-object-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-rtcore-ntuser-cursor-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-rtcore-ntuser-dpi-l1-2-0.dll
+lib/wine/fakedlls/ext-ms-win-rtcore-ntuser-rawinput-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-security-credui-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-security-cryptui-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-uxtheme-themes-l1-1-0.dll
 lib/wine/fakedlls/extrac32.exe
 lib/wine/fakedlls/faultrep.dll
+lib/wine/fakedlls/fc.exe
+lib/wine/fakedlls/feclient.dll
+lib/wine/fakedlls/find.exe
 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/fsutil.exe
 lib/wine/fakedlls/fusion.dll
 lib/wine/fakedlls/fwpuclnt.dll
 lib/wine/fakedlls/gameux.dll
-lib/wine/fakedlls/gdi.exe16
 lib/wine/fakedlls/gdi32.dll
 lib/wine/fakedlls/gdiplus.dll
 lib/wine/fakedlls/glu32.dll
@@ -1080,19 +1838,20 @@ 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
 lib/wine/fakedlls/httpapi.dll
+lib/wine/fakedlls/icacls.exe
 lib/wine/fakedlls/iccvid.dll
 lib/wine/fakedlls/icinfo.exe
 lib/wine/fakedlls/icmp.dll
 lib/wine/fakedlls/ieframe.dll
+lib/wine/fakedlls/ieproxy.dll
 lib/wine/fakedlls/iexplore.exe
-lib/wine/fakedlls/ifsmgr.vxd
 lib/wine/fakedlls/imaadp32.acm
 lib/wine/fakedlls/imagehlp.dll
-lib/wine/fakedlls/imm.dll16
 lib/wine/fakedlls/imm32.dll
 lib/wine/fakedlls/inetcomm.dll
 lib/wine/fakedlls/inetcpl.cpl
@@ -1103,20 +1862,24 @@ lib/wine/fakedlls/inkobj.dll
 lib/wine/fakedlls/inseng.dll
 lib/wine/fakedlls/ipconfig.exe
 lib/wine/fakedlls/iphlpapi.dll
+lib/wine/fakedlls/iprop.dll
+lib/wine/fakedlls/irprops.cpl
 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/kerberos.dll
 lib/wine/fakedlls/kernel32.dll
-lib/wine/fakedlls/keyboard.drv16
-lib/wine/fakedlls/krnl386.exe16
+lib/wine/fakedlls/kernelbase.dll
+lib/wine/fakedlls/ksuser.dll
 lib/wine/fakedlls/ktmw32.dll
+lib/wine/fakedlls/l3codeca.acm
 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
 lib/wine/fakedlls/mapi32.dll
 lib/wine/fakedlls/mapistub.dll
 lib/wine/fakedlls/mciavi32.dll
@@ -1124,29 +1887,33 @@ 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/mf3216.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
 lib/wine/fakedlls/mofcomp.exe
-lib/wine/fakedlls/monodebg.vxd
 lib/wine/fakedlls/mountmgr.sys
-lib/wine/fakedlls/mouse.drv16
+lib/wine/fakedlls/mp3dmod.dll
 lib/wine/fakedlls/mpr.dll
 lib/wine/fakedlls/mprapi.dll
-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/msdrm.dll
 lib/wine/fakedlls/msftedit.dll
 lib/wine/fakedlls/msg711.acm
 lib/wine/fakedlls/msgsm32.acm
@@ -1159,12 +1926,15 @@ lib/wine/fakedlls/msiexec.exe
 lib/wine/fakedlls/msimg32.dll
 lib/wine/fakedlls/msimsg.dll
 lib/wine/fakedlls/msimtf.dll
+lib/wine/fakedlls/msinfo32.exe
 lib/wine/fakedlls/msisip.dll
 lib/wine/fakedlls/msisys.ocx
 lib/wine/fakedlls/msls31.dll
 lib/wine/fakedlls/msnet32.dll
 lib/wine/fakedlls/mspatcha.dll
+lib/wine/fakedlls/msports.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
@@ -1173,6 +1943,9 @@ 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/msvcp140.dll
 lib/wine/fakedlls/msvcp60.dll
 lib/wine/fakedlls/msvcp70.dll
 lib/wine/fakedlls/msvcp71.dll
@@ -1180,6 +1953,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
@@ -1190,23 +1965,29 @@ 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
 lib/wine/fakedlls/mswsock.dll
 lib/wine/fakedlls/msxml.dll
 lib/wine/fakedlls/msxml2.dll
 lib/wine/fakedlls/msxml3.dll
 lib/wine/fakedlls/msxml4.dll
 lib/wine/fakedlls/msxml6.dll
+lib/wine/fakedlls/mtxdm.dll
+lib/wine/fakedlls/ncrypt.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
 lib/wine/fakedlls/ngen.exe
+lib/wine/fakedlls/ninput.dll
 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
@@ -1215,33 +1996,30 @@ 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
 lib/wine/fakedlls/ole32.dll
 lib/wine/fakedlls/oleacc.dll
 lib/wine/fakedlls/oleaut32.dll
-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
 lib/wine/fakedlls/olesvr32.dll
 lib/wine/fakedlls/olethk32.dll
 lib/wine/fakedlls/oleview.exe
+lib/wine/fakedlls/opcservices.dll
+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
 lib/wine/fakedlls/ping.exe
 lib/wine/fakedlls/plugplay.exe
+lib/wine/fakedlls/powershell.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
@@ -1252,7 +2030,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
+lib/wine/fakedlls/qwave.dll
 lib/wine/fakedlls/rasapi32.dll
 lib/wine/fakedlls/rasdlg.dll
 lib/wine/fakedlls/reg.exe
@@ -1270,17 +2048,21 @@ 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
 lib/wine/fakedlls/rundll32.exe
 lib/wine/fakedlls/samlib.dll
 lib/wine/fakedlls/sane.ds
+lib/wine/fakedlls/sapi.dll
+lib/wine/fakedlls/sas.dll
 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/scrobj.dll
 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
@@ -1289,42 +2071,48 @@ 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
 lib/wine/fakedlls/sfc.dll
 lib/wine/fakedlls/sfc_os.dll
+lib/wine/fakedlls/shcore.dll
 lib/wine/fakedlls/shdoclc.dll
 lib/wine/fakedlls/shdocvw.dll
-lib/wine/fakedlls/shell.dll16
 lib/wine/fakedlls/shell32.dll
 lib/wine/fakedlls/shfolder.dll
 lib/wine/fakedlls/shlwapi.dll
+lib/wine/fakedlls/shutdown.exe
 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
 lib/wine/fakedlls/spoolss.dll
 lib/wine/fakedlls/spoolsv.exe
+lib/wine/fakedlls/srclient.dll
+lib/wine/fakedlls/sspicli.dll
 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
+lib/wine/fakedlls/strmdll.dll
+lib/wine/fakedlls/subst.exe
 lib/wine/fakedlls/svchost.exe
 lib/wine/fakedlls/svrapi.dll
 lib/wine/fakedlls/sxs.dll
-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/tdh.dll
+lib/wine/fakedlls/tdi.sys
 lib/wine/fakedlls/termsv.exe
-lib/wine/fakedlls/toolhelp.dll16
 lib/wine/fakedlls/traffic.dll
-lib/wine/fakedlls/twain.dll16
 lib/wine/fakedlls/twain_32.dll
-lib/wine/fakedlls/typelib.dll16
+lib/wine/fakedlls/tzres.dll
+lib/wine/fakedlls/ucrtbase.dll
+lib/wine/fakedlls/uiautomationcore.dll
+lib/wine/fakedlls/uiribbon.dll
 lib/wine/fakedlls/unicows.dll
 lib/wine/fakedlls/uninstaller.exe
 lib/wine/fakedlls/unlodctr.exe
@@ -1332,7 +2120,6 @@ 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
 lib/wine/fakedlls/user32.dll
 lib/wine/fakedlls/userenv.dll
 lib/wine/fakedlls/usp10.dll
@@ -1340,38 +2127,40 @@ 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/vcomp140.dll
 lib/wine/fakedlls/vcomp90.dll
-lib/wine/fakedlls/vdhcp.vxd
+lib/wine/fakedlls/vcruntime140.dll
 lib/wine/fakedlls/vdmdbg.dll
-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
+lib/wine/fakedlls/virtdisk.dll
+lib/wine/fakedlls/vssapi.dll
+lib/wine/fakedlls/vulkan-1.dll
+lib/wine/fakedlls/wbemdisp.dll
 lib/wine/fakedlls/wbemprox.dll
+lib/wine/fakedlls/wdscore.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
 lib/wine/fakedlls/windowscodecs.dll
 lib/wine/fakedlls/windowscodecsext.dll
+${PLIST.alsa}lib/wine/fakedlls/winealsa.drv
 lib/wine/fakedlls/wineboot.exe
 lib/wine/fakedlls/winebrowser.exe
+lib/wine/fakedlls/winebus.sys
 lib/wine/fakedlls/winecfg.exe
 lib/wine/fakedlls/wineconsole.exe
 lib/wine/fakedlls/wined3d.dll
 lib/wine/fakedlls/winedbg.exe
 lib/wine/fakedlls/winedevice.exe
 lib/wine/fakedlls/winefile.exe
+lib/wine/fakedlls/winegstreamer.dll
+lib/wine/fakedlls/winehid.sys
 lib/wine/fakedlls/winemapi.dll
 lib/wine/fakedlls/winemenubuilder.exe
 lib/wine/fakedlls/winemine.exe
@@ -1379,39 +2168,41 @@ 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
-lib/wine/fakedlls/winex11.drv
-lib/wine/fakedlls/wing.dll16
+${PLIST.pulse}lib/wine/fakedlls/winepulse.drv
+lib/wine/fakedlls/winevulkan.dll
+${PLIST.x11}lib/wine/fakedlls/winex11.drv
 lib/wine/fakedlls/wing32.dll
-lib/wine/fakedlls/winhelp.exe16
 lib/wine/fakedlls/winhlp32.exe
 lib/wine/fakedlls/winhttp.dll
 lib/wine/fakedlls/wininet.dll
+lib/wine/fakedlls/winmgmt.exe
 lib/wine/fakedlls/winmm.dll
-lib/wine/fakedlls/winnls.dll16
 lib/wine/fakedlls/winnls32.dll
-lib/wine/fakedlls/winoldap.mod16
 lib/wine/fakedlls/winscard.dll
-lib/wine/fakedlls/winsock.dll16
 lib/wine/fakedlls/winspool.drv
 lib/wine/fakedlls/winsta.dll
-lib/wine/fakedlls/wintab.dll16
 lib/wine/fakedlls/wintab32.dll
 lib/wine/fakedlls/wintrust.dll
+lib/wine/fakedlls/winusb.dll
 lib/wine/fakedlls/winver.exe
 lib/wine/fakedlls/wlanapi.dll
 lib/wine/fakedlls/wldap32.dll
+lib/wine/fakedlls/wmasf.dll
 lib/wine/fakedlls/wmi.dll
 lib/wine/fakedlls/wmic.exe
 lib/wine/fakedlls/wmiutils.dll
+lib/wine/fakedlls/wmp.dll
+lib/wine/fakedlls/wmphoto.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
+lib/wine/fakedlls/wpc.dll
+lib/wine/fakedlls/wpcap.dll
 lib/wine/fakedlls/write.exe
 lib/wine/fakedlls/ws2_32.dll
 lib/wine/fakedlls/wscript.exe
+lib/wine/fakedlls/wsdapi.dll
 lib/wine/fakedlls/wshom.ocx
 lib/wine/fakedlls/wsnmp32.dll
 lib/wine/fakedlls/wsock32.dll
@@ -1419,23 +2210,52 @@ 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_7.dll
+lib/wine/fakedlls/xaudio2_8.dll
+lib/wine/fakedlls/xaudio2_9.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
 lib/wine/fakedlls/xpsprint.dll
 lib/wine/fakedlls/xpssvcs.dll
 lib/wine/faultrep.dll.so
+lib/wine/fc.exe.so
+lib/wine/feclient.dll.so
+lib/wine/find.exe.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/fsutil.exe.so
 lib/wine/fusion.dll.so
 lib/wine/fwpuclnt.dll.so
 lib/wine/gameux.dll.so
-lib/wine/gdi.exe16.so
 lib/wine/gdi32.dll.so
 lib/wine/gdiplus.dll.so
 lib/wine/glu32.dll.so
@@ -1445,19 +2265,20 @@ 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
 lib/wine/httpapi.dll.so
+lib/wine/icacls.exe.so
 lib/wine/iccvid.dll.so
 lib/wine/icinfo.exe.so
 lib/wine/icmp.dll.so
 lib/wine/ieframe.dll.so
+lib/wine/ieproxy.dll.so
 lib/wine/iexplore.exe.so
-lib/wine/ifsmgr.vxd.so
 lib/wine/imaadp32.acm.so
 lib/wine/imagehlp.dll.so
-lib/wine/imm.dll16.so
 lib/wine/imm32.dll.so
 lib/wine/inetcomm.dll.so
 lib/wine/inetcpl.cpl.so
@@ -1468,14 +2289,19 @@ lib/wine/inkobj.dll.so
 lib/wine/inseng.dll.so
 lib/wine/ipconfig.exe.so
 lib/wine/iphlpapi.dll.so
+lib/wine/iprop.dll.so
+lib/wine/irprops.cpl.so
 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/kerberos.dll.so
 lib/wine/kernel32.dll.so
-lib/wine/keyboard.drv16.so
-lib/wine/krnl386.exe16.so
+lib/wine/kernelbase.dll.so
+lib/wine/ksuser.dll.so
 lib/wine/ktmw32.dll.so
+lib/wine/l3codeca.acm.so
 lib/wine/libaclui.def
 lib/wine/libactiveds.def
 lib/wine/libadsiid.a
@@ -1487,6 +2313,7 @@ lib/wine/libatl80.def
 lib/wine/libavicap32.def
 lib/wine/libavifil32.def
 lib/wine/libavrt.def
+lib/wine/libbcrypt.def
 lib/wine/libcabinet.def
 lib/wine/libcapi2032.def
 lib/wine/libcards.def
@@ -1495,32 +2322,33 @@ 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
 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/libd3dx11.def
 lib/wine/libd3dx9.def
 lib/wine/libd3dxof.def
 lib/wine/libdbgeng.def
 lib/wine/libdbghelp.def
 lib/wine/libdciman32.def
 lib/wine/libddraw.def
-lib/wine/libdinput.def
-lib/wine/libdinput.def.a
-lib/wine/libdinput8.def
-lib/wine/libdmusic32.def
+lib/wine/libdinput.a
+lib/wine/libdinput8.a
+lib/wine/libdmoguids.a
 lib/wine/libdnsapi.def
-lib/wine/libdplay.def
 lib/wine/libdplayx.def
 lib/wine/libdpnet.def
 lib/wine/libdsound.def
@@ -1535,42 +2363,53 @@ 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/libhttpapi.def
 lib/wine/libieframe.def
 lib/wine/libimagehlp.def
 lib/wine/libimm32.def
 lib/wine/libinetcomm.def
 lib/wine/libiphlpapi.def
-lib/wine/libkernel.def
+lib/wine/libjsproxy.def
 lib/wine/libkernel32.def
 lib/wine/libloadperf.def
 lib/wine/liblz32.def
 lib/wine/libmapi32.def
+lib/wine/libmf.def
+lib/wine/libmfplat.def
+lib/wine/libmfuuid.a
 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
 lib/wine/libmsvcrtd.def
 lib/wine/libmsvfw32.def
 lib/wine/libmswsock.def
 lib/wine/libnddeapi.def
 lib/wine/libnetapi32.def
 lib/wine/libnewdev.def
+lib/wine/libninput.def
 lib/wine/libnormaliz.def
 lib/wine/libntdll.def
 lib/wine/libntdsapi.def
-lib/wine/libntoskrnl.exe.def
+lib/wine/libntoskrnl.def
 lib/wine/libodbc32.def
 lib/wine/libodbccp32.def
 lib/wine/libole32.def
@@ -1595,7 +2434,6 @@ lib/wine/librsaenh.def
 lib/wine/librtutils.def
 lib/wine/libsecur32.def
 lib/wine/libsensapi.def
-lib/wine/libserialui.def
 lib/wine/libsetupapi.def
 lib/wine/libsfc.def
 lib/wine/libsfc_os.def
@@ -1610,11 +2448,13 @@ lib/wine/libsti.def
 lib/wine/libstrmbase.a
 lib/wine/libstrmiids.a
 lib/wine/libsxs.def
+lib/wine/libt2embed.def
 lib/wine/libtapi32.def
+lib/wine/libucrtbase.def
 lib/wine/libunicows.def
 lib/wine/liburl.def
 lib/wine/liburlmon.def
-lib/wine/libusbd.sys.def
+lib/wine/libusbd.def
 lib/wine/libuser32.def
 lib/wine/libuserenv.def
 lib/wine/libusp10.def
@@ -1622,12 +2462,14 @@ lib/wine/libuuid.a
 lib/wine/libuxtheme.def
 lib/wine/libvdmdbg.def
 lib/wine/libversion.def
+lib/wine/libvulkan-1.def
 lib/wine/libwebservices.def
 lib/wine/libwer.def
 lib/wine/libwindowscodecs.def
 lib/wine/libwindowscodecsext.def
 lib/wine/libwinecrt0.a
 lib/wine/libwined3d.def
+lib/wine/libwinevulkan.def
 lib/wine/libwinhttp.def
 lib/wine/libwininet.def
 lib/wine/libwinmm.def
@@ -1636,19 +2478,23 @@ lib/wine/libwinscard.def
 lib/wine/libwinspool.def
 lib/wine/libwintab32.def
 lib/wine/libwintrust.def
+lib/wine/libwlanapi.def
 lib/wine/libwldap32.def
+lib/wine/libwmcodecdspuuid.a
+lib/wine/libwmvcore.def
 lib/wine/libwnaspi32.def
-lib/wine/libwow32.def
 lib/wine/libws2_32.def
+lib/wine/libwsdapi.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
 lib/wine/mapi32.dll.so
 lib/wine/mapistub.dll.so
 lib/wine/mciavi32.dll.so
@@ -1656,29 +2502,33 @@ 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/mf3216.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
 lib/wine/mofcomp.exe.so
-lib/wine/monodebg.vxd.so
 lib/wine/mountmgr.sys.so
-lib/wine/mouse.drv16.so
+lib/wine/mp3dmod.dll.so
 lib/wine/mpr.dll.so
 lib/wine/mprapi.dll.so
-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/msdrm.dll.so
 lib/wine/msftedit.dll.so
 lib/wine/msg711.acm.so
 lib/wine/msgsm32.acm.so
@@ -1691,12 +2541,15 @@ lib/wine/msiexec.exe.so
 lib/wine/msimg32.dll.so
 lib/wine/msimsg.dll.so
 lib/wine/msimtf.dll.so
+lib/wine/msinfo32.exe.so
 lib/wine/msisip.dll.so
 lib/wine/msisys.ocx.so
 lib/wine/msls31.dll.so
 lib/wine/msnet32.dll.so
 lib/wine/mspatcha.dll.so
+lib/wine/msports.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 +2558,9 @@ 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/msvcp140.dll.so
 lib/wine/msvcp60.dll.so
 lib/wine/msvcp70.dll.so
 lib/wine/msvcp71.dll.so
@@ -1712,6 +2568,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,23 +2580,29 @@ 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
 lib/wine/mswsock.dll.so
 lib/wine/msxml.dll.so
 lib/wine/msxml2.dll.so
 lib/wine/msxml3.dll.so
 lib/wine/msxml4.dll.so
 lib/wine/msxml6.dll.so
+lib/wine/mtxdm.dll.so
+lib/wine/ncrypt.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
 lib/wine/ngen.exe.so
+lib/wine/ninput.dll.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,33 +2611,30 @@ 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
 lib/wine/ole32.dll.so
 lib/wine/oleacc.dll.so
 lib/wine/oleaut32.dll.so
-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
 lib/wine/olesvr32.dll.so
 lib/wine/olethk32.dll.so
 lib/wine/oleview.exe.so
+lib/wine/opcservices.dll.so
+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
 lib/wine/ping.exe.so
 lib/wine/plugplay.exe.so
+lib/wine/powershell.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
@@ -1784,7 +2645,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
+lib/wine/qwave.dll.so
 lib/wine/rasapi32.dll.so
 lib/wine/rasdlg.dll.so
 lib/wine/reg.exe.so
@@ -1802,17 +2663,21 @@ 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
 lib/wine/rundll32.exe.so
 lib/wine/samlib.dll.so
 lib/wine/sane.ds.so
+lib/wine/sapi.dll.so
+lib/wine/sas.dll.so
 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/scrobj.dll.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
@@ -1821,42 +2686,48 @@ 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
 lib/wine/sfc.dll.so
 lib/wine/sfc_os.dll.so
+lib/wine/shcore.dll.so
 lib/wine/shdoclc.dll.so
 lib/wine/shdocvw.dll.so
-lib/wine/shell.dll16.so
 lib/wine/shell32.dll.so
 lib/wine/shfolder.dll.so
 lib/wine/shlwapi.dll.so
+lib/wine/shutdown.exe.so
 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
 lib/wine/spoolss.dll.so
 lib/wine/spoolsv.exe.so
+lib/wine/srclient.dll.so
+lib/wine/sspicli.dll.so
 lib/wine/start.exe.so
 lib/wine/stdole2.tlb.so
 lib/wine/stdole32.tlb.so
 lib/wine/sti.dll.so
-lib/wine/storage.dll16.so
-lib/wine/stress.dll16.so
+lib/wine/strmdll.dll.so
+lib/wine/subst.exe.so
 lib/wine/svchost.exe.so
 lib/wine/svrapi.dll.so
 lib/wine/sxs.dll.so
-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/tdh.dll.so
+lib/wine/tdi.sys.so
 lib/wine/termsv.exe.so
-lib/wine/toolhelp.dll16.so
 lib/wine/traffic.dll.so
-lib/wine/twain.dll16.so
 lib/wine/twain_32.dll.so
-lib/wine/typelib.dll16.so
+lib/wine/tzres.dll.so
+lib/wine/ucrtbase.dll.so
+lib/wine/uiautomationcore.dll.so
+lib/wine/uiribbon.dll.so
 lib/wine/unicows.dll.so
 lib/wine/uninstaller.exe.so
 lib/wine/unlodctr.exe.so
@@ -1864,7 +2735,6 @@ 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
 lib/wine/user32.dll.so
 lib/wine/userenv.dll.so
 lib/wine/usp10.dll.so
@@ -1872,38 +2742,40 @@ 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/vcomp140.dll.so
 lib/wine/vcomp90.dll.so
-lib/wine/vdhcp.vxd.so
+lib/wine/vcruntime140.dll.so
 lib/wine/vdmdbg.dll.so
-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
+lib/wine/virtdisk.dll.so
+lib/wine/vssapi.dll.so
+lib/wine/vulkan-1.dll.so
+lib/wine/wbemdisp.dll.so
 lib/wine/wbemprox.dll.so
+lib/wine/wdscore.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
+lib/wine/wimgapi.dll.so
 lib/wine/windowscodecs.dll.so
 lib/wine/windowscodecsext.dll.so
+${PLIST.alsa}lib/wine/winealsa.drv.so
 lib/wine/wineboot.exe.so
 lib/wine/winebrowser.exe.so
+lib/wine/winebus.sys.so
 lib/wine/winecfg.exe.so
 lib/wine/wineconsole.exe.so
 lib/wine/wined3d.dll.so
 lib/wine/winedbg.exe.so
 lib/wine/winedevice.exe.so
 lib/wine/winefile.exe.so
+lib/wine/winegstreamer.dll.so
+lib/wine/winehid.sys.so
 lib/wine/winemapi.dll.so
 lib/wine/winemenubuilder.exe.so
 lib/wine/winemine.exe.so
@@ -1911,39 +2783,41 @@ lib/wine/winemsibuilder.exe.so
 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.pulse}lib/wine/winepulse.drv.so
+lib/wine/winevulkan.dll.so
+${PLIST.x11}lib/wine/winex11.drv.so
 lib/wine/wing32.dll.so
-lib/wine/winhelp.exe16.so
 lib/wine/winhlp32.exe.so
 lib/wine/winhttp.dll.so
 lib/wine/wininet.dll.so
+lib/wine/winmgmt.exe.so
 lib/wine/winmm.dll.so
-lib/wine/winnls.dll16.so
 lib/wine/winnls32.dll.so
-lib/wine/winoldap.mod16.so
 lib/wine/winscard.dll.so
-lib/wine/winsock.dll16.so
 lib/wine/winspool.drv.so
 lib/wine/winsta.dll.so
-lib/wine/wintab.dll16.so
 lib/wine/wintab32.dll.so
 lib/wine/wintrust.dll.so
+lib/wine/winusb.dll.so
 lib/wine/winver.exe.so
 lib/wine/wlanapi.dll.so
 lib/wine/wldap32.dll.so
+lib/wine/wmasf.dll.so
 lib/wine/wmi.dll.so
 lib/wine/wmic.exe.so
 lib/wine/wmiutils.dll.so
+lib/wine/wmp.dll.so
+lib/wine/wmphoto.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
+lib/wine/wpc.dll.so
+lib/wine/wpcap.dll.so
 lib/wine/write.exe.so
 lib/wine/ws2_32.dll.so
 lib/wine/wscript.exe.so
+lib/wine/wsdapi.dll.so
 lib/wine/wshom.ocx.so
 lib/wine/wsnmp32.dll.so
 lib/wine/wsock32.dll.so
@@ -1951,20 +2825,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_7.dll.so
+lib/wine/xaudio2_8.dll.so
+lib/wine/xaudio2_9.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
 man/de.UTF-8/man1/winemaker.1
 man/de.UTF-8/man1/wineserver.1
-man/fr.UTF-8/man1/wine.1
 man/fr.UTF-8/man1/winemaker.1
 man/fr.UTF-8/man1/wineserver.1
 man/man1/msiexec.1
@@ -1972,7 +2867,6 @@ man/man1/notepad.1
 man/man1/regedit.1
 man/man1/regsvr32.1
 man/man1/widl.1
-man/man1/wine.1
 man/man1/wineboot.1
 man/man1/winebuild.1
 man/man1/winecfg.1
@@ -1989,7 +2883,6 @@ man/man1/winepath.1
 man/man1/wineserver.1
 man/man1/wmc.1
 man/man1/wrc.1
-man/pl.UTF-8/man1/wine.1
 share/applications/wine.desktop
 share/wine/fonts/coue1255.fon
 share/wine/fonts/coue1256.fon
@@ -2046,6 +2939,5 @@ share/wine/fonts/vgasysg.fon
 share/wine/fonts/vgasysr.fon
 share/wine/fonts/vgasyst.fon
 share/wine/fonts/wingding.ttf
-share/wine/generic.ppd
 share/wine/l_intl.nls
 share/wine/wine.inf
diff --git a/emulators/wine/PLIST.Darwin b/emulators/wine/PLIST.Darwin
index e64da379678..59d9ea9f5e1 100644
--- a/emulators/wine/PLIST.Darwin
+++ b/emulators/wine/PLIST.Darwin
@@ -1,12 +1,8 @@
-@comment $NetBSD: PLIST.Darwin,v 1.2 2014/01/17 09:01:58 adam Exp $
-lib/wine/fakedlls/openal32.dll
-lib/wine/fakedlls/opencl.dll
+@comment $NetBSD: PLIST.Darwin,v 1.3 2020/05/22 17:44:41 nia Exp $
 lib/wine/fakedlls/winecoreaudio.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/winemp3.acm.so
 lib/wine/wineqtdecoder.dll.so
diff --git a/emulators/wine/buildlink3.mk b/emulators/wine/buildlink3.mk
index a8b70a0cf3d..8edce85a9cb 100644
--- a/emulators/wine/buildlink3.mk
+++ b/emulators/wine/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2020/03/08 16:47:43 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2020/05/22 17:44:41 nia Exp $
 
 BUILDLINK_TREE+=	wine
 
@@ -8,17 +8,6 @@ WINE_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.wine+=	wine>=1.3.0
 BUILDLINK_ABI_DEPENDS.wine+=	wine>=1.6.2nb26
 BUILDLINK_PKGSRCDIR.wine?=	../../emulators/wine
-
-pkgbase:= wine
-.include "../../mk/pkg-build-options.mk"
-
-.include "../../graphics/freetype2/buildlink3.mk"
-.if !empty(PKG_BUILD_OPTIONS.wine:Mopengl)
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/freeglut/buildlink3.mk"
-.endif
-.include "../../graphics/giflib/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
 .endif # WINE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-wine
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index dcf813cfb47..7cadbdb1d07 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.92 2017/01/04 11:52:24 jperkin Exp $
+$NetBSD: distinfo,v 1.93 2020/05/22 17:44:41 nia Exp $
 
-SHA1 (wine-1.6.2.tar.bz2) = 574b9ccedbf213622b7ee55f715764673fc27692
-RMD160 (wine-1.6.2.tar.bz2) = 7252851af5e9f748750685900c918e4fcb31c1f6
-SHA512 (wine-1.6.2.tar.bz2) = 81c83566dc2cab276ab7b9cfb5edc5fbca0f003dcb78044a0197c9a4d9a05a40f9045e5b4981c9219c3c39dab52fe519ef3cb338d79ee01e1fe66e3c056e8397
-Size (wine-1.6.2.tar.bz2) = 21252985 bytes
-SHA1 (patch-configure) = dae045a6c4d3e8a8424567ea058e48e6fa08ed26
-SHA1 (patch-dlls_ntdll_signal__i386.c) = 23028c77cda2611e5fe9c3f78dde55259d0bd6d6
-SHA1 (patch-dlls_wbemprox_builtin.c) = a120531c3ac1e5eddc3c82424d96c0afae69cc7a
-SHA1 (patch-dlls_wineoss.drv_mmdevdrv.c) = 9ea9ad05a32b3f684f22986b227534d87c7dafe7
-SHA1 (patch-programs_winhlp32_macro.lex.l) = 6d37626d44a38559d268b568583f314d2bd31203
-SHA1 (patch-tools_wrc_parser.l) = 6a061055b9f3b2c892f614154c8c15053ac7d9e6
+SHA1 (wine-4.0.tar.xz) = c3ebc9a01ee45036067742e56efb9c25db3fc815
+RMD160 (wine-4.0.tar.xz) = 617a42ed4719e6ea06b48866811c30629d8b2a0e
+SHA512 (wine-4.0.tar.xz) = 7607fa7a3d5f7bcd3d8c4c9e7bb6e1987466110bbfc672782ebe57c6d9da348c58e76abf40b0a70c725dfd703163db6e194ee0e3db11a47b6b60e225163308dd
+Size (wine-4.0.tar.xz) = 21644692 bytes
+SHA1 (patch-configure) = 5dda8249ec5533b4bbe5d735df33491452acc078
+SHA1 (patch-dlls_ntdll_thread.c) = 8a13e956e6622cc215fbe6e9943a704b3a926168
+SHA1 (patch-dlls_wininet_http.c) = 9e539ed70a5bf010e50c7beb1c3b3c877ed5e5d8
+SHA1 (patch-include_bcrypt.h) = 77ea288bac8ab9dccb23e831c083b0229bbb669d
+SHA1 (patch-programs_wineconsole_Makefile.in) = 73f274eef6759accc0dfae5d5de21c76573b8e7b
+SHA1 (patch-programs_wineconsole_curses.c) = 644b0d665a045113ed15a1cd4a70c67ff08b5eb6
diff --git a/emulators/wine/options.mk b/emulators/wine/options.mk
index a54de583ece..50c945133d9 100644
--- a/emulators/wine/options.mk
+++ b/emulators/wine/options.mk
@@ -1,71 +1,59 @@
-# $NetBSD: options.mk,v 1.19 2020/01/20 21:16:43 nia Exp $
+# $NetBSD: options.mk,v 1.20 2020/05/22 17:44:41 nia Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.wine
-PKG_SUPPORTED_OPTIONS=	cups dbus hal ldap opengl sane ssl x11
-PKG_SUGGESTED_OPTIONS=	opengl ssl x11
+PKG_OPTIONS_VAR=		PKG_OPTIONS.wine
+PKG_SUPPORTED_OPTIONS=		alsa cups dbus pulseaudio sane x11
+PKG_SUGGESTED_OPTIONS=		cups dbus sane x11
+PKG_SUGGESTED_OPTIONS.Linux=	alsa
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		opengl x11
+PLIST_VARS+=	alsa
+.if !empty(PKG_OPTIONS:Malsa)
+PLIST.alsa=		yes
+.  include "../../audio/alsa-lib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-alsa
+.endif
 
 .if !empty(PKG_OPTIONS:Mcups)
-.include "../../print/cups-base/buildlink3.mk"
+.  include "../../print/libcups/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-cups
 .endif
 
 .if !empty(PKG_OPTIONS:Mdbus)
-.include "../../sysutils/dbus/buildlink3.mk"
+.  include "../../sysutils/dbus/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-dbus
 .endif
 
-.if !empty(PKG_OPTIONS:Mhal)
-.include "../../sysutils/hal/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--without-hal
-.endif
-
-.if !empty(PKG_OPTIONS:Mldap)
-.include "../../databases/openldap-client/buildlink3.mk"
+PLIST_VARS+=	pulse
+.if !empty(PKG_OPTIONS:Mpulseaudio)
+PLIST.pulse=		yes
+.  include "../../audio/pulseaudio/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=	--without-ldap
+CONFIGURE_ARGS+=	--without-pulse
 .endif
 
-.if !empty(PKG_OPTIONS:Mssl)
-.include "../../security/openssl/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Msane)
+.  include "../../graphics/sane-backends/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=	--without-openssl
+CONFIGURE_ARGS+=	--without-sane
 .endif
 
+PLIST_VARS+=	x11
 .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"
-.include "../../x11/libXcomposite/buildlink3.mk"
-.include "../../x11/libXcursor/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXi/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/libXrandr/buildlink3.mk"
-.include "../../x11/libXrender/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
+.  include "../../x11/libX11/buildlink3.mk"
+.  include "../../x11/libICE/buildlink3.mk"
+.  include "../../x11/libXcursor/buildlink3.mk"
+.  include "../../x11/libXext/buildlink3.mk"
+.  include "../../x11/libXfixes/buildlink3.mk"
+.  include "../../x11/libXi/buildlink3.mk"
+.  include "../../x11/libXinerama/buildlink3.mk"
+.  include "../../x11/libXrandr/buildlink3.mk"
+.  include "../../x11/libXrender/buildlink3.mk"
+.  include "../../x11/libXxf86vm/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=	--without-freetype
 CONFIGURE_ARGS+=	--without-x
 .endif
-
-.if !empty(PKG_OPTIONS:Mopengl) && !empty(PKG_OPTIONS:Mx11)
-PLIST.opengl=		yes
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/freeglut/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--without-opengl
-.endif
-
-.if !empty(PKG_OPTIONS:Msane)
-.include "../../graphics/sane-backends/buildlink3.mk"
-.endif
diff --git a/emulators/wine/patches/patch-configure b/emulators/wine/patches/patch-configure
index 4a8171cf515..c6a4bd8a655 100644
--- a/emulators/wine/patches/patch-configure
+++ b/emulators/wine/patches/patch-configure
@@ -1,32 +1,15 @@
-$NetBSD: patch-configure,v 1.1 2014/01/17 09:01:58 adam Exp $
+$NetBSD: patch-configure,v 1.2 2020/05/22 17:44:42 nia Exp $
 
-Configure for OSS v3 support for NetBSD.
+pkgsrc doesn't use lib64.
 
---- configure.orig	2013-11-15 19:30:24.000000000 +0000
+--- configure.orig	2019-03-15 20:18:31.000000000 +0000
 +++ configure
-@@ -11395,14 +11395,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>
- "
-+if test x`echo "$host_alias" | grep -iv netbsd` = x; then :
- if test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes; then :
- 
- cat >>confdefs.h <<_ACEOF
- #define HAVE_OSS_SYSINFO_NUMAUDIOENGINES 1
-+#define HAVE_OSSv4 1
- _ACEOF
- 
- OSS4INCL="$ac_oss_incl"
- 
-+else
-+ac_cv_member_oss_sysinfo_numaudioengines=yes
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_OSS_SYSINFO_NUMAUDIOENGINES 1
-+_ACEOF
-+
-+OSS4INCL="$ac_oss_incl"
-+
-+fi
+@@ -5683,7 +5683,7 @@ if test "x$enable_win64" = "xyes"
+ then
+     test -z "$with_wine64" || as_fn_error $? "--enable-win64 and --with-wine64 are mutually exclusive.
+ --enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree." "$LINENO" 5
+-    test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64"
++    #test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64"
  fi
  
- fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the directory containing the Wine tools" >&5
diff --git a/emulators/wine/patches/patch-dlls_ntdll_signal__i386.c b/emulators/wine/patches/patch-dlls_ntdll_signal__i386.c
deleted file mode 100644
index 9033cd8a985..00000000000
--- a/emulators/wine/patches/patch-dlls_ntdll_signal__i386.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-dlls_ntdll_signal__i386.c,v 1.1 2016/06/09 15:26:35 fhajny Exp $
-
-SunOS needs sys/regset.h for registers too.
-
---- dlls/ntdll/signal_i386.c.orig	2014-01-10 20:37:29.000000000 +0000
-+++ dlls/ntdll/signal_i386.c
-@@ -269,7 +269,7 @@ typedef struct sigcontext SIGCONTEXT;
- 
- #elif defined(__svr4__) || defined(_SCO_DS) || defined(__sun)
- 
--#ifdef _SCO_DS
-+#if defined(_SCO_DS) || defined(__sun)
- #include <sys/regset.h>
- #endif
- #include <sys/ucontext.h>
diff --git a/emulators/wine/patches/patch-dlls_ntdll_thread.c b/emulators/wine/patches/patch-dlls_ntdll_thread.c
new file mode 100644
index 00000000000..bfce38dad2c
--- /dev/null
+++ b/emulators/wine/patches/patch-dlls_ntdll_thread.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-dlls_ntdll_thread.c,v 1.1 2020/05/22 17:44:42 nia Exp $
+
+Fix Unhandled page fault on write access owing to pthread_attr_setstack(3)
+setting guard on NetBSD 8.0 and newer. This patch has been submitted to Wine
+and can be removed to once upstreamed.
+
+--- dlls/ntdll/thread.c.orig	2019-03-15 20:18:31.000000000 +0000
++++ dlls/ntdll/thread.c
+@@ -526,6 +526,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HAN
+     pthread_attr_init( &attr );
+     pthread_attr_setstack( &attr, teb->DeallocationStack,
+                          (char *)teb->Tib.StackBase + extra_stack - (char *)teb->DeallocationStack );
++    pthread_attr_setguardsize(&attr, 0);
+     pthread_attr_setscope( &attr, PTHREAD_SCOPE_SYSTEM ); /* force creating a kernel thread */
+     interlocked_xchg_add( &nb_threads, 1 );
+     if (pthread_create( &pthread_id, &attr, (void * (*)(void *))start_thread, info ))
diff --git a/emulators/wine/patches/patch-dlls_wbemprox_builtin.c b/emulators/wine/patches/patch-dlls_wbemprox_builtin.c
deleted file mode 100644
index f347d4981aa..00000000000
--- a/emulators/wine/patches/patch-dlls_wbemprox_builtin.c
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-dlls_wbemprox_builtin.c,v 1.1 2014/01/17 09:01:58 adam Exp $
-
-Reorder includes to fix 'select' being redefined error on NetBSD.
-
---- dlls/wbemprox/builtin.c.orig	2013-11-15 19:30:24.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/patches/patch-dlls_wineoss.drv_mmdevdrv.c b/emulators/wine/patches/patch-dlls_wineoss.drv_mmdevdrv.c
deleted file mode 100644
index a92ae6cd91d..00000000000
--- a/emulators/wine/patches/patch-dlls_wineoss.drv_mmdevdrv.c
+++ /dev/null
@@ -1,311 +0,0 @@
-$NetBSD: patch-dlls_wineoss.drv_mmdevdrv.c,v 1.1 2014/01/17 09:01:58 adam Exp $
-
-Restore OSSv3 support for NetBSD.
-
---- dlls/wineoss.drv/mmdevdrv.c.orig	2013-11-15 19:30:24.000000000 +0000
-+++ dlls/wineoss.drv/mmdevdrv.c
-@@ -55,6 +55,10 @@
- 
- WINE_DEFAULT_DEBUG_CHANNEL(oss);
- 
-+#ifndef HAVE_OSSv4
-+#define OSS_DEVNODE_SIZE 255
-+#endif
-+
- #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER)
- 
- static const REFERENCE_TIME DefaultPeriod = 200000;
-@@ -111,7 +115,9 @@ struct ACImpl {
-     float *vols;
- 
-     int fd;
-+#ifdef HAVE_OSSv4
-     oss_audioinfo ai;
-+#endif
-     char devnode[OSS_DEVNODE_SIZE];
- 
-     BOOL initted, playing;
-@@ -269,7 +275,9 @@ enum DriverPriority {
- int WINAPI AUDDRV_GetPriority(void)
- {
-     int mixer_fd;
-+#ifdef HAVE_OSSv4
-     oss_sysinfo sysinfo;
-+#endif
- 
-     /* 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
-@@ -282,6 +290,7 @@ int WINAPI AUDDRV_GetPriority(void)
-         return Priority_Unavailable;
-     }
- 
-+#ifdef HAVE_OSSv4
-     sysinfo.version[0] = 0xFF;
-     sysinfo.versionnum = ~0;
-     if(ioctl(mixer_fd, SNDCTL_SYSINFO, &sysinfo) < 0){
-@@ -289,9 +298,11 @@ int WINAPI AUDDRV_GetPriority(void)
-         close(mixer_fd);
-         return Priority_Unavailable;
-     }
-+#endif
- 
-     close(mixer_fd);
- 
-+#ifdef HAVE_OSSv4
-     if(sysinfo.version[0] < '4' || sysinfo.version[0] > '9'){
-         TRACE("Priority_Low: sysinfo.version[0]: %x\n", sysinfo.version[0]);
-         return Priority_Low;
-@@ -300,6 +311,7 @@ int WINAPI AUDDRV_GetPriority(void)
-         TRACE("Priority_Low: sysinfo.versionnum: %x\n", sysinfo.versionnum);
-         return Priority_Low;
-     }
-+#endif
- 
-     TRACE("Priority_Preferred: Seems like valid OSS!\n");
- 
-@@ -406,29 +418,34 @@ static UINT get_default_index(EDataFlow 
- {
-     int fd = -1, err;
-     UINT i;
-+#ifdef HAVE_OSSv4
-     oss_audioinfo ai;
-+#endif
-     const char *devnode;
-     OSSDevice *dev_item;
- 
-     if(flow == eRender)
--        fd = open("/dev/dsp", O_WRONLY | O_NONBLOCK);
-+        fd = open("/dev/audio", O_WRONLY | O_NONBLOCK);
-     else
--        fd = open("/dev/dsp", O_RDONLY | O_NONBLOCK);
-+        fd = open("/dev/audio", O_RDONLY | O_NONBLOCK);
- 
-     if(fd < 0){
-         WARN("Couldn't open default device!\n");
-         return 0;
-     }
- 
-+#ifdef HAVE_OSSv4
-     ai.dev = -1;
-     if((err = ioctl(fd, SNDCTL_ENGINEINFO, &ai)) < 0){
-         WARN("SNDCTL_ENGINEINFO failed: %d (%s)\n", err, strerror(errno));
-         close(fd);
-         return 0;
-     }
-+#endif
- 
-     close(fd);
- 
-+#ifdef HAVE_OSSv4
-     TRACE("Default devnode: %s\n", ai.devnode);
-     devnode = oss_clean_devnode(ai.devnode);
-     i = 0;
-@@ -439,6 +456,7 @@ static UINT get_default_index(EDataFlow 
-             ++i;
-         }
-     }
-+#endif
- 
-     WARN("Couldn't find default device! Choosing first.\n");
-     return 0;
-@@ -448,7 +466,9 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDa
-         UINT *num, UINT *def_index)
- {
-     int i, mixer_fd;
-+#ifdef HAVE_OSSv4
-     oss_sysinfo sysinfo;
-+#endif
-     static int print_once = 0;
- 
-     static const WCHAR outW[] = {'O','u','t',':',' ',0};
-@@ -462,6 +482,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDa
-         return AUDCLNT_E_SERVICE_NOT_RUNNING;
-     }
- 
-+#ifdef HAVE_OSSv4
-     if(ioctl(mixer_fd, SNDCTL_SYSINFO, &sysinfo) < 0){
-         close(mixer_fd);
- 
-@@ -574,6 +595,55 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDa
-         }
-     }
- 
-+#else
-+    *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *));
-+    *guids = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID));
-+
-+    *num = 0;
-+    const char *devnode;
-+    OSSDevice *dev_item;
-+    devnode = oss_clean_devnode("/dev/audio");
-+    size_t len, prefix_len;
-+    const WCHAR *prefix;
-+
-+    dev_item = HeapAlloc(GetProcessHeap(), 0, sizeof(*dev_item));
-+
-+    dev_item->flow = flow;
-+    get_device_guid(flow, devnode, &dev_item->guid);
-+    strcpy(dev_item->devnode, devnode);
-+
-+    (*guids)[*num] = dev_item->guid;
-+
-+    len = MultiByteToWideChar(CP_UNIXCP, 0, "OSS AUDIO", -1, NULL, 0);
-+    if(flow == eRender){
-+        prefix = outW;
-+        prefix_len = (sizeof(outW) / sizeof(*outW)) - 1;
-+        len += prefix_len;
-+    }else{
-+        prefix = inW;
-+        prefix_len = (sizeof(inW) / sizeof(*inW)) - 1;
-+        len += prefix_len;
-+    }
-+    (*ids)[*num] = HeapAlloc(GetProcessHeap(), 0,
-+            len * sizeof(WCHAR));
-+    if(!(*ids)[*num]){
-+        for(i = 0; i < *num; ++i)
-+            HeapFree(GetProcessHeap(), 0, (*ids)[i]);
-+            HeapFree(GetProcessHeap(), 0, *ids);
-+            HeapFree(GetProcessHeap(), 0, *guids);
-+            HeapFree(GetProcessHeap(), 0, dev_item);
-+            close(mixer_fd);
-+            return E_OUTOFMEMORY;
-+        }
-+        memcpy((*ids)[*num], prefix, prefix_len * sizeof(WCHAR));
-+        MultiByteToWideChar(CP_UNIXCP, 0, "OSS_AUDIO", -1,
-+                (*ids)[*num] + prefix_len, len - prefix_len);
-+
-+        list_add_tail(&g_devices, &dev_item->entry);
-+
-+        (*num)++;
-+#endif
-+
-     close(mixer_fd);
- 
-     *def_index = get_default_index(flow);
-@@ -625,6 +695,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(G
- 
-     This->dataflow = oss_dev->flow;
- 
-+#ifdef HAVE_OSSv4
-     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,
-@@ -633,9 +704,11 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(G
-         HeapFree(GetProcessHeap(), 0, This);
-         return E_FAIL;
-     }
-+#endif
- 
-     strcpy(This->devnode, oss_dev->devnode);
- 
-+#ifdef HAVE_OSSv4
-     TRACE("OSS audioinfo:\n");
-     TRACE("devnode: %s\n", This->ai.devnode);
-     TRACE("name: %s\n", This->ai.name);
-@@ -648,6 +721,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);
-+#endif
- 
-     This->IAudioClient_iface.lpVtbl = &AudioClient_Vtbl;
-     This->IAudioRenderClient_iface.lpVtbl = &AudioRenderClient_Vtbl;
-@@ -794,10 +868,12 @@ static int get_oss_format(const WAVEFORM
-             return AFMT_U8;
-         case 16:
-             return AFMT_S16_LE;
-+#ifdef HAVE_OSSv4
-         case 24:
-             return AFMT_S24_LE;
-         case 32:
-             return AFMT_S32_LE;
-+#endif
-         }
-         return -1;
-     }
-@@ -1241,10 +1317,14 @@ static HRESULT WINAPI AudioClient_IsForm
-             outpwfx = NULL;
-     }
- 
-+#ifndef __NetBSD__
-     if(This->dataflow == eRender)
-         fd = open(This->devnode, O_WRONLY | O_NONBLOCK, 0);
-     else if(This->dataflow == eCapture)
-         fd = open(This->devnode, O_RDONLY | O_NONBLOCK, 0);
-+#else
-+    fd = This->fd;
-+#endif
- 
-     if(fd < 0){
-         WARN("Unable to open device %s: %d (%s)\n", This->devnode, errno,
-@@ -1254,7 +1334,9 @@ static HRESULT WINAPI AudioClient_IsForm
- 
-     ret = setup_oss_device(mode, fd, pwfx, outpwfx);
- 
-+#ifndef __NetBSD__
-     close(fd);
-+#endif
- 
-     return ret;
- }
-@@ -1272,11 +1354,19 @@ static HRESULT WINAPI AudioClient_GetMix
-         return E_POINTER;
-     *pwfx = NULL;
- 
--    if(This->dataflow == eRender)
-+    if(This->dataflow == eRender) {
-+#if HAVE_OSSv4
-         formats = This->ai.oformats;
--    else if(This->dataflow == eCapture)
-+#else
-+	formats = AFMT_S16_LE;
-+#endif
-+    } else if(This->dataflow == eCapture) {
-+#if HAVE_OSSv4
-         formats = This->ai.iformats;
--    else
-+#else
-+	formats = AFMT_S16_LE;
-+#endif
-+    } else
-         return E_UNEXPECTED;
- 
-     fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE));
-@@ -1295,12 +1385,14 @@ static HRESULT WINAPI AudioClient_GetMix
-     }else if(formats & AFMT_U8){
-         fmt->Format.wBitsPerSample = 8;
-         fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
-+#ifdef HAVE_OSSv4
-     }else if(formats & AFMT_S32_LE){
-         fmt->Format.wBitsPerSample = 32;
-         fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
-     }else if(formats & AFMT_S24_LE){
-         fmt->Format.wBitsPerSample = 24;
-         fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
-+#endif
-     }else{
-         WARN("Didn't recognize any available OSS formats: %x\n", formats);
-         CoTaskMemFree(fmt);
-@@ -1309,16 +1401,22 @@ static HRESULT WINAPI AudioClient_GetMix
- 
-     /* some OSS drivers are buggy, so set reasonable defaults if
-      * the reported values seem wacky */
-+#ifdef HAVE_OSSv4
-     fmt->Format.nChannels = max(This->ai.max_channels, This->ai.min_channels);
-     if(fmt->Format.nChannels == 0 || fmt->Format.nChannels > 8)
-+#endif
-         fmt->Format.nChannels = 2;
- 
-+#ifdef HAVE_OSSv4
-     if(This->ai.max_rate == 0)
-+#endif
-         fmt->Format.nSamplesPerSec = 44100;
-+#ifdef HAVE_OSSv4
-     else
-         fmt->Format.nSamplesPerSec = min(This->ai.max_rate, 44100);
-     if(fmt->Format.nSamplesPerSec < This->ai.min_rate)
-         fmt->Format.nSamplesPerSec = This->ai.min_rate;
-+#endif
- 
-     fmt->dwChannelMask = get_channel_mask(fmt->Format.nChannels);
- 
diff --git a/emulators/wine/patches/patch-dlls_wininet_http.c b/emulators/wine/patches/patch-dlls_wininet_http.c
new file mode 100644
index 00000000000..2100c33ad7f
--- /dev/null
+++ b/emulators/wine/patches/patch-dlls_wininet_http.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-dlls_wininet_http.c,v 1.1 2020/05/22 17:44:42 nia Exp $
+
+Fix headers
+
+--- dlls/wininet/http.c.orig	2019-03-15 20:18:31.000000000 +0000
++++ dlls/wininet/http.c
+@@ -35,14 +35,14 @@
+ #  include <zlib.h>
+ #endif
+ 
+-#include "winsock2.h"
+-#include "ws2ipdef.h"
+-
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <time.h>
+ #include <assert.h>
+ 
++#include "winsock2.h"
++#include "ws2ipdef.h"
++
+ #include "windef.h"
+ #include "winbase.h"
+ #include "wininet.h"
diff --git a/emulators/wine/patches/patch-include_bcrypt.h b/emulators/wine/patches/patch-include_bcrypt.h
new file mode 100644
index 00000000000..553dfd403ea
--- /dev/null
+++ b/emulators/wine/patches/patch-include_bcrypt.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-include_bcrypt.h,v 1.1 2020/05/22 17:44:42 nia Exp $
+
+Use parantheses around expression to prevent gcc from complaining
+when using -D_FORTIFY_SOURCE=2 flag
+
+--- include/bcrypt.h.orig	2019-08-14 15:05:32.929387224 +0000
++++ include/bcrypt.h
+@@ -91,7 +91,7 @@ typedef LONG NTSTATUS;
+ #define BCRYPT_CHAIN_MODE_ECB       (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','E','C','B',0}
+ #define BCRYPT_CHAIN_MODE_CFB       (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','C','F','B',0}
+ #define BCRYPT_CHAIN_MODE_CCM       (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','C','C','M',0}
+-#define BCRYPT_CHAIN_MODE_GCM       (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','G','C','M',0}
++#define BCRYPT_CHAIN_MODE_GCM       ((const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','G','C','M',0})
+ 
+ #define BCRYPT_ECDSA_PUBLIC_P256_MAGIC  0x31534345
+ #define BCRYPT_ECDSA_PRIVATE_P256_MAGIC 0x32534345
diff --git a/emulators/wine/patches/patch-programs_wineconsole_Makefile.in b/emulators/wine/patches/patch-programs_wineconsole_Makefile.in
new file mode 100644
index 00000000000..15624bb7d6a
--- /dev/null
+++ b/emulators/wine/patches/patch-programs_wineconsole_Makefile.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-programs_wineconsole_Makefile.in,v 1.1 2020/05/22 17:44:42 nia Exp $
+
+kludge: link against curses as build fails owing to _acs_char(curses)
+being extern.
+
+--- programs/wineconsole/Makefile.in.orig	2019-03-15 20:18:31.000000000 +0000
++++ programs/wineconsole/Makefile.in
+@@ -1,7 +1,7 @@
+ MODULE    = wineconsole.exe
+ APPMODE   = -mwindows
+ IMPORTS   = advapi32
+-DELAYIMPORTS = comctl32 user32 gdi32
++DELAYIMPORTS = comctl32 user32 gdi32 curses
+ 
+ C_SRCS = \
+ 	curses.c \
diff --git a/emulators/wine/patches/patch-programs_wineconsole_curses.c b/emulators/wine/patches/patch-programs_wineconsole_curses.c
new file mode 100644
index 00000000000..afb6851b230
--- /dev/null
+++ b/emulators/wine/patches/patch-programs_wineconsole_curses.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-programs_wineconsole_curses.c,v 1.1 2020/05/22 17:44:42 nia Exp $
+
+_acs_map in NetBSD curses is the equivalent of acs_map in ncurses.
+
+--- programs/wineconsole/curses.c.orig	2019-03-15 20:18:31.000000000 +0000
++++ programs/wineconsole/curses.c
+@@ -125,7 +125,7 @@ MAKE_FUNCPTR(getmouse)
+ MAKE_FUNCPTR(mouseinterval)
+ MAKE_FUNCPTR(mousemask)
+ #endif
+-MAKE_FUNCPTR(acs_map)
++MAKE_FUNCPTR(_acs_map)
+ 
+ #undef MAKE_FUNCPTR
+ 
+@@ -189,7 +189,7 @@ static BOOL WCCURSES_bind_libcurses(void
+     LOAD_FUNCPTR(mouseinterval)
+     LOAD_FUNCPTR(mousemask)
+ #endif
+-    LOAD_FUNCPTR(acs_map)
++    LOAD_FUNCPTR(_acs_map)
+ 
+ #undef LOAD_FUNCPTR
+ 
diff --git a/emulators/wine/patches/patch-programs_winhlp32_macro.lex.l b/emulators/wine/patches/patch-programs_winhlp32_macro.lex.l
deleted file mode 100644
index 3861d581009..00000000000
--- a/emulators/wine/patches/patch-programs_winhlp32_macro.lex.l
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-programs_winhlp32_macro.lex.l,v 1.1 2017/01/04 11:52:24 jperkin Exp $
-
-Ensure the local yywrap is used.
-
---- programs/winhlp32/macro.lex.l.orig	2014-01-10 20:37:29.000000000 +0000
-+++ programs/winhlp32/macro.lex.l
-@@ -35,6 +35,7 @@
- #include "winhelp.h"
- 
- #include "wine/debug.h"
-+#undef yywrap
- 
- WINE_DEFAULT_DEBUG_CHANNEL(winhelp);
- 
diff --git a/emulators/wine/patches/patch-tools_wrc_parser.l b/emulators/wine/patches/patch-tools_wrc_parser.l
deleted file mode 100644
index 07a55befafe..00000000000
--- a/emulators/wine/patches/patch-tools_wrc_parser.l
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-tools_wrc_parser.l,v 1.1 2017/01/04 11:52:24 jperkin Exp $
-
-Ensure the local yywrap is used.
-
---- tools/wrc/parser.l.orig	2014-01-10 20:37:29.000000000 +0000
-+++ tools/wrc/parser.l
-@@ -119,6 +119,7 @@ cident	[a-zA-Z_][0-9a-zA-Z_]*
- #include "newstruc.h"
- 
- #include "parser.tab.h"
-+#undef yywrap
- 
- /* Always update the current character position within a line */
- #define YY_USER_ACTION	char_number+=yyleng; wanted_id = want_id; want_id = 0;