just import winetricks-20220401.tar with rpmgs script

winetricks/README.md

@@ -23,7 +23,7 @@ The ```winetricks``` package should be used if it is available and up to date. T
 * Gentoo: https://packages.gentoo.org/packages/app-emulation/winetricks
 * Homebrew (OSX): https://formulae.brew.sh/formula/winetricks
 * MacPorts (OSX): https://www.macports.org/ports.php?by=name&substr=winetricks
-* Slackbuilds (Slackware): https://slackbuilds.org/repository/14.2/system/winetricks/?search=winetricks
+* Slackbuilds (Slackware): https://slackbuilds.org/apps/winetricks/
 * Ubuntu: https://packages.ubuntu.com/search?keywords=winetricks
 
 Note: packaged Debian / Ubuntu winetricks versions are typically outdated, so a manual installation is recommended.

winetricks/src/winetricks

@@ -760,7 +760,8 @@ cat > "${WINETRICKS_WORKDIR}/cp_font_files.sh" <<_EOF_
     _W_file_name="\$(basename "\$_W_src_file" | tr "[:upper:]" "[:lower:]")"
 
     # Remove any existing font files that might have the same name, but with different case characters
-    find "${_W_dest_dir}" -maxdepth 1 -type f -iname "\$_W_file_name" -exec rm '{}' ';'
+    # LANG=C to avoid locale issues (https://github.com/Winetricks/winetricks/issues/1892)
+    LANG=C find "${_W_dest_dir}" -maxdepth 1 -type f -iname "\$_W_file_name" -exec rm '{}' ';'
 
     # FIXME: w_try() isn't available, need some better error handling:
     cp -f "\$_W_src_file" "${_W_dest_dir}/\$_W_file_name"
@@ -768,7 +769,8 @@ _EOF_
 
     # Use -exec "sh .." to avoid issues with noexec
     # Gross quoting is to avoid SC2156
-    find "${_W_src_dir}" -maxdepth 1 -type f -iname "${_W_pattern}" -exec sh -c 'sh '"${WINETRICKS_WORKDIR}/cp_font_files.sh"' "$1"' _ {} \;
+    # LANG=C to avoid locale issues (https://github.com/Winetricks/winetricks/issues/1892)
+    LANG=C find "${_W_src_dir}" -maxdepth 1 -type f -iname "${_W_pattern}" -exec sh -c 'sh '"${WINETRICKS_WORKDIR}/cp_font_files.sh"' "$1"' _ {} \;
 
     # Wait for Wine to add the new font to the registry under HKCU\Software\Wine\Fonts\Cache
     w_wineserver -w
@@ -7301,7 +7303,7 @@ helper_dxvk_d9vk()
 
 #----------------------------------------------------------------
 
-w_metadata dxvk054 dlls \
+w_metadata dxvk0054 dlls \
     title="Vulkan-based D3D11 implementation for Linux / Wine (0.54)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7310,14 +7312,14 @@ w_metadata dxvk054 dlls \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file2="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk054()
+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"
 }
 
-w_metadata dxvk060 dlls \
+w_metadata dxvk0060 dlls \
     title="Vulkan-based D3D11 implementation for Linux / Wine (0.60)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7326,14 +7328,14 @@ w_metadata dxvk060 dlls \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file2="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk060()
+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"
 }
 
-w_metadata dxvk061 dlls \
+w_metadata dxvk0061 dlls \
     title="Vulkan-based D3D11 implementation for Linux / Wine (0.61)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7342,14 +7344,14 @@ w_metadata dxvk061 dlls \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file2="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk061()
+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"
 }
 
-w_metadata dxvk062 dlls \
+w_metadata dxvk0062 dlls \
     title="Vulkan-based D3D11 implementation for Linux / Wine (0.62)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7358,14 +7360,14 @@ w_metadata dxvk062 dlls \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file2="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk062()
+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"
 }
 
-w_metadata dxvk063 dlls \
+w_metadata dxvk0063 dlls \
     title="Vulkan-based D3D11 implementation for Linux / Wine (0.63)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7374,14 +7376,14 @@ w_metadata dxvk063 dlls \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file2="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk063()
+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"
 }
 
-w_metadata dxvk064 dlls \
+w_metadata dxvk0064 dlls \
     title="Vulkan-based D3D11 implementation for Linux / Wine (0.64)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7390,14 +7392,14 @@ w_metadata dxvk064 dlls \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file2="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk064()
+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"
 }
 
-w_metadata dxvk065 dlls \
+w_metadata dxvk0065 dlls \
     title="Vulkan-based D3D11 implementation for Linux / Wine (0.65)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7406,14 +7408,14 @@ w_metadata dxvk065 dlls \
     installed_file1="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file2="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk065()
+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"
 }
 
-w_metadata dxvk070 dlls \
+w_metadata dxvk0070 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.70)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7425,14 +7427,14 @@ w_metadata dxvk070 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk070()
+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"
 }
 
