From 0f01ddc269059146f8692a523b256b32cb32943394d9dbcf55454b683dc1f024 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Fri, 31 Mar 2017 19:35:55 +0000
Subject: [PATCH] - Update to 2.5 development snapshot   - Support for
 message-mode named pipes.   - Translation of version resources through po
 files.   - Transform feedback support in Direct3D.   - Scheduler classes in
 C++ runtime.   - Better scrolling in popup menus.   - More improvements to
 the XML reader.   - Various bug fixes. - updated winetricks

OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=411
---
 wine-2.4.tar.xz      |    3 -
 wine-2.4.tar.xz.sign |   16 -
 wine-2.5.tar.xz      |    3 +
 wine-2.5.tar.xz.sign |   16 +
 wine.changes         |   13 +
 wine.spec            |    4 +-
 winetricks           | 1409 ++++++++++++------------------------------
 winetricks.1         |    2 +-
 8 files changed, 418 insertions(+), 1048 deletions(-)
 delete mode 100644 wine-2.4.tar.xz
 delete mode 100644 wine-2.4.tar.xz.sign
 create mode 100644 wine-2.5.tar.xz
 create mode 100644 wine-2.5.tar.xz.sign

diff --git a/wine-2.4.tar.xz b/wine-2.4.tar.xz
deleted file mode 100644
index 73f3e86..0000000
--- a/wine-2.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:87b5df07e4781fecce2f92415a4717208ea253a20a0df8b36b9f90b69b72748e
-size 18953748
diff --git a/wine-2.4.tar.xz.sign b/wine-2.4.tar.xz.sign
deleted file mode 100644
index 1e1c619..0000000
--- a/wine-2.4.tar.xz.sign
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAljMRL8ACgkQzvrI6q8X
-UZ1JSQ/9GZxyhbKKE1cG5SdMiM9LdmFgsnfOkoCVv1BFVhmJ4D3XMjJNiCMLppy9
-2lf2MUhNQfiojIX0eZRF03ZOFACWR+EsCNL3I+9l0B/RuMI490zqhoVKOYI2zJyn
-ESyEgwoBGmyJ556nxrvAdtRvvbki3yDVLGYWv76NzyDsHXD0r6KaEC9fbFUdx0MH
-KmqWXPOgn5IjWoB65BOuB1H79W9m+OZrpseBZKAzF+ljEnD+YodV1OFxR3VDY9Vy
-j5mhKKGUOkdHaDopv2sA4DHRM46jr9X0saoq8/wvX8TsXsCnnDsGCHBIiqqr2sfY
-Z2UIl+2xsbggOwI7SgzNWhIvSoIQZrIAhNYiQmXDBfH/JzEO+/fmnnw2bjm4WiQ0
-sSYyY06B8YOVwu/XLDwywH4Y7m7Gk0iW1zCTQIz54aMTBGK3J5XXQJqhFbtnh0HP
-HWUDc0y+2Boshkmryj3R+2fuhbUpMD22A3+MJKi1ep1KHR0a+X+rsl9SO44zfdJN
-mSwO5p/URYd3o1Iy2SWikmTDjnehnlZZuOBBGCl2RDKETV69W2JvSDF8C+Ge2l6B
-SP6/LbUUMtLvlgdRv9IOuqE6JlUApw07Iw8NOLZCUvSKURoIJU1oS18R/mq6M7V0
-/5P8mVhsWDrPdQ5aSkjZveE4sCpvjC+5+36Sma0dEKR1IZw/8WI=
-=KxY2
------END PGP SIGNATURE-----
diff --git a/wine-2.5.tar.xz b/wine-2.5.tar.xz
new file mode 100644
index 0000000..b494386
--- /dev/null
+++ b/wine-2.5.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:13f92b7ab483323aaabbc6519851e688ad4372ea30569961c831d40d6d3bccd2
+size 18993176
diff --git a/wine-2.5.tar.xz.sign b/wine-2.5.tar.xz.sign
new file mode 100644
index 0000000..35644c6
--- /dev/null
+++ b/wine-2.5.tar.xz.sign
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAljerTIACgkQzvrI6q8X
+UZ0aaBAAlwdcLCvaT1JjR92fBHE2uVay4G6uVSABz3ltusi2IO5YbXTDvbaKo1PS
+TOeBUcq++Fpfl1YWKjcxhiH/rCA7HuEJjBKh8TdehWBUqAYo0nC2QYDEZ9ktFrpH
+SeNPuDhpzA1c5BOEOsO53WI19eD8qM+7qUGAxzSyDOXzAB47CvhTWcTUv6eVZJOr
+BVKaMf9jJbmyBZVVG4tKaotns75Y59+UnJDkKHUn0e9uDuIvZ62O9ntlTHdYbN1/
+HS/q8DntPlwUsqc7lv+1WSMnXm4e6vAOM5tVXZser+9XVY6Pl3WygsGzja+a0JIR
+tMJ02di+FLTgUd0dUIZu8y7Q1pqdN3px1pxrd8W7vD1PC4fVUNi+jfvPAFkItVwA
+bxKKFFLP7VkLxDt6OaCRVtQ4hVlVNGjA0ttD4Y5d8LcRNMzG+M+luqu/zp7eGzQT
+6OfEtYNPAP7b2c0t6pJLXcswNsMG5ADSfZupZ5H7yZs6MXKdStpnVl/C4jnDNOFF
+6yC0bpDAvZeqBBO+gm8zfZnyHnWrH2yg3mx4dAptjee9SdwoC+78jgfuJ2HiA6XL
+frKGJKz8NiBIdKWjDgFAk4Or5Ec44kNzV7ltXV2dONkcepp67cvjy7DWOrWxk394
+PF31UtMHv4aiJLUZVjEtuIGqon0su69znJD/5zS9k3NeWA1pBxk=
+=G1w2
+-----END PGP SIGNATURE-----
diff --git a/wine.changes b/wine.changes
index 72076e9..69a101c 100644
--- a/wine.changes
+++ b/wine.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri Mar 31 19:34:18 UTC 2017 - meissner@suse.com
+
+- Update to 2.5 development snapshot
+  - Support for message-mode named pipes.
+  - Translation of version resources through po files.
+  - Transform feedback support in Direct3D.
+  - Scheduler classes in C++ runtime.
+  - Better scrolling in popup menus.
+  - More improvements to the XML reader.
+  - Various bug fixes.
+- updated winetricks
+
 -------------------------------------------------------------------
 Fri Mar 17 21:33:29 UTC 2017 - meissner@suse.com
 
diff --git a/wine.spec b/wine.spec
index ad9dc08..c1d3476 100644
--- a/wine.spec
+++ b/wine.spec
@@ -54,8 +54,8 @@ BuildRequires:  update-desktop-files
 BuildRequires:  valgrind-devel
 BuildRequires:  xorg-x11-devel
 BuildRequires:  pkgconfig(libudev)
-%define realver 2.4
-Version:        2.4
+%define realver 2.5
+Version:        2.5
 Release:        0
 Summary:        An MS Windows Emulator
 License:        LGPL-2.1+
diff --git a/winetricks b/winetricks
index 1f5c8c6..482aa7a 100644
--- a/winetricks
+++ b/winetricks
@@ -6,7 +6,7 @@
 
 # Name of this version of winetricks (YYYYMMDD)
 # (This doesn't change often, use the sha256sum of the file when reporting problems)
-WINETRICKS_VERSION=20170316
+WINETRICKS_VERSION=20170327-next
 
 # This is a UTF-8 file
 # You should see an o with two dots over it here [ö]
@@ -28,9 +28,9 @@ WINETRICKS_VERSION=20170316
 # - wine is used to execute Win32 apps except on Cygwin.
 # - ar, cabextract, unrar, unzip, and 7z are needed by some verbs.
 # - aria2c, wget, curl, or fetch is needed for downloading.
-# - sha1sum, sha1, or shasum is needed for verifying downloads (or openssl for OSX 10.5)
-# - Note: there is a transition to sha256 under way, which requires
-# - sha256sum, sha256, or shasum (OSX 10.5 does not support these, and is considered deprecated)
+# - sha256sum, sha256, or shasum (OSX 10.5 does not support these, 10.6+ is required):
+# - note: some legacy verbs may still sha1sum, sha1, or shasum, but this is deprecated and
+#   will be removed in a future release
 # - zenity is needed by the GUI, though it can limp along somewhat with kdialog/xmessage.
 # - xdg-open (if present) or open (for OS X) is used to open download pages
 #   for the user when downloads cannot be fully automated.
@@ -67,7 +67,7 @@ WINETRICKS_VERSION=20170316
 #   Copyright (C) 2011 Łukasz Wojniłowicz
 #   Copyright (C) 2011 Matthew Bozarth
 #   Copyright (C) 2013-2016 Andrey Gusev <andrey.goosev!gmail.com>
-#   Copyright (C) 2013-2015 Hillwood Yang <hillwood!opensuse.org>
+#   Copyright (C) 2013-2017 Hillwood Yang <hillwood!opensuse.org>
 #   Copyright (C) 2013,2016 André Hentschel <nerv!dawncrow.de>
 #
 # License:
@@ -100,7 +100,7 @@ WINETRICKS_VERSION=20170316
 # - If there is no universally available program for a needed function,
 #   support the two most frequently available programs.
 #   e.g. fall back to wget if curl is not available; likewise, support
-#   both sha1sum and openssl.
+#   both sha256sum and sha256.
 # - When using Unix commands like cp, put options before filenames so it will
 #   work on systems like OS X.  e.g. "rm -f foo.dat", not "rm foo.dat -f"
 #
@@ -572,10 +572,15 @@ w_get_sha1sum()
     if [ -f "$_W_sha1_file" ] || [ -h "$_W_sha1_file" ]
     then
         _W_gotsha1sum=$($WINETRICKS_SHA1SUM < "$_W_sha1_file" | sed 's/(stdin)= //;s/ .*//')
+        w_get_sha256sum "$_W_sha1_file"
     else
         w_warn "$_W_sha1_file is not a regular file, not checking sha1sum"
         return
     fi
+
+    w_warn "sha1sum is considered deprecated and should no longer be used. This package (${W_PACKAGE}) still uses it. This is a bug."
+    w_warn "See https://github.com/Winetricks/winetricks/issues/737 and https://shattered.io/"
+    w_warn "Please report the following to https://github.com/Winetricks/winetricks/: file:${_W_sha1_file} sha1: ${_W_gotsha1sum} sha256:${_W_gotsha256sum}"
 }
 
 # get sha256sum string and set $_W_gotsha256sum to it
@@ -589,11 +594,27 @@ w_get_sha256sum()
     then
         _W_gotsha256sum=$($WINETRICKS_SHA256SUM < "$_W_sha256_file" | sed 's/(stdin)= //;s/ .*//')
     else
-        w_warn "$_W_sha256_file is not a regular file, not checking sha1sum"
+        w_warn "$_W_sha256_file is not a regular file, not checking sha256sum"
         return
     fi
 }
 
+w_get_shatype() {
+    _W_sum="$1"
+
+    # tr -d " " is for FreeBSD/OS X/Solaris return a leading space:
+    # See https://stackoverflow.com/questions/30927590/wc-on-osx-return-includes-spaces/30927885#30927885
+    _W_sum_length="$(echo "$_W_sum" | tr -d "\n" | wc -c | tr -d " ")"
+    case "$_W_sum_length" in
+         0) _W_shatype="none" ;;
+         40) _W_shatype="sha1" ;;
+         64) _W_shatype="sha256" ;;
+         # 128) sha512..
+         *) w_die "unsupported shasum..bug" ;;
+    esac
+}
+
+# FIXME: remove 2018/04/01 (or 03/31 or 4/2, to avoid April Fools comments), along with any remaining unfixed verbs
 # verify a sha1sum
 w_verify_sha1sum()
 {
@@ -611,7 +632,6 @@ w_verify_sha1sum()
 # verify a sha256sum
 w_verify_sha256sum()
 {
-    set -x
     _W_vs_wantsum=$1
     _W_vs_file=$2
 
@@ -623,6 +643,23 @@ w_verify_sha256sum()
     unset _W_vs_wantsum _W_vs_file _W_gotsha256sum
 }
 
+# verify any kind of shasum (that winetricks supports ;) ):
+w_verify_shasum()
+{
+    _W_vs_wantsum="$1"
+    _W_vs_file="$2"
+
+    w_get_shatype "$_W_vs_wantsum"
+
+    case "$_W_shatype" in
+        none) w_warn "No checksum provided, not verifying" ;;
+        sha1) w_verify_sha1sum "$_W_sum" "$_W_vs_file" ;;
+        sha256) w_verify_sha256sum "$_W_sum" "$_W_vs_file" ;;
+        # 128) sha512..
+        *) w_die "unsupported shasum..bug" ;;
+    esac
+}
+
 # wget outputs progress messages that look like this:
 #      0K .......... .......... .......... .......... ..........  0%  823K 40s
 # This function replaces each such line with the pair of lines
@@ -811,7 +848,7 @@ winetricks_selfupdate_rollback()
 }
 
 # Download a file
-# Usage: w_download_to (packagename|path to download file) url [sha1sum [filename [cookie jar]]]
+# Usage: w_download_to (packagename|path to download file) url [shasum [filename [cookie jar]]]
 # Caches downloads in winetrickscache/$packagename
 w_download_to()
 {
@@ -836,16 +873,7 @@ w_download_to()
         _W_file=$(basename "$_W_url")
     fi
 
-    # tr -d " " is for FreeBSD/OS X/Solaris return a leading space:
-    # See https://stackoverflow.com/questions/30927590/wc-on-osx-return-includes-spaces/30927885#30927885
-    _W_sum_length="$(echo "$_W_sum" | tr -d "\n" | wc -c | tr -d " ")"
-    case "$_W_sum_length" in
-         0) _W_shatype="none" ;;
-         40) _W_shatype="sha1" ;;
-         64) _W_shatype="sha256" ;;
-         # 128) sha512..
-         *) w_die "unsupported shasum..bug" ;;
-    esac
+    w_get_shatype "$_W_sum"
 
     if echo "${_W_packagename}" | grep -q -e '\/-' -e '^-'; then
             w_die "Invalid path ${_W_packagename} given"
@@ -1044,15 +1072,8 @@ w_download_to()
         _W_url="https://web.archive.org/web/$_W_url"
     done
 
-    if test "$_W_sum" && test ! "$checksum_ok"
-    then
-        case "$_W_shatype" in
-            none) w_warn "No checksum provided, not verifying" ;;
-            sha1) w_verify_sha1sum "$_W_sum" "$_W_cache/$_W_file" ;;
-            sha256) w_verify_sha256sum "$_W_sum" "$_W_cache/$_W_file" ;;
-            # 128) sha512..
-            *) w_die "unsupported shasum..bug" ;;
-        esac
+    if test "$_W_sum" && test ! "$checksum_ok" ; then
+        w_verify_shasum "$_W_sum" "$_W_cache/$_W_file"
     fi
 }
 
@@ -1090,7 +1111,7 @@ w_open_webpage()
 }
 
 # Download a file
-# Usage: w_download url [sha1sum [filename [cookie jar]]]
+# Usage: w_download url [shasum [filename [cookie jar]]]
 # Caches downloads in winetrickscache/$W_PACKAGE
 w_download()
 {
@@ -1168,28 +1189,26 @@ w_download_manual_to()
     _W_packagename="$1"
     _W_url="$2"
     _W_file="$3"
-    _W_sha1sum="$4"
+    _W_shasum="$4"
 
     # shellcheck disable=SC2154
     case "$media" in
-    "download")
-        w_info "FAIL: bug: media type is download, but w_download_manual was called.  Programmer, please change verb's media type to manual_download."
-        ;;
-    esac
-
-    case $LANG in
-    da*) _W_dlmsg="Hent venligst filen $_W_file fra $_W_url og placér den i $W_CACHE/$_W_packagename, kør derefter dette skript.";;
-    de*) _W_dlmsg="Bitte laden Sie $_W_file von $_W_url runter, stellen Sie's in $W_CACHE/$_W_packagename, dann wiederholen Sie dieses Kommando.";;
-    pl*) _W_dlmsg="Proszę pobrać plik $_W_file z $_W_url, następnie umieścić go w $W_CACHE/$_W_packagename, a na końcu uruchomić ponownie ten skrypt.";;
-    ru*) _W_dlmsg="Пожалуйста, скачайте файл $_W_file по адресу $_W_url, и поместите его в $W_CACHE/$_W_packagename, а затем запустите winetricks заново.";;
-    uk*) _W_dlmsg="Будь ласка, звантажте $_W_file з $_W_url, розташуйте в $W_CACHE/$_W_packagename, потім запустіть скрипт знову.";;
-    zh_CN*) _W_dlmsg="请从 $_W_url 下载 $_W_file，并置放于 $W_CACHE/$_W_packagename, 然后重新运行 winetricks.";;
-    zh_TW*|zh_HK*) _W_dlmsg="請從 $_W_url 下載 $_W_file，并置放於 $W_CACHE/$_W_packagename, 然后重新執行 winetricks.";;
-    *) _W_dlmsg="Please download $_W_file from $_W_url, place it in $W_CACHE/$_W_packagename, then re-run this script.";;
+        "download") w_info "FAIL: bug: media type is download, but w_download_manual was called.  Programmer, please change verb's media type to manual_download." ;;
     esac
 
     if ! test -f "$W_CACHE/$_W_packagename/$_W_file"
     then
+        case $LANG in
+            da*) _W_dlmsg="Hent venligst filen $_W_file fra $_W_url og placér den i $W_CACHE/$_W_packagename, kør derefter dette skript.";;
+            de*) _W_dlmsg="Bitte laden Sie $_W_file von $_W_url runter, stellen Sie's in $W_CACHE/$_W_packagename, dann wiederholen Sie dieses Kommando.";;
+            pl*) _W_dlmsg="Proszę pobrać plik $_W_file z $_W_url, następnie umieścić go w $W_CACHE/$_W_packagename, a na końcu uruchomić ponownie ten skrypt.";;
+            ru*) _W_dlmsg="Пожалуйста, скачайте файл $_W_file по адресу $_W_url, и поместите его в $W_CACHE/$_W_packagename, а затем запустите winetricks заново.";;
+            uk*) _W_dlmsg="Будь ласка, звантажте $_W_file з $_W_url, розташуйте в $W_CACHE/$_W_packagename, потім запустіть скрипт знову.";;
+            zh_CN*) _W_dlmsg="请从 $_W_url 下载 $_W_file，并置放于 $W_CACHE/$_W_packagename, 然后重新运行 winetricks.";;
+            zh_TW*|zh_HK*) _W_dlmsg="請從 $_W_url 下載 $_W_file，并置放於 $W_CACHE/$_W_packagename, 然后重新執行 winetricks.";;
+            *) _W_dlmsg="Please download $_W_file from $_W_url, place it in $W_CACHE/$_W_packagename, then re-run this script.";;
+        esac
+
         mkdir -p "$W_CACHE/$_W_packagename"
         w_open_folder "$W_CACHE/$_W_packagename"
         w_open_webpage "$_W_url"
@@ -1198,12 +1217,12 @@ w_download_manual_to()
         # FIXME: wait in loop until file is finished?
     fi
 
-    if test "$_W_sha1sum"
+    if test "$_W_shasum"
     then
-        w_verify_sha1sum "$_W_sha1sum" "$W_CACHE/$_W_packagename/$_W_file"
+        w_verify_shasum "$_W_shasum" "$W_CACHE/$_W_packagename/$_W_file"
     fi
 
-    unset _W_url _W_file _W_sha1sum _W_dlmsg
+    unset _W_dlmsg _W_file _W_sha1sum _W_sha256sum _W_url
 }
 
 w_download_manual()
@@ -1780,9 +1799,10 @@ w_override_no_dlls()
 w_override_all_dlls()
 {
     # Disable all known native Microsoft DLLs in favor of Wine's built-in ones
-    # Generated with
+    # Generated with:
     # find ~/wine-git/dlls -maxdepth 1 -type d -print | sed 's,.*/,,' | sort | fmt -50 | sed 's/$/ \\/'
-    # Last updated: 2015-09-28
+    #
+    # 2015/09/28: Last list update
     w_override_dlls builtin \
         acledit aclui activeds actxprxy adsiid advapi32 \
         advpack amstream api-ms-win-core-com-l1-1-0 \
@@ -2165,21 +2185,21 @@ _EOF_
         "$WINE" reg add "HKLM\\System\\CurrentControlSet\\Control\\ProductOptions" /v ProductType /d "ServerNT" /f
         ;;
     win8)
-        csdversion=" "
+        csdversion=""
         currentbuildnumber="9200"
         currentversion="6.2"
         csdversion_hex=dword:00000000
         "$WINE" reg add "HKLM\\System\\CurrentControlSet\\Control\\ProductOptions" /v ProductType /d "WinNT" /f
         ;;
     win81)
-        csdversion=" "
+        csdversion=""
         currentbuildnumber="9600"
         currentversion="6.3"
         csdversion_hex=dword:00000000
         "$WINE" reg add "HKLM\\System\\CurrentControlSet\\Control\\ProductOptions" /v ProductType /d "WinNT" /f
         ;;
     win10)
-        csdversion=" "
+        csdversion=""
         currentbuildnumber="10240"
         currentversion="10.0"
         csdversion_hex=dword:00000000
