Correct 2 bugs connected to asynchronous shutdown():

- Cannot call WSAGetOverlappedResult() because completion function destroys the overlapped structure. - ws2_async_cleanup() called twice in case of failure.

Correct 2 bugs connected to asynchronous shutdown():
4577875c · Martin Wilck · Alexandre Julliard · b5fc589f · 4577875c
Commit 4577875c authored Dec 05, 2002 by Martin Wilck Committed by Alexandre Julliard Dec 05, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 6 deletions

socket.c dlls/winsock/socket.c +2 -6

No files found.
--- a/dlls/winsock/socket.c
+++ b/dlls/winsock/socket.c
@@ -1376,15 +1376,11 @@ static int WS2_register_async_shutdown ( SOCKET s, int fd, int type )
    if ( (ret = register_new_async ( &wsa->async )) )
    {
        err = NtStatusToWSAError ( ret );
-        ws2_async_cleanup ( &wsa->async );
        goto out;
    }
    /* Try immediate completion */
-    if ( WSAGetOverlappedResult ( s, ovl, NULL, FALSE, NULL ) )
-        return 0;
-    if ( (err = WSAGetLastError ()) == WSA_IO_INCOMPLETE )
-        return 0;
-    return WSAEINVAL;
+    while ( WaitForSingleObjectEx ( ovl->hEvent, 0, TRUE ) == STATUS_USER_APC );
+    return 0;

 out_close:
    WSACloseEvent ( ovl->hEvent );