diff --git a/patches/msxml3-FreeThreadedXMLHTTP60/0003-msxml3-Implement-FreeThreadedXMLHTTP60.patch b/patches/msxml3-FreeThreadedXMLHTTP60/0003-msxml3-Implement-FreeThreadedXMLHTTP60.patch index 2e7e2934..0b4889e2 100644 --- a/patches/msxml3-FreeThreadedXMLHTTP60/0003-msxml3-Implement-FreeThreadedXMLHTTP60.patch +++ b/patches/msxml3-FreeThreadedXMLHTTP60/0003-msxml3-Implement-FreeThreadedXMLHTTP60.patch @@ -1,4 +1,4 @@ -From c1208e9a19cb0d0752c8d76d6a17f8b848ff0728 Mon Sep 17 00:00:00 2001 +From 84c611b7d9345b2b1ea551df24be0c093b11ccb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= Date: Tue, 8 Sep 2020 18:43:52 +0200 Subject: [PATCH] msxml3: Implement FreeThreadedXMLHTTP60. @@ -15,11 +15,10 @@ Update from Gijs Vermeulen 7 files changed, 905 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in -index 7e3eccc0139..b14723d60fd 100644 +index 2bf789732da..e2d737599b1 100644 --- a/dlls/msxml3/Makefile.in +++ b/dlls/msxml3/Makefile.in -@@ -1,6 +1,6 @@ - EXTRADEFS = -DWINE_NO_LONG_TYPES +@@ -1,5 +1,5 @@ MODULE = msxml3.dll -IMPORTS = $(XSLT_PE_LIBS) $(XML2_PE_LIBS) uuid urlmon shlwapi oleaut32 ole32 user32 advapi32 +IMPORTS = $(XSLT_PE_LIBS) $(XML2_PE_LIBS) uuid urlmon shlwapi oleaut32 ole32 user32 advapi32 rtworkq @@ -27,10 +26,10 @@ index 7e3eccc0139..b14723d60fd 100644 C_SRCS = \ diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c -index 34aa3bc4e23..651a6b8e9df 100644 +index 243ee379712..323c7b49848 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c -@@ -277,6 +277,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 +37,7 @@ index 34aa3bc4e23..651a6b8e9df 100644 static ClassFactory serverhttp = { { &ClassFactoryVtbl }, ServerXMLHTTP_create }; static ClassFactory xsltemplatecf = { { &ClassFactoryVtbl }, XSLTemplate_create }; static ClassFactory mxnsmanagercf = { {&ClassFactoryVtbl }, MXNamespaceManager_create }; -@@ -338,6 +339,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 +49,7 @@ index 34aa3bc4e23..651a6b8e9df 100644 IsEqualCLSID( rclsid, &CLSID_ServerXMLHTTP30 ) || IsEqualCLSID( rclsid, &CLSID_ServerXMLHTTP40 ) || diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c -index 934d580064f..65232bbc8af 100644 +index cc384a380e5..70855d5c6ee 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -38,10 +38,12 @@ @@ -67,7 +66,7 @@ index 934d580064f..65232bbc8af 100644 static const WCHAR colspaceW[] = {':',' ',0}; static const WCHAR crlfW[] = {'\r','\n',0}; -@@ -2074,6 +2076,468 @@ static const struct IServerXMLHTTPRequestVtbl ServerXMLHTTPRequestVtbl = +@@ -2058,6 +2060,468 @@ static const struct IServerXMLHTTPRequestVtbl ServerXMLHTTPRequestVtbl = ServerXMLHTTPRequest_setOption }; @@ -536,7 +535,7 @@ index 934d580064f..65232bbc8af 100644 static void init_httprequest(httprequest *req) { req->IXMLHTTPRequest_iface.lpVtbl = &XMLHTTPRequestVtbl; -@@ -2123,6 +2587,35 @@ HRESULT XMLHTTPRequest_create(void **obj) +@@ -2107,6 +2571,35 @@ HRESULT XMLHTTPRequest_create(void **obj) return S_OK; } @@ -572,7 +571,7 @@ index 934d580064f..65232bbc8af 100644 HRESULT ServerXMLHTTP_create(void **obj) { serverhttp *req; -@@ -2142,3 +2635,4 @@ HRESULT ServerXMLHTTP_create(void **obj) +@@ -2126,3 +2619,4 @@ HRESULT ServerXMLHTTP_create(void **obj) return S_OK; } diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index add9d80c..9350b02b 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "adda27cdb82fd40ef71e554b8ba17244cb871710" + echo "cc91ba6da75ab82d249a5fea3b00abded5021585" } # Show version information diff --git a/staging/upstream-commit b/staging/upstream-commit index 5671f5c5..0ad81a56 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -adda27cdb82fd40ef71e554b8ba17244cb871710 +cc91ba6da75ab82d249a5fea3b00abded5021585