Module: wine Branch: master Commit: 43e67ebddc8312f1bd8d325abc106a7f9625ebb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43e67ebddc8312f1bd8d325ab...
Author: Zebediah Figura z.figura12@gmail.com Date: Tue Jun 15 10:39:49 2021 -0500
server: Remove the no longer used set_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 | 21 +-------------- server/protocol.def | 10 ------- server/request.h | 8 ------ server/sock.c | 60 ------------------------------------------ server/trace.c | 12 --------- 5 files changed, 1 insertion(+), 110 deletions(-)
diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index a97974027f1..1f0e25c31fa 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1730,22 +1730,6 @@ struct unlock_file_reply
-struct set_socket_event_request -{ - struct request_header __header; - obj_handle_t handle; - unsigned int mask; - obj_handle_t event; - user_handle_t window; - unsigned int msg; -}; -struct set_socket_event_reply -{ - struct reply_header __header; -}; - - - struct get_socket_event_request { struct request_header __header; @@ -5501,7 +5485,6 @@ enum request REQ_get_volume_info, REQ_lock_file, REQ_unlock_file, - REQ_set_socket_event, REQ_get_socket_event, REQ_get_socket_info, REQ_set_socket_deferred, @@ -5784,7 +5767,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 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 set_socket_deferred_request set_socket_deferred_request; @@ -6065,7 +6047,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 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 set_socket_deferred_reply set_socket_deferred_reply; @@ -6292,7 +6273,7 @@ union generic_reply
/* ### protocol_version begin ### */
-#define SERVER_PROTOCOL_VERSION 712 +#define SERVER_PROTOCOL_VERSION 713
/* ### protocol_version end ### */
diff --git a/server/protocol.def b/server/protocol.def index 3609261b848..d3f44482c37 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1423,16 +1423,6 @@ enum server_fd_type @END
-/* Set socket event parameters */ -@REQ(set_socket_event) - obj_handle_t handle; /* handle to the socket */ - unsigned int mask; /* event mask */ - obj_handle_t event; /* event object */ - user_handle_t window; /* window to send the message to */ - unsigned int msg; /* message to send */ -@END - - /* Get socket event parameters */ @REQ(get_socket_event) obj_handle_t handle; /* handle to the socket */ diff --git a/server/request.h b/server/request.h index 4f6adaa97c2..c3f77a233ab 100644 --- a/server/request.h +++ b/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(set_socket_event); DECL_HANDLER(get_socket_event); DECL_HANDLER(get_socket_info); DECL_HANDLER(set_socket_deferred); @@ -454,7 +453,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_set_socket_event, (req_handler)req_get_socket_event, (req_handler)req_get_socket_info, (req_handler)req_set_socket_deferred, @@ -1040,12 +1038,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 set_socket_event_request, handle) == 12 ); -C_ASSERT( FIELD_OFFSET(struct set_socket_event_request, mask) == 16 ); -C_ASSERT( FIELD_OFFSET(struct set_socket_event_request, event) == 20 ); -C_ASSERT( FIELD_OFFSET(struct set_socket_event_request, window) == 24 ); -C_ASSERT( FIELD_OFFSET(struct set_socket_event_request, msg) == 28 ); -C_ASSERT( sizeof(struct set_socket_event_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 ); diff --git a/server/sock.c b/server/sock.c index 6d2ac6af2b7..a3062cff8ab 100644 --- a/server/sock.c +++ b/server/sock.c @@ -444,28 +444,6 @@ static unsigned int afd_poll_flag_to_win32( unsigned int flags ) return ret; }
-static unsigned int afd_poll_flag_from_win32( unsigned int flags ) -{ - static const unsigned int map[] = - { - AFD_POLL_READ, - AFD_POLL_WRITE, - AFD_POLL_OOB, - AFD_POLL_ACCEPT, - AFD_POLL_CONNECT | AFD_POLL_CONNECT_ERR, - AFD_POLL_RESET | AFD_POLL_HUP, - }; - - unsigned int i, ret = 0; - - for (i = 0; i < ARRAY_SIZE(map); ++i) - { - if (flags & (1 << i)) ret |= map[i]; - } - - return ret; -} - /* wake anybody waiting on the socket event or send the associated message */ static void sock_wake_up( struct sock *sock ) { @@ -2520,44 +2498,6 @@ struct object *create_socket_device( struct object *root, const struct unicode_s return create_named_object( root, &socket_device_ops, name, attr, sd ); }
-/* set socket event parameters */ -DECL_HANDLER(set_socket_event) -{ - struct sock *sock; - struct event *old_event; - - 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; - old_event = sock->event; - sock->mask = afd_poll_flag_from_win32( req->mask ); - if (req->window) - { - sock->pending_events &= ~sock->mask; - sock->reported_events &= ~sock->mask; - } - sock->event = NULL; - sock->window = req->window; - sock->message = req->msg; - sock->wparam = req->handle; /* wparam is the socket handle */ - if (req->event) sock->event = get_event_obj( current->process, req->event, EVENT_MODIFY_STATE ); - - if (debug_level && sock->event) fprintf(stderr, "event ptr: %p\n", sock->event); - - sock_reselect( sock ); - - sock->nonblocking = 1; - - /* if a network event is pending, signal the event object - it is possible that CONNECT or ACCEPT network events has happened - before a WSAEventSelect() was done on it. - (when dealing with Asynchronous socket) */ - sock_wake_up( sock ); - - if (old_event) release_object( old_event ); /* we're through with it */ - release_object( &sock->obj ); -} - /* get socket event parameters */ DECL_HANDLER(get_socket_event) { diff --git a/server/trace.c b/server/trace.c index 42952d3cdff..27500eae589 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2073,15 +2073,6 @@ static void dump_unlock_file_request( const struct unlock_file_request *req ) dump_uint64( ", count=", &req->count ); }
-static void dump_set_socket_event_request( const struct set_socket_event_request *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", mask=%08x", req->mask ); - fprintf( stderr, ", event=%04x", req->event ); - fprintf( stderr, ", window=%08x", req->window ); - fprintf( stderr, ", msg=%08x", req->msg ); -} - static void dump_get_socket_event_request( const struct get_socket_event_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4598,7 +4589,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_set_socket_event_request, (dump_func)dump_get_socket_event_request, (dump_func)dump_get_socket_info_request, (dump_func)dump_set_socket_deferred_request, @@ -4877,7 +4867,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_volume_info_reply, (dump_func)dump_lock_file_reply, NULL, - NULL, (dump_func)dump_get_socket_event_reply, (dump_func)dump_get_socket_info_reply, NULL, @@ -5156,7 +5145,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "get_volume_info", "lock_file", "unlock_file", - "set_socket_event", "get_socket_event", "get_socket_info", "set_socket_deferred",
-
Alexandre Julliard