[PATCH v3 3/3] server: Don't reset socket error in IOCTL_AFD_GET_SO_ERROR.
Piotr Caban
wine at gitlab.winehq.org
Sat Jun 11 05:59:54 CDT 2022
From: Piotr Caban <piotr at codeweavers.com>
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)
--
GitLab
https://gitlab.winehq.org/wine/wine/-/merge_requests/225
More information about the wine-devel
mailing list