Jacek Caban : mshtml: Use better helper in IHTMLStyle:: get_width implementation.

Alexandre Julliard julliard at winehq.org
Fri Mar 30 11:27:06 CDT 2012


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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Fri Mar 30 14:14:26 2012 +0200

mshtml: Use better helper in IHTMLStyle::get_width implementation.

---

 dlls/mshtml/htmlstyle.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c
index 448b7c8..627d42c 100644
--- a/dlls/mshtml/htmlstyle.c
+++ b/dlls/mshtml/htmlstyle.c
@@ -2002,8 +2002,7 @@ static HRESULT WINAPI HTMLStyle_get_width(IHTMLStyle *iface, VARIANT *p)
 
     TRACE("(%p)->(%p)\n", This, p);
 
-    V_VT(p) = VT_BSTR;
-    return get_style_attr(This, STYLEID_WIDTH, &V_BSTR(p));
+    return get_nsstyle_attr_var(This->nsstyle, STYLEID_WIDTH, p, 0);
 }
 
 static HRESULT WINAPI HTMLStyle_put_height(IHTMLStyle *iface, VARIANT v)
@@ -2710,8 +2709,8 @@ static HRESULT WINAPI HTMLStyle_setAttribute(IHTMLStyle *iface, BSTR strAttribut
     HRESULT hres;
     DISPID dispid;
 
-    TRACE("(%p)->(%s v%d %08x)\n", This, debugstr_w(strAttributeName),
-           V_VT(&AttributeValue), lFlags);
+    TRACE("(%p)->(%s %s %08x)\n", This, debugstr_w(strAttributeName),
+          debugstr_variant(&AttributeValue), lFlags);
 
     if(!strAttributeName)
         return E_INVALIDARG;




More information about the wine-cvs mailing list