Jacek Caban : mshtml: Added IHTMLWindow:: get_clientInformation implementation.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Dec 21 15:10:33 CST 2015
Module: wine
Branch: master
Commit: 11a6bfc673cb45d3186c5d09926e0f44aae09dcc
URL: http://source.winehq.org/git/wine.git/?a=commit;h=11a6bfc673cb45d3186c5d09926e0f44aae09dcc
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Dec 21 14:30:50 2015 +0100
mshtml: Added IHTMLWindow::get_clientInformation implementation.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mshtml/htmlwindow.c | 6 ++++--
dlls/mshtml/tests/dom.c | 9 +++++++--
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c
index fbb558e..d7d133a 100644
--- a/dlls/mshtml/htmlwindow.c
+++ b/dlls/mshtml/htmlwindow.c
@@ -1349,8 +1349,10 @@ static HRESULT WINAPI HTMLWindow2_scroll(IHTMLWindow2 *iface, LONG x, LONG y)
static HRESULT WINAPI HTMLWindow2_get_clientInformation(IHTMLWindow2 *iface, IOmNavigator **p)
{
HTMLWindow *This = impl_from_IHTMLWindow2(iface);
- FIXME("(%p)->(%p)\n", This, p);
- return E_NOTIMPL;
+
+ TRACE("(%p)->(%p)\n", This, p);
+
+ return IHTMLWindow2_get_navigator(&This->IHTMLWindow2_iface, p);
}
static HRESULT WINAPI HTMLWindow2_setInterval(IHTMLWindow2 *iface, BSTR expression,
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index b892ac0..9d09acd 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -5965,11 +5965,16 @@ static void test_navigator(IHTMLDocument2 *doc)
hres = IHTMLWindow2_get_navigator(window, &navigator2);
ok(hres == S_OK, "get_navigator failed: %08x\n", hres);
- ok(navigator != navigator2, "navigator2 != navihgator\n");
+ ok(navigator != navigator2, "navigator2 != navigator\n");
+ IOmNavigator_Release(navigator2);
- IHTMLWindow2_Release(window);
+ hres = IHTMLWindow2_get_clientInformation(window, &navigator2);
+ ok(hres == S_OK, "get_clientInformation failed: %08x\n", hres);
+ todo_wine ok(iface_cmp((IUnknown*)navigator, (IUnknown*)navigator2), "navigator2 != navigator\n");
IOmNavigator_Release(navigator2);
+ IHTMLWindow2_Release(window);
+
hres = IOmNavigator_get_appCodeName(navigator, &bstr);
ok(hres == S_OK, "get_appCodeName failed: %08x\n", hres);
ok(!strcmp_wa(bstr, "Mozilla"), "Unexpected appCodeName %s\n", wine_dbgstr_w(bstr));
More information about the wine-cvs
mailing list