just import winetricks-20190310.tar with rpmgs script

0c468372 · Vitaly Lipatov · d5350ca7 · 0c468372 · 0c468372 · 0c468372
Commit 0c468372 authored Mar 18, 2019 by Vitaly Lipatov
14 changed files
--- a/winetricks/README.md
+++ b/winetricks/README.md
@@ -28,34 +28,108 @@ The ```winetricks``` package should be used if it is available and up to date. T
 Note: packaged Debian / Ubuntu winetricks versions are typically outdated, so a manual installation is recommended.
-If the package is unavailable, outdated, or the latest version is desired, a manual installation of winetricks can be done. E.g.:
+If the package is unavailable, outdated, or the latest version is desired, a manual installation of winetricks can be done.
+It is _highly_ recommended to uninstall any previously installed version of winetricks first.
+**_If you don't uninstall a previously installed, packaged version of winetricks... Well then you get to pick up the pieces!_**
+E.g. for Debian / Ubuntu:
+```
+sudo apt-get purge winetricks
+```
+Then, for Ubuntu, use a shell script to download the current winetricks script(s).
+E.g.:
 ```
-sudo -- sh -c '
+# Create and switch to a temporary directory writeable by current user. See:
-cat > /usr/local/bin/update_winetricks.sh <<_EOF_SCRIPT
+#   https://www.tldp.org/LDP/abs/html/subshells.html
+cd "$(mktemp -d)"
+# Use a BASH "here document" to create an updater shell script file.
+# See:
+#   https://www.tldp.org/LDP/abs/html/here-docs.html
+# >  outputs stdout to a file, overwriting any pre-existing file
+# << takes input, directly from the script itself, till the second '_EOF_SCRIPT' marker, as stdin
+# the cat command hooks these 2 streams up (stdin and stdout)
+###### create update_winetricks START ########
+cat > update_winetricks <<_EOF_SCRIPT
 #!/bin/sh
-cd "${HOME}" # change to a path writeable by current user
+# Create and switch to a temporary directory writeable by current user. See:
+#   https://www.tldp.org/LDP/abs/html/subshells.html
+cd "$(mktemp -d)"
+# Download the latest winetricks script (master="latest version") from Github.
 wget https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks
+# Mark the winetricks script (we've just downloaded) as executable. See:
+#   https://www.tldp.org/LDP/GNU-Linux-Tools-Summary/html/x9543.htm
 chmod +x winetricks
-sudo mv winetricks /usr/local/bin
+# Move the winetricks script to a location which will be in the standard user PATH. See:
+#   https://www.tldp.org/LDP/abs/html/internalvariables.html
+sudo mv winetricks /usr/bin
+# Download the latest winetricks BASH completion script (master="latest version") from Github.
 wget https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks.bash-completion
+# Move the winetricks BASH completion script to a standard location for BASH completion modules. See:
+#   https://www.tldp.org/LDP/abs/html/tabexpansion.html
 sudo mv winetricks.bash-completion /usr/share/bash-completion/completions/winetricks
 _EOF_SCRIPT 
-chmod +x /usr/local/bin/update_winetricks.sh
+###### create update_winetricks FINISH ########
-'
+# Mark the update_winetricks script (we've just written out) as executable. See:
+#   https://www.tldp.org/LDP/GNU-Linux-Tools-Summary/html/x9543.htm
+chmod +x update_winetricks
+# We must escalate privileges to root, as regular Linux users do not have write access to '/usr/bin'.
+sudo mv update_winetricks /usr/bin/
+```
+See the manpages for the individual functions, if you are not clear how they are being used, e.g.
+```
+man mktemp
+man mv
+man wget
+man sudo
+...
+```
+An alternative updater script implementation, using **su** in place of **sudo**, is also possible:
+```
+cd "$(mktemp -d)"
+cat > update_winetricks <<_EOF_SCRIPT
+#!/bin/sh
+cd "$(mktemp -d)"
+wget https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks
+wget https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks.bash-completion
+chmod +x winetricks
+su root sh -c 'mv winetricks /usr/bin ; mv winetricks.bash-completion /usr/share/bash-completion/completions/winetricks'
+_EOF_SCRIPT
+chmod +x update_winetricks
+su root sh -c 'mv update_winetricks /usr/bin/'
 ```
 To use ```curl``` instead of ```wget```: subsitute all ```wget``` calls with ```curl -O```, in the winetricks update script.
-Note: the path ```/usr/local/bin``` must be in your ```PATH``` (env variable) for this to work.
 # Updating
-This winetricks update scripts can easily automated, via (where available) a systemd timer unit...
+Using the traditional Unix crontab...
+```
+sudo ln "/usr/bin/update_winetricks" "/etc/cron.weekly/update_winetricks"
+```
+Note: ensure you have a cron utility installed and enabled, on systems utilizing **systemd** by default.
+The update script can be automated, to run on a set schedule, via (where available) **systemd** units.
+E.g. to create a scheduled winetricks updater **systemd** **timer** unit, and an associated **systemd** **service** unit:
 ```
-sudo -- sh -c '
+cd "$(mktemp -d)"
-cat > /etc/systemd/system/winetricks_update.timer <<_EOF_TIMER
+cat > winetricks_update.timer <<_EOF_TIMER_UNIT
 [Unit]
 Description=Run winetricks update script weekly (Saturday)
@@ -65,29 +139,30 @@ Persistent=true
 [Install]
 WantedBy=timers.target
-_EOF_TIMER
+_EOF_TIMER_UNIT
-sudo cat > /etc/systemd/system/winetricks_update.service <<_EOF_SERVICE
+cat > winetricks_update.service <<_EOF_SERVICE_UNIT
 [Unit]
 Description=Run winetricks update script
 After=network.target
 [Service]
-ExecStart=/usr/local/bin/update_winetricks.sh
+ExecStart=/usr/bin/update_winetricks
 Type=oneshot
-_EOF_SERVICE
+_EOF_SERVICE_UNIT
-'
+sudo mv winetricks_update.timer winetricks_update.service /etc/systemd/system/
 ```
