[PATCH 3/5] server: Remove the no longer used enable_socket_event request.

Zebediah Figura z.figura12 at gmail.com
Wed Jun 2 10:30:17 CDT 2021


Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 server/protocol.def |  8 --------
 server/sock.c       | 24 ------------------------
 2 files changed, 32 deletions(-)

diff --git a/server/protocol.def b/server/protocol.def
index 8a68c9a5eb7..30624a7cbaf 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -1456,14 +1456,6 @@ enum server_fd_type
 @END
 
 
-/* Re-enable pending socket events */
- at REQ(enable_socket_event)
-    obj_handle_t handle;        /* handle to the socket */
-    unsigned int mask;          /* events to re-enable */
-    unsigned int sstate;        /* status bits to set */
-    unsigned int cstate;        /* status bits to clear */
- at END
-
 @REQ(set_socket_deferred)
     obj_handle_t handle;        /* handle to the socket */
     obj_handle_t deferred;      /* handle to the socket for which accept() is deferred */
diff --git a/server/sock.c b/server/sock.c
index 45390127acc..700d4c0761a 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -2378,30 +2378,6 @@ DECL_HANDLER(get_socket_event)
     release_object( &sock->obj );
 }
 
-/* re-enable pending socket events */
-DECL_HANDLER(enable_socket_event)
-{
-    struct sock *sock;
-
-    if (!(sock = (struct sock*)get_handle_obj( current->process, req->handle,
-                                               FILE_WRITE_ATTRIBUTES, &sock_ops)))
-        return;
-
-    if (get_unix_fd( sock->fd ) == -1) return;
-
-    /* for event-based notification, windows erases stale events */
-    sock->pending_events &= ~req->mask;
-
-    sock->reported_events &= ~req->mask;
-    sock->state |= req->sstate;
-    sock->state &= ~req->cstate;
-    if (sock->type != WS_SOCK_STREAM) sock->state &= ~STREAM_FLAG_MASK;
-
-    sock_reselect( sock );
-
-    release_object( &sock->obj );
-}
-
 DECL_HANDLER(set_socket_deferred)
 {
     struct sock *sock, *acceptsock;
-- 
2.30.2




More information about the wine-devel mailing list