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

mshtml: Implement IHTMLStyle get/put borderBottomStyle.

This commit is contained in:
Alistair Leslie-Hughes 2009-01-13 18:38:32 +11:00 committed by Alexandre Julliard
parent 44de20a0c7
commit 1d1f60bbee
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

@ -43,6 +43,8 @@ static const WCHAR attrBackgroundImage[] =
{'b','a','c','k','g','r','o','u','n','d','-','i','m','a','g','e',0}; {'b','a','c','k','g','r','o','u','n','d','-','i','m','a','g','e',0};
static const WCHAR attrBorder[] = static const WCHAR attrBorder[] =
{'b','o','r','d','e','r',0}; {'b','o','r','d','e','r',0};
static const WCHAR attrBorderBottomStyle[] =
{'b','o','r','d','e','r','-','b','o','t','t','o','m','-','s','t','y','l','e',0};
static const WCHAR attrBorderLeft[] = static const WCHAR attrBorderLeft[] =
{'b','o','r','d','e','r','-','l','e','f','t',0}; {'b','o','r','d','e','r','-','l','e','f','t',0};
static const WCHAR attrBorderLeftStyle[] = static const WCHAR attrBorderLeftStyle[] =
@ -106,6 +108,7 @@ static const struct{
{attrBackgroundColor, DISPID_IHTMLSTYLE_BACKGROUNDCOLOR}, {attrBackgroundColor, DISPID_IHTMLSTYLE_BACKGROUNDCOLOR},
{attrBackgroundImage, DISPID_IHTMLSTYLE_BACKGROUNDIMAGE}, {attrBackgroundImage, DISPID_IHTMLSTYLE_BACKGROUNDIMAGE},
{attrBorder, DISPID_IHTMLSTYLE_BORDER}, {attrBorder, DISPID_IHTMLSTYLE_BORDER},
{attrBorderBottomStyle, DISPID_IHTMLSTYLE_BORDERBOTTOMSTYLE},
{attrBorderLeft, DISPID_IHTMLSTYLE_BORDERLEFT}, {attrBorderLeft, DISPID_IHTMLSTYLE_BORDERLEFT},
{attrBorderLeftStyle, DISPID_IHTMLSTYLE_BORDERLEFTSTYLE}, {attrBorderLeftStyle, DISPID_IHTMLSTYLE_BORDERLEFTSTYLE},
{attrBorderWidth, DISPID_IHTMLSTYLE_BORDERWIDTH}, {attrBorderWidth, DISPID_IHTMLSTYLE_BORDERWIDTH},
@ -1488,15 +1491,19 @@ static HRESULT WINAPI HTMLStyle_get_borderRightStyle(IHTMLStyle *iface, BSTR *p)
static HRESULT WINAPI HTMLStyle_put_borderBottomStyle(IHTMLStyle *iface, BSTR v) static HRESULT WINAPI HTMLStyle_put_borderBottomStyle(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_BOTTOM_STYLE, v, 0);
} }
static HRESULT WINAPI HTMLStyle_get_borderBottomStyle(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_get_borderBottomStyle(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_BOTTOM_STYLE, p);
} }
static HRESULT WINAPI HTMLStyle_put_borderLeftStyle(IHTMLStyle *iface, BSTR v) static HRESULT WINAPI HTMLStyle_put_borderLeftStyle(IHTMLStyle *iface, BSTR v)

1
dlls/mshtml/htmlstyle.h
View File

@ -35,6 +35,7 @@ typedef enum {
STYLEID_BACKGROUND_COLOR, STYLEID_BACKGROUND_COLOR,
STYLEID_BACKGROUND_IMAGE, STYLEID_BACKGROUND_IMAGE,
STYLEID_BORDER, STYLEID_BORDER,
STYLEID_BORDER_BOTTOM_STYLE,
STYLEID_BORDER_LEFT, STYLEID_BORDER_LEFT,
STYLEID_BORDER_LEFT_STYLE, STYLEID_BORDER_LEFT_STYLE,
STYLEID_BORDER_WIDTH, STYLEID_BORDER_WIDTH,

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

@ -2892,6 +2892,10 @@ static void test_default_style(IHTMLStyle *style)
test_border_styles(style, str); test_border_styles(style, str);
SysFreeString(str); SysFreeString(str);
str = a2bstr("borderbottomstyle");
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)) {