patches: rebase on upstream 20260530; drop 3 patches merged upstream

patches/0001-Added-the-ability-to-download-components-without-ins.patch

-From 8e54b4b9a8940a922a6a62ef43112b6cc4691713 Mon Sep 17 00:00:00 2001
+From 0aca706002ad4cc352a5c1e8fc77549684a408fb Mon Sep 17 00:00:00 2001
 From: Nurlan Usenov <suren@etersoft.ru>
 Date: Mon, 25 Aug 2025 21:12:22 +0300
 Subject: [PATCH] Added the ability to download components without installation
+To: wine-devel <wine-devel@winehq.org>
 
 ---
- src/winetricks | 300 ++++++++++++++++++++++++++++++++++++++++---------
- 1 file changed, 244 insertions(+), 56 deletions(-)
+ src/winetricks | 295 ++++++++++++++++++++++++++++++++++++++++---------
+ 1 file changed, 241 insertions(+), 54 deletions(-)
 
 diff --git a/src/winetricks b/src/winetricks
-index daad06a..5f4c9c7 100755
+index 30ec63e..a8fff5f 100755
 --- a/src/winetricks
 +++ b/src/winetricks
-@@ -207,7 +207,7 @@ w_askpermission()
+@@ -210,7 +210,7 @@ w_askpermission()
                  w_info "Unattended mode, not prompting for confirmation"
              else
                  printf %s "Press Y or N, then Enter: " >&2
@@ -20,7 +21,7 @@ index daad06a..5f4c9c7 100755
                  test "${response}" = Y || test "${response}" = y
              fi
      esac
-@@ -2726,31 +2726,37 @@ w_do_call()
+@@ -2821,31 +2821,37 @@ w_do_call()
          test "${W_OPT_NOCLEAN}" = 1 || rm -rf "${W_TMP}"
          w_try_mkdir -q "${W_TMP}"
  
@@ -77,7 +78,7 @@ index daad06a..5f4c9c7 100755
  
          # User-specific postinstall hook.
          # Source it so the script can call w_download() if needed.
-@@ -2762,15 +2768,17 @@ w_do_call()
+@@ -2857,15 +2863,17 @@ w_do_call()
          fi
  
          # Verify install
@@ -102,7 +103,7 @@ index daad06a..5f4c9c7 100755
          fi
  
          # Clean up after this verb
-@@ -5153,6 +5161,7 @@ Usage: $0 [options] [command|verb|path-to-verb] ...
+@@ -5355,6 +5363,7 @@ Usage: $0 [options] [command|verb|path-to-verb] ...
  Executes given verbs.  Each verb installs an application or changes a setting.
  
  Options:
@@ -110,7 +111,7 @@ index daad06a..5f4c9c7 100755
      --country=CC      Set country code to CC and don't detect your IP address
  -f, --force           Don't check whether packages were already installed
      --gui             Show gui diagnostics even when driven by commandline
-@@ -5188,6 +5196,7 @@ winetricks_handle_option()
+@@ -5414,6 +5423,7 @@ winetricks_handle_option()
          -V|--version) winetricks_print_version ; exit 0;;
          --verify) WINETRICKS_VERIFY=1 ;;
          -vv|--really-verbose) WINETRICKS_OPT_VERBOSE=2 ; set -x ;;
@@ -118,7 +119,7 @@ index daad06a..5f4c9c7 100755
          -*) w_die "unknown option $1" ;;
          prefix=*) export WINEPREFIX="${W_PREFIXES_ROOT}/${1##prefix=}" ;;
          *) return "${FALSE}" ;;
-@@ -5262,6 +5271,91 @@ winetricks_verify()
+@@ -5488,6 +5498,91 @@ winetricks_verify()
      esac
  }
  
@@ -210,7 +211,7 @@ index daad06a..5f4c9c7 100755
  #---- Builtin Verbs ----
  
  #----------------------------------------------------------------
-@@ -7835,7 +7929,9 @@ load_dxvk()
+@@ -8069,7 +8164,9 @@ load_dxvk()
      _W_dxvk_version="$(w_get_github_latest_release doitsujin dxvk)"
      _W_dxvk_version="${_W_dxvk_version#v}"
      w_linkcheck_ignore=1 w_download "https://github.com/doitsujin/dxvk/releases/download/v${_W_dxvk_version}/dxvk-${_W_dxvk_version}.tar.gz"
@@ -221,7 +222,7 @@ index daad06a..5f4c9c7 100755
      unset _W_dxvk_version
  }
  
-@@ -8009,7 +8107,9 @@ load_vkd3d()
+@@ -8323,7 +8420,9 @@ load_vkd3d()
      _W_vkd3d_proton_version="$(w_get_github_latest_release HansKristian-Work vkd3d-proton)"
      _W_vkd3d_proton_version="${_W_vkd3d_proton_version#v}"
      w_linkcheck_ignore=1 w_download "https://github.com/HansKristian-Work/vkd3d-proton/releases/download/v${_W_vkd3d_proton_version}/vkd3d-proton-${_W_vkd3d_proton_version}.tar.zst"
@@ -232,7 +233,7 @@ index daad06a..5f4c9c7 100755
      unset _W_vkd3d_proton_version
  }
  
