msxml3: Convert dll registration to the IRegistrar mechanism.
diff --git a/include/msxml2.idl b/include/msxml2.idl
index 9d49f46..f9c10ef 100644
--- a/include/msxml2.idl
+++ b/include/msxml2.idl
@@ -1516,15 +1516,6 @@
}
[
- uuid(F6D90F11-9C73-11D3-B32E-00C04F990BB4)
-]
-coclass DOMDocument
-{
- [default] interface IXMLDOMDocument2;
- [default, source] dispinterface XMLDOMDocumentEvents;
-}
-
-[
uuid(f5078f1b-c551-11d3-89b9-0000f81fe221)
]
coclass DOMDocument26
@@ -1534,6 +1525,10 @@
}
[
+ helpstring("XML DOM Document 3.0"),
+ progid("Msxml2.DOMDocument.3.0"),
+ vi_progid("Msxml2.DOMDocument"),
+ threading(both),
uuid(f5078f32-c551-11d3-89b9-0000f81fe221)
]
coclass DOMDocument30
@@ -1561,9 +1556,13 @@
}
[
- uuid(F6D90F12-9C73-11D3-B32E-00C04F990BB4)
+ helpstring("XML DOM Document"),
+ progid("Msxml2.DOMDocument"),
+ vi_progid("Msxml2.DOMDocument"),
+ threading(both),
+ uuid(f6d90f11-9c73-11d3-b32e-00c04f990bb4)
]
-coclass FreeThreadedDOMDocument
+coclass DOMDocument
{
[default] interface IXMLDOMDocument2;
[default, source] dispinterface XMLDOMDocumentEvents;
@@ -1579,6 +1578,10 @@
}
[
+ helpstring("Free threaded XML DOM Document 3.0"),
+ progid("Msxml2.FreeThreadedDOMDocument.3.0"),
+ vi_progid("Msxml2.FreeThreadedDOMDocument"),
+ threading(both),
uuid(f5078f33-c551-11d3-89b9-0000f81fe221)
]
coclass FreeThreadedDOMDocument30
@@ -1606,11 +1609,16 @@
}
[
- uuid(f6d90f16-9c73-11d3-b32e-00c04f990bb4)
+ helpstring("Free threaded XML DOM Document"),
+ progid("Msxml2.FreeThreadedDOMDocument"),
+ vi_progid("Msxml2.FreeThreadedDOMDocument"),
+ threading(both),
+ uuid(f6d90f12-9c73-11d3-b32e-00c04f990bb4)
]
-coclass XMLHTTP
+coclass FreeThreadedDOMDocument
{
- [default] interface IXMLHTTPRequest;
+ [default] interface IXMLDOMDocument2;
+ [default, source] dispinterface XMLDOMDocumentEvents;
}
[
@@ -1622,6 +1630,10 @@
}
[
+ helpstring("XML HTTP 3.0"),
+ progid("Msxml2.XMLHTTP.3.0"),
+ vi_progid("Msxml2.XMLHTTP"),
+ threading(apartment),
uuid(f5078f35-c551-11d3-89b9-0000f81fe221)
]
coclass XMLHTTP30
@@ -1646,14 +1658,22 @@
}
[
- uuid(afba6b42-5692-48ea-8141-dc517dcf0ef1)
+ helpstring("XML HTTP"),
+ progid("Msxml2.XMLHTTP"),
+ vi_progid("Msxml2.XMLHTTP"),
+ threading(apartment),
+ uuid(f6d90f16-9c73-11d3-b32e-00c04f990bb4)
]
-coclass ServerXMLHTTP
+coclass XMLHTTP
{
- [default] interface IServerXMLHTTPRequest;
+ [default] interface IXMLHTTPRequest;
}
[
+ helpstring("Server XML HTTP 3.0"),
+ progid("Msxml2.ServerXMLHTTP.3.0"),
+ vi_progid("Msxml2.ServerXMLHTTP"),
+ threading(apartment),
uuid(afb40ffd-b609-40a3-9828-f88bbe11e4e3)
]
coclass ServerXMLHTTP30
@@ -1678,11 +1698,15 @@
}
[
- uuid(373984c9-b845-449b-91e7-45ac83036ade)
+ helpstring("Server XML HTTP"),
+ progid("Msxml2.ServerXMLHTTP"),
+ vi_progid("Msxml2.ServerXMLHTTP"),
+ threading(apartment),
+ uuid(afba6b42-5692-48ea-8141-dc517dcf0ef1)
]
-coclass XMLSchemaCache
+coclass ServerXMLHTTP
{
- [default] interface IXMLDOMSchemaCollection;
+ [default] interface IServerXMLHTTPRequest;
}
[
@@ -1694,6 +1718,10 @@
}
[
+ helpstring("XML Schema Cache 3.0"),
+ progid("Msxml2.XMLSchemaCache.3.0"),
+ vi_progid("Msxml2.XMLSchemaCache"),
+ threading(both),
uuid(f5078f34-c551-11d3-89b9-0000f81fe221)
]
coclass XMLSchemaCache30
@@ -1718,11 +1746,15 @@
}
[
- uuid(2933BF94-7B36-11d2-B20E-00C04F983E60)
+ helpstring("XML Schema Cache"),
+ progid("Msxml2.XMLSchemaCache"),
+ vi_progid("Msxml2.XMLSchemaCache"),
+ threading(both),
+ uuid(373984c9-b845-449b-91e7-45ac83036ade)
]
-coclass XSLTemplate
+coclass XMLSchemaCache
{
- [default] interface IXSLTemplate;
+ [default] interface IXMLDOMSchemaCollection;
}
[
@@ -1734,6 +1766,10 @@
}
[
+ helpstring("XSL Template 3.0"),
+ progid("Msxml2.XSLTemplate.3.0"),
+ vi_progid("Msxml2.XSLTemplate"),
+ threading(both),
uuid(f5078f36-c551-11d3-89b9-0000f81fe221)
]
coclass XSLTemplate30
@@ -1757,6 +1793,18 @@
[default] interface IXSLTemplate;
}
+[
+ helpstring("XSL Template"),
+ progid("Msxml2.XSLTemplate"),
+ vi_progid("Msxml2.XSLTemplate"),
+ threading(both),
+ uuid(2933BF94-7B36-11d2-B20E-00C04F983E60)
+]
+coclass XSLTemplate
+{
+ [default] interface IXSLTemplate;
+}
+
/*
* Sax Interfaces
*/
@@ -3214,16 +3262,10 @@
[
- uuid(079aa557-4a18-424a-8eee-e39f0a8d41b9)
-]
-coclass SAXXMLReader
-{
- [default] interface IVBSAXXMLReader;
- interface ISAXXMLReader;
- interface IMXReaderControl;
-};
-
-[
+ helpstring("SAX XML Reader 3.0"),
+ progid("Msxml2.SAXXMLReader.3.0"),
+ vi_progid("Msxml2.SAXXMLReader"),
+ threading(both),
uuid(3124c396-fb13-4836-a6ad-1317f1713688)
]
coclass SAXXMLReader30
@@ -3252,6 +3294,20 @@
}
[
+ helpstring("SAX XML Reader"),
+ progid("Msxml2.SAXXMLReader"),
+ vi_progid("Msxml2.SAXXMLReader"),
+ threading(both),
+ uuid(079aa557-4a18-424a-8eee-e39f0a8d41b9)
+]
+coclass SAXXMLReader
+{
+ [default] interface IVBSAXXMLReader;
+ interface ISAXXMLReader;
+ interface IMXReaderControl;
+}
+
+[
uuid(a4c23ec3-6b70-4466-9127-550077239978)
]
coclass MXHTMLWriter
@@ -3332,26 +3388,10 @@
}
[
- 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;
-};
-
-[
+ helpstring("MXXMLWriter 3.0"),
+ progid("Msxml2.MXXMLWriter.3.0"),
+ vi_progid("Msxml2.MXXMLWriter"),
+ threading(both),
uuid(3d813dfe-6c91-4a4e-8f41-04346a841d9c)
]
coclass MXXMLWriter30
@@ -3412,6 +3452,30 @@
}
[
+ helpstring("MXXMLWriter"),
+ progid("Msxml2.MXXMLWriter"),
+ vi_progid("Msxml2.MXXMLWriter"),
+ threading(both),
+ 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(88d969d5-f192-11d4-a65f-0040963251e5)
]
coclass MXNamespaceManager
@@ -3439,16 +3503,10 @@
}
[
- uuid(4dd441ad-526d-4a77-9f1b-9841ed802fb0)
-]
-coclass SAXAttributes
-{
- [default] interface IMXAttributes;
- interface IVBSAXAttributes;
- interface ISAXAttributes;
-}
-
-[
+ helpstring("SAXAttributes 3.0"),
+ progid("Msxml2.SAXAttributes.3.0"),
+ vi_progid("Msxml2.SAXAttributes"),
+ threading(both),
uuid(3e784a01-f3ae-4dc0-9354-9526b9370eba)
]
coclass SAXAttributes30
@@ -3478,6 +3536,20 @@
interface ISAXAttributes;
}
+[
+ helpstring("SAXAttributes"),
+ progid("Msxml2.SAXAttributes"),
+ vi_progid("Msxml2.SAXAttributes"),
+ threading(both),
+ uuid(4dd441ad-526d-4a77-9f1b-9841ed802fb0)
+]
+coclass SAXAttributes
+{
+ [default] interface IMXAttributes;
+ interface IVBSAXAttributes;
+ interface ISAXAttributes;
+}
+
/*
* Error Codes
*/
