Jacek Caban : ieframe: Fixed QI tests on IE10, where IStdMarshalInfo is supported by WebBrowser object.

Module: wine Branch: master Commit: 5ed0ddd93c4c514174ef3dbd7e3a355408f8f1e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ed0ddd93c4c514174ef3dbd7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 28 13:38:50 2013 +0100 ieframe: Fixed QI tests on IE10, where IStdMarshalInfo is supported by WebBrowser object. --- dlls/ieframe/tests/webbrowser.c | 5 ----- dlls/ieframe/webbrowser.c | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 1915876..43f761b 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2951,7 +2951,6 @@ static void test_QueryInterface(IWebBrowser2 *wb) IViewObjectEx *viewex = (void*)0xdeadbeef; IOleLink *link = (void*)0xdeadbeef; IMarshal *marshal = (void*)0xdeadbeef; - IStdMarshalInfo *marshalinfo = (void*)0xdeadbeef; IUnknown *unk = (IUnknown*)wb; HRESULT hres; @@ -2991,10 +2990,6 @@ static void test_QueryInterface(IWebBrowser2 *wb) 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_UIActivate(IWebBrowser2 *unk, BOOL activate) diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index dda957a..0a9f2a5 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -135,7 +135,8 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID 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); + /* This is implemented since IE10 */ + WARN("(%p)->(IID_IStdMarshalInfo %p) returning NULL\n", This, ppv); return E_NOINTERFACE; }else if(HlinkFrame_QI(&This->hlink_frame, riid, ppv)) { return S_OK;