From 7df92630ca00982f8f03f3c7c669c4c3367bfd2c76089056fdab1c8070f7e2a3 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Fri, 19 Feb 2016 16:28:18 +0000
Subject: [PATCH] - Updated to 1.9.4 development snapshot   - Support for color
 glyphs and font fallbacks in DirectWrite.   - Improvements to the WebServices
 reader.   - Support for more formats in Direct3D 11.   - Simplified syntax
 and clean up of tests marked todo.   - Various bug fixes. - updated
 winetricks

- Updated to 1.9.3 development snapshot
  - New version of the Gecko engine based on Firefox 44.
  - JSON support in JavaScript.
  - Improved line breaking in DirectWrite.
  - Some more write support in WebServices.
  - Still more Shader Model 4 instructions.
  - Various bug fixes.
- updated winetricks

OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=344
---
 wine-1.9.2.tar.bz2      |    3 -
 wine-1.9.2.tar.bz2.sign |   17 -
 wine-1.9.4.tar.bz2      |    3 +
 wine-1.9.4.tar.bz2.sign |   17 +
 wine.changes            |   23 +
 wine.spec               |    4 +-
 winetricks              | 1517 ++++-----------------------------------
 7 files changed, 202 insertions(+), 1382 deletions(-)
 delete mode 100644 wine-1.9.2.tar.bz2
 delete mode 100644 wine-1.9.2.tar.bz2.sign
 create mode 100644 wine-1.9.4.tar.bz2
 create mode 100644 wine-1.9.4.tar.bz2.sign

diff --git a/wine-1.9.2.tar.bz2 b/wine-1.9.2.tar.bz2
deleted file mode 100644
index 3dd7fb7..0000000
--- a/wine-1.9.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:334d4d6a71ef2e4a385e01d05d66c1727cbe52646299378d19d203e645044e7a
-size 22965698
diff --git a/wine-1.9.2.tar.bz2.sign b/wine-1.9.2.tar.bz2.sign
deleted file mode 100644
index 3440aae..0000000
--- a/wine-1.9.2.tar.bz2.sign
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABAgAGBQJWojy0AAoJEM76yOqvF1GdN+EP/AmKRq2nLT+sxQhyrbKFoIAV
-dVqPCHPIMrdI24b0Y6BjXoEXcWeRgMAdoKXEpAkbApWeiJGXg+tOMugAmyCSxzPy
-IFkKcLk2YSLFzfEKWUEXgxdbKka+AfNpWZFkuyYWFOi0WwWTPyvepriE7gsmJWhf
-jg3kXXvc6DEobUwBk7IaHcPtorxRQ/gWD6RJgiRNiYjRbLIUREQnWoFqiDhRH/Mt
-CUYf5GSj6MFdVqENXyEyD+1NMrGaFaDh+yuadpWT/s61z8M5WQHwqvuV5R/J+9xF
-PNKv2mpLub5b0gmWjDUFxlZ/r2OmrQ0v0gVSSis1lITrxL7ZLdDOiFiD8JXJTXb6
-paJ71VZLx0XZV9zU5xtjlo8Q5JFagesxfC5Q8+/qqLzW7WdmrXdluv6GbuRCItFm
-12wU3rWQFJ0Hjeu4alEgG/qjcM65IEcDUrp+Kj8PkTEl+ld236v44PQxtajbcdpR
-J/A1HcDG9YGLRg5/50BZDGk4r8DWLXGCp+Tr1Q7Ke/4h8p+H8hYPd/6WEpQd8qgx
-FoU3dmaveSbUuzSxrqZ2mL3N6I+OefCcgxQf850F/p3lgKOCQEbPw36ek8vDHGfx
-cJXjS1DALoA9dCqabSoX9j0ZShT5PzugKWV0wD1vHztpEHDN9Lagbq/yvSDFr6Fr
-9i5bhEQyOS8+Q8q7qoYM
-=tMiC
------END PGP SIGNATURE-----
diff --git a/wine-1.9.4.tar.bz2 b/wine-1.9.4.tar.bz2
new file mode 100644
index 0000000..546d87d
--- /dev/null
+++ b/wine-1.9.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:75c1eab6b980870b367a73db6e57eb0dc9242c2be8546f94084577a0ed0bbbb8
+size 22974777
diff --git a/wine-1.9.4.tar.bz2.sign b/wine-1.9.4.tar.bz2.sign
new file mode 100644
index 0000000..0ec6a58
--- /dev/null
+++ b/wine-1.9.4.tar.bz2.sign
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJWxyzKAAoJEM76yOqvF1Gdy88P/R6+mNvQT9onQMieEYvaQvcI
+8zDCU2N4o2GRu+ZEAK5y9dScPZ22AldV4QsnYuLOHbHW38ToSd7y1bOG/o8/r0vY
+EMYO6q9XaBe52/KnTpX6SBY3sQHw1ph5frR6GK+S9axfBBsHGwg7Mzc48mOEx31G
+LjWDwiqhwSWWsFB9eLVrHb09qUvbC73xJZHIFDJ98l9LM6GIKYFHrUFa7k64GU+o
+0bSXKZuvZXv4xDHF2m3koidCBgmyIwB8mUz1aGyu/GYeQpCfP/HyRxxrQVC0usdz
+u9LJoNrjYU2AjALJ7C7Hi75Vi1i7muD5hyroPmexUMc8ePn8v8HoRetv+QN4Q7Gl
+PN0kcCL0mIlUsAI9tz/DZPhqElQtVyLbag1h+Pgtl70T7RnJSyPTDeG/P0vu4Yoq
+40EvT1avoaKy/X2Depuk7NphSOfSynro0swXBncScXpZBrmzzXtY3T1/jKEknxNa
+5UXxHUJozoapCAz0ZT9MmTjNV+4rBGBPEUmGpVFZ6Saq13bGZ3BQDhl1unicsDEy
+hJNJwyE20QGZp4gAgv+ORH9XbMwyPxbaQjjrOj9sRGgmQzGZn5RCXO9nvZTQqt4q
+zHKOIaLIRo8X6dRv3BvO4gSwi7PZyEnDYTIqQmQVD/sXWAqmUmZIvTu0lQhDW6If
+M+oS6O6JdMzVBwIXAjOl
+=MP4/
+-----END PGP SIGNATURE-----
diff --git a/wine.changes b/wine.changes
index 84f4473..821788c 100644
--- a/wine.changes
+++ b/wine.changes
@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Fri Feb 19 16:27:50 UTC 2016 - meissner@suse.com
+
+- Updated to 1.9.4 development snapshot
+  - Support for color glyphs and font fallbacks in DirectWrite.
+  - Improvements to the WebServices reader.
+  - Support for more formats in Direct3D 11.
+  - Simplified syntax and clean up of tests marked todo.
+  - Various bug fixes.
+- updated winetricks
+
+-------------------------------------------------------------------
+Fri Feb  5 14:28:51 UTC 2016 - meissner@suse.com
+
+- Updated to 1.9.3 development snapshot
+  - New version of the Gecko engine based on Firefox 44.
+  - JSON support in JavaScript.
+  - Improved line breaking in DirectWrite.
+  - Some more write support in WebServices.
+  - Still more Shader Model 4 instructions.
+  - Various bug fixes.
+- updated winetricks
+
 -------------------------------------------------------------------
 Fri Jan 22 14:54:12 UTC 2016 - meissner@suse.com
 
diff --git a/wine.spec b/wine.spec
index a7f5334..453862d 100644
--- a/wine.spec
+++ b/wine.spec
@@ -53,8 +53,8 @@ BuildRequires:  sane-backends-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  valgrind-devel
 BuildRequires:  xorg-x11-devel
-%define realver 1.9.2
-Version:        1.9.2
+%define realver 1.9.4
+Version:        1.9.4
 Release:        0
 Summary:        An MS Windows Emulator
 License:        LGPL-2.1+
diff --git a/winetricks b/winetricks
index 6c3ae24..74ec280 100644
--- a/winetricks
+++ b/winetricks
@@ -731,28 +731,32 @@ w_download_to()
         else
             w_die "Please install wget or aria2c (or, if those aren't available, curl)"
         fi
-        if test $? != 0
+        if test $? = 0
+        then
+            # Need to decompress .exe's that are compressed, else cygwin fails
+            # Also affects ttf files on github
+            _W_filetype=`which file 2>/dev/null`
+            case $_W_filetype-$_W_file in
+            /*-*.exe|/*-*.ttf|/*-*.zip)
+                case `file "$_W_file"` in
+                *:*gzip*) mv "$_W_file" "$_W_file.gz"; gunzip < "$_W_file.gz" > "$_W_file";;
+                esac
+            esac
+
+            # On cygwin, .exe's must be marked +x
+            case "$_W_file" in
+            *.exe) chmod +x "$_W_file" ;;
+            esac
+
+            cd "$_W_dl_olddir"
+            unset _W_dl_olddir
+        elif test $tries = 2
         then
             test -f "$_W_file" && rm "$_W_file"
             w_die "Downloading $_W_url failed"
         fi
-        # Need to decompress .exe's that are compressed, else cygwin fails
-        # Also affects ttf files on github
-        _W_filetype=`which file 2>/dev/null`
-        case $_W_filetype-$_W_file in
-        /*-*.exe|/*-*.ttf|/*-*.zip)
-            case `file "$_W_file"` in
-            *:*gzip*) mv "$_W_file" "$_W_file.gz"; gunzip < "$_W_file.gz" > "$_W_file";;
-            esac
-        esac
-
-        # On cygwin, .exe's must be marked +x
-        case "$_W_file" in
-        *.exe) chmod +x "$_W_file" ;;
-        esac
-
-        cd "$_W_dl_olddir"
-        unset _W_dl_olddir
+        # Download from the Wayback Machine on second try
+        _W_url="https://web.archive.org/web/$_W_url"
     done
 
     if test "$3" && test ! "$checksum_ok"
@@ -1175,17 +1179,6 @@ fi
         w_steam_safemode
     fi
 
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Steam" "steam.exe -login $W_STEAM_ID $W_STEAM_PASSWORD -applaunch $_W_steamid"
-
-    myexec="Exec=env WINEPREFIX=\"$WINEPREFIX\" wine cmd /c 'C:\\\\\\\\Run-$W_PACKAGE.bat'"
-    mymenu="$XDG_DATA_HOME/applications/wine/Programs/Steam/$_W_steamtitle.desktop"
-    if test -f "$mymenu" && w_workaround_wine_bug 26487 "Fixing system menu"
-    then
-        sed -i "s,Exec=.*,$myexec," "$mymenu"
-    else
-        w_warn "bug: could not find system menu entry $_W_steamtitle"
-    fi
-
     unset _W_steamid _W_steamtitle
 }
 
@@ -1311,11 +1304,6 @@ winetricks_load_gog()
         WinWait, Setup - $game_title, Exit Installer
         ControlClick, TMCoPShadowButton1 ; Exit Installer
         "
-
-    if test "$run_command"x != ""x
-    then
-        w_declare_exe "$W_PROGRAMS_X86_WIN\\GOG.com\\$install_dir" "$run_command"
-    fi
 }
 
 #----------------------------------------------------------------
@@ -2112,26 +2100,11 @@ w_metadata()
     esac
 }
 
-# Function for verbs to register their main executable [or, if name is given,
-# other executables]
-# Example:
-#   w_declare_exe "$W_PROGRAMS_X86_WIN\\WorldOfGooDemo" WorldOfGoo.exe [name]
+# Function for verbs to register their main executable [or, if name is given, other executables]
+# Deprecated. No-op for backwards compatibility
 w_declare_exe()
 {
-    _W_dir="$1"
-    _W_exe="$2"
-    if test "$3"
-    then
-        _W_name="$3"
-    else
-        _W_name="$W_PACKAGE"
-    fi
-    cat > "$W_DRIVE_C/run-$_W_name.bat" <<__EOF__
-${W_PROGRAMS_DRIVE}:
-cd "$_W_dir"
-$_W_exe %*
-__EOF__
-    unset _W_dir _W_exe _W_name
+    w_warn "w_declare_exe is deprecated, now a noop"
 }
 
 # Checks that a conflicting verb is not already installed in the prefix
@@ -3822,6 +3795,8 @@ winetricks_set_unattended()
         # Might want to trim our stable of variables here a bit...
         W_UNATTENDED_DASH_Q="-q"
         W_UNATTENDED_SLASH_Q="/q"
+        W_UNATTENDED_SLASH_QN="/qn"
+        W_UNATTENDED_SLASH_QNT="/qnt"
         W_UNATTENDED_SLASH_S="/S"
         W_UNATTENDED_DASH_SILENT="-silent"
         W_UNATTENDED_SLASH_SILENT="/silent"
@@ -3830,6 +3805,8 @@ winetricks_set_unattended()
         W_OPT_UNATTENDED=""
         W_UNATTENDED_DASH_Q=""
         W_UNATTENDED_SLASH_Q=""
+        W_UNATTENDED_SLASH_QN=""
+        W_UNATTENDED_SLASH_QNT=""
         W_UNATTENDED_SLASH_S=""
         W_UNATTENDED_DASH_SILENT=""
         W_UNATTENDED_SLASH_SILENT=""
@@ -3856,7 +3833,7 @@ winetricks_set_wineprefix()
     # The folder-name is localized!
     W_PROGRAMS_WIN="`w_expand_env ProgramFiles`"
     case "$W_PROGRAMS_WIN" in
-    "")  w_die "$WINE cmd.exe /c echo '%ProgramFiles%' returned empty string, error message \"`cat $W_TMP_EARLY/early_wine.err.txt`\" ";;
+    "") w_die "$WINE cmd.exe /c echo '%ProgramFiles%' returned empty string, error message \"`cat $W_TMP_EARLY/early_wine.err.txt`\" ";;
     %*) 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" ;;
     *unknown*) 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
@@ -4280,7 +4257,7 @@ then
     # Which GUI helper to use (none/zenity/kdialog).  See winetricks_detect_gui.
     WINETRICKS_GUI=none
     # Default to a shared prefix:
-    WINETRICKS_OPT_SHAREDPREFIX=1
+    WINETRICKS_OPT_SHAREDPREFIX=${WINETRICKS_OPT_SHAREDPREFIX:-1}
 
     # Handle options before init, to avoid starting wine for --help or --version
     while winetricks_handle_option $1
@@ -4394,7 +4371,7 @@ helper_win7sp1()
 #---------------------------------------------------------
 
 w_metadata  adobeair dlls \
-    title="Adobe AIR 19.0" \
+    title="Adobe AIR 20.x" \
     publisher="Adobe" \
     year="2015" \
     media="download" \
@@ -4417,8 +4394,10 @@ load_adobeair()
     # 2015-11-06: 19.x sha1sum 3bc2a568204a3a9b59ca347ab49585f0c5fab279
     # 2015-12-27: 20.0 sha1sum 9c10b7be43771869c381c73197c9a0fcd1b727cf
     # 2015-12-29: 20.0.0.233 (had to check with strings on Adobe AIR.dll) sha1sum 7161fb8b47721485882f52720f8b41dbfe3b69d0
-    w_download http://airdownload.adobe.com/air/win/download/20.0/AdobeAIRInstaller.exe 7161fb8b47721485882f52720f8b41dbfe3b69d0
-    cd "$W_CACHE"/adobeair
+    # 2016-02-17: 20.0.0.260 (strings 'Adobe AIR.dll' | grep 20\\. ) sha1sum 2fdd561556fe881c4e5538d4ee37f523871befd3
+
+    w_download http://airdownload.adobe.com/air/win/download/20.0/AdobeAIRInstaller.exe 2fdd561556fe881c4e5538d4ee37f523871befd3
+    cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" AdobeAIRInstaller.exe $W_UNATTENDED_DASH_SILENT
 }
 
@@ -4458,7 +4437,7 @@ load_art2kmin()
 {
     # See http://www.microsoft.com/downloads/details.aspx?familyid=d9ae78d9-9dc6-4b38-9fa6-2c745a175aed&displaylang=en
     w_download http://download.microsoft.com/download/D/2/A/D2A2FC8B-0447-491C-A5EF-E8AA3A74FB98/AccessRuntime.exe 571811b7536e97cf4e4e53bbf8260cddd69f9b2d
-    cd "$W_CACHE"/art2kmin
+    cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" AccessRuntime.exe $W_UNATTENDED_SLASH_Q
 }
 
@@ -4509,7 +4488,7 @@ w_metadata cabinet dlls \
 load_cabinet()
 {
     # http://www.microsoft.com/downloads/en/details.aspx?FamilyId=9AD000F2-CAE7-493D-B0F3-AE36C570ADE8&displaylang=en
-    w_download http://web.archive.org/web/20080731135848/http://download.microsoft.com/download/3/b/f/3bf74b01-16ba-472d-9a8c-42b2b4fa0d76/mdac_typ.exe f68594d1f578c3b47bf0639c46c11c5da161feee
+    w_download http://download.microsoft.com/download/3/b/f/3bf74b01-16ba-472d-9a8c-42b2b4fa0d76/mdac_typ.exe f68594d1f578c3b47bf0639c46c11c5da161feee
     w_try_cabextract --directory="$W_TMP" "$W_CACHE"/cabinet/$file1
     w_try cp "$W_TMP"/cabinet.dll "$W_SYSTEM32_DLLS"/cabinet.dll
 
@@ -4581,7 +4560,7 @@ load_comctl32ocx()
     # http://www.microsoft.com/downloads/details.aspx?FamilyID=25437D98-51D0-41C1-BB14-64662F5F62FE
     w_download http://download.microsoft.com/download/3/a/5/3a5925ac-e779-4b1c-bb01-af67dc2f96fc/VisualBasic6-KB896559-v1-ENU.exe f52cf2034488235b37a1da837d1c40eb2a1bad84
     # More ActiveX controls. See https://support.microsoft.com/kb/297381
-    w_download https://web.archive.org/web/20141012205821/http://activex.microsoft.com/controls/vb6/mscomct2.cab 766f9ccf8849a04d757faee379da54d635c8ac71
+    w_download http://activex.microsoft.com/controls/vb6/mscomct2.cab 766f9ccf8849a04d757faee379da54d635c8ac71
 
     w_try_cabextract --directory="$W_TMP" "$W_CACHE"/comctl32ocx/VisualBasic6-KB896559-v1-ENU.exe
     w_try cp "$W_TMP"/mscomctl.ocx "$W_SYSTEM32_DLLS"/mscomctl.ocx
@@ -4607,7 +4586,7 @@ w_metadata comdlg32ocx dlls \
 load_comdlg32ocx()
 {
     # By analogy with vb5 version in http://support.microsoft.com/kb/168917
-    w_download https://web.archive.org/web/20141227220748/http://activex.microsoft.com/controls/vb6/ComDlg32.cab d4f3e193c6180eccd73bad53a8500beb5b279cbf
+    w_download http://activex.microsoft.com/controls/vb6/ComDlg32.cab d4f3e193c6180eccd73bad53a8500beb5b279cbf
     w_try_cabextract --directory="$W_TMP" "$W_CACHE"/comdlg32ocx/${file1}
     w_try cp "$W_TMP"/comdlg32.ocx "$W_SYSTEM32_DLLS"/comdlg32.ocx
     w_try_regsvr comdlg32.ocx
@@ -5190,7 +5169,7 @@ load_directx9()
     # See http://code.google.com/p/winezeug/issues/detail?id=71
     w_set_winver winxp
 
-    cd "$W_CACHE"/directx9
+    cd "$W_CACHE/$W_PACKAGE"
     WINEDLLOVERRIDES="wintrust=b,mscoree=,ddraw,d3d8,d3d9,dsound,dinput=n" \
         w_try "$WINE" $DIRECTX_NAME /t:"$W_TMP_WIN" $W_UNATTENDED_SLASH_Q
 
@@ -5470,13 +5449,8 @@ load_dotnet20()
         "$WINE" reg delete 'HKLM\Software\Microsoft\.NETFramework\v2.0.50727\SBSDisabled'
     fi
 
-    cd "$W_CACHE"/dotnet20
-    if w_workaround_wine_bug 30845 "Using native fusion while installing..." 1.5.8,
-    then
-        w_try env WINEDLLOVERRIDES=mscoree,fusion=n "$WINE" dotnetfx.exe ${W_OPT_UNATTENDED:+/q /c:"install.exe /q"}
-    else
-        w_try "$WINE" dotnetfx.exe ${W_OPT_UNATTENDED:+/q /c:"install.exe /q"}
-    fi
+    cd "$W_CACHE"/"$W_PACKAGE"
+    w_try "$WINE" dotnetfx.exe ${W_OPT_UNATTENDED:+/q /c:"install.exe /q"}
     w_unset_winver
 
     # We can't stop installing dotnet20 in win2K mode until wine supports
@@ -5487,11 +5461,6 @@ load_dotnet20()
     # This affects Victoria 2 demo, see http://forum.paradoxplaza.com/forum/showthread.php?p=11523967
     rm -f "$W_SYSTEM32_DLLS"/msvc?80.dll
 
-    if w_workaround_wine_bug 30162 "Dirty hack, killing off mscorsvw.exe" 1.5.31,
-    then
-        w_killall "mscorsvw.exe"
-    fi
-
     W_NGEN_CMD="w_try $WINE $DRIVE_C/windows/Microsoft.NET/Framework/v2.0.50727/ngen.exe executequeueditems"
 }
 
@@ -5520,7 +5489,7 @@ load_dotnet20sdk()
 
     w_call dotnet20
 
-    cd "$W_CACHE"/dotnet20sdk
+    cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
         SetTitleMatchMode, 2
         run, setup.exe ${W_OPT_UNATTENDED:+/q /c:"install.exe /q"}
@@ -5604,7 +5573,7 @@ load_dotnet20sp1()
     # Workaround Wine/Mono integration:
     "$WINE" reg add "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v2.0.50727" /v Version /t REG_SZ /d "2.0.50727" /f
 
-    cd "$W_CACHE"/dotnet20sp1
+    cd "$W_CACHE/$W_PACKAGE"
     "$WINE" NetFx20SP1_x86.exe ${W_OPT_UNATTENDED:+/q}
     status=$?
 
@@ -5653,28 +5622,13 @@ load_dotnet20sp2()
 
     w_call dotnet20
 
-    WINEDLLOVERRIDES=
-    if w_workaround_wine_bug 22521 "Adding registry key, setting windows version so installer works"
-    then
-        # Recipe from http://bugs.winehq.org/show_bug.cgi?id=22521
-        "$WINE" reg add "HKLM\Software\Microsoft\Net Framework Setup\NDP\v2.0.50727" /v Version /d "2.0.50727" /f
-        # Stop services
-        # Recipe from http://bugs.winehq.org/show_bug.cgi?id=16956
-        $WINESERVER -k
-        # Fight a race condition, see bug 16956 comment 43
-        w_set_winver win2k
-        $WINESERVER -w
-        WINEDLLOVERRIDES=regsvcs.exe,mscorsvw.exe=b
-        export WINEDLLOVERRIDES
-    fi
-
     # FIXME: verify on pristine windows XP:
     if w_workaround_wine_bug 34803
     then
         "$WINE" reg delete 'HKLM\Software\Microsoft\.NETFramework\v2.0.50727\SBSDisabled'
     fi
 
-    cd "$W_CACHE"/dotnet20sp2
+    cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
         SetTitleMatchMode, 2
         run, NetFx20SP2_x86.exe ${W_OPT_UNATTENDED:+ /q /c:"install.exe /q"}
@@ -5728,7 +5682,7 @@ w_metadata dotnet30 dlls \
 load_dotnet30()
 {
     # http://msdn.microsoft.com/en-us/netframework/bb264589.aspx
-    w_download http://web.archive.org/web/20120509084326/http://download.microsoft.com/download/3/F/0/3F0A922C-F239-4B9B-9CB0-DF53621C57D9/dotnetfx3.exe f3d2c3c7e4c0c35450cf6dab1f9f2e9e7ff50039
+    w_download http://download.microsoft.com/download/3/F/0/3F0A922C-F239-4B9B-9CB0-DF53621C57D9/dotnetfx3.exe f3d2c3c7e4c0c35450cf6dab1f9f2e9e7ff50039
 
     w_call remove_mono
 
@@ -5768,18 +5722,9 @@ load_dotnet30()
     # OK if this fails, that just means you have an older wine.
     "$WINE" sc delete "FontCache3.0.0.0"
 
-    if w_workaround_wine_bug 30845 "Using native fusion..." ,1.5.6
-    then
-        # Either adding this registry key
-        #$WINE reg add 'HKLM\Software\Microsoft\.NETFramework' /v InstallRoot /d 'C:\Windows\Microsoft.NET\Framework\' /f
-        # or using native mscoree and fusion
-        WINEDLLOVERRIDES=mscoree,fusion=n
-        export WINEDLLOVERRIDES
-        # will let install start
-    fi
     WINEDLLOVERRIDES="ngen.exe,mscorsvw.exe=b;$WINEDLLOVERRIDES"
 
-    cd "$W_CACHE"/dotnet30
+    cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" $file1 ${W_OPT_UNATTENDED:+ /q /c:"install.exe /q"}
 
     # Doesn't install any ngen.exe
@@ -5916,7 +5861,7 @@ load_dotnet35sp1()
     WINEDLLOVERRIDES=ngen.exe,mscorsvw.exe=b
     export WINEDLLOVERRIDES
 
-    cd "$W_CACHE"/dotnet35sp1
+    cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
         SetTitleMatchMode, 2
         run, dotnetfx35.exe /lang:ENU $W_UNATTENDED_SLASH_Q
@@ -5973,11 +5918,6 @@ load_dotnet40()
     # http://www.microsoft.com/download/en/details.aspx?id=17718
     w_download http://download.microsoft.com/download/9/5/A/95A9616B-7A37-4AF6-BC36-D6EA96C8DAAE/dotNetFx40_Full_x86_x64.exe 58da3d74db353aad03588cbb5cea8234166d8b99
 
-    if w_workaround_wine_bug 30707 "Need to get gacutil.exe"  1.5.5,
-    then
-        w_download_manual http://www.mediafire.com/?v8rw5h1ra7maod4 gacutil-net40.tar.bz2 d40cc1249ea051338c064aff5ba0f1a5f24b59a5
-    fi
-
     w_call remove_mono
 
     # Remove Mono registry entry:
@@ -5994,26 +5934,6 @@ load_dotnet40()
     "$WINE" reg add "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full" /v Install /t REG_DWORD /d 0001 /f
     "$WINE" reg add "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full" /v Version /t REG_SZ /d "4.0.30319" /f
 
-    if w_workaround_wine_bug 30707 "Manually registering assemblies"  1.5.5,
-    then
-        cd "$W_TMP"
-        tar -xvjf "$W_CACHE/$W_PACKAGE/gacutil-net40.tar.bz2"
-
-        for assembly in $W_WINDIR_UNIX/Microsoft.NET/Framework/v4.0.30319/*.[dD]ll
-        do
-            "$WINE" "$W_TMP/gacutil.exe" /i "$(w_pathconv -w $assembly)" /f
-        done
-
-        for assembly in $W_WINDIR_UNIX/Microsoft.NET/Framework/v4.0.30319/WPF/*.[dD]ll
-        do
-            # Some of the dlls aren't assemblies. FIXME: Should filter them based on that..
-            "$WINE" "$W_TMP/gacutil.exe" /i "$(w_pathconv -w $assembly)" /f || true
-        done
-
-        mkdir -p "$W_WINDIR_UNIX/Microsoft.NET/assembly/GAC_32/System.EnterpriseServices/v4.0_4.0.0.0__b03f5f7f11d50a3a"
-        cp "$W_WINDIR_UNIX/Microsoft.NET/Framework/v4.0.30319/System.EnterpriseServices.dll" "$W_WINDIR_UNIX/Microsoft.NET/assembly/GAC_32/System.EnterpriseServices/v4.0_4.0.0.0__b03f5f7f11d50a3a"
-    fi
-
     W_NGEN_CMD="$WINE $WINEPREFIX/drive_c/windows/Microsoft.NET/Framework/v4.0.30319/ngen.exe executequeueditems"
 }
 
@@ -6155,8 +6075,7 @@ load_dotnet_verifier()
     # 2015/12/27: sha1sum b9712da2943e057668f21f68c473657a205c5cb8
     w_download http://blogs.msdn.com/cfs-file.ashx/__key/CommunityServer-Components-PostAttachments/00-08-99-90-04/netfx_5F00_setupverifier_5F00_new.zip b9712da2943e057668f21f68c473657a205c5cb8
 
-    cd "$W_CACHE"/dotnet_verifier
-
+    cd "$W_CACHE/$W_PACKAGE"
     w_try_unzip "$W_SYSTEM32_DLLS" netfx_5F00_setupverifier_5F00_new.zip netfx_setupverifier.exe
 }
 
@@ -6339,8 +6258,8 @@ w_metadata gdiplus_winxp dlls \
 load_gdiplus_winxp()
 {
     w_download_manual http://download.cnet.com/NET-Framework-1-0-GDIPLUS-DLL-Security-Update/3000-10250_4-10732223.html NDP1.0sp2-KB830348-X86-Enu.exe 6113cd89d77525958295ccbd73b5fb8b89abd0aa
-    cd "$W_CACHE"/gdiplus
-    w_try_cabextract -d "$W_TMP" -F FL_gdiplus_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8 "$W_CACHE"/gdiplus_winxp/$file1
+    cd "$W_CACHE/$W_PACKAGE"
+    w_try_cabextract -d "$W_TMP" -F FL_gdiplus_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8 "$W_CACHE/${W_PACKAGE}/$file1"
     w_try cp "$W_TMP/FL_gdiplus_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8" "$W_SYSTEM32_DLLS/gdiplus.dll"
 
     # For some reason, native,builtin isn't good enough...?
@@ -6403,7 +6322,7 @@ load_gfw()
     w_download http://download.microsoft.com/download/5/5/8/55846E20-4A46-4EF8-B272-7F988BC9090A/gfwlivesetupmin.exe 6f9e0ba052c68c8b51bb0e3ce6024d0e1c7b20b2
 
     # FIXME: Depends on .Net 20, but is it really needed? For now, skip it.
-    cd "$W_CACHE"/gfw
+    cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" gfwlivesetupmin.exe /nodotnet $W_UNATTENDED_SLASH_Q
 
     w_call msasn1
@@ -6441,7 +6360,7 @@ w_metadata gmdls dlls \
 
 load_gmdls()
 {
-    w_download_to directx8 http://web.archive.org/web/20070403193305/http://download.microsoft.com/download/whistler/Update/8.1/W982KMeXP/EN-US/DX81Redist.exe ea2345f602741343e97a5ece5d1d2c3cc44296c3
+    w_download_to directx8 http://download.microsoft.com/download/whistler/Update/8.1/W982KMeXP/EN-US/DX81Redist.exe ea2345f602741343e97a5ece5d1d2c3cc44296c3
 
     w_try_unzip "$W_TMP" "$W_CACHE"/directx8/DX81Redist.exe "*/*/DirectX.cab"
     w_try_cabextract -d "$W_TMP" -F gm16.dls "$W_TMP"/*/*/DirectX.cab
