ieframe: Fixed QI tests on IE10, where IStdMarshalInfo is supported by WebBrowser object.
This commit is contained in:
parent
99a86766a0
commit
5ed0ddd93c
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue