server: Clear only returned events in IOCTL_AFD_GET_EVENTS.

Signed-off-by: Zebediah Figura <zfigura@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

server: Clear only returned events in IOCTL_AFD_GET_EVENTS.
683d46a2 · Zebediah Figura · Alexandre Julliard · ad078be4 · 683d46a2 · 683d46a2
Commit 683d46a2 authored May 03, 2022 by Zebediah Figura Committed by Alexandre Julliard May 04, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

sock.c dlls/ws2_32/tests/sock.c +3 -3

sock.c server/sock.c +1 -1

No files found.
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -5659,7 +5659,7 @@ static void test_connect_events(struct event_test_ctx *ctx)
    if (ctx->is_message)
        check_events(ctx, FD_WRITE, 0, 200);
    else
-        check_events_todo(ctx, FD_CONNECT, 0, 200);
+        check_events(ctx, FD_CONNECT, 0, 200);

    closesocket(client);
    closesocket(server);
@@ -5896,7 +5896,7 @@ static void test_read_events(struct event_test_ctx *ctx)
    check_events(ctx, 0, 0, 0);

    select_events(ctx, server, FD_ACCEPT | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE);
-    check_events_todo_event(ctx, FD_READ, FD_WRITE, 200);
+    check_events(ctx, FD_READ, FD_WRITE, 200);
    check_events(ctx, 0, 0, 0);

    ret = sync_recv(server, buffer, 5, 0);
@@ -6111,7 +6111,7 @@ static void test_close_events(struct event_test_ctx *ctx)

    check_events(ctx, 0, 0, 200);
    select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ);
-    check_events_todo_event(ctx, FD_CLOSE, 0, 200);
+    check_events(ctx, FD_CLOSE, 0, 200);

    closesocket(server);
 }

--- a/server/sock.c
+++ b/server/sock.c
@@ -2516,7 +2516,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async )
        for (i = 0; i < ARRAY_SIZE( params.status ); ++i)
            params.status[i] = sock_get_ntstatus( sock->errors[i] );

-        sock->pending_events = 0;
+        sock->pending_events &= ~sock->mask;
        sock_reselect( sock );

        set_reply_data( &params, sizeof(params) );