Jacek Caban : mshtml: Use get_elem_attr_value helper in is_elem_name.

Alexandre Julliard julliard at winehq.org
Wed Jun 11 13:36:21 CDT 2014


Module: wine
Branch: master
Commit: d0898685a686befe0fdcd8d0310f1a9b74906887
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d0898685a686befe0fdcd8d0310f1a9b74906887

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Tue May 27 11:29:28 2014 +0200

mshtml: Use get_elem_attr_value helper in is_elem_name.

---

 dlls/mshtml/htmlelemcol.c |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c
index cb7bad1..8fd61ed 100644
--- a/dlls/mshtml/htmlelemcol.c
+++ b/dlls/mshtml/htmlelemcol.c
@@ -368,7 +368,7 @@ static BOOL is_elem_id(HTMLElement *elem, LPCWSTR name)
 static BOOL is_elem_name(HTMLElement *elem, LPCWSTR name)
 {
     const PRUnichar *str;
-    nsAString nsstr, nsname;
+    nsAString nsstr;
     BOOL ret = FALSE;
     nsresult nsres;
 
@@ -385,15 +385,12 @@ static BOOL is_elem_name(HTMLElement *elem, LPCWSTR name)
         return TRUE;
     }
 
-    nsAString_InitDepend(&nsname, nameW);
-    nsres =  nsIDOMHTMLElement_GetAttribute(elem->nselem, &nsname, &nsstr);
-    nsAString_Finish(&nsname);
+    nsres = get_elem_attr_value(elem->nselem, nameW, &nsstr, &str);
     if(NS_SUCCEEDED(nsres)) {
-        nsAString_GetData(&nsstr, &str);
         ret = !strcmpiW(str, name);
+        nsAString_Finish(&nsstr);
     }
 
-    nsAString_Finish(&nsstr);
     return ret;
 }
 




More information about the wine-cvs mailing list