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 7af58ec4..c48f692e 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,7 +1,7 @@ -From 5c873ba9b51531c7e41b77424b46264ed712b972 Mon Sep 17 00:00:00 2001 +From f4dee57bb2912eb76741eaf74ee07397409167df Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 11 Sep 2020 17:55:59 +1000 -Subject: [PATCH 1/3] include: Remove interfaces already define in msxml6.idl +Subject: [PATCH] include: Remove interfaces already define in msxml6.idl Signed-off-by: Alistair Leslie-Hughes --- @@ -10,10 +10,11 @@ Signed-off-by: Alistair Leslie-Hughes dlls/msxml3/tests/schema.c | 5 ++ dlls/msxml3/uuid.c | 11 ++++ include/msxml2.idl | 109 ---------------------------------- - 5 files changed, 18 insertions(+), 109 deletions(-) + include/msxml6.idl | 24 ++++---- + 6 files changed, 30 insertions(+), 121 deletions(-) diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c -index 445cfbf730..b8452ff4b4 100644 +index 445cfbf730d..b8452ff4b4e 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -35,6 +35,7 @@ @@ -25,7 +26,7 @@ index 445cfbf730..b8452ff4b4 100644 /* undef the #define in msxml2 so that we can access the v.2 version diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c -index 986f429cc1..db39919a41 100644 +index ab814c5f764..e8441311776 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -29,6 +29,7 @@ @@ -37,7 +38,7 @@ index 986f429cc1..db39919a41 100644 #include "ocidl.h" #include "dispex.h" diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c -index 4637d62f8b..805f05cb71 100644 +index d1622ffc7da..964e368bf84 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -32,6 +32,11 @@ @@ -53,7 +54,7 @@ index 4637d62f8b..805f05cb71 100644 #define EXPECT_HR(hr,hr_exp) \ diff --git a/dlls/msxml3/uuid.c b/dlls/msxml3/uuid.c -index 4abbe5e476..333d4f3d3c 100644 +index 4abbe5e4763..333d4f3d3c7 100644 --- a/dlls/msxml3/uuid.c +++ b/dlls/msxml3/uuid.c @@ -41,6 +41,17 @@ @@ -75,7 +76,7 @@ index 4abbe5e476..333d4f3d3c 100644 * 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 916e0e8ab3..1d1ba7a524 100644 +index 916e0e8ab3d..1d1ba7a5248 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -1612,15 +1612,6 @@ coclass FreeThreadedDOMDocument40 @@ -257,6 +258,48 @@ index 916e0e8ab3..1d1ba7a524 100644 [ helpstring("SAXAttributes"), progid("Msxml2.SAXAttributes"), +diff --git a/include/msxml6.idl b/include/msxml6.idl +index 5bfb21d04ae..bfea408ab21 100644 +--- a/include/msxml6.idl ++++ b/include/msxml6.idl +@@ -2946,18 +2946,6 @@ coclass DOMDocument60 + [default, source] dispinterface XMLDOMDocumentEvents; + } + +-[ +- helpstring("Free threaded XML DOM Document 6.0"), +- progid("Msxml2.FreeThreadedDOMDocument.6.0"), +- threading(both), +- uuid(88d96a06-f192-11d4-a65f-0040963251e5), +-] +-coclass FreeThreadedDOMDocument60 +-{ +- [default] interface IXMLDOMDocument3; +- [default, source] dispinterface XMLDOMDocumentEvents; +-} +- + [ + helpstring("SAX XML Reader 6.0"), + progid("Msxml2.SAXXMLReader.6.0"), +@@ -3063,6 +3051,18 @@ coclass XSLTemplate60 + [default] interface IXSLTemplate; + } + ++[ ++ helpstring("Free threaded XML DOM Document 6.0"), ++ progid("Msxml2.FreeThreadedDOMDocument.6.0"), ++ threading(both), ++ uuid(88d96a06-f192-11d4-a65f-0040963251e5), ++] ++coclass FreeThreadedDOMDocument60 ++{ ++ [default] interface IXMLDOMDocument3; ++ [default, source] dispinterface XMLDOMDocumentEvents; ++} ++ + [ + helpstring("XML HTTP 6.0"), + progid("Msxml2.XMLHTTP.6.0"), -- -2.28.0 +2.29.2 diff --git a/patches/msxml3-FreeThreadedXMLHTTP60/0002-include-Add-IXMLHTTPRequest2-3-interfaces.patch b/patches/msxml3-FreeThreadedXMLHTTP60/0002-include-Add-IXMLHTTPRequest2-3-interfaces.patch index a625120e..b5b358d7 100644 --- a/patches/msxml3-FreeThreadedXMLHTTP60/0002-include-Add-IXMLHTTPRequest2-3-interfaces.patch +++ b/patches/msxml3-FreeThreadedXMLHTTP60/0002-include-Add-IXMLHTTPRequest2-3-interfaces.patch @@ -1,7 +1,7 @@ -From cf32f7460fe0df6bb9dfb80c5a55473246ff4018 Mon Sep 17 00:00:00 2001 +From 0582e37b52e2484a6f27b99b25fdf62afd31a4df Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Thu, 3 Sep 2020 17:59:10 +1000 -Subject: [PATCH 2/3] include: Add IXMLHTTPRequest2/3 interfaces +Subject: [PATCH] include: Add IXMLHTTPRequest2/3 interfaces Signed-off-by: Alistair Leslie-Hughes --- @@ -9,7 +9,7 @@ Signed-off-by: Alistair Leslie-Hughes 1 file changed, 106 insertions(+) diff --git a/include/msxml6.idl b/include/msxml6.idl -index 5bfb21d04a..5473fa0bd9 100644 +index bfea408ab21..1f35e965124 100644 --- a/include/msxml6.idl +++ b/include/msxml6.idl @@ -244,6 +244,8 @@ typedef enum _SCHEMAWHITESPACE @@ -128,8 +128,8 @@ index 5bfb21d04a..5473fa0bd9 100644 [ object, dual, -@@ -1607,6 +1702,17 @@ interface ISAXDeclHandler : IUnknown - [in] int nSystemId); +@@ -3063,6 +3158,17 @@ coclass FreeThreadedDOMDocument60 + [default, source] dispinterface XMLDOMDocumentEvents; } +[ @@ -144,8 +144,8 @@ index 5bfb21d04a..5473fa0bd9 100644 +} + [ - object, - local, + helpstring("XML HTTP 6.0"), + progid("Msxml2.XMLHTTP.6.0"), -- -2.28.0 +2.29.2 diff --git a/patches/msxml3-FreeThreadedXMLHTTP60/0003-msxml3-Implement-FreeThreadedXMLHTTP60.patch b/patches/msxml3-FreeThreadedXMLHTTP60/0003-msxml3-Implement-FreeThreadedXMLHTTP60.patch index 9293bba6..53d90c5f 100644 --- a/patches/msxml3-FreeThreadedXMLHTTP60/0003-msxml3-Implement-FreeThreadedXMLHTTP60.patch +++ b/patches/msxml3-FreeThreadedXMLHTTP60/0003-msxml3-Implement-FreeThreadedXMLHTTP60.patch @@ -1,4 +1,4 @@ -From 32d4275cfb92373f1f8b6abb9b75872289b5b94b Mon Sep 17 00:00:00 2001 +From 16487de3a86ba56671d9868bdbe7b908bbb7d6bf 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. @@ -1065,5 +1065,5 @@ index 333d4f3d3c7..1eb09d003fe 100644 /* * Note that because of a #define in msxml2.h, we end up initializing -- -2.28.0 +2.29.2