Commit 25dc6c7c authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

msxml: Register XMLHTTP objects.

parent 7ccf6c28
...@@ -317,8 +317,6 @@ static HRESULT WINAPI BindStatusCallback_OnObjectAvailable(IBindStatusCallback * ...@@ -317,8 +317,6 @@ static HRESULT WINAPI BindStatusCallback_OnObjectAvailable(IBindStatusCallback *
return E_NOTIMPL; return E_NOTIMPL;
} }
#undef STATUSCLB_THIS
static const IBindStatusCallbackVtbl BindStatusCallbackVtbl = { static const IBindStatusCallbackVtbl BindStatusCallbackVtbl = {
BindStatusCallback_QueryInterface, BindStatusCallback_QueryInterface,
BindStatusCallback_AddRef, BindStatusCallback_AddRef,
...@@ -402,8 +400,6 @@ static HRESULT WINAPI BSCHttpNegotiate_OnResponse(IHttpNegotiate *iface, DWORD c ...@@ -402,8 +400,6 @@ static HRESULT WINAPI BSCHttpNegotiate_OnResponse(IHttpNegotiate *iface, DWORD c
return S_OK; return S_OK;
} }
#undef HTTPNEG2_THIS
static const IHttpNegotiateVtbl BSCHttpNegotiateVtbl = { static const IHttpNegotiateVtbl BSCHttpNegotiateVtbl = {
BSCHttpNegotiate_QueryInterface, BSCHttpNegotiate_QueryInterface,
BSCHttpNegotiate_AddRef, BSCHttpNegotiate_AddRef,
......
...@@ -540,6 +540,22 @@ static struct regsvr_coclass const coclass_list[] = { ...@@ -540,6 +540,22 @@ static struct regsvr_coclass const coclass_list[] = {
"Microsoft.XMLHTTP", "Microsoft.XMLHTTP",
"1.0" "1.0"
}, },
{ &CLSID_XMLHTTP26,
"XML HTTP 2.6",
NULL,
"msxml3.dll",
"Apartment",
"Msxml2.XMLHTTP.2.6",
"2.6"
},
{ &CLSID_XMLHTTP30,
"XML HTTP 3.0",
NULL,
"msxml3.dll",
"Apartment",
"Msxml2.XMLHTTP.3.0",
"3.0"
},
{ &CLSID_XMLDSOControl, { &CLSID_XMLDSOControl,
"XML Data Source Object", "XML Data Source Object",
NULL, NULL,
...@@ -701,6 +717,16 @@ static struct progid const progid_list[] = { ...@@ -701,6 +717,16 @@ static struct progid const progid_list[] = {
&CLSID_XMLHTTPRequest, &CLSID_XMLHTTPRequest,
NULL NULL
}, },
{ "Msxml2.XMLHTTP.2.6",
"XML HTTP 2.6",
&CLSID_XMLHTTP26,
NULL
},
{ "Msxml2.XMLHTTP.3.0",
"XML HTTP 3.0",
&CLSID_XMLHTTP30,
NULL
},
{ "Microsoft.XMLDSO", { "Microsoft.XMLDSO",
"XML Data Source Object", "XML Data Source Object",
&CLSID_XMLDSOControl, &CLSID_XMLDSOControl,
......
...@@ -385,6 +385,14 @@ static struct regsvr_coclass const coclass_list[] = { ...@@ -385,6 +385,14 @@ static struct regsvr_coclass const coclass_list[] = {
"Microsoft.FreeThreadedDOMDocument4.0", "Microsoft.FreeThreadedDOMDocument4.0",
"4.0" "4.0"
}, },
{ &CLSID_XMLHTTP40,
"XML HTTP 4.0",
NULL,
"msxml4.dll",
"Apartment",
"Msxml2.XMLHTTP.4.0",
"4.0"
},
{ NULL } /* list terminator */ { NULL } /* list terminator */
}; };
...@@ -397,6 +405,11 @@ static struct progid const progid_list[] = { ...@@ -397,6 +405,11 @@ static struct progid const progid_list[] = {
&CLSID_DOMDocument40, &CLSID_DOMDocument40,
NULL NULL
}, },
{ "Msxml2.XMLHTTP.4.0",
"XML HTTP 4.0",
&CLSID_XMLHTTP40,
NULL
},
{ "Msxml2.SAXXMLReader.4.0", { "Msxml2.SAXXMLReader.4.0",
"SAX XML Reader 4.0", "SAX XML Reader 4.0",
&CLSID_SAXXMLReader40, &CLSID_SAXXMLReader40,
......
...@@ -346,6 +346,14 @@ static struct regsvr_coclass const coclass_list[] = { ...@@ -346,6 +346,14 @@ static struct regsvr_coclass const coclass_list[] = {
"Msxml2.DOMDocument", "Msxml2.DOMDocument",
"6.0" "6.0"
}, },
{ &CLSID_XMLHTTP60,
"XML HTTP 6.0",
NULL,
"msxml6.dll",
"Apartment",
"Msxml2.XMLHTTP.6.0",
"6.0"
},
{ &CLSID_XMLSchemaCache60, { &CLSID_XMLSchemaCache60,
"XML Schema Cache 6.0", "XML Schema Cache 6.0",
NULL, NULL,
...@@ -390,6 +398,11 @@ static struct progid const progid_list[] = { ...@@ -390,6 +398,11 @@ static struct progid const progid_list[] = {
&CLSID_DOMDocument60, &CLSID_DOMDocument60,
NULL NULL
}, },
{ "Msxml2.XMLHTTP.6.0",
"XML XMLHTTP 6.0",
&CLSID_XMLHTTP60,
NULL
},
{ "Msxml2.XMLSchemaCache.6.0", { "Msxml2.XMLSchemaCache.6.0",
"XML Schema Cache 6.0", "XML Schema Cache 6.0",
&CLSID_XMLSchemaCache60, &CLSID_XMLSchemaCache60,
......
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