Commit 9141c97d authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

mshtml: Silence failing QueryInterfaces common for .net applications.

parent 38436fff
......@@ -26,6 +26,7 @@
#include "winbase.h"
#include "winuser.h"
#include "ole2.h"
#include "mscoree.h"
#include "wine/debug.h"
......@@ -1675,6 +1676,10 @@ BOOL dispex_query_interface(DispatchEx *This, REFIID riid, void **ppv)
*ppv = NULL;
else if(IsEqualGUID(&IID_UndocumentedScriptIface, riid))
*ppv = NULL;
else if(IsEqualGUID(&IID_IMarshal, riid))
*ppv = NULL;
else if(IsEqualGUID(&IID_IManagedObject, riid))
*ppv = NULL;
else
return FALSE;
......
......@@ -4572,9 +4572,6 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv)
}else if(IsEqualGUID(&IID_IPersistPropertyBag, riid)) {
TRACE("(%p)->(IID_IPersistPropertyBag %p) returning NULL\n", This, ppv);
*ppv = NULL;
}else if(IsEqualGUID(&IID_IMarshal, riid)) {
TRACE("(%p)->(IID_IMarshal %p) returning NULL\n", This, ppv);
*ppv = NULL;
}else if(IsEqualGUID(&IID_IExternalConnection, riid)) {
TRACE("(%p)->(IID_IExternalConnection %p) returning NULL\n", This, ppv);
*ppv = NULL;
......
......@@ -87,6 +87,10 @@ static HRESULT WINAPI HTMLLocation_QueryInterface(IHTMLLocation *iface, REFIID r
*ppv = &This->IHTMLLocation_iface;
}else if(IsEqualGUID(&IID_IHTMLLocation, riid)) {
*ppv = &This->IHTMLLocation_iface;
}else if(IsEqualGUID(&IID_IMarshal, riid)) {
*ppv = NULL;
FIXME("(%p)->(IID_IMarshal %p)\n", This, ppv);
return E_NOINTERFACE;
}else if(dispex_query_interface(&This->dispex, riid, ppv)) {
return *ppv ? S_OK : E_NOINTERFACE;
}else {
......
......@@ -184,6 +184,10 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii
*ppv = &This->ITravelLogClient_iface;
}else if(IsEqualGUID(&IID_IObjectIdentity, riid)) {
*ppv = &This->IObjectIdentity_iface;
}else if(IsEqualGUID(&IID_IMarshal, riid)) {
*ppv = NULL;
FIXME("(%p)->(IID_IMarshal %p)\n", This, ppv);
return E_NOINTERFACE;
}else if(dispex_query_interface(&This->inner_window->event_target.dispex, riid, ppv)) {
assert(!*ppv);
return E_NOINTERFACE;
......
......@@ -43,6 +43,7 @@
#include "mshtml_private.h"
#include "resource.h"
#include "pluginhost.h"
#include "mscoree.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
......@@ -588,6 +589,8 @@ const char *debugstr_mshtml_guid(const GUID *iid)
X(IID_IHTMLPrivateWindow);
X(IID_IHtmlLoadOptions);
X(IID_IInternetHostSecurityManager);
X(IID_IManagedObject);
X(IID_IMarshal);
X(IID_IMonikerProp);
X(IID_IObjectIdentity);
X(IID_IObjectSafety);
......
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