James Hawkins : urlmon: Fix several failing tests with IE7.

[Alexandre Julliard]

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

Author: James Hawkins <jhawkins(a)codeweavers.com>
Date:   Mon Sep  8 22:18:41 2008 -0500

urlmon: Fix several failing tests with IE7.

---

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

diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c
index f315070..e2cc084 100644
--- a/dlls/urlmon/tests/url.c
+++ b/dlls/urlmon/tests/url.c
@@ -2122,7 +2122,8 @@ static void test_BindToStorage(int protocol, BOOL emul, DWORD t)
                 CHECK_CALLED(OnProgress_CONNECTING);
             }else todo_wine {
                 CHECK_NOT_CALLED(OnProgress_FINDINGRESOURCE);
-                CHECK_NOT_CALLED(OnProgress_CONNECTING);
+                /* IE7 does call this */
+                CLEAR_CALLED(OnProgress_CONNECTING);
             }
         }
         if(test_protocol == HTTP_TEST || test_protocol == FILE_TEST)
@@ -2281,7 +2282,8 @@ static void test_BindToObject(int protocol, BOOL emul)
                 CHECK_CALLED(Obj_OnProgress_CONNECTING);
             }else todo_wine {
                 CHECK_NOT_CALLED(Obj_OnProgress_FINDINGRESOURCE);
-                CHECK_NOT_CALLED(Obj_OnProgress_CONNECTING);
+                /* IE7 does call this */
+                CLEAR_CALLED(Obj_OnProgress_CONNECTING);
             }
         }
         if(test_protocol == HTTP_TEST || test_protocol == FILE_TEST) {
@@ -2383,8 +2385,10 @@ static void test_URLDownloadToFile(DWORD prot, BOOL emul)
             CHECK_CALLED(QueryInterface_IHttpNegotiate2);
             CHECK_CALLED(GetRootSecurityId);
         }
-        if(test_protocol == HTTP_TEST || test_protocol == FILE_TEST)
+        if(test_protocol == FILE_TEST)
             CHECK_CALLED(OnProgress_SENDINGREQUEST);
+        else if(test_protocol == HTTP_TEST)
+            CLEAR_CALLED(OnProgress_SENDINGREQUEST); /* not called by IE7 */
         if(test_protocol == HTTP_TEST)
             CHECK_CALLED(OnResponse);
         CHECK_CALLED(OnProgress_MIMETYPEAVAILABLE);