From 7ff3446be5751319fd402d70df3c307eec0d2fe2 Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Wed, 6 Oct 2010 00:01:45 +0400 Subject: [PATCH] msxml3: Accept versioned XMLHTTP CLSIDs. --- dlls/msxml3/factory.c | 6 +++++- include/msxml2.idl | 36 ++++++++++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 5c7d015135b..bd42f1a9e90 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -253,7 +253,11 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) { cf = (IClassFactory*) &saxreadcf.lpVtbl; } - else if( IsEqualCLSID( rclsid, &CLSID_XMLHTTPRequest)) + else if( IsEqualCLSID( rclsid, &CLSID_XMLHTTPRequest ) || + IsEqualCLSID( rclsid, &CLSID_XMLHTTP26 ) || + IsEqualCLSID( rclsid, &CLSID_XMLHTTP30 ) || + IsEqualCLSID( rclsid, &CLSID_XMLHTTP40 ) || + IsEqualCLSID( rclsid, &CLSID_XMLHTTP60 )) { cf = (IClassFactory*) &httpreqcf.lpVtbl; } diff --git a/include/msxml2.idl b/include/msxml2.idl index 444ebe8d678..da520d284a8 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -1330,13 +1330,45 @@ coclass FreeThreadedDOMDocument30 } [ - uuid(88d969c1-f192-11d4-a65f-0040963251e5), + uuid(88d969c1-f192-11d4-a65f-0040963251e5) ] coclass FreeThreadedDOMDocument40 { [default] interface IXMLDOMDocument2; [default, source] dispinterface XMLDOMDocumentEvents; -}; +} + +[ + uuid(f5078f1e-c551-11d3-89b9-0000f81fe221) +] +coclass XMLHTTP26 +{ + [default] interface IXMLHTTPRequest; +} + +[ + uuid(f5078f35-c551-11d3-89b9-0000f81fe221) +] +coclass XMLHTTP30 +{ + [default] interface IXMLHTTPRequest; +} + +[ + uuid(88d969c5-f192-11d4-a65f-0040963251e5) +] +coclass XMLHTTP40 +{ + [default] interface IXMLHTTPRequest; +} + +[ + uuid(88d96a0a-f192-11d4-a65f-0040963251e5) +] +coclass XMLHTTP60 +{ + [default] interface IXMLHTTPRequest; +} [ uuid(373984c9-b845-449b-91e7-45ac83036ade)