marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Added IHTMLWindow2::get_location implementation.

oldstable
Jacek Caban 2009-01-03 17:45:47 +01:00 committed by Alexandre Julliard
parent b84fda836e
commit 159cc19b03
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/mshtml/htmlwindow.c
View File

@ -248,8 +248,15 @@ static HRESULT WINAPI HTMLWindow2_get_Image(IHTMLWindow2 *iface, IHTMLImageEleme
static HRESULT WINAPI HTMLWindow2_get_location(IHTMLWindow2 *iface, IHTMLLocation **p)
{
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)

11
dlls/mshtml/tests/dom.c
View File

@ -2185,6 +2185,7 @@ static void test_compatmode(IHTMLDocument2 *doc)
static void test_location(IHTMLDocument2 *doc)
{
IHTMLLocation *location, *location2;
IHTMLWindow2 *window;
ULONG ref;
HRESULT hres;
@ -2195,10 +2196,18 @@ static void test_location(IHTMLDocument2 *doc)
ok(hres == S_OK, "get_location failed: %08x\n", hres);
ok(location == location2, "location != location2\n");
IHTMLLocation_Release(location2);
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);
test_ifaces((IUnknown*)location, location_iids);
IHTMLLocation_Release(location2);
ref = IHTMLLocation_Release(location);
ok(!ref, "location chould be destroyed here\n");
}