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

mshtml: Implement IHTMLStyle get/put borderTopStyle.

This commit is contained in:
Alistair Leslie-Hughes 2009-01-13 18:40:01 +11:00 committed by Alexandre Julliard
parent 7c3b5b6931
commit 1584719604
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/mshtml/htmlstyle.c
View File

@ -51,6 +51,8 @@ static const WCHAR attrBorderLeftStyle[] =
{'b','o','r','d','e','r','-','l','e','f','t','-','s','t','y','l','e',0}; {'b','o','r','d','e','r','-','l','e','f','t','-','s','t','y','l','e',0};
static const WCHAR attrBorderRightStyle[] = static const WCHAR attrBorderRightStyle[] =
{'b','o','r','d','e','r','-','r','i','g','h','t','-','s','t','y','l','e',0}; {'b','o','r','d','e','r','-','r','i','g','h','t','-','s','t','y','l','e',0};
static const WCHAR attrBorderTopStyle[] =
{'b','o','r','d','e','r','-','t','o','p','-','s','t','y','l','e',0};
static const WCHAR attrBorderWidth[] = static const WCHAR attrBorderWidth[] =
{'b','o','r','d','e','r','-','w','i','d','t','h',0}; {'b','o','r','d','e','r','-','w','i','d','t','h',0};
static const WCHAR attrColor[] = static const WCHAR attrColor[] =
@ -114,6 +116,7 @@ static const struct{
{attrBorderLeft, DISPID_IHTMLSTYLE_BORDERLEFT}, {attrBorderLeft, DISPID_IHTMLSTYLE_BORDERLEFT},
{attrBorderLeftStyle, DISPID_IHTMLSTYLE_BORDERLEFTSTYLE}, {attrBorderLeftStyle, DISPID_IHTMLSTYLE_BORDERLEFTSTYLE},
{attrBorderRightStyle, DISPID_IHTMLSTYLE_BORDERRIGHTSTYLE}, {attrBorderRightStyle, DISPID_IHTMLSTYLE_BORDERRIGHTSTYLE},
{attrBorderTopStyle, DISPID_IHTMLSTYLE_BORDERTOPSTYLE},
{attrBorderWidth, DISPID_IHTMLSTYLE_BORDERWIDTH}, {attrBorderWidth, DISPID_IHTMLSTYLE_BORDERWIDTH},
{attrColor, DISPID_IHTMLSTYLE_COLOR}, {attrColor, DISPID_IHTMLSTYLE_COLOR},
{attrCursor, DISPID_IHTMLSTYLE_CURSOR}, {attrCursor, DISPID_IHTMLSTYLE_CURSOR},
@ -1466,15 +1469,19 @@ static HRESULT WINAPI HTMLStyle_get_borderStyle(IHTMLStyle *iface, BSTR *p)
static HRESULT WINAPI HTMLStyle_put_borderTopStyle(IHTMLStyle *iface, BSTR v) static HRESULT WINAPI HTMLStyle_put_borderTopStyle(IHTMLStyle *iface, BSTR v)
{ {
HTMLStyle *This = HTMLSTYLE_THIS(iface); HTMLStyle *This = HTMLSTYLE_THIS(iface);
FIXME("(%p)->(%s)\n", This, debugstr_w(v)); TRACE("(%p)->(%s)\n", This, debugstr_w(v));
return E_NOTIMPL;
if(!is_valid_border_style(v))
return E_INVALIDARG;
return set_style_attr(This, STYLEID_BORDER_TOP_STYLE, v, 0);
} }
static HRESULT WINAPI HTMLStyle_get_borderTopStyle(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_get_borderTopStyle(IHTMLStyle *iface, BSTR *p)
{ {
HTMLStyle *This = HTMLSTYLE_THIS(iface); HTMLStyle *This = HTMLSTYLE_THIS(iface);
FIXME("(%p)->(%p)\n", This, p); TRACE("(%p)->(%p)\n", This, p);
return E_NOTIMPL; return get_style_attr(This, STYLEID_BORDER_TOP_STYLE, p);
} }
static HRESULT WINAPI HTMLStyle_put_borderRightStyle(IHTMLStyle *iface, BSTR v) static HRESULT WINAPI HTMLStyle_put_borderRightStyle(IHTMLStyle *iface, BSTR v)

1
dlls/mshtml/htmlstyle.h
View File

@ -39,6 +39,7 @@ typedef enum {
STYLEID_BORDER_LEFT, STYLEID_BORDER_LEFT,
STYLEID_BORDER_LEFT_STYLE, STYLEID_BORDER_LEFT_STYLE,
STYLEID_BORDER_RIGHT_STYLE, STYLEID_BORDER_RIGHT_STYLE,
STYLEID_BORDER_TOP_STYLE,
STYLEID_BORDER_WIDTH, STYLEID_BORDER_WIDTH,
STYLEID_COLOR, STYLEID_COLOR,
STYLEID_CURSOR, STYLEID_CURSOR,

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

@ -2900,6 +2900,10 @@ static void test_default_style(IHTMLStyle *style)
test_border_styles(style, str); test_border_styles(style, str);
SysFreeString(str); SysFreeString(str);
str = a2bstr("bordertopstyle");
test_border_styles(style, str);
SysFreeString(str);
hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2);
ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres);
if(SUCCEEDED(hres)) { if(SUCCEEDED(hres)) {