June 2020 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Add IHTMLCSSStyleDeclaration2::columnWidth property semi-stub implementation.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: 1e73766ab1e5b4d56f8f52e4389e0aa1c69e72fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e73766ab1e5b4d56f8f52e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 9 16:15:51 2020 +0200 mshtml: Add IHTMLCSSStyleDeclaration2::columnWidth property semi-stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 13 +++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 348eacc7e0..c327faa0a2 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-width", + DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNWIDTH, + DISPID_UNKNOWN + }, { cursorW, DISPID_IHTMLCSSSTYLEDECLARATION_CURSOR, @@ -8813,15 +8818,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnCount(IHTMLCSSStyleDecl static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columnWidth(IHTMLCSSStyleDeclaration2 *iface, VARIANT v) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + WARN("(%p)->(%s) semi-stub\n", This, debugstr_variant(&v)); + return set_style_property_var(This, STYLEID_COLUMN_WIDTH, &v); } static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnWidth(IHTMLCSSStyleDeclaration2 *iface, VARIANT *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_var(This, STYLEID_COLUMN_WIDTH, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columnGap(IHTMLCSSStyleDeclaration2 *iface, VARIANT v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 25dc12b69f..09b044c84c 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_WIDTH, STYLEID_CURSOR, STYLEID_DIRECTION, STYLEID_DISPLAY, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 1b481354fc..6746cd048a 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -921,6 +921,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"auto"), "columnCount = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); + + V_VT(&v) = VT_ERROR; + hres = IHTMLCSSStyleDeclaration2_get_columnWidth(css_style, &v); + ok(hres == S_OK, "get_columnWidth failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR && !V_BSTR(&v), "columnWidth = %s\n", wine_dbgstr_variant(&v)); + VariantClear(&v); + + V_VT(&v) = VT_I4; + V_I4(&v) = 20; + hres = IHTMLCSSStyleDeclaration2_put_columnWidth(css_style, v); + ok(hres == S_OK, "put_columnWidth failed: %08x\n", hres); + + V_VT(&v) = VT_ERROR; + hres = IHTMLCSSStyleDeclaration2_get_columnWidth(css_style, &v); + ok(hres == S_OK, "get_columnWidth failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR && !V_BSTR(&v), "columnWidth = %s\n", wine_dbgstr_variant(&v)); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(L"20px"); + hres = IHTMLCSSStyleDeclaration2_put_columnWidth(css_style, v); + ok(hres == S_OK, "put_columnWidth failed: %08x\n", hres); + VariantClear(&v); + + V_VT(&v) = VT_ERROR; + hres = IHTMLCSSStyleDeclaration2_get_columnWidth(css_style, &v); + ok(hres == S_OK, "get_columnWidth failed: %08x\n", hres); + 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); } static void test_body_style(IHTMLStyle *style)

1 0

