You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-12-15 08:03:15 -08:00
144 lines
4.4 KiB
Diff
144 lines
4.4 KiB
Diff
From 5415f4b6355c3d28d1fbe34aa3627554cea04e36 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
|
|
|
|
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
|
---
|
|
dlls/msxml3/factory.c | 3 +--
|
|
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(-)
|
|
|
|
diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c
|
|
index cd10ec5f8de..782df43dc06 100644
|
|
--- a/dlls/msxml3/factory.c
|
|
+++ b/dlls/msxml3/factory.c
|
|
@@ -31,6 +31,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
|
|
@@ -52,8 +53,6 @@ DEFINE_GUID(CLSID_XSLTemplate60, 0x88d96a08, 0xf192, 0x11d4, 0xa6, 0x5f, 0x00, 0
|
|
|
|
WINE_DEFAULT_DEBUG_CHANNEL(msxml);
|
|
|
|
-extern GUID CLSID_XMLSchemaCache60;
|
|
-
|
|
typedef HRESULT (*ClassFactoryCreateInstanceFunc)(void**);
|
|
typedef HRESULT (*DOMFactoryCreateInstanceFunc)(MSXML_VERSION, void**);
|
|
|
|
diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c
|
|
index 31424aa62b6..e847c399814 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 50e5a743b82..c83e72e136a 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"
|
|
|
|
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
|
|
+++ b/include/msxml6.idl
|
|
@@ -3065,18 +3065,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"),
|
|
@@ -3182,6 +3170,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.51.0
|
|
|