just import winetricks-20210206.tar with rpmgs script

winetricks/.github/FUNDING.yml

+github: austin987
+patreon: austin987

winetricks/Makefile

@@ -64,7 +64,7 @@ install:
 	$(INSTALL_DATA) src/winetricks.bash-completion $(DESTDIR)$(PREFIX)/share/bash-completion/completions/winetricks
 
 check:
-	echo 'This verifies that most DLL verbs, plus flash, install ok.'
+	echo 'This verifies that most DLL verbs install ok.'
 	echo 'It should take about an hour to run with a fast connection.'
 	echo 'If you want to test a particular version of wine, do e.g.'
 	echo 'export WINE=$$HOME/wine-git/wine first.'
@@ -102,7 +102,7 @@ shell-checks:
 	sh ./tests/shell-checks || exit 1
 
 test:
-	echo 'This verifies that most DLL verbs, plus flash and dotnet, install ok.'
+	echo 'This verifies that most DLL verbs install ok (and some other misc tests).'
 	echo 'It also makes sure that all URLs in winetricks work, so a fast uncapped internet connection is needed.'
 	echo 'It should take about an hour to run with a fast connection.'
 	echo 'If you want to test a particular version of wine, do e.g.'

winetricks/files/LATEST

-20201206
+20210206

winetricks/files/verbs/all.txt

@@ -41,7 +41,6 @@ openwatcom               Open Watcom C/C++ compiler (can compile win16 code!) (W
 protectionid             Protection ID (CDKiLLER & TippeX, 2016)
 psdk2003                 MS Platform SDK 2003 (Microsoft, 2003) [downloadable]
 psdkwin71                MS Windows 7.1 SDK (Microsoft, 2010) [downloadable]
-psdkwin7                 MS Windows 7 SDK (Microsoft, 2009) [downloadable]
 qqintl                   QQ International Instant Messenger 2.11 (Tencent, 2014) [downloadable]
 qq                       QQ 8.9.6(Chinese chat app) (Tencent, 2017) [downloadable]
 safari                   Safari (Apple, 2010) [downloadable]
@@ -71,10 +70,10 @@ stalker_pripyat_bench    S.T.A.L.K.E.R.: Call of Pripyat benchmark (GSC Game Wor
 unigine_heaven           Unigen Heaven 2.1 Benchmark (Unigen, 2010)
 wglgears                 wglgears (Clinton L. Jeffery, 2005) [downloadable]
 ===== dlls =====
-adobeair                 Adobe AIR (Adobe, 2018) [downloadable]
 allcodecs                All codecs (dirac, ffdshow, icodecs, cinepak, l3codecx, xvid) except wmp (various, 1995-2009) [downloadable]
 amstream                 MS amstream.dll (Microsoft, 2011) [downloadable]
-art2kmin                 MS Access 2007 runtime (Microsoft, 2007) [downloadable]
+art2k7min                MS Access 2007 runtime (Microsoft, 2007) [downloadable]
+art2kmin                 MS Access 2000 runtime (Microsoft, 2000) [downloadable]
 atmlib                   Adobe Type Manager (Adobe, 2009) [downloadable]
 avifil32                 MS avifil32 (Microsoft, 2004) [downloadable]
 binkw32                  RAD Game Tools binkw32.dll (RAD Game Tools, Inc., 2000) [downloadable]
@@ -88,6 +87,7 @@ comdlg32ocx              Common Dialog ActiveX Control for VB6 (Microsoft, 2012)
 crypt32                  MS crypt32 (Microsoft, 2004) [downloadable]
 d3dcompiler_42           MS d3dcompiler_42.dll (Microsoft, 2010) [downloadable]
 d3dcompiler_43           MS d3dcompiler_43.dll (Microsoft, 2010) [downloadable]
+d3dcompiler_46           MS d3dcompiler_46.dll (Microsoft, 2010) [downloadable]
 d3dcompiler_47           MS d3dcompiler_47.dll (Microsoft, FIXME) [downloadable]
 d3drm                    MS d3drm.dll (Microsoft, 2010) [downloadable]
 d3dx10_43                MS d3dx10_43.dll (Microsoft, 2010) [downloadable]
@@ -165,6 +165,8 @@ dotnet471                MS .NET 4.7.1 (Microsoft, 2017) [downloadable]
 dotnet472                MS .NET 4.7.2 (Microsoft, 2018) [downloadable]
 dotnet48                 MS .NET 4.8 (Microsoft, 2019) [downloadable]
 dotnetcore2              MS .NET Core Runtime 2.1 LTS (Microsoft, 2020) [downloadable]
+dotnetcore3              MS .NET Core Runtime 3.1 LTS (Microsoft, 2020) [downloadable]
+dotnetcoredesktop3       MS .NET Core Desktop Runtime 3.1 LTS (Microsoft, 2020) [downloadable]
 dotnet_verifier          MS .NET Verifier (Microsoft, 2016) [downloadable]
 dpvoice                  Microsoft dpvoice dpvvox dpvacm Audio dlls (Microsoft, 2002) [downloadable]
 dsdmo                    MS dsdmo.dll (Microsoft, 2010) [downloadable]
@@ -240,7 +242,6 @@ faudio1906               FAudio (xaudio reimplementation, with xna support) buil
 faudio                   FAudio (xaudio reimplementation, with xna support) builds for win32 (latest) (Kron4ek, 2019) [downloadable]
 ffdshow                  ffdshow video codecs (doom9 folks, 2010) [downloadable]
 filever                  Microsoft's filever, for dumping file version info (Microsoft, 20??) [downloadable]
-flash                    Flash Player 32 (Adobe, 2020) [downloadable]
 galliumnine02            Gallium Nine Standalone (v0.2) (Gallium Nine Team, 2019) [downloadable]
 galliumnine03            Gallium Nine Standalone (v0.3) (Gallium Nine Team, 2019) [downloadable]
 galliumnine04            Gallium Nine Standalone (v0.4) (Gallium Nine Team, 2019) [downloadable]
@@ -276,6 +277,7 @@ mfc120                   Visual C++ 2013 mfc120 library; part of vcrun2013 (Micr
 mfc140                   Visual C++ 2015 mfc140 library; part of vcrun2015 (Microsoft, 2015) [downloadable]
 mfc40                    MS mfc40 (Microsoft Foundation Classes from win7sp1) (Microsoft, 1999) [downloadable]
 mfc42                    Visual C++ 6 SP4 mfc42 library; part of vcrun6 (Microsoft, 2000) [downloadable]
+mfc70                    Visual Studio (.NET) 2002 mfc70 library (Microsoft, 2006) [downloadable]
 mfc71                    Visual C++ 2003 mfc71 library; part of vcrun2003 (Microsoft, 2003) [downloadable]
 mfc80                    Visual C++ 2005 mfc80 library; part of vcrun2005 (Microsoft, 2011) [downloadable]
 mfc90                    Visual C++ 2008 mfc90 library; part of vcrun2008 (Microsoft, 2011) [downloadable]
@@ -319,6 +321,7 @@ quicktime76              Apple QuickTime 7.6 (Apple, 2010) [downloadable]
 riched20                 MS RichEdit Control 2.0 (riched20.dll) (Microsoft, 2004) [downloadable]
 riched30                 MS RichEdit Control 3.0 (riched20.dll, msls31.dll) (Microsoft, 2001) [downloadable]
 richtx32                 MS Rich TextBox Control 6.0 (Microsoft, 2012) [downloadable]
+sapi                     MS Speech API (Microsoft, 2011) [downloadable]
 sdl                      Simple DirectMedia Layer (Sam Lantinga, 2012) [downloadable]
 secur32                  MS Security Support Provider Interface (Microsoft, 2011) [downloadable]
 setupapi                 MS Setup API (Microsoft, 2004) [downloadable]
@@ -340,8 +343,8 @@ vcrun2010                Visual C++ 2010 libraries (mfc100,msvcp100,msvcr100) (M
 vcrun2012                Visual C++ 2012 libraries (atl110,mfc110,mfc110u,msvcp110,msvcr110,vcomp110) (Microsoft, 2012) [downloadable]
 vcrun2013                Visual C++ 2013 libraries (mfc120,mfc120u,msvcp120,msvcr120,vcomp120) (Microsoft, 2013) [downloadable]
 vcrun2015                Visual C++ 2015 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll) (Microsoft, 2015) [downloadable]
-vcrun2017                Visual C++ 2017 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll) (Microsoft, 2017) [downloadable]
-vcrun2019                Visual C++ 2015-2019 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll) (and vcruntime140_1.dll on win64) (Microsoft, 2019) [downloadable]
+vcrun2017                Visual C++ 2017 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,msvcp140_1.dll,msvcp140_2.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll) (Microsoft, 2017) [downloadable]
+vcrun2019                Visual C++ 2015-2019 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,msvcp140_1,msvcp140_2,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll) (and vcruntime140_1.dll on win64) (Microsoft, 2019) [downloadable]
 vcrun6sp6                Visual C++ 6 SP6 libraries (with fixes in ATL and MFC) (Microsoft, 2004) [downloadable]
 vcrun6                   Visual C++ 6 SP4 libraries (mfc42, msvcp60, msvcirt) (Microsoft, 2000) [downloadable]
 vjrun20                  MS Visual J# 2.0 SE libraries (requires dotnet20) (Microsoft, 2007) [downloadable]
@@ -516,8 +519,6 @@ cfc=disable              Disable CheckFloatConstants (default)
 cfc=enabled              Enable CheckFloatConstants
 csmt=off                 Disable Command Stream Multithreading
 csmt=on                  Enable Command Stream Multithreading (default)
-ddr=gdi                  Set DirectDrawRenderer to gdi
-ddr=opengl               Set DirectDrawRenderer to opengl
 fontfix                  Check for broken fonts
 fontsmooth=bgr           Enable subpixel font smoothing for BGR LCDs
 fontsmooth=disable       Disable font smoothing
@@ -563,6 +564,10 @@ psm=1                    Set MaxShaderModelPS to 1
 psm=2                    Set MaxShaderModelPS to 2
 psm=3                    Set MaxShaderModelPS to 3
 remove_mono              Remove builtin wine-mono
