[PATCH 3/4] include: Add some missing types to msxml6 typelib.

[Nikolay Sivov]

Signed-off-by: Nikolay Sivov <nsivov at 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 */
-- 
2.28.0