emulators/wine-devel: Update to Wine 6.20

This includes the following changes:
 - MSXml, XAudio, DInput and a few other modules converted to PE.
 - A few system libraries are bundled with the source to support PE builds.
 - HID joystick is now the only supported joystick backend in DirectInput.
 - Better support for MSVCRT builds in Winelib.
 - Various bug fixes.

Also, using our patches within this Port (for now):
 - procfs no longer needs to be mounted on /proc, we use sysctl() instead.
 - The Staging patchset will apply even if $PORTSDIR is a Git repository.

The latter requires lang/gawk as an additional EXTRACT_DEPENDS.

(The now bundled system libraries will trigger some follow-up changes,
but for now we're okay.)

Approved by:	maintainer (= author)
This commit is contained in:
Damjan Jovanovic 2021-11-01 08:57:10 +00:00 committed by Gerald Pfeifer
parent e6a5c3bfab
commit e041ced513
6 changed files with 420 additions and 11 deletions

View file

@ -1,8 +1,7 @@
# Created by: Gerald Pfeifer <gerald@FreeBSD.org>
PORTNAME= wine
DISTVERSION= 6.19
PORTREVISION= 3
DISTVERSION= 6.20
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/Source \
@ -109,7 +108,8 @@ STAGING_DIST= v${DISTVERSION}.tar.gz
STAGING_DISTFILES= ${STAGING_DIST}:staging
STAGING_EXTRACT_DEPENDS= bash:shells/bash \
git:devel/git \
autoconf>0:devel/autoconf
autoconf>0:devel/autoconf \
gawk:lang/gawk
STAGING_LIB_DEPENDS= libtxc_dxtn.so:graphics/s2tc
V4L_CONFIGURE_WITH= v4l2
@ -160,6 +160,7 @@ PLIST_SUB+= WINE32="" WINE64="@comment " WINEARCH="i386"
post-extract-STAGING-on: fix-shebang
cd ${WRKSRC} && ${TAR} xf ${DISTDIR}/${STAGING_DIST} --strip-components 1
cd ${WRKSRC} && ${PATCH} -p0 < ${PATCHDIR}/extra-gitapply
cd ${WRKSRC} && bash ./patches/patchinstall.sh --backend=patch DESTDIR=${WRKSRC} --all
pre-build:

View file

@ -1,5 +1,5 @@
TIMESTAMP = 1633927265
SHA256 (wine-6.19.tar.xz) = 4182e2d9627704cc376f46fc3109580ea9077796f44f5ee83e08e3e96bf0ab66
SIZE (wine-6.19.tar.xz) = 24894356
SHA256 (v6.19.tar.gz) = 47158842c938f68d9097965135321892515bb7f133c88be469c91f845f942ac3
SIZE (v6.19.tar.gz) = 9690585
TIMESTAMP = 1634993849
SHA256 (wine-6.20.tar.xz) = 4028237e9c7bfdd56d7604af19783ff812f645f29c27de742a688e4535528471
SIZE (wine-6.20.tar.xz) = 26921644
SHA256 (v6.20.tar.gz) = 360fd304a0f4c12e3aa149dde0bc3ac7a2c8787740e1f228bd13158f855166ea
SIZE (v6.20.tar.gz) = 9643278

View file

@ -0,0 +1,66 @@
--- patches/gitapply.sh 2021-10-23 11:20:53.385792000 +0200
+++ patches/gitapply.sh 2021-10-23 11:21:40.952836000 +0200
@@ -22,6 +22,13 @@
nogit=0
tmpfile=""
+patch="patch"
+sha1sum="sha1sum"
+if [ `uname -s` = "FreeBSD" ]; then
+ patch="gpatch"
+ sha1sum="sha1"
+fi
+
# Show usage information about gitapply script
usage()
{
@@ -57,7 +64,7 @@
gitsha1()
{
if [ -f "$1" ]; then
- echo -en "blob $(du -b "$1" | cut -f1)\x00" | cat - "$1" | sha1sum | cut -d' ' -f1
+ echo -en "blob $(wc -c < "$1" | xargs | cut -d' ' -f1)\x00" | cat - "$1" | $sha1sum | cut -d' ' -f1
else
echo "0000000000000000000000000000000000000000"
fi
@@ -66,7 +73,7 @@
# Determine size of a file (or zero, if it doesn't exist)
filesize()
{
- local size=$(du -b "$1" | cut -f1)
+ local size=$(wc -c < "$1" | xargs | cut -d' ' -f1)
if [ -z "$size" ]; then
size="0"
fi
@@ -114,13 +121,6 @@
exit 1
fi
-# Detect BSD - we check this first to error out as early as possible
-if gzip -V 2>&1 | grep -q "BSD"; then
- echo "This script is not compatible with *BSD utilities. Please install git," >&2
- echo "which provides the same functionality and will be used instead." >&2
- exit 1
-fi
-
# Check if GNU Awk is available
if ! command -v gawk >/dev/null 2>&1; then
if ! awk -V 2>/dev/null | grep -q "GNU Awk"; then
@@ -135,7 +135,7 @@
fi
# Check for missing depdencies
-for dependency in gawk cut dd du grep gzip hexdump patch sha1sum; do
+for dependency in gawk cut dd grep gzip hexdump $patch $sha1sum; do
if ! command -v "$dependency" >/dev/null 2>&1; then
echo "Missing dependency: $dependency - please install this program and try again." >&2
exit 1
@@ -358,7 +358,7 @@
# Apply textual patch
tmpoffset=$((lastoffset - 1))
- if ! sed -n "$offset,$tmpoffset p" "$tmpfile" | patch -p1 -s -f; then
+ if ! sed -n "$offset,$tmpoffset p" "$tmpfile" | $patch -p1 -s -f; then
abort "Textual patch did not apply, aborting."
fi

View file

@ -0,0 +1,36 @@
commit 57db53024a79aa5ce3c691d94b5f167a34ef0530
Author: Damjan Jovanovic <damjan.jov@gmail.com>
Date: Sat Oct 23 10:54:48 2021 +0200
winebus.sys: get inotify working on FreeBSD
FreeBSD requires linking to the inotify library, and
including limits.h.
Signed-off-by: Damjan Jovanovic <damjan.jov@gmail.com>
diff --git dlls/winebus.sys/Makefile.in dlls/winebus.sys/Makefile.in
index 6fc6fc5a632..d9ea33d267d 100644
--- dlls/winebus.sys/Makefile.in
+++ dlls/winebus.sys/Makefile.in
@@ -1,7 +1,7 @@
MODULE = winebus.sys
UNIXLIB = winebus.so
IMPORTS = ntoskrnl hidparse
-EXTRALIBS = $(IOKIT_LIBS) $(UDEV_LIBS) $(PTHREAD_LIBS)
+EXTRALIBS = $(IOKIT_LIBS) $(UDEV_LIBS) $(PTHREAD_LIBS) $(INOTIFY_LIBS)
EXTRAINCL = $(UDEV_CFLAGS) $(SDL2_CFLAGS)
EXTRADLLFLAGS = -Wl,--subsystem,native
diff --git dlls/winebus.sys/bus_udev.c dlls/winebus.sys/bus_udev.c
index 8889b6a3e1f..4c00fe6ad39 100644
--- dlls/winebus.sys/bus_udev.c
+++ dlls/winebus.sys/bus_udev.c
@@ -52,6 +52,7 @@
#ifdef HAVE_SYS_INOTIFY_H
# include <sys/inotify.h>
#endif
+#include <limits.h>
#ifdef HAVE_LINUX_INPUT_H
# include <linux/input.h>

View file

@ -0,0 +1,284 @@
commit 6e67f3beaabdf70832e2c71d2505fc96a4aa9456
Author: Damjan Jovanovic <damjan.jov@gmail.com>
Date: Sat Oct 23 09:57:09 2021 +0200
Use sysctl() instead of /proc/curproc/file throughout Wine.
diff --git dlls/ntdll/unix/loader.c dlls/ntdll/unix/loader.c
index 4e807744862..2be11dc3747 100644
--- dlls/ntdll/unix/loader.c
+++ dlls/ntdll/unix/loader.c
@@ -58,6 +58,10 @@
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
+#include <limits.h>
+#ifdef HAVE_SYS_SYSCTL_H
+# include <sys/sysctl.h>
+#endif
#ifdef __APPLE__
# include <CoreFoundation/CoreFoundation.h>
# define LoadResource MacLoadResource
@@ -588,6 +592,11 @@ static void set_config_dir(void)
static void init_paths( char *argv[] )
{
Dl_info info;
+#if defined (__FreeBSD__) || defined(__DragonFly__)
+ static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
+ char *path;
+ size_t path_size;
+#endif
argv0 = strdup( argv[0] );
@@ -600,7 +609,10 @@ static void init_paths( char *argv[] )
#if (defined(__linux__) && !defined(__ANDROID__)) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
bin_dir = realpath_dirname( "/proc/self/exe" );
#elif defined (__FreeBSD__) || defined(__DragonFly__)
- bin_dir = realpath_dirname( "/proc/curproc/file" );
+ path = malloc( path_size = PATH_MAX );
+ if (path && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 ))
+ bin_dir = realpath_dirname( path );
+ free( path );
#else
bin_dir = realpath_dirname( argv0 );
#endif
diff --git libs/wine/config.c libs/wine/config.c
index cb42421c168..23c76fda128 100644
--- libs/wine/config.c
+++ libs/wine/config.c
@@ -28,8 +28,12 @@
#include <stdlib.h>
#include <string.h>
#include <errno.h>
+#include <limits.h>
#include <sys/types.h>
#include <sys/stat.h>
+#ifdef HAVE_SYS_SYSCTL_H
+# include <sys/sysctl.h>
+#endif
#include <unistd.h>
#include <dlfcn.h>
#ifdef HAVE_PWD_H
@@ -56,8 +60,6 @@ static void fatal_error( const char *err, ... ) __attribute__((noreturn,format(
#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
static const char exe_link[] = "/proc/self/exe";
-#elif defined (__FreeBSD__) || defined(__DragonFly__)
-static const char exe_link[] = "/proc/curproc/file";
#else
static const char exe_link[] = "";
#endif
@@ -141,8 +143,18 @@ static char *symlink_dirname( const char *name )
/* return the directory that contains the main exe at run-time */
static char *get_runtime_exedir(void)
{
+#if defined(__FreeBSD__) || defined(__DragonFly__)
+ static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
+ size_t dir_size = PATH_MAX;
+ char *dir = malloc( dir_size );
+ if (dir && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), dir, &dir_size, NULL, 0 ))
+ return dir;
+ free( dir );
+ return NULL;
+#else
if (exe_link[0]) return symlink_dirname( exe_link );
return NULL;
+#endif
}
/* return the base directory from argv0 */
diff --git loader/main.c loader/main.c
index fdc77c56162..242ff15accd 100644
--- loader/main.c
+++ loader/main.c
@@ -29,6 +29,10 @@
#include <sys/stat.h>
#include <unistd.h>
#include <dlfcn.h>
+#include <limits.h>
+#ifdef HAVE_SYS_SYSCTL_H
+# include <sys/sysctl.h>
+#endif
#include "main.h"
@@ -83,8 +87,14 @@ static const char *get_self_exe( char *argv0 )
#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
return "/proc/self/exe";
#elif defined (__FreeBSD__) || defined(__DragonFly__)
- return "/proc/curproc/file";
-#else
+ static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
+ size_t path_size = PATH_MAX;
+ char *path = malloc( path_size );
+ if (path && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 ))
+ return path;
+ free( path );
+#endif
+
if (!strchr( argv0, '/' )) /* search in PATH */
{
char *p, *path = getenv( "PATH" );
@@ -104,7 +114,6 @@ static const char *get_self_exe( char *argv0 )
return NULL;
}
return argv0;
-#endif
}
static void *try_dlopen( const char *dir, const char *name )
diff --git server/unicode.c server/unicode.c
index 67698d7639c..86a1217b01f 100644
--- server/unicode.c
+++ server/unicode.c
@@ -25,6 +25,10 @@
#include <stdio.h>
#include <stdarg.h>
#include <unistd.h>
+#include <limits.h>
+#ifdef HAVE_SYS_SYSCTL_H
+# include <sys/sysctl.h>
+#endif
#include "windef.h"
#include "winternl.h"
@@ -240,7 +244,17 @@ static char *get_nls_dir(void)
#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
dir = realpath( "/proc/self/exe", NULL );
#elif defined (__FreeBSD__) || defined(__DragonFly__)
- dir = realpath( "/proc/curproc/file", NULL );
+ static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
+ size_t dir_size = PATH_MAX;
+ dir = malloc( dir_size );
+ if (dir)
+ {
+ if (sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), dir, &dir_size, NULL, 0 ))
+ {
+ free( dir );
+ dir = NULL;
+ }
+ }
#else
dir = realpath( server_argv0, NULL );
#endif
diff --git tools/widl/widl.c tools/widl/widl.c
index e5a772e87bd..79c92e2f338 100644
--- tools/widl/widl.c
+++ tools/widl/widl.c
@@ -29,6 +29,11 @@
#include <assert.h>
#include <ctype.h>
#include <signal.h>
+#include <limits.h>
+#include <sys/types.h>
+#ifdef HAVE_SYS_SYSCTL_H
+# include <sys/sysctl.h>
+#endif
#include "widl.h"
#include "utils.h"
@@ -562,7 +567,12 @@ static void init_argv0_dir( const char *argv0 )
#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
dir = realpath( "/proc/self/exe", NULL );
#elif defined (__FreeBSD__) || defined(__DragonFly__)
- dir = realpath( "/proc/curproc/file", NULL );
+ static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
+ size_t path_size = PATH_MAX;
+ char *path = malloc( path_size );
+ if (path && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 ))
+ dir = realpath( path, NULL );
+ free( path );
#else
dir = realpath( argv0, NULL );
#endif
diff --git tools/winegcc/winegcc.c tools/winegcc/winegcc.c
index 5204553f739..b1123cd7e51 100644
--- tools/winegcc/winegcc.c
+++ tools/winegcc/winegcc.c
@@ -96,6 +96,11 @@
#include <string.h>
#include <errno.h>
#include <ctype.h>
+#include <limits.h>
+#include <sys/types.h>
+#ifdef HAVE_SYS_SYSCTL_H
+# include <sys/sysctl.h>
+#endif
#include "utils.h"
@@ -747,7 +752,12 @@ static void init_argv0_dir( const char *argv0 )
#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
dir = realpath( "/proc/self/exe", NULL );
#elif defined (__FreeBSD__) || defined(__DragonFly__)
- dir = realpath( "/proc/curproc/file", NULL );
+ static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
+ size_t path_size = PATH_MAX;
+ char *path = malloc( path_size );
+ if (path && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 ))
+ dir = realpath( path, NULL );
+ free( path );
#else
dir = realpath( argv0, NULL );
#endif
diff --git tools/wmc/wmc.c tools/wmc/wmc.c
index 864c969b136..2993d3c5ef7 100644
--- tools/wmc/wmc.c
+++ tools/wmc/wmc.c
@@ -24,6 +24,11 @@
#include <stdlib.h>
#include <string.h>
#include <signal.h>
+#include <limits.h>
+#include <sys/types.h>
+#ifdef HAVE_SYS_SYSCTL_H
+# include <sys/sysctl.h>
+#endif
#include "wmc.h"
#include "utils.h"
@@ -165,7 +170,12 @@ static void init_argv0_dir( const char *argv0 )
#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
dir = realpath( "/proc/self/exe", NULL );
#elif defined (__FreeBSD__) || defined(__DragonFly__)
- dir = realpath( "/proc/curproc/file", NULL );
+ static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
+ size_t path_size = PATH_MAX;
+ char *path = malloc( path_size );
+ if (path && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 ))
+ dir = realpath( path, NULL );
+ free( path );
#else
dir = realpath( argv0, NULL );
#endif
diff --git tools/wrc/wrc.c tools/wrc/wrc.c
index 8cdb91195cf..b44ae6fd0e5 100644
--- tools/wrc/wrc.c
+++ tools/wrc/wrc.c
@@ -27,6 +27,11 @@
#include <assert.h>
#include <ctype.h>
#include <signal.h>
+#include <limits.h>
+#include <sys/types.h>
+#ifdef HAVE_SYS_SYSCTL_H
+# include <sys/sysctl.h>
+#endif
#include "../tools.h"
#include "wrc.h"
@@ -336,7 +341,12 @@ static void init_argv0_dir( const char *argv0 )
#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
dir = realpath( "/proc/self/exe", NULL );
#elif defined (__FreeBSD__) || defined(__DragonFly__)
- dir = realpath( "/proc/curproc/file", NULL );
+ static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
+ size_t path_size = PATH_MAX;
+ char *path = malloc( path_size );
+ if (path && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 ))
+ dir = realpath( path, NULL );
+ free( path );
#else
dir = realpath( argv0, NULL );
#endif