-w_metadata dxvk071 dlls \
+w_metadata dxvk0071 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.71)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7444,14 +7446,14 @@ w_metadata dxvk071 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk071()
+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"
 }
 
-w_metadata dxvk072 dlls \
+w_metadata dxvk0072 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.72)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7463,14 +7465,14 @@ w_metadata dxvk072 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk072()
+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"
 }
 
-w_metadata dxvk080 dlls \
+w_metadata dxvk0080 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.80)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7482,7 +7484,7 @@ w_metadata dxvk080 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk080()
+load_dxvk0080()
 {
     # https://github.com/doitsujin/dxvk
     # 2017/09/23: f9e736cdbf1e83e45ca748652a94a3a189fc5accde1eac549b2ba5af8f7acacb
@@ -7492,7 +7494,7 @@ load_dxvk080()
     helper_dxvk_d9vk "${file1}" "3.18" "1.1.84" "dxgi,d3d10core,d3d10,d3d11"
 }
 
-w_metadata dxvk081 dlls \
+w_metadata dxvk0081 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.81)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7504,14 +7506,14 @@ w_metadata dxvk081 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk081()
+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"
 }
 
-w_metadata dxvk090 dlls \
+w_metadata dxvk0090 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.90)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7523,14 +7525,14 @@ w_metadata dxvk090 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk090()
+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"
 }
 
-w_metadata dxvk091 dlls \
+w_metadata dxvk0091 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.91)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7542,14 +7544,14 @@ w_metadata dxvk091 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk091()
+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"
 }
 
-w_metadata dxvk092 dlls \
+w_metadata dxvk0092 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.92)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7561,14 +7563,14 @@ w_metadata dxvk092 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk092()
+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"
 }
 
-w_metadata dxvk093 dlls \
+w_metadata dxvk0093 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.93)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7580,14 +7582,14 @@ w_metadata dxvk093 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk093()
+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"
 }
 
-w_metadata dxvk094 dlls \
+w_metadata dxvk0094 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.94)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7599,14 +7601,14 @@ w_metadata dxvk094 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk094()
+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"
 }
 
-w_metadata dxvk095 dlls \
+w_metadata dxvk0095 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.95)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7618,14 +7620,14 @@ w_metadata dxvk095 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk095()
+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"
 }
 
-w_metadata dxvk096 dlls \
+w_metadata dxvk0096 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.96)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7637,14 +7639,14 @@ w_metadata dxvk096 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk096()
+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"
 }
 
-w_metadata dxvk100 dlls \
+w_metadata dxvk1000 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (1.0)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7656,14 +7658,14 @@ w_metadata dxvk100 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk100()
+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"
 }
 
-w_metadata dxvk101 dlls \
+w_metadata dxvk1001 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (1.0.1)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7675,14 +7677,14 @@ w_metadata dxvk101 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk101()
+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"
 }
 
-w_metadata dxvk102 dlls \
+w_metadata dxvk1002 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (1.0.2)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7694,14 +7696,14 @@ w_metadata dxvk102 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk102()
+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"
 }
 
-w_metadata dxvk103 dlls \
+w_metadata dxvk1003 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (1.0.3)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7713,14 +7715,14 @@ w_metadata dxvk103 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk103()
+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"
 }
 
-w_metadata dxvk111 dlls \
+w_metadata dxvk1011 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (1.1.1)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7732,14 +7734,14 @@ w_metadata dxvk111 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk111()
+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"
 }
 
-w_metadata dxvk120 dlls \
+w_metadata dxvk1020 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (1.2)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7751,14 +7753,14 @@ w_metadata dxvk120 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk120()
+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"
 }
 
-w_metadata dxvk121 dlls \
+w_metadata dxvk1021 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (1.2.1)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7770,14 +7772,14 @@ w_metadata dxvk121 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk121()
+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"
 }
 
-w_metadata dxvk122 dlls \
+w_metadata dxvk1022 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (1.2.2)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7789,14 +7791,14 @@ w_metadata dxvk122 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk122()
+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"
 }
 
-w_metadata dxvk123 dlls \
+w_metadata dxvk1023 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (1.2.3)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7808,14 +7810,14 @@ w_metadata dxvk123 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk123()
+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"
 }
 
-w_metadata dxvk130 dlls \
+w_metadata dxvk1030 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (1.3)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7827,14 +7829,14 @@ w_metadata dxvk130 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk130()
+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"
 }
 
-w_metadata dxvk131 dlls \
+w_metadata dxvk1031 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (1.3.1)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7846,14 +7848,14 @@ w_metadata dxvk131 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk131()
+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"
 }
 
-w_metadata dxvk132 dlls \
+w_metadata dxvk1032 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (1.3.2)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7865,14 +7867,14 @@ w_metadata dxvk132 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk132()
+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"
 }
 
