Zebediah Figura : ws2_32: Use IOCTL_AFD_WINE_GET_SO_ERROR.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: fb3956fcf94397bed53598943a9524520bc23e08
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=fb3956fcf94397bed53598943...

Author: Zebediah Figura 
Date:   Thu Jun 24 00:00:11 2021 -0500

ws2_32: Use IOCTL_AFD_WINE_GET_SO_ERROR.

Signed-off-by: Zebediah Figura 
Signed-off-by: Alexandre Julliard

---

dlls/ws2_32/socket.c     | 41 +----------------------------------------
 dlls/ws2_32/tests/sock.c |  2 --
 2 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index ab111f726a9..b183b85b0b3 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -694,19 +694,6 @@ static inline void release_sock_fd( SOCKET s, int fd )
     close( fd );
 }

-static void _get_sock_errors(SOCKET s, int *events)
-{
-    SERVER_START_REQ( get_socket_event )
-    {
-        req->handle  = wine_server_obj_handle( SOCKET2HANDLE(s) );
-        req->service = FALSE;
-        req->c_event = 0;
-        wine_server_set_reply( req, events, sizeof(int) * FD_MAX_EVENTS );
-        wine_server_call( req );
-    }
-    SERVER_END_REQ;
-}
-
 static int _get_fd_type(int fd)
 {
     int sock_type = -1;
@@ -2236,33 +2223,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
             return 0;

case WS_SO_ERROR:
-        {
-            if ( (fd = get_sock_fd( s, 0, NULL )) == -1)
-                return SOCKET_ERROR;
-            if (getsockopt(fd, SOL_SOCKET, SO_ERROR, optval, (socklen_t *)optlen) != 0 )
-            {
-                SetLastError(wsaErrno());
-                ret = SOCKET_ERROR;
-            }
-            release_sock_fd( s, fd );
-
-            /* The wineserver may have swallowed the error before us */
-            if (!ret && *(int*) optval == 0)
-            {
-                int i, events[FD_MAX_EVENTS];
-                _get_sock_errors(s, events);
-                for (i = 0; i < FD_MAX_EVENTS; i++)
-                {
-                    if(events[i])
-                    {
-                        TRACE("returning SO_ERROR %d from wine server\n", events[i]);
-                        *(int*) optval = events[i];
-                        break;
-                    }
-                }
-            }
-            return ret;
-        }
+            return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_ERROR, optval, optlen );

case WS_SO_LINGER:
         {
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index 7534e75edb3..9f461376853 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -1295,7 +1295,6 @@ todo_wine
     SetLastError(0xdeadbeef);
     i = 4321;
     err = getsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, &size);
-todo_wine
     ok( !err && !WSAGetLastError(),
         "got %d with %d (expected 0 with 0)\n",
         err, WSAGetLastError());
@@ -1306,7 +1305,6 @@ todo_wine
     SetLastError(0xdeadbeef);
     size = 1;
     err = getsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, &size);
-todo_wine
     ok( (err == SOCKET_ERROR) && (WSAGetLastError() == WSAEFAULT),
         "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n",
         err, WSAGetLastError());