From a916cf2bfc79efa598df0f39555f8bd0fb68ed6f Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Tue, 9 Jun 2020 16:16:13 +0200
Subject: [PATCH] mshtml: Add IHTMLCSSStyleDeclaration2::columnSpan 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 989edce1ec8..7e49d0b2f86 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-span",
+        DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNSPAN,
+        DISPID_UNKNOWN
+    },
     {
         L"column-width",
         DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNWIDTH,
@@ -8870,15 +8875,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnFill(IHTMLCSSStyleDecla
 static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columnSpan(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_SPAN, v);
 }
 
 static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnSpan(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_SPAN, p);
 }
 
 static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columns(IHTMLCSSStyleDeclaration2 *iface, BSTR v)
diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h
index b74463f4d60..641404afc1b 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_SPAN,
     STYLEID_COLUMN_WIDTH,
     STYLEID_CURSOR,
     STYLEID_DIRECTION,
diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c
index 31a40ae188a..227196489ed 100644
--- a/dlls/mshtml/tests/style.c
+++ b/dlls/mshtml/tests/style.c
@@ -999,6 +999,24 @@ static void test_css_style_declaration2(IHTMLCSSStyleDeclaration2 *css_style)
     todo_wine
     ok(str && !lstrcmpW(str, L"auto"), "columnFill = %s\n", wine_dbgstr_w(str));
     SysFreeString(str);
+
+    str = NULL;
+    hres = IHTMLCSSStyleDeclaration2_get_columnSpan(css_style, &str);
+    ok(hres == S_OK, "get_columnSpan failed: %08x\n", hres);
+    ok(!str, "columnSpan = %s\n", wine_dbgstr_w(str));
+    SysFreeString(str);
+
+    str = SysAllocString(L"all");
+    hres = IHTMLCSSStyleDeclaration2_put_columnSpan(css_style, str);
+    ok(hres == S_OK, "put_columnSpan failed: %08x\n", hres);
+    SysFreeString(str);
+
+    str = NULL;
+    hres = IHTMLCSSStyleDeclaration2_get_columnSpan(css_style, &str);
+    ok(hres == S_OK, "get_columnSpan failed: %08x\n", hres);
+    todo_wine
+    ok(str && !lstrcmpW(str, L"all"), "columnSpan = %s\n", wine_dbgstr_w(str));
+    SysFreeString(str);
 }
 
 static void test_body_style(IHTMLStyle *style)