Module: wine Branch: master Commit: 433f82c74e5b203d35b00f015841ec2b448542eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=433f82c74e5b203d35b00f0158...
Author: Jacek Caban jacek@codeweavers.com Date: Mon Feb 8 17:52:17 2016 +0100
mshtml/tests: Fixed style tests on IE6.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/mshtml/tests/style.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 94ccc76..3da1a70 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2935,14 +2935,17 @@ static void test_current_style(IHTMLCurrentStyle *current_style) IHTMLCurrentStyle3_Release(current_style3);
hres = IHTMLCurrentStyle_QueryInterface(current_style, &IID_IHTMLCurrentStyle4, (void**)¤t_style4); - ok(hres == S_OK, "Could not get IHTMLCurrentStyle4 iface: %08x\n", hres); - - hres = IHTMLCurrentStyle4_get_minWidth(current_style4, &v); - ok(hres == S_OK, "get_minWidth failed: %08x\n", hres); - ok(V_VT(&v) == VT_BSTR, "V_VT(minWidth) = %d\n", V_VT(&v)); - VariantClear(&v); + ok(hres == S_OK || broken(hres == E_NOINTERFACE), "Could not get IHTMLCurrentStyle4 iface: %08x\n", hres); + if(SUCCEEDED(hres)) { + hres = IHTMLCurrentStyle4_get_minWidth(current_style4, &v); + ok(hres == S_OK, "get_minWidth failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(minWidth) = %d\n", V_VT(&v)); + VariantClear(&v);
- IHTMLCurrentStyle4_Release(current_style4); + IHTMLCurrentStyle4_Release(current_style4); + }else { + win_skip("IHTMLCurrentStyle4 not supported.\n"); + } }
static const char basic_test_str[] = "<html><body><div id="divid"></div/</body></html>";