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

This commit is contained in:
Ge van Geldorp 2009-01-05 01:00:09 +01:00 committed by Alexandre Julliard
parent b511365423
commit e7e4894f2a
1 changed files with 2 additions and 7 deletions

View File

@ -363,8 +363,6 @@ static void InternetReadFile_test(int flags)
CHECK_NOTIFIED2(INTERNET_STATUS_REQUEST_SENT, 2); CHECK_NOTIFIED2(INTERNET_STATUS_REQUEST_SENT, 2);
CHECK_NOTIFIED2(INTERNET_STATUS_RECEIVING_RESPONSE, 2); CHECK_NOTIFIED2(INTERNET_STATUS_RECEIVING_RESPONSE, 2);
CHECK_NOTIFIED2(INTERNET_STATUS_RESPONSE_RECEIVED, 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); CHECK_NOTIFIED(INTERNET_STATUS_REDIRECT);
if (flags & INTERNET_FLAG_ASYNC) if (flags & INTERNET_FLAG_ASYNC)
CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE);
@ -411,8 +409,6 @@ static void InternetReadFile_test(int flags)
length = 100; length = 100;
trace("Entering Query loop\n"); trace("Entering Query loop\n");
SET_EXPECT(INTERNET_STATUS_CLOSING_CONNECTION);
SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED);
while (TRUE) while (TRUE)
{ {
if (flags & INTERNET_FLAG_ASYNC) if (flags & INTERNET_FLAG_ASYNC)
@ -450,9 +446,8 @@ static void InternetReadFile_test(int flags)
if (length == 0) if (length == 0)
break; break;
} }
/* WinXP does not send, but Win98 does */ todo_wine CHECK_NOTIFIED2(INTERNET_STATUS_CLOSING_CONNECTION, 2);
CLEAR_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); todo_wine CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTION_CLOSED, 2);
CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED);
abort: abort:
trace("aborting\n"); trace("aborting\n");
SET_EXPECT2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); SET_EXPECT2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0));