Piotr Caban : server: Don't reset socket error in IOCTL_AFD_GET_SO_ERROR.

Alexandre Julliard julliard at winehq.org
Mon Jun 13 16:02:17 CDT 2022


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

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Fri Jun 10 17:09:30 2022 +0200

server: Don't reset socket error in IOCTL_AFD_GET_SO_ERROR.

Signed-off-by: Piotr Caban <piotr at codeweavers.com>

---

 server/sock.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/server/sock.c b/server/sock.c
index 439801a8cfa..b11ebddb51d 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -2797,7 +2797,6 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async )
     case IOCTL_AFD_WINE_GET_SO_ERROR:
     {
         int error;
-        socklen_t len = sizeof(error);
         unsigned int i;
 
         if (get_reply_max_size() < sizeof(error))
@@ -2806,12 +2805,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async )
             return;
         }
 
-        if (getsockopt( unix_fd, SOL_SOCKET, SO_ERROR, (char *)&error, &len ) < 0)
-        {
-            set_error( sock_get_ntstatus( errno ) );
-            return;
-        }
-
+        error = sock_error( sock );
         if (!error)
         {
             for (i = 0; i < ARRAY_SIZE( sock->errors ); ++i)




More information about the wine-cvs mailing list