server: Remove the no longer used get_socket_event request.

include/wine/server_protocol.h

@@ -1730,23 +1730,6 @@ struct unlock_file_reply
 
 
 
-struct get_socket_event_request
-{
-    struct request_header __header;
-    obj_handle_t handle;
-    int          service;
-    obj_handle_t c_event;
-};
-struct get_socket_event_reply
-{
-    struct reply_header __header;
-    unsigned int mask;
-    unsigned int pmask;
-    /* VARARG(errors,ints); */
-};
-
-
-
 struct recv_socket_request
 {
     struct request_header __header;
@@ -5456,7 +5439,6 @@ enum request
     REQ_get_volume_info,
     REQ_lock_file,
     REQ_unlock_file,
-    REQ_get_socket_event,
     REQ_recv_socket,
     REQ_poll_socket,
     REQ_send_socket,
@@ -5736,7 +5718,6 @@ union generic_request
     struct get_volume_info_request get_volume_info_request;
     struct lock_file_request lock_file_request;
     struct unlock_file_request unlock_file_request;
-    struct get_socket_event_request get_socket_event_request;
     struct recv_socket_request recv_socket_request;
     struct poll_socket_request poll_socket_request;
     struct send_socket_request send_socket_request;
@@ -6014,7 +5995,6 @@ union generic_reply
     struct get_volume_info_reply get_volume_info_reply;
     struct lock_file_reply lock_file_reply;
     struct unlock_file_reply unlock_file_reply;
-    struct get_socket_event_reply get_socket_event_reply;
     struct recv_socket_reply recv_socket_reply;
     struct poll_socket_reply poll_socket_reply;
     struct send_socket_reply send_socket_reply;
@@ -6238,7 +6218,7 @@ union generic_reply
 
 /* ### protocol_version begin ### */
 
-#define SERVER_PROTOCOL_VERSION 715
+#define SERVER_PROTOCOL_VERSION 716
 
 /* ### protocol_version end ### */
 

server/protocol.def

@@ -1423,18 +1423,6 @@ enum server_fd_type
 @END
 
 
-/* Get socket event parameters */
-@REQ(get_socket_event)
-    obj_handle_t handle;        /* handle to the socket */
-    int          service;       /* clear pending? */
-    obj_handle_t c_event;       /* event to clear */
-@REPLY
-    unsigned int mask;          /* event mask */
-    unsigned int pmask;         /* pending events */
-    VARARG(errors,ints);        /* event errors */
-@END
-
-
 /* Perform a recv on a socket */
 @REQ(recv_socket)
     int          oob;           /* are we receiving OOB data? */

server/request.h

@@ -172,7 +172,6 @@ DECL_HANDLER(get_file_info);
 DECL_HANDLER(get_volume_info);
 DECL_HANDLER(lock_file);
 DECL_HANDLER(unlock_file);
-DECL_HANDLER(get_socket_event);
 DECL_HANDLER(recv_socket);
 DECL_HANDLER(poll_socket);
 DECL_HANDLER(send_socket);
@@ -451,7 +450,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] =
     (req_handler)req_get_volume_info,
     (req_handler)req_lock_file,
     (req_handler)req_unlock_file,
-    (req_handler)req_get_socket_event,
     (req_handler)req_recv_socket,
     (req_handler)req_poll_socket,
     (req_handler)req_send_socket,
@@ -1034,13 +1032,6 @@ C_ASSERT( FIELD_OFFSET(struct unlock_file_request, handle) == 12 );
 C_ASSERT( FIELD_OFFSET(struct unlock_file_request, offset) == 16 );
 C_ASSERT( FIELD_OFFSET(struct unlock_file_request, count) == 24 );
 C_ASSERT( sizeof(struct unlock_file_request) == 32 );
-C_ASSERT( FIELD_OFFSET(struct get_socket_event_request, handle) == 12 );
-C_ASSERT( FIELD_OFFSET(struct get_socket_event_request, service) == 16 );
-C_ASSERT( FIELD_OFFSET(struct get_socket_event_request, c_event) == 20 );
-C_ASSERT( sizeof(struct get_socket_event_request) == 24 );
-C_ASSERT( FIELD_OFFSET(struct get_socket_event_reply, mask) == 8 );
-C_ASSERT( FIELD_OFFSET(struct get_socket_event_reply, pmask) == 12 );
-C_ASSERT( sizeof(struct get_socket_event_reply) == 16 );
 C_ASSERT( FIELD_OFFSET(struct recv_socket_request, oob) == 12 );
 C_ASSERT( FIELD_OFFSET(struct recv_socket_request, async) == 16 );
 C_ASSERT( FIELD_OFFSET(struct recv_socket_request, status) == 56 );

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 );

server/trace.c

@@ -2073,20 +2073,6 @@ static void dump_unlock_file_request( const struct unlock_file_request *req )
     dump_uint64( ", count=", &req->count );
 }
 
-static void dump_get_socket_event_request( const struct get_socket_event_request *req )
-{
-    fprintf( stderr, " handle=%04x", req->handle );
-    fprintf( stderr, ", service=%d", req->service );
-    fprintf( stderr, ", c_event=%04x", req->c_event );
-}
-
-static void dump_get_socket_event_reply( const struct get_socket_event_reply *req )
-{
-    fprintf( stderr, " mask=%08x", req->mask );
-    fprintf( stderr, ", pmask=%08x", req->pmask );
-    dump_varargs_ints( ", errors=", cur_size );
-}
-
 static void dump_recv_socket_request( const struct recv_socket_request *req )
 {
     fprintf( stderr, " oob=%d", req->oob );
@@ -4571,7 +4557,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = {
     (dump_func)dump_get_volume_info_request,
     (dump_func)dump_lock_file_request,
     (dump_func)dump_unlock_file_request,
-    (dump_func)dump_get_socket_event_request,
     (dump_func)dump_recv_socket_request,
     (dump_func)dump_poll_socket_request,
     (dump_func)dump_send_socket_request,
@@ -4847,7 +4832,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = {
     (dump_func)dump_get_volume_info_reply,
     (dump_func)dump_lock_file_reply,
     NULL,
-    (dump_func)dump_get_socket_event_reply,
     (dump_func)dump_recv_socket_reply,
     (dump_func)dump_poll_socket_reply,
     (dump_func)dump_send_socket_reply,
@@ -5123,7 +5107,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = {
     "get_volume_info",
     "lock_file",
     "unlock_file",
-    "get_socket_event",
     "recv_socket",
     "poll_socket",
     "send_socket",