Module: wine Branch: master Commit: 042ecec8b6bddb617e3a01f534b6e7ca2eb1cba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=042ecec8b6bddb617e3a01f534...
Author: Vitaly Perov vitperov@etersoft.ru Date: Wed Sep 29 16:01:36 2010 +0400
shdocvw: Silence QueryInterface FIXME.
---
dlls/shdocvw/tests/webbrowser.c | 5 +++++ dlls/shdocvw/webbrowser.c | 3 +++ 2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 85f71b7..04a0b8e 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -2436,6 +2436,7 @@ static void test_QueryInterface(IUnknown *unk) IOleCache *cache = (void*)0xdeadbeef; IObjectWithSite *site = (void*)0xdeadbeef; IViewObjectEx *viewex = (void*)0xdeadbeef; + IOleLink *link = (void*)0xdeadbeef; HRESULT hres;
hres = IUnknown_QueryInterface(unk, &IID_IQuickActivate, (void**)&qa); @@ -2466,6 +2467,10 @@ static void test_QueryInterface(IUnknown *unk) ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); ok(viewex == NULL, "viewex=%p, expected NULL\n", viewex);
+ hres = IUnknown_QueryInterface(unk, &IID_IOleLink, (void**)&link); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(link == NULL, "link=%p, expected NULL\n", link); + }
static void test_WebBrowser(BOOL do_download) diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 5115de7..0c1bb12 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -127,6 +127,9 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid }else if(IsEqualGUID(&IID_IViewObjectEx, riid)) { TRACE("(%p)->(IID_IViewObjectEx %p) returning NULL\n", This, ppv); return E_NOINTERFACE; + }else if(IsEqualGUID(&IID_IOleLink, riid)) { + TRACE("(%p)->(IID_IOleLink %p) returning NULL\n", This, ppv); + return E_NOINTERFACE; }else if(HlinkFrame_QI(&This->hlink_frame, riid, ppv)) { return S_OK; }