ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Implement IHTMLStyle get/put textDecorationNone.

This commit is contained in:
Alistair Leslie-Hughes 2009-03-01 16:53:52 +11:00 committed by Alexandre Julliard
parent 5104db3d82
commit c9f4c2298a
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/mshtml/htmlstyle.c
View File

@ -156,6 +156,8 @@ static const WCHAR valUnderline[] =
{'u','n','d','e','r','l','i','n','e',0};
static const WCHAR szNormal[] =
{'n','o','r','m','a','l',0};
static const WCHAR styleNone[] =
{'n','o','n','e',0};
static const WCHAR px_formatW[] = {'%','d','p','x',0};
static const WCHAR emptyW[] = {0};
@ -436,7 +438,6 @@ static HRESULT get_nsstyle_pos(HTMLStyle *This, styleid_t sid, float *p)
static BOOL is_valid_border_style(BSTR v)
{
static const WCHAR styleNone[] = {'n','o','n','e',0};
static const WCHAR styleDotted[] = {'d','o','t','t','e','d',0};
static const WCHAR styleDashed[] = {'d','a','s','h','e','d',0};
static const WCHAR styleSolid[] = {'s','o','l','i','d',0};
@ -935,15 +936,19 @@ static HRESULT WINAPI HTMLStyle_get_textDecoration(IHTMLStyle *iface, BSTR *p)
static HRESULT WINAPI HTMLStyle_put_textDecorationNone(IHTMLStyle *iface, VARIANT_BOOL v)
{
HTMLStyle *This = HTMLSTYLE_THIS(iface);
FIXME("(%p)->(%x)\n", This, v);
return E_NOTIMPL;
TRACE("(%p)->(%x)\n", This, v);
return set_style_attr(This, STYLEID_TEXT_DECORATION, v ? styleNone : emptyW, 0);
}
static HRESULT WINAPI HTMLStyle_get_textDecorationNone(IHTMLStyle *iface, VARIANT_BOOL *p)
{
HTMLStyle *This = HTMLSTYLE_THIS(iface);
FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL;
TRACE("(%p)->(%p)\n", This, p);
return check_style_attr_value(This, STYLEID_TEXT_DECORATION, styleNone, p);
}
static HRESULT WINAPI HTMLStyle_put_textDecorationUnderline(IHTMLStyle *iface, VARIANT_BOOL v)

16
dlls/mshtml/tests/dom.c
View File

@ -2750,6 +2750,22 @@ static void test_default_style(IHTMLStyle *style)
hres = IHTMLStyle_put_textDecorationLineThrough(style, VARIANT_FALSE);
ok(hres == S_OK, "put_textDecorationLineThrough failed: %08x\n", hres);
b = 0xfefe;
hres = IHTMLStyle_get_textDecorationNone(style, &b);
ok(hres == S_OK, "get_textDecorationNone failed: %08x\n", hres);
ok(b == VARIANT_FALSE, "textDecorationNone = %x\n", b);
hres = IHTMLStyle_put_textDecorationNone(style, VARIANT_TRUE);
ok(hres == S_OK, "put_textDecorationNone failed: %08x\n", hres);
ok(b == VARIANT_FALSE, "textDecorationNone = %x\n", b);
hres = IHTMLStyle_get_textDecorationNone(style, &b);
ok(hres == S_OK, "get_textDecorationNone failed: %08x\n", hres);
ok(b == VARIANT_TRUE, "textDecorationNone = %x\n", b);
hres = IHTMLStyle_put_textDecorationNone(style, VARIANT_FALSE);
ok(hres == S_OK, "put_textDecorationNone failed: %08x\n", hres);
hres = IHTMLStyle_get_posWidth(style, NULL);
ok(hres == E_POINTER, "get_posWidth failed: %08x\n", hres);