-w_metadata dxvk133 dlls \
+w_metadata dxvk1033 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (1.3.3)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7884,14 +7886,14 @@ w_metadata dxvk133 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk133()
+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"
 }
 
-w_metadata dxvk134 dlls \
+w_metadata dxvk1034 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (1.3.4)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7903,14 +7905,14 @@ w_metadata dxvk134 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk134()
+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"
 }
 
-w_metadata dxvk140 dlls \
+w_metadata dxvk1040 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (1.4)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7922,14 +7924,14 @@ w_metadata dxvk140 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk140()
+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"
 }
 
-w_metadata dxvk141 dlls \
+w_metadata dxvk1041 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (1.4.1)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7941,14 +7943,14 @@ w_metadata dxvk141 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk141()
+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"
 }
 
-w_metadata dxvk142 dlls \
+w_metadata dxvk1042 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (1.4.2)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7960,14 +7962,14 @@ w_metadata dxvk142 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk142()
+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"
 }
 
-w_metadata dxvk143 dlls \
+w_metadata dxvk1043 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (1.4.3)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7979,14 +7981,14 @@ w_metadata dxvk143 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk143()
+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"
 }
 
-w_metadata dxvk144 dlls \
+w_metadata dxvk1044 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (1.4.4)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -7998,14 +8000,14 @@ w_metadata dxvk144 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk144()
+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"
 }
 
-w_metadata dxvk145 dlls \
+w_metadata dxvk1045 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (1.4.5)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -8017,14 +8019,14 @@ w_metadata dxvk145 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk145()
+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"
 }
 
-w_metadata dxvk146 dlls \
+w_metadata dxvk1046 dlls \
     title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (1.4.6)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -8036,7 +8038,7 @@ w_metadata dxvk146 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk146()
+load_dxvk1046()
 {
     # https://github.com/doitsujin/dxvk
     # Original sha256sum: 1aa069f5ea7d3d6e374bda332d12f9207f1a21e9811c4d4d82487416420ee73e
@@ -8045,7 +8047,7 @@ load_dxvk146()
     helper_dxvk_d9vk "${file1}" "4.20" "1.1.113" "dxgi,d3d10core,d3d10,d3d11"
 }
 
-w_metadata dxvk150 dlls \
+w_metadata dxvk1050 dlls \
     title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.5)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -8058,14 +8060,14 @@ w_metadata dxvk150 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk150()
+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"
 }
 
-w_metadata dxvk151 dlls \
+w_metadata dxvk1051 dlls \
     title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.5.1)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -8078,14 +8080,14 @@ w_metadata dxvk151 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk151()
+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"
 }
 
-w_metadata dxvk152 dlls \
+w_metadata dxvk1052 dlls \
     title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.5.2)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -8098,14 +8100,14 @@ w_metadata dxvk152 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk152()
+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"
 }
 
-w_metadata dxvk153 dlls \
+w_metadata dxvk1053 dlls \
     title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.5.3)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -8118,14 +8120,14 @@ w_metadata dxvk153 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk153()
+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"
 }
 
-w_metadata dxvk154 dlls \
+w_metadata dxvk1054 dlls \
     title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.5.4)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -8138,14 +8140,14 @@ w_metadata dxvk154 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk154()
+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"
 }
 
-w_metadata dxvk155 dlls \
+w_metadata dxvk1055 dlls \
     title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.5.5)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -8158,14 +8160,14 @@ w_metadata dxvk155 dlls \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file5="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk155()
+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"
 }
 
-w_metadata dxvk160 dlls \
+w_metadata dxvk1060 dlls \
     title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.6)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -8176,14 +8178,14 @@ w_metadata dxvk160 dlls \
     installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk160()
+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"
 }
 
-w_metadata dxvk161 dlls \
+w_metadata dxvk1061 dlls \
     title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.6.1)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -8194,14 +8196,14 @@ w_metadata dxvk161 dlls \
     installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk161()
+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"
 }
 
-w_metadata dxvk170 dlls \
+w_metadata dxvk1070 dlls \
     title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.7)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -8212,14 +8214,14 @@ w_metadata dxvk170 dlls \
     installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk170()
+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"
 }
 
-w_metadata dxvk171 dlls \
+w_metadata dxvk1071 dlls \
     title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.7.1)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -8230,14 +8232,14 @@ w_metadata dxvk171 dlls \
     installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk171()
+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"
 }
 
-w_metadata dxvk172 dlls \
+w_metadata dxvk1072 dlls \
     title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.7.2)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -8248,14 +8250,14 @@ w_metadata dxvk172 dlls \
     installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk172()
+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"
 }
 
-w_metadata dxvk173 dlls \
+w_metadata dxvk1073 dlls \
     title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.7.3)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -8266,14 +8268,14 @@ w_metadata dxvk173 dlls \
     installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk173()
+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"
 }
 
