Jacek Caban : mshtml: Added IHTMLStyle::paddingBottom implementation.

Alexandre Julliard julliard at winehq.org
Thu Jan 26 14:49:24 CST 2012


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

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

mshtml: Added IHTMLStyle::paddingBottom implementation.

---

 dlls/mshtml/htmlstyle.c   |   12 ++++++++----
 dlls/mshtml/tests/style.c |   16 ++++++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c
index 3e328ba..684f744 100644
--- a/dlls/mshtml/htmlstyle.c
+++ b/dlls/mshtml/htmlstyle.c
@@ -1592,15 +1592,19 @@ static HRESULT WINAPI HTMLStyle_get_paddingRight(IHTMLStyle *iface, VARIANT *p)
 static HRESULT WINAPI HTMLStyle_put_paddingBottom(IHTMLStyle *iface, VARIANT v)
 {
     HTMLStyle *This = impl_from_IHTMLStyle(iface);
-    FIXME("(%p)->(v%d)\n", This, V_VT(&v));
-    return E_NOTIMPL;
+
+    TRACE("(%p)->(v%d)\n", This, V_VT(&v));
+
+    return set_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_BOTTOM, &v, ATTR_FIX_PX);
 }
 
 static HRESULT WINAPI HTMLStyle_get_paddingBottom(IHTMLStyle *iface, VARIANT *p)
 {
     HTMLStyle *This = impl_from_IHTMLStyle(iface);
-    FIXME("(%p)->(%p)\n", This, p);
-    return E_NOTIMPL;
+
+    TRACE("(%p)->(%p)\n", This, p);
+
+    return get_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_BOTTOM, p, 0);
 }
 
 static HRESULT WINAPI HTMLStyle_put_paddingLeft(IHTMLStyle *iface, VARIANT v)
diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c
index a6ac67a..03a433f 100644
--- a/dlls/mshtml/tests/style.c
+++ b/dlls/mshtml/tests/style.c
@@ -1260,6 +1260,22 @@ static void test_body_style(IHTMLStyle *style)
     ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
     VariantClear(&v);
 
+    hres = IHTMLStyle_get_paddingBottom(style, &v);
+    ok(hres == S_OK, "get_paddingBottom: %08x\n", hres);
+    ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v));
+    ok(!V_BSTR(&v), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
+
+    V_VT(&v) = VT_I4;
+    V_I4(&v) = 6;
+    hres = IHTMLStyle_put_paddingBottom(style, v);
+    ok(hres == S_OK, "put_paddingBottom failed: %08x\n", hres);
+
+    hres = IHTMLStyle_get_paddingBottom(style, &v);
+    ok(hres == S_OK, "get_paddingBottom: %08x\n", hres);
+    ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v));
+    ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
+    VariantClear(&v);
+
     str = a2bstr("1");
     hres = IHTMLStyle_put_padding(style, str);
     ok(hres == S_OK, "put_padding failed: %08x\n", hres);




More information about the wine-cvs mailing list