From: Bernhard Übelacker <bernhardu@mailbox.org> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56927 --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 95cb3059022..f5580cab4e3 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1353,7 +1353,7 @@ int WINAPI closesocket( SOCKET s ) return -1; } - if (!socket_list_remove( s )) + if (!socket_list_remove( s ) && !is_valid_socket( s )) { SetLastError( WSAENOTSOCK ); return -1; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8d589c63ea3..de040e07b2d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -14595,10 +14595,16 @@ static void test_valid_handle(void) ok(ret == -1, "got %d\n", ret); ok(WSAGetLastError() == WSAENOTSOCK, "got error %u\n", WSAGetLastError()); - CloseHandle(invalid); - CloseHandle(duplicated); - closesocket(client); - closesocket(server); + ret = closesocket((SOCKET)invalid); + ok(ret == SOCKET_ERROR, "closesocket failed unexpectedly: %d\n", ret); + ret = CloseHandle(invalid); + ok(ret, "CloseHandle failed unexpectedly: %d\n", ret); + ret = closesocket((SOCKET)duplicated); + ok(!ret, "closesocket failed unexpectedly: %d\n", ret); + ret = closesocket(client); + ok(!ret, "closesocket failed unexpectedly: %d\n", ret); + ret = closesocket(server); + ok(!ret, "closesocket failed unexpectedly: %d\n", ret); } static void test_afunix_path( const char *path ) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10051