Commit 22836b0f authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

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

parent 1e73766a
......@@ -554,6 +554,11 @@ static const style_tbl_entry_t style_tbl[] = {
DISPID_UNKNOWN
},
{
L"column-gap",
DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNGAP,
DISPID_UNKNOWN
},
{
L"column-width",
DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNWIDTH,
DISPID_UNKNOWN
......@@ -8832,15 +8837,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnWidth(IHTMLCSSStyleDecl
static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columnGap(IHTMLCSSStyleDeclaration2 *iface, VARIANT v)
{
CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface);
FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
return E_NOTIMPL;
TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));
return set_style_property_var(This, STYLEID_COLUMN_GAP, &v);
}
static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnGap(IHTMLCSSStyleDeclaration2 *iface, VARIANT *p)
{
CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface);
FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL;
TRACE("(%p)->(%p)\n", This, p);
return get_style_property_var(This, STYLEID_COLUMN_GAP, p);
}
static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columnFill(IHTMLCSSStyleDeclaration2 *iface, BSTR v)
......
......@@ -82,6 +82,7 @@ typedef enum {
STYLEID_CLIP,
STYLEID_COLOR,
STYLEID_COLUMN_COUNT,
STYLEID_COLUMN_GAP,
STYLEID_COLUMN_WIDTH,
STYLEID_CURSOR,
STYLEID_DIRECTION,
......
......@@ -951,6 +951,36 @@ 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"), "columnWidth = %s\n", wine_dbgstr_variant(&v));
VariantClear(&v);
V_VT(&v) = VT_ERROR;
hres = IHTMLCSSStyleDeclaration2_get_columnGap(css_style, &v);
ok(hres == S_OK, "get_columnGap failed: %08x\n", hres);
ok(V_VT(&v) == VT_BSTR && !V_BSTR(&v), "columnGap = %s\n", wine_dbgstr_variant(&v));
VariantClear(&v);
V_VT(&v) = VT_I4;
V_I4(&v) = 20;
hres = IHTMLCSSStyleDeclaration2_put_columnGap(css_style, v);
ok(hres == S_OK, "put_columnGap failed: %08x\n", hres);
V_VT(&v) = VT_ERROR;
hres = IHTMLCSSStyleDeclaration2_get_columnGap(css_style, &v);
ok(hres == S_OK, "get_columnGap failed: %08x\n", hres);
ok(V_VT(&v) == VT_BSTR && !V_BSTR(&v), "columnGap = %s\n", wine_dbgstr_variant(&v));
VariantClear(&v);
V_VT(&v) = VT_BSTR;
V_BSTR(&v) = SysAllocString(L"20px");
hres = IHTMLCSSStyleDeclaration2_put_columnGap(css_style, v);
ok(hres == S_OK, "put_columnGap failed: %08x\n", hres);
VariantClear(&v);
V_VT(&v) = VT_ERROR;
hres = IHTMLCSSStyleDeclaration2_get_columnGap(css_style, &v);
ok(hres == S_OK, "get_columnGap failed: %08x\n", hres);
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);
}
static void test_body_style(IHTMLStyle *style)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment