server: Avoid reporting POLLOUT on connection failure in poll_single_socket().

Ideally we should be using sock_get_poll_events() and sock_poll_event() instead, but that seems like an overly risky change for this late in code freeze. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51442Signed-off-by: Zebediah Figura <zfigura@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

server: Avoid reporting POLLOUT on connection failure in poll_single_socket().
51e5995d · Zebediah Figura · Alexandre Julliard · 7c037c82 · 51e5995d · 51e5995d
Commit 51e5995d authored Jan 06, 2022 by Zebediah Figura Committed by Alexandre Julliard Jan 07, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

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

sock.c server/sock.c +3 -0

No files found.
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -6830,7 +6830,7 @@ static void test_WSAPoll(void)
        fds[0].events = POLLRDNORM | POLLRDBAND | POLLWRNORM;
        fds[0].revents = 0xdead;
        ret = pWSAPoll(fds, 1, 10000);
-        todo_wine ok(ret == 1, "got %d\n", ret);
+        ok(ret == 1, "got %d\n", ret);
        todo_wine ok(fds[0].revents == (POLLWRNORM | POLLHUP | POLLERR), "got events %#x\n", fds[0].revents);

        len = sizeof(err);

--- a/server/sock.c
+++ b/server/sock.c
@@ -2979,6 +2979,9 @@ static int poll_single_socket( struct sock *sock, int mask )
    if (pollfd.events < 0 || poll( &pollfd, 1, 0 ) < 0)
        return 0;

+    if (sock->state == SOCK_CONNECTING && (pollfd.revents & (POLLERR | POLLHUP)))
+        pollfd.revents &= ~POLLOUT;
+
    if ((mask & AFD_POLL_HUP) && (pollfd.revents & POLLIN) && sock->type == WS_SOCK_STREAM)
    {
        char dummy;