mshtml: Implement IHTMLStyle get/put borderRightStyle.
This commit is contained in:
parent
1d1f60bbee
commit
7c3b5b6931
|
@ -49,6 +49,8 @@ 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[] =
|
||||||
{'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[] =
|
||||||
|
{'b','o','r','d','e','r','-','r','i','g','h','t','-','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[] =
|
||||||
|
@ -111,6 +113,7 @@ static const struct{
|
||||||
{attrBorderBottomStyle, DISPID_IHTMLSTYLE_BORDERBOTTOMSTYLE},
|
{attrBorderBottomStyle, DISPID_IHTMLSTYLE_BORDERBOTTOMSTYLE},
|
||||||
{attrBorderLeft, DISPID_IHTMLSTYLE_BORDERLEFT},
|
{attrBorderLeft, DISPID_IHTMLSTYLE_BORDERLEFT},
|
||||||
{attrBorderLeftStyle, DISPID_IHTMLSTYLE_BORDERLEFTSTYLE},
|
{attrBorderLeftStyle, DISPID_IHTMLSTYLE_BORDERLEFTSTYLE},
|
||||||
|
{attrBorderRightStyle, DISPID_IHTMLSTYLE_BORDERRIGHTSTYLE},
|
||||||
{attrBorderWidth, DISPID_IHTMLSTYLE_BORDERWIDTH},
|
{attrBorderWidth, DISPID_IHTMLSTYLE_BORDERWIDTH},
|
||||||
{attrColor, DISPID_IHTMLSTYLE_COLOR},
|
{attrColor, DISPID_IHTMLSTYLE_COLOR},
|
||||||
{attrCursor, DISPID_IHTMLSTYLE_CURSOR},
|
{attrCursor, DISPID_IHTMLSTYLE_CURSOR},
|
||||||
|
@ -1477,15 +1480,19 @@ static HRESULT WINAPI HTMLStyle_get_borderTopStyle(IHTMLStyle *iface, BSTR *p)
|
||||||
static HRESULT WINAPI HTMLStyle_put_borderRightStyle(IHTMLStyle *iface, BSTR v)
|
static HRESULT WINAPI HTMLStyle_put_borderRightStyle(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_RIGHT_STYLE, v, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI HTMLStyle_get_borderRightStyle(IHTMLStyle *iface, BSTR *p)
|
static HRESULT WINAPI HTMLStyle_get_borderRightStyle(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_RIGHT_STYLE, p);
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI HTMLStyle_put_borderBottomStyle(IHTMLStyle *iface, BSTR v)
|
static HRESULT WINAPI HTMLStyle_put_borderBottomStyle(IHTMLStyle *iface, BSTR v)
|
||||||
|
|
|
@ -38,6 +38,7 @@ typedef enum {
|
||||||
STYLEID_BORDER_BOTTOM_STYLE,
|
STYLEID_BORDER_BOTTOM_STYLE,
|
||||||
STYLEID_BORDER_LEFT,
|
STYLEID_BORDER_LEFT,
|
||||||
STYLEID_BORDER_LEFT_STYLE,
|
STYLEID_BORDER_LEFT_STYLE,
|
||||||
|
STYLEID_BORDER_RIGHT_STYLE,
|
||||||
STYLEID_BORDER_WIDTH,
|
STYLEID_BORDER_WIDTH,
|
||||||
STYLEID_COLOR,
|
STYLEID_COLOR,
|
||||||
STYLEID_CURSOR,
|
STYLEID_CURSOR,
|
||||||
|
|
|
@ -2896,6 +2896,10 @@ static void test_default_style(IHTMLStyle *style)
|
||||||
test_border_styles(style, str);
|
test_border_styles(style, str);
|
||||||
SysFreeString(str);
|
SysFreeString(str);
|
||||||
|
|
||||||
|
str = a2bstr("borderrightstyle");
|
||||||
|
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)) {
|
||||||
|
|
Loading…
Reference in New Issue