mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Rebase against 666c5b6e20e3b9e1e34d10b88372406f494699f2.
This commit is contained in:
Alistair Leslie-Hughes
parent
c35a3386eb
commit
91a9c0e3db
@ -1,25 +1,35 @@
|
||||
From b1bbc311c1e2dec72e04be9c668b6072d11b04fb Mon Sep 17 00:00:00 2001
|
||||
From ce5e1fc75139e4de9d92dfe27b4a513a96da013c Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Thu, 2 Oct 2014 19:53:46 +0200
|
||||
Subject: [PATCH] winelib: Append '(Staging)' at the end of the version string.
|
||||
|
||||
---
|
||||
dlls/ntdll/Makefile.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
Makefile.in | 2 +-
|
||||
dlls/ntdll/Makefile.in | 1 +
|
||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 307a95b3b1a..61019fed949 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -116,7 +116,7 @@ install-manpages:: manpages
|
||||
# Rules for generated source files
|
||||
|
||||
dlls/ntdll/unix/version.c: dummy
|
||||
- @version=`(GIT_DIR=$(srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1)
|
||||
+ @version=`(GIT_DIR=$(srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1 (Staging)";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1)
|
||||
|
||||
programs/winetest/build.rc: dummy
|
||||
@build="STRINGTABLE { 1 \"`GIT_DIR=$(srcdir)/.git git rev-parse HEAD 2>/dev/null`\" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || (rm -f $@ && exit 1)
|
||||
diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
|
||||
index a553536d4c7..71e3df13b66 100644
|
||||
index f39ffb42c6f..67847bb9392 100644
|
||||
--- a/dlls/ntdll/Makefile.in
|
||||
+++ b/dlls/ntdll/Makefile.in
|
||||
@@ -81,7 +81,7 @@ unix_loader_EXTRADEFS = \
|
||||
@@ -79,3 +79,4 @@ unix_loader_EXTRADEFS = \
|
||||
-DBINDIR=\"${bindir}\" \
|
||||
-DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${dlldir} ${bindir}`\" \
|
||||
-DBIN_TO_DATADIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine`\"
|
||||
|
||||
unix/version.c: dummy
|
||||
- version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1)
|
||||
+ version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1 (Staging)";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1)
|
||||
|
||||
dummy:
|
||||
.PHONY: dummy
|
||||
+
|
||||
--
|
||||
2.28.0
|
||||
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
From 7824e15960e00ffb11adae1a1e683aa1487f6317 Mon Sep 17 00:00:00 2001
|
||||
From 197e9857c0d65098111273e1d3219ac90f4896d2 Mon Sep 17 00:00:00 2001
|
||||
From: Derek Lesho <dlesho@codeweavers.com>
|
||||
Date: Wed, 29 Jan 2020 15:37:39 -0600
|
||||
Subject: [PATCH 23/52] tools: Add support for multiple parent directories.
|
||||
Subject: [PATCH] tools: Add support for multiple parent directories.
|
||||
|
||||
Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
|
||||
---
|
||||
tools/make_makefiles | 45 +++++++++++++++++++++++++++-----------------
|
||||
tools/makedep.c | 30 ++++++++++++++++++++---------
|
||||
2 files changed, 49 insertions(+), 26 deletions(-)
|
||||
tools/makedep.c | 26 +++++++++++++++++--------
|
||||
2 files changed, 46 insertions(+), 25 deletions(-)
|
||||
|
||||
diff --git a/tools/make_makefiles b/tools/make_makefiles
|
||||
index c18fa90e2d3..1e34a280a40 100755
|
||||
index a92987c2ab5..6bc1b47ca5d 100755
|
||||
--- a/tools/make_makefiles
|
||||
+++ b/tools/make_makefiles
|
||||
@@ -231,14 +231,14 @@ sub parse_makefile($)
|
||||
@@ -230,14 +230,14 @@ sub parse_makefile($)
|
||||
{
|
||||
die "Configure substitution is not allowed in $file" unless $file eq "Makefile";
|
||||
}
|
||||
@ -30,7 +30,7 @@ index c18fa90e2d3..1e34a280a40 100755
|
||||
{
|
||||
my $var = $1;
|
||||
my @list = split(/\s+/, $2);
|
||||
@@ -293,19 +293,27 @@ sub get_makedep_flags($)
|
||||
@@ -292,19 +292,27 @@ sub get_makedep_flags($)
|
||||
return %flags;
|
||||
}
|
||||
|
||||
@ -66,7 +66,7 @@ index c18fa90e2d3..1e34a280a40 100755
|
||||
}
|
||||
|
||||
# preserve shared source files that are listed in the existing makefile
|
||||
@@ -410,13 +418,16 @@ sub assign_sources_to_makefiles(@)
|
||||
@@ -409,13 +417,16 @@ sub assign_sources_to_makefiles(@)
|
||||
foreach my $file (@makefiles)
|
||||
{
|
||||
my $make = $makefiles{$file};
|
||||
@ -91,28 +91,25 @@ index c18fa90e2d3..1e34a280a40 100755
|
||||
}
|
||||
|
||||
diff --git a/tools/makedep.c b/tools/makedep.c
|
||||
index 4bd20d469d6..a67add38afa 100644
|
||||
index 7fe2c4daf54..55a52603820 100644
|
||||
--- a/tools/makedep.c
|
||||
+++ b/tools/makedep.c
|
||||
@@ -184,6 +184,7 @@ struct makefile
|
||||
@@ -184,11 +184,11 @@ struct makefile
|
||||
struct strarray install_dev;
|
||||
struct strarray extra_targets;
|
||||
struct strarray extra_imports;
|
||||
+ struct strarray parent_dirs;
|
||||
struct list sources;
|
||||
struct list includes;
|
||||
const char *base_dir;
|
||||
@@ -191,7 +192,6 @@ struct makefile
|
||||
const char *src_dir;
|
||||
const char *obj_dir;
|
||||
const char *top_src_dir;
|
||||
const char *top_obj_dir;
|
||||
- const char *parent_dir;
|
||||
const char *module;
|
||||
const char *testdll;
|
||||
const char *sharedlib;
|
||||
@@ -1376,15 +1376,24 @@ static struct file *open_local_file( const struct makefile *make, const char *pa
|
||||
@@ -1382,14 +1382,21 @@ static struct file *open_local_file( const struct makefile *make, const char *pa
|
||||
{
|
||||
char *src_path = root_dir_path( base_dir_path( make, path ));
|
||||
char *src_path = src_dir_path( make, path );
|
||||
struct file *ret = load_file( src_path );
|
||||
+ unsigned int i;
|
||||
|
||||
@ -125,23 +122,19 @@ index 4bd20d469d6..a67add38afa 100644
|
||||
+
|
||||
free( src_path );
|
||||
- path = strmake( "%s/%s", make->parent_dir, path );
|
||||
- src_path = root_dir_path( base_dir_path( make, path ));
|
||||
- src_path = src_dir_path( make, path );
|
||||
+ new_path = strmake( "%s/%s", make->parent_dirs.str[i], path );
|
||||
+ src_path = root_dir_path( base_dir_path( make, new_path ));
|
||||
+ src_path = src_dir_path( make, new_path );
|
||||
ret = load_file( src_path );
|
||||
- if (ret) ret->flags |= FLAG_PARENTDIR;
|
||||
+ if (ret)
|
||||
+ {
|
||||
+ ret->flags |= FLAG_PARENTDIR;
|
||||
+ path = new_path;
|
||||
+ }
|
||||
+ else
|
||||
+ free(new_path);
|
||||
}
|
||||
|
||||
if (ret) *filename = src_dir_path( make, path );
|
||||
@@ -4275,13 +4284,13 @@ static void load_sources( struct makefile *make )
|
||||
strarray_set_value( &make->vars, "top_srcdir", top_src_dir_path( make, "" ));
|
||||
if (ret) *filename = src_path;
|
||||
@@ -4129,13 +4136,13 @@ static void load_sources( struct makefile *make )
|
||||
strarray_set_value( &make->vars, "top_srcdir", root_src_dir_path( "" ));
|
||||
strarray_set_value( &make->vars, "srcdir", src_dir_path( make, "" ));
|
||||
|
||||
- make->parent_dir = get_expanded_make_variable( make, "PARENTSRC" );
|
||||
@ -155,7 +148,7 @@ index 4bd20d469d6..a67add38afa 100644
|
||||
make->programs = get_expanded_make_var_array( make, "PROGRAMS" );
|
||||
make->scripts = get_expanded_make_var_array( make, "SCRIPTS" );
|
||||
make->imports = get_expanded_make_var_array( make, "IMPORTS" );
|
||||
@@ -4326,8 +4335,11 @@ static void load_sources( struct makefile *make )
|
||||
@@ -4180,8 +4187,11 @@ static void load_sources( struct makefile *make )
|
||||
strarray_add( &make->include_args, strmake( "-I%s", obj_dir_path( make, "" )));
|
||||
if (make->src_dir)
|
||||
strarray_add( &make->include_args, strmake( "-I%s", make->src_dir ));
|
||||
@ -166,9 +159,9 @@ index 4bd20d469d6..a67add38afa 100644
|
||||
+ for (i = 0; i < make->parent_dirs.count; i++)
|
||||
+ strarray_add( &make->include_args, strmake( "-I%s", src_dir_path( make, make->parent_dirs.str[i] )));
|
||||
+ }
|
||||
strarray_add( &make->include_args, strmake( "-I%s", top_obj_dir_path( make, "include" )));
|
||||
if (make->top_src_dir)
|
||||
strarray_add( &make->include_args, strmake( "-I%s", top_src_dir_path( make, "include" )));
|
||||
strarray_add( &make->include_args, "-Iinclude" );
|
||||
if (root_src_dir) strarray_add( &make->include_args, strmake( "-I%s", root_src_dir_path( "include" )));
|
||||
|
||||
--
|
||||
2.28.0
|
||||
|
||||
|
||||
@ -0,0 +1,262 @@
|
||||
From 5c873ba9b51531c7e41b77424b46264ed712b972 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 1/3] include: Remove interfaces already define in msxml6.idl
|
||||
|
||||
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
---
|
||||
dlls/msxml3/factory.c | 1 +
|
||||
dlls/msxml3/tests/saxreader.c | 1 +
|
||||
dlls/msxml3/tests/schema.c | 5 ++
|
||||
dlls/msxml3/uuid.c | 11 ++++
|
||||
include/msxml2.idl | 109 ----------------------------------
|
||||
5 files changed, 18 insertions(+), 109 deletions(-)
|
||||
|
||||
diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c
|
||||
index 445cfbf730..b8452ff4b4 100644
|
||||
--- a/dlls/msxml3/factory.c
|
||||
+++ b/dlls/msxml3/factory.c
|
||||
@@ -35,6 +35,7 @@
|
||||
#include "ole2.h"
|
||||
#include "msxml.h"
|
||||
#include "msxml2.h"
|
||||
+#include "msxml6.h"
|
||||
#include "xmlparser.h"
|
||||
|
||||
/* 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
|
||||
--- a/dlls/msxml3/tests/saxreader.c
|
||||
+++ b/dlls/msxml3/tests/saxreader.c
|
||||
@@ -29,6 +29,7 @@
|
||||
#include "windows.h"
|
||||
#include "ole2.h"
|
||||
#include "msxml2.h"
|
||||
+#include "msxml6.h"
|
||||
#include "msxml2did.h"
|
||||
#include "ocidl.h"
|
||||
#include "dispex.h"
|
||||
diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c
|
||||
index 4637d62f8b..805f05cb71 100644
|
||||
--- a/dlls/msxml3/tests/schema.c
|
||||
+++ b/dlls/msxml3/tests/schema.c
|
||||
@@ -32,6 +32,11 @@
|
||||
#include "dispex.h"
|
||||
#include "cguid.h"
|
||||
|
||||
+DEFINE_GUID(CLSID_MXXMLWriter60, 0x88d96a0f, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5);
|
||||
+DEFINE_GUID(CLSID_SAXAttributes60, 0x88d96a0e, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5);
|
||||
+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);
|
||||
+
|
||||
#include "wine/test.h"
|
||||
|
||||
#define EXPECT_HR(hr,hr_exp) \
|
||||
diff --git a/dlls/msxml3/uuid.c b/dlls/msxml3/uuid.c
|
||||
index 4abbe5e476..333d4f3d3c 100644
|
||||
--- a/dlls/msxml3/uuid.c
|
||||
+++ b/dlls/msxml3/uuid.c
|
||||
@@ -41,6 +41,17 @@
|
||||
#include "initguid.h"
|
||||
#include "msxml2.h"
|
||||
|
||||
+/* Cannot include msxml6 here since we will get a duplicate LIBID_MSXML2 error. */
|
||||
+DEFINE_GUID(CLSID_FreeThreadedDOMDocument60, 0x88d96a06, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5);
|
||||
+DEFINE_GUID(CLSID_MXNamespaceManager60, 0x88d96a11, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5);
|
||||
+DEFINE_GUID(CLSID_MXXMLWriter60, 0x88d96a0f, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5);
|
||||
+DEFINE_GUID(CLSID_SAXAttributes60, 0x88d96a0e, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5);
|
||||
+DEFINE_GUID(CLSID_SAXXMLReader60, 0x88d96a0c, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5);
|
||||
+DEFINE_GUID(CLSID_ServerXMLHTTP60, 0x88d96a0b, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5);
|
||||
+DEFINE_GUID(CLSID_XMLHTTP60, 0x88d96a0a, 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_XSLTemplate60, 0x88d96a08, 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 916e0e8ab3..1d1ba7a524 100644
|
||||
--- a/include/msxml2.idl
|
||||
+++ b/include/msxml2.idl
|
||||
@@ -1612,15 +1612,6 @@ coclass FreeThreadedDOMDocument40
|
||||
[default, source] dispinterface XMLDOMDocumentEvents;
|
||||
}
|
||||
|
||||
-[
|
||||
- uuid(88d96a06-f192-11d4-a65f-0040963251e5),
|
||||
-]
|
||||
-coclass FreeThreadedDOMDocument60
|
||||
-{
|
||||
- [default] interface IXMLDOMDocument3;
|
||||
- [default, source] dispinterface XMLDOMDocumentEvents;
|
||||
-}
|
||||
-
|
||||
[
|
||||
helpstring("Free threaded XML DOM Document"),
|
||||
progid("Msxml2.FreeThreadedDOMDocument"),
|
||||
@@ -1662,14 +1653,6 @@ coclass XMLHTTP40
|
||||
[default] interface IXMLHTTPRequest;
|
||||
}
|
||||
|
||||
-[
|
||||
- uuid(88d96a0a-f192-11d4-a65f-0040963251e5)
|
||||
-]
|
||||
-coclass XMLHTTP60
|
||||
-{
|
||||
- [default] interface IXMLHTTPRequest;
|
||||
-}
|
||||
-
|
||||
[
|
||||
helpstring("XML HTTP"),
|
||||
progid("Msxml2.XMLHTTP"),
|
||||
@@ -1702,14 +1685,6 @@ coclass ServerXMLHTTP40
|
||||
[default] interface IServerXMLHTTPRequest2;
|
||||
}
|
||||
|
||||
-[
|
||||
- uuid(88d96a0b-f192-11d4-a65f-0040963251e5)
|
||||
-]
|
||||
-coclass ServerXMLHTTP60
|
||||
-{
|
||||
- [default] interface IServerXMLHTTPRequest2;
|
||||
-}
|
||||
-
|
||||
[
|
||||
helpstring("Server XML HTTP"),
|
||||
progid("Msxml2.ServerXMLHTTP"),
|
||||
@@ -1750,14 +1725,6 @@ coclass XMLSchemaCache40
|
||||
[default] interface IXMLDOMSchemaCollection2;
|
||||
}
|
||||
|
||||
-[
|
||||
- uuid(88d96a07-f192-11d4-a65f-0040963251e5)
|
||||
-]
|
||||
-coclass XMLSchemaCache60
|
||||
-{
|
||||
- [default] interface IXMLDOMSchemaCollection2;
|
||||
-}
|
||||
-
|
||||
[
|
||||
helpstring("XML Schema Cache"),
|
||||
progid("Msxml2.XMLSchemaCache"),
|
||||
@@ -1798,14 +1765,6 @@ coclass XSLTemplate40
|
||||
[default] interface IXSLTemplate;
|
||||
}
|
||||
|
||||
-[
|
||||
- uuid(88d96a08-f192-11d4-a65f-0040963251e5)
|
||||
-]
|
||||
-coclass XSLTemplate60
|
||||
-{
|
||||
- [default] interface IXSLTemplate;
|
||||
-}
|
||||
-
|
||||
[
|
||||
helpstring("XSL Template"),
|
||||
progid("Msxml2.XSLTemplate"),
|
||||
@@ -3297,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"),
|
||||
@@ -3380,26 +3330,6 @@ coclass MXHTMLWriter40
|
||||
interface IVBSAXLexicalHandler;
|
||||
}
|
||||
|
||||
-[
|
||||
- uuid(88d96a10-f192-11d4-a65f-0040963251e5)
|
||||
-]
|
||||
-coclass MXHTMLWriter60
|
||||
-{
|
||||
- [default] interface IMXWriter;
|
||||
-
|
||||
- interface ISAXContentHandler;
|
||||
- interface ISAXDeclHandler;
|
||||
- interface ISAXDTDHandler;
|
||||
- interface ISAXErrorHandler;
|
||||
- interface ISAXLexicalHandler;
|
||||
-
|
||||
- interface IVBSAXContentHandler;
|
||||
- interface IVBSAXDeclHandler;
|
||||
- interface IVBSAXDTDHandler;
|
||||
- interface IVBSAXErrorHandler;
|
||||
- interface IVBSAXLexicalHandler;
|
||||
-}
|
||||
-
|
||||
[
|
||||
helpstring("MXXMLWriter 3.0"),
|
||||
progid("Msxml2.MXXMLWriter.3.0"),
|
||||
@@ -3444,26 +3374,6 @@ coclass MXXMLWriter40
|
||||
interface IVBSAXLexicalHandler;
|
||||
}
|
||||
|
||||
-[
|
||||
- uuid(88d96a0f-f192-11d4-a65f-0040963251e5)
|
||||
-]
|
||||
-coclass MXXMLWriter60
|
||||
-{
|
||||
- [default] interface IMXWriter;
|
||||
-
|
||||
- interface ISAXContentHandler;
|
||||
- interface ISAXDeclHandler;
|
||||
- interface ISAXDTDHandler;
|
||||
- interface ISAXErrorHandler;
|
||||
- interface ISAXLexicalHandler;
|
||||
-
|
||||
- interface IVBSAXContentHandler;
|
||||
- interface IVBSAXDeclHandler;
|
||||
- interface IVBSAXDTDHandler;
|
||||
- interface IVBSAXErrorHandler;
|
||||
- interface IVBSAXLexicalHandler;
|
||||
-}
|
||||
-
|
||||
[
|
||||
helpstring("MXXMLWriter"),
|
||||
progid("Msxml2.MXXMLWriter"),
|
||||
@@ -3506,15 +3416,6 @@ coclass MXNamespaceManager40
|
||||
interface IMXNamespaceManager;
|
||||
}
|
||||
|
||||
-[
|
||||
- uuid(88d96a11-f192-11d4-a65f-0040963251e5)
|
||||
-]
|
||||
-coclass MXNamespaceManager60
|
||||
-{
|
||||
- [default] interface IVBMXNamespaceManager;
|
||||
- interface IMXNamespaceManager;
|
||||
-}
|
||||
-
|
||||
[
|
||||
helpstring("SAXAttributes 3.0"),
|
||||
progid("Msxml2.SAXAttributes.3.0"),
|
||||
@@ -3539,16 +3440,6 @@ coclass SAXAttributes40
|
||||
interface ISAXAttributes;
|
||||
}
|
||||
|
||||
-[
|
||||
- uuid(88d96a0e-f192-11d4-a65f-0040963251e5)
|
||||
-]
|
||||
-coclass SAXAttributes60
|
||||
-{
|
||||
- [default] interface IMXAttributes;
|
||||
- interface IVBSAXAttributes;
|
||||
- interface ISAXAttributes;
|
||||
-}
|
||||
-
|
||||
[
|
||||
helpstring("SAXAttributes"),
|
||||
progid("Msxml2.SAXAttributes"),
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
From 1b9bde927b65e034acde1a3cdca1aac6afcab854 Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
Date: Thu, 3 Sep 2020 17:58:53 +1000
|
||||
Subject: [PATCH 1/5] msxml3: Use msxml6 header for defining GUIDs.
|
||||
|
||||
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
---
|
||||
dlls/msxml3/factory.c | 2 +-
|
||||
dlls/msxml3/uuid.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c
|
||||
index 445cfbf730..3be974c58a 100644
|
||||
--- a/dlls/msxml3/factory.c
|
||||
+++ b/dlls/msxml3/factory.c
|
||||
@@ -34,7 +34,7 @@
|
||||
#include "winuser.h"
|
||||
#include "ole2.h"
|
||||
#include "msxml.h"
|
||||
-#include "msxml2.h"
|
||||
+#include "msxml6.h"
|
||||
#include "xmlparser.h"
|
||||
|
||||
/* undef the #define in msxml2 so that we can access the v.2 version
|
||||
diff --git a/dlls/msxml3/uuid.c b/dlls/msxml3/uuid.c
|
||||
index 4abbe5e476..7403b27c72 100644
|
||||
--- a/dlls/msxml3/uuid.c
|
||||
+++ b/dlls/msxml3/uuid.c
|
||||
@@ -39,7 +39,7 @@
|
||||
|
||||
/* Now we can initialize the rest of the uuids */
|
||||
#include "initguid.h"
|
||||
-#include "msxml2.h"
|
||||
+#include "msxml6.h"
|
||||
|
||||
/*
|
||||
* Note that because of a #define in msxml2.h, we end up initializing
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From e46f6e920f9f41f7f5ab5b0bb5254dec7d0c0dc2 Mon Sep 17 00:00:00 2001
|
||||
From cf32f7460fe0df6bb9dfb80c5a55473246ff4018 Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
Date: Thu, 3 Sep 2020 17:59:10 +1000
|
||||
Subject: [PATCH 4/5] include: Add IXMLHTTPRequest2/3 interfaces
|
||||
Subject: [PATCH 2/3] include: Add IXMLHTTPRequest2/3 interfaces
|
||||
|
||||
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
---
|
||||
@ -9,21 +9,21 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
1 file changed, 106 insertions(+)
|
||||
|
||||
diff --git a/include/msxml6.idl b/include/msxml6.idl
|
||||
index 1f657a8cde..b837e42477 100644
|
||||
index 5bfb21d04a..5473fa0bd9 100644
|
||||
--- a/include/msxml6.idl
|
||||
+++ b/include/msxml6.idl
|
||||
@@ -109,6 +109,8 @@ interface ISchemaAny;
|
||||
interface ISchemaIdentityConstraint;
|
||||
interface ISchemaNotation;
|
||||
@@ -244,6 +244,8 @@ typedef enum _SCHEMAWHITESPACE
|
||||
SCHEMAWHITESPACE_COLLAPSE = 2,
|
||||
} SCHEMAWHITESPACE;
|
||||
|
||||
+interface IXMLHTTPRequest2Callback;
|
||||
+interface IXMLHTTPRequest3Callback;
|
||||
|
||||
cpp_quote("#define DOMDocument DOMDocument2")
|
||||
cpp_quote("#define CLSID_DOMDocument CLSID_DOMDocument2")
|
||||
@@ -261,6 +263,35 @@ typedef enum _SCHEMATYPEVARIETY
|
||||
SCHEMATYPEVARIETY_UNION = 2,
|
||||
} SCHEMATYPEVARIETY;
|
||||
typedef enum _SCHEMATYPEVARIETY
|
||||
{
|
||||
@@ -393,6 +395,35 @@ interface IXMLDOMNode : IDispatch
|
||||
[in] VARIANT var1);
|
||||
}
|
||||
|
||||
+typedef struct tagXHR_COOKIE
|
||||
+{
|
||||
@ -57,8 +57,8 @@ index 1f657a8cde..b837e42477 100644
|
||||
[
|
||||
local,
|
||||
object,
|
||||
@@ -1265,6 +1296,70 @@ interface IXMLHTTPRequest : IDispatch
|
||||
HRESULT onreadystatechange([in] IDispatch *pReadyStateSink);
|
||||
@@ -1309,6 +1340,70 @@ interface IServerXMLHTTPRequest : IXMLHTTPRequest
|
||||
[in] VARIANT value);
|
||||
}
|
||||
|
||||
+[
|
||||
@ -128,8 +128,8 @@ index 1f657a8cde..b837e42477 100644
|
||||
[
|
||||
object,
|
||||
dual,
|
||||
@@ -1554,6 +1649,17 @@ coclass XMLHTTP60
|
||||
[default] interface IXMLHTTPRequest;
|
||||
@@ -1607,6 +1702,17 @@ interface ISAXDeclHandler : IUnknown
|
||||
[in] int nSystemId);
|
||||
}
|
||||
|
||||
+[
|
||||
@ -144,8 +144,8 @@ index 1f657a8cde..b837e42477 100644
|
||||
+}
|
||||
+
|
||||
[
|
||||
uuid(afba6b42-5692-48ea-8141-dc517dcf0ef1)
|
||||
]
|
||||
object,
|
||||
local,
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
From 904a06e52cb70dd9821b6aea99bc646f9c573d12 Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
Date: Thu, 3 Sep 2020 17:59:01 +1000
|
||||
Subject: [PATCH 2/5] msxml3/tests: Use msxml6.h where required
|
||||
|
||||
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
---
|
||||
dlls/msxml3/tests/saxreader.c | 4 ++--
|
||||
dlls/msxml3/tests/schema.c | 4 ++--
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c
|
||||
index 986f429cc1..5c5fa8075d 100644
|
||||
--- a/dlls/msxml3/tests/saxreader.c
|
||||
+++ b/dlls/msxml3/tests/saxreader.c
|
||||
@@ -28,8 +28,8 @@
|
||||
|
||||
#include "windows.h"
|
||||
#include "ole2.h"
|
||||
-#include "msxml2.h"
|
||||
-#include "msxml2did.h"
|
||||
+#include "msxml6.h"
|
||||
+#include "msxml6did.h"
|
||||
#include "ocidl.h"
|
||||
#include "dispex.h"
|
||||
|
||||
diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c
|
||||
index 4637d62f8b..fc0329bd10 100644
|
||||
--- a/dlls/msxml3/tests/schema.c
|
||||
+++ b/dlls/msxml3/tests/schema.c
|
||||
@@ -26,9 +26,9 @@
|
||||
#include "initguid.h"
|
||||
#include "windows.h"
|
||||
#include "ole2.h"
|
||||
-#include "msxml2.h"
|
||||
+#include "msxml6.h"
|
||||
#undef CLSID_DOMDocument
|
||||
-#include "msxml2did.h"
|
||||
+#include "msxml6did.h"
|
||||
#include "dispex.h"
|
||||
#include "cguid.h"
|
||||
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@ -1,196 +0,0 @@
|
||||
From 87f6f9640a5590ae216c4f863d34826122e4914a Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
Date: Thu, 3 Sep 2020 17:59:06 +1000
|
||||
Subject: [PATCH 3/5] include: Remove interfaces already define in msxml6.idl
|
||||
|
||||
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
---
|
||||
include/msxml2.idl | 109 ---------------------------------------------
|
||||
1 file changed, 109 deletions(-)
|
||||
|
||||
diff --git a/include/msxml2.idl b/include/msxml2.idl
|
||||
index cfafc42133..a2d72d2063 100644
|
||||
--- a/include/msxml2.idl
|
||||
+++ b/include/msxml2.idl
|
||||
@@ -1605,15 +1605,6 @@ coclass FreeThreadedDOMDocument40
|
||||
[default, source] dispinterface XMLDOMDocumentEvents;
|
||||
}
|
||||
|
||||
-[
|
||||
- uuid(88d96a06-f192-11d4-a65f-0040963251e5),
|
||||
-]
|
||||
-coclass FreeThreadedDOMDocument60
|
||||
-{
|
||||
- [default] interface IXMLDOMDocument3;
|
||||
- [default, source] dispinterface XMLDOMDocumentEvents;
|
||||
-}
|
||||
-
|
||||
[
|
||||
helpstring("Free threaded XML DOM Document"),
|
||||
progid("Msxml2.FreeThreadedDOMDocument"),
|
||||
@@ -1655,14 +1646,6 @@ coclass XMLHTTP40
|
||||
[default] interface IXMLHTTPRequest;
|
||||
}
|
||||
|
||||
-[
|
||||
- uuid(88d96a0a-f192-11d4-a65f-0040963251e5)
|
||||
-]
|
||||
-coclass XMLHTTP60
|
||||
-{
|
||||
- [default] interface IXMLHTTPRequest;
|
||||
-}
|
||||
-
|
||||
[
|
||||
helpstring("XML HTTP"),
|
||||
progid("Msxml2.XMLHTTP"),
|
||||
@@ -1695,14 +1678,6 @@ coclass ServerXMLHTTP40
|
||||
[default] interface IServerXMLHTTPRequest2;
|
||||
}
|
||||
|
||||
-[
|
||||
- uuid(88d96a0b-f192-11d4-a65f-0040963251e5)
|
||||
-]
|
||||
-coclass ServerXMLHTTP60
|
||||
-{
|
||||
- [default] interface IServerXMLHTTPRequest2;
|
||||
-}
|
||||
-
|
||||
[
|
||||
helpstring("Server XML HTTP"),
|
||||
progid("Msxml2.ServerXMLHTTP"),
|
||||
@@ -1743,14 +1718,6 @@ coclass XMLSchemaCache40
|
||||
[default] interface IXMLDOMSchemaCollection2;
|
||||
}
|
||||
|
||||
-[
|
||||
- uuid(88d96a07-f192-11d4-a65f-0040963251e5)
|
||||
-]
|
||||
-coclass XMLSchemaCache60
|
||||
-{
|
||||
- [default] interface IXMLDOMSchemaCollection2;
|
||||
-}
|
||||
-
|
||||
[
|
||||
helpstring("XML Schema Cache"),
|
||||
progid("Msxml2.XMLSchemaCache"),
|
||||
@@ -1791,14 +1758,6 @@ coclass XSLTemplate40
|
||||
[default] interface IXSLTemplate;
|
||||
}
|
||||
|
||||
-[
|
||||
- uuid(88d96a08-f192-11d4-a65f-0040963251e5)
|
||||
-]
|
||||
-coclass XSLTemplate60
|
||||
-{
|
||||
- [default] interface IXSLTemplate;
|
||||
-}
|
||||
-
|
||||
[
|
||||
helpstring("XSL Template"),
|
||||
progid("Msxml2.XSLTemplate"),
|
||||
@@ -3290,15 +3249,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"),
|
||||
@@ -3373,26 +3323,6 @@ coclass MXHTMLWriter40
|
||||
interface IVBSAXLexicalHandler;
|
||||
}
|
||||
|
||||
-[
|
||||
- uuid(88d96a10-f192-11d4-a65f-0040963251e5)
|
||||
-]
|
||||
-coclass MXHTMLWriter60
|
||||
-{
|
||||
- [default] interface IMXWriter;
|
||||
-
|
||||
- interface ISAXContentHandler;
|
||||
- interface ISAXDeclHandler;
|
||||
- interface ISAXDTDHandler;
|
||||
- interface ISAXErrorHandler;
|
||||
- interface ISAXLexicalHandler;
|
||||
-
|
||||
- interface IVBSAXContentHandler;
|
||||
- interface IVBSAXDeclHandler;
|
||||
- interface IVBSAXDTDHandler;
|
||||
- interface IVBSAXErrorHandler;
|
||||
- interface IVBSAXLexicalHandler;
|
||||
-}
|
||||
-
|
||||
[
|
||||
helpstring("MXXMLWriter 3.0"),
|
||||
progid("Msxml2.MXXMLWriter.3.0"),
|
||||
@@ -3437,26 +3367,6 @@ coclass MXXMLWriter40
|
||||
interface IVBSAXLexicalHandler;
|
||||
}
|
||||
|
||||
-[
|
||||
- uuid(88d96a0f-f192-11d4-a65f-0040963251e5)
|
||||
-]
|
||||
-coclass MXXMLWriter60
|
||||
-{
|
||||
- [default] interface IMXWriter;
|
||||
-
|
||||
- interface ISAXContentHandler;
|
||||
- interface ISAXDeclHandler;
|
||||
- interface ISAXDTDHandler;
|
||||
- interface ISAXErrorHandler;
|
||||
- interface ISAXLexicalHandler;
|
||||
-
|
||||
- interface IVBSAXContentHandler;
|
||||
- interface IVBSAXDeclHandler;
|
||||
- interface IVBSAXDTDHandler;
|
||||
- interface IVBSAXErrorHandler;
|
||||
- interface IVBSAXLexicalHandler;
|
||||
-}
|
||||
-
|
||||
[
|
||||
helpstring("MXXMLWriter"),
|
||||
progid("Msxml2.MXXMLWriter"),
|
||||
@@ -3499,15 +3409,6 @@ coclass MXNamespaceManager40
|
||||
interface IMXNamespaceManager;
|
||||
}
|
||||
|
||||
-[
|
||||
- uuid(88d96a11-f192-11d4-a65f-0040963251e5)
|
||||
-]
|
||||
-coclass MXNamespaceManager60
|
||||
-{
|
||||
- [default] interface IVBMXNamespaceManager;
|
||||
- interface IMXNamespaceManager;
|
||||
-}
|
||||
-
|
||||
[
|
||||
helpstring("SAXAttributes 3.0"),
|
||||
progid("Msxml2.SAXAttributes.3.0"),
|
||||
@@ -3532,16 +3433,6 @@ coclass SAXAttributes40
|
||||
interface ISAXAttributes;
|
||||
}
|
||||
|
||||
-[
|
||||
- uuid(88d96a0e-f192-11d4-a65f-0040963251e5)
|
||||
-]
|
||||
-coclass SAXAttributes60
|
||||
-{
|
||||
- [default] interface IMXAttributes;
|
||||
- interface IVBSAXAttributes;
|
||||
- interface ISAXAttributes;
|
||||
-}
|
||||
-
|
||||
[
|
||||
helpstring("SAXAttributes"),
|
||||
progid("Msxml2.SAXAttributes"),
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@ -1,15 +1,16 @@
|
||||
From 02147fc13eefc56391549102082759b85c282510 Mon Sep 17 00:00:00 2001
|
||||
From 849e198c39ce81b2e99505486859ee305d9f6fed Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
|
||||
Date: Tue, 8 Sep 2020 18:43:52 +0200
|
||||
Subject: [PATCH 5/5] msxml3: Implement FreeThreadedXMLHTTP60.
|
||||
Subject: [PATCH 3/3] msxml3: Implement FreeThreadedXMLHTTP60.
|
||||
|
||||
---
|
||||
dlls/msxml3/Makefile.in | 2 +-
|
||||
dlls/msxml3/factory.c | 5 +
|
||||
dlls/msxml3/httprequest.c | 493 +++++++++++++++++++++++++++++++++++-
|
||||
dlls/msxml3/msxml_private.h | 1 +
|
||||
dlls/msxml3/tests/httpreq.c | 395 ++++++++++++++++++++++++++++-
|
||||
5 files changed, 891 insertions(+), 5 deletions(-)
|
||||
dlls/msxml3/tests/schema.c | 5 +
|
||||
dlls/msxml3/uuid.c | 3 +
|
||||
6 files changed, 894 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in
|
||||
index 936c745895..f9e629f89b 100644
|
||||
@ -22,29 +23,6 @@ index 936c745895..f9e629f89b 100644
|
||||
EXTRALIBS = $(XML2_LIBS)
|
||||
EXTRAINCL = $(XML2_CFLAGS) $(XSLT_CFLAGS)
|
||||
|
||||
diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c
|
||||
index 3be974c58a..8608e238ee 100644
|
||||
--- a/dlls/msxml3/factory.c
|
||||
+++ b/dlls/msxml3/factory.c
|
||||
@@ -280,6 +280,7 @@ static HRESULT DOMClassFactory_Create(const GUID *clsid, REFIID riid, void **ppv
|
||||
|
||||
static ClassFactory xmldoccf = { { &ClassFactoryVtbl }, XMLDocument_create };
|
||||
static ClassFactory httpreqcf = { { &ClassFactoryVtbl }, XMLHTTPRequest_create };
|
||||
+static ClassFactory httpreqcf2 = { { &ClassFactoryVtbl }, XMLHTTPRequest2_create };
|
||||
static ClassFactory serverhttp = { { &ClassFactoryVtbl }, ServerXMLHTTP_create };
|
||||
static ClassFactory xsltemplatecf = { { &ClassFactoryVtbl }, XSLTemplate_create };
|
||||
static ClassFactory mxnsmanagercf = { {&ClassFactoryVtbl }, MXNamespaceManager_create };
|
||||
@@ -341,6 +342,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv )
|
||||
{
|
||||
cf = &httpreqcf.IClassFactory_iface;
|
||||
}
|
||||
+ else if( IsEqualCLSID( rclsid, &CLSID_FreeThreadedXMLHTTP60 ))
|
||||
+ {
|
||||
+ cf = &httpreqcf2.IClassFactory_iface;
|
||||
+ }
|
||||
else if( IsEqualCLSID( rclsid, &CLSID_ServerXMLHTTP ) ||
|
||||
IsEqualCLSID( rclsid, &CLSID_ServerXMLHTTP30 ) ||
|
||||
IsEqualCLSID( rclsid, &CLSID_ServerXMLHTTP40 ) ||
|
||||
diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c
|
||||
index 7286eb97bb..ad74260193 100644
|
||||
--- a/dlls/msxml3/httprequest.c
|
||||
@ -577,10 +555,10 @@ index 7286eb97bb..ad74260193 100644
|
||||
{
|
||||
MESSAGE("This program tried to use a ServerXMLHTTP object, but\n"
|
||||
diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h
|
||||
index 5fce060985..f25a4a8268 100644
|
||||
index a59e00bf2b..9797f96f3c 100644
|
||||
--- a/dlls/msxml3/msxml_private.h
|
||||
+++ b/dlls/msxml3/msxml_private.h
|
||||
@@ -498,6 +498,7 @@ extern HRESULT XMLDocument_create(void**) DECLSPEC_HIDDEN;
|
||||
@@ -501,6 +501,7 @@ extern HRESULT XMLDocument_create(void**) DECLSPEC_HIDDEN;
|
||||
extern HRESULT SAXXMLReader_create(MSXML_VERSION, void**) DECLSPEC_HIDDEN;
|
||||
extern HRESULT SAXAttributes_create(MSXML_VERSION, void**) DECLSPEC_HIDDEN;
|
||||
extern HRESULT XMLHTTPRequest_create(void **) DECLSPEC_HIDDEN;
|
||||
@ -589,14 +567,15 @@ index 5fce060985..f25a4a8268 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 74c302d5eb..f22c9831a1 100644
|
||||
index 74c302d5eb..25e6922c31 100644
|
||||
--- a/dlls/msxml3/tests/httpreq.c
|
||||
+++ b/dlls/msxml3/tests/httpreq.c
|
||||
@@ -27,8 +27,8 @@
|
||||
@@ -26,9 +26,9 @@
|
||||
#include <assert.h>
|
||||
|
||||
#include "windows.h"
|
||||
|
||||
-#include "msxml2.h"
|
||||
-
|
||||
#include "msxml2.h"
|
||||
-#include "msxml2did.h"
|
||||
+#include "msxml6.h"
|
||||
+#include "msxml6did.h"
|
||||
@ -1019,6 +998,40 @@ index 74c302d5eb..f22c9831a1 100644
|
||||
|
||||
CoUninitialize();
|
||||
}
|
||||
diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c
|
||||
index 805f05cb71..f9c64c50ec 100644
|
||||
--- a/dlls/msxml3/tests/schema.c
|
||||
+++ b/dlls/msxml3/tests/schema.c
|
||||
@@ -32,10 +32,15 @@
|
||||
#include "dispex.h"
|
||||
#include "cguid.h"
|
||||
|
||||
+DEFINE_GUID(CLSID_FreeThreadedDOMDocument60, 0x88d96a06, 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(CLSID_MXXMLWriter60, 0x88d96a0f, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5);
|
||||
DEFINE_GUID(CLSID_SAXAttributes60, 0x88d96a0e, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5);
|
||||
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(IID_IXMLHTTPRequest2, 0xe5d37dc0, 0x552a, 0x4d52, 0x9c,0xc0, 0xa1,0x4d,0x54,0x6f,0xbd,0x04);
|
||||
+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);
|
||||
|
||||
#include "wine/test.h"
|
||||
|
||||
diff --git a/dlls/msxml3/uuid.c b/dlls/msxml3/uuid.c
|
||||
index 333d4f3d3c..2b995d5acc 100644
|
||||
--- a/dlls/msxml3/uuid.c
|
||||
+++ b/dlls/msxml3/uuid.c
|
||||
@@ -51,6 +51,9 @@ DEFINE_GUID(CLSID_ServerXMLHTTP60, 0x88d96a0b, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0
|
||||
DEFINE_GUID(CLSID_XMLHTTP60, 0x88d96a0a, 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_XSLTemplate60, 0x88d96a08, 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_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
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@ -51,7 +51,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "01bacebba418bf6f58a644b1aab41be215bd200a"
|
||||
echo "666c5b6e20e3b9e1e34d10b88372406f494699f2"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -1768,7 +1768,7 @@ fi
|
||||
# | * ntdll-FLS_Callbacks
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/ntdll/Makefile.in, dlls/ntdll/loader.c
|
||||
# | * Makefile.in, dlls/ntdll/Makefile.in, dlls/ntdll/loader.c
|
||||
# |
|
||||
if test "$enable_Staging" -eq 1; then
|
||||
patch_apply Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch
|
||||
@ -2871,11 +2871,9 @@ fi
|
||||
# | include/msxml2.idl, include/msxml6.idl
|
||||
# |
|
||||
if test "$enable_msxml3_FreeThreadedXMLHTTP60" -eq 1; then
|
||||
patch_apply msxml3-FreeThreadedXMLHTTP60/0001-msxml3-Use-msxml6-header-for-defining-GUIDs.patch
|
||||
patch_apply msxml3-FreeThreadedXMLHTTP60/0002-msxml3-tests-Use-msxml6.h-where-required.patch
|
||||
patch_apply msxml3-FreeThreadedXMLHTTP60/0003-include-Remove-interfaces-already-define-in-msxml6.i.patch
|
||||
patch_apply msxml3-FreeThreadedXMLHTTP60/0004-include-Add-IXMLHTTPRequest2-3-interfaces.patch
|
||||
patch_apply msxml3-FreeThreadedXMLHTTP60/0005-msxml3-Implement-FreeThreadedXMLHTTP60.patch
|
||||
patch_apply msxml3-FreeThreadedXMLHTTP60/0001-include-Remove-interfaces-already-define-in-msxml6.i.patch
|
||||
patch_apply msxml3-FreeThreadedXMLHTTP60/0002-include-Add-IXMLHTTPRequest2-3-interfaces.patch
|
||||
patch_apply msxml3-FreeThreadedXMLHTTP60/0003-msxml3-Implement-FreeThreadedXMLHTTP60.patch
|
||||
fi
|
||||
|
||||
# Patchset netutils-dll
|
||||
|
||||
@ -1 +1 @@
|
||||
01bacebba418bf6f58a644b1aab41be215bd200a
|
||||
666c5b6e20e3b9e1e34d10b88372406f494699f2
|
||||
|
||||
Loading…
Reference in New Issue
Block a user