Damjan Jovanovic : server: Revert b4a1d80ae35d35f5c170e101922bf1563488be18 for now.

[Alexandre Julliard]

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

Author: Damjan Jovanovic <damjan.jov(a)gmail.com>
Date:   Sun Jan  5 20:32:31 2020 +0200

server: Revert b4a1d80ae35d35f5c170e101922bf1563488be18 for now.

It breaks too many things.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48357
Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/ws2_32/tests/sock.c | 5 +++--
 server/sock.c            | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index fa9d081185..60c5dfc63f 100644
--- 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++)
                 {
diff --git a/server/sock.c b/server/sock.c
index 29542cd01f..1a53ce4b09 100644
--- 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;