ws2_32: Use NtStatusToWSAError() in WSAGetOverlappedResult().

Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ws2_32: Use NtStatusToWSAError() in WSAGetOverlappedResult().
5a8dc6cd · Zebediah Figura · Alexandre Julliard · 54a39d57 · 5a8dc6cd · 5a8dc6cd
Commit 5a8dc6cd authored May 06, 2021 by Zebediah Figura Committed by Alexandre Julliard May 07, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 9 deletions

socket.c dlls/ws2_32/socket.c +1 -1

sock.c dlls/ws2_32/tests/sock.c +3 -8

No files found.
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -5737,7 +5737,7 @@ BOOL WINAPI WSAGetOverlappedResult( SOCKET s, LPWSAOVERLAPPED lpOverlapped,
    if ( lpdwFlags )
        *lpdwFlags = lpOverlapped->u.s.Offset;

-    if (status) SetLastError( RtlNtStatusToDosError(status) );
+    SetLastError( NtStatusToWSAError(status) );
    return !status;
 }


--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -8701,14 +8701,9 @@ static void test_WSAGetOverlappedResult(void)
            }
            else
            {
-                todo_wine_if (!NT_SUCCESS(status)
-                        && LOWORD(status) != WSAEINVAL
-                        && status != STATUS_CANCELLED
-                        && status != (0x80070000 | ERROR_IO_INCOMPLETE)
-                        && status != (0xc0070000 | ERROR_IO_INCOMPLETE))
-                    ok(WSAGetLastError() == expect
-                            || (status == (0xc0070000 | ERROR_IO_INCOMPLETE) && WSAGetLastError() == WSAEINVAL), /* < win8 */
-                            "status %#x: expected error %u, got %u\n", status, expect, WSAGetLastError());
+                ok(WSAGetLastError() == expect
+                        || (status == (0xc0070000 | ERROR_IO_INCOMPLETE) && WSAGetLastError() == WSAEINVAL), /* < win8 */
+                        "status %#x: expected error %u, got %u\n", status, expect, WSAGetLastError());
            }
        }
    }