+renderer=gdi             Set renderer to gdi
+renderer=gl              Set renderer to gl
+renderer=no3d            Set renderer to no3d
+renderer=vulkan          Set renderer to vulkan
 rtlm=auto                Set RenderTargetLockMode to auto (default)
 rtlm=disabled            Set RenderTargetLockMode to disabled
 rtlm=readdraw            Set RenderTargetLockMode to readdraw
@@ -577,8 +582,8 @@ sound=oss                Set sound driver to OSS
 sound=pulse              Set sound driver to PulseAudio
 strictdrawordering=disabled Disable StrictDrawOrdering (default)
 strictdrawordering=enabled Enable StrictDrawOrdering
-usetakefocus=disabled    Disable UseTakeFocus (default)
-usetakefocus=enabled     Enable UseTakeFocus
+usetakefocus=n           Disable UseTakeFocus (default)
+usetakefocus=y           Enable UseTakeFocus
 vd=1024x768              Enable virtual desktop, set size to 1024x768
 vd=1280x1024             Enable virtual desktop, set size to 1280x1024
 vd=1440x900              Enable virtual desktop, set size to 1440x900

winetricks/files/verbs/apps.txt

@@ -40,7 +40,6 @@ openwatcom               Open Watcom C/C++ compiler (can compile win16 code!) (W
 protectionid             Protection ID (CDKiLLER & TippeX, 2016)
 psdk2003                 MS Platform SDK 2003 (Microsoft, 2003) [downloadable]
 psdkwin71                MS Windows 7.1 SDK (Microsoft, 2010) [downloadable]
-psdkwin7                 MS Windows 7 SDK (Microsoft, 2009) [downloadable]
 qqintl                   QQ International Instant Messenger 2.11 (Tencent, 2014) [downloadable]
 qq                       QQ 8.9.6(Chinese chat app) (Tencent, 2017) [downloadable]
 safari                   Safari (Apple, 2010) [downloadable]

winetricks/files/verbs/dlls.txt

-adobeair                 Adobe AIR (Adobe, 2018) [downloadable]
 allcodecs                All codecs (dirac, ffdshow, icodecs, cinepak, l3codecx, xvid) except wmp (various, 1995-2009) [downloadable]
 amstream                 MS amstream.dll (Microsoft, 2011) [downloadable]
-art2kmin                 MS Access 2007 runtime (Microsoft, 2007) [downloadable]
+art2k7min                MS Access 2007 runtime (Microsoft, 2007) [downloadable]
+art2kmin                 MS Access 2000 runtime (Microsoft, 2000) [downloadable]
 atmlib                   Adobe Type Manager (Adobe, 2009) [downloadable]
 avifil32                 MS avifil32 (Microsoft, 2004) [downloadable]
 binkw32                  RAD Game Tools binkw32.dll (RAD Game Tools, Inc., 2000) [downloadable]
@@ -15,6 +15,7 @@ comdlg32ocx              Common Dialog ActiveX Control for VB6 (Microsoft, 2012)
 crypt32                  MS crypt32 (Microsoft, 2004) [downloadable]
 d3dcompiler_42           MS d3dcompiler_42.dll (Microsoft, 2010) [downloadable]
 d3dcompiler_43           MS d3dcompiler_43.dll (Microsoft, 2010) [downloadable]
+d3dcompiler_46           MS d3dcompiler_46.dll (Microsoft, 2010) [downloadable]
 d3dcompiler_47           MS d3dcompiler_47.dll (Microsoft, FIXME) [downloadable]
 d3drm                    MS d3drm.dll (Microsoft, 2010) [downloadable]
 d3dx10_43                MS d3dx10_43.dll (Microsoft, 2010) [downloadable]
@@ -92,6 +93,8 @@ dotnet471                MS .NET 4.7.1 (Microsoft, 2017) [downloadable]
 dotnet472                MS .NET 4.7.2 (Microsoft, 2018) [downloadable]
 dotnet48                 MS .NET 4.8 (Microsoft, 2019) [downloadable]
 dotnetcore2              MS .NET Core Runtime 2.1 LTS (Microsoft, 2020) [downloadable]
+dotnetcore3              MS .NET Core Runtime 3.1 LTS (Microsoft, 2020) [downloadable]
+dotnetcoredesktop3       MS .NET Core Desktop Runtime 3.1 LTS (Microsoft, 2020) [downloadable]
 dotnet_verifier          MS .NET Verifier (Microsoft, 2016) [downloadable]
 dpvoice                  Microsoft dpvoice dpvvox dpvacm Audio dlls (Microsoft, 2002) [downloadable]
 dsdmo                    MS dsdmo.dll (Microsoft, 2010) [downloadable]
@@ -167,7 +170,6 @@ faudio1906               FAudio (xaudio reimplementation, with xna support) buil
 faudio                   FAudio (xaudio reimplementation, with xna support) builds for win32 (latest) (Kron4ek, 2019) [downloadable]
 ffdshow                  ffdshow video codecs (doom9 folks, 2010) [downloadable]
 filever                  Microsoft's filever, for dumping file version info (Microsoft, 20??) [downloadable]
-flash                    Flash Player 32 (Adobe, 2020) [downloadable]
 galliumnine02            Gallium Nine Standalone (v0.2) (Gallium Nine Team, 2019) [downloadable]
 galliumnine03            Gallium Nine Standalone (v0.3) (Gallium Nine Team, 2019) [downloadable]
 galliumnine04            Gallium Nine Standalone (v0.4) (Gallium Nine Team, 2019) [downloadable]
@@ -203,6 +205,7 @@ mfc120                   Visual C++ 2013 mfc120 library; part of vcrun2013 (Micr
 mfc140                   Visual C++ 2015 mfc140 library; part of vcrun2015 (Microsoft, 2015) [downloadable]
 mfc40                    MS mfc40 (Microsoft Foundation Classes from win7sp1) (Microsoft, 1999) [downloadable]
 mfc42                    Visual C++ 6 SP4 mfc42 library; part of vcrun6 (Microsoft, 2000) [downloadable]
+mfc70                    Visual Studio (.NET) 2002 mfc70 library (Microsoft, 2006) [downloadable]
 mfc71                    Visual C++ 2003 mfc71 library; part of vcrun2003 (Microsoft, 2003) [downloadable]
 mfc80                    Visual C++ 2005 mfc80 library; part of vcrun2005 (Microsoft, 2011) [downloadable]
 mfc90                    Visual C++ 2008 mfc90 library; part of vcrun2008 (Microsoft, 2011) [downloadable]
@@ -246,6 +249,7 @@ quicktime76              Apple QuickTime 7.6 (Apple, 2010) [downloadable]
 riched20                 MS RichEdit Control 2.0 (riched20.dll) (Microsoft, 2004) [downloadable]
 riched30                 MS RichEdit Control 3.0 (riched20.dll, msls31.dll) (Microsoft, 2001) [downloadable]
 richtx32                 MS Rich TextBox Control 6.0 (Microsoft, 2012) [downloadable]
+sapi                     MS Speech API (Microsoft, 2011) [downloadable]
 sdl                      Simple DirectMedia Layer (Sam Lantinga, 2012) [downloadable]
 secur32                  MS Security Support Provider Interface (Microsoft, 2011) [downloadable]
 setupapi                 MS Setup API (Microsoft, 2004) [downloadable]
@@ -267,8 +271,8 @@ vcrun2010                Visual C++ 2010 libraries (mfc100,msvcp100,msvcr100) (M
 vcrun2012                Visual C++ 2012 libraries (atl110,mfc110,mfc110u,msvcp110,msvcr110,vcomp110) (Microsoft, 2012) [downloadable]
 vcrun2013                Visual C++ 2013 libraries (mfc120,mfc120u,msvcp120,msvcr120,vcomp120) (Microsoft, 2013) [downloadable]
 vcrun2015                Visual C++ 2015 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll) (Microsoft, 2015) [downloadable]
-vcrun2017                Visual C++ 2017 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll) (Microsoft, 2017) [downloadable]
-vcrun2019                Visual C++ 2015-2019 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll) (and vcruntime140_1.dll on win64) (Microsoft, 2019) [downloadable]
+vcrun2017                Visual C++ 2017 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,msvcp140_1.dll,msvcp140_2.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll) (Microsoft, 2017) [downloadable]
+vcrun2019                Visual C++ 2015-2019 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,msvcp140_1,msvcp140_2,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll) (and vcruntime140_1.dll on win64) (Microsoft, 2019) [downloadable]
 vcrun6sp6                Visual C++ 6 SP6 libraries (with fixes in ATL and MFC) (Microsoft, 2004) [downloadable]
 vcrun6                   Visual C++ 6 SP4 libraries (mfc42, msvcp60, msvcirt) (Microsoft, 2000) [downloadable]
 vjrun20                  MS Visual J# 2.0 SE libraries (requires dotnet20) (Microsoft, 2007) [downloadable]

winetricks/files/verbs/download.txt

@@ -3,7 +3,6 @@
 3dmark2001
 3m_library
 7zip
-adobeair
 adobe_diged
 adobe_diged4
 algodoo_demo
@@ -14,6 +13,7 @@ amstream
 andale
 aoe3_demo
 arial
+art2k7min
 art2kmin
 atmlib
 autohotkey
@@ -51,6 +51,7 @@ crayonphysics_demo
 crypt32
 d3dcompiler_42
 d3dcompiler_43
+d3dcompiler_46
 d3dcompiler_47
 d3drm
 d3dx10
@@ -130,6 +131,8 @@ dotnet471
 dotnet472
 dotnet48
 dotnetcore2
+dotnetcore3
+dotnetcoredesktop3
 dotnet_verifier
 dpvoice
 dragonage2_demo
@@ -215,7 +218,6 @@ ffdshow
 fifa11_demo
 filever
 firefox
-flash
 fontxplorer
 galliumnine
 galliumnine02
@@ -266,6 +268,7 @@ mfc120
 mfc140
 mfc40
 mfc42
+mfc70
 mfc71
 mfc80
 mfc90