-@@ -9977,7 +10077,9 @@ load_faudio()
+@@ -10363,7 +10462,9 @@ load_faudio()
      w_download_to "${W_TMP_EARLY}" "https://raw.githubusercontent.com/Kron4ek/FAudio-Builds/master/LATEST"
      faudio_version="$(cat "${W_TMP_EARLY}/LATEST")"
      w_linkcheck_ignore=1 w_download "https://github.com/Kron4ek/FAudio-Builds/releases/download/${faudio_version}/faudio-${faudio_version}.tar.xz"
@@ -243,9 +244,10 @@ index daad06a..5f4c9c7 100755
  }
  
  #----------------------------------------------------------------
-@@ -10211,6 +10312,8 @@ load_galliumnine()
+@@ -10597,7 +10698,9 @@ load_galliumnine()
      _W_galliumnine_version="$(w_get_github_latest_release iXit wine-nine-standalone)"
      w_linkcheck_ignore=1 w_download "https://github.com/iXit/wine-nine-standalone/releases/download/${_W_galliumnine_version}/gallium-nine-standalone-${_W_galliumnine_version}.tar.gz"
+     w_warn "Gallium Nine is deprecated and will be removed in Mesa3D 25.2 release https://cgit.freedesktop.org/mesa/mesa/commit/?id=6b6cb825e92ad3bf33b1e032151e32c7b79d8323"
 -    helper_galliumnine "gallium-nine-standalone-${_W_galliumnine_version}.tar.gz"
 +    if [ "${W_SKIP_INSTALL}" != "skip_install" ]; then
 +        helper_galliumnine "gallium-nine-standalone-${_W_galliumnine_version}.tar.gz"
@@ -253,7 +255,7 @@ index daad06a..5f4c9c7 100755
      unset _W_galliumnine_version
  }
  
-@@ -10376,15 +10480,28 @@ w_metadata allcodecs dlls \
+@@ -10762,15 +10865,28 @@ w_metadata allcodecs dlls \
      publisher="various" \
      year="1995-2009" \
      media="download"
@@ -288,7 +290,7 @@ index daad06a..5f4c9c7 100755
  }
  
  #----------------------------------------------------------------
-@@ -14362,8 +14479,10 @@ w_metadata droid fonts \
+@@ -14861,8 +14977,10 @@ w_metadata droid fonts \
  
  do_droid() {
      w_download "${_W_droid_url}${1}?raw=true" "$3"  "$1"
@@ -301,7 +303,7 @@ index daad06a..5f4c9c7 100755
  }
  
  load_droid()
-@@ -14929,22 +15048,36 @@ w_metadata allfonts fonts \
+@@ -15428,22 +15546,36 @@ w_metadata allfonts fonts \
      publisher="various" \
      year="1998-2010" \
      media="download"
@@ -351,7 +353,7 @@ index daad06a..5f4c9c7 100755
  }
  
  #######################
-@@ -17004,8 +17137,10 @@ load_winrar()
+@@ -17394,8 +17526,10 @@ load_winrar()
              fi
              ;;
      esac
@@ -364,7 +366,7 @@ index daad06a..5f4c9c7 100755
  }
  
  #----------------------------------------------------------------
-@@ -17586,6 +17721,35 @@ load_wglgears()
+@@ -17976,6 +18110,35 @@ load_wglgears()
      chmod +x "${W_SYSTEM32_DLLS}/wglgears.exe"
  }
  
@@ -400,7 +402,7 @@ index daad06a..5f4c9c7 100755
  #######################
  # settings
  #######################
-@@ -18468,15 +18632,39 @@ w_metadata alldlls=builtin settings \
+@@ -18888,15 +19051,39 @@ w_metadata alldlls=builtin settings \
      title_bg="Заменете DLL файловете" \
      title_uk="Перевизначити найбільш поширені DLL на вбудовані" \
      title="Override most common DLLs to builtin"
@@ -441,5 +443,5 @@ index daad06a..5f4c9c7 100755
  
  w_metadata bad settings \
 -- 
-2.33.8
+2.50.1
 

patches/0001-Avoid-corruption-of-W_PROGRAMS_WIN-and-W_PROGRAMS_X8.patch

-From bb795de7455f8f4c6b5e6ae12a45aa5aa481417b Mon Sep 17 00:00:00 2001
+From 4151dc0a5dd3a42559187786607962aad8499ce8 Mon Sep 17 00:00:00 2001
 From: Nurlan Usenov <suren@etersoft.ru>
 Date: Mon, 22 Dec 2025 13:00:54 +0300
-Subject: [PATCH] Avoid corruption of W_PROGRAMS_WIN and W_PROGRAMS_X86_WIN
+Subject: [PATCH] Avoid corruption of W_PROGRAMS_WIN and W_PROGRAMS_X86_WIN 
  when running from syswo64
+To: wine-devel <wine-devel@winehq.org>
 
 ---
  src/winetricks | 5 +++++
  1 file changed, 5 insertions(+)
 
 diff --git a/src/winetricks b/src/winetricks
-index 9a66f56..66abb12 100755
+index a8fff5f..75ffb78 100755
 --- a/src/winetricks
 +++ b/src/winetricks
-@@ -1078,9 +1078,14 @@ w_pathconv()
+@@ -1134,9 +1134,14 @@ w_pathconv()
  }
  
  # Expand an environment variable and print it to stdout
@@ -26,7 +27,7 @@ index 9a66f56..66abb12 100755
 +    unset _W_dl_olddir
  }
  
