ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shdocvw: Silence common invalid QueryInterface FIXMEs.

This commit is contained in:
Jacek Caban 2006-10-02 21:07:31 +02:00 committed by Alexandre Julliard
parent 463d010531
commit 8302f073b6
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/shdocvw/tests/webbrowser.c
View File

@ -936,6 +936,21 @@ static void test_Extent(IUnknown *unk)
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)
{
IUnknown *unk = NULL;
@ -948,6 +963,7 @@ static void test_WebBrowser(void)
if(FAILED(hres))
return;
test_QueryInterface(unk);
test_ClassInfo(unk);
test_ClientSite(unk, &ClientSite);
test_Extent(unk);

6
dlls/shdocvw/webbrowser.c
View File

@ -99,6 +99,12 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid
}else if(IsEqualGUID(&IID_IHlinkFrame, riid)) {
TRACE("(%p)->(IID_IHlinkFrame %p)\n", This, ppv);
*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) {