From 053954076c6e267c3e5375eb40a8a33267e4a855 Mon Sep 17 00:00:00 2001
From: Arkadiusz Hiler <ahiler@codeweavers.com>
Date: Tue, 8 Feb 2022 16:45:52 +0200
Subject: [PATCH] Update wine

---
 Makefile.in    |  1 -
 default_pfx.py |  6 ++----
 proton         | 13 +++++++++++--
 wine           |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 9c0a5c14..52528f55 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -693,7 +693,6 @@ WINE_SOURCE_ARGS = \
 
 WINE_CONFIGURE_ARGS = \
   --with-mingw \
-  --without-xpresent \
   --disable-tests
 
 WINE_CONFIGURE_ARGS64 = --enable-win64
diff --git a/default_pfx.py b/default_pfx.py
index db413d41..89857366 100755
--- a/default_pfx.py
+++ b/default_pfx.py
@@ -59,15 +59,13 @@ def setup_dll_symlinks(default_pfx_dir, dist_dir):
             if os.path.isfile(filename) and file_is_wine_builtin_dll(filename):
                 bitness = dll_bitness(filename)
                 if bitness == 32:
-                    libdir = os.path.join(dist_dir, 'lib/wine')
+                    libdir = os.path.join(dist_dir, 'lib/wine/i386-windows')
                 elif bitness == 64:
-                    libdir = os.path.join(dist_dir, 'lib64/wine')
+                    libdir = os.path.join(dist_dir, 'lib64/wine/x86_64-windows')
                 else:
                     continue
                 if os.path.exists(os.path.join(libdir, file_)):
                     target = os.path.join(libdir, file_)
-                elif os.path.exists(os.path.join(libdir, 'fakedlls', file_)):
-                    target = os.path.join(libdir, 'fakedlls', file_)
                 else:
                     continue
                 os.unlink(filename)
diff --git a/proton b/proton
index 62ba5634..f31daf13 100755
--- a/proton
+++ b/proton
@@ -31,7 +31,7 @@ from random import randrange
 #To enable debug logging, copy "user_settings.sample.py" to "user_settings.py"
 #and edit it if needed.
 
-CURRENT_PREFIX_VERSION="6.3-3"
+CURRENT_PREFIX_VERSION="7.0-100"
 
 PFX="Proton: "
 ld_path_var = "LD_LIBRARY_PATH"
@@ -58,7 +58,16 @@ def log(msg):
 def file_is_wine_builtin_dll(path):
     if os.path.islink(path):
         contents = os.readlink(path)
-        if os.path.dirname(contents).endswith(('/lib/wine/i386-unix', '/lib/wine/i386-windows', '/lib64/wine/x86_64-unix', '/lib64/wine/x86_64-windows')):
+        if os.path.dirname(contents).endswith((
+                    '/lib/wine',
+                    '/lib64/wine',
+                    '/lib/wine/fakedlls',
+                    '/lib64/wine/fakedlls',
+                    '/lib/wine/i386-unix',
+                    '/lib/wine/i386-windows',
+                    '/lib64/wine/x86_64-unix',
+                    '/lib64/wine/x86_64-windows'
+                )):
             # This may be a broken link to a dll in a removed Proton install
             return True
     if not os.path.exists(path):
diff --git a/wine b/wine
index f0b3d09a..bdb21c72 160000
--- a/wine
+++ b/wine
@@ -1 +1 @@
-Subproject commit f0b3d09ad69ddfc27dbd850bd6b365da6683fa08
+Subproject commit bdb21c72edcccc71416c399ed432ed5eab426e26