ws2_32: Return success for setting SO_ERROR.

5925a2ee · Paul Gofman · Alexandre Julliard · a8c1d5c1 · 5925a2ee · 5925a2ee
Commit 5925a2ee authored Nov 14, 2022 by Paul Gofman Committed by Alexandre Julliard Nov 15, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

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

sock.c dlls/ws2_32/tests/sock.c +0 -1

No files found.
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -3173,9 +3173,9 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int
        }
        case SO_ERROR:
-            FIXME( "SO_ERROR, stub!\n" );
+            FIXME( "SO_ERROR, stub.\n" );
-            SetLastError( WSAENOPROTOOPT );
+            SetLastError( ERROR_SUCCESS );
-            return -1;
+            return 0;
        case SO_KEEPALIVE:
            if (optlen <= 0 || !optval)

--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -1431,7 +1431,6 @@ static void test_set_getsockopt(void)
    SetLastError(0xdeadbeef);
    i = 1234;
    err = setsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, size);
-    todo_wine
    ok( !err && !WSAGetLastError(),
        "got %d with %d (expected 0 with 0)\n",
        err, WSAGetLastError());