@@ -316,7 +319,6 @@ pngfilt
 pptfonts
 prntvpt
 psdk2003
-psdkwin7
 psdkwin71
 python26
 python27
@@ -335,6 +337,7 @@ riched30
 richtx32
 ruse_demo_steam
 safari
+sapi
 sdl
 secondlife
 secur32

winetricks/files/verbs/settings.txt

@@ -9,8 +9,6 @@ cfc=disable              Disable CheckFloatConstants (default)
 cfc=enabled              Enable CheckFloatConstants
 csmt=off                 Disable Command Stream Multithreading
 csmt=on                  Enable Command Stream Multithreading (default)
-ddr=gdi                  Set DirectDrawRenderer to gdi
-ddr=opengl               Set DirectDrawRenderer to opengl
 fontfix                  Check for broken fonts
 fontsmooth=bgr           Enable subpixel font smoothing for BGR LCDs
 fontsmooth=disable       Disable font smoothing
@@ -56,6 +54,10 @@ psm=1                    Set MaxShaderModelPS to 1
 psm=2                    Set MaxShaderModelPS to 2
 psm=3                    Set MaxShaderModelPS to 3
 remove_mono              Remove builtin wine-mono
+renderer=gdi             Set renderer to gdi
+renderer=gl              Set renderer to gl
+renderer=no3d            Set renderer to no3d
+renderer=vulkan          Set renderer to vulkan
 rtlm=auto                Set RenderTargetLockMode to auto (default)
 rtlm=disabled            Set RenderTargetLockMode to disabled
 rtlm=readdraw            Set RenderTargetLockMode to readdraw
@@ -70,8 +72,8 @@ sound=oss                Set sound driver to OSS
 sound=pulse              Set sound driver to PulseAudio
 strictdrawordering=disabled Disable StrictDrawOrdering (default)
 strictdrawordering=enabled Enable StrictDrawOrdering
-usetakefocus=disabled    Disable UseTakeFocus (default)
-usetakefocus=enabled     Enable UseTakeFocus
+usetakefocus=n           Disable UseTakeFocus (default)
+usetakefocus=y           Enable UseTakeFocus
 vd=1024x768              Enable virtual desktop, set size to 1024x768
 vd=1280x1024             Enable virtual desktop, set size to 1280x1024
 vd=1440x900              Enable virtual desktop, set size to 1440x900

winetricks/src/release.sh

@@ -103,8 +103,7 @@ if [ ${nopush} = 1 ] ; then
     echo "--no-push used, not uploading signature file"
 else
     python3 src/github-api-releases.py  "${tmpdir}/${version}.tar.gz.asc" Winetricks winetricks "${version}"
+    rm -rf "${tmpdir}"
 fi
 
-rm -rf "${tmpdir}"
-
 exit 0

winetricks/src/winetricks

@@ -6,7 +6,7 @@
 
 # Name of this version of winetricks (YYYYMMDD)
 # (This doesn't change often, use the sha256sum of the file when reporting problems)
-WINETRICKS_VERSION=20201206
+WINETRICKS_VERSION=20210206
 
 # This is a UTF-8 file
 # You should see an o with two dots over it here [ö]
@@ -5500,10 +5500,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 < 4.0, warn user:
-    # 4.0 doesn't do what I thought it would
-    if w_wine_version_in ,3.99 ; then
-        w_warn "Your version of wine ${_wine_version_stripped} is no longer supported upstream. You should upgrade to 4.x"
+    # 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"
     fi
 
     winetricks_set_wineprefix "$1"
@@ -5755,7 +5755,8 @@ helper_directx_dl()
     # https://www.microsoft.com/en-us/download/details.aspx?id=9033
     # FIXME: none of the verbs that use this will show download status right
     # until file1 metadata is extended to handle common cache dir
-    w_download_to directx9 https://download.microsoft.com/download/E/E/1/EE17FF74-6C45-4575-9CF4-7FC2597ACD18/directx_feb2010_redist.exe f6d191e89a963d7cca34f169d30f49eab99c1ed3bb92da73ec43617caaa1e93f
+    # 2021/01/28: https://download.microsoft.com/download/E/E/1/EE17FF74-6C45-4575-9CF4-7FC2597ACD18/directx_feb2010_redist.exe
+    w_download_to directx9 https://files.holarse-linuxgaming.de/mirrors/microsoft/directx_feb2010_redist.exe f6d191e89a963d7cca34f169d30f49eab99c1ed3bb92da73ec43617caaa1e93f
 
     DIRECTX_NAME=directx_feb2010_redist.exe
 }
@@ -5765,7 +5766,8 @@ helper_directx_Jun2010()
 {
     # June 2010 DirectX 9c User Redistributable
     # https://www.microsoft.com/en-us/download/details.aspx?id=8109
-    w_download_to directx9 https://download.microsoft.com/download/8/4/A/84A35BF1-DAFE-4AE8-82AF-AD2AE20B6B14/directx_Jun2010_redist.exe
+    # 2021/01/28: https://download.microsoft.com/download/8/4/A/84A35BF1-DAFE-4AE8-82AF-AD2AE20B6B14/directx_Jun2010_redist.exe
+    w_download_to directx9 https://files.holarse-linuxgaming.de/mirrors/microsoft/directx_Jun2010_redist.exe 8746ee1a84a083a90e37899d71d50d5c7c015e69688a466aa80447f011780c0d
 
     DIRECTX_NAME=directx_Jun2010_redist.exe
 }
@@ -5817,7 +5819,8 @@ helper_win2ksp4()
     # Mirror list at http://www.filewatcher.com/m/w2ksp4_en.exe.135477136-0.html
     # This URL doesn't need rename from w2ksp4_en.exe to W2KSP4_EN.EXE
     # to avoid users having to redownload for a file rename
-    w_download_to win2ksp4 https://ftp.gnome.org/mirror/archive/ftp.sunet.se/pub/security/vendor/microsoft/win2000/Service_Packs/usa/W2KSP4_EN.EXE 167bb78d4adc957cc39fb4902517e1f32b1e62092353be5f8fb9ee647642de7e
+    # 2020/12/09: https://ftp.gnome.org/mirror/archive/ftp.sunet.se/pub/security/vendor/microsoft/win2000/Service_Packs/usa/W2KSP4_EN.EXE
+    w_download_to win2ksp4 http://x3270.bgp.nu/download/specials/W2KSP4_EN.EXE 167bb78d4adc957cc39fb4902517e1f32b1e62092353be5f8fb9ee647642de7e
     w_try_cabextract -d "${W_TMP}" -L -F "${filename}" "${W_CACHE}"/win2ksp4/W2KSP4_EN.EXE
 }
 
@@ -5827,7 +5830,7 @@ helper_winxpsp2_support_tools()
     filename="$1"
 
     # https://www.microsoft.com/en-us/download/details.aspx?id=18546
-    w_download_to winxpsp2_support_tools https://download.microsoft.com/download/d/3/8/d38066aa-4e37-4ae8-bce3-a4ce662b2024/WindowsXP-KB838079-SupportTools-ENU.exe 7927e87af616d2fb8d4ead0db0103eb845a4e6651b20a5bffea9eebc3035c24d
+    w_download_to winxpsp2_support_tools https://web.archive.org/web/20070104163903/https://download.microsoft.com/download/d/3/8/d38066aa-4e37-4ae8-bce3-a4ce662b2024/WindowsXP-KB838079-SupportTools-ENU.exe 7927e87af616d2fb8d4ead0db0103eb845a4e6651b20a5bffea9eebc3035c24d
 
     w_try_cabextract -d "${W_TMP}" -L -F support.cab "${W_CACHE}"/winxpsp2_support_tools/WindowsXP-KB838079-SupportTools-ENU.exe
     w_try_cabextract -d "${W_TMP}" -L -F "${filename}" "${W_TMP}"/support.cab
@@ -5850,7 +5853,8 @@ helper_winxpsp3()
     # https://download.microsoft.com/download/d/3/0/d30e32d8-418a-469d-b600-f32ce3edf42d/WindowsXP-KB936929-SP3-x86-ENU.exe
     # Mirror list: http://www.filewatcher.com/m/WindowsXP-KB936929-SP3-x86-ENU.exe.331805736-0.html
     # 2018/04/04: http://www.download.windowsupdate.com/msdownload/update/software/dflt/2008/04/windowsxp-kb936929-sp3-x86-enu_c81472f7eeea2eca421e116cd4c03e2300ebfde4.exe
-    w_download_to winxpsp3 https://ftp.gnome.org/mirror/archive/ftp.sunet.se/pub/security/vendor/microsoft/winxp/Service_Packs/WindowsXP-KB936929-SP3-x86-ENU.exe 62e524a552db9f6fd22d469010ea4d7e28ee06fa615a1c34362129f808916654
+    # 2020/12/09: https://ftp.gnome.org/mirror/archive/ftp.sunet.se/pub/security/vendor/microsoft/winxp/Service_Packs/WindowsXP-KB936929-SP3-x86-ENU.exe
+    w_download_to winxpsp3 http://www.download.windowsupdate.com/msdownload/update/software/dflt/2008/04/windowsxp-kb936929-sp3-x86-enu_c81472f7eeea2eca421e116cd4c03e2300ebfde4.exe 62e524a552db9f6fd22d469010ea4d7e28ee06fa615a1c34362129f808916654 WindowsXP-KB936929-SP3-x86-ENU.exe
 
     w_try_cabextract -d "${W_TMP}" -L -F "${filename}" "${W_CACHE}"/winxpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe
 }
@@ -5887,38 +5891,6 @@ helper_win7sp1_x64()
 
 #---------------------------------------------------------
 
