Vitaly Perov : mshtml: Silence IStdMarshalInfo in htmldoc_qi FIXME.
Alexandre Julliard
julliard at winehq.org
Tue Feb 23 11:17:20 CST 2010
Module: wine
Branch: master
Commit: e2f3b143fd2f8cc960d0fa25eb5da99c36c0484f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f3b143fd2f8cc960d0fa25eb5da99c36c0484f
Author: Vitaly Perov <vitperov at etersoft.ru>
Date: Mon Feb 22 19:19:31 2010 +0300
mshtml: Silence IStdMarshalInfo in htmldoc_qi FIXME.
---
dlls/mshtml/htmldoc.c | 3 +++
dlls/mshtml/tests/htmldoc.c | 5 +++++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c
index 93aea06..8adfdb1 100644
--- a/dlls/mshtml/htmldoc.c
+++ b/dlls/mshtml/htmldoc.c
@@ -1776,6 +1776,9 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv)
}else if(IsEqualGUID(&IID_IExternalConnection, riid)) {
TRACE("(%p)->(IID_IExternalConnection %p) returning NULL\n", This, ppv);
*ppv = NULL;
+ }else if(IsEqualGUID(&IID_IStdMarshalInfo, riid)) {
+ TRACE("(%p)->(IID_IStdMarshalInfo %p) returning NULL\n", This, ppv);
+ *ppv = NULL;
}else if(IsEqualGUID(&IID_IObjectWithSite, riid)) {
TRACE("(%p)->(IID_IObjectWithSite %p)\n", This, ppv);
*ppv = OBJSITE(This);
diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c
index adc318a..08e0359 100644
--- a/dlls/mshtml/tests/htmldoc.c
+++ b/dlls/mshtml/tests/htmldoc.c
@@ -4314,6 +4314,11 @@ static void test_QueryInterface(IHTMLDocument2 *doc)
hres = IUnknown_QueryInterface(doc, &IID_IExternalConnection, (void**)&qi);
ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres);
ok(qi == NULL, "qi=%p, expected NULL\n", qi);
+
+ qi = (void*)0xdeadbeef;
+ hres = IUnknown_QueryInterface(doc, &IID_IStdMarshalInfo, (void**)&qi);
+ ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres);
+ ok(qi == NULL, "qi=%p, expected NULL\n", qi);
}
static void init_test(enum load_state_t ls) {
More information about the wine-cvs
mailing list