just import winetricks-20190615.tar with rpmgs script

winetricks/files/LATEST

-20190310
+20190615

winetricks/files/verbs/apps.txt

-Using winetricks 20190310 - sha256sum: cf44b3cbf4134adb9f9dd7eec0d50b45d34ae65c5432d72edc24bcd1841888ba with wine-3.21-243-g0cc6233e20 and WINEARCH=win32
+Using winetricks 20190615 - sha256sum: b6e465841d1d7bf473d8ecd32ed7a18e0add817444bf54ec25e6c9465584c6e9 with wine-4.9 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]
@@ -9,7 +9,7 @@ busybox                  BusyBox FRP-2121 (Ron Yorston / Busybox authors, 2015)
 cmake                    CMake 2.8 (Kitware, 2013) [downloadable]
 colorprofile             Standard RGB color profile (Microsoft, 2005) [downloadable]
 controlpad               MS ActiveX Control Pad (Microsoft, 1997) [downloadable]
-controlspy               Control Spy 2.0  (Microsoft, 2005) [downloadable]
+controlspy               Control Spy 6  (Microsoft, 2005) [downloadable]
 emu8086                  emu8086 (emu8086.com, 2015) [downloadable]
 ev3                      Lego Mindstorms EV3 Home Edition (Lego, 2014) [downloadable]
 firefox                  Firefox 51.0 (Mozilla, 2017) [downloadable]

winetricks/files/verbs/benchmarks.txt

-Using winetricks 20190310 - sha256sum: cf44b3cbf4134adb9f9dd7eec0d50b45d34ae65c5432d72edc24bcd1841888ba with wine-3.21-243-g0cc6233e20 and WINEARCH=win32
+Using winetricks 20190615 - sha256sum: b6e465841d1d7bf473d8ecd32ed7a18e0add817444bf54ec25e6c9465584c6e9 with wine-4.9 and WINEARCH=win32
 3dmark03                 3D Mark 03 (Futuremark, 2003)
 3dmark05                 3D Mark 05 (Futuremark, 2005) [downloadable]
 3dmark06                 3D Mark 06 (Futuremark, 2006)

winetricks/files/verbs/download.txt

-Using winetricks 20190310 - sha256sum: cf44b3cbf4134adb9f9dd7eec0d50b45d34ae65c5432d72edc24bcd1841888ba with wine-3.21-243-g0cc6233e20 and WINEARCH=win32
+Using winetricks 20190615 - sha256sum: b6e465841d1d7bf473d8ecd32ed7a18e0add817444bf54ec25e6c9465584c6e9 with wine-4.9 and WINEARCH=win32
 3dmark05
 3dmark2000
 3dmark2001
@@ -50,6 +50,7 @@ corefonts
 courier
 crayonphysics_demo
 crypt32
+d3dcompiler_42
 d3dcompiler_43
 d3dcompiler_47
 d3drm
@@ -79,6 +80,10 @@ d3dx9_41
 d3dx9_42
 d3dx9_43
 d3dxof
+d9vk010
+d9vk011
+d9vk012
+d9vk_master
 dbghelp
 devenum
 digitanks_demo
@@ -87,6 +92,7 @@ dinput8
 dirac
 directmusic
 directplay
+directshow
 directx9
 dmband
 dmcompos
@@ -113,7 +119,9 @@ dotnet452
 dotnet46
 dotnet461
 dotnet462
+dotnet471
 dotnet472
+dotnet48
 dotnet_verifier
 dpvoice
 dragonage2_demo
@@ -128,34 +136,45 @@ dxdiagn_feb2010
 dxsdk_jun2010
 dxsdk_nov2006
 dxvk
+dxvk054
+dxvk060
+dxvk061
+dxvk062
+dxvk063
+dxvk064
+dxvk065
+dxvk070
+dxvk071
+dxvk072
+dxvk080
+dxvk081
+dxvk090
+dxvk091
+dxvk092
+dxvk093
+dxvk094
+dxvk095
+dxvk096
 dxvk100