@@ -6488,7 +6407,7 @@ load_dirac()
     # Avoid mfc90 not found error.  (DiracSplitter-libschroedinger.ax needs mfc90 to register itself, I think.)
     w_call vcrun2008
 
-    cd "$W_CACHE"/dirac
+    cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
         SetTitleMatchMode, 2
         run DiracDirectShowFilter-1.0.2.exe
@@ -6524,7 +6443,7 @@ w_metadata ffdshow dlls \
 load_ffdshow()
 {
     w_download $WINETRICKS_SOURCEFORGE/ffdshow-tryout/ffdshow_beta7_rev3154_20091209.exe 8534c31489e51df70ee9583438d6211e6f0696d0
-    cd "$W_CACHE"/ffdshow
+    cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" ffdshow_beta7_rev3154_20091209.exe $W_UNATTENDED_SLASH_SILENT
 }
 
@@ -6565,7 +6484,7 @@ load_icodecs()
     # 2014-04-11: http://www.cucusoft.com/codecdownload/codinstl.exe (linked from http://www.cucusoft.com/codec.asp)
     w_download "http://www.cucusoft.com/codecdownload/codinstl.exe" 2c5d64f472abe3f601ce352dcca75b4f02996f8a
 
-    cd "$W_CACHE"/icodecs
+    cd "$W_CACHE/$W_PACKAGE"
 
     w_ahk_do "
         SetTitleMatchMode, 2
@@ -6610,7 +6529,7 @@ load_jet40()
     # See also http://bugs.winehq.org/show_bug.cgi?id=6085
     # FIXME: "failed with error 2"
     w_download http://www.autoxplorer.com/exe/Jet40SP8_9xNT.exe 8cd25342030857969ede2d8fcc34f3f7bcc2d6d4
-    cd "$W_CACHE"/jet40
+    cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" jet40sp8_9xnt.exe $W_UNATTENDED_SLASH_Q
 }
 
@@ -6651,7 +6570,7 @@ w_metadata kindle apps \
 load_kindle()
 {
     w_download http://kindleforpc.amazon.com/42039/KindleForPC-installer-1.13.42039.exe 2316102823d295fb346062e03a8bb594b93cb536
-    cd "$W_CACHE"/kindle
+    cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" $file1 ${W_OPT_UNATTENDED:+ /S}
 
     if w_workaround_wine_bug 39980 "Installing native vcrun2008"
@@ -6702,10 +6621,11 @@ load_mdac27()
     fi
 
     # http://www.microsoft.com/downloads/en/details.aspx?FamilyId=9AD000F2-CAE7-493D-B0F3-AE36C570ADE8&displaylang=en
-    w_download http://web.archive.org/web/20060202021126/http://download.microsoft.com/download/3/b/f/3bf74b01-16ba-472d-9a8c-42b2b4fa0d76/mdac_typ.exe f68594d1f578c3b47bf0639c46c11c5da161feee
+    w_download http://download.microsoft.com/download/3/b/f/3bf74b01-16ba-472d-9a8c-42b2b4fa0d76/mdac_typ.exe f68594d1f578c3b47bf0639c46c11c5da161feee
     load_native_mdac
     w_set_winver nt40
-    w_try "$WINE" "$W_CACHE"/mdac27/mdac_typ.exe ${W_OPT_UNATTENDED:+ /q /C:"setup /QNT"}
+    cd "$W_CACHE"/"$W_PACKAGE"
+    w_try "$WINE" mdac_typ.exe ${W_OPT_UNATTENDED:+ /q /C:"setup $W_UNATTENDED_SLASH_QNT"}
     w_unset_winver
 }
 
@@ -6725,13 +6645,8 @@ load_mdac28()
     w_download http://download.microsoft.com/download/4/a/a/4aafff19-9d21-4d35-ae81-02c48dcbbbff/MDAC_TYP.EXE 4fbc272c79da59e38818924d8575accb0af776fb
     load_native_mdac
     w_set_winver nt40
-    cd "$W_CACHE"/mdac28
-    if [ $W_UNATTENDED_SLASH_Q ]
-    then
-        w_try "$WINE" mdac_typ.exe /q /C:"setup /QNT"
-    else
-        w_try "$WINE" mdac_typ.exe
-    fi
+    cd "$W_CACHE"/"$W_PACKAGE"
+    w_try "$WINE" mdac_typ.exe ${W_OPT_UNATTENDED:+ /q /C:"setup $W_UNATTENDED_SLASH_QNT"}
     w_unset_winver
 }
 
@@ -6845,7 +6760,7 @@ w_metadata mfc40 dlls \
 
 load_mfc40()
 {
-    w_download https://web.archive.org/web/20070316220826/http://activex.microsoft.com/controls/vc/mfc40.cab 53c570e2c811674d6e4fa46cff5a3a04cd0ffc24
+    w_download http://activex.microsoft.com/controls/vc/mfc40.cab 53c570e2c811674d6e4fa46cff5a3a04cd0ffc24
     w_try_cabextract -d "$W_TMP" "$W_CACHE"/mfc40/mfc40.cab
     w_try_cabextract -d "$W_SYSTEM32_DLLS" -F *40.dll "$W_TMP"/mfc40.exe
 }
@@ -6930,9 +6845,14 @@ w_metadata msdxmocx dlls \
 
 load_msdxmocx()
 {
-    # http://www.oldapps.com/windows_media_player.php?old_windows_media_player=3?download
-    # Iceweasel gives a security warning (!), but clamscan and virustotal.com report it as clean:
-    w_download http://download.oldapps.com/Windows_Media/mpfull.exe 44aef252a660612a01ee13271d84d2da3885e58d
+    # Previously at http://www.oldapps.com/windows_media_player.php?old_windows_media_player=3?download
+    # (2015/12/01) Iceweasel gave a security warning (!), but clamscan and virustotal.com report it as clean
+    #
+    # (2016/02/18) Since then, oldapps.com removed it. It's on a Finnish mirror, where it's been since 2001/10/20
+    # Found using http://www.filewatcher.com/m/mpfull.exe.3593680-0.html
+    # The sha1sum is different. Perhaps Iceweasel was right. This one is also clean according to clamscan/virustotal.com
+
+    w_download ftp://www.define.fi/Pub/Fixes/Microsoft/Windows%2095/mpfull.exe 99691df6ac455233230faac7514bdea781ba0ce3
 
     w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_CACHE/$W_PACKAGE/${file1}"
     w_try_regsvr msdxm.ocx
@@ -6954,7 +6874,7 @@ load_msflxgrd()
     # may 2011: f497c3b390cd80d5bcd1f13d5c0c68b206369aa7
     # 2015/11/09: Removed from Microsoft.com, archive.org has an older copy:
     # 2015/11/09: 3d6c04e923781d4ce0d3ab62189b8de352ab25d5
-    w_download https://web.archive.org/web/20070127040448/http://activex.microsoft.com/controls/vb6/MsFlxGrd.cab 3d6c04e923781d4ce0d3ab62189b8de352ab25d5
+    w_download http://activex.microsoft.com/controls/vb6/MsFlxGrd.cab 3d6c04e923781d4ce0d3ab62189b8de352ab25d5
 
     w_try_cabextract --directory="$W_TMP" "$W_CACHE"/msflxgrd/${file1}
     w_try cp -f "$W_TMP"/[Mm][Ss][Ff][Ll][Xx][Gg][Rr][Dd].[Oo][Cc][Xx] "$W_SYSTEM32_DLLS"
@@ -6979,7 +6899,7 @@ load_mshflxgd()
     # May 2009: bd8aa796e16e5f213414af78931e0379d9cbe292
     # 2015/11/09: Removed from Microsoft.com, archive.org has the original copy:
     # 2015/11/09: 5f9c7a81022949bfe39b50f2bbd799c448bb7377
-    w_download https://web.archive.org/web/20061011041549/http://activex.microsoft.com/controls/vb6/MSHFLXGD.CAB 5f9c7a81022949bfe39b50f2bbd799c448bb7377
+    w_download http://activex.microsoft.com/controls/vb6/MSHFLXGD.CAB 5f9c7a81022949bfe39b50f2bbd799c448bb7377
 
     w_try_cabextract --directory="$W_TMP" "$W_CACHE"/mshflxgd/MSHFLXGD.CAB
     w_try cp -f "$W_TMP"/[Mm][Ss][Hh][Ff][Ll][Xx][Gg][Dd].[Oo][Cc][Xx] "$W_SYSTEM32_DLLS"
@@ -7060,7 +6980,7 @@ load_msmask()
     # May 2009: 30e55679e4a13fe4d9620404476f215f93239292
     # 2015/11/09: Removed from Microsoft.com, archive.org has an older copy:
     # 2015/11/09: bdd2bb3a32d18926a048f302aff18b1e6d250d9d
-    w_download https://web.archive.org/web/20061011040848/http://activex.microsoft.com/controls/vb6/MSMASK32.CAB bdd2bb3a32d18926a048f302aff18b1e6d250d9d
+    w_download http://activex.microsoft.com/controls/vb6/MSMASK32.CAB bdd2bb3a32d18926a048f302aff18b1e6d250d9d
     w_try_cabextract --directory="$W_TMP" "$W_CACHE"/msmask/MSMASK32.CAB
     w_try cp -f "$W_TMP"/[Mm][Ss][Mm][Aa][Ss][Kk]32.[Oo][Cc][Xx] "$W_SYSTEM32_DLLS"/msmask32.ocx
     w_try_regsvr msmask32.ocx
@@ -7099,12 +7019,12 @@ load_msxml3()
     # Service Pack 5
     #w_download http://download.microsoft.com/download/a/5/e/a5e03798-2454-4d4b-89a3-4a47579891d8/msxml3.msi
     # Service Pack 7
-    w_download http://web.archive.org/web/20070314193356/http://download.microsoft.com/download/8/8/8/888f34b7-4f54-4f06-8dac-fa29b19f33dd/msxml3.msi d4c2178dfb807e1a0267fce0fd06b8d51106d913
+    w_download http://download.microsoft.com/download/8/8/8/888f34b7-4f54-4f06-8dac-fa29b19f33dd/msxml3.msi d4c2178dfb807e1a0267fce0fd06b8d51106d913
 
     # it won't install on top of wine's msxml3, which has a pretty high version number, so delete wine's fake dll
     rm "$W_SYSTEM32_DLLS"/msxml3.dll
     w_override_dlls native msxml3
-    cd "$W_CACHE"/msxml3
+    cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" msiexec /i msxml3.msi $W_UNATTENDED_SLASH_Q
 }
 
