Zebediah Figura : server: Also clear pending events in set_socket_event.

Alexandre Julliard julliard at winehq.org
Mon May 17 15:45:29 CDT 2021


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

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Sun May 16 21:45:50 2021 -0500

server: Also clear pending events in set_socket_event.

In particular, prevent FD_CONNECT from being reported when not selected for.

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 server/sock.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/sock.c b/server/sock.c
index 945895b51a4..565fb4c5a2c 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -1809,7 +1809,10 @@ DECL_HANDLER(set_socket_event)
     old_event = sock->event;
     sock->mask    = req->mask;
     if (req->window)
-        sock->reported_events &= ~req->mask; /* re-enable held events */
+    {
+        sock->pending_events &= ~req->mask;
+        sock->reported_events &= ~req->mask;
+    }
     sock->event   = NULL;
     sock->window  = req->window;
     sock->message = req->msg;




More information about the wine-cvs mailing list