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

mshtml: Use nsIDOMWindowCollection::NamedItem in get_window_by_name.

oldstable
Jacek Caban 2012-09-03 12:52:27 +02:00 committed by Alexandre Julliard
parent a535417443
commit 2dcb37e520
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/mshtml/htmlwindow.c
View File

@ -360,6 +360,8 @@ HRESULT get_frame_by_name(HTMLOuterWindow *This, const WCHAR *name, BOOL deep, H
{
nsIDOMWindowCollection *nsframes;
HTMLOuterWindow *window = NULL;
nsIDOMWindow *nswindow;
nsAString name_str;
PRUint32 length, i;
nsresult nsres;
HRESULT hres = S_OK;
@ -370,12 +372,24 @@ HRESULT get_frame_by_name(HTMLOuterWindow *This, const WCHAR *name, BOOL deep, H
return E_FAIL;
}
nsAString_InitDepend(&name_str, name);
nsres = nsIDOMWindowCollection_NamedItem(nsframes, &name_str, &nswindow);
nsAString_Finish(&name_str);
if(NS_FAILED(nsres)) {
nsIDOMWindowCollection_Release(nsframes);
return E_FAIL;
}
if(nswindow) {
*ret = nswindow_to_window(nswindow);
return S_OK;
}
nsres = nsIDOMWindowCollection_GetLength(nsframes, &length);
assert(nsres == NS_OK);
for(i = 0; i < length && !window; ++i) {
HTMLOuterWindow *window_iter;
nsIDOMWindow *nswindow;
BSTR id;
nsres = nsIDOMWindowCollection_Item(nsframes, i, &nswindow);