-dxvk54
-dxvk60
-dxvk61
-dxvk62
-dxvk63
-dxvk64
-dxvk65
-dxvk70
-dxvk71
-dxvk72
-dxvk80
-dxvk81
-dxvk90
-dxvk91
-dxvk92
-dxvk93
-dxvk94
-dxvk95
-dxvk96
+dxvk101
+dxvk102
+dxvk103
+dxvk111
+dxvk120
+dxvk121
 emu8086
 esent
 eufonts
 ev3
 eve
 faudio
+faudio1901
+faudio1902
+faudio1903
+faudio1904
 ffdshow
 fifa11_demo
+filever
 firefox
 flash
 fontxplorer
@@ -205,6 +224,7 @@ mpc
 msacm32
 msasn1
 msctf
+msdelta
 msdxmocx
 msflxgrd
 msftedit
@@ -229,6 +249,7 @@ nuget
 office2013pro
 ogg
 ole32
+oleaut32
 ollydbg110
 ollydbg200
 ollydbg201
@@ -236,6 +257,7 @@ opensymbol
 openwatcom
 pdh
 penpenxmas
+peverify
 physx
 pngfilt
 pptfonts
@@ -243,7 +265,9 @@ psdk2003
 psdkwin7
 psdkwin71
 python26
+python27
 qasf
+qcap
 qdvd
 qedit
 qq

winetricks/files/verbs/games.txt

-Using winetricks 20190310 - sha256sum: cf44b3cbf4134adb9f9dd7eec0d50b45d34ae65c5432d72edc24bcd1841888ba with wine-3.21-243-g0cc6233e20 and WINEARCH=win32
+Using winetricks 20190615 - sha256sum: b6e465841d1d7bf473d8ecd32ed7a18e0add817444bf54ec25e6c9465584c6e9 with wine-4.9 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]
 amnesia_tdd_demo         Amnesia: The Dark Descent Demo (Frictional Games, 2010)
 aoe3_demo                Age of Empires III Trial (Microsoft, 2005) [downloadable]
-atmosphir                Atmosphir (Minor Studios, 2011)
 avatar_demo              James Camerons Avatar: The Game Demo (Ubisoft, 2009)
 beneath_a_steel_sky_gog  Beneath a Steel Sky (GOG.com, free) (Virgin Interactive, 1994)
 bfbc2                    Battlefield Bad Company 2 (EA, 2010)

winetricks/files/verbs/manual-download.txt

-Using winetricks 20190310 - sha256sum: cf44b3cbf4134adb9f9dd7eec0d50b45d34ae65c5432d72edc24bcd1841888ba with wine-3.21-243-g0cc6233e20 and WINEARCH=win32
+Using winetricks 20190615 - sha256sum: b6e465841d1d7bf473d8ecd32ed7a18e0add817444bf54ec25e6c9465584c6e9 with wine-4.9 and WINEARCH=win32
 3dmark03
 3dmark06
 amnesia_tdd_demo
-atmosphir
 avatar_demo
 blobby_volley
 bttf101

winetricks/files/verbs/settings.txt

-Using winetricks 20190310 - sha256sum: cf44b3cbf4134adb9f9dd7eec0d50b45d34ae65c5432d72edc24bcd1841888ba with wine-3.21-243-g0cc6233e20 and WINEARCH=win32
+Using winetricks 20190615 - sha256sum: b6e465841d1d7bf473d8ecd32ed7a18e0add817444bf54ec25e6c9465584c6e9 with wine-4.9 and WINEARCH=win32
 alldlls=builtin          Override most common DLLs to builtin
 alldlls=default          Remove all DLL overrides
 ao=disabled              Disable AlwaysOffscreen (default)
@@ -67,6 +67,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
 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/misc/filelists/winxpsp2_support_tools.txt

