system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

mshtml: Add IHTMLCSSStyleDeclaration2::columnRule property semi-stub implementation.

Browse source 
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2020-06-09 16:16:43 +02:00 committed by Alexandre Julliard
parent 883f45ac0e
commit dbc5dc893b
3 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
dlls/mshtml/htmlstyle.c
View file

@ -563,6 +563,11 @@ static const style_tbl_entry_t style_tbl[] = {
DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNGAP,
DISPID_UNKNOWN
},
{
L"column-rule",
DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNRULE,
DISPID_UNKNOWN
},
{
L"column-rule-color",
DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNRULECOLOR,
@ -8918,15 +8923,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columns(IHTMLCSSStyleDeclarat
static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columnRule(IHTMLCSSStyleDeclaration2 *iface, BSTR v)
{
CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface);
FIXME("(%p)->(%s)\n", This, debugstr_w(v));
return E_NOTIMPL;
WARN("(%p)->(%s) semi-stub\n", This, debugstr_w(v));
return set_style_property(This, STYLEID_COLUMN_RULE, v);
}
static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnRule(IHTMLCSSStyleDeclaration2 *iface, BSTR *p)
{
CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface);
FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL;
WARN("(%p)->(%p) semi-stub\n", This, p);
return get_style_property(This, STYLEID_COLUMN_RULE, p);
}
static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columnRuleColor(IHTMLCSSStyleDeclaration2 *iface, VARIANT v)

1
dlls/mshtml/htmlstyle.h
View file

@ -84,6 +84,7 @@ typedef enum {
STYLEID_COLUMN_COUNT,
STYLEID_COLUMN_FILL,
STYLEID_COLUMN_GAP,
STYLEID_COLUMN_RULE,
STYLEID_COLUMN_RULE_COLOR,
STYLEID_COLUMN_RULE_STYLE,
STYLEID_COLUMN_RULE_WIDTH,

15
dlls/mshtml/tests/style.c
View file

@ -1073,6 +1073,21 @@ static void test_css_style_declaration2(IHTMLCSSStyleDeclaration2 *css_style)
todo_wine
ok(V_VT(&v) == VT_BSTR && V_BSTR(&v) && !lstrcmpW(V_BSTR(&v), L"10px"), "columnRuleWidth = %s\n", wine_dbgstr_variant(&v));
VariantClear(&v);
str = NULL;
hres = IHTMLCSSStyleDeclaration2_get_columnRule(css_style, &str);
ok(hres == S_OK, "get_columnRule failed: %08x\n", hres);
todo_wine
ok(str && !lstrcmpW(str, L"10px solid red"), "columnRule = %s\n", wine_dbgstr_w(str));
SysFreeString(str);
hres = IHTMLCSSStyleDeclaration2_put_columnRule(css_style, NULL);
ok(hres == S_OK, "put_columnRule failed: %08x\n", hres);
str = (void*)0xdeadbeef;
hres = IHTMLCSSStyleDeclaration2_get_columnRule(css_style, &str);
ok(hres == S_OK, "get_columnRule failed: %08x\n", hres);
ok(!str, "columnRule = %s\n", wine_dbgstr_w(str));
}
static void test_body_style(IHTMLStyle *style)