wininet/tests: INTERNET_STATUS_CLOSING_CONNECTION and ..._CONNECTION_CLOSED…

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

wininet/tests: INTERNET_STATUS_CLOSING_CONNECTION and ..._CONNECTION_CLOSED…
e7e4894f · Ge van Geldorp · Alexandre Julliard · b5113654 · e7e4894f
Commit e7e4894f authored Jan 05, 2009 by Ge van Geldorp Committed by Alexandre Julliard Jan 05, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 7 deletions

http.c dlls/wininet/tests/http.c +2 -7

No files found.
--- 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));