+Viewing cabinet: /home/austin/Downloads/WindowsXP-KB838079-SupportTools-ENU.exe
+ File size | Date       Time     | Name
+-----------+---------------------+-------------
+     11347 | 04.08.2004 02:59:44 | sup_pro.cab
+     14930 | 04.08.2004 02:59:44 | sup_srv.cab
+   4811582 | 04.08.2004 02:59:44 | support.cab
+    219648 | 04.08.2004 02:59:44 | suptools.msi
+
+Viewing cabinet: sup_pro.cab
+ File size | Date       Time     | Name
+-----------+---------------------+-------------
+       296 | 27.06.2001 21:24:42 | package_description.xml
+    108880 | 28.06.2001 16:50:46 | Desktop.hht
+
+Viewing cabinet: sup_srv.cab
+ File size | Date       Time     | Name
+-----------+---------------------+-------------
+       307 | 27.06.2001 21:19:38 | package_description.xml
+    100868 | 27.06.2001 21:18:26 | Server.hht
+     83536 | 27.06.2001 21:16:16 | toolsctr.hht
+
+Viewing cabinet: support.cab
+ File size | Date       Time     | Name
+-----------+---------------------+-------------
+     80896 | 17.08.2001 14:59:50 | acldiag.exe
+     74752 | 21.07.2001 19:17:28 | activate.doc
+     73728 | 17.08.2001 14:59:50 | activate.exe
+    216091 | 17.08.2001 13:04:02 | addiag.exe
+    659968 | 17.08.2001 14:56:26 | adprop.dll
+    300032 | 17.08.2001 14:59:48 | adsiedit.dll
+     42986 | 21.07.2001 14:14:20 | adsiedit.msc
+     92672 | 17.08.2001 14:59:48 | apidll.dll
+       947 | 21.07.2001 18:22:14 | apimon.cnt
+    166912 | 17.08.2001 14:59:50 | apimon.exe
+     53228 | 21.07.2001 18:22:14 | apimon.hlp
+      7680 | 17.08.2001 14:01:54 | apmstat.exe
+     49152 | 17.08.2001 14:59:50 | bindiff.exe
+    119296 | 04.08.2004 00:57:00 | bitsadmin.exe
+     39936 | 17.08.2001 14:59:50 | browstat.exe
+     62976 | 17.08.2001 13:53:20 | cabarc.exe
+     33262 | 17.08.2001 12:42:14 | clonegg.vbs
+     33418 | 17.08.2001 12:42:16 | cloneggu.vbs
+     33315 | 17.08.2001 12:42:16 | clonelg.vbs
+     88576 | 17.08.2001 13:53:28 | clonepr.dll
+     97280 | 21.07.2001 19:17:28 | clonepr.doc
+     32855 | 17.08.2001 12:42:14 | clonepr.vbs
+    609584 | 21.07.2001 19:17:24 | comctl32.ocx
+    140096 | 21.07.2001 19:17:24 | comdlg32.ocx
+      1317 | 21.07.2001 18:37:28 | depends.cnt
+      6656 | 17.08.2001 14:59:48 | depends.dll
+    615936 | 17.08.2001 14:59:52 | depends.exe
+    128264 | 21.07.2001 18:37:30 | depends.hlp
+     39936 | 17.08.2001 14:59:52 | dfsutil.exe
+     12800 | 17.08.2001 13:48:20 | dhcploc.exe
+     14336 | 17.08.2001 14:02:18 | diruse.exe
+    158720 | 17.08.2001 14:59:52 | dmdiag.exe
+    122880 | 17.08.2001 14:59:52 | dnscmd.exe
+     41472 | 17.08.2001 14:59:52 | dsacls.exe
+    119296 | 21.07.2001 19:13:36 | dsastat.exe
+      1165 | 21.07.2001 19:13:30 | dskprobe.cnt
+     94720 | 17.08.2001 14:03:02 | dskprobe.exe
+     50501 | 21.07.2001 19:13:32 | dskprobe.hlp
+   1748480 | 21.07.2001 19:13:34 | dskprtrb.doc
+      5120 | 17.08.2001 14:59:44 | dumpchk.exe
+    225792 | 21.07.2001 19:15:04 | dupfinder.exe
+     16928 | 21.07.2001 19:15:04 | efsinfo.exe
+     16350 | 21.07.2001 19:17:28 | eula.txt
+     25088 | 17.08.2001 14:59:54 | exctrlst.exe
+     88064 | 04.08.2004 00:57:00 | extract.exe
+     12800 | 17.08.2001 14:59:54 | filever.exe
+     24064 | 17.08.2001 13:47:44 | ftonline.exe
+      4096 | 17.08.2001 14:02:40 | getsid.exe
+     32768 | 17.08.2001 14:59:54 | gflags.exe
+     41472 | 17.08.2001 13:58:54 | gutils.dll
+    831539 | 04.08.2004 00:56:26 | iadstools.dll
+    170496 | 21.07.2001 19:17:28 | iadstools.doc
+    106496 | 04.08.2004 00:56:52 | ipseccmd.exe
+     22016 | 17.08.2001 13:51:24 | ksetup.exe
+     76288 | 17.08.2001 13:51:24 | ktpass.exe
+     35328 | 21.07.2001 19:17:30 | ldp.doc
+    227840 | 17.08.2001 14:59:56 | ldp.exe
+      6144 | 17.08.2001 14:59:56 | memsnap.exe
+     26112 | 17.08.2001 13:54:32 | movetree.dll
+      9728 | 17.08.2001 13:54:32 | movetree.exe
+    176128 | 21.07.2001 19:14:14 | msicuu.exe
+     83968 | 17.08.2001 13:58:44 | msizap.exe
+     50688 | 17.08.2001 14:59:56 | netcap.exe
+    321536 | 17.08.2001 14:59:58 | netdiag.exe
+    147456 | 03.08.2004 23:01:42 | netdom.exe
+     44544 | 17.08.2001 14:03:04 | netset.exe
+    189952 | 17.08.2001 13:52:38 | nltest.exe
+     45892 | 21.07.2001 19:17:26 | ntdetect.chk
+     53248 | 17.08.2001 14:58:20 | ntfrsapi.dll
+      9216 | 17.08.2001 14:59:58 | ntfrsutl.exe
+     13312 | 17.08.2001 14:59:46 | pfmon.exe
+      8704 | 17.08.2001 14:59:46 | pmon.exe
+     11264 | 17.08.2001 14:59:46 | poolmon.exe
+      8704 | 17.08.2001 14:03:06 | pptpclnt.exe
+      8704 | 17.08.2001 14:03:06 | pptpsrv.exe
+      8704 | 17.08.2001 14:59:46 | pstat.exe
+     25088 | 17.08.2001 14:59:46 | pviewer.exe
+     30720 | 17.08.2001 14:59:58 | rasdiag.exe
+    130047 | 17.07.2004 11:43:02 | readme.htm
+     34304 | 17.08.2001 14:59:58 | remote.exe
+   1191987 | 03.08.2004 22:28:52 | replmon.exe
+     14336 | 17.08.2001 13:52:18 | rsdiag.exe
+     14848 | 17.08.2001 13:52:16 | rsdir.exe
+     24064 | 17.08.2001 13:54:32 | sdcheck.exe
+     19909 | 21.07.2001 19:04:02 | search.vbs
+      9728 | 17.08.2001 15:00:00 | setspn.exe
+     11776 | 17.08.2001 14:03:14 | setx.exe
+     59392 | 17.08.2001 14:03:30 | showaccs.exe
+     18944 | 17.08.2001 15:00:00 | showperf.exe
+      4404 | 17.08.2001 12:42:16 | sidhist.vbs
+     53248 | 17.08.2001 14:03:34 | sidwalk.exe
+      4608 | 21.07.2001 19:14:44 | sidwalk.msc
+    102912 | 17.08.2001 14:03:44 | sidwkr.dll
+     40960 | 17.08.2001 14:03:44 | snmputilg.exe
+    213051 | 17.08.2001 15:00:00 | SPCheck.exe
+       735 | 21.07.2001 19:17:30 | st.xml
+    788244 | 21.07.2001 19:17:30 | suptools.chm
+      8704 | 17.08.2001 14:03:54 | timezone.exe
+     18944 | 17.08.2001 15:00:00 | tracefmt.exe
+     26624 | 17.08.2001 15:00:00 | tracelog.exe
+     90624 | 17.08.2001 15:00:00 | tracepdb.exe
+    193536 | 17.08.2001 14:59:48 | traceprt.dll
+    528440 | 17.08.2001 13:04:42 | vfi.exe
+     32256 | 17.08.2001 14:04:08 | whoami.exe
+    105984 | 17.08.2001 14:06:38 | windiff.exe
+     17357 | 21.07.2001 19:22:48 | windiff.hlp
+     25088 | 17.08.2001 15:00:02 | wsremote.exe
+     49664 | 17.08.2001 14:04:12 | xcacls.exe
+     16896 | 03.08.2004 23:00:14 | httpcfg.exe

