reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-29 06:30:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mshtml: Added IHTMLWindow2::get_document implementation.

Browse Source
This commit is contained in:
Jacek Caban 2008-04-21 18:12:32 +02:00 committed by Alexandre Julliard
parent 7c63087a5c
commit aeb1095b47
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/mshtml/htmlwindow.c
View File

@ -467,8 +467,18 @@ static HRESULT WINAPI HTMLWindow2_get_onscroll(IHTMLWindow2 *iface, VARIANT *p)
static HRESULT WINAPI HTMLWindow2_get_document(IHTMLWindow2 *iface, IHTMLDocument2 **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: We should return a wrapper object here */
*p = HTMLDOC(This->doc);
IHTMLDocument2_AddRef(*p);
}else {
*p = NULL;
}
return S_OK;
}
static HRESULT WINAPI HTMLWindow2_get_event(IHTMLWindow2 *iface, IHTMLEventObj **p)

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

@ -1081,7 +1081,6 @@ static void test_navigator(IHTMLDocument2 *doc)
hres = IHTMLDocument2_get_parentWindow(doc, &window);
ok(hres == S_OK, "parentWidnow failed: %08x\n", hres);
test_ifaces((IUnknown*)window, window_iids);
hres = IHTMLWindow2_get_navigator(window, &navigator);
ok(hres == S_OK, "get_navigator failed: %08x\n", hres);
@ -1187,6 +1186,25 @@ static void test_default_body(IHTMLBodyElement *body)
ok(bstr == NULL, "bstr != NULL\n");
}
static void test_window(IHTMLDocument2 *doc)
{
IHTMLWindow2 *window;
IHTMLDocument2 *doc2 = NULL;
HRESULT hres;
hres = IHTMLDocument2_get_parentWindow(doc, &window);
ok(hres == S_OK, "get_parentElement failed: %08x\n", hres);
test_ifaces((IUnknown*)window, window_iids);
test_disp((IUnknown*)window, &DIID_DispHTMLWindow2);
hres = IHTMLWindow2_get_document(window, &doc2);
ok(hres == S_OK, "get_document failed: %08x\n", hres);
ok(doc2 != NULL, "doc2 == NULL\n");
IHTMLDocument_Release(doc2);
IHTMLWindow2_Release(window);
}
static void test_defaults(IHTMLDocument2 *doc)
{
IHTMLStyleSheetsCollection *stylesheetcol;
@ -1209,6 +1227,7 @@ static void test_defaults(IHTMLDocument2 *doc)
ok(hres == S_OK, "get_style failed: %08x\n", hres);
test_default_style(style);
test_window(doc);
test_compatmode(doc);
test_location(doc);
test_navigator(doc);