Rebase against 7ea710c69ba46f6255c0e049b5c29bc3e06b6433.

The apiset's have been left until the dll's these use are actually in wine.
ext-ms-win-xaml-pal-l1-1-0
ext-ms-win-appmodel-usercontext

patches/msxml3-FreeThreadedXMLHTTP60/0001-include-Remove-interfaces-already-define-in-msxml6.i.patch

@@ -1,4 +1,4 @@
-From f4dee57bb2912eb76741eaf74ee07397409167df Mon Sep 17 00:00:00 2001
+From 0d226ed6deed34649926c32dffe7086d2ce4f06b Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Fri, 11 Sep 2020 17:55:59 +1000
 Subject: [PATCH] include: Remove interfaces already define in msxml6.idl
@@ -14,10 +14,10 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
  6 files changed, 30 insertions(+), 121 deletions(-)
 
 diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c
-index 445cfbf730d..b8452ff4b4e 100644
+index c2d3cd30c60..243ee379712 100644
 --- a/dlls/msxml3/factory.c
 +++ b/dlls/msxml3/factory.c
-@@ -35,6 +35,7 @@
+@@ -31,6 +31,7 @@
  #include "ole2.h"
  #include "msxml.h"
  #include "msxml2.h"
@@ -26,7 +26,7 @@ index 445cfbf730d..b8452ff4b4e 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 ab814c5f764..e8441311776 100644
+index d8101c4ce94..d19ad28fba9 100644
 --- a/dlls/msxml3/tests/saxreader.c
 +++ b/dlls/msxml3/tests/saxreader.c
 @@ -29,6 +29,7 @@
@@ -38,7 +38,7 @@ index ab814c5f764..e8441311776 100644
  #include "ocidl.h"
  #include "dispex.h"
 diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c
-index d1622ffc7da..964e368bf84 100644
+index cf55f53dbc9..fd7abca151d 100644
 --- a/dlls/msxml3/tests/schema.c
 +++ b/dlls/msxml3/tests/schema.c
 @@ -32,6 +32,11 @@
@@ -52,7 +52,7 @@ index d1622ffc7da..964e368bf84 100644
 +
  #include "wine/test.h"
  
- #define EXPECT_HR(hr,hr_exp) \
+ #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c)
 diff --git a/dlls/msxml3/uuid.c b/dlls/msxml3/uuid.c
 index 4abbe5e4763..333d4f3d3c7 100644
 --- a/dlls/msxml3/uuid.c
@@ -259,10 +259,10 @@ index 916e0e8ab3d..1d1ba7a5248 100644
      helpstring("SAXAttributes"),
      progid("Msxml2.SAXAttributes"),
 diff --git a/include/msxml6.idl b/include/msxml6.idl
-index 5bfb21d04ae..bfea408ab21 100644
+index 4948de39f1f..e6a0a5feda5 100644
 --- a/include/msxml6.idl
 +++ b/include/msxml6.idl
-@@ -2946,18 +2946,6 @@ coclass DOMDocument60
+@@ -3048,18 +3048,6 @@ coclass DOMDocument60
      [default, source] dispinterface XMLDOMDocumentEvents;
  }
  
@@ -281,7 +281,7 @@ index 5bfb21d04ae..bfea408ab21 100644
  [
      helpstring("SAX XML Reader 6.0"),
      progid("Msxml2.SAXXMLReader.6.0"),
-@@ -3063,6 +3051,18 @@ coclass XSLTemplate60
+@@ -3165,6 +3153,18 @@ coclass XSLTemplate60
      [default] interface IXSLTemplate;
  }
  
@@ -301,5 +301,5 @@ index 5bfb21d04ae..bfea408ab21 100644
      helpstring("XML HTTP 6.0"),
      progid("Msxml2.XMLHTTP.6.0"),
 -- 
-2.29.2
+2.34.1