@@ -7127,7 +7047,7 @@ load_msxml4()
     # SP3 (2009): http://www.microsoft.com/downloads/details.aspx?familyid=7F6C0CB4-7A5E-4790-A7CF-9E139E6819C0
     w_download http://download.microsoft.com/download/A/2/D/A2D8587D-0027-4217-9DAD-38AFDB0A177E/msxml.msi aa70c5c1a7a069af824947bcda1d9893a895318b
     w_override_dlls native,builtin msxml4
-    cd "$W_CACHE"/msxml4
+    cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" msiexec /i msxml.msi $W_UNATTENDED_SLASH_Q
 }
 
@@ -7199,7 +7119,7 @@ w_metadata ogg dlls \
 load_ogg()
 {
     w_download http://downloads.xiph.org/releases/oggdsf/opencodecs_0.85.17777.exe 386cf7cd29ffcbf8705eff8c8233de448ecf33ab
-    cd "$W_CACHE"/ogg
+    cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" $file1 $W_UNATTENDED_SLASH_S
 }
 
@@ -7339,7 +7259,7 @@ load_physx()
 {
     # Has a minor issue, see bug report http://bugs.winehq.org/show_bug.cgi?id=34167
     w_download http://uk.download.nvidia.com/Windows/9.14.0702/PhysX-9.14.0702-SystemSoftware.msi 81e2d38e2356e807ad80cdf150ed5acfff839c8b
-    cd "$W_CACHE"/physx
+    cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" msiexec /i PhysX-9.14.0702-SystemSoftware.msi $W_UNATTENDED_SLASH_Q
 }
 
@@ -7412,35 +7332,16 @@ w_metadata quicktime72 dlls \
     publisher="Apple" \
     year="2010" \
     media="download" \
-    file1="quicktimeplayer72.exe" \
+    file1="QuickTimeInstaller.exe" \
     installed_file1="c:/windows/Installer/{95A890AA-B3B1-44B6-9C18-A8F7AB3EE7FC}/QTPlayer.ico"
 
 load_quicktime72()
 {
-    # http://www.apple.com/support/downloads/quicktime72forwindows.html
-    # http://www.oldapps.com/quicktime_player.php?old_quicktime=6
-    w_download http://download.oldapps.com/Quicktime/quicktimeplayer72.exe bb89981f10cf21de57b9453e53cf81b9194271a9
+    # https://support.apple.com/downloads/quicktime
+    w_download http://appldnld.apple.com.edgesuite.net/content.info.apple.com/QuickTime/061-2915.20070710.pO94c/QuickTimeInstaller.exe bb89981f10cf21de57b9453e53cf81b9194271a9
 
-    unset QUICKTIME_QUIET
-    if test "$W_UNATTENDED_SLASH_Q" != ""
-    then
-        QUICKTIME_QUIET="/qn"  # ISSETUPDRIVEN=0
-    fi
-
-    if w_workaround_wine_bug 9366 ""  1.1.22,
-    then
-        w_call gdiplus
-        w_call vcrun2005      # no bug number, but same era
-    fi
-
-    if w_workaround_wine_bug 1347
-    then
-        w_warn "Setting vista mode to avoid blacking the whole screen in quicktime"
-        w_set_winver vista
-    fi
-
-    cd "$W_CACHE"/quicktime72
-    w_try "$WINE" quicktimeplayer72.exe ALLUSERS=1 DESKTOP_SHORTCUTS=0 QTTaskRunFlags=0 QTINFO.BISQTPRO=1 SCHEDULE_ASUW=0 REBOOT_REQUIRED=No $QUICKTIME_QUIET > /dev/null 2>&1
+    cd "$W_CACHE"/"$W_PACKAGE"
+    w_try "$WINE" ${file1} ALLUSERS=1 DESKTOP_SHORTCUTS=0 QTTaskRunFlags=0 QTINFO.BISQTPRO=1 SCHEDULE_ASUW=0 REBOOT_REQUIRED=No $W_UNATTENDED_SLASH_QN > /dev/null 2>&1
 
     if w_workaround_wine_bug 11681
     then
@@ -7476,26 +7377,8 @@ load_quicktime76()
     # http://www.apple.com/quicktime/download/
     w_download http://appldnld.apple.com/QuickTime/041-0025.20101207.Ptrqt/QuickTimeInstaller.exe 1eec8904f041d9e0ad3459788bdb690e45dbc38e
 
-    unset QUICKTIME_QUIET
-    if test "$W_UNATTENDED_SLASH_Q"
-    then
-        QUICKTIME_QUIET="/qn"  # ISSETUPDRIVEN=0
-    fi
-
-    if w_workaround_wine_bug 9366 ""  1.1.22,
-    then
-        w_call gdiplus
-        w_call vcrun2005      # no bug number, but same era
-    fi
-
-    if w_workaround_wine_bug 1347
-    then
-        w_warn "Setting vista mode to avoid blacking the whole screen in quicktime"
-        w_set_winver vista
-    fi
-
-    cd "$W_CACHE"/quicktime76
-    w_try "$WINE" QuickTimeInstaller.exe ALLUSERS=1 DESKTOP_SHORTCUTS=0 QTTaskRunFlags=0 QTINFO.BISQTPRO=1 SCHEDULE_ASUW=0 REBOOT_REQUIRED=No $QUICKTIME_QUIET > /dev/null 2>&1
+    cd "$W_CACHE"/"$W_PACKAGE"
+    w_try "$WINE" QuickTimeInstaller.exe ALLUSERS=1 DESKTOP_SHORTCUTS=0 QTTaskRunFlags=0 QTINFO.BISQTPRO=1 SCHEDULE_ASUW=0 REBOOT_REQUIRED=No $W_UNATTENDED_SLASH_QN > /dev/null 2>&1
 
     if w_workaround_wine_bug 11681
     then
@@ -7597,7 +7480,7 @@ w_metadata richtx32 dlls \
 
 load_richtx32()
 {
-    w_download https://web.archive.org/web/20150815181727/http://activex.microsoft.com/controls/vb6/richtx32.cab da404b566df3ad74fe687c39404a36c3e7cadc07
+    w_download http://activex.microsoft.com/controls/vb6/richtx32.cab da404b566df3ad74fe687c39404a36c3e7cadc07
     w_try_cabextract "$W_CACHE"/richtx32/richtx32.cab -d "$W_SYSTEM32_DLLS" -F RichTx32.ocx
     w_try_regsvr RichTx32.ocx
 }
@@ -7693,9 +7576,10 @@ load_shockwave() {
     # 2015-08-02 sha1sum: e2efa2eb7db0a6de08905cd61bb3efcf58fda994
     # 2015-11-09 sha1sum: d13420a6fdc4f8d9c45c5ee6767974f0f0054cdc
     # 2015-12-27 sha1sum: 3ac6d85e54dffb2940c89fc10e63363a47ec96d0
+    # 2016-02-18 sha1sum: 45147a791e3f71bd67ead1622d9120060dd196e5
 
-    w_download http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi 3ac6d85e54dffb2940c89fc10e63363a47ec96d0
-    cd "$W_CACHE"/shockwave
+    w_download http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi 45147a791e3f71bd67ead1622d9120060dd196e5
+    cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" msiexec /i sw_lic_full_installer.msi $W_UNATTENDED_SLASH_Q
 }
 
@@ -7739,7 +7623,7 @@ load_tabctl32()
 {
     # http://msdn.microsoft.com/en-us/library/aa240864(VS.60).aspx
     # Nov 2012: tabctl32
-    w_download https://web.archive.org/web/20110818064708/http://activex.microsoft.com/controls/vb6/TABCTL32.CAB beca51d05924a5466ab80eb0f8d0cdf8bc1ac697
+    w_download http://activex.microsoft.com/controls/vb6/TABCTL32.CAB beca51d05924a5466ab80eb0f8d0cdf8bc1ac697
 
     w_try_cabextract --directory="$W_TMP" "$W_CACHE"/tabctl32/${file1}
     w_try cp -f "$W_TMP"/[Tt][Aa][Bb][Cc][Tt][Ll][3][2].[Oo][Cc][Xx] "$W_SYSTEM32_DLLS"
@@ -7855,7 +7739,7 @@ w_metadata vb5run dlls \
 load_vb5run()
 {
     w_download http://download.microsoft.com/download/vb50pro/utility/1/win98/en-us/msvbvm50.exe 28bfaf09b8ac32cf5ffa81252f3e2fadcb3a8f27
-    cd "$W_CACHE"/vb5run
+    cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" msvbvm50.exe $W_UNATTENDED_SLASH_Q
 }
 
@@ -7890,7 +7774,7 @@ load_vb6run()
     rm -f "$W_SYSTEM32_DLLS"/olepro32.dll
     rm -f "$W_SYSTEM32_DLLS"/stdole2.tlb
 
-    cd "$W_CACHE"/vb6run
+    cd "$W_CACHE/$W_PACKAGE"
     # Exits with status 43 for some reason?
     "$WINE" vbrun60sp6.exe $W_UNATTENDED_SLASH_Q
 
@@ -8030,7 +7914,7 @@ w_metadata vcrun2003 dlls \
     publisher="Microsoft" \
     year="2003" \
     media="download" \
-    file1="BZEditW32_1.6.5_Installer.exe" \
+    file1="BZEditW32_1.6.5.exe" \
     installed_file1="$W_SYSTEM32_DLLS_WIN/msvcp71.dll"
 
 load_vcrun2003()
@@ -8038,8 +7922,9 @@ load_vcrun2003()
     # Load the Visual C++ 2003 runtime libraries
     # Sadly, I know of no Microsoft URL for these
     echo "Installing BZFlag (which comes with the Visual C++ 2003 runtimes)"
-    w_download $WINETRICKS_SOURCEFORGE/bzflag/BZEditW32_1.6.5_Installer.exe bdd1b32c4202fd77e6513fd507c8236888b09121
-    w_try "$WINE" "$W_CACHE"/vcrun2003/BZEditW32_1.6.5_Installer.exe $W_UNATTENDED_SLASH_S
+    # winetricks-test can't handle ${file1} in url since it does a raw parsing :/
+    w_download $WINETRICKS_SOURCEFORGE/bzflag/BZEditW32_1.6.5.exe bdd1b32c4202fd77e6513fd507c8236888b09121
+    w_try "$WINE" "$W_CACHE"/vcrun2003/${file1} $W_UNATTENDED_SLASH_S
     w_try cp "$W_PROGRAMS_X86_UNIX/BZEdit1.6.5"/m*71* "$W_SYSTEM32_DLLS"
 }
 
@@ -8067,7 +7952,7 @@ load_vcrun2005()
     # http://support.microsoft.com/kb/2538242
     w_download http://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x86.EXE b8fab0bb7f62a24ddfe77b19cd9a1451abd7b847
 
-    cd "$W_CACHE"/vcrun2005
+    cd "$W_CACHE/$W_PACKAGE"
     w_override_dlls native,builtin atl80 msvcm80 msvcp80 msvcr80 vcomp
     w_try "$WINE" $file1 $W_UNATTENDED_SLASH_Q
 }
@@ -8089,7 +7974,7 @@ load_vcrun2008()
     # http://support.microsoft.com/kb/2538242
     w_download http://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x86.exe 470640aa4bb7db8e69196b5edb0010933569e98d
     w_override_dlls native,builtin atl90 msvcm90 msvcp90 msvcr90 vcomp90
-    cd "$W_CACHE"/vcrun2008
+    cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" $file1 $W_UNATTENDED_SLASH_Q
 }
 
@@ -8108,13 +7993,8 @@ load_vcrun2010()
     # See http://www.microsoft.com/downloads/details.aspx?FamilyID=a7b7a05e-6de6-4d3a-a423-37bf0912db84
     w_download http://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe 372d9c1670343d3fb252209ba210d4dc4d67d358
 
-    if w_workaround_wine_bug 23427 ""  1.3.5,
-    then
-        w_call msxml3
-    fi
-
     w_override_dlls native,builtin msvcp100 msvcr100 vcomp100 atl100
-    cd "$W_CACHE"/vcrun2010
+    cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" vcredist_x86.exe $W_UNATTENDED_SLASH_Q
 
     case "$W_ARCH" in
@@ -8155,21 +8035,8 @@ load_vcrun2012()
     w_download http://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x86.exe 96b377a27ac5445328cbaae210fc4f0aaa750d3f
 
     w_override_dlls native,builtin atl110 msvcp110 msvcr110 vcomp110
-    cd "$W_CACHE"/vcrun2012
-    if w_workaround_wine_bug 17273 "Manually extracting dlls"
-    then
-        w_try_cabextract --directory="$W_TMP" vcredist_x86.exe
-        w_try_cabextract --directory="$W_TMP" "$W_TMP/a2"
-        w_try_cabextract --directory="$W_TMP" "$W_TMP/a3"
-        cp "$W_TMP"/F_CENTRAL_atl110_x86 "$W_SYSTEM32_DLLS"/atl110.dll
-        cp "$W_TMP"/F_CENTRAL_mfc110_x86 "$W_SYSTEM32_DLLS"/mfc110.dll
-        cp "$W_TMP"/F_CENTRAL_mfc110u_x86 "$W_SYSTEM32_DLLS"/mfc110u.dll
-        cp "$W_TMP"/F_CENTRAL_msvcp110_x86 "$W_SYSTEM32_DLLS"/msvcp110.dll
-        cp "$W_TMP"/F_CENTRAL_msvcr110_x86 "$W_SYSTEM32_DLLS"/msvcr110.dll
-        cp "$W_TMP"/F_CENTRAL_vcomp110_x86 "$W_SYSTEM32_DLLS"/vcomp110.dll
-    else
-        w_try "$WINE" vcredist_x86.exe $W_UNATTENDED_SLASH_Q
-    fi
+    cd "$W_CACHE"/"$W_PACKAGE"
+    w_try "$WINE" vcredist_x86.exe $W_UNATTENDED_SLASH_Q
 
     case "$W_ARCH" in
     win64)
@@ -8213,20 +8080,8 @@ load_vcrun2013()
     w_download http://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x86.exe df7f0a73bfa077e483e51bfb97f5e2eceedfb6a3
 
     w_override_dlls native,builtin atl120 msvcp120 msvcr120 vcomp120
-    cd "$W_CACHE"/vcrun2013
-    if w_workaround_wine_bug 17273 "Manually extracting dlls"
-    then
-        w_try_cabextract --directory="$W_TMP" vcredist_x86.exe
-        w_try_cabextract --directory="$W_TMP" "$W_TMP/a2"
-        w_try_cabextract --directory="$W_TMP" "$W_TMP/a3"
-        cp "$W_TMP"/F_CENTRAL_mfc120_x86 "$W_SYSTEM32_DLLS"/mfc120.dll
-        cp "$W_TMP"/F_CENTRAL_mfc120u_x86 "$W_SYSTEM32_DLLS"/mfc120u.dll
-        cp "$W_TMP"/F_CENTRAL_msvcp120_x86 "$W_SYSTEM32_DLLS"/msvcp120.dll
-        cp "$W_TMP"/F_CENTRAL_msvcr120_x86 "$W_SYSTEM32_DLLS"/msvcr120.dll
-        cp "$W_TMP"/F_CENTRAL_vcomp120_x86 "$W_SYSTEM32_DLLS"/vcomp120.dll
-    else
-        w_try "$WINE" vcredist_x86.exe $W_UNATTENDED_SLASH_Q
-    fi
+    cd "$W_CACHE"/"$W_PACKAGE"
+    w_try "$WINE" vcredist_x86.exe $W_UNATTENDED_SLASH_Q
 
     case "$W_ARCH" in
     win64)
@@ -8268,33 +8123,8 @@ load_vcrun2015()
     w_download https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe bfb74e498c44d3a103ca3aa2831763fb417134d1
 
     w_override_dlls native,builtin atl140 msvcp140 msvcr140 vcomp140
-    cd "$W_CACHE"/vcrun2015
-    if w_workaround_wine_bug 17273 "Manually extracting dlls"
-    then
-        w_try_cabextract --directory="$W_TMP" vc_redist.x86.exe
-        w_try_cabextract --directory="$W_TMP" "$W_TMP/a10"
-        w_try_cabextract --directory="$W_TMP" "$W_TMP/a11"
-        cp "$W_TMP"/concrt140.dll "$W_SYSTEM32_DLLS"/concrt140.dll
-        cp "$W_TMP"/mfc140.dll "$W_SYSTEM32_DLLS"/mfc140.dll
-        cp "$W_TMP"/mfc140u.dll "$W_SYSTEM32_DLLS"/mfc140u.dll
-        cp "$W_TMP"/mfcm140.dll "$W_SYSTEM32_DLLS"/mfcm140.dll
-        cp "$W_TMP"/mfcm140u.dll "$W_SYSTEM32_DLLS"/mfcm140u.dll
-        cp "$W_TMP"/msvcp140.dll "$W_SYSTEM32_DLLS"/msvcp140.dll
-        cp "$W_TMP"/vcamp140.dll "$W_SYSTEM32_DLLS"/vcamp140.dll
-        cp "$W_TMP"/vccorlib140.dll "$W_SYSTEM32_DLLS"/vccorlib140.dll
-        cp "$W_TMP"/vcomp140.dll "$W_SYSTEM32_DLLS"/vcomp140.dll
-        cp "$W_TMP"/vcruntime140.dll "$W_SYSTEM32_DLLS"/vcruntime140.dll
-
-        w_override_dlls native,builtin api-ms-win-crt-heap-l1-1-0 api-ms-win-crt-locale-l1-1-0 api-ms-win-crt-math-l1-1-0.dll api-ms-win-crt-runtime-l1-1-0 api-ms-win-crt-stdio-l1-1-0 ucrtbase vcruntime140
-        cp "$W_TMP"/api_ms_win_crt_heap_l1_1_0.dll "$W_SYSTEM32_DLLS"/api-ms-win-crt-heap-l1-1-0.dll
-        cp "$W_TMP"/api_ms_win_crt_locale_l1_1_0.dll "$W_SYSTEM32_DLLS"/api-ms-win-crt-locale-l1-1-0.dll
-        cp "$W_TMP"/api_ms_win_crt_math_l1_1_0.dll  "$W_SYSTEM32_DLLS"/api-ms-win-crt-math-l1-1-0.dll
-        cp "$W_TMP"/api_ms_win_crt_runtime_l1_1_0.dll "$W_SYSTEM32_DLLS"/api-ms-win-crt-runtime-l1-1-0.dll
-        cp "$W_TMP"/api_ms_win_crt_stdio_l1_1_0.dll "$W_SYSTEM32_DLLS"/api-ms-win-crt-stdio-l1-1-0.dll
-        cp "$W_TMP"/ucrtbase.dll "$W_SYSTEM32_DLLS"/ucrtbase.dll
-    else
-        w_try "$WINE" vc_redist.x86.exe $W_UNATTENDED_SLASH_Q
-    fi
+    cd "$W_CACHE"/"$W_PACKAGE"
+    w_try "$WINE" vc_redist.x86.exe $W_UNATTENDED_SLASH_Q
 
     case "$W_ARCH" in
     win64)
@@ -8355,13 +8185,8 @@ load_vjrun20()
 
     # See http://www.microsoft.com/downloads/details.aspx?FamilyId=E9D87F37-2ADC-4C32-95B3-B5E3A21BAB2C
     w_download http://download.microsoft.com/download/9/2/3/92338cd0-759f-4815-8981-24b437be74ef/vjredist.exe 80a098e36b90d159da915aebfbfbacf35f302bd8
-
-    if [ $W_UNATTENDED_SLASH_Q ]
-    then
-        w_try "$WINE" "$W_CACHE"/vjrun20/vjredist.exe /q /C:"install /QNT"
-    else
-        w_try "$WINE" "$W_CACHE"/vjrun20/vjredist.exe
-    fi
+    cd "$W_CACHE"/"$W_PACKAGE"
+    w_try "$WINE" vjredist.exe ${W_OPT_UNATTENDED:+ /q /C:"install $W_UNATTENDED_SLASH_QNT"}
 }
 
 #----------------------------------------------------------------