-w_metadata adobeair dlls \
-    title="Adobe AIR" \
-    publisher="Adobe" \
-    year="2018" \
-    media="download" \
-    file1="AdobeAIRInstaller.exe" \
-    installed_file1="${W_COMMONFILES_X86_WIN}/Adobe AIR/Versions/1.0/Adobe AIR.dll" \
-    homepage="https://www.adobe.com/products/air/"
-
-load_adobeair()
-{
-    # 2017/03/14: 20.0.0.260 (strings 'Adobe AIR.dll' | grep 20\\. ) sha256sum 318770b9a18e59ca4a721a1f5c2b0235cffdbe77a043e99cb2af32074d61de45
-    # 2018/01/30: 28.0.0.127 (strings 'Adobe AIR.dll' | grep 28\\. ) sha256sum 9076489e273652089a4a53a1d38c6631e8b7477e39426a843e0273f25bfb109f
-    # 2018/03/16: 29.0.0.112 (strings 'Adobe AIR.dll' | grep -E "^29\..+\..+" ) sha256sum 5186b54682644a30f2be61c9b510de9a9a76e301bc1b42f0f1bc50bd809a3625
-    # 2018/06/08: 30.0.0.107 (strings 'Adobe AIR.dll' | grep -E "^30\..+\..+" ) sha256sum bcc36174f6f70baba27e5ed1c0df67e55c306ac7bc86b1d280eff4db8c314985
-    # 2018/09/12: 31.0.0.96 (strings 'Adobe AIR.dll' | grep -E "^31\..+\..+" ) sha256sum dc82421f135627802b21619bdb7e4b9b0ec16d351120485c575aa6c16cd2737e
-    # 2018/12/22: 32.0.0.89 (strings 'Adobe AIR.dll' | grep -E "^32\..+\..+" ) sha256sum 24532d41ef2588c0daac4b6f8b7f863ee3c1a1b1e90b2d8d8b3eb4faa657e5e3
-    # 2019/06/11: 32.0.0.125 (strings 'Adobe AIR.dll' | grep -E "^32\..+\..+" ) sha256sum 6718308e10a45176155d0ecc8458bd3606308925b91f26a7d08c148cf52c9db3
-    w_download https://airdownload.adobe.com/air/win/download/latest/AdobeAIRInstaller.exe 6718308e10a45176155d0ecc8458bd3606308925b91f26a7d08c148cf52c9db3
-    w_try_cd "${W_CACHE}/${W_PACKAGE}"
-
-    # See https://bugs.winehq.org/show_bug.cgi?id=43506
-    # and https://github.com/Winetricks/winetricks/issues/821
-    if w_workaround_wine_bug 43506 "Forcing quiet install"; then
-        w_try "${WINE}" AdobeAIRInstaller.exe -silent
-    else
-        w_try "${WINE}" AdobeAIRInstaller.exe ${W_OPT_UNATTENDED:+-silent}
-    fi
-}
-
-#----------------------------------------------------------------
-
 w_metadata amstream dlls \
     title="MS amstream.dll" \
     publisher="Microsoft" \
@@ -5946,6 +5918,22 @@ load_amstream()
 #----------------------------------------------------------------
 
 w_metadata art2kmin dlls \
+    title="MS Access 2000 runtime" \
+    publisher="Microsoft" \
+    year="2000" \
+    media="download" \
+    file1="art2kmin.exe" \
+    installed_file1="${W_COMMONFILES_X86_WIN}/Microsoft Shared/MSDesigners98/MDT2DBNS.DLL"
+
+load_art2kmin()
+{
+    w_download http://download.microsoft.com/download/office2000dev/art2kmin/1/win98/en-us/art2kmin.exe c6bf34dfac8d22b5d4ba8a4b14256dc25215f1ce769049c7f25c40850b5e5b81
+    w_try_7z "${W_TMP}" "${W_CACHE}/${W_PACKAGE}"/art2kmin.exe
+    w_try_cd "${W_TMP}"
+    w_try "${WINE}" Setup.exe INSTALLPFILES=1 /wait ${W_OPT_UNATTENDED:+/q}
+}
+
+w_metadata art2k7min dlls \
     title="MS Access 2007 runtime" \
     publisher="Microsoft" \
     year="2007" \
@@ -5953,7 +5941,7 @@ w_metadata art2kmin dlls \
     file1="AccessRuntime.exe" \
     installed_file1="${W_COMMONFILES_X86_WIN}/Microsoft Shared/OFFICE12/ACEES.DLL"
 
-load_art2kmin()
+load_art2k7min()
 {
     # See https://www.microsoft.com/en-us/download/details.aspx?id=4438
     # Originally at https://download.microsoft.com/download/D/2/A/D2A2FC8B-0447-491C-A5EF-E8AA3A74FB98/AccessRuntime.exe
@@ -6238,6 +6226,33 @@ load_d3dcompiler_43()
 
 #----------------------------------------------------------------
 
+w_metadata d3dcompiler_46 dlls \
+    title="MS d3dcompiler_46.dll" \
+    publisher="Microsoft" \
+    year="2010" \
+    media="download" \
+    file1="../directx9/directx_Jun2010_redist.exe" \
+    installed_file1="${W_SYSTEM32_DLLS_WIN}/d3dcompiler_46.dll"
+
+load_d3dcompiler_46()
+{
+    # See https://bugs.winehq.org/show_bug.cgi?id=50350#c13
+
+    w_download http://download.microsoft.com/download/F/1/3/F1300C9C-A120-4341-90DF-8A52509B23AC/standalonesdk/Installers/2630bae9681db6a9f6722366f47d055c.cab
+    w_try_cabextract -d "${W_TMP}" -L -F "fil47ed91e900f4b9d9659b66a211b57c39" "${W_CACHE}/${W_PACKAGE}/2630bae9681db6a9f6722366f47d055c.cab"
+    w_try mv "${W_TMP}/fil47ed91e900f4b9d9659b66a211b57c39" "${W_SYSTEM32_DLLS}/d3dcompiler_46.dll"
+
+    if [ "${W_ARCH}" = "win64" ]; then
+        w_download http://download.microsoft.com/download/F/1/3/F1300C9C-A120-4341-90DF-8A52509B23AC/standalonesdk/Installers/61d57a7a82309cd161a854a6f4619e52.cab
+        w_try_cabextract -d "${W_TMP}" -L -F "fil8c20206095817436f8df4a711faee5b7" "${W_CACHE}/${W_PACKAGE}/61d57a7a82309cd161a854a6f4619e52.cab"
+        w_try mv "${W_TMP}/fil8c20206095817436f8df4a711faee5b7" "${W_SYSTEM64_DLLS}/d3dcompiler_46.dll"
+    fi
+
+    w_override_dlls native d3dcompiler_46
+}
+
+#----------------------------------------------------------------
+
 w_metadata d3dcompiler_47 dlls \
     title="MS d3dcompiler_47.dll" \
     publisher="Microsoft" \
@@ -6907,16 +6922,19 @@ load_directplay()
     w_try_cabextract -d "${W_TMP}" -L -F dxnt.cab "${W_CACHE}"/directx9/${DIRECTX_NAME}
     w_try_cabextract -d "${W_SYSTEM32_DLLS}" -L -F 'dplaysvr.exe' "${W_TMP}/dxnt.cab"
     w_try_cabextract -d "${W_SYSTEM32_DLLS}" -L -F 'dplayx.dll' "${W_TMP}/dxnt.cab"
+    w_try_cabextract -d "${W_SYSTEM32_DLLS}" -L -F 'dpmodemx.dll' "${W_TMP}/dxnt.cab"
     w_try_cabextract -d "${W_SYSTEM32_DLLS}" -L -F 'dpnet.dll' "${W_TMP}/dxnt.cab"
     w_try_cabextract -d "${W_SYSTEM32_DLLS}" -L -F 'dpnhpast.dll' "${W_TMP}/dxnt.cab"
+    w_try_cabextract -d "${W_SYSTEM32_DLLS}" -L -F 'dpnhupnp.dll' "${W_TMP}/dxnt.cab"
     w_try_cabextract -d "${W_SYSTEM32_DLLS}" -L -F 'dpnsvr.exe' "${W_TMP}/dxnt.cab"
     w_try_cabextract -d "${W_SYSTEM32_DLLS}" -L -F 'dpwsockx.dll' "${W_TMP}/dxnt.cab"
 
-    w_override_dlls native dplayx dpnet dpnhpast dpnsvr.exe dpwsockx
+    w_override_dlls native dplaysvr.exe dplayx dpmodemx dpnet dpnhpast dpnhupnp dpnsvr.exe dpwsockx
 
     w_try_regsvr dplayx.dll
     w_try_regsvr dpnet.dll
     w_try_regsvr dpnhpast.dll
+    w_try_regsvr dpnhupnp.dll
 }
 
 #----------------------------------------------------------------
@@ -8389,7 +8407,7 @@ w_metadata dmusic32 dlls \
 
 load_dmusic32()
 {
-    w_download_to directx9 https://download.microsoft.com/download/3/9/7/3972f80c-5711-4e14-9483-959d48a2d03b/directx_apr2006_redist.exe dd8c3d401efe4561b67bd88475201b2f62f43cd23e4acc947bb34a659fa74952
+    w_download_to directx9 https://web.archive.org/web/20100920035904/https://download.microsoft.com/download/3/9/7/3972f80c-5711-4e14-9483-959d48a2d03b/directx_apr2006_redist.exe dd8c3d401efe4561b67bd88475201b2f62f43cd23e4acc947bb34a659fa74952
 
     w_try_cabextract -d "${W_TMP}" -F DirectX.cab "${W_CACHE}"/directx9/directx_apr2006_redist.exe
     w_try_cabextract -d "${W_SYSTEM32_DLLS}" -L -F dmusic32.dll "${W_TMP}"/DirectX.cab
@@ -8637,6 +8655,7 @@ load_dotnet11()
     fi
 
     w_override_dlls native mscorwks
+    w_override_dlls native fusion
 
     W_NGEN_CMD="w_try ${WINE} ${W_DRIVE_C}/windows/Microsoft.NET/Framework/v1.1.4322/ngen.exe executequeueditems"
 }
@@ -9085,7 +9104,7 @@ w_metadata dotnet30sp1 dlls \
     media="download" \
     conflicts="dotnet11 dotnet20sdk" \
     file1="NetFx30SP1_x86.exe" \
