msxml3: Update to newer version; add 64-bit support

Closes #2148

src/winetricks

@@ -11778,18 +11778,38 @@ load_msxml3()
     # 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}"
 
-    # See https://github.com/Winetricks/winetricks/issues/1086
+    # Start with installing the older, 32-bit only version, this is needed for
+    # the updated version to properly install for some reason
+    # 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
         w_try "${WINE}" msiexec /i msxml3.msi /q
     else
         w_try "${WINE}" msiexec /i msxml3.msi ${W_OPT_UNATTENDED:+/q}
     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
 }
 
 #----------------------------------------------------------------