@@ -2298,8 +2318,8 @@ w_wine_version_in()
 {
    for _W_range
    do
-     _W_val1=$(echo $_W_range | sed 's/,.*//')
-     _W_val2=$(echo $_W_range | sed 's/.*,//')
+     _W_val1=$(echo "$_W_range" | sed 's/,.*//')
+     _W_val2=$(echo "$_W_range" | sed 's/.*,//')
 
      # If in this range, return true
      case $_W_range in
@@ -2424,7 +2444,7 @@ w_metadata()
         # FIXME: backslashes get interpreted here.  This screws up
         # installed_file1 fairly often.  Fortunately, we can use forward
         # slashes in that variable instead of backslashes.
-        echo ${arg%%=*}=\"${arg#*=}\"
+        echo "${arg%%=*}"=\""${arg#*=}"\"
     done > "$file"
     echo category='"'"$_W_category"'"' >> "$file"
     # If the problem described above happens, you'd see errors like this:
@@ -2482,7 +2502,7 @@ w_do_call()
         # Hack..
         if test "$cmd" = vd
         then
-            load_vd $arg
+            load_vd "$arg"
             _W_status=$?
             test "$W_OPT_NOCLEAN" = 1 || rm -rf "$W_TMP"
             mkdir -p "$W_TMP"
@@ -2856,10 +2876,12 @@ winetricks_latest_version_check()
 
     latest_version="$(winetricks_dl_url_to_stdout https://raw.githubusercontent.com/Winetricks/winetricks/master/files/LATEST)"
 
-    # Also check that $latest_version is an actual number in case github is down
-    if [ ! -z "${latest_version}" ] && [ ! "$WINETRICKS_VERSION" = "${latest_version}" ] && \
-        echo "${latest_version}" | grep -E "[0-9]{8}" ; then
+    # Check that $latest_version is an actual number in case github is down
+    if ! echo "${latest_version}" | grep -E "[0-9]{8}" || [ -z "${latest_version}" ] ; then
+        w_warn "Github down? version '${latest_version}' doesn't appear to be a valid version"
+    fi
 
+    if [ ! "$WINETRICKS_VERSION" = "${latest_version}" ] && [ ! "$WINETRICKS_VERSION" = "${latest_version}-next" ]; then
         if [ -f "${WINETRICKS_CONFIG}/enable-auto-update" ] ; then
             w_info "You are running winetricks-${WINETRICKS_VERSION}."
             w_info "New upstream release winetricks-${latest_version} is available."
@@ -3678,7 +3700,7 @@ winetricks_showmenu()
         # Filter out any verb that's already installed
         sh "$WINETRICKS_WORKDIR"/zenity.sh |
             tr '|' '\012' |
-            fgrep -v -x -f "$WINETRICKS_WORKDIR"/installed.txt |
+            grep -F -v -x -f "$WINETRICKS_WORKDIR"/installed.txt |
             tr '\012' ' '
         ;;
 
@@ -4280,7 +4302,7 @@ winetricks_mount_cached_iso()
 
 winetricks_list_mounts()
 {
-    mount | egrep 'udf|iso9660' | sed 's,^\([^ ]*\) on \(.*\) type .*,\1 \2,'| grep "$1\$"
+    mount | grep -E 'udf|iso9660' | sed 's,^\([^ ]*\) on \(.*\) type .*,\1 \2,'| grep "$1\$"
 }
 
 # Return success and set _W_dev _W_mountpoint if volume $1 is mounted
@@ -5002,8 +5024,8 @@ helper_win2ksp4()
 {
     filename=$1
 
-    # http://www.microsoft.com/downloads/details.aspx?FamilyID=1001AAF1-749F-49F4-8010-297BD6CA33A0&displaylang=en
-    w_download_to win2ksp4 http://download.microsoft.com/download/E/6/A/E6A04295-D2A8-40D0-A0C5-241BFECD095E/W2KSP4_EN.EXE 167bb78d4adc957cc39fb4902517e1f32b1e62092353be5f8fb9ee647642de7e
+    # https://www.microsoft.com/en-us/download/details.aspx?id=4127
+    w_download_to win2ksp4 https://download.microsoft.com/download/E/6/A/E6A04295-D2A8-40D0-A0C5-241BFECD095E/W2KSP4_EN.EXE 167bb78d4adc957cc39fb4902517e1f32b1e62092353be5f8fb9ee647642de7e
     w_try_cabextract -d "$W_TMP" -L -F "$filename" "$W_CACHE"/win2ksp4/W2KSP4_EN.EXE
 }
 
@@ -5019,7 +5041,7 @@ helper_winxpsp3()
     fi
 
     # https://www.microsoft.com/en-us/download/details.aspx?id=24
-    w_download_to winxpsp3 http://download.microsoft.com/download/d/3/0/d30e32d8-418a-469d-b600-f32ce3edf42d/WindowsXP-KB936929-SP3-x86-ENU.exe 62e524a552db9f6fd22d469010ea4d7e28ee06fa615a1c34362129f808916654
+    w_download_to winxpsp3 https://download.microsoft.com/download/d/3/0/d30e32d8-418a-469d-b600-f32ce3edf42d/WindowsXP-KB936929-SP3-x86-ENU.exe 62e524a552db9f6fd22d469010ea4d7e28ee06fa615a1c34362129f808916654
 
     w_try_cabextract -d "$W_TMP" -L -F "$filename" "$W_CACHE"/winxpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe
 }
@@ -5047,7 +5069,7 @@ w_metadata adobeair dlls \
 
 load_adobeair()
 {
-    # 2017-3-14: 20.0.0.260 (strings 'Adobe AIR.dll' | grep 20\\. ) sha256sum 318770b9a18e59ca4a721a1f5c2b0235cffdbe77a043e99cb2af32074d61de45
+    # 2017/03/14: 20.0.0.260 (strings 'Adobe AIR.dll' | grep 20\\. ) sha256sum 318770b9a18e59ca4a721a1f5c2b0235cffdbe77a043e99cb2af32074d61de45
     w_download https://airdownload.adobe.com/air/win/download/20.0/AdobeAIRInstaller.exe 318770b9a18e59ca4a721a1f5c2b0235cffdbe77a043e99cb2af32074d61de45
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" AdobeAIRInstaller.exe $W_UNATTENDED_DASH_SILENT
@@ -5139,8 +5161,8 @@ 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://download.microsoft.com/download/3/b/f/3bf74b01-16ba-472d-9a8c-42b2b4fa0d76/mdac_typ.exe 36d2a3099e6286ae3fab181a502a95fbd825fa5ddb30bf09b345abc7f1f620b4
+    # https://www.microsoft.com/downloads/en/details.aspx?FamilyId=9AD000F2-CAE7-493D-B0F3-AE36C570ADE8&displaylang=en
+    w_download https://download.microsoft.com/download/3/b/f/3bf74b01-16ba-472d-9a8c-42b2b4fa0d76/mdac_typ.exe 36d2a3099e6286ae3fab181a502a95fbd825fa5ddb30bf09b345abc7f1f620b4
     w_try_cabextract --directory="$W_TMP" "$W_CACHE/cabinet/$file1"
     w_try cp "$W_TMP"/cabinet.dll "$W_SYSTEM32_DLLS"/cabinet.dll
 
@@ -5159,7 +5181,7 @@ w_metadata cmd dlls \
 
 load_cmd()
 {
-    w_download http://download.microsoft.com/download/8/d/c/8dc79965-dfbc-4b25-9546-e23bc4b791c6/Q811493_W2K_SP4_X86_EN.exe b5574b3516a724c2cba0d864162a3d1d684db1cf30de8db4b0e0ea6a1f6f1480
+    w_download https://download.microsoft.com/download/8/d/c/8dc79965-dfbc-4b25-9546-e23bc4b791c6/Q811493_W2K_SP4_X86_EN.exe b5574b3516a724c2cba0d864162a3d1d684db1cf30de8db4b0e0ea6a1f6f1480
     w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_CACHE/$W_PACKAGE/$file1" -F cmd.exe
 
     w_override_dlls native,builtin cmd.exe
@@ -5178,8 +5200,8 @@ w_metadata comctl32 dlls \
 load_comctl32()
 {
     # Microsoft has removed. Mirrors can be found at http://www.filewatcher.com/m/CC32inst.exe.587496-0.html
-    # 2011-01-17: http://www.microsoft.com/downloads/details.aspx?familyid=6f94d31a-d1e0-4658-a566-93af0d8d4a1e
-    # 2012-08-11: w_download http://download.microsoft.com/download/platformsdk/redist/5.80.2614.3600/w9xnt4/en-us/cc32inst.exe d68c0cca721870aed39f5f2efd80dfb74f3db66d5f9a49e7578b18279edfa4a7
+    # 2011/01/17: https://www.microsoft.com/en-us/download/details.aspx?id=14672
+    # 2012/08/11: w_download https://download.microsoft.com/download/platformsdk/redist/5.80.2614.3600/w9xnt4/en-us/cc32inst.exe d68c0cca721870aed39f5f2efd80dfb74f3db66d5f9a49e7578b18279edfa4a7
     # 2016/01/07: w_download ftp://ftp.ie.debian.org/disk1/download.sourceforge.net/pub/sourceforge/p/po/pocmin/Win%2095_98%20Controls/Win%2095_98%20Controls/CC32inst.exe
     # 2017/03/12: w_download $WINETRICKS_SOURCEFORGE/project/pocmin/Win%2095_98%20Controls/Win%2095_98%20Controls/CC32inst.exe
 
@@ -5282,7 +5304,7 @@ load_binkw32()
     # sha256sum of the decompressed file: 1fd7ef7873c8a3be7e2f127b306d0d24d7d88e20cf9188894eff87b5af0d495f
     #
     # Zip sha256sum:
-    # 2015-12-27: 1d5efda8e4af796319b94034ba67b453cbbfddd81eb7d94fd059b40e237fa75d
+    # 2015/12/27: 1d5efda8e4af796319b94034ba67b453cbbfddd81eb7d94fd059b40e237fa75d
 
     w_download http://www.down-dll.com/dll/b/__32-binkw32.dll3.0.0.0.zip 1d5efda8e4af796319b94034ba67b453cbbfddd81eb7d94fd059b40e237fa75d
 
@@ -5939,7 +5961,7 @@ w_metadata dxsdk_nov2006 dlls \
 
 load_dxsdk_nov2006()
 {
-    w_download https://download.microsoft.com/download/9/e/5/9e5bfc66-a621-4e0d-8bfe-6688058c3f00/dxsdk_aug2006.exe 1e9cdbef391ebfbf781e6c87a375138d8c195c57
+    w_download https://download.microsoft.com/download/9/e/5/9e5bfc66-a621-4e0d-8bfe-6688058c3f00/dxsdk_aug2006.exe ab8d7d895089a88108d4148ef0f7e214b7a23c1ee9ba720feca78c7d4ca16c00
 
     # dxview.dll uses mfc42u while registering
     w_call mfc42
@@ -5962,7 +5984,7 @@ w_metadata dxsdk_jun2010 dlls \
 
 load_dxsdk_jun2010()
 {
-    w_download https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/DXSDK_Jun10.exe 8fe98c00fde0f524760bb9021f438bd7d9304a69
+    w_download https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/DXSDK_Jun10.exe 11a0ddeb293040f8b99eeb1bdf6197ae1b26fdb74c036e5717d8e45db9c1576e
 
     # Without dotnet20, install aborts halfway through
     w_call dotnet20
@@ -6121,7 +6143,7 @@ load_dotnet20()
 {
     w_package_unsupported_win64
 
-    # http://www.microsoft.com/downloads/details.aspx?FamilyID=0856eacb-4362-4b0d-8edd-aab15c5e04f5
+    # https://www.microsoft.com/en-us/download/details.aspx?id=19
     w_download https://download.lenovo.com/ibmdl/pub/pc/pccbbs/thinkvantage_en/dotnetfx.exe 46693d9b74d12454d117cc61ff2e9481cabb100b4d74eb5367d3cf88b89a0e71
 
     w_call remove_mono
@@ -6367,7 +6389,7 @@ load_dotnet30()
     w_package_unsupported_win64
 
     # https://msdn.microsoft.com/en-us/netframework/bb264589.aspx
-    w_download http://download.microsoft.com/download/3/F/0/3F0A922C-F239-4B9B-9CB0-DF53621C57D9/dotnetfx3.exe 6cf8921e00f52bbd888aa7a520a7bac47e818e2a850bcc44494c64d6cbfafdac
+    w_download https://download.microsoft.com/download/3/F/0/3F0A922C-F239-4B9B-9CB0-DF53621C57D9/dotnetfx3.exe 6cf8921e00f52bbd888aa7a520a7bac47e818e2a850bcc44494c64d6cbfafdac
 
     w_call remove_mono
 
@@ -6866,7 +6888,7 @@ load_dotnet462()
         unattended_args="/ai /gm2"
     else
         # Official version. See https://www.microsoft.com/en-us/download/details.aspx?id=53344
-        w_download https://download.microsoft.com/download/F/9/4/F942F07D-F26F-4F30-B4E3-EBD54FABA377/NDP462-KB3151800-x86-x64-AllOS-ENU.exe a70f856bda33d45ad0a8ad035f73092441715431
+        w_download https://download.microsoft.com/download/F/9/4/F942F07D-F26F-4F30-B4E3-EBD54FABA377/NDP462-KB3151800-x86-x64-AllOS-ENU.exe 28886593e3b32f018241a4c0b745e564526dbb3295cb2635944e3a393f4278d4
         file_package="NDP462-KB3151800-x86-x64-AllOS-ENU.exe"
         unattended_args="/q /norestart"
     fi
@@ -6997,9 +7019,8 @@ w_metadata flash dlls \
 
 load_flash()
 {
-    # As of July 9, 2013, Adobe Flash 10 is no longer supported.
-    # And as of June 24, 2013, Adobe Flash 10.3 won't even install for me,
-    # it tells you to go get a newer version!
+    # 2013/07/09: Adobe Flash 10 is no longer supported.
+    # 2013/06/24: Adobe Flash 10.3 won't even install for me, it tells you to go get a newer version!
     # See
     # https://blogs.adobe.com/psirt/
     # https://get.adobe.com/de/flashplayer/otherversions/
@@ -7007,7 +7028,7 @@ load_flash()
     # https://helpx.adobe.com/flash-player/kb/archived-flash-player-versions.html
 
     # ActiveX plugin
-    # 2014-10-02 3958827058648cfe05fc6ee510685e8d93f995d3428c3eedbd6814704765672a
+    # 2014/10/02: 3958827058648cfe05fc6ee510685e8d93f995d3428c3eedbd6814704765672a
     w_download https://download.macromedia.com/pub/flashplayer/installers/archive/fp_14.0.0.176_archive.zip 3958827058648cfe05fc6ee510685e8d93f995d3428c3eedbd6814704765672a
 
     w_try_unzip "$W_TMP" "$W_CACHE"/flash/fp_14.0.0.176_archive.zip fp_14.0.0.176_archive/14_0_r0_176/flashplayer14_0r0_176_winax.exe
@@ -7015,7 +7036,7 @@ load_flash()
     w_try "$WINE" flashplayer14_0r0_176_winax.exe ${W_OPT_UNATTENDED:+ /install}
 
     # Mozilla / Firefox (NPAPI) plugin
-    # 2014-10-02 17496fd3c863c180aead953d7d4499dd36f997a9570abc2b92f55e4ea1d55d73
+    # 2014/10/02: 17496fd3c863c180aead953d7d4499dd36f997a9570abc2b92f55e4ea1d55d73
     w_download https://download.macromedia.com/pub/flashplayer/installers/archive/fp_14.0.0.179_archive.zip 17496fd3c863c180aead953d7d4499dd36f997a9570abc2b92f55e4ea1d55d73
 
     w_try_unzip "$W_TMP" "$W_CACHE"/flash/fp_14.0.0.179_archive.zip fp_14.0.0.179_archive/14_0_r0_179/flashplayer14_0r0_179_win.exe
@@ -7023,7 +7044,7 @@ load_flash()
     w_try "$WINE" flashplayer14_0r0_179_win.exe ${W_OPT_UNATTENDED:+ /install}
 
     # Projector (standalone player)
-    # 2015-07-06
+    # 2015/07/06:
     w_download https://download.macromedia.com/pub/flashplayer/updaters/14/flashplayer_14_sa.exe 8640c42e73dc44125045e17abd32412c48f3808a8393c94fc8281cf4b0d87bdc
     # shellcheck disable=SC2154
     w_try cp "${W_CACHE}/${W_PACKAGE}/${file3}" "$W_SYSTEM32_DLLS/Macromed/Flash"
@@ -7081,7 +7102,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
+    # https://www.microsoft.com/en-us/download/details.aspx?id=5339
+    w_download https://download.microsoft.com/download/1/4/6/1467c2ba-4d1f-43ad-8d9b-3e8bc1c6ac3d/NDP1.0sp2-KB830348-X86-Enu.exe 3c6c7eed4a0ccd2ea2ce0446359b8c752dd2a3b82332663f655e803ce0b05335
     w_try_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"
@@ -7141,7 +7163,7 @@ w_metadata gfw dlls \
 
 load_gfw()
 {
-    # http://www.microsoft.com/games/en-us/live/pages/livejoin.aspx
+    # https://www.microsoft.com/games/en-us/live/pages/livejoin.aspx
     # http://www.next-gen.biz/features/should-games-for-windows-live-die
     w_download https://download.microsoft.com/download/5/5/8/55846E20-4A46-4EF8-B272-7F988BC9090A/gfwlivesetupmin.exe b14609508e2f8dba0886ded84e2817ad532ebfa31f8a6d4be2e6a5a03a9d7c23
 
@@ -7184,7 +7206,7 @@ w_metadata gmdls dlls \
 
 load_gmdls()
 {
-    w_download_to directx8 http://download.microsoft.com/download/whistler/Update/8.1/W982KMeXP/EN-US/DX81Redist.exe 5ddc1a8e204381254dc5d65f406584787155983adf245a75000dcd0d2efb04c6
+    w_download_to directx8 https://download.microsoft.com/download/whistler/Update/8.1/W982KMeXP/EN-US/DX81Redist.exe 5ddc1a8e204381254dc5d65f406584787155983adf245a75000dcd0d2efb04c6
 
     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
@@ -7309,8 +7331,8 @@ load_icodecs()
     # Note: this codec is insecure, see
     # https://support.microsoft.com/kb/954157
     # Original source, ftp://download.intel.com/support/createshare/camerapack/codinstl.exe, had same checksum
-    # 2010-11-14: http://codec.alshow.co.kr/Down/codinstl.exe
-    # 2014-04-11: http://www.cucusoft.com/codecdownload/codinstl.exe (linked from http://www.cucusoft.com/codec.asp)
+    # 2010/11/14: http://codec.alshow.co.kr/Down/codinstl.exe
+    # 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" 0979d43568111cadf0b3bf43cd8d746ac3de505759c14f381592b4f8439f6c95
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
@@ -7481,8 +7503,8 @@ load_mdac27()
         w_die "Installer doesn't support 64-bit architecture."
     fi
 
-    # http://www.microsoft.com/downloads/en/details.aspx?FamilyId=9AD000F2-CAE7-493D-B0F3-AE36C570ADE8&displaylang=en
-    w_download http://download.microsoft.com/download/3/b/f/3bf74b01-16ba-472d-9a8c-42b2b4fa0d76/mdac_typ.exe 36d2a3099e6286ae3fab181a502a95fbd825fa5ddb30bf09b345abc7f1f620b4
+    # https://www.microsoft.com/downloads/en/details.aspx?FamilyId=9AD000F2-CAE7-493D-B0F3-AE36C570ADE8&displaylang=en
+    w_download https://download.microsoft.com/download/3/b/f/3bf74b01-16ba-472d-9a8c-42b2b4fa0d76/mdac_typ.exe 36d2a3099e6286ae3fab181a502a95fbd825fa5ddb30bf09b345abc7f1f620b4
     load_native_mdac
     w_set_winver nt40
     w_try_cd "$W_CACHE"/"$W_PACKAGE"
@@ -7708,13 +7730,13 @@ w_metadata msdxmocx dlls \
 load_msdxmocx()
 {
     # Previously at https://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
+    # 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
+    # 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 sha256sum is different. Perhaps Iceweasel was right. This one is also clean according to clamscan/virustotal.com
 
-    # (2017/9/28) define.fi is down, these sites have mpfull.exe with the original sha256:
+    # 2017/09/28: define.fi is down, these sites have mpfull.exe with the original sha256:
     # http://hell.pl/agnus/windows95/
     # http://zerosky.oldos.org/win9x.html
     # http://sdfox7.com/win95/
@@ -7738,7 +7760,6 @@ w_metadata msflxgrd dlls \
 load_msflxgrd()
 {
     # https://msdn.microsoft.com/en-us/library/aa240864(VS.60).aspx
-    # may 2011: f497c3b390cd80d5bcd1f13d5c0c68b206369aa7
     # 2015/11/09: Removed from Microsoft.com, archive.org has an older copy:
     # 2015/11/09: a0d374293ab9556a6eb7705efbca533ad8f20e6b9cb55f14f1ec5bb55552ec8d
     w_download http://activex.microsoft.com/controls/vb6/MsFlxGrd.cab a0d374293ab9556a6eb7705efbca533ad8f20e6b9cb55f14f1ec5bb55552ec8d
@@ -7800,9 +7821,9 @@ w_metadata msscript dlls \
 
 load_msscript()
 {
-    # http://msdn.microsoft.com/scripting/scriptcontrol/x86/sct10en.exe
-    # http://www.microsoft.com/downloads/details.aspx?familyid=d7e31492-2595-49e6-8c02-1426fec693ac
-    w_download http://download.microsoft.com/download/d/2/a/d2a7430c-6d5b-48e9-96c4-3c751be7bffe/sct10en.exe 9b6730c3070f252f5051e0cf6b99523b66730599d795a607efd40b7fb0e11efb
+    # https://msdn.microsoft.com/scripting/scriptcontrol/x86/sct10en.exe
+    # https://www.microsoft.com/en-us/download/details.aspx?id=1949
+    w_download https://download.microsoft.com/download/d/2/a/d2a7430c-6d5b-48e9-96c4-3c751be7bffe/sct10en.exe 9b6730c3070f252f5051e0cf6b99523b66730599d795a607efd40b7fb0e11efb
 
     w_try_cabextract --directory="$W_TMP" "$W_CACHE"/msscript/sct10en.exe
     w_try cp -f "$W_TMP"/msscript.ocx "$W_SYSTEM32_DLLS"
@@ -7821,7 +7842,7 @@ w_metadata msls31 dlls \
 load_msls31()
 {
     # Needed by native RichEdit and Internet Explorer
-    w_download http://download.microsoft.com/download/WindowsInstaller/Install/2.0/NT45/EN-US/InstMsiW.exe 4c3516c0b5c2b76b88209b22e3bf1cb82d8e2de7116125e97e128952372eed6b
+    w_download https://download.microsoft.com/download/WindowsInstaller/Install/2.0/NT45/EN-US/InstMsiW.exe 4c3516c0b5c2b76b88209b22e3bf1cb82d8e2de7116125e97e128952372eed6b
     w_try_cabextract --directory="$W_TMP" "$W_CACHE"/msls31/InstMsiW.exe
     w_try cp -f "$W_TMP"/msls31.dll "$W_SYSTEM32_DLLS"
 }
@@ -7840,8 +7861,6 @@ load_msmask()
 {
     # https://msdn.microsoft.com/en-us/library/11405hcf(VS.71).aspx
     # https://bugs.winehq.org/show_bug.cgi?id=2934
-    # old: 3c6b26f68053364ea2e09414b615dbebafb9d5c3
-    # May 2009: 30e55679e4a13fe4d9620404476f215f93239292
     # 2015/11/09: Removed from microsoft.com, archive.org has an older copy:
     # 2015/11/09: 25e49bd2aa8f96ff3c1068fc0fa7ba87fe86d8d5999e3592919a4b03f0602d67
     w_download http://activex.microsoft.com/controls/vb6/MSMASK32.CAB 25e49bd2aa8f96ff3c1068fc0fa7ba87fe86d8d5999e3592919a4b03f0602d67
@@ -7881,9 +7900,9 @@ w_metadata msxml3 dlls \
 load_msxml3()
 {
     # Service Pack 5
-    #w_download http://download.microsoft.com/download/a/5/e/a5e03798-2454-4d4b-89a3-4a47579891d8/msxml3.msi
+    #w_download https://download.microsoft.com/download/a/5/e/a5e03798-2454-4d4b-89a3-4a47579891d8/msxml3.msi
     # Service Pack 7
-    w_download http://download.microsoft.com/download/8/8/8/888f34b7-4f54-4f06-8dac-fa29b19f33dd/msxml3.msi f9c678f8217e9d4f9647e8a1f6d89a7c26a57b9e9e00d39f7487493dd7b4e36c
+    w_download https://download.microsoft.com/download/8/8/8/888f34b7-4f54-4f06-8dac-fa29b19f33dd/msxml3.msi f9c678f8217e9d4f9647e8a1f6d89a7c26a57b9e9e00d39f7487493dd7b4e36c
 
     # 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
@@ -7905,9 +7924,9 @@ w_metadata msxml4 dlls \
 load_msxml4()
 {
     # MS06-071: https://www.microsoft.com/en-us/download/details.aspx?id=11125
-    # w_download https://download.microsoft.com/download/e/2/e/e2e92e52-210b-4774-8cd9-3a7a0130141d/msxml4-KB927978-enu.exe d364f9fe80c3965e79f6f64609fc253dfeb69c25
+    # w_download https://download.microsoft.com/download/e/2/e/e2e92e52-210b-4774-8cd9-3a7a0130141d/msxml4-KB927978-enu.exe 7602c2a6d2a46ef2b4028438d2cce67fe437a9bfb569249ea38141b4756b4e03
     # MS07-042: https://www.microsoft.com/en-us/download/details.aspx?id=2386
-    # w_download https://download.microsoft.com/download/9/4/2/9422e6b6-08ee-49cb-9f05-6c6ee755389e/msxml4-KB936181-enu.exe 73d75d7b41f8a3d49f272e74d4f73bb5e82f1acf
+    # w_download https://download.microsoft.com/download/9/4/2/9422e6b6-08ee-49cb-9f05-6c6ee755389e/msxml4-KB936181-enu.exe 1ce9ff868816cfc9bf33e93fdf1552afce5b491443892babb521e74c05e45242
     # SP3 (2009): https://www.microsoft.com/en-us/download/details.aspx?id=15697
     w_download https://download.microsoft.com/download/A/2/D/A2D8587D-0027-4217-9DAD-38AFDB0A177E/msxml.msi 47c2ae679c37815da9267c81fc3777de900ad2551c11c19c2840938b346d70bb
     w_override_dlls native,builtin msxml4
@@ -7931,7 +7950,7 @@ load_msxml6()
     # https://www.microsoft.com/en-us/download/details.aspx?id=6276
     if [ $W_ARCH = win64 ]
     then
-        w_download https://download.microsoft.com/download/e/a/f/eafb8ee7-667d-4e30-bb39-4694b5b3006f/msxml6_x64.msi ca0c0814a9c7024583edb997296aad7cb0a3cbf7
+        w_download https://download.microsoft.com/download/e/a/f/eafb8ee7-667d-4e30-bb39-4694b5b3006f/msxml6_x64.msi 945d8c535758d5178d4de9063cfcba7dfa96987eaa478e0c03ba646cc7ca772f
     else
         w_download https://download.microsoft.com/download/e/a/f/eafb8ee7-667d-4e30-bb39-4694b5b3006f/msxml6_x86.msi efa48f8cab5a89b8e667ed3e10dfb71bddc02923d0f3757bd93ffabe6fb6c598
     fi
@@ -7960,10 +7979,7 @@ w_metadata nuget dlls \
 load_nuget()
 {
     w_call dotnet40
-    # 2014-01-22: d4082afc4f89df195fa1e83ee1cf02bce3dd2f13
-    # 2014-02-26: 9bc98ced9c2d2b51ab687f86b5580913c025b8b0
-    # 2014-04-17: 3210cc9a2e575384d59b0604c892bccce760e9b6
-    # probably changes too rapidly to check
+    # Changes too rapidly to check shasum
     w_download https://nuget.org/nuget.exe
     w_try cp "$W_CACHE/$W_PACKAGE"/nuget.exe "$W_SYSTEM32_DLLS"
     w_warn "To run NuGet, use the command line \"$WINE nuget\"."
@@ -7987,6 +8003,25 @@ load_ogg()
     w_try "$WINE" "$file1" $W_UNATTENDED_SLASH_S
 }
 
+
+#----------------------------------------------------------------
+
+w_metadata ole32 dlls \
+    title="MS ole32 Module (ole32.dll)" \
+    publisher="Microsoft" \
+    year="2004" \
+    media="download" \
+    file1="../winxpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/ole32.dll"
+
+load_ole32()
+{
+    # Some applications need this, for example Wechat.
+    helper_winxpsp3 i386/ole32.dl_
+    w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_TMP"/i386/ole32.dl_
+    w_override_dlls native,builtin ole32
+}
+
 #----------------------------------------------------------------
 
 w_metadata ollydbg110 apps \
@@ -8103,7 +8138,7 @@ w_metadata pdh dlls \
 load_pdh()
 {
     # https://support.microsoft.com/kb/284996
-    w_download http://download.microsoft.com/download/platformsdk/Redist/5.0.2195.2668/NT4/EN-US/pdhinst.exe 5506e34930badec5c27d4c325462530e4b06a4a9797a8f70089b39013b5dffae
+    w_download https://download.microsoft.com/download/platformsdk/Redist/5.0.2195.2668/NT4/EN-US/pdhinst.exe 5506e34930badec5c27d4c325462530e4b06a4a9797a8f70089b39013b5dffae
 
     w_try_cabextract --directory="$W_TMP" "$W_CACHE"/pdh/pdhinst.exe
     w_try_unzip "$W_TMP" "$W_TMP"/pdh.exe
@@ -8141,7 +8176,7 @@ w_metadata pngfilt dlls \
 load_pngfilt()
 {
     # https://www.microsoft.com/en-us/download/details.aspx?id=3907
-    w_download http://download.microsoft.com/download/5/0/c/50c42d0e-07a8-4a2b-befb-1a403bd0df96/IE5.01sp4-KB871260-Windows2000sp4-x86-ENU.exe eb1b90677ee969b278494c6180d906af37eda6d20f760dc395350a2da91eb631
+    w_download https://download.microsoft.com/download/5/0/c/50c42d0e-07a8-4a2b-befb-1a403bd0df96/IE5.01sp4-KB871260-Windows2000sp4-x86-ENU.exe eb1b90677ee969b278494c6180d906af37eda6d20f760dc395350a2da91eb631
     w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F pngfilt.dll "$W_CACHE"/pngfilt/IE5.01sp4-KB871260-Windows2000sp4-x86-ENU.exe
     w_try_regsvr pngfilt.dll
 }
@@ -8334,8 +8369,8 @@ load_riched30()
     # only works with riched30, and recommends getting it by installing
     # msi 2, which just happens to come with riched30 version of riched20
     # (though not with a corresponding riched32, which might be a problem)
-    # http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=CEBBACD8-C094-4255-B702-DE3BB768148F
-    w_download http://download.microsoft.com/download/WindowsInstaller/Install/2.0/W9XMe/EN-US/InstMsiA.exe 536e4c8385d7d250fd5702a6868d1ed004692136eefad22252d0dac15f02563a
+    # https://www.microsoft.com/en-us/download/details.aspx?id=21990
+    w_download https://download.microsoft.com/download/WindowsInstaller/Install/2.0/W9XMe/EN-US/InstMsiA.exe 536e4c8385d7d250fd5702a6868d1ed004692136eefad22252d0dac15f02563a
     w_try_cabextract --directory="$W_TMP" "$W_CACHE"/riched30/InstMsiA.exe
     w_try cp -f "$W_TMP"/riched20.dll "$W_SYSTEM32_DLLS"
     w_try cp -f "$W_TMP"/msls31.dll "$W_SYSTEM32_DLLS"
@@ -8388,8 +8423,8 @@ w_metadata secur32 dlls \
 
 load_secur32()
 {
-    # http://www.microsoft.com/downloads/details.aspx?familyid=c4e408d7-6716-4a12-ad3a-8029667f5c84
-    w_download http://download.microsoft.com/download/6/9/5/69501788-B62F-44D8-933F-B6FAA576CA87/Windows2000-KB959426-x86-ENU.EXE a150e8b8fc68164eed18f214ee0726d9b7eb6c4726aab91decd12627b045d68b
+    # https://www.microsoft.com/en-us/download/details.aspx?id=12784
+    w_download https://download.microsoft.com/download/6/9/5/69501788-B62F-44D8-933F-B6FAA576CA87/Windows2000-KB959426-x86-ENU.EXE a150e8b8fc68164eed18f214ee0726d9b7eb6c4726aab91decd12627b045d68b
     w_try_cabextract "$W_CACHE"/secur32/Windows2000-KB959426-x86-ENU.EXE -d "$W_SYSTEM32_DLLS" -F secur32.dll
     w_override_dlls native,builtin secur32
 }
@@ -8423,8 +8458,8 @@ w_metadata shockwave dlls \
     installed_file1="$W_SYSTEM32_DLLS_WIN/Adobe/Shockwave 12/shockwave_Projector_Loader.dcr"
 
 load_shockwave() {
-    # 2017-03-12 sha256sum: 39715a84b1d85347066fbf89a3af9f5e612b59402093b055cd423bd30a7f637d
-    # 2017-03-15 sha256sum: 58f2152bf726d52f08fb41f904c62ff00fdf748c8ce413e8c8547da3a21922ba
+    # 2017/03/12: 39715a84b1d85347066fbf89a3af9f5e612b59402093b055cd423bd30a7f637d
+    # 2017/03/15: 58f2152bf726d52f08fb41f904c62ff00fdf748c8ce413e8c8547da3a21922ba
     w_download https://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi 58f2152bf726d52f08fb41f904c62ff00fdf748c8ce413e8c8547da3a21922ba
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
@@ -8470,7 +8505,7 @@ w_metadata tabctl32 dlls \
 load_tabctl32()
 {
     # https://msdn.microsoft.com/en-us/library/aa240864(VS.60).aspx
-    # Nov 2012: tabctl32
+    # 2012/11: tabctl32
     w_download http://activex.microsoft.com/controls/vb6/TABCTL32.CAB d2a7bdacf74de95146384578d0f08ccefb2defb0081b3d42d34fdcee7ea4cc68
 
     w_try_cabextract --directory="$W_TMP" "$W_CACHE/tabctl32/${file1}"
@@ -8509,8 +8544,8 @@ w_metadata usp10 dlls \
 load_usp10()
 {
     # https://en.wikipedia.org/wiki/Uniscribe
-    # http://www.microsoft.com/downloads/details.aspx?familyid=cebbacd8-c094-4255-b702-de3bb768148f
-    w_download_to msi2 http://download.microsoft.com/download/WindowsInstaller/Install/2.0/W9XMe/EN-US/InstMsiA.exe 536e4c8385d7d250fd5702a6868d1ed004692136eefad22252d0dac15f02563a
+    # https://www.microsoft.com/en-us/download/details.aspx?id=21990
+    w_download_to msi2 https://download.microsoft.com/download/WindowsInstaller/Install/2.0/W9XMe/EN-US/InstMsiA.exe 536e4c8385d7d250fd5702a6868d1ed004692136eefad22252d0dac15f02563a
     w_try_cabextract --directory="$W_TMP" "$W_CACHE"/msi2/InstMsiA.exe
     w_try cp -f "$W_TMP"/usp10.dll "$W_SYSTEM32_DLLS"
     w_override_dlls native,builtin usp10
@@ -8795,7 +8830,7 @@ w_metadata vcrun2005 dlls \
 
 load_vcrun2005()
 {
-    # June 2011 security update, see
+    # 2011/06: Security update, see
     # https://technet.microsoft.com/library/security/ms11-025 or
     # https://support.microsoft.com/kb/2538242
     w_download https://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x86.EXE 4ee4da0fe62d5fa1b5e80c6e6d88a4a2f8b3b140c35da51053d0d7b72a381d29
@@ -8947,7 +8982,6 @@ w_metadata vcrun2013 dlls \
 load_vcrun2013()
 {
     # https://www.microsoft.com/en-us/download/details.aspx?id=40784
-    # 2014/07/26: 18f81495bc5e6b293c69c28b0ac088a96debbab2
     # 2015/01/14: a22895e55b26202eae166838edbe2ea6aad00d7ea600c11f8a31ede5cbce2048
     w_download https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x86.exe a22895e55b26202eae166838edbe2ea6aad00d7ea600c11f8a31ede5cbce2048
 
@@ -9088,7 +9122,7 @@ load_windowscodecs()
         EXE="wic_x86_enu.exe"
     elif [ "$W_ARCH" = "win64" ] ; then
         # https://www.microsoft.com/en-us/download/details.aspx?id=1385
-        w_download https://download.microsoft.com/download/6/4/5/645FED5F-A6E7-44D9-9D10-FE83348796B0/wic_x64_enu.exe 4bdbf76a7bc96453306c893b4a7b2b8ae6127f67
+        w_download https://download.microsoft.com/download/6/4/5/645FED5F-A6E7-44D9-9D10-FE83348796B0/wic_x64_enu.exe 5822fecd69a90c2833965a25e8779000825d69cc8c9250933f0ab70df52171e1
         EXE="wic_x64_enu.exe"
     else
         w_die "Invalid W_ARCH value, $W_ARCH"
@@ -9173,9 +9207,9 @@ load_wmi()
         w_die "Installer doesn't support 64-bit architecture."
     fi
 
-    # WMI for NT4.0 need validation: http://www.microsoft.com/downloads/en/details.aspx?FamilyID=c174cfb1-ef67-471d-9277-4c2b1014a31e
-    # See also http://www.microsoft.com/downloads/en/details.aspx?FamilyId=98A4C5BA-337B-4E92-8C18-A63847760EA5
-    w_download http://download.microsoft.com/download/platformsdk/wmi9x/1.5/W9X/EN-US/wmi9x.exe 62752e9c1b879688c26f205eebf07d3783906c3e
+    # WMI for NT4.0 need validation: https://www.microsoft.com/en-us/download/details.aspx?id=7665
+    # See also https://www.microsoft.com/en-us/download/details.aspx?id=16510
+    w_download https://download.microsoft.com/download/platformsdk/wmi9x/1.5/W9X/EN-US/wmi9x.exe 1d5d94050354b164c6a19531df151e0703d5eb39cebf4357ee2cfc340c2509d0
 
     w_set_winver win98
     w_override_dlls native,builtin wbemprox wmiutils
@@ -9249,8 +9283,8 @@ w_metadata wsh56vb dlls \
 load_wsh56vb()
 {
     # This installs VBScript 5.6 (but not JScript)
-    # 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 792a36d629e01cb474a434761e8cd33211c19ff84f5aa52f0d41111e054ecaac
+    # See also https://www.microsoft.com/en-us/download/details.aspx?id=8495
+    w_download https://download.microsoft.com/download/IE60/Patch/Q318089/W9XNT4Me/EN-US/vbs56men.exe 792a36d629e01cb474a434761e8cd33211c19ff84f5aa52f0d41111e054ecaac
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_override_dlls native,builtin vbscript
@@ -9288,100 +9322,45 @@ w_metadata xact dlls \
     publisher="Microsoft" \
     year="2010" \
     media="download" \
-    file1="../directx9/directx_feb2010_redist.exe" \
+    file1="../directx9/directx_Jun2010_redist.exe" \
     installed_file1="$W_SYSTEM32_DLLS_WIN/xactengine2_0.dll"
 
 load_xact()
-{
-    helper_directx_dl
-
-    # Extract xactengine?_?.dll, X3DAudio?_?.dll, xaudio?_?.dll, xapofx?_?.dll
-    w_try_cabextract -d "$W_TMP" -L -F '*_xact_*x86*' "$W_CACHE"/directx9/$DIRECTX_NAME
-    w_try_cabextract -d "$W_TMP" -L -F '*_x3daudio_*x86*' "$W_CACHE"/directx9/$DIRECTX_NAME
-    w_try_cabextract -d "$W_TMP" -L -F '*_xaudio_*x86*' "$W_CACHE"/directx9/$DIRECTX_NAME
-    for x in "$W_TMP"/*.cab
-    do
-      w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'xactengine*.dll' "$x"
-      w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'xaudio*.dll' "$x"
-      w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'x3daudio*.dll' "$x"
-      w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'xapofx*.dll' "$x"
-    done
-    if test "$W_ARCH" = "win64"
-    then
-        w_try_cabextract -d "$W_TMP" -L -F '*_xact_*x64*' "$W_CACHE"/directx9/$DIRECTX_NAME
-        w_try_cabextract -d "$W_TMP" -L -F '*_x3daudio_*x64*' "$W_CACHE"/directx9/$DIRECTX_NAME
-        w_try_cabextract -d "$W_TMP" -L -F '*_xaudio_*x64*' "$W_CACHE"/directx9/$DIRECTX_NAME
-        for x in "$W_TMP"/*x64.cab
-        do
-          w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'xactengine*.dll' "$x"
-          w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'xaudio*.dll' "$x"
-          w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'x3daudio*.dll' "$x"
-          w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'xapofx*.dll' "$x"
-        done
-    fi
-
-    # Register xactengine?_?.dll
-    for x in "$W_SYSTEM32_DLLS"/xactengine*
-    do
-      w_try_regsvr "$(basename "$x")"
-    done
-
-    # and xaudio?_?.dll, but not xaudio2_8 (unsupported)
-    for x in 0 1 2 3 4 5 6 7
-    do
-      w_try_regsvr "$(basename "$W_SYSTEM32_DLLS/xaudio2_${x}")"
-    done
-}
-
-#----------------------------------------------------------------
-
-w_metadata xact_jun2010 dlls \
-    title="MS XACT Engine" \
-    publisher="Microsoft" \
-    year="2010" \
-    media="download" \
-    file1="../directx9/directx_Jun2010_redist.exe" \
-    installed_file1="$W_SYSTEM32_DLLS_WIN/xactengine2_0.dll"
-
-load_xact_jun2010()
 {
     helper_directx_Jun2010
 
     # Extract xactengine?_?.dll, X3DAudio?_?.dll, xaudio?_?.dll, xapofx?_?.dll
-    w_try_cabextract -d "$W_TMP" -L -F '*_xact_*x86*' "$W_CACHE"/directx9/$DIRECTX_NAME
-    w_try_cabextract -d "$W_TMP" -L -F '*_x3daudio_*x86*' "$W_CACHE"/directx9/$DIRECTX_NAME
-    w_try_cabextract -d "$W_TMP" -L -F '*_xaudio_*x86*' "$W_CACHE"/directx9/$DIRECTX_NAME
-    for x in "$W_TMP"/*.cab
-    do
-      w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'xactengine*.dll' "$x"
-      w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'xaudio*.dll' "$x"
-      w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'x3daudio*.dll' "$x"
-      w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'xapofx*.dll' "$x"
+    w_try_cabextract -d "$W_TMP" -L -F '*_xact_*x86*' "$W_CACHE/directx9/$DIRECTX_NAME"
+    w_try_cabextract -d "$W_TMP" -L -F '*_x3daudio_*x86*' "$W_CACHE/directx9/$DIRECTX_NAME"
+    w_try_cabextract -d "$W_TMP" -L -F '*_xaudio_*x86*' "$W_CACHE/directx9/$DIRECTX_NAME"
+
+    for x in "$W_TMP"/*.cab ; do
+        w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'xactengine*.dll' "$x"
+        w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'xaudio*.dll' "$x"
+        w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'x3daudio*.dll' "$x"
+        w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'xapofx*.dll' "$x"
     done
-    if test "$W_ARCH" = "win64"
-    then
-        w_try_cabextract -d "$W_TMP" -L -F '*_xact_*x64*' "$W_CACHE"/directx9/$DIRECTX_NAME
-        w_try_cabextract -d "$W_TMP" -L -F '*_x3daudio_*x64*' "$W_CACHE"/directx9/$DIRECTX_NAME
-        w_try_cabextract -d "$W_TMP" -L -F '*_xaudio_*x64*' "$W_CACHE"/directx9/$DIRECTX_NAME
-        for x in "$W_TMP"/*x64.cab
-        do
-          w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'xactengine*.dll' "$x"
-          w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'xaudio*.dll' "$x"
-          w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'x3daudio*.dll' "$x"
-          w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'xapofx*.dll' "$x"
+
+    if test "$W_ARCH" = "win64" ; then
+        w_try_cabextract -d "$W_TMP" -L -F '*_xact_*x64*' "$W_CACHE/directx9/$DIRECTX_NAME"
+        w_try_cabextract -d "$W_TMP" -L -F '*_x3daudio_*x64*' "$W_CACHE/directx9/$DIRECTX_NAME"
+        w_try_cabextract -d "$W_TMP" -L -F '*_xaudio_*x64*' "$W_CACHE/directx9/$DIRECTX_NAME"
+        for x in "$W_TMP"/*x64.cab ; do
+            w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'xactengine*.dll' "$x"
+            w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'xaudio*.dll' "$x"
+            w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'x3daudio*.dll' "$x"
+            w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F 'xapofx*.dll' "$x"
         done
     fi
 
     # Register xactengine?_?.dll
-    for x in "$W_SYSTEM32_DLLS"/xactengine*
-    do
-      w_try_regsvr "$(basename "$x")"
+    for x in "$W_SYSTEM32_DLLS"/xactengine* ; do
+        w_try_regsvr "$(basename "$x")"
     done
 
     # and xaudio?_?.dll, but not xaudio2_8 (unsupported)
-    for x in 0 1 2 3 4 5 6 7
-    do
-      w_try_regsvr "$(basename "$W_SYSTEM32_DLLS/xaudio2_${x}")"
+    for x in 0 1 2 3 4 5 6 7 ; do
+        w_try_regsvr "$(basename "$W_SYSTEM32_DLLS/xaudio2_${x}")"
     done
 }
 
@@ -9420,37 +9399,20 @@ load_xinput()
 
 #----------------------------------------------------------------
 
-# FIXME: extend metadata to allow file1_en, file1_fr, etc.
 w_metadata xmllite dlls \
     title="MS xmllite dll" \
     publisher="Microsoft" \
-    year="2006" \
+    year="2011" \
     media="download" \
+    file1="../win7sp1/windows6.1-KB976932-X86.exe" \
     installed_file1="$W_SYSTEM32_DLLS_WIN/xmllite.dll"
 
 load_xmllite()
 {
-    case $LANG in
-    en*) w_download http://download.microsoft.com/download/f/9/6/f964059a-3747-4ed8-9326-ba1e639031b1/WindowsXP-KB915865-v11-x86-ENU.exe 226d246a1c64e693791de5c727509002d089b0d5 ;;
-    fr*) w_download http://download.microsoft.com/download/4/1/d/41de58a0-6715-4d3e-99e7-ff0c11283d1b/WindowsXP-KB915865-v11-x86-FRA.exe abb70b6a96be7dce453b00877739e90c6f3efba0 ;;
-    de*) w_download http://download.microsoft.com/download/9/b/6/9b67efdb-cce3-4247-a2e0-386673859a1b/WindowsXP-KB915865-v11-x86-DEU.exe a03a325815acf9d624db58ab94a140a5586e64c8 ;;
-    ja*) w_download http://download.microsoft.com/download/f/5/c/f5cf73b7-4dc4-4042-815d-29d2fd24ae6f/WindowsXP-KB915865-v11-x86-JPN.exe eaf443d04d9b13cb86f927f8a7fe372268386395 ;;
-    *) w_die "Sorry, xmllite install not yet implemented for language $LANG" ;;
-    esac
+    helper_win7sp1 x86_microsoft-windows-servicingstack_31bf3856ad364e35_6.1.7601.17514_none_0b66cb34258c936f/xmllite.dll
+    w_try cp "$W_TMP/x86_microsoft-windows-servicingstack_31bf3856ad364e35_6.1.7601.17514_none_0b66cb34258c936f/xmllite.dll" "$W_SYSTEM32_DLLS/xmllite.dll"
 
-    # Doesn't install in newer versions:
-    w_set_winver winxp
-
-    w_try_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 ;;
-    fr*) w_try "$WINE" WindowsXP-KB915865-v11-x86-FRA.exe $W_UNATTENDED_SLASH_Q ;;
-    de*) w_try "$WINE" WindowsXP-KB915865-v11-x86-DEU.exe $W_UNATTENDED_SLASH_Q ;;
-    ja*) w_try "$WINE" WindowsXP-KB915865-v11-x86-JPN.exe $W_UNATTENDED_SLASH_Q ;;
-    esac
-
-    w_unset_winver
+    w_override_dlls native,builtin xmllite
 }
 
 #----------------------------------------------------------------
@@ -9466,7 +9428,7 @@ w_metadata xna31 dlls \
 load_xna31()
 {
     w_call dotnet20sp2
-    w_download https://download.microsoft.com/download/5/9/1/5912526C-B950-4662-99B6-119A83E60E5C/xnafx31_redist.msi bdd33b677c9576a63ff2a6f65e12c0563cc116e6
+    w_download https://download.microsoft.com/download/5/9/1/5912526C-B950-4662-99B6-119A83E60E5C/xnafx31_redist.msi 187e7e6b08fe35428d945612a7d258bfed25fad53cc54882983abdc73fe60f91
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" msiexec $W_UNATTENDED_SLASH_QUIET /i "$file1"
 }
@@ -9511,7 +9473,7 @@ w_metadata xvid dlls \
 load_xvid()
 {
     w_call vcrun6
-    w_download http://www.koepi.info/Xvid-1.3.2-20110601.exe 0a11498a96f75ad019c4c7d06161504140337dc0
+    w_download http://www.koepi.info/Xvid-1.3.2-20110601.exe 74b23965cebe59e388eab6dba224b6b751ef4519454cc12086ade51c81f0a33c
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" "$file1" ${W_OPT_UNATTENDED:+ --mode unattended --decode_divx 1 --decode_3ivx 1 --decode_other 1}
 }
@@ -9532,7 +9494,7 @@ load_baekmuk()
 {
     # See http://kldp.net/projects/baekmuk for project page
     # Need to download from Debian as the project page has unique captcha tokens per visitor
-    w_download http://http.debian.net/debian/pool/main/f/fonts-baekmuk/fonts-baekmuk_2.2.orig.tar.gz afdee34f700007de6ea87b43c92a88b7385ba65b
+    w_download http://http.debian.net/debian/pool/main/f/fonts-baekmuk/fonts-baekmuk_2.2.orig.tar.gz 08ab7dffb55d5887cc942ce370f5e33b756a55fbb4eaf0b90f244070e8d51882
 
     w_try_cd "$W_TMP"
     tar zxvf "$W_CACHE/$W_PACKAGE/$file1" baekmuk-ttf-2.2/ttf
@@ -9572,7 +9534,7 @@ w_metadata cambria fonts \
 load_cambria()
 {
     # https://www.microsoft.com/en-us/download/details.aspx?id=13
-    w_download_to consolas https://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe ab48a8ebac88219c84f293c6c1e81f1a0f420da6
+    w_download_to consolas https://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe 249473568eba7a1e4f95498acba594e0f42e6581add4dead70c1dfb908a09423
     w_try_cabextract -d "$W_TMP" -L -F ppviewer.cab "$W_CACHE"/consolas/PowerPointViewer.exe
     w_try_cabextract -d "$W_FONTSDIR_UNIX" -L -F 'CAMBRIA*.TT*' "$W_TMP"/ppviewer.cab
     w_register_font cambria.ttc "Cambria"
@@ -9594,7 +9556,7 @@ w_metadata constantia fonts \
 load_constantia()
 {
     # https://www.microsoft.com/en-us/download/details.aspx?id=13
-    w_download_to consolas https://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe ab48a8ebac88219c84f293c6c1e81f1a0f420da6
+    w_download_to consolas https://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe 249473568eba7a1e4f95498acba594e0f42e6581add4dead70c1dfb908a09423
     w_try_cabextract -d "$W_TMP" -L -F ppviewer.cab "$W_CACHE"/consolas/PowerPointViewer.exe
     w_try_cabextract -d "$W_FONTSDIR_UNIX" -L -F 'CONSTAN*.TTF' "$W_TMP"/ppviewer.cab
     w_register_font constan.ttf "Constantia"
@@ -9616,7 +9578,7 @@ w_metadata consolas fonts \
 load_consolas()
 {
     # https://www.microsoft.com/en-us/download/details.aspx?id=13
-    w_download https://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe ab48a8ebac88219c84f293c6c1e81f1a0f420da6
+    w_download https://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe 249473568eba7a1e4f95498acba594e0f42e6581add4dead70c1dfb908a09423
     w_try_cabextract -d "$W_TMP" -L -F ppviewer.cab "$W_CACHE"/consolas/PowerPointViewer.exe
     w_try_cabextract -d "$W_FONTSDIR_UNIX" -L -F 'CONSOL*.TTF' "$W_TMP"/ppviewer.cab
     w_register_font consola.ttf "Consoleas"
@@ -9762,7 +9724,7 @@ w_metadata eufonts fonts \
 load_eufonts()
 {
     # https://www.microsoft.com/en-us/download/details.aspx?id=16083
-    w_download https://download.microsoft.com/download/a/1/8/a180e21e-9c2b-4b54-9c32-bf7fd7429970/EUupdate.EXE 9b076c40cb63aa0d8512aa8e610ba11d3466e441
+    w_download https://download.microsoft.com/download/a/1/8/a180e21e-9c2b-4b54-9c32-bf7fd7429970/EUupdate.EXE 464dd2cd5f09f489f9ac86ea7790b7b8548fc4e46d9f889b68d2cdce47e09ea8
     w_try_cabextract -q --directory="$W_TMP" "$W_CACHE"/eufonts/EUupdate.EXE
     w_try cp -f "$W_TMP"/*.ttf "$W_FONTSDIR_UNIX"
 
@@ -9903,33 +9865,12 @@ w_metadata fontfix settings \
 
 load_fontfix()
 {
-    # Some versions of ukai.ttf and uming.ttf crash .NET and Picasa
-    # See https://bugs.winehq.org/show_bug.cgi?id=7098#c9
-    # Very unlikely to still be around, so downgrade to fatal warning
-    if test -f /usr/share/fonts/truetype/arphic/ukai.ttf
-    then
-        w_get_sha1sum /usr/share/fonts/truetype/arphic/ukai.ttf
-        if [ "$_W_gotsha1sum"x = "96e1121f89953e5169d3e2e7811569148f573985"x ]
-        then
-            w_die "Your installed ukai.ttf is known to be broken. Upgrade your ttf-arphic font package!"
-        fi
-    fi
-
-    if test -f /usr/share/fonts/truetype/arphic/uming.ttf
-    then
-        w_get_sha1sum /usr/share/fonts/truetype/arphic/uming.ttf
-        if [ "$_W_gotsha1sum"x = "2a4f4a69e343c21c24d044b2cb19fd4f0decc82c"x ]
-        then
-            w_die "Your installed uming.ttf is known to be broken. Upgrade your ttf-uming font package!"
-        fi
-    fi
-
     # Focht says Samyak is bad news, and font substitution isn't a good workaround.
     # I've seen psdkwin7 setup crash because of this; the symptom was a messagebox saying
     # SDKSetup encountered an error: The type initializer for 'Microsoft.WizardFramework.WizardSettings' threw an exception
     # and WINEDEBUG=+relay,+seh shows an exception very quickly after
     # Call KERNEL32.CreateFileW(0c83b36c L"Z:\\USR\\SHARE\\FONTS\\TRUETYPE\\TTF-ORIYA-FONTS\\SAMYAK-ORIYA.TTF",80000000,00000001,00000000,00000003,00000080,00000000) ret=70d44091
-    if xlsfonts 2>/dev/null | egrep -i "samyak.*oriya"
+    if xlsfonts 2>/dev/null | grep -E -i "samyak.*oriya"
     then
         w_die "Please uninstall the Samyak/Oriya font, e.g. 'sudo dpkg -r ttf-oriya-fonts', then log out and log in again.  That font causes strange crashes in .net programs."
     fi
@@ -9948,7 +9889,7 @@ w_metadata ipamona fonts \
 
 load_ipamona()
 {
-    w_download "http://www.geocities.jp/ipa_mona/$file1" 57dd13ab58c0005d3ee2932539e4987ab0242bc7
+    w_download "http://www.geocities.jp/ipa_mona/$file1" ab77beea3b051abf606cd8cd3badf6cb24141ef145c60f508fcfef1e3852bb9d
 
     w_try_cd "$W_TMP"
 
@@ -10016,7 +9957,7 @@ w_metadata lucida fonts \
 
 load_lucida()
 {
-    w_download ftp://ftp.fu-berlin.de/pc/security/ms-patches/winnt/usa/NT40TSE/hotfixes-postSP3/Euro-fix/eurofixi.exe 64c47ad92265f6f10b0fd909a703d4fd1b05b2d5
+    w_download ftp://ftp.fu-berlin.de/pc/security/ms-patches/winnt/usa/NT40TSE/hotfixes-postSP3/Euro-fix/eurofixi.exe 41f272a33521f6e15f2cce9ff1e049f2badd5ff0dc327fc81b60825766d5b6c7
     w_try_cabextract -d "$W_FONTSDIR_UNIX" -L -F 'lucon.ttf' "$W_CACHE"/lucida/eurofixi.exe
     w_register_font lucon.ttf "Lucida Console"
 }
@@ -10059,7 +10000,7 @@ load_tahoma()
 {
     # The tahoma and tahomabd fonts are needed by e.g. Steam
 
-    w_download http://download.microsoft.com/download/office97pro/fonts/1/w95/en-us/tahoma32.exe 888ce7b7ab5fd41f9802f3a65fd0622eb651a068
+    w_download https://download.microsoft.com/download/office97pro/fonts/1/w95/en-us/tahoma32.exe 57496fb91d1629d2b6f313aaa6ebcdbcfd09c269b6462fe490420c786c089a40
     w_try_cabextract --directory="$W_TMP" "$W_CACHE"/tahoma/tahoma32.exe
     w_try cp -f "$W_TMP"/Tahoma.TTF "$W_FONTSDIR_UNIX"/tahoma.ttf
     w_try cp -f "$W_TMP"/Tahomabd.TTF "$W_FONTSDIR_UNIX"/tahomabd.ttf
@@ -10086,7 +10027,7 @@ load_takao()
 {
     # The Takao font provides Japanese glyphs.  May also be needed with fakejapanese function above.
     # See https://launchpad.net/takao-fonts for project page
-    w_download https://launchpad.net/takao-fonts/trunk/003.02.01/+download/takao-fonts-ttf-003.02.01.zip 4f636d5c7c1bc16b96ea723adb16838cfb6df059
+    w_download https://launchpad.net/takao-fonts/trunk/003.02.01/+download/takao-fonts-ttf-003.02.01.zip 2f526a16c7931958f560697d494d8304949b3ce0aef246fb0c727fbbcc39089e
     cp -f "$W_CACHE"/takao/takao-fonts-ttf-003.02.01.zip "$W_TMP"
     w_try_unzip "$W_TMP" "$W_TMP"/takao-fonts-ttf-003.02.01.zip
     w_try cp -f "$W_TMP"/takao-fonts-ttf-003.02.01/*.ttf "$W_FONTSDIR_UNIX"
@@ -10112,7 +10053,7 @@ w_metadata uff fonts \
 
 load_uff()
 {
-    w_download http://font.ubuntu.com/download/ubuntu-font-family-0.70.1.zip efbab0d5d8cb5cff091307d2360dcb1bfe1ae6e1
+    w_download http://font.ubuntu.com/download/ubuntu-font-family-0.70.1.zip c3737665b85e48664feabb8448957bdf17eab26cc320270f1641d9f98b7ea22e
     w_try_cd "$W_TMP"
     w_try_unzip . "$W_CACHE"/uff/ubuntu-font-family-0.70.1.zip
     mv ubuntu-font-family-0.70.1/*.ttf "$W_FONTSDIR_UNIX"
@@ -10158,7 +10099,7 @@ load_unifont()
 {
     # The GNU Unifont provides glyphs for just about everything in common language.  It is intended for multilingual usage.
     # See http://unifoundry.com/unifont.html for project page
-    w_download http://unifoundry.com/unifont-5.1.20080907.zip bb8a3960dc0a96aa305de28312ea8a0ab64123d2
+    w_download http://unifoundry.com/unifont-5.1.20080907.zip 6ec1176f83769072b09de2bc1fff68ec5d802183304756a372e2419236f5b5ba
     cp -f "$W_CACHE"/unifont/unifont-5.1.20080907.zip "$W_TMP"
     w_try_unzip "$W_TMP" "$W_TMP"/unifont-5.1.20080907.zip
     w_try cp -f "$W_TMP"/unifont-5.1.20080907.ttf "$W_FONTSDIR_UNIX/unifont.ttf"
@@ -10197,15 +10138,15 @@ w_metadata 3m_library apps \
     publisher="3M Company" \
     year="2015" \
     media="download" \
-    file1="3M-TM-Cloud-Library-PC-App-LIVE-Installer-1.51.735677.exe" \
-    installed_exe1="$W_PROGRAMS_X86_WIN/3M(TM) Cloud Library PC App/3MCloudLibrary.exe" \
-    homepage="https://www.3m.com/us/library/eBook/index.html"
+    file1="cloudLibrary-2.1.1702011951-Setup.exe" \
+    installed_exe1="$W_PROGRAMS_X86_WIN/cloudLibrary/cloudLibrary.exe" \
+    homepage="http://www.yourcloudlibrary.com/index.php/en-us/"
 
 load_3m_library()
 {
-    w_download https://www.3m.com/us/library/eBook/docs/3M-TM-Cloud-Library-PC-App-LIVE-Installer-1.51.735677.exe 810dc5f6b74ab7b34893288ee44ef7dc563a4ee7
+    w_download http://download.yourcloudlibrary.com/apps/pc/cloudLibrary-2.1.1702011951-Setup.exe bb3d854cc525c065e7298423bf0019309f4b65497c1d8bc6af09460cd6fcb57f
     w_try_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_try "$WINE" "${file1}" $W_UNATTENDED_SLASH_S
 }
 
 #----------------------------------------------------------------
@@ -10299,70 +10240,6 @@ load_adobe_diged4()
 
 #----------------------------------------------------------------
 
-w_metadata audible apps \
-    title="Audible.com Manager / Player" \
-    publisher="Audible" \
-    year="2011" \
-    media="download" \
-    file1="ActiveSetupN.exe" \
-    installed_exe1="$W_PROGRAMS_X86_WIN/Audible/Bin/Manager.exe" \
-    homepage="http://www.audible.com"
-
-load_audible()
-{
-    w_download http://download.audible.com/AM50/ActiveSetupN.exe 49f501471912ccca442bcc1c8f2c69160579f712
-    w_try_cd "$W_CACHE/$W_PACKAGE"
-    # Use exact title match!
-    w_ahk_do "
-        SetWinDelay 500
-        SetTitleMatchMode, 3
-        Run, $file1
-        WinWait, AudibleManager Setup
-        ControlClick, Button3  ; accept
-        WinWait, AudibleManager Setup, Start by
-        ControlClick, Button6 ; OK
-        WinWaitClose
-        ; many windows come and go, quite a few of them starting with AudibleManager, so use exact match to get the real mccoy
-        WinWait, AudibleManager  ; the dang thing starts up
-        WinKill
-    "
-}
-
-#----------------------------------------------------------------
-
-w_metadata audibledm apps \
-    title="Audible.com Download Manager" \
-    publisher="Audible" \
-    year="2011" \
-    media="download" \
-    file1="AudibleDM_iTunesSetup.exe" \
-    installed_exe1="$W_PROGRAMS_X86_WIN/Audible/Bin/AudibleDownloadHelper.exe" \
-    homepage="http://www.audible.com"
-
-load_audibledm()
-{
-    w_download http://download.audible.com/AM50/AudibleDM_iTunesSetup.exe 03261d77a59ebbceedf6683b5301c162bc0c7788
-    w_try_cd "$W_CACHE/$W_PACKAGE"
-    w_ahk_do "
-        SetWinDelay 500
-        SetTitleMatchMode, 2
-        Run, AudibleDM_iTunesSetup.exe
-        WinWait, Audible Download Manager Setup
-        ControlClick, Button2  ; accept
-        WinWait, Audible Download Manager Setup, Choose where
-        ControlClick, Button1 ; OK
-        WinWait, Audible Download Manager Setup, Manage
-        ControlClick, Button1 ; OK
-        WinWait, Audible Download Manager Setup, success
-        ControlClick, Button1 ; OK
-        WinWaitClose
-        WinWait, Audible Download Manager  ; the dang thing starts up
-        WinKill
-    "
-}
-
-#----------------------------------------------------------------
-
 w_metadata autohotkey apps \
     title="AutoHotKey" \
     publisher="autohotkey.org" \
@@ -10456,7 +10333,7 @@ w_metadata controlspy apps \
 
 load_controlspy()
 {
-    w_download http://download.microsoft.com/download/a/3/1/a315b133-03a8-4845-b428-ec585369b285/ControlSpy.msi d9127634dd47580be93c768263ddf37a3a75fd65a545e87ddb9602906a035845
+    w_download https://download.microsoft.com/download/a/3/1/a315b133-03a8-4845-b428-ec585369b285/ControlSpy.msi d9127634dd47580be93c768263ddf37a3a75fd65a545e87ddb9602906a035845
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" msiexec /i ControlSpy.msi ${W_UNATTENDED_SLASH_QB}
 }
@@ -10536,8 +10413,7 @@ load_ev3()
 
     w_call dotnet40
 
-    # 2016-02-18: LMS-EV3-WIN32-ENUS-01-01-01-full-setup.exe 855c914d9a3cf0f4793a046872658fd661389671
-    # 2016-03-22: LMS-EV3-WIN32-ENUS-01-02-01-full-setup.exe c47341f08242f0f6f01996530e7c93bda2d666747ada60ab93fa773a55d40a19
+    # 2016/03/22: LMS-EV3-WIN32-ENUS-01-02-01-full-setup.exe c47341f08242f0f6f01996530e7c93bda2d666747ada60ab93fa773a55d40a19
 
     w_download http://esd.lego.com.edgesuite.net/digitaldelivery/mindstorms/6ecda7c2-1189-4816-b2dd-440e22d65814/public/LMS-EV3-WIN32-ENUS-01-02-01-full-setup.exe c47341f08242f0f6f01996530e7c93bda2d666747ada60ab93fa773a55d40a19
 
@@ -10601,16 +10477,18 @@ load_fontxplorer()
 #----------------------------------------------------------------
 
 w_metadata foobar2000 apps \
-    title="foobar2000 v1.3.12" \
+    title="foobar2000 v1.3.14" \
     publisher="Peter Pawlowski" \
-    year="2014" \
+    year="2016" \
     media="manual_download" \
-    file1="foobar2000_v1.3.12.exe" \
+    file1="foobar2000_v1.3.14.exe" \
     installed_exe1="$W_PROGRAMS_X86_WIN/foobar2000/foobar2000.exe"
 
 load_foobar2000()
 {
-    w_download_manual https://www.foobar2000.org/download foobar2000_v1.3.12.exe 9ea5c70f662c8bf3db6f02dbb20109fd05580f6c
+    # 2016/12/21: 1.3.14 - 72d024d258c2f3b6cea62dc47fb613848202e7f33f2331f6b2e0a8e61daffcb6
+
+    w_download_manual https://www.foobar2000.org/download foobar2000_v1.3.14.exe 72d024d258c2f3b6cea62dc47fb613848202e7f33f2331f6b2e0a8e61daffcb6
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" "$file1" $W_UNATTENDED_SLASH_S
 }
@@ -11096,7 +10974,7 @@ load_mspaint()
     then
         w_call mfc42
     fi
-    w_download http://download.microsoft.com/download/0/A/4/0A40DF5C-2BAE-4C63-802A-84C33B34AC98/WindowsXP-KB978706-x86-ENU.exe 93ed34ab6c0d01a323ce10992d1c1ca27d1996fef82f0864d83e7f5ac6f9b24b
+    w_download https://download.microsoft.com/download/0/A/4/0A40DF5C-2BAE-4C63-802A-84C33B34AC98/WindowsXP-KB978706-x86-ENU.exe 93ed34ab6c0d01a323ce10992d1c1ca27d1996fef82f0864d83e7f5ac6f9b24b
     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
 }
@@ -11151,7 +11029,7 @@ w_metadata nook apps \
 load_nook()
 {
     # Dates from curl --head
-    # 7 Mar 2012 sha256sum 436616d99f0e2351909ab53d910b505c7a3fca248876ebb835fd7bce4aad9720
+    # 2012/03/07: sha256sum 436616d99f0e2351909ab53d910b505c7a3fca248876ebb835fd7bce4aad9720
     w_download http://images.barnesandnoble.com/PResources/download/eReader2/bndr2_setup_latest.exe 436616d99f0e2351909ab53d910b505c7a3fca248876ebb835fd7bce4aad9720
     w_try_cd "$W_CACHE/$W_PACKAGE"
 
@@ -11301,11 +11179,9 @@ w_metadata picasa39 apps \
 
 load_picasa39()
 {
-    # 2015/01/17: 39b2df46dbc423e250371e826026a2827f55b956
-    # 2015/09/21: 55907fc84b1d9d6a450463869b16927f07737298
-    # 2016/01/02: b3f7e2ee168811cb1d924eb34afe2b0d8153f89f
+    # 2016/01/02: 482c1a547d8d3aa25ee446d30ea986de63ef8c8d68b8d1109dd3d9b714e73e08
 
-    w_download https://dl.google.com/picasa/picasa39-setup.exe b3f7e2ee168811cb1d924eb34afe2b0d8153f89f
+    w_download https://dl.google.com/picasa/picasa39-setup.exe 482c1a547d8d3aa25ee446d30ea986de63ef8c8d68b8d1109dd3d9b714e73e08
     if w_workaround_wine_bug 29434 "Picasa 3.9 fails to authenticate with Google"
     then
         w_warn "Picasa 3.9 authentication to the Google account is currently broken under wine. See https://bugs.winehq.org/show_bug.cgi?id=29434 for more details."
@@ -11345,18 +11221,19 @@ load_picasa39()
 w_metadata protectionid apps \
     title="Protection ID" \
     publisher="CDKiLLER & TippeX" \
-    year="2015" \
-    media="download" \
-    file1="ProtectionId.670.halloween.2015.rar" \
+    year="2016" \
+    media="manual_download" \
+    file1="ProtectionId.685.December.2016.rar" \
     installed_file1="$W_SYSTEM32_DLLS_WIN/protection_id.exe"
 
 load_protectionid()
 {
-    w_download https://pid.gamecopyworld.com/dl.php?f=ProtectionId.670.halloween.2015.rar a307e15f28d00959cffddd8fda073aac6df943c8 "$file1"
+    w_download_manual "http://pid.gamecopyworld.com/" ProtectionId.685.December.2016.rar 27a84d740c9fb96cc866438a2b5cd4afc350affc8b7a0122c28c651af3559aea
     w_try_cd "$W_SYSTEM32_DLLS"
     w_try_unrar "${W_CACHE}/${W_PACKAGE}/${file1}"
-    # ProtectionId.670.halloween.2015 has a different executable name than usual, this may need to be disabled on next update:
-    mv Protection_ID.eXe protection_id.exe
+
+    # ProtectionId.685.December.2016 has a different executable name than usual, this may need to be disabled on next update:
+    w_try mv Protection_ID.eXe protection_id.exe
 }
 
 #----------------------------------------------------------------
@@ -11371,10 +11248,15 @@ w_metadata psdk2003 apps \
 
 load_psdk2003()
 {
+    if [ $W_ARCH = win64 ]
+    then
+        w_die "Installer doesn't support 64-bit architecture."
+    fi
+
     w_call mfc42
 
     # https://www.microsoft.com/en-us/download/details.aspx?id=15656
-    w_download https://download.microsoft.com/download/7/5/e/75ec7f04-4c8c-4f38-b582-966e76602643/5.2.3790.1830.15.PlatformSDK_Svr2003SP1_rtm.img
+    w_download https://download.microsoft.com/download/7/5/e/75ec7f04-4c8c-4f38-b582-966e76602643/5.2.3790.1830.15.PlatformSDK_Svr2003SP1_rtm.img 7ef138b07a8ed2e008371d8602900eb68e86ac2a832d16b53f462a9e64f24d53
 
     # Unpack ISO (how handy that 7z can do this!)
     # Only the windows version of 7z can handle .img files?
@@ -11385,7 +11267,7 @@ load_psdk2003()
     w_try_cd "$W_TMP/Setup"
 
     # Sanity check...
-    w_verify_sha1sum 6376ab5394226f426366d0646bf244d26156697b  PSDK-x86.msi
+    w_verify_sha256sum d2605ae6f35a7fcc209e1d8dfbdfdb42afcb61e7d173f58fd608ae31db4ab1e7 PSDK-x86.msi
 
     w_try "$WINE" msiexec /i PSDK-x86.msi ${W_UNATTENDED_SLASH_QB}
 }
@@ -11453,7 +11335,7 @@ load_psdkwin71()
     w_call dotnet40
     w_call mfc42   # need mfc42u, or setup will abort
     # https://www.microsoft.com/en-us/download/details.aspx?id=3138
-    w_download https://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/winsdk_web.exe a8717ebb20a69c7efa85232bcb9899b8b07f98cf
+    w_download https://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/winsdk_web.exe 9ea8d82a66a33946e8673df92d784971b35b8f65ade3e0325855be8490e3d51d
 
     if w_workaround_wine_bug 21596
     then
@@ -11615,14 +11497,7 @@ w_metadata steam apps \
 
 load_steam()
 {
-    # 18 Mar 2011 7f2fee9ffeaba8424a6c76d6c95b794735ac9959
-    # 29 Nov 2012 fa053c268b6285741d1a1392c25f92c5cb2a6ffb
-    # 17 Mar 2014 b2a3fdbe4a662f3bf751f5b8bfc61f8d35e050fe
-    # 11 Dec 2014 7ad8fbeffa6c963b821f80129c15c9d8e85f9a4a
-    #  6 Jan 2015 e04aefe8bc894f11f211edec8e8a008abe0147d2
-    # 21 Jun 2015 0e8046d40c38d817338135ec73a5b217cc340cf5
-    # 29 Dec 2015 728e3c82fd57c68cbbdb64965719081ffee6272c
-    # 28 Oct 2016 029f918a29b2b311711788e8a477c8de529c11d7dba3caf99cbbde5a983efdad
+    # 2016/10/28: 029f918a29b2b311711788e8a477c8de529c11d7dba3caf99cbbde5a983efdad
     w_download http://media.steampowered.com/client/installer/SteamSetup.exe 029f918a29b2b311711788e8a477c8de529c11d7dba3caf99cbbde5a983efdad
     w_try_cd "$W_CACHE/$W_PACKAGE"
 
@@ -11701,16 +11576,8 @@ w_metadata utorrent apps \
 load_utorrent()
 {
     # BitTorrent client supported on Windows, OS X, Linux through Wine
-    # Oct 2010 2.0.4 sha1sum 8382b8a7bc625d68b6efe18a7b9e5488dc0119ee
-    # Nov 6 2010 2.0.4 sha1sum 263a91693d0976473cd321cd6f1b0103a814f3ad
-    # Dev 17 2010 2.2 sha1sum 0c95bdfba07421fe706b30ee2ec6779217c5dce4, hangs, see Wine bug 24946
-    # Feb 11 2011 2.2.1beta sha1sum 82e81e1484b4e8654b83908509f3777532c6fcb3
-    # Mar 28 2011 2.2.1 sha1sum 7049109e4d3f72338d54b42ae37ecf38fafed46f
-    # Apr 14 2011 2.2.1 sha1sum b1378d7cbe5d1e1b168ce44def8f59facdc046d5
-    # 7 May 2011        sha1sum 2932c9ed1c1225e485f7e3dd2ed267aa7d568c80
-    # 14 May 2011 removed checksum, updates too quickly to track :-(
-    # 7 Mar 2012 sha1sum c6d9a80c02898139b17194d10293f17ecef054cb
-    w_download_manual "https://www.oldapps.com/utorrent.php?old_utorrent=38" utorrent_2.2.1.exe c6d9a80c02898139b17194d10293f17ecef054cb
+    # 2012/03/07: sha1sum ec2c086ff784b06e4ff05243164ddb768b81ee32096afed6d5e574ff350b619e
+    w_download_manual "https://www.oldapps.com/utorrent.php?old_utorrent=38" utorrent_2.2.1.exe ec2c086ff784b06e4ff05243164ddb768b81ee32096afed6d5e574ff350b619e
 
     w_try cp -f "$W_CACHE/utorrent/$file1" "$W_WINDIR_UNIX"/utorrent.exe
 }
@@ -11718,7 +11585,7 @@ load_utorrent()
 #----------------------------------------------------------------
 
 w_metadata utorrent3 apps \
-    title="µTorrent 3.1" \
+    title="µTorrent 3.4" \
     publisher="BitTorrent" \
     year="2011" \
     media="download" \
@@ -11727,13 +11594,8 @@ w_metadata utorrent3 apps \
 
 load_utorrent3()
 {
-    # 15 Apr 2011: sha1sum a5f198207919e8f2091a9b4459d7d6fc8a63e874
-    # 27 Apr 2011: sha1sum d969f0c61cf2b2afaea4121f097ef690dffbf771
-    # 7 May 2011: sha1sum 1793a7b15d905a9fa82f9a969a96fa53abaac04c
-    # 14 May: removed checksum, changes too often to track
-    # 7 Mar 2012: sha1sum 73ba69b5d0004239a709af5db57c88c9d9c8f7b2
-    # 28 Jun 2013: sha1sum d2408c8a09a2bd9704af39f818ec7ac9e9cca46e
-    w_download https://download-new.utorrent.com/endpoint/utorrent/os/windows/track/stable/ d2408c8a09a2bd9704af39f818ec7ac9e9cca46e uTorrent.exe
+    # 2017/03/26: sha256sum 482cfc0759f484ad4e6547cc160ef3f08057cb05969242efd75a51525ab9bd92
+    w_download https://download-new.utorrent.com/endpoint/utorrent/os/windows/track/stable/ 482cfc0759f484ad4e6547cc160ef3f08057cb05969242efd75a51525ab9bd92 uTorrent.exe
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
     # If you don't use /PERFORMINSTALL, it just runs µTorrent
@@ -11743,8 +11605,8 @@ load_utorrent3()
     # dang installer exits with status 1 on success
     status=$?
     case $status in
-    0|1) ;;
-    *) w_die "Note: utorrent installer returned status '$status'.  Aborting." ;;
+        0|1) ;;
+        *) w_die "Note: utorrent installer returned status '$status'.  Aborting." ;;
     esac
 }
 
@@ -11960,7 +11822,6 @@ w_metadata winamp apps \
 load_winamp()
 {
     w_info "may send information while installing, see https://www.microsoft.com/security/portal/Threat/Encyclopedia/Entry.aspx?threatid=159633"
-    # 2014 winamp5621_full_emusic-7plus_en-us.exe afc172039db52fdc202114bec7bcf8b5bf2468bb
 
     w_download https://winampplugins.co.uk/Winamp/winamp5666_full_all_redux.exe ea9a6ba81475d49876d0b8b300d93f28f7959b8e99ce4372dbde746567e14002
     w_try_cd "$W_CACHE/$W_PACKAGE"
@@ -12022,8 +11883,8 @@ load_wme9()
     then
         w_die "Installer doesn't support 64-bit architecture."
     fi
-    # 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 19d1610d12b51c969f64703c4d3a76aae30dee526bae715381b5f3369f717d76
+    # See also https://www.microsoft.com/en-us/download/details.aspx?id=17792
+    w_download https://download.microsoft.com/download/8/1/f/81f9402f-efdd-439d-b2a4-089563199d47/WMEncoder.exe 19d1610d12b51c969f64703c4d3a76aae30dee526bae715381b5f3369f717d76
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" WMEncoder.exe $W_UNATTENDED_SLASH_Q
@@ -12148,7 +12009,7 @@ load_3dmark2000()
     # https://www.futuremark.com/download/3dmark2000/
     if ! test -f "$W_CACHE/$W_PACKAGE/3dmark2000_v11_100308.exe"
     then
-        w_download http://www.ocinside.de/download/3dmark2000_v11_100308.exe b0400d59cfd45d8c8893d3d4edc58b6285ee1502
+        w_download http://www.ocinside.de/download/3dmark2000_v11_100308.exe 1b392776fd377de8cc6db7c1d8b1565485e20816d1b053de3f16a743e629048d
     fi
 
     w_try_unzip "$W_TMP/$W_PACKAGE" "$W_CACHE/$W_PACKAGE"/3dmark2000_v11_100308.exe
@@ -12200,7 +12061,7 @@ load_3dmark2001()
     # https://www.futuremark.com/download/3dmark2001/
     if ! test -f "$W_CACHE/$W_PACKAGE"/3dmark2001se_330_100308.exe
     then
-        w_download http://www.ocinside.de/download/3dmark2001se_330_100308.exe 643bacbcc1615bb4f46d3b045b1b8d78371a6b54
+        w_download http://www.ocinside.de/download/3dmark2001se_330_100308.exe e34dfd32ef8fe8018a6f41f33fc3ab6dba45f2e90881688ac75a18b97dcd8813
     fi
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
@@ -12245,7 +12106,7 @@ load_3dmark03()
     # http://www.futuremark.com/benchmarks/3dmark03/download/
     if ! test -f "$W_CACHE/$W_PACKAGE/3DMark03_v360_1901.exe"
     then
-        w_download_manual https://www.futuremark.com/download/3dmark03/ 3DMark03_v360_1901.exe 46a439101ddbbe3c9563b5e9651cb61b46ce0619
+        w_download_manual https://www.futuremark.com/download/3dmark03/ 3DMark03_v360_1901.exe 86d7f73747944c553e47e6ab5a74138e8bbca07fab8216ae70a61ac7f9a1c468
     fi
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
@@ -12304,7 +12165,7 @@ load_3dmark05()
     # https://www.futuremark.com/download/3dmark05/
     if ! test -f "$W_CACHE/$W_PACKAGE/3DMark05_v130_1901.exe"
     then
-        w_download http://www.ocinside.de/download/3dmark05_v130_1901.exe 8ad6bc2917e22edf5fc95d1fa96cc82515093fb2
+        w_download http://www.ocinside.de/download/3dmark05_v130_1901.exe af97f20665090985ee8a4ba83d137e796bfe12e0dfb7fe285712fae198b34334
     fi
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
@@ -12348,7 +12209,7 @@ w_metadata 3dmark06 benchmarks \
 
 load_3dmark06()
 {
-    w_download_manual https://www.futuremark.com/support/downloads 3DMark06_v121_installer.exe a125a4b0a5649f848292f38cf424c672d8142058
+    w_download_manual https://www.futuremark.com/support/downloads 3DMark06_v121_installer.exe 362ebafd2b9c89a59a233e4328596438b74a32827feb65fe2837154c60a37da3
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
@@ -12400,8 +12261,7 @@ w_metadata unigine_heaven benchmarks \
 
 load_unigine_heaven()
 {
-    # FIXME: use w_download_torrent()
-    w_download_manual http://unigine.com/download/torrents/Unigine_Heaven-2.1.msi.torrent Unigine_Heaven-2.1.msi 3d7b94a3734cdae85f98032b61668e743979c444
+    w_download_manual "https://www.fileplanet.com/212489/210000/fileinfo/Unigine-'Heaven'-Benchmark-2.1-%28Windows%29" 47113b285253a1ebce04527a31d734c0dfce5724e8d2643c6c1b822a940e7073
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
@@ -12449,7 +12309,7 @@ w_metadata algodoo_demo games \
 
 load_algodoo_demo()
 {
-    w_download http://www.algodoo.com/download/Algodoo_1_7_1-Win32.exe caa73e73669a8787652a6bed123bbe2682152f12
+    w_download http://www.algodoo.com/download/Algodoo_1_7_1-Win32.exe 99d3704ac35028fbc74fdf7c59df3f6caf636009bba19bcddf4f7e7797c14d71
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
@@ -12497,7 +12357,7 @@ w_metadata amnesia_tdd_demo games \
 
 load_amnesia_tdd_demo()
 {
-    w_download_manual "https://www.amnesiagame.com/#demo" amnesia_tdd_demo_1.0.1.exe 0bf0bc6e9c8ea76f1c44582d9302a9b22d31d1b6
+    w_download_manual http://download.cnet.com/Amnesia-The-Dark-Descent-Demo/3000-2097_4-75312743.html amnesia_tdd_demo_1.0.1.exe ee4c07b40bfa59b506d2cee258c5c7a16028e11fc3a2bd243258c6bec8532dbc
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
 
@@ -12542,7 +12402,7 @@ w_metadata aoe3_demo games \
 load_aoe3_demo()
 {
 
-    w_download "http://download.microsoft.com/download/a/5/2/a525997e-8423-435b-b694-08118d235064/aoe3trial.exe" 2b0a123243092d79f910db5691d99d469f7c17c3
+    w_download http://http.download.nvidia.com/downloads/nZone/demos/aoe3trial.exe 4ef69289dfa0817ec14942d85ef597835a9d2b09e1506c60b9938b20daa274ad
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
 
@@ -12580,42 +12440,6 @@ load_aoe3_demo()
 
 #----------------------------------------------------------------
 
-w_metadata aoe_demo games \
-    title="Age of Empires Demo" \
-    publisher="Microsoft" \
-    year="1997" \
-    media="download" \
-    file1="MSAoE.exe" \
-    installed_exe1="$W_PROGRAMS_X86_WIN/Microsoft Games/Age of Empires Trial/empires.exe"
-
-load_aoe_demo()
-{
-    w_download http://download.microsoft.com/download/aoe/Trial/1.0/WIN98/EN-US/MSAoE.exe 23630a65ce4133038107f3175f8fc54a914bc2f3
-
-    w_try_cd "$W_CACHE/$W_PACKAGE"
-    w_ahk_do "
-        run, MSAoE.exe
-        SetTitleMatchMode, 2
-        winwait, Microsoft Age of Empires Trial Version
-        if ( w_opt_unattended > 0 ) {
-            sleep 1000
-            ControlClick, Button1
-            winwait, End User License Agreement
-            sleep 1000
-            ControlClick, Button1
-            winwait, Microsoft Age of Empires Trial Version, Setup will install
-            sleep 1000
-            ControlClick Button2
-            winwait, Microsoft Age of Empires Trial Version, Setup has successfully
-            sleep 1000
-            ControlClick Button1
-        }
-        WinWaitClose, Microsoft Age of Empires Trial Version
-    "
-}
-
-#----------------------------------------------------------------
-
 w_metadata acreedbro games \
     title="Assassin's Creed Brotherhood" \
     publisher="Ubisoft" \
@@ -12656,12 +12480,12 @@ load_acreedbro()
         WinWaitClose
     "
 
-    w_download http://static3.cdn.ubi.com/ac_brotherhood/ac_brotherhood_1.01_ww.exe a2b76f16616709cc16537b0e98faa4181ca904ce
+    w_download http://static3.cdn.ubi.com/ac_brotherhood/ac_brotherhood_1.01_ww.exe a8027b08840a7438a0bd1a1c17f962fcc386a2cb9fd1d3055de2486bf95778c2
 
     # FIXME: figure out why these executables don't exit, and do a proper workaround or fix
     sleep 10
     # shellcheck disable=SC2009
-    if ps augxw | grep -i exe | egrep 'winemenubuilder.exe|setup.exe|PnkBstrA.exe | egrep -v egrep'
+    if ps augxw | grep -i exe | grep -E 'winemenubuilder.exe|setup.exe|PnkBstrA.exe | grep -v grep'
     then
         w_warn "Killing processes so patcher does not complain about game still running"
         $WINESERVER -k
@@ -12707,7 +12531,8 @@ w_metadata atmosphir games \
 
 load_atmosphir()
 {
-    w_download_manual http://download.cnet.com/Atmosphir/3000-7492_4-75335647.html "Atmosphir Installer v1.0.0 fixed.exe" 3ee46b45ea9a8e4a8888148556efb7e61882f7d0
+    w_download_manual http://download.cnet.com/Atmosphir/3000-7492_4-75335647.html atmosphir-installer-v1.0.2.exe a6b2c82a98d750014874f8ab445b38ebb127450e5a7a9350832cf3a8d3a
+
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
         run Atmosphir Installer v1.0.0 fixed.exe
@@ -12755,7 +12580,7 @@ w_metadata avatar_demo games \
 
 load_avatar_demo()
 {
-    w_download_manual https://www.fileplanet.com/207386/200000/fileinfo/Avatar:-The-Game-Demo Avatar_The_Game_Demo.exe 8d8e4c82312962706bd2620406d592db4f0fa9c1
+    w_download_manual https://www.fileplanet.com/207386/200000/fileinfo/Avatar:-The-Game-Demo Avatar_The_Game_Demo.exe aec9cf718f9584edc23044ff94996d4e7309654d50fcea91cba4282576a1e9c8
 
     if w_workaround_wine_bug 23094 "Installing Visual C++ 2005 runtime to avoid installer crash"
     then
@@ -12815,7 +12640,7 @@ w_metadata bttf101 games \
 
 load_bttf101()
 {
-    w_download_manual http://www.telltalegames.com/bttf bttf_101_setup.exe 9b15e26d9b4d454f714d6559efe509562df9c10b
+    w_download_manual "https://www.fileplanet.com/220151/220000/fileinfo/Back-to-the-Future:-The-Game---Episode-1-Client-%28Free-Game%29" bttf_101_setup.exe 8ad05063c5dae096697665ac36578f885937829ec7dac6a3a3644c76820e999c
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
@@ -12854,7 +12679,7 @@ w_metadata bioshock_demo games \
 
 load_bioshock_demo()
 {
-    w_download http://us.download.nvidia.com/downloads/nZone/demos/nzd_BioShockPC.zip 7a19186602cec5210e4505b58965e8c04945b3cf
+    w_download http://us.download.nvidia.com/downloads/nZone/demos/nzd_BioShockPC.zip 36f73251c0c1c6f4b6a83af9b6e44c642b4fce127c2c28cb6d2b25bc95baa934
 
     w_info "Unzipping demo, installer will start in about 30 seconds."
     w_try unzip "$W_CACHE/$W_PACKAGE/nzd_BioShockPC.zip" -d "$W_TMP/$W_PACKAGE"
@@ -13025,50 +12850,6 @@ load_bfbc2()
 
 #----------------------------------------------------------------
 
-w_metadata bladekitten_demo games \
-    title="Blade Kitten Demo" \
-    publisher="Krome Studios" \
-    year="2010" \
-    media="manual_download" \
-    file1="BladeKittenDemoInstall.exe" \
-    installed_exe1="$W_PROGRAMS_X86_WIN/Krome Studios/Blade Kitten Demo/BladeKitten_Demo.exe"
-
-load_bladekitten_demo()
-{
-    w_download_manual http://news.bigdownload.com/2010/09/23/download-blade-kitten-demo BladeKittenDemoInstall.exe d3568f94c1ce284b7381e457e9497065bd45001d
-
-    cp "$W_CACHE/$W_PACKAGE"/BladeKittenDemoInstall.exe "$W_TMP"
-    w_try_cd "$W_TMP"
-    w_ahk_do "
-        ; This script always gives full window title, so no need to set a different title match mode
-        run BladeKittenDemoInstall.exe
-        WinWait Blade Kitten Demo Install Package
-        if ( w_opt_unattended > 0 ) {
-            Sleep 500
-            ControlClick Button2 ;  Install
-            WinWait Blade Kitten Demo, Next
-            Sleep 500
-            ControlClick Button1
-            WinWait Blade Kitten Demo, Cost
-            Sleep 500
-            ControlClick Button1  ; Next
-            WinWait Blade Kitten Demo, ready
-            Sleep 500
-            ControlClick Button1 ;  Next
-            ; Note - in older versions of Wine, the DirectX installer may take 6-10 minutes at this point
-        }
-        WinWaitClose
-        WinWait Blade Kitten Demo, Complete
-        if ( w_opt_unattended > 0 ) {
-            Sleep 500
-            ControlClick Button1 ;  Close
-        }
-        WinWaitClose
-    "
-}
-
-#----------------------------------------------------------------
-
 w_metadata cnc_tiberian_sun games \
     title="Command & Conquer: Tiberian Sun (2010 edition)" \
     publisher="EA" \
@@ -13079,7 +12860,7 @@ w_metadata cnc_tiberian_sun games \
 
 load_cnc_tiberian_sun()
 {
-    w_download http://lvlt.bioware.cdn.ea.com/u/f/eagames/cnc3/cnc3tv/Classic/OfficialCnCTiberianSun.rar 591aabd639fb9f2d2476a2150f3c00b1162674f5
+    w_download http://download.fileplanet.com/ftp1/022010/OfficialCnCTiberianSun.rar b04219e715511de9baa2feb9827013c8e106f8d6b9b563936b8a2f650305dec5
 
     w_try_cd "$W_PROGRAMS_X86_UNIX"
     # FIXME: we need a progress indicator when unpacking large archives
@@ -13099,7 +12880,7 @@ w_metadata cnc3_demo games \
 
 load_cnc3_demo()
 {
-    w_download "http://largedownloads.ea.com/pub/demos/CommandandConquer3/CnC3Demo.exe" f6af21eba2d17eb6d8bb6a131b501b41c3a7eaf7
+    w_download "http://largedownloads.ea.com/pub/demos/CommandandConquer3/CnC3Demo.exe" 1e2499f441ef1fc3cbe447ac16361ad4247a02b9b8ec05f504161e7b5b1254e5
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
@@ -13142,7 +12923,7 @@ w_metadata cnc_redalert3_demo games \
 
 load_cnc_redalert3_demo()
 {
-    w_download_manual 'https://www.fileplanet.com/194888/190000/fileinfo/Command-&-Conquer:-Red-Alert-3-Demo' RedAlert3Demo.exe f909b87cc12e386a51be51ede708634348c8af48
+    w_download_manual 'https://www.fileplanet.com/194888/190000/fileinfo/Command-&-Conquer:-Red-Alert-3-Demo' RedAlert3Demo.exe 9c2fb15076830f0e11d89be1847f4777262d8e6ee3d51ae765535f812a8a8cb2
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
     if test ! "$W_OPT_UNATTENDED"
@@ -13179,6 +12960,7 @@ load_cnc_redalert3_demo()
 #----------------------------------------------------------------
 
 # https://appdb.winehq.org/objectManager.php?sClass=version&iId=9320
+
 w_metadata blobby_volley games \
     title="Blobby Volley" \
     publisher="Daniel Skoraszewsky" \
@@ -13189,7 +12971,7 @@ w_metadata blobby_volley games \
 
 load_blobby_volley()
 {
-    w_download_manual https://www.chip.de/downloads/Blobby-Volley_12990993.html blobby.zip c7057c77a5009a88d9d877e17a63b5536ebeb177
+    w_download_manual https://www.chip.de/downloads/Blobby-Volley_12990993.html blobby.zip ef7d2e61fabe5ac6a556fa7c254edc667df5a6659ea262ee2bc97ed61abc3f64
     w_try_unzip "$W_DRIVE_C/BlobbyVolley" "$W_CACHE/$W_PACKAGE"/blobby.zip
 }
 
@@ -13205,9 +12987,9 @@ w_metadata cim_demo games \
 
 load_cim_demo()
 {
-    # 29 Mar 2011 d40408b59bc0e6e33b564e9bbb55dbab6c44c630, Inno Setup installer
-    #w_download http://www.pcgamestore.com/games/cities-in-motion-nbsp/trial/cim-demo-1-0-8.exe d40408b59bc0e6e33b564e9bbb55dbab6c44c630
-    w_download_manual https://www.fileplanet.com/218762/210000/fileinfo/Cities-in-Motion-Demo cim-demo-1-0-8.exe d40408b59bc0e6e33b564e9bbb55dbab6c44c630
+    # 29 Mar 2011 cf02066f496637c24f95cf0c4ddfae376951330802500fb11bd74cc6c8872995, Inno Setup installer
+    #w_download http://www.pcgamestore.com/games/cities-in-motion-nbsp/trial/cim-demo-1-0-8.exe cf02066f496637c24f95cf0c4ddfae376951330802500fb11bd74cc6c8872995
+    w_download_manual https://www.fileplanet.com/218762/210000/fileinfo/Cities-in-Motion-Demo cim-demo-1-0-8.exe cf02066f496637c24f95cf0c4ddfae376951330802500fb11bd74cc6c8872995
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" cim-demo-1-0-8.exe ${W_OPT_UNATTENDED:+ /sp- /silent /norestart}
 }
@@ -13224,7 +13006,7 @@ w_metadata cod_demo games \
 
 load_cod_demo()
 {
-    w_download_manual http://www.gamefront.com/files/968870/call_of_duty_demo_exe Call_Of_Duty_Demo.exe 1c480a1e64a80f7f97fd0acd9582fe190c64ad8e
+    w_download_manual http://www.gamefront.com/files/968870/call_of_duty_demo_exe Call_Of_Duty_Demo.exe a7773f1ddb0c9928f738a2be34614d52bc07ecc42c0fe704ab5a596da5421b08
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
@@ -13366,7 +13148,8 @@ w_metadata cod4mw_demo games \
 
 load_cod4mw_demo()
 {
-    w_download http://download.cnet.com/Call-of-Duty-4-Modern-Warfare/3000-7441_4-11277584.html CoD4MWDemoSetup_v2.exe 690a5f789a44437ed10784acfdd6418ca4a21886
+    # 2017/03/28: Also at https://www.fileplanet.com/213663/210000/fileinfo/LEGO-Harry-Potter:-Years-1-4-Demo
+    w_download_manual http://download.cnet.com/Call-of-Duty-4-Modern-Warfare/3000-7441_4-11277584.html CoD4MWDemoSetup_v2.exe 715710678394e9b0edda5dd3a560c9711557297aa2849c83e5c109db9830fbbb
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
@@ -13469,45 +13252,6 @@ load_cod5_waw()
     w_warn "This game is copy-protected, and requires the real disc in a real drive to run."
 }
 
-#----------------------------------------------------------
-
-w_metadata cojbib_demo games \
-    title="Call of Juarez: Bound in Blood Demo" \
-    publisher="Ubisoft" \
-    year="2009" \
-    media="manual_download" \
-    file1="CoJ2PC_20090713_DEMO_16_buy_now_INSTALLER.exe" \
-    installed_exe1="$W_PROGRAMS_X86_WIN/Ubisoft/Demo/Techland/Call of Juarez - Bound in Blood SP Demo/CoJBiBDemo_x86.exe"
-
-load_cojbib_demo()
-{
-    w_download_manual http://www.gamefront.com/files/14274183/CoJ2PC-20090713-DEMO-16-buy-now-INSTALLER.exe/ CoJ2PC_20090713_DEMO_16_buy_now_INSTALLER.exe 6426101f6c77bacd57c8449b12a3c76db7f761f0
-
-    w_try_cd "$W_CACHE/$W_PACKAGE"
-    w_ahk_do "
-        SetTitleMatchMode 2
-        SetWinDelay 500
-        run CoJ2PC_20090713_DEMO_16_buy_now_INSTALLER.exe
-        winwait Setup, language
-        if ( w_opt_unattended > 0 ) {
-            controlclick button1 ; next
-            winwait Call of Juarez, Welcome
-            controlclick button1 ; next
-            winwait Call of Juarez, License
-            controlclick button2 ; yes
-            winwait Call of Juarez, Location
-            controlclick button1 ; next
-            winwait Call of Juarez, Start
-            controlclick button1 ; next
-        }
-        winwait Call of Juarez, Complete
-        if ( w_opt_unattended > 0 )
-            controlclick button2 ; next
-
-        winwaitclose Call of Juarez
-    "
-}
-
 #----------------------------------------------------------------
 
 w_metadata civ4_demo games \
@@ -13520,7 +13264,7 @@ w_metadata civ4_demo games \
 
 load_civ4_demo()
 {
-    w_download_manual http://download.cnet.com/Civilization-IV-demo/3000-7489_4-10465206.html Civilization4_Demo.zip b54f1e5d0a1c2d1ef456d0c20098c23bbb6a0ea7
+    w_download_manual http://download.cnet.com/Civilization-IV-demo/3000-7489_4-10465206.html Civilization4_Demo.zip aaafc7fcbf0fc16c9b28c2422400721a40818b867e9291268877c5d3841122a2
 
     w_try_unzip "$W_TMP" "$W_CACHE/$W_PACKAGE"/Civilization4_Demo.zip
     w_try_cd "$W_TMP/$W_PACKAGE"
@@ -13561,7 +13305,7 @@ w_metadata crayonphysics_demo games \
 
 load_crayonphysics_demo()
 {
-    w_download https://crayonphysicsdeluxe.s3.amazonaws.com/crayon_release52demo.exe 4ffd64c630f69e7cf024ef946c2c64c8c4ce4eac
+    w_download https://crayonphysicsdeluxe.s3.amazonaws.com/crayon_release52demo.exe 3c221f4c4283d89c180337071b5d3f8b88b68cea0558e6f72abcb34ef954b923
     # Inno Setup installer
     w_try "$WINE" "$W_CACHE/$W_PACKAGE/$file1" ${W_OPT_UNATTENDED:+ /sp- /silent /norestart}
 }
@@ -13641,7 +13385,7 @@ w_metadata csi6_demo games \
 
 load_csi6_demo()
 {
-    w_download_manual https://www.fileplanet.com/217175/download/CSI:-Fatal-Conspiracy-Demo CSI6_PC_Demo_05.exe 28473b4dc9760b659f24a397192b74d170b593bb
+    w_download_manual https://www.fileplanet.com/217175/download/CSI:-Fatal-Conspiracy-Demo CSI6_PC_Demo_05.exe dd80e8e2ad2716a49ae292da99c4d069e2193d64ee62ca2941ce93fd7ee3b015
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
@@ -14047,7 +13791,7 @@ w_metadata deusex2_demo games \
 
 load_deusex2_demo()
 {
-    w_download_manual "http://www.techpowerup.com/downloads/1730/Deus_Ex:_Invisible_War_Demo.html" dxiw_demo.zip ccae48fb046d912b3714ea1b4be4294e74bb3092
+    w_download_manual https://www.fileplanet.com/133479/130000/fileinfo/Deus-Ex:-INVISIBLE-WAR-Demo dxiw_demo.zip cd3804a03301afd582c9c9374a670944b8cc1470ad1c2e5f3cd602c60d70244f
 
     w_try unzip "$W_CACHE/$W_PACKAGE/dxiw_demo.zip" -d "$W_TMP"
     w_try_cd "$W_TMP"
@@ -14093,7 +13837,7 @@ w_metadata diablo2 games \
 
 load_diablo2()
 {
-    w_download http://ftp.blizzard.com/pub/diablo2/patches/PC/D2Patch_113c.exe c78761bfb06999a9788f25a23a1ed30260ffb8ab
+    w_download http://ftp.blizzard.com/pub/diablo2/patches/PC/D2Patch_113c.exe 3d7a488c2a76a12e5a21fc71ca313cf9440f67ded6f65dc6bc49e30f6f557672
 
     w_read_key
 
@@ -14162,9 +13906,8 @@ w_metadata digitanks_demo games \
 
 load_digitanks_demo()
 {
-    # 8 june 2011: f204b13dc64c1a54fb1aaf27187c6083ebb16acf
-    # 11 Nov 2011: e54ffb07232f434bcfaf7b3d43ddf9affa93ef15
-    w_download "http://static.digitanks.com/files/digitanks.exe" e54ffb07232f434bcfaf7b3d43ddf9affa93ef15
+    # 2011/11/11: bc98de67680e907a30ee1ab5d062e098c07a87292e3fb82ae62ad2d7175e94ff
+    w_download "http://static.digitanks.com/files/digitanks.exe" bc98de67680e907a30ee1ab5d062e098c07a87292e3fb82ae62ad2d7175e94ff
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_try "$WINE" "$file1" ${W_OPT_UNATTENDED:+ /S}
     if w_workaround_wine_bug 8060 "installing corefonts"
@@ -14183,7 +13926,7 @@ w_metadata dirt2_demo games \
 
 load_dirt2_demo()
 {
-    w_download_manual http://www.joystiq.com/game/dirt-2/download/dirt-2-demo/ Dirt2Demo.zip 13af1beb8c4f6300e4655045b66aea1f8a29f2b3
+    w_download_manual https://www.fileplanet.com/207823/200000/fileinfo/DiRT-2-Demo Dirt2Demo.zip fbae62d04e3e33790fe78803577efc8ef9ff7e552220c944023b53315e0db9de
 
     w_try_unzip "$W_TMP/$W_PACKAGE" "$W_CACHE/$W_PACKAGE/Dirt2Demo.zip"
 
@@ -14234,84 +13977,6 @@ load_dirt2_demo()
 
 #----------------------------------------------------------------
 
-w_metadata divinity2_demo games \
-    title="Divinity II Demo" \
-    publisher="DTP Entertainment" \
-    year="2010" \
-    media="manual_download" \
-    file1="Divinity2_DEMO_EN_US.zip" \
-    installed_file1="$W_PROGRAMS_X86_WIN/Divinity II - Ego Draconis - Demo/Bin/Divinity2_Demo.exe"
-
-load_divinity2_demo()
-{
-    w_download_manual "http://www.gamershell.com/download_54304.shtml" "$file1" 2a33670b705d4da89e1119d808cda64977bb6096
-
-    w_try unzip -d "$W_TMP" "$W_CACHE/$W_PACKAGE/$file1"
-    w_try_cd "$W_TMP"
-
-    w_ahk_do "
-        Run, Divinity2_DEMO_EN_US.exe
-        SetTitleMatchMode, 2
-        WinWait,Setup - Divinity II - Ego Draconis - Demo
-        if ( w_opt_unattended > 0 ) {
-            Sleep 500
-            ControlClick TNewButton1 ; Next
-            WinWait,Setup - Divinity II - Ego Draconis - Demo, read
-            Sleep 500
-            ControlClick TNewRadioButton1 ;agreement
-            Sleep 500
-            ControlClick TNewButton2 ; Next
-            WinWait,Setup - Divinity II - Ego Draconis - Demo, into
-            Sleep 500
-            ControlClick TNewButton3 ; Next
-            WinWait,Setup - Divinity II - Ego Draconis - Demo, place
-            Sleep 500
-            ControlClick TNewButton4 ; Next
-            WinWait,Setup - Divinity II - Ego Draconis - Demo, installation
-            Sleep 500
-            ControlClick TNewButton4 ; Install
-            Loop
-            {
-                IfWinExist, NVIDIA PhysX Setup, must
-                {
-                    WinWait,NVIDIA PhysX Setup, must
-                    Sleep 500
-                    ControlClick Button3 ;accept
-                    Sleep 500
-                    ControlClick Button4 ; Next
-                    WinWait,NVIDIA PhysX Setup, been
-                    Sleep 500
-                    ControlClick Button1 ; Finish
-                }
-                IfWinExist,Setup - Divinity II - Ego Draconis - Demo, launched
-                {
-                    break
-                }
-                Sleep 2000
-            }
-            WinWait,Setup - Divinity II - Ego Draconis - Demo, launched
-            Sleep 500
-            ControlFocus, TNewCheckListBox1, Desktop
-            Sleep 500
-            Send {Space}
-            Sleep 500
-            ControlClick TNewButton4 ; Finish
-        }
-        WinWaitClose
-    "
-
-    if w_workaround_wine_bug 24417
-    then
-        w_call d3dx9_36
-    fi
-    if w_workaround_wine_bug 25329
-    then
-        w_call wmp9
-    fi
-}
-
-#----------------------------------------------------------------
-
 w_metadata demolition_company_demo games \
     title="Demolition Company demo" \
     publisher="Giants Software" \
@@ -14515,7 +14180,7 @@ w_metadata dragonage2_demo games \
 
 load_dragonage2_demo()
 {
-    w_download https://lvlt.bioware.cdn.ea.com/bioware/u/f/eagames/bioware/dragonage2/demo/DragonAge2Demo_F93M2qCj_EnEsItPlRu.exe a94715cd7943533a3cf1d84d40e667b04e1abc2e
+    w_download https://lvlt.bioware.cdn.ea.com/bioware/u/f/eagames/bioware/dragonage2/demo/DragonAge2Demo_F93M2qCj_EnEsItPlRu.exe 615c014deed9b97de5662774fe25074862a7873c430d5d3650d07c7ce2727e9d
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
@@ -14548,18 +14213,19 @@ load_dragonage2_demo()
 w_metadata eve games \
     title="EVE Online Tyrannis" \
     publisher="CCP Games" \
-    year="2011" \
+    year="2017" \
     media="download" \
-    file1="EVE_Online_Installer_561078.exe" \
-    installed_exe1="$W_PROGRAMS_X86_WIN/CCP/EVE/eve.exe"
+    file1="EveLauncher-1104888.exe" \
+    installed_exe1="c:/EVE/eve.exe"
 
 load_eve()
 {
-    # http://www.eveonline.com/download/?fallback=1&
-    w_download http://content.eveonline.com/561078/EVE_Online_Installer_561078.exe 5b5f0cd4fbd42f82b1d1cccb2e22ddeed97d1d3a
+    # https://community.eveonline.com/support/download/
+    w_download http://binaries.eveonline.com/EveLauncher-1104888.exe d1d66ea0a0e4a476a926307dcdb3d7b5e777d7cff7feb172ce7779dac9fdae8f
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
+        # FIXME: doesn't work with latest update, button names don't appear in AHK?
         run, $file1
         WinWait, EVE Online
         if ( w_opt_unattended > 0 ) {
@@ -14703,44 +14369,6 @@ _EOF_
 
 #----------------------------------------------------------------
 
-w_metadata farmsim2011_demo games \
-    title="Farming Simulator 2011 Demo" \
-    publisher="Astragon" \
-    year="2011" \
-    media="manual_download" \
-    file1="FarmingSimulator2011DemoEN.exe" \
-    installed_exe1="$W_PROGRAMS_X86_WIN/Farming Simulator 2011 Demo/game.exe"
-
-load_farmsim2011_demo()
-{
-    # From http://www.landwirtschafts-simulator.de/demo.php
-    w_download_manual http://www.landwirtschafts-simulator.de/demo.php FarmingSimulator2011DemoEN.exe c1221110e55625a3e797a3060c4bf5e3219bf2f0
-
-    w_try_cd "$W_CACHE/$W_PACKAGE"
-    w_ahk_do "
-        SetWinDelay 500
-        SetTitleMatchMode, 2
-        run, FarmingSimulator2011DemoEN.exe
-        if ( w_opt_unattended > 0 ) {
-            WinWait, Setup - Farming Simulator 2011 Demo
-            ControlClick TNewButton1   ; Next
-            WinWait, Setup - Farming Simulator 2011 Demo, License Agreement
-            ControlClick TNewRadioButton1   ; Accept
-            ControlClick TNewButton2   ; Next
-            WinWait, Setup - Farming Simulator 2011 Demo, Setup Type
-            ControlClick TNewButton2   ; Next
-            WinWait, Setup - Farming Simulator 2011 Demo, Ready to Install
-            ControlClick TNewButton2   ; Install
-        }
-        WinWait, Setup - Farming Simulator 2011 Demo, finished
-        if ( w_opt_unattended > 0 )
-            ControlClick TNewButton2   ; Finish
-        WinWaitClose
-    "
-}
-
-#----------------------------------------------------------------
-
 w_metadata fifa11_demo games \
     title="FIFA 11 Demo" \
     publisher="EA Sports" \
@@ -14752,7 +14380,7 @@ w_metadata fifa11_demo games \
 load_fifa11_demo()
 {
     # From https://www.ea.com/uk/football/news/fifa11-download-2
-    w_download "http://static.cdn.ea.com/fifa/u/f/fifa11_pc_demo_NA.zip" c3a66284bffb985f31b11e477dade50c0d4cac52
+    w_download "http://static.cdn.ea.com/fifa/u/f/fifa11_pc_demo_NA.zip" 8b51b5d7b017c4a198fdfae1c348666f99cd60271835d608357f2ad893e5be43
 
     w_try unzip -d "$W_TMP" "$W_CACHE/$W_PACKAGE/fifa11_pc_demo_NA.zip"
     w_try_cd "$W_TMP"
@@ -14808,12 +14436,13 @@ w_metadata hon games \
     publisher="S2 Games" \
     year="2013" \
     media="download" \
-    file1="HoNClient-3.1.2.exe" \
+    file1="HoNClient.exe" \
     installed_exe1="$W_PROGRAMS_X86_WIN/Heroes of Newerth/hon.exe"
 
 load_hon()
 {
-    w_download http://dl.heroesofnewerth.com/HoNClient-3.1.2.exe 49123d092f1fa75b8dddc20c817ab8addd5aee5f
+    # 2017/03/28: 0f3c3431a88964647fc4d9540490e43afedc2e48573c260892882ecf48172317
+    w_download http://dl.heroesofnewerth.com/installers/win32/HoNClient.exe 0f3c3431a88964647fc4d9540490e43afedc2e48573c260892882ecf48172317
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
@@ -14823,16 +14452,19 @@ load_hon()
         if ( w_opt_unattended > 0 ) {
             send {Enter}
             winwait, Heroes of Newerth
+            sleep 1000
             controlclick, Button2, Heroes of Newerth
             winwait, Heroes of Newerth, License
+            sleep 1000
             controlclick, Button2, Heroes of Newerth, License
-            winwait, Heroes of Newerth, Components
-            controlclick, Button2, Heroes of Newerth, Components
             winwait, Heroes of Newerth, Install Location
+            sleep 1000
             controlclick, Button2, Heroes of Newerth, Install Location
             winwait, Heroes of Newerth, Start Menu
+            sleep 1000
             controlclick, Button2, Heroes of Newerth, Start Menu
             winwait, Heroes of Newerth, Finish
+            sleep 1000
             controlclick, Button2, Heroes of Newerth, Finish
         }
         winwaitclose, Heroes of Newerth, Finish
@@ -14851,7 +14483,7 @@ w_metadata hordesoforcs2_demo games \
 
 load_hordesoforcs2_demo()
 {
-    w_download_manual https://www.fileplanet.com/216619/download/Hordes-of-Orcs-2-Demo HoO2Demo.exe 1ba26d35697e359f89a30915140e471fadc675da
+    w_download_manual https://www.fileplanet.com/216619/download/Hordes-of-Orcs-2-Demo HoO2Demo.exe 9c26e420c56268ca14e5cfa6552a9034fc2ea974714b5bfd427e611dfde197be
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
@@ -14981,7 +14613,8 @@ load_mfsx_demo()
         w_call vd=1024x768
     fi
 
-    w_download http://download.microsoft.com/download/4/7/7/477dcc35-0b98-42c5-b06f-7ded38a40491/FSXDemo.exe cbb13d2a7918f409f224eab7d3a2014330fc87bc
+    # 2017/03/28: also available at http://www.gamewatcher.com/downloads/flight-simulator-x-download/flight-simulator-x-final-demo
+    w_download_manual "https://www.fileplanet.com/166127/160000/fileinfo/Microsoft-Flight-Simulator-X-Demo-[Final]" fsxdemo.exe 0d616d8fb6315c15e9919a29968f98b1feda14a2a284721dad114395154e58be
     w_try_cd "$W_TMP"
     unzip "$W_CACHE/$W_PACKAGE"/FSXDemo.exe
     w_ahk_do "
@@ -15009,75 +14642,6 @@ load_mfsx_demo()
 
 #----------------------------------------------------------------
 
-w_metadata gothic4_demo games \
-    title="Gothic 4 demo (DRM broken on Wine)" \
-    publisher="Jowood" \
-    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"
-
-# https://appdb.winehq.org/objectManager.php?sClass=version&iId=21507
-
-load_gothic4_demo()
-{
-    w_download_manual http://www.gamershell.com/download_63874.shtml ArcaniA_Gothic4_Demo_Setup.zip d36024c0235878c4589234a56cc8b6e05da5c593
-
-    w_try_cd "$W_TMP"
-    w_try unzip "$W_CACHE/$W_PACKAGE"/ArcaniA_Gothic4_Demo_Setup.zip
-
-    w_ahk_do "
-        Settitlematchmode, 2
-        run, ArcaniA_Gothic4_Demo_Setup.exe
-        if ( w_opt_unattended > 0 ) {
-            winwait, Select Setup Language
-            sleep 1000
-            controlclick, TNewButton1, Select Setup Language
-            winwait, Setup - ArcaniA, Welcome to the
-            sleep 1000
-            controlclick, TNewButton1, Setup - ArcaniA, Welcome to the
-            winwait, Setup - ArcaniA, License Agreement
-            sleep 1000
-            controlclick, TNewRadioButton1, Setup - ArcaniA, License Agreement
-            sleep 1000
-            controlclick, TNewButton2, Setup - ArcaniA, License Agreement
-            winwait, Setup - ArcaniA, Select Destination Location
-            sleep 1000
-            controlclick, TNewButton3, Setup - ArcaniA, Select Destination Location
-            winwait, Setup - ArcaniA, Select Components
-            sleep 1000
-            controlclick, TNewButton3, Setup - ArcaniA, Select Components
-            winwait, Setup - ArcaniA, Select Start Menu
-            sleep 1000
-            controlclick, TNewButton4, Setup - ArcaniA, Select Start Menu
-            winwait, Setup - ArcaniA, Select Additional
-            sleep 1000
-            controlclick, TNewButton4, Setup - ArcaniA, Select Additional
-            winwait, Setup - ArcaniA, Ready to Install
-            sleep 1000
-            controlclick, TNewButton4, Setup - ArcaniA, Ready to Install
-            winwait, Setup - ArcaniA, Information
-            sleep 1000
-            controlclick, TNewButton4, Setup - ArcaniA, Information
-        }
-        winwait, Setup - ArcaniA, Completing
-        if ( w_opt_unattended > 0 ) {
-            sleep 1000
-            ; The two checkboxes share the same button id. App/Wine bug?
-            mousemove, 190, 155
-            click
-            sleep 1000
-            mousemove, 190, 180
-            click
-            sleep 1000
-            controlclick, TNewButton4, Setup - ArcaniA, Completing
-        }
-        winwaitclose
-    "
-}
-
-#----------------------------------------------------------------
-
 w_metadata gta_vc games \
     title="Grand Theft Auto: Vice City" \
     publisher="Rockstar" \
@@ -15160,13 +14724,8 @@ w_metadata hegemonygold_demo games \
 
 load_hegemonygold_demo()
 {
-    # 6 Mar 2011: 8c4d8aa8f997b106c78b065a4b200e5e1ab846a8
-    # 28 Apr 2011: 93677013fc17f014b1640bed070e8bb1b2a17445
-    # 25 Jun 2011: 4069656ea3c3760b67d1c5adff37de7472955f72
-    # 5 Nov 2011: 723c575ff5fff77941a1c786e28f46c094b8159c
-    # 8 Mar 2012: 36634314f571e345d082bdefe1150c76ef5610a7
-
-    w_download "https://www.longbowgames.com/downloads/Hegemony%20Gold%20Installer.exe" 36634314f571e345d082bdefe1150c76ef5610a7 HegemonyGoldInstaller.exe
+    # 2012/03/08: 143a6335b20855922907e3e266fe0ab286ac274dab434f1fca749c7b19c2ab49
+    w_download "https://www.longbowgames.com/downloads/Hegemony%20Gold%20Installer.exe" 143a6335b20855922907e3e266fe0ab286ac274dab434f1fca749c7b19c2ab49 HegemonyGoldInstaller.exe
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
 
@@ -15210,10 +14769,8 @@ w_metadata hegemony_demo games \
 
 load_hegemony_demo()
 {
-    # Oct 2010: d3d2aa020d38b594d112360ae40871662d35dea4
-    # Nov 2010: 80cad805ad4bed0d3c493f2d9a40d06512c429a9 https://www.longbowgames.com/forums/topic/?id=2223&start=0#post22184
-    # Feb 16 2011: 38e92e3e4d0f0d10393790bc37350a2094f60c37
-    w_download "https://www.longbowgames.com/downloads/Hegemony%20Philip%20of%20Macedon%20Installer.exe" 38e92e3e4d0f0d10393790bc37350a2094f60c37 Hegemony_Philip_of_Macedon_Installer.exe
+    # 2017/03/27: 697879215eadfda213c4105de653d056c69ed85ecb06ebafcc19d9344f70751c
+    w_download "https://www.longbowgames.com/downloads/Hegemony%20Philip%20of%20Macedon%20Installer.exe" 697879215eadfda213c4105de653d056c69ed85ecb06ebafcc19d9344f70751c Hegemony_Philip_of_Macedon_Installer.exe
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
 
@@ -15276,7 +14833,7 @@ load_hphbp_demo()
     ""|"C") w_die "Harry Potter will not install in the POSIX locale; please do 'export LANG=en_US.UTF-8' or something like that" ;;
     esac
 
-    w_download http://largedownloads.ea.com/pub/demos/HarryPotter/Release_HBP_demo_PC_DD_DEMO_Final_348428.exe dadc1366c3b5e641454aa337ad82bc8c5082bad2
+    w_download http://largedownloads.ea.com/pub/demos/HarryPotter/Release_HBP_demo_PC_DD_DEMO_Final_348428.exe eca6c5eb49dc2f778175a36e07b0b1d3f33db75fdb5fda8bfefd2c1648fbbd53
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
@@ -15320,7 +14877,7 @@ w_metadata imvu games \
 
 load_imvu()
 {
-    w_download http://static-akm.imvu.com/imvufiles/installers/InstallIMVU_465.0_st_c.exe 3a5c6c335227a5709c5772f91d8407edd07d4012
+    w_download http://static-akm.imvu.com/imvufiles/installers/InstallIMVU_465.0_st_c.exe 4c54b65308cc6bb832cbc3ed3b82701a23cbae5a67f07d6c1d6bdc84b6b2cbe4
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
@@ -15487,69 +15044,11 @@ load_losthorizon_demo()
 
 #----------------------------------------------------------------
 
-w_metadata lego_potc_demo games \
-    title="Lego Pirates of the Caribbean Demo" \
-    publisher="Travellers Tales" \
-    year="2011" \
-    media="manual_download" \
-    file1="LPOTC_PC_Demo.zip" \
-    installed_file1="$W_PROGRAMS_X86_WIN/Disney Interactive Studios/LEGO Pirates DEMO/LEGOPiratesDEMO.exe"
-
-load_lego_potc_demo()
-{
-    w_download_manual http://www.gamershell.com/download_73976.shtml LPOTC_PC_Demo.zip 3025dcbbee9ff2d74d7837a78ef5b7aceae15d8f
-    w_try_cd "$W_TMP"
-    w_info "Unpacking $file1"
-    w_try_unzip . "$W_CACHE/$W_PACKAGE/$file1" LPOTC_PC_Demo.exe
-    w_ahk_do "
-        SetWinDelay, 500
-        SetTitleMatchMode, 2
-        SetTitleMatchMode, slow        ; since word English in first dialog can only be read 'slowly'
-        run LPOTC_PC_Demo.exe
-        if ( w_opt_unattended > 0 ) {
-            winwait,LEGO,English
-            sleep 500
-            winactivate
-            send {Tab}{Tab}{Enter}
-            winwaitclose,LEGO,English
-
-            winwait, LEGO, License
-            winactivate
-            send {Space}
-            sleep 500
-            send {Enter}
-            winwaitclose, LEGO, License
-
-            winwait, DirectX
-            ControlClick, Button1  ; next
-            ;send {Enter}  ; next
-            winwaitclose, DirectX
-
-            winwait, LEGO, License       ; DIRECTX shows up in slow text, could wait for that
-            winactivate
-            sleep 500
-            ControlClick, Button1  ; accept
-            ;send {Tab}{Tab}{Space} ; accept
-            sleep 500
-            send {Enter}
-            winwaitclose, LEGO, License
-        }
-        winwait, LEGO, continue
-        if ( w_opt_unattended > 0 ) {
-            ControlClick, Button2
-            sleep 1000
-        }
-        winwaitclose, LEGO
-    "
-}
-
-#----------------------------------------------------------------
-
 w_metadata lhp_demo games \
     title="LEGO Harry Potter Demo [Years 1-4]" \
     publisher="Travellers Tales / WB" \
     year="2010" \
-    media="download" \
+    media="manual_download" \
     file1="LEGOHarryPotterDEMO.exe" \
     installed_exe1="$W_PROGRAMS_X86_WIN/WB Games/LEGO_Harry_Potter_DEMO/LEGOHarryPotterDEMO.exe"
 
@@ -15564,7 +15063,7 @@ load_lhp_demo()
         ;;
     esac
 
-    w_download "http://static.kidswb.com/legoharrypottergame/LEGOHarryPotterDEMO.exe" bb0a30ad9a7cc51c80e1bb1f3eec22e6ccc1a706
+    w_download_manual "https://www.fileplanet.com/213663/210000/fileinfo/LEGO-Harry-Potter:-Years-1-4-Demo" 01d8e88511d71f5dd1492034ea4b00eacdbbf891ef23cffa31413d232eee3647
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
@@ -15801,7 +15300,7 @@ w_metadata masseffect2_demo games \
 
 load_masseffect2_demo()
 {
-    w_download http://static.cdn.ea.com/bioware/u/f/eagames/bioware/masseffect2/ME2_DEMO/MassEffect2DemoEN.exe cda9a25387a98e29772b3ccdcf609f87188285e2
+    w_download http://static.cdn.ea.com/bioware/u/f/eagames/bioware/masseffect2/ME2_DEMO/MassEffect2DemoEN.exe 4ec5ce1dc90c10512324d24cba2b5b9ba1e1872ed4c23e3ede0fc0accc7d2ff2
 
     # FIXME: only do this for Nvidia graphics cards
     if w_workaround_wine_bug 23151 "Disabling glsl"
@@ -15866,7 +15365,7 @@ w_metadata maxmagicmarker_demo games \
 
 load_maxmagicmarker_demo()
 {
-    w_download https://www.maxandthemagicmarker.com/maxdemo/max_demo_pc.zip 1a79c583ff40e7b2cf05d18a89a806fd6b88a5d1
+    w_download https://www.maxandthemagicmarker.com/maxdemo/max_demo_pc.zip 6e2abd0cbd0ad04bfea9663402d7e9f24864d3f1c32df69eebf92dfc469fe6dd
 
     w_try_unzip "$W_PROGRAMS_X86_UNIX/$W_PACKAGE" "$W_CACHE/$W_PACKAGE"/max_demo_pc.zip
     # Work around bug in game?!
@@ -15889,7 +15388,7 @@ load_mdk()
     # Needed even on Windows, some people say.  Haven't tried the D3D version on win7 yet.
     w_call glidewrapper
 
-    w_download http://www.falconfly.de/downloads/patch-mdk3dfx.zip edcff0160c62d23b00c55c0bdfa38a6e90d925b0
+    w_download http://www.falconfly.de/downloads/patch-mdk3dfx.zip 9b9413609ed147944fa44bb5f51b35cf6baa7657e7e1a9891ad68d858275e00b
 
     w_mount MDK
     w_try_cd "$W_ISO_MOUNT_ROOT"
@@ -16056,11 +15555,11 @@ load_mise()
 #----------------------------------------------------------------
 
 w_metadata myth2_demo games \
-    title="Myth II demo 1.7.2" \
+    title="Myth II demo 1.8.0" \
     publisher="Project Magma" \
     year="2011" \
     media="download" \
-    file1="Myth2_Demo_172.exe" \
+    file1="Myth2_Demo_180.exe" \
     installed_exe1="$W_PROGRAMS_X86_WIN/Myth II Demo/Myth II Demo.exe" \
     homepage="http://projectmagma.net/"
 
@@ -16069,9 +15568,11 @@ load_myth2_demo()
     # Originally a 1998 game by Bungie; according to Wikipedia, they handed the
     # source code to Project Magma for further development.
 
-    # 1 May 2011 1.7.2 sha1sum e0a8f707377e71314a471a09ad2a55179ea44588
-    w_download http://tain.totalcodex.net/items/download/myth-ii-demo-windows e0a8f707377e71314a471a09ad2a55179ea44588 Myth2_Demo_172.exe
-    w_try_cd "$W_CACHE/$W_PACKAGE"
+    # 2017/03/27: 1a5e11be25c43491e2b4da5291b646ffe5330a6289bef236f404906e3b4f5e96
+    w_download http://tain.totalcodex.net/items/download/myth-ii-demo-windows 1a5e11be25c43491e2b4da5291b646ffe5330a6289bef236f404906e3b4f5e96 "${file1}"
+
+    w_try_cd "${W_TMP}"
+    w_try unzip "${W_CACHE}/${W_PACKAGE}/${file1}"
 
     w_ahk_do "
         SetTitleMatchMode, 2
@@ -16107,8 +15608,8 @@ w_metadata nfsshift_demo games \
 
 load_nfsshift_demo()
 {
-    #w_download http://cdn.needforspeed.com/data/downloads/shift/NFSSHIFTPCDEMO.exe 7b267654d08c54f15813f2917d9d74ec40905db7
-    w_download http://www.legendaryreviews.com/download-center/demos/NFSSHIFTPCDEMO.exe 7b267654d08c54f15813f2917d9d74ec40905db7
+    #w_download http://cdn.needforspeed.com/data/downloads/shift/NFSSHIFTPCDEMO.exe 5ad011e7dd42e3404e3191009cd81c05b891e7c138d61f958fce9506ff8c9de3
+    w_download http://www.legendaryreviews.com/download-center/demos/NFSSHIFTPCDEMO.exe 5ad011e7dd42e3404e3191009cd81c05b891e7c138d61f958fce9506ff8c9de3
 
     w_try cp "$W_CACHE/$W_PACKAGE/$file1" "$W_TMP"
 
@@ -16168,22 +15669,22 @@ load_nfsshift_demo()
 w_metadata njcwp_trial apps \
     title="NJStar Chinese Word Processor trial" \
     publisher="NJStar" \
-    year="2009" \
+    year="2015" \
     media="download" \
-    file1="njcwp.exe" \
-    installed_exe1="$W_PROGRAMS_X86_WIN/NJStar Chinese WP/njstar.exe" \
+    file1="njcwp610sw15918.exe" \
+    installed_exe1="$W_PROGRAMS_X86_WIN/NJStar Chinese WP6/NJStar.exe" \
     homepage="https://www.njstar.com/cms/njstar-chinese-word-processor"
 
 load_njcwp_trial()
 {
-    w_download https://www.njstar.com/download/njcwp.exe 006da155bad1ac4a73b953c98cb821eb7fd96507
+    w_download http://ftp.njstar.com/sw/njcwp610sw15918.exe 7afa6dfc431f058d1397ac7100d5650b97347e1f37f81a2e2d2ee5dfdff4660b
     w_try_cd "$W_CACHE/$W_PACKAGE"
     if test "$W_OPT_UNATTENDED"
     then
         w_ahk_do "
         SetTitleMatchMode, 2
         run $file1
-        WinWait, Setup, Wizard
+        WinWait, Setup, Welcome
         ControlClick Button2 ; next
         WinWait, Setup, License
         ControlClick Button2 ; agree
@@ -16206,20 +15707,20 @@ w_metadata njjwp_trial apps \
     publisher="NJStar" \
     year="2009" \
     media="download" \
-    file1="njjwp.exe" \
-    installed_exe1="$W_PROGRAMS_X86_WIN/NJStar Japanese WP/njstarj.exe" \
+    file1="njjwp610sw15918.exe" \
+    installed_exe1="$W_PROGRAMS_X86_WIN/NJStar Japanese WP6/NJStarJ.exe" \
     homepage="https://www.njstar.com/cms/njstar-japanese-word-processor"
 
 load_njjwp_trial()
 {
-    w_download https://www.njstar.com/download/njjwp.exe 363d22e4ca7b79d0290a8ccdb0fa99169971d418
+    w_download http://ftp.njstar.com/sw/njjwp610sw15918.exe 7f36138c3d19539cb73d757cd42a6f7afebdaf9cfed0cf9bc483c33e519e2a26
     w_try_cd "$W_CACHE/$W_PACKAGE"
     if test "$W_OPT_UNATTENDED"
     then
         w_ahk_do "
         SetTitleMatchMode, 2
         run $file1
-        WinWait, Setup, Wizard
+        WinWait, Setup, Welcome
         ControlClick Button2 ; next
         WinWait, Setup, License
         ControlClick Button2 ; agree
@@ -16298,7 +15799,7 @@ w_metadata penpenxmas games \
 load_penpenxmas()
 {
     W_BROWSERAGENT=1 \
-    w_download http://retrospec.sgn.net/download/files/PenPenXmasOlympics100.exe 36ec83cffa0ad3cc19dea33193b54bdaaea6db5b
+    w_download http://retrospec.sgn.net/download/files/PenPenXmasOlympics100.exe c35c5c6a9a3fa62d6b099713e72390d0490320534dba958b57b94f0a6ab458db
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
     "$WINE" PenPenXmasOlympics100.exe $W_UNATTENDED_SLASH_S
@@ -16316,7 +15817,7 @@ w_metadata plantsvszombies games \
 
 load_plantsvszombies()
 {
-    w_download "https://downloads.popcap.com/www/popcap_downloads/PlantsVsZombiesSetup.exe" c46979be135ef1c486144fa062466cdc51b740f5
+    w_download "https://downloads.popcap.com/www/popcap_downloads/PlantsVsZombiesSetup.exe" 4b4bb4d19fb639e5698983e39d7ad061c7667bcec19056560532c7ad0d67d0e4
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
@@ -16395,11 +15896,11 @@ load_popfs()
 #----------------------------------------------------------------
 
 w_metadata qq apps \
- title="QQ 8.0 (Chinese chat app)" \
+ title="QQ 8.9.1(Chinese chat app)" \
  publisher="Tencent" \
- year="2015" \
+ year="2017" \
  media="download" \
- file1="QQ8.0.exe" \
+ file1="QQ8.9.1.exe" \
  file2="QQ.tar.gz"\
  installed_exe1="$W_PROGRAMS_X86_WIN/Tencent/QQ/Bin/QQScLauncher.exe" \
  homepage="http://www.qq.com" \
@@ -16407,7 +15908,7 @@ w_metadata qq apps \
 
 load_qq()
 {
-    w_download https://dldir1.qq.com/qqfile/qq/QQ8.0/16968/QQ8.0.exe 3af11db606ea9f8358db5c9eb12398da3464de020b7da7cbf3e13662ee33d228
+    w_download https://dldir1.qq.com/qqfile/qq/QQ8.9.1/20437/QQ8.9.1.exe 8e0d3ff5264da2d77e2fc011c21048edeebcf082f55f68a301f763c3a15c0d3f
     w_download http://hillwoodhome.net/wine/QQ.tar.gz eb5cd6371eb75ec9e2fc0271199df05cbb9f38a60c2e81d5d8ac7daeb40aba62
 
     if w_workaround_wine_bug 5162 "Installing native riched20 to work around can't input username."
@@ -16492,50 +15993,6 @@ load_qqintl()
 
 #----------------------------------------------------------------
 
-w_metadata ragnarok games \
-    title="Ragnarok" \
-    publisher="GRAVITY" \
-    year="2002" \
-    media="manual_download" \
-    file1="iRO-13.2.2-FullInstall-20110421-1717.msi" \
-    installed_exe1="$W_PROGRAMS_X86_WIN/Gravity/Ragnarok Online/Ragnarok.exe"
-
-load_ragnarok()
-{
-    if w_workaround_wine_bug 657 "Visual C++ 6 runtime"
-    then
-        w_call vcrun6
-    fi
-
-    # publisher puts SHA1 checksums on download page, nice
-    # BDA295E3A2A57CD02BD122ED7BF4836AC012369A
-    w_download_manual http://www.playragnarok.com/downloads/clientdownload.aspx iRO-13.2.2-FullInstall-20110421-1717.msi bda295e3a2a57cd02bd122ed7bf4836ac012369a
-
-    w_try_cd "$W_CACHE/$W_PACKAGE"
-
-    w_ahk_do "
-        Run, msiexec /i $file1
-        SetTitleMatchMode, 2
-        WinWait, Ragnarok Online Setup, Please read the Ragnarok Online License Agreement
-        if ( w_opt_unattended > 0 ) {
-            Sleep 500
-            ControlClick Button1
-            Sleep 500
-            ControlClick Button3
-            }
-            WinWait, Ragnarok Online Setup, Completed the Ragnarok Online Setup Wizard
-        if ( w_opt_unattended > 0 ) {
-            Sleep 500
-            ControlClick Button1 ;Direct
-        }
-    "
-
-    # Game autoupdates:
-    w_killall "Ragnarok.exe"
-}
-
-#----------------------------------------------------------------
-
 w_metadata rct3deluxe games \
     title="RollerCoaster Tycoon 3 Deluxe (DRM broken on Wine)" \
     publisher="Atari" \
@@ -16592,63 +16049,6 @@ load_rct3deluxe()
 
 #----------------------------------------------------------------
 
-w_metadata rayman2_demo games \
-    title="Rayman 2 High Demo" \
-    publisher="Ubisoft" \
-    year="1999" \
-    media="download" \
-    file1="rayman2high.zip" \
-    installed_exe1="c:/UbiSoft/Rayman2Demo/Rayman2Demo.exe"
-
-load_rayman2_demo()
-{
-    w_download "ftp://ftp.ubisoft.com/Rayman2/rayman2high.zip" 14b2ad6f41e2e1358f3a4a5167d67a7111ea4fb5
-
-    w_try_cd "$W_TMP"
-    w_try unzip "$W_CACHE/$W_PACKAGE/rayman2high.zip"
-
-    w_ahk_do "
-        SetWinDelay 500
-        SetTitleMatchMode, 3
-        Run, SETUP.EXE
-        WinWaitActive, UBI Soft Installer - Language Choice
-        if ( w_opt_unattended > 0 ) {
-            ControlClick button1 ; OK
-            WinWait, Ubi Soft Installer - Rayman 2 Demo
-            ControlClick button1 ; Install
-            WinWait, Ubi Soft Installer - Configuration choice
-            ControlClick button1 ; Install
-            WinWait, Ubi Soft Installer - Installation Directory
-            ControlClick button1 ; OK
-            WinWait, Ubi Soft Installer - Shortcut Choice
-            ControlClick button1 ; OK
-            WinWait, Ubi Soft Installer - Information file
-            ControlClick button2 ; No
-        }
-        WinWait, Ubi Soft Installer - Rayman 2 Demo
-        if ( w_opt_unattended > 0 ) {
-            ControlClick button4 ; Quit
-        }
-        WinWaitClose
-    "
-
-    myexec="Exec=env WINEPREFIX=\"$WINEPREFIX\" wine "'C:\\\\\\\\windows\\\\\\\\UbiSoft\\\\\\\\SetupUbi.exe -play Rayman2'
-    mymenu="$HOME/Desktop/To Play Rayman 2 Demo.desktop"
-    if test -f "$mymenu" && w_workaround_wine_bug 26303 "Fixing desktop entry"
-    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/Ubi Soft Games/Rayman 2 Demo/1 To Play Rayman 2 Demo.desktop"
-    if test -f "$mymenu" && w_workaround_wine_bug 26304 "Fixing system menu"
-    then
-        # this is a hack, hopefully the wine bug will be fixed soon
-        sed -i "s,Exec=.*,$myexec," "$mymenu"
-    fi
-}
-
-#----------------------------------------------------------------
-
 w_metadata riseofnations_demo games \
     title="Rise of Nations Trial" \
     publisher="Microsoft" \
@@ -16659,7 +16059,7 @@ w_metadata riseofnations_demo games \
 
 load_riseofnations_demo()
 {
-    w_download_manual http://download.cnet.com/Rise-of-Nations-Trial-Version/3000-7562_4-10730812.html RiseOfNationsTrial.exe 33cbf1ebc0a93cb840f6296d8b529f6155db95ee
+    w_download_manual http://download.cnet.com/Rise-of-Nations-Trial-Version/3000-7562_4-10730812.html RiseOfNationsTrial.exe f0bd8be3999164e669aad33583e372ca0f530b1a2ac0194a4c13b265e9cdf744
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
 
@@ -16695,7 +16095,7 @@ w_metadata secondlife games \
 
 load_secondlife()
 {
-    w_download http://download.cloud.secondlife.com/Viewer-3/Second_Life_3-2-8-248931_Setup.exe e08c16edc4d2fb68bb6275bed11a259a74918da5
+    w_download http://download.cloud.secondlife.com/Viewer-3/Second_Life_3-2-8-248931_Setup.exe d155366f16bfe23f33a6b6d63f366691be2d0554429916da875ea78d0e0de8a6
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
@@ -16768,7 +16168,7 @@ load_sims3()
 
     # DVD region code is last digit.
     # FIXME: download appropriate one rather than just US version.
-    w_download http://akamai.cdn.ea.com/eadownloads/u/f/sims/sims3/patches/TS3_1.19.44.010001_Update.exe 7d21a81aaea70bf102267456df4629ce68be0cc8
+    w_download http://akamai.cdn.ea.com/eadownloads/u/f/sims/sims3/patches/TS3_1.19.44.010001_Update.exe 9428b32638108e51e63455b60f3cfd5b5aca07b55ce58a200087631a02b5336c
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
@@ -16860,7 +16260,7 @@ load_simsmed()
 
     # DVD region code is last digit.
     # FIXME: download appropriate one rather than just US version.
-    w_download http://akamai.cdn.ea.com/eadownloads/u/f/sims/sims/patches/TheSimsMedievalPatch_1.1.10.00001_Update.exe 7214ced8af7315741e05024faeacf9053b999b1b
+    w_download http://akamai.cdn.ea.com/eadownloads/u/f/sims/sims/patches/TheSimsMedievalPatch_1.1.10.00001_Update.exe 01c0f9e3394d93869f67f1319b80a1257fe421bbdf911a15c8c7ab43f2e73683
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
@@ -17014,52 +16414,6 @@ load_splitsecond()
 
 #----------------------------------------------------------------
 
-w_metadata splitsecond_demo games \
-    title="Split Second Demo" \
-    publisher="Disney" \
-    year="2010" \
-    media="manual_download" \
-    file1="SplitSecondDemo_FilePlanet.exe" \
-    installed_exe1="$W_PROGRAMS_X86_WIN/Disney Interactive Studios/Split Second/SplitSecondDEMO.exe"
-
-load_splitsecond_demo()
-{
-    w_download_manual https://www.fileplanet.com/212404/210000/fileinfo/Split/Second-Demo SplitSecondDemo_FilePlanet.exe 72b070712cfe951297263fae143521b45dae16b4
-
-    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
-
-    w_try_cd "$W_CACHE/$W_PACKAGE"
-    w_ahk_do "
-        SetTitleMatchMode, 2
-        run, SplitSecondDemo_FilePlanet.exe
-        winwait, Split, Language
-        ;ControlClick, Next, Split, Language  ; does not quite work, have to use {Enter} instead
-        Send {Enter}
-        winwait, Split, game installation
-        ControlClick, Button1, Split, game installation
-        winwait, Split, license
-        ControlClick, Button5, Split, license
-        ControlClick, Button2, Split, license
-        winwait, Split, DirectX
-        ControlClick, Button5, Split, DirectX
-        ControlClick, Button2, Split, DirectX
-        winwait, Split, installation path
-        ControlClick, Button1, Split, installation path
-        winwait, Split, Game features
-        ControlClick, Button2, Split, Game features
-        winwait, Split, start copying
-        ControlClick, Button1, Split, start copying
-        winwait, Split, completed
-        ControlClick, Button1, Split, completed
-        ControlClick, Button4, Split, completed
-    "
-}
-
-#----------------------------------------------------------------
-
 w_metadata spore games \
     title="Spore" \
     publisher="EA" \
@@ -17132,7 +16486,7 @@ w_metadata spore_cc_demo games \
 
 load_spore_cc_demo()
 {
-    w_download http://lvlt.bioware.cdn.ea.com/u/f/eagames/spore/scc/promo/792248d6ad421d577132c2b648bbed45_scc_trial_na.exe 06da5558e6ebbc39d2fac955eceab78cf8470e07
+    w_download http://akamai.cdn.ea.com/eamaster/u/f/eagames/spore/scc/promo/792248d6ad421d577132c2b648bbed45_scc_trial_na.exe a7fbc5ca02a49be9772b54caf3ab1a60bdda16e43e14051de407ace527bece15
 
     w_info "The installer runs on for about a minute after it's done."
 
@@ -17183,7 +16537,7 @@ w_metadata starcraft2_demo games \
 
 load_starcraft2_demo()
 {
-    w_download_manual https://www.fileplanet.com/217982/210000/fileinfo/Starcraft-2-Demo SC2-WingsOfLiberty-enUS-Demo-Installer.zip 4c06ad755fbde73f135a7359bf6bfdbd2c6eb00e
+    w_download_manual https://www.fileplanet.com/217982/210000/fileinfo/Starcraft-2-Demo SC2-WingsOfLiberty-enUS-Demo-Installer.zip 6ba192a726fc8b58031a7de961ad9392f60df05cfb206342f02f7a80b57c0784
 
     w_try_cd "$W_TMP"
     w_try_unzip . "$W_CACHE/$W_PACKAGE"/SC2-WingsOfLiberty-enUS-Demo-Installer.zip
@@ -17328,9 +16682,8 @@ w_metadata tmnationsforever games \
 
 load_tmnationsforever()
 {
-    # Before:      cab0cf66db0471bc2674a3b1aebc35de0bca6ed0
-    # 29 Mar 2011: 23388798d5c90ad4a233b4cd7e9fcafd69756978
-    w_download "http://files.trackmaniaforever.com/tmnationsforever_setup.exe" 23388798d5c90ad4a233b4cd7e9fcafd69756978
+    # 2011/03/29: 2f659138ed4409da404970841e18f03d29921beaf6a424824c8312ddb20f6355
+    w_download "http://files.trackmaniaforever.com/tmnationsforever_setup.exe" 2f659138ed4409da404970841e18f03d29921beaf6a424824c8312ddb20f6355
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
 
@@ -17458,7 +16811,7 @@ w_metadata sammax301_demo games \
 
 load_sammax301_demo()
 {
-    w_download_manual "https://www.fileplanet.com/211314/210000/fileinfo/Sam-&-Max:-Devil's-Playhouse---Episode-One-Demo" SamMax301_PC_Setup.exe 83f47b7f3a5074a6e29bdc9b4f1fd2c4471d9641
+    w_download_manual "https://www.fileplanet.com/211314/210000/fileinfo/Sam-&-Max:-Devil's-Playhouse---Episode-One-Demo" SamMax301_PC_Setup.exe bed2c16c0254881e7770743f936b8926fa202b91d281bb8c2dd34305d0c0a84a
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
@@ -17496,7 +16849,7 @@ w_metadata sammax304_demo games \
 
 load_sammax304_demo()
 {
-    w_download_manual "https://www.fileplanet.com/214770/210000/fileinfo/Sam-&-Max:-The-Devi's-Playhouse---Beyond-the-Alley-of-the-Dolls-Demo" SamMax304_PC_setup.exe 1a385a1f1e83770c973e6457b923b7a44bbe44d8
+    w_download_manual "https://www.fileplanet.com/214770/210000/fileinfo/Sam-&-Max:-The-Devi's-Playhouse---Beyond-the-Alley-of-the-Dolls-Demo" SamMax304_PC_setup.exe 51c85e98857d15c59d9bb808ee16794cc0caf39799c50545bffdf359eac4c70a
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
@@ -17531,7 +16884,7 @@ w_metadata tropico3_demo games \
 
 load_tropico3_demo()
 {
-    w_download_manual "http://www.tropico3.com/?p=downloads" Tropico3Demo.exe e031749db346ac3a87a675787c81eb1ca8cb5909
+    w_download_manual https://www.fileplanet.com/204947/200000/fileinfo/Tropico-3-Demo Tropico3Demo.exe c4c06858cb1e0b9ff29dc8de6ecb8eb9cf699ce31609fbfa848d5dbc83c9d3e0
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
 
@@ -17636,7 +16989,7 @@ w_metadata wglgears benchmarks \
 
 load_wglgears()
 {
-    w_download http://www2.cs.uidaho.edu/~jeffery/win32/wglgears.exe d65d2098bc11af76cb614946342913b1af62924d
+    w_download http://www2.cs.uidaho.edu/~jeffery/win32/wglgears.exe 858ba95ea3c9af4ded1f4100e59b6e8e57024f3efef56304dbd48106e8f2f6f7
     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"
@@ -17655,15 +17008,15 @@ w_metadata stalker_pripyat_bench benchmarks \
 load_stalker_pripyat_bench()
 {
     # Much faster
-    w_download_manual http://www.bigdownload.com/games/stalker-call-of-pripyat/pc/stalker-call-of-pripyat-benchmark stkcop-bench-setup.exe 8691c3f289ecd0521bed60ffd46e65ad080206e0
-    #w_download http://files.gsc-game.com/st/bench/stkcop-bench-setup.exe 8691c3f289ecd0521bed60ffd46e65ad080206e0
+    w_download_manual http://www.bigdownload.com/games/stalker-call-of-pripyat/pc/stalker-call-of-pripyat-benchmark stkcop-bench-setup.exe 8c810fba1bbb9c58fc01f4f602479886680c9f4b491dd0afe935e27083f54845
+    #w_download http://files.gsc-game.com/st/bench/stkcop-bench-setup.exe 8c810fba1bbb9c58fc01f4f602479886680c9f4b491dd0afe935e27083f54845
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
 
     # FIXME: a bit fragile, if you're browsing the web while installing, it sometimes gets stuck.
     w_ahk_do "
         SetTitleMatchMode, 2
-        run stkcop-bench-setup.exe
+        run $file1
         WinWait,Setup - Call Of Pripyat Benchmark
         if ( w_opt_unattended > 0 ) {
             sleep 1000
@@ -17817,7 +17170,7 @@ w_metadata typingofthedead_demo games \
 
 load_typingofthedead_demo()
 {
-    w_download "https://www.fileplanet.com/54947/50000/fileinfo/The-Typing-of-the-Dead-Demo" 96fe3edb2431210932af840e29c59bce6b7fc80f
+    w_download_manual "https://www.fileplanet.com/54947/50000/fileinfo/The-Typing-of-the-Dead-Demo" tod-demo.zip feb0888b6cf1d51af2bf3d752e1727b5d248c2704ca053561f384b55e86267ea
     w_try_cd "$W_TMP"
     w_try_unzip . "$W_CACHE/$W_PACKAGE/tod-demo.zip"
     w_ahk_do "
@@ -17922,7 +17275,7 @@ load_wog()
             | sed 's,.*http,http,;s,".*,,')
         w_try rm "$W_CACHE/wog/dl2.php?lk=demo&filename=WorldOfGooDemo.1.0.exe"
 
-        w_download "$URL" e61d8253b9fe0663cb3c69018bb3d2ec6152d488
+        w_download "$URL" 07892e927e0c403a178717b67928d3b4126dd0ed4f82afa20a4bd2496706c5e9
     fi
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
@@ -17958,7 +17311,7 @@ w_metadata zootycoon2_demo games \
 
 load_zootycoon2_demo()
 {
-    w_download "http://download.microsoft.com/download/9/f/6/9f6a95f0-f34a-4312-9749-77b81d3de245/Zoo2Trial.exe" 60ad1bb34351f97b579c58234b926055f7979126
+    w_download "https://download.microsoft.com/download/9/f/6/9f6a95f0-f34a-4312-9749-77b81d3de245/Zoo2Trial.exe" d50e9c8bd8fd70d920f312dbe1b520688a5c6ae1352a6cbf2cfa5fc2036d0c5d
 
     w_try_cd "$W_CACHE/$W_PACKAGE"
     w_ahk_do "
@@ -19245,7 +18598,6 @@ for data in \
     shockwave:size_MB=134,time_sec=6 \
     sims3:size_MB=12884,time_sec=584 \
     sketchup:size_MB=319,time_sec=15 \
-    spotify:size_MB=59,time_sec=4 \
     starcraft2_demo:size_MB=5241,time_sec=211 \
     tahoma:size_MB=48,time_sec=0 \
     takao:size_MB=176,time_sec=3 \
@@ -19540,28 +18892,33 @@ execute_command()
     vd=*) w_do_call "$cmd";;
 
     # Hacks for backwards compatibility
-    cc580) w_call comctl32 ;;
-    comdlg32.ocx) w_call comdlg32ocx ;;
-    dotnet1) w_call dotnet11 ;;
-    dotnet2) w_call dotnet20 ;;
-    flash11) w_call flash ;;
-    fm20) w_call controlpad ;;   # art2kmin also comes with fm20.dll
-    fontsmooth-bgr) w_call fontsmooth=bgr ;;
-    fontsmooth-disable) w_call fontsmooth=disable ;;
-    fontsmooth-gray) w_call fontsmooth=gray ;;
-    fontsmooth-rgb) w_call fontsmooth=rgb ;;
-    glsl-disable) w_call glsl=disabled ;;
-    glsl-enable) w_call glsl=enabled ;;
-    ie6_full) w_call ie6 ;;
-    jscript) w_call wsh56js ;;            # FIXME: use wsh57 instead?
-    npm-repack) w_call npm=repack ;;
-    oss) w_call sound=oss ;;
-    python) w_call python26 ;;
-    vbrun60) w_call vb6run ;;
-    vcrun2005sp1) w_call vcrun2005 ;;
-    vcrun2008sp1) w_call vcrun2008 ;;
-    wsh56) w_call wsh57 ;;
-    xlive) w_call gfw ;;
+    # 2017/03/22: add deprecation notices
+    cc580) w_warn "Calling cc580 is deprecated, please use comctl32 instead" ; w_call comctl32 ;;
+    comdlg32.ocx) w_warn "Calling comdlg32.ocx is deprecated, please use comdlg32ocx instead" ; w_call comdlg32ocx ;;
+    dotnet1) w_warn "Calling dotnet1 is deprecated, please use dotnet11 instead" ; w_call dotnet11 ;;
+    dotnet2) w_warn "Calling dotnet2 is deprecated, please use dotnet20 instead" ; w_call dotnet20 ;;
+    flash11) w_warn "Calling flash11 is deprecated, please use flash instead" ; w_call flash ;;
+    # art2kmin also comes with fm20.dll
+    fm20) w_warn "Calling fm20 is deprecated, please use controlpad instead" ; w_call controlpad ;;
+    fontsmooth-bgr) w_warn "Calling fontsmooth-bgr is deprecated, please use fontsmooth=bgr instead" ; w_call fontsmooth=bgr ;;
+    fontsmooth-disable) w_warn "Calling fontsmooth-disable is deprecated, please use fontsmooth=disable instead" ; w_call fontsmooth=disable ;;
+    fontsmooth-gray) w_warn "Calling fontsmooth-gray is deprecated, please use fontsmooth=gray instead" ; w_call fontsmooth=gray ;;
+    fontsmooth-rgb) w_warn "Calling fontsmooth-rgb is deprecated, please use fontsmooth=rgb instead" ; w_call fontsmooth=rgb ;;
+    glsl-disable) w_warn "Calling glsl-disable is deprecated, please use glsl=disabled instead" ; w_call glsl=disabled ;;
+    glsl-enable) w_warn "Calling glsl-enable is deprecated, please use glsl=enabled instead" ; w_call glsl=enabled ;;
+    ie6_full) w_warn "Calling ie6_full is deprecated, please use ie6 instead" ; w_call ie6 ;;
+    # FIXME: use wsh57 instead?
+    jscript) w_warn "Calling jscript is deprecated, please use wsh56js instead" ; w_call wsh56js ;;
+    npm-repack) w_warn "Calling npm-repack is deprecated, please use npm=repack instead" ; w_call npm=repack ;;
+    oss) w_warn "Calling oss is deprecated, please use sound=oss instead" ; w_call sound=oss ;;
+    python) w_warn "Calling python is deprecated, please use python26 instead" ; w_call python26 ;;
+    vbrun60) w_warn "Calling vbrun60 is deprecated, please use vb6run instead" ; w_call vb6run ;;
+    vcrun2005sp1) w_warn "Calling vcrun2005sp1 is deprecated, please use vcrun2005 instead" ; w_call vcrun2005 ;;
+    vcrun2008sp1) w_warn "Calling vcrun2008sp1 is deprecated, please use vcrun2008 instead" ; w_call vcrun2008 ;;
+    wsh56) w_warn "Calling wsh56 is deprecated, please use wsh57 instead" ; w_call wsh57 ;;
+    # See https://github.com/Winetricks/winetricks/issues/747
+    xact_jun2010) w_warn "Calling xact_jun2010 is deprecated, please use xact instead" ; w_call xact ;;
+    xlive) w_warn "Calling xlive is deprecated, please use gfw instead" ; w_call gfw ;;
 
     # Normal verbs, with metadata and load_ functions
     *)
@@ -19683,11 +19040,11 @@ then
                 # Load the verb file
                 # shellcheck disable=SC1090
                 case $verb in
-                */*) . $verb ;;
-                *) . ./$verb ;;
+                    */*) . "$verb" ;;
+                    *) . ./"$verb" ;;
                 esac
                 # And forget that the verb comes from a file
-                verb="$(echo $verb | sed 's,.*/,,;s,.verb,,')"
+                verb="$(echo "$verb" | sed 's,.*/,,;s,.verb,,')"
                 ;;
             esac
             execute_command "$verb"
diff --git a/winetricks.1 b/winetricks.1
index f3cf18a..dc6badf 100644
--- a/winetricks.1
+++ b/winetricks.1
@@ -1,5 +1,5 @@
 .\" -*- nroff -*-
-.TH WINETRICKS 1 "March 2017" "Winetricks 20170316" "Wine Package Manager"
+.TH WINETRICKS 1 "March 2017" "Winetricks 20170327" "Wine Package Manager"
 .SH NAME
 winetricks \- manage virtual Windows environments using Wine
 .SH SYNOPSIS