@@ -8455,7 +8280,7 @@ load_wmi()
     w_set_winver win98
     w_override_dlls native,builtin wbemprox wmiutils
     # Note: there is a crash in the background towards the end, doesn't seem to hurt; see http://bugs.winehq.org/show_bug.cgi?id=7920
-    cd "$W_CACHE"/wmi
+    cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" wmi9x.exe $W_UNATTENDED_SLASH_S
     w_unset_winver
 }
@@ -8499,7 +8324,7 @@ load_wsh56vb()
     # See also http://www.microsoft.com/downloads/details.aspx?familyid=4F728263-83A3-464B-BCC0-54E63714BC75
     w_download http://download.microsoft.com/download/IE60/Patch/Q318089/W9XNT4Me/EN-US/vbs56men.exe 48f14a93db33caff271da0c93f334971f9d7cb22
 
-    cd "$W_CACHE"/wsh56vb
+    cd "$W_CACHE/$W_PACKAGE"
     w_override_dlls native,builtin vbscript
     # setupapi looks at the versions in new and original vbscript.dll, and wine's original is newer than wsh56vb's, so have to nuke the original
     w_try rm "$W_SYSTEM32_DLLS/vbscript.dll"
@@ -8688,20 +8513,7 @@ load_xmllite()
     # Doesn't install in newer versions:
     w_set_winver winxp
 
-    if w_workaround_wine_bug 16013
-    then
-        # Find instructions to create this file in dlls/wintrust/tests/crypt.c
-        w_download https://github.com/Winetricks/winetricks/raw/master/files/winetest.cat ac8f50dd54d011f3bb1dd79240dae9378748449f
-        # Put a dummy catalog file in place
-        mkdir -p "$W_SYSTEM32_DLLS"/catroot/\{f750e6c3-38ee-11d1-85e5-00c04fc295ee\}
-        w_try cp -f "$W_CACHE"/xmllite/winetest.cat "$W_SYSTEM32_DLLS"/catroot/\{f750e6c3-38ee-11d1-85e5-00c04fc295ee\}/oem0.cat
-        if test ! "$W_OPT_UNATTENDED"
-        then
-            w_warn "xmllite's interactive installer will hang at the end, but otherwise work."
-        fi
-    fi
-
-    cd "$W_CACHE"/xmllite
+    cd "$W_CACHE/$W_PACKAGE"
     w_override_dlls native xmllite
     case $LANG in
     en*) w_try "$WINE" WindowsXP-KB915865-v11-x86-ENU.exe $W_UNATTENDED_SLASH_Q ;;
@@ -8727,7 +8539,7 @@ load_xna31()
 {
     w_call dotnet20sp2
     w_download http://download.microsoft.com/download/5/9/1/5912526C-B950-4662-99B6-119A83E60E5C/xnafx31_redist.msi bdd33b677c9576a63ff2a6f65e12c0563cc116e6
-    cd "$W_CACHE"/xna31
+    cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" msiexec ${W_OPT_UNATTENDED:+/quiet} /i $file1
 }
 
@@ -8747,7 +8559,7 @@ load_xna40()
     w_call dotnet40
     # http://www.microsoft.com/en-us/download/details.aspx?id=20914
     w_download http://download.microsoft.com/download/A/C/2/AC2C903B-E6E8-42C2-9FD7-BEBAC362A930/xnafx40_redist.msi 49efdc29f65fc8263c196338552c7009fc96c5de
-    cd "$W_CACHE"/xna40
+    cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" msiexec ${W_OPT_UNATTENDED:+/quiet} /i $file1
 }
 
@@ -8765,11 +8577,7 @@ load_xvid()
 {
     w_call vcrun6
     w_download http://www.koepi.info/Xvid-1.3.2-20110601.exe 0a11498a96f75ad019c4c7d06161504140337dc0
-    cd "$W_CACHE"/xvid
-    if w_workaround_wine_bug 27380 "Installing msvcr80 to avoid crash in setavi32.exe"
-    then
-        w_call vcrun2008
-    fi
+    cd "$W_CACHE"/"$W_PACKAGE"
     w_try "$WINE" $file1 ${W_OPT_UNATTENDED:+ --mode unattended --decode_divx 1 --decode_3ivx 1 --decode_other 1}
 }
 
@@ -9468,7 +9276,6 @@ load_3m_library()
     w_download http://www.3m.com/us/library/eBook/docs/3M-TM-Cloud-Library-PC-App-LIVE-Installer-1.51.735677.exe 810dc5f6b74ab7b34893288ee44ef7dc563a4ee7
     cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" 3M-TM-Cloud-Library-PC-App-LIVE-Installer-1.51.735677.exe $W_UNATTENDED_SLASH_S
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\3M(TM) Cloud Library PC App" "3MCloudLibrary.exe"
 }
 
 #----------------------------------------------------------------
@@ -9486,7 +9293,6 @@ load_7zip()
     w_download http://www.7-zip.org/a/7z1505.exe ece8bbd4c8903095d44e99196219c953a1d47bfd
     cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" 7z1505.exe $W_UNATTENDED_SLASH_S
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\7-Zip" "7zFM.exe"
 }
 
 #----------------------------------------------------------------
@@ -9502,9 +9308,8 @@ w_metadata abiword apps \
 load_abiword()
 {
     w_download http://www.abisource.com/downloads/abiword/2.8.6/Windows/abiword-setup-2.8.6.exe a91acd3f60e842d23556032d34f1600602768318
-    cd "$W_CACHE"/abiword
+    cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" abiword-setup-2.8.6.exe $W_UNATTENDED_SLASH_S
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\AbiWord\\bin" AbiWord.exe
 }
 
 #----------------------------------------------------------------
@@ -9523,8 +9328,6 @@ load_adobe_diged()
     w_download http://kb2.adobe.com/cps/403/kb403051/attachments/setup.exe 4c79685408fa6ca12ef8bb0e0eaa4a846e21f915
     # NSIS installer
     w_try "$WINE" "$W_CACHE"/$W_PACKAGE/setup.exe ${W_OPT_UNATTENDED:+ /S}
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Adobe\\Adobe Digital Editions" \
-        digitaleditions.exe
 }
 
 #----------------------------------------------------------------
@@ -9593,7 +9396,6 @@ load_audible()
         WinWait, AudibleManager  ; the dang thing starts up
         WinKill
     "
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Audible\\Bin" Manager.exe
 }
 
 #----------------------------------------------------------------
@@ -9627,7 +9429,6 @@ load_audibledm()
         WinWait, Audible Download Manager  ; the dang thing starts up
         WinKill
     "
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Audible\\Bin" AudibleDownloadHelper.exe
 }
 
 #----------------------------------------------------------------
@@ -9644,7 +9445,7 @@ load_autohotkey()
 {
     W_BROWSERAGENT=1 \
     w_download http://www.autohotkey.com/download/AutoHotkey104805_Install.exe 13e5a9ca6d5b7705f1cd02560c3af4d38b1904fc
-    cd "$W_CACHE"/autohotkey
+    cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" AutoHotkey104805_Install.exe $W_UNATTENDED_SLASH_S
 }
 
@@ -9661,10 +9462,8 @@ w_metadata cmake apps \
 load_cmake()
 {
     w_download http://www.cmake.org/files/v2.8/cmake-2.8.11.2-win32-x86.exe d79af5715c0ad48d78bb731cce93b5ad89b16512
-    cd "$W_CACHE"/cmake
+    cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" cmake-2.8.11.2-win32-x86.exe $W_UNATTENDED_SLASH_S
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\CMake 2.8\\bin" "cmake-gui.exe"
 }
 
 #----------------------------------------------------------------
@@ -9717,8 +9516,6 @@ load_controlpad()
     then
         w_die "Install failed.  Please report,  If you just wanted fm20.dll, try installing art2min instead."
     fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\ActiveX Control Pad" "PED.EXE"
 }
 
 #----------------------------------------------------------------
@@ -9770,14 +9567,6 @@ load_dxdiag()
     then
         w_call directmusic
     fi
-    if w_workaround_wine_bug 25715 "" 1.7.28,
-    then
-        w_call quartz
-    fi
-    if w_workaround_wine_bug 25716 "" 1.7.29,
-    then
-        w_call devenum
-    fi
 }
 
 #----------------------------------------------------------------
@@ -9792,10 +9581,9 @@ w_metadata emu8086 apps \
 
 load_emu8086()
 {
-    w_download https://web.archive.org/web/20140209022335/http://emu8086.com/emu8086.zip fa3b2451cbc46fd2e3aa2670fa4d81ae8e75c7db
+    w_download http://emu8086.com/emu8086.zip fa3b2451cbc46fd2e3aa2670fa4d81ae8e75c7db
     w_try_unzip "$W_TMP" "$W_CACHE/$W_PACKAGE"/$file1
     w_try "$WINE" "$W_TMP/Setup.exe" $W_UNATTENDED_SLASH_SILENT
-    w_declare_exe "c:\\emu8086" "emu8086.exe"
 }
 
 #----------------------------------------------------------------
@@ -9810,16 +9598,9 @@ w_metadata firefox apps \
 
 load_firefox()
 {
-    if w_workaround_wine_bug 29077 "" 1.7.25,
-    then
-        w_warn "Visit about:config, search for dom.ipc, and set those booleans false if you want to use flash."
-    fi
-
     w_download "https://download.mozilla.org/?product=firefox-39.0-SSL&os=win&lang=en-US" 75eccbd9b2d44210b551c9a5045f03f01e899528 "$file1"
-    cd "$W_CACHE"/firefox
+    cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" "$file1" ${W_OPT_UNATTENDED:+ -ms}
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Mozilla Firefox" firefox.exe
 }
 
 #----------------------------------------------------------------
@@ -9839,7 +9620,6 @@ load_fontxplorer()
 
     cd "$W_CACHE/fontxplorer"
     w_try "$WINE" Font_Xplorer_122_Free.exe $W_UNATTENDED_SLASH_S
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Font Xplorer" "FXplorer.exe"
 }
 
 #----------------------------------------------------------------
@@ -9857,7 +9637,6 @@ load_foobar2000()
     w_download_manual http://www.foobar2000.org/download foobar2000_v1.3.6.exe 77d1c3aa766853701d29e46b3018aaf1e1b5dd39
     cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" $file1 $W_UNATTENDED_SLASH_S
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\foobar2000" "foobar2000.exe"
 }
 
 #----------------------------------------------------------------
@@ -9872,11 +9651,6 @@ w_metadata iceweasel apps \
 
 load_iceweasel()
 {
-    if w_workaround_wine_bug 29077 "" 1.7.25,
-    then
-        w_warn "Visit about:config, search for dom.ipc, and set those booleans false if you want to use flash."
-    fi
-
     w_download https://ftp.gnu.org/gnu/gnuzilla/31.7.0/icecat-31.7.0.en-US.win32.zip cf52a728c1af29065b7dc7bdddc9265a79eb5328
     w_try_unzip "${W_PROGRAMS_X86_UNIX}" "${W_CACHE}/${W_PACKAGE}/${file1}"
 }
@@ -9952,7 +9726,6 @@ load_irfanview()
     else
         w_try "$WINE" $file1
     fi
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\IrfanView" "i_view32.exe"
 }
 
 #----------------------------------------------------------------
@@ -10118,7 +9891,7 @@ load_ie7()
     else
         quiet="/quiet"
     fi
-    cd "$W_CACHE"/ie7
+    cd "$W_CACHE/$W_PACKAGE"
 
     "$WINE" IE7-WindowsXP-x86-enu.exe $quiet
 
@@ -10223,7 +9996,7 @@ load_ie8()
     else
         quiet=""
     fi
-    cd "$W_CACHE"/ie8
+    cd "$W_CACHE/$W_PACKAGE"
 
     # KLUDGE: if / is writable, having a z: mapping to it causes ie8 to put temporary directories on Z:\
     # so hide it temporarily.  This is not very robust!
@@ -10292,9 +10065,8 @@ w_metadata kobo apps \
 load_kobo()
 {
     w_download http://download.kobobooks.com/desktop/1/KoboSetup.exe 31a5f5583edf4b716b9feacb857d2170104cabd9
-    cd "$W_CACHE"/kobo
+    cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" $file1 ${W_OPT_UNATTENDED:+ /S}
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Kobo" "Kobo.exe"
 }
 
 #----------------------------------------------------------------
@@ -10357,8 +10129,6 @@ load_mspaint()
     w_download http://download.microsoft.com/download/0/A/4/0A40DF5C-2BAE-4C63-802A-84C33B34AC98/WindowsXP-KB978706-x86-ENU.exe f4e076b3867c2f08b6d258316aa0e11d6822b8d7
     w_try $WINE "$W_CACHE"/mspaint/WindowsXP-KB978706-x86-ENU.exe /q /x:"$W_TMP"/WindowsXP-KB978706-x86-ENU
     w_try cp -f "$W_TMP"/WindowsXP-KB978706-x86-ENU/SP3GDR/mspaint.exe "$W_WINDIR_UNIX"/mspaint.exe
-
-    w_declare_exe "$W_WINDIR_UNIX" "mspaint.exe"
 }
 
 #----------------------------------------------------------------
@@ -10379,10 +10149,9 @@ load_nook()
     # 7 Oct 2011 sha1sum 3b0301bd55471cc47cced44501547411fac9fcea
     # 7 Mar 2012 sha1sum e7060a63b9b303ddd820de762d9df254e1c931bc
     w_download http://images.barnesandnoble.com/PResources/download/eReader2/bndr2_setup_latest.exe e7060a63b9b303ddd820de762d9df254e1c931bc
-    cd "$W_CACHE"/nook
+    cd "$W_CACHE/$W_PACKAGE"
     "$WINE" $file1 ${W_OPT_UNATTENDED:+ /S}
     # normally has exit status 199?
-    w_declare_exe "$W_PROGRAMS_WIN\\Barnes & Noble\\BNDesktopReader" "BNDReader.exe"
 }
 
 #----------------------------------------------------------------
@@ -10451,12 +10220,6 @@ load_office2003pro()
         }
         WinWaitClose
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Microsoft Office\\Office11" WINWORD.EXE  word2003
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Microsoft Office\\Office11" EXCEL.EXE    excel2003
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Microsoft Office\\Office11" POWERPNT.EXE powerpoint2003
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Microsoft Office\\Office11" MSACCESS.EXE access2003
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Microsoft Office\\Office11" OUTLOOK.EXE  outlook2003
 }
 
 #----------------------------------------------------------------
@@ -10514,14 +10277,6 @@ $W_CACHE/$W_PACKAGE/key.txt and rerun."
     else
         w_try "$WINE" ${W_ISO_MOUNT_LETTER}:setup.exe
     fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Microsoft Office\\Office12" WINWORD.EXE  word2007
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Microsoft Office\\Office12" EXCEL.EXE    excel2007
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Microsoft Office\\Office12" POWERPNT.EXE powerpoint2007
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Microsoft Office\\Office12" MSACCESS.EXE access2007
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Microsoft Office\\Office12" OUTLOOK.EXE  outlook2007
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Microsoft Office\\Office12" MSPUB.EXE  publisher2007
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Microsoft Office\\Office12" INFOPATH.EXE  infopath2007
 }
 
 #----------------------------------------------------------------
@@ -10539,7 +10294,6 @@ load_opera()
     w_download ftp://ftp.opera.com/pub/opera/win/1150/en/Opera_1150_en_Setup.exe df50c7aed50e92af858e8834f833dd0543014b46
     cd "$W_CACHE"/$W_PACKAGE
     w_try "$WINE" $file1 ${W_OPT_UNATTENDED:+ /silent /launchopera 0 /allusers}
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Opera" opera.exe
 }
 
 #----------------------------------------------------------------
@@ -10562,10 +10316,6 @@ load_picasa39()
     then
         w_warn "Picasa 3.9 authentication to the Google account is currently broken under wine. See http://bugs.winehq.org/show_bug.cgi?id=29434 for more details."
     fi
-    if w_workaround_wine_bug 37729 "Picasa updater crashes during install unless dotnet20 loaded"
-    then
-        w_call dotnet20
-    fi
     cd "$W_CACHE"/$W_PACKAGE
     w_ahk_do "
         SetTitleMatchMode, 2
@@ -10594,7 +10344,6 @@ load_picasa39()
         }
         WinWaitClose
         "
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Google\\Picasa3" "Picasa3.exe"
 }
 
 #----------------------------------------------------------------
@@ -10661,16 +10410,12 @@ load_psdkwin7()
 {
     # http://www.microsoft.com/downloads/details.aspx?FamilyID=c17ba869-9671-4330-a63e-1fd44e0e2505&displaylang=en
     w_call dotnet20
-    if w_workaround_wine_bug 21509 "" 1.2,
-    then
-        w_call gdiplus     # work around http://bugs.winehq.org/show_bug.cgi?id=21509
-    fi
     w_call mfc42   # need mfc42u, or setup will abort
     # don't have a working unattended recipe.  Maybe we'll have to
     # do an autohotkey script until msft gets its act together:
     # http://social.msdn.microsoft.com/Forums/en-US/windowssdk/thread/c053b616-7d5b-405d-9841-ec465a8e21d5
     w_download http://download.microsoft.com/download/7/A/B/7ABD2203-C472-4036-8BA0-E505528CCCB7/winsdk_web.exe a01dcc67a38f461e80ea649edf1353f306582507
-    cd "$W_CACHE"/psdkwin7
+    cd "$W_CACHE/$W_PACKAGE"
     if w_workaround_wine_bug 21596
     then
         w_warn "When given a choice, select only C++ compilers and headers, the other options don't work yet.  See http://bugs.winehq.org/show_bug.cgi?id=21596"
@@ -10715,14 +10460,16 @@ load_psdkwin71()
     w_call mfc42   # need mfc42u, or setup will abort
     # http://www.microsoft.com/downloads/details.aspx?FamilyID=c17ba869-9671-4330-a63e-1fd44e0e2505&displaylang=en
     w_download http://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/winsdk_web.exe a8717ebb20a69c7efa85232bcb9899b8b07f98cf
-    cd "$W_CACHE"/psdkwin71
+
     if w_workaround_wine_bug 21596
     then
         w_warn "When given a choice, select only C++ compilers and headers, the other options don't work yet.  See http://bugs.winehq.org/show_bug.cgi?id=21596"
     fi
+
     # don't have a working unattended recipe.  Maybe we'll have to
     # do an autohotkey script until msft gets its act together:
     # http://social.msdn.microsoft.com/Forums/en-US/windowssdk/thread/c053b616-7d5b-405d-9841-ec465a8e21d5
+    cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" winsdk_web.exe
 
     if w_workaround_wine_bug 21362
@@ -10781,7 +10528,7 @@ load_python26()
         w_die "This installer is broken under $WINETRICKS_WINE_VERSION. Please upgrade Wine. See https://code.google.com/p/winetricks/issues/detail?id=347 for more info."
     fi
 
-    cd "$W_CACHE"/python26
+    cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" msiexec /i python-2.6.2.msi ALLUSERS=1 $W_UNATTENDED_SLASH_Q
 
     w_ahk_do "
@@ -10864,7 +10611,7 @@ load_spotify()
     # updates too frequently to check checksum :-(
     w_download http://www.spotify.com/download/Spotify%20Installer.exe
 
-    cd "$W_CACHE"/spotify
+    cd "$W_CACHE/$W_PACKAGE"
     # w_download doesn't handle renaming for us without a checksum, tsk.
     # And autohotkey thinks % is a variable reference.
     if test ! -f SpotifyInstaller.exe
@@ -10872,11 +10619,6 @@ load_spotify()
         cp Spotify%20Installer.exe SpotifyInstaller.exe
     fi
 
-    if w_workaround_wine_bug 27476 "Installing winhttp to work around a facebook integration crash on login and install"
-    then
-        w_call ie7
-    fi
-
     # Install is silent by default, and always starts app
     # So all we have to do here is close app if we want unattended install
     w_ahk_do "
@@ -10890,8 +10632,6 @@ load_spotify()
         sleep 1000
         Process, Close, SpotifyWebHelper.exe
         "
-
-    w_declare_exe "c:\\users\\$LOGNAME\\Application Data\\Spotify" spotify.exe
 }
 
 #----------------------------------------------------------------