-    installed_file1="c:/windows/system32/XpsFilt.dll"    # we're cheating a bit here
+    installed_file1="c:/windows/dotnet30sp1.installed.workaround"
 
 load_dotnet30sp1()
 {
@@ -9098,7 +9117,11 @@ load_dotnet30sp1()
     # And a third way, but only with mingw enabled in wine-4.12.1 through wine-4.14
     w_package_broken_mingw  "https://bugs.winehq.org/show_bug.cgi?id=47484" 4.12.1 4.14
 
-    w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=49831" 5.17
+    # crashes on install:
+    w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=49831" 5.17 6.0
+
+    # XpsFilt.dll doesn't get installed (not sure what version exactly causes it, bug 49831 muddies things):
+    w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=50463" 5.17 6.0
 
     # FIXME: URL?
     w_download https://download.microsoft.com/download/8/F/E/8FEEE89D-9E4F-4BA3-993E-0FFEA8E21E1B/NetFx30SP1_x86.exe 3100df4d4db3965ead9520c887a534115cf6fc7ba100abde45226958b865695b
@@ -9123,7 +9146,6 @@ load_dotnet30sp1()
 
     w_set_winver winxp
 
-    w_try "${WINE}" msiexec /i "XPSEP XP and Server 2003 32 bit.msi" ${W_OPT_UNATTENDED:+/qb}
     "${WINE}" sc delete FontCache3.0.0.0
 
     w_try_ms_installer "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/q}
@@ -9133,6 +9155,9 @@ load_dotnet30sp1()
 
     # Doesn't install any ngen.exe
     # W_NGEN_CMD=""
+
+    # Do not rely on temporary files. As a workaround, touch a file instead so that we know it's been installed for list-installed
+    w_try touch "${W_WINDIR_UNIX}/dotnet30sp1.installed.workaround"
 }
 
 verify_dotnet30sp1()
@@ -9153,7 +9178,8 @@ w_metadata dotnet35 dlls \
 
 load_dotnet35()
 {
-    w_package_broken_win64 https://bugs.winehq.org/show_bug.cgi?id=49690 5.12
+    # actually, fixed in 6.0-rc2, but w_package_broken() doesn't handle rc versions well
+    w_package_broken_win64 https://bugs.winehq.org/show_bug.cgi?id=49690 5.12 6.0
 
     w_verify_cabextract_available
 
@@ -9668,6 +9694,56 @@ load_dotnetcore2()
 
 #----------------------------------------------------------------
 
+w_metadata dotnetcore3 dlls \
+    title="MS .NET Core Runtime 3.1 LTS" \
+    publisher="Microsoft" \
+    year="2020" \
+    media="download" \
+    file1="dotnet-runtime-3.1.10-win-x86.exe" \
+    installed_file1="${W_PROGRAMS_WIN}/dotnet/dotnet.exe"
+
+load_dotnetcore3()
+{
+    # Official version, see https://dotnet.microsoft.com/download/dotnet-core/3.1
+    w_download https://download.visualstudio.microsoft.com/download/pr/abb3fb5d-4e82-4ca8-bc03-ac13e988e608/b34036773a72b30c5dc5520ee6a2768f/dotnet-runtime-3.1.10-win-x86.exe 6ae8d2fb7a23ac4770fa815bc27614b2db0e89f5c078eb2744771bf5541cdba3
+
+    w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
+    w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/quiet}
+
+    if [ "${W_ARCH}" = "win64" ]; then
+        # Also install the 64-bit version
+        w_download https://download.visualstudio.microsoft.com/download/pr/9845b4b0-fb52-48b6-83cf-4c431558c29b/41025de7a76639eeff102410e7015214/dotnet-runtime-3.1.10-win-x64.exe 78ef39c732ec35e79a0c1a10010ea797733df2811d774709b0fde23dce02efdf
+        w_try "${WINE}" "dotnet-runtime-3.1.10-win-x64.exe" ${W_OPT_UNATTENDED:+/quiet}
+    fi
+}
+
+#----------------------------------------------------------------
+
+w_metadata dotnetcoredesktop3 dlls \
+    title="MS .NET Core Desktop Runtime 3.1 LTS" \
+    publisher="Microsoft" \
+    year="2020" \
+    media="download" \
+    file1="windowsdesktop-runtime-3.1.10-win-x86.exe" \
+    installed_file1="${W_PROGRAMS_WIN}/dotnet/dotnet.exe"
+
+load_dotnetcoredesktop3()
+{
+    # Official version, see https://dotnet.microsoft.com/download/dotnet-core/3.1
+    w_download https://download.visualstudio.microsoft.com/download/pr/865d0be5-16e2-4b3d-a990-f4c45acd280c/ec867d0a4793c0b180bae85bc3a4f329/windowsdesktop-runtime-3.1.10-win-x86.exe 4da245d9048642ed3f25c04e8fa0156e1d2966b4d257c12a9a3d3a0c929102aa
+
+    w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
+    w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/quiet}
+
+    if [ "${W_ARCH}" = "win64" ]; then
+        # Also install the 64-bit version
+        w_download https://download.visualstudio.microsoft.com/download/pr/513acf37-8da2-497d-bdaa-84d6e33c1fee/eb7b010350df712c752f4ec4b615f89d/windowsdesktop-runtime-3.1.10-win-x64.exe 32286b9a35d9a53d28807ef761f3dba43b71e602efd2b794f843fcf5ea8438a9
+        w_try "${WINE}" "windowsdesktop-runtime-3.1.10-win-x64.exe" ${W_OPT_UNATTENDED:+/quiet}
+    fi
+}
+
+#----------------------------------------------------------------
+
 w_metadata dotnet_verifier dlls \
     title="MS .NET Verifier" \
     publisher="Microsoft" \
@@ -9986,88 +10062,6 @@ load_filever()
 
 #----------------------------------------------------------------
 
