diff --git a/winetricks-zh b/winetricks-zh
index 6ac9524..056cecb 100755
--- a/winetricks-zh
+++ b/winetricks-zh
@@ -182,14 +182,14 @@ else
     W_TMP_EARLY="/tmp"
 fi
 
+W_TEXT_LINE="------------------------------------------------------"
+
 #---- Public Functions ----
 
 # Ask permission to continue
 w_askpermission()
 {
-    echo "------------------------------------------------------"
-    echo "$@"
-    echo "------------------------------------------------------"
+    printf '%s\n%b\n%s\n' "${W_TEXT_LINE}" "${@}" "${W_TEXT_LINE}"
 
     if test "${W_OPT_UNATTENDED}"; then
         _W_timeout="--timeout 5"
@@ -227,9 +227,7 @@ w_info()
 {
     # If $WINETRICKS_SUPER_QUIET is set, w_info is a no-op:
     if [ -z "${WINETRICKS_SUPER_QUIET}" ] ; then
-        echo "------------------------------------------------------"
-        echo "$@"
-        echo "------------------------------------------------------"
+        printf '%s\n%b\n%s\n' "${W_TEXT_LINE}" "${@}" "${W_TEXT_LINE}"
     fi
 
     case ${WINETRICKS_GUI} in
@@ -244,9 +242,7 @@ w_warn()
 {
     # If $WINETRICKS_SUPER_QUIET is set, w_info is a no-op:
     if [ -z "${WINETRICKS_SUPER_QUIET}" ] ; then
-        echo "------------------------------------------------------"
-        echo "warning: $*"
-        echo "------------------------------------------------------"
+        printf '%s\nwarning: %b\n%s\n' "${W_TEXT_LINE}" "${*}" "${W_TEXT_LINE}"
     fi
 
     if test "${W_OPT_UNATTENDED}"; then
@@ -267,9 +263,7 @@ w_warn()
 # If user cancels, exit status is 1
 w_warn_cancel()
 {
-    echo "------------------------------------------------------" >&2
-    echo "$@" >&2
-    echo "------------------------------------------------------" >&2
+    printf '%s\n%b\n%s\n' "${W_TEXT_LINE}" "${@}" "${W_TEXT_LINE}" >&2
 
     if test "${W_OPT_UNATTENDED}"; then
         _W_timeout="--timeout 5"
@@ -605,6 +599,7 @@ w_try()
     en_ms_5="exit status ${status} - user selected 'Cancel'"
     en_ms_105="exit status ${status} - normal, user selected 'restart now'"
     en_ms_194="exit status ${status} - normal, user selected 'restart later'"
+    en_ms_236="exit status ${status} - newer version detected"
 
     en_abort="Note: command $* returned status ${status}. Aborting."
     pl_abort="Informacja: poelcenie $* zwróciło status ${status}. Przerywam."
@@ -617,6 +612,7 @@ w_try()
             0) ;;
             105) echo "${en_ms_105}" ;;
             194) echo "${en_ms_194}" ;;
+            236) echo "${en_ms_236}" ;;
 
             # Fatal
             5) w_die "${en_ms_5}" ;;
@@ -806,8 +802,13 @@ w_try_regedit32()
         *) unset cmdc ;;
     esac
 
-    # shellcheck disable=SC2086
-    w_try "${WINE_MULTI}" ${cmdc} regedit ${W_OPT_UNATTENDED:+/S} "$@"
+    if [ "${W_ARCH}" = "win64" ]; then
+        # shellcheck disable=SC2086
+        w_try "${WINE}" ${cmdc} "${W_SYSTEM32_DLLS_WIN}\\regedit.exe" ${W_OPT_UNATTENDED:+/S} "$@"
+    else
+        # shellcheck disable=SC2086
+        w_try "${WINE}" ${cmdc} "C:\\windows\\regedit.exe" ${W_OPT_UNATTENDED:+/S} "$@"
+    fi
 }
 
 w_try_regedit64()
@@ -819,17 +820,17 @@ w_try_regedit64()
     esac
 
     # shellcheck disable=SC2086
-    w_try "${WINE64}" ${cmdc} regedit ${W_OPT_UNATTENDED:+/S} "$@"
+    w_try "${WINE64}" ${cmdc} "C:\\windows\\regedit.exe" ${W_OPT_UNATTENDED:+/S} "$@"
 }
 
 w_try_regsvr()
 {
-    w_try "${WINE}" regsvr32 ${W_OPT_UNATTENDED:+/S} "$@"
+    w_try "${WINE}" "${W_SYSTEM32_DLLS_WIN}\\regsvr32.exe" ${W_OPT_UNATTENDED:+/S} "$@"
 }
 
 w_try_regsvr64()
 {
-    w_try "${WINE64}" regsvr32 ${W_OPT_UNATTENDED:+/S} "$@"
+    w_try "${WINE64}" "${W_SYSTEM64_DLLS_WIN64}\\regsvr32.exe" ${W_OPT_UNATTENDED:+/S} "$@"
 }
 
 w_try_unrar()
@@ -1366,15 +1367,6 @@ w_download_to()
 
         if test -s "${_W_cache}/${_W_file}" ; then
             if test "${_W_sum}" ; then
-                if test ${tries} = 1 ; then
-                    # The cache was full.  If the file is larger than 500 MB,
-                    # don't checksum it, that just annoys the user.
-                    # shellcheck disable=SC2046
-                    if test $(du -k "${_W_cache}/${_W_file}" | cut -f1) -gt 500000 ; then
-                        checksum_ok=1
-                        break
-                    fi
-                fi
                 # If checksum matches, declare success and exit loop
                 case "${_W_shatype}" in
                     none)
@@ -3271,11 +3263,13 @@ winetricks_early_wine_arch()
 
 winetricks_detect_gui()
 {
-    if [ -n "$1" ]; then
-        if [ "$1" = "kdialog" ] && test -x "$(command -v kdialog 2>/dev/null)"; then
+    if [ "$1" != "--gui" ] ; then
+        if [ "$1" = "kdialog" ] ; then
+            test -x "$(command -v kdialog 2>/dev/null)" || w_die "--gui=kdialog was used, but kdialog is not installed"
             WINETRICKS_GUI=kdialog
             WINETRICKS_GUI_VERSION="$(kdialog --version)"
-        elif [ "$1" = "zenity" ] || [ "$1" = "--gui" ] && test -x "$(command -v zenity 2>/dev/null)"; then
+        elif [ "$1" = "zenity" ] ; then
+            test -x "$(command -v zenity 2>/dev/null)" || w_die "--gui=zenity was used, but zenity is not installed"
             WINETRICKS_GUI=zenity
             WINETRICKS_GUI_VERSION="$(zenity --version)"
             WINETRICKS_MENU_HEIGHT=500
@@ -3617,6 +3611,7 @@ winetricks_mainmenu()
             _W_msg_taskmgr='Run taskmgr'
             _W_msg_explorer='Run explorer'
             _W_msg_uninstaller='Run uninstaller'
+            _W_msg_winecmd='Run a Wine cmd shell'
             _W_msg_shell='Run a commandline shell (for debugging)'
             _W_msg_folder='Browse files'
             _W_msg_annihilate="Delete ALL DATA AND APPLICATIONS INSIDE THIS WINEPREFIX"
@@ -3631,6 +3626,7 @@ winetricks_mainmenu()
             _W_msg_taskmgr='taskmgr starten'
             _W_msg_explorer='explorer starten'
             _W_msg_uninstaller='uninstaller starten'
+            _W_msg_winecmd='Starten Sie Wine cmd'
             _W_msg_shell='Eine Kommandozeile zum debuggen starten'
             _W_msg_folder='Ordner durchsuchen'
             _W_msg_annihilate="ALLE DATEIEN UND PROGRAMME IN DIESEM WINEPREFIX Löschen"
@@ -3645,6 +3641,7 @@ winetricks_mainmenu()
             _W_msg_taskmgr='Uruchomić menedżer zadań'
             _W_msg_explorer='Uruchomić explorer'
             _W_msg_uninstaller='Uruchomić program odinstalowujący'
+            _W_msg_winecmd='Uruchomić Wine cmd'
             _W_msg_shell='Uruchomić powłokę wiersza poleceń (dla debugowania)'
             _W_msg_folder='Przeglądać pliki'
             _W_msg_annihilate="Usuńąć WSZYSTKIE DANE I APLIKACJE WEWNĄTRZ TEGO PREFIKSU WINE"
@@ -3659,6 +3656,7 @@ winetricks_mainmenu()
             _W_msg_taskmgr='Executar taskmgr'
             _W_msg_explorer='Executar explorer'
             _W_msg_uninstaller='Executar desinstalador'
+            _W_msg_winecmd='Executar Wine cmd'
             _W_msg_shell='Executar linha de comandos shell (para depuração)'
             _W_msg_folder='Gerenciar arquivos'
             _W_msg_annihilate="Apagar TODOS OS DADOS E APLICATIVOS DENTRO DESTE WINEPREFIX"
@@ -3673,6 +3671,7 @@ winetricks_mainmenu()
             _W_msg_taskmgr='Запустить taskmgr (менеджер задач)'
             _W_msg_explorer='Запустить explorer'
             _W_msg_uninstaller='Запустить uninstaller (деинсталлятор)'
+            _W_msg_winecmd='Запустить винную команду'
             _W_msg_shell='Запустить графический терминал (для отладки)'
             _W_msg_folder='Проводник файлов'
             _W_msg_annihilate="Удалить ВСЕ ДАННЫЕ И ПРИЛОЖЕНИЯ В ЭТОМ WINEPREFIX"
@@ -3687,6 +3686,7 @@ winetricks_mainmenu()
             _W_msg_taskmgr='Запустити taskmgr'
             _W_msg_explorer='Запустити explorer'
             _W_msg_uninstaller='Встановлення/видалення програм'
+            _W_msg_winecmd='Запустіть оболонку Wine cmd'
             _W_msg_shell='Запуск командної оболонки (для налагодження)'
             _W_msg_folder='Перегляд файлів'
             _W_msg_annihilate="Видалити УСІ ДАНІ ТА ПРОГРАМИ З ЦЬОГО WINEPREFIX"
@@ -3701,6 +3701,7 @@ winetricks_mainmenu()
             _W_msg_taskmgr='运行任务管理器'
             _W_msg_explorer='运行资源管理器'
             _W_msg_uninstaller='运行卸载程序'
+            _W_msg_winecmd='运行 Wine cmd'
             _W_msg_shell='运行命令提示窗口 (作为调试)'
             _W_msg_folder='浏览容器中的文件'
             _W_msg_annihilate="删除容器中所有数据和应用程序"
@@ -3715,6 +3716,7 @@ winetricks_mainmenu()
             _W_msg_taskmgr='執行工作管理員'
             _W_msg_explorer='執行檔案總管'
             _W_msg_uninstaller='執行解除安裝程式'
+            _W_msg_winecmd='運行 Wine cmd'
             _W_msg_shell='執行命令提示視窗 (作為偵錯)'
             _W_msg_folder='瀏覽容器中的檔案'
             _W_msg_annihilate="刪除容器中所有資料和應用程式"
@@ -3729,6 +3731,7 @@ winetricks_mainmenu()
             _W_msg_taskmgr='Run taskmgr'
             _W_msg_explorer='Run explorer'
             _W_msg_uninstaller='Run uninstaller'
+            _W_msg_winecmd='Run a Wine cmd shell'
             _W_msg_shell='Run a commandline shell (for debugging)'
             _W_msg_folder='Browse files'
             _W_msg_annihilate="Delete ALL DATA AND APPLICATIONS INSIDE THIS WINEPREFIX"
@@ -3757,6 +3760,7 @@ winetricks_mainmenu()
                     FALSE taskmgr     '${_W_msg_taskmgr}' \
                     FALSE explorer    '${_W_msg_explorer}' \
                     FALSE uninstaller '${_W_msg_uninstaller}' \
+                    FALSE cmd         '${_W_msg_winecmd}' \
                     FALSE shell       '${_W_msg_shell}' \
                     FALSE folder      '${_W_msg_folder}' \
                     FALSE annihilate  '${_W_msg_annihilate}' \
@@ -3780,6 +3784,7 @@ winetricks_mainmenu()
                     taskmgr     "${_W_msg_taskmgr}" off \
                     explorer    "${_W_msg_explorer}" off \
                     uninstaller "${_W_msg_uninstaller}" off \
+                    cmd         "${_W_msg_winecmd}" off \
                     shell       "${_W_msg_shell}" off \
                     folder      "${_W_msg_folder}" off \
                     annihilate  "${_W_msg_annihilate}" off \
@@ -4944,10 +4949,13 @@ winetricks_cleanup()
         kill $(cat "${WINETRICKS_WORKDIR}/dd-pid")
     fi
     test "${WINETRICKS_CACHE_SYMLINK}" && rm -f "${WINETRICKS_CACHE_SYMLINK}"
-    test "${W_OPT_NOCLEAN}" = 1 || rm -rf "${WINETRICKS_WORKDIR}"
-    # if $W_TMP_EARLY was created by mktemp, remove it (but not if W_OPT_NOCLEAN is set to 1):
-    test "${W_OPT_NOCLEAN}" = 1 || rm -rf "${W_TMP_EARLY}"
-    test "${W_OPT_NOCLEAN}" = 1 || rm -rf "${WINEPREFIX}"/wrapper.cfg
+
+    if [ "${W_OPT_NOCLEAN}" = 1 ]; then
+        rm -rf "${WINETRICKS_WORKDIR}"
+        rm -rf "${W_TMP_EARLY}"
+        rm -rf "${WINEPREFIX}/wrapper.cfg"
+        rm -rf "${WINEPREFIX}/no_win64_warnings"
+    fi
 }
 
 winetricks_set_unattended()
@@ -5071,12 +5079,36 @@ winetricks_set_wineprefix()
         W_COMMONFILES_WIN="$(w_expand_env CommonProgramW6432)"
         W_COMMONFILES="$(w_pathconv -u "${W_COMMONFILES_WIN}")"
 
-        # 64-bit prefixes still have plenty of issues:
-        case ${LANG} in
-            ru*) w_warn "Вы используете 64-битный WINEPREFIX. Важно: многие ветки устанавливают только 32-битные версии пакетов. Если у вас возникли проблемы, пожалуйста, проверьте еще раз на чистом 32-битном WINEPREFIX до отправки отчета об ошибке." ;;
-            pt*) w_warn "Você está usando um WINEPREFIX de 64-bit. Observe que muitos casos instalam apenas versões de pacotes de 32-bit. Se você encontrar problemas, teste novamente em um WINEPREFIX limpo de 32-bit antes de relatar um bug." ;;
-            *) 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." ;;
+        # 64-bit prefixes still have plenty of issues/a lot of verbs only install 32-bit libraries
+        # Allow the user to disable that (globally, or per prefix).
+        if test -f "${W_CACHE}/no_win64_warnings"; then
+            echo "${W_CACHE}/no_win64_warnings exists, not issuing 64-bit prefix warning"
+            _W_no_win64_warnings=1
+        elif test -f "${WINEPREFIX}/no_win64_warnings"; then
+            echo "${WINEPREFIX}/no_win64_warnings exists, not issuing 64-bit prefix warning"
+            _W_no_win64_warnings=1
+        elif test -f "${W_TMP_EARLY}/no_win64_warnings"; then
+            echo "${W_TMP_EARLY}/no_win64_warnings exists, not issuing 64-bit prefix warning"
+            _W_no_win64_warnings=1
+        else
+            _W_no_win64_warnings=0
+        fi
+
+        # In case of GUI, only warn once per prefix, per session (i.e., don't warn next time)
+        # Can't use ${W_TMP} because that is cleared out after each verb (by w_call())
+        case ${WINETRICKS_GUI} in
+            none) true ;;
+            *) touch "${W_TMP_EARLY}/no_win64_warnings" ;;
         esac
+
+        if [ "${_W_no_win64_warnings}" = 0 ]; then
+            case ${LANG} in
+                ru*) w_warn "Вы используете 64-битный WINEPREFIX. Важно: многие ветки устанавливают только 32-битные версии пакетов. Если у вас возникли проблемы, пожалуйста, проверьте еще раз на чистом 32-битном WINEPREFIX до отправки отчета об ошибке." ;;
+                pt*) w_warn "Você está usando um WINEPREFIX de 64-bit. Observe que muitos casos instalam apenas versões de pacotes de 32-bit. Se você encontrar problemas, teste novamente em um WINEPREFIX limpo de 32-bit antes de relatar um bug." ;;
+                *) 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
+        fi
+
     else
         WINE64="false"
         WINE_ARCH="${WINE}"
@@ -5107,7 +5139,7 @@ winetricks_set_wineprefix()
 
     ## Arch independent variables:
 
-    # Note: using AppData since it's arch indepedent
+    # Note: using AppData since it's arch independent
     W_APPDATA_WIN="$(w_expand_env AppData)"
     W_APPDATA_UNIX="$(w_pathconv -u "${W_APPDATA_WIN}")"
 
@@ -5147,10 +5179,11 @@ winetricks_set_wineprefix()
     esac
 
     W_WINDIR_UNIX="${W_DRIVE_C}/windows"
+    W_WINDIR_WIN="C:\\windows"
 
     # FIXME: get fonts path from SHGetFolderPath
     # See also https://blogs.msdn.microsoft.com/oldnewthing/20031103-00/?p=41973/
-    W_FONTSDIR_WIN="c:\\windows\\Fonts"
+    W_FONTSDIR_WIN="${W_WINDIR_WIN}\\Fonts"
 
     # FIXME: just convert path from Windows to Unix?
     # Did the user rename Fonts to fonts?