- # Determine what architecture a binary file is built for, silently continue in case of failure.
+ # Get the latest tagged release from github.com API
 -- 
-2.33.8
+2.50.1
 

patches/0001-ie8-removed-dll-that-cannot-be-installed-or-register.patch

-From 9416cfb35636f12a8ceb1c5cf9e8b869f6461781 Mon Sep 17 00:00:00 2001
-From: Nurlan Usenov <suren@etersoft.ru>
-Date: Thu, 13 Mar 2025 15:32:18 +0300
-Subject: [PATCH] ie8: removed dll that cannot be installed or registered
-
-
-diff --git a/src/winetricks b/src/winetricks
-index ef21df4..916e9cc 100755
---- a/src/winetricks
-+++ b/src/winetricks
-@@ -15478,16 +15478,18 @@ load_ie8()
- 
-     # Work around DLL registration bug until ierunonce/RunOnce/wineboot is fixed
-     # FIXME: whittle down this list
--    for i in actxprxy.dll browseui.dll browsewm.dll cdfview.dll ddraw.dll \
--        dispex.dll dsound.dll iedkcs32.dll iepeers.dll iesetup.dll \
--        imgutil.dll inetcomm.dll isetup.dll jscript.dll laprxy.dll \
--        mlang.dll msctf.dll mshtml.dll mshtmled.dll msi.dll msimtf.dll msident.dll \
--        msoeacct.dll msrating.dll mstime.dll msxml3.dll occache.dll \
--        ole32.dll oleaut32.dll olepro32.dll pngfilt.dll quartz.dll \
--        rpcrt4.dll rsabase.dll rsaenh.dll scrobj.dll scrrun.dll \
--        shdocvw.dll shell32.dll urlmon.dll vbscript.dll webcheck.dll \
--        wshcon.dll wshext.dll asctrls.ocx hhctrl.ocx mscomct2.ocx \
--        plugin.ocx proctexe.ocx tdc.ocx uxtheme.dll webcheck.dll wshom.ocx; do
-+
-+    # The list has been divided to avoid errors when installing the dll using "/i"
-+    # And removed the dll files that cannot be installed or registered
-+    for i in actxprxy.dll ddraw.dll dispex.dll dsound.dll iedkcs32.dll \
-+        iepeers.dll inetcomm.dll jscript.dll mlang.dll msctf.dll mshtmled.dll \
-+        msi.dll msimtf.dll msident.dll mstime.dll msxml3.dll ole32.dll \
-+        oleaut32.dll olepro32.dll quartz.dll rpcrt4.dll rsabase.dll rsaenh.dll \
-+        scrobj.dll scrrun.dll vbscript.dll hhctrl.ocx tdc.ocx wshom.ocx; do
-+        w_try_regsvr32 ${i} > /dev/null 2>&1
-+    done
-+
-+    for i in browseui.dll shdocvw.dll shell32.dll urlmon.dll; do
-         w_try_regsvr32 /i ${i} > /dev/null 2>&1
-     done
- 
--- 
-2.42.2
-

patches/0001-winetricks-W_NO_WIN64_WARNINGS-1.patch

-From 9c165694b660944b2d92e308a8b25590124c0ae1 Mon Sep 17 00:00:00 2001
+From b036b35712f99fa8ad47eb5902c2344d9e400973 Mon Sep 17 00:00:00 2001
 From: Vitaly Lipatov <lav@etersoft.ru>
 Date: Thu, 13 Feb 2025 16:30:43 +0300
 Subject: [PATCH] winetricks: W_NO_WIN64_WARNINGS=1
@@ -9,10 +9,10 @@ To: wine-devel <wine-devel@winehq.org>
  1 file changed, 2 insertions(+)
 
 diff --git a/src/winetricks b/src/winetricks
-index 6a4bfb7..611959e 100755
+index ff8bb05..4efb387 100755
 --- a/src/winetricks
 +++ b/src/winetricks
-@@ -13,6 +13,8 @@ WINETRICKS_VERSION=20250102-next
+@@ -13,6 +13,8 @@ WINETRICKS_VERSION=20260125-next
  # You should see a micro (u with a tail) here [µ]
  # You should see a trademark symbol here [™]
  
@@ -22,5 +22,5 @@ index 6a4bfb7..611959e 100755
  #
  # Winetricks is a package manager for Win32 dlls and applications on POSIX.
 -- 
-2.42.4
+2.50.1
 

patches/0001-winetricks-added-eget-via-epm.patch

-From 31b187b7789577e7908fb1f6f121da6eb2ac5655 Mon Sep 17 00:00:00 2001
+From 3cd6f0aa2c21d19f139a7a871e37b5d2c0f6dcc4 Mon Sep 17 00:00:00 2001
 From: Nurlan Usenov <suren@etersoft.ru>
 Date: Tue, 1 Apr 2025 12:45:12 +0300
 Subject: [PATCH] winetricks: added eget via epm
+To: wine-devel <wine-devel@winehq.org>
 
 ---
  src/winetricks | 27 ++++++++++++++++++++++++++-
  1 file changed, 26 insertions(+), 1 deletion(-)
 
 diff --git a/src/winetricks b/src/winetricks
-index ef21df4..60c35a7 100755
+index ab4c31c..30ec63e 100755
 --- a/src/winetricks
 +++ b/src/winetricks
