Nikolay Sivov : msxml: Register XMLHTTP objects.
Alexandre Julliard
julliard at winehq.org
Fri Oct 8 12:38:07 CDT 2010
Module: wine
Branch: master
Commit: 25dc6c7c9e3459336a8ffc102c3d2f16e2e01cca
URL: http://source.winehq.org/git/wine.git/?a=commit;h=25dc6c7c9e3459336a8ffc102c3d2f16e2e01cca
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Fri Oct 8 02:25:46 2010 +0400
msxml: Register XMLHTTP objects.
---
dlls/msxml3/httprequest.c | 4 ----
dlls/msxml3/regsvr.c | 26 ++++++++++++++++++++++++++
dlls/msxml4/regsvr.c | 13 +++++++++++++
dlls/msxml6/regsvr.c | 13 +++++++++++++
4 files changed, 52 insertions(+), 4 deletions(-)
diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c
index 3a3e0d6..6ff0f96 100644
--- a/dlls/msxml3/httprequest.c
+++ b/dlls/msxml3/httprequest.c
@@ -317,8 +317,6 @@ static HRESULT WINAPI BindStatusCallback_OnObjectAvailable(IBindStatusCallback *
return E_NOTIMPL;
}
-#undef STATUSCLB_THIS
-
static const IBindStatusCallbackVtbl BindStatusCallbackVtbl = {
BindStatusCallback_QueryInterface,
BindStatusCallback_AddRef,
@@ -402,8 +400,6 @@ static HRESULT WINAPI BSCHttpNegotiate_OnResponse(IHttpNegotiate *iface, DWORD c
return S_OK;
}
-#undef HTTPNEG2_THIS
-
static const IHttpNegotiateVtbl BSCHttpNegotiateVtbl = {
BSCHttpNegotiate_QueryInterface,
BSCHttpNegotiate_AddRef,
diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c
index c528ec4..ca1cc12 100644
--- a/dlls/msxml3/regsvr.c
+++ b/dlls/msxml3/regsvr.c
@@ -540,6 +540,22 @@ static struct regsvr_coclass const coclass_list[] = {
"Microsoft.XMLHTTP",
"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,
"XML Data Source Object",
NULL,
@@ -701,6 +717,16 @@ static struct progid const progid_list[] = {
&CLSID_XMLHTTPRequest,
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",
"XML Data Source Object",
&CLSID_XMLDSOControl,
diff --git a/dlls/msxml4/regsvr.c b/dlls/msxml4/regsvr.c
index e4b1a0d..a89683f 100644
--- a/dlls/msxml4/regsvr.c
+++ b/dlls/msxml4/regsvr.c
@@ -385,6 +385,14 @@ static struct regsvr_coclass const coclass_list[] = {
"Microsoft.FreeThreadedDOMDocument4.0",
"4.0"
},
+ { &CLSID_XMLHTTP40,
+ "XML HTTP 4.0",
+ NULL,
+ "msxml4.dll",
+ "Apartment",
+ "Msxml2.XMLHTTP.4.0",
+ "4.0"
+ },
{ NULL } /* list terminator */
};
@@ -397,6 +405,11 @@ static struct progid const progid_list[] = {
&CLSID_DOMDocument40,
NULL
},
+ { "Msxml2.XMLHTTP.4.0",
+ "XML HTTP 4.0",
+ &CLSID_XMLHTTP40,
+ NULL
+ },
{ "Msxml2.SAXXMLReader.4.0",
"SAX XML Reader 4.0",
&CLSID_SAXXMLReader40,
diff --git a/dlls/msxml6/regsvr.c b/dlls/msxml6/regsvr.c
index 872015d..70a6fc4 100644
--- a/dlls/msxml6/regsvr.c
+++ b/dlls/msxml6/regsvr.c
@@ -346,6 +346,14 @@ static struct regsvr_coclass const coclass_list[] = {
"Msxml2.DOMDocument",
"6.0"
},
+ { &CLSID_XMLHTTP60,
+ "XML HTTP 6.0",
+ NULL,
+ "msxml6.dll",
+ "Apartment",
+ "Msxml2.XMLHTTP.6.0",
+ "6.0"
+ },
{ &CLSID_XMLSchemaCache60,
"XML Schema Cache 6.0",
NULL,
@@ -390,6 +398,11 @@ static struct progid const progid_list[] = {
&CLSID_DOMDocument60,
NULL
},
+ { "Msxml2.XMLHTTP.6.0",
+ "XML XMLHTTP 6.0",
+ &CLSID_XMLHTTP60,
+ NULL
+ },
{ "Msxml2.XMLSchemaCache.6.0",
"XML Schema Cache 6.0",
&CLSID_XMLSchemaCache60,
More information about the wine-cvs
mailing list