@@ -5410,10 +5443,10 @@ winetricks_wine_setup()
     # wine-2.8
     _wine_version_stripped="$(echo "${WINETRICKS_WINE_VERSION}" | cut -d ' ' -f1 | sed -e 's/wine-//' -e 's/-rc.*//')"
 
-    # If WINE is < 5.0, warn user:
-    # 5.0 doesn't do what I thought it would
-    if w_wine_version_in ,4.99 ; then
-        w_warn "Your version of wine ${_wine_version_stripped} is no longer supported upstream. You should upgrade to 5.x"
+    # If WINE is < 6.0, warn user:
+    # 6.0 doesn't do what I thought it would
+    if w_wine_version_in ,5.99 ; then
+        w_warn "Your version of wine ${_wine_version_stripped} is no longer supported upstream. You should upgrade to 6.x"
     fi
 
     winetricks_set_wineprefix "$1"
@@ -5952,7 +5985,7 @@ w_metadata cnc_ddraw dlls \
 load_cnc_ddraw()
 {
     # Note: only works if ddraw.ini contains settings for the executable
-    w_download https://github.com/CnCNet/cnc-ddraw/releases/download/v4.4.4.0/cnc-ddraw.zip 15b1f5ff38558869af651e3f10ab9e7728fa8f48d03b721e923f35fb417c55eb
+    w_download https://github.com/CnCNet/cnc-ddraw/releases/download/v4.6.0.0/cnc-ddraw.zip 1633d30bc80ecae60db97e881a4c804911e300dcb280d58ea8b8ddda2e1dd1ac
     w_try_unzip "${W_SYSTEM32_DLLS}" "${W_CACHE}/${W_PACKAGE}/${file1}"
 
     w_override_dlls native,builtin ddraw
@@ -6116,7 +6149,7 @@ w_metadata d3dcompiler_43 dlls \
 
 load_d3dcompiler_43()
 {
-    if w_workaround_wine_bug 24013 "Native d3dcompiler_43 may cause some d3d10 apps to crash, see https://bugs.winehq.org/show_bug.cgi?id=24013" ,5.4; then
+    if w_workaround_wine_bug 24013 "Native d3dcompiler_43 may cause some d3d10 apps to crash, see https://bugs.winehq.org/show_bug.cgi?id=24013" 4.20,; then
         :
     fi
 
@@ -6931,22 +6964,22 @@ load_dsdmo()
 
 #----------------------------------------------------------------
 
-w_metadata dxsdk_nov2006 apps \
-    title="MS DirectX SDK, November 2006 (developers only)" \
+w_metadata dxsdk_aug2006 apps \
+    title="MS DirectX SDK, August 2006 (developers only)" \
     publisher="Microsoft" \
     year="2006" \
     media="download" \
     file1="dxsdk_aug2006.exe" \
     installed_file1="${W_PROGRAMS_X86_WIN}/Microsoft DirectX SDK (August 2006)/Lib/x86/d3d10.lib"
 
-load_dxsdk_nov2006()
+load_dxsdk_aug2006()
 {
-    w_download https://download.microsoft.com/download/9/e/5/9e5bfc66-a621-4e0d-8bfe-6688058c3f00/dxsdk_aug2006.exe ab8d7d895089a88108d4148ef0f7e214b7a23c1ee9ba720feca78c7d4ca16c00
+    w_download https://archive.org/download/dxsdk_aug2006/dxsdk_aug2006.exe ab8d7d895089a88108d4148ef0f7e214b7a23c1ee9ba720feca78c7d4ca16c00
 
     # dxview.dll uses mfc42u while registering
     w_call mfc42
 
-    w_try_cabextract "${W_CACHE}"/dxsdk_nov2006/dxsdk_aug2006.exe
+    w_try_cabextract "${W_CACHE}/${W_PACKAGE}/${file1}"
     w_try_unzip "${W_TMP}" dxsdk.exe
     w_try_cd "${W_TMP}"
     w_try "${WINE}" msiexec /i Microsoft_DirectX_SDK.msi ${W_OPT_UNATTENDED:+/q}
@@ -6997,12 +7030,14 @@ load_dxtrans()
 # $2 - minimum Wine version (required)
 # $3 - minimum Vulkan API version (required)
 # $4 - [dxgi,][d3d9,][d3d10core,][d3d10,]d3d11 (required)
-helper_dxvk_d9vk()
+helper_dxvk()
 {
     _W_package_archive="${1}"
     _W_min_wine_version="${2}"
     _W_min_vulkan_version="${3}"
     _W_dll_overrides="$(echo "${4}" | sed 's/,/ /g')"
+    # dxvk repository, for d3d9/d3d10/d3d11 support
+    _W_repository="doitsujin/dxvk"
 
     _W_supported_overrides="dxgi d3d9 d3d10core d3d10 d3d11"
     _W_invalid_overrides="$(echo "${_W_dll_overrides}" | awk -vvalid_overrides_regex="$(echo "${_W_supported_overrides}" | sed 's/ /|/g')" '{ gsub(valid_overrides_regex,""); sub("[ ]*",""); print $0 }')"
@@ -7011,33 +7046,9 @@ helper_dxvk_d9vk()
     fi
 
     _W_dll_overrides="$(echo "${_W_dll_overrides}" | sed 's/d3d10 /&d3d10_1 /')"
-
-    case "${_W_package_archive}" in
-        d9vk*)
-            # dvk9 repository, for d3d9/d3d10/d3d11 support
-            _W_repository="Joshua-Ashton/d9vk"
-            ;;
-        dxvk*)
-            # dxvk repository, for d3d9/d3d10/d3d11 support
-            _W_repository="doitsujin/dxvk"
-            ;;
-        *)
-            w_die "parameter (1): unsupported package archive repository: '${_W_package_archive}'; supported: d9vk dxvk"
-            ;;
-    esac
-
-    case "${_W_package_archive}" in
-        *master*)
-            _W_package_dir="build/dxvk-release"
-            _W_package_version="master"
-            w_warn "Using master ${_W_repository} build"
-            ;;
-        *)
-            _W_package_dir="${_W_package_archive%.tar.gz}"
-            _W_package_version="${_W_package_dir#*-}"
-            w_warn "Please refer to ${_W_repository#*/} version ${_W_package_version} release notes... See: https://github.com/${_W_repository}/releases/tag/${_W_package_version}"
-            ;;
-    esac
+    _W_package_dir="${_W_package_archive%.tar.gz}"
+    _W_package_version="${_W_package_dir#*-}"
+    w_warn "Please refer to ${_W_repository#*/} version ${_W_package_version} release notes... See: https://github.com/${_W_repository}/releases/tag/${_W_package_version}"
     w_warn "Please refer to current dxvk base graphics driver requirements... See: https://github.com/doitsujin/dxvk/wiki/Driver-support"
 
     if w_wine_version_in ",${_W_min_wine_version}" ; then
@@ -7069,6 +7080,7 @@ helper_dxvk_d9vk()
         w_call d3dcompiler_43
         w_call d3dx9
     fi
+    w_call d3dcompiler_47
 
     unset _W_d3d9_support _W_dll _W_dll_overrides _W_invalid_overrides _W_min_vulkan_version _W_min_wine_version \
         _W_package_archive _W_package_dir _W_package_version \
@@ -7091,7 +7103,7 @@ load_dxvk0054()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v0.54/dxvk-0.54.tar.gz" 1c2f186baaa01d2de7b832f6f05021bdd29eccb65fc197c8b15adfd4e08f9640
-    helper_dxvk_d9vk "${file1}" "3.10" "1.1.72" "dxgi,d3d11"
+    helper_dxvk "${file1}" "3.10" "1.1.72" "dxgi,d3d11"
 }
 
 w_metadata dxvk0060 dlls \
@@ -7107,7 +7119,7 @@ load_dxvk0060()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v0.60/dxvk-0.60.tar.gz" 27d6f700241d3ec3b6c002c3d739bb0e3f210ec916ecb5a62d9204e9e50f2c4a
-    helper_dxvk_d9vk "${file1}" "3.10" "1.1.72" "dxgi,d3d11"
+    helper_dxvk "${file1}" "3.10" "1.1.72" "dxgi,d3d11"
 }
 
 w_metadata dxvk0061 dlls \
@@ -7123,7 +7135,7 @@ load_dxvk0061()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v0.61/dxvk-0.61.tar.gz" d04388f026dc0d8b276b08f7db74fb3556cbbc8f762401eb5ef52629ee39ded1
-    helper_dxvk_d9vk "${file1}"  "3.10" "1.1.72" "dxgi,d3d11"
+    helper_dxvk "${file1}"  "3.10" "1.1.72" "dxgi,d3d11"
 }
 
 w_metadata dxvk0062 dlls \
@@ -7139,7 +7151,7 @@ load_dxvk0062()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v0.62/dxvk-0.62.tar.gz" b9dbb57908e24b094b68f665ad729b6ee277eecc8ba04a6e6e4f8a4d2dfd94e3
-    helper_dxvk_d9vk "${file1}"  "3.10" "1.1.72" "dxgi,d3d11"
+    helper_dxvk "${file1}"  "3.10" "1.1.72" "dxgi,d3d11"
 }
 
 w_metadata dxvk0063 dlls \
@@ -7155,7 +7167,7 @@ load_dxvk0063()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v0.63/dxvk-0.63.tar.gz" 696df816bd9640770dee14f932bc641a16261fccf76be7c28d812a64ca6040fa
-    helper_dxvk_d9vk "${file1}"  "3.18" "1.1.80" "dxgi,d3d11"
+    helper_dxvk "${file1}"  "3.18" "1.1.80" "dxgi,d3d11"
 }
 
 w_metadata dxvk0064 dlls \
@@ -7171,7 +7183,7 @@ load_dxvk0064()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v0.64/dxvk-0.64.tar.gz" 2e03e40ff0a9d36f96a06137f3fa9110ebaea230d0bf6c22cf6399e16e97fb9c
-    helper_dxvk_d9vk "${file1}" "3.18" "1.1.80" "dxgi,d3d11"
+    helper_dxvk "${file1}" "3.18" "1.1.80" "dxgi,d3d11"
 }
 
 w_metadata dxvk0065 dlls \
@@ -7187,7 +7199,7 @@ load_dxvk0065()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v0.65/dxvk-0.65.tar.gz" 7b4eb42e693f925d0aff90bae261b20c50428602382ee94a3e3860b2ad1ebad0
-    helper_dxvk_d9vk "${file1}" "3.18" "1.1.80" "dxgi,d3d11"
+    helper_dxvk "${file1}" "3.18" "1.1.80" "dxgi,d3d11"
 }
 
 w_metadata dxvk0070 dlls \
@@ -7206,7 +7218,7 @@ load_dxvk0070()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v0.70/dxvk-0.70.tar.gz" 310546d530be494a35cae49b707fef4b073269d811aac25bdf72899ed1df4e9f
-    helper_dxvk_d9vk "${file1}" "3.18" "1.1.80" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "3.18" "1.1.80" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk0071 dlls \
@@ -7225,7 +7237,7 @@ load_dxvk0071()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v0.71/dxvk-0.71.tar.gz" fbe66337d1450f366961a7699253cd7a96c12a88c2fcda64b79be1cbb13d37d5
-    helper_dxvk_d9vk "${file1}" "3.18" "1.1.80" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "3.18" "1.1.80" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk0072 dlls \
@@ -7244,7 +7256,7 @@ load_dxvk0072()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v0.72/dxvk-0.72.tar.gz" bc84f48f99cf5add3c8919a43d7a9c0bf208c994dc58326a636b56b8db650c52
-    helper_dxvk_d9vk "${file1}" "3.18" "1.1.84" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "3.18" "1.1.84" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk0080 dlls \
@@ -7266,7 +7278,7 @@ load_dxvk0080()
     # 2017/11/17: 7058a834bb006cad5462933110449b434df561e67d83f68d3965ecc74e2e1cbc
     # See: https://github.com/doitsujin/dxvk/issues/773
     w_download "https://github.com/doitsujin/dxvk/releases/download/v0.80/dxvk-0.80.tar.gz" 7058a834bb006cad5462933110449b434df561e67d83f68d3965ecc74e2e1cbc
-    helper_dxvk_d9vk "${file1}" "3.18" "1.1.84" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "3.18" "1.1.84" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk0081 dlls \
@@ -7285,7 +7297,7 @@ load_dxvk0081()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v0.81/dxvk-0.81.tar.gz" 9bf6eda9ae4ee74b509e07dfe9cc003dfa4bba192b519dacdd542a57f6a43869
-    helper_dxvk_d9vk "${file1}" "3.18" "1.1.84" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "3.18" "1.1.84" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk0090 dlls \
@@ -7304,7 +7316,7 @@ load_dxvk0090()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v0.90/dxvk-0.90.tar.gz" 15bce7b282065054ff9233b33738bf1d2c74b16829361cbd6843bc2f5dfe4509
-    helper_dxvk_d9vk "${file1}" "3.19" "1.1.87" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "3.19" "1.1.87" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk0091 dlls \
@@ -7323,7 +7335,7 @@ load_dxvk0091()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v0.91/dxvk-0.91.tar.gz" 5296106ac3a8c631d7f26fa46dbff4be1332cda14fa493fd89ccf97e050c4855
-    helper_dxvk_d9vk "${file1}" "3.19" "1.1.87" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "3.19" "1.1.87" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk0092 dlls \
@@ -7342,7 +7354,7 @@ load_dxvk0092()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v0.92/dxvk-0.92.tar.gz" e22c0ae4693aac88562c7a9a97b3316e086b9048c9f8f9e128923ac1611a5c49
-    helper_dxvk_d9vk "${file1}" "3.19" "1.1.87" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "3.19" "1.1.87" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk0093 dlls \
@@ -7361,7 +7373,7 @@ load_dxvk0093()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v0.93/dxvk-0.93.tar.gz" 4d964e4e10e67ba7705312496e472ae9859520a78d8742d6d377886318c95e53
-    helper_dxvk_d9vk "${file1}" "4.0" "1.1.93" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.0" "1.1.93" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk0094 dlls \
@@ -7380,7 +7392,7 @@ load_dxvk0094()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v0.94/dxvk-0.94.tar.gz" 1f06bfac5b435b62b972806fb3bbd86f7ccae2399b4451e85ae414e03d3712a3
-    helper_dxvk_d9vk "${file1}" "4.0" "1.1.93" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.0" "1.1.93" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk0095 dlls \
@@ -7399,7 +7411,7 @@ load_dxvk0095()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v0.95/dxvk-0.95.tar.gz" 1eea48149f6e94c3c74ecddd92df4f9daa67ab28d0fca548bde5cd40f0e486bf
-    helper_dxvk_d9vk "${file1}" "4.0" "1.1.93" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.0" "1.1.93" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk0096 dlls \
@@ -7418,7 +7430,7 @@ load_dxvk0096()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v0.96/dxvk-0.96.tar.gz" 9d054c1e7a4f59825c651b14d3cfbf0d8c724763f485b3d59c89f1d7194b2206
-    helper_dxvk_d9vk "${file1}" "4.0" "1.1.93" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.0" "1.1.93" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1000 dlls \
@@ -7437,7 +7449,7 @@ load_dxvk1000()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.0/dxvk-1.0.tar.gz" 8c8d26544609532201c10e6f5309bf5e913b5ca5b985932928ef9ab238de6dc2
-    helper_dxvk_d9vk "${file1}" "4.5" "1.1.101" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.5" "1.1.101" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1001 dlls \
@@ -7456,7 +7468,7 @@ load_dxvk1001()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.0.1/dxvk-1.0.1.tar.gz" 739847cdd14b302dac600c66bc6617d7814945df6d4d7b6c91fecfa910e3b1b1
-    helper_dxvk_d9vk "${file1}" "4.5" "1.1.101" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.5" "1.1.101" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1002 dlls \
@@ -7475,7 +7487,7 @@ load_dxvk1002()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.0.2/dxvk-1.0.2.tar.gz" f9504b188488d1102cba7e82c28681708f39e151af1c1ef7ebeac82d729c01ac
-    helper_dxvk_d9vk "${file1}" "4.5" "1.1.101" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.5" "1.1.101" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1003 dlls \
@@ -7494,7 +7506,7 @@ load_dxvk1003()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.0.3/dxvk-1.0.3.tar.gz" 984d28ab3a112be207d6339da19113d1117e56731ed413d0e202e6fd1391a6ae
-    helper_dxvk_d9vk "${file1}" "4.5" "1.1.101" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.5" "1.1.101" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1011 dlls \
@@ -7513,7 +7525,7 @@ load_dxvk1011()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.1.1/dxvk-1.1.1.tar.gz" 346c523953f72ac5885071c4384039faf01f6f43a88d5b0c12d94bfaa9598c1d
-    helper_dxvk_d9vk "${file1}" "4.5" "1.1.104" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.5" "1.1.104" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1020 dlls \
@@ -7532,7 +7544,7 @@ load_dxvk1020()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.2/dxvk-1.2.tar.gz" 414751a810143ced34d1f4f0eb2a40e79b4c9726318994b244b70d1b3a6f8b32
-    helper_dxvk_d9vk "${file1}" "4.5" "1.1.104" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.5" "1.1.104" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1021 dlls \
@@ -7551,7 +7563,7 @@ load_dxvk1021()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.2.1/dxvk-1.2.1.tar.gz" 192beca0a34d13f101e9c2545d9533cf84830a23b566bed185c022ed754c3daa
-    helper_dxvk_d9vk "${file1}" "4.5" "1.1.104" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.5" "1.1.104" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1022 dlls \
@@ -7570,7 +7582,7 @@ load_dxvk1022()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.2.2/dxvk-1.2.2.tar.gz" dfe620a387222dc117a6722171e0bca400755a3e1c6459350c710dfda40b6701
-    helper_dxvk_d9vk "${file1}" "4.5" "1.1.104" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.5" "1.1.104" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1023 dlls \
@@ -7589,7 +7601,7 @@ load_dxvk1023()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.2.3/dxvk-1.2.3.tar.gz" 29ce345b3d962dbd8ec8bfda190635a21f62124e3e46f06e89aa2f3b1e230321
-    helper_dxvk_d9vk "${file1}" "4.5" "1.1.104" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.5" "1.1.104" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1030 dlls \
@@ -7608,7 +7620,7 @@ load_dxvk1030()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.3/dxvk-1.3.tar.gz" d15fac6503ea614986237052d554d7cbd2dbf5f3486feb6217e64bae83cfc2cf
-    helper_dxvk_d9vk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1031 dlls \
@@ -7627,7 +7639,7 @@ load_dxvk1031()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.3.1/dxvk-1.3.1.tar.gz" 2f6636dbd591ea9de20b30a33c9c8c0985a4939f6503f90ca5c7edafd01524a3
-    helper_dxvk_d9vk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1032 dlls \
@@ -7646,7 +7658,7 @@ load_dxvk1032()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.3.2/dxvk-1.3.2.tar.gz" aa70890a17b48be27648d15cb837b5167c99f75ee32ae0c94a85ec1f1fdc4675
-    helper_dxvk_d9vk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1033 dlls \
@@ -7665,7 +7677,7 @@ load_dxvk1033()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.3.3/dxvk-1.3.3.tar.gz" 828171ad1dbb6b51f367fa46cf33f8db4a0b1b990cd2e95654d6a65500d230b7
-    helper_dxvk_d9vk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1034 dlls \
@@ -7684,7 +7696,7 @@ load_dxvk1034()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.3.4/dxvk-1.3.4.tar.gz" 4683e2ad4221b16572b0d939da5a05ab9a16b2b62c2f4e0c8bf3b2cdb27918ff
-    helper_dxvk_d9vk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1040 dlls \
@@ -7703,7 +7715,7 @@ load_dxvk1040()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.4/dxvk-1.4.tar.gz" bf22785de1ce728bbdcfb4615035924112b4718049ca2cade5861b03735181de
-    helper_dxvk_d9vk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1041 dlls \
@@ -7722,7 +7734,7 @@ load_dxvk1041()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.4.1/dxvk-1.4.1.tar.gz" 574ec4dc5201e45d70472228f0c6695426f0392503ec7a47d6092600aac53a07
-    helper_dxvk_d9vk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1042 dlls \
@@ -7741,7 +7753,7 @@ load_dxvk1042()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.4.2/dxvk-1.4.2.tar.gz" 5adfd71ee0299798af4402f09f113f88929af429b6889af334cff5b84b84dbe6
-    helper_dxvk_d9vk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1043 dlls \
@@ -7760,7 +7772,7 @@ load_dxvk1043()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.4.3/dxvk-1.4.3.tar.gz" e4b9e7fc8faf2dd1ddf5206e14939a822034a85778d54a6950767d68909726f7
-    helper_dxvk_d9vk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1044 dlls \
@@ -7779,7 +7791,7 @@ load_dxvk1044()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.4.4/dxvk-1.4.4.tar.gz" a845285c8dfc63c7d00c14520b58fc6048796fef69fea49617edb46662a0ba31
-    helper_dxvk_d9vk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1045 dlls \
@@ -7798,7 +7810,7 @@ load_dxvk1045()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.4.5/dxvk-1.4.5.tar.gz" 566c93dce84c3c2f39938428ddcca27a5bb2f5068eb4f868ff2126389b965cd1
-    helper_dxvk_d9vk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1046 dlls \
@@ -7819,7 +7831,7 @@ load_dxvk1046()
     # Original sha256sum: 1aa069f5ea7d3d6e374bda332d12f9207f1a21e9811c4d4d82487416420ee73e
     # Upstream later rebuilt with commit 1ae7d4b30283d2eb06b467c581aafdbbd9d36cdf: c9e3a96d8c5e693e20f69f27ac3f8b55198449fddd24205195476d6af7e8a339
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.4.6/dxvk-1.4.6.tar.gz" c9e3a96d8c5e693e20f69f27ac3f8b55198449fddd24205195476d6af7e8a339
-    helper_dxvk_d9vk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1050 dlls \
@@ -7829,17 +7841,17 @@ w_metadata dxvk1050 dlls \
     media="download" \
     file1="dxvk-1.5.tar.gz" \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