-w_metadata dxvk180 dlls \
+w_metadata dxvk1080 dlls \
     title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.8)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -8284,14 +8286,14 @@ w_metadata dxvk180 dlls \
     installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk180()
+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"
 }
 
-w_metadata dxvk181 dlls \
+w_metadata dxvk1081 dlls \
     title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.8.1)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -8302,14 +8304,14 @@ w_metadata dxvk181 dlls \
     installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk181()
+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"
 }
 
-w_metadata dxvk190 dlls \
+w_metadata dxvk1090 dlls \
     title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.9)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -8320,14 +8322,14 @@ w_metadata dxvk190 dlls \
     installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk190()
+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"
 }
 
-w_metadata dxvk191 dlls \
+w_metadata dxvk1091 dlls \
     title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.9.1)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -8338,14 +8340,14 @@ w_metadata dxvk191 dlls \
     installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk191()
+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"
 }
 
-w_metadata dxvk192 dlls \
+w_metadata dxvk1092 dlls \
     title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.9.2)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -8356,14 +8358,14 @@ w_metadata dxvk192 dlls \
     installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk192()
+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"
 }
 
-w_metadata dxvk193 dlls \
+w_metadata dxvk1093 dlls \
     title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.9.3)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -8374,14 +8376,14 @@ w_metadata dxvk193 dlls \
     installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk193()
+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"
 }
 
-w_metadata dxvk194 dlls \
+w_metadata dxvk1094 dlls \
     title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.9.4)" \
     publisher="Philip Rebohle" \
     year="2017" \
@@ -8392,13 +8394,49 @@ w_metadata dxvk194 dlls \
     installed_file3="${W_SYSTEM32_DLLS_WIN}/d3d11.dll" \
     installed_file4="${W_SYSTEM32_DLLS_WIN}/dxgi.dll"
 
-load_dxvk194()
+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"
 }
 
+w_metadata dxvk1100 dlls \
+    title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.10)" \
+    publisher="Philip Rebohle" \
+    year="2017" \
+    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"
+
+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"
+}
+
+w_metadata dxvk1101 dlls \
+    title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.10.1)" \
+    publisher="Philip Rebohle" \
+    year="2017" \
+    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"
+
+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"
+}
+
 #----------------------------------------------------------------
 
 w_metadata dxvk dlls \
@@ -8495,7 +8533,7 @@ load_vkd3d()
     _W_vkd3d_proton_version="${_W_vkd3d_proton_version#v}"
     w_linkcheck_ignore=1 w_download "https://github.com/HansKristian-Work/vkd3d-proton/releases/download/v${_W_vkd3d_proton_version}/vkd3d-proton-${_W_vkd3d_proton_version}.tar.zst"
     helper_vkd3d_proton "vkd3d-proton-${_W_vkd3d_proton_version}.tar.zst"
-    unset _W_vkd3d-proton_version
+    unset _W_vkd3d_proton_version
 }
 
 #----------------------------------------------------------------
@@ -9323,7 +9361,7 @@ w_metadata dotnet35sp1 dlls \
 
 load_dotnet35sp1()
 {
-    w_package_broken_win64 https://bugs.winehq.org/show_bug.cgi?id=49690 5.12
+    w_package_broken_win64 https://bugs.winehq.org/show_bug.cgi?id=49690 5.12 6.0
 
     w_verify_cabextract_available
 
@@ -15171,7 +15209,7 @@ load_ie6()
 
     # Remove the fake DLLs, if any
     mv "${W_PROGRAMS_UNIX}/Internet Explorer/iexplore.exe" "${W_PROGRAMS_UNIX}/Internet Explorer/iexplore.exe.bak"
-    for dll in itircl itss jscript mlang mshtml msimtf shdoclc shdocvw shlwapi; do
+    for dll in itircl itss jscript mlang mshtml msimtf shdoclc shdocvw; do
         test -f "${W_SYSTEM32_DLLS}"/${dll}.dll &&
         mv "${W_SYSTEM32_DLLS}"/${dll}.dll "${W_SYSTEM32_DLLS}"/${dll}.dll.bak
     done
@@ -15254,7 +15292,7 @@ load_ie7()
     if [ -f "${W_PROGRAMS_X86_UNIX}/Internet Explorer/iexplore.exe" ]; then
         mv "${W_PROGRAMS_X86_UNIX}/Internet Explorer/iexplore.exe" "${W_PROGRAMS_X86_UNIX}/Internet Explorer/iexplore.exe.bak"
     fi
-    for dll in itircl itss jscript mshtml msimtf shdoclc shdocvw shlwapi urlmon; do
+    for dll in itircl itss jscript mshtml msimtf shdoclc shdocvw urlmon; do
         test -f "${W_SYSTEM32_DLLS}"/${dll}.dll &&
         mv "${W_SYSTEM32_DLLS}"/${dll}.dll "${W_SYSTEM32_DLLS}"/${dll}.dll.bak
     done
@@ -15317,11 +15355,11 @@ load_ie7()
     # Seeing is believing
     case ${WINETRICKS_GUI} in
         none)