Jacek Caban : mshtml: Add IHTMLCSSStyleDeclaration2::columnCount property semi-stub implementation.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: 06db253e7596a7f4227d5f7e1950cdf353e00779 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06db253e7596a7f4227d5f7e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 9 16:15:44 2020 +0200 mshtml: Add IHTMLCSSStyleDeclaration2::columnCount property semi-stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 13 +++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 43 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index af6a0ce458..348eacc7e0 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -548,6 +548,11 @@ static const style_tbl_entry_t style_tbl[] = { DISPID_A_COLOR, ATTR_HEX_INT }, + { + L"column-count", + DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNCOUNT, + DISPID_UNKNOWN + }, { cursorW, DISPID_IHTMLCSSSTYLEDECLARATION_CURSOR, @@ -8794,15 +8799,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_colorInterpolationFilters(IHT static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columnCount(IHTMLCSSStyleDeclaration2 *iface, VARIANT v) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + WARN("(%p)->(%s) semi-stub\n", This, debugstr_variant(&v)); + return set_style_property_var(This, STYLEID_COLUMN_COUNT, &v); } static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnCount(IHTMLCSSStyleDeclaration2 *iface, VARIANT *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_var(This, STYLEID_COLUMN_COUNT, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columnWidth(IHTMLCSSStyleDeclaration2 *iface, VARIANT v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 662227cd99..25dc12b69f 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -81,6 +81,7 @@ typedef enum { STYLEID_CLEAR, STYLEID_CLIP, STYLEID_COLOR, + STYLEID_COLUMN_COUNT, STYLEID_CURSOR, STYLEID_DIRECTION, STYLEID_DISPLAY, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index e8771838f4..1b481354fc 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -19,7 +19,6 @@ #define COBJMACROS #define CONST_VTABLE -#include <wine/test.h> #include <stdarg.h> #include <stdio.h> @@ -29,6 +28,7 @@ #include "mshtml.h" #include "mshtmhst.h" #include "docobj.h" +#include "wine/test.h" static BOOL is_ie9plus; @@ -831,6 +831,7 @@ static void test_css_style_declaration(IHTMLCSSStyleDeclaration *css_style) static void test_css_style_declaration2(IHTMLCSSStyleDeclaration2 *css_style) { + VARIANT v; BSTR str; HRESULT hres; @@ -889,6 +890,37 @@ static void test_css_style_declaration2(IHTMLCSSStyleDeclaration2 *css_style) ok(hres == S_OK, "get_transition failed: %08x\n", hres); ok(!wcsncmp(str, L"marigin-right 1s", wcslen(L"marigin-right 1s")), "transition = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + + V_VT(&v) = VT_ERROR; + hres = IHTMLCSSStyleDeclaration2_get_columnCount(css_style, &v); + ok(hres == S_OK, "get_columnCount failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR && !V_BSTR(&v), "columnCount = %s\n", wine_dbgstr_variant(&v)); + VariantClear(&v); + + V_VT(&v) = VT_I4; + V_I4(&v) = 2; + hres = IHTMLCSSStyleDeclaration2_put_columnCount(css_style, v); + ok(hres == S_OK, "put_columnCount failed: %08x\n", hres); + + V_VT(&v) = VT_ERROR; + hres = IHTMLCSSStyleDeclaration2_get_columnCount(css_style, &v); + ok(hres == S_OK, "get_columnCount failed: %08x\n", hres); + todo_wine + ok(V_VT(&v) == VT_BSTR && V_BSTR(&v) && !lstrcmpW(V_BSTR(&v), L"2"), "columnCount = %s\n", wine_dbgstr_variant(&v)); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(L"auto"); + hres = IHTMLCSSStyleDeclaration2_put_columnCount(css_style, v); + ok(hres == S_OK, "put_columnCount failed: %08x\n", hres); + VariantClear(&v); + + V_VT(&v) = VT_ERROR; + hres = IHTMLCSSStyleDeclaration2_get_columnCount(css_style, &v); + ok(hres == S_OK, "get_columnCount failed: %08x\n", hres); + todo_wine + ok(V_VT(&v) == VT_BSTR && V_BSTR(&v) && !lstrcmpW(V_BSTR(&v), L"auto"), "columnCount = %s\n", wine_dbgstr_variant(&v)); + VariantClear(&v); } static void test_body_style(IHTMLStyle *style)

1 0

Jacek Caban : mshtml: Use DISPID_UNKNOWN for compat dispids not supported in compat mode.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: b5d0c98857eb4becb7ceafb54bb74c51cad97bad URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5d0c98857eb4becb7ceafb5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 9 16:15:34 2020 +0200 mshtml: Use DISPID_UNKNOWN for compat dispids not supported in compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 845eeb1da1..af6a0ce458 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -342,7 +342,8 @@ typedef struct { static const style_tbl_entry_t style_tbl[] = { { L"animation-name", - DISPID_IHTMLCSSSTYLEDECLARATION2_ANIMATIONNAME + DISPID_IHTMLCSSSTYLEDECLARATION2_ANIMATIONNAME, + DISPID_UNKNOWN }, { backgroundW, @@ -799,11 +800,13 @@ static const style_tbl_entry_t style_tbl[] = { }, { L"transform", - DISPID_IHTMLCSSSTYLEDECLARATION2_TRANSFORM + DISPID_IHTMLCSSSTYLEDECLARATION2_TRANSFORM, + DISPID_UNKNOWN }, { L"transition", - DISPID_IHTMLCSSSTYLEDECLARATION2_TRANSITION + DISPID_IHTMLCSSSTYLEDECLARATION2_TRANSITION, + DISPID_UNKNOWN }, { vertical_alignW,

1 0

Jacek Caban : mshtml: Add IHTMLCSSStyleDeclaration2::columnRuleStyle property semi-stub implementation.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: 647424e4bd4e594ea6bb672a0bf167c6ab741c13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=647424e4bd4e594ea6bb672a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 9 16:16:28 2020 +0200 mshtml: Add IHTMLCSSStyleDeclaration2::columnRuleStyle property semi-stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)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 39f5f0dc11..0159dac75b 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -568,6 +568,11 @@ static const style_tbl_entry_t style_tbl[] = { DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNRULECOLOR, DISPID_UNKNOWN }, + { + L"column-rule-style", + DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNRULESTYLE, + DISPID_UNKNOWN + }, { L"column-span", DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNSPAN, @@ -8936,15 +8941,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnRuleColor(IHTMLCSSStyle static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columnRuleStyle(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_RULE_STYLE, v); } static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnRuleStyle(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_RULE_STYLE, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columnRuleWidth(IHTMLCSSStyleDeclaration2 *iface, VARIANT v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 330b7b1230..5823ccdf00 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -85,6 +85,7 @@ typedef enum { STYLEID_COLUMN_FILL, STYLEID_COLUMN_GAP, STYLEID_COLUMN_RULE_COLOR, + STYLEID_COLUMN_RULE_STYLE, STYLEID_COLUMN_SPAN, STYLEID_COLUMN_WIDTH, STYLEID_CURSOR, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index ca5f634540..cc6c2ec6f9 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1036,6 +1036,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"red"), "columnRuleColor = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); + + str = NULL; + hres = IHTMLCSSStyleDeclaration2_get_columnRuleStyle(css_style, &str); + ok(hres == S_OK, "get_columnRuleStyle failed: %08x\n", hres); + ok(!str, "columnRuleStyle = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = SysAllocString(L"solid"); + hres = IHTMLCSSStyleDeclaration2_put_columnRuleStyle(css_style, str); + ok(hres == S_OK, "put_columnRuleStyle failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLCSSStyleDeclaration2_get_columnRuleStyle(css_style, &str); + ok(hres == S_OK, "get_columnRuleStyle failed: %08x\n", hres); + todo_wine + ok(str && !lstrcmpW(str, L"solid"), "columnRuleStyle = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); } static void test_body_style(IHTMLStyle *style)

1 0

Jacek Caban : mshtml: Expose IHTMLCSSStyleDeclaration2 to scripts.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: 276accf534b17025ad2ea51a2cdbd25c06706e89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=276accf534b17025ad2ea51a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 9 16:17:00 2020 +0200 mshtml: Expose IHTMLCSSStyleDeclaration2 to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 62 +++++++++++++++++++++++++++------------ dlls/mshtml/tests/documentmode.js | 3 ++ 2 files changed, 46 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 022d49993f..0971b22375 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -328,6 +328,7 @@ static const WCHAR *overflow_values[] = { #define ATTR_HEX_INT 0x0008 #define ATTR_REMOVE_COMMA 0x0010 #define ATTR_NO_NULL 0x0020 +#define ATTR_COMPAT_IE10 0x0040 static const WCHAR pxW[] = {'p','x',0}; @@ -343,7 +344,8 @@ static const style_tbl_entry_t style_tbl[] = { { L"animation-name", DISPID_IHTMLCSSSTYLEDECLARATION2_ANIMATIONNAME, - DISPID_UNKNOWN + DISPID_UNKNOWN, + ATTR_COMPAT_IE10 }, { backgroundW, @@ -551,47 +553,56 @@ static const style_tbl_entry_t style_tbl[] = { { L"column-count", DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNCOUNT, - DISPID_UNKNOWN + DISPID_UNKNOWN, + ATTR_COMPAT_IE10 }, { L"column-fill", DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNFILL, - DISPID_UNKNOWN + DISPID_UNKNOWN, + ATTR_COMPAT_IE10 }, { L"column-gap", DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNGAP, - DISPID_UNKNOWN + DISPID_UNKNOWN, + ATTR_COMPAT_IE10 }, { L"column-rule", DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNRULE, - DISPID_UNKNOWN + DISPID_UNKNOWN, + ATTR_COMPAT_IE10 }, { L"column-rule-color", DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNRULECOLOR, - DISPID_UNKNOWN + DISPID_UNKNOWN, + ATTR_COMPAT_IE10 }, { L"column-rule-style", DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNRULESTYLE, - DISPID_UNKNOWN + DISPID_UNKNOWN, + ATTR_COMPAT_IE10 }, { L"column-rule-width", DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNRULEWIDTH, - DISPID_UNKNOWN + DISPID_UNKNOWN, + ATTR_COMPAT_IE10 }, { L"column-span", DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNSPAN, - DISPID_UNKNOWN + DISPID_UNKNOWN, + ATTR_COMPAT_IE10 }, { L"column-width", DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNWIDTH, - DISPID_UNKNOWN + DISPID_UNKNOWN, + ATTR_COMPAT_IE10 }, { cursorW, @@ -846,12 +857,14 @@ static const style_tbl_entry_t style_tbl[] = { { L"transform", DISPID_IHTMLCSSSTYLEDECLARATION2_TRANSFORM, - DISPID_UNKNOWN + DISPID_UNKNOWN, + ATTR_COMPAT_IE10 }, { L"transition", DISPID_IHTMLCSSSTYLEDECLARATION2_TRANSITION, - DISPID_UNKNOWN + DISPID_UNKNOWN, + ATTR_COMPAT_IE10 }, { vertical_alignW, @@ -898,7 +911,7 @@ C_ASSERT(ARRAY_SIZE(style_tbl) == STYLEID_MAX_VALUE); static const WCHAR px_formatW[] = {'%','d','p','x',0}; static const WCHAR emptyW[] = {0}; -static const style_tbl_entry_t *lookup_style_tbl(const WCHAR *name) +static const style_tbl_entry_t *lookup_style_tbl(CSSStyle *style, const WCHAR *name) { int c, i, min = 0, max = ARRAY_SIZE(style_tbl)-1; @@ -906,8 +919,11 @@ static const style_tbl_entry_t *lookup_style_tbl(const WCHAR *name) i = (min+max)/2; c = wcscmp(style_tbl[i].name, name); - if(!c) + if(!c) { + if((style_tbl[i].flags & ATTR_COMPAT_IE10) && dispex_compat_mode(&style->dispex) < COMPAT_MODE_IE10) + return NULL; return style_tbl+i; + } if(c > 0) max = i-1; @@ -3175,7 +3191,7 @@ static HRESULT WINAPI HTMLStyle_removeAttribute(IHTMLStyle *iface, BSTR strAttri TRACE("(%p)->(%s %08x %p)\n", This, debugstr_w(strAttributeName), lFlags, pfSuccess); - style_entry = lookup_style_tbl(strAttributeName); + style_entry = lookup_style_tbl(&This->css_style, strAttributeName); if(!style_entry) { compat_mode_t compat_mode = dispex_compat_mode(&This->css_style.dispex); DISPID dispid; @@ -5037,7 +5053,7 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_getPropertyValue(IHTMLCSSStyleDecl TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), value); - style_entry = lookup_style_tbl(name); + style_entry = lookup_style_tbl(This, name); nsAString_InitDepend(&name_str, style_entry ? style_entry->name : name); nsAString_InitDepend(&value_str, NULL); nsres = nsIDOMCSSStyleDeclaration_GetPropertyValue(This->nsstyle, &name_str, &value_str); @@ -5061,7 +5077,7 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_removeProperty(IHTMLCSSStyleDeclar TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrPropertyName), pbstrPropertyValue); - style_entry = lookup_style_tbl(bstrPropertyName); + style_entry = lookup_style_tbl(This, bstrPropertyName); nsAString_InitDepend(&name_str, style_entry ? style_entry->name : bstrPropertyName); nsAString_Init(&ret_str, NULL); nsres = nsIDOMCSSStyleDeclaration_RemoveProperty(This->nsstyle, &name_str, &ret_str); @@ -5079,7 +5095,7 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_setProperty(IHTMLCSSStyleDeclarati TRACE("(%p)->(%s %s %s)\n", This, debugstr_w(name), debugstr_variant(value), debugstr_variant(priority)); - style_entry = lookup_style_tbl(name); + style_entry = lookup_style_tbl(This, name); hres = var_to_styleval(This, value, style_entry, &value_str); if(FAILED(hres)) return hres; @@ -10166,11 +10182,17 @@ static const IHTMLCSSStyleDeclaration2Vtbl HTMLCSSStyleDeclaration2Vtbl = { HTMLCSSStyleDeclaration2_get_animationFillMode }; +static inline CSSStyle *impl_from_DispatchEx(DispatchEx *dispex) +{ + return CONTAINING_RECORD(dispex, CSSStyle, dispex); +} + static HRESULT CSSStyle_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid) { + CSSStyle *This = impl_from_DispatchEx(dispex); const style_tbl_entry_t *style_entry; - style_entry = lookup_style_tbl(name); + style_entry = lookup_style_tbl(This, name); if(style_entry) { DISPID id = dispex_compat_mode(dispex) >= COMPAT_MODE_IE9 ? style_entry->dispid : style_entry->compat_dispid; @@ -10188,6 +10210,8 @@ void CSSStyle_init_dispex_info(dispex_data_t *info, compat_mode_t mode) { if(mode >= COMPAT_MODE_IE9) dispex_info_add_interface(info, IHTMLCSSStyleDeclaration_tid, NULL); + if(mode >= COMPAT_MODE_IE10) + dispex_info_add_interface(info, IHTMLCSSStyleDeclaration2_tid, NULL); } const dispex_static_data_vtbl_t CSSStyle_dispex_vtbl = { diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index aa60cd4f8e..82b163a13d 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -154,6 +154,8 @@ function test_style_props() { test_exposed("setProperty", v >= 9); test_exposed("removeProperty", v >= 9); test_exposed("background-clip", v >= 9); + test_exposed("msTransform", v >= 9); + test_exposed("transform", v >= 10); style = document.body.currentStyle; @@ -167,6 +169,7 @@ function test_style_props() { test_exposed("setProperty", v >= 9); test_exposed("removeProperty", v >= 9); test_exposed("background-clip", v >= 9); + test_exposed("transform", v >= 10); if(window.getComputedStyle) { style = window.getComputedStyle(document.body);

1 0

Nikolay Sivov : dwrite: Get rid of cmap cache.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: a767467d2e246057242de199e223121d20f881e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a767467d2e246057242de199… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 9 12:14:37 2020 +0300 dwrite: Get rid of cmap cache. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 8 ++---- dlls/dwrite/font.c | 37 +++++++++++++-------------- dlls/dwrite/freetype.c | 60 -------------------------------------------- dlls/dwrite/opentype.c | 4 ++- 4 files changed, 22 insertions(+), 87 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a767467d2e246057242d…

1 0

Jacek Caban : mshtml: Add IHTMLCSSStyleDeclaration2::columnRuleColor property semi-stub implementation.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: fe886e6eedbe57720ccf38a573d9f306bc4b34fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe886e6eedbe57720ccf38a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 9 16:16:19 2020 +0200 mshtml: Add IHTMLCSSStyleDeclaration2::columnRuleColor property semi-stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 13 +++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 19 +++++++++++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 7e49d0b2f8..39f5f0dc11 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-rule-color", + DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNRULECOLOR, + DISPID_UNKNOWN + }, { L"column-span", DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNSPAN, @@ -8917,15 +8922,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnRule(IHTMLCSSStyleDecla static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columnRuleColor(IHTMLCSSStyleDeclaration2 *iface, VARIANT v) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + WARN("(%p)->(%s) semi-stub\n", This, debugstr_variant(&v)); + return set_style_property_var(This, STYLEID_COLUMN_RULE_COLOR, &v); } static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnRuleColor(IHTMLCSSStyleDeclaration2 *iface, VARIANT *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_var(This, STYLEID_COLUMN_RULE_COLOR, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columnRuleStyle(IHTMLCSSStyleDeclaration2 *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 641404afc1..330b7b1230 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_RULE_COLOR, STYLEID_COLUMN_SPAN, STYLEID_COLUMN_WIDTH, STYLEID_CURSOR, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 227196489e..ca5f634540 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1017,6 +1017,25 @@ static void test_css_style_declaration2(IHTMLCSSStyleDeclaration2 *css_style) todo_wine ok(str && !lstrcmpW(str, L"all"), "columnSpan = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + + V_VT(&v) = VT_ERROR; + hres = IHTMLCSSStyleDeclaration2_get_columnRuleColor(css_style, &v); + ok(hres == S_OK, "get_columnRuleColor failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR && !V_BSTR(&v), "columnRuleColor = %s\n", wine_dbgstr_variant(&v)); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(L"red"); + hres = IHTMLCSSStyleDeclaration2_put_columnRuleColor(css_style, v); + ok(hres == S_OK, "put_columnRuleColor failed: %08x\n", hres); + VariantClear(&v); + + V_VT(&v) = VT_ERROR; + hres = IHTMLCSSStyleDeclaration2_get_columnRuleColor(css_style, &v); + ok(hres == S_OK, "get_columnRuleColor failed: %08x\n", hres); + todo_wine + ok(V_VT(&v) == VT_BSTR && V_BSTR(&v) && !lstrcmpW(V_BSTR(&v), L"red"), "columnRuleColor = %s\n", wine_dbgstr_variant(&v)); + VariantClear(&v); } static void test_body_style(IHTMLStyle *style)

1 0

Nikolay Sivov : dwrite: Remove unused field from fontface data structure.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: 1cfa1c6930867bb32e2b78a16b95daac07327958 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cfa1c6930867bb32e2b78a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 9 12:14:36 2020 +0300 dwrite: Remove unused field from fontface data structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 - dlls/dwrite/font.c | 3 --- 2 files changed, 4 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 2d736fdec3..5e6946717b 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -262,7 +262,6 @@ struct dwrite_fontface INT charmap; UINT32 flags; - struct dwrite_fonttable cmap; struct dwrite_fonttable vdmx; struct dwrite_fonttable gasp; struct dwrite_fonttable cpal; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index dbb44327f2..f180ba765b 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -585,8 +585,6 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace5 *iface) heap_free(fontface->cached); } release_scriptshaping_cache(fontface->shaping_cache); - if (fontface->cmap.context) - IDWriteFontFace5_ReleaseFontTable(iface, fontface->cmap.context); if (fontface->vdmx.context) IDWriteFontFace5_ReleaseFontTable(iface, fontface->vdmx.context); if (fontface->gasp.context) @@ -4906,7 +4904,6 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li fontface->refcount = 1; fontface->type = desc->face_type; fontface->file_count = desc->files_number; - fontface->cmap.exists = TRUE; fontface->vdmx.exists = TRUE; fontface->gasp.exists = TRUE; fontface->cpal.exists = TRUE;

1 0

Jacek Caban : mshtml: Add IHTMLCSSStyleDeclaration2::columnRuleWidth property semi-stub implementation.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: 883f45ac0eff47a099813cbe0e5e89ca5406e359 URL: https://source.winehq.org/git/wine.git/?a=commit;h=883f45ac0eff47a099813cbe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 9 16:16:36 2020 +0200 mshtml: Add IHTMLCSSStyleDeclaration2::columnRuleWidth property semi-stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 13 +++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 19 +++++++++++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 0159dac75b..388d200fa3 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -573,6 +573,11 @@ static const style_tbl_entry_t style_tbl[] = { DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNRULESTYLE, DISPID_UNKNOWN }, + { + L"column-rule-width", + DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNRULEWIDTH, + DISPID_UNKNOWN + }, { L"column-span", DISPID_IHTMLCSSSTYLEDECLARATION2_COLUMNSPAN, @@ -8955,15 +8960,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnRuleStyle(IHTMLCSSStyle static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_columnRuleWidth(IHTMLCSSStyleDeclaration2 *iface, VARIANT v) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + WARN("(%p)->(%s) semi-stub\n", This, debugstr_variant(&v)); + return set_style_property_var(This, STYLEID_COLUMN_RULE_WIDTH, &v); } static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_columnRuleWidth(IHTMLCSSStyleDeclaration2 *iface, VARIANT *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_var(This, STYLEID_COLUMN_RULE_WIDTH, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_breakBefore(IHTMLCSSStyleDeclaration2 *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 5823ccdf00..c85e2be9e6 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -86,6 +86,7 @@ typedef enum { STYLEID_COLUMN_GAP, STYLEID_COLUMN_RULE_COLOR, STYLEID_COLUMN_RULE_STYLE, + STYLEID_COLUMN_RULE_WIDTH, STYLEID_COLUMN_SPAN, STYLEID_COLUMN_WIDTH, STYLEID_CURSOR, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index cc6c2ec6f9..f56b68d2b2 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1054,6 +1054,25 @@ static void test_css_style_declaration2(IHTMLCSSStyleDeclaration2 *css_style) todo_wine ok(str && !lstrcmpW(str, L"solid"), "columnRuleStyle = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + + V_VT(&v) = VT_ERROR; + hres = IHTMLCSSStyleDeclaration2_get_columnRuleWidth(css_style, &v); + ok(hres == S_OK, "get_columnRuleWidth failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR && !V_BSTR(&v), "columnRuleWidth = %s\n", wine_dbgstr_variant(&v)); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(L"10px"); + hres = IHTMLCSSStyleDeclaration2_put_columnRuleWidth(css_style, v); + ok(hres == S_OK, "put_columnRuleWidth failed: %08x\n", hres); + VariantClear(&v); + + V_VT(&v) = VT_ERROR; + hres = IHTMLCSSStyleDeclaration2_get_columnRuleWidth(css_style, &v); + ok(hres == S_OK, "get_columnRuleWidth failed: %08x\n", hres); + todo_wine + ok(V_VT(&v) == VT_BSTR && V_BSTR(&v) && !lstrcmpW(V_BSTR(&v), L"10px"), "columnRuleWidth = %s\n", wine_dbgstr_variant(&v)); + VariantClear(&v); } static void test_body_style(IHTMLStyle *style)

1 0

Jacek Caban : mshtml: Add IHTMLCSSStyleDeclaration2::columnFill property semi-stub implementation.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: fe146ac7db7f3c41a29b220620bb24176d9d756b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe146ac7db7f3c41a29b2206… Author: Jacek Caban <jacek(a)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(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)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)

1 0