[PATCH] Silence common interfaces

Alistair Leslie-Hughes leslie_alistair at hotmail.com
Fri Feb 4 18:38:08 CST 2011


---
 dlls/msxml3/httprequest.c  |   15 ++++++++++++++-
 dlls/msxml3/tests/domdoc.c |   10 ++++++++++
 2 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c
index 4dd4de8..a6f06cb 100644
--- a/dlls/msxml3/httprequest.c
+++ b/dlls/msxml3/httprequest.c
@@ -30,6 +30,7 @@
 #include "winuser.h"
 #include "ole2.h"
 #include "msxml6.h"
+#include "activscp.h"
 
 #include "msxml_private.h"
 
@@ -503,9 +504,21 @@ static HRESULT WINAPI httprequest_QueryInterface(IXMLHTTPRequest *iface, REFIID
     {
         *ppvObject = iface;
     }
+    else if ( IsEqualGUID( riid, &IID_IActiveScript))
+    {
+        TRACE("(%p)->(IID_IActiveScript %p) returning NULL\n", This, ppvObject);
+        *ppvObject = NULL;
+        return E_NOINTERFACE;
+    }
+    else if ( IsEqualGUID( riid, &IID_IDispatchEx))
+    {
+        TRACE("(%p)->(IID_IDispatchEx %p) returning NULL\n", This, ppvObject);
+        *ppvObject = NULL;
+        return E_NOINTERFACE;
+    }
     else
     {
-        FIXME("Unsupported interface %s\n", debugstr_guid(riid));
+        WARN("Unsupported interface %s\n", debugstr_guid(riid));
         return E_NOINTERFACE;
     }
 
diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index b4dc2e1..77c95fc 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -36,6 +36,8 @@
 
 #include "initguid.h"
 
+#include "activscp.h"
+
 DEFINE_GUID(IID_IObjectSafety, 0xcb5bdc81, 0x93c1, 0x11cf, 0x8f,0x20, 0x00,0x80,0x5f,0x2c,0xd0,0x64);
 
 static int g_unexpectedcall, g_expectedcall;
@@ -3216,6 +3218,8 @@ static void test_XMLHTTP(void)
     static const CHAR xmltestbodyA[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<a>TEST</a>\n";
 
     IXMLHttpRequest *pXMLHttpRequest;
+    IActiveScript *pScript = NULL;
+    IDispatchEx *pDispEx = NULL;
     BSTR bstrResponse, method, url;
     VARIANT dummy;
     VARIANT async;
@@ -3232,6 +3236,12 @@ static void test_XMLHTTP(void)
         return;
     }
 
+    hr = IXMLHTTPRequest_QueryInterface(pXMLHttpRequest, &IID_IActiveScript, (void**)&pScript);
+    ok(hr == E_NOINTERFACE, "got interface IActiveScript\n");
+
+    hr = IXMLHTTPRequest_QueryInterface(pXMLHttpRequest, &IID_IDispatchEx, (void**)&pDispEx);
+    ok(hr == E_NOINTERFACE, "got interface IDispatchEx\n");
+
     VariantInit(&dummy);
     V_VT(&dummy) = VT_ERROR;
     V_ERROR(&dummy) = DISP_E_MEMBERNOTFOUND;
-- 
1.7.1


--------------010601040206010305000807--



More information about the wine-patches mailing list