From: Alistair Leslie-Hughes leslie_alistair@hotmail.com
Signed-off-by: Alistair Leslie-Hughes leslie_alistair@hotmail.com Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- include/msxml2.idl | 3 +++ include/msxml6.idl | 3 +++ 2 files changed, 6 insertions(+)
diff --git a/include/msxml2.idl b/include/msxml2.idl index cfafc421336..452338bb01d 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -133,6 +133,8 @@ typedef enum tagDOMNodeType } DOMNodeType; cpp_quote("#endif")
+cpp_quote("#ifndef __msxml_som_enums__") +cpp_quote("#define __msxml_som_enums__") typedef enum _SOMITEMTYPE { SOMITEM_SCHEMA = 0x1000, @@ -260,6 +262,7 @@ typedef enum _SCHEMATYPEVARIETY SCHEMATYPEVARIETY_LIST = 1, SCHEMATYPEVARIETY_UNION = 2, } SCHEMATYPEVARIETY; +cpp_quote("#endif /* __msxml_som_enums__ */")
[ local, diff --git a/include/msxml6.idl b/include/msxml6.idl index 1f657a8cde9..a595fbf4f5a 100644 --- a/include/msxml6.idl +++ b/include/msxml6.idl @@ -133,6 +133,8 @@ typedef enum tagDOMNodeType } DOMNodeType; cpp_quote("#endif")
+cpp_quote("#ifndef __msxml_som_enums__") +cpp_quote("#define __msxml_som_enums__") typedef enum _SOMITEMTYPE { SOMITEM_SCHEMA = 0x1000, @@ -260,6 +262,7 @@ typedef enum _SCHEMATYPEVARIETY SCHEMATYPEVARIETY_LIST = 1, SCHEMATYPEVARIETY_UNION = 2, } SCHEMATYPEVARIETY; +cpp_quote("#endif /* __msxml_som_enums__ */")
[ local,
From: Alistair Leslie-Hughes leslie_alistair@hotmail.com
Signed-off-by: Alistair Leslie-Hughes leslie_alistair@hotmail.com Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- dlls/msxml3/main.c | 24 +++ dlls/msxml3/msxml_private.h | 27 +-- include/msxml6.idl | 394 ------------------------------------ 3 files changed, 27 insertions(+), 418 deletions(-)
diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index ec204aeb3bd..5135574846b 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -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) { diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 5fce0609857..a59e00bf2b3 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -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; diff --git a/include/msxml6.idl b/include/msxml6.idl index a595fbf4f5a..45cbdbb8929 100644 --- a/include/msxml6.idl +++ b/include/msxml6.idl @@ -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 @@ -1418,42 +1414,6 @@ interface IXMLDOMParseErrorCollection : IDispatch HRESULT _newEnum( [retval, out] IUnknown **ppunk); }
-[ - 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"), @@ -1466,42 +1426,6 @@ coclass DOMDocument60 [default, source] dispinterface XMLDOMDocumentEvents; }
-[ - 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"), @@ -1514,38 +1438,6 @@ coclass FreeThreadedDOMDocument60 [default, source] dispinterface XMLDOMDocumentEvents; }
-[ - 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"), @@ -1557,30 +1449,6 @@ coclass XMLHTTP60 [default] interface IXMLHTTPRequest; }
-[ - 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"), @@ -1592,38 +1460,6 @@ coclass ServerXMLHTTP60 [default] interface IServerXMLHTTPRequest2; }
-[ - 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"), @@ -1635,38 +1471,6 @@ coclass XMLSchemaCache60 [default] interface IXMLDOMSchemaCollection2; }
-[ - 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"), @@ -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"), @@ -3175,66 +2949,6 @@ coclass SAXXMLReader60 interface ISAXXMLReader; }
-[ - 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"), @@ -3258,66 +2972,6 @@ coclass MXHTMLWriter60 interface IVBSAXLexicalHandler; }
-[ - 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"), @@ -3341,24 +2995,6 @@ coclass MXXMLWriter60 interface IVBSAXLexicalHandler; }
-[ - 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"), @@ -3371,36 +3007,6 @@ coclass MXNamespaceManager60 interface IMXNamespaceManager; }
-[ - 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"),
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- include/msxml6.idl | 221 +++++++++++++++++++++++++++++---------------- 1 file changed, 141 insertions(+), 80 deletions(-)
diff --git a/include/msxml6.idl b/include/msxml6.idl index 45cbdbb8929..113704d5dbe 100644 --- a/include/msxml6.idl +++ b/include/msxml6.idl @@ -31,16 +31,6 @@ import "oaidl.idl"; #define vi_progid(str) #endif
-[ - uuid(f5078f18-c551-11d3-89b9-0000f81fe221), - version(6.0), - helpstring("Microsoft XML, v6.0") -] -library MSXML2 -{ - -importlib("stdole2.tlb"); - interface IXMLDOMImplementation; interface IXMLDOMNode; interface IXMLDOMDocumentFragment; @@ -1264,6 +1254,17 @@ interface IXMLHTTPRequest : IDispatch HRESULT onreadystatechange([in] IDispatch *pReadyStateSink); }
+typedef enum _SXH_SERVER_CERT_OPTION +{ + SXH_SERVER_CERT_IGNORE_UNKNOWN_CA = 0x00000100, + SXH_SERVER_CERT_IGNORE_WRONG_USAGE = 0x00000200, + SXH_SERVER_CERT_IGNORE_CERT_CN_INVALID = 0x00001000, + SXH_SERVER_CERT_IGNORE_CERT_DATE_INVALID = 0x00002000, + SXH_SERVER_CERT_IGNORE_ALL_SERVER_ERRORS = + (SXH_SERVER_CERT_IGNORE_UNKNOWN_CA | SXH_SERVER_CERT_IGNORE_WRONG_USAGE | + SXH_SERVER_CERT_IGNORE_CERT_CN_INVALID | SXH_SERVER_CERT_IGNORE_CERT_DATE_INVALID), +} SXH_SERVER_CERT_OPTION; + [ object, dual, @@ -1414,74 +1415,6 @@ interface IXMLDOMParseErrorCollection : IDispatch HRESULT _newEnum( [retval, out] IUnknown **ppunk); }
-[ - helpstring("XML DOM Document 6.0"), - progid("Msxml2.DOMDocument.6.0"), - threading(both), - uuid(88d96a05-f192-11d4-a65f-0040963251e5) -] -coclass DOMDocument60 -{ - [default] interface IXMLDOMDocument3; - [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("XML HTTP 6.0"), - progid("Msxml2.XMLHTTP.6.0"), - threading(apartment), - uuid(88d96a0a-f192-11d4-a65f-0040963251e5) -] -coclass XMLHTTP60 -{ - [default] interface IXMLHTTPRequest; -} - -[ - helpstring("Server XML HTTP 6.0"), - progid("Msxml2.ServerXMLHTTP.6.0"), - threading(apartment), - uuid(88d96a0b-f192-11d4-a65f-0040963251e5) -] -coclass ServerXMLHTTP60 -{ - [default] interface IServerXMLHTTPRequest2; -} - -[ - helpstring("XML Schema Cache 6.0"), - progid("Msxml2.XMLSchemaCache.6.0"), - threading(both), - uuid(88d96a07-f192-11d4-a65f-0040963251e5) -] -coclass XMLSchemaCache60 -{ - [default] interface IXMLDOMSchemaCollection2; -} - -[ - helpstring("XSL Template 6.0"), - progid("Msxml2.XSLTemplate.6.0"), - threading(both), - uuid(88d96a08-f192-11d4-a65f-0040963251e5) -] -coclass XSLTemplate60 -{ - [default] interface IXSLTemplate; -} - /* * Sax Interfaces */ @@ -2937,6 +2870,90 @@ interface ISchemaNotation : ISchemaItem [out,retval] BSTR* uri); }
+[ + uuid(f5078f18-c551-11d3-89b9-0000f81fe221), + version(6.0), + helpstring("Microsoft XML, v6.0") +] +library MSXML2 +{ + +importlib("stdole2.tlb"); + +interface IXMLDOMNotation; +interface IXMLDOMEntity; +interface IXMLDOMEntityReference; +interface IXMLDOMParseError2; +interface IXMLDOMParseErrorCollection; +interface IXMLDOMSelection; +interface IXTLRuntime; +dispinterface XMLDOMDocumentEvents; +interface ISAXXMLFilter; +interface IVBSAXXMLFilter; +interface IMXReaderControl; +interface IMXSchemaDeclHandler; +interface IMXXMLFilter; +interface ISchemaElement; +interface ISchemaParticle; +interface ISchemaType; +interface ISchemaComplexType; +interface ISchemaAny; +interface ISchemaModelGroup; +interface ISchemaAttribute; +interface ISchemaAttributeGroup; +interface ISchemaIdentityConstraint; +interface ISchemaNotation; + +[hidden] typedef struct __msxml6_ReferenceRemainingTypes__ +{ + enum tagDOMNodeType __tagDomNodeType__; + DOMNodeType __domNodeType__; + enum _SERVERXMLHTTP_OPTION __serverXmlHttpOptionEnum__; + SERVERXMLHTTP_OPTION __serverXmlHttpOption__; + enum _SXH_SERVER_CERT_OPTION __serverCertOptionEnum__; + SXH_SERVER_CERT_OPTION __serverCertOption__; + enum _SXH_PROXY_SETTING __proxySettingEnum__; + SXH_PROXY_SETTING __proxySetting__; + enum _SOMITEMTYPE __somItemTypeEnum__; + SOMITEMTYPE __somItemType__; + enum _SCHEMAUSE __schemaUseEnum__; + SCHEMAUSE __schemaUse__; + enum _SCHEMADERIVATIONMETHOD __schemaDerivationMethodEnum__; + SCHEMADERIVATIONMETHOD __schemaDerivationMethod__; + enum _SCHEMACONTENTTYPE __schemaContentTypeEnum__; + SCHEMACONTENTTYPE __schemaContentType__; + enum _SCHEMAPROCESSCONTENTS __schemaProcessContentsEnum__; + SCHEMAPROCESSCONTENTS __schemaProcessContents__; + enum _SCHEMAWHITESPACE __schemaWhitespaceEnum__; + SCHEMAWHITESPACE __schemaWhitespace__; + enum _SCHEMATYPEVARIETY __schemaTypeVarietyEnum__; + SCHEMATYPEVARIETY __schemaTypeVariety__; +} __msxml6_ReferenceRemainingTypes__; + +[ + helpstring("XML DOM Document 6.0"), + progid("Msxml2.DOMDocument.6.0"), + threading(both), + uuid(88d96a05-f192-11d4-a65f-0040963251e5) +] +coclass DOMDocument60 +{ + [default] interface IXMLDOMDocument3; + [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"), @@ -2949,6 +2966,17 @@ coclass SAXXMLReader60 interface ISAXXMLReader; }
+[ + helpstring("XML Schema Cache 6.0"), + progid("Msxml2.XMLSchemaCache.6.0"), + threading(both), + uuid(88d96a07-f192-11d4-a65f-0040963251e5) +] +coclass XMLSchemaCache60 +{ + [default] interface IXMLDOMSchemaCollection2; +} + [ helpstring("MXHTMLWriter 6.0"), progid("Msxml2.MXHTMLWriter.6.0"), @@ -3020,6 +3048,41 @@ coclass SAXAttributes60 interface ISAXAttributes; }
+[ + helpstring("XSL Template 6.0"), + progid("Msxml2.XSLTemplate.6.0"), + threading(both), + uuid(88d96a08-f192-11d4-a65f-0040963251e5) +] +coclass XSLTemplate60 +{ + [default] interface IXSLTemplate; +} + +[ + helpstring("XML HTTP 6.0"), + progid("Msxml2.XMLHTTP.6.0"), + threading(apartment), + uuid(88d96a0a-f192-11d4-a65f-0040963251e5) +] +coclass XMLHTTP60 +{ + [default] interface IXMLHTTPRequest; +} + +[ + helpstring("Server XML HTTP 6.0"), + progid("Msxml2.ServerXMLHTTP.6.0"), + threading(apartment), + uuid(88d96a0b-f192-11d4-a65f-0040963251e5) +] +coclass ServerXMLHTTP60 +{ + [default] interface IServerXMLHTTPRequest2; +} + +} /* Library MSXML */ + /* * Error Codes */ @@ -3027,5 +3090,3 @@ cpp_quote("#define E_XML_NOTWF 0xC00CE223") cpp_quote("#define E_XML_NODTD 0xC00CE224") cpp_quote("#define E_XML_INVALID 0xC00CE225") cpp_quote("#define E_XML_BUFFERTOOSMALL 0xC00CE226") - -} /* Library MSXML */
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- include/msxml2.idl | 4 ++++ include/msxml6.idl | 4 ++++ 2 files changed, 8 insertions(+)
diff --git a/include/msxml2.idl b/include/msxml2.idl index 452338bb01d..916e0e8ab3d 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -31,6 +31,10 @@ import "oaidl.idl"; #define vi_progid(str) #endif
+cpp_quote("#ifdef __ISAXXMLReader_INTERFACE_DEFINED__") +cpp_quote("#undef __MSXML2_LIBRARY_DEFINED__") +cpp_quote("#endif") + [ uuid(f5078f18-c551-11d3-89b9-0000f81fe221), version(3.0), diff --git a/include/msxml6.idl b/include/msxml6.idl index 113704d5dbe..5bfb21d04ae 100644 --- a/include/msxml6.idl +++ b/include/msxml6.idl @@ -99,6 +99,10 @@ interface ISchemaAny; interface ISchemaIdentityConstraint; interface ISchemaNotation;
+cpp_quote("#ifdef __ISAXXMLReader_INTERFACE_DEFINED__") +cpp_quote("#undef __MSXML2_LIBRARY_DEFINED__") +cpp_quote("#endif") + cpp_quote("#ifndef __MSXML_DOMNODETYPE_DEFINED") cpp_quote("#define __MSXML_DOMNODETYPE_DEFINED") typedef enum tagDOMNodeType
-
Nikolay Sivov