Jacek Caban : mshtml: Fixed tests on IEs not supporting INewWindowManager.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 47bb0de4bca4e51b5945635c26f9927a6512a91a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=47bb0de4bca4e51b5945635c26...

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Sun Dec 12 18:13:43 2010 +0100

mshtml: Fixed tests on IEs not supporting INewWindowManager.

---

 dlls/mshtml/tests/htmldoc.c |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c
index 9801d68..ed322ba 100644
--- a/dlls/mshtml/tests/htmldoc.c
+++ b/dlls/mshtml/tests/htmldoc.c
@@ -3572,22 +3572,31 @@ static void test_open_window(IHTMLDocument2 *doc)
     SET_EXPECT(EvaluateNewWindow);
 
     hres = IHTMLWindow2_open(window, url, name, NULL, VARIANT_FALSE, &new_window);
-    todo_wine
-    ok(hres == S_OK, "open failed: %08x\n", hres);
-    todo_wine
-    ok(new_window == NULL, "new_window != NULL\n");
+    open_call = FALSE;
+    SysFreeString(url);
+    SysFreeString(name);
 
     todo_wine
     CHECK_CALLED(TranslateUrl);
+
+    if(!called_EvaluateNewWindow) {
+        todo_wine
+        win_skip("INewWindowManager not supported\n");
+        if(SUCCEEDED(hres) && new_window)
+            IHTMLWindow2_Release(new_window);
+        IHTMLWindow2_Release(window);
+        return;
+    }
+
     todo_wine
     CHECK_CALLED(EvaluateNewWindow);
 
-    open_call = FALSE;
-    SysFreeString(url);
-    SysFreeString(name);
+    todo_wine
+    ok(hres == S_OK, "open failed: %08x\n", hres);
+    todo_wine
+    ok(new_window == NULL, "new_window != NULL\n");
 
     IHTMLWindow2_Release(window);
-    SysFreeString(name);
 }
 
 static void test_clear(IHTMLDocument2 *doc)