server: Return a Win32 error code from IOCTL_AFD_WINE_GET_SO_ERROR.

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

server: Return a Win32 error code from IOCTL_AFD_WINE_GET_SO_ERROR.
026b1920 · Zebediah Figura · Alexandre Julliard · 91e4596b · 026b1920 · 026b1920
Commit 026b1920 authored Jul 05, 2021 by Zebediah Figura Committed by Alexandre Julliard Jul 06, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

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

sock.c server/sock.c +1 -1

No files found.
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -3271,13 +3271,13 @@ static void test_select(void)
        id = 0xdeadbeef;
        ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char *)&id, &len);
        ok(!ret, "getsockopt failed with %d\n", WSAGetLastError());
-        todo_wine ok(id == WSAECONNREFUSED, "got error %u\n", id);
+        ok(id == WSAECONNREFUSED, "got error %u\n", id);

        len = sizeof(id);
        id = 0xdeadbeef;
        ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char *)&id, &len);
        ok(!ret, "getsockopt failed with %d\n", WSAGetLastError());
-        todo_wine ok(id == WSAECONNREFUSED, "got error %u\n", id);
+        ok(id == WSAECONNREFUSED, "got error %u\n", id);

        FD_ZERO_ALL();
        FD_SET(fdWrite, &readfds);
@@ -3307,7 +3307,7 @@ static void test_select(void)
        id = 0xdeadbeef;
        ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char *)&id, &len);
        ok(!ret, "getsockopt failed with %d\n", WSAGetLastError());
-        todo_wine ok(id == WSAECONNREFUSED, "got error %u\n", id);
+        ok(id == WSAECONNREFUSED, "got error %u\n", id);

        FD_ZERO_ALL();
        FD_SET(fdWrite, &readfds);
@@ -6515,13 +6515,13 @@ static void test_WSAPoll(void)
        err = 0xdeadbeef;
        ret = getsockopt(client, SOL_SOCKET, SO_ERROR, (char *)&err, &len);
        ok(!ret, "getsockopt failed with %d\n", WSAGetLastError());
-        todo_wine ok(err == WSAECONNREFUSED, "got error %u\n", err);
+        ok(err == WSAECONNREFUSED, "got error %u\n", err);

        len = sizeof(err);
        err = 0xdeadbeef;
        ret = getsockopt(client, SOL_SOCKET, SO_ERROR, (char *)&err, &len);
        ok(!ret, "getsockopt failed with %d\n", WSAGetLastError());
-        todo_wine ok(err == WSAECONNREFUSED, "got error %u\n", err);
+        ok(err == WSAECONNREFUSED, "got error %u\n", err);

        check_poll_todo(client, POLLWRNORM | POLLHUP | POLLERR);


--- a/server/sock.c
+++ b/server/sock.c
@@ -2587,7 +2587,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async )
            {
                if (sock->errors[i])
                {
-                    error = sock->errors[i];
+                    error = sock_get_error( sock->errors[i] );
                    break;
                }
            }