Jacek Caban : mshtml: Added IHTMLStyle:: marginBottom property implementation.
Alexandre Julliard
julliard at winehq.org
Thu Jan 26 14:49:24 CST 2012
Module: wine
Branch: master
Commit: 737dba7ae37dd837c036fef07bc6df18faefcc62
URL: http://source.winehq.org/git/wine.git/?a=commit;h=737dba7ae37dd837c036fef07bc6df18faefcc62
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Jan 26 14:33:24 2012 +0100
mshtml: Added IHTMLStyle::marginBottom property implementation.
---
dlls/mshtml/htmlstyle.c | 12 ++++++++----
dlls/mshtml/tests/style.c | 17 +++++++++++++++++
2 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c
index 9602f5e..77b7da1 100644
--- a/dlls/mshtml/htmlstyle.c
+++ b/dlls/mshtml/htmlstyle.c
@@ -1504,15 +1504,19 @@ static HRESULT WINAPI HTMLStyle_get_marginRight(IHTMLStyle *iface, VARIANT *p)
static HRESULT WINAPI HTMLStyle_put_marginBottom(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_MARGIN_BOTTOM, &v, ATTR_FIX_PX);
}
static HRESULT WINAPI HTMLStyle_get_marginBottom(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_MARGIN_BOTTOM, p, 0);
}
static HRESULT WINAPI HTMLStyle_put_marginLeft(IHTMLStyle *iface, VARIANT v)
diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c
index 183d3f4..9033c8c 100644
--- a/dlls/mshtml/tests/style.c
+++ b/dlls/mshtml/tests/style.c
@@ -382,6 +382,23 @@ static void test_body_style(IHTMLStyle *style)
ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginRight) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
V_VT(&v) = VT_NULL;
+ hres = IHTMLStyle_get_marginBottom(style, &v);
+ ok(hres == S_OK, "get_marginBottom failed: %08x\n", hres);
+ ok(V_VT(&v) == VT_BSTR, "V_VT(marginBottom) = %d\n", V_VT(&v));
+ ok(!V_BSTR(&v), "V_BSTR(marginBottom) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
+
+ V_VT(&v) = VT_I4;
+ V_I4(&v) = 6;
+ hres = IHTMLStyle_put_marginBottom(style, v);
+ ok(hres == S_OK, "put_marginBottom failed: %08x\n", hres);
+
+ V_VT(&v) = VT_NULL;
+ hres = IHTMLStyle_get_marginBottom(style, &v);
+ ok(hres == S_OK, "get_marginBottom failed: %08x\n", hres);
+ ok(V_VT(&v) == VT_BSTR, "V_VT(marginBottom) = %d\n", V_VT(&v));
+ ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginBottom) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
+
+ 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));
More information about the wine-cvs
mailing list