ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Added IHTMLDocument2::get_frames implementation.

This commit is contained in:
Jacek Caban 2012-02-08 15:58:21 +01:00 committed by Alexandre Julliard
parent 666004cdbd
commit 976a3d5e08
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/mshtml/htmldoc.c
View File

@ -471,8 +471,10 @@ static HRESULT WINAPI HTMLDocument_get_readyState(IHTMLDocument2 *iface, BSTR *p
static HRESULT WINAPI HTMLDocument_get_frames(IHTMLDocument2 *iface, IHTMLFramesCollection2 **p) static HRESULT WINAPI HTMLDocument_get_frames(IHTMLDocument2 *iface, IHTMLFramesCollection2 **p)
{ {
HTMLDocument *This = impl_from_IHTMLDocument2(iface); HTMLDocument *This = impl_from_IHTMLDocument2(iface);
FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL; TRACE("(%p)->(%p)\n", This, p);
return IHTMLWindow2_get_frames(&This->window->IHTMLWindow2_iface, p);
} }
static HRESULT WINAPI HTMLDocument_get_embeds(IHTMLDocument2 *iface, IHTMLElementCollection **p) static HRESULT WINAPI HTMLDocument_get_embeds(IHTMLDocument2 *iface, IHTMLElementCollection **p)

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

@ -5913,6 +5913,14 @@ static void test_frameset(IHTMLDocument2 *doc)
test_frames_collection(frames, "fr1"); test_frames_collection(frames, "fr1");
IHTMLFramesCollection2_Release(frames); IHTMLFramesCollection2_Release(frames);
hres = IHTMLDocument2_get_frames(doc, &frames);
ok(hres == S_OK, "IHTMLDocument2_get_frames failed: 0x%08x\n", hres);
if(FAILED(hres))
return;
test_frames_collection(frames, "fr1");
IHTMLFramesCollection2_Release(frames);
/* test using IHTMLWindow2 inheritance */ /* test using IHTMLWindow2 inheritance */
test_frames_collection((IHTMLFramesCollection2*)window, "fr2"); test_frames_collection((IHTMLFramesCollection2*)window, "fr2");