Zebediah Figura : ws2_32: Use NtStatusToWSAError() in WSAGetOverlappedResult().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5a8dc6cd2edfdc90fe655d14d42a07f8709c43bc
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=5a8dc6cd2edfdc90fe655d14d...

Author: Zebediah Figura <z.figura12(a)gmail.com>
Date:   Thu May  6 17:54:06 2021 -0500

ws2_32: Use NtStatusToWSAError() in WSAGetOverlappedResult().

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

---

 dlls/ws2_32/socket.c     |  2 +-
 dlls/ws2_32/tests/sock.c | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index ed7218f9fb7..273a6b159f4 100644
--- 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;
 }
 
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index 627c12b8a1f..a84f05becbf 100644
--- 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());
             }
         }
     }