ws2_32: Explicitly return WSAENOTSOCK for a file handle in getsockopt() except SO_OPENTYPE.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51671Signed-off-by: Akihiro Sagawa <sagawa.aki@gmail.com> Signed-off-by: Zebediah Figura <zfigura@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ws2_32: Explicitly return WSAENOTSOCK for a file handle in getsockopt() except SO_OPENTYPE.
ffe20add · Akihiro Sagawa · Alexandre Julliard · 2a45917a · ffe20add · ffe20add
Commit ffe20add authored Aug 24, 2021 by Akihiro Sagawa Committed by Alexandre Julliard Aug 24, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

socket.c dlls/ws2_32/socket.c +7 -0

sock.c dlls/ws2_32/tests/sock.c +2 -2

No files found.
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -1363,6 +1363,13 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl
          debugstr_sockopt(level, optname), debugstr_optval(optval, 0),
          optlen, optlen ? *optlen : 0);

+    if ((level != SOL_SOCKET || optname != SO_OPENTYPE) &&
+        !socket_list_find( s ))
+    {
+        SetLastError( WSAENOTSOCK );
+        return SOCKET_ERROR;
+    }
+
    switch(level)
    {
    case SOL_SOCKET:

--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -11693,8 +11693,8 @@ static void test_sockopt_validity(void)
    };
    static const struct sockopt_validity_test file_handle_tests[] =
    {
-        { -1,                         WSAENOTSOCK,     0,          TRUE },
-        { SO_TYPE,                    WSAENOTSOCK,     0,          TRUE },
+        { -1,                         WSAENOTSOCK                       },
+        { SO_TYPE,                    WSAENOTSOCK                       },
        { SO_OPENTYPE                                                   },
        {}
    };