Rebase against 94dc1f470cc7adfee75cb0718e953ca1954599ef.

patches/msxml3-FreeThreadedXMLHTTP60/0002-msxml3-Implement-FreeThreadedXMLHTTP60.patch

@@ -1,4 +1,4 @@
-From c4694f8dfffa56648976c1a05bb4788262a8677b Mon Sep 17 00:00:00 2001
+From 5bcc58b53dd99c5d6d85141d5658a5d7e98d8253 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
 Date: Tue, 8 Sep 2020 18:43:52 +0200
 Subject: [PATCH] msxml3: Implement FreeThreadedXMLHTTP60.
@@ -27,10 +27,10 @@ index 7e59a223143..5044c4e2c79 100644
  
  SOURCES = \
 diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c
-index 218ba87c4a8..ed14bd63a87 100644
+index e35839db2a3..0e2482d61be 100644
 --- a/dlls/msxml3/factory.c
 +++ b/dlls/msxml3/factory.c
-@@ -281,6 +281,7 @@ static HRESULT DOMClassFactory_Create(const GUID *clsid, REFIID riid, void **ppv
+@@ -279,6 +279,7 @@ static HRESULT DOMClassFactory_Create(const GUID *clsid, REFIID riid, void **ppv
  
  static ClassFactory xmldoccf = { { &ClassFactoryVtbl }, XMLDocument_create };
  static ClassFactory httpreqcf = { { &ClassFactoryVtbl }, XMLHTTPRequest_create };
@@ -38,7 +38,7 @@ index 218ba87c4a8..ed14bd63a87 100644
  static ClassFactory serverhttp = { { &ClassFactoryVtbl }, ServerXMLHTTP_create };
  static ClassFactory xsltemplatecf = { { &ClassFactoryVtbl }, XSLTemplate_create };
  static ClassFactory mxnsmanagercf = { {&ClassFactoryVtbl }, MXNamespaceManager_create };
-@@ -342,6 +343,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv )
+@@ -340,6 +341,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv )
      {
          cf = &httpreqcf.IClassFactory_iface;
      }
@@ -50,7 +50,7 @@ index 218ba87c4a8..ed14bd63a87 100644
               IsEqualCLSID( rclsid, &CLSID_ServerXMLHTTP30 ) ||
               IsEqualCLSID( rclsid, &CLSID_ServerXMLHTTP40 ) ||
 diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c
-index 6e4ab4c6519..412958a2a40 100644
+index 90be57ebabf..15a591c90be 100644
 --- a/dlls/msxml3/httprequest.c
 +++ b/dlls/msxml3/httprequest.c
 @@ -37,10 +37,12 @@
@@ -65,9 +65,9 @@ index 6e4ab4c6519..412958a2a40 100644
 -WINE_DEFAULT_DEBUG_CHANNEL(msxml);
 +WINE_DEFAULT_DEBUG_CHANNEL(xmlhttp);
  
- static const WCHAR colspaceW[] = {':',' ',0};
- static const WCHAR crlfW[] = {'\r','\n',0};
-@@ -2054,6 +2056,468 @@ static const struct IServerXMLHTTPRequestVtbl ServerXMLHTTPRequestVtbl =
+ static const DWORD safety_supported_options =
+     INTERFACESAFE_FOR_UNTRUSTED_CALLER |
+@@ -2044,6 +2046,468 @@ static const struct IServerXMLHTTPRequestVtbl ServerXMLHTTPRequestVtbl =
      ServerXMLHTTPRequest_setOption
  };
  
@@ -536,7 +536,7 @@ index 6e4ab4c6519..412958a2a40 100644
  static void init_httprequest(httprequest *req)
  {
      req->IXMLHTTPRequest_iface.lpVtbl = &XMLHTTPRequestVtbl;
-@@ -2103,6 +2567,35 @@ HRESULT XMLHTTPRequest_create(void **obj)
+@@ -2093,6 +2557,35 @@ HRESULT XMLHTTPRequest_create(void **obj)
      return S_OK;
  }
  
@@ -573,7 +573,7 @@ index 6e4ab4c6519..412958a2a40 100644
  {
      serverhttp *req;
 diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h
-index 54f54995c76..6188414c5ce 100644
+index ea492bc6b36..c2827563884 100644
 --- a/dlls/msxml3/msxml_private.h
 +++ b/dlls/msxml3/msxml_private.h
 @@ -343,6 +343,7 @@ extern HRESULT XMLDocument_create(void**);
@@ -1061,7 +1061,7 @@ index 7214d23c5dc..320a7e04fa3 100644
  /*
   * Note that because of a #define in msxml2.h, we end up initializing
 diff --git a/include/msxml6.idl b/include/msxml6.idl
-index 7396826a1f6..b2d8bd3b337 100644
+index bf7e0905057..a02f7b2db14 100644
 --- a/include/msxml6.idl
 +++ b/include/msxml6.idl
 @@ -1715,17 +1715,6 @@ interface ISAXDeclHandler : IUnknown
@@ -1101,5 +1101,5 @@ index 7396826a1f6..b2d8bd3b337 100644
      helpstring("XML DOM Document 6.0"),
      progid("Msxml2.DOMDocument.6.0"),
 -- 
-2.43.0
+2.47.2
 

staging/upstream-commit

@@ -1 +1 @@
-a46043015322bf8e6c78a74bd33300f3478767e3
+94dc1f470cc7adfee75cb0718e953ca1954599ef