-    installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
-    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
-    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
-    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
-    installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
+    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
+    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+    installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+    installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
 load_dxvk1050()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.5/dxvk-1.5.tar.gz" 90cfae0bb43fed1e46442d20e2ab3bf448ebdff1e9f4f59841dc922aa3a36d3b
-    helper_dxvk_d9vk "${file1}" "4.20" "1.1.113" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d9,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1051 dlls \
@@ -7849,17 +7861,17 @@ w_metadata dxvk1051 dlls \
     media="download" \
     file1="dxvk-1.5.1.tar.gz" \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
-    installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
-    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
-    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
-    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
-    installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
+    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
+    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+    installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+    installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
 load_dxvk1051()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.5.1/dxvk-1.5.1.tar.gz" 474ce9995edd47a3bd347a8f3263f35cf8df2676f5b16668bf38efa298d75c01
-    helper_dxvk_d9vk "${file1}" "4.20" "1.1.113" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d9,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1052 dlls \
@@ -7869,17 +7881,17 @@ w_metadata dxvk1052 dlls \
     media="download" \
     file1="dxvk-1.5.2.tar.gz" \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
-    installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
-    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
-    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
-    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
-    installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
+    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
+    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+    installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+    installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
 load_dxvk1052()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.5.2/dxvk-1.5.2.tar.gz" 684ba886b5ed922c2417753d8178f923c695258c69cc8f778bb59b99bbf62477
-    helper_dxvk_d9vk "${file1}" "4.20" "1.1.113" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d9,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1053 dlls \
@@ -7889,17 +7901,17 @@ w_metadata dxvk1053 dlls \
     media="download" \
     file1="dxvk-1.5.3.tar.gz" \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
-    installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
-    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
-    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
-    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
-    installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
+    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
+    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+    installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+    installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
 load_dxvk1053()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.5.3/dxvk-1.5.3.tar.gz" b845c9c492e32648dee44d058c189eff8534e5490a80a3b2a921248bc72e33bd
-    helper_dxvk_d9vk "${file1}" "4.20" "1.1.113" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d9,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1054 dlls \
@@ -7909,17 +7921,17 @@ w_metadata dxvk1054 dlls \
     media="download" \
     file1="dxvk-1.5.4.tar.gz" \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
-    installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
-    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
-    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
-    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
-    installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
+    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
+    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+    installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+    installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
 load_dxvk1054()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.5.4/dxvk-1.5.4.tar.gz" 8e4fd15525def9bcaa9cc1b4496f76a2664ba4806b02a5ac0eddd703d7bbdea7
-    helper_dxvk_d9vk "${file1}" "4.20" "1.1.113" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d9,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1055 dlls \
@@ -7929,17 +7941,17 @@ w_metadata dxvk1055 dlls \
     media="download" \
     file1="dxvk-1.5.5.tar.gz" \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
-    installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
-    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
-    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
-    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
-    installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
+    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
+    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+    installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+    installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
 load_dxvk1055()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.5.5/dxvk-1.5.5.tar.gz" f4c57274ac85d71b192e2a0ac095f285e26cc054c87c6c34c081f919147539eb
-    helper_dxvk_d9vk "${file1}" "4.20" "1.1.113" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+    helper_dxvk "${file1}" "4.20" "1.1.113" "dxgi,d3d9,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1060 dlls \
@@ -7949,15 +7961,17 @@ w_metadata dxvk1060 dlls \
     media="download" \
     file1="dxvk-1.6.tar.gz" \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
-    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
-    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
-    installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
+    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
+    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+    installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+    installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
 load_dxvk1060()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.6/dxvk-1.6.tar.gz" a493e0802e02629244672c44ad92c40fa0813b38908677ae14ee07feefcf7227
-    helper_dxvk_d9vk "${file1}" "5.3" "1.1.113" "dxgi,d3d9,d3d10core,d3d11"
+    helper_dxvk "${file1}" "5.3" "1.1.113" "dxgi,d3d9,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1061 dlls \
@@ -7967,15 +7981,17 @@ w_metadata dxvk1061 dlls \
     media="download" \
     file1="dxvk-1.6.1.tar.gz" \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
-    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
-    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
-    installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
+    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
+    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+    installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+    installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
 load_dxvk1061()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.6.1/dxvk-1.6.1.tar.gz" cdef8735313ed9ccb7af23b37bcceaad54553e29505c269246d5e347f1359136
-    helper_dxvk_d9vk "${file1}" "5.3" "1.1.113" "dxgi,d3d9,d3d10core,d3d11"
+    helper_dxvk "${file1}" "5.3" "1.1.113" "dxgi,d3d9,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1070 dlls \
@@ -7985,15 +8001,17 @@ w_metadata dxvk1070 dlls \
     media="download" \
     file1="dxvk-1.7.tar.gz" \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
-    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
-    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
-    installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
+    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
+    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+    installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+    installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
 load_dxvk1070()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.7/dxvk-1.7.tar.gz" 67d78239906c24bd50a5ecbc2fd792c1721e274a7a60dd22f74b21b08ca4c7a1
-    helper_dxvk_d9vk "${file1}" "5.8" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
+    helper_dxvk "${file1}" "5.8" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1071 dlls \
@@ -8003,15 +8021,17 @@ w_metadata dxvk1071 dlls \
     media="download" \
     file1="dxvk-1.7.1.tar.gz" \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
-    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
-    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
-    installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
+    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
+    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+    installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+    installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
 load_dxvk1071()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.7.1/dxvk-1.7.1.tar.gz" 6ce66c4e01196ed022604e90383593aea02c9016bde92c6840aa58805d5fc588
-    helper_dxvk_d9vk "${file1}" "5.8" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
+    helper_dxvk "${file1}" "5.8" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1072 dlls \
@@ -8021,15 +8041,17 @@ w_metadata dxvk1072 dlls \
     media="download" \
     file1="dxvk-1.7.2.tar.gz" \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
-    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
-    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
-    installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
+    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
+    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+    installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+    installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
 load_dxvk1072()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.7.2/dxvk-1.7.2.tar.gz" 1662f6bda93faf4f6c8b57d656779b08925889dd6b794114be874d6deb97e15b
-    helper_dxvk_d9vk "${file1}" "5.8" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
+    helper_dxvk "${file1}" "5.8" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1073 dlls \
@@ -8039,15 +8061,17 @@ w_metadata dxvk1073 dlls \
     media="download" \
     file1="dxvk-1.7.3.tar.gz" \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
-    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
-    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
-    installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
+    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
+    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+    installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+    installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
 load_dxvk1073()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.7.3/dxvk-1.7.3.tar.gz" e4c2444256b7ad63455fa6329638e3f42900ec7462dc9c26da56187a2040aba0
-    helper_dxvk_d9vk "${file1}" "5.8" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
+    helper_dxvk "${file1}" "5.8" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1080 dlls \
@@ -8057,15 +8081,17 @@ w_metadata dxvk1080 dlls \
     media="download" \
     file1="dxvk-1.8.tar.gz" \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
-    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
-    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
-    installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
+    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
+    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+    installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+    installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
 load_dxvk1080()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.8/dxvk-1.8.tar.gz" e84f7ac494ac7f5013976744470899226d145e29617c407ff52870055bda476e
-    helper_dxvk_d9vk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
+    helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1081 dlls \
@@ -8075,15 +8101,17 @@ w_metadata dxvk1081 dlls \
     media="download" \
     file1="dxvk-1.8.1.tar.gz" \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
-    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
-    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
-    installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
+    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
+    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+    installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+    installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
 load_dxvk1081()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.8.1/dxvk-1.8.1.tar.gz" 756a09c46f8279ade84456e3af038f64613a51e00a2d4cfffa4c91c10ede60e8
-    helper_dxvk_d9vk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
+    helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1090 dlls \
@@ -8093,15 +8121,17 @@ w_metadata dxvk1090 dlls \
     media="download" \
     file1="dxvk-1.9.tar.gz" \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
-    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
-    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
-    installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
+    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
+    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+    installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+    installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
 load_dxvk1090()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.9/dxvk-1.9.tar.gz" 433868f8783887192a04b788203d6b4effe3168be762dd60df1c1b564421a6ed
-    helper_dxvk_d9vk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
+    helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1091 dlls \
@@ -8111,15 +8141,17 @@ w_metadata dxvk1091 dlls \
     media="download" \
     file1="dxvk-1.9.1.tar.gz" \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
-    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
-    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
-    installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
+    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
+    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+    installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+    installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
 load_dxvk1091()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.9.1/dxvk-1.9.1.tar.gz" ef7591d6effcca8a8352cea4fa50fe73aa1f10fd89cb475f2f14236e4340a007
-    helper_dxvk_d9vk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
+    helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1092 dlls \
@@ -8129,15 +8161,17 @@ w_metadata dxvk1092 dlls \
     media="download" \
     file1="dxvk-1.9.2.tar.gz" \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
-    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
-    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
-    installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
+    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
+    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+    installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+    installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
 load_dxvk1092()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.9.2/dxvk-1.9.2.tar.gz" 24bcee655767f4731b8d3883dd93ba4edc7f1e87421e15fab19499d57236b8e9
-    helper_dxvk_d9vk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
+    helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1093 dlls \
@@ -8147,15 +8181,17 @@ w_metadata dxvk1093 dlls \
     media="download" \
     file1="dxvk-1.9.3.tar.gz" \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
-    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
-    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
-    installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
+    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
+    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+    installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+    installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
 load_dxvk1093()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.9.3/dxvk-1.9.3.tar.gz" cfcf4fac1f6bfc5a09183e77362a0af7fead4e54961bb548aef3e6cddadbe9bf
-    helper_dxvk_d9vk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
+    helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1094 dlls \
@@ -8165,15 +8201,17 @@ w_metadata dxvk1094 dlls \
     media="download" \
     file1="dxvk-1.9.4.tar.gz" \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
-    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
-    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
-    installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
+    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
+    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+    installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+    installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
 load_dxvk1094()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.9.4/dxvk-1.9.4.tar.gz" 854f564c3b58a4cdf7b16eb9a4b6bc6ddc0f83d68c4f979a529fc23f7a770502
-    helper_dxvk_d9vk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
+    helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1100 dlls \
@@ -8183,15 +8221,17 @@ w_metadata dxvk1100 dlls \
     media="download" \
     file1="dxvk-1.10.tar.gz" \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
-    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
-    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
-    installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
+    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
+    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+    installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+    installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
 load_dxvk1100()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.10/dxvk-1.10.tar.gz" a15bc7c1df66158a205c498883b0b216390d58f4a128657990af357431b9ce77
-    helper_dxvk_d9vk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
+    helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
 }
 
 w_metadata dxvk1101 dlls \
@@ -8201,15 +8241,57 @@ w_metadata dxvk1101 dlls \
     media="download" \
     file1="dxvk-1.10.1.tar.gz" \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
-    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
-    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
-    installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
+    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
+    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+    installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+    installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
 load_dxvk1101()
 {
     # https://github.com/doitsujin/dxvk
     w_download "https://github.com/doitsujin/dxvk/releases/download/v1.10.1/dxvk-1.10.1.tar.gz" dc349482cb0a73d4e29c82f8e9ff6031e09e176e84a97ffe91eac64422b307aa
-    helper_dxvk_d9vk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
+    helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+}
+
+w_metadata dxvk1102 dlls \
+    title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.10.2)" \
+    publisher="Philip Rebohle" \
+    year="2017" \
+    media="download" \
+    file1="dxvk-1.10.2.tar.gz" \
+    installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
+    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
+    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
+    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+    installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+    installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+
+load_dxvk1102()
+{
+    # https://github.com/doitsujin/dxvk
+    w_download "https://github.com/doitsujin/dxvk/releases/download/v1.10.2/dxvk-1.10.2.tar.gz" bf97df2b8923cd8e6c646bd66bdb3d0894da1be05a6498c2dbc15b4d2e530c83
+    helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
+}
+
+w_metadata dxvk1103 dlls \
+    title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.10.3)" \
+    publisher="Philip Rebohle" \
+    year="2017" \
+    media="download" \
+    file1="dxvk-1.10.3.tar.gz" \
+    installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d9.dll" \
+    installed_file2="${W_SYSTEM32_DLLS_WIN}/d3d10.dll" \
+    installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d10_1.dll" \
+    installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d10core.dll" \
+    installed_file5="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
+    installed_file6="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
+
+load_dxvk1103()
+{
+    # https://github.com/doitsujin/dxvk
+    w_download "https://github.com/doitsujin/dxvk/releases/download/v1.10.3/dxvk-1.10.3.tar.gz" 8d1a3c912761b450c879f98478ae64f6f6639e40ce6848170a0f6b8596fd53c6
+    helper_dxvk "${file1}" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d10,d3d11"
 }
 
 #----------------------------------------------------------------
