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

mshtml: Add IHTMLCSSStyleDeclaration2::columnSpan 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:13 +02:00 committed by Alexandre Julliard
parent fe146ac7db
commit a916cf2bfc
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

@ -563,6 +563,11 @@ static const style_tbl_entry_t style_tbl[] = {
DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNGAP, DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNGAP,
DISPID_UNKNOWN DISPID_UNKNOWN
}, },
{
L"column-span",
DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNSPAN,
DISPID_UNKNOWN
},
{ {
L"column-width", L"column-width",
DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNWIDTH, DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNWIDTH,
@ -8870,15 +8875,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnFill(IHTMLCSSStyleDecla
static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columnSpan(IHTMLCSSStyleDeclaration2 *iface, BSTR v) static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columnSpan(IHTMLCSSStyleDeclaration2 *iface, BSTR v)
{ {
CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface);
FIXME("(%p)->(%s)\n", This, debugstr_w(v)); WARN("(%p)->(%s) semi-stub\n", This, debugstr_w(v));
return E_NOTIMPL; return set_style_property(This, STYLEID_COLUMN_SPAN, v);
} }
static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnSpan(IHTMLCSSStyleDeclaration2 *iface, BSTR *p) static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnSpan(IHTMLCSSStyleDeclaration2 *iface, BSTR *p)
{ {
CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface);
FIXME("(%p)->(%p)\n", This, p); WARN("(%p)->(%p) semi-stub\n", This, p);
return E_NOTIMPL; return get_style_property(This, STYLEID_COLUMN_SPAN, p);
} }
static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columns(IHTMLCSSStyleDeclaration2 *iface, BSTR v) static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columns(IHTMLCSSStyleDeclaration2 *iface, BSTR v)

1
dlls/mshtml/htmlstyle.h
View File

@ -84,6 +84,7 @@ typedef enum {
STYLEID_COLUMN_COUNT, STYLEID_COLUMN_COUNT,
STYLEID_COLUMN_FILL, STYLEID_COLUMN_FILL,
STYLEID_COLUMN_GAP, STYLEID_COLUMN_GAP,
STYLEID_COLUMN_SPAN,
STYLEID_COLUMN_WIDTH, STYLEID_COLUMN_WIDTH,
STYLEID_CURSOR, STYLEID_CURSOR,
STYLEID_DIRECTION, STYLEID_DIRECTION,

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

@ -999,6 +999,24 @@ static void test_css_style_declaration2(IHTMLCSSStyleDeclaration2 *css_style)
todo_wine todo_wine
ok(str && !lstrcmpW(str, L"auto"), "columnFill = %s\n", wine_dbgstr_w(str)); ok(str && !lstrcmpW(str, L"auto"), "columnFill = %s\n", wine_dbgstr_w(str));
SysFreeString(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) static void test_body_style(IHTMLStyle *style)