-@@ -1577,6 +1577,19 @@ w_download_to()
+@@ -1695,6 +1695,19 @@ w_download_to()
                  -o "${_W_file}" \
                  ${_W_agent:+--user-agent="${_W_agent}"} \
                  "${_W_url}"
@@ -31,7 +32,7 @@ index ef21df4..60c35a7 100755
          else
              w_die "Here be dragons"
          fi
-@@ -2849,9 +2862,12 @@ _EOF_
+@@ -2963,9 +2976,12 @@ _EOF_
  # I.e., things common to w_download_to(), winetricks_download_to_stdout(), and winetricks_stats_report())
  winetricks_download_setup()
  {
@@ -45,7 +46,7 @@ index ef21df4..60c35a7 100755
          "") if [ -x "$(command -v aria2c 2>/dev/null)" ] ; then
                  WINETRICKS_DOWNLOADER="aria2c"
              elif [ -x "$(command -v wget 2>/dev/null)" ] ; then
-@@ -2860,6 +2876,8 @@ winetricks_download_setup()
+@@ -2974,6 +2990,8 @@ winetricks_download_setup()
                  WINETRICKS_DOWNLOADER="curl"
              elif [ -x "$(command -v fetch 2>/dev/null)" ] ; then
                  WINETRICKS_DOWNLOADER="fetch"
@@ -54,7 +55,7 @@ index ef21df4..60c35a7 100755
              else
                  w_die "Please install wget or aria2c (or, if those aren't available, curl)"
              fi
-@@ -2927,6 +2945,9 @@ winetricks_dl_url_to_stdout()
+@@ -3041,6 +3059,9 @@ winetricks_dl_url_to_stdout()
      elif [ "${WINETRICKS_DOWNLOADER}" = "fetch" ] ; then
          # fetch does not support retry count
          ${torify} fetch -o - -T "${WINETRICKS_DOWNLOADER_TIMEOUT}" "$1" 2>/dev/null
@@ -64,7 +65,7 @@ index ef21df4..60c35a7 100755
      else
          w_die "Please install aria2c, curl, or wget"
      fi
-@@ -18855,6 +18876,10 @@ winetricks_stats_report()
+@@ -19739,6 +19760,10 @@ winetricks_stats_report()
                      --max-tries="${WINETRICKS_DOWNLOADER_RETRIES}" \
                      --save-session='' \
                      "http://kegel.com/data/winetricks-usage?${report}" > /dev/null 2>&1 || true

patches/0001-winetricks-try-use-xvt-as-terminal.patch

-From 91567004fd40a583b2db38b21640f005f1f35240 Mon Sep 17 00:00:00 2001
+From 970b9d9d5a86622c859931a046b539e13dabd78b Mon Sep 17 00:00:00 2001
 From: Vitaly Lipatov <lav@etersoft.ru>
 Date: Sat, 18 Jun 2022 00:21:09 +0300
 Subject: [PATCH] winetricks: try use xvt as terminal
@@ -9,18 +9,18 @@ To: wine-devel <wine-devel@winehq.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/winetricks b/src/winetricks
-index 98762ec..9488fbd 100755
+index e0c9631..ff8bb05 100755
 --- a/src/winetricks
 +++ b/src/winetricks
-@@ -22851,7 +22851,7 @@ winetricks_shell()
-                 ${SHELL}
+@@ -19786,7 +19786,7 @@ winetricks_shell()
+                 WINEDEBUG=-all ${SHELL} "${@}"
                  ;;
              *)
 -                for term in gnome-terminal konsole Terminal xterm; do
 +                for term in gnome-terminal konsole Terminal xvt xterm; do
                      if test "$(command -v ${term} 2>/dev/null)"; then
-                         ${term}
-                         break
+                         if [ -n "${*}" ]; then
+                             # Convert the list of arguments into a single
 -- 
-2.33.3
+2.50.1
 

patches/0002-Remove-unuseful-binary-arch-detection.patch

-From aaf289cc98d5c86c3b466d93228e1cbf46e3408e Mon Sep 17 00:00:00 2001
+From f3921d5795b39ca426b7a14232cbc7f7f530e388 Mon Sep 17 00:00:00 2001
 From: Vitaly Lipatov <lav@etersoft.ru>
 Date: Thu, 6 Feb 2025 12:27:43 +0300
-Subject: [PATCH 2/2] Remove unuseful binary arch detection
+Subject: [PATCH] Remove unuseful binary arch detection
 To: wine-devel <wine-devel@winehq.org>
 
 ---
@@ -9,10 +9,10 @@ To: wine-devel <wine-devel@winehq.org>
  1 file changed, 2 insertions(+), 79 deletions(-)
 
 diff --git a/src/winetricks b/src/winetricks
-index 0204c63..1f5e1cc 100755
+index 4efb387..baa7425 100755
 --- a/src/winetricks
 +++ b/src/winetricks
-@@ -1054,34 +1054,6 @@ w_expand_env()
+@@ -1139,34 +1139,6 @@ w_expand_env()
      winetricks_early_wine_arch cmd.exe /c "chcp 65001 > nul & echo %$1%"
  }
  