winetricks/src/winetricks.1

 .\" -*- nroff -*-
-.TH WINETRICKS 1 "March 2019" "Winetricks 20190310" "Wine Package Manager"
+.TH WINETRICKS 1 "June 2019" "Winetricks 20190615" "Wine Package Manager"
 .SH NAME
 winetricks \- manage virtual Windows environments using Wine
 .SH SYNOPSIS

winetricks/tests/shell-checks

@@ -57,12 +57,12 @@ echo "======================== Begin shellcheck version info ===================
 echo "======================== End shellcheck version info ==========================="
 
 # Check if checkbashisms supports `command -v`. If not, warn, or if on travis, patch it:
-cat > "${temp}/test.sh" <<_EOF
+cat > "${temp}/command.sh" <<_EOF
 #!/bin/sh
 command -v grep
 _EOF
 
-if ! "$checkbashisms" --posix "${temp}/test.sh"; then
+if ! "$checkbashisms" --posix "${temp}/command.sh"; then
     echo "Use a sed expression, to add checkbashisms support for 'command -v', based on the patch from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=733511"
     echo "Creating a copy of the checkbashisms script, in ${temp}, to workaround this issue"
     # /usr/bin/ (or /usr/local/bin on OSX) isn't writable on Travis, so we have to patch it in /tmp and use that:
