Module: wine Branch: master Commit: fe146ac7db7f3c41a29b220620bb24176d9d756b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe146ac7db7f3c41a29b22062...
Author: Jacek Caban jacek@codeweavers.com Date: Tue Jun 9 16:16:07 2020 +0200
mshtml: Add IHTMLCSSStyleDeclaration2::columnFill 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 3c2f533111..989edce1ec 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -553,6 +553,11 @@ static const style_tbl_entry_t style_tbl[] = { DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNCOUNT, DISPID_UNKNOWN }, + { + L"column-fill", + DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNFILL, + DISPID_UNKNOWN + }, { L"column-gap", DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNGAP, @@ -8851,15 +8856,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnGap(IHTMLCSSStyleDeclar static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columnFill(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_FILL, v); }
static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnFill(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_FILL, p); }
static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columnSpan(IHTMLCSSStyleDeclaration2 *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index bcc4afc7fa..b74463f4d6 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -82,6 +82,7 @@ typedef enum { STYLEID_CLIP, STYLEID_COLOR, STYLEID_COLUMN_COUNT, + STYLEID_COLUMN_FILL, STYLEID_COLUMN_GAP, STYLEID_COLUMN_WIDTH, STYLEID_CURSOR, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index d63e5da748..31a40ae188 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -981,6 +981,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"20px"), "columnGap = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); + + str = NULL; + hres = IHTMLCSSStyleDeclaration2_get_columnFill(css_style, &str); + ok(hres == S_OK, "get_columnFill failed: %08x\n", hres); + ok(!str, "columnFill = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = SysAllocString(L"auto"); + hres = IHTMLCSSStyleDeclaration2_put_columnFill(css_style, str); + ok(hres == S_OK, "put_columnFill failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLCSSStyleDeclaration2_get_columnFill(css_style, &str); + ok(hres == S_OK, "get_columnFill failed: %08x\n", hres); + todo_wine + ok(str && !lstrcmpW(str, L"auto"), "columnFill = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); }
static void test_body_style(IHTMLStyle *style)