-            w_warn "To start ie7, use the command \"${WINE}\" '${W_PROGRAMS_WIN}\\\\Internet Explorer\\\\iexplore'"
+            w_warn "To start ie7, use the command \"${WINE}\" '${W_PROGRAMS_WIN}\\\\Internet Explorer\\\\iexplore.exe'"
             ;;
         *)
-            w_warn "Starting ie7.  To start it later, use the command \"${WINE}\" '${W_PROGRAMS_WIN}\\\\Internet Explorer\\\\iexplore'"
-            "${WINE}" "${W_PROGRAMS_WIN}\\Internet Explorer\\iexplore" https://www.microsoft.com/windows/internet-explorer/ie7/ > /dev/null 2>&1 &
+            w_warn "Starting ie7.  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
 
@@ -15341,11 +15379,13 @@ w_metadata ie8 dlls \
 
 load_ie8()
 {
-    # Installer itself bails out
-    w_package_unsupported_win64
-
-    # Bundled in Windows 7, so refuses to install. Works with XP:
-    w_set_winver winxp
+    if [ "${W_ARCH}" = "win32" ]; then
+        # Bundled in Windows 7, so refuses to install. Works with XP:
+        w_set_winver winxp
+    else
+        # Bundled in Windows 7, so refuses to install. Works with Win2003:
+        w_set_winver win2k3
+    fi
 
     # Unregister Wine IE
     #if [ ! -f "$W_SYSTEM32_DLLS"/plugin.ocx ]; then
@@ -15373,18 +15413,34 @@ load_ie8()
     mkdir -p "${W_SYSTEM32_DLLS}"/catroot/\{f750e6c3-38ee-11d1-85e5-00c04fc295ee\}
     w_try cp -f "${W_CACHE}"/ie8/winetest.cat "${W_SYSTEM32_DLLS}"/catroot/\{f750e6c3-38ee-11d1-85e5-00c04fc295ee\}/oem0.cat
 
-    w_download https://download.microsoft.com/download/C/C/0/CC0BD555-33DD-411E-936B-73AC6F95AE11/IE8-WindowsXP-x86-ENU.exe 5a2c6c82774bfe99b175f50a05b05bcd1fac7e9d0e54db2534049209f50cd6ef
+    if [ "${W_ARCH}" = "win32" ]; then
+        w_download https://download.microsoft.com/download/C/C/0/CC0BD555-33DD-411E-936B-73AC6F95AE11/IE8-WindowsXP-x86-ENU.exe 5a2c6c82774bfe99b175f50a05b05bcd1fac7e9d0e54db2534049209f50cd6ef
+    else
+        w_download https://download.microsoft.com/download/7/5/4/754D6601-662D-4E39-9788-6F90D8E5C097/IE8-WindowsServer2003-x64-ENU.exe bcff753e92ceabf31cfefaa6def146335c7cb27a50b95cd4f4658a0c3326f499
+    fi
 
     # Remove the fake DLLs from the existing WINEPREFIX
     if [ -f "${W_PROGRAMS_X86_UNIX}/Internet Explorer/iexplore.exe" ]; then
         w_try mv "${W_PROGRAMS_X86_UNIX}/Internet Explorer/iexplore.exe" "${W_PROGRAMS_X86_UNIX}/Internet Explorer/iexplore.exe.bak"
     fi
 
+    if [ "${W_ARCH}" = "win64" ]; then
+        if [ -f "${W_PROGRAMS_UNIX}/Internet Explorer/iexplore.exe" ]; then
+            w_try mv "${W_PROGRAMS_UNIX}/Internet Explorer/iexplore.exe" "${W_PROGRAMS_UNIX}/Internet Explorer/iexplore.exe.bak"
+        fi
+    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
+            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
 
     # KLUDGE: if / is writable (as on OS X?), having a Z: mapping to it
@@ -15401,7 +15457,11 @@ load_ie8()
     # FIXME: There's an option for /updates-noupdates to disable checking for updates, but that
     # forces the install to fail on Wine. Not sure if it's an IE8 or Wine bug...
     # FIXME: can't check status, as it always reports failure on wine?
-    "${WINE}" IE8-WindowsXP-x86-ENU.exe ${W_OPT_UNATTENDED:+/quiet /forcerestart}
+    if [ "${W_ARCH}" = "win32" ]; then
+        "${WINE}" IE8-WindowsXP-x86-ENU.exe ${W_OPT_UNATTENDED:+/quiet /forcerestart}
+    else
+        "${WINE}" IE8-WindowsServer2003-x64-ENU.exe ${W_OPT_UNATTENDED:+/quiet /forcerestart}
+    fi
 
     if [ "${_W_restore_z}" = 1 ]; then
         # END KLUDGE: restore Z:, assuming that the user didn't kill us
@@ -15410,7 +15470,6 @@ load_ie8()
 
     # Work around DLL registration bug until ierunonce/RunOnce/wineboot is fixed
     # FIXME: whittle down this list
-    w_try_cd "${W_SYSTEM32_DLLS}"
     for i in actxprxy.dll browseui.dll browsewm.dll cdfview.dll ddraw.dll \
         dispex.dll dsound.dll iedkcs32.dll iepeers.dll iesetup.dll \
         imgutil.dll inetcomm.dll isetup.dll jscript.dll laprxy.dll \
@@ -15422,6 +15481,9 @@ load_ie8()
         wshcon.dll wshext.dll asctrls.ocx hhctrl.ocx mscomct2.ocx \
         plugin.ocx proctexe.ocx tdc.ocx uxtheme.dll webcheck.dll wshom.ocx; do
         "${WINE}" regsvr32 /i ${i} > /dev/null 2>&1
+        if [ "${W_ARCH}" = "win64" ]; then
+            "${WINE64}" regsvr32 /i ${i} > /dev/null 2>&1
+        fi
     done
 
     if w_workaround_wine_bug 25648 "Setting TabProcGrowth=0 to avoid hang"; then
@@ -15441,14 +15503,18 @@ _EOF_
     # around this problem, copy native ieproxy to system32.
     w_try_cp_dll "${W_PROGRAMS_X86_UNIX}/Internet Explorer/ieproxy.dll" "${W_SYSTEM32_DLLS}"
 
+    if [ "${W_ARCH}" = "win64" ]; then
+        w_try_cp_dll "${W_PROGRAMS_UNIX}/Internet Explorer/ieproxy.dll" "${W_SYSTEM64_DLLS}"
+    fi
+
     # Seeing is believing
     case ${WINETRICKS_GUI} in
         none)
