diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,9 +1,8 @@
 PORTNAME=	wine
-DISTVERSION=	8.0.2
-PORTREVISION=	1
+DISTVERSION=	9.0
 PORTEPOCH=	1
 CATEGORIES=	emulators
-MASTER_SITES=	https://dl.winehq.org/wine/source/8.0/
+MASTER_SITES=	https://dl.winehq.org/wine/source/9.0/
 
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	Microsoft Windows compatibility environment
@@ -28,6 +27,7 @@
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--verbose \
+		--enable-archs=i386,x86_64 \
 		--disable-kerberos \
 		--disable-tests \
 		--without-capi \
@@ -135,6 +135,7 @@
 # FreeBSD yet.
 post-patch:
 	${REINPLACE_CMD} '/Exec/s|wine|wine64|g' ${WRKSRC}/loader/wine.desktop
+	${REINPLACE_CMD} 's|CFLAGS="$$llvm_extra_cflags $$llvm_cflags"|CFLAGS="$$CROSSCFLAGS $$llvm_extra_cflags $$llvm_cflags"|g' ${WRKSRC}/configure
 
 .else
 PLIST_SUB+=		WINE32="" WINE64="@comment " WINEARCH="i386"
@@ -144,21 +145,10 @@
 	cd ${WRKSRC} && ${MAKE_CMD} depend
 
 post-install:
