Jacek Caban : mshtml: Use proper helpers in IHTMLStyle:: color implementation.
Alexandre Julliard
julliard at winehq.org
Fri Mar 30 11:27:06 CDT 2012
Module: wine
Branch: master
Commit: 1cd6da26123c7595f4c1e8e117b2bcfaa0332795
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd6da26123c7595f4c1e8e117b2bcfaa0332795
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Mar 30 14:14:03 2012 +0200
mshtml: Use proper helpers in IHTMLStyle::color implementation.
---
dlls/mshtml/htmlstyle.c | 14 ++------------
dlls/mshtml/tests/style.c | 12 ++++++++++++
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c
index 69f3720..f13fb35 100644
--- a/dlls/mshtml/htmlstyle.c
+++ b/dlls/mshtml/htmlstyle.c
@@ -885,16 +885,7 @@ static HRESULT WINAPI HTMLStyle_put_color(IHTMLStyle *iface, VARIANT v)
TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));
- switch(V_VT(&v)) {
- case VT_BSTR:
- TRACE("%s\n", debugstr_w(V_BSTR(&v)));
- return set_style_attr(This, STYLEID_COLOR, V_BSTR(&v), 0);
-
- default:
- FIXME("unsupported vt=%d\n", V_VT(&v));
- }
-
- return E_NOTIMPL;
+ return set_nsstyle_attr_var(This->nsstyle, STYLEID_COLOR, &v, ATTR_HEX_INT);
}
static HRESULT WINAPI HTMLStyle_get_color(IHTMLStyle *iface, VARIANT *p)
@@ -903,8 +894,7 @@ static HRESULT WINAPI HTMLStyle_get_color(IHTMLStyle *iface, VARIANT *p)
TRACE("(%p)->(%p)\n", This, p);
- V_VT(p) = VT_BSTR;
- return get_style_attr(This, STYLEID_COLOR, &V_BSTR(p));
+ return get_nsstyle_attr_var(This->nsstyle, STYLEID_COLOR, p, 0);
}
static HRESULT WINAPI HTMLStyle_put_background(IHTMLStyle *iface, BSTR v)
diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c
index 7adb0ea..34e09b1 100644
--- a/dlls/mshtml/tests/style.c
+++ b/dlls/mshtml/tests/style.c
@@ -572,6 +572,18 @@ static void test_body_style(IHTMLStyle *style)
ok(V_VT(&v) == VT_BSTR, "V_VT(color) = %d\n", V_VT(&v));
ok(!V_BSTR(&v), "V_BSTR(color) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
+ V_VT(&v) = VT_I4;
+ V_I4(&v) = 0xfdfd;
+ hres = IHTMLStyle_put_color(style, v);
+ ok(hres == S_OK, "put_color failed: %08x\n", hres);
+
+ V_VT(&v) = VT_NULL;
+ hres = IHTMLStyle_get_color(style, &v);
+ ok(hres == S_OK, "get_color failed: %08x\n", hres);
+ ok(V_VT(&v) == VT_BSTR, "V_VT(color) = %d\n", V_VT(&v));
+ todo_wine
+ ok(!strcmp_wa(V_BSTR(&v), "#00fdfd"), "V_BSTR(color) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
+
b = 0xfefe;
hres = IHTMLStyle_get_textDecorationUnderline(style, &b);
ok(hres == S_OK, "get_textDecorationUnderline failed: %08x\n", hres);
More information about the wine-cvs
mailing list