@@ -73,6 +73,25 @@ if ! "$checkbashisms" --posix "${temp}/test.sh"; then
     checkbashisms="${temp}/checkbashisms.patched"
 fi
 
+# FIXME: if we add a third, clean this up
+# Check if checkbashisms supports `command -v`. If not, warn, or if on travis, patch it:
+cat > "${temp}/kill.sh" <<_EOF
+#!/bin/sh
+sleep 5 & spid="$!"
+kill -HUP \$spid
+_EOF
+
+if ! "$checkbashisms" --posix "${temp}/kill.sh"; then
+    echo "Disabling the kill -signal warning"
+    echo "Creating a copy of the checkbashisms script, in ${temp}, to workaround this issue"
+    # /usr/bin/ (or /usr/local/bin on OSX) isn't writable on Travis, so we have to patch it in /tmp and use that:
+    (
+        sed -e '/bashisms.*kill/d' "$checkbashisms" >  "${temp}/checkbashisms.patched.kill" && \
+        chmod +x "${temp}/checkbashisms.patched.kill"
+    )
+    checkbashisms="${temp}/checkbashisms.patched.kill"
+fi
+
 # Use git ls-files if available, this prevents 'finding' scripts that aren't checked into git.
 # E.g., if patching foo fails, then foo.orig would also be 'found'.
 # The find fallback is for non git users, e.g., distros packaging winetricks or end users
@@ -96,5 +115,6 @@ for shellscript in $files_to_check; do
     # https://bugs.launchpad.net/bash8/+bug/1698088
     # E006=line length check
     # E010=do/while same line (in some embedded perl in winetricks)