@@ -10908,32 +10648,13 @@ load_safari()
 {
     w_download http://appldnld.apple.com.edgesuite.net/content.info.apple.com/Safari5/061-7138.20100607.Y7U87/SafariSetup.exe e56d5d79d9cfbb85ac46ac78aa497d7f3d8dbc3d
 
-    cd "$W_CACHE"/$W_PACKAGE
-
-    if w_workaround_wine_bug 21146
-    then
-        w_try mkdir -p "$W_APPDATA_UNIX/Apple Computer/Preferences"
-        cat > "$W_APPDATA_UNIX/Apple Computer/Preferences/com.apple.Safari.plist" <<_EOF_
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-        <key>LastDisplayedWelcomePageVersionString</key>
-        <string>4.0</string>
-</dict>
-</plist>
-_EOF_
-    fi
-
     if test $W_OPT_UNATTENDED
     then
         w_warn "Safari's silent install is broken under wine. See http://bugs.winehq.org/show_bug.cgi?id=23493. You should do a regular install if you want to use Safari."
-        w_try "$WINE" SafariSetup.exe /qn
-    else
-        w_try "$WINE" SafariSetup.exe
     fi
 
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Safari" "Safari.exe"
+    cd "$W_CACHE"/$W_PACKAGE
+    w_try "$WINE" SafariSetup.exe $W_UNATTENDED_SLASH_QN
 }
 
 #----------------------------------------------------------------
@@ -10977,20 +10698,6 @@ load_sketchup()
         }
         WinWaitClose
     "
-
-    if w_workaround_wine_bug 14045 "Setting GLConfig Display HW_OK to 1" 1.3.18,
-    then
-        cat > "$W_TMP"/glconfigdisplay.reg <<_EOF_
-REGEDIT4
-
-[HKEY_CURRENT_USER\Software\Google\SketchUp8\GLConfig\Display]
-"HW_OK"="1"
-
-_EOF_
-        w_try_regedit "$W_TMP_WIN"\\glconfigdisplay.reg
-    fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Google\\Google SketchUp 8" "SketchUp.exe"
 }
 
 #----------------------------------------------------------------
@@ -11013,15 +10720,17 @@ load_steam()
     # 21 Jun 2015 0e8046d40c38d817338135ec73a5b217cc340cf5
     # 29 Dec 2015 728e3c82fd57c68cbbdb64965719081ffee6272c
     w_download http://media.steampowered.com/client/installer/SteamSetup.exe 728e3c82fd57c68cbbdb64965719081ffee6272c
-    cd "$W_CACHE"/steam
+    cd "$W_CACHE/$W_PACKAGE"
 
+    # Should be fixed in newer steam versions, since 2012. Commenting out for a while before removing in case users need to revert locally
+    #
     # Install corefonts first, so if the user doesn't have cabextract/Wine with cab support, we abort before installing Steam.
     # FIXME: support using Wine's cab support
-    if ! test -f "$W_FONTSDIR_UNIX/Times.TTF" && \
-        w_workaround_wine_bug 22751 "Installing corefonts to prevent a Steam crash"
-    then
-        w_call corefonts
-    fi
+    #if ! test -f "$W_FONTSDIR_UNIX/Times.TTF" && \
+    #    w_workaround_wine_bug 22751 "Installing corefonts to prevent a Steam crash"
+    #then
+    #    w_call corefonts
+    #fi
 
     if test $W_OPT_UNATTENDED
     then
@@ -11053,13 +10762,6 @@ load_steam()
     then
         w_override_dlls disabled gameoverlayrenderer
     fi
-
-    if w_workaround_wine_bug 31320 "Disabling dwrite.dll to prevent a Steam crash."
-    then
-        w_override_dlls disabled dwrite
-    fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Steam" "Steam.exe"
 }
 
 #----------------------------------------------------------------
@@ -11081,26 +10783,15 @@ load_uplay()
     # 16 Feb 2014 ?     sha1sum 19f98632ad1ff330c647f8ff1a3a15b44238c709
     # Changes too frequently, don't check anymore
     w_download http://static3.cdn.ubi.com/orbit/launcher_installer/UplayInstaller.exe
-    cd "$W_CACHE"/uplay
+    cd "$W_CACHE/$W_PACKAGE"
 
     # NSIS installer
     w_try "$WINE" UplayInstaller.exe ${W_OPT_UNATTENDED:+ /S}
 
-    if w_workaround_wine_bug 33742 "Using native crypt32 so uplay's autoupdater doesn't abort"
-    then
-        # Directx9 and game installation often fails with native crypt32,
-        # so set it to native for Uplay.exe only.
-        w_call crypt32
-        w_override_dlls default crypt32
-        w_override_app_dlls Uplay.exe native crypt32
-    fi
-
     if w_workaround_wine_bug 33673 "Installing gdiplus to work around slow navigation"
     then
         w_call gdiplus
     fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Ubisoft\\Ubisoft Game Launcher" "Uplay.exe"
 }
 
 #----------------------------------------------------------------
@@ -11128,8 +10819,6 @@ load_utorrent()
     w_download_manual "http://www.oldapps.com/utorrent.php?old_utorrent=38" utorrent_2.2.1.exe c6d9a80c02898139b17194d10293f17ecef054cb
 
     w_try cp -f "$W_CACHE/utorrent/$file1" "$W_WINDIR_UNIX"/utorrent.exe
-
-    w_declare_exe "c:\\windows" "utorrent.exe"
 }
 
 #----------------------------------------------------------------
@@ -11163,8 +10852,6 @@ load_utorrent3()
     0|1) ;;
     *) w_die "Note: utorrent installer returned status '$status'.  Aborting." ;;
     esac
-
-    w_declare_exe "$W_DRIVE_C\\users\\$LOGNAME\\Application Data\\uTorrent" "uTorrent.exe"
 }
 
 #----------------------------------------------------------------
@@ -11181,10 +10868,6 @@ load_vc2005express()
 {
     # Thanks to http://blogs.msdn.com/astebner/articles/551674.aspx for the recipe
     w_call dotnet20
-    if w_workaround_wine_bug 20029 ""  1.3.9,
-    then
-        w_call msxml6
-    fi
 
     # http://blogs.msdn.com/b/astebner/archive/2006/03/14/551674.aspx
     # http://go.microsoft.com/fwlink/?linkid=57034
@@ -11202,10 +10885,6 @@ load_vc2005express()
         w_try "$WINE" Ixpvc.exe /t:"$W_TMP_WIN" /q:a /c:"msiexec /i vcsetup.msi VSEXTUI=1 ADDLOCAL=ALL REBOOT=ReallySuppress"
 
     else
-        if w_workaround_wine_bug 25331
-        then
-            w_warn "Install fails with wine older than 1.1.35.  With wine-1.3.5 or higher, interactive install fails, but quiet mode (-q option) may work."
-        fi
         w_try "$WINE" setup.exe
         w_ahk_do "
             SetTitleMatchMode, 2
@@ -11213,8 +10892,6 @@ load_vc2005express()
             WinWaitClose, Visual C++ 2005 Express Edition Setup
         "
     fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Microsoft Visual Studio 8\\Common7\\IDE" "VCExpress.exe"
 }
 
 #----------------------------------------------------------------
@@ -11251,23 +10928,8 @@ w_metadata vc2005trial apps \
 
 load_vc2005trial()
 {
-    if w_workaround_wine_bug 26162 "Install fails with spurious error about custom action" ,1.3.4 1.3.15,
-    then
-        w_die "Please upgrade to wine-1.3.15 or later to install this app"
-    fi
-    if w_workaround_wine_bug 25331 "Install fails with error about custom rollback actions" 1.1.35,1.3.4 1.3.13,
-    then
-        w_die "Please upgrade to wine-1.3.15 or later to install this app"
-    fi
-    if w_workaround_wine_bug 27987 "Install fails with error about CA_RollbackHelpTransaction" ,1.3.19 1.3.37,
-    then
-        w_die "Please upgrade to wine-1.3.37 or later to install this app"
-    fi
     w_call dotnet20
-    if w_workaround_wine_bug 20029 "Installing native msxml6"  1.3.9,
-    then
-        w_call msxml6
-    fi
+    
     # Without mfc42.dll, pidgen.dll won't load, and the app claims "A trial edition is already installed..."
     w_call mfc42
 
@@ -11306,8 +10968,6 @@ load_vc2005trial()
             controlclick, button2
         winwaitclose, Finish Page
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Microsoft Visual Studio 8\\Common7\\IDE" "devenv.exe"
 }
 
 #----------------------------------------------------------------
@@ -11333,8 +10993,6 @@ load_vc2008express()
     # See also http://blogs.msdn.com/b/astebner/archive/2008/04/25/8425198.aspx
     cd "$W_TMP"/VCExpress
     w_try "$WINE" setup.exe $W_UNATTENDED_SLASH_Q
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Microsoft Visual Studio 9.0\\Common7\\IDE" "VCExpress.exe"
 }
 
 #----------------------------------------------------------------
@@ -11349,16 +11007,6 @@ w_metadata vc2010express apps \
 
 load_vc2010express()
 {
-    if w_workaround_wine_bug 32654 "Installing windows codecs to work around startup crash"
-    then
-        w_call windowscodecs
-    fi
-    if w_workaround_wine_bug 32280 "Replacing mono with dotnet40 to avoid fatal 'Unknown Error'"
-    then
-        # "w_call remove_mono" might suffice
-        w_call dotnet40
-    fi
-
     w_download http://download.microsoft.com/download/1/E/5/1E5F1C0A-0D5B-426A-A603-1798B951DDAE/VS2010Express1.iso adef5e361a1f64374f520b9a2d03c54ee43721c6
 
     # Unpack ISO
@@ -11380,8 +11028,6 @@ load_vc2010express()
     fi
 
     w_try $WINE setup.exe $W_UNATTENDED_SLASH_Q
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Microsoft Visual Studio 10.0\\Common7\\IDE" "VCExpress.exe"
 }
 
 #----------------------------------------------------------------
@@ -11398,9 +11044,8 @@ w_metadata vlc apps \
 load_vlc()
 {
     w_download http://get.videolan.org/vlc/2.2.1/win32/vlc-2.2.1-win32.exe 4cbcea9764b6b657d2147645eeb5b973b642530e
-    cd "$W_CACHE"/vlc
+    cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" $file1 ${W_OPT_UNATTENDED:+ /S}
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\VideoLAN\\VLC" vlc.exe
 }
 
 #----------------------------------------------------------------
@@ -11461,7 +11106,6 @@ load_winamp()
     else
         w_try "$WINE" "$file1"
     fi
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Winamp" "winamp.exe"
 }
 
 #----------------------------------------------------------------
@@ -11483,10 +11127,8 @@ load_wme9()
     # See also http://www.microsoft.com/downloads/details.aspx?FamilyID=5691ba02-e496-465a-bba9-b2f1182cdf24
     w_download http://download.microsoft.com/download/8/1/f/81f9402f-efdd-439d-b2a4-089563199d47/WMEncoder.exe 7a3f8781f3e5705651992ef0150ee30bc1295116
 
-    cd "$W_CACHE"/wme9
+    cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" WMEncoder.exe $W_UNATTENDED_SLASH_Q
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Windows Media Components\\Encoder" "wmenc.exe"
 }
 
 #----------------------------------------------------------------
@@ -11542,20 +11184,12 @@ load_wmp9()
     # Wine's pidgen is too stubby, crashes, see wine bug 31111
     w_override_app_dlls MPSetup.exe native pidgen
 
-    # Have to run twice; see http://bugs.winehq.org/show_bug.cgi?id=1886
-    cd "$W_CACHE"/wmp9
+    cd "$W_CACHE"/"$W_PACKAGE"
     w_try "$WINE" MPSetup.exe $W_UNATTENDED_SLASH_Q
 
-    if w_workaround_wine_bug 1886 "Re-installing since it does not work on the first try." 1.5.23,
-    then
-        w_try "$WINE" MPSetup.exe $W_UNATTENDED_SLASH_Q
-    fi
-
     load_wm9codecs
 
     w_unset_winver
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Windows Media Player" "wmplayer.exe"
 }
 
 #----------------------------------------------------------------
@@ -11585,7 +11219,7 @@ load_wmp10()
     w_download http://download.microsoft.com/download/1/2/a/12a31f29-2fa9-4f50-b95d-e45ef7013f87/MP10Setup.exe 69862273a5d9d97b4a2e5a3bd93898d259e86657
 
     # Crashes on exit, but otherwise ok; see http://bugs.winehq.org/show_bug.cgi?id=12633
-    cd "$W_CACHE"/wmp10
+    cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" MP10Setup.exe $W_UNATTENDED_SLASH_Q
 
     # Disable WMP's services, since they depend on unimplemented stuff, they trigger the GUI debugger several times
@@ -11595,8 +11229,6 @@ load_wmp10()
     load_wm9codecs
 
     w_unset_winver
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Windows Media Player" "wmplayer.exe"
 }
 
 #----------------------------------------------------------------
@@ -11651,14 +11283,6 @@ load_3dmark2000()
         Send {Enter}           ; Finish
         WinWaitClose
     "
-
-    cat > "$W_DRIVE_C/run-$W_PACKAGE.bat" <<__EOF__
-c:
-cd "$W_PROGRAMS_X86_WIN\MadOnion.com\3DMark2000"
-REM possible wine cmd bug: "3dmark2000" aborts, but ".\3dmark2000" works
-.\3DMark2000 %*
-__EOF__
-
 }
 
 #----------------------------------------------------------------
@@ -11704,8 +11328,6 @@ load_3dmark2001()
         }
         WinWaitClose
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\MadOnion.com\\3DMark2001 SE" "3DMark2001SE.exe"
 }
 
 #----------------------------------------------------------------
@@ -11765,7 +11387,6 @@ load_3dmark03()
         }
         WinWaitClose, 3DMark03 - InstallShield Wizard, Complete
     "
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Futuremark\\3DMark03" "3DMark03.exe"
 }
 
 #----------------------------------------------------------------
@@ -11815,8 +11436,6 @@ load_3dmark05()
         w_warn "You must run the app with the -nosysteminfo option to avoid a crash on startup"
         ARGS="-nosysteminfo"
     fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Futuremark\\3DMark05" "3DMark05 $ARGS"
 }
 
 #----------------------------------------------------------------
@@ -11859,12 +11478,7 @@ load_3dmark06()
         WinWaitClose, ahk_class #32770, Complete
     "
 
-    if w_workaround_wine_bug 9210
-    then
-        w_warn "The benchmark may warn that shader model 2.0 is not present.  You can ignore this, but if you want to work around it, see http://bugs.winehq.org/show_bug.cgi?id=9210 for a patch."
-    fi
-
-    if w_workaround_wine_bug 0 "Installing shader compiler..."
+    if w_workaround_wine_bug 24417 "Installing shader compiler..."
     then
         # "Demo" button doesn't work without this.  d3dcompiler_43 related.
         w_call d3dx9_28
@@ -11877,8 +11491,6 @@ load_3dmark06()
         w_warn "You must run the app with the -nosysteminfo option to avoid a crash on startup"
         ARGS="-nosysteminfo"
     fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Futuremark\\3DMark06" "3DMark06 $ARGS"
 }
 
 #----------------------------------------------------------------
@@ -11925,17 +11537,6 @@ load_unigine_heaven()
         }
         winwaitclose
     "
-
-    if w_workaround_wine_bug 22614 "setting video memory to 1024M" 1.3.23,
-    then
-        # hope your card actually has 1GB of RAM
-        w_call videomemorysize=1024
-    fi
-
-    # Should start Heaven.exe, but that doesn't run in Wine
-    # Should give option to run Heaven_gl.bat (even works in Wine)
-    # or the dx10 or dx11 versions (doesn't).
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Unigine\\Heaven" "cmd /c Heaven_d3d9.bat"
 }
 
 #----------------------------------------------------------------
@@ -11986,14 +11587,6 @@ load_algodoo_demo()
         }
         WinWaitClose, Algodoo, Completing
     "
-
-    # Since we declined the msvc runtime installer (right?), we have to do it here
-    if w_workaround_wine_bug 23815
-    then
-        w_call vcrun2008
-    fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Algodoo" "Algodoo.exe"
 }
 
 #----------------------------------------------------------------
@@ -12038,8 +11631,6 @@ load_amnesia_tdd_demo()
             WinWaitClose, Amnesia - The Dark Descent Demo, finished
         }
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Amnesia - The Dark Descent Demo\\redist" "Amnesia.exe"
 }
 
 #----------------------------------------------------------------
@@ -12057,11 +11648,6 @@ load_aoe3_demo()
 
     w_download "http://download.microsoft.com/download/a/5/2/a525997e-8423-435b-b694-08118d235064/aoe3trial.exe" 2b0a123243092d79f910db5691d99d469f7c17c3
 
-    if w_workaround_wine_bug 24897 "Installing msxml4 to avoid font problem" 1.3.9,
-    then
-        w_call msxml4
-    fi
-
     cd "$W_CACHE/$W_PACKAGE"
 
     w_ahk_do "
@@ -12083,15 +11669,6 @@ load_aoe3_demo()
         WinWaitClose
     "
 
-    if w_workaround_wine_bug 24911 "Installing devnum, dmsynth, and quartz to get sound working" 1.3.9,
-    then
-        # On some systems, only quartz is needed?
-        # appdb says that l3codecx is also needed?
-        w_call devenum
-        w_call dmsynth
-        w_call quartz
-    fi
-
     if w_workaround_wine_bug 24912
     then
         # kill off lingering installer
@@ -12103,8 +11680,6 @@ load_aoe3_demo()
         PID=`ps augxw | grep IDriver | grep -v grep | awk '{print $2}'`
         kill $PID
     fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Microsoft Games\\Age of Empires III Trial" "age3.exe"
 }
 
 #----------------------------------------------------------------
@@ -12141,8 +11716,6 @@ load_aoe_demo()
         }
         WinWaitClose, Microsoft Age of Empires Trial Version
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Microsoft Games\\Age of Empires Trial" "empires"
 }
 
 #----------------------------------------------------------------
@@ -12186,35 +11759,9 @@ load_acreedbro()
         }
         WinWaitClose
     "
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Ubisoft\\Assassin's Creed Brotherhood" AssassinsCreedBrotherhood.exe
 
     w_download http://static3.cdn.ubi.com/ac_brotherhood/ac_brotherhood_1.01_ww.exe a2b76f16616709cc16537b0e98faa4181ca904ce
 
-    if w_workaround_wine_bug 26562 "Disabling glsl for smoother rendering"
-    then
-        w_call glsl=disabled
-
-        # And turn off after-effects to fix depth of field problem caused
-        # by disabling glsl...
-        cd "$W_DRIVE_C/users/$LOGNAME/My Documents"
-        dir="Ubisoft/Assassin's Creed Brotherhood"
-        file="$dir/ACBrotherhood.ini"
-        if test -f "$file"
-        then
-            mv "$file" "$file.old"
-            sed 's,PostFX=[0-9]*,PostFX=0,' < "$file.old" > "$file"
-        else
-            mkdir -p "$dir"
-            echo "[Graphics]" > "$file"
-            echo "PostFX=0" >> "$file"
-        fi
-    fi
-
-    if w_workaround_wine_bug 26583 "Installing native d3dx9_36"
-    then
-        w_call d3dx9_36
-    fi
-
     # FIXME: figure out why these executables don't exit, and do a proper workaround or fix
     sleep 10
     if ps augxw | grep -i exe | egrep 'winemenubuilder.exe|setup.exe|PnkBstrA.exe | egrep -v egrep'
@@ -12248,27 +11795,6 @@ load_acreedbro()
         }
         WinWaitClose
     "
-
-    if test `which wine-hotfix-6971` 2> /dev/null
-    then
-        if w_workaround_wine_bug 6971 "Pointing menu and icon at wine-hotfix-6971 to fix mouse problems"
-        then
-            myexec="Exec=env WINEPREFIX=\"$WINEPREFIX\" wine-hotfix-6971 cmd /c 'C:\\\\\\\\Run-$W_PACKAGE.bat'"
-
-            mymenu="$HOME/Desktop/Assassin's Creed Brotherhood.desktop"
-            if test -f "$mymenu"
-            then
-                sed -i "s,Exec=.*,$myexec," "$mymenu"
-            fi
-            mymenu="$XDG_DATA_HOME/applications/wine/Programs/Ubisoft/Assassin's Creed Brotherhood/Assassin's Creed Brotherhood.desktop"
-            if test -f "$mymenu"
-            then
-                sed -i "s,Exec=.*,$myexec," "$mymenu"
-            fi
-        fi
-    else
-        w_workaround_wine_bug 6971 "Please upgrade to wine-1.3.23 or later; see http://wiki.winehq.org/Bug6971" 1.3.23,
-    fi
 }
 
 #----------------------------------------------------------------