-# FIXME: update winetricks_is_installed to look at installed_file2..n
-# https://github.com/Winetricks/winetricks/issues/988
-w_metadata flash dlls \
-    title="Flash Player 32" \
-    publisher="Adobe" \
-    year="2020" \
-    media="download" \
-    file1="fp_32.0.0.363_archive.zip" \
-    installed_file1="${W_SYSTEM32_DLLS_WIN}/Macromed/Flash/FlashUtil32_32_0_0_363_Plugin.exe" \
-    installed_file2="${W_SYSTEM32_DLLS_WIN}/Macromed/Flash/FlashUtil32_32_0_0_363_ActiveX.exe" \
-    installed_file3="${W_SYSTEM32_DLLS_WIN}/Macromed/Flash/flashplayer32_0r0_363_win_sa.exe" \
-    homepage="https://www.adobe.com/products/flashplayer/"
-
-load_flash()
-{
-    _W_ver_major=32
-    _W_ver_minor=0
-    _W_ver_rel=0
-    _W_ver_build=363
-    _W_dirname="${_W_ver_major}_${_W_ver_minor}_r${_W_ver_rel}_${_W_ver_build}"
-    _W_archive="fp_${_W_ver_major}.${_W_ver_minor}.${_W_ver_rel}.${_W_ver_build}_archive.zip"
-    _W_fileprefix="flashplayer${_W_ver_major}_${_W_ver_minor}r${_W_ver_rel}_${_W_ver_build}"
-
-    # 2013/07/09: Adobe Flash 10 is no longer supported.
-    # 2013/06/24: Adobe Flash 10.3 won't even install for me, it tells you to go get a newer version!
-    # See
-    # https://blogs.adobe.com/psirt/
-    # https://get.adobe.com/de/flashplayer/otherversions/
-    # Now, we install older versions by using zipfiles at
-    # https://helpx.adobe.com/flash-player/kb/archived-flash-player-versions.html
-
-    # 2018/06/24: d4b6f9a5e42cc9f2c7cbd1fd72059d4c1bead91b076afa2ca042d28f0fd7bedb
-    # 2020/05/24  a64230033de485f9454a07cdb1b366e1307d005223657086ab8a0b8b91610ed4
-    w_linkcheck_ignore=1 w_download "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/${_W_archive}" a64230033de485f9454a07cdb1b366e1307d005223657086ab8a0b8b91610ed4
-
-    # If OS version is Vista or newer:
-    #   1. NPAPI plugin doesn't work
-    #   2. In win64 prefix, "File not found." dialog appears when installing:
-    #      'wine: cannot find L"C:\\windows\\system32\\Macromed\\Temp\\{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}\\InstallFlashPlayer.exe"'
-    w_set_winver winxp
-
-    # ActiveX plugin
-    # 2014/10/02: 3958827058648cfe05fc6ee510685e8d93f995d3428c3eedbd6814704765672a
-    w_try_unzip "${W_TMP}" "${W_CACHE}/flash/${_W_archive}" "${_W_dirname}/${_W_fileprefix}_winax.exe"
-    w_try_cd "${W_TMP}/${_W_dirname}"
-    w_try "${WINE}" "${_W_fileprefix}_winax.exe" ${W_OPT_UNATTENDED:+ /install}
-
-    # Mozilla / Firefox (NPAPI) plugin
-    # 2014/10/02: 17496fd3c863c180aead953d7d4499dd36f997a9570abc2b92f55e4ea1d55d73
-    w_try_unzip "${W_TMP}" "${W_CACHE}/flash/${_W_archive}" "${_W_dirname}/${_W_fileprefix}_win.exe"
-    w_try "${WINE}" "${_W_fileprefix}_win.exe" ${W_OPT_UNATTENDED:+ /install}
-
-    # Projector (standalone player)
-    # 2015/07/06: 8640c42e73dc44125045e17abd32412c48f3808a8393c94fc8281cf4b0d87bdc
-    w_try_unzip "${W_TMP}" "${W_CACHE}/flash/${_W_archive}" "${_W_dirname}/${_W_fileprefix}_win_sa.exe"
-    w_try mv "${_W_fileprefix}_win_sa.exe" "${W_SYSTEM32_DLLS}/Macromed/Flash"
-
-    # After updating the above, you should carry the following steps out by
-    # hand to verify that plugin works.
-
-    #    rm -rf ~/.cache/winetricks/flash
-    #    w_try_cd ~/winetricks/src
-    #    rm -rf ~/.wine
-    #    sh winetricks -q flash ie7
-    #    cd "~/.wine/drive_c/Program Files/Internet Explorer"
-    #    wine iexplore.exe https://www.adobe.com/software/flash/about
-    # Verify that the version of Flash shows up and that you're not prompted
-    # to install Flash again
-    #
-    #    w_try_cd ~/winetricks/src
-    #    rm -rf ~/.wine
-    #    sh winetricks -q flash firefox
-    #    cd "~/.wine/drive_c/Program Files/Mozilla Firefox"
-    #    wine firefox.exe https://www.adobe.com/software/flash/about
-    # Verify that the version of Flash shows up and that you're not prompted
-    # to install Flash again
-
-    unset _W_ver_major _W_ver_minor _W_ver_rel _W_ver_build _W_dirname _W_archive _W_fileprefix
-}
-
-#----------------------------------------------------------------
-
 # $1 - gallium nine standalone archive name (required)
 helper_galliumnine()
 {
@@ -10312,7 +10306,7 @@ load_gfw()
 {
     # https://www.microsoft.com/games/en-us/live/pages/livejoin.aspx
     # http://www.next-gen.biz/features/should-games-for-windows-live-die
-    w_download https://download.microsoft.com/download/5/5/8/55846E20-4A46-4EF8-B272-7F988BC9090A/gfwlivesetupmin.exe b14609508e2f8dba0886ded84e2817ad532ebfa31f8a6d4be2e6a5a03a9d7c23
+    w_download https://web.archive.org/web/20140730232216/https://download.microsoft.com/download/5/5/8/55846E20-4A46-4EF8-B272-7F988BC9090A/gfwlivesetupmin.exe b14609508e2f8dba0886ded84e2817ad532ebfa31f8a6d4be2e6a5a03a9d7c23
 
     # FIXME: Depends on .NET 20, but is it really needed? For now, skip it.
     w_try_cd "${W_CACHE}/${W_PACKAGE}"
@@ -10353,7 +10347,7 @@ w_metadata gmdls dlls \
 
 load_gmdls()
 {
-    w_download_to directx9 https://download.microsoft.com/download/3/9/7/3972f80c-5711-4e14-9483-959d48a2d03b/directx_apr2006_redist.exe dd8c3d401efe4561b67bd88475201b2f62f43cd23e4acc947bb34a659fa74952
+    w_download_to directx9 https://web.archive.org/web/20100920035904/https://download.microsoft.com/download/3/9/7/3972f80c-5711-4e14-9483-959d48a2d03b/directx_apr2006_redist.exe dd8c3d401efe4561b67bd88475201b2f62f43cd23e4acc947bb34a659fa74952
 
     w_try_cabextract -d "${W_TMP}" -F DirectX.cab "${W_CACHE}"/directx9/directx_apr2006_redist.exe
     w_try_cabextract -d "${W_TMP}" -F gm16.dls "${W_TMP}"/DirectX.cab
@@ -10611,7 +10605,7 @@ w_metadata itircl dlls \
 load_itircl()
 {
     # https://msdn.microsoft.com/en-us/library/windows/desktop/ms669985(v=vs.85).aspx
-    w_download_to hhw https://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe b2b3140d42a818870c1ab13c1c7b8d4536f22bd994fa90aade89729a6009a3ae
+    w_download_to hhw https://web.archive.org/web/20160423015142if_/http://download.microsoft.com/download/0/a/9/0a939ef6-e31c-430f-a3df-dfae7960d564/htmlhelp.exe b2b3140d42a818870c1ab13c1c7b8d4536f22bd994fa90aade89729a6009a3ae
 
     w_try_cabextract -d "${W_TMP}" -F hhupd.exe "${W_CACHE}"/hhw/htmlhelp.exe
     w_try_cabextract -d "${W_SYSTEM32_DLLS}" -F itircl.dll "${W_TMP}"/hhupd.exe
@@ -10632,7 +10626,7 @@ w_metadata itss dlls \
 load_itss()
 {
     # https://msdn.microsoft.com/en-us/library/windows/desktop/ms669985(v=vs.85).aspx
-    w_download_to hhw https://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe b2b3140d42a818870c1ab13c1c7b8d4536f22bd994fa90aade89729a6009a3ae
+    w_download_to hhw https://web.archive.org/web/20160423015142if_/http://download.microsoft.com/download/0/a/9/0a939ef6-e31c-430f-a3df-dfae7960d564/htmlhelp.exe b2b3140d42a818870c1ab13c1c7b8d4536f22bd994fa90aade89729a6009a3ae
 
     w_try_cabextract -d "${W_TMP}" -F hhupd.exe "${W_CACHE}"/hhw/htmlhelp.exe
     w_try_cabextract -d "${W_SYSTEM32_DLLS}" -F itss.dll "${W_TMP}"/hhupd.exe
@@ -10829,7 +10823,7 @@ load_mdac28()
     w_package_unsupported_win64
 
     # https://www.microsoft.com/en-us/download/details.aspx?id=5793
-    w_download https://download.microsoft.com/download/4/a/a/4aafff19-9d21-4d35-ae81-02c48dcbbbff/MDAC_TYP.EXE 157ebae46932cb9047b58aa849ac1885e8cbd2f218810cb83e57613b49c679d6
+    w_download https://web.archive.org/web/20070127061938/https://download.microsoft.com/download/4/a/a/4aafff19-9d21-4d35-ae81-02c48dcbbbff/MDAC_TYP.EXE 157ebae46932cb9047b58aa849ac1885e8cbd2f218810cb83e57613b49c679d6
     load_native_mdac
     w_set_winver nt40
     w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
@@ -10961,6 +10955,26 @@ load_mfc40()
 
 #----------------------------------------------------------------
 
+w_metadata mfc70 dlls \
+    title="Visual Studio (.NET) 2002 mfc70 library" \
+    publisher="Microsoft" \
+    year="2006" \
+    media="download" \
+    file1="VS7.0sp1-KB924642-X86.exe" \
+    installed_file1="${W_SYSTEM32_DLLS_WIN}/mfc70.dll"
+
+load_mfc70()
+{
+    w_download https://download.microsoft.com/download/6/b/e/6be11d8a-e0c7-429c-ac8c-9860e313ced9/VS7.0sp1-KB924642-X86.exe 7173a950169a58c56d7174811a7cd50e6092046f1f083db9d2b03315347fc0f4
+
+    w_try_cabextract --directory="${W_TMP}" "${W_CACHE}/${W_PACKAGE}/${file1}" -F '*mfc*'
+
+    w_try cp "${W_TMP}"/FL_mfc70_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8 "${W_SYSTEM32_DLLS}"/mfc70.dll
+    w_try cp "${W_TMP}"/FL_mfc70u_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8 "${W_SYSTEM32_DLLS}"/mfc70u.dll
+}
+
+#----------------------------------------------------------------
+
 w_metadata msacm32 dlls \
     title="MS ACM32" \
     publisher="Microsoft" \
@@ -11851,6 +11865,38 @@ load_richtx32()
 
 #----------------------------------------------------------------
 
+w_metadata sapi dlls \
+    title="MS Speech API" \
+    publisher="Microsoft" \
+    year="2011" \
+    media="download" \
+    conflicts="speechsdk" \
+    file1="../win7sp1/windows6.1-KB976932-X86.exe" \
+    installed_file1="${W_SYSTEM32_DLLS_WIN}/sapi.dll"
+
+load_sapi()
+{
+    # This version of native SAPI needs to be directly in system32/syswow64
+    for stub in "${W_SYSTEM32_DLLS}/Speech" "${W_SYSTEM64_DLLS}/Speech"; do
+        if [ -d "${stub}" ]; then
+            w_try rm -rf "${stub}"
+        fi
+    done
+
+    helper_win7sp1 x86_microsoft-windows-speechcommon_31bf3856ad364e35_6.1.7601.17514_none_d809b28230ecfe46/sapi.dll
+    w_try cp "${W_TMP}/x86_microsoft-windows-speechcommon_31bf3856ad364e35_6.1.7601.17514_none_d809b28230ecfe46/sapi.dll" "${W_SYSTEM32_DLLS}/sapi.dll"
+    w_override_dlls native sapi
+    w_try_regsvr sapi.dll
+
+    if [ "${W_ARCH}" = "win64" ]; then
+        helper_win7sp1_x64 amd64_microsoft-windows-speechcommon_31bf3856ad364e35_6.1.7601.17514_none_34284e05e94a6f7c/sapi.dll
+        w_try cp "${W_TMP}/amd64_microsoft-windows-speechcommon_31bf3856ad364e35_6.1.7601.17514_none_34284e05e94a6f7c/sapi.dll" "${W_SYSTEM64_DLLS}/sapi.dll"
+        w_try_regsvr64 sapi.dll
+    fi
+}
+
+#----------------------------------------------------------------
+
 w_metadata sdl dlls \
     title="Simple DirectMedia Layer" \
     publisher="Sam Lantinga" \
@@ -11943,6 +11989,7 @@ w_metadata speechsdk dlls \
     publisher="Microsoft" \
     year="2009" \
     media="download" \
+    conflicts="sapi" \
     file1="SpeechSDK51.exe" \
     installed_file1="${W_PROGRAMS_X86_WIN}/Microsoft Speech SDK 5.1/Bin/SAPI51SampleApp.exe"
 
@@ -11951,7 +11998,7 @@ load_speechsdk()
     w_package_unsupported_win64
 
     # https://www.microsoft.com/en-us/download/details.aspx?id=10121
-    w_download https://download.microsoft.com/download/B/4/3/B4314928-7B71-4336-9DE7-6FA4CF00B7B3/SpeechSDK51.exe 520aa5d1a72dc6f41dc9b8b88603228ffd5d5d6f696224fc237ec4828fe7f6e0
+    w_download https://web.archive.org/web/20110805062427/https://download.microsoft.com/download/B/4/3/B4314928-7B71-4336-9DE7-6FA4CF00B7B3/SpeechSDK51.exe 520aa5d1a72dc6f41dc9b8b88603228ffd5d5d6f696224fc237ec4828fe7f6e0
 
     w_try_unzip "${W_TMP}" "${W_CACHE}"/speechsdk/SpeechSDK51.exe
 
@@ -12685,25 +12732,28 @@ load_vcrun2015()
     # 2015/10/12: fdd1e1f0dcae2d0aa0720895eff33b927d13076e64464bb7c7e5843b7667cd14
     w_download https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe fdd1e1f0dcae2d0aa0720895eff33b927d13076e64464bb7c7e5843b7667cd14
 
-    if w_workaround_wine_bug 37781 "This may fail in non-XP mode, see https://bugs.winehq.org/show_bug.cgi?id=37781" ,4.15; then
-        :
-    fi
-
-    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 msvcr140 ucrtbase vcomp140 vcruntime140
+    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 msvcr140 ucrtbase vcomp140 vcruntime140
 
+    # Otherwise ucrtbase doesn't get replaced
+    # See https://bugs.winehq.org/show_bug.cgi?id=46317
     w_set_winver winxp
+    w_try rm -f "${W_SYSTEM32_DLLS}"/ucrtbase.dll
 
     w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
     w_try "${WINE}" vc_redist.x86.exe ${W_OPT_UNATTENDED:+/q}
 
     case "${W_ARCH}" in
         win64)
+            # Also remove the 64-bit version
+            w_try rm -f "${W_SYSTEM64_DLLS}"/ucrtbase.dll
             # 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
             w_try "${WINE}" vc_redist.x64.exe ${W_OPT_UNATTENDED:+/q}
             ;;
     esac
+
+    w_set_winver 'default'
 }
 
 w_metadata mfc140 dlls \
@@ -12742,7 +12792,7 @@ load_mfc140()
 #----------------------------------------------------------------
 
 w_metadata vcrun2017 dlls \
-    title="Visual C++ 2017 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll)" \
+    title="Visual C++ 2017 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,msvcp140_1.dll,msvcp140_2.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll)" \
     publisher="Microsoft" \
     year="2017" \
     media="download" \
@@ -12758,19 +12808,20 @@ load_vcrun2017()
     # 2019/08/14: 54ad46ae80984aa48cae6361213692c96b3639e322730d28c7fb93b183c761da
     w_download https://aka.ms/vs/15/release/vc_redist.x86.exe 54ad46ae80984aa48cae6361213692c96b3639e322730d28c7fb93b183c761da
 
-    if w_workaround_wine_bug 37781 "This may fail in non-XP mode, see https://bugs.winehq.org/show_bug.cgi?id=37781" ,4.15; then
-        :
-    fi
-
-    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 msvcr140 ucrtbase vcomp140 vcruntime140
+    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 msvcr140 ucrtbase vcomp140 vcruntime140
 
+    # Otherwise ucrtbase doesn't get replaced
+    # See https://bugs.winehq.org/show_bug.cgi?id=46317
     w_set_winver winxp
+    w_try rm -f "${W_SYSTEM32_DLLS}"/ucrtbase.dll
 
     w_try_cd "${W_CACHE}/${W_PACKAGE}"
     w_try "${WINE}" vc_redist.x86.exe ${W_OPT_UNATTENDED:+/q}
 
     case "${W_ARCH}" in
         win64)
+            # Also remove the 64-bit version
+            w_try rm -f "${W_SYSTEM64_DLLS}"/ucrtbase.dll
             # Also install the 64-bit version
             # https://support.microsoft.com/en-gb/help/2977003/the-latest-supported-visual-c-downloads
             # 2017/10/02: 7434bf559290cccc3dd3624f10c9e6422cce9927d2231d294114b2f929f0e465
@@ -12780,12 +12831,14 @@ load_vcrun2017()
             w_try "${WINE}" vc_redist.x64.exe ${W_OPT_UNATTENDED:+/q}
             ;;
     esac
+
+    w_set_winver 'default'
 }
 
 #----------------------------------------------------------------
 
 w_metadata vcrun2019 dlls \
-    title="Visual C++ 2015-2019 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll) (and vcruntime140_1.dll on win64)" \
+    title="Visual C++ 2015-2019 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,msvcp140_1,msvcp140_2,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll) (and vcruntime140_1.dll on win64)" \
     publisher="Microsoft" \
     year="2019" \
     media="download" \
@@ -12804,13 +12857,20 @@ load_vcrun2019()
     # 2020/11/13: 50a3e92ade4c2d8f310a2812d46322459104039b9deadbd7fdd483b5c697c0c8
     w_download https://aka.ms/vs/16/release/vc_redist.x86.exe 50a3e92ade4c2d8f310a2812d46322459104039b9deadbd7fdd483b5c697c0c8
 
-    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 msvcr140 ucrtbase vcomp140 vcruntime140
+    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 msvcr140 ucrtbase vcomp140 vcruntime140
+
+    # Otherwise ucrtbase doesn't get replaced
+    # See https://bugs.winehq.org/show_bug.cgi?id=46317
+    w_set_winver winxp
+    w_try rm -f "${W_SYSTEM32_DLLS}"/ucrtbase.dll
 
     w_try_cd "${W_CACHE}"/"${W_PACKAGE}"
     w_try "${WINE}" vc_redist.x86.exe ${W_OPT_UNATTENDED:+/q}
 
     case "${W_ARCH}" in
         win64)
