Zhenbo Li : mshtml: Added IHTMLStyle::textIndent property implementation.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Aug 11 17:03:46 CDT 2014
Module: wine
Branch: master
Commit: aa41321f49ceee98a6f038a3fff714bd7ba9fa77
URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa41321f49ceee98a6f038a3fff714bd7ba9fa77
Author: Zhenbo Li <litimetal at gmail.com>
Date: Sat Aug 9 08:31:31 2014 +0800
mshtml: Added IHTMLStyle::textIndent 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 580b73c..6731149 100644
--- a/dlls/mshtml/htmlstyle.c
+++ b/dlls/mshtml/htmlstyle.c
@@ -1489,15 +1489,19 @@ static HRESULT WINAPI HTMLStyle_get_textAlign(IHTMLStyle *iface, BSTR *p)
static HRESULT WINAPI HTMLStyle_put_textIndent(IHTMLStyle *iface, VARIANT v)
{
HTMLStyle *This = impl_from_IHTMLStyle(iface);
- FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
- return E_NOTIMPL;
+
+ TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));
+
+ return set_nsstyle_attr_var(This->nsstyle, STYLEID_TEXT_INDENT, &v, ATTR_FIX_PX);
}
static HRESULT WINAPI HTMLStyle_get_textIndent(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_TEXT_INDENT, p, 0);
}
static HRESULT WINAPI HTMLStyle_put_lineHeight(IHTMLStyle *iface, VARIANT v)
diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c
index 62a6336..bd4b200 100644
--- a/dlls/mshtml/tests/style.c
+++ b/dlls/mshtml/tests/style.c
@@ -1248,6 +1248,23 @@ static void test_body_style(IHTMLStyle *style)
ok(!strcmp_wa(str, "center"), "textAlign = %s\n", wine_dbgstr_w(V_BSTR(&v)));
SysFreeString(str);
+ V_VT(&v) = VT_NULL;
+ hres = IHTMLStyle_get_textIndent(style, &v);
+ ok(hres == S_OK, "get_textIndent failed: %08x\n", hres);
+ ok(V_VT(&v) == VT_BSTR, "V_VT(textIndent) = %d\n", V_VT(&v));
+ ok(!V_BSTR(&v), "V_BSTR(textIndent) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
+
+ V_VT(&v) = VT_I4;
+ V_I4(&v) = 6;
+ hres = IHTMLStyle_put_textIndent(style, v);
+ ok(hres == S_OK, "put_textIndent failed: %08x\n", hres);
+
+ V_VT(&v) = VT_NULL;
+ hres = IHTMLStyle_get_textIndent(style, &v);
+ ok(hres == S_OK, "get_textIndent failed: %08x\n", hres);
+ ok(V_VT(&v) == VT_BSTR, "V_VT(textIndent) = %d\n", V_VT(&v));
+ ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(textIndent) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
+
str = (void*)0xdeadbeef;
hres = IHTMLStyle_get_textTransform(style, &str);
ok(hres == S_OK, "get_textTransform failed: %08x\n", hres);
More information about the wine-cvs
mailing list