Skip to content

W
wine-cw
Commit c1c92d07 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

msxml3: Convert dll registration to the IRegistrar mechanism.

parent 41d6a923
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 144 additions and 55 deletions
dlls/msxml3/Makefile.in
View file @ c1c92d07
......@@ -25,7 +25,6 @@ C_SRCS = \
parseerror.c \
pi.c \
queryresult.c \
regsvr.c \
saxreader.c \
schema.c \
text.c \
......@@ -43,5 +42,6 @@ RC_SRCS = \
version.rc
IDL_TLB_SRCS = msxml3_v1.idl
IDL_R_SRCS = msxml3_v1.idl
@MAKE_DLL_RULES@
dlls/msxml3/main.c
View file @ c1c92d07
......@@ -29,6 +29,7 @@
#include "winbase.h"
#include "winuser.h"
#include "ole2.h"
#include "rpcproxy.h"
#include "msxml.h"
#include "msxml6.h"
......@@ -243,3 +244,19 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
}
return TRUE;
}
/***********************************************************************
* DllRegisterServer (MSXML3.@)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( MSXML_hInstance, NULL );
}
/***********************************************************************
* DllUnregisterServer (MSXML3.@)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( MSXML_hInstance, NULL );
}
include/msxml2.idl
View file @ c1c92d07
......@@ -1516,15 +1516,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
......@@ -1534,6 +1525,10 @@ coclass DOMDocument26
}
[
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 @@ coclass DOMDocument60
}
[
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 @@ coclass FreeThreadedDOMDocument26
}
[
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 @@ coclass FreeThreadedDOMDocument60
}
[
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 @@ coclass XMLHTTP26
}
[
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 @@ coclass XMLHTTP60
}
[
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 @@ coclass ServerXMLHTTP60
}
[
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 @@ coclass XMLSchemaCache26
}
[
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 @@ coclass XMLSchemaCache60
}
[
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 @@ coclass XSLTemplate26
}
[
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 @@ coclass XSLTemplate60
[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 @@ interface ISchemaNotation : ISchemaItem
[
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 @@ coclass SAXXMLReader60
}
[
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,17 +3388,21 @@ coclass MXHTMLWriter60
}
[
uuid(fc220ad8-a72a-4ee8-926e-0b7ad152a020)
helpstring("MXXMLWriter 3.0"),
progid("Msxml2.MXXMLWriter.3.0"),
vi_progid("Msxml2.MXXMLWriter"),
threading(both),
uuid(3d813dfe-6c91-4a4e-8f41-04346a841d9c)
]
coclass MXXMLWriter
coclass MXXMLWriter30
{
[default] interface IMXWriter;
interface ISAXContentHandler;
interface ISAXErrorHandler;
interface ISAXDeclHandler;
interface ISAXDTDHandler;
interface ISAXErrorHandler;
interface ISAXLexicalHandler;
interface ISAXDeclHandler;
interface IVBSAXContentHandler;
interface IVBSAXDeclHandler;
......@@ -3352,9 +3412,9 @@ coclass MXXMLWriter
};
[
uuid(3d813dfe-6c91-4a4e-8f41-04346a841d9c)
uuid(88d969c8-f192-11d4-a65f-0040963251e5),
]
coclass MXXMLWriter30
coclass MXXMLWriter40
{
[default] interface IMXWriter;
......@@ -3369,12 +3429,12 @@ coclass MXXMLWriter30
interface IVBSAXDTDHandler;
interface IVBSAXErrorHandler;
interface IVBSAXLexicalHandler;
};
}
[
uuid(88d969c8-f192-11d4-a65f-0040963251e5),
uuid(88d96a0f-f192-11d4-a65f-0040963251e5)
]
coclass MXXMLWriter40
coclass MXXMLWriter60
{
[default] interface IMXWriter;
......@@ -3392,17 +3452,21 @@ coclass MXXMLWriter40
}
[
uuid(88d96a0f-f192-11d4-a65f-0040963251e5)
helpstring("MXXMLWriter"),
progid("Msxml2.MXXMLWriter"),
vi_progid("Msxml2.MXXMLWriter"),
threading(both),
uuid(fc220ad8-a72a-4ee8-926e-0b7ad152a020)
]
coclass MXXMLWriter60
coclass MXXMLWriter
{
[default] interface IMXWriter;
interface ISAXContentHandler;
interface ISAXDeclHandler;
interface ISAXDTDHandler;
interface ISAXErrorHandler;
interface ISAXDTDHandler;
interface ISAXLexicalHandler;
interface ISAXDeclHandler;
interface IVBSAXContentHandler;
interface IVBSAXDeclHandler;
......@@ -3439,9 +3503,13 @@ coclass MXNamespaceManager60
}
[
uuid(4dd441ad-526d-4a77-9f1b-9841ed802fb0)
helpstring("SAXAttributes 3.0"),
progid("Msxml2.SAXAttributes.3.0"),
vi_progid("Msxml2.SAXAttributes"),
threading(both),
uuid(3e784a01-f3ae-4dc0-9354-9526b9370eba)
]
coclass SAXAttributes
coclass SAXAttributes30
{
[default] interface IMXAttributes;
interface IVBSAXAttributes;
......@@ -3449,9 +3517,9 @@ coclass SAXAttributes
}
[
uuid(3e784a01-f3ae-4dc0-9354-9526b9370eba)
uuid(88d969ca-f192-11d4-a65f-0040963251e5),
]
coclass SAXAttributes30
coclass SAXAttributes40
{
[default] interface IMXAttributes;
interface IVBSAXAttributes;
......@@ -3459,9 +3527,9 @@ coclass SAXAttributes30
}
[
uuid(88d969ca-f192-11d4-a65f-0040963251e5),
uuid(88d96a0e-f192-11d4-a65f-0040963251e5)
]
coclass SAXAttributes40
coclass SAXAttributes60
{
[default] interface IMXAttributes;
interface IVBSAXAttributes;
......@@ -3469,9 +3537,13 @@ coclass SAXAttributes40
}
[
uuid(88d96a0e-f192-11d4-a65f-0040963251e5)
helpstring("SAXAttributes"),
progid("Msxml2.SAXAttributes"),
vi_progid("Msxml2.SAXAttributes"),
threading(both),
uuid(4dd441ad-526d-4a77-9f1b-9841ed802fb0)
]
coclass SAXAttributes60
coclass SAXAttributes
{
[default] interface IMXAttributes;
interface IVBSAXAttributes;
......
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