+            # Also remove the 64-bit version
+            w_try rm -f "${W_SYSTEM64_DLLS}"/ucrtbase.dll
             # Also install the 64-bit version
             # 2019/12/26: 40ea2955391c9eae3e35619c4c24b5aaf3d17aeaa6d09424ee9672aa9372aeed
             # 2020/03/23: b6c82087a2c443db859fdbeaae7f46244d06c3f2a7f71c35e50358066253de52
@@ -12826,6 +12886,8 @@ load_vcrun2019()
             w_try "${WINE}" vc_redist.x64.exe ${W_OPT_UNATTENDED:+/q}
             ;;
     esac
+
+    w_set_winver 'default'
 }
 
 #----------------------------------------------------------------
@@ -13046,11 +13108,11 @@ load_windowscodecs()
     # Separate 32/64-bit installers:
     if [ "${W_ARCH}" = "win32" ] ; then
         # https://www.microsoft.com/en-us/download/details.aspx?id=32
-        w_download https://download.microsoft.com/download/f/f/1/ff178bb1-da91-48ed-89e5-478a99387d4f/wic_x86_enu.exe 196868b09d87ae04e4ab42b4a3e0abbb160500e8ff13deb38e2956ee854868b1
+        w_download https://web.archive.org/web/20200810071051if_/https://download.microsoft.com/download/f/f/1/ff178bb1-da91-48ed-89e5-478a99387d4f/wic_x86_enu.exe 196868b09d87ae04e4ab42b4a3e0abbb160500e8ff13deb38e2956ee854868b1
         EXE="wic_x86_enu.exe"
     elif [ "${W_ARCH}" = "win64" ] ; then
         # https://www.microsoft.com/en-us/download/details.aspx?id=1385
-        w_download https://download.microsoft.com/download/6/4/5/645FED5F-A6E7-44D9-9D10-FE83348796B0/wic_x64_enu.exe 5822fecd69a90c2833965a25e8779000825d69cc8c9250933f0ab70df52171e1
+        w_download https://web.archive.org/web/20191125095535if_/http://download.microsoft.com/download/6/4/5/645fed5f-a6e7-44d9-9d10-fe83348796b0/wic_x64_enu.exe 5822fecd69a90c2833965a25e8779000825d69cc8c9250933f0ab70df52171e1
         EXE="wic_x64_enu.exe"
     else
         w_die "Invalid W_ARCH value, ${W_ARCH}"
@@ -13411,7 +13473,7 @@ load_xna40()
     fi
 
     # https://www.microsoft.com/en-us/download/details.aspx?id=20914
-    w_download https://download.microsoft.com/download/A/C/2/AC2C903B-E6E8-42C2-9FD7-BEBAC362A930/xnafx40_redist.msi e6c41d692ebcba854dad4b1c52bb7ddd05926bad3105595d6596b8bab01c25e7
+    w_download https://web.archive.org/web/20120325002813/https://download.microsoft.com/download/A/C/2/AC2C903B-E6E8-42C2-9FD7-BEBAC362A930/xnafx40_redist.msi e6c41d692ebcba854dad4b1c52bb7ddd05926bad3105595d6596b8bab01c25e7
     w_try_cd "${W_CACHE}/${W_PACKAGE}"
     w_try "${WINE}" msiexec ${W_OPT_UNATTENDED:+/quiet} /i "${file1}"
 }
@@ -14840,7 +14902,7 @@ load_hhw()
     w_call mfc40
 
     # https://msdn.microsoft.com/en-us/library/windows/desktop/ms669985(v=vs.85).aspx
-    w_download https://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe b2b3140d42a818870c1ab13c1c7b8d4536f22bd994fa90aade89729a6009a3ae
+    w_download https://web.archive.org/web/20160423015142if_/http://download.microsoft.com/download/0/a/9/0a939ef6-e31c-430f-a3df-dfae7960d564/htmlhelp.exe b2b3140d42a818870c1ab13c1c7b8d4536f22bd994fa90aade89729a6009a3ae
 
     # htmlhelp.exe automatically runs hhupd.exe. It shows a dialog that says
     # "This computer already has a newer version of HTML Help."
@@ -15911,48 +15973,6 @@ load_psdk2003()
 
 #----------------------------------------------------------------
 
