server: Fix some comments.
authorMike Kaplinskiy <mike.kaplinskiy@gmail.com>
Tue, 27 Jul 2010 04:16:28 +0000 (00:16 -0400)
committerAlexandre Julliard <julliard@winehq.org>
Wed, 28 Jul 2010 14:28:27 +0000 (16:28 +0200)
Apparently windows reports only currently valid events for WSAEnumNetworkEvents.

dlls/ws2_32/tests/sock.c
server/sock.c

index b078b9f3381ab75aa2e1b8ac690e37ee18c3a982..5a8e0dfb59a3d178b601f184ed511ffab082d935 100644 (file)
@@ -3126,9 +3126,6 @@ static void test_events(int useMessages)
     ok(ret == 2, "Failed to send buffer %d err %d\n", ret, GetLastError());
     broken_seq[0] = read_read_seq; /* win9x */
     broken_seq[1] = NULL;
-    /* we like to erase pmask in server, so we have varying behavior here *
-     * it is only fixed for now because we refuse to send notifications with
-     * any kind of asyncs requests running */
     ok_event_seq(src, hEvent, empty_seq, broken_seq, 0);
 
     dwRet = WaitForSingleObject(ov.hEvent, 100);
index 44422ad45c4ed2d815267f4e828218940234bf57..4922d64c52214874c686f848683922a9cabefcd1 100644 (file)
@@ -961,7 +961,9 @@ DECL_HANDLER(enable_socket_event)
                                                FILE_WRITE_ATTRIBUTES, &sock_ops)))
         return;
 
-    sock->pmask &= ~req->mask; /* is this safe? */
+    /* for event-based notification, windows erases stale events */
+    sock->pmask &= ~req->mask;
+
     sock->hmask &= ~req->mask;
     sock->state |= req->sstate;
     sock->state &= ~req->cstate;