-.if ${ARCH} == i386
-	${MV} ${STAGEDIR}${PREFIX}/bin/wineserver	${STAGEDIR}${PREFIX}/bin/wineserver32
-	${MV} ${STAGEDIR}${PREFIX}/bin/wine		${STAGEDIR}${PREFIX}/bin/wine.bin
-	-${ELFCTL} -e +noaslr				${STAGEDIR}${PREFIX}/bin/wine.bin
-	${INSTALL_SCRIPT} ${FILESDIR}/wine.sh		${STAGEDIR}${PREFIX}/bin/wine
-.else
-	${MV} ${STAGEDIR}${PREFIX}/bin/wine64		${STAGEDIR}${PREFIX}/bin/wine64.bin
-	-${ELFCTL} -e +noaslr				${STAGEDIR}${PREFIX}/bin/wine64.bin
-	${INSTALL_SCRIPT} ${FILESDIR}/wine.sh		${STAGEDIR}${PREFIX}/bin/wine64
-	${INSTALL_SCRIPT} ${FILESDIR}/wine-wow64.sh	${STAGEDIR}${PREFIX}/bin/wine
-	${INSTALL_SCRIPT} ${FILESDIR}/pkg32.sh		${STAGEDIR}${DATADIR}/pkg32.sh
-.endif
+	${ELFCTL} -e +noaslr ${STAGEDIR}${PREFIX}/bin/wine
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in README ANNOUNCE AUTHORS
+.for i in README.md ANNOUNCE.md AUTHORS
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/programs/winedbg/README ${STAGEDIR}${DOCSDIR}/README.winedbg
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1691940152
-SHA256 (wine-8.0.2.tar.xz) = 6ec8fb6f2c72d576cb11f52b2f8d59af64404802154651d122b98466d91dc847
-SIZE (wine-8.0.2.tar.xz) = 29060452
+TIMESTAMP = 1708631246
+SHA256 (wine-9.0.tar.xz) = 7cfd090a5395f5b76d95bb5defac8a312c8de4c070c1163b8b58da38330ca6ee
+SIZE (wine-9.0.tar.xz) = 30007216
diff --git a/emulators/wine/files/clang/stdarg.h b/emulators/wine/files/clang/stdarg.h
new file mode 100644
--- /dev/null
+++ b/emulators/wine/files/clang/stdarg.h
@@ -0,0 +1,51 @@
+/*===---- stdarg.h - Variable argument handling ----------------------------===
+ *
+ * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+ * See https://llvm.org/LICENSE.txt for license information.
+ * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+ *
+ *===-----------------------------------------------------------------------===
+ */
+
+#ifndef __STDARG_H
+
+#ifndef __GNUC_VA_LIST
+#define __GNUC_VA_LIST
+typedef __builtin_va_list __gnuc_va_list;
+#endif
+
+#ifdef __need___va_list
+#undef __need___va_list
+#else
+#define __STDARG_H
+#ifndef _VA_LIST
+typedef __builtin_va_list va_list;
+#define _VA_LIST
+#endif
+
+/* FIXME: This is using the placeholder dates Clang produces for these macros
+   in C2x mode; switch to the correct values once they've been published. */
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202000L
+/* C2x does not require the second parameter for va_start. */
+#define va_start(ap, ...) __builtin_va_start(ap, 0)
+#else
+/* Versions before C2x do require the second parameter. */
+#define va_start(ap, param) __builtin_va_start(ap, param)
+#endif
+#define va_end(ap)          __builtin_va_end(ap)
+#define va_arg(ap, type)    __builtin_va_arg(ap, type)
+
+/* GCC always defines __va_copy, but does not define va_copy unless in c99 mode
+ * or -ansi is not specified, since it was not part of C90.
+ */
+#define __va_copy(d,s) __builtin_va_copy(d,s)
+
+#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) ||              \
+    (defined(__cplusplus) && __cplusplus >= 201103L) ||                        \
+    !defined(__STRICT_ANSI__)
+#define va_copy(dest, src)  __builtin_va_copy(dest, src)
+#endif
+
+#endif /* __STDARG_H */
+
+#endif /* not __STDARG_H */
diff --git a/emulators/wine/files/clang/stdbool.h b/emulators/wine/files/clang/stdbool.h
new file mode 100644
--- /dev/null
+++ b/emulators/wine/files/clang/stdbool.h
@@ -0,0 +1,34 @@
+/*===---- stdbool.h - Standard header for booleans -------------------------===
+ *
+ * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+ * See https://llvm.org/LICENSE.txt for license information.
+ * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+ *
+ *===-----------------------------------------------------------------------===
+ */
+
+#ifndef __STDBOOL_H
+#define __STDBOOL_H
+
+#define __bool_true_false_are_defined 1
+
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ > 201710L
+/* FIXME: We should be issuing a deprecation warning here, but cannot yet due
+ * to system headers which include this header file unconditionally.
+ */
+#elif !defined(__cplusplus)
+#define bool _Bool
+#define true 1
+#define false 0
+#elif defined(__GNUC__) && !defined(__STRICT_ANSI__)
+/* Define _Bool as a GNU extension. */
+#define _Bool bool
+#if defined(__cplusplus) && __cplusplus < 201103L
+/* For C++98, define bool, false, true as a GNU extension. */
+#define bool bool
+#define false false
+#define true true
+#endif
+#endif
+
+#endif /* __STDBOOL_H */
diff --git a/emulators/wine/files/clang/stddef.h b/emulators/wine/files/clang/stddef.h
new file mode 100644
--- /dev/null
+++ b/emulators/wine/files/clang/stddef.h
@@ -0,0 +1,128 @@
+/*===---- stddef.h - Basic type definitions --------------------------------===
+ *
+ * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+ * See https://llvm.org/LICENSE.txt for license information.
+ * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+ *
+ *===-----------------------------------------------------------------------===
+ */
+
+#if !defined(__STDDEF_H) || defined(__need_ptrdiff_t) ||                       \
+    defined(__need_size_t) || defined(__need_wchar_t) ||                       \
+    defined(__need_NULL) || defined(__need_wint_t)
+
+#if !defined(__need_ptrdiff_t) && !defined(__need_size_t) &&                   \
+    !defined(__need_wchar_t) && !defined(__need_NULL) &&                       \
+    !defined(__need_wint_t)
+/* Always define miscellaneous pieces when modules are available. */
+#if !__has_feature(modules)
+#define __STDDEF_H
+#endif
+#define __need_ptrdiff_t
+#define __need_size_t
+#define __need_wchar_t
+#define __need_NULL
+#define __need_STDDEF_H_misc
+/* __need_wint_t is intentionally not defined here. */
+#endif
+
+#if defined(__need_ptrdiff_t)
+#if !defined(_PTRDIFF_T) || __has_feature(modules)
+/* Always define ptrdiff_t when modules are available. */
+#if !__has_feature(modules)
+#define _PTRDIFF_T
+#endif
+typedef __PTRDIFF_TYPE__ ptrdiff_t;
+#endif
+#undef __need_ptrdiff_t
+#endif /* defined(__need_ptrdiff_t) */
+
+#if defined(__need_size_t)
+#if !defined(_SIZE_T) || __has_feature(modules)
+/* Always define size_t when modules are available. */
+#if !__has_feature(modules)
+#define _SIZE_T
+#endif
+typedef __SIZE_TYPE__ size_t;
+#endif
+#undef __need_size_t
+#endif /*defined(__need_size_t) */
+
+#if defined(__need_STDDEF_H_misc)
+/* ISO9899:2011 7.20 (C11 Annex K): Define rsize_t if __STDC_WANT_LIB_EXT1__ is
+ * enabled. */
+#if (defined(__STDC_WANT_LIB_EXT1__) && __STDC_WANT_LIB_EXT1__ >= 1 && \
+     !defined(_RSIZE_T)) || __has_feature(modules)
+/* Always define rsize_t when modules are available. */
+#if !__has_feature(modules)
+#define _RSIZE_T
+#endif
+typedef __SIZE_TYPE__ rsize_t;
+#endif
+#endif /* defined(__need_STDDEF_H_misc) */
+
+#if defined(__need_wchar_t)
+#if !defined(__cplusplus) || (defined(_MSC_VER) && !_NATIVE_WCHAR_T_DEFINED)
+/* Always define wchar_t when modules are available. */
+#if !defined(_WCHAR_T) || __has_feature(modules)
+#if !__has_feature(modules)
+#define _WCHAR_T
+#if defined(_MSC_EXTENSIONS)
+#define _WCHAR_T_DEFINED
+#endif
+#endif
+typedef __WCHAR_TYPE__ wchar_t;
+#endif
+#endif
+#undef __need_wchar_t
+#endif /* defined(__need_wchar_t) */
+
+#if defined(__need_NULL)
+#undef NULL
+#ifdef __cplusplus
+#  if !defined(__MINGW32__) && !defined(_MSC_VER)
+#    define NULL __null
+#  else
+#    define NULL 0
+#  endif
+#else
+#  define NULL ((void*)0)
+#endif
+#ifdef __cplusplus
+#if defined(_MSC_EXTENSIONS) && defined(_NATIVE_NULLPTR_SUPPORTED)
+namespace std { typedef decltype(nullptr) nullptr_t; }
+using ::std::nullptr_t;
+#endif
+#endif
+#undef __need_NULL
+#endif /* defined(__need_NULL) */
+
+/* FIXME: This is using the placeholder dates Clang produces for these macros
+   in C2x mode; switch to the correct values once they've been published. */
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202000L
+typedef typeof(nullptr) nullptr_t;
+#endif /* defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202000L */
+
+#if defined(__need_STDDEF_H_misc)
+#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) ||              \
+    (defined(__cplusplus) && __cplusplus >= 201103L)
+#include "__stddef_max_align_t.h"
+#endif
+#define offsetof(t, d) __builtin_offsetof(t, d)
+#undef __need_STDDEF_H_misc
+#endif  /* defined(__need_STDDEF_H_misc) */
+
+/* Some C libraries expect to see a wint_t here. Others (notably MinGW) will use
+__WINT_TYPE__ directly; accommodate both by requiring __need_wint_t */
+#if defined(__need_wint_t)
+/* Always define wint_t when modules are available. */
+#if !defined(_WINT_T) || __has_feature(modules)
+#if !__has_feature(modules)
+#define _WINT_T
+#endif
+typedef __WINT_TYPE__ wint_t;
+#endif
+#undef __need_wint_t
+#endif /* __need_wint_t */
+
+#endif
diff --git a/emulators/wine/files/extra-patch-tools-winebuild-res32 b/emulators/wine/files/extra-patch-tools-winebuild-res32
new file mode 100644
--- /dev/null
+++ b/emulators/wine/files/extra-patch-tools-winebuild-res32
@@ -0,0 +1,95 @@
+The upstream change
+
+  commit 0b3f90ab1485d5bd32bd72d41c7fd8213b3b95b9
+  Author: Rémi Bernon <rbernon@codeweavers.com>
+  Date:   Sat Feb 11 11:05:22 2023 +0100
+
+    winebuild: Use .incbin instead of printf for resource data.
+
+apparently causes some (not completely reproducible) build
+issues on i386 due to resource exhaustion by the compiler,
+cf.  https://bugs.winehq.org/show_bug.cgi?id=54889 .
+
+https://github.com/llvm/llvm-project/issues/62339 tracks this on
+the LLVM side, alas has not really seen progress since April 2003.
+So for now this reverts the upstream commit (alas on i386 only as
+to minimize divergence and risk on 64-bit x86).
+
+
+--- tools/winebuild/res32.c
++++ tools/winebuild/res32.c
+@@ -44,8 +44,6 @@ struct resource
+ {
+     struct string_id type;
+     struct string_id name;
+-    const char      *input_name;
+-    unsigned int     input_offset;
+     const void      *data;
+     unsigned int     data_size;
+     unsigned int     data_offset;
+@@ -158,6 +156,28 @@ static void put_string( const struct string_id *str )
+     }
+ }
+ 
++static void dump_res_data( const struct resource *res )
++{
++    unsigned int i = 0;
++    unsigned int size = (res->data_size + 3) & ~3;
++
++    if (!size) return;
++
++    input_buffer = res->data;
++    input_buffer_pos  = 0;
++    input_buffer_size = size;
++
++    output( "\t.long " );
++    while (size > 4)
++    {
++        if ((i++ % 16) == 15) output( "0x%08x\n\t.long ", get_dword() );
++        else output( "0x%08x,", get_dword() );
++        size -= 4;
++    }
++    output( "0x%08x\n", get_dword() );
++    assert( input_buffer_pos == input_buffer_size );
++}
++
+ /* check the file header */
+ /* all values must be zero except header size */
+ static int check_header(void)
+@@ -179,7 +199,7 @@ static int check_header(void)
+ }
+ 
+ /* load the next resource from the current file */
+-static void load_next_resource( DLLSPEC *spec, const char *name )
++static void load_next_resource( DLLSPEC *spec )
+ {
+     unsigned int hdr_size;
+     struct resource *res = add_resource( spec );
+@@ -189,9 +209,6 @@ static void load_next_resource( DLLSPEC *spec, const char *name )
+     if (hdr_size & 3) fatal_error( "%s header size not aligned\n", input_buffer_filename );
+     if (hdr_size < 32) fatal_error( "%s invalid header size %u\n", input_buffer_filename, hdr_size );
+ 
+-    res->input_name = xstrdup( name );
+-    res->input_offset = input_buffer_pos - 2*sizeof(unsigned int) + hdr_size;
+-
+     res->data = input_buffer + input_buffer_pos - 2*sizeof(unsigned int) + hdr_size;
+     if ((const unsigned char *)res->data < input_buffer ||
+         (const unsigned char *)res->data >= input_buffer + input_buffer_size)
+@@ -220,7 +237,7 @@ int load_res32_file( const char *name, DLLSPEC *spec )
+ 
+     if ((ret = check_header()))
+     {
+-        while (input_buffer_pos < input_buffer_size) load_next_resource( spec, name );
++        while (input_buffer_pos < input_buffer_size) load_next_resource( spec );
+     }
+     return ret;
+ }
+@@ -473,7 +490,7 @@ void output_resources( DLLSPEC *spec )
+     {
+         output( "\n\t.balign 4\n" );
+         output( ".L__wine_spec_res_%d:\n", i );
+-        output( "\t.incbin \"%s\",%d,%d\n", res->input_name, res->input_offset, res->data_size );
++        dump_res_data( res );
+     }
+ 
+     if (!is_pe())
diff --git a/emulators/wine/files/patch-dlls_ntdll_unix_loader.c b/emulators/wine/files/patch-dlls_ntdll_unix_loader.c
deleted file mode 100644
--- a/emulators/wine/files/patch-dlls_ntdll_unix_loader.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- dlls/ntdll/unix/loader.c.orig	2023-07-19 15:29:22 UTC
-+++ dlls/ntdll/unix/loader.c
-@@ -694,6 +694,21 @@ static NTSTATUS loader_exec( char **argv, WORD machine
- {
-     if (machine != current_machine)
-     {
-+        char* wineserver_path = getenv("WINESERVER");
-+        if (wineserver_path != NULL && wineserver_path[0] == '/') {
-+            char* s = remove_tail(wineserver_path, "server");
-+            if (s != NULL) {
-+                if (machine == IMAGE_FILE_MACHINE_AMD64) {
-+                    argv[1] = malloc(strlen(s) + 3);
-+                    strcpy(argv[1], s);
-+                    strcat(argv[1], "64");
-+                } else {
-+                    argv[1] = s;
-+                }
-+                preloader_exec(argv);
-+            }
-+        }
-+
-         if (machine == IMAGE_FILE_MACHINE_AMD64)  /* try the 64-bit loader */
-         {
-             size_t len = strlen(wineloader);
diff --git a/emulators/wine/files/patch-dlls_ntdll_unix_signal__x86__64.c b/emulators/wine/files/patch-dlls_ntdll_unix_signal__x86__64.c
new file mode 100644
--- /dev/null
+++ b/emulators/wine/files/patch-dlls_ntdll_unix_signal__x86__64.c
@@ -0,0 +1,216 @@
+--- dlls/ntdll/unix/signal_x86_64.c.orig	2024-01-27 01:56:23.000000000 +0300
++++ dlls/ntdll/unix/signal_x86_64.c	2024-02-22 23:31:46.856586000 +0300
+@@ -144,6 +144,8 @@ __ASM_GLOBAL_FUNC( alloc_fs_sel,
+ 
+ #elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__)
+ 
++#include <machine/cpufunc.h>
++#include <machine/segments.h>
+ #include <machine/trap.h>
+ 
+ #define RAX_sig(context)     ((context)->uc_mcontext.mc_rax)
+@@ -454,7 +456,7 @@ static inline struct amd64_thread_data *amd64_thread_d
+     return (struct amd64_thread_data *)ntdll_get_thread_data()->cpu_data;
+ }
+ 
+-#ifdef __linux__
++#if defined(__linux__) || defined(__FreeBSD__)
+ static inline TEB *get_current_teb(void)
+ {
+     unsigned long rsp;
+@@ -824,6 +826,25 @@ static inline ucontext_t *init_handler( void *sigconte
+         struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&get_current_teb()->GdiTebBatch;
+         arch_prctl( ARCH_SET_FS, ((struct amd64_thread_data *)thread_data->cpu_data)->pthread_teb );
+     }
++#elif defined(__FreeBSD__)
++  struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&get_current_teb()->GdiTebBatch;
++  USHORT fs = ((struct amd64_thread_data *)thread_data->cpu_data)->fs;
++  assert(fs != GSEL(GUFS32_SEL, SEL_UPL));
++  if (fs != 0)
++  {
++      load_fs(GSEL(GUFS32_SEL, SEL_UPL));
++      amd64_set_fsbase(((struct amd64_thread_data *)thread_data->cpu_data)->pthread_teb);
++  }
++  else
++  {
++      uint64_t fsbase = rdfsbase();
++      uint64_t pthread_teb = ((struct amd64_thread_data *)thread_data->cpu_data)->pthread_teb;
++      if (fsbase != pthread_teb)
++      {
++          fprintf(stderr, "fs: %#x, fsbase: %#lx, pthread_teb: %#lx\n", fs, fsbase, pthread_teb);
++          abort();
++      }
++  }
+ #endif
+     return sigcontext;
+ }
+@@ -837,6 +858,13 @@ static inline void leave_handler( ucontext_t *sigconte
+ #ifdef __linux__
+     if (fs32_sel && !is_inside_signal_stack( (void *)RSP_sig(sigcontext )) && !is_inside_syscall(sigcontext))
+         __asm__ volatile( "movw %0,%%fs" :: "r" (fs32_sel) );
++#elif defined(__FreeBSD__)
++    struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&get_current_teb()->GdiTebBatch;
++    USHORT fs = ((struct amd64_thread_data *)thread_data->cpu_data)->fs;
++    if (fs != 0 && !is_inside_signal_stack((void *)RSP_sig(sigcontext)) && !is_inside_syscall(sigcontext))
++    {
++        load_fs(fs);
++    }
+ #endif
+ #ifdef DS_sig
+     DS_sig(sigcontext) = ds64_sel;
+@@ -1598,7 +1626,7 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback,
+                    "movq %rsp,0x328(%r8)\n\t"  /* amd64_thread_data()->syscall_frame */
+                    /* switch to user stack */
+                    "movq %rdi,%rsp\n\t"        /* user_rsp */
+-#ifdef __linux__
++#if defined(__linux__) || defined(__FreeBSD__)
+                    "testl $12,%r14d\n\t"       /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */
+                    "jz 1f\n\t"
+                    "movw 0x338(%r8),%fs\n"     /* amd64_thread_data()->fs */
+@@ -2174,6 +2202,7 @@ static void usr1_handler( int signal, siginfo_t *sigin
+  *           LDT support
+  */
+ 
++//TODO: machdep.max_ldt_segment?
+ #define LDT_SIZE 8192
+ 
+ #define LDT_FLAGS_DATA      0x13  /* Data segment */
+@@ -2231,6 +2260,16 @@ static void ldt_set_entry( WORD sel, LDT_ENTRY entry )
+ 
+ #if defined(__APPLE__)
+     if (i386_set_ldt(index, (union ldt_entry *)&entry, 1) < 0) perror("i386_set_ldt");
++#elif defined(__FreeBSD__)
++    struct i386_ldt_args p;
++    p.start = index;
++    p.descs = (struct user_segment_descriptor *)&entry;
++    p.num   = 1;
++    if (sysarch(I386_SET_LDT, &p) == -1)
++    {
++        perror("i386_set_ldt");
++        exit(1);
++    }
+ #else
+     fprintf( stderr, "No LDT support on this platform\n" );
+     exit(1);
+@@ -2378,7 +2417,6 @@ static void *mac_thread_gsbase(void)
+ }
+ #endif
+ 
+-
+ /**********************************************************************
+  *		signal_init_process
+  */
+@@ -2439,6 +2477,18 @@ void signal_init_process(void)
+             break;
+         }
+     }
++#elif defined(__FreeBSD__)
++    if (wow_teb)
++    {
++        LDT_ENTRY fs32_entry = ldt_make_entry(wow_teb, page_size - 1, LDT_FLAGS_DATA | LDT_FLAGS_32BIT);
++
++        cs32_sel = GSEL(GUCODE32_SEL, SEL_UPL);
++
++        amd64_thread_data()->fs = (first_ldt_entry << 3) | 7;
++        ldt_set_entry(amd64_thread_data()->fs, fs32_entry);
++
++        syscall_flags |= SYSCALL_HAVE_PTHREAD_TEB;
++    }
+ #endif
+ 
+     sig_act.sa_mask = server_block_set;
+@@ -2484,8 +2534,9 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, vo
+     arch_prctl( ARCH_SET_GS, teb );
+     arch_prctl( ARCH_GET_FS, &thread_data->pthread_teb );
+     if (fs32_sel) alloc_fs_sel( fs32_sel >> 3, get_wow_teb( teb ));
+-#elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__)
+-    amd64_set_gsbase( teb );
++#elif defined(__FreeBSD__)
++    amd64_set_gsbase(teb);
++    amd64_get_fsbase(&thread_data->pthread_teb);
+ #elif defined(__NetBSD__)
+     sysarch( X86_64_SET_GSBASE, &teb );
+ #elif defined (__APPLE__)
+@@ -2588,7 +2639,6 @@ __ASM_GLOBAL_FUNC( signal_start_thread,
+                    "1:\tmovq %r8,%rsp\n\t"
+                    "call " __ASM_NAME("call_init_thunk"))
+ 
+-
+ /***********************************************************************
+  *           __wine_syscall_dispatcher
+  */
+@@ -2632,7 +2682,11 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher,
+                    __ASM_CFI_REG_IS_AT2(rbp, rcx, 0x98, 0x01)
+                    /* Legends of Runeterra hooks the first system call return instruction, and
+                     * depends on us returning to it. Adjust the return address accordingly. */
++#ifndef __FreeBSD__
+                    "subq $0xb,0x70(%rcx)\n\t"
++#else
++                   "subq $0xe,0x70(%rcx)\n\t" // "jmp 1f" = e9 01 00 00 00
++#endif
+                    "movl 0xb0(%rcx),%r14d\n\t"     /* frame->syscall_flags */
+                    "testl $3,%r14d\n\t"            /* SYSCALL_HAVE_XSAVE | SYSCALL_HAVE_XSAVEC */
+                    "jz 2f\n\t"
+@@ -2696,6 +2750,23 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher,
+                    "leaq -0x98(%rbp),%rcx\n"
+                    "2:\n\t"
+ #endif
++#ifdef __FreeBSD__
++                   "testl $12,%r14d\n\t"           /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */
++                   "jz 2f\n\t"
++                   "movq $0x13,%rsi\n\t"           /* GSEL(GUFS32_SEL, SEL_UPL) */
++                   "movq %rsi,%fs\n\t"
++# if USE_AMD64_SET_FSBASE_FUNC
++                   "pushq %rcx\n\t"
++                   "movq %gs:0x320,%rdi\n\t"       /* amd64_thread_data()->pthread_teb */
++                   "callq amd64_set_fsbase\n\t"
++                   "popq %rcx\n\t"
++
++# else
++                   "movq %gs:0x320,%rsi\n\t"       /* amd64_thread_data()->pthread_teb */
++                   "wrfsbase %rsi\n\t"
++# endif
++                   "2:\n\t"
++#endif
+                    "movq 0x00(%rcx),%rax\n\t"
+                    "movq 0x18(%rcx),%r11\n\t"      /* 2nd argument */
+                    "movl %eax,%ebx\n\t"
+@@ -2768,7 +2839,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher,
+                    "movq 0x20(%rcx),%rsi\n\t"
+                    "movq 0x08(%rcx),%rbx\n\t"
+                    "leaq 0x70(%rcx),%rsp\n\t"      /* %rsp > frame means no longer inside syscall */
+-#ifdef __linux__
++#if defined(__linux__) || defined(__FreeBSD__)
+                    "testl $12,%r14d\n\t"           /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */
+                    "jz 1f\n\t"
+                    "movw %gs:0x338,%fs\n"          /* amd64_thread_data()->fs */
+@@ -2902,6 +2973,20 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher,
+                    "syscall\n\t"
+                    "2:\n\t"
+ #endif
++#ifdef __FreeBSD__
++                   "testl $12,%r14d\n\t"           /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */
++                   "jz 2f\n\t"
++                   "movq $0x13,%rsi\n\t"           /* GSEL(GUFS32_SEL, SEL_UPL) */
++                   "movq %rsi,%fs\n\t"
++# if USE_AMD64_SET_FSBASE_FUNC
++                   "movq %gs:0x320,%rdi\n\t"       /* amd64_thread_data()->pthread_teb */
++                   "callq amd64_set_fsbase\n\t"
++# else
++                   "movq %gs:0x320,%rsi\n\t"       /* amd64_thread_data()->pthread_teb */
++                   "wrfsbase %rsi\n\t"
++# endif
++                   "2:\n\t"
++#endif
+                    "movq %r8,%rdi\n\t"             /* args */
+                    "callq *(%r10,%rdx,8)\n\t"
+                    "movq %rsp,%rcx\n\t"
+@@ -2920,7 +3005,7 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher,
+                    /* switch to user stack */
+                    "movq 0x88(%rcx),%rsp\n\t"
+                    __ASM_CFI(".cfi_restore_state\n\t")
+-#ifdef __linux__
++#if defined(__linux__) || defined(__FreeBSD__)
+                    "testl $12,%r14d\n\t"           /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */
+                    "jz 1f\n\t"
+                    "movw %gs:0x338,%fs\n"          /* amd64_thread_data()->fs */
diff --git a/emulators/wine/files/patch-dlls_wow64cpu_cpu.c b/emulators/wine/files/patch-dlls_wow64cpu_cpu.c
new file mode 100644
--- /dev/null
+++ b/emulators/wine/files/patch-dlls_wow64cpu_cpu.c
@@ -0,0 +1,24 @@
+--- dlls/wow64cpu/cpu.c.orig	2024-01-25 16:39:19.964476000 +0300
++++ dlls/wow64cpu/cpu.c	2024-02-01 22:55:09.329013000 +0300
+@@ -207,6 +207,10 @@ __ASM_GLOBAL_FUNC( syscall_32to64,
+                    "movl %edx,4(%rsp)\n\t"
+                    "movl 0xc4(%r13),%r14d\n\t"  /* context->Esp */
+                    "xchgq %r14,%rsp\n\t"
++                   /* weird FreeBSD stuff */
++                   "movl $0x3b,%edx\n\t"        /* GSEL(GUDATA_SEL, SEL_UPL) */
++                   "movl %edx,%ss\n\t"
++                   /* ******************* */
+                    "ljmp *(%r14)\n"
+                    ".Lsyscall_32to64_return:\n\t"
+                    "movq %rsp,%r14\n\t"
+@@ -261,6 +265,10 @@ __ASM_GLOBAL_FUNC( unix_call_32to64,
+                    "movl %edx,4(%rsp)\n\t"
+                    "movl 0xc4(%r13),%r14d\n\t"  /* context->Esp */
+                    "xchgq %r14,%rsp\n\t"
++                   /* weird FreeBSD stuff */
++                   "movl $0x3b,%edx\n\t"        /* GSEL(GUDATA_SEL, SEL_UPL) */
++                   "movl %edx,%ss\n\t"
++                   /* ******************* */
+                    "ljmp *(%r14)" )
+ 
+ 
diff --git a/emulators/wine/files/pkg32.sh b/emulators/wine/files/pkg32.sh
deleted file mode 100644
--- a/emulators/wine/files/pkg32.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh -e
-
-if [ "$(id -u)" = 0 ]
-then
-  echo "Don't run this script as root!"
-  exit 1
-fi
-
-I386_ROOT="${WINE_i386_ROOT:-$HOME/.i386-wine-pkg}"
-
-if [ ! -d "$I386_ROOT/usr/share/keys/pkg" ]
-then
-  mkdir -p "$I386_ROOT/usr/share/keys"
-  ln -s /usr/share/keys/pkg "$I386_ROOT/usr/share/keys/pkg"
-fi
-
-ABI=$(pkg config ABI | sed s/amd64/i386/)
-# Show what we're going to do, then do it.
-echo pkg -o ABI="$ABI" -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@"
-exec pkg -o ABI="$ABI" -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@"
diff --git a/emulators/wine/files/wine-wow64.sh b/emulators/wine/files/wine-wow64.sh
deleted file mode 100644
--- a/emulators/wine/files/wine-wow64.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh -e
-
-TARGET="$(realpath "$0")"
-PREFIX="${TARGET%/*/*}"
-LOCALBASE="${PREFIX}"
-
-I386_ROOT="${WINE_i386_ROOT:-$HOME/.i386-wine-pkg}"
-
-if [ ! -f "$I386_ROOT/$PREFIX/bin/wine" ]
-then
-  printf "%s doesn't exist!\n\n" "$I386_ROOT/$PREFIX/bin/wine"
-  printf "Try installing 32-bit Wine with\n\t%s\n" "$PREFIX/share/wine/pkg32.sh install wine mesa-dri"
-  ABI=$(pkg config ABI | sed s/amd64/i386/)
-  FREEBSD_VERSION_MAJOR=`uname -r | sed "s/\..*//"`
-  cat <<- HERE
-
-	If using Poudriere, please make sure your repo is setup to use ${ABI}
-	and create symlinks for
-	  FreeBSD:$FREEBSD_VERSION_MAJOR:amd64 and
-	  FreeBSD:$FREEBSD_VERSION_MAJOR:i386
-	to the relevant output directories. See pkg.conf(5) for more info.
-HERE
-  exit 1
-fi
-
-WINE32_VERSION=$(env -u WINELOADERNOEXEC "$I386_ROOT/$PREFIX/bin/wine" --version)
-WINE64_VERSION=$(env -u WINELOADERNOEXEC "${TARGET}64" --version)
-if [ "$WINE32_VERSION" != "$WINE64_VERSION" ]
-then
-  printf "wine [%s] and wine64 [%s] versions do not match!\n\n" "$WINE32_VERSION" "$WINE64_VERSION"
-  printf "Try updating 32-bit wine with\n\t%s\n" "$PREFIX/share/wine/pkg32.sh upgrade"
-  exit 1
-fi
-
-export LIBGL_DRIVERS_PATH="${LIBGL_DRIVERS_PATH:+$LIBGL_DRIVERS_PATH:}$LOCALBASE/lib/dri-devel:$LOCALBASE/lib32/dri-devel:$I386_ROOT/$LOCALBASE/lib/dri-devel:$LOCALBASE/lib/dri:$LOCALBASE/lib32/dri:$I386_ROOT/$LOCALBASE/lib/dri"
-export LD_32_LIBRARY_PATH="${LD_32_LIBRARY_PATH:+$LD_32_LIBRARY_PATH:}$I386_ROOT/$PREFIX/lib/wine:$LOCALBASE/lib32:$I386_ROOT/$LOCALBASE/lib"
-for d in "$I386_ROOT/$LOCALBASE"/llvm*/lib
-do
-  if [ -d "$d" ]
-  then
-    export LD_32_LIBRARY_PATH="$LD_32_LIBRARY_PATH:$d"
-  fi
-done
-export LD_32_LIBRARY_PATH_RPATH=y
-LD_32_LIBMAP_CONF=$(sed "s,$LOCALBASE,$I386_ROOT&,2" "$I386_ROOT/$LOCALBASE"/etc/libmap.d/*.conf 2>/dev/null || true)
-export LD_32_LIBMAP="
-libgcc_s.so.1 /usr/lib32/libgcc_s.so.1
-$LOCALBASE/lib/libvulkan_intel.so  $I386_ROOT/$LOCALBASE/lib/libvulkan_intel.so
-$LOCALBASE/lib/libvulkan_radeon.so $I386_ROOT/$LOCALBASE/lib/libvulkan_radeon.so
-$LOCALBASE/lib/alsa-lib/libasound_module_pcm_oss.so $I386_ROOT/$LOCALBASE/lib/alsa-lib/libasound_module_pcm_oss.so
-$LD_32_LIBMAP_CONF
-$LD_32_LIBMAP"
-
-if [ -z "$WINE_NO_WOW64" ]
-then
-  export WINESERVER="${TARGET}server"
-fi
-
-exec "$I386_ROOT/$PREFIX/bin/wine" "$@"
diff --git a/emulators/wine/files/wine.sh b/emulators/wine/files/wine.sh
deleted file mode 100644
--- a/emulators/wine/files/wine.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-TARGET="$(realpath "$0")"
-
-if [ -z "$WINESERVER" ]; then
-  if [ -f "${TARGET%/*}/wineserver32" ]; then
-    export WINESERVER="${TARGET%/*}/wineserver32"
-  elif [ -f "${TARGET%/*}/wineserver" ]; then
-    export WINESERVER="${TARGET%/*}/wineserver"
-  fi
-fi
-
-# Workaround for https://bugs.winehq.org/show_bug.cgi?id=50257
-export LD_BIND_NOW=1
-export LD_32_BIND_NOW=1
-
-exec "${TARGET}.bin" "$@"
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -6,9 +6,6 @@
 bin/regsvr32
 bin/widl
 bin/wine
-%%WINE32%%bin/wine.bin
-%%WINE64%%bin/wine64
-%%WINE64%%bin/wine64.bin
 bin/wineboot
 bin/winebuild
 bin/winecfg
@@ -22,8 +19,7 @@
 bin/winemaker
 bin/winemine
 bin/winepath
-%%WINE64%%bin/wineserver
-%%WINE32%%bin/wineserver32
+bin/wineserver
 bin/wmc
 bin/wrc
 include/wine/debug.h
@@ -34,8 +30,6 @@
 include/wine/itss.idl
 include/wine/mfinternal.h
 include/wine/mfinternal.idl
-include/wine/svcctl.h
-include/wine/svcctl.idl
 include/wine/msvcrt/assert.h
 include/wine/msvcrt/complex.h
 include/wine/msvcrt/conio.h
@@ -98,6 +92,8 @@
 include/wine/msvcrt/vadefs.h
 include/wine/msvcrt/wchar.h
 include/wine/msvcrt/wctype.h
+include/wine/svcctl.h
+include/wine/svcctl.idl
 include/wine/windows/accctrl.h
 include/wine/windows/access.idl
 include/wine/windows/aclapi.h
@@ -108,6 +104,7 @@
 include/wine/windows/activaut.idl
 include/wine/windows/activdbg.h
 include/wine/windows/activdbg.idl
+include/wine/windows/activeds.h
 include/wine/windows/activscp.h
 include/wine/windows/activscp.idl
 include/wine/windows/adserr.h
@@ -125,6 +122,7 @@
 include/wine/windows/appcompatapi.h
 include/wine/windows/appmgmt.h
 include/wine/windows/appmodel.h
+include/wine/windows/appnotify.h
 include/wine/windows/asferr.h
 include/wine/windows/asptlb.h
 include/wine/windows/asptlb.idl
@@ -255,10 +253,12 @@
 include/wine/windows/d3d10_1.idl
 include/wine/windows/d3d10_1shader.h
 include/wine/windows/d3d10effect.h
+include/wine/windows/d3d10effect.idl
 include/wine/windows/d3d10misc.h
 include/wine/windows/d3d10sdklayers.h
 include/wine/windows/d3d10sdklayers.idl
 include/wine/windows/d3d10shader.h
+include/wine/windows/d3d10shader.idl
 include/wine/windows/d3d11.h
 include/wine/windows/d3d11.idl
 include/wine/windows/d3d11_1.h
@@ -280,6 +280,8 @@
 include/wine/windows/d3d12sdklayers.idl
 include/wine/windows/d3d12shader.h
 include/wine/windows/d3d12shader.idl
+include/wine/windows/d3d12video.h
+include/wine/windows/d3d12video.idl
 include/wine/windows/d3d8.h
 include/wine/windows/d3d8caps.h
 include/wine/windows/d3d8types.h
@@ -335,9 +337,43 @@
 include/wine/windows/dciman.h
 include/wine/windows/dcommon.h
 include/wine/windows/dcommon.idl
+include/wine/windows/dcomp.h
+include/wine/windows/dcomp.idl
+include/wine/windows/dcompanimation.h
+include/wine/windows/dcompanimation.idl
+include/wine/windows/dcomptypes.h
+include/wine/windows/dcomptypes.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/hidpddi.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/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/winddi.h
+include/wine/windows/ddk/winddiui.h
+include/wine/windows/ddk/winsplp.h
+include/wine/windows/ddk/wsk.h
 include/wine/windows/ddraw.h
 include/wine/windows/ddrawgdi.h
 include/wine/windows/ddrawi.h
@@ -419,6 +455,8 @@
 include/wine/windows/dwrite_2.idl
 include/wine/windows/dwrite_3.h
 include/wine/windows/dwrite_3.idl
+include/wine/windows/dxcore.h
+include/wine/windows/dxcore_interface.h
 include/wine/windows/dxdiag.h
 include/wine/windows/dxerr8.h
 include/wine/windows/dxerr9.h
@@ -499,6 +537,8 @@
 include/wine/windows/hlguids.h
 include/wine/windows/hlink.h
 include/wine/windows/hlink.idl
+include/wine/windows/hrtfapoapi.h
+include/wine/windows/hrtfapoapi.idl
 include/wine/windows/hstring.h
 include/wine/windows/hstring.idl
 include/wine/windows/htiface.h
@@ -531,6 +571,7 @@
 include/wine/windows/imagehlp.h
 include/wine/windows/ime.h
 include/wine/windows/imm.h
+include/wine/windows/immdev.h
 include/wine/windows/imnact.h
 include/wine/windows/imnact.idl
 include/wine/windows/imnxport.h
@@ -548,6 +589,7 @@
 include/wine/windows/inspectable.idl
 include/wine/windows/interactioncontext.h
 include/wine/windows/intshcut.h
+include/wine/windows/ioringapi.h
 include/wine/windows/ip2string.h
 include/wine/windows/ipexport.h
 include/wine/windows/iphlpapi.h
@@ -556,6 +598,9 @@
 include/wine/windows/iprtrmib.h
 include/wine/windows/iptypes.h
 include/wine/windows/isguids.h
+include/wine/windows/ivectorchangedeventargs.h
+include/wine/windows/ivectorchangedeventargs.idl
+include/wine/windows/kbd.h
 include/wine/windows/knownfolders.h
 include/wine/windows/ks.h
 include/wine/windows/ksguid.h
@@ -698,6 +743,7 @@
 include/wine/windows/netcfgx.idl
 include/wine/windows/netcon.h
 include/wine/windows/netcon.idl
+include/wine/windows/netevent.h
 include/wine/windows/netfw.h
 include/wine/windows/netfw.idl
 include/wine/windows/netioapi.h
@@ -719,6 +765,7 @@
 include/wine/windows/ntdef.h
 include/wine/windows/ntdsapi.h
 include/wine/windows/ntgdi.h
+include/wine/windows/ntioring_x.h
 include/wine/windows/ntlsa.h
 include/wine/windows/ntquery.h
 include/wine/windows/ntsecapi.h
@@ -797,6 +844,7 @@
 include/wine/windows/ras.h
 include/wine/windows/rasdlg.h
 include/wine/windows/raserror.h
+include/wine/windows/realtimeapiset.h
 include/wine/windows/reason.h
 include/wine/windows/regstr.h
 include/wine/windows/relogger.h
@@ -812,6 +860,7 @@
 include/wine/windows/rmxftmpl.x
 include/wine/windows/roapi.h
 include/wine/windows/roerrorapi.h
+include/wine/windows/rometadataresolution.h
 include/wine/windows/roparameterizediid.h
 include/wine/windows/roparameterizediid.idl
 include/wine/windows/row.idl
@@ -857,6 +906,7 @@
 include/wine/windows/sesprp.idl
 include/wine/windows/setupapi.h
 include/wine/windows/sfc.h
+include/wine/windows/shcore.h
 include/wine/windows/shdeprecated.h
 include/wine/windows/shdeprecated.idl
 include/wine/windows/shdispid.h
@@ -884,6 +934,7 @@
 include/wine/windows/spatialaudioclient.h
 include/wine/windows/spatialaudioclient.idl
 include/wine/windows/specstrings.h
+include/wine/windows/specstrings_strict.h
 include/wine/windows/sperror.h
 include/wine/windows/sql.h
 include/wine/windows/sqlext.h
@@ -903,6 +954,8 @@
 include/wine/windows/structuredquerycondition.idl
 include/wine/windows/svrapi.h
 include/wine/windows/synchapi.h
+include/wine/windows/systemmediatransportcontrolsinterop.h
+include/wine/windows/systemmediatransportcontrolsinterop.idl
 include/wine/windows/t2embapi.h
 include/wine/windows/tapi.h
 include/wine/windows/taskschd.h
@@ -947,6 +1000,8 @@
 include/wine/windows/uiautomationcoreapi.h
 include/wine/windows/uiribbon.h
 include/wine/windows/uiribbon.idl
+include/wine/windows/uiviewsettingsinterop.h
+include/wine/windows/uiviewsettingsinterop.idl
 include/wine/windows/unexposeenums2managed.h
 include/wine/windows/unknwn.h
 include/wine/windows/unknwn.idl
@@ -1011,12 +1066,24 @@
 include/wine/windows/windef.h
 include/wine/windows/windns.h
 include/wine/windows/windot11.h
+include/wine/windows/windows.applicationmodel.core.h
+include/wine/windows/windows.applicationmodel.core.idl
+include/wine/windows/windows.applicationmodel.h
+include/wine/windows/windows.applicationmodel.idl
+include/wine/windows/windows.devices.bluetooth.h
+include/wine/windows/windows.devices.bluetooth.idl
 include/wine/windows/windows.devices.enumeration.h
 include/wine/windows/windows.devices.enumeration.idl
+include/wine/windows/windows.devices.geolocation.h
+include/wine/windows/windows.devices.geolocation.idl
 include/wine/windows/windows.devices.haptics.h
 include/wine/windows/windows.devices.haptics.idl
 include/wine/windows/windows.devices.power.h
 include/wine/windows/windows.devices.power.idl
+include/wine/windows/windows.devices.radios.h
+include/wine/windows/windows.devices.radios.idl
+include/wine/windows/windows.devices.usb.h
+include/wine/windows/windows.devices.usb.idl
 include/wine/windows/windows.foundation.collections.h
 include/wine/windows/windows.foundation.collections.idl
 include/wine/windows/windows.foundation.h
@@ -1035,31 +1102,87 @@
 include/wine/windows/windows.gaming.ui.idl
 include/wine/windows/windows.globalization.h
 include/wine/windows/windows.globalization.idl
+include/wine/windows/windows.graphics.capture.h
+include/wine/windows/windows.graphics.capture.idl
+include/wine/windows/windows.graphics.capture.interop.h
+include/wine/windows/windows.graphics.capture.interop.idl
+include/wine/windows/windows.graphics.directx.direct3d11.h
+include/wine/windows/windows.graphics.directx.direct3d11.idl
+include/wine/windows/windows.graphics.directx.h
+include/wine/windows/windows.graphics.directx.idl
+include/wine/windows/windows.graphics.effects.h
+include/wine/windows/windows.graphics.effects.idl
+include/wine/windows/windows.graphics.holographic.h
+include/wine/windows/windows.graphics.holographic.idl
 include/wine/windows/windows.h
+include/wine/windows/windows.management.deployment.h
+include/wine/windows/windows.management.deployment.idl
+include/wine/windows/windows.media.capture.h
+include/wine/windows/windows.media.capture.idl
 include/wine/windows/windows.media.closedcaptioning.h
 include/wine/windows/windows.media.closedcaptioning.idl
 include/wine/windows/windows.media.devices.h
 include/wine/windows/windows.media.devices.idl
+include/wine/windows/windows.media.effects.h
+include/wine/windows/windows.media.effects.idl
 include/wine/windows/windows.media.h
 include/wine/windows/windows.media.idl
+include/wine/windows/windows.media.render.h
+include/wine/windows/windows.media.render.idl
 include/wine/windows/windows.media.speechrecognition.h
 include/wine/windows/windows.media.speechrecognition.idl
 include/wine/windows/windows.media.speechsynthesis.h
 include/wine/windows/windows.media.speechsynthesis.idl
+include/wine/windows/windows.networking.connectivity.h
+include/wine/windows/windows.networking.connectivity.idl
+include/wine/windows/windows.networking.h
+include/wine/windows/windows.networking.idl
+include/wine/windows/windows.perception.spatial.h
+include/wine/windows/windows.perception.spatial.idl
+include/wine/windows/windows.perception.spatial.surfaces.h
+include/wine/windows/windows.perception.spatial.surfaces.idl
+include/wine/windows/windows.security.credentials.h
+include/wine/windows/windows.security.credentials.idl
+include/wine/windows/windows.security.credentials.ui.h
+include/wine/windows/windows.security.credentials.ui.idl
 include/wine/windows/windows.security.cryptography.h
 include/wine/windows/windows.security.cryptography.idl
+include/wine/windows/windows.security.exchangeactivesyncprovisioning.h
+include/wine/windows/windows.security.exchangeactivesyncprovisioning.idl
+include/wine/windows/windows.security.isolation.h
+include/wine/windows/windows.security.isolation.idl
+include/wine/windows/windows.storage.fileproperties.h
+include/wine/windows/windows.storage.fileproperties.idl
+include/wine/windows/windows.storage.h
+include/wine/windows/windows.storage.idl
+include/wine/windows/windows.storage.search.h
+include/wine/windows/windows.storage.search.idl
 include/wine/windows/windows.storage.streams.h
 include/wine/windows/windows.storage.streams.idl
 include/wine/windows/windows.system.h
 include/wine/windows/windows.system.idl
 include/wine/windows/windows.system.power.h
 include/wine/windows/windows.system.power.idl
+include/wine/windows/windows.system.profile.h
+include/wine/windows/windows.system.profile.idl
+include/wine/windows/windows.system.profile.systemmanufacturers.h
+include/wine/windows/windows.system.profile.systemmanufacturers.idl
 include/wine/windows/windows.system.threading.h
 include/wine/windows/windows.system.threading.idl
 include/wine/windows/windows.system.userprofile.h
 include/wine/windows/windows.system.userprofile.idl
+include/wine/windows/windows.ui.composition.h
+include/wine/windows/windows.ui.composition.idl
+include/wine/windows/windows.ui.composition.interop.h
+include/wine/windows/windows.ui.composition.interop.idl
+include/wine/windows/windows.ui.core.h
+include/wine/windows/windows.ui.core.idl
 include/wine/windows/windows.ui.h
 include/wine/windows/windows.ui.idl
+include/wine/windows/windows.ui.viewmanagement.h
+include/wine/windows/windows.ui.viewmanagement.idl
+include/wine/windows/windows.ui.xaml.hosting.desktopwindowxamlsource.h
+include/wine/windows/windows.ui.xaml.hosting.desktopwindowxamlsource.idl
 include/wine/windows/windowscontracts.h
 include/wine/windows/windowscontracts.idl
 include/wine/windows/windowsx.h
@@ -1077,6 +1200,7 @@
 include/wine/windows/winnt.h
 include/wine/windows/winnt.rh
 include/wine/windows/winperf.h
+include/wine/windows/winppi.h
 include/wine/windows/winreg.h
 include/wine/windows/winresrc.h
 include/wine/windows/winsafer.h
@@ -1099,6 +1223,7 @@
 include/wine/windows/winuser.rh
 include/wine/windows/winver.h
 include/wine/windows/wlanapi.h
+include/wine/windows/wldp.h
 include/wine/windows/wmcodecdsp.h
 include/wine/windows/wmcodecdsp.idl
 include/wine/windows/wmdrmsdk.h
@@ -1155,6 +1280,8 @@
 include/wine/windows/xact2wb.h
 include/wine/windows/xact3.h
 include/wine/windows/xact3wb.h
+include/wine/windows/xamlom.h
+include/wine/windows/xamlom.idl
 include/wine/windows/xapo.h
 include/wine/windows/xapo.idl
 include/wine/windows/xapofx.h
@@ -1176,34 +1303,1012 @@
 include/wine/windows/xpsobjectmodel_1.h
 include/wine/windows/xpsobjectmodel_1.idl
 include/wine/windows/zmouse.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/hidpddi.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
-include/wine/windows/ddk/wsk.h
+lib/wine/i386-windows/acledit.dll
+lib/wine/i386-windows/aclui.dll
+lib/wine/i386-windows/activeds.dll
+lib/wine/i386-windows/activeds.tlb
+lib/wine/i386-windows/actxprxy.dll
+lib/wine/i386-windows/adsldp.dll
+lib/wine/i386-windows/adsldpc.dll
+lib/wine/i386-windows/advapi32.dll
+lib/wine/i386-windows/advpack.dll
+lib/wine/i386-windows/amsi.dll
+lib/wine/i386-windows/amstream.dll
+lib/wine/i386-windows/apisetschema.dll
+lib/wine/i386-windows/apphelp.dll
+lib/wine/i386-windows/appwiz.cpl
+lib/wine/i386-windows/appxdeploymentclient.dll
+lib/wine/i386-windows/arp.exe
+lib/wine/i386-windows/aspnet_regiis.exe
+lib/wine/i386-windows/atl.dll
+lib/wine/i386-windows/atl100.dll
+lib/wine/i386-windows/atl110.dll
+lib/wine/i386-windows/atl80.dll
+lib/wine/i386-windows/atl90.dll
+lib/wine/i386-windows/atlthunk.dll
+lib/wine/i386-windows/atmlib.dll
+lib/wine/i386-windows/attrib.exe
+lib/wine/i386-windows/authz.dll
+lib/wine/i386-windows/avicap32.dll
+lib/wine/i386-windows/avifil32.dll
+lib/wine/i386-windows/avifile.dll16
+lib/wine/i386-windows/avrt.dll
+lib/wine/i386-windows/bcrypt.dll
+lib/wine/i386-windows/bcryptprimitives.dll
+lib/wine/i386-windows/bluetoothapis.dll
+lib/wine/i386-windows/browseui.dll
+lib/wine/i386-windows/bthprops.cpl
+lib/wine/i386-windows/cabarc.exe
+lib/wine/i386-windows/cabinet.dll
+lib/wine/i386-windows/cacls.exe
+lib/wine/i386-windows/cards.dll
+lib/wine/i386-windows/cdosys.dll
+lib/wine/i386-windows/certutil.exe
+lib/wine/i386-windows/cfgmgr32.dll
+lib/wine/i386-windows/chcp.com
+lib/wine/i386-windows/clock.exe
+lib/wine/i386-windows/clusapi.dll
+lib/wine/i386-windows/cmd.exe
+lib/wine/i386-windows/cng.sys
+lib/wine/i386-windows/combase.dll
+lib/wine/i386-windows/comcat.dll
+lib/wine/i386-windows/comctl32.dll
+lib/wine/i386-windows/comdlg32.dll
+lib/wine/i386-windows/coml2.dll
+lib/wine/i386-windows/comm.drv16
+lib/wine/i386-windows/commdlg.dll16
+lib/wine/i386-windows/compobj.dll16
+lib/wine/i386-windows/compstui.dll
+lib/wine/i386-windows/comsvcs.dll
+lib/wine/i386-windows/concrt140.dll
+lib/wine/i386-windows/conhost.exe
+lib/wine/i386-windows/connect.dll
+lib/wine/i386-windows/control.exe
+lib/wine/i386-windows/credui.dll
+lib/wine/i386-windows/crtdll.dll
+lib/wine/i386-windows/crypt32.dll
+lib/wine/i386-windows/cryptdlg.dll
+lib/wine/i386-windows/cryptdll.dll
+lib/wine/i386-windows/cryptext.dll
+lib/wine/i386-windows/cryptnet.dll
+lib/wine/i386-windows/cryptowinrt.dll
+lib/wine/i386-windows/cryptsp.dll
+lib/wine/i386-windows/cryptui.dll
+lib/wine/i386-windows/cscript.exe
+lib/wine/i386-windows/ctapi32.dll
+lib/wine/i386-windows/ctl3d.dll16
+lib/wine/i386-windows/ctl3d32.dll
+lib/wine/i386-windows/ctl3dv2.dll16
+lib/wine/i386-windows/d2d1.dll
+lib/wine/i386-windows/d3d10.dll
+lib/wine/i386-windows/d3d10_1.dll
+lib/wine/i386-windows/d3d10core.dll
+lib/wine/i386-windows/d3d11.dll
+lib/wine/i386-windows/d3d12.dll
+lib/wine/i386-windows/d3d12core.dll
+lib/wine/i386-windows/d3d8.dll
+lib/wine/i386-windows/d3d8thk.dll
+lib/wine/i386-windows/d3d9.dll
+lib/wine/i386-windows/d3dcompiler_33.dll
+lib/wine/i386-windows/d3dcompiler_34.dll
+lib/wine/i386-windows/d3dcompiler_35.dll
+lib/wine/i386-windows/d3dcompiler_36.dll
+lib/wine/i386-windows/d3dcompiler_37.dll
+lib/wine/i386-windows/d3dcompiler_38.dll
+lib/wine/i386-windows/d3dcompiler_39.dll
+lib/wine/i386-windows/d3dcompiler_40.dll
+lib/wine/i386-windows/d3dcompiler_41.dll
+lib/wine/i386-windows/d3dcompiler_42.dll
+lib/wine/i386-windows/d3dcompiler_43.dll
+lib/wine/i386-windows/d3dcompiler_46.dll
+lib/wine/i386-windows/d3dcompiler_47.dll
+lib/wine/i386-windows/d3dim.dll
+lib/wine/i386-windows/d3dim700.dll
+lib/wine/i386-windows/d3drm.dll
+lib/wine/i386-windows/d3dx10_33.dll
+lib/wine/i386-windows/d3dx10_34.dll
+lib/wine/i386-windows/d3dx10_35.dll
+lib/wine/i386-windows/d3dx10_36.dll
+lib/wine/i386-windows/d3dx10_37.dll
+lib/wine/i386-windows/d3dx10_38.dll
+lib/wine/i386-windows/d3dx10_39.dll
+lib/wine/i386-windows/d3dx10_40.dll
+lib/wine/i386-windows/d3dx10_41.dll
+lib/wine/i386-windows/d3dx10_42.dll
+lib/wine/i386-windows/d3dx10_43.dll
+lib/wine/i386-windows/d3dx11_42.dll
+lib/wine/i386-windows/d3dx11_43.dll
+lib/wine/i386-windows/d3dx9_24.dll
+lib/wine/i386-windows/d3dx9_25.dll
+lib/wine/i386-windows/d3dx9_26.dll
+lib/wine/i386-windows/d3dx9_27.dll
+lib/wine/i386-windows/d3dx9_28.dll
+lib/wine/i386-windows/d3dx9_29.dll
+lib/wine/i386-windows/d3dx9_30.dll
+lib/wine/i386-windows/d3dx9_31.dll
+lib/wine/i386-windows/d3dx9_32.dll
+lib/wine/i386-windows/d3dx9_33.dll
+lib/wine/i386-windows/d3dx9_34.dll
+lib/wine/i386-windows/d3dx9_35.dll
+lib/wine/i386-windows/d3dx9_36.dll
+lib/wine/i386-windows/d3dx9_37.dll
+lib/wine/i386-windows/d3dx9_38.dll
+lib/wine/i386-windows/d3dx9_39.dll
+lib/wine/i386-windows/d3dx9_40.dll
+lib/wine/i386-windows/d3dx9_41.dll
+lib/wine/i386-windows/d3dx9_42.dll
+lib/wine/i386-windows/d3dx9_43.dll
+lib/wine/i386-windows/d3dxof.dll
+lib/wine/i386-windows/davclnt.dll
+lib/wine/i386-windows/dbgeng.dll
+lib/wine/i386-windows/dbghelp.dll
+lib/wine/i386-windows/dciman32.dll
+lib/wine/i386-windows/dcomp.dll
+lib/wine/i386-windows/ddeml.dll16
+lib/wine/i386-windows/ddraw.dll
+lib/wine/i386-windows/ddrawex.dll
+lib/wine/i386-windows/devenum.dll
+lib/wine/i386-windows/dhcpcsvc.dll
+lib/wine/i386-windows/dhcpcsvc6.dll
+lib/wine/i386-windows/dhtmled.ocx
+lib/wine/i386-windows/diasymreader.dll
+lib/wine/i386-windows/difxapi.dll
+lib/wine/i386-windows/dinput.dll
+lib/wine/i386-windows/dinput8.dll
+lib/wine/i386-windows/directmanipulation.dll
+lib/wine/i386-windows/dism.exe
+lib/wine/i386-windows/dispdib.dll16
+lib/wine/i386-windows/dispex.dll
+lib/wine/i386-windows/display.drv16
+lib/wine/i386-windows/dllhost.exe
+lib/wine/i386-windows/dmband.dll
+lib/wine/i386-windows/dmcompos.dll
+lib/wine/i386-windows/dmime.dll
+lib/wine/i386-windows/dmloader.dll
+lib/wine/i386-windows/dmscript.dll
+lib/wine/i386-windows/dmstyle.dll
+lib/wine/i386-windows/dmsynth.dll
+lib/wine/i386-windows/dmusic.dll
+lib/wine/i386-windows/dmusic32.dll
+lib/wine/i386-windows/dnsapi.dll
+lib/wine/i386-windows/dplay.dll
+lib/wine/i386-windows/dplaysvr.exe
+lib/wine/i386-windows/dplayx.dll
+lib/wine/i386-windows/dpnaddr.dll
+lib/wine/i386-windows/dpnet.dll
+lib/wine/i386-windows/dpnhpast.dll
+lib/wine/i386-windows/dpnhupnp.dll
+lib/wine/i386-windows/dpnlobby.dll
+lib/wine/i386-windows/dpnsvr.exe
+lib/wine/i386-windows/dpvoice.dll
+lib/wine/i386-windows/dpvsetup.exe
+lib/wine/i386-windows/dpwsockx.dll
+lib/wine/i386-windows/drmclien.dll
+lib/wine/i386-windows/dsdmo.dll
+lib/wine/i386-windows/dsound.dll
+lib/wine/i386-windows/dsquery.dll
+lib/wine/i386-windows/dssenh.dll
+lib/wine/i386-windows/dsuiext.dll
+lib/wine/i386-windows/dswave.dll
+lib/wine/i386-windows/dwmapi.dll
+lib/wine/i386-windows/dwrite.dll
+lib/wine/i386-windows/dx8vb.dll
+lib/wine/i386-windows/dxcore.dll
+lib/wine/i386-windows/dxdiag.exe
+lib/wine/i386-windows/dxdiagn.dll
+lib/wine/i386-windows/dxgi.dll
+lib/wine/i386-windows/dxtrans.dll
+lib/wine/i386-windows/dxva2.dll
+lib/wine/i386-windows/eject.exe
+lib/wine/i386-windows/esent.dll
+lib/wine/i386-windows/evr.dll
+lib/wine/i386-windows/expand.exe
+lib/wine/i386-windows/explorer.exe
+lib/wine/i386-windows/explorerframe.dll
+lib/wine/i386-windows/extrac32.exe
+lib/wine/i386-windows/faultrep.dll
+lib/wine/i386-windows/fc.exe
+lib/wine/i386-windows/feclient.dll
+lib/wine/i386-windows/find.exe
+lib/wine/i386-windows/findstr.exe
+lib/wine/i386-windows/fltlib.dll
+lib/wine/i386-windows/fltmgr.sys
+lib/wine/i386-windows/fntcache.dll
+lib/wine/i386-windows/fontsub.dll
+lib/wine/i386-windows/fsutil.exe
+lib/wine/i386-windows/fusion.dll
+lib/wine/i386-windows/fwpuclnt.dll
+lib/wine/i386-windows/gameux.dll
+lib/wine/i386-windows/gamingtcui.dll
+lib/wine/i386-windows/gdi.exe16
+lib/wine/i386-windows/gdi32.dll
+lib/wine/i386-windows/gdiplus.dll
+lib/wine/i386-windows/geolocation.dll
+lib/wine/i386-windows/glu32.dll
+lib/wine/i386-windows/gpkcsp.dll
+lib/wine/i386-windows/graphicscapture.dll
+lib/wine/i386-windows/hal.dll
+lib/wine/i386-windows/hh.exe
+lib/wine/i386-windows/hhctrl.ocx
+lib/wine/i386-windows/hid.dll
+lib/wine/i386-windows/hidclass.sys
+lib/wine/i386-windows/hidparse.sys
+lib/wine/i386-windows/hlink.dll
+lib/wine/i386-windows/hnetcfg.dll
+lib/wine/i386-windows/hostname.exe
+lib/wine/i386-windows/hrtfapo.dll
+lib/wine/i386-windows/http.sys
+lib/wine/i386-windows/httpapi.dll
+lib/wine/i386-windows/hvsimanagementapi.dll
+lib/wine/i386-windows/ia2comproxy.dll
+lib/wine/i386-windows/icacls.exe
+lib/wine/i386-windows/iccvid.dll
+lib/wine/i386-windows/icinfo.exe
+lib/wine/i386-windows/icmp.dll
+lib/wine/i386-windows/ieframe.dll
+lib/wine/i386-windows/ieproxy.dll
+lib/wine/i386-windows/iexplore.exe
+lib/wine/i386-windows/ifsmgr.vxd
+lib/wine/i386-windows/imaadp32.acm
+lib/wine/i386-windows/imagehlp.dll
+lib/wine/i386-windows/imm.dll16
+lib/wine/i386-windows/imm32.dll
+lib/wine/i386-windows/inetcomm.dll
+lib/wine/i386-windows/inetcpl.cpl
+lib/wine/i386-windows/inetmib1.dll
+lib/wine/i386-windows/infosoft.dll
+lib/wine/i386-windows/initpki.dll
+lib/wine/i386-windows/inkobj.dll
+lib/wine/i386-windows/inseng.dll
+lib/wine/i386-windows/ipconfig.exe
+lib/wine/i386-windows/iphlpapi.dll
+lib/wine/i386-windows/iprop.dll
+lib/wine/i386-windows/ir50_32.dll
+lib/wine/i386-windows/irprops.cpl
+lib/wine/i386-windows/itircl.dll
+lib/wine/i386-windows/itss.dll
+lib/wine/i386-windows/joy.cpl
+lib/wine/i386-windows/jscript.dll
+lib/wine/i386-windows/jsproxy.dll
+lib/wine/i386-windows/kernel32.dll
+lib/wine/i386-windows/kernelbase.dll
+lib/wine/i386-windows/keyboard.drv16
+lib/wine/i386-windows/klist.exe
+lib/wine/i386-windows/krnl386.exe16
+lib/wine/i386-windows/ksecdd.sys
+lib/wine/i386-windows/ksproxy.ax
+lib/wine/i386-windows/ksuser.dll
+lib/wine/i386-windows/ktmw32.dll
+lib/wine/i386-windows/l3codeca.acm
+lib/wine/i386-windows/libaclui.a
+lib/wine/i386-windows/libactiveds.a
+lib/wine/i386-windows/libadsiid.a
+lib/wine/i386-windows/libadvapi32.a
+lib/wine/i386-windows/libadvpack.a
+lib/wine/i386-windows/libatl.a
+lib/wine/i386-windows/libatl100.a
+lib/wine/i386-windows/libatl110.a
+lib/wine/i386-windows/libatl80.a
+lib/wine/i386-windows/libatlthunk.a
+lib/wine/i386-windows/libavicap32.a
+lib/wine/i386-windows/libavifil32.a
+lib/wine/i386-windows/libavrt.a
+lib/wine/i386-windows/libbcrypt.a
+lib/wine/i386-windows/libbluetoothapis.a
+lib/wine/i386-windows/libcabinet.a
+lib/wine/i386-windows/libcards.a
+lib/wine/i386-windows/libcfgmgr32.a
+lib/wine/i386-windows/libclusapi.a
+lib/wine/i386-windows/libcombase.a
+lib/wine/i386-windows/libcomctl32.a
+lib/wine/i386-windows/libcomdlg32.a
+lib/wine/i386-windows/libcoml2.a
+lib/wine/i386-windows/libcompstui.a
+lib/wine/i386-windows/libcomsvcs.a
+lib/wine/i386-windows/libcredui.a
+lib/wine/i386-windows/libcrypt32.a
+lib/wine/i386-windows/libcryptdll.a
+lib/wine/i386-windows/libcryptnet.a
+lib/wine/i386-windows/libcryptui.a
+lib/wine/i386-windows/libd2d1.a
+lib/wine/i386-windows/libd3d10.a
+lib/wine/i386-windows/libd3d10_1.a
+lib/wine/i386-windows/libd3d10core.a
+lib/wine/i386-windows/libd3d11.a
+lib/wine/i386-windows/libd3d12.a
+lib/wine/i386-windows/libd3d8.a
+lib/wine/i386-windows/libd3d9.a
+lib/wine/i386-windows/libd3dcompiler.a
+lib/wine/i386-windows/libd3dcompiler_43.a
+lib/wine/i386-windows/libd3dcompiler_46.a
+lib/wine/i386-windows/libd3drm.a
+lib/wine/i386-windows/libd3dx10.a
+lib/wine/i386-windows/libd3dx10_34.a
+lib/wine/i386-windows/libd3dx10_35.a
+lib/wine/i386-windows/libd3dx10_36.a
+lib/wine/i386-windows/libd3dx10_37.a
+lib/wine/i386-windows/libd3dx10_38.a
+lib/wine/i386-windows/libd3dx10_39.a
+lib/wine/i386-windows/libd3dx10_40.a
+lib/wine/i386-windows/libd3dx10_41.a
+lib/wine/i386-windows/libd3dx10_42.a
+lib/wine/i386-windows/libd3dx11.a
+lib/wine/i386-windows/libd3dx11_42.a
+lib/wine/i386-windows/libd3dx9.a
+lib/wine/i386-windows/libd3dxof.a
+lib/wine/i386-windows/libdbgeng.a
+lib/wine/i386-windows/libdbghelp.a
+lib/wine/i386-windows/libdciman32.a
+lib/wine/i386-windows/libddraw.a
+lib/wine/i386-windows/libdhcpcsvc.a
+lib/wine/i386-windows/libdinput.a
+lib/wine/i386-windows/libdinput8.a
+lib/wine/i386-windows/libdmoguids.a
+lib/wine/i386-windows/libdnsapi.a
+lib/wine/i386-windows/libdplayx.a
+lib/wine/i386-windows/libdpnet.a
+lib/wine/i386-windows/libdsound.a
+lib/wine/i386-windows/libdwmapi.a
+lib/wine/i386-windows/libdwrite.a
+lib/wine/i386-windows/libdxerr8.a
+lib/wine/i386-windows/libdxerr9.a
+lib/wine/i386-windows/libdxgi.a
+lib/wine/i386-windows/libdxguid.a
+lib/wine/i386-windows/libdxva2.a
+lib/wine/i386-windows/libevr.a
+lib/wine/i386-windows/libfaultrep.a
+lib/wine/i386-windows/libgdi32.a
+lib/wine/i386-windows/libgdiplus.a
+lib/wine/i386-windows/libglu32.a
+lib/wine/i386-windows/libhal.a
+lib/wine/i386-windows/libhid.a
+lib/wine/i386-windows/libhidclass.a
+lib/wine/i386-windows/libhidparse.a
+lib/wine/i386-windows/libhlink.a
+lib/wine/i386-windows/libhtmlhelp.a
+lib/wine/i386-windows/libhttpapi.a
+lib/wine/i386-windows/libieframe.a
+lib/wine/i386-windows/libimagehlp.a
+lib/wine/i386-windows/libimm32.a
+lib/wine/i386-windows/libinetcomm.a
+lib/wine/i386-windows/libiphlpapi.a
+lib/wine/i386-windows/libjsproxy.a
+lib/wine/i386-windows/libkernel.a
+lib/wine/i386-windows/libkernel32.a
+lib/wine/i386-windows/libkernelbase.a
+lib/wine/i386-windows/libloadperf.a
+lib/wine/i386-windows/liblz32.a
+lib/wine/i386-windows/libmapi32.a
+lib/wine/i386-windows/libmf.a
+lib/wine/i386-windows/libmfplat.a
+lib/wine/i386-windows/libmfplay.a
+lib/wine/i386-windows/libmfreadwrite.a
+lib/wine/i386-windows/libmfsrcsnk.a
+lib/wine/i386-windows/libmfuuid.a
+lib/wine/i386-windows/libmlang.a
+lib/wine/i386-windows/libmpr.a
+lib/wine/i386-windows/libmprapi.a
+lib/wine/i386-windows/libmsacm32.a
+lib/wine/i386-windows/libmsasn1.a
+lib/wine/i386-windows/libmscms.a
+lib/wine/i386-windows/libmsdmo.a
+lib/wine/i386-windows/libmshtml.a
+lib/wine/i386-windows/libmsi.a
+lib/wine/i386-windows/libmsimg32.a
+lib/wine/i386-windows/libmspatcha.a
+lib/wine/i386-windows/libmsvcp140.a
+lib/wine/i386-windows/libmsvcr100.a
+lib/wine/i386-windows/libmsvcr110.a
+lib/wine/i386-windows/libmsvcr120.a
+lib/wine/i386-windows/libmsvcr70.a
+lib/wine/i386-windows/libmsvcr71.a
+lib/wine/i386-windows/libmsvcr80.a
+lib/wine/i386-windows/libmsvcr90.a
+lib/wine/i386-windows/libmsvcrt.a
+lib/wine/i386-windows/libmsvcrtd.a
+lib/wine/i386-windows/libmsvfw32.a
+lib/wine/i386-windows/libmswsock.a
+lib/wine/i386-windows/libncrypt.a
+lib/wine/i386-windows/libnddeapi.a
+lib/wine/i386-windows/libnetapi32.a
+lib/wine/i386-windows/libnetio.a
+lib/wine/i386-windows/libnewdev.a
+lib/wine/i386-windows/libninput.a
+lib/wine/i386-windows/libnormaliz.a
+lib/wine/i386-windows/libnsi.a
+lib/wine/i386-windows/libntdll.a
+lib/wine/i386-windows/libntdsapi.a
+lib/wine/i386-windows/libntoskrnl.a
+lib/wine/i386-windows/libodbc32.a
+lib/wine/i386-windows/libodbccp32.a
+lib/wine/i386-windows/libole32.a
+lib/wine/i386-windows/liboleacc.a
+lib/wine/i386-windows/liboleaut32.a
+lib/wine/i386-windows/libolecli32.a
+lib/wine/i386-windows/liboledlg.a
+lib/wine/i386-windows/libolepro32.a
+lib/wine/i386-windows/libolesvr32.a
+lib/wine/i386-windows/libopengl32.a
+lib/wine/i386-windows/libpdh.a
+lib/wine/i386-windows/libpowrprof.a
+lib/wine/i386-windows/libprntvpt.a
+lib/wine/i386-windows/libpropsys.a
+lib/wine/i386-windows/libpsapi.a
+lib/wine/i386-windows/libquartz.a
+lib/wine/i386-windows/libqwave.a
+lib/wine/i386-windows/librasapi32.a
+lib/wine/i386-windows/librasdlg.a
+lib/wine/i386-windows/libresutils.a
+lib/wine/i386-windows/libriched20.a
+lib/wine/i386-windows/librpcrt4.a
+lib/wine/i386-windows/librsaenh.a
+lib/wine/i386-windows/librtutils.a
+lib/wine/i386-windows/librtworkq.a
+lib/wine/i386-windows/libscrrun.a
+lib/wine/i386-windows/libsechost.a
+lib/wine/i386-windows/libsecur32.a
+lib/wine/i386-windows/libsensapi.a
+lib/wine/i386-windows/libsetupapi.a
+lib/wine/i386-windows/libsfc.a
+lib/wine/i386-windows/libsfc_os.a
+lib/wine/i386-windows/libshcore.a
+lib/wine/i386-windows/libshdocvw.a
+lib/wine/i386-windows/libshell32.a
+lib/wine/i386-windows/libshfolder.a
+lib/wine/i386-windows/libshlwapi.a
+lib/wine/i386-windows/libslc.a
+lib/wine/i386-windows/libsnmpapi.a
+lib/wine/i386-windows/libspoolss.a
+lib/wine/i386-windows/libsti.a
+lib/wine/i386-windows/libstrmbase.a
+lib/wine/i386-windows/libstrmiids.a
+lib/wine/i386-windows/libsxs.a
+lib/wine/i386-windows/libt2embed.a
+lib/wine/i386-windows/libtapi32.a
+lib/wine/i386-windows/libucrtbase.a
+lib/wine/i386-windows/libuiautomationcore.a
+lib/wine/i386-windows/libunicows.a
+lib/wine/i386-windows/liburl.a
+lib/wine/i386-windows/liburlmon.a
+lib/wine/i386-windows/libusbd.a
+lib/wine/i386-windows/libuser32.a
+lib/wine/i386-windows/libuserenv.a
+lib/wine/i386-windows/libusp10.a
+lib/wine/i386-windows/libuuid.a
+lib/wine/i386-windows/libuxtheme.a
+lib/wine/i386-windows/libvcruntime140.a
+lib/wine/i386-windows/libvdmdbg.a
+lib/wine/i386-windows/libversion.a
+lib/wine/i386-windows/libvulkan-1.a
+lib/wine/i386-windows/libwbemuuid.a
+lib/wine/i386-windows/libwebservices.a
+lib/wine/i386-windows/libwer.a
+lib/wine/i386-windows/libwevtapi.a
+lib/wine/i386-windows/libwin32u.a
+lib/wine/i386-windows/libwindowscodecs.a
+lib/wine/i386-windows/libwindowscodecsext.a
+lib/wine/i386-windows/libwinecrt0.a
+lib/wine/i386-windows/libwined3d.a
+lib/wine/i386-windows/libwinevulkan.a
+lib/wine/i386-windows/libwinhttp.a
+lib/wine/i386-windows/libwininet.a
+lib/wine/i386-windows/libwinmm.a
+lib/wine/i386-windows/libwinnls32.a
+lib/wine/i386-windows/libwinspool.a
+lib/wine/i386-windows/libwintab32.a
+lib/wine/i386-windows/libwintrust.a
+lib/wine/i386-windows/libwlanapi.a
+lib/wine/i386-windows/libwldap32.a
+lib/wine/i386-windows/libwmcodecdspuuid.a
+lib/wine/i386-windows/libwmvcore.a
+lib/wine/i386-windows/libwnaspi32.a
+lib/wine/i386-windows/libwow32.a
+lib/wine/i386-windows/libws2_32.a
+lib/wine/i386-windows/libwsdapi.a
+lib/wine/i386-windows/libwsnmp32.a
+lib/wine/i386-windows/libwsock32.a
+lib/wine/i386-windows/libwtsapi32.a
+lib/wine/i386-windows/libxaudio2_8.a
+lib/wine/i386-windows/libxinput.a
+lib/wine/i386-windows/libxmllite.a
+lib/wine/i386-windows/light.msstyles
+lib/wine/i386-windows/loadperf.dll
+lib/wine/i386-windows/localspl.dll
+lib/wine/i386-windows/localui.dll
+lib/wine/i386-windows/lodctr.exe
+lib/wine/i386-windows/lz32.dll
+lib/wine/i386-windows/lzexpand.dll16
+lib/wine/i386-windows/magnification.dll
+lib/wine/i386-windows/mapi32.dll
+lib/wine/i386-windows/mapistub.dll
+lib/wine/i386-windows/mciavi32.dll
+lib/wine/i386-windows/mcicda.dll
+lib/wine/i386-windows/mciqtz32.dll
+lib/wine/i386-windows/mciseq.dll
+lib/wine/i386-windows/mciwave.dll
+lib/wine/i386-windows/mf.dll
+lib/wine/i386-windows/mf3216.dll
+lib/wine/i386-windows/mferror.dll
+lib/wine/i386-windows/mfmediaengine.dll
+lib/wine/i386-windows/mfplat.dll
+lib/wine/i386-windows/mfplay.dll
+lib/wine/i386-windows/mfreadwrite.dll
+lib/wine/i386-windows/mfsrcsnk.dll
+lib/wine/i386-windows/mgmtapi.dll
+lib/wine/i386-windows/midimap.dll
+lib/wine/i386-windows/mlang.dll
+lib/wine/i386-windows/mmcndmgr.dll
+lib/wine/i386-windows/mmdevapi.dll
+lib/wine/i386-windows/mmdevldr.vxd
+lib/wine/i386-windows/mmsystem.dll16
+lib/wine/i386-windows/mofcomp.exe
+lib/wine/i386-windows/monodebg.vxd
+lib/wine/i386-windows/mountmgr.sys
+lib/wine/i386-windows/mouse.drv16
+lib/wine/i386-windows/mp3dmod.dll
+lib/wine/i386-windows/mpr.dll
+lib/wine/i386-windows/mprapi.dll
+lib/wine/i386-windows/msacm.dll16
+lib/wine/i386-windows/msacm32.dll
+lib/wine/i386-windows/msacm32.drv
+lib/wine/i386-windows/msado15.dll
+lib/wine/i386-windows/msadp32.acm
+lib/wine/i386-windows/msasn1.dll
+lib/wine/i386-windows/msauddecmft.dll
+lib/wine/i386-windows/mscat32.dll
+lib/wine/i386-windows/mscms.dll
+lib/wine/i386-windows/mscoree.dll
+lib/wine/i386-windows/mscorwks.dll
+lib/wine/i386-windows/msctf.dll
+lib/wine/i386-windows/msctfmonitor.dll
+lib/wine/i386-windows/msctfp.dll
+lib/wine/i386-windows/msdaps.dll
+lib/wine/i386-windows/msdasql.dll
+lib/wine/i386-windows/msdelta.dll
+lib/wine/i386-windows/msdmo.dll
+lib/wine/i386-windows/msdrm.dll
+lib/wine/i386-windows/msftedit.dll
+lib/wine/i386-windows/msg711.acm
+lib/wine/i386-windows/msgsm32.acm
+lib/wine/i386-windows/mshta.exe
+lib/wine/i386-windows/mshtml.dll
+lib/wine/i386-windows/mshtml.tlb
+lib/wine/i386-windows/msi.dll
+lib/wine/i386-windows/msidb.exe
+lib/wine/i386-windows/msident.dll
+lib/wine/i386-windows/msiexec.exe
+lib/wine/i386-windows/msimg32.dll
+lib/wine/i386-windows/msimsg.dll
+lib/wine/i386-windows/msimtf.dll
+lib/wine/i386-windows/msinfo32.exe
+lib/wine/i386-windows/msisip.dll
+lib/wine/i386-windows/msisys.ocx
+lib/wine/i386-windows/msls31.dll
+lib/wine/i386-windows/msmpeg2vdec.dll
+lib/wine/i386-windows/msnet32.dll
+lib/wine/i386-windows/mspatcha.dll
+lib/wine/i386-windows/msports.dll
+lib/wine/i386-windows/msrle32.dll
+lib/wine/i386-windows/msscript.ocx
+lib/wine/i386-windows/mssign32.dll
+lib/wine/i386-windows/mssip32.dll
+lib/wine/i386-windows/mstask.dll
+lib/wine/i386-windows/msttsengine.dll
+lib/wine/i386-windows/msv1_0.dll
+lib/wine/i386-windows/msvcirt.dll
+lib/wine/i386-windows/msvcm80.dll
+lib/wine/i386-windows/msvcm90.dll
+lib/wine/i386-windows/msvcp100.dll
+lib/wine/i386-windows/msvcp110.dll
+lib/wine/i386-windows/msvcp120.dll
+lib/wine/i386-windows/msvcp120_app.dll
+lib/wine/i386-windows/msvcp140.dll
+lib/wine/i386-windows/msvcp140_1.dll
+lib/wine/i386-windows/msvcp140_2.dll
+lib/wine/i386-windows/msvcp140_atomic_wait.dll
+lib/wine/i386-windows/msvcp140_codecvt_ids.dll
+lib/wine/i386-windows/msvcp60.dll
+lib/wine/i386-windows/msvcp70.dll
+lib/wine/i386-windows/msvcp71.dll
+lib/wine/i386-windows/msvcp80.dll
+lib/wine/i386-windows/msvcp90.dll
+lib/wine/i386-windows/msvcp_win.dll
+lib/wine/i386-windows/msvcr100.dll
+lib/wine/i386-windows/msvcr110.dll
+lib/wine/i386-windows/msvcr120.dll
+lib/wine/i386-windows/msvcr120_app.dll
+lib/wine/i386-windows/msvcr70.dll
+lib/wine/i386-windows/msvcr71.dll
+lib/wine/i386-windows/msvcr80.dll
+lib/wine/i386-windows/msvcr90.dll
+lib/wine/i386-windows/msvcrt.dll
+lib/wine/i386-windows/msvcrt20.dll
+lib/wine/i386-windows/msvcrt40.dll
+lib/wine/i386-windows/msvcrtd.dll
+lib/wine/i386-windows/msvfw32.dll
+lib/wine/i386-windows/msvidc32.dll
+lib/wine/i386-windows/msvideo.dll16
+lib/wine/i386-windows/mswsock.dll
+lib/wine/i386-windows/msxml.dll
+lib/wine/i386-windows/msxml2.dll
+lib/wine/i386-windows/msxml3.dll
+lib/wine/i386-windows/msxml4.dll
+lib/wine/i386-windows/msxml6.dll
+lib/wine/i386-windows/mtxdm.dll
+lib/wine/i386-windows/ncrypt.dll
+lib/wine/i386-windows/nddeapi.dll
+lib/wine/i386-windows/ndis.sys
+lib/wine/i386-windows/net.exe
+lib/wine/i386-windows/netapi32.dll
+lib/wine/i386-windows/netcfgx.dll
+lib/wine/i386-windows/netio.sys
+lib/wine/i386-windows/netprofm.dll
+lib/wine/i386-windows/netsh.exe
+lib/wine/i386-windows/netstat.exe
+lib/wine/i386-windows/netutils.dll
+lib/wine/i386-windows/newdev.dll
+lib/wine/i386-windows/ngen.exe
+lib/wine/i386-windows/ninput.dll
+lib/wine/i386-windows/normaliz.dll
+lib/wine/i386-windows/notepad.exe
+lib/wine/i386-windows/npmshtml.dll
+lib/wine/i386-windows/npptools.dll
+lib/wine/i386-windows/nsi.dll
+lib/wine/i386-windows/nsiproxy.sys
+lib/wine/i386-windows/ntdll.dll
+lib/wine/i386-windows/ntdsapi.dll
+lib/wine/i386-windows/ntoskrnl.exe
+lib/wine/i386-windows/ntprint.dll
+lib/wine/i386-windows/objsel.dll
+lib/wine/i386-windows/odbc32.dll
+lib/wine/i386-windows/odbcbcp.dll
+lib/wine/i386-windows/odbccp32.dll
+lib/wine/i386-windows/odbccu32.dll
+lib/wine/i386-windows/ole2.dll16
+lib/wine/i386-windows/ole2conv.dll16
+lib/wine/i386-windows/ole2disp.dll16
+lib/wine/i386-windows/ole2nls.dll16
+lib/wine/i386-windows/ole2prox.dll16
+lib/wine/i386-windows/ole2thk.dll16
+lib/wine/i386-windows/ole32.dll
+lib/wine/i386-windows/oleacc.dll
+lib/wine/i386-windows/oleaut32.dll
+lib/wine/i386-windows/olecli.dll16
+lib/wine/i386-windows/olecli32.dll
+lib/wine/i386-windows/oledb32.dll
+lib/wine/i386-windows/oledlg.dll
+lib/wine/i386-windows/olepro32.dll
+lib/wine/i386-windows/olesvr.dll16
+lib/wine/i386-windows/olesvr32.dll
+lib/wine/i386-windows/olethk32.dll
+lib/wine/i386-windows/oleview.exe
+lib/wine/i386-windows/opcservices.dll
+lib/wine/i386-windows/opengl32.dll
+lib/wine/i386-windows/packager.dll
+lib/wine/i386-windows/pdh.dll
+lib/wine/i386-windows/photometadatahandler.dll
+lib/wine/i386-windows/pidgen.dll
+lib/wine/i386-windows/ping.exe
+lib/wine/i386-windows/plugplay.exe
+lib/wine/i386-windows/pnputil.exe
+lib/wine/i386-windows/powershell.exe
+lib/wine/i386-windows/powrprof.dll
+lib/wine/i386-windows/presentationfontcache.exe
+lib/wine/i386-windows/printui.dll
+lib/wine/i386-windows/prntvpt.dll
+lib/wine/i386-windows/progman.exe
+lib/wine/i386-windows/propsys.dll
+lib/wine/i386-windows/psapi.dll
+lib/wine/i386-windows/pstorec.dll
+lib/wine/i386-windows/pwrshplugin.dll
+lib/wine/i386-windows/qasf.dll
+lib/wine/i386-windows/qcap.dll
+lib/wine/i386-windows/qdvd.dll
+lib/wine/i386-windows/qedit.dll
+lib/wine/i386-windows/qmgr.dll
+lib/wine/i386-windows/qmgrprxy.dll
+lib/wine/i386-windows/quartz.dll
+lib/wine/i386-windows/query.dll
+lib/wine/i386-windows/qwave.dll
+lib/wine/i386-windows/rasapi16.dll16
+lib/wine/i386-windows/rasapi32.dll
+lib/wine/i386-windows/rasdlg.dll
+lib/wine/i386-windows/reg.exe
+lib/wine/i386-windows/regapi.dll
+lib/wine/i386-windows/regasm.exe
+lib/wine/i386-windows/regedit.exe
+lib/wine/i386-windows/regini.exe
+lib/wine/i386-windows/regsvcs.exe
+lib/wine/i386-windows/regsvr32.exe
+lib/wine/i386-windows/resutils.dll
+lib/wine/i386-windows/riched20.dll
+lib/wine/i386-windows/riched32.dll
+lib/wine/i386-windows/robocopy.exe
+lib/wine/i386-windows/rpcrt4.dll
+lib/wine/i386-windows/rpcss.exe
+lib/wine/i386-windows/rsabase.dll
+lib/wine/i386-windows/rsaenh.dll
+lib/wine/i386-windows/rstrtmgr.dll
+lib/wine/i386-windows/rtutils.dll
+lib/wine/i386-windows/rtworkq.dll
+lib/wine/i386-windows/rundll.exe16
+lib/wine/i386-windows/rundll32.exe
+lib/wine/i386-windows/samlib.dll
+lib/wine/i386-windows/sapi.dll
+lib/wine/i386-windows/sas.dll
+lib/wine/i386-windows/sc.exe
+lib/wine/i386-windows/scarddlg.dll
+lib/wine/i386-windows/scardsvr.dll
+lib/wine/i386-windows/sccbase.dll
+lib/wine/i386-windows/schannel.dll
+lib/wine/i386-windows/schedsvc.dll
+lib/wine/i386-windows/schtasks.exe
+lib/wine/i386-windows/scrobj.dll
+lib/wine/i386-windows/scrrun.dll
+lib/wine/i386-windows/scsiport.sys
+lib/wine/i386-windows/sdbinst.exe
+lib/wine/i386-windows/secedit.exe
+lib/wine/i386-windows/sechost.dll
+lib/wine/i386-windows/secur32.dll
+lib/wine/i386-windows/security.dll
+lib/wine/i386-windows/sensapi.dll
+lib/wine/i386-windows/serialui.dll
+lib/wine/i386-windows/servicemodelreg.exe
+lib/wine/i386-windows/services.exe
+lib/wine/i386-windows/setupapi.dll
+lib/wine/i386-windows/setupx.dll16
+lib/wine/i386-windows/setx.exe
+lib/wine/i386-windows/sfc.dll
+lib/wine/i386-windows/sfc_os.dll
+lib/wine/i386-windows/shcore.dll
+lib/wine/i386-windows/shdoclc.dll
+lib/wine/i386-windows/shdocvw.dll
+lib/wine/i386-windows/shell.dll16
+lib/wine/i386-windows/shell32.dll
+lib/wine/i386-windows/shfolder.dll
+lib/wine/i386-windows/shlwapi.dll
+lib/wine/i386-windows/shutdown.exe
+lib/wine/i386-windows/slbcsp.dll
+lib/wine/i386-windows/slc.dll
+lib/wine/i386-windows/snmpapi.dll
+lib/wine/i386-windows/softpub.dll
+lib/wine/i386-windows/sound.drv16
+lib/wine/i386-windows/spoolss.dll
+lib/wine/i386-windows/spoolsv.exe
+lib/wine/i386-windows/sppc.dll
+lib/wine/i386-windows/srclient.dll
+lib/wine/i386-windows/srvcli.dll
+lib/wine/i386-windows/srvsvc.dll
+lib/wine/i386-windows/sspicli.dll
+lib/wine/i386-windows/start.exe
+lib/wine/i386-windows/stdole2.tlb
+lib/wine/i386-windows/stdole32.tlb
+lib/wine/i386-windows/sti.dll
+lib/wine/i386-windows/storage.dll16
+lib/wine/i386-windows/stress.dll16
+lib/wine/i386-windows/strmdll.dll
+lib/wine/i386-windows/subst.exe
+lib/wine/i386-windows/svchost.exe
+lib/wine/i386-windows/svrapi.dll
+lib/wine/i386-windows/sxs.dll
+lib/wine/i386-windows/system.drv16
+lib/wine/i386-windows/systeminfo.exe
+lib/wine/i386-windows/t2embed.dll
+lib/wine/i386-windows/tapi32.dll
+lib/wine/i386-windows/taskkill.exe
+lib/wine/i386-windows/tasklist.exe
+lib/wine/i386-windows/taskmgr.exe
+lib/wine/i386-windows/taskschd.dll
+lib/wine/i386-windows/tbs.dll
+lib/wine/i386-windows/tdh.dll
+lib/wine/i386-windows/tdi.sys
+lib/wine/i386-windows/termsv.exe
+lib/wine/i386-windows/threadpoolwinrt.dll
+lib/wine/i386-windows/toolhelp.dll16
+lib/wine/i386-windows/traffic.dll
+lib/wine/i386-windows/twain.dll16
+lib/wine/i386-windows/twain_32.dll
+lib/wine/i386-windows/twinapi.appcore.dll
+lib/wine/i386-windows/typelib.dll16
+lib/wine/i386-windows/tzres.dll
+lib/wine/i386-windows/ucrtbase.dll
+lib/wine/i386-windows/uianimation.dll
+lib/wine/i386-windows/uiautomationcore.dll
+lib/wine/i386-windows/uiribbon.dll
+lib/wine/i386-windows/unicows.dll
+lib/wine/i386-windows/uninstaller.exe
+lib/wine/i386-windows/unlodctr.exe
+lib/wine/i386-windows/updspapi.dll
+lib/wine/i386-windows/url.dll
+lib/wine/i386-windows/urlmon.dll
+lib/wine/i386-windows/usbd.sys
+lib/wine/i386-windows/user.exe16
+lib/wine/i386-windows/user32.dll
+lib/wine/i386-windows/userenv.dll
+lib/wine/i386-windows/usp10.dll
+lib/wine/i386-windows/utildll.dll
+lib/wine/i386-windows/uxtheme.dll
+lib/wine/i386-windows/vbscript.dll
+lib/wine/i386-windows/vcomp.dll
+lib/wine/i386-windows/vcomp100.dll
+lib/wine/i386-windows/vcomp110.dll
+lib/wine/i386-windows/vcomp120.dll
+lib/wine/i386-windows/vcomp140.dll
+lib/wine/i386-windows/vcomp90.dll
+lib/wine/i386-windows/vcruntime140.dll
+lib/wine/i386-windows/vdhcp.vxd
+lib/wine/i386-windows/vdmdbg.dll
+lib/wine/i386-windows/ver.dll16
+lib/wine/i386-windows/version.dll
+lib/wine/i386-windows/vga.dll
+lib/wine/i386-windows/view.exe
+lib/wine/i386-windows/virtdisk.dll
+lib/wine/i386-windows/vmm.vxd
+lib/wine/i386-windows/vnbt.vxd
+lib/wine/i386-windows/vnetbios.vxd
+lib/wine/i386-windows/vssapi.dll
+lib/wine/i386-windows/vtdapi.vxd
+lib/wine/i386-windows/vulkan-1.dll
+lib/wine/i386-windows/vwin32.vxd
+lib/wine/i386-windows/w32skrnl.dll
+lib/wine/i386-windows/w32sys.dll16
+lib/wine/i386-windows/wbemdisp.dll
+lib/wine/i386-windows/wbemprox.dll
+lib/wine/i386-windows/wdscore.dll
+lib/wine/i386-windows/webservices.dll
+lib/wine/i386-windows/websocket.dll
+lib/wine/i386-windows/wer.dll
+lib/wine/i386-windows/wevtapi.dll
+lib/wine/i386-windows/wevtsvc.dll
+lib/wine/i386-windows/wevtutil.exe
+lib/wine/i386-windows/where.exe
+lib/wine/i386-windows/whoami.exe
+lib/wine/i386-windows/wiaservc.dll
+lib/wine/i386-windows/wimgapi.dll
+lib/wine/i386-windows/win32s16.dll16
+lib/wine/i386-windows/win32u.dll
+lib/wine/i386-windows/win87em.dll16
+lib/wine/i386-windows/winaspi.dll16
+lib/wine/i386-windows/windebug.dll16
+lib/wine/i386-windows/windows.applicationmodel.dll
+lib/wine/i386-windows/windows.devices.bluetooth.dll
+lib/wine/i386-windows/windows.devices.enumeration.dll
+lib/wine/i386-windows/windows.devices.usb.dll
+lib/wine/i386-windows/windows.gaming.input.dll
+lib/wine/i386-windows/windows.gaming.ui.gamebar.dll
+lib/wine/i386-windows/windows.globalization.dll
+lib/wine/i386-windows/windows.media.devices.dll
+lib/wine/i386-windows/windows.media.dll
+lib/wine/i386-windows/windows.media.mediacontrol.dll
+lib/wine/i386-windows/windows.media.speech.dll
+lib/wine/i386-windows/windows.networking.dll
+lib/wine/i386-windows/windows.networking.hostname.dll
+lib/wine/i386-windows/windows.perception.stub.dll
+lib/wine/i386-windows/windows.security.credentials.ui.userconsentverifier.dll
+lib/wine/i386-windows/windows.storage.applicationdata.dll
+lib/wine/i386-windows/windows.system.profile.systemmanufacturers.dll
+lib/wine/i386-windows/windows.ui.dll
+lib/wine/i386-windows/windowscodecs.dll
+lib/wine/i386-windows/windowscodecsext.dll
+lib/wine/i386-windows/winealsa.drv
+lib/wine/i386-windows/wineboot.exe
+lib/wine/i386-windows/winebrowser.exe
+lib/wine/i386-windows/winebus.sys
+lib/wine/i386-windows/winecfg.exe
+lib/wine/i386-windows/wineconsole.exe
+lib/wine/i386-windows/wined3d.dll
+lib/wine/i386-windows/winedbg.exe
+lib/wine/i386-windows/winedevice.exe
+lib/wine/i386-windows/winefile.exe
+lib/wine/i386-windows/winehid.sys
+lib/wine/i386-windows/winemapi.dll
+lib/wine/i386-windows/winemenubuilder.exe
+lib/wine/i386-windows/winemine.exe
+lib/wine/i386-windows/winemsibuilder.exe
+lib/wine/i386-windows/winepath.exe
+lib/wine/i386-windows/wineps.drv
+lib/wine/i386-windows/wineps16.drv16
+lib/wine/i386-windows/winevdm.exe
+lib/wine/i386-windows/winevulkan.dll
+lib/wine/i386-windows/winex11.drv
+lib/wine/i386-windows/winexinput.sys
+lib/wine/i386-windows/wing.dll16
+lib/wine/i386-windows/wing32.dll
+lib/wine/i386-windows/winhelp.exe16
+lib/wine/i386-windows/winhlp32.exe
+lib/wine/i386-windows/winhttp.dll
+lib/wine/i386-windows/wininet.dll
+lib/wine/i386-windows/winmgmt.exe
+lib/wine/i386-windows/winmm.dll
+lib/wine/i386-windows/winnls.dll16
+lib/wine/i386-windows/winnls32.dll
+lib/wine/i386-windows/winoldap.mod16
+lib/wine/i386-windows/winprint.dll
+lib/wine/i386-windows/winsock.dll16
+lib/wine/i386-windows/winspool.drv
+lib/wine/i386-windows/winsta.dll
+lib/wine/i386-windows/wintab.dll16
+lib/wine/i386-windows/wintab32.dll
+lib/wine/i386-windows/wintrust.dll
+lib/wine/i386-windows/wintypes.dll
+lib/wine/i386-windows/winusb.dll
+lib/wine/i386-windows/winver.exe
+lib/wine/i386-windows/wlanapi.dll
+lib/wine/i386-windows/wlanui.dll
+lib/wine/i386-windows/wldap32.dll
+lib/wine/i386-windows/wldp.dll
+lib/wine/i386-windows/wmasf.dll
+lib/wine/i386-windows/wmi.dll
+lib/wine/i386-windows/wmic.exe
+lib/wine/i386-windows/wmiutils.dll
+lib/wine/i386-windows/wmp.dll
+lib/wine/i386-windows/wmphoto.dll
+lib/wine/i386-windows/wmplayer.exe
+lib/wine/i386-windows/wmvcore.dll
+lib/wine/i386-windows/wnaspi32.dll
+lib/wine/i386-windows/wofutil.dll
+lib/wine/i386-windows/wordpad.exe
+lib/wine/i386-windows/wow32.dll
+lib/wine/i386-windows/wpc.dll
+lib/wine/i386-windows/wpcap.dll
+lib/wine/i386-windows/write.exe
+lib/wine/i386-windows/ws2_32.dll
+lib/wine/i386-windows/wscript.exe
+lib/wine/i386-windows/wsdapi.dll
+lib/wine/i386-windows/wshom.ocx
+lib/wine/i386-windows/wsnmp32.dll
+lib/wine/i386-windows/wsock32.dll
+lib/wine/i386-windows/wtsapi32.dll
+lib/wine/i386-windows/wuapi.dll
+lib/wine/i386-windows/wuaueng.dll
+lib/wine/i386-windows/wuauserv.exe
+lib/wine/i386-windows/wusa.exe
+lib/wine/i386-windows/x3daudio1_0.dll
+lib/wine/i386-windows/x3daudio1_1.dll
+lib/wine/i386-windows/x3daudio1_2.dll
+lib/wine/i386-windows/x3daudio1_3.dll
+lib/wine/i386-windows/x3daudio1_4.dll
+lib/wine/i386-windows/x3daudio1_5.dll
+lib/wine/i386-windows/x3daudio1_6.dll
+lib/wine/i386-windows/x3daudio1_7.dll
+lib/wine/i386-windows/xactengine2_0.dll
+lib/wine/i386-windows/xactengine2_4.dll
+lib/wine/i386-windows/xactengine2_7.dll
+lib/wine/i386-windows/xactengine2_9.dll
+lib/wine/i386-windows/xactengine3_0.dll
+lib/wine/i386-windows/xactengine3_1.dll
+lib/wine/i386-windows/xactengine3_2.dll
+lib/wine/i386-windows/xactengine3_3.dll
+lib/wine/i386-windows/xactengine3_4.dll
+lib/wine/i386-windows/xactengine3_5.dll
+lib/wine/i386-windows/xactengine3_6.dll
+lib/wine/i386-windows/xactengine3_7.dll
+lib/wine/i386-windows/xapofx1_1.dll
+lib/wine/i386-windows/xapofx1_2.dll
+lib/wine/i386-windows/xapofx1_3.dll
+lib/wine/i386-windows/xapofx1_4.dll
+lib/wine/i386-windows/xapofx1_5.dll
+lib/wine/i386-windows/xaudio2_0.dll
+lib/wine/i386-windows/xaudio2_1.dll
+lib/wine/i386-windows/xaudio2_2.dll
+lib/wine/i386-windows/xaudio2_3.dll
+lib/wine/i386-windows/xaudio2_4.dll
+lib/wine/i386-windows/xaudio2_5.dll
+lib/wine/i386-windows/xaudio2_6.dll
+lib/wine/i386-windows/xaudio2_7.dll
+lib/wine/i386-windows/xaudio2_8.dll
+lib/wine/i386-windows/xaudio2_9.dll
+lib/wine/i386-windows/xcopy.exe
+lib/wine/i386-windows/xinput1_1.dll
+lib/wine/i386-windows/xinput1_2.dll
+lib/wine/i386-windows/xinput1_3.dll
+lib/wine/i386-windows/xinput1_4.dll
+lib/wine/i386-windows/xinput9_1_0.dll
+lib/wine/i386-windows/xinputuap.dll
+lib/wine/i386-windows/xmllite.dll
+lib/wine/i386-windows/xolehlp.dll
+lib/wine/i386-windows/xpsprint.dll
+lib/wine/i386-windows/xpssvcs.dll
 lib/wine/%%WINEARCH%%-unix/avicap32.so
 lib/wine/%%WINEARCH%%-unix/bcrypt.so
 lib/wine/%%WINEARCH%%-unix/crypt32.so
@@ -1224,6 +2329,7 @@
 lib/wine/%%WINEARCH%%-unix/libavifil32.a
 lib/wine/%%WINEARCH%%-unix/libavrt.a
 lib/wine/%%WINEARCH%%-unix/libbcrypt.a
+lib/wine/%%WINEARCH%%-unix/libbluetoothapis.a
 lib/wine/%%WINEARCH%%-unix/libcabinet.a
 lib/wine/%%WINEARCH%%-unix/libcards.a
 lib/wine/%%WINEARCH%%-unix/libcfgmgr32.a
@@ -1231,6 +2337,7 @@
 lib/wine/%%WINEARCH%%-unix/libcombase.a
 lib/wine/%%WINEARCH%%-unix/libcomctl32.a
 lib/wine/%%WINEARCH%%-unix/libcomdlg32.a
+lib/wine/%%WINEARCH%%-unix/libcoml2.a
 lib/wine/%%WINEARCH%%-unix/libcompstui.a
 lib/wine/%%WINEARCH%%-unix/libcomsvcs.a
 lib/wine/%%WINEARCH%%-unix/libcredui.a
@@ -1243,7 +2350,7 @@
 lib/wine/%%WINEARCH%%-unix/libd3d10_1.a
 lib/wine/%%WINEARCH%%-unix/libd3d10core.a
 lib/wine/%%WINEARCH%%-unix/libd3d11.a
-%%X11%%lib/wine/%%WINEARCH%%-unix/libd3d12.a
+lib/wine/%%WINEARCH%%-unix/libd3d12.a
 lib/wine/%%WINEARCH%%-unix/libd3d8.a
 lib/wine/%%WINEARCH%%-unix/libd3d9.a
 lib/wine/%%WINEARCH%%-unix/libd3dcompiler.a
@@ -1301,7 +2408,6 @@
 lib/wine/%%WINEARCH%%-unix/libinetcomm.a
 lib/wine/%%WINEARCH%%-unix/libiphlpapi.a
 lib/wine/%%WINEARCH%%-unix/libjsproxy.a
-%%WINE32%%lib/wine/%%WINEARCH%%-unix/libkernel.a
 lib/wine/%%WINEARCH%%-unix/libkernel32.a
 lib/wine/%%WINEARCH%%-unix/libkernelbase.a
 lib/wine/%%WINEARCH%%-unix/libloadperf.a
@@ -1415,8 +2521,6 @@
 lib/wine/%%WINEARCH%%-unix/libwin32u.a
 lib/wine/%%WINEARCH%%-unix/libwindowscodecs.a
 lib/wine/%%WINEARCH%%-unix/libwindowscodecsext.a
-lib/wine/%%WINEARCH%%-unix/libwine.so.1
-lib/wine/%%WINEARCH%%-unix/libwine.so.1.0
 lib/wine/%%WINEARCH%%-unix/libwinecrt0.a
 lib/wine/%%WINEARCH%%-unix/libwined3d.a
 lib/wine/%%WINEARCH%%-unix/libwinevulkan.a
@@ -1424,7 +2528,6 @@
 lib/wine/%%WINEARCH%%-unix/libwininet.a
 lib/wine/%%WINEARCH%%-unix/libwinmm.a
 lib/wine/%%WINEARCH%%-unix/libwinnls32.a
-lib/wine/%%WINEARCH%%-unix/libwinscard.a
 lib/wine/%%WINEARCH%%-unix/libwinspool.a
 lib/wine/%%WINEARCH%%-unix/libwintab32.a
 lib/wine/%%WINEARCH%%-unix/libwintrust.a
@@ -1433,13 +2536,13 @@
 lib/wine/%%WINEARCH%%-unix/libwmcodecdspuuid.a
 lib/wine/%%WINEARCH%%-unix/libwmvcore.a
 lib/wine/%%WINEARCH%%-unix/libwnaspi32.a
-%%WINE32%%lib/wine/%%WINEARCH%%-unix/libwow32.a
-%%WINE64%%lib/wine/%%WINEARCH%%-unix/libwow64.a
+lib/wine/%%WINEARCH%%-unix/libwow64.a
 lib/wine/%%WINEARCH%%-unix/libws2_32.a
 lib/wine/%%WINEARCH%%-unix/libwsdapi.a
 lib/wine/%%WINEARCH%%-unix/libwsnmp32.a
 lib/wine/%%WINEARCH%%-unix/libwsock32.a
 lib/wine/%%WINEARCH%%-unix/libwtsapi32.a
+lib/wine/%%WINEARCH%%-unix/libxaudio2_8.a
 lib/wine/%%WINEARCH%%-unix/libxinput.a
 lib/wine/%%WINEARCH%%-unix/libxmllite.a
 lib/wine/%%WINEARCH%%-unix/localspl.so
@@ -1453,11 +2556,11 @@
 lib/wine/%%WINEARCH%%-unix/qcap.so
 lib/wine/%%WINEARCH%%-unix/secur32.so
 lib/wine/%%WINEARCH%%-unix/win32u.so
-%%ALSA%%lib/wine/%%WINEARCH%%-unix/winealsa.so
+lib/wine/%%WINEARCH%%-unix/winealsa.so
 lib/wine/%%WINEARCH%%-unix/winebus.so
-%%OSS%%lib/wine/%%WINEARCH%%-unix/wineoss.so
+lib/wine/%%WINEARCH%%-unix/wineps.so
 lib/wine/%%WINEARCH%%-unix/winevulkan.so
-%%X11%%lib/wine/%%WINEARCH%%-unix/winex11.so
+lib/wine/%%WINEARCH%%-unix/winex11.so
 lib/wine/%%WINEARCH%%-unix/winspool.so
 lib/wine/%%WINEARCH%%-unix/wpcap.so
 lib/wine/%%WINEARCH%%-unix/ws2_32.so
@@ -1475,6 +2578,7 @@
 lib/wine/%%WINEARCH%%-windows/apisetschema.dll
 lib/wine/%%WINEARCH%%-windows/apphelp.dll
 lib/wine/%%WINEARCH%%-windows/appwiz.cpl
+lib/wine/%%WINEARCH%%-windows/appxdeploymentclient.dll
 lib/wine/%%WINEARCH%%-windows/arp.exe
 lib/wine/%%WINEARCH%%-windows/aspnet_regiis.exe
 lib/wine/%%WINEARCH%%-windows/atl.dll
@@ -1488,9 +2592,9 @@
 lib/wine/%%WINEARCH%%-windows/authz.dll
 lib/wine/%%WINEARCH%%-windows/avicap32.dll
 lib/wine/%%WINEARCH%%-windows/avifil32.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/avifile.dll16
 lib/wine/%%WINEARCH%%-windows/avrt.dll
 lib/wine/%%WINEARCH%%-windows/bcrypt.dll
+lib/wine/%%WINEARCH%%-windows/bcryptprimitives.dll
 lib/wine/%%WINEARCH%%-windows/bluetoothapis.dll
 lib/wine/%%WINEARCH%%-windows/browseui.dll
 lib/wine/%%WINEARCH%%-windows/bthprops.cpl
@@ -1510,9 +2614,7 @@
 lib/wine/%%WINEARCH%%-windows/comcat.dll
 lib/wine/%%WINEARCH%%-windows/comctl32.dll
 lib/wine/%%WINEARCH%%-windows/comdlg32.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/comm.drv16
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/commdlg.dll16
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/compobj.dll16
+lib/wine/%%WINEARCH%%-windows/coml2.dll
 lib/wine/%%WINEARCH%%-windows/compstui.dll
 lib/wine/%%WINEARCH%%-windows/comsvcs.dll
 lib/wine/%%WINEARCH%%-windows/concrt140.dll
@@ -1531,15 +2633,14 @@
 lib/wine/%%WINEARCH%%-windows/cryptui.dll
 lib/wine/%%WINEARCH%%-windows/cscript.exe
 lib/wine/%%WINEARCH%%-windows/ctapi32.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/ctl3d.dll16
 lib/wine/%%WINEARCH%%-windows/ctl3d32.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/ctl3dv2.dll16
 lib/wine/%%WINEARCH%%-windows/d2d1.dll
 lib/wine/%%WINEARCH%%-windows/d3d10.dll
 lib/wine/%%WINEARCH%%-windows/d3d10_1.dll
 lib/wine/%%WINEARCH%%-windows/d3d10core.dll
 lib/wine/%%WINEARCH%%-windows/d3d11.dll
-%%X11%%lib/wine/%%WINEARCH%%-windows/d3d12.dll
+lib/wine/%%WINEARCH%%-windows/d3d12.dll
+lib/wine/%%WINEARCH%%-windows/d3d12core.dll
 lib/wine/%%WINEARCH%%-windows/d3d8.dll
 lib/wine/%%WINEARCH%%-windows/d3d8thk.dll
 lib/wine/%%WINEARCH%%-windows/d3d9.dll
@@ -1598,7 +2699,6 @@
 lib/wine/%%WINEARCH%%-windows/dbghelp.dll
 lib/wine/%%WINEARCH%%-windows/dciman32.dll
 lib/wine/%%WINEARCH%%-windows/dcomp.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/ddeml.dll16
 lib/wine/%%WINEARCH%%-windows/ddraw.dll
 lib/wine/%%WINEARCH%%-windows/ddrawex.dll
 lib/wine/%%WINEARCH%%-windows/devenum.dll
@@ -1611,9 +2711,7 @@
 lib/wine/%%WINEARCH%%-windows/dinput8.dll
 lib/wine/%%WINEARCH%%-windows/directmanipulation.dll
 lib/wine/%%WINEARCH%%-windows/dism.exe
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/dispdib.dll16
 lib/wine/%%WINEARCH%%-windows/dispex.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/display.drv16
 lib/wine/%%WINEARCH%%-windows/dllhost.exe
 lib/wine/%%WINEARCH%%-windows/dmband.dll
 lib/wine/%%WINEARCH%%-windows/dmcompos.dll
@@ -1647,6 +2745,7 @@
 lib/wine/%%WINEARCH%%-windows/dwmapi.dll
 lib/wine/%%WINEARCH%%-windows/dwrite.dll
 lib/wine/%%WINEARCH%%-windows/dx8vb.dll
+lib/wine/%%WINEARCH%%-windows/dxcore.dll
 lib/wine/%%WINEARCH%%-windows/dxdiag.exe
 lib/wine/%%WINEARCH%%-windows/dxdiagn.dll
 lib/wine/%%WINEARCH%%-windows/dxgi.dll
@@ -1673,11 +2772,12 @@
 lib/wine/%%WINEARCH%%-windows/fwpuclnt.dll
 lib/wine/%%WINEARCH%%-windows/gameux.dll
 lib/wine/%%WINEARCH%%-windows/gamingtcui.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/gdi.exe16
 lib/wine/%%WINEARCH%%-windows/gdi32.dll
 lib/wine/%%WINEARCH%%-windows/gdiplus.dll
-%%X11%%lib/wine/%%WINEARCH%%-windows/glu32.dll
+lib/wine/%%WINEARCH%%-windows/geolocation.dll
+lib/wine/%%WINEARCH%%-windows/glu32.dll
 lib/wine/%%WINEARCH%%-windows/gpkcsp.dll
+lib/wine/%%WINEARCH%%-windows/graphicscapture.dll
 lib/wine/%%WINEARCH%%-windows/hal.dll
 lib/wine/%%WINEARCH%%-windows/hh.exe
 lib/wine/%%WINEARCH%%-windows/hhctrl.ocx
@@ -1687,8 +2787,10 @@
 lib/wine/%%WINEARCH%%-windows/hlink.dll
 lib/wine/%%WINEARCH%%-windows/hnetcfg.dll
 lib/wine/%%WINEARCH%%-windows/hostname.exe
+lib/wine/%%WINEARCH%%-windows/hrtfapo.dll
 lib/wine/%%WINEARCH%%-windows/http.sys
 lib/wine/%%WINEARCH%%-windows/httpapi.dll
+lib/wine/%%WINEARCH%%-windows/hvsimanagementapi.dll
 lib/wine/%%WINEARCH%%-windows/ia2comproxy.dll
 lib/wine/%%WINEARCH%%-windows/icacls.exe
 lib/wine/%%WINEARCH%%-windows/iccvid.dll
@@ -1697,10 +2799,8 @@
 lib/wine/%%WINEARCH%%-windows/ieframe.dll
 lib/wine/%%WINEARCH%%-windows/ieproxy.dll
 lib/wine/%%WINEARCH%%-windows/iexplore.exe
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/ifsmgr.vxd
 lib/wine/%%WINEARCH%%-windows/imaadp32.acm
 lib/wine/%%WINEARCH%%-windows/imagehlp.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/imm.dll16
 lib/wine/%%WINEARCH%%-windows/imm32.dll
 lib/wine/%%WINEARCH%%-windows/inetcomm.dll
 lib/wine/%%WINEARCH%%-windows/inetcpl.cpl
@@ -1712,6 +2812,7 @@
 lib/wine/%%WINEARCH%%-windows/ipconfig.exe
 lib/wine/%%WINEARCH%%-windows/iphlpapi.dll
 lib/wine/%%WINEARCH%%-windows/iprop.dll
+lib/wine/%%WINEARCH%%-windows/ir50_32.dll
 lib/wine/%%WINEARCH%%-windows/irprops.cpl
 lib/wine/%%WINEARCH%%-windows/itircl.dll
 lib/wine/%%WINEARCH%%-windows/itss.dll
@@ -1720,8 +2821,7 @@
 lib/wine/%%WINEARCH%%-windows/jsproxy.dll
 lib/wine/%%WINEARCH%%-windows/kernel32.dll
 lib/wine/%%WINEARCH%%-windows/kernelbase.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/keyboard.drv16
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/krnl386.exe16
+lib/wine/%%WINEARCH%%-windows/klist.exe
 lib/wine/%%WINEARCH%%-windows/ksecdd.sys
 lib/wine/%%WINEARCH%%-windows/ksproxy.ax
 lib/wine/%%WINEARCH%%-windows/ksuser.dll
@@ -1741,6 +2841,7 @@
 lib/wine/%%WINEARCH%%-windows/libavifil32.a
 lib/wine/%%WINEARCH%%-windows/libavrt.a
 lib/wine/%%WINEARCH%%-windows/libbcrypt.a
+lib/wine/%%WINEARCH%%-windows/libbluetoothapis.a
 lib/wine/%%WINEARCH%%-windows/libcabinet.a
 lib/wine/%%WINEARCH%%-windows/libcards.a
 lib/wine/%%WINEARCH%%-windows/libcfgmgr32.a
@@ -1748,6 +2849,7 @@
 lib/wine/%%WINEARCH%%-windows/libcombase.a
 lib/wine/%%WINEARCH%%-windows/libcomctl32.a
 lib/wine/%%WINEARCH%%-windows/libcomdlg32.a
+lib/wine/%%WINEARCH%%-windows/libcoml2.a
 lib/wine/%%WINEARCH%%-windows/libcompstui.a
 lib/wine/%%WINEARCH%%-windows/libcomsvcs.a
 lib/wine/%%WINEARCH%%-windows/libcredui.a
@@ -1760,7 +2862,7 @@
 lib/wine/%%WINEARCH%%-windows/libd3d10_1.a
 lib/wine/%%WINEARCH%%-windows/libd3d10core.a
 lib/wine/%%WINEARCH%%-windows/libd3d11.a
-%%X11%%lib/wine/%%WINEARCH%%-windows/libd3d12.a
+lib/wine/%%WINEARCH%%-windows/libd3d12.a
 lib/wine/%%WINEARCH%%-windows/libd3d8.a
 lib/wine/%%WINEARCH%%-windows/libd3d9.a
 lib/wine/%%WINEARCH%%-windows/libd3dcompiler.a
@@ -1818,7 +2920,6 @@
 lib/wine/%%WINEARCH%%-windows/libinetcomm.a
 lib/wine/%%WINEARCH%%-windows/libiphlpapi.a
 lib/wine/%%WINEARCH%%-windows/libjsproxy.a
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/libkernel.a
 lib/wine/%%WINEARCH%%-windows/libkernel32.a
 lib/wine/%%WINEARCH%%-windows/libkernelbase.a
 lib/wine/%%WINEARCH%%-windows/libloadperf.a
@@ -1939,7 +3040,6 @@
 lib/wine/%%WINEARCH%%-windows/libwininet.a
 lib/wine/%%WINEARCH%%-windows/libwinmm.a
 lib/wine/%%WINEARCH%%-windows/libwinnls32.a
-lib/wine/%%WINEARCH%%-windows/libwinscard.a
 lib/wine/%%WINEARCH%%-windows/libwinspool.a
 lib/wine/%%WINEARCH%%-windows/libwintab32.a
 lib/wine/%%WINEARCH%%-windows/libwintrust.a
@@ -1948,13 +3048,13 @@
 lib/wine/%%WINEARCH%%-windows/libwmcodecdspuuid.a
 lib/wine/%%WINEARCH%%-windows/libwmvcore.a
 lib/wine/%%WINEARCH%%-windows/libwnaspi32.a
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/libwow32.a
-%%WINE64%%lib/wine/%%WINEARCH%%-windows/libwow64.a
+lib/wine/%%WINEARCH%%-windows/libwow64.a
 lib/wine/%%WINEARCH%%-windows/libws2_32.a
 lib/wine/%%WINEARCH%%-windows/libwsdapi.a
 lib/wine/%%WINEARCH%%-windows/libwsnmp32.a
 lib/wine/%%WINEARCH%%-windows/libwsock32.a
 lib/wine/%%WINEARCH%%-windows/libwtsapi32.a
+lib/wine/%%WINEARCH%%-windows/libxaudio2_8.a
 lib/wine/%%WINEARCH%%-windows/libxinput.a
 lib/wine/%%WINEARCH%%-windows/libxmllite.a
 lib/wine/%%WINEARCH%%-windows/light.msstyles
@@ -1963,7 +3063,7 @@
 lib/wine/%%WINEARCH%%-windows/localui.dll
 lib/wine/%%WINEARCH%%-windows/lodctr.exe
 lib/wine/%%WINEARCH%%-windows/lz32.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/lzexpand.dll16
+lib/wine/%%WINEARCH%%-windows/magnification.dll
 lib/wine/%%WINEARCH%%-windows/mapi32.dll
 lib/wine/%%WINEARCH%%-windows/mapistub.dll
 lib/wine/%%WINEARCH%%-windows/mciavi32.dll
@@ -1982,23 +3082,19 @@
 lib/wine/%%WINEARCH%%-windows/mgmtapi.dll
 lib/wine/%%WINEARCH%%-windows/midimap.dll
 lib/wine/%%WINEARCH%%-windows/mlang.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/mmcndmgr.dll
+lib/wine/%%WINEARCH%%-windows/mmcndmgr.dll
 lib/wine/%%WINEARCH%%-windows/mmdevapi.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/mmdevldr.vxd
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/mmsystem.dll16
 lib/wine/%%WINEARCH%%-windows/mofcomp.exe
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/monodebg.vxd
 lib/wine/%%WINEARCH%%-windows/mountmgr.sys
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/mouse.drv16
 lib/wine/%%WINEARCH%%-windows/mp3dmod.dll
 lib/wine/%%WINEARCH%%-windows/mpr.dll
 lib/wine/%%WINEARCH%%-windows/mprapi.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/msacm.dll16
 lib/wine/%%WINEARCH%%-windows/msacm32.dll
 lib/wine/%%WINEARCH%%-windows/msacm32.drv
 lib/wine/%%WINEARCH%%-windows/msado15.dll
 lib/wine/%%WINEARCH%%-windows/msadp32.acm
 lib/wine/%%WINEARCH%%-windows/msasn1.dll
+lib/wine/%%WINEARCH%%-windows/msauddecmft.dll
 lib/wine/%%WINEARCH%%-windows/mscat32.dll
 lib/wine/%%WINEARCH%%-windows/mscms.dll
 lib/wine/%%WINEARCH%%-windows/mscoree.dll
@@ -2028,6 +3124,7 @@
 lib/wine/%%WINEARCH%%-windows/msisip.dll
 lib/wine/%%WINEARCH%%-windows/msisys.ocx
 lib/wine/%%WINEARCH%%-windows/msls31.dll
+lib/wine/%%WINEARCH%%-windows/msmpeg2vdec.dll
 lib/wine/%%WINEARCH%%-windows/msnet32.dll
 lib/wine/%%WINEARCH%%-windows/mspatcha.dll
 lib/wine/%%WINEARCH%%-windows/msports.dll
@@ -2036,6 +3133,7 @@
 lib/wine/%%WINEARCH%%-windows/mssign32.dll
 lib/wine/%%WINEARCH%%-windows/mssip32.dll
 lib/wine/%%WINEARCH%%-windows/mstask.dll
+lib/wine/%%WINEARCH%%-windows/msttsengine.dll
 lib/wine/%%WINEARCH%%-windows/msv1_0.dll
 lib/wine/%%WINEARCH%%-windows/msvcirt.dll
 lib/wine/%%WINEARCH%%-windows/msvcm80.dll
@@ -2048,6 +3146,7 @@
 lib/wine/%%WINEARCH%%-windows/msvcp140_1.dll
 lib/wine/%%WINEARCH%%-windows/msvcp140_2.dll
 lib/wine/%%WINEARCH%%-windows/msvcp140_atomic_wait.dll
+lib/wine/%%WINEARCH%%-windows/msvcp140_codecvt_ids.dll
 lib/wine/%%WINEARCH%%-windows/msvcp60.dll
 lib/wine/%%WINEARCH%%-windows/msvcp70.dll
 lib/wine/%%WINEARCH%%-windows/msvcp71.dll
@@ -2068,7 +3167,6 @@
 lib/wine/%%WINEARCH%%-windows/msvcrtd.dll
 lib/wine/%%WINEARCH%%-windows/msvfw32.dll
 lib/wine/%%WINEARCH%%-windows/msvidc32.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/msvideo.dll16
 lib/wine/%%WINEARCH%%-windows/mswsock.dll
 lib/wine/%%WINEARCH%%-windows/msxml.dll
 lib/wine/%%WINEARCH%%-windows/msxml2.dll
@@ -2105,21 +3203,13 @@
 lib/wine/%%WINEARCH%%-windows/odbcbcp.dll
 lib/wine/%%WINEARCH%%-windows/odbccp32.dll
 lib/wine/%%WINEARCH%%-windows/odbccu32.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/ole2.dll16
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/ole2conv.dll16
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/ole2disp.dll16
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/ole2nls.dll16
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/ole2prox.dll16
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/ole2thk.dll16
 lib/wine/%%WINEARCH%%-windows/ole32.dll
 lib/wine/%%WINEARCH%%-windows/oleacc.dll
 lib/wine/%%WINEARCH%%-windows/oleaut32.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/olecli.dll16
 lib/wine/%%WINEARCH%%-windows/olecli32.dll
 lib/wine/%%WINEARCH%%-windows/oledb32.dll
 lib/wine/%%WINEARCH%%-windows/oledlg.dll
 lib/wine/%%WINEARCH%%-windows/olepro32.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/olesvr.dll16
 lib/wine/%%WINEARCH%%-windows/olesvr32.dll
 lib/wine/%%WINEARCH%%-windows/olethk32.dll
 lib/wine/%%WINEARCH%%-windows/oleview.exe
@@ -2131,6 +3221,7 @@
 lib/wine/%%WINEARCH%%-windows/pidgen.dll
 lib/wine/%%WINEARCH%%-windows/ping.exe
 lib/wine/%%WINEARCH%%-windows/plugplay.exe
+lib/wine/%%WINEARCH%%-windows/pnputil.exe
 lib/wine/%%WINEARCH%%-windows/powershell.exe
 lib/wine/%%WINEARCH%%-windows/powrprof.dll
 lib/wine/%%WINEARCH%%-windows/presentationfontcache.exe
@@ -2150,7 +3241,6 @@
 lib/wine/%%WINEARCH%%-windows/quartz.dll
 lib/wine/%%WINEARCH%%-windows/query.dll
 lib/wine/%%WINEARCH%%-windows/qwave.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/rasapi16.dll16
 lib/wine/%%WINEARCH%%-windows/rasapi32.dll
 lib/wine/%%WINEARCH%%-windows/rasdlg.dll
 lib/wine/%%WINEARCH%%-windows/reg.exe
@@ -2171,13 +3261,13 @@
 lib/wine/%%WINEARCH%%-windows/rstrtmgr.dll
 lib/wine/%%WINEARCH%%-windows/rtutils.dll
 lib/wine/%%WINEARCH%%-windows/rtworkq.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/rundll.exe16
 lib/wine/%%WINEARCH%%-windows/rundll32.exe
 lib/wine/%%WINEARCH%%-windows/samlib.dll
 lib/wine/%%WINEARCH%%-windows/sapi.dll
 lib/wine/%%WINEARCH%%-windows/sas.dll
 lib/wine/%%WINEARCH%%-windows/sc.exe
 lib/wine/%%WINEARCH%%-windows/scarddlg.dll
+lib/wine/%%WINEARCH%%-windows/scardsvr.dll
 lib/wine/%%WINEARCH%%-windows/sccbase.dll
 lib/wine/%%WINEARCH%%-windows/schannel.dll
 lib/wine/%%WINEARCH%%-windows/schedsvc.dll
@@ -2195,14 +3285,12 @@
 lib/wine/%%WINEARCH%%-windows/servicemodelreg.exe
 lib/wine/%%WINEARCH%%-windows/services.exe
 lib/wine/%%WINEARCH%%-windows/setupapi.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/setupx.dll16
 lib/wine/%%WINEARCH%%-windows/setx.exe
 lib/wine/%%WINEARCH%%-windows/sfc.dll
 lib/wine/%%WINEARCH%%-windows/sfc_os.dll
 lib/wine/%%WINEARCH%%-windows/shcore.dll
 lib/wine/%%WINEARCH%%-windows/shdoclc.dll
 lib/wine/%%WINEARCH%%-windows/shdocvw.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/shell.dll16
 lib/wine/%%WINEARCH%%-windows/shell32.dll
 lib/wine/%%WINEARCH%%-windows/shfolder.dll
 lib/wine/%%WINEARCH%%-windows/shlwapi.dll
@@ -2211,25 +3299,22 @@
 lib/wine/%%WINEARCH%%-windows/slc.dll
 lib/wine/%%WINEARCH%%-windows/snmpapi.dll
 lib/wine/%%WINEARCH%%-windows/softpub.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/sound.drv16
 lib/wine/%%WINEARCH%%-windows/spoolss.dll
 lib/wine/%%WINEARCH%%-windows/spoolsv.exe
 lib/wine/%%WINEARCH%%-windows/sppc.dll
 lib/wine/%%WINEARCH%%-windows/srclient.dll
 lib/wine/%%WINEARCH%%-windows/srvcli.dll
+lib/wine/%%WINEARCH%%-windows/srvsvc.dll
 lib/wine/%%WINEARCH%%-windows/sspicli.dll
 lib/wine/%%WINEARCH%%-windows/start.exe
 lib/wine/%%WINEARCH%%-windows/stdole2.tlb
 lib/wine/%%WINEARCH%%-windows/stdole32.tlb
 lib/wine/%%WINEARCH%%-windows/sti.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/storage.dll16
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/stress.dll16
 lib/wine/%%WINEARCH%%-windows/strmdll.dll
 lib/wine/%%WINEARCH%%-windows/subst.exe
 lib/wine/%%WINEARCH%%-windows/svchost.exe
 lib/wine/%%WINEARCH%%-windows/svrapi.dll
 lib/wine/%%WINEARCH%%-windows/sxs.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/system.drv16
 lib/wine/%%WINEARCH%%-windows/systeminfo.exe
 lib/wine/%%WINEARCH%%-windows/t2embed.dll
 lib/wine/%%WINEARCH%%-windows/tapi32.dll
@@ -2242,11 +3327,9 @@
 lib/wine/%%WINEARCH%%-windows/tdi.sys
 lib/wine/%%WINEARCH%%-windows/termsv.exe
 lib/wine/%%WINEARCH%%-windows/threadpoolwinrt.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/toolhelp.dll16
 lib/wine/%%WINEARCH%%-windows/traffic.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/twain.dll16
 lib/wine/%%WINEARCH%%-windows/twain_32.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/typelib.dll16
+lib/wine/%%WINEARCH%%-windows/twinapi.appcore.dll
 lib/wine/%%WINEARCH%%-windows/tzres.dll
 lib/wine/%%WINEARCH%%-windows/ucrtbase.dll
 lib/wine/%%WINEARCH%%-windows/uianimation.dll
@@ -2259,7 +3342,6 @@
 lib/wine/%%WINEARCH%%-windows/url.dll
 lib/wine/%%WINEARCH%%-windows/urlmon.dll
 lib/wine/%%WINEARCH%%-windows/usbd.sys
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/user.exe16
 lib/wine/%%WINEARCH%%-windows/user32.dll
 lib/wine/%%WINEARCH%%-windows/userenv.dll
 lib/wine/%%WINEARCH%%-windows/usp10.dll
@@ -2274,22 +3356,13 @@
 lib/wine/%%WINEARCH%%-windows/vcomp90.dll
 lib/wine/%%WINEARCH%%-windows/vcruntime140.dll
 lib/wine/%%WINEARCH%%-windows/vcruntime140_1.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/vdhcp.vxd
 lib/wine/%%WINEARCH%%-windows/vdmdbg.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/ver.dll16
 lib/wine/%%WINEARCH%%-windows/version.dll
 lib/wine/%%WINEARCH%%-windows/vga.dll
 lib/wine/%%WINEARCH%%-windows/view.exe
 lib/wine/%%WINEARCH%%-windows/virtdisk.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/vmm.vxd
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/vnbt.vxd
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/vnetbios.vxd
 lib/wine/%%WINEARCH%%-windows/vssapi.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/vtdapi.vxd
 lib/wine/%%WINEARCH%%-windows/vulkan-1.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/vwin32.vxd
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/w32skrnl.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/w32sys.dll16
 lib/wine/%%WINEARCH%%-windows/wbemdisp.dll
 lib/wine/%%WINEARCH%%-windows/wbemprox.dll
 lib/wine/%%WINEARCH%%-windows/wdscore.dll
@@ -2303,22 +3376,28 @@
 lib/wine/%%WINEARCH%%-windows/whoami.exe
 lib/wine/%%WINEARCH%%-windows/wiaservc.dll
 lib/wine/%%WINEARCH%%-windows/wimgapi.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/win32s16.dll16
 lib/wine/%%WINEARCH%%-windows/win32u.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/win87em.dll16
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/winaspi.dll16
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/windebug.dll16
+lib/wine/%%WINEARCH%%-windows/windows.applicationmodel.dll
+lib/wine/%%WINEARCH%%-windows/windows.devices.bluetooth.dll
 lib/wine/%%WINEARCH%%-windows/windows.devices.enumeration.dll
+lib/wine/%%WINEARCH%%-windows/windows.devices.usb.dll
 lib/wine/%%WINEARCH%%-windows/windows.gaming.input.dll
 lib/wine/%%WINEARCH%%-windows/windows.gaming.ui.gamebar.dll
 lib/wine/%%WINEARCH%%-windows/windows.globalization.dll
 lib/wine/%%WINEARCH%%-windows/windows.media.devices.dll
 lib/wine/%%WINEARCH%%-windows/windows.media.dll
+lib/wine/%%WINEARCH%%-windows/windows.media.mediacontrol.dll
 lib/wine/%%WINEARCH%%-windows/windows.media.speech.dll
 lib/wine/%%WINEARCH%%-windows/windows.networking.dll
+lib/wine/%%WINEARCH%%-windows/windows.networking.hostname.dll
+lib/wine/%%WINEARCH%%-windows/windows.perception.stub.dll
+lib/wine/%%WINEARCH%%-windows/windows.security.credentials.ui.userconsentverifier.dll
+lib/wine/%%WINEARCH%%-windows/windows.storage.applicationdata.dll
+lib/wine/%%WINEARCH%%-windows/windows.system.profile.systemmanufacturers.dll
+lib/wine/%%WINEARCH%%-windows/windows.ui.dll
 lib/wine/%%WINEARCH%%-windows/windowscodecs.dll
 lib/wine/%%WINEARCH%%-windows/windowscodecsext.dll
-%%ALSA%%lib/wine/%%WINEARCH%%-windows/winealsa.drv
+lib/wine/%%WINEARCH%%-windows/winealsa.drv
 lib/wine/%%WINEARCH%%-windows/wineboot.exe
 lib/wine/%%WINEARCH%%-windows/winebrowser.exe
 lib/wine/%%WINEARCH%%-windows/winebus.sys
@@ -2333,31 +3412,21 @@
 lib/wine/%%WINEARCH%%-windows/winemenubuilder.exe
 lib/wine/%%WINEARCH%%-windows/winemine.exe
 lib/wine/%%WINEARCH%%-windows/winemsibuilder.exe
-%%OSS%%lib/wine/%%WINEARCH%%-windows/wineoss.drv
 lib/wine/%%WINEARCH%%-windows/winepath.exe
 lib/wine/%%WINEARCH%%-windows/wineps.drv
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/wineps16.drv16
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/winevdm.exe
 lib/wine/%%WINEARCH%%-windows/winevulkan.dll
-%%X11%%lib/wine/%%WINEARCH%%-windows/winex11.drv
-%%X11%%lib/wine/%%WINEARCH%%-windows/winexinput.sys
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/wing.dll16
+lib/wine/%%WINEARCH%%-windows/winex11.drv
+lib/wine/%%WINEARCH%%-windows/winexinput.sys
 lib/wine/%%WINEARCH%%-windows/wing32.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/winhelp.exe16
 lib/wine/%%WINEARCH%%-windows/winhlp32.exe
 lib/wine/%%WINEARCH%%-windows/winhttp.dll
 lib/wine/%%WINEARCH%%-windows/wininet.dll
 lib/wine/%%WINEARCH%%-windows/winmgmt.exe
 lib/wine/%%WINEARCH%%-windows/winmm.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/winnls.dll16
 lib/wine/%%WINEARCH%%-windows/winnls32.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/winoldap.mod16
 lib/wine/%%WINEARCH%%-windows/winprint.dll
-lib/wine/%%WINEARCH%%-windows/winscard.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/winsock.dll16
 lib/wine/%%WINEARCH%%-windows/winspool.drv
 lib/wine/%%WINEARCH%%-windows/winsta.dll
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/wintab.dll16
 lib/wine/%%WINEARCH%%-windows/wintab32.dll
 lib/wine/%%WINEARCH%%-windows/wintrust.dll
 lib/wine/%%WINEARCH%%-windows/wintypes.dll
@@ -2366,6 +3435,7 @@
 lib/wine/%%WINEARCH%%-windows/wlanapi.dll
 lib/wine/%%WINEARCH%%-windows/wlanui.dll
 lib/wine/%%WINEARCH%%-windows/wldap32.dll
+lib/wine/%%WINEARCH%%-windows/wldp.dll
 lib/wine/%%WINEARCH%%-windows/wmasf.dll
 lib/wine/%%WINEARCH%%-windows/wmi.dll
 lib/wine/%%WINEARCH%%-windows/wmic.exe
@@ -2377,10 +3447,9 @@
 lib/wine/%%WINEARCH%%-windows/wnaspi32.dll
 lib/wine/%%WINEARCH%%-windows/wofutil.dll
 lib/wine/%%WINEARCH%%-windows/wordpad.exe
-%%WINE32%%lib/wine/%%WINEARCH%%-windows/wow32.dll
-%%WINE64%%lib/wine/%%WINEARCH%%-windows/wow64.dll
-%%WINE64%%lib/wine/%%WINEARCH%%-windows/wow64cpu.dll
-%%WINE64%%lib/wine/%%WINEARCH%%-windows/wow64win.dll
+lib/wine/%%WINEARCH%%-windows/wow64.dll
+lib/wine/%%WINEARCH%%-windows/wow64cpu.dll
+lib/wine/%%WINEARCH%%-windows/wow64win.dll
 lib/wine/%%WINEARCH%%-windows/wpc.dll
 lib/wine/%%WINEARCH%%-windows/wpcap.dll
 lib/wine/%%WINEARCH%%-windows/write.exe
@@ -2441,10 +3510,10 @@
 lib/wine/%%WINEARCH%%-windows/xolehlp.dll
 lib/wine/%%WINEARCH%%-windows/xpsprint.dll
 lib/wine/%%WINEARCH%%-windows/xpssvcs.dll
-%%WINE32%%man/de.UTF-8/man1/wine.1.gz
+man/de.UTF-8/man1/wine.1.gz
 man/de.UTF-8/man1/winemaker.1.gz
 man/de.UTF-8/man1/wineserver.1.gz
-%%WINE32%%man/fr.UTF-8/man1/wine.1.gz
+man/fr.UTF-8/man1/wine.1.gz
 man/fr.UTF-8/man1/winemaker.1.gz
 man/fr.UTF-8/man1/wineserver.1.gz
 man/man1/msiexec.1.gz
@@ -2452,7 +3521,7 @@
 man/man1/regedit.1.gz
 man/man1/regsvr32.1.gz
 man/man1/widl.1.gz
-%%WINE32%%man/man1/wine.1.gz
+man/man1/wine.1.gz
 man/man1/wineboot.1.gz
 man/man1/winebuild.1.gz
 man/man1/winecfg.1.gz
@@ -2469,8 +3538,69 @@
 man/man1/wineserver.1.gz
 man/man1/wmc.1.gz
 man/man1/wrc.1.gz
-%%WINE32%%man/pl.UTF-8/man1/wine.1.gz
+man/pl.UTF-8/man1/wine.1.gz
 share/applications/wine.desktop
+%%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE.md
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%DOCSDIR%%/README.winedbg
+%%PORTDOCS%%%%DOCSDIR%%/README.winedump
+%%DATADIR%%/fonts/coue1255.fon
+%%DATADIR%%/fonts/coue1256.fon
+%%DATADIR%%/fonts/coue1257.fon
+%%DATADIR%%/fonts/coure.fon
+%%DATADIR%%/fonts/couree.fon
+%%DATADIR%%/fonts/coureg.fon
+%%DATADIR%%/fonts/courer.fon
+%%DATADIR%%/fonts/couret.fon
+%%DATADIR%%/fonts/cvgasys.fon
+%%DATADIR%%/fonts/hvgasys.fon
+%%DATADIR%%/fonts/jsmalle.fon
+%%DATADIR%%/fonts/jvgafix.fon
+%%DATADIR%%/fonts/jvgasys.fon
+%%DATADIR%%/fonts/marlett.ttf
+%%DATADIR%%/fonts/smae1255.fon
+%%DATADIR%%/fonts/smae1256.fon
+%%DATADIR%%/fonts/smae1257.fon
+%%DATADIR%%/fonts/smalle.fon
+%%DATADIR%%/fonts/smallee.fon
+%%DATADIR%%/fonts/smalleg.fon
+%%DATADIR%%/fonts/smaller.fon
+%%DATADIR%%/fonts/smallet.fon
+%%DATADIR%%/fonts/ssee1255.fon
+%%DATADIR%%/fonts/ssee1256.fon
+%%DATADIR%%/fonts/ssee1257.fon
+%%DATADIR%%/fonts/ssee874.fon
+%%DATADIR%%/fonts/ssef1255.fon
+%%DATADIR%%/fonts/ssef1256.fon
+%%DATADIR%%/fonts/ssef1257.fon
+%%DATADIR%%/fonts/ssef874.fon
+%%DATADIR%%/fonts/sserife.fon
+%%DATADIR%%/fonts/sserifee.fon
+%%DATADIR%%/fonts/sserifeg.fon
+%%DATADIR%%/fonts/sserifer.fon
+%%DATADIR%%/fonts/sserifet.fon
+%%DATADIR%%/fonts/sseriff.fon
+%%DATADIR%%/fonts/sseriffe.fon
+%%DATADIR%%/fonts/sseriffg.fon
+%%DATADIR%%/fonts/sseriffr.fon
+%%DATADIR%%/fonts/sserifft.fon
+%%DATADIR%%/fonts/svgasys.fon
+%%DATADIR%%/fonts/symbol.ttf
+%%DATADIR%%/fonts/tahoma.ttf
+%%DATADIR%%/fonts/tahomabd.ttf
+%%DATADIR%%/fonts/vgafix.fon
+%%DATADIR%%/fonts/vgas1255.fon
+%%DATADIR%%/fonts/vgas1256.fon
+%%DATADIR%%/fonts/vgas1257.fon
+%%DATADIR%%/fonts/vgas874.fon
+%%DATADIR%%/fonts/vgasys.fon
+%%DATADIR%%/fonts/vgasyse.fon
+%%DATADIR%%/fonts/vgasysg.fon
+%%DATADIR%%/fonts/vgasysr.fon
+%%DATADIR%%/fonts/vgasyst.fon
+%%DATADIR%%/fonts/webdings.ttf
+%%DATADIR%%/fonts/wingding.ttf
 %%DATADIR%%/nls/c_037.nls
 %%DATADIR%%/nls/c_10000.nls
 %%DATADIR%%/nls/c_10001.nls
@@ -2547,65 +3677,3 @@
 %%DATADIR%%/nls/normnfkc.nls
 %%DATADIR%%/nls/normnfkd.nls
 %%DATADIR%%/nls/sortdefault.nls
-%%WINE64%%%%DATADIR%%/pkg32.sh
-%%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.winedbg
-%%PORTDOCS%%%%DOCSDIR%%/README.winedump
-%%X11%%%%DATADIR%%/fonts/coue1255.fon
-%%X11%%%%DATADIR%%/fonts/coue1256.fon
-%%X11%%%%DATADIR%%/fonts/coue1257.fon
-%%X11%%%%DATADIR%%/fonts/coure.fon
-%%X11%%%%DATADIR%%/fonts/couree.fon
-%%X11%%%%DATADIR%%/fonts/coureg.fon
-%%X11%%%%DATADIR%%/fonts/courer.fon
-%%X11%%%%DATADIR%%/fonts/couret.fon
-%%X11%%%%DATADIR%%/fonts/cvgasys.fon
-%%X11%%%%DATADIR%%/fonts/hvgasys.fon
-%%X11%%%%DATADIR%%/fonts/jsmalle.fon
-%%X11%%%%DATADIR%%/fonts/jvgafix.fon
-%%X11%%%%DATADIR%%/fonts/jvgasys.fon
-%%X11%%%%DATADIR%%/fonts/marlett.ttf
-%%X11%%%%DATADIR%%/fonts/smae1255.fon
-%%X11%%%%DATADIR%%/fonts/smae1256.fon
-%%X11%%%%DATADIR%%/fonts/smae1257.fon
-%%X11%%%%DATADIR%%/fonts/smalle.fon
-%%X11%%%%DATADIR%%/fonts/smallee.fon
-%%X11%%%%DATADIR%%/fonts/smalleg.fon
-%%X11%%%%DATADIR%%/fonts/smaller.fon
-%%X11%%%%DATADIR%%/fonts/smallet.fon
-%%X11%%%%DATADIR%%/fonts/ssee1255.fon
-%%X11%%%%DATADIR%%/fonts/ssee1256.fon
-%%X11%%%%DATADIR%%/fonts/ssee1257.fon
-%%X11%%%%DATADIR%%/fonts/ssee874.fon
-%%X11%%%%DATADIR%%/fonts/ssef1255.fon
-%%X11%%%%DATADIR%%/fonts/ssef1256.fon
-%%X11%%%%DATADIR%%/fonts/ssef1257.fon
-%%X11%%%%DATADIR%%/fonts/ssef874.fon
-%%X11%%%%DATADIR%%/fonts/sserife.fon
-%%X11%%%%DATADIR%%/fonts/sserifee.fon
-%%X11%%%%DATADIR%%/fonts/sserifeg.fon
-%%X11%%%%DATADIR%%/fonts/sserifer.fon
-%%X11%%%%DATADIR%%/fonts/sserifet.fon
-%%X11%%%%DATADIR%%/fonts/sseriff.fon
-%%X11%%%%DATADIR%%/fonts/sseriffe.fon
-%%X11%%%%DATADIR%%/fonts/sseriffg.fon
-%%X11%%%%DATADIR%%/fonts/sseriffr.fon
-%%X11%%%%DATADIR%%/fonts/sserifft.fon
-%%X11%%%%DATADIR%%/fonts/svgasys.fon
-%%X11%%%%DATADIR%%/fonts/symbol.ttf
-%%X11%%%%DATADIR%%/fonts/tahoma.ttf
-%%X11%%%%DATADIR%%/fonts/tahomabd.ttf
-%%X11%%%%DATADIR%%/fonts/vgafix.fon
-%%X11%%%%DATADIR%%/fonts/vgas1255.fon
-%%X11%%%%DATADIR%%/fonts/vgas1256.fon
-%%X11%%%%DATADIR%%/fonts/vgas1257.fon
-%%X11%%%%DATADIR%%/fonts/vgas874.fon
-%%X11%%%%DATADIR%%/fonts/vgasys.fon
-%%X11%%%%DATADIR%%/fonts/vgasyse.fon
-%%X11%%%%DATADIR%%/fonts/vgasysg.fon
-%%X11%%%%DATADIR%%/fonts/vgasysr.fon
-%%X11%%%%DATADIR%%/fonts/vgasyst.fon
-%%X11%%%%DATADIR%%/fonts/webdings.ttf
-%%X11%%%%DATADIR%%/fonts/wingding.ttf