@@ -8230,7 +8312,7 @@ 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"
-    helper_dxvk_d9vk "dxvk-${_W_dxvk_version}.tar.gz" "5.14" "1.2.140" "dxgi,d3d9,d3d10core,d3d11"
+    helper_dxvk "dxvk-${_W_dxvk_version}.tar.gz" "7.1" "1.3.204" "dxgi,d3d9,d3d10core,d3d11"
     unset _W_dxvk_version
 }
 
@@ -8271,7 +8353,7 @@ helper_vkd3d_proton()
         w_try_unzip "${W_TMP}" "${W_CACHE}/${W_PACKAGE}/${_W_package_archive}"
     elif [ "${_W_package_archive##*.}" = "zst" ]; then
         w_try_cd "${W_TMP}"
-        w_try tar -I zstd -xvf "${W_CACHE}/${W_PACKAGE}/${_W_package_archive}"
+        w_try tar --use-compress-program=unzstd -xvf "${W_CACHE}/${W_PACKAGE}/${_W_package_archive}"
     else
         w_try_cd "${W_TMP}"
         w_try tar -zxf "${W_CACHE}/${W_PACKAGE}/${_W_package_archive}"
@@ -8529,7 +8611,7 @@ w_metadata dotnet11 dlls \
     media="download" \
     conflicts="dotnet20sdk" \
     file1="dotnetfx.exe" \