@@ -12318,7 +11844,6 @@ load_atmosphir()
         }
         winwaitclose
     "
-    w_declare_exe "$W_PROGRAMS_X86_WIN/Minor Studios/Atmosphir" Atmosphir.exe
 }
 
 #----------------------------------------------------------------
@@ -12379,11 +11904,9 @@ load_avatar_demo()
         }
         winwaitclose AVATAR
     "
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Ubisoft\\Demo\\James Cameron's AVATAR - THE GAME (Demo)\\bin" "AvatarDemo.exe"
-
-    w_workaround_wine_bug 26590 "If game seems slow, try winetricks glsl=disabled"
 }
 
+#----------------------------------------------------------------
 
 w_metadata bttf101 games \
     title="Back to the Future Episode 1" \
@@ -12397,11 +11920,6 @@ load_bttf101()
 {
     w_download_manual http://www.telltalegames.com/bttf bttf_101_setup.exe 9b15e26d9b4d454f714d6559efe509562df9c10b
 
-    if w_workaround_wine_bug 26371 "Installing d3dx9_36 to work around crash"
-    then
-        w_call d3dx9_36
-    fi
-
     cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
         SetWinDelay 1000
@@ -12425,8 +11943,6 @@ load_bttf101()
         }
         WinWaitClose
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Telltale Games\\Back to the Future The Game\\Episode 1" BackToTheFuture101.exe
 }
 
 #----------------------------------------------------------------
@@ -12441,11 +11957,6 @@ w_metadata bioshock_demo games \
 
 load_bioshock_demo()
 {
-    if w_workaround_wine_bug 6971 "Setting mwo=force... please upgrade to wine-1.3.23" 1.3.23,
-    then
-        w_call mwo=force
-    fi
-
     w_download http://us.download.nvidia.com/downloads/nZone/demos/nzd_BioShockPC.zip 7a19186602cec5210e4505b58965e8c04945b3cf
 
     w_info "Unzipping demo, installer will start in about 30 seconds."
@@ -12484,8 +11995,6 @@ load_bioshock_demo()
         winwaitclose
         sleep 3000 ; wait for splash screen to close
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\2K Games\\BioShock Demo\\Builds\\Release" "Bioshock.exe"
 }
 
 #----------------------------------------------------------------
@@ -12496,14 +12005,11 @@ w_metadata bioshock2 games \
     year="2010" \
     media="dvd" \
     file1="BIOSHOCK_2.iso" \
-    wine_showstoppers="7065" \
     installed_exe1="$W_PROGRAMS_X86_WIN/2K Games/BioShock 2/SP/Builds/Binaries/Bioshock2Launcher.exe" \
     installed_exe2="$W_PROGRAMS_X86_WIN/2K Games/BioShock 2/MP/Builds/Binaries/Bioshock2Launcher.exe"
 
 load_bioshock2()
 {
-    w_workaround_wine_bug 7065 "This game won't work in Wine because its disc check fails."
-
     w_mount BIOSHOCK_2
     w_ahk_do "
         SetWinDelay 1000
@@ -12528,8 +12034,6 @@ load_bioshock2()
             controlclick Button4 ; Finish
         }
     "
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\2K Games\\BioShock 2\\SP\\Builds\\Binaries" Bioshock2Launcher.exe
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\2K Games\\BioShock 2\\MP\\Builds\\Binaries" Bioshock2Launcher.exe bioshock2_mp
 }
 
 #----------------------------------------------------------------
@@ -12619,8 +12123,6 @@ load_bfbc2()
     then
         w_warn 'If the game says "No CD/DVD error", try "sudo mount -o remount,unhide,uid=`uid -u`".  See http://bugs.winehq.org/show_bug.cgi?id=22961 for more info.'
     fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Electronic Arts\\Battlefield Bad Company 2" "BFBC2Game.exe"
 }
 
 #----------------------------------------------------------------
@@ -12665,13 +12167,6 @@ load_bladekitten_demo()
         }
         WinWaitClose
     "
-
-    if w_workaround_wine_bug 24681
-    then
-        w_set_app_winver BladeKitten_Demo.exe win2k
-    fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Krome Studios\\Blade Kitten Demo" "BladeKitten_Demo.exe"
 }
 
 #----------------------------------------------------------------
@@ -12692,10 +12187,6 @@ load_cnc_tiberian_sun()
     # FIXME: we need a progress indicator when unpacking large archives
     w_info "Unpacking rar file.  This will take a minute."
     w_try_unrar "$W_CACHE/$W_PACKAGE/$file1"
-
-    w_declare_exe \
-        "$W_PROGRAMS_X86_WIN\\EA Games\\Command & Conquer The First Decade\\Command & Conquer(tm) Tiberian Sun(tm)\\SUN" \
-        Game.exe
 }
 
 #----------------------------------------------------------------
@@ -12739,13 +12230,6 @@ load_cnc3_demo()
 
         winwaitclose, Conquer 3, Launch the program
     "
-
-    if w_workaround_wine_bug 19159
-    then
-        w_call vd=800x600
-    fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Electronic Arts\\Command & Conquer 3 Tiberium Wars Demo" "CNC3Demo.exe"
 }
 
 #----------------------------------------------------------------
@@ -12792,8 +12276,6 @@ load_cnc_redalert3_demo()
             WinWaitClose
         "
     fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Electronic Arts\\Red Alert 3 Demo" RA3Demo.exe
 }
 
 #----------------------------------------------------------------
@@ -12830,7 +12312,6 @@ load_cim_demo()
     w_download_manual http://www.fileplanet.com/218762/210000/fileinfo/Cities-in-Motion-Demo cim-demo-1-0-8.exe d40408b59bc0e6e33b564e9bbb55dbab6c44c630
     cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" cim-demo-1-0-8.exe ${W_OPT_UNATTENDED:+ /sp- /silent /norestart}
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Cities In Motion Demo" "Cities In Motion.exe"
 }
 
 #----------------------------------------------------------------
@@ -12890,13 +12371,6 @@ load_cod_demo()
     else
         setvar=
     fi
-    cat > "$W_DRIVE_C/run-$W_PACKAGE.bat" <<__EOF__
-$setvar
-c:
-cd "$W_PROGRAMS_X86_WIN\\Call of Duty Single Player Demo"
-CoDSP.exe %*
-__EOF__
-
 }
 
 #----------------------------------------------------------------
@@ -12983,13 +12457,6 @@ load_cod1()
     else
         setvar=
     fi
-    cat > "$W_DRIVE_C/run-$W_PACKAGE.bat" <<__EOF__
-$setvar
-c:
-cd "$W_PROGRAMS_X86_WIN\\Call of Duty"
-CoDSP.exe %*
-__EOF__
-
     w_warn "This game is copy-protected, and requires the real disc in a real drive to run."
 }
 
@@ -13042,8 +12509,6 @@ load_cod4mw_demo()
         }
         WinWaitClose,WinZip Self-Extractor - CoD4MWDemoSetup_v2
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Activision\\Call of Duty 4 - Modern Warfare Demo" "iw3sp.exe"
 }
 
 #----------------------------------------------------------------
@@ -13107,20 +12572,7 @@ load_cod5_waw()
     "
 
     # FIXME: Install latest updates
-
-    if w_workaround_wine_bug 16241 "Working around sound bug by setting Win7 mode" 1.3.12,
-    then
-        set_app_winver CodWaW.exe win7
-    fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Activision\\Call of Duty - World at War" "CoDWaW.exe"
-
-    if w_workaround_wine_bug 219
-    then
-        w_warn "This game's copy-protection scheme does not currently work in Wine."
-    else
-        w_warn "This game is copy-protected, and requires the real disc in a real drive to run."
-    fi
+    w_warn "This game is copy-protected, and requires the real disc in a real drive to run."
 }
 
 #----------------------------------------------------------
@@ -13160,8 +12612,6 @@ load_cojbib_demo()
 
         winwaitclose Call of Juarez
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Ubisoft\\Demo\\Techland\\Call of Juarez - Bound in Blood SP Demo" "CoJBiBDemo_x86.exe"
 }
 
 #----------------------------------------------------------------
@@ -13202,17 +12652,6 @@ load_civ4_demo()
         }
         winwaitclose
     "
-
-    if w_workaround_wine_bug 6856
-    then
-        w_call msxml3
-    fi
-    if w_workaround_wine_bug 6856 # part 2, still need to file a bug
-    then
-        w_call d3dx9_26
-    fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Firaxis Games\\Sid Meier's Civilization 4 Demo" "Civilization4.exe"
 }
 
 #----------------------------------------------------------------
@@ -13231,7 +12670,6 @@ load_crayonphysics_demo()
     w_download http://crayonphysicsdeluxe.s3.amazonaws.com/crayon_release52demo.exe 4ffd64c630f69e7cf024ef946c2c64c8c4ce4eac
     # Inno Setup installer
     w_try "$WINE" "$W_CACHE/$W_PACKAGE/$file1" ${W_OPT_UNATTENDED:+ /sp- /silent /norestart}
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Crayon Physics Deluxe Demo" crayon.exe
 }
 
 #----------------------------------------------------------------
@@ -13295,11 +12733,6 @@ load_crysis2()
         }
         winwaitclose
     "
-
-    if w_workaround_wine_bug 26283
-    then
-        w_warn "The game has some nasty flickering, see http://bugs.winehq.org/show_bug.cgi?id=26283"
-    fi
 }
 
 #----------------------------------------------------------------
@@ -13339,8 +12772,6 @@ load_csi6_demo()
             WinWaitClose
         }
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Ubisoft\\Telltale Games\\CSI - Fatal Conspiracy Demo" "CSI6Demo.exe"
 }
 
 #----------------------------------------------------------------
@@ -13393,9 +12824,6 @@ load_darknesswithin2_demo()
     then
         w_call d3dx9_36
     fi
-
-    # you have to cd to the directory containing DarkLineage.exe before running it
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Iceberg Interactive\\Darkness Within 2 Demo" "DarkLineage.exe"
 }
 
 #----------------------------------------------------------------
@@ -13446,7 +12874,6 @@ load_darkspore()
         }
         WinWaitClose, InstallShield Wizard
     "
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Electronic Arts\\Darkspore\\DarksporeBin" "Darkspore.exe"
 }
 
 #----------------------------------------------------------------
@@ -13464,18 +12891,6 @@ load_dcuo()
 {
     # The installer would take care of this, but let's do it first
     w_call flash
-    if w_workaround_wine_bug 26298 "Installing microsoft runtime libraries"
-    then
-        w_call vcrun2005
-    fi
-    if w_workaround_wine_bug 27279 "Installing microsoft XAct audio"
-    then
-        w_call xact
-    fi
-    if w_workaround_wine_bug 25906 "Installing ie8"
-    then
-        w_call ie8
-    fi
 
     w_mount "DCUO - Disc 1"
     w_ahk_do "
@@ -13549,7 +12964,6 @@ load_dcuo()
         winwaitclose
     "
     w_warn "Now let the wookie install itself, and then quit."
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Sony Online Entertainment\\Installed Games\\DC Universe Online Live" LaunchPad.exe
 }
 
 #----------------------------------------------------------------
@@ -13610,37 +13024,27 @@ load_deadspace()
         controlclick, Button5
         controlclick, Button1
     "
-
-    if w_workaround_wine_bug 26079
-    then
-        w_call d3dx9_36
-    fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Electronic Arts\\Dead Space" "Dead Space.exe"
 }
 
 #----------------------------------------------------------------
 
 w_metadata deadspace2 games \
-    title="Dead Space 2 (drm broken on wine)" \
+    title="Dead Space 2" \
     publisher="EA" \
     year="2011" \
     media="dvd" \
     file1="Disc1.iso" \
     file2="Disc2.iso" \
     installed_exe1="$W_PROGRAMS_X86_WIN/EA Games/Dead Space 2/deadspace2.exe" \
-    wine_showstoppers="25853"
 
 load_deadspace2()
 {
-    if w_workaround_wine_bug 25853
-    then
-        w_warn "Non-steam versions of this game do not run on Wine because Wine does not support the version of SecuROM they use.  Proceed only if you want to run into this problem."
-    fi
     w_read_key
 
     w_mount Disc1
 
+    # FIXME: this bug was fixed in 1.3.36, so this is unneccessary
+    #
     # Work around bug 25963 (fails to switch discs)
     w_warn "Copying discs to hard drive.  This will take a few minutes."
     cd "$W_TMP"
@@ -13735,13 +13139,6 @@ load_deadspace2()
         }
         WinWaitClose, Product activation
     "
-
-    if w_workaround_wine_bug 21230
-    then
-        w_call d3dx9_36
-    fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\EA Games\\Dead Space 2" deadspace2.exe
 }
 
 #----------------------------------------------------------------
@@ -13758,8 +13155,6 @@ load_deusex2_demo()
 {
     w_download_manual "http://www.techpowerup.com/downloads/1730/Deus_Ex:_Invisible_War_Demo.html" dxiw_demo.zip ccae48fb046d912b3714ea1b4be4294e74bb3092
 
-    w_workaround_wine_bug 6971 "Please upgrade to wine-1.3.23 or later; see http://wiki.winehq.org/Bug6971" 1.3.23,
-
     w_try unzip "$W_CACHE/$W_PACKAGE/dxiw_demo.zip" -d "$W_TMP"
     cd "$W_TMP"
     w_ahk_do "
@@ -13788,8 +13183,6 @@ load_deusex2_demo()
             controlclick button4
         winwaitclose Deus Ex, Complete
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Deus Ex - Invisible War Demo\\System" "DX2.exe"
 }
 
 #----------------------------------------------------------------
@@ -13862,9 +13255,6 @@ load_diablo2()
         ControlClick &Cancel, Diablo II"
     # Dagnabbit, the darn updater starts the game after it updates, no matter what I do?
     w_killall "Game.exe"
-
-    # Runs better in window
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Diablo II" "Diablo II.exe -d3d9 -w"
 }
 
 w_metadata digitanks_demo games \
@@ -13883,11 +13273,10 @@ load_digitanks_demo()
     w_download "http://static.digitanks.com/files/digitanks.exe" e54ffb07232f434bcfaf7b3d43ddf9affa93ef15
     cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" $file1 ${W_OPT_UNATTENDED:+ /S}
-    if w_workaround_wine_bug 26915 "installing corefonts"
+    if w_workaround_wine_bug 8060 "installing corefonts"
     then
         w_call corefonts
     fi
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Digitanks" digitanksdemo.exe
 }
 
 w_metadata dirt2_demo games \
@@ -13947,8 +13336,6 @@ load_dirt2_demo()
         }
         WinWaitClose, DiRT2 Demo - InstallShield Wizard, Complete
         "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Codemasters\\DiRT2 Demo" "dirt2.exe"
 }
 
 #----------------------------------------------------------------
@@ -14027,8 +13414,6 @@ load_divinity2_demo()
     then
         w_call wmp9
     fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Divinity II - Ego Draconis - Demo\\Bin" "Divinity2_Demo.exe"
 }
 
 #----------------------------------------------------------------
@@ -14070,7 +13455,6 @@ load_demolition_company_demo()
         }
         winwaitclose, Setup - Demolition
     "
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Demolition Company Demo\\" "DemolitionCompany.exe"
 }
 
 #----------------------------------------------------------------
@@ -14087,25 +13471,10 @@ load_dragonage()
 {
     w_read_key
 
-    if w_workaround_wine_bug 22191 "Installer has a non-fatal crash on exit"
-    then
-        w_call nocrashdialog
-    fi
     # game can do this, why do we need to?
     w_call physx
-    if w_workaround_wine_bug 24837 "Installing C++ runtime library"
-    then
-        w_call vcrun2005
-    fi
 
-    if test "$WINETRICKS_OPT_KEEPISOS" != 1 &&  \
-        test ! -f "$W_CACHE/dragonage/DragonAge.iso" &&  \
-        w_workaround_wine_bug 26459 "Making and mounting an .iso to work around 'Failed to authenticate the disk' error.  After each reboot, you'll need to do [sudo mount -o ro,loop '$W_CACHE/dragonage/DragonAge.iso' /mnt/winetricks] to play Dragon Age.  Someday this will be automated."
-    then
-        WINETRICKS_OPT_KEEPISOS=1 w_mount DragonAge
-    else
-        w_mount DragonAge
-    fi
+    w_mount DragonAge
 
     w_ahk_do "
         SetWinDelay 1000
@@ -14148,11 +13517,6 @@ load_dragonage()
     else
         cp -f "$ini" "$ini.old"
     fi
-    if w_workaround_wine_bug 22308 "Setting EnableFrameBufferEffects=0 to work around blurry cut scenes"
-    then
-        sed 's,EnableFrameBufferEffects=1,EnableFrameBufferEffects=0,' < "$ini" > "$ini.new"
-        mv -f "$ini.new" "$ini"
-    fi
     if w_workaround_wine_bug 22383 "use strictdrawordering to avoid video problems"
     then
         w_call strictdrawordering=enabled
@@ -14162,15 +13526,6 @@ load_dragonage()
         sed 's,UseVSync=1,UseVSync=0,' < "$ini" > "$ini.new"
         mv -f "$ini.new" "$ini"
     fi
-    if w_workaround_wine_bug 26435 "Setting SoundDisabled=0 to fix sound"
-    then
-        sed 's,SoundDisabled=1,SoundDisabled=0,' < "$ini" > "$ini.new"
-        mv -f "$ini.new" "$ini"
-    fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Dragon Age" "bin_ship\\daorigins.exe"
-
-    w_workaround_wine_bug 26211 "You may need to kill DAO or its launcher after each run.  The Process view of taskmgr makes this relatively easy."
 }
 
 #----------------------------------------------------------------
@@ -14236,11 +13591,6 @@ load_dragonage_ue()
         winwaitclose
     "
 
-    if w_workaround_wine_bug 22307
-    then
-        w_warn "Turn off frame buffer effects to avoid blurry cut scenes.  See http://bugs.winehq.org/show_bug.cgi?id=22307"
-    fi
-
     if w_workaround_wine_bug 22383
     then
         w_try_winetricks strictdrawordering=enabled
@@ -14257,8 +13607,6 @@ load_dragonage_ue()
     fi
 
     w_warn "To activate the additional content, visit http://social.bioware.com/redeem_code.php?path=/dragonage/pc/dlcactivate/en"
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Dragon Age" "bin_ship\\daorigins.exe"
 }
 
 #----------------------------------------------------------------
@@ -14299,16 +13647,6 @@ load_dragonage2_demo()
         }
         winwaitclose
     "
-    if w_workaround_wine_bug 26205 "installing DirectX runtime libraries"
-    then
-        w_call d3dx9_36
-        w_call d3dx11_43
-    fi
-    if w_workaround_wine_bug 26211 "installing native devenum to get sound in logo movie"
-    then
-        w_call devenum
-    fi
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Dragon Age 2 Demo" "DragonAge2Launcher.exe"
 }
 
 #----------------------------------------------------------------
@@ -14326,11 +13664,6 @@ load_eve()
     # http://www.eveonline.com/download/?fallback=1&
     w_download http://content.eveonline.com/561078/EVE_Online_Installer_561078.exe 5b5f0cd4fbd42f82b1d1cccb2e22ddeed97d1d3a
 
-    if w_workaround_wine_bug 18221
-    then
-        w_call corefonts
-    fi
-
     cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
         run, $file1
@@ -14353,7 +13686,6 @@ load_eve()
         }
         WinWaitClose, EVE Online
     "
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\CCP\\EVE" "eve.exe"
 }
 
 #----------------------------------------------------------------
@@ -14378,12 +13710,6 @@ load_fable_tlc()
         w_call mfc42
     fi
 
-    if test ! -f "$W_CACHE/$W_PACKAGE/FABLE_DISC_1.iso" && w_workaround_wine_bug 24940
-    then
-        # FIXME: port load_harder from winetricks and use it when caching first disc?
-        w_warn "If the installer can't read from the CD, try using ddrescue to make image of first disc, and place in $W_CACHE/$W_PACKAGE/FABLE_DISC_1.iso"
-    fi
-
     w_mount FABLE_DISK_1
     w_ahk_do "
         SetTitleMatchMode, 2
@@ -14479,8 +13805,6 @@ _EOF_
     then
         w_call d3dx9_36
     fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Microsoft Games\\Fable - The Lost Chapters" "Fable.exe"
 }
 
 #----------------------------------------------------------------
@@ -14519,7 +13843,6 @@ load_farmsim2011_demo()
             ControlClick TNewButton2   ; Finish
         WinWaitClose
     "
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Farming Simulator 2011 Demo" game.exe
 }
 
 #----------------------------------------------------------------
