Skip to content

W
wine-winehq
Commit ca937890 authored by Alistair Leslie-Hughes's avatar Alistair Leslie-Hughes Committed by Alexandre Julliard
Browse files
Options

include: Remove coclasses that don't belong to msxml6.idl.

Signed-off-by: 's avatarAlistair Leslie-Hughes <leslie_alistair@hotmail.com> Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 870ae19c
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 418 deletions
dlls/msxml3/main.c
View file @ ca937890
......@@ -51,6 +51,7 @@
#include "ole2.h"
#include "rpcproxy.h"
#include "msxml.h"
#include "msxml2.h"
#include "msxml6.h"
#include "wine/unicode.h"
......@@ -393,6 +394,29 @@ static void init_char_encoders(void)
#endif /* HAVE_LIBXML2 */
const CLSID* DOMDocument_version(MSXML_VERSION v)
{
switch (v)
{
default:
case MSXML_DEFAULT: return &CLSID_DOMDocument;
case MSXML3: return &CLSID_DOMDocument30;
case MSXML4: return &CLSID_DOMDocument40;
case MSXML6: return &CLSID_DOMDocument60;
}
}
const CLSID* SchemaCache_version(MSXML_VERSION v)
{
switch (v)
{
default:
case MSXML_DEFAULT: return &CLSID_XMLSchemaCache;
case MSXML3: return &CLSID_XMLSchemaCache30;
case MSXML4: return &CLSID_XMLSchemaCache40;
case MSXML6: return &CLSID_XMLSchemaCache60;
}
}
HRESULT WINAPI DllCanUnloadNow(void)
{
......
dlls/msxml3/msxml_private.h
View file @ ca937890
......@@ -40,6 +40,9 @@ typedef enum {
MSXML6 = 60
} MSXML_VERSION;
extern const CLSID * DOMDocument_version(MSXML_VERSION v) DECLSPEC_HIDDEN;
extern const CLSID * SchemaCache_version(MSXML_VERSION v) DECLSPEC_HIDDEN;
/* typelibs */
typedef enum tid_t {
NULL_tid,
......@@ -505,30 +508,6 @@ extern HRESULT MXNamespaceManager_create(void**) DECLSPEC_HIDDEN;
extern HRESULT XMLParser_create(void**) DECLSPEC_HIDDEN;
extern HRESULT XMLView_create(void**) DECLSPEC_HIDDEN;
static inline const CLSID* DOMDocument_version(MSXML_VERSION v)
{
switch (v)
{
default:
case MSXML_DEFAULT: return &CLSID_DOMDocument;
case MSXML3: return &CLSID_DOMDocument30;
case MSXML4: return &CLSID_DOMDocument40;
case MSXML6: return &CLSID_DOMDocument60;
}
}
static inline const CLSID* SchemaCache_version(MSXML_VERSION v)
{
switch (v)
{
default:
case MSXML_DEFAULT: return &CLSID_XMLSchemaCache;
case MSXML3: return &CLSID_XMLSchemaCache30;
case MSXML4: return &CLSID_XMLSchemaCache40;
case MSXML6: return &CLSID_XMLSchemaCache60;
}
}
typedef struct bsc_t bsc_t;
HRESULT create_moniker_from_url(LPCWSTR, IMoniker**) DECLSPEC_HIDDEN;
......
include/msxml6.idl
View file @ ca937890
......@@ -109,10 +109,6 @@ interface ISchemaAny;
interface ISchemaIdentityConstraint;
interface ISchemaNotation;
cpp_quote("#define DOMDocument DOMDocument2")
cpp_quote("#define CLSID_DOMDocument CLSID_DOMDocument2")
cpp_quote("#ifndef __MSXML_DOMNODETYPE_DEFINED")
cpp_quote("#define __MSXML_DOMNODETYPE_DEFINED")
typedef enum tagDOMNodeType
......@@ -1419,42 +1415,6 @@ interface IXMLDOMParseErrorCollection : IDispatch
}
[
uuid(F6D90F11-9C73-11D3-B32E-00C04F990BB4)
]
coclass DOMDocument
{
[default] interface IXMLDOMDocument2;
[default, source] dispinterface XMLDOMDocumentEvents;
}
[
uuid(f5078f1b-c551-11d3-89b9-0000f81fe221)
]
coclass DOMDocument26
{
[default] interface IXMLDOMDocument2;
[default, source] dispinterface XMLDOMDocumentEvents;
}
[
uuid(f5078f32-c551-11d3-89b9-0000f81fe221)
]
coclass DOMDocument30
{
[default] interface IXMLDOMDocument2;
[default, source] dispinterface XMLDOMDocumentEvents;
}
[
uuid(88d969c0-f192-11d4-a65f-0040963251e5)
]
coclass DOMDocument40
{
[default] interface IXMLDOMDocument2;
[default, source] dispinterface XMLDOMDocumentEvents;
}
[
helpstring("XML DOM Document 6.0"),
progid("Msxml2.DOMDocument.6.0"),
threading(both),
......@@ -1467,42 +1427,6 @@ coclass DOMDocument60
}
[
uuid(F6D90F12-9C73-11D3-B32E-00C04F990BB4)
]
coclass FreeThreadedDOMDocument
{
[default] interface IXMLDOMDocument2;
[default, source] dispinterface XMLDOMDocumentEvents;
}
[
uuid(f5078f1c-c551-11d3-89b9-0000f81fe221)
]
coclass FreeThreadedDOMDocument26
{
[default] interface IXMLDOMDocument2;
[default, source] dispinterface XMLDOMDocumentEvents;
}
[
uuid(f5078f33-c551-11d3-89b9-0000f81fe221)
]
coclass FreeThreadedDOMDocument30
{
[default] interface IXMLDOMDocument2;
[default, source] dispinterface XMLDOMDocumentEvents;
}
[
uuid(88d969c1-f192-11d4-a65f-0040963251e5)
]
coclass FreeThreadedDOMDocument40
{
[default] interface IXMLDOMDocument2;
[default, source] dispinterface XMLDOMDocumentEvents;
}
[
helpstring("Free threaded XML DOM Document 6.0"),
progid("Msxml2.FreeThreadedDOMDocument.6.0"),
threading(both),
......@@ -1515,38 +1439,6 @@ coclass FreeThreadedDOMDocument60
}
[
uuid(f6d90f16-9c73-11d3-b32e-00c04f990bb4)
]
coclass XMLHTTP
{
[default] interface IXMLHTTPRequest;
}
[
uuid(f5078f1e-c551-11d3-89b9-0000f81fe221)
]
coclass XMLHTTP26
{
[default] interface IXMLHTTPRequest;
}
[
uuid(f5078f35-c551-11d3-89b9-0000f81fe221)
]
coclass XMLHTTP30
{
[default] interface IXMLHTTPRequest;
}
[
uuid(88d969c5-f192-11d4-a65f-0040963251e5)
]
coclass XMLHTTP40
{
[default] interface IXMLHTTPRequest;
}
[
helpstring("XML HTTP 6.0"),
progid("Msxml2.XMLHTTP.6.0"),
threading(apartment),
......@@ -1558,30 +1450,6 @@ coclass XMLHTTP60
}
[
uuid(afba6b42-5692-48ea-8141-dc517dcf0ef1)
]
coclass ServerXMLHTTP
{
[default] interface IServerXMLHTTPRequest;
}
[
uuid(afb40ffd-b609-40a3-9828-f88bbe11e4e3)
]
coclass ServerXMLHTTP30
{
[default] interface IServerXMLHTTPRequest;
}
[
uuid(88d969c6-f192-11d4-a65f-0040963251e5)
]
coclass ServerXMLHTTP40
{
[default] interface IServerXMLHTTPRequest2;
}
[
helpstring("Server XML HTTP 6.0"),
progid("Msxml2.ServerXMLHTTP.6.0"),
threading(apartment),
......@@ -1593,38 +1461,6 @@ coclass ServerXMLHTTP60
}
[
uuid(373984c9-b845-449b-91e7-45ac83036ade)
]
coclass XMLSchemaCache
{
[default] interface IXMLDOMSchemaCollection;
}
[
uuid(f5078f1d-c551-11d3-89b9-0000f81fe221)
]
coclass XMLSchemaCache26
{
[default] interface IXMLDOMSchemaCollection;
}
[
uuid(f5078f34-c551-11d3-89b9-0000f81fe221)
]
coclass XMLSchemaCache30
{
[default] interface IXMLDOMSchemaCollection;
}
[
uuid(88d969c2-f192-11d4-a65f-0040963251e5)
]
coclass XMLSchemaCache40
{
[default] interface IXMLDOMSchemaCollection2;
}
[
helpstring("XML Schema Cache 6.0"),
progid("Msxml2.XMLSchemaCache.6.0"),
threading(both),
......@@ -1636,38 +1472,6 @@ coclass XMLSchemaCache60
}
[
uuid(2933BF94-7B36-11d2-B20E-00C04F983E60)
]
coclass XSLTemplate
{
[default] interface IXSLTemplate;
}
[
uuid(f5078f21-c551-11d3-89b9-0000f81fe221)
]
coclass XSLTemplate26
{
[default] interface IXSLTemplate;
}
[
uuid(f5078f36-c551-11d3-89b9-0000f81fe221)
]
coclass XSLTemplate30
{
[default] interface IXSLTemplate;
}
[
uuid(88d969c3-f192-11d4-a65f-0040963251e5)
]
coclass XSLTemplate40
{
[default] interface IXSLTemplate;
}
[
helpstring("XSL Template 6.0"),
progid("Msxml2.XSLTemplate.6.0"),
threading(both),
......@@ -3133,36 +2937,6 @@ interface ISchemaNotation : ISchemaItem
[out,retval] BSTR* uri);
}
[
uuid(079aa557-4a18-424a-8eee-e39f0a8d41b9)
]
coclass SAXXMLReader
{
[default] interface IVBSAXXMLReader;
interface ISAXXMLReader;
interface IMXReaderControl;
}
[
uuid(3124c396-fb13-4836-a6ad-1317f1713688)
]
coclass SAXXMLReader30
{
[default] interface IVBSAXXMLReader;
interface ISAXXMLReader;
interface IMXReaderControl;
}
[
uuid(7c6e29bc-8b8b-4c3d-859e-af6cd158be0f)
]
coclass SAXXMLReader40
{
[default] interface IVBSAXXMLReader;
interface ISAXXMLReader;
}
[
helpstring("SAX XML Reader 6.0"),
progid("Msxml2.SAXXMLReader.6.0"),
......@@ -3176,66 +2950,6 @@ coclass SAXXMLReader60
}
[
uuid(a4c23ec3-6b70-4466-9127-550077239978)
]
coclass MXHTMLWriter
{
[default] interface IMXWriter;
interface ISAXContentHandler;
interface ISAXErrorHandler;
interface ISAXDTDHandler;
interface ISAXLexicalHandler;
interface ISAXDeclHandler;
interface IVBSAXContentHandler;
interface IVBSAXDeclHandler;
interface IVBSAXDTDHandler;
interface IVBSAXErrorHandler;
interface IVBSAXLexicalHandler;
}
[
uuid(853d1540-c1a7-4aa9-a226-4d3bd301146d)
]
coclass MXHTMLWriter30
{
[default] interface IMXWriter;
interface ISAXContentHandler;
interface ISAXDeclHandler;
interface ISAXDTDHandler;
interface ISAXErrorHandler;
interface ISAXLexicalHandler;
interface IVBSAXContentHandler;
interface IVBSAXDeclHandler;
interface IVBSAXDTDHandler;
interface IVBSAXErrorHandler;
interface IVBSAXLexicalHandler;
}
[
uuid(88d969c9-f192-11d4-a65f-0040963251e5)
]
coclass MXHTMLWriter40
{
[default] interface IMXWriter;
interface ISAXContentHandler;
interface ISAXDeclHandler;
interface ISAXDTDHandler;
interface ISAXErrorHandler;
interface ISAXLexicalHandler;
interface IVBSAXContentHandler;
interface IVBSAXDeclHandler;
interface IVBSAXDTDHandler;
interface IVBSAXErrorHandler;
interface IVBSAXLexicalHandler;
}
[
helpstring("MXHTMLWriter 6.0"),
progid("Msxml2.MXHTMLWriter.6.0"),
threading(both),
......@@ -3259,66 +2973,6 @@ coclass MXHTMLWriter60
}
[
uuid(fc220ad8-a72a-4ee8-926e-0b7ad152a020)
]
coclass MXXMLWriter
{
[default] interface IMXWriter;
interface ISAXContentHandler;
interface ISAXErrorHandler;
interface ISAXDTDHandler;
interface ISAXLexicalHandler;
interface ISAXDeclHandler;
interface IVBSAXContentHandler;
interface IVBSAXDeclHandler;
interface IVBSAXDTDHandler;
interface IVBSAXErrorHandler;
interface IVBSAXLexicalHandler;
}
[
uuid(3d813dfe-6c91-4a4e-8f41-04346a841d9c)
]
coclass MXXMLWriter30
{
[default] interface IMXWriter;
interface ISAXContentHandler;
interface ISAXDeclHandler;
interface ISAXDTDHandler;
interface ISAXErrorHandler;
interface ISAXLexicalHandler;
interface IVBSAXContentHandler;
interface IVBSAXDeclHandler;
interface IVBSAXDTDHandler;
interface IVBSAXErrorHandler;
interface IVBSAXLexicalHandler;
}
[
uuid(88d969c8-f192-11d4-a65f-0040963251e5),
]
coclass MXXMLWriter40
{
[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 6.0"),
progid("Msxml2.MXXMLWriter.6.0"),
threading(both),
......@@ -3342,24 +2996,6 @@ coclass MXXMLWriter60
}
[
uuid(88d969d5-f192-11d4-a65f-0040963251e5)
]
coclass MXNamespaceManager
{
[default] interface IVBMXNamespaceManager;
interface IMXNamespaceManager;
}
[
uuid(88d969d6-f192-11d4-a65f-0040963251e5)
]
coclass MXNamespaceManager40
{
[default] interface IVBMXNamespaceManager;
interface IMXNamespaceManager;
}
[
helpstring("MXNamespaceManager 6.0"),
progid("Msxml2.MXNamespaceManager.6.0"),
threading(both),
......@@ -3372,36 +3008,6 @@ coclass MXNamespaceManager60
}
[
uuid(4dd441ad-526d-4a77-9f1b-9841ed802fb0)
]
coclass SAXAttributes
{
[default] interface IMXAttributes;
interface IVBSAXAttributes;
interface ISAXAttributes;
}
[
uuid(3e784a01-f3ae-4dc0-9354-9526b9370eba)
]
coclass SAXAttributes30
{
[default] interface IMXAttributes;
interface IVBSAXAttributes;
interface ISAXAttributes;
}
[
uuid(88d969ca-f192-11d4-a65f-0040963251e5),
]
coclass SAXAttributes40
{
[default] interface IMXAttributes;
interface IVBSAXAttributes;
interface ISAXAttributes;
}
[
helpstring("SAXAttributes 6.0"),
progid("Msxml2.SAXAttributes.6.0"),
threading(both),
......
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