@@ -47,7 +47,7 @@ index 0204c63..1f5e1cc 100755
  # Get the latest tagged release from github.com API
  w_get_github_latest_release()
  {
-@@ -4428,52 +4400,9 @@ winetricks_set_wineprefix()
+@@ -4634,52 +4606,9 @@ winetricks_set_wineprefix()
          fi
          WINEBOOT_BIN="$(dirname "${WINESERVER_BIN}")/$(basename "${WINESERVER_BIN}"|sed 's,wineserver,wineboot,')"
  
@@ -67,7 +67,7 @@ index 0204c63..1f5e1cc 100755
 -                _W_wineserver_binary_arch="$(winetricks_get_file_arch "${WINE_BINDIR}/wineserver")"
 -            fi
 -        fi
--        if [ -z "${_W_wineserver_binary_arch}" ]; then
+-        if [ -z "${W_OPT_UNATTENDED}" ] && [ -z "${_W_wineserver_binary_arch}" ]; then
 -            w_warn "Unknown file arch of ${WINESERVER_BIN}."
 -        fi
 -
@@ -84,7 +84,7 @@ index 0204c63..1f5e1cc 100755
 -                _W_wine_binary_arch="$(winetricks_get_file_arch "${WINE_BINDIR}/wine")"
 -            fi
 -        fi
--        if [ -z "${_W_wine_binary_arch}" ]; then
+-        if [ -z "${W_OPT_UNATTENDED}" ] && [ -z "${_W_wine_binary_arch}" ]; then
 -            w_warn "Unknown file arch of ${WINE_BIN}."
 -        fi
 -
@@ -100,7 +100,7 @@ index 0204c63..1f5e1cc 100755
  
          # Probably need fancier handling/checking, but for a basic start:
          # Note 'wine' may be named 'wine-stable'/'wine-staging'/etc.):
-@@ -4482,8 +4411,6 @@ winetricks_set_wineprefix()
+@@ -4688,8 +4617,6 @@ winetricks_set_wineprefix()
          # WINE_MULTI = generic wine, new name
          if [ -n "${WINE64}" ]; then
              true
@@ -109,7 +109,7 @@ index 0204c63..1f5e1cc 100755
          elif [ "${WINE%??}64" = "${WINE}" ]; then
              WINE64="${WINE}"
          elif command -v "${WINE}64" >/dev/null 2>&1; then
-@@ -4494,6 +4421,8 @@ winetricks_set_wineprefix()
+@@ -4700,6 +4627,8 @@ winetricks_set_wineprefix()
                  if [ -x "${WINE_BINDIR}/wine64" ]; then
                      # Workaround case where wine is in path, but wine64 is only in Wine's bindir
                      WINE64="${WINE_BINDIR}/wine64"
@@ -118,7 +118,7 @@ index 0204c63..1f5e1cc 100755
                  fi
              else
                  # Handle case where wine binaries (or binary wrappers) have a suffix
-@@ -4566,15 +4495,9 @@ winetricks_set_wineprefix()
+@@ -4780,15 +4709,9 @@ winetricks_set_wineprefix()
                  *) w_warn "You are using a 64-bit WINEPREFIX. Note that many verbs only install 32-bit versions of packages. If you encounter problems, please retest in a clean 32-bit WINEPREFIX before reporting a bug." ;;
              esac
  
@@ -135,5 +135,5 @@ index 0204c63..1f5e1cc 100755
          WINE_ARCH="${WINE}"
          WINE_MULTI="${WINE}"
 -- 
-2.42.4
+2.50.1
 

patches/0004-winetricks-added-cades-installation-eterbug-17080.patch

-From ad2a8a038d49c294a79a017547914f9e979e8975 Mon Sep 17 00:00:00 2001
+From dcfee814640049ddb5a5b10e8be5dee85a1f766a Mon Sep 17 00:00:00 2001
 From: Iviv <iviv@etersoft.ru>
 Date: Tue, 5 Mar 2024 19:32:34 +0300
 Subject: [PATCH] winetricks: added cades installation (eterbug#17080)
+To: wine-devel <wine-devel@winehq.org>
 
-Signed-off-by: Ivan Ivlev <iviv@etersoft.ru>
 ---
  src/winetricks | 25 +++++++++++++++++++++++++
  1 file changed, 25 insertions(+)
 
 diff --git a/src/winetricks b/src/winetricks
-index d1988ce..3b46a79 100755
+index baa7425..1a70b72 100755
 --- a/src/winetricks
 +++ b/src/winetricks
-@@ -19480,6 +19480,31 @@ load_remove_mono()
+@@ -19052,6 +19052,31 @@ load_remove_mono()
  }
  
  
@@ -45,5 +45,5 @@ index d1988ce..3b46a79 100755
  
  w_metadata sandbox settings \
 -- 
-2.42.2
+2.50.1
 

patches/0005-workaround-for-guest-user.patch

-From fba388e7e6a18f1eb575e5e98f6998f1f02b1413 Mon Sep 17 00:00:00 2001
+From d40ff4ba057b8d28be791ae51006866eddcbcc55 Mon Sep 17 00:00:00 2001
 From: Nurlan Usenov <suren@etersoft.ru>
 Date: Tue, 27 Feb 2024 17:18:23 +0300
 Subject: [PATCH] dotnet35sp1: Workaround for error if the username is "guest"
+To: wine-devel <wine-devel@winehq.org>
 
 ---
  src/winetricks | 42 ++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 42 insertions(+)
 
 diff --git a/src/winetricks b/src/winetricks
-index 4544e3d..374c2bd 100755
+index 1a70b72..ab4c31c 100755
 --- a/src/winetricks
 +++ b/src/winetricks
-@@ -1346,6 +1346,36 @@ w_dotnet_verify()
+@@ -1409,6 +1409,36 @@ w_dotnet_verify()
      w_info ".Net Verifier returned ${dn_status}"
  }
-
+ 
 +# Workaround for "You do not have sufficient rights to run this application" error if the username is "guest".
 +w_replace_username_guest()
 +{
@@ -48,68 +49,72 @@ index 4544e3d..374c2bd 100755
  # Checks if the user can run the self-update/rollback commands
  winetricks_check_update_availability()
  {
-@@ -9297,8 +9327,10 @@ load_dotnet20sp1()
+@@ -8792,8 +8822,10 @@ load_dotnet20sp1()
          w_set_winver winxp
      fi
-
+ 
 +    w_replace_username_guest
      w_try_cd "${W_CACHE}/${W_PACKAGE}"
      w_try_ms_installer "${WINE}" "${exe}" ${W_OPT_UNATTENDED:+/q}
 +    w_restore_username
-
+ 
      if [ "${W_ARCH}" = "win32" ]; then
          # We can't stop installing dotnet20sp1 in win2k mode until Wine supports
-@@ -9358,8 +9390,10 @@ load_dotnet20sp2()
+@@ -8853,8 +8885,10 @@ load_dotnet20sp2()
          exe="NetFx20SP2_x64.exe"
      fi
-
+ 
 +    w_replace_username_guest
      w_try_cd "${W_CACHE}/${W_PACKAGE}"
      w_try_ms_installer "${WINE}" "${exe}" ${W_OPT_UNATTENDED:+ /q /c:"install.exe /q"}
 +    w_restore_username
-
+ 
      if [ "${W_ARCH}" = "win32" ]; then
          # We can't stop installing dotnet20sp1 in win2k mode until Wine supports
-@@ -9443,9 +9477,11 @@ load_dotnet30()
+@@ -8938,9 +8972,11 @@ load_dotnet30()
      WINEDLLOVERRIDES="ngen.exe,mscorsvw.exe=b;${WINEDLLOVERRIDES}"
      export WINEDLLOVERRIDES
-
+ 
 +    w_replace_username_guest
      w_try_cd "${W_CACHE}/${W_PACKAGE}"
      w_warn "Installing .NET 3.0 runtime silently, as otherwise it gets hidden behind taskbar. Installation usually takes about 3 minutes."
      w_try "${WINE}" "${file1}" /q /c:"install.exe /q"
 +    w_restore_username
-
+ 
      w_override_dlls native mscorwks
      w_restore_winver
-@@ -9497,7 +9533,9 @@ load_dotnet30sp1()
-
+@@ -8992,7 +9028,9 @@ load_dotnet30sp1()
+ 
      "${WINE}" sc delete FontCache3.0.0.0
-
+ 
 +    w_replace_username_guest
      w_try_ms_installer "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/q}
 +    w_restore_username
-
+ 
      w_override_dlls native mscorwks
      w_restore_winver
-@@ -9543,8 +9581,10 @@ load_dotnet35()
+@@ -9038,8 +9076,10 @@ load_dotnet35()
      w_override_dlls native mscoree mscorwks
      w_wineserver -w
-
+ 
 +    w_replace_username_guest
      w_try_cd "${W_CACHE}/${W_PACKAGE}"
      w_try_ms_installer "${WINE}" "${file1}" /lang:ENU ${W_OPT_UNATTENDED:+/q}
 +    w_restore_username
-
+ 
      w_restore_winver
  
-@@ -9597,8 +9637,10 @@ load_dotnet35sp1()
+@@ -9092,8 +9132,10 @@ load_dotnet35sp1()
      w_try_cd "${W_TMP}"
      w_try ln -s "${W_CACHE}/${W_PACKAGE}/${file1}" .
-
+ 
 +    w_replace_username_guest
      WINEDLLOVERRIDES="ngen.exe=n" w_try_ms_installer "${WINE}" dotnetfx35.exe /lang:ENU ${W_OPT_UNATTENDED:+/q}
      w_try rm dotnetfx35.exe
 +    w_restore_username
-
+ 
      w_restore_winver
+ 
+-- 
+2.50.1
+

patches/0006-install-correct-version-of-msvcp140.patch

-From 596f33cc300055ca1bd6550779f69d2dc396dd56 Mon Sep 17 00:00:00 2001
-From: Nurlan Usenov <suren@etersoft.ru>
-Date: Thu, 6 Mar 2025 19:08:35 +0300
-Subject: [PATCH] vcrun2019: Install correct version of msvcp140.dll into 64bit
- directory
-
----
- src/winetricks | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/winetricks b/src/winetricks
-index ef21df4..cea891e 100755
---- a/src/winetricks
-+++ b/src/winetricks
-@@ -13019,8 +13019,8 @@ load_vcrun2019()
-             w_download https://aka.ms/vs/16/release/vc_redist.x64.exe 5d9999036f2b3a930f83b7fe3e2186b12e79ae7c007d538f52e3582e986a37c3
- 
-             # Also replace 64-bit msvcp140.dll
--            w_try_cabextract --directory="${W_TMP}/win64"  "${W_CACHE}"/"${W_PACKAGE}"/vc_redist.x64.exe -F 'a11'
--            w_try_cabextract --directory="${W_SYSTEM64_DLLS}" "${W_TMP}/win64/a11" -F 'msvcp140.dll'
-+            w_try_cabextract --directory="${W_TMP}/win64"  "${W_CACHE}"/"${W_PACKAGE}"/vc_redist.x64.exe -F 'a12'
-+            w_try_cabextract --directory="${W_SYSTEM64_DLLS}" "${W_TMP}/win64/a12" -F 'msvcp140.dll'
- 
-             w_try_ms_installer "${WINE}" vc_redist.x64.exe ${W_OPT_UNATTENDED:+/q}
-             ;;
--- 
-2.33.8
-

patches/0007-vcrun2017-2019-2022-fix-msvcp140_2-not-replaced.patch

-From 8cb6674d1682d5c1e29b2c1cdd8c42811aab0395 Mon Sep 17 00:00:00 2001
+From df3fdeca7ca43dd3c03dd29b7088c82dc46047e7 Mon Sep 17 00:00:00 2001
 From: Nurlan Usenov <suren@etersoft.ru>
 Date: Thu, 19 Mar 2026 08:20:24 +0300
 Subject: [PATCH] vcrun2017/2019/2022: fix msvcp140_2.dll not being replaced on
- Wine 11+
+  Wine 11+
+To: wine-devel <wine-devel@winehq.org>
 
 ---
- src/winetricks | 26 +++++++++++++++++---------
- 1 file changed, 17 insertions(+), 9 deletions(-)
+ src/winetricks | 24 ++++++++++++++++--------
+ 1 file changed, 16 insertions(+), 8 deletions(-)
 
 diff --git a/src/winetricks b/src/winetricks
-index cea891e..f99ee57 100755
+index 75ffb78..fb51d44 100755
 --- a/src/winetricks
 +++ b/src/winetricks
-@@ -12916,11 +12916,12 @@ load_vcrun2017()
-         w_set_winver winxp
-     fi
+@@ -13648,11 +13648,12 @@ load_vcrun2015()
+ 
+     w_override_dlls native,builtin api-ms-win-crt-private-l1-1-0 api-ms-win-crt-conio-l1-1-0 api-ms-win-crt-convert-l1-1-0 api-ms-win-crt-environment-l1-1-0 api-ms-win-crt-filesystem-l1-1-0 api-ms-win-crt-heap-l1-1-0 api-ms-win-crt-locale-l1-1-0 api-ms-win-crt-math-l1-1-0 api-ms-win-crt-multibyte-l1-1-0 api-ms-win-crt-process-l1-1-0 api-ms-win-crt-runtime-l1-1-0 api-ms-win-crt-stdio-l1-1-0 api-ms-win-crt-string-l1-1-0 api-ms-win-crt-utility-l1-1-0 api-ms-win-crt-time-l1-1-0 atl140 concrt140 msvcp140 msvcp140_1 msvcp140_atomic_wait ucrtbase vcomp140 vccorlib140 vcruntime140 vcruntime140_1
  
 -    # Setup will refuse to install msvcp140 & ucrtbase because builtin's version number is higher, so manually replace them
 +    # Setup will refuse to install msvcp140, msvcp140_2 & ucrtbase because builtin's version number is higher, so manually replace them
@@ -25,8 +26,8 @@ index cea891e..f99ee57 100755
 +    w_try_cabextract --directory="${W_SYSTEM32_DLLS}" "${W_TMP}/win32/a10" -F 'msvcp140_2.dll'
      w_try_cabextract --directory="${W_SYSTEM32_DLLS}" "${W_TMP}/win32/a10" -F 'ucrtbase.dll'
  
-     w_try_cd "${W_CACHE}/${W_PACKAGE}"
-@@ -12935,9 +12936,10 @@ load_vcrun2017()
+     w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
+@@ -13746,9 +13747,10 @@ load_vcrun2017()
              # 2019/08/14: 5b0cbb977f2f5253b1ebe5c9d30edbda35dbd68fb70de7af5faac6423db575b5
              # 2024/10/17: 7cf24eba2bd67ea6229b7dd131e06f4e92ebefc06e36fe401cdd227d7ed78264
              w_download https://aka.ms/vs/15/release/vc_redist.x64.exe 7cf24eba2bd67ea6229b7dd131e06f4e92ebefc06e36fe401cdd227d7ed78264
@@ -38,9 +39,9 @@ index cea891e..f99ee57 100755
              w_try_cabextract --directory="${W_SYSTEM64_DLLS}" "${W_TMP}/win64/a10" -F 'ucrtbase.dll'
              w_try_ms_installer "${WINE}" vc_redist.x64.exe ${W_OPT_UNATTENDED:+/q}
              ;;
-@@ -12985,10 +12987,11 @@ load_vcrun2019()
-         w_set_winver winxp
-     fi
+@@ -13789,10 +13791,11 @@ load_vcrun2019()
+ 
+     w_download https://aka.ms/vs/16/release/vc_redist.x86.exe 49545cb0f6499c4a65e1e8d5033441eeeb4edfae465a68489a70832c6a4f6399
  
 -    # Setup will refuse to install msvcp140 because the builtin's version number is higher, so manually replace it
 +    # Setup will refuse to install msvcp140 & msvcp140_2 because the builtin's version number is higher, so manually replace them
@@ -51,7 +52,7 @@ index cea891e..f99ee57 100755
  
      w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
      w_try_ms_installer "${WINE}" vc_redist.x86.exe ${W_OPT_UNATTENDED:+/q}
-@@ -13018,9 +13021,10 @@ load_vcrun2019()
+@@ -13822,9 +13825,10 @@ load_vcrun2019()
  
              w_download https://aka.ms/vs/16/release/vc_redist.x64.exe 5d9999036f2b3a930f83b7fe3e2186b12e79ae7c007d538f52e3582e986a37c3
  
@@ -63,9 +64,9 @@ index cea891e..f99ee57 100755
  
              w_try_ms_installer "${WINE}" vc_redist.x64.exe ${W_OPT_UNATTENDED:+/q}
              ;;
-@@ -13089,10 +13093,12 @@ load_vcrun2022()
+@@ -13893,10 +13897,12 @@ load_vcrun2022()
  
-     w_download https://aka.ms/vs/17/release/vc_redist.x86.exe dd1a8be03398367745a87a5e35bebdab00fdad080cf42af0c3f20802d08c25d4
+     w_download https://aka.ms/vs/17/release/vc_redist.x86.exe 0c09f2611660441084ce0df425c51c11e147e6447963c3690f97e0b25c55ed64
  
 -    # Setup will refuse to install msvcp140 because the builtin's version number is higher, so manually replace it
 +    # Setup will refuse to install msvcp140 & msvcp140_2 because the builtin's version number is higher, so manually replace them
@@ -78,15 +79,14 @@ index cea891e..f99ee57 100755
  
      w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
      w_try_ms_installer "${WINE}" vc_redist.x86.exe ${W_OPT_UNATTENDED:+/q}
-@@ -13113,9 +13119,11 @@ load_vcrun2022()
+@@ -13919,9 +13925,11 @@ load_vcrun2022()
  
-             w_download https://aka.ms/vs/17/release/vc_redist.x64.exe 1821577409c35b2b9505ac833e246376cc68a8262972100444010b57226f0940
+             w_download https://aka.ms/vs/17/release/vc_redist.x64.exe cc0ff0eb1dc3f5188ae6300faef32bf5beeba4bdd6e8e445a9184072096b713b
  
 -            # Also replace 64-bit msvcp140.dll
--            w_try_cabextract --directory="${W_TMP}/win64"  "${W_CACHE}"/"${W_PACKAGE}"/vc_redist.x64.exe -F 'a11'
--            w_try_cabextract --directory="${W_SYSTEM64_DLLS}" "${W_TMP}/win64/a11" -F 'msvcp140.dll'
 +            # Also replace 64-bit msvcp140.dll & msvcp140_2.dll
-+            w_try_cabextract --directory="${W_TMP}/win64"  "${W_CACHE}"/"${W_PACKAGE}"/vc_redist.x64.exe -F 'a12'
+             w_try_cabextract --directory="${W_TMP}/win64"  "${W_CACHE}"/"${W_PACKAGE}"/vc_redist.x64.exe -F 'a12'
+-            w_try_cabextract --directory="${W_SYSTEM64_DLLS}" "${W_TMP}/win64/a12" -F 'msvcp140.dll'
 +            w_try_cabextract --directory="${W_TMP}/win64" "${W_TMP}/win64/a12"
 +            w_try mv -f "${W_TMP}/win64/msvcp140.dll_amd64" "${W_SYSTEM64_DLLS}/msvcp140.dll"
 +            w_try mv -f "${W_TMP}/win64/msvcp140_2.dll_amd64" "${W_SYSTEM64_DLLS}/msvcp140_2.dll"

patches/0008-msxml3-generate-64bit-msxml3r-stub.patch

-From 5f816e3b076f1df2ee80500cc52113d1198c40d0 Mon Sep 17 00:00:00 2001
+From f99cb15e783ee4dba06666e1d9961bd2d3df45b9 Mon Sep 17 00:00:00 2001
 From: Nurlan Usenov <suren@etersoft.ru>
 Date: Tue, 24 Mar 2026 06:43:35 +0300
-Subject: [PATCH] msxml3: generate 64-bit msxml3r.dll resource stub for win64
+Subject: [PATCH] msxml3: generate 64-bit msxml3r.dll resource stub for win64 
  prefixes
+To: wine-devel <wine-devel@winehq.org>
 
 ---
  src/winetricks | 6 ++++++
  1 file changed, 6 insertions(+)
 
 diff --git a/src/winetricks b/src/winetricks
-index a48368f..eaa18d1 100755
+index fb51d44..ba2ba1e 100755
 --- a/src/winetricks
 +++ b/src/winetricks
-@@ -11158,6 +11158,12 @@ load_msxml3()
+@@ -11881,6 +11881,12 @@ load_msxml3()
      if [ "${W_ARCH}" = "win64" ]; then
          helper_win7sp1_x64 amd64_microsoft-windows-msxml30_31bf3856ad364e35_6.1.7601.17514_none_e6944609ad75ac7d/msxml3.dll
          w_try_cp_dll "${W_TMP}/amd64_microsoft-windows-msxml30_31bf3856ad364e35_6.1.7601.17514_none_e6944609ad75ac7d/msxml3.dll" "${W_SYSTEM64_DLLS}/msxml3.dll"