server: Revert b4a1d80a for now.

It breaks too many things. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48357Signed-off-by: Damjan Jovanovic <damjan.jov@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

server: Revert b4a1d80a for now.
37dec9f1 · Damjan Jovanovic · Alexandre Julliard · 5b96ed02 · 37dec9f1 · 37dec9f1
Commit 37dec9f1 authored Jan 05, 2020 by Damjan Jovanovic Committed by Alexandre Julliard Jan 06, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

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

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

No files found.
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -3053,8 +3053,9 @@ static void test_WSAEnumNetworkEvents(void)
                }
                else
                {
-                    ok (net_events.lNetworkEvents == 0, "Test[%d]: expected 0, got %d\n",
-                        i, net_events.lNetworkEvents);
+                    todo_wine_if (i != 0) /* Remove when fixed */
+                        ok (net_events.lNetworkEvents == 0, "Test[%d]: expected 0, got %d\n",
+                            i, net_events.lNetworkEvents);
                }
                for (k = 0; k < FD_MAX_EVENTS; k++)
                {

--- a/server/sock.c
+++ b/server/sock.c
@@ -1228,7 +1228,7 @@ DECL_HANDLER(set_socket_event)
                                                FILE_WRITE_ATTRIBUTES, &sock_ops))) return;
    old_event = sock->event;
    sock->mask    = req->mask;
-    sock->hmask   &= (FD_WRITE | ~req->mask); /* re-enable held events */
+    sock->hmask   &= ~req->mask; /* re-enable held events */
    sock->event   = NULL;
    sock->window  = req->window;
    sock->message = req->msg;