Jacek Caban : mshtml: Use elem_string_attr_getter helper in HTMLLabelElement_get_htmlFor implementation.

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


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

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

mshtml: Use elem_string_attr_getter helper in HTMLLabelElement_get_htmlFor implementation.

---

 dlls/mshtml/htmlinput.c |   21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c
index e6fb184..f5e086c 100644
--- a/dlls/mshtml/htmlinput.c
+++ b/dlls/mshtml/htmlinput.c
@@ -1334,29 +1334,10 @@ static HRESULT WINAPI HTMLLabelElement_put_htmlFor(IHTMLLabelElement *iface, BST
 static HRESULT WINAPI HTMLLabelElement_get_htmlFor(IHTMLLabelElement *iface, BSTR *p)
 {
     HTMLLabelElement *This = impl_from_IHTMLLabelElement(iface);
-    nsAString for_str, val_str;
-    nsresult nsres;
-    HRESULT hres;
 
     TRACE("(%p)->(%p)\n", This, p);
 
-    nsAString_InitDepend(&for_str, forW);
-    nsAString_Init(&val_str, NULL);
-    nsres = nsIDOMHTMLElement_GetAttribute(This->element.nselem, &for_str, &val_str);
-    nsAString_Finish(&for_str);
-    if(NS_SUCCEEDED(nsres)) {
-        const PRUnichar *val;
-
-        nsAString_GetData(&val_str, &val);
-        *p = SysAllocString(val);
-        hres = *p ? S_OK : E_OUTOFMEMORY;
-    }else {
-        ERR("GetAttribute failed: %08x\n", nsres);
-        hres = E_FAIL;
-    }
-
-    nsAString_Finish(&val_str);
-    return hres;
+    return elem_string_attr_getter(&This->element, forW, p);
 }
 
 static HRESULT WINAPI HTMLLabelElement_put_accessKey(IHTMLLabelElement *iface, BSTR v)




More information about the wine-cvs mailing list