marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msxml: Register the v2.0 classes using the IRegistrar mechanism.

oldstable
Alexandre Julliard 2010-12-21 13:26:15 +01:00
parent 25ccc90b42
commit cfa37214b9
7 changed files with 41 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/msxml/msxml.rgs 100644
View File

@ -0,0 +1,13 @@
HKCR
{
ForceRemove MSXML.DOMDocument = s 'XML DOM Document'
{
CLSID = s '{2933BF90-7B36-11D2-B20E-00C04F983E60}'
CurVer = s 'Microsoft.XMLDOM.1.0'
}
ForceRemove MSXML.FreeThreadedDOMDocument = s 'Free Threaded XML DOM Document'
{
CLSID = s '{2933BF91-7B36-11D2-B20E-00C04F983E60}'
CurVer = s 'Microsoft.FreeThreadedXMLDOM.1.0'
}
}

3
dlls/msxml/rsrc.rc
View File

@ -20,3 +20,6 @@
/* @makedep: msxml_tlb.tlb */
1 TYPELIB msxml_tlb.tlb
/* @makedep: msxml.rgs */
1 WINE_REGISTRY msxml.rgs

90
dlls/msxml3/regsvr.c
View File

@ -466,14 +466,6 @@ static LONG register_key_defvalueA(
* coclass list
*/
static struct regsvr_coclass const coclass_list[] = {
{ &CLSID_DOMDocument,
"XML DOM Document",
NULL,
"msxml3.dll",
"Both",
"Microsoft.XMLDOM",
"1.0"
},
{ &CLSID_DOMDocument2,
"XML DOM Document",
NULL,
@ -490,22 +482,6 @@ static struct regsvr_coclass const coclass_list[] = {
"Msxml2.DOMDocument",
"3.0"
},
{ &CLSID_DOMFreeThreadedDocument,
"Free threaded XML DOM Document",
NULL,
"msxml3.dll",
"Both",
"Microsoft.FreeThreadedXMLDOM",
"1.0"
},
{ &CLSID_DOMFreeThreadedDocument,
"Free threaded XML DOM Document",
NULL,
"msxml3.dll",
"Both",
"Microsoft.FreeThreadedXMLDOM",
NULL
},
{ &CLSID_FreeThreadedDOMDocument,
"Free Threaded XML DOM Document",
NULL,
@ -530,14 +506,6 @@ static struct regsvr_coclass const coclass_list[] = {
"Microsoft.FreeThreadedDOMDocument.1.0",
"1.0"
},
{ &CLSID_XMLHTTPRequest,
"XML HTTP Request",
NULL,
"msxml3.dll",
"Apartment",
"Microsoft.XMLHTTP",
"1.0"
},
{ &CLSID_XMLHTTP26,
"XML HTTP 2.6",
NULL,
@ -554,14 +522,6 @@ static struct regsvr_coclass const coclass_list[] = {
"Msxml2.XMLHTTP.3.0",
"3.0"
},
{ &CLSID_XMLDSOControl,
"XML Data Source Object",
NULL,
"msxml3.dll",
"Apartment",
"Microsoft.XMLDSO",
"1.0"
},
{ &CLSID_XMLDocument,
"Msxml",
NULL,
@ -655,21 +615,6 @@ static struct regsvr_interface const interface_list[] = {
* progid list
*/
static struct progid const progid_list[] = {
{ "Microsoft.XMLDOM",
"XML DOM Document",
&CLSID_DOMDocument,
"Microsoft.XMLDOM.1.0"
},
{ "Microsoft.XMLDOM.1.0",
"XML DOM Document",
&CLSID_DOMDocument,
NULL
},
{ "MSXML.DOMDocument",
"XML DOM Document",
&CLSID_DOMDocument,
"Microsoft.XMLDOM.1.0"
},
{ "Msxml2.DOMDocument",
"XML DOM Document",
&CLSID_DOMDocument2,
@ -680,21 +625,6 @@ static struct progid const progid_list[] = {
&CLSID_DOMDocument30,
NULL
},
{ "Microsoft.FreeThreadedXMLDOM",
"Free threaded XML DOM Document",
&CLSID_DOMFreeThreadedDocument,
"Microsoft.FreeThreadedXMLDOM.1.0"
},
{ "Microsoft.FreeThreadedXMLDOM.1.0",
"Free threaded XML DOM Document",
&CLSID_DOMFreeThreadedDocument,
NULL
},
{ "MSXML.FreeThreadedDOMDocument",
"Free threaded XML DOM Document",
&CLSID_DOMFreeThreadedDocument,
"Microsoft.FreeThreadedXMLDOM.1.0"
},
{ "MSXML.FreeThreadedDOMDocument26",
"Free threaded XML DOM Document 2.6",
&CLSID_FreeThreadedDOMDocument26,
@ -705,16 +635,6 @@ static struct progid const progid_list[] = {
&CLSID_FreeThreadedDOMDocument30,
NULL
},
{ "Microsoft.XMLHTTP",
"XML HTTP Request",
&CLSID_XMLHTTPRequest,
"Microsoft.XMLHTTP.1.0"
},
{ "Microsoft.XMLHTTP.1.0",
"XML HTTP Request",
&CLSID_XMLHTTPRequest,
NULL
},
{ "Msxml2.XMLHTTP.2.6",
"XML HTTP 2.6",
&CLSID_XMLHTTP26,
@ -725,16 +645,6 @@ static struct progid const progid_list[] = {
&CLSID_XMLHTTP30,
NULL
},
{ "Microsoft.XMLDSO",
"XML Data Source Object",
&CLSID_XMLDSOControl,
"Microsoft.XMLDSO.1.0"
},
{ "Microsoft.XMLDSO.1.0",
"XML Data Source Object",
&CLSID_XMLDSOControl,
NULL
},
{ "Msxml",
"Msxml",
&CLSID_XMLDocument,

5
include/msxml.idl
View File

@ -343,7 +343,10 @@ interface IXMLElementNotificationSink : IDispatch
}
[
uuid(cfc399af-d876-11d0-9c10-00c04fc99c8e)
helpstring("Msxml"),
progid("Msxml"),
threading(both),
uuid(cfc399af-d876-11d0-9c10-00c04fc99c8e)
]
coclass XMLDocument
{

18
include/xmldom.idl
View File

@ -736,7 +736,11 @@ dispinterface XMLDOMDocumentEvents
}
[
uuid(2933bf90-7b36-11d2-b20e-00c04f983e60)
helpstring("XML DOM Document"),
progid("Microsoft.XMLDOM.1.0"),
vi_progid("Microsoft.XMLDOM"),
threading(both),
uuid(2933bf90-7b36-11d2-b20e-00c04f983e60)
]
coclass DOMDocument
{
@ -745,7 +749,11 @@ coclass DOMDocument
}
[
uuid(2933bf91-7b36-11d2-b20e-00c04f983e60)
helpstring("Free Threaded XML DOM Document"),
progid("Microsoft.FreeThreadedXMLDOM.1.0"),
vi_progid("Microsoft.FreeThreadedXMLDOM"),
threading(both),
uuid(2933bf91-7b36-11d2-b20e-00c04f983e60)
]
coclass DOMFreeThreadedDocument
{
@ -809,7 +817,11 @@ interface IXMLHttpRequest : IDispatch
}
[
uuid(ed8c108e-4349-11d2-91a4-00c04f7969e8)
helpstring("XML HTTP Request"),
progid("Microsoft.XMLHTTP.1.0"),
vi_progid("Microsoft.XMLHTTP"),
threading(apartment),
uuid(ed8c108e-4349-11d2-91a4-00c04f7969e8)
]
coclass XMLHTTPRequest
{

6
include/xmldso.idl
View File

@ -49,7 +49,11 @@ interface IXMLDSOControl : IDispatch
}
[
uuid(550dda30-0541-11d2-9ca9-0060b0ec3d39)
helpstring("XML Data Source Object"),
progid("Microsoft.XMLDSO.1.0"),
vi_progid("Microsoft.XMLDSO"),
threading(apartment),
uuid(550dda30-0541-11d2-9ca9-0060b0ec3d39)
]
coclass XMLDSOControl
{

1
tools/wine.inf.in
View File

@ -2527,6 +2527,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
11,,msimtf.dll,1
11,,msisip.dll,1
11,,mstask.dll,1
11,,msxml.dll,1
11,,msxml3.dll,1
11,,msxml4.dll,1
11,,msxml6.dll,1