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

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

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:36 +02:00 committed by Alexandre Julliard
parent 647424e4bd
commit 883f45ac0e
3 changed files with 29 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

@ -573,6 +573,11 @@ static const style_tbl_entry_t style_tbl[] = {
DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNRULESTYLE, DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNRULESTYLE,
DISPID_UNKNOWN DISPID_UNKNOWN
}, },
{
L"column-rule-width",
DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNRULEWIDTH,
DISPID_UNKNOWN
},
{ {
L"column-span", L"column-span",
DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNSPAN, DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNSPAN,
@ -8955,15 +8960,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnRuleStyle(IHTMLCSSStyle
static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columnRuleWidth(IHTMLCSSStyleDeclaration2 *iface, VARIANT v) static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columnRuleWidth(IHTMLCSSStyleDeclaration2 *iface, VARIANT v)
{ {
CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface);
FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); WARN("(%p)->(%s) semi-stub\n", This, debugstr_variant(&v));
return E_NOTIMPL; return set_style_property_var(This, STYLEID_COLUMN_RULE_WIDTH, &v);
} }
static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnRuleWidth(IHTMLCSSStyleDeclaration2 *iface, VARIANT *p) static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnRuleWidth(IHTMLCSSStyleDeclaration2 *iface, VARIANT *p)
{ {
CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface);
FIXME("(%p)->(%p)\n", This, p); WARN("(%p)->(%p) semi-stub\n", This, p);
return E_NOTIMPL; return get_style_property_var(This, STYLEID_COLUMN_RULE_WIDTH, p);
} }
static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_breakBefore(IHTMLCSSStyleDeclaration2 *iface, BSTR v) static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_breakBefore(IHTMLCSSStyleDeclaration2 *iface, BSTR v)

1
dlls/mshtml/htmlstyle.h
View File

@ -86,6 +86,7 @@ typedef enum {
STYLEID_COLUMN_GAP, STYLEID_COLUMN_GAP,
STYLEID_COLUMN_RULE_COLOR, STYLEID_COLUMN_RULE_COLOR,
STYLEID_COLUMN_RULE_STYLE, STYLEID_COLUMN_RULE_STYLE,
STYLEID_COLUMN_RULE_WIDTH,
STYLEID_COLUMN_SPAN, STYLEID_COLUMN_SPAN,
STYLEID_COLUMN_WIDTH, STYLEID_COLUMN_WIDTH,
STYLEID_CURSOR, STYLEID_CURSOR,

19
dlls/mshtml/tests/style.c
View File

@ -1054,6 +1054,25 @@ static void test_css_style_declaration2(IHTMLCSSStyleDeclaration2 *css_style)
todo_wine todo_wine
ok(str && !lstrcmpW(str, L"solid"), "columnRuleStyle = %s\n", wine_dbgstr_w(str)); ok(str && !lstrcmpW(str, L"solid"), "columnRuleStyle = %s\n", wine_dbgstr_w(str));
SysFreeString(str); SysFreeString(str);
V_VT(&v) = VT_ERROR;
hres = IHTMLCSSStyleDeclaration2_get_columnRuleWidth(css_style, &v);
ok(hres == S_OK, "get_columnRuleWidth failed: %08x\n", hres);
ok(V_VT(&v) == VT_BSTR && !V_BSTR(&v), "columnRuleWidth = %s\n", wine_dbgstr_variant(&v));
VariantClear(&v);
V_VT(&v) = VT_BSTR;
V_BSTR(&v) = SysAllocString(L"10px");
hres = IHTMLCSSStyleDeclaration2_put_columnRuleWidth(css_style, v);
ok(hres == S_OK, "put_columnRuleWidth failed: %08x\n", hres);
VariantClear(&v);
V_VT(&v) = VT_ERROR;
hres = IHTMLCSSStyleDeclaration2_get_columnRuleWidth(css_style, &v);
ok(hres == S_OK, "get_columnRuleWidth failed: %08x\n", hres);
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);
} }
static void test_body_style(IHTMLStyle *style) static void test_body_style(IHTMLStyle *style)