From 0d9769c31a6702d3a3345825cfeadddd745da6327daa1ee4fa5a23db954dc016 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Mon, 15 May 2017 11:16:42 +0000
Subject: [PATCH] - Update to 2.8 development snapshot   - Direct3D command
 stream runs asynchronously.   - Better serial and parallel ports
 autodetection.   - Still more fixes for high DPI settings.   - System tray
 notifications on macOS.   - Various bug fixes. - updated winetricks

OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=419
---
 wine-2.7.tar.xz      |   3 -
 wine-2.7.tar.xz.sign |  16 ---
 wine-2.8.tar.xz      |   3 +
 wine-2.8.tar.xz.sign |  16 +++
 wine.changes         |  11 ++
 wine.spec            |   4 +-
 winetricks           | 301 ++++++++++++++++++++++++++++++++++---------
 7 files changed, 272 insertions(+), 82 deletions(-)
 delete mode 100644 wine-2.7.tar.xz
 delete mode 100644 wine-2.7.tar.xz.sign
 create mode 100644 wine-2.8.tar.xz
 create mode 100644 wine-2.8.tar.xz.sign

diff --git a/wine-2.7.tar.xz b/wine-2.7.tar.xz
deleted file mode 100644
index 4ce1319..0000000
--- a/wine-2.7.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e55a43088e313c45f7ab49272b7cb441c06f5659fb4220b2325dc060db0ee14c
-size 19101108
diff --git a/wine-2.7.tar.xz.sign b/wine-2.7.tar.xz.sign
deleted file mode 100644
index 1b1bb41..0000000
--- a/wine-2.7.tar.xz.sign
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlkDf0MACgkQzvrI6q8X
-UZ0tIg//ek6YIM66otEG0a+ltjwQJ8+V8mWGQI4/gKt/BMkb9JE0MrqUaq6JKTuk
-q6RWu5VCRxFEKOKpe5DrP1vt/rI4ld4KwJu05iERS6ZrDtZtsshBOJRzskLcDZUy
-+xaYRjRVdSDVwRjUlDE0F/nh5EMy1nGFNvx8giwnwGCmoHaXQI4NM1lAKMI5D9aR
-HFE+0axdnUQasYP4x1GLk8A+lBEEEsjl75CG9Heqxfs9AhKG4YkMP/F87YtrZJaP
-Yq3+YoCCsoUfb9/KbIFx9W/FUvobYtyoRc4ui2V7T6Z/gjTuws5tR1YBna3ti1Lw
-V77hhi547/9RU5bmb/1ipwOr7UpuTIbMzi8eRB77QZDTabZHdpAC2/PTaeeQLq0n
-JLx1AfcZSOGislsquXkt8NvqUL60EYHXcKqoXYKKHYNT1B29DQOZV/psgJOSsmjT
-i155VmS/WCeHV5HIXiyr98hlXvI01hKoQa+b+JQd4M7dquk8pFbricN+5bPxfm8t
-vdLpjKr2AjxEZI41HW17bwXFrroH2833zfO6J+ghOTWm04Z8txVyq8pbEij7HHck
-Moa4A+znGoq6x/K82qrM8TPnPN1zA2Ep1SDY8CT2edxwcKj/hMvDmZKiPBsXTtvb
-Qk0UMEAY0/spYrenhwpktpITRr5uEvWBes9kG/IWrsxtrSg0LOQ=
-=jZ64
------END PGP SIGNATURE-----
diff --git a/wine-2.8.tar.xz b/wine-2.8.tar.xz
new file mode 100644
index 0000000..877eaef
--- /dev/null
+++ b/wine-2.8.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:83e9607af66d86020dc27a368ebba28fa7e8ffecfdf8f149da06b3531ac3e579
+size 19120740
diff --git a/wine-2.8.tar.xz.sign b/wine-2.8.tar.xz.sign
new file mode 100644
index 0000000..329dec4
--- /dev/null
+++ b/wine-2.8.tar.xz.sign
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlkV5u0ACgkQzvrI6q8X
+UZ1lMxAAsHSLekUUraVbf4IL0RatIUdwkxEiqz/Cd6yTxROiwmVVCnNUpcpJnU+e
+s+R89xJxfopLBzOTi+PmyoUyJ55lVovJTzu+8nrvx5TjPiXZ3hpA0SyiL7fGH9P0
+RLeCACDzV7hBqwpccNgHFKLoqI+hYpoHC+sOYOpBvutQ5nHWS9kTGX+3KxlhDRDU
+ebPD1tb4ka9wyqMUEb7Cl1i+p1e7qrwIxv//PX+Xd012LAX1UhF6pvF65WzRDeBX
+FLQjVtlLqKEabzdkL+3BMHJ0T7iwjmKNkto/x/R1u9qukV3FCWss2/Z1TDWQ9ou8
+QTmbHIATTyr83j2/Rugyrqm50CbG7H2isZoMQOtp4kzyoHIlqvRKMQfATOWN4eoy
+aKcPvWKZsCTWK27AEf/78XmcqrjB/y6yw3qiRGt0/6XBdZaOgQDVhE1cmJNK69JO
+sF8Mdb5ElIjEBd8OlcdBJEJUjitm5aEbFa1QCOIAIEARY2SdW4VCBINQn1RnkE2U
+oE9wwx+myWaCfhLFBr9/6TmoGwa1XU1gNdWKwrlavTHz13czu5Nf+7nbc0VDuu+Q
+QL+imTI3E4M2zWZ21pnxp6GQTu3/W7udXSFpSRCmk1C41NnVrKx5Hbe49hNkspbL
+U/p8LzmgarKUA9YcGHMe3N9V2N9zeKR6WTamXOnVn3C2OFZaP+A=
+=3xdK
+-----END PGP SIGNATURE-----
diff --git a/wine.changes b/wine.changes
index 3e3a041..9e18427 100644
--- a/wine.changes
+++ b/wine.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon May 15 11:16:10 UTC 2017 - meissner@suse.com
+
+- Update to 2.8 development snapshot
+  - Direct3D command stream runs asynchronously.
+  - Better serial and parallel ports autodetection.
+  - Still more fixes for high DPI settings.
+  - System tray notifications on macOS.
+  - Various bug fixes.
+- updated winetricks
+
 -------------------------------------------------------------------
 Sat Apr 29 16:06:30 UTC 2017 - meissner@suse.com
 
