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

mshtml: Use get_elem_attr_value helper in HTMLFormElement_get_dispid.

This commit is contained in:
Jacek Caban 2014-05-27 11:29:48 +02:00 committed by Alexandre Julliard
parent df62eea186
commit 04ea007cbb
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/mshtml/htmlform.c
View File

@ -568,7 +568,7 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface,
{ {
HTMLFormElement *This = impl_from_HTMLDOMNode(iface); HTMLFormElement *This = impl_from_HTMLDOMNode(iface);
nsIDOMHTMLCollection *elements; nsIDOMHTMLCollection *elements;
nsAString nsname, nsstr; nsAString nsstr, name_str;
UINT32 len, i; UINT32 len, i;
nsresult nsres; nsresult nsres;
HRESULT hres = DISP_E_UNKNOWNNAME; HRESULT hres = DISP_E_UNKNOWNNAME;
@ -604,7 +604,6 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface,
} }
} }
nsAString_InitDepend(&nsname, nameW);
nsAString_Init(&nsstr, NULL); nsAString_Init(&nsstr, NULL);
for(i = 0; i < len; ++i) { for(i = 0; i < len; ++i) {
nsIDOMNode *nsitem; nsIDOMNode *nsitem;
@ -644,21 +643,22 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface,
} }
/* compare by name attr */ /* compare by name attr */
nsres = nsIDOMHTMLElement_GetAttribute(nshtml_elem, &nsname, &nsstr); nsres = get_elem_attr_value(nshtml_elem, nameW, &name_str, &str);
nsIDOMHTMLElement_Release(nshtml_elem); nsIDOMHTMLElement_Release(nshtml_elem);
nsAString_GetData(&nsstr, &str); if(NS_SUCCEEDED(nsres)) {
if(!strcmpiW(str, name)) { if(!strcmpiW(str, name)) {
/* FIXME: using index for dispid */ nsAString_Finish(&name_str);
*pid = MSHTML_DISPID_CUSTOM_MIN + i; /* FIXME: using index for dispid */
hres = S_OK; *pid = MSHTML_DISPID_CUSTOM_MIN + i;
break; hres = S_OK;
break;
}
nsAString_Finish(&name_str);
} }
} }
nsAString_Finish(&nsname);
nsAString_Finish(&nsstr); nsAString_Finish(&nsstr);
nsIDOMHTMLCollection_Release(elements); nsIDOMHTMLCollection_Release(elements);
return hres; return hres;
} }