mshtml: Implement IHTMLStyle get/put borderColor.

This commit is contained in:
Alistair Leslie-Hughes 2009-03-03 21:04:49 +11:00 committed by Alexandre Julliard
parent f7a6c512a0
commit 73241dfe84
3 changed files with 30 additions and 4 deletions

View File

@ -47,6 +47,8 @@ static const WCHAR attrBorder[] =
{'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 attrBorderColor[] =
{'b','o','r','d','e','r','-','c','o','l','o','r',0};
static const WCHAR attrBorderLeft[] =
{'b','o','r','d','e','r','-','l','e','f','t',0};
static const WCHAR attrBorderLeftStyle[] =
@ -118,6 +120,7 @@ static const struct{
{attrBackgroundRepeat, DISPID_IHTMLSTYLE_BACKGROUNDREPEAT},
{attrBorder, DISPID_IHTMLSTYLE_BORDER},
{attrBorderBottomStyle, DISPID_IHTMLSTYLE_BORDERBOTTOMSTYLE},
{attrBorderColor, DISPID_IHTMLSTYLE_BORDERCOLOR},
{attrBorderLeft, DISPID_IHTMLSTYLE_BORDERLEFT},
{attrBorderLeftStyle, DISPID_IHTMLSTYLE_BORDERLEFTSTYLE},
{attrBorderRightStyle, DISPID_IHTMLSTYLE_BORDERRIGHTSTYLE},
@ -1415,15 +1418,19 @@ static HRESULT WINAPI HTMLStyle_get_borderLeft(IHTMLStyle *iface, BSTR *p)
static HRESULT WINAPI HTMLStyle_put_borderColor(IHTMLStyle *iface, BSTR v)
{
HTMLStyle *This = HTMLSTYLE_THIS(iface);
FIXME("(%p)->(%s)\n", This, debugstr_w(v));
return E_NOTIMPL;
TRACE("(%p)->(%s)\n", This, debugstr_w(v));
return set_style_attr(This, STYLEID_BORDER_COLOR, v, 0);
}
static HRESULT WINAPI HTMLStyle_get_borderColor(IHTMLStyle *iface, BSTR *p)
{
HTMLStyle *This = HTMLSTYLE_THIS(iface);
FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL;
TRACE("(%p)->(%p)\n", This, p);
return get_style_attr(This, STYLEID_BORDER_COLOR, p);
}
static HRESULT WINAPI HTMLStyle_put_borderTopColor(IHTMLStyle *iface, VARIANT v)

View File

@ -41,6 +41,7 @@ typedef enum {
STYLEID_BACKGROUND_REPEAT,
STYLEID_BORDER,
STYLEID_BORDER_BOTTOM_STYLE,
STYLEID_BORDER_COLOR,
STYLEID_BORDER_LEFT,
STYLEID_BORDER_LEFT_STYLE,
STYLEID_BORDER_RIGHT_STYLE,

View File

@ -3319,6 +3319,24 @@ static void test_default_style(IHTMLStyle *style)
ok(hres == S_OK, "put_backgroundRepeat failed: %08x\n", hres);
SysFreeString(sDefault);
/* BorderColor */
hres = IHTMLStyle_get_borderColor(style, &sDefault);
ok(hres == S_OK, "get_borderColor failed: %08x\n", hres);
str = a2bstr("red green red blue");
hres = IHTMLStyle_put_borderColor(style, str);
ok(hres == S_OK, "put_borderColor failed: %08x\n", hres);
SysFreeString(str);
hres = IHTMLStyle_get_borderColor(style, &str);
ok(hres == S_OK, "get_borderColor failed: %08x\n", hres);
ok(!strcmp_wa(str, "red green red blue"), "str=%s\n", dbgstr_w(str));
SysFreeString(str);
hres = IHTMLStyle_put_borderColor(style, sDefault);
ok(hres == S_OK, "put_borderColor failed: %08x\n", hres);
SysFreeString(sDefault);
hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2);
ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres);
if(SUCCEEDED(hres)) {