-            w_warn "To start ie8, use the command \"${WINE}\" '${W_PROGRAMS_WIN}\\\\Internet Explorer\\\\iexplore'"
+            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'"
-            "${WINE}" "${W_PROGRAMS_WIN}\\Internet Explorer\\iexplore" https://www.microsoft.com/windows/internet-explorer > /dev/null 2>&1 &
+            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
 
@@ -16331,7 +16397,8 @@ load_steam()
     # 2016/10/28: 029f918a29b2b311711788e8a477c8de529c11d7dba3caf99cbbde5a983efdad
     # 2018/06/01: 3bc6942fe09f10ed3447bccdcf4a70ed369366fef6b2c7f43b541f1a3c5d1c51
     # 2021/03/27: 874788b45dfc043289ba05387e83f27b4a046004a88a4c5ee7c073187ff65b9d
-    w_download http://media.steampowered.com/client/installer/SteamSetup.exe 874788b45dfc043289ba05387e83f27b4a046004a88a4c5ee7c073187ff65b9d
+    # 2022/03/27: 3b616cb0beaacffb53884b5ba0453312d2577db598d2a877a3b251125fb281a1
+    w_download http://media.steampowered.com/client/installer/SteamSetup.exe 3b616cb0beaacffb53884b5ba0453312d2577db598d2a877a3b251125fb281a1
     w_try_cd "${W_CACHE}/${W_PACKAGE}"
 
     w_try "${WINE}" SteamSetup.exe ${W_OPT_UNATTENDED:+ /S}
@@ -23133,7 +23200,7 @@ winetricks_shell()
                     fi
                 done
                 ;;
-            esac
+        esac
     )
 }
 
