From fa2f3233442929ae79f76537d6805bc929026583 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Sat, 25 Oct 2025 17:34:41 +1100 Subject: [PATCH] Rebase against 606d2f48bf8149bf45153f11ef3501eece20762c. --- ...nterfaces-already-define-in-msxml6.i.patch | 45 +++---------------- ...xml3-Implement-FreeThreadedXMLHTTP60.patch | 25 +++++------ 2 files changed, 16 insertions(+), 54 deletions(-) diff --git a/patches/msxml3-FreeThreadedXMLHTTP60/0001-include-Remove-interfaces-already-define-in-msxml6.i.patch b/patches/msxml3-FreeThreadedXMLHTTP60/0001-include-Remove-interfaces-already-define-in-msxml6.i.patch index 4fbb2723..014e3b16 100644 --- a/patches/msxml3-FreeThreadedXMLHTTP60/0001-include-Remove-interfaces-already-define-in-msxml6.i.patch +++ b/patches/msxml3-FreeThreadedXMLHTTP60/0001-include-Remove-interfaces-already-define-in-msxml6.i.patch @@ -1,4 +1,4 @@ -From 5415f4b6355c3d28d1fbe34aa3627554cea04e36 Mon Sep 17 00:00:00 2001 +From 3db26a0859c98d02796b1a7b8f8f8718c8c90386 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 11 Sep 2020 17:55:59 +1000 Subject: [PATCH] include: Remove interfaces already define in msxml6.idl @@ -9,12 +9,11 @@ Signed-off-by: Alistair Leslie-Hughes dlls/msxml3/tests/saxreader.c | 1 + dlls/msxml3/tests/schema.c | 5 +++++ dlls/msxml3/uuid.c | 3 +++ - include/msxml2.idl | 9 --------- include/msxml6.idl | 24 ++++++++++++------------ - 6 files changed, 22 insertions(+), 23 deletions(-) + 5 files changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c -index cd10ec5f8de..782df43dc06 100644 +index 58477529708..3a198d4c516 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -31,6 +31,7 @@ @@ -25,7 +24,7 @@ index cd10ec5f8de..782df43dc06 100644 #include "xmlparser.h" /* undef the #define in msxml2 so that we can access the v.2 version -@@ -52,8 +53,6 @@ DEFINE_GUID(CLSID_XSLTemplate60, 0x88d96a08, 0xf192, 0x11d4, 0xa6, 0x5f, 0x00, 0 +@@ -53,8 +54,6 @@ DEFINE_GUID(CLSID_XSLTemplate60, 0x88d96a08, 0xf192, 0x11d4, 0xa6, 0x5f, 0x00, 0 WINE_DEFAULT_DEBUG_CHANNEL(msxml); @@ -35,7 +34,7 @@ index cd10ec5f8de..782df43dc06 100644 typedef HRESULT (*DOMFactoryCreateInstanceFunc)(MSXML_VERSION, void**); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c -index 31424aa62b6..e847c399814 100644 +index cba3e5c6a63..a7fe38f0384 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -29,6 +29,7 @@ @@ -62,40 +61,6 @@ index 50e5a743b82..c83e72e136a 100644 #include "wine/test.h" static const WCHAR xdr_schema1_uri[] = L"x-schema:test1.xdr"; -diff --git a/dlls/msxml3/uuid.c b/dlls/msxml3/uuid.c -index 7e50b439146..a51e3b27580 100644 ---- a/dlls/msxml3/uuid.c -+++ b/dlls/msxml3/uuid.c -@@ -41,6 +41,9 @@ - #include "initguid.h" - #include "msxml2.h" - -+/* Cannot include msxml6 here since we will get a duplicate LIBID_MSXML2 error. */ -+DEFINE_GUID(CLSID_SAXXMLReader60, 0x88d96a0c, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); -+ - /* - * Note that because of a #define in msxml2.h, we end up initializing - * CLSID_DOMDocument2 to be the v.3 version independent DOMDocument -diff --git a/include/msxml2.idl b/include/msxml2.idl -index d91087bec93..85bb6a5b0cb 100644 ---- a/include/msxml2.idl -+++ b/include/msxml2.idl -@@ -3256,15 +3256,6 @@ coclass SAXXMLReader40 - interface ISAXXMLReader; - } - --[ -- uuid(88d96a0c-f192-11d4-a65f-0040963251e5) --] --coclass SAXXMLReader60 --{ -- [default] interface IVBSAXXMLReader; -- interface ISAXXMLReader; --} -- - [ - helpstring("SAX XML Reader"), - progid("Msxml2.SAXXMLReader"), diff --git a/include/msxml6.idl b/include/msxml6.idl index ead87be7516..bf7e0905057 100644 --- a/include/msxml6.idl diff --git a/patches/msxml3-FreeThreadedXMLHTTP60/0002-msxml3-Implement-FreeThreadedXMLHTTP60.patch b/patches/msxml3-FreeThreadedXMLHTTP60/0002-msxml3-Implement-FreeThreadedXMLHTTP60.patch index 9430c57d..1aa2042e 100644 --- a/patches/msxml3-FreeThreadedXMLHTTP60/0002-msxml3-Implement-FreeThreadedXMLHTTP60.patch +++ b/patches/msxml3-FreeThreadedXMLHTTP60/0002-msxml3-Implement-FreeThreadedXMLHTTP60.patch @@ -1,4 +1,4 @@ -From a6a004bc410fbe8fc5106c4f0fa379bfde612725 Mon Sep 17 00:00:00 2001 +From a7e02a05c19ee1a371a36fd98ec9a0a6cfb2b8d1 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. @@ -11,9 +11,9 @@ Update from Gijs Vermeulen dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/tests/httpreq.c | 395 +++++++++++++++++++++++++++- dlls/msxml3/tests/schema.c | 6 + - dlls/msxml3/uuid.c | 6 +- + dlls/msxml3/uuid.c | 6 + include/msxml6.idl | 22 +- - 8 files changed, 915 insertions(+), 17 deletions(-) + 8 files changed, 916 insertions(+), 16 deletions(-) diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in index 7e59a223143..5044c4e2c79 100644 @@ -27,10 +27,10 @@ index 7e59a223143..5044c4e2c79 100644 SOURCES = \ diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c -index 782df43dc06..f479d6bd17e 100644 +index 3a198d4c516..25c2abbbe76 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c -@@ -288,6 +288,7 @@ static HRESULT DOMClassFactory_Create(const GUID *clsid, REFIID riid, void **ppv +@@ -289,6 +289,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 782df43dc06..f479d6bd17e 100644 static ClassFactory serverhttp = { { &ClassFactoryVtbl }, ServerXMLHTTP_create }; static ClassFactory xsltemplatecf = { { &ClassFactoryVtbl }, XSLTemplate_create }; static ClassFactory mxnsmanagercf = { {&ClassFactoryVtbl }, MXNamespaceManager_create }; -@@ -349,6 +350,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) +@@ -350,6 +351,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) { cf = &httpreqcf.IClassFactory_iface; } @@ -1038,22 +1038,19 @@ index c83e72e136a..c896f1e6a04 100644 #include "wine/test.h" diff --git a/dlls/msxml3/uuid.c b/dlls/msxml3/uuid.c -index a51e3b27580..e2b564cf891 100644 +index 7e50b439146..15318d3ad1d 100644 --- a/dlls/msxml3/uuid.c +++ b/dlls/msxml3/uuid.c -@@ -43,7 +43,11 @@ +@@ -56,3 +56,9 @@ + */ - /* Cannot include msxml6 here since we will get a duplicate LIBID_MSXML2 error. */ - DEFINE_GUID(CLSID_SAXXMLReader60, 0x88d96a0c, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); -- + DEFINE_GUID(CLSID_XMLSchemaCache60, 0x88d96a07, 0xf192, 0x11d4, 0xa6, 0x5f, 0x00, 0x40, 0x96, 0x32, 0x51, 0xe5); ++ +DEFINE_GUID(CLSID_FreeThreadedXMLHTTP60, 0x88d96a09, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); +DEFINE_GUID(IID_IXMLHTTPRequest2, 0xe5d37dc0, 0x552a, 0x4d52, 0x9c,0xc0, 0xa1,0x4d,0x54,0x6f,0xbd,0x04); +DEFINE_GUID(IID_IXMLHTTPRequest3, 0xa1c9feee, 0x0617, 0x4f23, 0x9d,0x58, 0x89,0x61,0xea,0x43,0x56,0x7c); +DEFINE_GUID(IID_IXMLHTTPRequest2Callback, 0xa44a9299, 0xe321, 0x40de, 0x88,0x66, 0x34,0x1b,0x41,0x66,0x91,0x62); +DEFINE_GUID(IID_IXMLHTTPRequest3Callback, 0xb9e57830, 0x8c6c, 0x4a6f, 0x9c,0x13, 0x47,0x77,0x2b,0xb0,0x47,0xbb); - /* - * Note that because of a #define in msxml2.h, we end up initializing - * CLSID_DOMDocument2 to be the v.3 version independent DOMDocument diff --git a/include/msxml6.idl b/include/msxml6.idl index bf7e0905057..a02f7b2db14 100644 --- a/include/msxml6.idl