Commit 159cc19b authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

mshtml: Added IHTMLWindow2::get_location implementation.

parent b84fda83
...@@ -248,8 +248,15 @@ static HRESULT WINAPI HTMLWindow2_get_Image(IHTMLWindow2 *iface, IHTMLImageEleme ...@@ -248,8 +248,15 @@ static HRESULT WINAPI HTMLWindow2_get_Image(IHTMLWindow2 *iface, IHTMLImageEleme
static HRESULT WINAPI HTMLWindow2_get_location(IHTMLWindow2 *iface, IHTMLLocation **p) static HRESULT WINAPI HTMLWindow2_get_location(IHTMLWindow2 *iface, IHTMLLocation **p)
{ {
HTMLWindow *This = HTMLWINDOW2_THIS(iface); HTMLWindow *This = HTMLWINDOW2_THIS(iface);
FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL; TRACE("(%p)->(%p)\n", This, p);
if(!This->doc) {
FIXME("This->doc is NULL\n");
return E_FAIL;
}
return IHTMLDocument2_get_location(HTMLDOC(This->doc), p);
} }
static HRESULT WINAPI HTMLWindow2_get_history(IHTMLWindow2 *iface, IOmHistory **p) static HRESULT WINAPI HTMLWindow2_get_history(IHTMLWindow2 *iface, IOmHistory **p)
......
...@@ -2185,6 +2185,7 @@ static void test_compatmode(IHTMLDocument2 *doc) ...@@ -2185,6 +2185,7 @@ static void test_compatmode(IHTMLDocument2 *doc)
static void test_location(IHTMLDocument2 *doc) static void test_location(IHTMLDocument2 *doc)
{ {
IHTMLLocation *location, *location2; IHTMLLocation *location, *location2;
IHTMLWindow2 *window;
ULONG ref; ULONG ref;
HRESULT hres; HRESULT hres;
...@@ -2195,10 +2196,18 @@ static void test_location(IHTMLDocument2 *doc) ...@@ -2195,10 +2196,18 @@ static void test_location(IHTMLDocument2 *doc)
ok(hres == S_OK, "get_location failed: %08x\n", hres); ok(hres == S_OK, "get_location failed: %08x\n", hres);
ok(location == location2, "location != location2\n"); ok(location == location2, "location != location2\n");
IHTMLLocation_Release(location2);
test_ifaces((IUnknown*)location, location_iids); hres = IHTMLDocument2_get_parentWindow(doc, &window);
ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres);
hres = IHTMLWindow2_get_location(window, &location2);
ok(hres == S_OK, "get_location failed: %08x\n", hres);
ok(location == location2, "location != location2\n");
IHTMLLocation_Release(location2); IHTMLLocation_Release(location2);
test_ifaces((IUnknown*)location, location_iids);
ref = IHTMLLocation_Release(location); ref = IHTMLLocation_Release(location);
ok(!ref, "location chould be destroyed here\n"); ok(!ref, "location chould be destroyed here\n");
} }
......
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