-    installed_file1="c:/windows/Microsoft.NET/Framework/v1.1.4322/ndpsetup.ico"
+    installed_file1="${W_WINDIR_WIN}/Microsoft.NET/Framework/v1.1.4322/ndpsetup.ico"
 
 load_dotnet11()
 {
@@ -8539,7 +8621,7 @@ load_dotnet11()
     # https://www.microsoft.com/en-us/download/details.aspx?id=26
     w_download https://web.archive.org/web/20210505032023/http://download.microsoft.com/download/a/a/c/aac39226-8825-44ce-90e3-bf8203e74006/dotnetfx.exe ba0e58ec93f2ffd54fc7c627eeca9502e11ab3c6fc85dcbeff113bd61d995bce
 
-    w_call remove_mono
+    w_call remove_mono internal
     w_call corefonts
     w_call fontfix
 
@@ -8589,16 +8671,16 @@ w_metadata dotnet11sp1 dlls \
     year="2004" \
     media="download" \
     file1="NDP1.1sp1-KB867460-X86.exe" \
-    installed_file1="c:/windows/Microsoft.NET/Framework/v1.1.4322/CONFIG/web_hightrust.config.default"
+    installed_file1="${W_WINDIR_WIN}/Microsoft.NET/Framework/v1.1.4322/CONFIG/web_hightrust.config.default"
 
 load_dotnet11sp1()
 {
     # The installer itself doesn't support 64-bit
     w_package_unsupported_win64
 
-    w_download https://download.microsoft.com/download/8/b/4/8b4addd8-e957-4dea-bdb8-c4e00af5b94b/NDP1.1sp1-KB867460-X86.exe 2c0a35409ff0873cfa28b70b8224e9aca2362241c1f0ed6f622fef8d4722fd9a
+    w_download https://msassist.com/files/dotNETframework/NDP1.1sp1-KB867460-X86.exe 2c0a35409ff0873cfa28b70b8224e9aca2362241c1f0ed6f622fef8d4722fd9a
 
-    w_call remove_mono
+    w_call remove_mono internal
     w_call dotnet11
 
     w_try_cd "${W_CACHE}/${W_PACKAGE}"
@@ -8647,11 +8729,11 @@ w_metadata dotnet20 dlls \
     media="download" \
     conflicts="dotnet20sp1 dotnet20sp2 dotnet30sp1 dotnet35" \
     file1="dotnetfx.exe" \
-    installed_file1="c:/windows/Microsoft.NET/Framework/v2.0.50727/MSBuild.exe"
+    installed_file1="${W_WINDIR_WIN}/Microsoft.NET/Framework/v2.0.50727/MSBuild.exe"
 
 load_dotnet20()
 {
-    w_call remove_mono
+    w_call remove_mono internal
     w_call fontfix
 
     if [ "${W_ARCH}" = "win32" ]; then
@@ -8701,7 +8783,7 @@ load_dotnet20()
         # This affects Victoria 2 demo, see https://forum.paradoxplaza.com/forum/showthread.php?p=11523967
         rm -f "${W_SYSTEM32_DLLS}"/msvc?80.dll
     elif [ "${W_ARCH}" = "win64" ]; then
-        w_download https://download.microsoft.com/download/a/3/f/a3f1bf98-18f3-4036-9b68-8e6de530ce0a/NetFx64.exe 7ea86dca8eeaedcaa4a17370547ca2cea9e9b6774972b8e03d2cb1fb0e798669
+        w_download https://web.archive.org/web/20060509045320/https://download.microsoft.com/download/a/3/f/a3f1bf98-18f3-4036-9b68-8e6de530ce0a/NetFx64.exe 7ea86dca8eeaedcaa4a17370547ca2cea9e9b6774972b8e03d2cb1fb0e798669
 
         # validates successfully in win7 mode wine-3.19, so not setting winversion
         w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
@@ -8736,9 +8818,9 @@ load_dotnet20sdk()
     w_package_unsupported_win64
 
     # https://www.microsoft.com/en-us/download/details.aspx?id=19988
-    w_download https://download.microsoft.com/download/c/4/b/c4b15d7d-6f37-4d5a-b9c6-8f07e7d46635/setup.exe 1d7337bfbb2c65f43c82d188688ce152af403bcb67a2cc2a3cc68a580ecd8200
+    w_download https://web.archive.org/web/20111102051348/https://download.microsoft.com/download/c/4/b/c4b15d7d-6f37-4d5a-b9c6-8f07e7d46635/setup.exe 1d7337bfbb2c65f43c82d188688ce152af403bcb67a2cc2a3cc68a580ecd8200
 
-    w_call remove_mono
+    w_call remove_mono internal
 
     w_call dotnet20
 
@@ -8800,11 +8882,11 @@ w_metadata dotnet20sp1 dlls \
     media="download" \
     conflicts="dotnet20sp2" \
     file1="NetFx20SP1_x86.exe" \
-    installed_file1="c:/windows/dotnet20sp1.installed.workaround"
+    installed_file1="${W_WINDIR_WIN}/dotnet20sp1.installed.workaround"
 
 load_dotnet20sp1()
 {
-    w_call remove_mono
+    w_call remove_mono internal
 
     # Not sure when exactly it was fixed, but it works with 4.0+, and doesn't in 3.0
     # Given that 3.x is deprecated, not worth looking into.
@@ -8872,11 +8954,11 @@ w_metadata dotnet20sp2 dlls \
     media="download" \
     conflicts="dotnet11" \
     file1="NetFx20SP2_x86.exe" \
-    installed_file1="c:/windows/winsxs/manifests/x86_Microsoft.VC80.CRT_1fc8b3b9a1e18e3b_8.0.50727.3053_x-ww_b80fa8ca.cat"
+    installed_file1="${W_WINDIR_WIN}/winsxs/manifests/x86_Microsoft.VC80.CRT_1fc8b3b9a1e18e3b_8.0.50727.3053_x-ww_b80fa8ca.cat"
 
 load_dotnet20sp2()
 {
-    w_call remove_mono
+    w_call remove_mono internal
 
     # Not sure when exactly it was fixed, but it works with 4.0+, and doesn't in 3.0
     # Given that 3.x is deprecated, not worth looking into.
@@ -8935,7 +9017,7 @@ w_metadata dotnet30 dlls \
     media="download" \
     conflicts="dotnet11 dotnet30sp1 dotnet35 dotnet35sp1" \
     file1="dotnetfx3.exe" \
-    installed_file1="c:/windows/Microsoft.NET/Framework/v3.0/Microsoft .NET Framework 3.0/logo.bmp"
+    installed_file1="${W_WINDIR_WIN}/Microsoft.NET/Framework/v3.0/Microsoft .NET Framework 3.0/logo.bmp"
 
 load_dotnet30()
 {
@@ -8951,7 +9033,7 @@ load_dotnet30()
     # 2020/04/12: couldn't find a working mirror, so back to archive.org for now:
     w_download https://web.archive.org/web/20061130220825/http://download.microsoft.com/download/3/F/0/3F0A922C-F239-4B9B-9CB0-DF53621C57D9/dotnetfx3.exe 6cf8921e00f52bbd888aa7a520a7bac47e818e2a850bcc44494c64d6cbfafdac
 
-    w_call remove_mono
+    w_call remove_mono internal
 
     if test -f /proc/sys/kernel/yama/ptrace_scope; then
         case $(cat /proc/sys/kernel/yama/ptrace_scope) in
@@ -9020,7 +9102,7 @@ w_metadata dotnet30sp1 dlls \
     media="download" \
     conflicts="dotnet11 dotnet20sdk" \
     file1="NetFx30SP1_x86.exe" \
-    installed_file1="c:/windows/dotnet30sp1.installed.workaround"
+    installed_file1="${W_WINDIR_WIN}/dotnet30sp1.installed.workaround"
 
 load_dotnet30sp1()
 {
@@ -9045,7 +9127,7 @@ load_dotnet30sp1()
     # 2020/10/19: w_download https://download.microsoft.com/download/2/5/2/2526f55d-32bc-410f-be18-164ba67ae07d/XPSEP%20XP%20and%20Server%202003%2032%20bit.msi 630c86a202c40cbcd430701977d4f1fefa6151624ef9a4870040dff45e547dea "XPSEP XP and Server 2003 32 bit.msi"
     w_download https://web.archive.org/web/20200810211554if_/https://download.microsoft.com/download/2/5/2/2526f55d-32bc-410f-be18-164ba67ae07d/XPSEP%20XP%20and%20Server%202003%2032%20bit.msi 630c86a202c40cbcd430701977d4f1fefa6151624ef9a4870040dff45e547dea "XPSEP XP and Server 2003 32 bit.msi"
 
-    w_call remove_mono
+    w_call remove_mono internal
     w_call dotnet30
     w_wineserver -w
     w_call dotnet20sp1
@@ -9090,7 +9172,7 @@ w_metadata dotnet35 dlls \
     media="download" \
     conflicts="dotnet11 dotnet20sdk dotnet20sp2 dotnet30" \
     file1="dotnetfx35.exe" \
-    installed_file1="c:/windows/Microsoft.NET/Framework/v3.5/MSBuild.exe"
+    installed_file1="${W_WINDIR_WIN}/Microsoft.NET/Framework/v3.5/MSBuild.exe"
 
 load_dotnet35()
 {
@@ -9102,7 +9184,7 @@ load_dotnet35()
     # https://www.microsoft.com/en-us/download/details.aspx?id=21
     w_download https://download.microsoft.com/download/6/0/f/60fc5854-3cb8-4892-b6db-bd4f42510f28/dotnetfx35.exe 3e3a4104bad9a0c270ed5cbe8abb986de9afaf0281a98998bdbdc8eaab85c3b6
 
-    w_call remove_mono
+    w_call remove_mono internal
 
     w_set_winver winxp
 
@@ -9132,7 +9214,7 @@ w_metadata dotnet35sp1 dlls \
     media="download" \
     conflicts="dotnet11 dotnet20sp1" \
     file1="dotnetfx35.exe" \
-    installed_file1="c:/windows/Microsoft.NET/Framework/v3.5/msbuild.exe.config"
+    installed_file1="${W_WINDIR_WIN}/Microsoft.NET/Framework/v3.5/msbuild.exe.config"
 
 load_dotnet35sp1()
 {
@@ -9143,7 +9225,7 @@ load_dotnet35sp1()
     # Official version. See https://dotnet.microsoft.com/en-us/download/dotnet-framework/net35-sp1
     w_download https://download.microsoft.com/download/2/0/e/20e90413-712f-438c-988e-fdaa79a8ac3d/dotnetfx35.exe 0582515bde321e072f8673e829e175ed2e7a53e803127c50253af76528e66bc1
 
-    w_call remove_mono
+    w_call remove_mono internal
 
     w_set_winver winxp
 
@@ -9184,7 +9266,7 @@ w_metadata dotnet40 dlls \
     media="download" \
     conflicts="dotnet20sdk" \
     file1="dotNetFx40_Full_x86_x64.exe" \
-    installed_file1="c:/windows/Microsoft.NET/Framework/v4.0.30319/ngen.exe"
+    installed_file1="${W_WINDIR_WIN}/Microsoft.NET/Framework/v4.0.30319/ngen.exe"
 
 load_dotnet40()
 {
@@ -9201,7 +9283,7 @@ load_dotnet40()
     # Official version. See https://dotnet.microsoft.com/download/dotnet-framework/net40
     w_download https://download.microsoft.com/download/9/5/A/95A9616B-7A37-4AF6-BC36-D6EA96C8DAAE/dotNetFx40_Full_x86_x64.exe 65e064258f2e418816b304f646ff9e87af101e4c9552ab064bb74d281c38659f
 
-    w_call remove_mono
+    w_call remove_mono internal
 
     w_call winxp
 
@@ -9291,7 +9373,7 @@ w_metadata dotnet45 dlls \
     media="download" \
     conflicts="dotnet20sdk" \
     file1="dotnetfx45_full_x86_x64.exe" \
-    installed_file1="c:/windows/Microsoft.NET/Framework/v4.0.30319/Microsoft.Windows.ApplicationServer.Applications.45.man"
+    installed_file1="${W_WINDIR_WIN}/Microsoft.NET/Framework/v4.0.30319/Microsoft.Windows.ApplicationServer.Applications.45.man"
 
 load_dotnet45()
 {
@@ -9306,7 +9388,7 @@ load_dotnet45()
     # Official version. See https://dotnet.microsoft.com/download/dotnet-framework/net45
     w_download https://download.microsoft.com/download/b/a/4/ba4a7e71-2906-4b2d-a0e1-80cf16844f5f/dotnetfx45_full_x86_x64.exe a04d40e217b97326d46117d961ec4eda455e087b90637cb33dd6cc4a2c228d83
 
-    w_call remove_mono
+    w_call remove_mono internal
 
     # See https://appdb.winehq.org/objectManager.php?sClass=version&iId=25478 for Focht's recipe
 
@@ -9351,7 +9433,7 @@ w_metadata dotnet452 dlls \
     media="download" \
     conflicts="dotnet20sdk dotnet46 dotnet462" \
     file1="NDP452-KB2901907-x86-x64-AllOS-ENU.exe" \
-    installed_file1="c:/windows/Microsoft.NET/Framework/v4.0.30319/Microsoft.Windows.ApplicationServer.Applications.45.man"
+    installed_file1="${W_WINDIR_WIN}/Microsoft.NET/Framework/v4.0.30319/Microsoft.Windows.ApplicationServer.Applications.45.man"
 
 load_dotnet452()
 {
@@ -9366,7 +9448,7 @@ load_dotnet452()
     # Official version. See https://dotnet.microsoft.com/download/dotnet-framework/net452
     w_download https://download.microsoft.com/download/E/2/1/E21644B5-2DF2-47C2-91BD-63C560427900/NDP452-KB2901907-x86-x64-AllOS-ENU.exe 6c2c589132e830a185c5f40f82042bee3022e721a216680bd9b3995ba86f3781
 
-    w_call remove_mono
+    w_call remove_mono internal
 
     # See https://appdb.winehq.org/objectManager.php?sClass=version&iId=25478 for Focht's recipe
 
@@ -9408,7 +9490,7 @@ w_metadata dotnet46 dlls \
     media="download" \
     file1="NDP46-KB3045557-x86-x64-AllOS-ENU.exe" \
     conflicts="dotnet20sdk" \
-    installed_file1="c:/windows/Migration/WTR/netfx45_upgradecleanup.inf"
+    installed_file1="${W_WINDIR_WIN}/Migration/WTR/netfx45_upgradecleanup.inf"
 
 load_dotnet46()
 {
@@ -9420,7 +9502,7 @@ load_dotnet46()
     # Official version. See https://dotnet.microsoft.com/download/dotnet-framework/net46
     w_download https://download.microsoft.com/download/6/F/9/6F9673B1-87D1-46C4-BF04-95F24C3EB9DA/enu_netfx/NDP46-KB3045557-x86-x64-AllOS-ENU_exe/NDP46-KB3045557-x86-x64-AllOS-ENU.exe b21d33135e67e3486b154b11f7961d8e1cfd7a603267fb60febb4a6feab5cf87
 
-    w_call remove_mono
+    w_call remove_mono internal
 
     w_call dotnet45
     w_set_winver win7
@@ -9455,7 +9537,7 @@ w_metadata dotnet461 dlls \
     media="download" \
     file1="NDP461-KB3102436-x86-x64-AllOS-ENU.exe" \
     conflicts="dotnet20sdk" \
-    installed_file1="c:/windows/dotnet461.installed.workaround"
+    installed_file1="${W_WINDIR_WIN}/dotnet461.installed.workaround"
 
 load_dotnet461()
 {
@@ -9467,7 +9549,7 @@ load_dotnet461()
     # Official version. See https://dotnet.microsoft.com/download/dotnet-framework/net461
     w_download https://download.microsoft.com/download/E/4/1/E4173890-A24A-4936-9FC9-AF930FE3FA40/NDP461-KB3102436-x86-x64-AllOS-ENU.exe beaa901e07347d056efe04e8961d5546c7518fab9246892178505a7ba631c301
 
-    w_call remove_mono
+    w_call remove_mono internal
 
     w_call dotnet46
     w_set_winver win7
@@ -9504,7 +9586,7 @@ w_metadata dotnet462 dlls \
     year="2016" \
     media="download" \
     conflicts="dotnet20sdk" \
-    installed_file1="c:/windows/dotnet462.installed.workaround"
+    installed_file1="${W_WINDIR_WIN}/dotnet462.installed.workaround"
 
 load_dotnet462()
 {
@@ -9517,7 +9599,7 @@ load_dotnet462()
     w_download https://download.visualstudio.microsoft.com/download/pr/8e396c75-4d0d-41d3-aea8-848babc2736a/80b431456d8866ebe053eb8b81a168b3/NDP462-KB3151800-x86-x64-AllOS-ENU.exe b4cbb4bc9a3983ec3be9f80447e0d619d15256a9ce66ff414ae6e3856705e237
     file_package="NDP462-KB3151800-x86-x64-AllOS-ENU.exe"
 
-    w_call remove_mono
+    w_call remove_mono internal
 
     w_call dotnet461
     w_set_winver win7
@@ -9556,7 +9638,7 @@ w_metadata dotnet471 dlls \
     media="download" \
     file1="NDP471-KB4033342-x86-x64-AllOS-ENU.exe" \
     conflicts="dotnet20sdk dotnet30sp1" \
-    installed_file1="c:/windows/dotnet471.installed.workaround"
+    installed_file1="${W_WINDIR_WIN}/dotnet471.installed.workaround"
 
 load_dotnet471()
 {
@@ -9568,7 +9650,7 @@ load_dotnet471()
     # Official version. See https://dotnet.microsoft.com/download/dotnet-framework/net471
     w_download https://download.visualstudio.microsoft.com/download/pr/4312fa21-59b0-4451-9482-a1376f7f3ba4/9947fce13c11105b48cba170494e787f/NDP471-KB4033342-x86-x64-AllOS-ENU.exe df6e700d37ff416e2e1d8463dededdf76522ceaf5bb4cc3f197a7f2b9eccc4ad
 
-    w_call remove_mono
+    w_call remove_mono internal
 
     w_call dotnet462
     w_set_winver win7
@@ -9605,7 +9687,7 @@ w_metadata dotnet472 dlls \
     year="2018" \
     media="download" \
     conflicts="dotnet20sdk" \
-    installed_file1="c:/windows/dotnet472.installed.workaround"
+    installed_file1="${W_WINDIR_WIN}/dotnet472.installed.workaround"
 
 load_dotnet472()
 {
@@ -9617,7 +9699,7 @@ load_dotnet472()
     # Official version. See https://dotnet.microsoft.com/download/dotnet-framework/net472
     w_download https://download.visualstudio.microsoft.com/download/pr/1f5af042-d0e4-4002-9c59-9ba66bcf15f6/089f837de42708daacaae7c04b7494db/NDP472-KB4054530-x86-x64-AllOS-ENU.exe 5cb624b97f9fd6d3895644c52231c9471cd88aacb57d6e198d3024a1839139f6
 
-    w_call remove_mono
+    w_call remove_mono internal
 
     w_call dotnet462
     w_set_winver win7
@@ -9655,7 +9737,7 @@ w_metadata dotnet48 dlls \
     media="download" \
     file1="ndp48-x86-x64-allos-enu.exe" \
     conflicts="dotnet20sdk" \
-    installed_file1="c:/windows/dotnet48.installed.workaround"
+    installed_file1="${W_WINDIR_WIN}/dotnet48.installed.workaround"
 
 load_dotnet48()
 {
@@ -9667,7 +9749,7 @@ load_dotnet48()
     # Official version. See https://dotnet.microsoft.com/download/dotnet-framework/net48
     w_download https://download.visualstudio.microsoft.com/download/pr/7afca223-55d2-470a-8edc-6a1739ae3252/abd170b4b0ec15ad0222a809b761a036/ndp48-x86-x64-allos-enu.exe 95889d6de3f2070c07790ad6cf2000d33d9a1bdfc6a381725ab82ab1c314fd53
 
-    w_call remove_mono
+    w_call remove_mono internal
 
     w_call dotnet40
     w_set_winver win7
@@ -10308,11 +10390,11 @@ w_metadata glidewrapper dlls \
     year="2005" \
     media="download" \
     file1="GlideWrapper084c.exe" \
-    installed_file1="c:/windows/glide3x.dll"
+    installed_file1="${W_WINDIR_WIN}/glide3x.dll"
 
 load_glidewrapper()
 {
-    w_download http://www.zeckensack.de/glide/archive/GlideWrapper084c.exe 3c4185bd7eac9bd50e0727a7b5165ec8273230455480cf94358e1bbd35921b69
+    w_download http://www.vogonsdrivers.com/wrappers/files/Glide/OpenGL/Zeckensack/GlideWrapper084c.exe 3c4185bd7eac9bd50e0727a7b5165ec8273230455480cf94358e1bbd35921b69
     w_try_cd "${W_CACHE}/${W_PACKAGE}"
 
     # The installer opens its README in a web browser, really annoying when doing make check/test:
@@ -10749,21 +10831,23 @@ w_metadata ie8_kb2936068 dlls \
     year="2014" \
     media="download" \
     file1="IE8-WindowsXP-KB2936068-x86-ENU.exe" \
-    installed_file1="c:/windows/KB2936068-IE8.log"
+    installed_file1="${W_WINDIR_WIN}/KB2936068-IE8.log"
 
 load_ie8_kb2936068()
 {
-    # If we really need win64 support, should check if there's an x64 version of the hotfix
-    w_package_unsupported_win64
-
     w_call ie8
 
-    w_download https://download.microsoft.com/download/3/8/C/38CE0ABB-01FD-4C0A-A569-BC5E82C34A17/IE8-WindowsXP-KB2936068-x86-ENU.exe 8bda23c78cdcd9d01c364a01c6d639dfb2d11550a5521b8a81c808c1a2b1824e
-
-    w_set_winver winxp
-
-    w_try_cd "${W_CACHE}/${W_PACKAGE}"
-    w_try_ms_installer "${WINE}" IE8-WindowsXP-KB2936068-x86-ENU.exe ${W_OPT_UNATTENDED:+/quiet /forcerestart}
+    if [ "${W_ARCH}" = "win32" ]; then
+        w_download https://download.microsoft.com/download/3/8/C/38CE0ABB-01FD-4C0A-A569-BC5E82C34A17/IE8-WindowsXP-KB2936068-x86-ENU.exe 8bda23c78cdcd9d01c364a01c6d639dfb2d11550a5521b8a81c808c1a2b1824e
+        w_set_winver winxp
+        w_try_cd "${W_CACHE}/${W_PACKAGE}"
+        w_try_ms_installer "${WINE}" IE8-WindowsXP-KB2936068-x86-ENU.exe ${W_OPT_UNATTENDED:+/quiet /forcerestart}
+    else
+        w_download https://download.microsoft.com/download/4/C/5/4C5B97EA-8E28-4CBB-AF27-0AB0D386F4E9/IE8-WindowsServer2003.WindowsXP-KB2936068-x64-ENU.exe 40f42f2d98259dde860bd0dbe71b9a0c623c03e0feff738f67920e4be0845598
+        w_set_winver win2k3
+        w_try_cd "${W_CACHE}/${W_PACKAGE}"
+        w_try_ms_installer "${WINE}" IE8-WindowsServer2003.WindowsXP-KB2936068-x64-ENU.exe ${W_OPT_UNATTENDED:+/quiet /forcerestart}
+    fi
 
     w_set_winver 'default'
 }
@@ -11254,7 +11338,7 @@ load_msmask()
     w_try_regsvr msmask32.ocx
 }
 
- #----------------------------------------------------------------
+#----------------------------------------------------------------
 
 w_metadata msftedit dlls \
     title="Microsoft RichEdit Control" \
@@ -11826,7 +11910,7 @@ w_metadata quicktime72 dlls \
     year="2010" \
     media="download" \
     file1="QuickTimeInstaller.exe" \
-    installed_file1="c:/windows/Installer/{95A890AA-B3B1-44B6-9C18-A8F7AB3EE7FC}/QTPlayer.ico"
+    installed_file1="${W_WINDIR_WIN}/Installer/{95A890AA-B3B1-44B6-9C18-A8F7AB3EE7FC}/QTPlayer.ico"
 
 load_quicktime72()
 {
@@ -11865,7 +11949,7 @@ w_metadata quicktime76 dlls \
     year="2010" \
     media="download" \
     file1="QuickTimeInstaller.exe" \
-    installed_file1="c:/windows/Installer/{57752979-A1C9-4C02-856B-FBB27AC4E02C}/QTPlayer.ico"
+    installed_file1="${W_WINDIR_WIN}/Installer/{57752979-A1C9-4C02-856B-FBB27AC4E02C}/QTPlayer.ico"
 
 load_quicktime76()
 {
@@ -12305,7 +12389,7 @@ load_vb6run()
 {
     # https://support.microsoft.com/kb/290887
     if test ! -f "${W_CACHE}"/vb6run/vbrun60sp6.exe; then
-        w_download https://lon-01.lo4d.com/files/visual-basic-runtime-files/VB6.0-KB290887-X86.exe 467b5a10c369865f2021d379fc0933cb382146b702bbca4bcb703fc86f4322bb
+        w_download https://web.archive.org/web/20070204154430/https://download.microsoft.com/download/5/a/d/5ad868a0-8ecd-4bb0-a882-fe53eb7ef348/VB6.0-KB290887-X86.exe 467b5a10c369865f2021d379fc0933cb382146b702bbca4bcb703fc86f4322bb
 
         w_try "${WINE}" "${W_CACHE}"/vb6run/VB6.0-KB290887-X86.exe "/T:${W_TMP_WIN}" /c ${W_OPT_UNATTENDED:+/q}
         if test ! -f "${W_TMP}"/vbrun60sp6.exe; then
@@ -12470,7 +12554,7 @@ w_metadata vcrun2005 dlls \
     year="2011" \
     media="download" \
     file1="vcredist_x86.EXE" \
-    installed_file1="c:/windows/winsxs/x86_Microsoft.VC80.MFC_1fc8b3b9a1e18e3b_8.0.50727.6195_x-ww_150c9e8b/mfc80.dll|c:/windows/winsxs/x86_microsoft.vc80.mfc_1fc8b3b9a1e18e3b_8.0.50727.6195_none_deadbeef/mfc80.dll"
+    installed_file1="${W_WINDIR_WIN}/winsxs/x86_Microsoft.VC80.MFC_1fc8b3b9a1e18e3b_8.0.50727.6195_x-ww_150c9e8b/mfc80.dll|${W_WINDIR_WIN}/winsxs/x86_microsoft.vc80.mfc_1fc8b3b9a1e18e3b_8.0.50727.6195_none_deadbeef/mfc80.dll"
 
 load_vcrun2005()
 {
@@ -12491,13 +12575,13 @@ load_vcrun2005()
     w_override_dlls native,builtin atl80 msvcm80 msvcp80 msvcr80 vcomp
 
     w_try_cd "${W_CACHE}/${W_PACKAGE}"
-    w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/q}
+    w_try_ms_installer "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/q}
 
     if [ "${W_ARCH}" = "win64" ] ;then
         # Originally: 0551a61c85b718e1fa015b0c3e3f4c4eea0637055536c00e7969286b4fa663e0
         # 2021/05/25: 4487570bd86e2e1aac29db2a1d0a91eb63361fcaac570808eb327cd4e0e2240d
         w_download https://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x64.EXE 4487570bd86e2e1aac29db2a1d0a91eb63361fcaac570808eb327cd4e0e2240d
-        w_try "${WINE}" vcredist_x64.exe ${W_OPT_UNATTENDED:+/q}
+        w_try_ms_installer "${WINE}" vcredist_x64.exe ${W_OPT_UNATTENDED:+/q}
     fi
 }
 
@@ -12563,7 +12647,7 @@ load_vcrun2008()
     w_override_dlls native,builtin atl90 msvcm90 msvcp90 msvcr90 vcomp90
 
     w_try_cd "${W_CACHE}/${W_PACKAGE}"
-    w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/q}
+    w_try_ms_installer "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/q}
 
     case "${W_ARCH}" in
         win64)
@@ -12571,7 +12655,7 @@ load_vcrun2008()
             # 2016/11/15: b811f2c047a3e828517c234bd4aa4883e1ec591d88fad21289ae68a6915a6665
             # 2021/05/23: c5e273a4a16ab4d5471e91c7477719a2f45ddadb76c7f98a38fa5074a6838654
             w_download https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x64.exe c5e273a4a16ab4d5471e91c7477719a2f45ddadb76c7f98a38fa5074a6838654
-            w_try "${WINE}" vcredist_x64.exe ${W_OPT_UNATTENDED:+/q}
+            w_try_ms_installer "${WINE}" vcredist_x64.exe ${W_OPT_UNATTENDED:+/q}
             ;;
     esac
 }
@@ -12628,7 +12712,7 @@ load_vcrun2010()
 
     w_override_dlls native,builtin msvcp100 msvcr100 vcomp100 atl100
     w_try_cd "${W_CACHE}/${W_PACKAGE}"
-    w_try "${WINE}" vcredist_x86.exe ${W_OPT_UNATTENDED:+/q}
+    w_try_ms_installer "${WINE}" vcredist_x86.exe ${W_OPT_UNATTENDED:+/q}
 
     case "${W_ARCH}" in
         win64)
@@ -12637,7 +12721,7 @@ load_vcrun2010()
             # Originally: c6cd2d3f0b11dc2a604ffdc4dd97861a83b77e21709ba71b962a47759c93f4c8
             # 2021/04/24: 2fddbc3aaaab784c16bc673c3bae5f80929d5b372810dbc28649283566d33255
             w_download https://download.microsoft.com/download/A/8/0/A80747C3-41BD-45DF-B505-E9710D2744E0/vcredist_x64.exe 2fddbc3aaaab784c16bc673c3bae5f80929d5b372810dbc28649283566d33255
-            w_try "${WINE}" vcredist_x64.exe ${W_OPT_UNATTENDED:+/q}
+            w_try_ms_installer "${WINE}" vcredist_x64.exe ${W_OPT_UNATTENDED:+/q}
             ;;
     esac
 }
@@ -12692,14 +12776,14 @@ load_vcrun2012()
 
     w_override_dlls native,builtin atl110 msvcp110 msvcr110 vcomp110
     w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
-    w_try "${WINE}" vcredist_x86.exe ${W_OPT_UNATTENDED:+/q}
+    w_try_ms_installer "${WINE}" vcredist_x86.exe ${W_OPT_UNATTENDED:+/q}
 
     case "${W_ARCH}" in
         win64)
             # Also install the 64-bit version
             # 2015/10/19: 681be3e5ba9fd3da02c09d7e565adfa078640ed66a0d58583efad2c1e3cc4064
             w_download https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x64.exe 681be3e5ba9fd3da02c09d7e565adfa078640ed66a0d58583efad2c1e3cc4064
-            w_try "${WINE}" vcredist_x64.exe ${W_OPT_UNATTENDED:+/q}
+            w_try_ms_installer "${WINE}" vcredist_x64.exe ${W_OPT_UNATTENDED:+/q}
             ;;
     esac
 }
@@ -12756,7 +12840,7 @@ load_vcrun2013()
 
     w_override_dlls native,builtin atl120 msvcp120 msvcr120 vcomp120
     w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
-    w_try "${WINE}" vcredist_x86.exe ${W_OPT_UNATTENDED:+/q}
+    w_try_ms_installer "${WINE}" vcredist_x86.exe ${W_OPT_UNATTENDED:+/q}
 
     case "${W_ARCH}" in
         win64)
@@ -12764,7 +12848,7 @@ load_vcrun2013()
             # 2015/10/19: e554425243e3e8ca1cd5fe550db41e6fa58a007c74fad400274b128452f38fb8
             # 2019/03/24: 20e2645b7cd5873b1fa3462b99a665ac8d6e14aae83ded9d875fea35ffdd7d7e
             w_download https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x64.exe 20e2645b7cd5873b1fa3462b99a665ac8d6e14aae83ded9d875fea35ffdd7d7e
-            w_try "${WINE}" vcredist_x64.exe ${W_OPT_UNATTENDED:+/q}
+            w_try_ms_installer "${WINE}" vcredist_x64.exe ${W_OPT_UNATTENDED:+/q}
             ;;
     esac
 }
@@ -12809,15 +12893,15 @@ w_metadata vcrun2015 dlls \
     publisher="Microsoft" \
     year="2015" \
     media="download" \
-    conflicts="vcrun2017 vcrun2019" \
+    conflicts="vcrun2017 vcrun2019 ucrtbase2019" \
     file1="vc_redist.x86.exe" \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/mfc140.dll"
 
 load_vcrun2015()
 {
-    # https://www.microsoft.com/en-us/download/details.aspx?id=48145
-    # 2015/10/12: fdd1e1f0dcae2d0aa0720895eff33b927d13076e64464bb7c7e5843b7667cd14
-    w_download https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe fdd1e1f0dcae2d0aa0720895eff33b927d13076e64464bb7c7e5843b7667cd14
+    # https://www.microsoft.com/en-us/download/details.aspx?id=53587
+    # 2022/09/16: dafb8b5f4b46bfaf7faa1d0ad05211f5c9855f0005cd603f8b5037b6a708d6b6
+    w_download https://download.microsoft.com/download/6/D/F/6DF3FF94-F7F9-4F0B-838C-A328D1A7D0EE/vc_redist.x86.exe dafb8b5f4b46bfaf7faa1d0ad05211f5c9855f0005cd603f8b5037b6a708d6b6
 
     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
 
@@ -12831,17 +12915,17 @@ load_vcrun2015()
     w_try_cabextract --directory="${W_SYSTEM32_DLLS}" "${W_TMP}/win32/a10" -F 'ucrtbase.dll'
 
     w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
-    w_try "${WINE}" vc_redist.x86.exe ${W_OPT_UNATTENDED:+/q}
+    w_try_ms_installer "${WINE}" vc_redist.x86.exe ${W_OPT_UNATTENDED:+/q}
 
     case "${W_ARCH}" in
         win64)
             # Also install the 64-bit version
-            # 2015/10/12: 5eea714e1f22f1875c1cb7b1738b0c0b1f02aec5ecb95f0fdb1c5171c6cd93a3
-            w_download https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe 5eea714e1f22f1875c1cb7b1738b0c0b1f02aec5ecb95f0fdb1c5171c6cd93a3
+            # 2022/09/16: d7257265dbc0635c96dd67ddf938a09abe0866cb2d4fa05f8b758c8644e724e4
+            w_download https://download.microsoft.com/download/6/D/F/6DF3FF94-F7F9-4F0B-838C-A328D1A7D0EE/vc_redist.x64.exe d7257265dbc0635c96dd67ddf938a09abe0866cb2d4fa05f8b758c8644e724e4
             # Also replace 64-bit ucrtbase.dll
             w_try_cabextract --directory="${W_TMP}/win64"  "${W_CACHE}"/vcrun2015/vc_redist.x64.exe -F 'a10'
             w_try_cabextract --directory="${W_SYSTEM64_DLLS}" "${W_TMP}/win64/a10" -F 'ucrtbase.dll'
-            w_try "${WINE}" vc_redist.x64.exe ${W_OPT_UNATTENDED:+/q}
+            w_try_ms_installer "${WINE}" vc_redist.x64.exe ${W_OPT_UNATTENDED:+/q}
             ;;
     esac
 
@@ -12888,7 +12972,7 @@ w_metadata vcrun2017 dlls \
     publisher="Microsoft" \
     year="2017" \
     media="download" \
-    conflicts="vcrun2015 vcrun2019" \
+    conflicts="vcrun2015 vcrun2019 ucrtbase2019" \
     file1="vc_redist.x86.exe" \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/mfc140.dll"
 
@@ -12912,7 +12996,7 @@ load_vcrun2017()
     w_try_cabextract --directory="${W_SYSTEM32_DLLS}" "${W_TMP}/win32/a10" -F 'ucrtbase.dll'
 
     w_try_cd "${W_CACHE}/${W_PACKAGE}"
-    w_try "${WINE}" vc_redist.x86.exe ${W_OPT_UNATTENDED:+/q}
+    w_try_ms_installer "${WINE}" vc_redist.x86.exe ${W_OPT_UNATTENDED:+/q}
 
     case "${W_ARCH}" in
         win64)
@@ -12925,7 +13009,7 @@ load_vcrun2017()
             # Also replace 64-bit ucrtbase.dll
             w_try_cabextract --directory="${W_TMP}/win64"  "${W_CACHE}"/vcrun2017/vc_redist.x64.exe -F 'a10'
             w_try_cabextract --directory="${W_SYSTEM64_DLLS}" "${W_TMP}/win64/a10" -F 'ucrtbase.dll'
-            w_try "${WINE}" vc_redist.x64.exe ${W_OPT_UNATTENDED:+/q}
+            w_try_ms_installer "${WINE}" vc_redist.x64.exe ${W_OPT_UNATTENDED:+/q}
             ;;
     esac
 
@@ -12961,8 +13045,6 @@ load_vcrun2019()
     # 2021/10/23: 80c7969f4e05002a0cd820b746e0acb7406d4b85e52ef096707315b390927824
     # 2022/01/18: 4c6c420cf4cbf2c9c9ed476e96580ae92a97b2822c21329a2e49e8439ac5ad30
 
-    w_warn "ucrtbase.dll is no longer included in vcrun2019. For details see: https://github.com/Winetricks/winetricks/issues/1770"
-
     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-heap-l1-1-0 api-ms-win-crt-locale-l1-1-0 api-ms-win-crt-math-l1-1-0 api-ms-win-crt-runtime-l1-1-0 api-ms-win-crt-stdio-l1-1-0 api-ms-win-crt-time-l1-1-0 atl140 concrt140 msvcp140 msvcp140_1 msvcp140_2 msvcp140_atomic_wait msvcp140_codecvt_ids vcamp140 vccorlib140 vcomp140 vcruntime140
 
     w_download https://aka.ms/vs/16/release/vc_redist.x86.exe 4c6c420cf4cbf2c9c9ed476e96580ae92a97b2822c21329a2e49e8439ac5ad30
@@ -12972,7 +13054,7 @@ load_vcrun2019()
     fi
 
     w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
-    w_try "${WINE}" vc_redist.x86.exe ${W_OPT_UNATTENDED:+/q}
+    w_try_ms_installer "${WINE}" vc_redist.x86.exe ${W_OPT_UNATTENDED:+/q}
 
     case "${W_ARCH}" in
         win64)
@@ -12996,22 +13078,56 @@ load_vcrun2019()
             w_override_dlls native,builtin vcruntime140_1
 
             w_download https://aka.ms/vs/16/release/vc_redist.x64.exe 296f96cd102250636bcd23ab6e6cf70935337b1bbb3507fe8521d8d9cfaa932f
-            w_try "${WINE}" vc_redist.x64.exe ${W_OPT_UNATTENDED:+/q}
+            w_try_ms_installer "${WINE}" vc_redist.x64.exe ${W_OPT_UNATTENDED:+/q}
             ;;
     esac
 
+    w_call ucrtbase2019
+
     w_set_winver 'default'
 }
 
 #----------------------------------------------------------------
 
+w_metadata ucrtbase2019 dlls \
+    title="Visual C++ 2019 library (ucrtbase.dll)" \
+    publisher="Microsoft" \
+    year="2019" \
+    media="download" \
+    conflicts="vcrun2015 vcrun2017" \
+    file1="vc_redist.x86.exe" \
+    installed_file1="${W_SYSTEM32_DLLS_WIN}/ucrtbase.dll"
+
+load_ucrtbase2019()
+{
+    w_override_dlls native,builtin ucrtbase
+
+    # Microsoft download no longer containts ucrtbase so get the last known version from archive.org
+    w_download https://web.archive.org/web/20210415064013/https://download.visualstudio.microsoft.com/download/pr/85d47aa9-69ae-4162-8300-e6b7e4bf3cf3/14563755AC24A874241935EF2C22C5FCE973ACB001F99E524145113B2DC638C1/VC_redist.x86.exe 14563755ac24a874241935ef2c22c5fce973acb001f99e524145113b2dc638c1
+
+    w_try_cabextract --directory="${W_TMP}/win32"  "${W_CACHE}"/"${W_PACKAGE}"/VC_redist.x86.exe -F 'a10'
+    w_try_cabextract --directory="${W_SYSTEM32_DLLS}" "${W_TMP}/win32/a10" -F 'ucrtbase.dll'
+
+    case "${W_ARCH}" in
+        win64)
+            # Microsoft download no longer containts ucrtbase so get the last known version from archive.org
+            w_download https://web.archive.org/web/20210414165612/https://download.visualstudio.microsoft.com/download/pr/85d47aa9-69ae-4162-8300-e6b7e4bf3cf3/52B196BBE9016488C735E7B41805B651261FFA5D7AA86EB6A1D0095BE83687B2/VC_redist.x64.exe 52b196bbe9016488c735e7b41805b651261ffa5d7aa86eb6a1d0095be83687b2
+
+            w_try_cabextract --directory="${W_TMP}/win64"  "${W_CACHE}"/"${W_PACKAGE}"/VC_redist.x64.exe -F 'a10'
+            w_try_cabextract --directory="${W_SYSTEM64_DLLS}" "${W_TMP}/win64/a10" -F 'ucrtbase.dll'
+            ;;
+    esac
+}
+
+#----------------------------------------------------------------
+
 w_metadata vjrun20 dlls \
     title="MS Visual J# 2.0 SE libraries (requires dotnet20)" \
     publisher="Microsoft" \
     year="2007" \
     media="download" \
     file1="vjredist.exe" \
-    installed_file1="c:/windows/Microsoft.NET/Framework/VJSharp/VJSharpSxS10.dll"
+    installed_file1="${W_WINDIR_WIN}/Microsoft.NET/Framework/VJSharp/VJSharpSxS10.dll"
 
 load_vjrun20()
 {
@@ -13049,64 +13165,6 @@ load_vstools2019()
 
 #----------------------------------------------------------------
 
-w_metadata vulkanrt121412 dlls \
-    title="Vulkan Runtime 1.2.141.2" \
-    publisher="LunarG" \
-    year="2020" \
-    media="download" \
-    file1="VulkanRT-1.2.141.2-Installer.exe" \
-    installed_exe1="${W_SYSTEM32_DLLS_WIN}/vulkaninfo.exe"
-
-load_vulkanrt121412()
-{
-    # https://vulkan.lunarg.com/sdk/home
-    w_download "https://sdk.lunarg.com/sdk/download/1.2.141.2/windows/VulkanRT-1.2.141.2-Installer.exe?Human=true;u=" bf5050ead980e66fdd7b8eb5664d2b92e037ec5c400f75c2dc209a595828aaf7 "${file1}"
-    w_try_cd "${W_CACHE}/${W_PACKAGE}"
-    w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/S}
-}
-
-#----------------------------------------------------------------
-
-w_metadata vulkansdk121412 apps \
-    title="Vulkan SDK 1.2.141.2 (developers only)" \
-    publisher="LunarG" \
-    year="2020" \
-    media="download" \
-    file1="VulkanSDK-1.2.141.2-Installer.exe" \
-    installed_file1="C:/VulkanSDK/1.2.141.2/vulkan.ico" \
-    installed_file2="C:/windows/winevulkan.json"
-
-load_vulkansdk121412()
-{
-    _W_vulkan_version="${file1%-*.exe}"
-    _W_vulkan_version="${_W_vulkan_version#*-}"
-    # https://vulkan.lunarg.com/sdk/home
-    w_download "https://sdk.lunarg.com/sdk/download/1.2.141.2/windows/VulkanSDK-1.2.141.2-Installer.exe?Human=true;u=" d732eaee50c5f924ee64c9408bec7073b7a230464f1636f346833727c9bbddd0 "${file1}"
-    w_try_cd "${W_CACHE}/${W_PACKAGE}"
-    w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/S}
-    echo "Creating C:\\windows\\winevulkan.json winevulkan json file"
-    cat > "${W_WINDIR_UNIX}"/winevulkan.json <<_EOF_
-{
-    "file_format_version": "1.0.0",
-    "ICD": {
-        "library_path": "c:\\\\windows\\\\system32\\\\winevulkan.dll",
-        "api_version": "${_W_vulkan_version}"
-    }
-}
-_EOF_
-    echo "Creating winevulkan registry settings"
-    cat > "${W_TMP}"/winevulkan.reg <<_EOF_
-REGEDIT4
-
-[HKEY_LOCAL_MACHINE\\SOFTWARE\\Khronos\\Vulkan\\Drivers\\]
-"C:\\\\Windows\\\\winevulkan.json"=dword:00000000
-
-_EOF_
-    w_try_regedit "${W_TMP_WIN}"\\winevulkan.reg
-}
-
-#----------------------------------------------------------------
-
 w_metadata webio dlls \
     title="MS Windows Web I/O" \
     publisher="Microsoft" \
@@ -13529,7 +13587,9 @@ w_metadata xvid dlls \
 load_xvid()
 {
     w_call vcrun6
-    w_download http://www.koepi.info/Xvid-1.3.2-20110601.exe 74b23965cebe59e388eab6dba224b6b751ef4519454cc12086ade51c81f0a33c
+    # 2011/06/03: http://www.koepi.info/Xvid-1.3.2-20110601.exe
+    # 2022/09/08: https://s3.amazonaws.com/moviecodec/files/Xvid-1.3.2-20110601.exe
+    w_download https://s3.amazonaws.com/moviecodec/files/Xvid-1.3.2-20110601.exe 74b23965cebe59e388eab6dba224b6b751ef4519454cc12086ade51c81f0a33c
     w_try_cd "${W_CACHE}/${W_PACKAGE}"
     w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+ --mode unattended --decode_divx 1 --decode_3ivx 1 --decode_other 1}
 }
@@ -14662,14 +14722,14 @@ w_metadata autohotkey apps \
     publisher="autohotkey.org" \
     year="2010" \
     media="download" \
-    file1="AutoHotkey104805_Install.exe" \
+    file1="AutoHotkey_1.1.36.01_setup.exe" \
     installed_exe1="${W_PROGRAMS_X86_WIN}/AutoHotkey/AutoHotkey.exe"
 
 load_autohotkey()
 {
-    w_download https://github.com/AutoHotkey/AutoHotkey/releases/download/v1.0.48.05/AutoHotkey104805_Install.exe 4311c3e7c29ed2d67f415138360210bc2f55ff78758b20b003b91d775ee207b9
+    w_download https://github.com/AutoHotkey/AutoHotkey/releases/download/v1.1.36.01/AutoHotkey_1.1.36.01_setup.exe 62734d219f14a942986e62d6c0fef0c2315bc84acd963430aed788c36e67e1ff
     w_try_cd "${W_CACHE}/${W_PACKAGE}"
-    w_try "${WINE}" AutoHotkey104805_Install.exe ${W_OPT_UNATTENDED:+/S}
+    w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/S}
 }
 
 #----------------------------------------------------------------
@@ -14720,7 +14780,7 @@ w_metadata colorprofile apps \
     year="2005" \
     media="download" \
     file1="ColorProfile.exe" \
-    installed_exe1="c:/windows/system32/spool/drivers/color/sRGB Color Space Profile.icm"
+    installed_exe1="${W_WINDIR_WIN}/system32/spool/drivers/color/sRGB Color Space Profile.icm"
 
 load_colorprofile()
 {
@@ -14818,6 +14878,24 @@ load_dxdiag()
 
 #----------------------------------------------------------------
 
+w_metadata dxwnd apps \
+    title="Window hooker to run fullscreen programs in window and much more..." \
+    publisher="ghotik" \
+    year="2011" \
+    media="download" \
+    file1"v2_05_88_build.rar" \
+    installed_exe1="${W_PROGRAMS_X86_WIN}/dxwnd/dxwnd.exe" \
+    homepage="https://dxwnd.sourceforge.io"
+
+load_dxwnd()
+{
+    # 2022/10/02 v2_05_88_build.rar a80ad1246493b3b34fba2131494052423ac298a39592d4e06a685568b829922e
+    w_download https://versaweb.dl.sourceforge.net/project/dxwnd/Latest%20build/v2_05_88_build.rar a80ad1246493b3b34fba2131494052423ac298a39592d4e06a685568b829922e
+    w_try_7z "${W_PROGRAMS_X86_UNIX}"/dxwnd "${W_CACHE}"/"${W_PACKAGE}"/"${file1}" -aoa
+}
+
+#----------------------------------------------------------------
+
 w_metadata emu8086 apps \
     title="emu8086" \
     publisher="emu8086.com" \
@@ -14881,7 +14959,7 @@ w_metadata firefox apps \
 
 load_firefox()
 {
-    w_download "https://download.mozilla.org/?product=firefox-51.0-SSL&os=win&lang=en-US" 05fa9ae012eca560f42d593e75eb37045a54e4978b665b51f6a61e4a2d376eb8 "${file1}"
+    w_download "https://download.mozilla.org/?product=firefox-51.0-SSL&os=win&lang=en-US" 05fa9ae012eca560f42d593e75eb37045a54e4978b665b51f6a61e4a2d376eb8 FirefoxSetup51.0.exe
     w_try_cd "${W_CACHE}/${W_PACKAGE}"
     w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+ -ms}
 }
@@ -15141,7 +15219,7 @@ w_metadata ie7 dlls \
     media="download" \
     conflicts="ie6 ie8" \
     file1="IE7-WindowsXP-x86-enu.exe" \
-    installed_file1="c:/windows/ie7.log"
+    installed_file1="${W_WINDIR_WIN}/ie7.log"
 
 load_ie7()
 {
@@ -15194,7 +15272,7 @@ load_ie7()
     w_download https://web.archive.org/web/20200617171343/https://download.microsoft.com/download/3/8/8/38889DC1-848C-4BF2-8335-86C573AD86D9/IE7-WindowsXP-x86-enu.exe bf5c325bbe3f4174869b2a8ff75f92833e7f7debe64777ed0faf293c7725cbef
     w_try_cd "${W_CACHE}/${W_PACKAGE}"
 
-    # IE7 requies winxp to install:
+    # IE7 requires winxp to install:
     w_set_winver winxp
 
     w_try_ms_installer "${WINE}" IE7-WindowsXP-x86-enu.exe ${W_OPT_UNATTENDED:+/quiet}
@@ -15249,7 +15327,7 @@ w_metadata ie8 dlls \
     media="download" \
     conflicts="ie6 ie7" \
     file1="IE8-WindowsXP-x86-ENU.exe" \
-    installed_file1="c:/windows/ie8_main.log"
+    installed_file1="${W_WINDIR_WIN}/ie8_main.log"
 
 load_ie8()
 {
@@ -15305,17 +15383,24 @@ load_ie8()
     fi
 
     # Replace the fake DLLs by copies from the bundle
-    for dll in browseui inseng itircl itss jscript mshtml shdoclc shdocvw shlwapi urlmon; do
-        test -f "${W_SYSTEM32_DLLS}"/${dll}.dll &&
-            w_try mv "${W_SYSTEM32_DLLS}"/${dll}.dll "${W_SYSTEM32_DLLS}"/${dll}.dll.bak &&
-            w_try_cabextract --directory="${W_SYSTEM32_DLLS}" "${W_CACHE}"/ie8/IE8-WindowsXP-x86-ENU.exe -F ${dll}.dll
-        if [ "${W_ARCH}" = "win64" ]; then
+
+    if [ "${W_ARCH}" = "win32" ]; then
+        for dll in browseui inseng itircl itss jscript mshtml shdoclc shdocvw shlwapi urlmon; do
+            test -f "${W_SYSTEM32_DLLS}"/${dll}.dll &&
+                w_try mv "${W_SYSTEM32_DLLS}"/${dll}.dll "${W_SYSTEM32_DLLS}"/${dll}.dll.bak &&
+                w_try_cabextract --directory="${W_SYSTEM32_DLLS}" "${W_CACHE}"/ie8/IE8-WindowsXP-x86-ENU.exe -F ${dll}.dll
+        done
+    else
+        for dll in browseui inseng jscript mshtml shdocvw shlwapi urlmon; do
+            test -f "${W_SYSTEM32_DLLS}"/${dll}.dll &&
+                w_try mv "${W_SYSTEM32_DLLS}"/${dll}.dll "${W_SYSTEM32_DLLS}"/${dll}.dll.bak &&
+                w_try_cabextract --directory="${W_CACHE}"/ie8 "${W_CACHE}"/ie8/IE8-WindowsServer2003-x64-ENU.exe -F wow/w${dll}.dll &&
+                w_try mv "${W_CACHE}"/ie8/wow/w${dll}.dll "${W_SYSTEM32_DLLS}"/${dll}.dll
             test -f "${W_SYSTEM64_DLLS}"/${dll}.dll &&
                 w_try mv "${W_SYSTEM64_DLLS}"/${dll}.dll "${W_SYSTEM64_DLLS}"/${dll}.dll.bak
                 w_try_cabextract --directory="${W_SYSTEM64_DLLS}" "${W_CACHE}"/ie8/IE8-WindowsServer2003-x64-ENU.exe -F ${dll}.dll
-        fi
-
-    done
+        done
+    fi
 
     # KLUDGE: if / is writable (as on OS X?), having a Z: mapping to it
     # causes ie7 to put temporary directories on Z:\.
@@ -15381,16 +15466,26 @@ _EOF_
         w_try_cp_dll "${W_PROGRAMS_UNIX}/Internet Explorer/ieproxy.dll" "${W_SYSTEM64_DLLS}"
     fi
 
+    if w_workaround_wine_bug 53103 "Running a no-op command so that ie8 finishes bootstrapping" 7.5; then
+        w_wineserver -w
+        w_try "${WINE}" xcopy /? > /dev/null
+        w_wineserver -w
+    fi
+
     # Seeing is believing
-    case ${WINETRICKS_GUI} in
-        none)
-            w_warn "To start ie8, use the command \"${WINE}\" '${W_PROGRAMS_WIN}\\\\Internet Explorer\\\\iexplore.exe'"
-            ;;
-        *)
-            w_warn "Starting ie8.  To start it later, use the command \"${WINE}\" '${W_PROGRAMS_WIN}\\\\Internet Explorer\\\\iexplore.exe'"
-            "${WINE}" "${W_PROGRAMS_WIN}\\Internet Explorer\\iexplore.exe" http://www.example.com > /dev/null 2>&1 &
-            ;;
-    esac
+    if [ "${WINETRICKS_GUI}" != "none" ]; then
+        if [ "${W_ARCH}" = "win32" ]; then
+            w_warn "Starting ie8 ..."
+        else
+            w_warn "Starting ie8 (64-bit) ..."
+        fi
+        "${WINE}" "${W_PROGRAMS_WIN}\\Internet Explorer\\iexplore.exe" http://www.example.com > /dev/null 2>&1 &
+    fi
+    if [ "${W_ARCH}" = "win32" ]; then
+        w_warn "To start ie8, from a terminal shell, use the command \"${WINE}\" '${W_PROGRAMS_WIN}\\\\Internet Explorer\\\\iexplore.exe'"
+    else
+        w_warn "To start ie8 (32-bit), from a terminal shell, use the command \"${WINE}\" '${W_PROGRAMS_X86_WIN}\\\\Internet Explorer\\\\iexplore.exe'\nTo start ie8 (64-bit), from a terminal shell, use the command \"${WINE}\" '${W_PROGRAMS_WIN}\\\\Internet Explorer\\\\iexplore.exe'"
+    fi
 
     w_set_winver 'default'
 
@@ -15512,9 +15607,9 @@ w_metadata mozillabuild apps \
 
 load_mozillabuild()
 {
-    w_download https://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/MozillaBuildSetup-2.0.0.exe d5ffe52fe634fb7ed02e61041cc183c3af92039ee74e794f7ae83a408e4cf3f5
+    w_download https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-2.0.0.exe d5ffe52fe634fb7ed02e61041cc183c3af92039ee74e794f7ae83a408e4cf3f5
     w_try_cd "${W_CACHE}/${W_PACKAGE}"
-    w_try "${WINE}" MozillaBuildSetup-2.0.0.exe ${W_OPT_UNATTENDED:+/S}
+    w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/S}
 }
 
 #----------------------------------------------------------------
@@ -15543,7 +15638,7 @@ w_metadata mspaint apps \
     year="2010" \
     media="download" \
     file1="windowsxp-kb978706-x86-enu_f4e076b3867c2f08b6d258316aa0e11d6822b8d7.exe" \
-    installed_file1="c:/windows/mspaint.exe"
+    installed_file1="${W_WINDIR_WIN}/mspaint.exe"
 
 load_mspaint()
 {
@@ -15990,6 +16085,114 @@ load_openwatcom()
 
 #----------------------------------------------------------------
 
+w_metadata origin apps \
+    title="EA Origin" \
+    publisher="EA" \
+    year="2011" \
+    media="download" \
+    file1="OriginSetup.exe" \
+    installed_file1="${W_PROGRAMS_X86_WIN}/Origin/Origin.exe" \
+    homepage="https://www.origin.com/"
+
+helper_origin_dl()
+{
+    # Skipping checksum as this changes too often
+    w_download_to origin https://origin-a.akamaihd.net/Origin-Client-Download/origin/live/OriginSetup.exe
+}
+
+load_origin()
+{
+    # Need to force wine-6.0 as Origin doesn't run below WineCX21 (wine32on64)
+    if [ "$(uname -s)" = "Darwin" ] && w_wine_version_in ,6.0 ; then
+        w_die "${W_PACKAGE} requires wine version 6.0 (or newer)"
+    fi
+
+    if [ "${WINETRICKS_FORCE}" != 1 ] && w_workaround_wine_bug 44691 "Installer fails under wine, manually unpacking it instead" 6.7,; then
+        w_call originupdater
+        w_warn "${W_PACKAGE} might fail, to update use the originupdate verb"
+    else
+        helper_origin_dl
+        w_try_cd "${W_CACHE}/${W_PACKAGE}"
+        w_try "${WINE}" "${file1}" /NoLaunch ${W_OPT_UNATTENDED:+/SILENT}
+    fi
+
+    if w_workaround_wine_bug 32342 "QtWebEngineProcess.exe crashes when updating or launching Origin (missing fonts)"; then
+        w_call corefonts
+    fi
+
+    if w_workaround_wine_bug 44258 "Origin crashes on start."; then
+        w_override_app_dlls igoproxy.exe disabled d3d10
+        w_override_app_dlls igoproxy.exe disabled d3d10_1
+        w_override_app_dlls igoproxy.exe disabled d3d10core
+        w_override_app_dlls igoproxy.exe disabled d3d11
+        w_override_app_dlls igoproxy.exe disabled d3d12
+        w_override_app_dlls igoproxy.exe disabled dxgi
+        w_override_app_dlls igoproxy.exe disabled vulkan-1
+        w_override_app_dlls igoproxy.exe disabled winevulkan
+
+        if [ "${W_ARCH}" = "win64" ]; then
+            w_override_app_dlls igoproxy64.exe disabled d3d10
+            w_override_app_dlls igoproxy64.exe disabled d3d10_1
+            w_override_app_dlls igoproxy64.exe disabled d3d10core
+            w_override_app_dlls igoproxy64.exe disabled d3d11
+            w_override_app_dlls igoproxy64.exe disabled d3d12
+            w_override_app_dlls igoproxy64.exe disabled dxgi
+            w_override_app_dlls igoproxy64.exe disabled vulkan-1
+            w_override_app_dlls igoproxy64.exe disabled winevulkan
+        fi
+    fi
+
+    if w_workaround_wine_bug 44985 "Disabling libglesv2 to make Store and Library function correctly."; then
+        w_override_dlls disabled libglesv2
+    fi
+
+    # Avoids "An unexpected error has occurred. Please try again in a few moments. Error: 327684:3"
+    # Games won't register correctly unless disabled
+    if w_workaround_wine_bug 52781 "Origin does not notice games exiting, does not allow them to be relaunched."; then
+        w_override_app_dlls origin.exe disabled gameux
+    fi
+
+    # Origin requirements
+    w_call vcrun2010
+    w_call vcrun2013
+    w_call vcrun2019
+
+    if w_wine_version_in ,6.3 ; then
+        w_call d3dcompiler_47
+    fi
+
+    w_warn "Origin In-game overlay must be disabled"
+}
+
+#----------------------------------------------------------------
+
+w_metadata originupdater apps \
+    title="EA Origin (updater)" \
+    publisher="EA" \
+    media="download" \
+    file1="../origin/OriginSetup.exe" \
+    homepage="https://www.origin.com/"
+
+load_originupdater()
+{
+    # Need to force wine-6.0 as Origin doesn't run below WineCX21 (wine32on64)
+    if [ "$(uname -s)" = "Darwin" ] && w_wine_version_in ,6.0 ; then
+        w_die "${W_PACKAGE} requires wine version 6.0 (or newer)"
+    fi
+
+    # Remove cached installer as the checksum changes too often that is even more critical for the updater function
+    w_try rm -f "${W_CACHE}/origin/OriginSetup.exe"
+
+    helper_origin_dl
+
+    w_try rm -rf "${W_PROGRAMS_X86_UNIX}"/Origin
+    w_try_7z "${W_CACHE}"/origin "${W_CACHE}"/origin/OriginSetup.exe update
+    w_try_7z "${W_PROGRAMS_X86_UNIX}"/Origin "${W_CACHE}"/origin/update/OriginUpdate_*_*_*_*.zip -aoa
+    w_try rm -rf "${W_CACHE}"/origin/update
+}
+
+#----------------------------------------------------------------
+
 w_metadata protectionid apps \
     title="Protection ID" \
     publisher="CDKiLLER & TippeX" \
@@ -16104,11 +16307,11 @@ _EOF_
 #----------------------------------------------------------------
 
 w_metadata qq apps \
-    title="QQ 8.9.6(Chinese chat app)" \
+    title="QQ 9.5.3(Chinese chat app)" \
     publisher="Tencent" \
-    year="2017" \
+    year="2021" \
     media="download" \
-    file1="QQ8.9.6.exe" \
+    file1="QQ9.5.3.28008.exe" \
     file2="QQ.tar.gz"\
     installed_exe1="${W_PROGRAMS_X86_WIN}/Tencent/QQ/Bin/QQScLauncher.exe" \
     homepage="https://www.qq.com/" \
@@ -16116,7 +16319,7 @@ w_metadata qq apps \
 
 load_qq()
 {
-    w_download https://dldir1.qq.com/qqfile/qq/QQ8.9.6/22404/QQ8.9.6.exe d207f49a642be21c4e1b14fc9f4cf47a6a9a2718afbc8bd0685b607b65424ef6
+    w_download https://down.qq.com/qqweb/PCQQ/PCQQ_EXE/QQ9.5.3.28008.exe 11c869a5586a6d2210711854b85e0fcf582a20e7ca68a1cd3bfa96704f4c1804
     w_download https://hillwoodhome.net/wine/QQ.tar.gz eb5cd6371eb75ec9e2fc0271199df05cbb9f38a60c2e81d5d8ac7daeb40aba62
 
     if w_workaround_wine_bug 5162 "Installing native riched20 to work around can't input username."; then
@@ -16141,6 +16344,10 @@ load_qq()
         # shellcheck disable=SC1001
         echo Exec=env WINEPREFIX="${WINEPREFIX}" "${WINE}" \""${W_PROGRAMS_X86_WIN}"/Tencent/QQ/bin/QQScLauncher.exe\" >> "${HOME}/.local/share/applications/wine/Programs/腾讯软件/QQ/腾讯QQ.desktop"
     fi
+    
+    if w_workaround_wine_bug xxx "Installing native dbghelp to work around crash bug" ; then
+        w_call dbghelp
+    fi
 
     if w_workaround_wine_bug 37680 "Disable txplatform.exe to work around QQ can't be quit cleanly"; then
         w_override_dlls disabled txplatform.exe
@@ -16282,8 +16489,18 @@ load_steam()
         w_override_dlls disabled gameoverlayrenderer
     fi
 
-    if w_workaround_wine_bug 44985 "Disabling libglesv2 to make Store and Library function correctly."; then
+    if w_workaround_wine_bug 44985 "Disabling libglesv2 to make Store and Library function correctly." 7.0,; then
         w_override_dlls disabled libglesv2
+        w_warn "Steam needs to be launched with -noreactlogin"
+    fi
+
+    if [ "$(uname -s)" = "Darwin" ] && w_workaround_wine_bug 49839 "Steamwebhelper.exe crashes when running Steam."; then
+        w_warn "Steam must be launched with -allosarches -cef-force-32bit -cef-in-process-gpu -no-cef-sandbox"
+    fi
+
+    # vulkandriverquery & vulkandriverquery64 crash a lot on macOS
+    if [ "$(uname -s)" = "Darwin" ]; then
+        w_call nocrashdialog
     fi
 
     # Otherwise Steam Store and Library don't show
@@ -16292,22 +16509,22 @@ load_steam()
 
 #----------------------------------------------------------------
 
-w_metadata uplay apps \
-    title="Uplay" \
+w_metadata ubisoftconnect apps \
+    title="Ubisoft Connect" \
     publisher="Ubisoft" \
-    year="2013" \
+    year="2020" \
     media="download" \
-    file1="UplayInstaller.exe" \
-    installed_exe1="${W_PROGRAMS_X86_WIN}/Ubisoft/Ubisoft Game Launcher/Uplay.exe"
+    file1="UbisoftConnectInstaller.exe" \
+    installed_exe1="${W_PROGRAMS_X86_WIN}/Ubisoft/Ubisoft Game Launcher/UbisoftConnect.exe"
 
-load_uplay()
+load_ubisoftconnect()
 {
     # Changes too frequently, don't check anymore
-    w_download https://static3.cdn.ubi.com/orbit/launcher_installer/UplayInstaller.exe
+    w_download https://ubistatic3-a.akamaihd.net/orbit/launcher_installer/UbisoftConnectInstaller.exe
     w_try_cd "${W_CACHE}/${W_PACKAGE}"
 
     # NSIS installer
-    w_try "${WINE}" UplayInstaller.exe ${W_OPT_UNATTENDED:+ /S}
+    w_try "${WINE}" UbisoftConnectInstaller.exe ${W_OPT_UNATTENDED:+ /S}
 }
 
 #----------------------------------------------------------------
@@ -16318,7 +16535,7 @@ w_metadata utorrent apps \
     year="2011" \
     media="manual_download" \
     file1="utorrent_2.2.1.exe" \
-    installed_exe1="c:/windows/utorrent.exe"
+    installed_exe1="${W_WINDIR_WIN}/utorrent.exe"
 
 load_utorrent()
 {
@@ -16414,7 +16631,9 @@ load_vc2005expresssp1()
     if w_workaround_wine_bug 37375; then
             w_warn "Installer currently fails"
     fi
-    w_download https://download.microsoft.com/download/7/7/3/7737290f-98e8-45bf-9075-85cc6ae34bf1/VS80sp1-KB926748-X86-INTL.exe a959d1ea52674b5338473be32a1370f9ec80df84629a2ed3471aa911b42d9e50
+
+    w_download https://web.archive.org/web/20110624054336/https://download.microsoft.com/download/7/7/3/7737290f-98e8-45bf-9075-85cc6ae34bf1/VS80sp1-KB926748-X86-INTL.exe a959d1ea52674b5338473be32a1370f9ec80df84629a2ed3471aa911b42d9e50
+
     w_try ${WINE} "${W_CACHE}"/vc2005expresssp1/VS80sp1-KB926748-X86-INTL.exe ${W_OPT_UNATTENDED:+/q}
 }
 
@@ -16523,14 +16742,10 @@ load_vc2010express()
     # Formerly at: ftp://www.daba.lv/pub/Programmeeshana/VisualStudio/VS2010Express1.iso a9d5dcdf55e539a06547a8ebbc63d55dc167113e09ee9e42096ab9098313039b
     w_download https://debian.fmi.uni-sofia.bg/~aangelov/VS2010Express1.iso a9d5dcdf55e539a06547a8ebbc63d55dc167113e09ee9e42096ab9098313039b
 
-    # Unpack ISO
-    w_try_7z "${W_TMP}" "${W_CACHE}"/vc2010express/VS2010Express1.iso
-    w_try_cd "${W_TMP}"/VCExpress
-
     # Uninstall wine-mono, installer doesn't attempt to install native .Net if mono is installed,
     # Then the installer throws an exception and fails
     # See https://github.com/Winetricks/winetricks/issues/1165
-    w_call remove_mono
+    w_call remove_mono internal
 
     # dotnet40 leaves winver at win2k, which causes vc2010 to abort on
     # start because it looks for c:\users\$LOGNAME\Application Data
@@ -16540,6 +16755,11 @@ load_vc2010express()
         w_call mspatcha
     fi
 
+    # Unpack ISO
+    # This must happen after w_call or W_TMP will be blown away
+    w_try_7z "${W_TMP}" "${W_CACHE}"/vc2010express/VS2010Express1.iso
+    w_try_cd "${W_TMP}"/VCExpress
+
     w_try ${WINE} setup.exe ${W_OPT_UNATTENDED:+/q}
 }
 
@@ -16622,6 +16842,101 @@ load_winamp()
 
 #----------------------------------------------------------------
 
+w_metadata winrar apps \
+    title="WinRAR 6.11" \
+    publisher="RARLAB" \
+    year="1993" \
+    media="download" \
+    file1="winrar-x32-611.exe" \
+    installed_exe1="${W_PROGRAMS_WIN}/WinRAR/WinRAR.exe"
+
+load_winrar()
+{
+    _W_winrar_url="https://www.win-rar.com/fileadmin/winrar-versions"
+    _W_winrar_ver="611"
+    if [ "${W_ARCH}" = "win32" ]; then
+        _W_winrar_exe="winrar-x32-${_W_winrar_ver}.exe"
+    else
+        _W_winrar_exe="winrar-x64-${_W_winrar_ver}.exe"
+    fi
+    case ${LANG} in
+        da*)
+            _W_winrar_exe="${_W_winrar_exe%.exe}dk.exe"
+            if [ "${W_ARCH}" = "win32" ]; then
+                w_download "${_W_winrar_url}/${_W_winrar_exe}" 0d42fef9e9dc906cbf75d230dbfc902e1c95a2d5fbf6994d53686ac80300733a
+            else
+                w_download "${_W_winrar_url}/${_W_winrar_exe}" cb1f96cb804d1f89447a53968c3e3a83409b7b3fb6876e0be614b4932c674251
+            fi
+            ;;
+        de*)
+            _W_winrar_exe="${_W_winrar_exe%.exe}d.exe"
+            if [ "${W_ARCH}" = "win32" ]; then
+                w_download "${_W_winrar_url}/${_W_winrar_exe}" 3ed5607cefe225ad72b407be7ca2c1dddfde765ac6d78406b104d674f0444e2d
+            else
+                w_download "${_W_winrar_url}/${_W_winrar_exe}" 7247dc5ea61348bd2b9bea59b19ab05dbb2db67f6001e921a3456de7274ccf9f
+            fi
+            ;;
+        pl*)
+            _W_winrar_exe="${_W_winrar_exe%.exe}pl.exe"
+            if [ "${W_ARCH}" = "win32" ]; then
+                w_download "${_W_winrar_url}/${_W_winrar_exe}" 2011f899d3a2b48aade49642d2f0b6f0d79730cece119a305c83fa17d317107e
+            else
+                w_download "${_W_winrar_url}/${_W_winrar_exe}" 9171eab706208f6febe4dcd2b475cbc2894b834ad112c89eb0a494bb3643360c
+            fi
+            ;;
+        pt*)
+            _W_winrar_exe="${_W_winrar_exe%.exe}pt.exe"
+            if [ "${W_ARCH}" = "win32" ]; then
+                w_download "${_W_winrar_url}/${_W_winrar_exe}" d3e37bbfa6ea268093c37f2ce4fc7a14833eaf7c01b51cf25be1714f37435e02
+            else
+                w_download "${_W_winrar_url}/${_W_winrar_exe}" 1e9c9a49426a2292ee5a97ff8a77b34598966ce45b1bffc9464e7110b236471b
+            fi
+            ;;
+        ru*)
+            _W_winrar_exe="${_W_winrar_exe%.exe}ru.exe"
+            if [ "${W_ARCH}" = "win32" ]; then
+                w_download "${_W_winrar_url}/${_W_winrar_exe}" 6d70cbf9b7a8de9e825e619128ef3555600b14a062ff90cf2ab47edd3ca6ecf2
+            else
+                w_download "${_W_winrar_url}/${_W_winrar_exe}" f32ad8fc89a9bcfc1477e60de6d1ac9681f6eae6ff033aacdb6e0b75e7712910
+            fi
+            ;;
+        uk*)
+            _W_winrar_exe="${_W_winrar_exe%.exe}uk.exe"
+            if [ "${W_ARCH}" = "win32" ]; then
+                w_download "${_W_winrar_url}/${_W_winrar_exe}" d4e9cb5e4d488ee47f6b1bb694a792fb7f661e401128fe59bc8cb63372003d5f
+            else
+                w_download "${_W_winrar_url}/${_W_winrar_exe}" c54197b003c39e2ae27c33319302c893f8ed9d04f22166f79ab1ff1dc82b6ccf
+            fi
+            ;;
+        zh_CN*)
+            _W_winrar_exe="${_W_winrar_exe%.exe}sc.exe"
+            if [ "${W_ARCH}" = "win32" ]; then
+                w_download "${_W_winrar_url}/${_W_winrar_exe}" cfcebea91ee1837950bed722a92d240bbdcafc7e1fcb76e9fc5d9ce4acea6ccd
+            else
+                w_download "${_W_winrar_url}/${_W_winrar_exe}" a364612c5acc56c057fec0428220eca991b58a47bd3a7ae4c1b4e0a644ad79da
+            fi
+            ;;
+        zh_TW*|zh_HK*)
+            _W_winrar_exe="${_W_winrar_exe%.exe}tc.exe"
+            if [ "${W_ARCH}" = "win32" ]; then
+                w_download "${_W_winrar_url}/${_W_winrar_exe}" 7ffbd880bc92442c84413397028ef65a16cde9fa87eff0a55dc5a93c61d68b84
+            else
+                w_download "${_W_winrar_url}/${_W_winrar_exe}" 126ac1b858f769d5dffb39cff603bf0ec79dc21b8d7b79e92e29463d1786996a
+            fi
+            ;;
+        *)
+            if [ "${W_ARCH}" = "win32" ]; then
+                w_download "${_W_winrar_url}/${_W_winrar_exe}" 6124fce45e0413021160eaf4b4652ae6b6bdd4967082094f7d457207aa349f1f
+            else
+                w_download "${_W_winrar_url}/${_W_winrar_exe}" 3023edb4fc3f7c2ebad157b182b62848423f6fa20d180b0df689cbb503a49684
+            fi
+            ;;
+    esac
+    w_try_cd "${W_CACHE}/${W_PACKAGE}"
+    w_try "${WINE}" "${_W_winrar_exe}" ${W_OPT_UNATTENDED:+/S}
+}
+
+#----------------------------------------------------------------
 w_metadata wme9 apps \
     title="MS Windows Media Encoder 9 (broken in Wine)" \
     publisher="Microsoft" \
