diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 501b016b0a8..9f05a9f340d 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1788,20 +1788,6 @@ struct set_socket_deferred_reply -struct get_console_wait_event_request -{ - struct request_header __header; - obj_handle_t handle; -}; -struct get_console_wait_event_reply -{ - struct reply_header __header; - obj_handle_t event; - char __pad_12[4]; -}; - - - struct get_next_console_request_request { struct request_header __header; @@ -5423,7 +5409,6 @@ enum request REQ_get_socket_info, REQ_enable_socket_event, REQ_set_socket_deferred, - REQ_get_console_wait_event, REQ_get_next_console_request, REQ_read_directory_changes, REQ_read_change, @@ -5705,7 +5690,6 @@ union generic_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 get_console_wait_event_request get_console_wait_event_request; struct get_next_console_request_request get_next_console_request_request; struct read_directory_changes_request read_directory_changes_request; struct read_change_request read_change_request; @@ -5985,7 +5969,6 @@ union generic_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 get_console_wait_event_reply get_console_wait_event_reply; struct get_next_console_request_reply get_next_console_request_reply; struct read_directory_changes_reply read_directory_changes_reply; struct read_change_reply read_change_reply; @@ -6205,7 +6188,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 651 +#define SERVER_PROTOCOL_VERSION 652 /* ### protocol_version end ### */ diff --git a/server/console.c b/server/console.c index 8bb7d8ecfa8..ebcc8beb97c 100644 --- a/server/console.c +++ b/server/console.c @@ -60,7 +60,6 @@ struct console_input struct screen_buffer *active; /* active screen buffer */ struct console_server *server; /* console server object */ unsigned int last_id; /* id of last created console buffer */ - struct event *event; /* event to wait on for input queue */ struct fd *fd; /* for bare console, attached input fd */ struct async_queue ioctl_q; /* ioctl queue */ struct async_queue read_q; /* read queue */ @@ -371,18 +370,11 @@ static struct object *create_console_input(void) console_input->num_proc = 0; console_input->active = NULL; console_input->server = NULL; - console_input->event = create_event( NULL, NULL, 0, 1, 0, NULL ); console_input->fd = NULL; console_input->last_id = 0; init_async_queue( &console_input->ioctl_q ); init_async_queue( &console_input->read_q ); - if (!console_input->event) - { - release_object( console_input ); - return NULL; - } - console_input->fd = alloc_pseudo_fd( &console_input_fd_ops, &console_input->obj, FILE_SYNCHRONOUS_IO_NONALERT ); if (!console_input->fd) @@ -626,8 +618,6 @@ static void console_input_destroy( struct object *obj ) free_async_queue( &console_in->ioctl_q ); free_async_queue( &console_in->read_q ); - if (console_in->event) - release_object( console_in->event ); if (console_in->fd) release_object( console_in->fd ); } @@ -1157,45 +1147,6 @@ struct object *create_console_device( struct object *root, const struct unicode_ return create_named_object( root, &console_device_ops, name, attr, sd ); } -/* get console which renderer is 'current' */ -static int cgwe_enum( struct process* process, void* user) -{ - if (process->console && process->console->renderer == current) - { - *(struct console_input**)user = (struct console_input *)grab_object( process->console ); - return 1; - } - return 0; -} - -DECL_HANDLER(get_console_wait_event) -{ - struct console_input* console = NULL; - struct object *obj; - - if (req->handle) - { - if (!(obj = get_handle_obj( current->process, req->handle, FILE_READ_PROPERTIES, NULL ))) return; - if (obj->ops == &console_input_ops) - console = (struct console_input *)grab_object( obj ); - else if (obj->ops == &screen_buffer_ops) - console = (struct console_input *)grab_object( ((struct screen_buffer *)obj)->input ); - else - set_error( STATUS_OBJECT_TYPE_MISMATCH ); - release_object( obj ); - } - else if (current->process->console) - console = (struct console_input *)grab_object( current->process->console ); - else enum_processes(cgwe_enum, &console); - - if (console) - { - reply->event = alloc_handle( current->process, console->event, EVENT_ALL_ACCESS, 0 ); - release_object( console ); - } - else set_error( STATUS_INVALID_PARAMETER ); -} - /* retrieve the next pending console ioctl request */ DECL_HANDLER(get_next_console_request) { @@ -1213,9 +1164,6 @@ DECL_HANDLER(get_next_console_request) return; } - if (req->signal) set_event( server->console->event); - else reset_event( server->console->event ); - if (!req->signal) server->console->signaled = 0; else if (!server->console->signaled) { diff --git a/server/protocol.def b/server/protocol.def index 846d2e15602..a3708f20705 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1444,14 +1444,6 @@ enum server_fd_type @END -/* Get the input queue wait event */ -@REQ(get_console_wait_event) - obj_handle_t handle; /* handle to the console */ -@REPLY - obj_handle_t event; -@END - - /* Retrieve the next pending console ioctl request */ @REQ(get_next_console_request) obj_handle_t handle; /* console server handle */ diff --git a/server/request.h b/server/request.h index a3c49634490..972db53a889 100644 --- a/server/request.h +++ b/server/request.h @@ -178,7 +178,6 @@ DECL_HANDLER(get_socket_event); DECL_HANDLER(get_socket_info); DECL_HANDLER(enable_socket_event); DECL_HANDLER(set_socket_deferred); -DECL_HANDLER(get_console_wait_event); DECL_HANDLER(get_next_console_request); DECL_HANDLER(read_directory_changes); DECL_HANDLER(read_change); @@ -459,7 +458,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_get_socket_info, (req_handler)req_enable_socket_event, (req_handler)req_set_socket_deferred, - (req_handler)req_get_console_wait_event, (req_handler)req_get_next_console_request, (req_handler)req_read_directory_changes, (req_handler)req_read_change, @@ -1070,10 +1068,6 @@ 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 ); -C_ASSERT( FIELD_OFFSET(struct get_console_wait_event_request, handle) == 12 ); -C_ASSERT( sizeof(struct get_console_wait_event_request) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_console_wait_event_reply, event) == 8 ); -C_ASSERT( sizeof(struct get_console_wait_event_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_next_console_request_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_next_console_request_request, signal) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_next_console_request_request, read) == 20 ); diff --git a/server/trace.c b/server/trace.c index 32d6f6e10b2..e059b709e8f 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2021,16 +2021,6 @@ static void dump_set_socket_deferred_request( const struct set_socket_deferred_r fprintf( stderr, ", deferred=%04x", req->deferred ); } -static void dump_get_console_wait_event_request( const struct get_console_wait_event_request *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); -} - -static void dump_get_console_wait_event_reply( const struct get_console_wait_event_reply *req ) -{ - fprintf( stderr, " event=%04x", req->event ); -} - static void dump_get_next_console_request_request( const struct get_next_console_request_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4451,7 +4441,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_socket_info_request, (dump_func)dump_enable_socket_event_request, (dump_func)dump_set_socket_deferred_request, - (dump_func)dump_get_console_wait_event_request, (dump_func)dump_get_next_console_request_request, (dump_func)dump_read_directory_changes_request, (dump_func)dump_read_change_request, @@ -4729,7 +4718,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_socket_info_reply, NULL, NULL, - (dump_func)dump_get_console_wait_event_reply, (dump_func)dump_get_next_console_request_reply, NULL, (dump_func)dump_read_change_reply, @@ -5007,7 +4995,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "get_socket_info", "enable_socket_event", "set_socket_deferred", - "get_console_wait_event", "get_next_console_request", "read_directory_changes", "read_change", @@ -5277,7 +5264,6 @@ static const struct { "INFO_LENGTH_MISMATCH", STATUS_INFO_LENGTH_MISMATCH }, { "INSTANCE_NOT_AVAILABLE", STATUS_INSTANCE_NOT_AVAILABLE }, { "INSUFFICIENT_RESOURCES", STATUS_INSUFFICIENT_RESOURCES }, - { "INVALID_BUFFER_SIZE", STATUS_INVALID_BUFFER_SIZE }, { "INVALID_CID", STATUS_INVALID_CID }, { "INVALID_DEVICE_REQUEST", STATUS_INVALID_DEVICE_REQUEST }, { "INVALID_FILE_FOR_SECTION", STATUS_INVALID_FILE_FOR_SECTION },