@@ -23204,25 +23271,66 @@ 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 ;;
-        dxvk54) w_warn "Calling dxvk54 is deprecated, please use dxvk054 instead" ; w_call dxvk054 ;;
-        dxvk60) w_warn "Calling dxvk60 is deprecated, please use dxvk060 instead" ; w_call dxvk060 ;;
-        dxvk61) w_warn "Calling dxvk61 is deprecated, please use dxvk061 instead" ; w_call dxvk061 ;;
-        dxvk62) w_warn "Calling dxvk62 is deprecated, please use dxvk062 instead" ; w_call dxvk062 ;;
-        dxvk63) w_warn "Calling dxvk63 is deprecated, please use dxvk063 instead" ; w_call dxvk063 ;;
-        dxvk64) w_warn "Calling dxvk64 is deprecated, please use dxvk064 instead" ; w_call dxvk064 ;;
-        dxvk65) w_warn "Calling dxvk65 is deprecated, please use dxvk065 instead" ; w_call dxvk065 ;;
-        dxvk70) w_warn "Calling dxvk70 is deprecated, please use dxvk070 instead" ; w_call dxvk070 ;;
-        dxvk71) w_warn "Calling dxvk71 is deprecated, please use dxvk071 instead" ; w_call dxvk071 ;;
-        dxvk72) w_warn "Calling dxvk72 is deprecated, please use dxvk072 instead" ; w_call dxvk072 ;;
-        dxvk80) w_warn "Calling dxvk80 is deprecated, please use dxvk080 instead" ; w_call dxvk080 ;;
-        dxvk81) w_warn "Calling dxvk81 is deprecated, please use dxvk081 instead" ; w_call dxvk081 ;;
-        dxvk90) w_warn "Calling dxvk90 is deprecated, please use dxvk090 instead" ; w_call dxvk090 ;;
-        dxvk91) w_warn "Calling dxvk91 is deprecated, please use dxvk091 instead" ; w_call dxvk091 ;;
-        dxvk92) w_warn "Calling dxvk92 is deprecated, please use dxvk092 instead" ; w_call dxvk092 ;;
-        dxvk93) w_warn "Calling dxvk93 is deprecated, please use dxvk093 instead" ; w_call dxvk093 ;;
-        dxvk94) w_warn "Calling dxvk94 is deprecated, please use dxvk094 instead" ; w_call dxvk094 ;;
-        dxvk95) w_warn "Calling dxvk95 is deprecated, please use dxvk095 instead" ; w_call dxvk095 ;;
-        dxvk96) w_warn "Calling dxvk96 is deprecated, please use dxvk096 instead" ; w_call dxvk096 ;;
+        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 ;;
+        dxvk062|dxvk62) w_warn "Calling $1 is deprecated, please use dxvk0062 instead" ; w_call dxvk0062 ;;
+        dxvk063|dxvk63) w_warn "Calling $1 is deprecated, please use dxvk0063 instead" ; w_call dxvk0063 ;;
+        dxvk064|dxvk64) w_warn "Calling $1 is deprecated, please use dxvk0064 instead" ; w_call dxvk0064 ;;
+        dxvk065|dxvk65) w_warn "Calling $1 is deprecated, please use dxvk0065 instead" ; w_call dxvk0065 ;;
+        dxvk070|dxvk70) w_warn "Calling $1 is deprecated, please use dxvk0070 instead" ; w_call dxvk0070 ;;
+        dxvk071|dxvk71) w_warn "Calling $1 is deprecated, please use dxvk0071 instead" ; w_call dxvk0071 ;;
+        dxvk072|dxvk72) w_warn "Calling $1 is deprecated, please use dxvk0072 instead" ; w_call dxvk0072 ;;
+        dxvk080|dxvk80) w_warn "Calling $1 is deprecated, please use dxvk0080 instead" ; w_call dxvk0080 ;;
+        dxvk081|dxvk81) w_warn "Calling $1 is deprecated, please use dxvk0081 instead" ; w_call dxvk0081 ;;
+        dxvk090|dxvk90) w_warn "Calling $1 is deprecated, please use dxvk0090 instead" ; w_call dxvk0090 ;;
+        dxvk091|dxvk91) w_warn "Calling $1 is deprecated, please use dxvk0091 instead" ; w_call dxvk0091 ;;
+        dxvk092|dxvk92) w_warn "Calling $1 is deprecated, please use dxvk0092 instead" ; w_call dxvk0092 ;;
+        dxvk093|dxvk93) w_warn "Calling $1 is deprecated, please use dxvk0093 instead" ; w_call dxvk0093 ;;
+        dxvk094|dxvk94) w_warn "Calling $1 is deprecated, please use dxvk0094 instead" ; w_call dxvk0094 ;;
+        dxvk095|dxvk95) w_warn "Calling $1 is deprecated, please use dxvk0095 instead" ; w_call dxvk0095 ;;
+        dxvk096|dxvk96) w_warn "Calling $1 is deprecated, please use dxvk0096 instead" ; w_call dxvk0096 ;;
+        dxvk100) w_warn "Calling dxvk100 is deprecated, please use dxvk1000 instead" ; w_call dxvk1000 ;;
+        dxvk101) w_warn "Calling dxvk101 is deprecated, please use dxvk1001 instead" ; w_call dxvk1001 ;;
+        dxvk102) w_warn "Calling dxvk102 is deprecated, please use dxvk1002 instead" ; w_call dxvk1002 ;;
+        dxvk103) w_warn "Calling dxvk103 is deprecated, please use dxvk1003 instead" ; w_call dxvk1003 ;;
+        dxvk111) w_warn "Calling dxvk111 is deprecated, please use dxvk1011 instead" ; w_call dxvk1011 ;;
+        dxvk120) w_warn "Calling dxvk120 is deprecated, please use dxvk1020 instead" ; w_call dxvk1020 ;;
+        dxvk121) w_warn "Calling dxvk121 is deprecated, please use dxvk1021 instead" ; w_call dxvk1021 ;;
+        dxvk122) w_warn "Calling dxvk122 is deprecated, please use dxvk1022 instead" ; w_call dxvk1022 ;;
+        dxvk123) w_warn "Calling dxvk123 is deprecated, please use dxvk1023 instead" ; w_call dxvk1023 ;;
+        dxvk130) w_warn "Calling dxvk130 is deprecated, please use dxvk1030 instead" ; w_call dxvk1030 ;;
+        dxvk131) w_warn "Calling dxvk131 is deprecated, please use dxvk1031 instead" ; w_call dxvk1031 ;;
+        dxvk132) w_warn "Calling dxvk132 is deprecated, please use dxvk1032 instead" ; w_call dxvk1032 ;;
+        dxvk133) w_warn "Calling dxvk133 is deprecated, please use dxvk1033 instead" ; w_call dxvk1033 ;;
+        dxvk134) w_warn "Calling dxvk134 is deprecated, please use dxvk1034 instead" ; w_call dxvk1034 ;;
+        dxvk140) w_warn "Calling dxvk140 is deprecated, please use dxvk1040 instead" ; w_call dxvk1040 ;;
+        dxvk141) w_warn "Calling dxvk141 is deprecated, please use dxvk1041 instead" ; w_call dxvk1041 ;;
+        dxvk142) w_warn "Calling dxvk142 is deprecated, please use dxvk1042 instead" ; w_call dxvk1042 ;;
+        dxvk143) w_warn "Calling dxvk143 is deprecated, please use dxvk1043 instead" ; w_call dxvk1043 ;;
+        dxvk144) w_warn "Calling dxvk144 is deprecated, please use dxvk1044 instead" ; w_call dxvk1044 ;;
+        dxvk145) w_warn "Calling dxvk145 is deprecated, please use dxvk1045 instead" ; w_call dxvk1045 ;;
+        dxvk146) w_warn "Calling dxvk146 is deprecated, please use dxvk1046 instead" ; w_call dxvk1046 ;;
+        dxvk150) w_warn "Calling dxvk150 is deprecated, please use dxvk1050 instead" ; w_call dxvk1050 ;;
+        dxvk151) w_warn "Calling dxvk151 is deprecated, please use dxvk1051 instead" ; w_call dxvk1051 ;;
+        dxvk152) w_warn "Calling dxvk152 is deprecated, please use dxvk1052 instead" ; w_call dxvk1052 ;;
+        dxvk153) w_warn "Calling dxvk153 is deprecated, please use dxvk1053 instead" ; w_call dxvk1053 ;;
+        dxvk154) w_warn "Calling dxvk154 is deprecated, please use dxvk1054 instead" ; w_call dxvk1054 ;;
+        dxvk155) w_warn "Calling dxvk155 is deprecated, please use dxvk1055 instead" ; w_call dxvk1055 ;;
+        dxvk160) w_warn "Calling dxvk160 is deprecated, please use dxvk1060 instead" ; w_call dxvk1060 ;;
+        dxvk161) w_warn "Calling dxvk161 is deprecated, please use dxvk1061 instead" ; w_call dxvk1061 ;;
+        dxvk170) w_warn "Calling dxvk170 is deprecated, please use dxvk1070 instead" ; w_call dxvk1070 ;;
+        dxvk171) w_warn "Calling dxvk171 is deprecated, please use dxvk1071 instead" ; w_call dxvk1071 ;;
+        dxvk172) w_warn "Calling dxvk172 is deprecated, please use dxvk1072 instead" ; w_call dxvk1072 ;;
+        dxvk173) w_warn "Calling dxvk173 is deprecated, please use dxvk1073 instead" ; w_call dxvk1073 ;;
+        dxvk180) w_warn "Calling dxvk180 is deprecated, please use dxvk1080 instead" ; w_call dxvk1080 ;;
+        dxvk181) w_warn "Calling dxvk181 is deprecated, please use dxvk1081 instead" ; w_call dxvk1081 ;;
+        dxvk190) w_warn "Calling dxvk190 is deprecated, please use dxvk1090 instead" ; w_call dxvk1090 ;;
+        dxvk191) w_warn "Calling dxvk191 is deprecated, please use dxvk1091 instead" ; w_call dxvk1091 ;;
+        dxvk192) w_warn "Calling dxvk192 is deprecated, please use dxvk1092 instead" ; w_call dxvk1092 ;;
+        dxvk193) w_warn "Calling dxvk193 is deprecated, please use dxvk1093 instead" ; w_call dxvk1093 ;;
+        dxvk194) w_warn "Calling dxvk194 is deprecated, please use dxvk1094 instead" ; w_call dxvk1094 ;;
+
         # art2kmin also comes with fm20.dll
         fm20) w_warn "Calling fm20 is deprecated, please use controlpad instead" ; w_call controlpad ;;
         fontsmooth-bgr) w_warn "Calling fontsmooth-bgr is deprecated, please use fontsmooth=bgr instead" ; w_call fontsmooth=bgr ;;