@@ -16784,7 +17099,7 @@ load_wmp11()
 
         installer_exe=wmp11-windowsxp-x86-enu.exe
         wmf_exe=wmfdist11.exe
-        wmf_exe=wmp11.exe
+        wmp_exe=wmp11.exe
     elif [ "${W_ARCH}" = "win64" ]; then
         # https://appdb.winehq.org/objectManager.php?sClass=version&iId=32057
         w_download https://web.archive.org/web/20190512112704/https://download.microsoft.com/download/3/0/8/3080C52C-2517-43DE-BDB4-B7EAFD88F084/wmp11-windowsxp-x64-enu.exe 5af407cf336849aff435044ec28f066dd523bbdc22d1ce7aaddb5263084f5526
@@ -18478,7 +18793,7 @@ load_deadspace2()
 
     w_mount Disc1
 
-    # FIXME: this bug was fixed in 1.3.36, so this is unneccessary
+    # FIXME: this bug was fixed in 1.3.36, so this is unnecessary
     #
     # Work around bug 25963 (fails to switch discs)
     w_warn "Copying discs to hard drive.  This will take a few minutes."
@@ -18690,26 +19005,6 @@ load_diablo2()
     w_killall "Game.exe"
 }
 
-w_metadata digitanks_demo games \
-    title="Digitanks Demo" \
-    publisher="Lunar Workshop" \
-    year="2011" \
-    media="download" \
-    file1="digitanks.exe" \
-    installed_exe1="${W_PROGRAMS_X86_WIN}/Digitanks/digitanksdemo.exe" \
-    homepage="http://www.digitanks.com"
-
-load_digitanks_demo()
-{
-    # 2011/11/11: bc98de67680e907a30ee1ab5d062e098c07a87292e3fb82ae62ad2d7175e94ff
-    w_download "http://static.digitanks.com/files/digitanks.exe" bc98de67680e907a30ee1ab5d062e098c07a87292e3fb82ae62ad2d7175e94ff
-    w_try_cd "${W_CACHE}/${W_PACKAGE}"
-    w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+ /S}
-    if w_workaround_wine_bug 8060 "installing corefonts"; then
-        w_call corefonts
-    fi
-}
-
 w_metadata dirt2_demo games \
     title="Dirt 2 Demo" \
     publisher="Codemasters" \