@@ -14582,13 +13905,6 @@ load_fifa11_demo()
         }
         WinWaitClose
     "
-
-    if w_workaround_wine_bug 22161
-    then
-        w_call d3dx9_36
-    fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\EA Sports\\FIFA 11 Demo\\Game" "fifa.exe"
 }
 
 #----------------------------------------------------------------
@@ -14627,12 +13943,6 @@ load_hon()
         }
         winwaitclose, Heroes of Newerth, Finish
     "
-    if w_workaround_wine_bug 25919 "disabling mmdevapi to fix sound and avoid crash"
-    then
-        w_override_dlls disabled mmdevapi
-    fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Heroes of Newerth" "hon.exe"
 }
 
 #----------------------------------------------------------------
@@ -14678,8 +13988,6 @@ load_hordesoforcs2_demo()
         }
         winwaitclose Orcs
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Hordes of Orcs 2 Demo" "HoO2.exe"
 }
 
 #----------------------------------------------------------------
@@ -14691,13 +13999,10 @@ w_metadata mfsxde games \
     media="dvd" \
     file1="FSX DISK 1.iso" \
     file2="FSX DISK 2.iso" \
-    installed_exe1="$W_PROGRAMS_X86_WIN/Microsoft Games/Microsoft Flight Simulator X/fsx.exe" \
-    wine_showstoppers="26411"
+    installed_exe1="$W_PROGRAMS_X86_WIN/Microsoft Games/Microsoft Flight Simulator X/fsx.exe"
 
 load_mfsxde()
 {
-    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
@@ -14760,8 +14065,6 @@ load_mfsxde()
         ; Setup doesn't close on its own, because this process doesn't exit cleanly
         process, close, IDriver.exe
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Microsoft Games\\Microsoft Flight Simulator X" "fsx.exe"
 }
 
 #----------------------------------------------------------------
@@ -14808,8 +14111,6 @@ load_mfsx_demo()
         ; Setup doesn't close on its own, because this process doesn't exit cleanly
         process, close, IDriver.exe
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Microsoft Games\\Microsoft Flight Simulator X" "fsx.exe"
 }
 
 #----------------------------------------------------------------
@@ -14820,18 +14121,12 @@ w_metadata gothic4_demo games \
     year="2010" \
     media="manual_download" \
     file1="ArcaniA_Gothic4_Demo_Setup.zip" \
-    installed_exe1="$W_PROGRAMS_X86_WIN/JoWooD Entertainment AG/ArcaniA - Gothic 4 Demo/Arcania.exe" \
-    wine_showstoppers="7065"
+    installed_exe1="$W_PROGRAMS_X86_WIN/JoWooD Entertainment AG/ArcaniA - Gothic 4 Demo/Arcania.exe"
 
 # http://appdb.winehq.org/objectManager.php?sClass=version&iId=21507
 
 load_gothic4_demo()
 {
-    if w_workaround_wine_bug 7065
-    then
-        w_warn "Non-steam versions of this game do not run on Wine because Wine does not support the version of SecuROM they use.  Proceed only if you want to run into this problem."
-    fi
-
     w_download_manual http://www.gamershell.com/download_63874.shtml ArcaniA_Gothic4_Demo_Setup.zip d36024c0235878c4589234a56cc8b6e05da5c593
 
     cd "$W_TMP"
@@ -14885,18 +14180,6 @@ load_gothic4_demo()
         }
         winwaitclose
     "
-
-    if w_workaround_wine_bug 21939
-    then
-        w_call wmp9
-    fi
-
-    if w_workaround_wine_bug 24250
-    then
-        w_call vcrun2008
-    fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\JoWooD Entertainment AG\\ArcaniA - Gothic 4 Demo" "Arcania.exe"
 }
 
 #----------------------------------------------------------------
@@ -14960,8 +14243,6 @@ load_gta_vc()
         w_call vd=800x600
     fi
 
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Rockstar Games\\Grand Theft Auto Vice City" gta-vc.exe
-
     myexec="Exec=env WINEPREFIX=\"$WINEPREFIX\" wine cmd /c 'C:\\\\\\\\Run-gta_vc.bat'"
     mymenu="$XDG_DATA_HOME/applications/wine/Programs/Rockstar Games/Grand Theft Auto Vice City/Play GTA Vice City.desktop"
     if test -f "$mymenu" && w_workaround_wine_bug 26304 "Fixing system menu"
@@ -15002,8 +14283,6 @@ load_guildwars()
         Sleep 4000
         WinClose, ahk_class ArenaNet_Dx_Window_Class
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Guild Wars" "Gw.exe"
 }
 
 #----------------------------------------------------------------
@@ -15020,11 +14299,6 @@ w_metadata hegemonygold_demo games \
 
 load_hegemonygold_demo()
 {
-    if w_workaround_wine_bug 25767
-    then
-        w_warn "This game works, but has some rendering glitches in Wine."
-    fi
-
     # 6 Mar 2011: 8c4d8aa8f997b106c78b065a4b200e5e1ab846a8
     # 28 Apr 2011: 93677013fc17f014b1640bed070e8bb1b2a17445
     # 25 Jun 2011: 4069656ea3c3760b67d1c5adff37de7472955f72
@@ -15061,8 +14335,6 @@ load_hegemonygold_demo()
         }
         WinWaitClose,Hegemony
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Longbow Digital Arts\\Hegemony Gold" "Hegemony Gold.exe"
 }
 
 #----------------------------------------------------------------
@@ -15084,11 +14356,6 @@ load_hegemony_demo()
 
     cd "$W_CACHE/$W_PACKAGE"
 
-    if w_workaround_wine_bug 24819
-    then
-        w_override_dlls disabled gameux
-    fi
-
     w_ahk_do "
         SetTitleMatchMode, 2
         run, Hegemony_Philip_of_Macedon_Installer.exe
@@ -15130,8 +14397,6 @@ load_hegemony_demo()
         }
         WinWaitClose,Hegemony
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Longbow Digital Arts\\Hegemony Philip of Macedon" "Hegemony Philip of Macedon.exe"
 }
 
 #----------------------------------------------------------------
@@ -15180,8 +14445,6 @@ load_hphbp_demo()
     # Won't really work on cygwin, but that's ok.
     cd "$W_PROGRAMS_X86_UNIX/Electronic Arts"
     ln -s "Harry Potter and the Half-Blood Prince"* "Harry Potter and the Half-Blood Prince Demo"
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Electronic Arts\\Harry Potter and the Half-Blood Prince Demo\\pc" hp6_demo.exe
 }
 
 #----------------------------------------------------------------
@@ -15198,13 +14461,7 @@ load_imvu()
 {
     w_download http://static-akm.imvu.com/imvufiles/installers/InstallIMVU_465.0_st_c.exe 3a5c6c335227a5709c5772f91d8407edd07d4012
 
-    if w_workaround_wine_bug 28541 "Installing Visual C++ 2008 runtime to avoid crash on startup"
-    then
-        w_call vcrun2008
-    fi
-
     cd "$W_CACHE/$W_PACKAGE"
-
     w_ahk_do "
         SetTitleMatchMode, 2
         SetWinDelay 500
@@ -15224,8 +14481,6 @@ load_imvu()
         }
         winwaitclose
     "
-
-    w_declare_exe "c:\\users\\$LOGNAME\\Application Data\\IMVUClient" "IMVUClient.exe"
 }
 
 #----------------------------------------------------------------
@@ -15243,12 +14498,6 @@ w_metadata kotor1 games \
 
 load_kotor1()
 {
-    # without virtual desktop, some in-game resolutions cause a crash.
-    if w_workaround_wine_bug 16596
-    then
-        w_call vd=800x600
-    fi
-
     w_mount "KOTOR_1"
     w_ahk_do "
         SetTitleMatchMode 2
@@ -15314,8 +14563,6 @@ load_kotor1()
         }
         winwaitclose Star Wars, Complete
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\LucasArts\\SWKotOR" "swkotor.exe"
 }
 
 #----------------------------------------------------------------
@@ -15374,8 +14621,6 @@ load_losthorizon_demo()
         }
         WinWaitClose
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Deep Silver\\Lost Horizon Demo" "fsasgame.exe"
 }
 
 #----------------------------------------------------------------
@@ -15434,8 +14679,6 @@ load_lego_potc_demo()
         }
         winwaitclose, LEGO
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Disney Interactive Studios\\LEGO Pirates DEMO" LEGOPiratesDEMO.exe
 }
 
 #----------------------------------------------------------------
@@ -15481,17 +14724,10 @@ load_lhp_demo()
         winwaitclose, LEGO, Finish
     "
 
-    if w_workaround_wine_bug 23397
-    then
-        w_warn "If sound stutters, try switching to OSS sound in winecfg (winetricks sound=oss)"
-    fi
-
     # Work around locale issues by symlinking the app's directory to not have a funny char
     # Won't really work on cygwin, but that's ok.
     cd "$W_PROGRAMS_X86_UNIX/WB Games"
     ln -s LEGO*Harry\ Potter*DEMO LEGO_Harry_Potter_DEMO
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\WB Games\\LEGO_Harry_Potter_DEMO" "LEGOHarryPotterDEMO.exe"
 }
 
 #----------------------------------------------------------------
@@ -15523,12 +14759,6 @@ load_lswcs()
         }
         winwaitclose, LEGO
     "
-    # Installer crashes at end (http://bugs.winehq.org/show_bug.cgi?id=22529) but this doesn't seem to hurt.
-    # Wait for all processes to exit, else unmount will fail
-    #$W_WINESERVER -w
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\LucasArts\\LEGO Star Wars - The Complete Saga" "LEGOStarWarsSaga.exe"
-
     w_warn "This game is copy-protected, and requires the real disc in a real drive to run."
 }
 
@@ -15587,8 +14817,6 @@ load_lemonysnicket()
         }
         WinWaitClose, Lemony
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Activision\\Lemony Snicket's A Series of Unfortunate Events" System\\game.exe
 }
 
 #----------------------------------------------------------------
@@ -15624,7 +14852,6 @@ load_luxor_ar()
         }
         winwaitclose
     "
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\MumboJumbo\\Luxor Amun Rising" "Luxor AR.exe"
 }
 
 #----------------------------------------------------------------
@@ -15644,28 +14871,11 @@ load_masseffect2()
     w_mount MassEffect2
     w_read_key
 
-    if w_workaround_wine_bug 22091 "May hang or crash at end of install, but should install ok."
-    then
-        w_call nocrashdialog
-    fi
-
-    if w_workaround_wine_bug 23126 "Installing C runtime library" 1.3.0,
-    then
-        w_call vcrun2005
-    fi
-    if w_workaround_wine_bug 23125 "Installing d3dx10 libraries" 1.3.0,
-    then
-        w_call d3dx10
-    fi
     # FIXME: only do this for nvidia cards
     if w_workaround_wine_bug 23151 "Disabling glsl"
     then
         w_call glsl=disabled
     fi
-    if w_workaround_wine_bug 22919 "Installing physx"
-    then
-        w_call physx
-    fi
 
     w_ahk_do "
         SetTitleMatchMode, 2
@@ -15715,9 +14925,6 @@ load_masseffect2()
             sleep 1000
         }
     "
-    w_workaround_wine_bug 6971 "Please upgrade to wine-1.3.23 or later; see http://wiki.winehq.org/Bug6971" 1.3.23,
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Mass Effect 2\\Binaries" "MassEffect2.EXE"
 }
 
 #----------------------------------------------------------------
@@ -15734,28 +14941,11 @@ load_masseffect2_demo()
 {
     w_download http://static.cdn.ea.com/bioware/u/f/eagames/bioware/masseffect2/ME2_DEMO/MassEffect2DemoEN.exe cda9a25387a98e29772b3ccdcf609f87188285e2
 
-    if w_workaround_wine_bug 22091 "May hang or crash at end of install, but should install ok."
-    then
-        w_call nocrashdialog
-    fi
-
-    if w_workaround_wine_bug 23126 "Installing C runtime library" 1.3.0,
-    then
-        w_call vcrun2005
-    fi
-    if w_workaround_wine_bug 23125 "Installing d3dx10 libraries" 1.3.0,
-    then
-        w_call d3dx10
-    fi
     # FIXME: only do this for nvidia cards
     if w_workaround_wine_bug 23151 "Disabling glsl"
     then
         w_call glsl=disabled
     fi
-    if w_workaround_wine_bug 22919 "Installing physx"
-    then
-        w_call physx
-    fi
 
     # Don't let self-extractor write into $W_CACHE
     case "$OS" in
@@ -15800,42 +14990,6 @@ load_masseffect2_demo()
             sleep 1000
         }
     "
-    if test `which wine-hotfix-6971` 2> /dev/null
-    then
-        if w_workaround_wine_bug 6971 "Pointing menu and icon at wine-hotfix-6971 so mouse will work, assuming your X supports XInput2"
-        then
-            w_declare_exe "$W_PROGRAMS_X86_WIN\\Mass Effect 2 Demo\\Binaries" "MassEffect2.EXE"
-            myexec="Exec=env WINEPREFIX=\"$XDG_DATA_HOME/wineprefixes/masseffect2_demo\" wine-hotfix-6971 cmd /c 'C:\\\\\\Run-masseffect2_demo.bat'"
-
-            mymenu="$HOME/Desktop/Mass Effect 2 Demo.desktop"
-            me2tries=0
-            while test ! -f "$mymenu"
-            do
-                if test $me2tries -gt 120
-                then
-                    w_die "timeout waiting for winemenubuilder to finish :-("
-                fi
-                me2tries=`expr $me2tries + 1`
-                echo "waiting for winemenubuilder to finish..."
-                sleep 1
-            done
-            unset me2tries
-            if test -f "$mymenu"
-            then
-                # this is a hack, hopefully the wine bug will be fixed soon
-                sed -i "s,Exec=.*,$myexec," "$mymenu"
-            fi
-            mymenu="$XDG_DATA_HOME/applications/wine/Programs/Mass Effect 2 Demo/Mass Effect 2 Demo.desktop"
-            if test -f "$mymenu"
-            then
-                # this is a hack, hopefully the wine bug will be fixed soon
-                sed -i "s,Exec=.*,$myexec," "$mymenu"
-            fi
-        fi
-    else
-        w_workaround_wine_bug 6971 "Please upgrade to wine-1.3.23 or later; see http://wiki.winehq.org/Bug6971" 1.3.23, || true
-    fi
-
 }
 
 #----------------------------------------------------------------
@@ -15856,8 +15010,6 @@ load_maxmagicmarker_demo()
     # Work around bug in game?!
     cd "$W_PROGRAMS_X86_UNIX/$W_PACKAGE"
     mv "max and the magic markerdemo pc" "max and the magic markerdemo pc"_Data
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\$W_PACKAGE" "max and the magic markerdemo pc.exe"
 }
 
 #----------------------------------------------------------------
@@ -15921,7 +15073,6 @@ load_mdk()
     cd "$W_DRIVE_C/SHINY/MDK"
     w_try_unzip . "$W_CACHE/$W_PACKAGE"/patch-mdk3dfx.zip
 
-    w_declare_exe "C:\\SHINY\\MDK" "MDK3DFX.EXE"
     # TODO: wine fails to install menu items, add a workaround for that
 }
 
@@ -15964,8 +15115,6 @@ load_menofwar()
             ControlClick, TNewButton1, Setup - Men of War, Setup has finished
         }
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Aspyr\\Men of War" "mow.exe"
 }
 
 #----------------------------------------------------------------
@@ -15981,13 +15130,6 @@ w_metadata mb_warband_demo games \
 
 load_mb_warband_demo()
 {
-    if w_workaround_wine_bug 23207 "" 1.3.23,
-    then
-        w_die "Please upgrade to wine-1.3.23 or later, built with gcc-4.4.5 or later, else game crashes on startup."
-    fi
-    w_workaround_wine_bug 6971 "Please upgrade to wine-1.3.23 or later; see http://wiki.winehq.org/Bug6971" 1.3.23,
-    # Mouse still doesn't work quite right after picking menu, see bug 25705.
-
     w_download "http://download.taleworlds.com/mb_warband_setup_1143.exe" 94fb829068678e27bcd67d9e0fde7f08c51a23af
 
     cd "$W_CACHE/$W_PACKAGE"
@@ -16005,8 +15147,6 @@ load_mb_warband_demo()
         }
         winwaitclose Warband
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Mount&Blade Warband" "mb_warband.exe"
 }
 
 #----------------------------------------------------------------
@@ -16023,24 +15163,6 @@ load_mise()
 {
     w_download_manual "http://www.direct2drive.com/8241/product/Buy-The-Secret-of-Monkey-Island(R):-Special-Edition-Download" SecretOfMonkeyIslandSE_ddsetup.zip 2e32458698c9ec7ebce94ae5c57531a3fe1dbb9e
 
-    if w_workaround_wine_bug 22161
-    then
-        # Doesn't crash, but you only get a black screen and a flood of d3dx fixme's without native d3dx9_36
-        w_call d3dx9_36
-    fi
-
-    if w_workaround_wine_bug 24545
-    then
-        # Game wants to install directx, but we delete it. It really only needs xact for x3daudio?_?.dll
-        w_call xact
-    fi
-
-    if w_workaround_wine_bug 24547
-    then
-        # It really does need vcrun2005, for msvp80.dll (and potentially one stub from msvcr80)
-        w_call vcrun2005
-    fi
-
     mkdir -p "$W_TMP/$W_PACKAGE"
     cd "$W_TMP/$W_PACKAGE"
 
@@ -16099,8 +15221,6 @@ load_mise()
             Process, Close, MISE.exe
         "
     fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\LucasArts\\The Secret of Monkey Island Special Edition" "MISE.exe"
 }
 
 #----------------------------------------------------------------
@@ -16143,7 +15263,6 @@ load_myth2_demo()
         }
         winwaitclose
     "
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Myth II Demo" "Myth II Demo.exe"
 }
 
 #----------------------------------------------------------------
@@ -16212,90 +15331,6 @@ load_nfsshift_demo()
         }
         winwaitclose, Setup, Finish
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Electronic Arts\\Need for Speed SHIFT Demo" "shiftdemo.exe"
-}
-
-#----------------------------------------------------------------
-
-w_metadata nfsworld games \
-    title="Need For Speed World" \
-    publisher="EA" \
-    year="2013" \
-    media="download" \
-    file1="setup_nfsw" \
-    installed_exe1="$W_PROGRAMS_X86_WIN/Electronic Arts/Need For Speed World/GameLauncher.exe"
-
-load_nfsworld()
-{
-    w_workaround_wine_bug 27048 "The patcher will probably put up an error dialog and then hang.  When this happens, kill it and try again.  It should succeed after the fourth or so try."
-
-    w_workaround_wine_bug 27047 "Game fails with corrupt executable error in wine-1.3.19 and earlier" 1.3.20,
-
-    # This changes frequently, I fear
-    # Be careful to update $file1 when you update the url
-    # 1.8.40.65   9b1f10af09350e2b3f5ccbc679dbea628e9f432d0 ?
-    # 1.8.40.1229 f355fcad20dd6267910bec93a318224718ab5de7
-    # 4 July 2013 1.8.40.1509 6f76c74ae07d36470931bac74b44548d1a319ce0
-    w_download http://static.cdn.ea.com/blackbox/u/f/NFSWO/1509/launcher/weblaunch_1.8.40.1509/setup_nfsw.exe 6f76c74ae07d36470931bac74b44548d1a319ce0
-
-    # pre-1.6 versions of wine also needed ie7?
-    if w_workaround_wine_bug 25658 "Installing dotnet20 so launcher does not just exit"
-    then
-        w_call dotnet20
-    fi
-
-    if w_workaround_wine_bug 28652 "Installing gdiplus so launcher does not look horrible (and to work around crash bug 33880, too)"
-    then
-        w_call gdiplus
-    fi
-
-    if test "$W_OPT_UNATTENDED" && w_workaround_wine_bug 25961 "Installing vcrun2008 just to make unattended install easier"
-    then
-        w_call vcrun2008
-    fi
-
-    if w_workaround_wine_bug 26915 "installing corefonts so help works"
-    then
-        w_call corefonts
-    fi
-
-    cd "$W_CACHE/$W_PACKAGE"
-    w_ahk_do "
-        SetWinDelay 500
-        SetTitleMatchMode, 2
-        run $file1
-        winwait, Language
-        if ( w_opt_unattended > 0 ) {
-            ControlClick TNewButton1        ; Next
-            winwait Setup - Need For Speed
-            ControlClick TNewButton1        ; Next
-            winwait Setup - Need For Speed, License
-            ControlClick TNewRadioButton1   ; Accept
-            sleep 1000
-            ControlClick TNewButton2        ; Next
-            winwait Setup - Need For Speed, be installed
-            ControlClick TNewButton3        ; Next
-            winwait Setup - Need For Speed, be downloaded
-            ControlClick TNewButton4        ; Next
-            winwait Setup - Need For Speed, shortcuts
-            ControlClick TNewButton5        ; Next
-            winwait Setup - Need For Speed, Tasks
-            ControlClick TNewButton5        ; Next
-            winwait Setup - Need For Speed, Ready to Install
-            ControlClick TNewButton5        ; Next
-        }
-        winwait Setup - Need For Speed, Completing
-        if ( w_opt_unattended > 0 ) {
-            send {Space}                    ; uncheck readme
-            send {Tab}
-            send {Space}                    ; uncheck launch
-            sleep 1000                      ; let launch uncheck take effect?
-            ControlClick TNewButton5        ; Finish
-        }
-        winwaitclose
-    "
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Electronic Arts\\Need For Speed World" GameLauncher.exe
 }
 
 #----------------------------------------------------------------
