Commit 8302f073 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

shdocvw: Silence common invalid QueryInterface FIXMEs.

parent 463d0105
...@@ -936,6 +936,21 @@ static void test_Extent(IUnknown *unk) ...@@ -936,6 +936,21 @@ static void test_Extent(IUnknown *unk)
IOleObject_Release(oleobj); IOleObject_Release(oleobj);
} }
static void test_QueryInterface(IUnknown *unk)
{
IQuickActivate *qa = (IQuickActivate*)0xdeadbeef;
IRunnableObject *runnable = (IRunnableObject*)0xdeadbeef;
HRESULT hres;
hres = IUnknown_QueryInterface(unk, &IID_IQuickActivate, (void**)&qa);
ok(hres == E_NOINTERFACE, "QueryInterface returned %08lx, expected E_NOINTERFACE\n", hres);
ok(qa == NULL, "qa=%p, ezpected NULL\n", qa);
hres = IUnknown_QueryInterface(unk, &IID_IRunnableObject, (void**)&runnable);
ok(hres == E_NOINTERFACE, "QueryInterface returned %08lx, expected E_NOINTERFACE\n", hres);
ok(runnable == NULL, "runnable=%p, ezpected NULL\n", runnable);
}
static void test_WebBrowser(void) static void test_WebBrowser(void)
{ {
IUnknown *unk = NULL; IUnknown *unk = NULL;
...@@ -948,6 +963,7 @@ static void test_WebBrowser(void) ...@@ -948,6 +963,7 @@ static void test_WebBrowser(void)
if(FAILED(hres)) if(FAILED(hres))
return; return;
test_QueryInterface(unk);
test_ClassInfo(unk); test_ClassInfo(unk);
test_ClientSite(unk, &ClientSite); test_ClientSite(unk, &ClientSite);
test_Extent(unk); test_Extent(unk);
......
...@@ -99,6 +99,12 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid ...@@ -99,6 +99,12 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid
}else if(IsEqualGUID(&IID_IHlinkFrame, riid)) { }else if(IsEqualGUID(&IID_IHlinkFrame, riid)) {
TRACE("(%p)->(IID_IHlinkFrame %p)\n", This, ppv); TRACE("(%p)->(IID_IHlinkFrame %p)\n", This, ppv);
*ppv = HLINKFRAME(This); *ppv = HLINKFRAME(This);
}else if(IsEqualGUID(&IID_IQuickActivate, riid)) {
TRACE("(%p)->(IID_IQuickActivate %p) returning NULL\n", This, ppv);
return E_NOINTERFACE;
}else if(IsEqualGUID(&IID_IRunnableObject, riid)) {
TRACE("(%p)->(IID_IRunnableObject %p) returning NULL\n", This, ppv);
return E_NOINTERFACE;
} }
if(*ppv) { if(*ppv) {
......
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