@@ -19203,49 +19498,6 @@ load_fifa11_demo()
 
 #----------------------------------------------------------------
 
-w_metadata hon games \
-    title="Heroes of Newerth" \
-    publisher="S2 Games" \
-    year="2018" \
-    media="download" \
-    file1="HoNClient.exe" \
-    installed_exe1="${W_PROGRAMS_X86_WIN}/Heroes of Newerth/hon.exe"
-
-load_hon()
-{
-    # 2017/03/28: 0f3c3431a88964647fc4d9540490e43afedc2e48573c260892882ecf48172317
-    # 2018/06/03: d4c82a3c5fdaee193675838e2fe6ade6b9fcdc4bdaf57848300c0eb09e71a945
-    w_download http://dl.heroesofnewerth.com/installers/win32/HoNClient.exe d4c82a3c5fdaee193675838e2fe6ade6b9fcdc4bdaf57848300c0eb09e71a945
-
-    w_try_cd "${W_CACHE}/${W_PACKAGE}"
-    w_ahk_do "
-        SetTitleMatchMode, 2
-        run, ${file1}
-        winwait, Installer Language
-        if ( w_opt_unattended > 0 ) {
-            send {Enter}
-            winwait, Heroes of Newerth
-            sleep 1000
-            controlclick, Button2, Heroes of Newerth
-            winwait, Heroes of Newerth, License
-            sleep 1000
-            controlclick, Button2, Heroes of Newerth, License
-            winwait, Heroes of Newerth, Install Location
-            sleep 1000
-            controlclick, Button2, Heroes of Newerth, Install Location
-            winwait, Heroes of Newerth, Start Menu
-            sleep 1000
-            controlclick, Button2, Heroes of Newerth, Start Menu
-            winwait, Heroes of Newerth, Finish
-            sleep 1000
-            controlclick, Button2, Heroes of Newerth, Finish
-        }
-        winwaitclose, Heroes of Newerth, Finish
-    "
-}
-
-#----------------------------------------------------------------
-
 w_metadata hordesoforcs2_demo games \
     title="Hordes of Orcs 2 Demo" \
     publisher="Freeverse" \
