msxml3: Use even newer version from win7sp1

This is necessary for Adobe Premier to work.

src/winetricks

@@ -11770,33 +11770,21 @@ w_metadata msxml3 dlls \
 
 load_msxml3()
 {
-    # Service Pack 7
+    # Service Pack 7, includes a version of msxml3r.dll (resources DLL)
     # Originally at https://download.microsoft.com/download/8/8/8/888f34b7-4f54-4f06-8dac-fa29b19f33dd/msxml3.msi
     # Mirror list: http://www.filewatcher.com/m/msxml3.msi.1070592-0.html
     # Known bad sites (2017/06/11):
     # ftp://support.danbit.dk/D/DVD-RW-USB2B/Driver/Installation/Data/Redist/msxml3.msi
     # ftp://94.79.56.169/common/Client/MSXML%204.0%20Service%20Pack%202/msxml3.msi
     w_download https://media.codeweavers.com/pub/other/msxml3.msi f9c678f8217e9d4f9647e8a1f6d89a7c26a57b9e9e00d39f7487493dd7b4e36c
 
-    # Service Pack 10(?)
-    # See https://github.com/Winetricks/winetricks/issues/2148
-    if [ "${W_ARCH}" = "win32" ]; then
-        # 32 bit version
-        w_download https://download.microsoft.com/download/4/4/B/44B76554-81B0-4DEC-8F72-60BE7E28802C/WindowsServer2003-KB2939576-x86-ENU.exe 475efc68ab3bdcff7f26a8f1294e8b8e3b396bcc522b36e7a39347576da1b8ef
-        installer_exe=WindowsServer2003-KB2939576-x86-ENU.exe
-    elif [ "${W_ARCH}" = "win64" ]; then
-        # 64 bit version
-        w_download https://download.microsoft.com/download/C/8/D/C8D8E694-859C-4196-8B1C-CD8C9D4FC5D9/WindowsServer2003-KB2939576-x64-ENU.exe 5fd8b6976ecdefd5ed35e27b2e79c4eff5b9d175e0d1f5cd4e736e092107de36
-        installer_exe=WindowsServer2003-KB2939576-x64-ENU.exe
-    fi
-
     # It won't install on top of Wine's msxml3, which has a pretty high version number, so delete Wine's fake DLL
     rm "${W_SYSTEM32_DLLS}"/msxml3.dll
     w_override_dlls native msxml3
     w_try_cd "${W_CACHE}/${W_PACKAGE}"
 
-    # Start with installing the older, 32-bit only version, this is needed for
-    # the updated version to properly install for some reason
+    # Start with installing the older 32-bit only version, to get at least some
+    # version of the resources DLL, which is not included in win7sp1
     # Use quiet install, see https://github.com/Winetricks/winetricks/issues/1086
     # and https://bugs.winehq.org/show_bug.cgi?id=26925
     if w_workaround_wine_bug 26925 "Forcing quiet install"; then
@@ -11806,10 +11794,13 @@ load_msxml3()
     fi
 
     # Install newer version, which includes the x64 DLL if applicable
-    w_set_winver win2k3
-    # Force quiet mode to avoid permanent hang after install
-    w_try "${WINE}" "${installer_exe}" /q
-    w_set_winver default
+    helper_win7sp1 wow64_microsoft-windows-msxml30_31bf3856ad364e35_6.1.7601.17514_none_f0e8f05be1d66e78/msxml3.dll
+    w_try_cp_dll "${W_TMP}/wow64_microsoft-windows-msxml30_31bf3856ad364e35_6.1.7601.17514_none_f0e8f05be1d66e78/msxml3.dll" "${W_SYSTEM32_DLLS}/crypt32.dll"
+
+    if [ "${W_ARCH}" = "win64" ]; then
+        helper_win7sp1_x64 amd64_microsoft-windows-msxml30_31bf3856ad364e35_6.1.7601.17514_none_e6944609ad75ac7d/msxml3.dll
+        w_try_cp_dll "${W_TMP}/amd64_microsoft-windows-msxml30_31bf3856ad364e35_6.1.7601.17514_none_e6944609ad75ac7d/msxml3.dll" "${W_SYSTEM64_DLLS}/crypt32.dll"
+    fi
 }
 
 #----------------------------------------------------------------