James Hawkins : urlmon: Fix a few test failures in IE7.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 75a10719ac123f82cad6c566e3a5a3f91549db08
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=75a10719ac123f82cad6c566e3...

Author: James Hawkins 
Date:   Tue Jun 24 16:53:51 2008 -0500

urlmon: Fix a few test failures in IE7.

---

dlls/urlmon/tests/protocol.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c
index 7aff617..bc666eb 100644
--- a/dlls/urlmon/tests/protocol.c
+++ b/dlls/urlmon/tests/protocol.c
@@ -1342,8 +1342,10 @@ static void test_file_protocol_fail(void)
     SET_EXPECT(GetBindInfo);
     expect_hrResult = MK_E_SYNTAX;
     hres = IInternetProtocol_Start(protocol, wszIndexHtml, &protocol_sink, &bind_info, 0, 0);
-    ok(hres == MK_E_SYNTAX, "Start failed: %08x, expected MK_E_SYNTAX\n", hres);
-    CHECK_CALLED(GetBindInfo);
+    ok(hres == MK_E_SYNTAX ||
+       hres == E_INVALIDARG,
+       "Start failed: %08x, expected MK_E_SYNTAX or E_INVALIDARG\n", hres);
+    CLEAR_CALLED(GetBindInfo); /* GetBindInfo not called in IE7 */

SET_EXPECT(GetBindInfo);
     if(!(bindf & BINDF_FROMURLMON))
@@ -1387,12 +1389,12 @@ static void test_file_protocol_fail(void)
     SET_EXPECT(GetBindInfo);
     hres = IInternetProtocol_Start(protocol, NULL, &protocol_sink, &bind_info, 0, 0);
     ok(hres == E_INVALIDARG, "Start failed: %08x, expected E_INVALIDARG\n", hres);
-    CHECK_CALLED(GetBindInfo);
+    CLEAR_CALLED(GetBindInfo); /* GetBindInfo not called in IE7 */

SET_EXPECT(GetBindInfo);
     hres = IInternetProtocol_Start(protocol, emptyW, &protocol_sink, &bind_info, 0, 0);
     ok(hres == E_INVALIDARG, "Start failed: %08x, expected E_INVALIDARG\n", hres);
-    CHECK_CALLED(GetBindInfo);
+    CLEAR_CALLED(GetBindInfo); /* GetBindInfo not called in IE7 */

IInternetProtocol_Release(protocol);
 }