From: Gabriel Ivăncescu gabrielopcode@gmail.com
Signed-off-by: Gabriel Ivăncescu gabrielopcode@gmail.com --- dlls/mshtml/oleobj.c | 11 +---------- dlls/mshtml/tests/dom.c | 8 ++++++++ 2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 4044604aae2..90a109fcfc0 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -2384,16 +2384,7 @@ HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument2, put_onbeforeupdate, VARIANT) HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument2, get_onbeforeupdate, VARIANT*) HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument2, put_onerrorupdate, VARIANT) HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument2, get_onerrorupdate, VARIANT*) - -static HRESULT WINAPI DocObjHTMLDocument2_toString(IHTMLDocument2 *iface, BSTR *String) -{ - HTMLDocumentObj *This = impl_from_IHTMLDocument2(iface); - - TRACE("(%p)->(%p)\n", This, String); - - return dispex_to_string(&This->dispex, String); -} - +HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument2, toString, BSTR*) HTMLDOCUMENTOBJ_FWD_TO_NODE_3(HTMLDocument2, createStyleSheet, BSTR,LONG,IHTMLStyleSheet**)
static const IHTMLDocument2Vtbl DocObjHTMLDocument2Vtbl = { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c18eb590cc8..7fb12c445ea 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -10917,6 +10917,7 @@ static void test_doc_obj(IHTMLDocument2 *doc) { IEventTarget *event_target = (void*)0xdeadbeef; HRESULT hres; + BSTR bstr;
hres = IHTMLDocument2_QueryInterface(doc, &IID_IEventTarget, (void**)&event_target); if(compat_mode < COMPAT_IE9) { @@ -10927,6 +10928,13 @@ static void test_doc_obj(IHTMLDocument2 *doc) ok(!!event_target, "event_target = %p\n", event_target); IEventTarget_Release(event_target); } + + bstr = NULL; + hres = IHTMLDocument2_toString(doc, &bstr); + ok(hres == S_OK, "toString failed: %08lx\n", hres); + todo_wine_if(compat_mode >= COMPAT_IE9) + ok(!wcscmp(bstr, (compat_mode < COMPAT_IE9 ? L"[object]" : L"[object Document]")), "toString returned %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); }
static void test_about_blank_storage(IHTMLDocument2 *doc)