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

shdocvw: Silence more invalid QueryInterface FIXMEs.

This commit is contained in:
Jacek Caban 2008-02-22 11:35:24 +01:00 committed by Alexandre Julliard
parent 20163e034a
commit 89069761ba
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1929,7 +1929,9 @@ static void test_QueryInterface(IUnknown *unk)
IQuickActivate *qa = (IQuickActivate*)0xdeadbeef;
IRunnableObject *runnable = (IRunnableObject*)0xdeadbeef;
IPerPropertyBrowsing *propbrowse = (void*)0xdeadbeef;
IOleInPlaceSite *inplace = (void*)0xdeadbeef;
IOleCache *cache = (void*)0xdeadbeef;
IObjectWithSite *site = (void*)0xdeadbeef;
HRESULT hres;
hres = IUnknown_QueryInterface(unk, &IID_IQuickActivate, (void**)&qa);
@ -1942,11 +1944,19 @@ static void test_QueryInterface(IUnknown *unk)
hres = IUnknown_QueryInterface(unk, &IID_IPerPropertyBrowsing, (void**)&propbrowse);
ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres);
ok(runnable == NULL, "runnable=%p, ezpected NULL\n", runnable);
ok(propbrowse == NULL, "propbrowse=%p, ezpected NULL\n", runnable);
hres = IUnknown_QueryInterface(unk, &IID_IOleCache, (void**)&cache);
ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres);
ok(cache == NULL, "runnable=%p, ezpected NULL\n", runnable);
ok(cache == NULL, "cache=%p, ezpected NULL\n", runnable);
hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceSite, (void**)&inplace);
ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres);
ok(inplace == NULL, "inplace=%p, ezpected NULL\n", runnable);
hres = IUnknown_QueryInterface(unk, &IID_IObjectWithSite, (void**)&site);
ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres);
ok(site == NULL, "inplace=%p, ezpected NULL\n", runnable);
}
static void test_WebBrowser(void)

6
dlls/shdocvw/webbrowser.c
View File

@ -114,6 +114,12 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid
}else if(IsEqualGUID(&IID_IOleCache, riid)) {
TRACE("(%p)->(IID_IOleCache %p) returning NULL\n", This, ppv);
return E_NOINTERFACE;
}else if(IsEqualGUID(&IID_IOleInPlaceSite, riid)) {
TRACE("(%p)->(IID_IOleInPlaceSite %p) returning NULL\n", This, ppv);
return E_NOINTERFACE;
}else if(IsEqualGUID(&IID_IObjectWithSite, riid)) {
TRACE("(%p)->(IID_IObjectWithSite %p) returning NULL\n", This, ppv);
return E_NOINTERFACE;
}
if(*ppv) {