James Hawkins : urlmon: Fix a few test failures.

[Alexandre Julliard]

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

Author: James Hawkins <jhawkins at codeweavers.com>
Date:   Sun Jun 29 18:21:11 2008 -0500

urlmon: Fix a few test failures.

---

 dlls/urlmon/tests/url.c |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c
index 592eefa..c0e93ec 100644
--- a/dlls/urlmon/tests/url.c
+++ b/dlls/urlmon/tests/url.c
@@ -2194,6 +2194,8 @@ static void test_BindToObject(int protocol, BOOL emul)
         SET_EXPECT(Start);
         if(test_protocol == HTTP_TEST)
             SET_EXPECT(Terminate);
+        if(test_protocol == FILE_TEST)
+            SET_EXPECT(OnProgress_MIMETYPEAVAILABLE);
         SET_EXPECT(UnlockRequest);
     }else {
         if(test_protocol == HTTP_TEST) {
@@ -2260,6 +2262,8 @@ static void test_BindToObject(int protocol, BOOL emul)
         CHECK_CALLED(Start);
         if(test_protocol == HTTP_TEST)
             CHECK_CALLED(Terminate);
+        if(test_protocol == FILE_TEST)
+            CLEAR_CALLED(OnProgress_MIMETYPEAVAILABLE); /* not called in IE7 */
         CHECK_CALLED(UnlockRequest);
     }else {
         if(test_protocol == HTTP_TEST) {
@@ -2302,9 +2306,13 @@ static void test_BindToObject(int protocol, BOOL emul)
     if(test_protocol != HTTP_TEST || emul || urls[test_protocol] == SHORT_RESPONSE_URL) {
         ok(IMoniker_Release(mon) == 0, "mon should be destroyed here\n");
         ok(IBindCtx_Release(bctx) == 0, "bctx should be destroyed here\n");
-    }else todo_wine {
-        ok(IMoniker_Release(mon) == 0, "mon should be destroyed here\n");
-        ok(IBindCtx_Release(bctx) == 0, "bctx should be destroyed here\n");
+    }else {
+        todo_wine ok(IMoniker_Release(mon) == 0, "mon should be destroyed here\n");
+
+        if(bindf & BINDF_ASYNCHRONOUS)
+            ok(IBindCtx_Release(bctx) != 0, "bctx should not be destroyed here\n");
+        else
+            todo_wine ok(IBindCtx_Release(bctx) == 0, "bctx should be destroyed here\n");
     }
 
     if(emul)