Ge van Geldorp : wininet/tests: INTERNET_STATUS_CLOSING_CONNECTION and ... _CONNECTION_CLOSED callbacks can appear after ..._REQUEST_COMPLETE.

[Alexandre Julliard]

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

Author: Ge van Geldorp 
Date:   Mon Jan  5 01:00:09 2009 +0100

wininet/tests: INTERNET_STATUS_CLOSING_CONNECTION and  ..._CONNECTION_CLOSED callbacks can appear after ..._REQUEST_COMPLETE.

---

dlls/wininet/tests/http.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c
index de81651..89995bf 100644
--- a/dlls/wininet/tests/http.c
+++ b/dlls/wininet/tests/http.c
@@ -363,8 +363,6 @@ static void InternetReadFile_test(int flags)
     CHECK_NOTIFIED2(INTERNET_STATUS_REQUEST_SENT, 2);
     CHECK_NOTIFIED2(INTERNET_STATUS_RECEIVING_RESPONSE, 2);
     CHECK_NOTIFIED2(INTERNET_STATUS_RESPONSE_RECEIVED, 2);
-    todo_wine CHECK_NOTIFIED2(INTERNET_STATUS_CLOSING_CONNECTION, 2);
-    todo_wine CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTION_CLOSED, 2);
     CHECK_NOTIFIED(INTERNET_STATUS_REDIRECT);
     if (flags & INTERNET_FLAG_ASYNC)
         CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE);
@@ -411,8 +409,6 @@ static void InternetReadFile_test(int flags)
     length = 100;
     trace("Entering Query loop\n");

-    SET_EXPECT(INTERNET_STATUS_CLOSING_CONNECTION);
-    SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED);
     while (TRUE)
     {
         if (flags & INTERNET_FLAG_ASYNC)
@@ -450,9 +446,8 @@ static void InternetReadFile_test(int flags)
         if (length == 0)
             break;
     }
-    /* WinXP does not send, but Win98 does */
-    CLEAR_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION);
-    CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED);
+    todo_wine CHECK_NOTIFIED2(INTERNET_STATUS_CLOSING_CONNECTION, 2);
+    todo_wine CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTION_CLOSED, 2);
 abort:
     trace("aborting\n");
     SET_EXPECT2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0));