wine-commits August 2018

wine-commits@winehq.org

2 participants
618 discussions

Jacek Caban : mshtml: Introduce get_current_style_property helper.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: cccabee8b20afa73cef4b492a5fbed7fff3aff3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cccabee8b20afa73cef4b492… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 29 14:09:41 2018 +0200 mshtml: Introduce get_current_style_property helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlcurstyle.c | 59 +++++++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cccabee8b20afa73cef4…

1 0

Jacek Caban : mshtml: Skip var_to_nsstyle fixups in IE9+ mode.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 1f122a29d97b6a1986d089fd42cef2b8b97a1949 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f122a29d97b6a1986d089fd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 29 14:09:28 2018 +0200 mshtml: Skip var_to_nsstyle fixups in IE9+ mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 10 +++++----- dlls/mshtml/tests/style.c | 40 +++------------------------------------- 2 files changed, 8 insertions(+), 42 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 5c48a24..7fa126d 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -523,7 +523,7 @@ static HRESULT set_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_ return S_OK; } -static HRESULT var_to_styleval(const VARIANT *v, styleid_t sid, WCHAR *buf, const WCHAR **ret) +static HRESULT var_to_styleval(HTMLStyle *style, const VARIANT *v, styleid_t sid, WCHAR *buf, const WCHAR **ret) { switch(V_VT(v)) { case VT_NULL: @@ -539,7 +539,7 @@ static HRESULT var_to_styleval(const VARIANT *v, styleid_t sid, WCHAR *buf, cons return S_OK; case VT_I4: { - unsigned flags = style_tbl[sid].flags; + unsigned flags = dispex_compat_mode(&style->dispex) < COMPAT_MODE_IE9 ? style_tbl[sid].flags : 0; static const WCHAR formatW[] = {'%','d',0}; static const WCHAR hex_formatW[] = {'#','%','0','6','x',0}; @@ -598,7 +598,7 @@ static HRESULT set_style_property_var(HTMLStyle *style, styleid_t sid, VARIANT * WCHAR buf[14]; HRESULT hres; - hres = var_to_styleval(value, sid, buf, &val); + hres = var_to_styleval(style, value, sid, buf, &val); if(FAILED(hres)) return hres; @@ -1202,7 +1202,7 @@ static HRESULT WINAPI HTMLStyle_put_backgroundPositionX(IHTMLStyle *iface, VARIA TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - hres = var_to_styleval(&v, STYLEID_BACKGROUND_POSITION_X, buf, &val); + hres = var_to_styleval(This, &v, STYLEID_BACKGROUND_POSITION_X, buf, &val); if(FAILED(hres)) return hres; @@ -1295,7 +1295,7 @@ static HRESULT WINAPI HTMLStyle_put_backgroundPositionY(IHTMLStyle *iface, VARIA TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - hres = var_to_styleval(&v, STYLEID_BACKGROUND_POSITION_Y, buf, &val); + hres = var_to_styleval(This, &v, STYLEID_BACKGROUND_POSITION, buf, &val); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 1fc26c2..1a22d54 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -107,16 +107,6 @@ static void _test_var_bstr(unsigned line, const VARIANT *v, const char *expect) ok_(__FILE__,line)(!V_BSTR(v), "V_BSTR(v) = %s, expected NULL\n", wine_dbgstr_w(V_BSTR(v))); } -#define test_var_bstr_todo(a,b) _test_var_bstr_todo(__LINE__,a,b) -static void _test_var_bstr_todo(unsigned line, const VARIANT *v, const char *expect) -{ - ok_(__FILE__,line)(V_VT(v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(v)); - if(expect) - todo_wine ok_(__FILE__,line)(!strcmp_wa(V_BSTR(v), expect), "V_BSTR(v) = %s, expected %s\n", wine_dbgstr_w(V_BSTR(v)), expect); - else - todo_wine ok_(__FILE__,line)(!V_BSTR(v), "V_BSTR(v) = %s, expected NULL\n", wine_dbgstr_w(V_BSTR(v))); -} - #define get_elem2_iface(u) _get_elem2_iface(__LINE__,u) static IHTMLElement2 *_get_elem2_iface(unsigned line, IUnknown *unk) { @@ -451,10 +441,7 @@ static void test_style2(IHTMLStyle2 *style2) V_VT(&v) = VT_EMPTY; hres = IHTMLStyle2_get_bottom(style2, &v); ok(hres == S_OK, "get_bottom failed: %08x\n", hres); - if(compat_mode < COMPAT_IE9) - test_var_bstr(&v, "4px"); - else - test_var_bstr_todo(&v, NULL); + test_var_bstr(&v, compat_mode < COMPAT_IE9 ? "4px" : NULL); /* overflowX */ str = (void*)0xdeadbeef; @@ -791,7 +778,6 @@ static void test_body_style(IHTMLStyle *style) if(compat_mode < COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginRight) = %s\n", wine_dbgstr_w(V_BSTR(&v))); else - todo_wine ok(!V_BSTR(&v), "mariginRight = %s\n", wine_dbgstr_w(V_BSTR(&v))); V_VT(&v) = VT_NULL; @@ -812,7 +798,6 @@ static void test_body_style(IHTMLStyle *style) if(compat_mode < COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginBottom) = %s\n", wine_dbgstr_w(V_BSTR(&v))); else - todo_wine ok(!V_BSTR(&v), "mariginBottom = %s\n", wine_dbgstr_w(V_BSTR(&v))); V_VT(&v) = VT_NULL; @@ -833,7 +818,6 @@ static void test_body_style(IHTMLStyle *style) if(compat_mode < COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginLeft) = %s\n", wine_dbgstr_w(V_BSTR(&v))); else - todo_wine ok(!V_BSTR(&v), "mariginLeft = %s\n", wine_dbgstr_w(V_BSTR(&v))); str = (void*)0xdeadbeef; @@ -994,7 +978,6 @@ static void test_body_style(IHTMLStyle *style) if(compat_mode < COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), "12px"), "fontSize = %s\n", wine_dbgstr_w(V_BSTR(&v))); else - todo_wine ok(!V_BSTR(&v), "fontSize = %s\n", wine_dbgstr_w(V_BSTR(&v))); V_VT(&v) = VT_NULL; @@ -1194,23 +1177,18 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_get_width(style, &v); ok(hres == S_OK, "get_width failed: %08x\n", hres); - if(compat_mode < COMPAT_IE9) - test_var_bstr(&v, "100px"); - else - test_var_bstr_todo(&v, "auto"); + test_var_bstr(&v, compat_mode < COMPAT_IE9 ? "100px" : "auto"); VariantClear(&v); l = 0xdeadbeef; hres = IHTMLStyle_get_pixelWidth(style, &l); ok(hres == S_OK, "get_pixelWidth failed: %08x\n", hres); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(l == (compat_mode < COMPAT_IE9 ? 100 : 0), "pixelWidth = %d\n", l); V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_width(style, &v); ok(hres == S_OK, "get_width failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), compat_mode < COMPAT_IE9 ? "100px" : "auto"), "V_BSTR(v)=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -1293,7 +1271,6 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_get_marginTop(style, &v); ok(hres == S_OK, "get_marginTop failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(marginTop) = %d\n", V_VT(&v)); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), compat_mode < COMPAT_IE9 ? "5px" : "6px"), "V_BSTR(marginTop) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -1606,20 +1583,17 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_get_height(style, &v); ok(hres == S_OK, "get_height failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), compat_mode < COMPAT_IE9 ? "64px" : "50px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); hres = IHTMLStyle_get_posHeight(style, &f); ok(hres == S_OK, "get_posHeight failed: %08x\n", hres); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(f == (compat_mode < COMPAT_IE9 ? 64.0 : 50), "expected 64.0 got %f\n", f); l = 0xdeadbeef; hres = IHTMLStyle_get_pixelHeight(style, &l); ok(hres == S_OK, "get_pixelHeight failed: %08x\n", hres); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(l == (compat_mode < COMPAT_IE9 ? 64 : 50), "pixelHeight = %d\n", l); str = (void*)0xdeadbeef; @@ -1669,7 +1643,6 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_get_verticalAlign(style, &v); ok(hres == S_OK, "get_verticalAlign failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), compat_mode < COMPAT_IE9 ? "100px" : "middle"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -1708,7 +1681,6 @@ static void test_body_style(IHTMLStyle *style) if(compat_mode < COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), "6px"), "textIndent = %s\n", wine_dbgstr_w(V_BSTR(&v))); else - todo_wine ok(!V_BSTR(&v), "textIndent = %s\n", wine_dbgstr_w(V_BSTR(&v))); str = (void*)0xdeadbeef; @@ -2002,7 +1974,6 @@ static void test_body_style(IHTMLStyle *style) if(compat_mode < COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), "6px"), "paddingTop = %s\n", wine_dbgstr_w(V_BSTR(&v))); else - todo_wine ok(!V_BSTR(&v), "paddingTop = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -2022,7 +1993,6 @@ static void test_body_style(IHTMLStyle *style) if(compat_mode < COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), "6px"), "paddingRight = %s\n", wine_dbgstr_w(V_BSTR(&v))); else - todo_wine ok(!V_BSTR(&v), "paddingRight = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -2042,7 +2012,6 @@ static void test_body_style(IHTMLStyle *style) if(compat_mode < COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), "6px"), "paddingBottom = %s\n", wine_dbgstr_w(V_BSTR(&v))); else - todo_wine ok(!V_BSTR(&v), "paddingBottom = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -2979,10 +2948,7 @@ static void test_current_style(IHTMLCurrentStyle *current_style) hres = IHTMLCurrentStyle_get_verticalAlign(current_style, &v); ok(hres == S_OK, "get_verticalAlign failed: %08x\n", hres); - if(compat_mode < COMPAT_IE9) - test_var_bstr(&v, "100px"); - else - test_var_bstr_todo(&v, "middle"); + test_var_bstr(&v, compat_mode < COMPAT_IE9 ? "100px" : "middle"); VariantClear(&v); hres = IHTMLCurrentStyle_get_marginRight(current_style, &v);

1 0

Jacek Caban : mshtml: Skip set_style_property fixups in IE9+ mode.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: ec13283af2af8e88872d4d31e2dee6aeebabe280 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec13283af2af8e88872d4d31… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 29 14:09:15 2018 +0200 mshtml: Skip set_style_property fixups in IE9+ mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 5 +++-- dlls/mshtml/tests/style.c | 42 +++--------------------------------------- 2 files changed, 6 insertions(+), 41 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 31d38c8..5c48a24 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -565,7 +565,7 @@ static inline HRESULT set_style_property(HTMLStyle *style, styleid_t sid, const WCHAR *val = NULL; HRESULT hres; - if(value && *value) { + if(value && *value && dispex_compat_mode(&style->dispex) < COMPAT_MODE_IE9) { unsigned flags = style_tbl[sid].flags; if(style_tbl[sid].allowed_values) { @@ -4780,7 +4780,8 @@ HRESULT HTMLStyle_Create(HTMLElement *elem, HTMLStyle **ret) nsIDOMCSSStyleDeclaration_AddRef(nsstyle); - init_dispex(&style->dispex, (IUnknown*)&style->IHTMLStyle_iface, &HTMLStyle_dispex); + init_dispex_with_compat_mode(&style->dispex, (IUnknown*)&style->IHTMLStyle_iface, &HTMLStyle_dispex, + dispex_compat_mode(&elem->node.event_target.dispex)); *ret = style; return S_OK; diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 12877e9..1fc26c2 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -284,7 +284,6 @@ static void _test_border_styles(unsigned line, IHTMLStyle *pStyle, BSTR Name) if(compat_mode < COMPAT_IE9) ok_(__FILE__,line) (FAILED(hres), "invalid value passed.\n"); else - todo_wine ok_(__FILE__,line) (hres == S_OK, "invalid value returned: %08x\n", hres); VariantClear(&arg); @@ -364,21 +363,6 @@ static void _test_text_decoration(unsigned line, IHTMLStyle *style, const char * SysFreeString(str); } -#define test_text_decoration_todo(a,b) _test_text_decoration_todo(__LINE__,a,b) -static void _test_text_decoration_todo(unsigned line, IHTMLStyle *style, const char *exdec) -{ - BSTR str; - HRESULT hres; - - hres = IHTMLStyle_get_textDecoration(style, &str); - ok_(__FILE__,line)(hres == S_OK, "get_textDecoration failed: %08x\n", hres); - if(exdec) - todo_wine ok_(__FILE__,line)(!strcmp_wa(str, exdec), "textDecoration = %s, expected %s\n", wine_dbgstr_w(str), exdec); - else - todo_wine ok_(__FILE__,line)(!str, "textDecoration = %s, expected NULL\n", wine_dbgstr_w(str)); - SysFreeString(str); -} - static void test_set_csstext(IHTMLStyle *style) { VARIANT v; @@ -639,10 +623,7 @@ static void test_style5(IHTMLStyle5 *style5) hres = IHTMLStyle5_get_minWidth(style5, &v); ok(hres == S_OK, "get_minWidth failed: %08x\n", hres); - if(compat_mode < COMPAT_IE9) - test_var_bstr(&v, "10px"); - else - test_var_bstr_todo(&v, "10%"); + test_var_bstr(&v, compat_mode < COMPAT_IE9 ? "10px" : "10%"); VariantClear(&v); hres = IHTMLStyle5_put_minWidth(style5, vdefault); @@ -717,10 +698,7 @@ static void test_style5(IHTMLStyle5 *style5) hres = IHTMLStyle5_get_maxHeight(style5, &v); ok(hres == S_OK, "get_maxHeight failed: %08x\n", hres); - if(compat_mode < COMPAT_IE9) - test_var_bstr(&v, "100px"); - else - test_var_bstr_todo(&v, "70%"); + test_var_bstr(&v, compat_mode < COMPAT_IE9 ? "100px" : "70%"); VariantClear(&v); hres = IHTMLStyle5_put_maxHeight(style5, vdefault); @@ -873,7 +851,6 @@ static void test_body_style(IHTMLStyle *style) str = a2bstr("test"); hres = IHTMLStyle_put_fontWeight(style, str); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), "put_fontWeight failed: %08x\n", hres); SysFreeString(str); @@ -971,7 +948,6 @@ static void test_body_style(IHTMLStyle *style) str = a2bstr("test"); hres = IHTMLStyle_put_fontVariant(style, str); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), "fontVariant failed: %08x\n", hres); SysFreeString(str); @@ -1141,7 +1117,6 @@ static void test_body_style(IHTMLStyle *style) str = a2bstr("invalid"); hres = IHTMLStyle_put_textDecoration(style, str); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), "put_textDecoration failed: %08x\n", hres); SysFreeString(str); @@ -1158,14 +1133,10 @@ static void test_body_style(IHTMLStyle *style) str = a2bstr("invalid"); hres = IHTMLStyle_put_textDecoration(style, str); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), "put_textDecoration failed: %08x\n", hres); SysFreeString(str); - if(compat_mode < COMPAT_IE9) - test_text_decoration(style, NULL); - else - test_text_decoration_todo(style, "blink"); + test_text_decoration(style, compat_mode < COMPAT_IE9 ? NULL : "blink"); hres = IHTMLStyle_put_textDecoration(style, sDefault); ok(hres == S_OK, "put_textDecoration failed: %08x\n", hres); @@ -1799,7 +1770,6 @@ static void test_body_style(IHTMLStyle *style) str = a2bstr("test"); hres = IHTMLStyle_put_fontStyle(style, str); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), "put_fontStyle failed: %08x\n", hres); SysFreeString(str); @@ -1832,7 +1802,6 @@ static void test_body_style(IHTMLStyle *style) str = a2bstr("test"); hres = IHTMLStyle_put_overflow(style, str); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), "put_overflow failed: %08x\n", hres); SysFreeString(str); @@ -2111,7 +2080,6 @@ static void test_body_style(IHTMLStyle *style) if(compat_mode < COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), "10px"), "paddingLeft = %s\n", wine_dbgstr_w(V_BSTR(&v))); else - todo_wine ok(!V_BSTR(&v), "paddingLeft = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -2124,7 +2092,6 @@ static void test_body_style(IHTMLStyle *style) str = a2bstr("invalid"); hres = IHTMLStyle_put_backgroundRepeat(style, str); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), "put_backgroundRepeat failed: %08x\n", hres); SysFreeString(str); @@ -2410,7 +2377,6 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_get_borderRightWidth(style, &v); ok(hres == S_OK, "get_borderRightWidth: %08x\n", hres); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), compat_mode < COMPAT_IE9 ? "10px" : "1px"), "borderRightWidth = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -2431,7 +2397,6 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_get_borderBottomWidth(style, &v); ok(hres == S_OK, "get_borderBottomWidth: %08x\n", hres); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), compat_mode < COMPAT_IE9 ? "10px" : "1px"), "borderBottomWidth = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -2452,7 +2417,6 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_get_borderLeftWidth(style, &v); ok(hres == S_OK, "get_borderLeftWidth: %08x\n", hres); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), compat_mode < COMPAT_IE9 ? "10px" : "1px"), "expected 10px = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v);

1 0

Jacek Caban : mshtml: Move value fixups to set_style_property.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 7732b879016fd6d5fdaa683cbe7ec76f47a515b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7732b879016fd6d5fdaa683c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 29 14:08:57 2018 +0200 mshtml: Move value fixups to set_style_property. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 66 ++++++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 51e4fbe..31d38c8 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -506,32 +506,10 @@ static LPWSTR fix_url_value(LPCWSTR val) static HRESULT set_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, const WCHAR *value) { nsAString str_name, str_value, str_empty; - LPWSTR val = NULL; nsresult nsres; - HRESULT hres = S_OK; - - if(value && *value) { - unsigned flags = style_tbl[sid].flags; - if(flags & ATTR_FIX_PX) - val = fix_px_value(value); - else if(flags & ATTR_FIX_URL) - val = fix_url_value(value); - - if(style_tbl[sid].allowed_values) { - const WCHAR **iter; - for(iter = style_tbl[sid].allowed_values; *iter; iter++) { - if(!strcmpiW(*iter, value)) - break; - } - if(!*iter) { - hres = E_INVALIDARG; - value = emptyW; - } - } - } nsAString_InitDepend(&str_name, style_tbl[sid].name); - nsAString_InitDepend(&str_value, val ? val : value); + nsAString_InitDepend(&str_value, value); nsAString_InitDepend(&str_empty, emptyW); nsres = nsIDOMCSSStyleDeclaration_SetProperty(nsstyle, &str_name, &str_value, &str_empty); @@ -541,9 +519,8 @@ static HRESULT set_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_ nsAString_Finish(&str_name); nsAString_Finish(&str_value); nsAString_Finish(&str_empty); - heap_free(val); - return hres; + return S_OK; } static HRESULT var_to_styleval(const VARIANT *v, styleid_t sid, WCHAR *buf, const WCHAR **ret) @@ -583,6 +560,38 @@ static HRESULT var_to_styleval(const VARIANT *v, styleid_t sid, WCHAR *buf, cons } } +static inline HRESULT set_style_property(HTMLStyle *style, styleid_t sid, const WCHAR *value) +{ + WCHAR *val = NULL; + HRESULT hres; + + if(value && *value) { + unsigned flags = style_tbl[sid].flags; + + if(style_tbl[sid].allowed_values) { + const WCHAR **iter; + for(iter = style_tbl[sid].allowed_values; *iter; iter++) { + if(!strcmpiW(*iter, value)) + break; + } + if(!*iter) { + WARN("invalid value %s\n", debugstr_w(value)); + set_nsstyle_property(style->nsstyle, sid, emptyW); + return E_INVALIDARG; + } + } + + if(flags & ATTR_FIX_PX) + val = fix_px_value(value); + else if(flags & ATTR_FIX_URL) + val = fix_url_value(value); + } + + hres = set_nsstyle_property(style->nsstyle, sid, val ? val : value); + heap_free(val); + return hres; +} + static HRESULT set_style_property_var(HTMLStyle *style, styleid_t sid, VARIANT *value) { const WCHAR *val; @@ -593,12 +602,7 @@ static HRESULT set_style_property_var(HTMLStyle *style, styleid_t sid, VARIANT * if(FAILED(hres)) return hres; - return set_nsstyle_property(style->nsstyle, sid, val); -} - -static inline HRESULT set_style_property(HTMLStyle *style, styleid_t sid, const WCHAR *value) -{ - return set_nsstyle_property(style->nsstyle, sid, value); + return set_style_property(style, sid, val); } static HRESULT get_nsstyle_attr_nsval(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, nsAString *value)

1 0

Guillaume Charifi : iphlpapi/tests: Add tests for GetUdp6Table().
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: d292c4713f21838d152bce007dc7b3c6a4094588 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d292c4713f21838d152bce00… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Mon Aug 27 11:08:38 2018 +0200 iphlpapi/tests: Add tests for GetUdp6Table(). Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 55 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 0d35c26..1be9f3c 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -74,6 +74,7 @@ static DWORD (WINAPI *pGetTcpStatisticsEx)(PMIB_TCPSTATS,DWORD); static DWORD (WINAPI *pGetUdpStatisticsEx)(PMIB_UDPSTATS,DWORD); static DWORD (WINAPI *pGetTcpTable)(PMIB_TCPTABLE,PDWORD,BOOL); static DWORD (WINAPI *pGetUdpTable)(PMIB_UDPTABLE,PDWORD,BOOL); +static DWORD (WINAPI *pGetUdp6Table)(PMIB_UDP6TABLE,PDWORD,BOOL); static DWORD (WINAPI *pGetPerAdapterInfo)(ULONG,PIP_PER_ADAPTER_INFO,PULONG); static DWORD (WINAPI *pGetAdaptersAddresses)(ULONG,ULONG,PVOID,PIP_ADAPTER_ADDRESSES,PULONG); static DWORD (WINAPI *pGetUnicastIpAddressEntry)(MIB_UNICASTIPADDRESS_ROW*); @@ -129,6 +130,7 @@ static void loadIPHlpApi(void) pGetUdpStatisticsEx = (void *)GetProcAddress(hLibrary, "GetUdpStatisticsEx"); pGetTcpTable = (void *)GetProcAddress(hLibrary, "GetTcpTable"); pGetUdpTable = (void *)GetProcAddress(hLibrary, "GetUdpTable"); + pGetUdp6Table = (void *)GetProcAddress(hLibrary, "GetUdp6Table"); pGetPerAdapterInfo = (void *)GetProcAddress(hLibrary, "GetPerAdapterInfo"); pGetAdaptersAddresses = (void *)GetProcAddress(hLibrary, "GetAdaptersAddresses"); pGetUnicastIpAddressEntry = (void *)GetProcAddress(hLibrary, "GetUnicastIpAddressEntry"); @@ -171,6 +173,23 @@ static const char *ntoa( DWORD ip ) return buffer; } +static const char *ntoa6( IN6_ADDR *ip ) +{ + static char buffer[40]; + char *buf = buffer; + unsigned short *p = ip->u.Word; + unsigned int i = 0; + + while (i < 8) + { + if (i > 0) + *buf++ = ':'; + buf += sprintf( buf, "%x", htons(p[i]) ); + i++; + } + return buffer; +} + /* still-to-be-tested 98-only functions: GetUniDirectionalAdapterInfo @@ -2220,6 +2239,41 @@ static void test_ConvertLengthToIpv4Mask(void) ok( mask == INADDR_NONE, "ConvertLengthToIpv4Mask mask value 0x%08x, expected 0x%08x\n", mask, INADDR_NONE ); } +static void test_GetUdp6Table(void) +{ + if (pGetUdp6Table) { + DWORD apiReturn; + ULONG dwSize = 0; + + apiReturn = pGetUdp6Table(NULL, &dwSize, FALSE); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetUdp6Table is not supported\n"); + return; + } + ok(apiReturn == ERROR_INSUFFICIENT_BUFFER, + "GetUdp6Table(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", + apiReturn); + if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { + PMIB_UDP6TABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); + + apiReturn = pGetUdp6Table(buf, &dwSize, FALSE); + ok(apiReturn == NO_ERROR, + "GetUdp6Table(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", + apiReturn); + + if (apiReturn == NO_ERROR && winetest_debug > 1) + { + DWORD i; + trace( "UDP6 table: %u entries\n", buf->dwNumEntries ); + for (i = 0; i < buf->dwNumEntries; i++) + trace( "%u: %s%%%u:%u\n", + i, ntoa6(&buf->table[i].dwLocalAddr), ntohs(buf->table[i].dwLocalScopeId), ntohs(buf->table[i].dwLocalPort) ); + } + HeapFree(GetProcessHeap(), 0, buf); + } + } +} + START_TEST(iphlpapi) { @@ -2248,6 +2302,7 @@ START_TEST(iphlpapi) test_GetUnicastIpAddressEntry(); test_GetUnicastIpAddressTable(); test_ConvertLengthToIpv4Mask(); + test_GetUdp6Table(); freeIPHlpApi(); } }

1 0

Guillaume Charifi : iphlpapi: Implement GetUdp6Table().
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 88e44332fe0129c5c2d6c0f11ed8a6ed95fe1b40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88e44332fe0129c5c2d6c0f1… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Mon Aug 27 11:08:37 2018 +0200 iphlpapi: Implement GetUdp6Table(). Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 30 ++++-- dlls/iphlpapi/ipstats.c | 244 ++++++++++++++++++++++++++++++++++++++++++ dlls/iphlpapi/ipstats.h | 1 + include/iphlpapi.h | 2 + include/udpmib.h | 51 +++++++++ include/ws2ipdef.h | 35 ++++-- 7 files changed, 349 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=88e44332fe0129c5c2d6…

1 0

Louis Lenders : kernel32: Add stub for GetApplicationRestartSettings.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: ad8f45095777839156168e80ff1d8fba5cc265d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad8f45095777839156168e80… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Aug 27 18:26:29 2018 +0200 kernel32: Add stub for GetApplicationRestartSettings. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-windowserrorreporting-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 +++++++++- dlls/kernelbase/kernelbase.spec | 2 +- include/winbase.h | 1 + 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec b/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec index 96511a7..180ffed 100644 --- a/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec +++ b/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec @@ -1,5 +1,5 @@ @ stub GetApplicationRecoveryCallback -@ stub GetApplicationRestartSettings +@ stdcall GetApplicationRestartSettings(long ptr ptr ptr) kernel32.GetApplicationRestartSettings @ stdcall WerRegisterFile(wstr long long) kernel32.WerRegisterFile @ stdcall WerRegisterMemoryBlock(ptr long) kernel32.WerRegisterMemoryBlock @ stdcall WerRegisterRuntimeExceptionModule(wstr ptr) kernel32.WerRegisterRuntimeExceptionModule diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c53276c..f1d75b8 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -543,7 +543,7 @@ @ stdcall GetActiveProcessorCount(long) @ stdcall GetActiveProcessorGroupCount() # @ stub GetApplicationRecoveryCallback -# @ stub GetApplicationRestartSettings +@ stdcall GetApplicationRestartSettings(long ptr ptr ptr) @ stdcall GetAtomNameA(long ptr long) @ stdcall GetAtomNameW(long ptr long) @ stdcall GetBinaryType(str ptr) GetBinaryTypeA diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index b12c37f..7ac7477 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3937,7 +3937,6 @@ BOOL WINAPI CmdBatNotification( BOOL bBatchRunning ) return FALSE; } - /*********************************************************************** * RegisterApplicationRestart (KERNEL32.@) */ @@ -4007,6 +4006,15 @@ HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK return E_FAIL; } +/*********************************************************************** + * GetApplicationRestartSettings (KERNEL32.@) + */ +HRESULT WINAPI GetApplicationRestartSettings(HANDLE process, WCHAR *cmdline, DWORD *size, DWORD *flags) +{ + FIXME("%p, %p, %p, %p)\n", process, cmdline, size, flags); + return E_NOTIMPL; +} + /********************************************************************** * GetNumaHighestNodeNumber (KERNEL32.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 5865ee7..89fad2c 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -414,7 +414,7 @@ # @ stub GetAppDataFolder # @ stub GetAppModelVersion # @ stub GetApplicationRecoveryCallback -# @ stub GetApplicationRestartSettings +@ stdcall GetApplicationRestartSettings(long ptr ptr ptr) kernel32.GetApplicationRestartSettings # @ stub GetApplicationUserModelId # @ stub GetApplicationUserModelIdFromToken # @ stub GetAppliedGPOListInternalA diff --git a/include/winbase.h b/include/winbase.h index aa57dae..8b26308 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2038,6 +2038,7 @@ WINBASEAPI BOOL WINAPI FreeResource(HGLOBAL); WINADVAPI PVOID WINAPI FreeSid(PSID); WINADVAPI BOOL WINAPI GetAce(PACL,DWORD,LPVOID*); WINADVAPI BOOL WINAPI GetAclInformation(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS); +WINBASEAPI HRESULT WINAPI GetApplicationRestartSettings(HANDLE,WCHAR*,DWORD*,DWORD*); WINBASEAPI UINT WINAPI GetAtomNameA(ATOM,LPSTR,INT); WINBASEAPI UINT WINAPI GetAtomNameW(ATOM,LPWSTR,INT); #define GetAtomName WINELIB_NAME_AW(GetAtomName)

1 0

Alistair Leslie-Hughes : ntoskrnl.exe: Add DbgQueryDebugFilterState stub.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 6b3f6657876980f86d09e06bb1f35737acf96d12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b3f6657876980f86d09e06b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 29 01:30:02 2018 +0000 ntoskrnl.exe: Add DbgQueryDebugFilterState stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45655 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 6 ++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 280bf27..e587d05 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3722,3 +3722,9 @@ void WINAPI IoReleaseRemoveLockAndWaitEx(PIO_REMOVE_LOCK lock, PVOID tag, ULONG { FIXME("stub: %p %p %u\n", lock, tag, size); } + +NTSTATUS WINAPI DbgQueryDebugFilterState(ULONG component, ULONG level) +{ + FIXME("stub: %d %d\n", component, level); + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 71ac860..8079114 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -111,7 +111,7 @@ @ varargs DbgPrintEx(long long str) @ stub DbgPrintReturnControlC @ stub DbgPrompt -@ stub DbgQueryDebugFilterState +@ stdcall DbgQueryDebugFilterState(long long) @ stub DbgSetDebugFilterState @ stdcall ExAcquireResourceExclusiveLite(ptr long) @ stub ExAcquireResourceSharedLite diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index d2f84d2..0cd1673 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1367,6 +1367,7 @@ static inline void IoSetCompletionRoutine(IRP *irp, PIO_COMPLETION_ROUTINE routi #define SYMBOLIC_LINK_QUERY 0x0001 #define SYMBOLIC_LINK_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x1) +NTSTATUS WINAPI DbgQueryDebugFilterState(ULONG, ULONG); void WINAPI ExAcquireFastMutexUnsafe(PFAST_MUTEX); PVOID WINAPI ExAllocatePool(POOL_TYPE,SIZE_T); PVOID WINAPI ExAllocatePoolWithQuota(POOL_TYPE,SIZE_T);

1 0

Francois Gouget : testbot: Detect the TestBot scripts usage errors in LogUtils.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: tools Branch: master Commit: 62f3f66df03a8afb36d42dead8e3f4e03759279e URL: https://source.winehq.org/git/tools.git/?a=commit;h=62f3f66df03a8afb36d42de… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Aug 26 10:18:00 2018 +0200 testbot: Detect the TestBot scripts usage errors in LogUtils. They indicate a TestBot error obviously. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index a9ab20b..17b9093 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -119,7 +119,11 @@ sub GetLogLineCategory($) { return "diag"; } - if ($Line =~ /^BotError:/ or + if (# TestBot script error messages + $Line =~ /^[a-zA-Z.]+:error: / or + # TestBot error + $Line =~ /^BotError:/ or + # X errors $Line =~ /^X Error of failed request: / or $Line =~ / opcode of failed request: /) {

1 0

Francois Gouget : testbot: Fix detection of new exceptions and too much data errors.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: tools Branch: master Commit: 2c997c0003c54cf2fcb9751fe843373648e60ddb URL: https://source.winehq.org/git/tools.git/?a=commit;h=2c997c0003c54cf2fcb9751… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Aug 26 10:17:54 2018 +0200 testbot: Fix detection of new exceptions and too much data errors. The address of the crashing code changes with each patch and should thus be ignored. The exact amount of data printed does not change the error. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 19a39aa..a9ab20b 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -756,6 +756,12 @@ sub _GetLineKey($) # Remove the line number $Line =~ s/^([_a-z0-9]+\.c:)\d+:( Test (?:failed|succeeded inside todo block): )/$1$2/; + # Remove the crash code address: it changes whenever the test is recompiled + $Line =~ s/^(Unhandled exception: .* code) $0x[0-9a-fA-F]{8,16}$\.$/$1/; + + # The exact amount of data printed does not change the error + $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$[0-9]+ bytes$$/$1/; + # Note: Only the 'done (258)' lines are reported as errors and they are # modified by GetLogErrors() so that they no longer contain the pid. # So there is no need to remove the pid from the done lines.

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2018