ws2_32: Return WSAEFAULT instead of WSAEINVAL from WSAStartup() if "data" is NULL.

Signed-off-by: Zebediah Figura <zfigura@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ws2_32: Return WSAEFAULT instead of WSAEINVAL from WSAStartup() if "data" is NULL.
a6cbdb7d · Zebediah Figura · Alexandre Julliard · 5efc6369 · a6cbdb7d · a6cbdb7d
Commit a6cbdb7d authored Feb 01, 2022 by Zebediah Figura Committed by Alexandre Julliard Feb 01, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

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

protocol.c dlls/ws2_32/tests/protocol.c +1 -2

No files found.
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -594,7 +594,7 @@ int WINAPI WSAStartup( WORD version, WSADATA *data )
    if (!LOBYTE(version))
        return WSAVERNOTSUPPORTED;

-    if (!data) return WSAEINVAL;
+    if (!data) return WSAEFAULT;

    num_startup++;
    TRACE( "increasing startup count to %d\n", num_startup );

--- a/dlls/ws2_32/tests/protocol.c
+++ b/dlls/ws2_32/tests/protocol.c
@@ -2880,8 +2880,7 @@ static void test_startup(void)
        ok(WSAGetLastError() == WSANOTINITIALISED, "got error %u\n", WSAGetLastError());

        ret = WSAStartup(tests[i].version, NULL);
-        todo_wine_if (LOBYTE(tests[i].version))
-            ok(ret == (LOBYTE(tests[i].version) ? WSAEFAULT : WSAVERNOTSUPPORTED), "got %d\n", ret);
+        ok(ret == (LOBYTE(tests[i].version) ? WSAEFAULT : WSAVERNOTSUPPORTED), "got %d\n", ret);

        winetest_pop_context();
    }