-    w_try "$bashate" -i E006,E010 "${shellscript}"
+    # E044=Use [[ for non-POSIX comparisions
+    w_try "$bashate" -i E006,E010,E044 "${shellscript}"
 done

winetricks/tests/winetricks-dotnet-grid-test

+#!/bin/sh
+# Test different dotnet installation combinations
+#
+# Copyright (C) 2019 Austin English
+#
+# This software comes with ABSOLUTELY NO WARRANTY.
+#
+# This is free software, placed under the terms of the GNU Lesser
+# Public License version 2.1 (or later), as published by the Free
+# Software Foundation. Please see the file COPYING for details.
+
+set -x
+
+# FIXME: put logs in $SRCDIR/out/; and use the tempdir for prefixes
+# FIXME: prefixes removed by default, but add an option to keep them
+# FIXME: make --force optional
+outdir="$(mktemp -d "${TMPDIR:-/tmp}/winetricks-test.XXXXXXXX")"
+
+# Note: skips dotnet20sdk, which is broken AF
+dotnet_verbs="$(./src/winetricks dlls list | grep ^dotnet | grep -v -e sdk -e verifier | cut -d ' ' -f1)"
+
+for verb1 in $dotnet_verbs; do
+    for verb2 in $dotnet_verbs; do
+        if [ "$verb1" = "$verb2" ]; then
+                continue
+        fi
+
+        combo="${verb1}-${verb2}"
+        case "$combo" in
+            dotnet11*-dotnet20|dotnet11*-dotnet30*|dotnet11*-dotnet35*)
+                echo "Skipping, has a popup that needs to be automated away in -q mode (but fails anyway, so not worth it)";
+                echo "${combo} skipped" | tee -a "${outdir}/statuslog.txt";
+                continue;;
+        esac
+
+        export WINEPREFIX="${outdir}/prefix-${combo}"
+        wineserver -k
+
+        ./src/winetricks -q --force --verify "$verb1" "$verb2" 2>&1 | tee -a "${outdir}/${combo}.txt"
+        status="$?"
+        echo "$combo exited $status" 2>&1 | tee -a "${outdir}/${combo}.txt"
+        echo "$combo exited $status" 2>&1 | tee -a "${outdir}/statuslog.txt"
+
+        rm -rf "$WINEPREFIX"
+    done
+done

winetricks/tests/winetricks-test

@@ -268,6 +268,20 @@ test_speed()
     fi
 }
 
