Jacek Caban : mshtml: Use proper helpers to implement IHTMLSyle:: fontSize property.
Alexandre Julliard
julliard at winehq.org
Fri Mar 30 11:27:06 CDT 2012
Module: wine
Branch: master
Commit: 75dd422c2a566b43f5ce0057dc8d49a25f79b615
URL: http://source.winehq.org/git/wine.git/?a=commit;h=75dd422c2a566b43f5ce0057dc8d49a25f79b615
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Mar 30 14:13:49 2012 +0200
mshtml: Use proper helpers to implement IHTMLSyle::fontSize property.
---
dlls/mshtml/htmlstyle.c | 12 ++----------
dlls/mshtml/tests/style.c | 11 +++++++++++
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c
index 7efdce6..69f3720 100644
--- a/dlls/mshtml/htmlstyle.c
+++ b/dlls/mshtml/htmlstyle.c
@@ -853,14 +853,7 @@ static HRESULT WINAPI HTMLStyle_put_fontSize(IHTMLStyle *iface, VARIANT v)
TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));
- switch(V_VT(&v)) {
- case VT_BSTR:
- return set_style_attr(This, STYLEID_FONT_SIZE, V_BSTR(&v), 0);
- default:
- FIXME("not supported vt %d\n", V_VT(&v));
- }
-
- return S_OK;
+ return set_nsstyle_attr_var(This->nsstyle, STYLEID_FONT_SIZE, &v, ATTR_FIX_PX);
}
static HRESULT WINAPI HTMLStyle_get_fontSize(IHTMLStyle *iface, VARIANT *p)
@@ -869,8 +862,7 @@ static HRESULT WINAPI HTMLStyle_get_fontSize(IHTMLStyle *iface, VARIANT *p)
TRACE("(%p)->(%p)\n", This, p);
- V_VT(p) = VT_BSTR;
- return get_style_attr(This, STYLEID_FONT_SIZE, &V_BSTR(p));
+ return get_nsstyle_attr_var(This->nsstyle, STYLEID_FONT_SIZE, p, 0);
}
static HRESULT WINAPI HTMLStyle_put_font(IHTMLStyle *iface, BSTR v)
diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c
index 9fe8512..7adb0ea 100644
--- a/dlls/mshtml/tests/style.c
+++ b/dlls/mshtml/tests/style.c
@@ -555,6 +555,17 @@ static void test_body_style(IHTMLStyle *style)
ok(V_VT(&v) == VT_BSTR, "V_VT(fontSize) = %d\n", V_VT(&v));
ok(!V_BSTR(&v), "V_BSTR(fontSize) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
+ V_VT(&v) = VT_I4;
+ V_I4(&v) = 12;
+ hres = IHTMLStyle_put_fontSize(style, v);
+ ok(hres == S_OK, "put_fontSize failed: %08x\n", hres);
+
+ V_VT(&v) = VT_NULL;
+ hres = IHTMLStyle_get_fontSize(style, &v);
+ ok(hres == S_OK, "get_fontSize failed: %08x\n", hres);
+ ok(V_VT(&v) == VT_BSTR, "V_VT(fontSize) = %d\n", V_VT(&v));
+ ok(!strcmp_wa(V_BSTR(&v), "12px"), "V_BSTR(fontSize) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
+
V_VT(&v) = VT_NULL;
hres = IHTMLStyle_get_color(style, &v);
ok(hres == S_OK, "get_color failed: %08x\n", hres);
More information about the wine-cvs
mailing list