Jacek Caban : mshtml: Use set_nsstyle_attr_var helper in IHTMLStyle:: put_marginLeft implementation.

[Alexandre Julliard]

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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Thu Jan 26 14:33:38 2012 +0100

mshtml: Use set_nsstyle_attr_var helper in IHTMLStyle::put_marginLeft implementation.

---

 dlls/mshtml/htmlstyle.c   |   21 ++-------------------
 dlls/mshtml/tests/style.c |   11 +++++++++++
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c
index 77b7da1..523fc8f 100644
--- a/dlls/mshtml/htmlstyle.c
+++ b/dlls/mshtml/htmlstyle.c
@@ -1523,26 +1523,9 @@ static HRESULT WINAPI HTMLStyle_put_marginLeft(IHTMLStyle *iface, VARIANT v)
 {
     HTMLStyle *This = impl_from_IHTMLStyle(iface);
 
-    switch(V_VT(&v)) {
-    case VT_NULL:
-        TRACE("(%p)->(NULL)\n", This);
-        return set_style_attr(This, STYLEID_MARGIN_LEFT, emptyW, 0);
-    case VT_I4: {
-        WCHAR buf[14];
-
-        TRACE("(%p)->(%d)\n", This, V_I4(&v));
-
-        wsprintfW(buf, px_formatW, V_I4(&v));
-        return set_style_attr(This, STYLEID_MARGIN_LEFT, buf, 0);
-    }
-    case VT_BSTR:
-        TRACE("(%p)->(%s)\n", This, debugstr_w(V_BSTR(&v)));
-        return set_style_attr(This, STYLEID_MARGIN_LEFT, V_BSTR(&v), 0);
-    default:
-        FIXME("Unsupported vt=%d\n", V_VT(&v));
-    }
+    TRACE("(%p)->(v%d)\n", This, V_VT(&v));
 
-    return E_NOTIMPL;
+    return set_nsstyle_attr_var(This->nsstyle, STYLEID_MARGIN_LEFT, &v, ATTR_FIX_PX);
 }
 
 static HRESULT WINAPI HTMLStyle_put_margin(IHTMLStyle *iface, BSTR v)
diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c
index 9033c8c..e950f83 100644
--- a/dlls/mshtml/tests/style.c
+++ b/dlls/mshtml/tests/style.c
@@ -404,6 +404,17 @@ static void test_body_style(IHTMLStyle *style)
     ok(V_VT(&v) == VT_BSTR, "V_VT(marginLeft) = %d\n", V_VT(&v));
     ok(!V_BSTR(&v), "V_BSTR(marginLeft) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
 
+    V_VT(&v) = VT_I4;
+    V_I4(&v) = 6;
+    hres = IHTMLStyle_put_marginLeft(style, v);
+    ok(hres == S_OK, "put_marginLeft failed: %08x\n", hres);
+
+    V_VT(&v) = VT_NULL;
+    hres = IHTMLStyle_get_marginLeft(style, &v);
+    ok(hres == S_OK, "get_marginLeft failed: %08x\n", hres);
+    ok(V_VT(&v) == VT_BSTR, "V_VT(marginLeft) = %d\n", V_VT(&v));
+    ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginLeft) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
+
     str = (void*)0xdeadbeef;
     hres = IHTMLStyle_get_fontFamily(style, &str);
     ok(hres == S_OK, "get_fontFamily failed: %08x\n", hres);