+# test win32 7-zip fallback
+test_7zip()
+{
+    # 7z
+    WINETRICKS_FORCE_WIN_7Z=1 test_command --verify comctl32ocx
+    # ar
+    WINETRICKS_FORCE_WIN_7Z=1 test_command --verify opensymbol
+    # rar
+    # FIXME: protectionid requires a manual download, and the only other user is avatar_demo
+    #WINETRICKS_FORCE_WIN_7Z=1 test_command --verify protectionid
+    # zip
+    WINETRICKS_FORCE_WIN_7Z=1 test_command --verify vb2run
+}
+
 # Return the number of blocks available in the system
 total_df()
 {
@@ -357,7 +371,7 @@ test_command()
 
     # Isolate us from the user's home directory
     # shellcheck disable=SC2086
-    $XVFB $WINETRICKS sandbox
+    $XVFB $WINETRICKS sandbox || fail "\'$XVFB $WINETRICKS sandbox\' failed"
 
     echo "Installing $command"
 
@@ -365,12 +379,20 @@ test_command()
     $XVFB $WINETRICKS --no-isolate -q nocrashdialog "$@"
     return=$?
 
+    if [ -d "$WINEPREFIX/drive_c/windows/syswow64" ]; then
+        WINEARCH="win64"
+    else
+        WINEARCH="win32"
+    fi
+
     if [ "$return" = "32" ] && [ "$WINEARCH" != "win32" ]; then
         skip "$command is not supported on $WINEARCH, requires win32"
         archskip=1
+        return
     elif [ "$return" = "64" ] && [ "$WINEARCH" != "win64" ]; then
         skip "$command is not supported on $WINEARCH, requires win64"
         archskip=1
+        return
     fi
 
     if [ "$EXPECT_FAIL" = "yes" ] ; then
@@ -379,10 +401,13 @@ test_command()
             fail "$command succeeded, should have failed"
         else
             pass "test_command $command expected to fail, and did fail!"
-            return
         fi
     else
-        echo "winetricks $* completed"
+        if [ "$return" = "0" ] ; then
+            pass "$@"
+        else
+            fail "$@"
+        fi
     fi
 
     if [ ! -f time.log ] ; then
@@ -393,50 +418,11 @@ test_command()
 
     echo "test_app: ${app}: install_time $seconds seconds."
 
-    # Cleanup:
-    for x in $command; do
-        case $x in
-            dotnet*)
-                # bug in wine?  the wineconsoles are for the langpacks, and seem empty.
-                if pgrep wineconsole; then
-                    killall wineconsole
-                fi
-                ;;
-            fontxplorer)
-                # a number of apps open a folder on the desktop
-                # FIXME: this should this be in the verb
-                if pgrep winefile ; then
-                    killall winefile.exe
-                fi
-                ;;
-            hegemony*)
-                # FIXME: this should this be in the verb
-                if pgrep Launcher ; then
-                    killall Launcher.exe
-                fi
-                ;;
-            wmi)
-                # wmi starts a service
-                # FIXME: this should this be in the verb
-                if pgrep WinMgmt ; then
-                    killall WinMgmt.exe
-                fi
-                ;;
-        esac
-    done
-
-    # Arcania-Gothic4, et al
-    if pgrep notepad.exe ; then
-        killall notepad.exe
-    fi
-
     echo "Checking for dangling processes!"
     # shellcheck disable=SC2009
     ps augxw | grep \\.exe
     "$WINESERVER" -w
     echo "Wineserver done."
-
-    pass "$@"
 }
 
 test_custom_verbs()
@@ -588,12 +574,10 @@ test_dlls()
 test_dotnet()
 {
     # verify that each individual installer works:
-    for x in dotnet11 dotnet11sp1 \
-            dotnet20 dotnet20sp1 dotnet20sp2 \
-            dotnet30 dotnet30sp1 dotnet35 dotnet35sp1 \
-            dotnet40 dotnet45 dotnet452 dotnet46 dotnet461 dotnet462 dotnet472; do
+    dotnet_verbs="$($WINETRICKS dlls list | grep ^dotnet | grep -v -e sdk -e verifier | cut -d ' ' -f1)"
+    for x in $dotnet_verbs; do
         echo "testing $x"
-        test_command --verify $x
+        test_command --verify "$x"
     done
 
     # FIXME: add other possible combinations
@@ -605,7 +589,7 @@ test_dotnet()
     done
 
     # combinations that should break:
-    for fail_combo in "dotnet11 dotnet20"; do
+    for fail_combo in "dotnet20sp2 dotnet20sp1"; do
         # shellcheck disable=SC2086
         EXPECT_FAIL=yes test_command $fail_combo
     done
@@ -673,6 +657,8 @@ test_quick()
 
     # And test all the automatically-downloadable dlls
     test_dlls
+    # And win32 7zip fallback
+    test_7zip
 }
 
 test_full() {
@@ -688,7 +674,7 @@ test_full() {
 }
 
 test_xvfb() {
-    if [ ! "$(command -v xvfb-run 2>/dev/null)" ] ; then
+    if ! command -v xvfb-run 2>/dev/null; then
         w_die "Please install xvfb-run for xvfb tests"
     fi
 
@@ -805,6 +791,7 @@ test_w_compare_wine_version()
 }
 
 case "$1" in
+    7zip) check_deps; test_7zip;;
     check-deps) check_deps ; exit $? ;;
     custom-verbs) test_custom_verbs ;;
     dotnet) check_deps && test_dotnet ;;