diff --git a/wine.spec b/wine.spec
index f1a72ef..1d67f72 100644
--- a/wine.spec
+++ b/wine.spec
@@ -57,8 +57,8 @@ BuildRequires:  update-desktop-files
 BuildRequires:  valgrind-devel
 BuildRequires:  xorg-x11-devel
 BuildRequires:  pkgconfig(libudev)
-%define realver 2.7
-Version:        2.7
+%define realver 2.8
+Version:        2.8
 Release:        0
 Summary:        An MS Windows Emulator
 License:        LGPL-2.1+
diff --git a/winetricks b/winetricks
index 4e859aa..3efa0bc 100644
--- a/winetricks
+++ b/winetricks
@@ -5030,22 +5030,25 @@ helper_directx_Jun2010()
     DIRECTX_NAME=directx_Jun2010_redist.exe
 }
 
-# Filelist at ./misc/filelists/directx-feb2010.txt
+# Filelist at ./misc/filelists/directx-jun2010.txt
 helper_d3dx9_xx()
 {
     dllname=d3dx9_$1
 
-    helper_directx_dl
+    helper_directx_Jun2010
 
     # Even kinder, less invasive directx - only extract and override d3dx9_xx.dll
     w_try_cabextract -d "$W_TMP" -L -F "*$dllname*x86*" "$W_CACHE"/directx9/$DIRECTX_NAME
+
     for x in "$W_TMP"/*.cab
     do
       w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F "$dllname.dll" "$x"
     done
+
     if test "$W_ARCH" = "win64"
     then
         w_try_cabextract -d "$W_TMP" -L -F "*$dllname*x64*" "$W_CACHE"/directx9/$DIRECTX_NAME
+
         for x in "$W_TMP"/*x64.cab
         do
             w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F "$dllname.dll" "$x"
@@ -5060,9 +5063,11 @@ helper_win2ksp4()
 {
     filename=$1
 
-    # 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
+    # Originally at https://www.microsoft.com/en-us/download/details.aspx?id=4127
+    # Mirror list at http://www.filewatcher.com/m/w2ksp4_en.exe.135477136-0.html
+    # The rename from w2ksp4_en.exe to W2KSP4_EN.EXE avoids users having to redownload for a file rename
+    w_download_to win2ksp4 ftp://ftp.twaren.net/pub/cpatch/msupdate/win2000/en/w2ksp4_en.exe 167bb78d4adc957cc39fb4902517e1f32b1e62092353be5f8fb9ee647642de7e W2KSP4_EN.EXE
+    w_try_cabextract -d "$W_TMP" -L -F "$filename" "$W_CACHE"/win2ksp4/w2ksp4_en.exe
 }
 
 # Filelist at ./misc/filelists/winxpsp3.txt
@@ -5132,21 +5137,23 @@ load_adobeair()
 w_metadata amstream dlls \
     title="MS amstream.dll" \
     publisher="Microsoft" \
-    year="2010" \
+    year="2011" \
     media="download" \
-    file1="../directx9/directx_feb2010_redist.exe" \
+    file1="../win7sp1/windows6.1-KB976932-X86.exe" \
     installed_file1="$W_SYSTEM32_DLLS_WIN/amstream.dll"
 
 load_amstream()
 {
-    helper_directx_dl
-    mkdir "$W_CACHE"/amstream   # kludge so test -f $file1 works
+    helper_win7sp1 x86_microsoft-windows-directshow-other_31bf3856ad364e35_6.1.7601.17514_none_0f58f1e53efca91e/amstream.dll
+    w_try cp "$W_TMP/x86_microsoft-windows-directshow-other_31bf3856ad364e35_6.1.7601.17514_none_0f58f1e53efca91e/amstream.dll" "$W_SYSTEM32_DLLS/amstream.dll"
 
-    w_try_cabextract -d "$W_TMP" -L -F dxnt.cab "$W_CACHE"/directx9/$DIRECTX_NAME
-    w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'amstream.dll' "$W_TMP/dxnt.cab"
-    w_try_regsvr amstream.dll
+    if [ "$W_ARCH" = "win64" ]
+    then
+        helper_win7sp1_x64 amd64_microsoft-windows-directshow-other_31bf3856ad364e35_6.1.7601.17514_none_6b778d68f75a1a54/amstream.dll
+        w_try cp "$W_TMP/amd64_microsoft-windows-directshow-other_31bf3856ad364e35_6.1.7601.17514_none_6b778d68f75a1a54/amstream.dll" "$W_SYSTEM64_DLLS/amstream.dll"
+    fi
 
-    w_override_dlls native amstream
+    w_override_dlls native,builtin amstream
 }
 
 #----------------------------------------------------------------
@@ -5457,12 +5464,42 @@ load_d3dx9()
 
 #----------------------------------------------------------------
 
+w_metadata d3dx9_24 dlls \
+    title="MS d3dx9_24.dll" \
+    publisher="Microsoft" \
+    year="2010" \
+    media="download" \
+    file1="../directx9/directx_feb2010_redist.exe" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_24.dll"
+
+load_d3dx9_24()
+{
+    helper_d3dx9_xx 24
+}
+
+#----------------------------------------------------------------
+
+w_metadata d3dx9_25 dlls \
+    title="MS d3dx9_25.dll" \
+    publisher="Microsoft" \
+    year="2010" \
+    media="download" \
+    file1="../directx9/directx_Jun2010_redist.exe" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_25.dll"
+
+load_d3dx9_25()
+{
+    helper_d3dx9_xx 25
+}
+
+#----------------------------------------------------------------
+
 w_metadata d3dx9_26 dlls \
     title="MS d3dx9_26.dll" \
     publisher="Microsoft" \
     year="2010" \
     media="download" \
-    file1="../directx9/directx_feb2010_redist.exe" \
+    file1="../directx9/directx_Jun2010_redist.exe" \
     installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_26.dll"
 
 load_d3dx9_26()
@@ -5472,12 +5509,27 @@ load_d3dx9_26()
 
 #----------------------------------------------------------------
 
+w_metadata d3dx9_27 dlls \
+    title="MS d3dx9_27.dll" \
+    publisher="Microsoft" \
+    year="2010" \
+    media="download" \
+    file1="../directx9/directx_Jun2010_redist.exe" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_27.dll"
+
+load_d3dx9_27()
+{
+    helper_d3dx9_xx 27
+}
+
+#----------------------------------------------------------------
+
 w_metadata d3dx9_28 dlls \
     title="MS d3dx9_28.dll" \
     publisher="Microsoft" \
     year="2010" \
     media="download" \
-    file1="../directx9/directx_feb2010_redist.exe" \
+    file1="../directx9/directx_Jun2010_redist.exe" \
     installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_28.dll"
 
 load_d3dx9_28()
@@ -5487,12 +5539,42 @@ load_d3dx9_28()
 
 #----------------------------------------------------------------
 
+w_metadata d3dx9_29 dlls \
+    title="MS d3dx9_29.dll" \
+    publisher="Microsoft" \
+    year="2010" \
+    media="download" \
+    file1="../directx9/directx_Jun2010_redist.exe" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_29.dll"
+
+load_d3dx9_29()
+{
+    helper_d3dx9_xx 29
+}
+
+#----------------------------------------------------------------
+
+w_metadata d3dx9_30 dlls \
+    title="MS d3dx9_30.dll" \
+    publisher="Microsoft" \
+    year="2010" \
+    media="download" \
+    file1="../directx9/directx_Jun2010_redist.exe" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_30.dll"
+
+load_d3dx9_30()
+{
+    helper_d3dx9_xx 30
+}
+
+#----------------------------------------------------------------
+
 w_metadata d3dx9_31 dlls \
     title="MS d3dx9_31.dll" \
     publisher="Microsoft" \
     year="2010" \
     media="download" \
-    file1="../directx9/directx_feb2010_redist.exe" \
+    file1="../directx9/directx_Jun2010_redist.exe" \
     installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_31.dll"
 
 load_d3dx9_31()
@@ -5502,12 +5584,57 @@ load_d3dx9_31()
 
 #----------------------------------------------------------------
 
+w_metadata d3dx9_32 dlls \
+    title="MS d3dx9_32.dll" \
+    publisher="Microsoft" \
+    year="2010" \
+    media="download" \
+    file1="../directx9/directx_Jun2010_redist.exe" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_32.dll"
+
+load_d3dx9_32()
+{
+    helper_d3dx9_xx 32
+}
+
+#----------------------------------------------------------------
+
+w_metadata d3dx9_33 dlls \
+    title="MS d3dx9_33.dll" \
+    publisher="Microsoft" \
+    year="2010" \
+    media="download" \
+    file1="../directx9/directx_Jun2010_redist.exe" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_33.dll"
+
+load_d3dx9_33()
+{
+    helper_d3dx9_xx 33
+}
+
+#----------------------------------------------------------------
+
+w_metadata d3dx9_34 dlls \
+    title="MS d3dx9_34.dll" \
+    publisher="Microsoft" \
+    year="2010" \
+    media="download" \
+    file1="../directx9/directx_Jun2010_redist.exe" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_34.dll"
+
+load_d3dx9_34()
+{
+    helper_d3dx9_xx 34
+}
+
+#----------------------------------------------------------------
+
 w_metadata d3dx9_35 dlls \
     title="MS d3dx9_35.dll" \
     publisher="Microsoft" \
     year="2010" \
     media="download" \
-    file1="../directx9/directx_feb2010_redist.exe" \
+    file1="../directx9/directx_Jun2010_redist.exe" \
     installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_35.dll"
 
 load_d3dx9_35()
@@ -5522,7 +5649,7 @@ w_metadata d3dx9_36 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/d3dx9_36.dll"
 
 load_d3dx9_36()
@@ -5532,12 +5659,42 @@ load_d3dx9_36()
 
 #----------------------------------------------------------------
 
+w_metadata d3dx9_37 dlls \
+    title="MS d3dx9_37.dll" \
+    publisher="Microsoft" \
+    year="2010" \
+    media="download" \
+    file1="../directx9/directx_Jun2010_redist.exe" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_37.dll"
+
+load_d3dx9_37()
+{
+    helper_d3dx9_xx 37
+}
+
+#----------------------------------------------------------------
+
+w_metadata d3dx9_38 dlls \
+    title="MS d3dx9_38.dll" \
+    publisher="Microsoft" \
+    year="2010" \
+    media="download" \
+    file1="../directx9/directx_Jun2010_redist.exe" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_38.dll"
+
+load_d3dx9_38()
+{
+    helper_d3dx9_xx 38
+}
+
+#----------------------------------------------------------------
+
 w_metadata d3dx9_39 dlls \
     title="MS d3dx9_39.dll" \
     publisher="Microsoft" \
     year="2010" \
     media="download" \
-    file1="../directx9/directx_feb2010_redist.exe" \
+    file1="../directx9/directx_Jun2010_redist.exe" \
     installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_39.dll"
 
 load_d3dx9_39()
@@ -5547,12 +5704,42 @@ load_d3dx9_39()
 
 #----------------------------------------------------------------
 
+w_metadata d3dx9_40 dlls \
+    title="MS d3dx9_40.dll" \
+    publisher="Microsoft" \
+    year="2010" \
+    media="download" \
+    file1="../directx9/directx_Jun2010_redist.exe" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_40.dll"
+
+load_d3dx9_40()
+{
+    helper_d3dx9_xx 40
+}
+
+#----------------------------------------------------------------
+
+w_metadata d3dx9_41 dlls \
+    title="MS d3dx9_41.dll" \
+    publisher="Microsoft" \
+    year="2010" \
+    media="download" \
+    file1="../directx9/directx_Jun2010_redist.exe" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_41.dll"
+
+load_d3dx9_41()
+{
+    helper_d3dx9_xx 41
+}
+
+#----------------------------------------------------------------
+
 w_metadata d3dx9_42 dlls \
     title="MS d3dx9_42.dll" \
     publisher="Microsoft" \
     year="2010" \
     media="download" \
-    file1="../directx9/directx_feb2010_redist.exe" \
+    file1="../directx9/directx_Jun2010_redist.exe" \
     installed_file1="$W_SYSTEM32_DLLS_WIN/d3dx9_42.dll"
 
 load_d3dx9_42()
@@ -5572,25 +5759,7 @@ w_metadata d3dx9_43 dlls \
 
 load_d3dx9_43()
 {
-    dllname=d3dx9_43
-
-    helper_directx_Jun2010
-
-    w_try_cabextract -d "$W_TMP" -L -F "*$dllname*x86*" "$W_CACHE"/directx9/$DIRECTX_NAME
-    for x in "$W_TMP"/*.cab
-    do
-      w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F "$dllname.dll" "$x"
-    done
-    if test "$W_ARCH" = "win64"
-    then
-        w_try_cabextract -d "$W_TMP" -L -F "*$dllname*x64*" "$W_CACHE"/directx9/$DIRECTX_NAME
-        for x in "$W_TMP"/*x64.cab
-        do
-            w_try_cabextract -d "$W_SYSTEM64_DLLS" -L -F "$dllname.dll" "$x"
-        done
-    fi
-
-    w_override_dlls native $dllname
+    helper_d3dx9_xx 43
 }
 
 #----------------------------------------------------------------
@@ -6991,18 +7160,23 @@ load_dotnet_verifier()
 w_metadata dxdiagn dlls \
     title="DirectX Diagnostic Library" \
     publisher="Microsoft" \
-    year="2010" \
+    year="2011" \
     media="download" \
-    file1="../directx9/directx_feb2010_redist.exe" \
+    file1="../win7sp1/windows6.1-KB976932-X86.exe" \
     installed_file1="$W_SYSTEM32_DLLS_WIN/dxdiagn.dll"
 
 load_dxdiagn()
 {
-    helper_directx_dl
+    helper_win7sp1 x86_microsoft-windows-d..x-directxdiagnostic_31bf3856ad364e35_6.1.7601.17514_none_25cb021dbc0611db/dxdiagn.dll
+    w_try cp "$W_TMP/x86_microsoft-windows-d..x-directxdiagnostic_31bf3856ad364e35_6.1.7601.17514_none_25cb021dbc0611db/dxdiagn.dll" "$W_SYSTEM32_DLLS/dxdiagn.dll"
 
-    w_try_cabextract -d "$W_TMP" -L -F dxnt.cab "$W_CACHE"/directx9/$DIRECTX_NAME
-    w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F dxdiagn.dll "$W_TMP/dxnt.cab"
-    w_override_dlls native dxdiagn
+    if [ "$W_ARCH" = "win64" ]
+    then
+        helper_win7sp1_x64 amd64_microsoft-windows-d..x-directxdiagnostic_31bf3856ad364e35_6.1.7601.17514_none_81e99da174638311/dxdiagn.dll
+        w_try cp "$W_TMP/amd64_microsoft-windows-d..x-directxdiagnostic_31bf3856ad364e35_6.1.7601.17514_none_81e99da174638311/dxdiagn.dll" "$W_SYSTEM64_DLLS/dxdiagn.dll"
+    fi
+
+    w_override_dlls native,builtin dxdiagn
 }
 
 #----------------------------------------------------------------
@@ -7608,7 +7782,7 @@ w_metadata mdx dlls \
 
 load_mdx()
 {
-    helper_directx_dl
+    helper_directx_Jun2010
 
     w_try_cd "$W_TMP"
 
@@ -7911,7 +8085,10 @@ w_metadata msls31 dlls \
 load_msls31()
 {
     # Needed by native RichEdit and Internet Explorer
-    w_download https://download.microsoft.com/download/WindowsInstaller/Install/2.0/NT45/EN-US/InstMsiW.exe 4c3516c0b5c2b76b88209b22e3bf1cb82d8e2de7116125e97e128952372eed6b
+    # Originally at https://download.microsoft.com/download/WindowsInstaller/Install/2.0/NT45/EN-US/InstMsiW.exe
+    # Mirror list at http://www.filewatcher.com/m/InstMsiW.exe.1822848-0.html
+    w_download ftp://ftp.hp.com/pub/softlib/software/msi/InstMsiW.exe 4c3516c0b5c2b76b88209b22e3bf1cb82d8e2de7116125e97e128952372eed6b InstMsiW.exe
+
     w_try_cabextract --directory="$W_TMP" "$W_CACHE"/msls31/InstMsiW.exe
     w_try cp -f "$W_TMP"/msls31.dll "$W_SYSTEM32_DLLS"
 }
@@ -8258,23 +8435,25 @@ load_pngfilt()
 #----------------------------------------------------------------
 
 w_metadata qdvd dlls \
-    title="qdvd.dll (from DirectX 9 user redistributable)" \
+    title="qdvd.dll" \
     publisher="Microsoft" \
-    year="2010" \
+    year="2011" \
     media="download" \
-    file1="../directx9/directx_feb2010_redist.exe" \
+    file1="../win7sp1/windows6.1-KB976932-X86.exe" \
     installed_file1="$W_SYSTEM32_DLLS_WIN/qdvd.dll"
 
 load_qdvd()
 {
-    helper_directx_dl
+    helper_win7sp1 x86_microsoft-windows-directshow-dvdsupport_31bf3856ad364e35_6.1.7601.17514_none_562994bd321aac67/qdvd.dll
+    w_try cp "$W_TMP/x86_microsoft-windows-directshow-dvdsupport_31bf3856ad364e35_6.1.7601.17514_none_562994bd321aac67/qdvd.dll" "$W_SYSTEM32_DLLS/qdvd.dll"
 
-    w_try_cabextract -d "$W_TMP" -L -F dxnt.cab "$W_CACHE"/directx9/$DIRECTX_NAME
-    w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F qdvd.dll "$W_TMP/dxnt.cab"
+    if [ "$W_ARCH" = "win64" ]
+    then
+        helper_win7sp1_x64 amd64_microsoft-windows-directshow-dvdsupport_31bf3856ad364e35_6.1.7601.17514_none_b2483040ea781d9d/qdvd.dll
+        w_try cp "$W_TMP/amd64_microsoft-windows-directshow-dvdsupport_31bf3856ad364e35_6.1.7601.17514_none_b2483040ea781d9d/qdvd.dll" "$W_SYSTEM64_DLLS/qdvd.dll"
+    fi
 
-    w_try_regsvr qdvd.dll
-
-    w_override_dlls native qdvd
+    w_override_dlls native,builtin qdvd
 }
 
 #----------------------------------------------------------------
@@ -9473,7 +9652,7 @@ w_metadata xinput dlls \
 
 load_xinput()
 {
-    helper_directx_dl
+    helper_directx_Jun2010
 
     w_try_cabextract -d "$W_TMP" -L -F '*_xinput_*x86*' "$W_CACHE"/directx9/$DIRECTX_NAME
     for x in "$W_TMP"/*.cab
@@ -10072,7 +10251,7 @@ w_metadata opensymbol fonts \
     publisher="OpenOffice.org" \
     year="2016" \
     media="download" \
-    file1="fonts-opensymbol_102.2+LibO3.5.4+dfsg2-0+deb7u8_all.deb" \
+    file1="fonts-opensymbol_102.2+LibO3.5.4+dfsg2-0+deb7u9_all.deb" \
     installed_file1="$W_FONTSDIR_WIN/opens___.ttf"
 
 load_opensymbol()
@@ -10080,7 +10259,7 @@ load_opensymbol()
     # The OpenSymbol fonts are a replacement for the Windows Wingdings font from OpenOffice.org.
     # Need to w_download Debian since I can't find a standalone download from OpenOffice
     # Note: The source download package on debian is for _all_ of OpenOffice, which is 266 MB.
-    w_download http://security.debian.org/debian-security/pool/updates/main/libr/libreoffice/fonts-opensymbol_102.2+LibO3.5.4+dfsg2-0+deb7u8_all.deb 3b7ad433cf8944789be1f1b7cf14aed5c2f9dab26f04824eebea2a3a8544a777
+    w_download http://security.debian.org/debian-security/pool/updates/main/libr/libreoffice/fonts-opensymbol_102.2+LibO3.5.4+dfsg2-0+deb7u9_all.deb 11f272c3de3f2d891dfd067f467263ff361c08566a1a0ee5e5d64cbee459ee22
 
     w_try_cd "$W_TMP"
     w_try_ar "$W_CACHE/$W_PACKAGE/$file1" data.tar.xz
@@ -17974,7 +18153,7 @@ w_metadata windowmanagermanaged=y settings \
     title="Allow the window manager to control windows (default)"
 w_metadata windowmanagermanaged=n settings \
     title_uk="Не дозволяти менеджеру вікон керування вікнами" \
-    title="Prevent the window manager from controling windows"
+    title="Prevent the window manager from controlling windows"
 
 load_windowmanagermanaged()
 {
@@ -18165,7 +18344,7 @@ load_native_mdac()
 {
     # Set those overrides globally so user programs get MDAC's ODBC
     # instead of Wine's unixodbc
-    w_override_dlls native,builtin odbc32 odbccp32 oledb32
+    w_override_dlls native,builtin mtxdm odbc32 odbccp32 oledb32
 }
 
 #----------------------------------------------------------------