+See:
+* [freedesktop.org: systemd service unit](https://www.freedesktop.org/software/systemd/man/systemd.service.html)
+* [freedesktop.org: systemd timer unit](https://www.freedesktop.org/software/systemd/man/systemd.timer.html)
 To start and enable the winetricks update timer:
 ```
 sudo systemctl daemon-reload
 sudo systemctl enable winetricks_update.timer
 sudo systemctl start winetricks_update.timer
 ```
-Or using the more tradional Unix crontab...
-```
-sudo cp "/usr/local/bin/update_winetricks.sh" "/etc/cron.weekly/"
-```
 The core winetricks script can also be updated by simply doing:
 ```

--- a/winetricks/files/LATEST
+++ b/winetricks/files/LATEST
-20181203
+20190310
--- a/winetricks/files/verbs/all.txt
+++ b/winetricks/files/verbs/all.txt
-Using winetricks 20181203 - sha256sum: 2e32c987b5dd0ddd3e0836290d9561e7f251ca080248f53050cc84c27d4bbd18 with wine-3.19-116-gb78de971f6 and WINEARCH=win32
+Using winetricks 20190310 - sha256sum: cf44b3cbf4134adb9f9dd7eec0d50b45d34ae65c5432d72edc24bcd1841888ba with wine-3.21-243-g0cc6233e20 and WINEARCH=win32
 ===== apps =====
 3m_library               3M Cloud Library (3M Company, 2015) [downloadable]
 7zip                     7-Zip 16.02 (Igor Pavlov, 2016) [downloadable]
@@ -78,6 +78,7 @@ binkw32                  RAD Game Tools binkw32.dll (RAD Game Tools, Inc., 2000)
 cabinet                  Microsoft cabinet.dll (Microsoft, 2002) [downloadable]
 cinepak                  Cinepak Codec (Radius, 1995) [downloadable]
 cmd                      MS cmd.exe (Microsoft, 2004) [downloadable]
+cnc_ddraw                Reimplentation of ddraw for CnC games (CnCNet, 2018) [downloadable]
 comctl32ocx              MS comctl32.ocx and mscomctl.ocx, comctl32 wrappers for VB6 (Microsoft, 2012) [downloadable]
 comctl32                 MS common controls 5.80 (Microsoft, 2001) [downloadable]
 comdlg32ocx              Common Dialog ActiveX Control for VB6 (Microsoft, 2012) [downloadable]
@@ -156,6 +157,7 @@ dxdiagn                  DirectX Diagnostic Library (Microsoft, 2011) [downloada
 dxdiag                   DirectX Diagnostic Tool (Microsoft, 2010) [downloadable]
 dxsdk_jun2010            MS DirectX SDK, June 2010 (developers only) (Microsoft, 2010) [downloadable]
 dxsdk_nov2006            MS DirectX SDK, November 2006 (developers only) (Microsoft, 2006) [downloadable]
+dxvk100                  Vulkan-based D3D10/D3D11 implementation for Linux / Wine (1.0) (Philip Rebohle, 2018) [downloadable]
 dxvk54                   Vulkan-based D3D11 implementation for Linux / Wine (0.54) (Philip Rebohle, 2018) [downloadable]
 dxvk60                   Vulkan-based D3D11 implementation for Linux / Wine (0.60) (Philip Rebohle, 2018) [downloadable]
 dxvk61                   Vulkan-based D3D11 implementation for Linux / Wine (0.61) (Philip Rebohle, 2018) [downloadable]
@@ -172,10 +174,17 @@ dxvk90                   Vulkan-based D3D10/D3D11 implementation for Linux / Win
 dxvk91                   Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.91) (Philip Rebohle, 2018) [downloadable]
 dxvk92                   Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.92) (Philip Rebohle, 2018) [downloadable]
 dxvk93                   Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.93) (Philip Rebohle, 2018) [downloadable]
+dxvk94                   Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.94) (Philip Rebohle, 2018) [downloadable]
+dxvk95                   Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.95) (Philip Rebohle, 2018) [downloadable]
+dxvk96                   Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.96) (Philip Rebohle, 2018) [downloadable]
 dxvk                     Vulkan-based D3D10/D3D11 implementation for Linux / Wine (latest) (Philip Rebohle, 2018) [downloadable]
 esent                    MS Extensible Storage Engine (Microsoft, 2011) [downloadable]
+faudio                   FAudio (xaudio reimplemntation, with xna support) builds for win32 (Kron4ek, 2019) [downloadable]
 ffdshow                  ffdshow video codecs (doom9 folks, 2010) [downloadable]
 flash                    Flash Player 29 (Adobe, 2018) [downloadable]
+galliumnine02            Gallium Nine Standalone (v0.2) (Gallium Nine Team, 2019) [downloadable]
+galliumnine03            Gallium Nine Standalone (v0.3) (Gallium Nine Team, 2019) [downloadable]
+galliumnine              Gallium Nine Standalone (latest) (Gallium Nine Team, 2019) [downloadable]
 gdiplus                  MS GDI+ (Microsoft, 2011) [downloadable]
 gdiplus_winxp            MS GDI+ (Microsoft, 2004)
 gfw                      MS Games For Windows Live (xlive.dll) (Microsoft, 2008) [downloadable]
@@ -220,10 +229,10 @@ pdh                      MS pdh.dll (Performance Data Helper) (Microsoft, 2011) 
 physx                    PhysX (Nvidia, 2014) [downloadable]
 pngfilt                  pngfilt.dll (from winxp) (Microsoft, 2004) [downloadable]
 python26                 Python interpreter 2.6.2 (Python Software Foundaton, 2009) [downloadable]
-qasf                     qasf.dll (from Directx 9 user redistributable) (Microsoft, 2010) [downloadable]
+qasf                     qasf.dll (Microsoft, 2011) [downloadable]
 qdvd                     qdvd.dll (Microsoft, 2011) [downloadable]
 qedit                    qedit.dll (Microsoft, 2011) [downloadable]
-quartz                   quartz.dll (from Directx 9 user redistributable) (Microsoft, 2010) [downloadable]
+quartz                   quartz.dll (Microsoft, 2011) [downloadable]
 quicktime72              Apple QuickTime 7.2 (Apple, 2010) [downloadable]
 quicktime76              Apple QuickTime 7.6 (Apple, 2010) [downloadable]
 riched20                 MS RichEdit Control 2.0 (riched20.dll) (Microsoft, 2004) [downloadable]
@@ -265,7 +274,8 @@ wmp10                    Windows Media Player 10 (Microsoft, 2006) [downloadable
 wmp9                     Windows Media Player 9 (Microsoft, 2003) [downloadable]
 wmv9vcm                  MS Windows Media Video 9 Video Compression Manager (Microsoft, 2013) [downloadable]
 wsh57                    MS Windows Script Host 5.7 (Microsoft, 2007) [downloadable]
-xact                     MS XACT Engine (Microsoft, 2010) [downloadable]
+xact                     MS XACT Engine (32-bit only) (Microsoft, 2010) [downloadable]
+xact_x64                 MS XACT Engine (64-bit only) (Microsoft, 2010) [downloadable]
 xinput                   Microsoft XInput (Xbox controller support) (Microsoft, 2010) [downloadable]
 xmllite                  MS xmllite dll (Microsoft, 2011) [downloadable]
 xna31                    MS XNA Framework Redistributable 3.1 (Microsoft, 2009) [downloadable]
@@ -448,6 +458,8 @@ hosts                    Add empty C:\windows\system32\drivers\etc\{hosts,servic
 isolate_home             Remove wineprefix links to /home/austin
 macdriver=mac            Enable the Mac native Quartz driver (default)
 macdriver=x11            Disable the Mac native Quartz driver, use X11 instead
+mimeassoc=off            Disable exporting MIME-type file associations to the native desktop
+mimeassoc=on             Enable exporting MIME-type file associations to the native desktop (default)
 multisampling=disabled   Disable Direct3D multisampling
 multisampling=enabled    Enable Direct3D multisampling
 mwo=disable              Set DirectInput MouseWarpOverride to disable

--- a/winetricks/files/verbs/apps.txt
+++ b/winetricks/files/verbs/apps.txt
-Using winetricks 20181203 - sha256sum: 2e32c987b5dd0ddd3e0836290d9561e7f251ca080248f53050cc84c27d4bbd18 with wine-3.19-116-gb78de971f6 and WINEARCH=win32
+Using winetricks 20190310 - sha256sum: cf44b3cbf4134adb9f9dd7eec0d50b45d34ae65c5432d72edc24bcd1841888ba with wine-3.21-243-g0cc6233e20 and WINEARCH=win32
 3m_library               3M Cloud Library (3M Company, 2015) [downloadable]
 7zip                     7-Zip 16.02 (Igor Pavlov, 2016) [downloadable]
 abiword                  AbiWord 2.8.6 (AbiSource, 2010) [downloadable]

--- a/winetricks/files/verbs/benchmarks.txt
+++ b/winetricks/files/verbs/benchmarks.txt
-Using winetricks 20181203 - sha256sum: 2e32c987b5dd0ddd3e0836290d9561e7f251ca080248f53050cc84c27d4bbd18 with wine-3.19-116-gb78de971f6 and WINEARCH=win32
+Using winetricks 20190310 - sha256sum: cf44b3cbf4134adb9f9dd7eec0d50b45d34ae65c5432d72edc24bcd1841888ba with wine-3.21-243-g0cc6233e20 and WINEARCH=win32
 3dmark03                 3D Mark 03 (Futuremark, 2003)
 3dmark05                 3D Mark 05 (Futuremark, 2005) [downloadable]
 3dmark06                 3D Mark 06 (Futuremark, 2006)

--- a/winetricks/files/verbs/dlls.txt
+++ b/winetricks/files/verbs/dlls.txt
-Using winetricks 20181203 - sha256sum: 2e32c987b5dd0ddd3e0836290d9561e7f251ca080248f53050cc84c27d4bbd18 with wine-3.19-116-gb78de971f6 and WINEARCH=win32
+Using winetricks 20190310 - sha256sum: cf44b3cbf4134adb9f9dd7eec0d50b45d34ae65c5432d72edc24bcd1841888ba with wine-3.21-243-g0cc6233e20 and WINEARCH=win32
 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]
@@ -9,6 +9,7 @@ binkw32                  RAD Game Tools binkw32.dll (RAD Game Tools, Inc., 2000)
 cabinet                  Microsoft cabinet.dll (Microsoft, 2002) [downloadable]
 cinepak                  Cinepak Codec (Radius, 1995) [downloadable]
 cmd                      MS cmd.exe (Microsoft, 2004) [downloadable]
+cnc_ddraw                Reimplentation of ddraw for CnC games (CnCNet, 2018) [downloadable]
 comctl32ocx              MS comctl32.ocx and mscomctl.ocx, comctl32 wrappers for VB6 (Microsoft, 2012) [downloadable]
 comctl32                 MS common controls 5.80 (Microsoft, 2001) [downloadable]
 comdlg32ocx              Common Dialog ActiveX Control for VB6 (Microsoft, 2012) [downloadable]
@@ -87,6 +88,7 @@ dxdiagn                  DirectX Diagnostic Library (Microsoft, 2011) [downloada
 dxdiag                   DirectX Diagnostic Tool (Microsoft, 2010) [downloadable]
 dxsdk_jun2010            MS DirectX SDK, June 2010 (developers only) (Microsoft, 2010) [downloadable]
 dxsdk_nov2006            MS DirectX SDK, November 2006 (developers only) (Microsoft, 2006) [downloadable]
+dxvk100                  Vulkan-based D3D10/D3D11 implementation for Linux / Wine (1.0) (Philip Rebohle, 2018) [downloadable]
 dxvk54                   Vulkan-based D3D11 implementation for Linux / Wine (0.54) (Philip Rebohle, 2018) [downloadable]
 dxvk60                   Vulkan-based D3D11 implementation for Linux / Wine (0.60) (Philip Rebohle, 2018) [downloadable]
 dxvk61                   Vulkan-based D3D11 implementation for Linux / Wine (0.61) (Philip Rebohle, 2018) [downloadable]
@@ -103,10 +105,17 @@ dxvk90                   Vulkan-based D3D10/D3D11 implementation for Linux / Win
 dxvk91                   Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.91) (Philip Rebohle, 2018) [downloadable]
 dxvk92                   Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.92) (Philip Rebohle, 2018) [downloadable]
 dxvk93                   Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.93) (Philip Rebohle, 2018) [downloadable]
+dxvk94                   Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.94) (Philip Rebohle, 2018) [downloadable]
+dxvk95                   Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.95) (Philip Rebohle, 2018) [downloadable]
+dxvk96                   Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.96) (Philip Rebohle, 2018) [downloadable]
 dxvk                     Vulkan-based D3D10/D3D11 implementation for Linux / Wine (latest) (Philip Rebohle, 2018) [downloadable]
 esent                    MS Extensible Storage Engine (Microsoft, 2011) [downloadable]
+faudio                   FAudio (xaudio reimplemntation, with xna support) builds for win32 (Kron4ek, 2019) [downloadable]
 ffdshow                  ffdshow video codecs (doom9 folks, 2010) [downloadable]
 flash                    Flash Player 29 (Adobe, 2018) [downloadable]
+galliumnine02            Gallium Nine Standalone (v0.2) (Gallium Nine Team, 2019) [downloadable]
+galliumnine03            Gallium Nine Standalone (v0.3) (Gallium Nine Team, 2019) [downloadable]
+galliumnine              Gallium Nine Standalone (latest) (Gallium Nine Team, 2019) [downloadable]
 gdiplus                  MS GDI+ (Microsoft, 2011) [downloadable]
 gdiplus_winxp            MS GDI+ (Microsoft, 2004)
 gfw                      MS Games For Windows Live (xlive.dll) (Microsoft, 2008) [downloadable]
@@ -151,10 +160,10 @@ pdh                      MS pdh.dll (Performance Data Helper) (Microsoft, 2011) 
 physx                    PhysX (Nvidia, 2014) [downloadable]
 pngfilt                  pngfilt.dll (from winxp) (Microsoft, 2004) [downloadable]
 python26                 Python interpreter 2.6.2 (Python Software Foundaton, 2009) [downloadable]
-qasf                     qasf.dll (from Directx 9 user redistributable) (Microsoft, 2010) [downloadable]
+qasf                     qasf.dll (Microsoft, 2011) [downloadable]
 qdvd                     qdvd.dll (Microsoft, 2011) [downloadable]
 qedit                    qedit.dll (Microsoft, 2011) [downloadable]
-quartz                   quartz.dll (from Directx 9 user redistributable) (Microsoft, 2010) [downloadable]
+quartz                   quartz.dll (Microsoft, 2011) [downloadable]
 quicktime72              Apple QuickTime 7.2 (Apple, 2010) [downloadable]
 quicktime76              Apple QuickTime 7.6 (Apple, 2010) [downloadable]
 riched20                 MS RichEdit Control 2.0 (riched20.dll) (Microsoft, 2004) [downloadable]
@@ -196,7 +205,8 @@ wmp10                    Windows Media Player 10 (Microsoft, 2006) [downloadable
 wmp9                     Windows Media Player 9 (Microsoft, 2003) [downloadable]
 wmv9vcm                  MS Windows Media Video 9 Video Compression Manager (Microsoft, 2013) [downloadable]
 wsh57                    MS Windows Script Host 5.7 (Microsoft, 2007) [downloadable]
-xact                     MS XACT Engine (Microsoft, 2010) [downloadable]
+xact                     MS XACT Engine (32-bit only) (Microsoft, 2010) [downloadable]
+xact_x64                 MS XACT Engine (64-bit only) (Microsoft, 2010) [downloadable]
 xinput                   Microsoft XInput (Xbox controller support) (Microsoft, 2010) [downloadable]
 xmllite                  MS xmllite dll (Microsoft, 2011) [downloadable]
 xna31                    MS XNA Framework Redistributable 3.1 (Microsoft, 2009) [downloadable]

--- a/winetricks/files/verbs/download.txt
+++ b/winetricks/files/verbs/download.txt
-Using winetricks 20181203 - sha256sum: 2e32c987b5dd0ddd3e0836290d9561e7f251ca080248f53050cc84c27d4bbd18 with wine-3.19-116-gb78de971f6 and WINEARCH=win32
+Using winetricks 20190310 - sha256sum: cf44b3cbf4134adb9f9dd7eec0d50b45d34ae65c5432d72edc24bcd1841888ba with wine-3.21-243-g0cc6233e20 and WINEARCH=win32
 3dmark05
 3dmark2000
 3dmark2001
@@ -35,6 +35,7 @@ civ5_demo_steam
 cjkfonts
 cmake
 cmd
+cnc_ddraw
 colorprofile
 comctl32
 comctl32ocx
@@ -127,6 +128,7 @@ dxdiagn_feb2010
 dxsdk_jun2010
 dxsdk_nov2006
 dxvk
+dxvk100
 dxvk54
 dxvk60
 dxvk61
@@ -143,16 +145,23 @@ dxvk90
 dxvk91
 dxvk92
 dxvk93
+dxvk94
+dxvk95
+dxvk96
 emu8086
 esent
 eufonts
 ev3
 eve
+faudio
 ffdshow
 fifa11_demo
 firefox
 flash
 fontxplorer
+galliumnine
+galliumnine02
+galliumnine03
 gdiplus
 georgia
 gfw
@@ -315,6 +324,7 @@ wog
 wormsreloaded_demo_steam
 wsh57
 xact
+xact_x64
 xinput
 xmllite
 xna31

--- a/winetricks/files/verbs/games.txt
+++ b/winetricks/files/verbs/games.txt
-Using winetricks 20181203 - sha256sum: 2e32c987b5dd0ddd3e0836290d9561e7f251ca080248f53050cc84c27d4bbd18 with wine-3.19-116-gb78de971f6 and WINEARCH=win32
+Using winetricks 20190310 - sha256sum: cf44b3cbf4134adb9f9dd7eec0d50b45d34ae65c5432d72edc24bcd1841888ba with wine-3.21-243-g0cc6233e20 and WINEARCH=win32
 acreedbro                Assassin's Creed Brotherhood (Ubisoft, 2011)
 algodoo_demo             Algodoo Demo (Algoryx, 2009) [downloadable]
 alienswarm_steam         Alien Swarm (Steam) (Valve, 2010) [downloadable]

--- a/winetricks/files/verbs/manual-download.txt
+++ b/winetricks/files/verbs/manual-download.txt
-Using winetricks 20181203 - sha256sum: 2e32c987b5dd0ddd3e0836290d9561e7f251ca080248f53050cc84c27d4bbd18 with wine-3.19-116-gb78de971f6 and WINEARCH=win32
+Using winetricks 20190310 - sha256sum: cf44b3cbf4134adb9f9dd7eec0d50b45d34ae65c5432d72edc24bcd1841888ba with wine-3.21-243-g0cc6233e20 and WINEARCH=win32
 3dmark03
 3dmark06
 amnesia_tdd_demo

--- a/winetricks/files/verbs/settings.txt
+++ b/winetricks/files/verbs/settings.txt
-Using winetricks 20181203 - sha256sum: 2e32c987b5dd0ddd3e0836290d9561e7f251ca080248f53050cc84c27d4bbd18 with wine-3.19-116-gb78de971f6 and WINEARCH=win32
+Using winetricks 20190310 - sha256sum: cf44b3cbf4134adb9f9dd7eec0d50b45d34ae65c5432d72edc24bcd1841888ba with wine-3.21-243-g0cc6233e20 and WINEARCH=win32
 alldlls=builtin          Override most common DLLs to builtin
 alldlls=default          Remove all DLL overrides
 ao=disabled              Disable AlwaysOffscreen (default)
@@ -34,6 +34,8 @@ hosts                    Add empty C:\windows\system32\drivers\etc\{hosts,servic
 isolate_home             Remove wineprefix links to /home/austin
 macdriver=mac            Enable the Mac native Quartz driver (default)
 macdriver=x11            Disable the Mac native Quartz driver, use X11 instead
+mimeassoc=off            Disable exporting MIME-type file associations to the native desktop
+mimeassoc=on             Enable exporting MIME-type file associations to the native desktop (default)
 multisampling=disabled   Disable Direct3D multisampling
 multisampling=enabled    Enable Direct3D multisampling
 mwo=disable              Set DirectInput MouseWarpOverride to disable

--- a/winetricks/src/winetricks
+++ b/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=20181203
+WINETRICKS_VERSION=20190310
 # This is a UTF-8 file
 # You should see an o with two dots over it here [ö]
@@ -54,7 +54,7 @@ WINETRICKS_VERSION=20181203
 #
 # Copyright:
 #   Copyright (C) 2007-2014 Dan Kegel <dank!kegel.com>
-#   Copyright (C) 2008-2017 Austin English <austinenglish!gmail.com>
+#   Copyright (C) 2008-2019 Austin English <austinenglish!gmail.com>
 #   Copyright (C) 2010-2011 Phil Blankenship <phillip.e.blankenship!gmail.com>
 #   Copyright (C) 2010-2015 Shannon VanWagner <shannon.vanwagner!gmail.com>
 #   Copyright (C) 2010 Belhorma Bendebiche <amro256!gmail.com>
@@ -301,6 +301,16 @@ w_killall()
    kill -s KILL $(pgrep $1)
 }
+# Some packages don't support win32, die with an appropriate message
+# Returns 64 (for tests/winetricks-test)
+w_package_unsupported_win32()
+{
+    if [ "$W_ARCH" = "win32" ] ; then
+        w_warn "This package ($W_PACKAGE) does not work on a 32-bit installation. You must use a prefix made with WINEARCH=win64."
+        exit 64
+    fi
+}
 # Warn user if package is broken. Optionally provide a link to the bug report.
 w_package_broken_win64()
 {
@@ -545,6 +555,12 @@ w_try_regsvr()
    w_try "$WINE" regsvr32 $W_UNATTENDED_SLASH_S "$@"
 }
+w_try_regsvr64()
+{
+    # shellcheck disable=SC2086
+    w_try "$WINE64" regsvr32 $W_UNATTENDED_SLASH_S "$@"
+}
 w_try_unrar()
 {
    # $1 - zipfile to extract (keeping internal paths, in cwd)
@@ -1992,6 +2008,7 @@ w_override_all_dlls()
    #   -e '/^.*\/dbghelp$/ d' \
    #   -e '/^.*\/ddraw$/ d' \
    #   -e '/^.*\/dlls$/ d' \
+    #   -e '/^.*\/dmoguids$/ d' \
    #   -e '/^.*\/dxerr8$/ d' \
    #   -e '/^.*\/dxerr9$/ d' \
    #   -e '/^.*\/dxguid$/ d' \
@@ -2006,6 +2023,7 @@ w_override_all_dlls()
    #   -e '/^.*\/mswsock$/ d' \
    #   -e '/^.*\/ntdll$/ d' \
    #   -e '/^.*\/opengl32$/ d' \
+    #   -e '/^.*\/secur32$/ d' \
    #   -e '/^.*\/strmbase$/ d' \
    #   -e '/^.*\/strmiids$/ d' \
    #   -e '/^.*\/twain_32$/ d' \
@@ -2020,13 +2038,14 @@ w_override_all_dlls()
    #   -e '/^.*\/wineqtdecoder$/ d' \
    #   -e '/^.*\/winmm$/ d' \
    #   -e '/^.*\/wintab32$/ d' \
+    #   -e '/^.*\/wmcodecdspuuid$/ d' \
    #   -e '/^.*\/wnaspi32$/ d' \
    #   -e '/^.*\/wow32$/ d' \
    #   -e '/^.*\/ws2_32$/ d' \
    #   -e '/^.*\/wsock32$/ d' \
    #   -e 's,.*/,        ,' | sort | fmt -63 | sed 's/$/ \\/'
    #
-    # 2018-02-18: Last list update (wine-3.2)
+    # 2018-12-10: Last list update (wine-4.0-rc1)
    w_override_dlls builtin \
        acledit aclui activeds actxprxy adsldp adsldpc advpack \
        amstream api-ms-win-appmodel-identity-l1-1-0 \
@@ -2037,7 +2056,7 @@ w_override_all_dlls()
        api-ms-win-core-appinit-l1-1-0 \
        api-ms-win-core-atoms-l1-1-0 \
        api-ms-win-core-bem-l1-1-0 api-ms-win-core-com-l1-1-0 \
-        api-ms-win-core-com-l1-1-1 \
+        api-ms-win-core-com-l1-1-1 api-ms-win-core-comm-l1-1-0 \
        api-ms-win-core-com-private-l1-1-0 \
        api-ms-win-core-console-l1-1-0 \
        api-ms-win-core-console-l2-1-0 \
@@ -2073,6 +2092,7 @@ w_override_all_dlls()
        api-ms-win-core-kernel32-legacy-l1-1-0 \
        api-ms-win-core-kernel32-legacy-l1-1-1 \
        api-ms-win-core-kernel32-private-l1-1-1 \
+        api-ms-win-core-largeinteger-l1-1-0 \
        api-ms-win-core-libraryloader-l1-1-0 \
        api-ms-win-core-libraryloader-l1-1-1 \
        api-ms-win-core-libraryloader-l1-2-0 \
@@ -2102,6 +2122,7 @@ w_override_all_dlls()
        api-ms-win-core-processthreads-l1-1-0 \
        api-ms-win-core-processthreads-l1-1-1 \
        api-ms-win-core-processthreads-l1-1-2 \
+        api-ms-win-core-processthreads-l1-1-3 \
        api-ms-win-core-processtopology-obsolete-l1-1-0 \
        api-ms-win-core-profile-l1-1-0 \
        api-ms-win-core-psapi-ansi-l1-1-0 \
@@ -2122,6 +2143,7 @@ w_override_all_dlls()
        api-ms-win-core-stringansi-l1-1-0 \
        api-ms-win-core-string-l1-1-0 \
        api-ms-win-core-string-l2-1-0 \
+        api-ms-win-core-stringloader-l1-1-1 \
        api-ms-win-core-string-obsolete-l1-1-0 \
        api-ms-win-core-synch-ansi-l1-1-0 \
        api-ms-win-core-synch-l1-1-0 \
@@ -2149,6 +2171,7 @@ w_override_all_dlls()
        api-ms-win-core-winrt-registration-l1-1-0 \
        api-ms-win-core-winrt-roparameterizediid-l1-1-0 \
        api-ms-win-core-winrt-string-l1-1-0 \
+        api-ms-win-core-winrt-string-l1-1-1 \
        api-ms-win-core-wow64-l1-1-0 \
        api-ms-win-core-wow64-l1-1-1 \
        api-ms-win-core-xstate-l1-1-0 \
@@ -2168,6 +2191,7 @@ w_override_all_dlls()
        api-ms-win-crt-string-l1-1-0 \
        api-ms-win-crt-time-l1-1-0 \
        api-ms-win-crt-utility-l1-1-0 \
+        api-ms-win-devices-config-l1-1-0 \
        api-ms-win-devices-config-l1-1-1 \
        api-ms-win-devices-query-l1-1-1 \
        api-ms-win-downlevel-advapi32-l1-1-0 \
@@ -2186,21 +2210,30 @@ w_override_all_dlls()
        api-ms-win-eventing-legacy-l1-1-0 \
        api-ms-win-eventing-provider-l1-1-0 \
        api-ms-win-eventlog-legacy-l1-1-0 \
+        api-ms-win-gdi-dpiinfo-l1-1-0 \
        api-ms-win-mm-joystick-l1-1-0 \
        api-ms-win-mm-misc-l1-1-1 api-ms-win-mm-mme-l1-1-0 \
        api-ms-win-mm-time-l1-1-0 \
        api-ms-win-ntuser-dc-access-l1-1-0 \
        api-ms-win-ntuser-rectangle-l1-1-0 \
+        api-ms-win-ntuser-sysparams-l1-1-0 \
        api-ms-win-perf-legacy-l1-1-0 \
        api-ms-win-power-base-l1-1-0 \
        api-ms-win-power-setting-l1-1-0 \
+        api-ms-win-rtcore-ntuser-draw-l1-1-0 \
        api-ms-win-rtcore-ntuser-private-l1-1-0 \
+        api-ms-win-rtcore-ntuser-private-l1-1-4 \
+        api-ms-win-rtcore-ntuser-window-l1-1-0 \
+        api-ms-win-rtcore-ntuser-winevent-l1-1-0 \
+        api-ms-win-rtcore-ntuser-wmpointer-l1-1-0 \
+        api-ms-win-rtcore-ntuser-wmpointer-l1-1-3 \
        api-ms-win-security-activedirectoryclient-l1-1-0 \
        api-ms-win-security-audit-l1-1-1 \
        api-ms-win-security-base-l1-1-0 \
        api-ms-win-security-base-l1-2-0 \
        api-ms-win-security-base-private-l1-1-1 \
        api-ms-win-security-credentials-l1-1-0 \
+        api-ms-win-security-cryptoapi-l1-1-0 \
        api-ms-win-security-grouppolicy-l1-1-0 \
        api-ms-win-security-lsalookup-l1-1-0 \
        api-ms-win-security-lsalookup-l1-1-1 \
@@ -2217,16 +2250,19 @@ w_override_all_dlls()
        api-ms-win-service-private-l1-1-1 \
        api-ms-win-service-winsvc-l1-1-0 \
        api-ms-win-service-winsvc-l1-2-0 \
+        api-ms-win-shcore-obsolete-l1-1-0 \
        api-ms-win-shcore-scaling-l1-1-1 \
+        api-ms-win-shcore-stream-l1-1-0 \
+        api-ms-win-shcore-thread-l1-1-0 \
        api-ms-win-shell-shellcom-l1-1-0 \
        api-ms-win-shell-shellfolders-l1-1-0 apphelp \
-        appwiz.cpl atl atl100 atl110 atl80 atl90 authz \
+        appwiz.cpl atl atl100 atl110 atl80 atl90 atmlib \
-        avicap32 avifil32 avrt bcrypt bluetoothapis browseui \
+        authz avicap32 avifil32 avrt bcrypt bluetoothapis \
-        bthprops.cpl cabinet cards cdosys cfgmgr32 clusapi \
+        browseui bthprops.cpl cabinet cards cdosys cfgmgr32 \
-        combase comcat comctl32 comdlg32 compstui comsvcs \
+        clusapi combase comcat comctl32 comdlg32 compstui \
-        concrt140 connect credui crtdll crypt32 cryptdlg \
+        comsvcs concrt140 connect credui crtdll crypt32 \
-        cryptdll cryptext cryptnet cryptui ctapi32 ctl3d32 \
+        cryptdlg cryptdll cryptext cryptnet cryptui ctapi32 \
-        d2d1 d3d10 d3d10_1 d3d10core d3d11 d3d12 d3d8 \
+        ctl3d32 d2d1 d3d10 d3d10_1 d3d10core d3d11 d3d12 d3d8 \
        d3d9 d3dcompiler_33 d3dcompiler_34 d3dcompiler_35 \
        d3dcompiler_36 d3dcompiler_37 d3dcompiler_38 \
        d3dcompiler_39 d3dcompiler_40 d3dcompiler_41 \
@@ -2246,69 +2282,87 @@ w_override_all_dlls()
        dswave dwmapi dwrite dx8vb dxdiagn dxgi dxva2 esent \
        evr explorerframe ext-ms-win-authz-context-l1-1-0 \
        ext-ms-win-domainjoin-netjoin-l1-1-0 \
+        ext-ms-win-dwmapi-ext-l1-1-0 \
        ext-ms-win-gdi-dc-create-l1-1-1 \
        ext-ms-win-gdi-dc-l1-2-0 ext-ms-win-gdi-devcaps-l1-1-0 \
        ext-ms-win-gdi-draw-l1-1-1 \
        ext-ms-win-gdi-render-l1-1-0 \
        ext-ms-win-kernel32-package-current-l1-1-0 \
        ext-ms-win-kernel32-package-l1-1-1 \
+        ext-ms-win-ntuser-draw-l1-1-0 \
+        ext-ms-win-ntuser-gui-l1-3-0 \
+        ext-ms-win-ntuser-keyboard-l1-3-0 \
        ext-ms-win-ntuser-message-l1-1-1 \
+        ext-ms-win-ntuser-misc-l1-2-0 \
+        ext-ms-win-ntuser-misc-l1-5-1 \
+        ext-ms-win-ntuser-mouse-l1-1-0 \
        ext-ms-win-ntuser-private-l1-1-1 \
+        ext-ms-win-ntuser-private-l1-3-1 \
        ext-ms-win-ntuser-rectangle-ext-l1-1-0 \
        ext-ms-win-ntuser-uicontext-ext-l1-1-0 \
        ext-ms-win-ntuser-windowclass-l1-1-1 \
        ext-ms-win-ntuser-window-l1-1-1 \
+        ext-ms-win-ntuser-window-l1-1-4 \
+        ext-ms-win-oleacc-l1-1-0 \
        ext-ms-win-ras-rasapi32-l1-1-0 \
+        ext-ms-win-rtcore-gdi-devcaps-l1-1-0 \
        ext-ms-win-rtcore-gdi-object-l1-1-0 \
        ext-ms-win-rtcore-gdi-rgn-l1-1-0 \
+        ext-ms-win-rtcore-ntuser-cursor-l1-1-0 \
        ext-ms-win-rtcore-ntuser-dc-access-l1-1-0 \
        ext-ms-win-rtcore-ntuser-dpi-l1-1-0 \
+        ext-ms-win-rtcore-ntuser-dpi-l1-2-0 \
+        ext-ms-win-rtcore-ntuser-rawinput-l1-1-0 \
+        ext-ms-win-rtcore-ntuser-syscolors-l1-1-0 \
        ext-ms-win-rtcore-ntuser-sysparams-l1-1-0 \
        ext-ms-win-security-credui-l1-1-0 \
-        ext-ms-win-security-cryptui-l1-1-0 faultrep fltlib \
+        ext-ms-win-security-cryptui-l1-1-0 \
-        fltmgr.sys fntcache fontsub fusion fwpuclnt gameux \
+        ext-ms-win-uxtheme-themes-l1-1-0 faultrep feclient \
-        gdiplus gpkcsp hal hhctrl.ocx hid hidclass.sys hlink \
+        fltlib fltmgr.sys fntcache fontsub fusion fwpuclnt \
-        hnetcfg httpapi iccvid ieframe ieproxy imaadp32.acm \
+        gameux gdiplus gpkcsp hal hhctrl.ocx hid hidclass.sys \
-        imagehlp imm32 inetcomm inetcpl.cpl inetmib1 infosoft \
+        hlink hnetcfg httpapi iccvid ieframe ieproxy \
-        initpki inkobj inseng iprop irprops.cpl itircl itss \
+        imaadp32.acm imagehlp imm32 inetcomm inetcpl.cpl \
-        joy.cpl jscript jsproxy kerberos kernelbase ksuser \
+        inetmib1 infosoft initpki inkobj inseng iprop \
-        ktmw32 loadperf localspl localui lz32 mapi32 mapistub \
+        irprops.cpl itircl itss joy.cpl jscript jsproxy \
-        mciavi32 mcicda mciqtz32 mciseq mciwave mf mf3216 \
+        kerberos kernelbase ksuser ktmw32 loadperf localspl \
-        mfplat mfreadwrite mgmtapi midimap mlang mmcndmgr \
+        localui lz32 mapi32 mapistub mciavi32 mcicda mciqtz32 \
-        mmdevapi mpr mprapi msacm32 msadp32.acm msasn1 \
+        mciseq mciwave mf mf3216 mfplat mfreadwrite mgmtapi \
-        mscat32 mscms mscoree msctf msctfp msdaps msdelta \
+        midimap mlang mmcndmgr mmdevapi mp3dmod mpr mprapi \
-        msdmo msdrm msftedit msg711.acm msgsm32.acm mshtml \
+        msacm32 msadp32.acm msasn1 mscat32 mscms mscoree \
-        msi msident msimg32 msimsg msimtf msisip msisys.ocx \
+        msctf msctfp msdaps msdelta msdmo msdrm msftedit \
-        msls31 msnet32 mspatcha msports msrle32 msscript.ocx \
+        msg711.acm msgsm32.acm mshtml msi msident msimg32 \
-        mssign32 mssip32 mstask msvcirt msvcm80 msvcm90 \
+        msimsg msimtf msisip msisys.ocx msls31 msnet32 \
-        msvcp100 msvcp110 msvcp120 msvcp120_app msvcp140 \
+        mspatcha msports msrle32 msscript.ocx mssign32 \
-        msvcp60 msvcp70 msvcp71 msvcp80 msvcp90 msvcr100 \
+        mssip32 mstask msvcirt msvcm80 msvcm90 msvcp100 \
-        msvcr110 msvcr120 msvcr120_app msvcr70 msvcr71 msvcr80 \
+        msvcp110 msvcp120 msvcp120_app msvcp140 msvcp60 \
+        msvcp70 msvcp71 msvcp80 msvcp90 msvcr100 msvcr110 \
+        msvcr120 msvcr120_app msvcr70 msvcr71 msvcr80 \
        msvcr90 msvcrt msvcrt20 msvcrt40 msvcrtd msvfw32 \
        msvidc32 msxml msxml2 msxml3 msxml4 msxml6 mtxdm \
        ncrypt nddeapi ndis.sys netapi32 netcfgx netprofm \
-        newdev normaliz npmshtml npptools ntdsapi ntprint \
+        newdev ninput normaliz npmshtml npptools ntdsapi \
-        objsel odbc32 odbccp32 odbccu32 ole32 oleacc oleaut32 \
+        ntprint objsel odbc32 odbccp32 odbccu32 ole32 oleacc \
-        olecli32 oledb32 oledlg olepro32 olesvr32 olethk32 \
+        oleaut32 olecli32 oledb32 oledlg olepro32 olesvr32 \
-        openal32 opencl packager pdh photometadatahandler \
+        olethk32 opcservices openal32 opencl packager pdh \
-        pidgen powrprof printui prntvpt propsys psapi \
+        photometadatahandler pidgen powrprof printui prntvpt \
-        pstorec qcap qedit qmgr qmgrprxy quartz query \
+        propsys psapi pstorec qcap qedit qmgr qmgrprxy \
-        rasapi32 rasdlg regapi resutils riched20 riched32 \
+        quartz query qwave rasapi32 rasdlg regapi resutils \
-        rpcrt4 rsabase rsaenh rstrtmgr rtutils samlib sapi \
+        riched20 riched32 rpcrt4 rsabase rsaenh rstrtmgr \
-        scarddlg sccbase schannel schedsvc scrobj scrrun \
+        rtutils samlib sapi sas scarddlg sccbase schannel \
-        scsiport.sys secur32 security sensapi serialui \
+        schedsvc scrobj scrrun scsiport.sys security sensapi \
-        setupapi sfc sfc_os shcore shdoclc shdocvw shell32 \
+        serialui setupapi sfc sfc_os shcore shdoclc shdocvw \
-        shfolder shlwapi slbcsp slc snmpapi softpub spoolss \
+        shell32 shfolder shlwapi slbcsp slc snmpapi softpub \
-        sspicli sti svrapi sxs t2embed tapi32 taskschd tdh \
+        spoolss srclient sspicli sti strmdll svrapi sxs \
-        tdi.sys traffic ucrtbase uiautomationcore uiribbon \
+        t2embed tapi32 taskschd tdh tdi.sys traffic tzres \
-        updspapi url urlmon usbd.sys userenv usp10 uxtheme \
+        ucrtbase uiautomationcore uiribbon updspapi url \
-        vbscript vcomp vcomp100 vcomp110 vcomp120 vcomp140 \
+        urlmon usbd.sys userenv usp10 uxtheme vbscript \
-        vcomp90 vcruntime140 version virtdisk vssapi wbemdisp \
+        vcomp vcomp100 vcomp110 vcomp120 vcomp140 vcomp90 \
+        vcruntime140 version virtdisk vssapi vulkan-1 wbemdisp \
        wbemprox wdscore webservices wer wevtapi wiaservc \
        wimgapi windowscodecs windowscodecsext winebus.sys \
-        winegstreamer winehid.sys winemapi wing32 winhttp \
+        winegstreamer winehid.sys winemapi winevulkan wing32 \
-        wininet winnls32 winscard winsta wintrust winusb \
+        winhttp wininet winnls32 winscard winsta wintrust \
-        wlanapi wldap32 wmasf wmi wmiutils wmp wmphoto \
+        winusb wlanapi wldap32 wmasf wmi wmiutils wmp wmphoto \
        wmvcore wpc wpcap wsdapi wshom.ocx wsnmp32 wtsapi32 \
        wuapi wuaueng x3daudio1_0 x3daudio1_1 x3daudio1_2 \
        x3daudio1_3 x3daudio1_4 x3daudio1_5 x3daudio1_6 \
@@ -3163,6 +3217,9 @@ winetricks_latest_version_check()
            ru*) w_warn "Отсутствует подключение к Github? версия '${latest_version}' может быть неактуальной" ;;
            *) w_warn "Github down? version '${latest_version}' doesn't appear to be a valid version" ;;
        esac
+        # If we can't get the latest version, no reason to go further:
+        return
    fi
    if [ ! "$WINETRICKS_VERSION" = "${latest_version}" ] && [ ! "$WINETRICKS_VERSION" = "${latest_version}-next" ]; then
@@ -3331,8 +3388,6 @@ winetricks_prefixmenu()
             _W_msg_mkprefix="Создать новый путь wine"
             _W_msg_unattended0="Отключить автоматическую установку"
             _W_msg_unattended1="Включить автоматическую установку"
-             _W_msg_showbroken0="Спрятать нерабочие программы (например, использующие DRM)"
-             _W_msg_showbroken1="Отобразить нерабочие программы (например, использующие DRM)"
             _W_msg_help="Просмотр справки (в веб-браузере)"
             ;;
        uk*) _W_msg_title="Winetricks - виберіть wineprefix"
@@ -3344,34 +3399,28 @@ winetricks_prefixmenu()
             _W_msg_mkprefix="створити новий wineprefix"
             _W_msg_unattended0="Вимкнути автоматичне встановлення"
             _W_msg_unattended1="Увімкнути автоматичне встановлення"
-             _W_msg_showbroken0="Сховати нестабільні додатки (наприклад з проблемами з DRM)"
-             _W_msg_showbroken1="Показати нестабільні додатки (наприклад з проблемами з DRM)"
             _W_msg_help="Переглянути довідку"
             ;;
-        zh_CN*)   _W_msg_title="Windows 应用安装向导 - 选择一个 wine 容器"
+        zh_CN*)   _W_msg_title="Winetricks - 选择一个 Wine 容器"
-             _W_msg_body='君欲何为？'
+             _W_msg_body='您想要做什么？'
-             _W_msg_apps='安装一个 windows 应用'
+             _W_msg_apps='安装一个 Windows 应用'
             _W_msg_games='安装一个游戏'
             _W_msg_benchmarks='安装一个基准测试软件'
-             _W_msg_default="选择默认的 wine 容器"
+             _W_msg_default="选择默认的 Wine 容器"
-             _W_msg_mkprefix="创建新的 wine 容器"
+             _W_msg_mkprefix="创建新的 Wine 容器"
             _W_msg_unattended0="禁用静默安装"
             _W_msg_unattended1="启用静默安装"
-             _W_msg_showbroken0="隐藏有问题的程序 (例如那些有数字版权问题)"
-             _W_msg_showbroken1="有问题的程序 (例如那些有数字版权问题)"
             _W_msg_help="查看帮助"
             ;;
-        zh_TW*|zh_HK*)   _W_msg_title="Windows 應用安裝向導 - 選取一個 wine 容器"
+        zh_TW*|zh_HK*)   _W_msg_title="Winetricks - 選取一個 Wine 容器"
-             _W_msg_body='君欲何為？'
+             _W_msg_body='您想要做什麼？'
-             _W_msg_apps='安裝一個 windows 應用'
+             _W_msg_apps='安裝一個 Windows 應用'
             _W_msg_games='安裝一個遊戲'
             _W_msg_benchmarks='安裝一個基准測試軟體'
-             _W_msg_default="選取預設的 wine 容器"
+             _W_msg_default="選取預設的 Wine 容器"
-             _W_msg_mkprefix="创建新的 wine 容器"
+             _W_msg_mkprefix="建立新的 Wine 容器"
             _W_msg_unattended0="禁用靜默安裝"
             _W_msg_unattended1="啟用靜默安裝"
-             _W_msg_showbroken0="隱藏有問題的程式 (例如那些有數字版權問題)"
-             _W_msg_showbroken1="有問題的程式 (例如那些有數字版權問題)"
             _W_msg_help="檢視輔助說明"
             ;;
        de*) _W_msg_title="Winetricks - wineprefix auswählen"
@@ -3383,8 +3432,6 @@ winetricks_prefixmenu()
             _W_msg_mkprefix="Neuen wineprefix erstellen"
             _W_msg_unattended0="Automatische Installation deaktivieren"
             _W_msg_unattended1="Automatische Installation aktivieren"
-             _W_msg_showbroken0="Defekte Programme nicht anzeigen (z.B. solche mit DRM Problemen)"
-             _W_msg_showbroken1="Defekte Programme anzeigen (z.B. solche mit DRM Problemen)"
             _W_msg_help="Hilfe anzeigen"
             ;;
        pl*) _W_msg_title="Winetricks - wybierz prefiks Wine"
@@ -3396,8 +3443,6 @@ winetricks_prefixmenu()
             _W_msg_mkprefix="Stwórz nowy prefiks Wine"
             _W_msg_unattended0="Wyłącz cichą instalację"
             _W_msg_unattended1="Włącz cichą instalację"
-             _W_msg_showbroken0="Ukrywaj uszkodzone aplikacje (np. z problemami z DRM)"
-             _W_msg_showbroken1="Pokazuj uszkodzone aplikacje (np. z problemami z DRM)"
             _W_msg_help="Wyświetl pomoc"
             ;;
        *)   _W_msg_title="Winetricks - choose a wineprefix"
@@ -3409,8 +3454,6 @@ winetricks_prefixmenu()
             _W_msg_mkprefix="Create new wineprefix"
             _W_msg_unattended0="Disable silent install"
             _W_msg_unattended1="Enable silent install"
-             _W_msg_showbroken0="Hide broken apps (e.g. those with DRM problems)"
-             _W_msg_showbroken1="Show broken apps (e.g. those with DRM problems)"
             _W_msg_help="View help"
             ;;
    esac
@@ -3418,10 +3461,6 @@ winetricks_prefixmenu()
        1) _W_cmd_unattended=attended; _W_msg_unattended="$_W_msg_unattended0" ;;
        *) _W_cmd_unattended=unattended; _W_msg_unattended="$_W_msg_unattended1" ;;
    esac
-    case "$W_OPT_SHOWBROKEN" in
-        1) _W_cmd_showbroken=hidebroken; _W_msg_showbroken="$_W_msg_showbroken0" ;;
-        *) _W_cmd_showbroken=showbroken; _W_msg_showbroken="$_W_msg_showbroken1" ;;
-    esac
    case $WINETRICKS_GUI in
        zenity)
@@ -3465,7 +3504,6 @@ winetricks_prefixmenu()
                done >> "$WINETRICKS_WORKDIR"/zenity.sh
            fi
            printf %s " FALSE $_W_cmd_unattended '$_W_msg_unattended'" >> "$WINETRICKS_WORKDIR"/zenity.sh
-            printf %s " FALSE $_W_cmd_showbroken '$_W_msg_showbroken'" >> "$WINETRICKS_WORKDIR"/zenity.sh
            sh "$WINETRICKS_WORKDIR"/zenity.sh | tr '|' ' '
            ;;
@@ -3498,7 +3536,6 @@ winetricks_prefixmenu()
                done
            fi
            printf %s " $_W_cmd_unattended '$_W_msg_unattended' off"
-            printf %s " $_W_cmd_showbroken '$_W_msg_showbroken' off"
            ) > "$WINETRICKS_WORKDIR"/kdialog.sh
            sh "$WINETRICKS_WORKDIR"/kdialog.sh
            ;;
@@ -3615,33 +3652,33 @@ winetricks_mainmenu()
             _W_msg_folder='Перегляд файлів'
             _W_msg_annihilate="Видалити УСІ ДАНІ ТА ПРОГРАМИ З ЦЬОГО WINEPREFIX"
             ;;
-        zh_CN*)   _W_msg_title="Windows 应用安装向导 - 当前容器路径是 \"$WINEPREFIX\""
+        zh_CN*)   _W_msg_title="Winetricks - 当前容器路径是 \"$WINEPREFIX\""
             _W_msg_body='管理当前容器'
             _W_msg_dlls="安装 Windows DLL 或组件"
             _W_msg_fonts='安装字体'
             _W_msg_settings='修改设置'
-             _W_msg_winecfg='运行 winecfg'
+             _W_msg_winecfg='运行 Wine 配置程序'
             _W_msg_regedit='运行注册表'
             _W_msg_taskmgr='运行任务管理器'
             _W_msg_explorer='运行资源管理器'
             _W_msg_uninstaller='运行卸载程序'
             _W_msg_shell='运行命令提示窗口 (作为调试)'
             _W_msg_folder='浏览容器中的文件'
-             _W_msg_annihilate="删除当前容器所有相关文件，包括启动器，完全卸载"
+             _W_msg_annihilate="删除容器中所有数据和应用程序"
             ;;
-        zh_TW*|zh_HK*)   _W_msg_title="Windows 應用裝載向導 - 目前容器路徑是 \"$WINEPREFIX\""
+        zh_TW*|zh_HK*)   _W_msg_title="Winetricks - 目前容器路徑是 \"$WINEPREFIX\""
             _W_msg_body='管理目前容器'
-             _W_msg_dlls="裝載 Windows DLL 或套件"
+             _W_msg_dlls="安裝 Windows DLL 或套件"
-             _W_msg_fonts='裝載字型'
+             _W_msg_fonts='安裝字型'
             _W_msg_settings='修改設定'
-             _W_msg_winecfg='執行 winecfg'
+             _W_msg_winecfg='執行 Wine 設定程式'
-             _W_msg_regedit='執行註冊表'
+             _W_msg_regedit='執行登錄編輯程式'
-             _W_msg_taskmgr='執行工作管理者'
+             _W_msg_taskmgr='執行工作管理員'
-             _W_msg_explorer='執行資源經理'
+             _W_msg_explorer='執行檔案總管'
-             _W_msg_uninstaller='執行反安裝程式'
+             _W_msg_uninstaller='執行解除安裝程式'
-             _W_msg_shell='執行指令輔助說明視窗 (作為除錯)'
+             _W_msg_shell='執行命令提示視窗 (作為偵錯)'
             _W_msg_folder='瀏覽容器中的檔案'
-             _W_msg_annihilate="移除目前容器所有相依檔案，包括啟動器，完全卸載"
+             _W_msg_annihilate="刪除容器中所有資料和應用程式"
             ;;
        *)   _W_msg_title="Winetricks - current prefix is \"$WINEPREFIX\""
             _W_msg_body='What would you like to do to this wineprefix?'
@@ -3733,11 +3770,11 @@ winetricks_settings_menu()
        uk*) _W_msg_title="Winetricks - поточний prefix \"$WINEPREFIX\""
             _W_msg_body='Які налаштування Ви хочете змінити?'
             ;;
-        zh_CN*)   _W_msg_title="Windows 应用安装向导 - 当前容器路径是 \"$WINEPREFIX\""
+        zh_CN*)   _W_msg_title="Winetricks - 当前容器路径是 \"$WINEPREFIX\""
-             _W_msg_body='君欲更改哪项设置？'
+             _W_msg_body='您想要更改哪项设置？'
             ;;
-        zh_TW*|zh_HK*)   _W_msg_title="Windows 應用裝載向導 - 目前容器路徑是 \"$WINEPREFIX\""
+        zh_TW*|zh_HK*)   _W_msg_title="Winetricks - 目前容器路徑是 \"$WINEPREFIX\""
-             _W_msg_body='君欲變更哪項設定？'
+             _W_msg_body='您想要變更哪項設定？'
             ;;
        *)   _W_msg_title="Winetricks - current prefix is \"$WINEPREFIX\""
             _W_msg_body='Which settings would you like to change?'
@@ -3910,12 +3947,12 @@ winetricks_showmenu()
             _W_msg_body='Які пакунки Ви хочете встановити?'
             _W_cached="кешовано"
             ;;
-        zh_CN*)   _W_msg_title="Windows 应用安装向导 - 当前容器路径是 \"$WINEPREFIX\""
+        zh_CN*)   _W_msg_title="Winetricks - 当前容器路径是 \"$WINEPREFIX\""
-             _W_msg_body='君欲安装何种应用？'
+             _W_msg_body='您想要安装什么应用程序？'
             _W_cached="已缓存"
             ;;
-        zh_TW*|zh_HK*)   _W_msg_title="Windows 應用裝載向導 - 目前容器路徑是 \"$WINEPREFIX\""
+        zh_TW*|zh_HK*)   _W_msg_title="Winetricks - 目前容器路徑是 \"$WINEPREFIX\""
-             _W_msg_body='君欲裝載何種應用？'
+             _W_msg_body='您想要安裝什麼應用程式？'
             _W_cached="已緩存"
             ;;
        *)   _W_msg_title="Winetricks - current prefix is \"$WINEPREFIX\""
@@ -3940,8 +3977,6 @@ winetricks_showmenu()
                        --column År \
                        --column Medie \
                        --column Status \
-                        --column 'Size (MB)' \
-                        --column 'Time (sec)' \
                        --height $WINETRICKS_MENU_HEIGHT \
                        --width $WINETRICKS_MENU_WIDTH \
                        "
@@ -3958,8 +3993,6 @@ winetricks_showmenu()
                        --column Jahr \
                        --column Media \
                        --column Status \
-                        --column 'Größe (MB)' \
-                        --column 'Zeit (sec)' \
                        --height $WINETRICKS_MENU_HEIGHT \
                        --width $WINETRICKS_MENU_WIDTH \
                        "
@@ -3976,8 +4009,6 @@ winetricks_showmenu()
                        --column Rok \
                        --column Media \
                        --column Status \
-                        --column 'Rozmiar (MB)' \
-                        --column 'Czas (sek)' \
                        --height $WINETRICKS_MENU_HEIGHT \
                        --width $WINETRICKS_MENU_WIDTH \
                        "
@@ -3994,8 +4025,6 @@ winetricks_showmenu()
                        --column Год \
                        --column Источник \
                        --column Статус \
-                        --column 'Размер (МБ)' \
-                        --column 'Время (сек)' \
                        --height $WINETRICKS_MENU_HEIGHT \
                        --width $WINETRICKS_MENU_WIDTH \
                        "
@@ -4012,8 +4041,6 @@ winetricks_showmenu()
                        --column Рік \
                        --column Медіа \
                        --column Статус \
-                        --column 'Розмір (МБ)' \
-                        --column 'Час (сек)' \
                        --height $WINETRICKS_MENU_HEIGHT \
                        --width $WINETRICKS_MENU_WIDTH \
                        "
@@ -4030,8 +4057,6 @@ winetricks_showmenu()
                        --column 发行年 \
                        --column 媒介 \
                        --column 状态 \
-                        --column '文件大小 (MB)' \
-                        --column '时间 (秒)' \
                        --height $WINETRICKS_MENU_HEIGHT \
                        --width $WINETRICKS_MENU_WIDTH \
                        "
@@ -4048,8 +4073,6 @@ winetricks_showmenu()
                        --column 發行年 \
                        --column 媒介 \
                        --column 狀態 \
-                        --column '檔案大小 (MB)' \
-                        --column '時間 (秒)' \
                        --height $WINETRICKS_MENU_HEIGHT \
                        --width $WINETRICKS_MENU_WIDTH \
                        "
@@ -4066,8 +4089,6 @@ winetricks_showmenu()
                        --column Year \
                        --column Media \
                        --column Status \
-                        --column 'Size (MB)' \
-                        --column 'Time (sec)' \
                        --height $WINETRICKS_MENU_HEIGHT \
                        --width $WINETRICKS_MENU_WIDTH \
                        "
@@ -4083,8 +4104,6 @@ winetricks_showmenu()
                    title='?'
                    # shellcheck disable=SC1090
                    . "$metadatafile"
-                    # shellcheck disable=SC2154
-                    if test "$W_OPT_SHOWBROKEN" = 1 || test "$wine_showstoppers" = ""; then
                    # Compute cached and downloadable flags
                    flags=""
                    winetricks_is_cached "$code" && flags="$_W_cached"
@@ -4100,10 +4119,7 @@ winetricks_showmenu()
                        \"$year\" \
                        \"$media\" \
                        \"$flags\" \
-                            \"$size_MB\" \
-                            \"$time_sec\" \
                    "
-                    fi
                )
            done >> "$WINETRICKS_WORKDIR"/zenity.sh
@@ -4948,7 +4964,7 @@ winetricks_set_wineprefix()
    W_PROGRAMS_WIN="$(w_expand_env ProgramFiles)"
    case "$W_PROGRAMS_WIN" in
        "") w_info "$(winetricks_print_wineprefix_info)" ; w_die "$WINE cmd.exe /c echo '%ProgramFiles%' returned empty string, error message \"$(cat $W_TMP_EARLY/early_wine.err.txt)\" ";;
-        %*) w_info "$(winetricks_print_wineprefix_info)" ; w_die "$WINE cmd.exe /c echo '%ProgramFiles%' returned unexpanded string '$W_PROGRAMS_WIN' ... this can be caused by a corrupt wineprefix, by an old wine, or by not owning $WINEPREFIX" ;;
+        %*) w_info "$(winetricks_print_wineprefix_info)" ; w_die "$WINE cmd.exe /c echo '%ProgramFiles%' returned unexpanded string '$W_PROGRAMS_WIN' ... this can be caused by a corrupt wineprefix (\`wineboot -u\` may help), by an old wine, or by not owning $WINEPREFIX" ;;
        *unknown*) w_info "$(winetricks_print_wineprefix_info)" ; w_die "$WINE cmd.exe /c echo '%ProgramFiles%' returned a string containing the word 'unknown', as if a voice had cried out in terror, and was suddenly silenced." ;;
    esac
@@ -5362,7 +5378,6 @@ Optionen:
    --no-clean        Temp Verzeichnisse nicht löschen (nützlich beim debuggen)
 -q, --unattended      Keine Fragen stellen, alles automatisch installieren
 -r, --ddrescue        Alternativer Zugriffsmodus (hilft bei zerkratzten Disks)
-    --showbroken      Auch Verben anzeigen die momentan in Wine nicht funktionieren
 -t  --torify          Run downloads under torify, if available
    --verify          Wenn Möglisch automatische GUI Tests für Verben starten
 -v, --verbose         Alle ausgeführten Kommandos anzeigen
@@ -5404,7 +5419,6 @@ Options:
    --no-clean        Don't delete temp directories (useful during debugging)
 -q, --unattended      Don't ask any questions, just install automatically
 -r, --ddrescue        Retry hard when caching scratched discs
-    --showbroken      Even show verbs that are currently broken in wine
 -t  --torify          Run downloads under torify, if available
    --verify          Run (automated) GUI tests for verbs, if available
 -v, --verbose         Echo all commands as they are executed
@@ -5449,7 +5463,6 @@ winetricks_handle_option()
        -q|--unattended) winetricks_set_unattended 1 ;;
        -r|--ddrescue) WINETRICKS_OPT_DD=ddrescue ;;
        --self-update) winetricks_selfupdate;;
-        --showbroken) W_OPT_SHOWBROKEN=1 ;;
        -t|--torify)  WINETRICKS_OPT_TORIFY=1 ;;
        --update-rollback) winetricks_selfupdate_rollback;;
        -v|--verbose) WINETRICKS_OPT_VERBOSE=1 ; set -x;;
@@ -5661,7 +5674,8 @@ load_adobeair()
    # 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
-    w_download https://airdownload.adobe.com/air/win/download/latest/AdobeAIRInstaller.exe dc82421f135627802b21619bdb7e4b9b0ec16d351120485c575aa6c16cd2737e
+    # 2018/12/22: 32.0.0.89 (strings 'Adobe AIR.dll' | grep -E "^32\..+\..+" ) sha256sum 24532d41ef2588c0daac4b6f8b7f863ee3c1a1b1e90b2d8d8b3eb4faa657e5e3
+    w_download https://airdownload.adobe.com/air/win/download/latest/AdobeAIRInstaller.exe 24532d41ef2588c0daac4b6f8b7f863ee3c1a1b1e90b2d8d8b3eb4faa657e5e3
    w_try_cd "$W_CACHE/$W_PACKAGE"
    # See https://bugs.winehq.org/show_bug.cgi?id=43506
@@ -5687,14 +5701,14 @@ load_amstream()
 {
    helper_win7sp1 x86_microsoft-windows-directshow-other_31bf3856ad364e35_6.1.7601.17514_none_0f58f1e53efca91e/amstream.dll
    w_try cp "$W_TMP/x86_microsoft-windows-directshow-other_31bf3856ad364e35_6.1.7601.17514_none_0f58f1e53efca91e/amstream.dll" "$W_SYSTEM32_DLLS/amstream.dll"
+    w_try_regsvr amstream.dll
    if [ "$W_ARCH" = "win64" ]; then
        helper_win7sp1_x64 amd64_microsoft-windows-directshow-other_31bf3856ad364e35_6.1.7601.17514_none_6b778d68f75a1a54/amstream.dll
        w_try cp "$W_TMP/amd64_microsoft-windows-directshow-other_31bf3856ad364e35_6.1.7601.17514_none_6b778d68f75a1a54/amstream.dll" "$W_SYSTEM64_DLLS/amstream.dll"
+        w_try_regsvr64 amstream.dll
    fi
-    w_try_regsvr amstream.dll
    w_override_dlls native,builtin amstream
 }
@@ -5796,6 +5810,26 @@ load_cmd()
 #----------------------------------------------------------------
+w_metadata cnc_ddraw dlls \
+    title="Reimplentation of ddraw for CnC games" \
+    homepage="https://github.com/CnCNet/cnc-ddraw" \
+    publisher="CnCNet" \
+    year="2018" \
+    media="download" \
+    file1="cnc-ddraw.zip" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/Shaders/readme.txt"
+load_cnc_ddraw()
+{
+    # Note: only works if ddraw.ini contains settings for the executable
+    w_download https://github.com/CnCNet/cnc-ddraw/releases/download/1.3.4.0/cnc-ddraw.zip c1f85053223ab04a573cc482b43b93a58077e928a401f3364c9dc5542ad090ae
+    w_try_unzip "$W_SYSTEM32_DLLS" "$W_CACHE/$W_PACKAGE/$file1"
+    w_override_dlls native,builtin ddraw
+}
+#----------------------------------------------------------------
 w_metadata comctl32 dlls \
    title="MS common controls 5.80" \
    publisher="Microsoft" \
@@ -5917,11 +5951,14 @@ w_metadata d3dcompiler_43 dlls \
    year="2010" \
    media="download" \
    file1="../directx9/directx_Jun2010_redist.exe" \
-    installed_file1="$W_SYSTEM32_DLLS_WIN/d3dcompiler_43.dll" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3dcompiler_43.dll"
-    wine_showstoppers="24013"   # list a showstopper to hide this from average users for now
 load_d3dcompiler_43()
 {
+    if w_workaround_wine_bug 24013; then
+        w_warn "Native d3dcompiler_43 may cause some d3d10 apps to crash, see https://bugs.winehq.org/show_bug.cgi?id=24013"
+    fi
    dllname=d3dcompiler_43
    helper_directx_Jun2010
@@ -7105,6 +7142,82 @@ load_dxvk93()
    helper_dxvk "$file1" "d3d10_enabled" "3.19" "1.1.88"
 }
+w_metadata dxvk94 dlls \
+    title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.94)" \
+    publisher="Philip Rebohle" \
+    year="2018" \
+    media="download" \
+    file1="dxvk-0.94.tar.gz" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3d10.dll" \
+    installed_file2="$W_SYSTEM32_DLLS_WIN/d3d10_1.dll" \
+    installed_file3="$W_SYSTEM32_DLLS_WIN/d3d10core.dll" \
+    installed_file4="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
+    installed_file5="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
+load_dxvk94()
+{
+    # https://github.com/doitsujin/dxvk
+    w_download "https://github.com/doitsujin/dxvk/releases/download/v0.94/dxvk-0.94.tar.gz" 1f06bfac5b435b62b972806fb3bbd86f7ccae2399b4451e85ae414e03d3712a3
+    helper_dxvk "$file1" "d3d10_enabled" "3.19" "1.1.88"
+}
+w_metadata dxvk95 dlls \
+    title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.95)" \
+    publisher="Philip Rebohle" \
+    year="2018" \
+    media="download" \
+    file1="dxvk-0.95.tar.gz" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3d10.dll" \
+    installed_file2="$W_SYSTEM32_DLLS_WIN/d3d10_1.dll" \
+    installed_file3="$W_SYSTEM32_DLLS_WIN/d3d10core.dll" \
+    installed_file4="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
+    installed_file5="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
+load_dxvk95()
+{
+    # https://github.com/doitsujin/dxvk
+    w_download "https://github.com/doitsujin/dxvk/releases/download/v0.95/dxvk-0.95.tar.gz" 1eea48149f6e94c3c74ecddd92df4f9daa67ab28d0fca548bde5cd40f0e486bf
+    helper_dxvk "$file1" "d3d10_enabled" "3.19" "1.1.88"
+}
+w_metadata dxvk96 dlls \
+    title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.96)" \
+    publisher="Philip Rebohle" \
+    year="2018" \
+    media="download" \
+    file1="dxvk-0.96.tar.gz" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3d10.dll" \
+    installed_file2="$W_SYSTEM32_DLLS_WIN/d3d10_1.dll" \
+    installed_file3="$W_SYSTEM32_DLLS_WIN/d3d10core.dll" \
+    installed_file4="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
+    installed_file5="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
+load_dxvk96()
+{
+    # https://github.com/doitsujin/dxvk
+    w_download "https://github.com/doitsujin/dxvk/releases/download/v0.96/dxvk-0.96.tar.gz" 9d054c1e7a4f59825c651b14d3cfbf0d8c724763f485b3d59c89f1d7194b2206
+    helper_dxvk "$file1" "d3d10_enabled" "3.19" "1.1.88"
+}
+w_metadata dxvk100 dlls \
+    title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (1.0)" \
+    publisher="Philip Rebohle" \
+    year="2018" \
+    media="download" \
+    file1="dxvk-1.0.tar.gz" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3d10.dll" \
+    installed_file2="$W_SYSTEM32_DLLS_WIN/d3d10_1.dll" \
+    installed_file3="$W_SYSTEM32_DLLS_WIN/d3d10core.dll" \
+    installed_file4="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
+    installed_file5="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
+load_dxvk100()
+{
+    # https://github.com/doitsujin/dxvk
+    w_download "https://github.com/doitsujin/dxvk/releases/download/v1.0/dxvk-1.0.tar.gz" 8c8d26544609532201c10e6f5309bf5e913b5ca5b985932928ef9ab238de6dc2
+    helper_dxvk "$file1" "d3d10_enabled" "3.19" "1.1.88"
+}
 #----------------------------------------------------------------
@@ -7125,7 +7238,7 @@ load_dxvk()
    # There's no stable exe URL, but they do provide a RELEASE file that lets us build one:
    w_download_to "${W_TMP_EARLY}" "https://raw.githubusercontent.com/doitsujin/dxvk/master/RELEASE"
    dxvk_version="$(cat "${W_TMP_EARLY}/RELEASE")"
-    w_linkcheck=1_ignore w_download "https://github.com/doitsujin/dxvk/releases/download/v${dxvk_version}/dxvk-${dxvk_version}.tar.gz"
+    w_linkcheck_ignore=1 w_download "https://github.com/doitsujin/dxvk/releases/download/v${dxvk_version}/dxvk-${dxvk_version}.tar.gz"
    helper_dxvk "dxvk-${dxvk_version}.tar.gz" "d3d10_enabled" "3.19" "1.1.88"
    unset dxvk_version
 }
@@ -8343,10 +8456,12 @@ load_dxdiagn()
 {
    helper_win7sp1 x86_microsoft-windows-d..x-directxdiagnostic_31bf3856ad364e35_6.1.7601.17514_none_25cb021dbc0611db/dxdiagn.dll
    w_try cp "$W_TMP/x86_microsoft-windows-d..x-directxdiagnostic_31bf3856ad364e35_6.1.7601.17514_none_25cb021dbc0611db/dxdiagn.dll" "$W_SYSTEM32_DLLS/dxdiagn.dll"
+    w_try_regsvr dxdiagn.dll
    if [ "$W_ARCH" = "win64" ]; then
        helper_win7sp1_x64 amd64_microsoft-windows-d..x-directxdiagnostic_31bf3856ad364e35_6.1.7601.17514_none_81e99da174638311/dxdiagn.dll
        w_try cp "$W_TMP/amd64_microsoft-windows-d..x-directxdiagnostic_31bf3856ad364e35_6.1.7601.17514_none_81e99da174638311/dxdiagn.dll" "$W_SYSTEM64_DLLS/dxdiagn.dll"
+        w_try_regsvr64 dxdiagn.dll
    fi
    w_override_dlls native,builtin dxdiagn
@@ -8369,6 +8484,7 @@ load_dxdiagn_feb2010()
    w_try_cabextract -d "$W_TMP" -L -F dxnt.cab "$W_CACHE"/directx9/$DIRECTX_NAME
    w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'dxdiagn.dll' "$W_TMP/dxnt.cab"
+    w_try_regsvr dxdiagn.dll
    w_override_dlls native dxdiagn
 }
@@ -8419,6 +8535,48 @@ load_esent()
 #----------------------------------------------------------------
+w_metadata faudio dlls \
+    title="FAudio (xaudio reimplemntation, with xna support) builds for win32" \
+    publisher="Kron4ek" \
+    year="2019" \
+    media="download" \
+    file1="faudio-git-a756af4.tar.xz" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/FAudio.dll"
+load_faudio()
+{
+    # FIXME: they have a LATEST file that may be useful in the future
+    # Not sure if we want to have multiple versions like dxvk
+    # Especially when some are prefixed with 'git-'!
+    # https://raw.githubusercontent.com/Kron4ek/FAudio-Builds/master/LATEST
+    faudio_version="$(basename "${file1}" .tar.xz)"
+    # 2018/01/26: b491e9a1eb2052f62d6639be86639203ec1c7e803101db86ef8817a07baaf0a8
+    w_download https://github.com/Kron4ek/FAudio-Builds/releases/download/git-a756af4/faudio-git-a756af4.tar.xz b491e9a1eb2052f62d6639be86639203ec1c7e803101db86ef8817a07baaf0a8
+    w_try_cd "$W_TMP"
+    w_try tar -Jxf "${W_CACHE}/${W_PACKAGE}/${file1}"
+    # They ship an installation script, but it's bash (and we have all needed functionality already)
+    # Unless they add something more complex, this should suffice:
+    for dll in "${faudio_version}/x32/"*.dll; do
+        shortdll="$(basename "${dll}" .dll)"
+        w_try cp "${dll}" "$W_SYSTEM32_DLLS"
+        w_override_dlls native "$shortdll"
+    done
+    if [ "$W_ARCH" = "win64" ]; then
+        for dll in "${faudio_version}/x64/"*.dll; do
+            # Note: 'libgcc_s_sjlj-1.dll' is not included in the 64-bit build
+            shortdll="$(basename "${dll}" .dll)"
+            w_try cp "${dll}" "$W_SYSTEM64_DLLS"
+            w_override_dlls native "$shortdll"
+        done
+    fi
+}
+#----------------------------------------------------------------
 # FIXME: update winetricks_is_installed to look at installed_file2..n
 # https://github.com/Winetricks/winetricks/issues/988
 w_metadata flash dlls \
@@ -8500,6 +8658,80 @@ load_flash()
 #----------------------------------------------------------------
+# $1 - gallium nine standalone archive name (required)
+helper_galliumnine()
+{
+    _W_galliumnine_archive="${1}"
+    _W_galliumnine_tmp="$W_TMP/galliumnine"
+    w_try rm -rf "$_W_galliumnine_tmp"
+    w_try mkdir -p "$_W_galliumnine_tmp"
+    w_try tar -C "$_W_galliumnine_tmp" --strip-components=1 -zxf "$W_CACHE/$W_PACKAGE/$_W_galliumnine_archive"
+    w_try mv "$_W_galliumnine_tmp/lib32/d3d9-nine.dll.so" "$W_SYSTEM32_DLLS/d3d9-nine.dll"
+    w_try mv "$_W_galliumnine_tmp/bin32/ninewinecfg.exe.so" "$W_SYSTEM32_DLLS/ninewinecfg.exe"
+    if test "$W_ARCH" = "win64"; then
+        w_try mv "$_W_galliumnine_tmp/lib64/d3d9-nine.dll.so" "$W_SYSTEM64_DLLS/d3d9-nine.dll"
+        w_try mv "$_W_galliumnine_tmp/bin64/ninewinecfg.exe.so" "$W_SYSTEM64_DLLS/ninewinecfg.exe"
+    fi
+    w_try rm -rf "$_W_galliumnine_tmp"
+    # use ninewinecfg to enable gallium nine
+    WINEDEBUG=-all w_try "$WINE_MULTI" ninewinecfg -e
+    unset _W_galliumnine_tmp _W_galliumnine_archive
+}
+w_metadata galliumnine02 dlls \
+    title="Gallium Nine Standalone (v0.2)" \
+    publisher="Gallium Nine Team" \
+    year="2019" \
+    media="download" \
+    file1="gallium-nine-standalone-v0.2.tar.gz" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3d9-nine.dll" \
+    installed_file2="$W_SYSTEM32_DLLS_WIN/ninewinecfg.exe" \
+    homepage="https://github.com/iXit/wine-nine-standalone"
+load_galliumnine02()
+{
+    w_download "https://github.com/iXit/wine-nine-standalone/releases/download/v0.2/gallium-nine-standalone-v0.2.tar.gz" 6818fe890e343aa32d3d53179bfeb63df40977797bd7b6263e85e2bb57559313
+    helper_galliumnine "$file1"
+}
+w_metadata galliumnine03 dlls \
+    title="Gallium Nine Standalone (v0.3)" \
+    publisher="Gallium Nine Team" \
+    year="2019" \
+    media="download" \
+    file1="gallium-nine-standalone-v0.3.tar.gz" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3d9-nine.dll" \
+    installed_file2="$W_SYSTEM32_DLLS_WIN/ninewinecfg.exe" \
+    homepage="https://github.com/iXit/wine-nine-standalone"
+load_galliumnine03()
+{
+    w_download "https://github.com/iXit/wine-nine-standalone/releases/download/v0.3/gallium-nine-standalone-v0.3.tar.gz" 8bb564073ab2198e5b9b870f7b8cac8d9bc20bc6accf66c4c798e4b450ec0c91
+    helper_galliumnine "$file1"
+}
+w_metadata galliumnine dlls \
+    title="Gallium Nine Standalone (latest)" \
+    publisher="Gallium Nine Team" \
+    year="2019" \
+    media="download" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3d9-nine.dll" \
+    installed_file2="$W_SYSTEM32_DLLS_WIN/ninewinecfg.exe" \
+    homepage="https://github.com/iXit/wine-nine-standalone"
+load_galliumnine()
+{
+    w_download_to "${W_TMP_EARLY}" "https://api.github.com/repos/iXit/wine-nine-standalone/releases/latest" "" "release.json"
+    _W_galliumnine_version="$(grep -w tag_name ${W_TMP_EARLY}/release.json | cut -d '"' -f 4)"
+    w_linkcheck_ignore=1 w_download "https://github.com/iXit/wine-nine-standalone/releases/download/${_W_galliumnine_version}/gallium-nine-standalone-${_W_galliumnine_version}.tar.gz"
+    helper_galliumnine "gallium-nine-standalone-${_W_galliumnine_version}.tar.gz"
+    unset _W_galliumnine_version
+}
+#----------------------------------------------------------------
 w_metadata gdiplus dlls \
    title="MS GDI+" \
    publisher="Microsoft" \
@@ -9397,7 +9629,7 @@ load_msftedit()
        w_try cp "$W_TMP/amd64_microsoft-windows-msftedit_31bf3856ad364e35_6.1.7601.17514_none_33f6fe754dd11735/msftedit.dll" "$W_SYSTEM64_DLLS/msftedit.dll"
    fi
-    w_override_dlls native,builtin mstfedit
+    w_override_dlls native,builtin msftedit
 }
 #----------------------------------------------------------------
@@ -9424,7 +9656,14 @@ load_msxml3()
    rm "$W_SYSTEM32_DLLS"/msxml3.dll
    w_override_dlls native msxml3
    w_try_cd "$W_CACHE/$W_PACKAGE"
+    # See https://github.com/Winetricks/winetricks/issues/1086
+    # and https://bugs.winehq.org/show_bug.cgi?id=26925
+    if w_workaround_wine_bug 26925 "Forcing quiet install"; then
+        w_try "$WINE" msiexec /i msxml3.msi /q
+    else
        w_try "$WINE" msiexec /i msxml3.msi $W_UNATTENDED_SLASH_Q
+    fi
 }
 #----------------------------------------------------------------
@@ -9634,23 +9873,26 @@ load_python26()
 #----------------------------------------------------------------
 w_metadata qasf dlls \
-    title="qasf.dll (from Directx 9 user redistributable)" \
+    title="qasf.dll" \
    publisher="Microsoft" \
-    year="2010" \
+    year="2011" \
    media="download" \
-    file1="../directx9/directx_feb2010_redist.exe" \
+    file1="../win7sp1/windows6.1-KB976932-X86.exe" \
    installed_file1="$W_SYSTEM32_DLLS_WIN/qasf.dll"
 load_qasf()
 {
-    helper_directx_dl
+    helper_win7sp1 x86_microsoft-windows-directshow-asf_31bf3856ad364e35_6.1.7601.17514_none_1cc4e9c15ccc8ae8/qasf.dll
+    w_try cp "$W_TMP/x86_microsoft-windows-directshow-asf_31bf3856ad364e35_6.1.7601.17514_none_1cc4e9c15ccc8ae8/qasf.dll" "$W_SYSTEM32_DLLS/qasf.dll"
-    w_try_cabextract -d "$W_TMP" -L -F dxnt.cab "$W_CACHE"/directx9/$DIRECTX_NAME
-    w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F qasf.dll "$W_TMP/dxnt.cab"
    w_try_regsvr qasf.dll
-    w_override_dlls native qasf
+    if [ "$W_ARCH" = "win64" ]; then
+        helper_win7sp1_x64 amd64_microsoft-windows-directshow-asf_31bf3856ad364e35_6.1.7601.17514_none_78e385451529fc1e/qasf.dll
+        w_try cp "$W_TMP/amd64_microsoft-windows-directshow-asf_31bf3856ad364e35_6.1.7601.17514_none_78e385451529fc1e/qasf.dll" "$W_SYSTEM64_DLLS/qasf.dll"
+        w_try_regsvr64 qasf.dll
+    fi
+    w_override_dlls native,builtin qasf
 }
 #----------------------------------------------------------------
@@ -9690,10 +9932,12 @@ load_qedit()
 {
    helper_win7sp1 x86_microsoft-windows-qedit_31bf3856ad364e35_6.1.7601.17514_none_5ca34698a5a970d2/qedit.dll
    w_try cp "$W_TMP/x86_microsoft-windows-qedit_31bf3856ad364e35_6.1.7601.17514_none_5ca34698a5a970d2/qedit.dll" "$W_SYSTEM32_DLLS/qedit.dll"
+    w_try_regsvr qedit.dll
    if [ "$W_ARCH" = "win64" ]; then
        helper_win7sp1_x64 amd64_microsoft-windows-qedit_31bf3856ad364e35_6.1.7601.17514_none_b8c1e21c5e06e208/qedit.dll
        w_try cp "$W_TMP/amd64_microsoft-windows-qedit_31bf3856ad364e35_6.1.7601.17514_none_b8c1e21c5e06e208/qedit.dll" "$W_SYSTEM64_DLLS/qedit.dll"
+        w_try_regsvr64 qedit.dll
    fi
    w_override_dlls native,builtin qedit
@@ -9702,23 +9946,26 @@ load_qedit()
 #----------------------------------------------------------------
 w_metadata quartz dlls \
-    title="quartz.dll (from Directx 9 user redistributable)" \
+    title="quartz.dll" \
    publisher="Microsoft" \
-    year="2010" \
+    year="2011" \
    media="download" \
-    file1="../directx9/directx_feb2010_redist.exe" \
+    file1="../win7sp1/windows6.1-KB976932-X86.exe" \
    installed_file1="$W_SYSTEM32_DLLS_WIN/quartz.dll"
 load_quartz()
 {
-    helper_directx_dl
+    helper_win7sp1 x86_microsoft-windows-directshow-core_31bf3856ad364e35_6.1.7601.17514_none_a877a1cc4c284497/quartz.dll
+    w_try cp "$W_TMP/x86_microsoft-windows-directshow-core_31bf3856ad364e35_6.1.7601.17514_none_a877a1cc4c284497/quartz.dll" "$W_SYSTEM32_DLLS/quartz.dll"
-    w_try_cabextract -d "$W_TMP" -L -F dxnt.cab "$W_CACHE"/directx9/$DIRECTX_NAME
-    w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F quartz.dll "$W_TMP/dxnt.cab"
    w_try_regsvr quartz.dll
-    w_override_dlls native quartz
+    if [ "$W_ARCH" = "win64" ]; then
+        helper_win7sp1_x64 amd64_microsoft-windows-directshow-core_31bf3856ad364e35_6.1.7601.17514_none_04963d500485b5cd/quartz.dll
+        w_try cp "$W_TMP/amd64_microsoft-windows-directshow-core_31bf3856ad364e35_6.1.7601.17514_none_04963d500485b5cd/quartz.dll" "$W_SYSTEM64_DLLS/quartz.dll"
+        w_try_regsvr64 quartz.dll
+    fi
+    w_override_dlls native,builtin quartz
 }
 #----------------------------------------------------------------
@@ -10982,7 +11229,7 @@ load_wsh57()
 #----------------------------------------------------------------
 w_metadata xact dlls \
-    title="MS XACT Engine" \
+    title="MS XACT Engine (32-bit only)" \
    publisher="Microsoft" \
    year="2010" \
    media="download" \
@@ -11005,7 +11252,7 @@ load_xact()
        w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'xapofx*.dll' "$x"
    done
-    # Don't install 64-bit xact DLLs. They are broken in Wine, see:
+    # Don't install 64-bit xact DLLs by default. They are broken in Wine, see:
    # https://bugs.winehq.org/show_bug.cgi?id=41618#c5
    w_override_dlls native,builtin xaudio2_0 xaudio2_1 xaudio2_2 xaudio2_3 xaudio2_4 xaudio2_5 xaudio2_6 xaudio2_7
@@ -11025,6 +11272,52 @@ load_xact()
 #----------------------------------------------------------------
+w_metadata xact_x64 dlls \
+    title="MS XACT Engine (64-bit only)" \
+    publisher="Microsoft" \
+    year="2010" \
+    media="download" \
+    file1="../directx9/directx_Jun2010_redist.exe" \
+    installed_file1="${W_SYSTEM64_DLLS_WIN64:-does_not_exist}/xactengine2_0.dll"
+load_xact_x64()
+{
+    w_package_unsupported_win32
+    if w_workaround_wine_bug 41618; then
+        w_warn "While this helps some games, it completely breaks others. You've been warned."
+    fi
+    helper_directx_Jun2010
+    # Extract xactengine?_?.dll, X3DAudio?_?.dll, xaudio?_?.dll, xapofx?_?.dll
+    w_try_cabextract -d "$W_TMP" -L -F '*_xact_*x64*' "$W_CACHE/directx9/$DIRECTX_NAME"
+    w_try_cabextract -d "$W_TMP" -L -F '*_x3daudio_*x64*' "$W_CACHE/directx9/$DIRECTX_NAME"
+    w_try_cabextract -d "$W_TMP" -L -F '*_xaudio_*x64*' "$W_CACHE/directx9/$DIRECTX_NAME"
+    for x in "$W_TMP"/*.cab ; do
+        w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'xactengine*.dll' "$x"
+        w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'xaudio*.dll' "$x"
+        w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'x3daudio*.dll' "$x"
+        w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'xapofx*.dll' "$x"
+    done
+    w_override_dlls native,builtin xaudio2_0 xaudio2_1 xaudio2_2 xaudio2_3 xaudio2_4 xaudio2_5 xaudio2_6 xaudio2_7
+    w_override_dlls native,builtin x3daudio1_0 x3daudio1_1 x3daudio1_2 x3daudio1_3 x3daudio1_4 x3daudio1_5 x3daudio1_6 x3daudio1_7
+    w_override_dlls native,builtin xapofx1_1 xapofx1_2 xapofx1_3 xapofx1_4 xapofx1_5
+    # Register xactengine?_?.dll
+    for x in "$W_SYSTEM64_DLLS"/xactengine* ; do
+        w_try_regsvr64 "$(basename "$x")"
+    done
+    # and xaudio?_?.dll, but not xaudio2_8 (unsupported)
+    for x in 0 1 2 3 4 5 6 7 ; do
+        w_try_regsvr64 "$(basename "$W_SYSTEM64_DLLS/xaudio2_${x}")"
+    done
+}
+#----------------------------------------------------------------
 w_metadata xinput dlls \
    title="Microsoft XInput (Xbox controller support)" \
    publisher="Microsoft" \
@@ -13918,15 +14211,6 @@ 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 39403 "Force Steam/Steamwebhelper Client to Windows XP compatibility, to workaround store/web no longer working."; then
-        if [ "$W_ARCH" = "win64" ]; then
-            w_set_app_winver steam.exe winxp64
-            w_set_app_winver steamwebhelper.exe winxp64
-        else
-            w_set_app_winver steam.exe winxp
-            w_set_app_winver steamwebhelper.exe winxp
-        fi
-    fi
 }
 #----------------------------------------------------------------
@@ -14166,6 +14450,11 @@ load_vc2010express()
    w_try_7z "$W_TMP" "$W_CACHE"/vc2010express/VS2010Express1.iso
    w_try_cd "$W_TMP"/VCExpress
+    # Uninstall wine-mono, installer doesn't attempt to install native .Net if mono is installed,
+    # Then the installer throws and exception and fails
+    # See https://github.com/Winetricks/winetricks/issues/1165
+    w_call remove_mono
    # dotnet40 leaves winver at win2k, which causes vc2010 to abort on
    # start because it looks for c:\users\$LOGNAME\Application Data
    w_set_winver winxp
@@ -16975,13 +17264,10 @@ w_metadata mfsx_demo games \
    year="2006" \
    media="download" \
    file1="FSXDemo.exe" \
-    installed_exe1="$W_PROGRAMS_X86_WIN/Microsoft Games/Microsoft Flight Simulator X Demo/fsx.exe" \
+    installed_exe1="$W_PROGRAMS_X86_WIN/Microsoft Games/Microsoft Flight Simulator X Demo/fsx.exe"
-    wine_showstoppers="26411"
 load_mfsx_demo()
 {
-    w_workaround_wine_bug 26411 "Game hangs on first screen for me"
    if w_workaround_wine_bug 25139 "Setting virtual desktop so license screen shows up on first run"; then
        w_call vd=1024x768
    fi
@@ -17404,19 +17690,13 @@ w_metadata masseffect2 games \
    media="dvd" \
    file1="MassEffect2.iso" \
    file2="ME2_Disc2.iso" \
-    installed_exe1="$W_PROGRAMS_X86_WIN/Mass Effect 2/Binaries/MassEffect2.exe" \
+    installed_exe1="$W_PROGRAMS_X86_WIN/Mass Effect 2/Binaries/MassEffect2.exe"
-    wine_showstoppers="23184"
 load_masseffect2()
 {
    w_mount MassEffect2
    w_read_key
-    # FIXME: only do this for Nvidia graphics cards
-    if w_workaround_wine_bug 23151 "Disabling glsl"; then
-        w_call glsl=disabled
-    fi
    w_ahk_do "
        SetTitleMatchMode, 2
        run, ${W_ISO_MOUNT_LETTER}:Setup.exe
@@ -17481,11 +17761,6 @@ load_masseffect2_demo()
 {
    w_download http://static.cdn.ea.com/bioware/u/f/eagames/bioware/masseffect2/ME2_DEMO/MassEffect2DemoEN.exe 4ec5ce1dc90c10512324d24cba2b5b9ba1e1872ed4c23e3ede0fc0accc7d2ff2
-    # FIXME: only do this for Nvidia graphics cards
-    if w_workaround_wine_bug 23151 "Disabling glsl"; then
-        w_call glsl=disabled
-    fi
    # Don't let self-extractor write into $W_CACHE
    case "$W_PLATFORM" in
        windows_cmd|wine_cmd)
@@ -17970,11 +18245,14 @@ w_metadata rct3deluxe games \
    year="2004" \
    media="cd" \
    file1="RCT3.iso" \
-    installed_exe1="$W_PROGRAMS_X86_WIN/Atari/RollerCoaster Tycoon 3/RCT3.EXE"\
+    installed_exe1="$W_PROGRAMS_X86_WIN/Atari/RollerCoaster Tycoon 3/RCT3.EXE"
-    wine_showstoppers="21448"
 load_rct3deluxe()
 {
+    if w_workaround_wine_bug 21448; then
+        w_warn "DRM doesn't work, see https://bugs.winehq.org/show_bug.cgi?id=21448"
+    fi
    w_mount RCT3
    # FIXME: make videos and music work
@@ -18094,8 +18372,7 @@ w_metadata sims3 games \
    year="2009" \
    media="dvd" \
    file1="Sims3.iso" \
-    installed_exe1="$W_PROGRAMS_X86_WIN/Electronic Arts/The Sims 3/Game/Bin/TS3.exe" \
+    installed_exe1="$W_PROGRAMS_X86_WIN/Electronic Arts/The Sims 3/Game/Bin/TS3.exe"
-    wine_showstoppers="26273"
 load_sims3()
 {
@@ -18160,8 +18437,7 @@ w_metadata simsmed games \
    year="2011" \
    media="dvd" \
    file1="TSimsM.iso" \
-    installed_exe1="$W_PROGRAMS_X86_WIN/Electronic Arts/The Sims Medieval/Game/Bin/TSM.exe" \
+    installed_exe1="$W_PROGRAMS_X86_WIN/Electronic Arts/The Sims Medieval/Game/Bin/TSM.exe"
-    wine_showstoppers="26273"
 load_simsmed()
 {
@@ -18259,8 +18535,7 @@ w_metadata sims3_gen games \
    year="2011" \
    media="dvd" \
    file1="Sims3EP04.iso" \
-    installed_exe1="$W_PROGRAMS_X86_WIN/Electronic Arts/The Sims 3 Generations/Game/Bin/TS3EP04.exe" \
+    installed_exe1="$W_PROGRAMS_X86_WIN/Electronic Arts/The Sims 3 Generations/Game/Bin/TS3EP04.exe"
-    wine_showstoppers="26273"
 load_sims3_gen()
 {
@@ -19669,6 +19944,33 @@ _EOF_
    w_try_regedit "$W_TMP_WIN"/vd.reg
 }
+#----------------------------------------------------------------
+# MIME-type file associations settings
+w_metadata mimeassoc=on settings \
+    title="Enable exporting MIME-type file associations to the native desktop (default)"
+w_metadata mimeassoc=off settings \
+    title="Disable exporting MIME-type file associations to the native desktop"
+load_mimeassoc()
+{
+    case "$1" in
+        off) arg=N;;
+        on)  arg=Y;;
+        *) w_die "illegal value $1 for mimeassoc";;
+    esac
+    echo "Setting mimeassoc to $arg"
+    cat > "$W_TMP"/set-mimeassoc.reg <<_EOF_
+REGEDIT4
+[HKEY_CURRENT_USER\\Software\\Wine\\FileOpenAssociations]
+"Enable"="$arg"
+_EOF_
+    w_try_regedit "$W_TMP"/set-mimeassoc.reg
+}
 ####
 # settings->direct3d
@@ -20209,7 +20511,9 @@ load_remove_mono()
    if test "$mono_uuid"; then
         "${WINE_ARCH}" uninstaller --remove "$mono_uuid"
    else
+        # Bail out if mono isn't installed, so we don't break .Net setups
        w_warn "Mono does not appear to be installed."
+        return
    fi
    # FIXME: verify on pristine Windows XP:
@@ -20648,8 +20952,6 @@ execute_command()
            ;;
        unattended) winetricks_set_unattended 1 ;;
        attended) winetricks_set_unattended 0 ;;
-        showbroken) W_OPT_SHOWBROKEN=1 ;;
-        hidebroken) W_OPT_SHOWBROKEN=0 ;;
        arch=*) winetricks_set_winearch "$arg" ;;
        prefix=*) winetricks_set_wineprefix "$arg" ;;
        annihilate) winetricks_annihilate_wineprefix ;;
@@ -20747,11 +21049,16 @@ then
            winetricks_volname "${1#volnameof=}"
            ;;
        "")
-            if test x"$DISPLAY" = x""; then
+            if [ -z "$DISPLAY" ]; then
+                if [ "$(uname -s)" = "Darwin" ]; then
+                    echo "Running on OSX, but DISPLAY is not set...probably using Mac Driver."
+                else
                    echo "DISPLAY not set, not defaulting to gui"
                    winetricks_usage
                    exit 0
                fi
+            fi
            # GUI case
            # No non-option arguments given, so read them from GUI, and loop until user quits
            winetricks_detect_gui

--- a/winetricks/src/winetricks.1
+++ b/winetricks/src/winetricks.1
 .\" -*- nroff -*-
-.TH WINETRICKS 1 "December 2018" "Winetricks 20181203" "Wine Package Manager"
+.TH WINETRICKS 1 "March 2019" "Winetricks 20190310" "Wine Package Manager"
 .SH NAME
 winetricks \- manage virtual Windows environments using Wine
 .SH SYNOPSIS
@@ -59,10 +59,6 @@ Don't ask any questions, just install automatically
 Retry hard when caching scratched discs
 .TP
 .B
-\-\-showbroken
-Even show verbs that are currently broken in Wine
-.TP
-.B
 \-v, \-\-verbose
 Echo all commands as they are executed
 .TP

--- a/winetricks/src/winetricks.appdata.xml
+++ b/winetricks/src/winetricks.appdata.xml
@@ -2,7 +2,7 @@
 <!-- Copyright 2017 Daniel Rusek <mail@asciiwolf.com> -->
 <component type="desktop">
  <id>winetricks.desktop</id>
-  <project_license>GPL-2.1</project_license>
+  <project_license>LGPL-2.1+</project_license>
  <metadata_license>CC0-1.0</metadata_license>
  <name>Winetricks</name>
  <summary>Work around problems and install applications under Wine</summary>

--- a/winetricks/src/winetricks.bash-completion
+++ b/winetricks/src/winetricks.bash-completion
@@ -22,13 +22,13 @@
 ##### Define Global constants / variables #####
 WINETRICKS_PATH="$(command -v winetricks)"
+# https://pkgstore.datahub.io/core/country-list/data_csv/data/d7c9d7cfb42cb69f4422dec222dbbaa8/data_csv.csv
 COUNTRY_CODES="AF AX AL DZ AS AD AO AI AQ AG AR AM AW AU AT AZ BS BH BD BB BY BE BZ BJ BM BT BA BW BV BR IO BN BG BF BI \
 KH CM CA CV KY CF TD CL CN CX CC CO KM CG CK CR CI HR CU CW CY CZ DK DJ DM DO EC EG SV GQ ER EE ET FK FO FJ FI FR \
 GF PF TF GA GM GE DE GH GI GR GL GD GP GU GT GG GN GW GY HT HM VA HN HK HU IS IN ID IQ IE IM IL IT JM JP JE JO KZ KE KI KW KG \
 LA LV LB LS LR LY LI LT LU MO MG MW MY MV ML MT MH MQ MR MU YT MX MC MN ME MS MA MZ MM NA NR NP NL NC NZ NI NE NG NU NF MP NO \
 OM PK PW PA PG PY PE PH PN PL PT PR QA RE RO RU RW BL KN LC MF PM VC WS SM ST SA SN RS SC SL SG SX SK SI SB SO ZA GS SS ES LK \
 SD SR SJ SZ SE CH SY TJ TH TL TG TK TO TT TN TR TM TC TV UG UA AE GB US UM UY UZ VU VN WF EH YE ZM ZW"
-COUNTRY_CODE_URL="https://pkgstore.datahub.io/core/country-list/data_csv/data/d7c9d7cfb42cb69f4422dec222dbbaa8/data_csv.csv"
 INVERTIBLE_OPTS="isolate opt"
 TERMINATING_OPTS="help update version"
 TERMINATING_LIST_COMMAND="list"
@@ -251,32 +251,6 @@ _scrape_all_categories_and_verbs()
 ##### Define general BASH helper functions #####
-# _store_country_codes()
-#   (> COUNTRY_CODE_URL)
-#   (< COUNTRY_CODES)
-#
-# Download a string of 2 ASCII uppercase character Global Country Codes.
-# Only update global variable COUNTRY_CODES, if the list download is successful...
-# Otherwise fallback to the local copy of the Country Codes list.
-#
-_fetch_country_codes()
-{
-    local country_codes
-    # Use some aggressive timeouts here... We can fallback to a local copy of these codes.
-    # shellcheck disable=SC2016
-    country_codes="$(wget -t 3 -T 10 -O - -q "${COUNTRY_CODE_URL}" 2>/dev/null | ${AWK} -F ',' \
-        '{
-            if ($2 ~ "^[[:upper:]][[:upper:]]") {
-                printf("%s%s", not_first ? " " : "", substr($2,1,2))
-                not_first=1;
-            }
-        }' 2>/dev/null
-    )"
-    [[ -z "${country_codes}" ]] || COUNTRY_CODES="${country_codes}"
-}
 # _list_remove_items()
 #  1-N< search-term1 [... search-termN]
 #     < stdin  (list)
@@ -801,7 +775,6 @@ _winetricks()
 [[ -z "${AWK}" ]] && return 1
 # Setup various Global variables (when this script is initially source'd)...
-_fetch_country_codes
 CATEGORIES_VERBS_LIST="$(_scrape_all_categories_and_verbs)"
 RAW_OPTIONS="$(_scrape_options)"
 COMMANDS="$(_scrape_commands)"