View file

@ -200,6 +200,7 @@ include/wine/windows/commoncontrols.idl
include/wine/windows/compobj.h
include/wine/windows/comsvcs.h
include/wine/windows/comsvcs.idl
include/wine/windows/concurrencysal.h
include/wine/windows/consoleapi.h
include/wine/windows/control.h
include/wine/windows/control.idl
@ -379,6 +380,7 @@ include/wine/windows/dplay8.h
include/wine/windows/dplobby.h
include/wine/windows/dplobby8.h
include/wine/windows/dpnathlp.h
include/wine/windows/driverspecs.h
include/wine/windows/drmexternals.h
include/wine/windows/drmexternals.idl
include/wine/windows/dsclient.h
@ -695,6 +697,7 @@ include/wine/windows/ntquery.h
include/wine/windows/ntsecapi.h
include/wine/windows/ntsecpkg.h
include/wine/windows/ntstatus.h
include/wine/windows/ntuser.h
%%STAGING%%include/wine/windows/nvapi.h
%%STAGING%%include/wine/windows/nvcuvid.h
%%STAGING%%include/wine/windows/nvencodeapi.h
@ -852,6 +855,7 @@ include/wine/windows/snmp.h
include/wine/windows/softpub.h
include/wine/windows/spatialaudioclient.h
include/wine/windows/spatialaudioclient.idl
include/wine/windows/specstrings.h
include/wine/windows/sperror.h
include/wine/windows/sql.h
include/wine/windows/sqlext.h
@ -975,6 +979,8 @@ include/wine/windows/wincrypt.h
include/wine/windows/windef.h
include/wine/windows/windns.h
include/wine/windows/windot11.h
include/wine/windows/windows.devices.enumeration.h
include/wine/windows/windows.devices.enumeration.idl
include/wine/windows/windows.foundation.collections.h
include/wine/windows/windows.foundation.collections.idl
include/wine/windows/windows.foundation.h
@ -1056,6 +1062,8 @@ include/wine/windows/wmsbuffer.idl
include/wine/windows/wmsdk.h
include/wine/windows/wmsdkidl.h
include/wine/windows/wmsdkidl.idl
include/wine/windows/wmsecure.h
include/wine/windows/wmsecure.idl
include/wine/windows/wnaspi32.h
include/wine/windows/wownt16.h
include/wine/windows/wownt32.h
@ -1511,6 +1519,7 @@ lib/wine/%%WINEARCH%%-unix/ddraw.dll.so
lib/wine/%%WINEARCH%%-unix/ddrawex.dll.so
lib/wine/%%WINEARCH%%-unix/devenum.dll.so
lib/wine/%%WINEARCH%%-unix/dhcpcsvc.dll.so
lib/wine/%%WINEARCH%%-unix/dhcpcsvc6.dll.so
lib/wine/%%WINEARCH%%-unix/dhtmled.ocx.so
lib/wine/%%WINEARCH%%-unix/difxapi.dll.so
lib/wine/%%WINEARCH%%-unix/dinput.dll.so
@ -1765,11 +1774,13 @@ lib/wine/%%WINEARCH%%-unix/libdxgi.def
lib/wine/%%WINEARCH%%-unix/libdxguid.a
lib/wine/%%WINEARCH%%-unix/libdxva2.def
lib/wine/%%WINEARCH%%-unix/libevr.def
lib/wine/%%WINEARCH%%-unix/libfaudio.a
lib/wine/%%WINEARCH%%-unix/libfaultrep.def
%%STAGING%%lib/wine/%%WINEARCH%%-unix/libfltmgr.def
lib/wine/%%WINEARCH%%-unix/libgdi32.def
lib/wine/%%WINEARCH%%-unix/libgdiplus.def
lib/wine/%%WINEARCH%%-unix/libglu32.def
lib/wine/%%WINEARCH%%-unix/libgsm.a
lib/wine/%%WINEARCH%%-unix/libhal.def
lib/wine/%%WINEARCH%%-unix/libhid.def
lib/wine/%%WINEARCH%%-unix/libhidclass.def
@ -1782,10 +1793,13 @@ lib/wine/%%WINEARCH%%-unix/libimagehlp.def
lib/wine/%%WINEARCH%%-unix/libimm32.def
lib/wine/%%WINEARCH%%-unix/libinetcomm.def
lib/wine/%%WINEARCH%%-unix/libiphlpapi.def
lib/wine/%%WINEARCH%%-unix/libjpeg.a
lib/wine/%%WINEARCH%%-unix/libjsproxy.def
lib/wine/%%WINEARCH%%-unix/libjxr.a
%%WINE32%%lib/wine/%%WINEARCH%%-unix/libkernel.def
lib/wine/%%WINEARCH%%-unix/libkernel32.def
lib/wine/%%WINEARCH%%-unix/libkernelbase.def
lib/wine/%%WINEARCH%%-unix/liblcms2.a
lib/wine/%%WINEARCH%%-unix/libloadperf.def
lib/wine/%%WINEARCH%%-unix/liblz32.def
lib/wine/%%WINEARCH%%-unix/libmapi32.def
@ -1796,6 +1810,7 @@ lib/wine/%%WINEARCH%%-unix/libmfplay.def
lib/wine/%%WINEARCH%%-unix/libmfreadwrite.def
lib/wine/%%WINEARCH%%-unix/libmfuuid.a
lib/wine/%%WINEARCH%%-unix/libmlang.def
lib/wine/%%WINEARCH%%-unix/libmpg123.a
lib/wine/%%WINEARCH%%-unix/libmpr.def
lib/wine/%%WINEARCH%%-unix/libmprapi.def
lib/wine/%%WINEARCH%%-unix/libmsacm32.def
@ -1838,6 +1853,7 @@ lib/wine/%%WINEARCH%%-unix/libolepro32.def
lib/wine/%%WINEARCH%%-unix/libolesvr32.def
lib/wine/%%WINEARCH%%-unix/libopengl32.def
lib/wine/%%WINEARCH%%-unix/libpdh.def
lib/wine/%%WINEARCH%%-unix/libpng.a
lib/wine/%%WINEARCH%%-unix/libpowrprof.def
lib/wine/%%WINEARCH%%-unix/libprntvpt.def
lib/wine/%%WINEARCH%%-unix/libpropsys.def
@ -1872,6 +1888,7 @@ lib/wine/%%WINEARCH%%-unix/libstrmiids.a
lib/wine/%%WINEARCH%%-unix/libsxs.def
lib/wine/%%WINEARCH%%-unix/libt2embed.def
lib/wine/%%WINEARCH%%-unix/libtapi32.def
lib/wine/%%WINEARCH%%-unix/libtiff.a
lib/wine/%%WINEARCH%%-unix/libucrtbase.a
lib/wine/%%WINEARCH%%-unix/libuiautomationcore.def
lib/wine/%%WINEARCH%%-unix/libunicows.def
@ -1920,7 +1937,10 @@ lib/wine/%%WINEARCH%%-unix/libwsock32.def
lib/wine/%%WINEARCH%%-unix/libwtsapi32.def
%%STAGING%%lib/wine/%%WINEARCH%%-unix/libx3daudio1_7.def
lib/wine/%%WINEARCH%%-unix/libxinput.def
lib/wine/%%WINEARCH%%-unix/libxml2.a
lib/wine/%%WINEARCH%%-unix/libxmllite.def
lib/wine/%%WINEARCH%%-unix/libxslt.a
lib/wine/%%WINEARCH%%-unix/libz.a
lib/wine/%%WINEARCH%%-unix/light.msstyles.so
lib/wine/%%WINEARCH%%-unix/loadperf.dll.so
lib/wine/%%WINEARCH%%-unix/localspl.dll.so
@ -1964,7 +1984,6 @@ lib/wine/%%WINEARCH%%-unix/msadp32.acm.so
lib/wine/%%WINEARCH%%-unix/msasn1.dll.so
lib/wine/%%WINEARCH%%-unix/mscat32.dll.so
lib/wine/%%WINEARCH%%-unix/mscms.dll.so
lib/wine/%%WINEARCH%%-unix/mscms.so
lib/wine/%%WINEARCH%%-unix/mscoree.dll.so
lib/wine/%%WINEARCH%%-unix/mscorwks.dll.so
lib/wine/%%WINEARCH%%-unix/msctf.dll.so
@ -2135,6 +2154,7 @@ lib/wine/%%WINEARCH%%-unix/regsvr32.exe.so
lib/wine/%%WINEARCH%%-unix/resutils.dll.so
lib/wine/%%WINEARCH%%-unix/riched20.dll.so
lib/wine/%%WINEARCH%%-unix/riched32.dll.so
lib/wine/%%WINEARCH%%-unix/robocopy.exe.so
lib/wine/%%WINEARCH%%-unix/rpcrt4.dll.so
lib/wine/%%WINEARCH%%-unix/rpcss.exe.so
lib/wine/%%WINEARCH%%-unix/rsabase.dll.so
@ -2232,7 +2252,6 @@ lib/wine/%%WINEARCH%%-unix/urlmon.dll.so
lib/wine/%%WINEARCH%%-unix/usbd.sys.so
%%WINE32%%lib/wine/%%WINEARCH%%-unix/user.exe16.so
lib/wine/%%WINEARCH%%-unix/user32.dll.so
lib/wine/%%WINEARCH%%-unix/user32.so
lib/wine/%%WINEARCH%%-unix/userenv.dll.so
lib/wine/%%WINEARCH%%-unix/usp10.dll.so
lib/wine/%%WINEARCH%%-unix/utildll.dll.so
@ -2282,6 +2301,7 @@ lib/wine/%%WINEARCH%%-unix/win32u.so
%%WINE32%%lib/wine/%%WINEARCH%%-unix/win87em.dll16.so
%%WINE32%%lib/wine/%%WINEARCH%%-unix/winaspi.dll16.so
%%WINE32%%lib/wine/%%WINEARCH%%-unix/windebug.dll16.so
lib/wine/%%WINEARCH%%-unix/windows.devices.enumeration.dll.so
lib/wine/%%WINEARCH%%-unix/windows.gaming.input.dll.so
lib/wine/%%WINEARCH%%-unix/windows.globalization.dll.so
lib/wine/%%WINEARCH%%-unix/windows.media.devices.dll.so
@ -2344,7 +2364,6 @@ lib/wine/%%WINEARCH%%-unix/wmic.exe.so
lib/wine/%%WINEARCH%%-unix/wmiutils.dll.so
lib/wine/%%WINEARCH%%-unix/wmp.dll.so
lib/wine/%%WINEARCH%%-unix/wmphoto.dll.so
lib/wine/%%WINEARCH%%-unix/wmphoto.so
lib/wine/%%WINEARCH%%-unix/wmplayer.exe.so
lib/wine/%%WINEARCH%%-unix/wmvcore.dll.so
lib/wine/%%WINEARCH%%-unix/wnaspi32.dll.so
@ -2789,6 +2808,7 @@ lib/wine/%%WINEARCH%%-windows/ddraw.dll
lib/wine/%%WINEARCH%%-windows/ddrawex.dll
lib/wine/%%WINEARCH%%-windows/devenum.dll
lib/wine/%%WINEARCH%%-windows/dhcpcsvc.dll
lib/wine/%%WINEARCH%%-windows/dhcpcsvc6.dll
lib/wine/%%WINEARCH%%-windows/dhtmled.ocx
lib/wine/%%WINEARCH%%-windows/difxapi.dll
lib/wine/%%WINEARCH%%-windows/dinput.dll
@ -3174,6 +3194,7 @@ lib/wine/%%WINEARCH%%-windows/regsvr32.exe
lib/wine/%%WINEARCH%%-windows/resutils.dll
lib/wine/%%WINEARCH%%-windows/riched20.dll
lib/wine/%%WINEARCH%%-windows/riched32.dll
lib/wine/%%WINEARCH%%-windows/robocopy.exe
lib/wine/%%WINEARCH%%-windows/rpcrt4.dll
lib/wine/%%WINEARCH%%-windows/rpcss.exe
lib/wine/%%WINEARCH%%-windows/rsabase.dll
@ -3318,6 +3339,7 @@ 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.devices.enumeration.dll
lib/wine/%%WINEARCH%%-windows/windows.gaming.input.dll
lib/wine/%%WINEARCH%%-windows/windows.globalization.dll
lib/wine/%%WINEARCH%%-windows/windows.media.devices.dll