Jacek Caban : mshtml: Add IHTMLCSSStyleDeclaration2::columnRuleColor property semi-stub implementation.

Alexandre Julliard julliard at winehq.org
Tue Jun 9 15:27:48 CDT 2020


Module: wine
Branch: master
Commit: fe886e6eedbe57720ccf38a573d9f306bc4b34fb
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=fe886e6eedbe57720ccf38a573d9f306bc4b34fb

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Tue Jun  9 16:16:19 2020 +0200

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

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mshtml/htmlstyle.c   | 13 +++++++++----
 dlls/mshtml/htmlstyle.h   |  1 +
 dlls/mshtml/tests/style.c | 19 +++++++++++++++++++
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c
index 7e49d0b2f8..39f5f0dc11 100644
--- a/dlls/mshtml/htmlstyle.c
+++ b/dlls/mshtml/htmlstyle.c
@@ -563,6 +563,11 @@ static const style_tbl_entry_t style_tbl[] = {
         DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNGAP,
         DISPID_UNKNOWN
     },
+    {
+        L"column-rule-color",
+        DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNRULECOLOR,
+        DISPID_UNKNOWN
+    },
     {
         L"column-span",
         DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNSPAN,
@@ -8917,15 +8922,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnRule(IHTMLCSSStyleDecla
 static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columnRuleColor(IHTMLCSSStyleDeclaration2 *iface, VARIANT v)
 {
     CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface);
-    FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
-    return E_NOTIMPL;
+    WARN("(%p)->(%s) semi-stub\n", This, debugstr_variant(&v));
+    return set_style_property_var(This, STYLEID_COLUMN_RULE_COLOR, &v);
 }
 
 static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnRuleColor(IHTMLCSSStyleDeclaration2 *iface, VARIANT *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_var(This, STYLEID_COLUMN_RULE_COLOR, p);
 }
 
 static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columnRuleStyle(IHTMLCSSStyleDeclaration2 *iface, BSTR v)
diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h
index 641404afc1..330b7b1230 100644
--- a/dlls/mshtml/htmlstyle.h
+++ b/dlls/mshtml/htmlstyle.h
@@ -84,6 +84,7 @@ typedef enum {
     STYLEID_COLUMN_COUNT,
     STYLEID_COLUMN_FILL,
     STYLEID_COLUMN_GAP,
+    STYLEID_COLUMN_RULE_COLOR,
     STYLEID_COLUMN_SPAN,
     STYLEID_COLUMN_WIDTH,
     STYLEID_CURSOR,
diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c
index 227196489e..ca5f634540 100644
--- a/dlls/mshtml/tests/style.c
+++ b/dlls/mshtml/tests/style.c
@@ -1017,6 +1017,25 @@ static void test_css_style_declaration2(IHTMLCSSStyleDeclaration2 *css_style)
     todo_wine
     ok(str && !lstrcmpW(str, L"all"), "columnSpan = %s\n", wine_dbgstr_w(str));
     SysFreeString(str);
+
+    V_VT(&v) = VT_ERROR;
+    hres = IHTMLCSSStyleDeclaration2_get_columnRuleColor(css_style, &v);
+    ok(hres == S_OK, "get_columnRuleColor failed: %08x\n", hres);
+    ok(V_VT(&v) == VT_BSTR && !V_BSTR(&v), "columnRuleColor = %s\n", wine_dbgstr_variant(&v));
+    VariantClear(&v);
+
+    V_VT(&v) = VT_BSTR;
+    V_BSTR(&v) = SysAllocString(L"red");
+    hres = IHTMLCSSStyleDeclaration2_put_columnRuleColor(css_style, v);
+    ok(hres == S_OK, "put_columnRuleColor failed: %08x\n", hres);
+    VariantClear(&v);
+
+    V_VT(&v) = VT_ERROR;
+    hres = IHTMLCSSStyleDeclaration2_get_columnRuleColor(css_style, &v);
+    ok(hres == S_OK, "get_columnRuleColor failed: %08x\n", hres);
+    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);
 }
 
 static void test_body_style(IHTMLStyle *style)




More information about the wine-cvs mailing list