diff --git a/patches/msxml3-FreeThreadedXMLHTTP60/0003-msxml3-Implement-FreeThreadedXMLHTTP60.patch b/patches/msxml3-FreeThreadedXMLHTTP60/0003-msxml3-Implement-FreeThreadedXMLHTTP60.patch index 387e49ab..f62e0075 100644 --- a/patches/msxml3-FreeThreadedXMLHTTP60/0003-msxml3-Implement-FreeThreadedXMLHTTP60.patch +++ b/patches/msxml3-FreeThreadedXMLHTTP60/0003-msxml3-Implement-FreeThreadedXMLHTTP60.patch @@ -1,4 +1,4 @@ -From 754cda08319f931f20d07f5197aa5840a6bee0ed Mon Sep 17 00:00:00 2001 +From 605c054026a8f871f28292425f1634895a9d3057 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. @@ -7,12 +7,12 @@ Update from Gijs Vermeulen --- dlls/msxml3/Makefile.in | 2 +- dlls/msxml3/factory.c | 5 + - dlls/msxml3/httprequest.c | 496 +++++++++++++++++++++++++++++++++++- + dlls/msxml3/httprequest.c | 495 +++++++++++++++++++++++++++++++++++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/tests/httpreq.c | 395 +++++++++++++++++++++++++++- dlls/msxml3/tests/schema.c | 6 + dlls/msxml3/uuid.c | 5 + - 7 files changed, 905 insertions(+), 5 deletions(-) + 7 files changed, 904 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in index 2bf789732da..e2d737599b1 100644 @@ -49,7 +49,7 @@ index 243ee379712..323c7b49848 100644 IsEqualCLSID( rclsid, &CLSID_ServerXMLHTTP30 ) || IsEqualCLSID( rclsid, &CLSID_ServerXMLHTTP40 ) || diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c -index cc384a380e5..9f89b5cb8fb 100644 +index cc384a380e5..98dd23c9fbb 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -38,10 +38,12 @@ @@ -571,11 +571,6 @@ index cc384a380e5..9f89b5cb8fb 100644 HRESULT ServerXMLHTTP_create(void **obj) { serverhttp *req; -@@ -2126,3 +2619,4 @@ HRESULT ServerXMLHTTP_create(void **obj) - - return S_OK; - } -+ diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 8003c1a9650..59b8c29845d 100644 --- a/dlls/msxml3/msxml_private.h @@ -589,7 +584,7 @@ index 8003c1a9650..59b8c29845d 100644 extern HRESULT XSLTemplate_create(void**) DECLSPEC_HIDDEN; extern HRESULT MXWriter_create(MSXML_VERSION, void**) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c -index bf52e71a6e7..285ef527f05 100644 +index bccfbaf582a..23d7680d196 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -26,9 +26,9 @@ @@ -604,7 +599,7 @@ index bf52e71a6e7..285ef527f05 100644 #include "dispex.h" #include "initguid.h" -@@ -1345,6 +1345,17 @@ static IXMLHttpRequest *create_xhr(void) +@@ -1344,6 +1344,17 @@ static IXMLHttpRequest *create_xhr(void) return SUCCEEDED(hr) ? ret : NULL; } @@ -622,7 +617,7 @@ index bf52e71a6e7..285ef527f05 100644 static IServerXMLHTTPRequest *create_server_xhr(void) { IServerXMLHTTPRequest *ret; -@@ -1905,11 +1916,388 @@ static void test_supporterrorinfo(void) +@@ -1904,11 +1915,388 @@ static void test_supporterrorinfo(void) IServerXMLHTTPRequest_Release(server_xhr); } @@ -1012,7 +1007,7 @@ index bf52e71a6e7..285ef527f05 100644 if (!(xhr = create_xhr())) { -@@ -1924,6 +2312,7 @@ START_TEST(httpreq) +@@ -1923,6 +2311,7 @@ START_TEST(httpreq) test_server_xhr(); test_safe_httpreq(); test_supporterrorinfo(); @@ -1021,7 +1016,7 @@ index bf52e71a6e7..285ef527f05 100644 CoUninitialize(); } diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c -index fd7abca151d..f518068acb6 100644 +index 99c7d35cc10..2b63182e2e4 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -32,10 +32,16 @@