@@ -16332,7 +15367,6 @@ load_njcwp_trial()
     else
         w_try "$WINE" $file1
     fi
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\NJStar Chinese WP" "njstar.exe"
 }
 
 #----------------------------------------------------------------
@@ -16369,7 +15403,6 @@ load_njjwp_trial()
     else
         w_try "$WINE" $file1
     fi
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\NJStar Japanese WP" "njstarj.exe"
 }
 
 #----------------------------------------------------------------
@@ -16420,8 +15453,6 @@ load_oblivion()
     then
         w_call d3dx9_36
     fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Bethesda Softworks\\Oblivion" "Oblivion.exe"
 }
 
 #----------------------------------------------------------------
@@ -16441,7 +15472,6 @@ load_penpenxmas()
 
     cd "$W_CACHE/$W_PACKAGE"
     "$WINE" PenPenXmasOlympics100.exe $W_UNATTENDED_SLASH_S
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\PPO" "PPO.exe"
 }
 
 #----------------------------------------------------------------
@@ -16476,8 +15506,6 @@ load_plantsvszombies()
         }
         WinWaitClose
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\PopCap Games\\Plants vs. Zombies" "PlantsVsZombies.exe"
 }
 
 #----------------------------------------------------------------
@@ -16532,8 +15560,6 @@ load_popfs()
             ControlClick, Button4
         }
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Ubisoft\\Prince of Persia The Forgotten Sands" "Prince of Persia.exe"
 }
 
 #----------------------------------------------------------------
@@ -16590,8 +15616,6 @@ load_qq()
 
     cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" "$file1"
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Tencent\\QQ\\Bin" QQScLauncher.exe
 }
 
 #----------------------------------------------------------------
@@ -16615,11 +15639,6 @@ load_qqintl()
         w_call riched20
     fi
 
-    if w_workaround_wine_bug 34566 "Installing native ctf to work around crash"
-    then
-        w_call msctf
-    fi
-
     if w_workaround_wine_bug 37617 "Installing native wininet to work around crash"
     then
         w_call wininet
@@ -16638,7 +15657,6 @@ load_qqintl()
 
     cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" "$file1"
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Tencent\\QQIntl\\Bin" QQ.exe
 }
 
 #----------------------------------------------------------------
@@ -16657,10 +15675,6 @@ load_ragnarok()
     then
         w_call vcrun6
     fi
-    if w_workaround_wine_bug 28228 "Installing Visual C++ 2008 runtime"
-    then
-        w_call vcrun2008
-    fi
 
     # publisher puts SHA1 checksums on download page, nice
     # BDA295E3A2A57CD02BD122ED7BF4836AC012369A
@@ -16704,11 +15718,6 @@ load_rct3deluxe()
 {
     w_mount RCT3
 
-    if w_workaround_wine_bug 26396
-    then
-        w_call quartz
-    fi
-
     # FIXME: make videos and music work
     # Game still doesn't show .wmv logo videos nor play .wma background audio in menu
     # though it does in Jake's screencast.  Loading wmp9 and devenum gets it to
@@ -16748,8 +15757,6 @@ load_rct3deluxe()
         }
         WinWaitClose Setup - RollerCoaster Tycoon 3, finished
         "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Atari\\RollerCoaster Tycoon 3" RCT3.EXE
 }
 
 #----------------------------------------------------------------
@@ -16769,16 +15776,6 @@ load_rayman2_demo()
     cd "$W_TMP"
     w_try unzip "$W_CACHE/$W_PACKAGE/rayman2high.zip"
 
-    if w_workaround_wine_bug 16596
-    then
-        w_call vd=800x600
-    fi
-
-    if w_workaround_wine_bug 21159
-    then
-        w_call dinput
-    fi
-
     w_ahk_do "
         SetWinDelay 500
         SetTitleMatchMode, 3
@@ -16817,8 +15814,6 @@ load_rayman2_demo()
         # this is a hack, hopefully the wine bug will be fixed soon
         sed -i "s,Exec=.*,$myexec," "$mymenu"
     fi
-
-    w_declare_exe "c:\\UbiSoft\\Rayman2Demo" "Rayman2Demo.exe"
 }
 
 #----------------------------------------------------------------
@@ -16855,8 +15850,6 @@ load_riseofnations_demo()
     then
         w_call directmusic
     fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Microsoft Games\\Rise of Nations Trial" "nations.exe"
 }
 
 #----------------------------------------------------------------
@@ -16890,8 +15883,6 @@ load_secondlife()
         }
         winwaitclose
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\SecondLifeViewer" "SecondLife.exe"
 }
 
 #----------------------------------------------------------------
@@ -16907,16 +15898,6 @@ w_metadata sims3 games \
 
 load_sims3()
 {
-    if w_workaround_wine_bug 22350 "Launcher needs .net"
-    then
-        w_call dotnet20
-    fi
-
-    if w_workaround_wine_bug 21517 "Old wine needs native DirectX for this game" 1.3.8,
-    then
-        w_call d3dx9_36
-    fi
-
     w_read_key
 
     w_mount Sims3
@@ -16968,8 +15949,6 @@ load_sims3()
         }
         winwaitclose
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Electronic Arts\\The Sims 3\\Game\\Bin" "TS3.exe"
 }
 
 #----------------------------------------------------------------
@@ -16985,11 +15964,6 @@ w_metadata simsmed games \
 
 load_simsmed()
 {
-    if w_workaround_wine_bug 21517 "Old wine needs native DirectX for this game" 1.3.8,
-    then
-        w_call d3dx9_36
-    fi
-
     w_read_key
 
     w_mount TSimsM
@@ -17074,23 +16048,6 @@ load_simsmed()
         }
         winwaitclose
     "
-
-    if w_workaround_wine_bug 25535 ".net 4 doesn't install on Wine, fixing menu to run game directly"
-    then
-        myexec="Exec=env WINEPREFIX=\"$WINEPREFIX\" wine cmd /c 'C:\\\\\\\\Run-$W_PACKAGE.bat'"
-        mymenu="$XDG_DATA_HOME/applications/wine/Programs/Electronic Arts/The Sims Medieval/The Sims™ Medieval.desktop"
-        if test -f "$mymenu"
-        then
-            sed -i "s,Exec=.*,$myexec," "$mymenu"
-        fi
-        mymenu="$HOME/Desktop/The Sims™ Medieval.desktop"
-        if test -f "$mymenu"
-        then
-            sed -i "s,Exec=.*,$myexec," "$mymenu"
-        fi
-    fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Electronic Arts\\The Sims Medieval\\Game\\Bin" "TSM.exe"
 }
 
 #----------------------------------------------------------------
@@ -17169,8 +16126,6 @@ load_sims3_gen()
         }
         winwaitclose
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Electronic Arts\\The Sims 3 Generations/Game/Bin" "TS3EP04.exe"
 }
 
 #----------------------------------------------------------------
@@ -17185,16 +16140,6 @@ w_metadata splitsecond games \
 
 load_splitsecond()
 {
-    if w_workaround_wine_bug 22774 "" 1.3.0
-    then
-        w_warn "On wine, install takes an extra 7 minutes at the end, please be patient."
-    fi
-
-    if w_workaround_wine_bug 22865
-    then
-        w_warn "This game is currently unplayable on wine due to rendering problems; see winehq bug 22865."
-    fi
-
     # Key is used in first run activation, no need to read it here.
     w_mount SplitSecond
 
@@ -17234,8 +16179,6 @@ load_splitsecond()
         sleep 500
         ControlClick, Button4, Split
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Disney Interactive Studios\\Split Second" "SplitSecond.exe"
 }
 
 #----------------------------------------------------------------
@@ -17257,11 +16200,6 @@ load_splitsecond_demo()
         w_warn "On wine, install takes an extra 7 minutes at the end, please be patient."
     fi
 
-    if w_workaround_wine_bug 22865
-    then
-        w_warn "This game is currently unplayable on wine due to rendering problems; see winehq bug 22865."
-    fi
-
     cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
         SetTitleMatchMode, 2
@@ -17287,8 +16225,6 @@ load_splitsecond_demo()
         ControlClick, Button1, Split, completed
         ControlClick, Button4, Split, completed
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Disney Interactive Studios\\Split Second Demo" "SplitSecondDEMO.exe"
 }
 
 #----------------------------------------------------------------
@@ -17351,8 +16287,6 @@ load_spore()
         }
         winwaitclose, SPORE, complete
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Electronic Arts\\SPORE\\Sporebin" "SporeApp.exe"
 }
 
 #----------------------------------------------------------------
@@ -17404,8 +16338,6 @@ load_spore_cc_demo()
     else
         w_try "$WINE" "$file1"
     fi
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Electronic Arts\\SPORE\\Sporebin" \
-        "SporeCreatureCreator.exe"
 }
 
 #----------------------------------------------------------------
@@ -17473,8 +16405,6 @@ load_starcraft2_demo()
             process, close, SC2.exe
         }
         "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\StarCraft II Demo" "StarCraft II.exe"
 }
 
 #----------------------------------------------------------------
@@ -17491,15 +16421,6 @@ load_theundergarden_demo()
 {
     w_download_manual http://www.bigdownload.com/games/the-undergarden/pc/the-undergarden-demo TheUnderGarden_PC_B34_SRTB.30_28OCT10.exe acf90c422ac2f2f242100f39bedfe7df0c95f7a
 
-    if w_workaround_wine_bug 25384
-    then
-        w_call vcrun2008
-    fi
-    if w_workaround_wine_bug 25385
-    then
-        w_call d3dx9_36
-    fi
-
     cd "$W_CACHE/$W_PACKAGE"
 
     w_ahk_do "
@@ -17562,8 +16483,6 @@ load_theundergarden_demo()
         }
         WinWaitClose,Setup,launched
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\The UnderGarden" "TheUndergarden.exe"
 }
 
 #----------------------------------------------------------------
@@ -17578,12 +16497,6 @@ w_metadata tmnationsforever games \
 
 load_tmnationsforever()
 {
-    if w_workaround_wine_bug 20915
-    then
-        # FIXME: script this?
-        w_warn "To fix choppy sound/low fps, try setting Settings/Advanced/Audio to portaudio when starting the game."
-    fi
-
     # Before:      cab0cf66db0471bc2674a3b1aebc35de0bca6ed0
     # 29 Mar 2011: 23388798d5c90ad4a233b4cd7e9fcafd69756978
     w_download "http://files.trackmaniaforever.com/tmnationsforever_setup.exe" 23388798d5c90ad4a233b4cd7e9fcafd69756978
@@ -17628,8 +16541,6 @@ load_tmnationsforever()
         }
         WinWaitClose
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\TmNationsForever" "TmForever.exe"
 }
 
 #----------------------------------------------------------------
@@ -17679,8 +16590,6 @@ load_trainztcc_2004()
         winwaitclose
     "
 
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Auran\\TRS2004" "TRS2004.exe"
-
     # And, while we're at it, also install the accompanying paint shed app
     cd ${W_ISO_MOUNT_ROOT}/TRAINZ_PAINTSHED
     w_ahk_do "
@@ -17704,7 +16613,6 @@ load_trainztcc_2004()
         }
         winwaitclose
     "
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Auran\\Trainz Paint Shed" "Trainz Paint Shed.exe" paintshed
 }
 
 #----------------------------------------------------------------
@@ -17743,7 +16651,6 @@ load_sammax301_demo()
         }
         winwaitclose Sam and Max The Penal Zone Setup
     "
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Telltale Games\\Sam and Max - The Devil's Playhouse\\The Penal Zone" "SamMax301.exe"
 }
 
 #----------------------------------------------------------------
@@ -17779,13 +16686,6 @@ load_sammax304_demo()
         }
         WinWaitClose
     "
-
-    if w_workaround_wine_bug 24250 "Installing visual C++ runtimes" 1.3.15,
-    then
-        w_call vcrun2005
-    fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Telltale Games\\Sam and Max - The Devil's Playhouse\\Beyond the Alley of the Dolls" "SamMax304.exe"
 }
 
 #----------------------------------------------------------------
@@ -17802,11 +16702,6 @@ load_tropico3_demo()
 {
     w_download_manual "http://www.tropico3.com/?p=downloads" Tropico3Demo.exe e031749db346ac3a87a675787c81eb1ca8cb5909
 
-    if w_workaround_wine_bug 24819 "Disabling gameux"
-    then
-        w_override_dlls disabled gameux
-    fi
-
     cd "$W_CACHE/$W_PACKAGE"
 
     w_ahk_do "
@@ -17830,15 +16725,6 @@ load_tropico3_demo()
         }
         WinWaitClose
     "
-
-    w_workaround_wine_bug 16328 "seawater is invisible in this wine, please update to 1.3.9 or later" 1.3.9,
-
-    if w_workaround_wine_bug 24845 "disabling mmdevapi to fix sound" 1.3.21,
-    then
-        w_override_dlls disabled mmdevapi
-    fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Kalypso\\Tropico 3 Demo" "Tropico3 Demo.exe"
 }
 
 #----------------------------------------------------------------
@@ -17902,26 +16788,6 @@ load_singularity()
         }
         "
 
-    if w_workaround_wine_bug 6971 "Setting mwo=force... please upgrade to wine-1.3.23" 1.3.23,
-    then
-        w_call mwo=force
-    fi
-
-    if w_workaround_wine_bug 22548
-    then
-        echo "Disabling \'depth of field\'"
-        cat > "$W_TMP"/dof.reg <<_EOF_
-REGEDIT4
-
-[HKEY_CURRENT_USER\Software\Activision\Singularity]
-"DepthOfField"=dword:00000000
-
-_EOF_
-        w_try_regedit "$W_TMP_WIN"\\dof.reg
-    fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Activision\\Singularity(TM)\\Binaries" "Singularity.exe"
-
     # Clean up crap left over in c:\ when the installer runs the vc 2008 redistributable installer
     cd "$W_DRIVE_C"
     rm -f VC_RED.* eula.*.txt globdata.ini install.exe install.ini install.res.*.dll vcredist.bmp
@@ -17943,8 +16809,6 @@ load_wglgears()
     mkdir -p "$W_PROGRAMS_X86_UNIX/misc"
     cp "$W_CACHE"/wglgears/wglgears.exe "$W_PROGRAMS_X86_UNIX/misc"
     chmod +x "$W_PROGRAMS_X86_UNIX/misc/wglgears.exe"
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\misc" wglgears.exe
 }
 
 #----------------------------------------------------------------
@@ -18006,8 +16870,6 @@ load_stalker_pripyat_bench()
         w_call d3dx9_31
         w_call d3dx9_42
     fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Call Of Pripyat Benchmark" "Benchmark.exe"
 }
 
 #----------------------------------------------------------------
@@ -18045,8 +16907,6 @@ load_torchlight()
         }
         WinWaitClose, Torchlight Setup
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Runic Games\\Torchlight" Torchlight.exe
 }
 
 #----------------------------------------------------------------
@@ -18109,13 +16969,6 @@ load_twfc()
         }
     "
 
-    if w_workaround_wine_bug 6971 "Setting mwo=force... please upgrade to wine-1.3.23" 1.3.23,
-    then
-        w_call mwo=force
-    fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Activision\\Transformers - War for Cybertron\\Binaries" "TWFC.exe"
-
     # Clean up crap left over in c:\ when the installer runs the vc 2008 redistributable installer
     cd "$W_DRIVE_C"
     rm -f VC_RED.* eula.*.txt globdata.ini install.exe install.ini install.res.*.dll vcredist.bmp
@@ -18150,8 +17003,6 @@ load_typingofthedead_demo()
         ; installer crashes here?
         Sleep 20000
     "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\SEGA\\TOD-Demo" "Tod_e_demo.exe"
 }
 
 #----------------------------------------------------------------
@@ -18218,15 +17069,6 @@ load_ut3()
         }
         WinWaitClose
     "
-
-    if w_workaround_wine_bug 6971 "Setting mwo=force... please upgrade to wine-1.3.23" 1.3.23,
-    then
-        w_call mwo=force
-        w_warn "Mouse will be disabled in in-game menu. Must use keyboard to navigate.  Alternately, patch wine as described in bug 6971 to use xinput2."
-    fi
-
-    # FIXME: enter user's key if -q
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Unreal Tournament 3\\Binaries" "UT3.exe"
 }
 
 #----------------------------------------------------------------
@@ -18271,7 +17113,6 @@ load_wog()
         }
         winwaitclose, World of Goo Setup
         "
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\WorldOfGooDemo" WorldOfGoo.exe
 }
 
 #----------------------------------------------------------------
@@ -18308,8 +17149,6 @@ load_zootycoon2_demo()
         winwaitactive, Zoo Tycoon 2 Trial, COMPLETE
         winclose, Zoo Tycoon 2 Trial, COMPLETE
         "
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Microsoft Games\\Zoo Tycoon 2 Trial Version" "zt2demoretail.exe"
 }
 
 #----------------------------------------------------------------
@@ -18405,7 +17244,6 @@ w_metadata bioshock2_steam games \
     publisher="2k" \
     year="2010" \
     media="download" \
-    wine_showstoppers="7065" \
     installed_exe1="$W_PROGRAMS_X86_WIN/Steam/steamapps/common/bioshock2/blort.exe"
 
 load_bioshock2_steam()
@@ -18478,29 +17316,6 @@ w_metadata ruse_demo_steam games \
 load_ruse_demo_steam()
 {
     w_steam_install_game 33310 "R.U.S.E."
-
-    if w_workaround_wine_bug 21939 "Installing Windows Media so game can start"
-    then
-        w_call wmp9
-    fi
-
-    if w_workaround_wine_bug 22016 "Turning off HDR to avoid washed out graphics"
-    then
-        for dir in "$W_PROGRAMS_X86_UNIX/Steam/userdata"/*/config
-        do
-            file=../33310/local/Option.ini
-            if test -f $file
-            then
-                sed -i "s/UseHDR = true/UseHDR = false/" $file
-            else
-                mkdir -p ../33310/local
-                cat > "$file" <<_EOF_
-[advanced_video]
-        UseHDR = false
-_EOF_
-            fi
-        done
-    fi
 }
 
 #----------------------------------------------------------------
@@ -18529,13 +17344,6 @@ w_metadata trine_steam games \
 load_trine_steam()
 {
     w_steam_install_game 35700 "Trine"
-
-    if w_workaround_wine_bug 21939 "Installing Windows Media Player so game can start"
-    then
-        w_call wmp9
-    fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Steam\\steamapps\\common\\trine" "trine_launcher.exe"
 }
 
 #----------------------------------------------------------------
@@ -18550,13 +17358,6 @@ w_metadata trine_demo_steam games \
 load_trine_demo_steam()
 {
     w_steam_install_game 35710 "Trine Demo"
-
-    if w_workaround_wine_bug 21939 "Installing Windows Media Player so game can start"
-    then
-        w_call wmp9
-    fi
-
-    w_declare_exe "$W_PROGRAMS_X86_WIN\\Steam\\steamapps\\common\\trine demo" "trine_launcher.exe"
 }
 
 #----------------------------------------------------------------
@@ -18570,10 +17371,6 @@ w_metadata wormsreloaded_demo_steam games \
 
 load_wormsreloaded_demo_steam()
 {
-    if w_workaround_wine_bug 26646 "Installing xact to enable sound"
-    then
-        w_call xact
-    fi
     w_steam_install_game 22690 "Worms Reloaded Demo"
 }