Zebediah Figura : ws2_32/tests: Wait for AFD_POLL_RESET in test_get_events_reset().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2ca895cb5f5a82057e6babfb9b1e810bc284829a
URL:    https://gitlab.winehq.org/wine/wine/-/commit/2ca895cb5f5a82057e6babfb9b1e810...

Author: Zebediah Figura 
Date:   Sat Jul 22 21:24:10 2023 -0500

ws2_32/tests: Wait for AFD_POLL_RESET in test_get_events_reset().

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54113

---

dlls/ws2_32/tests/afd.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c
index b856caee853..b011c0da69f 100644
--- a/dlls/ws2_32/tests/afd.c
+++ b/dlls/ws2_32/tests/afd.c
@@ -2058,17 +2058,20 @@ static void test_get_events_reset(void)

tcp_socketpair(&client, &server);

-    ret = WSAEventSelect(client, event, FD_ACCEPT | FD_CONNECT | FD_CLOSE | FD_OOB | FD_READ | FD_WRITE);
+    ret = WSAEventSelect(client, event, FD_ACCEPT | FD_CLOSE | FD_OOB | FD_READ);
     ok(!ret, "got error %lu\n", GetLastError());

close_with_rst(server);

+    ret = WaitForSingleObject(event, 1000);
+    ok(!ret, "got %d\n", ret);
+
     memset(&params, 0xcc, sizeof(params));
     memset(&io, 0xcc, sizeof(io));
     ret = NtDeviceIoControlFile((HANDLE)client, NULL, NULL, NULL, &io,
             IOCTL_AFD_GET_EVENTS, NULL, 0, &params, sizeof(params));
     ok(!ret, "got %#x\n", ret);
-    ok(params.flags == (AFD_POLL_RESET | AFD_POLL_CONNECT | AFD_POLL_WRITE), "got flags %#x\n", params.flags);
+    ok(params.flags == AFD_POLL_RESET, "got flags %#x\n", params.flags);
     for (i = 0; i < ARRAY_SIZE(params.status); ++i)
         ok(!params.status[i], "got status[%u] %#x\n", i, params.status[i]);

@@ -2076,17 +2079,21 @@ static void test_get_events_reset(void)

tcp_socketpair(&client, &server);

-    ret = WSAEventSelect(server, event, FD_ACCEPT | FD_CONNECT | FD_CLOSE | FD_OOB | FD_READ | FD_WRITE);
+    ResetEvent(event);
+    ret = WSAEventSelect(server, event, FD_ACCEPT | FD_CLOSE | FD_OOB | FD_READ);
     ok(!ret, "got error %lu\n", GetLastError());

close_with_rst(client);

+    ret = WaitForSingleObject(event, 1000);
+    ok(!ret, "got %d\n", ret);
+
     memset(&params, 0xcc, sizeof(params));
     memset(&io, 0xcc, sizeof(io));
     ret = NtDeviceIoControlFile((HANDLE)server, NULL, NULL, NULL, &io,
             IOCTL_AFD_GET_EVENTS, NULL, 0, &params, sizeof(params));
     ok(!ret, "got %#x\n", ret);
-    ok(params.flags == (AFD_POLL_RESET | AFD_POLL_WRITE), "got flags %#x\n", params.flags);
+    ok(params.flags == AFD_POLL_RESET, "got flags %#x\n", params.flags);
     for (i = 0; i < ARRAY_SIZE(params.status); ++i)
         ok(!params.status[i], "got status[%u] %#x\n", i, params.status[i]);