mshtml/tests: Fixed style tests on IE6.

Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

mshtml/tests: Fixed style tests on IE6.
433f82c7 · Jacek Caban · Alexandre Julliard · b35642f5 · 433f82c7
Commit 433f82c7 authored Feb 08, 2016 by Jacek Caban Committed by Alexandre Julliard Feb 09, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 7 deletions

style.c dlls/mshtml/tests/style.c +10 -7

No files found.
--- 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**)&current_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>";