ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2020-06-09 16:16:07 +02:00 committed by Alexandre Julliard
parent 22836b0fa7
commit fe146ac7db
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/mshtml/htmlstyle.c
View File

@ -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)

1
dlls/mshtml/htmlstyle.h
View File

@ -82,6 +82,7 @@ typedef enum {
STYLEID_CLIP,
STYLEID_COLOR,
STYLEID_COLUMN_COUNT,
STYLEID_COLUMN_FILL,
STYLEID_COLUMN_GAP,
STYLEID_COLUMN_WIDTH,
STYLEID_CURSOR,

18
dlls/mshtml/tests/style.c
View File

@ -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)