[PATCH 3/6] server: Remove the no longer used get_socket_event request.

Zebediah Figura z.figura12 at gmail.com
Thu Jun 24 00:00:12 CDT 2021


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

diff --git a/server/protocol.def b/server/protocol.def
index b5bc049ccf6..343febda6c5 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -1423,18 +1423,6 @@ enum server_fd_type
 @END
 
 
-/* Get socket event parameters */
- at REQ(get_socket_event)
-    obj_handle_t handle;        /* handle to the socket */
-    int          service;       /* clear pending? */
-    obj_handle_t c_event;       /* event to clear */
- at REPLY
-    unsigned int mask;          /* event mask */
-    unsigned int pmask;         /* pending events */
-    VARARG(errors,ints);        /* event errors */
- at END
-
-
 /* Perform a recv on a socket */
 @REQ(recv_socket)
     int          oob;           /* are we receiving OOB data? */
diff --git a/server/sock.c b/server/sock.c
index f614bf5feaa..e7754dc0da3 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -2976,45 +2976,6 @@ struct object *create_socket_device( struct object *root, const struct unicode_s
     return create_named_object( root, &socket_device_ops, name, attr, sd );
 }
 
-/* get socket event parameters */
-DECL_HANDLER(get_socket_event)
-{
-    unsigned int errors[FD_MAX_EVENTS] = {0};
-    struct sock *sock;
-
-    if (!(sock = (struct sock *)get_handle_obj( current->process, req->handle,
-                                                FILE_READ_ATTRIBUTES, &sock_ops ))) return;
-    if (get_unix_fd( sock->fd ) == -1) return;
-    reply->mask  = afd_poll_flag_to_win32( sock->mask );
-    reply->pmask = afd_poll_flag_to_win32( sock->pending_events );
-
-    errors[FD_READ_BIT]     = sock_get_error( sock->errors[AFD_POLL_BIT_READ] );
-    errors[FD_WRITE_BIT]    = sock_get_error( sock->errors[AFD_POLL_BIT_WRITE] );
-    errors[FD_OOB_BIT]      = sock_get_error( sock->errors[AFD_POLL_BIT_OOB] );
-    errors[FD_ACCEPT_BIT]   = sock_get_error( sock->errors[AFD_POLL_BIT_ACCEPT] );
-    errors[FD_CONNECT_BIT]  = sock_get_error( sock->errors[AFD_POLL_BIT_CONNECT_ERR] );
-    if (!(errors[FD_CLOSE_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_HUP] )))
-        errors[FD_CLOSE_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_RESET] );
-    set_reply_data( errors, min( get_reply_max_size(), sizeof(errors) ));
-
-    if (req->service)
-    {
-        if (req->c_event)
-        {
-            struct event *cevent = get_event_obj( current->process, req->c_event,
-                                                  EVENT_MODIFY_STATE );
-            if (cevent)
-            {
-                reset_event( cevent );
-                release_object( cevent );
-            }
-        }
-        sock->pending_events = 0;
-        sock_reselect( sock );
-    }
-    release_object( &sock->obj );
-}
-
 DECL_HANDLER(recv_socket)
 {
     struct sock *sock = (struct sock *)get_handle_obj( current->process, req->async.handle, 0, &sock_ops );
-- 
2.30.2




More information about the wine-devel mailing list