Commit a15301a0 authored by Vitaly Perov's avatar Vitaly Perov Committed by Alexandre Julliard

shdocvw: Silence more invalid QueryInterface FIXMEs.

parent ca042b29
...@@ -2437,6 +2437,8 @@ static void test_QueryInterface(IUnknown *unk) ...@@ -2437,6 +2437,8 @@ static void test_QueryInterface(IUnknown *unk)
IObjectWithSite *site = (void*)0xdeadbeef; IObjectWithSite *site = (void*)0xdeadbeef;
IViewObjectEx *viewex = (void*)0xdeadbeef; IViewObjectEx *viewex = (void*)0xdeadbeef;
IOleLink *link = (void*)0xdeadbeef; IOleLink *link = (void*)0xdeadbeef;
IMarshal *marshal = (void*)0xdeadbeef;
IStdMarshalInfo *marshalinfo = (void*)0xdeadbeef;
HRESULT hres; HRESULT hres;
hres = IUnknown_QueryInterface(unk, &IID_IQuickActivate, (void**)&qa); hres = IUnknown_QueryInterface(unk, &IID_IQuickActivate, (void**)&qa);
...@@ -2471,6 +2473,14 @@ static void test_QueryInterface(IUnknown *unk) ...@@ -2471,6 +2473,14 @@ static void test_QueryInterface(IUnknown *unk)
ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres);
ok(link == NULL, "link=%p, expected NULL\n", link); 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) static void test_WebBrowser(BOOL do_download)
......
...@@ -130,6 +130,12 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid ...@@ -130,6 +130,12 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid
}else if(IsEqualGUID(&IID_IOleLink, riid)) { }else if(IsEqualGUID(&IID_IOleLink, riid)) {
TRACE("(%p)->(IID_IOleLink %p) returning NULL\n", This, ppv); TRACE("(%p)->(IID_IOleLink %p) returning NULL\n", This, ppv);
return E_NOINTERFACE; 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)) { }else if(HlinkFrame_QI(&This->hlink_frame, riid, ppv)) {
return S_OK; return S_OK;
} }
......
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