Skip to content

W
wine-fonts
Commit 2f25bad0 authored by Alistair Leslie-Hughes's avatar Alistair Leslie-Hughes Committed by Vitaly Lipatov
Browse files
Options

include: Remove interfaces already define in msxml6.idl

Signed-off-by: 's avatarAlistair Leslie-Hughes <leslie_alistair@hotmail.com>
parent f911e092
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 121 deletions
dlls/msxml3/factory.c
View file @ 2f25bad0
......@@ -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
......
dlls/msxml3/tests/saxreader.c
View file @ 2f25bad0
......@@ -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"
......
dlls/msxml3/tests/schema.c
View file @ 2f25bad0
......@@ -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 check_interface(a, b, c) check_interface_(__LINE__, a, b, c)
......
dlls/msxml3/uuid.c
View file @ 2f25bad0
......@@ -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
......
include/msxml2.idl
View file @ 2f25bad0
......@@ -1613,15 +1613,6 @@ coclass FreeThreadedDOMDocument40
}
[
uuid(88d96a06-f192-11d4-a65f-0040963251e5),
]
coclass FreeThreadedDOMDocument60
{
[default] interface IXMLDOMDocument3;
[default, source] dispinterface XMLDOMDocumentEvents;
}
[
helpstring("Free threaded XML DOM Document"),
progid("Msxml2.FreeThreadedDOMDocument"),
vi_progid("Msxml2.FreeThreadedDOMDocument"),
......@@ -1663,14 +1654,6 @@ coclass XMLHTTP40
}
[
uuid(88d96a0a-f192-11d4-a65f-0040963251e5)
]
coclass XMLHTTP60
{
[default] interface IXMLHTTPRequest;
}
[
helpstring("XML HTTP"),
progid("Msxml2.XMLHTTP"),
vi_progid("Msxml2.XMLHTTP"),
......@@ -1703,14 +1686,6 @@ coclass ServerXMLHTTP40
}
[
uuid(88d96a0b-f192-11d4-a65f-0040963251e5)
]
coclass ServerXMLHTTP60
{
[default] interface IServerXMLHTTPRequest2;
}
[
helpstring("Server XML HTTP"),
progid("Msxml2.ServerXMLHTTP"),
vi_progid("Msxml2.ServerXMLHTTP"),
......@@ -1751,14 +1726,6 @@ coclass XMLSchemaCache40
}
[
uuid(88d96a07-f192-11d4-a65f-0040963251e5)
]
coclass XMLSchemaCache60
{
[default] interface IXMLDOMSchemaCollection2;
}
[
helpstring("XML Schema Cache"),
progid("Msxml2.XMLSchemaCache"),
vi_progid("Msxml2.XMLSchemaCache"),
......@@ -1799,14 +1766,6 @@ coclass XSLTemplate40
}
[
uuid(88d96a08-f192-11d4-a65f-0040963251e5)
]
coclass XSLTemplate60
{
[default] interface IXSLTemplate;
}
[
helpstring("XSL Template"),
progid("Msxml2.XSLTemplate"),
vi_progid("Msxml2.XSLTemplate"),
......@@ -3298,15 +3257,6 @@ coclass SAXXMLReader40
}
[
uuid(88d96a0c-f192-11d4-a65f-0040963251e5)
]
coclass SAXXMLReader60
{
[default] interface IVBSAXXMLReader;
interface ISAXXMLReader;
}
[
helpstring("SAX XML Reader"),
progid("Msxml2.SAXXMLReader"),
vi_progid("Msxml2.SAXXMLReader"),
......@@ -3381,26 +3331,6 @@ coclass MXHTMLWriter40
}
[
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"),
vi_progid("Msxml2.MXXMLWriter"),
......@@ -3445,26 +3375,6 @@ coclass MXXMLWriter40
}
[
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"),
vi_progid("Msxml2.MXXMLWriter"),
......@@ -3507,15 +3417,6 @@ coclass MXNamespaceManager40
}
[
uuid(88d96a11-f192-11d4-a65f-0040963251e5)
]
coclass MXNamespaceManager60
{
[default] interface IVBMXNamespaceManager;
interface IMXNamespaceManager;
}
[
helpstring("SAXAttributes 3.0"),
progid("Msxml2.SAXAttributes.3.0"),
vi_progid("Msxml2.SAXAttributes"),
......@@ -3540,16 +3441,6 @@ coclass SAXAttributes40
}
[
uuid(88d96a0e-f192-11d4-a65f-0040963251e5)
]
coclass SAXAttributes60
{
[default] interface IMXAttributes;
interface IVBSAXAttributes;
interface ISAXAttributes;
}
[
helpstring("SAXAttributes"),
progid("Msxml2.SAXAttributes"),
vi_progid("Msxml2.SAXAttributes"),
......
include/msxml6.idl
View file @ 2f25bad0
......@@ -3049,18 +3049,6 @@ coclass DOMDocument60
}
[
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"),
threading(both),
......@@ -3166,6 +3154,18 @@ coclass XSLTemplate60
}
[
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"),
threading(apartment),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment