Jacek Caban : mshtml: Use get_elem_attr_value helper in HTMLFormElement_get_dispid.
Alexandre Julliard
julliard at winehq.org
Wed Jun 11 13:36:22 CDT 2014
Module: wine
Branch: master
Commit: 04ea007cbb4733cd84fcc48b6341c819472a6fe1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=04ea007cbb4733cd84fcc48b6341c819472a6fe1
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue May 27 11:29:48 2014 +0200
mshtml: Use get_elem_attr_value helper in HTMLFormElement_get_dispid.
---
dlls/mshtml/htmlform.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c
index 5b9982c..6cbf1f6 100644
--- a/dlls/mshtml/htmlform.c
+++ b/dlls/mshtml/htmlform.c
@@ -568,7 +568,7 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface,
{
HTMLFormElement *This = impl_from_HTMLDOMNode(iface);
nsIDOMHTMLCollection *elements;
- nsAString nsname, nsstr;
+ nsAString nsstr, name_str;
UINT32 len, i;
nsresult nsres;
HRESULT hres = DISP_E_UNKNOWNNAME;
@@ -604,7 +604,6 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface,
}
}
- nsAString_InitDepend(&nsname, nameW);
nsAString_Init(&nsstr, NULL);
for(i = 0; i < len; ++i) {
nsIDOMNode *nsitem;
@@ -644,21 +643,22 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface,
}
/* 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);
- nsAString_GetData(&nsstr, &str);
- if(!strcmpiW(str, name)) {
- /* FIXME: using index for dispid */
- *pid = MSHTML_DISPID_CUSTOM_MIN + i;
- hres = S_OK;
- break;
+ if(NS_SUCCEEDED(nsres)) {
+ if(!strcmpiW(str, name)) {
+ nsAString_Finish(&name_str);
+ /* FIXME: using index for dispid */
+ *pid = MSHTML_DISPID_CUSTOM_MIN + i;
+ hres = S_OK;
+ break;
+ }
+ nsAString_Finish(&name_str);
}
}
- nsAString_Finish(&nsname);
- nsAString_Finish(&nsstr);
+ nsAString_Finish(&nsstr);
nsIDOMHTMLCollection_Release(elements);
-
return hres;
}
More information about the wine-cvs
mailing list