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