Module: wine Branch: master Commit: 810a9da9352ba83f3ed446590c248683286c9eed URL: https://source.winehq.org/git/wine.git/?a=commit;h=810a9da9352ba83f3ed446590...
Author: Zebediah Figura z.figura12@gmail.com Date: Wed Jun 2 10:30:17 2021 -0500
server: Remove the no longer used enable_socket_event request.
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
include/wine/server_protocol.h | 20 +------------------- server/protocol.def | 8 -------- server/request.h | 7 ------- server/sock.c | 24 ------------------------ server/trace.c | 11 ----------- 5 files changed, 1 insertion(+), 69 deletions(-)
diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 83b6bdb3e22..fe1f5394a72 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1780,21 +1780,6 @@ struct get_socket_info_reply };
- -struct enable_socket_event_request -{ - struct request_header __header; - obj_handle_t handle; - unsigned int mask; - unsigned int sstate; - unsigned int cstate; - char __pad_28[4]; -}; -struct enable_socket_event_reply -{ - struct reply_header __header; -}; - struct set_socket_deferred_request { struct request_header __header; @@ -5521,7 +5506,6 @@ enum request REQ_set_socket_event, REQ_get_socket_event, REQ_get_socket_info, - REQ_enable_socket_event, REQ_set_socket_deferred, REQ_recv_socket, REQ_poll_socket, @@ -5805,7 +5789,6 @@ union generic_request struct set_socket_event_request set_socket_event_request; struct get_socket_event_request get_socket_event_request; struct get_socket_info_request get_socket_info_request; - struct enable_socket_event_request enable_socket_event_request; struct set_socket_deferred_request set_socket_deferred_request; struct recv_socket_request recv_socket_request; struct poll_socket_request poll_socket_request; @@ -6087,7 +6070,6 @@ union generic_reply struct set_socket_event_reply set_socket_event_reply; struct get_socket_event_reply get_socket_event_reply; struct get_socket_info_reply get_socket_info_reply; - struct enable_socket_event_reply enable_socket_event_reply; struct set_socket_deferred_reply set_socket_deferred_reply; struct recv_socket_reply recv_socket_reply; struct poll_socket_reply poll_socket_reply; @@ -6312,7 +6294,7 @@ union generic_reply
/* ### protocol_version begin ### */
-#define SERVER_PROTOCOL_VERSION 710 +#define SERVER_PROTOCOL_VERSION 711
/* ### protocol_version end ### */
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 */ -@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 */ -@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/request.h b/server/request.h index ddf356c3e3f..a8d74f01f96 100644 --- a/server/request.h +++ b/server/request.h @@ -175,7 +175,6 @@ DECL_HANDLER(unlock_file); DECL_HANDLER(set_socket_event); DECL_HANDLER(get_socket_event); DECL_HANDLER(get_socket_info); -DECL_HANDLER(enable_socket_event); DECL_HANDLER(set_socket_deferred); DECL_HANDLER(recv_socket); DECL_HANDLER(poll_socket); @@ -458,7 +457,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_set_socket_event, (req_handler)req_get_socket_event, (req_handler)req_get_socket_info, - (req_handler)req_enable_socket_event, (req_handler)req_set_socket_deferred, (req_handler)req_recv_socket, (req_handler)req_poll_socket, @@ -1062,11 +1060,6 @@ C_ASSERT( FIELD_OFFSET(struct get_socket_info_reply, family) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_socket_info_reply, type) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_socket_info_reply, protocol) == 16 ); C_ASSERT( sizeof(struct get_socket_info_reply) == 24 ); -C_ASSERT( FIELD_OFFSET(struct enable_socket_event_request, handle) == 12 ); -C_ASSERT( FIELD_OFFSET(struct enable_socket_event_request, mask) == 16 ); -C_ASSERT( FIELD_OFFSET(struct enable_socket_event_request, sstate) == 20 ); -C_ASSERT( FIELD_OFFSET(struct enable_socket_event_request, cstate) == 24 ); -C_ASSERT( sizeof(struct enable_socket_event_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct set_socket_deferred_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_socket_deferred_request, deferred) == 16 ); C_ASSERT( sizeof(struct set_socket_deferred_request) == 24 ); 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; diff --git a/server/trace.c b/server/trace.c index 8bfc9e56cc5..1c51bffe1aa 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2109,14 +2109,6 @@ static void dump_get_socket_info_reply( const struct get_socket_info_reply *req fprintf( stderr, ", protocol=%d", req->protocol ); }
-static void dump_enable_socket_event_request( const struct enable_socket_event_request *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", mask=%08x", req->mask ); - fprintf( stderr, ", sstate=%08x", req->sstate ); - fprintf( stderr, ", cstate=%08x", req->cstate ); -} - static void dump_set_socket_deferred_request( const struct set_socket_deferred_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4610,7 +4602,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_set_socket_event_request, (dump_func)dump_get_socket_event_request, (dump_func)dump_get_socket_info_request, - (dump_func)dump_enable_socket_event_request, (dump_func)dump_set_socket_deferred_request, (dump_func)dump_recv_socket_request, (dump_func)dump_poll_socket_request, @@ -4891,7 +4882,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_socket_event_reply, (dump_func)dump_get_socket_info_reply, NULL, - NULL, (dump_func)dump_recv_socket_reply, (dump_func)dump_poll_socket_reply, (dump_func)dump_send_socket_reply, @@ -5170,7 +5160,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "set_socket_event", "get_socket_event", "get_socket_info", - "enable_socket_event", "set_socket_deferred", "recv_socket", "poll_socket",