Module: wine Branch: master Commit: 647424e4bd4e594ea6bb672a0bf167c6ab741c13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=647424e4bd4e594ea6bb672a0...
Author: Jacek Caban jacek@codeweavers.com Date: Tue Jun 9 16:16:28 2020 +0200
mshtml: Add IHTMLCSSStyleDeclaration2::columnRuleStyle property semi-stub implementation.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/mshtml/htmlstyle.c | 13 +++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 18 ++++++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 39f5f0dc11..0159dac75b 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -568,6 +568,11 @@ static const style_tbl_entry_t style_tbl[] = { DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNRULECOLOR, DISPID_UNKNOWN }, + { + L"column-rule-style", + DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNRULESTYLE, + DISPID_UNKNOWN + }, { L"column-span", DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNSPAN, @@ -8936,15 +8941,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnRuleColor(IHTMLCSSStyle static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columnRuleStyle(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_STYLE, v); }
static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnRuleStyle(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_STYLE, p); }
static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columnRuleWidth(IHTMLCSSStyleDeclaration2 *iface, VARIANT v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 330b7b1230..5823ccdf00 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -85,6 +85,7 @@ typedef enum { STYLEID_COLUMN_FILL, STYLEID_COLUMN_GAP, STYLEID_COLUMN_RULE_COLOR, + STYLEID_COLUMN_RULE_STYLE, STYLEID_COLUMN_SPAN, STYLEID_COLUMN_WIDTH, STYLEID_CURSOR, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index ca5f634540..cc6c2ec6f9 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1036,6 +1036,24 @@ 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"red"), "columnRuleColor = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); + + str = NULL; + hres = IHTMLCSSStyleDeclaration2_get_columnRuleStyle(css_style, &str); + ok(hres == S_OK, "get_columnRuleStyle failed: %08x\n", hres); + ok(!str, "columnRuleStyle = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = SysAllocString(L"solid"); + hres = IHTMLCSSStyleDeclaration2_put_columnRuleStyle(css_style, str); + ok(hres == S_OK, "put_columnRuleStyle failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLCSSStyleDeclaration2_get_columnRuleStyle(css_style, &str); + ok(hres == S_OK, "get_columnRuleStyle failed: %08x\n", hres); + todo_wine + ok(str && !lstrcmpW(str, L"solid"), "columnRuleStyle = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); }
static void test_body_style(IHTMLStyle *style)