-w_metadata psdkwin7 apps \
-    title="MS Windows 7 SDK" \
-    publisher="Microsoft" \
-    year="2009" \
-    media="download" \
-    file1="winsdk_web.exe" \
-    installed_exe1="C:/Program Files/Microsoft SDKs/Windows/v7.0/Bin/SetEnv.Cmd"
-
-load_psdkwin7()
-{
-    # https://www.microsoft.com/en-us/download/details.aspx?id=3138
-    w_call dotnet20
-    w_call mfc42   # need mfc42u, or setup will abort
-    # don't have a working unattended recipe.  Maybe we'll have to
-    # do an AutoHotKey script until Microsoft gets its act together:
-    # https://social.msdn.microsoft.com/Forums/windowsdesktop/en-US/c053b616-7d5b-405d-9841-ec465a8e21d5/
-    w_download https://download.microsoft.com/download/7/A/B/7ABD2203-C472-4036-8BA0-E505528CCCB7/winsdk_web.exe bb0e3b5d8feb750b3164b657a046f76ff086887719e418f57ce88ada5e8990d5
-    w_try_cd "${W_CACHE}/${W_PACKAGE}"
-    w_try "${WINE}" winsdk_web.exe
-
-    if w_workaround_wine_bug 21362; then
-        # Assume user installed in default location
-        cat > "${W_TMP}"/set-psdk7.reg <<_EOF_
-REGEDIT4
-
-[HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Microsoft SDKs]
-
-[HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Microsoft SDKs\\Windows]
-"CurrentVersion"="v7.0"
-"CurrentInstallFolder"="C:\\\\Program Files\\\\Microsoft SDKs\\\\Windows\\\\v7.0\\\\"
-
-[HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Microsoft SDKs\\Windows\\v7.0]
-"InstallationFolder"="C:\\\\Program Files\\\\Microsoft SDKs\\\\Windows\\\\v7.0\\\\"
-"ProductVersion"="7.0.7600.16385.40715"
-"ProductName"="Microsoft Windows SDK for Windows 7 (7.0.7600.16385.40715)"
-_EOF_
-        w_try_regedit "${W_TMP_WIN}"\\set-psdk7.reg
-    fi
-}
-
-#----------------------------------------------------------------
-
 w_metadata psdkwin71 apps \
     title="MS Windows 7.1 SDK" \
     publisher="Microsoft" \
@@ -16210,6 +16230,10 @@ load_steam()
     if w_workaround_wine_bug 22053 "Disabling gameoverlayrenderer to prevent game crashes on some machines."; then
         w_override_dlls disabled gameoverlayrenderer
     fi
+
+    if w_workaround_wine_bug 44985 "Disabling libglesv2 to make Store and Library function correctly."; then
+        w_override_dlls disabled libglesv2
+    fi
 }
 
 #----------------------------------------------------------------
@@ -18240,9 +18264,6 @@ w_metadata dcuo games \
 
 load_dcuo()
 {
-    # The installer would take care of this, but let's do it first
-    w_call flash
-
     w_mount "DCUO - Disc 1"
     w_ahk_do "
         SetWinDelay 1000
@@ -21770,13 +21791,13 @@ w_metadata windowmanagerdecorated=n settings \
 
 #----------------------------------------------------------------
 
-w_metadata usetakefocus=enabled settings \
+w_metadata usetakefocus=y settings \
     title_cz="Aktivovat UseTakeFocus" \
     title_uk="Увімкнути фокусування на вікні" \
     title_sk="Aktivovať UseTakeFocus" \
     title_tlh="Qorwagh buSchoH \'e\' chu\'" \
     title="Enable UseTakeFocus"
-w_metadata usetakefocus=disabled settings \
+w_metadata usetakefocus=n settings \
     title_cz="Deaktivovat UseTakeFocus (výchozí)" \
     title_uk="Вимкнути фокусування на вікні (за замовчуванням)" \
     title_sk="Deaktivovať UseTakeFocus (výchozí)" \
@@ -21786,20 +21807,20 @@ w_metadata usetakefocus=disabled settings \
 load_usetakefocus()
 {
     case "$1" in
-        enabled) arg="Y";;
-        disabled) arg="N";;
+        y) arg="Y";;
+        n) arg="N";;
         *) w_die "illegal value $1 for UseTakeFocus";;
     esac
 
     echo "Setting UseTakeFocus to ${arg}"
-    cat > "${W_TMP}"/set-gfs.reg <<_EOF_
+    cat > "${W_TMP}"/set-usetakefocus.reg <<_EOF_
 REGEDIT4
 
 [HKEY_CURRENT_USER\\Software\\Wine\\X11 Driver]
 "UseTakeFocus"="${arg}"
 
 _EOF_
-    w_try_regedit "${W_TMP}"/set-gfs.reg
+    w_try_regedit "${W_TMP}"/set-usetakefocus.reg
 }
 
 #----------------------------------------------------------------
@@ -21944,7 +21965,7 @@ winetricks_set_wined3d_var()
         enable*) arg=enabled;;
         hard*) arg=hardware;;
         repack) arg=repack;;
-        backbuffer|fbo|gdi|none|opengl|readdraw|readtex|texdraw|textex|auto) arg=$2;;
+        backbuffer|fbo|gdi|gl|no3d|none|readdraw|readtex|texdraw|textex|vulkan|auto) arg=$2;;
         [0-9]*) arg=$2;;
         *) w_die "illegal value $2 for $1";;
     esac
@@ -22021,24 +22042,6 @@ _EOF_
 #----------------------------------------------------------------
 # DirectDraw settings
 
-w_metadata ddr=gdi settings \
-    title_uk="Встановити DirectDrawRenderer на gdi" \
-    title="Set DirectDrawRenderer to gdi"
-w_metadata ddr=opengl settings \
-    title_uk="Встановити DirectDrawRenderer на opengl" \
-    title="Set DirectDrawRenderer to opengl"
-
-load_ddr()
-{
-    if w_wine_version_in ,3.16 ; then
-        winetricks_set_wined3d_var DirectDrawRenderer "$1"
-    else
-        winetricks_set_wined3d_var renderer "$1"
-    fi
-}
-
-#----------------------------------------------------------------
-
 w_metadata glsl=enabled settings \
     title_uk="Увімкнути GLSL шейдери (за замовчуванням)" \
     title="Enable GLSL shaders (default)"
@@ -22146,6 +22149,26 @@ load_strictdrawordering()
 
 #----------------------------------------------------------------
 
+w_metadata renderer=gdi settings \
+    title_uk="Встановити renderer на gdi" \
+    title="Set renderer to gdi"
+w_metadata renderer=gl settings \
+    title_uk="Встановити renderer на gl" \
+    title="Set renderer to gl"
+w_metadata renderer=no3d settings \
+    title_uk="Встановити renderer на no3d" \
+    title="Set renderer to no3d"
+w_metadata renderer=vulkan settings \
+    title_uk="Встановити renderer на vulkan" \
+    title="Set renderer to vulkan"
+
+load_renderer()
+{
+    winetricks_set_wined3d_var renderer "$1"
+}
+
+#----------------------------------------------------------------=
+
 w_metadata rtlm=auto settings \
     title_uk="Встановити RenderTargetLockMode на авто (за замовчуванням)" \
     title="Set RenderTargetLockMode to auto (default)"
@@ -23037,6 +23060,8 @@ execute_command()
         dotnet1) w_warn "Calling dotnet1 is deprecated, please use dotnet11 instead" ; w_call dotnet11 ;;
         dotnet2) w_warn "Calling dotnet2 is deprecated, please use dotnet20 instead" ; w_call dotnet20 ;;
         d9vk_master) w_warn "Calling d9vk_master is deprecated, please use dxvk_master instead" ; w_call dxvk_master ;;
+        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 ;;
@@ -23056,7 +23081,6 @@ execute_command()
         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 ;;
-        flash11) w_warn "Calling flash11 is deprecated, please use flash instead" ; w_call flash ;;
         # 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 ;;
@@ -23070,6 +23094,7 @@ execute_command()
         jscript) w_warn "Calling jscript is deprecated, please use wsh57 instead" ; w_call wsh57 ;;
         npm-repack) w_warn "Calling npm-repack is deprecated, please use npm=repack instead" ; w_call npm=repack ;;
         oss) w_warn "Calling oss is deprecated, please use sound=oss instead" ; w_call sound=oss ;;
+        psdkwin7) w_warn "psdkwin7 has been removed, use psdkwin71 instead"; w_call psdkwin71 ;;
         python) w_warn "Calling python is deprecated, please use python26 instead" ; w_call python26 ;;
         vbrun60) w_warn "Calling vbrun60 is deprecated, please use vb6run instead" ; w_call vb6run ;;
         vcrun2005sp1) w_warn "Calling vcrun2005sp1 is deprecated, please use vcrun2005 instead" ; w_call vcrun2005 ;;

winetricks/src/winetricks.1

 .\" -*- nroff -*-
-.TH WINETRICKS 1 "December 2020" "Winetricks 20201206" "Wine Package Manager"
+.TH WINETRICKS 1 "February 2021" "Winetricks 20210206" "Wine Package Manager"
 .SH NAME
 winetricks \- manage virtual Windows environments using Wine
 .SH SYNOPSIS

winetricks/tests/winetricks-test

@@ -120,7 +120,7 @@ fi
 
 # Tests that fail under Xvfb
 XVFB_DOTNET_BLACKLIST="dotnet11|dotnet11sp1|dotnet20|dotnet20sdk|dotnet20sp1|dotnet30|dotnet40|dotnet46"
-XVFB_BLACKLIST="${XVFB_DOTNET_BLACKLIST}|adobeair|binkw32|dirac|directmusic|dxdiag|flash|gdiplus_winxp|gfw|ie6|ie7|ie8"
+XVFB_BLACKLIST="${XVFB_DOTNET_BLACKLIST}|binkw32|dirac|directmusic|dxdiag|gdiplus_winxp|gfw|ie6|ie7|ie8"
 XVFB_BLACKLIST="${XVFB_BLACKLIST}|jet40|nuget|quicktime72|vcrun2008|vcrun2010|vcrun2012|vcrun2013|vcrun2015"
 XVFB_BLACKLIST="${XVFB_BLACKLIST}|vjrun20|windowscodecs|wmi|wmp9|wmp10|wsh56js|wsh56vb|xmllite|xna31|xna40|xvid"
 
@@ -835,7 +835,7 @@ test_xvfb() {
     BLACKLIST="${BLACKLIST}|${XVFB_BLACKLIST}"
     export BLACKLIST
 
-    # Not test_quick() since flash fails without proper X, but test_quick() doesn't respect $BLACKLIST
+    # Not test_quick() since some tests fail without proper X, but test_quick() doesn't respect $BLACKLIST
     # Also, we don't really want to duplicate those tests twice, as this is for TravisCI where time is limited..
     test_category dlls
     test_category fonts