[PATCH 2/5] server: Return STATUS_INVALID_PARAMETER when trying to call connect() on a socket with an active ConnectEx() async.
Zebediah Figura
z.figura12 at gmail.com
Thu Jun 10 12:36:36 CDT 2021
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/ws2_32/tests/sock.c | 2 +-
server/sock.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index 6cfdced79dc..95bf7a12830 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -10312,7 +10312,7 @@ static void test_connecting_socket(void)
overlapped.InternalHigh = 0xdeadbeef;
ret = pConnectEx(client, (struct sockaddr *)&invalid_addr, sizeof(invalid_addr), NULL, 0, &size, &overlapped);
ok(!ret, "got %d\n", ret);
- todo_wine ok(WSAGetLastError() == WSAEINVAL, "got %u\n", WSAGetLastError());
+ ok(WSAGetLastError() == WSAEINVAL, "got %u\n", WSAGetLastError());
ok((NTSTATUS)overlapped.Internal == STATUS_PENDING, "got status %#x\n", (NTSTATUS)overlapped.Internal);
todo_wine ok(overlapped.InternalHigh == 0xdeadbeef, "got size %Iu\n", overlapped.InternalHigh);
diff --git a/server/sock.c b/server/sock.c
index f2450fcc541..cae0c2ff32b 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -1780,7 +1780,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async )
if (sock->connect_req)
{
- set_error( params->synchronous ? STATUS_INVALID_PARAMETER : STATUS_CONNECTION_ACTIVE );
+ set_error( STATUS_INVALID_PARAMETER );
return 0;
}
--
2.30.2
More information about the wine-devel
mailing list