reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-28 22:20:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

shdocvw: Silence more invalid QueryInterface FIXMEs.

Browse Source
This commit is contained in:
Vitaly Perov 2010-10-01 13:09:40 +04:00 committed by Alexandre Julliard
parent ca042b2922
commit a15301a0bc
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2437,6 +2437,8 @@ static void test_QueryInterface(IUnknown *unk)
IObjectWithSite *site = (void*)0xdeadbeef;
IViewObjectEx *viewex = (void*)0xdeadbeef;
IOleLink *link = (void*)0xdeadbeef;
IMarshal *marshal = (void*)0xdeadbeef;
IStdMarshalInfo *marshalinfo = (void*)0xdeadbeef;
HRESULT hres;
hres = IUnknown_QueryInterface(unk, &IID_IQuickActivate, (void**)&qa);
@ -2471,6 +2473,14 @@ static void test_QueryInterface(IUnknown *unk)
ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres);
ok(link == NULL, "link=%p, expected NULL\n", link);
hres = IUnknown_QueryInterface(unk, &IID_IMarshal, (void**)&marshal);
ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres);
ok(marshal == NULL, "marshal=%p, expected NULL\n", marshal);
hres = IUnknown_QueryInterface(unk, &IID_IStdMarshalInfo, (void**)&marshalinfo);
ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres);
ok(marshalinfo == NULL, "marshalinfo=%p, expected NULL\n", marshalinfo);
}
static void test_WebBrowser(BOOL do_download)

6
dlls/shdocvw/webbrowser.c
View File

@ -130,6 +130,12 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid
}else if(IsEqualGUID(&IID_IOleLink, riid)) {
TRACE("(%p)->(IID_IOleLink %p) returning NULL\n", This, ppv);
return E_NOINTERFACE;
}else if(IsEqualGUID(&IID_IMarshal, riid)) {
TRACE("(%p)->(IID_IMarshal %p) returning NULL\n", This, ppv);
return E_NOINTERFACE;
}else if(IsEqualGUID(&IID_IStdMarshalInfo, riid)) {
TRACE("(%p)->(IID_IStdMarshalInfo %p) returning NULL\n", This, ppv);
return E_NOINTERFACE;
}else if(HlinkFrame_QI(&This->hlink_frame, riid, ppv)) {
return S_OK;
}