@@ -20060,7 +20312,7 @@ load_myth2_demo()
     # source code to Project Magma for further development.
 
     # 2017/03/27: 1a5e11be25c43491e2b4da5291b646ffe5330a6289bef236f404906e3b4f5e96
-    w_download https://tain.totalcodex.net/items/download/myth-ii-demo-windows 1a5e11be25c43491e2b4da5291b646ffe5330a6289bef236f404906e3b4f5e96 "${file1}"
+    w_download https://tain.totalcodex.net/items/download/myth-ii-demo-windows 1a5e11be25c43491e2b4da5291b646ffe5330a6289bef236f404906e3b4f5e96 Myth2_Demo_180.exe
 
     w_try_cd "${W_TMP}"
     w_try unzip "${W_CACHE}/${W_PACKAGE}/${file1}"
@@ -20099,8 +20351,10 @@ w_metadata nfsshift_demo games \
 
 load_nfsshift_demo()
 {
-    #w_download http://cdn.needforspeed.com/data/downloads/shift/NFSSHIFTPCDEMO.exe 5ad011e7dd42e3404e3191009cd81c05b891e7c138d61f958fce9506ff8c9de3
-    w_download http://www.legendaryreviews.com/download-center/demos/NFSSHIFTPCDEMO.exe 5ad011e7dd42e3404e3191009cd81c05b891e7c138d61f958fce9506ff8c9de3
+    # Originally at http://cdn.needforspeed.com/data/downloads/shift/NFSSHIFTPCDEMO.exe
+    # 2011/11/12: http://www.legendaryreviews.com/download-center/demos/NFSSHIFTPCDEMO.exe
+    # 2022/08/15: https://download.nvidia.com/downloads/nZone/demos/SHIFTDemo.exe
+    w_download https://download.nvidia.com/downloads/nZone/demos/SHIFTDemo.exe 5ad011e7dd42e3404e3191009cd81c05b891e7c138d61f958fce9506ff8c9de3 NFSSHIFTPCDEMO.exe
 
     w_try cp "${W_CACHE}/${W_PACKAGE}/${file1}" "${W_TMP}"
 
@@ -22952,16 +23206,21 @@ load_isolate_home()
 {
     w_skip_windows isolate_home && return
 
-    _olddir="$(pwd)"
-    w_try_cd "${WINEPREFIX}/drive_c/users/${USER}"
-    for x in *; do
-        if test -h "${x}" && test -d "${x}"; then
-            rm -f "${x}"
-            mkdir -p "${x}"
+    LANG=C find "${WINEPREFIX}/drive_c/users/${USER}" -type l | while IFS= read -r _W_symlink; do
+        # handle chained symlinks, which ultimately resolve outside $HOME, by using first symlink
+        _W_target="$(readlink "${_W_symlink}")"
+        if echo "${_W_target}" | grep -q "^${_W_symlink}"; then
+            echo "leaving symlink pointing inside the prefix: ${_W_symlink} -> ${_W_target}"
+        elif test -f "${_W_target}"; then
+            echo "ignoring file symlink: ${_W_symlink} -> ${_W_target}"
+        elif echo "${_W_target}" | grep -q "^${HOME}"; then
+            echo "removing directory symlink ${_W_symlink} -> ${_W_target} ..."
+            w_try rm -f "${_W_symlink}"
+            w_try mkdir -p "${_W_symlink}"
+        else
+            echo "leaving data directory symlink not pointing to \$HOME: ${_W_symlink} -> ${_W_target}"
         fi
     done
-    w_try_cd "${_olddir}"
-    unset _olddir
 
     # Workaround for:
     # https://bugs.winehq.org/show_bug.cgi?id=22450 (sandbox verb)
@@ -23036,7 +23295,7 @@ load_remove_mono()
         for uuid in ${mono_uuid}; do
             "${WINE_ARCH}" uninstaller --remove "${uuid}"
         done
-    else
+    elif [ -z "$1" ] || [ "$1" != "internal" ]; then
         # Bail out if mono isn't installed, so we don't break .Net setups
         w_warn "Mono does not appear to be installed."
         return
@@ -23491,12 +23750,12 @@ winetricks_shell()
 
         case ${WINETRICKS_GUI} in
             none)
-                ${SHELL}
+                WINEDEBUG=-all ${SHELL} "${@}"
                 ;;
             *)
                 for term in gnome-terminal konsole Terminal xterm; do
                     if test "$(command -v ${term} 2>/dev/null)"; then
-                        ${term}
+                        WINEDEBUG=-all ${term} -e "${@}"
                         break
                     fi
                 done
@@ -23555,6 +23814,7 @@ execute_command()
         explorer) "${WINE}" explorer & ;;
         uninstaller) "${WINE}" uninstaller ;;
         shell) winetricks_shell ;;
+        winecmd) winetricks_shell "${WINE}" "cmd.exe" ;;
 
         # These have to come before *=disabled to avoid looking like DLLs
         cfc=disable*) w_call cfc=disabled ;;
@@ -23572,6 +23832,8 @@ execute_command()
         dotnet2) w_warn "Calling dotnet2 is deprecated, please use dotnet20 instead" ; w_call dotnet20 ;;
         ddr=gdi) w_warn "Calling ddr=gdi is deprecated, please use renderer=gdi or renderer=no3d instead" ; w_call renderer=gdi ;;
         ddr=opengl) w_warn "Calling ddr=opengl is deprecated, please use renderer=gl instead" ; w_call renderer=gl ;;
+        dxsdk_nov2006) w_warn "Calling dxsdk_nov2006 is deprecated, please use dxsdk_aug2006 instead"; w_call dxsdk_aug2006 ;;
+
         dxvk054|dxvk54) w_warn "Calling $1 is deprecated, please use dxvk0054 instead" ; w_call dxvk0054 ;;
         dxvk060|dxvk60) w_warn "Calling $1 is deprecated, please use dxvk0060 instead" ; w_call dxvk0060 ;;
         dxvk061|dxvk61) w_warn "Calling $1 is deprecated, please use dxvk0061 instead" ; w_call dxvk0061 ;;
@@ -23718,7 +23980,7 @@ if ! test "${WINETRICKS_LIB}"; then
             # GUI case
             # No non-option arguments given, so read them from GUI, and loop until user quits
             if [ ${WINETRICKS_GUI} = "none" ]; then
-                winetricks_detect_gui
+                winetricks_detect_gui --gui
             fi
             winetricks_detect_sudo
             test -z "${WINETRICKS_ISO_MOUNT}" && winetricks_detect_iso_mount