Module: wine Branch: master Commit: 2306efc3fae152586348a618fce3d8398a883924 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2306efc3fae152586348a618f...
Author: Jacek Caban jacek@codeweavers.com Date: Fri Aug 14 13:27:42 2020 +0200
server: Remove no longer used get_console_input_info.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
include/wine/server_protocol.h | 26 +------------------------- server/console.c | 18 ------------------ server/protocol.def | 15 --------------- server/request.h | 12 ------------ server/trace.c | 20 -------------------- 5 files changed, 1 insertion(+), 90 deletions(-)
diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ddf6373dec..472ed6ab93 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1904,27 +1904,6 @@ struct set_console_input_info_reply
-struct get_console_input_info_request -{ - struct request_header __header; - obj_handle_t handle; -}; -struct get_console_input_info_reply -{ - struct reply_header __header; - int history_mode; - int history_size; - int history_index; - int edition_mode; - int input_cp; - int output_cp; - user_handle_t win; - /* VARARG(title,unicode_str); */ - char __pad_36[4]; -}; - - - struct append_console_input_history_request { struct request_header __header; @@ -5566,7 +5545,6 @@ enum request REQ_attach_console, REQ_get_console_wait_event, REQ_set_console_input_info, - REQ_get_console_input_info, REQ_append_console_input_history, REQ_get_console_input_history, REQ_create_console_output, @@ -5857,7 +5835,6 @@ union generic_request struct attach_console_request attach_console_request; struct get_console_wait_event_request get_console_wait_event_request; struct set_console_input_info_request set_console_input_info_request; - struct get_console_input_info_request get_console_input_info_request; struct append_console_input_history_request append_console_input_history_request; struct get_console_input_history_request get_console_input_history_request; struct create_console_output_request create_console_output_request; @@ -6146,7 +6123,6 @@ union generic_reply struct attach_console_reply attach_console_reply; struct get_console_wait_event_reply get_console_wait_event_reply; struct set_console_input_info_reply set_console_input_info_reply; - struct get_console_input_info_reply get_console_input_info_reply; struct append_console_input_history_reply append_console_input_history_reply; struct get_console_input_history_reply get_console_input_history_reply; struct create_console_output_reply create_console_output_reply; @@ -6367,7 +6343,7 @@ union generic_reply
/* ### protocol_version begin ### */
-#define SERVER_PROTOCOL_VERSION 635 +#define SERVER_PROTOCOL_VERSION 636
/* ### protocol_version end ### */
diff --git a/server/console.c b/server/console.c index 5a71bece9d..59a2794e01 100644 --- a/server/console.c +++ b/server/console.c @@ -2131,24 +2131,6 @@ DECL_HANDLER(set_console_input_info) set_console_input_info( req, get_req_data(), get_req_data_size() ); }
-/* get info about a console (output only) */ -DECL_HANDLER(get_console_input_info) -{ - struct console_input *console; - - if (!(console = console_input_get( req->handle, FILE_READ_PROPERTIES ))) return; - if (console->title) set_reply_data( console->title, min( console->title_len, get_reply_max_size() )); - reply->history_mode = console->history_mode; - reply->history_size = console->history_size; - reply->history_index = console->history_index; - reply->edition_mode = console->edition_mode; - reply->input_cp = console->input_cp; - reply->output_cp = console->output_cp; - reply->win = console->win; - - release_object( console ); -} - /* appends a string to console's history */ DECL_HANDLER(append_console_input_history) { diff --git a/server/protocol.def b/server/protocol.def index 9693228eaa..123f629a48 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1508,21 +1508,6 @@ enum server_fd_type #define SET_CONSOLE_INPUT_INFO_WIN 0x80
-/* Get info about a console (input only) */ -@REQ(get_console_input_info) - obj_handle_t handle; /* handle to console input, or 0 for process' console */ -@REPLY - int history_mode; /* whether we duplicate lines in history */ - int history_size; /* number of lines in history */ - int history_index; /* number of used lines in history */ - int edition_mode; /* index to the edition mode flavors */ - int input_cp; /* console input codepage */ - int output_cp; /* console output codepage */ - user_handle_t win; /* console window if backend supports it */ - VARARG(title,unicode_str); /* console title */ -@END - - /* appends a string to console's history */ @REQ(append_console_input_history) obj_handle_t handle; /* handle to console input, or 0 for process' console */ diff --git a/server/request.h b/server/request.h index 1d5fe8942a..4dff87e8b9 100644 --- a/server/request.h +++ b/server/request.h @@ -186,7 +186,6 @@ DECL_HANDLER(free_console); DECL_HANDLER(attach_console); DECL_HANDLER(get_console_wait_event); DECL_HANDLER(set_console_input_info); -DECL_HANDLER(get_console_input_info); DECL_HANDLER(append_console_input_history); DECL_HANDLER(get_console_input_history); DECL_HANDLER(create_console_output); @@ -476,7 +475,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_attach_console, (req_handler)req_get_console_wait_event, (req_handler)req_set_console_input_info, - (req_handler)req_get_console_input_info, (req_handler)req_append_console_input_history, (req_handler)req_get_console_input_history, (req_handler)req_create_console_output, @@ -1128,16 +1126,6 @@ C_ASSERT( FIELD_OFFSET(struct set_console_input_info_request, input_cp) == 36 ); C_ASSERT( FIELD_OFFSET(struct set_console_input_info_request, output_cp) == 40 ); C_ASSERT( FIELD_OFFSET(struct set_console_input_info_request, win) == 44 ); C_ASSERT( sizeof(struct set_console_input_info_request) == 48 ); -C_ASSERT( FIELD_OFFSET(struct get_console_input_info_request, handle) == 12 ); -C_ASSERT( sizeof(struct get_console_input_info_request) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_console_input_info_reply, history_mode) == 8 ); -C_ASSERT( FIELD_OFFSET(struct get_console_input_info_reply, history_size) == 12 ); -C_ASSERT( FIELD_OFFSET(struct get_console_input_info_reply, history_index) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_console_input_info_reply, edition_mode) == 20 ); -C_ASSERT( FIELD_OFFSET(struct get_console_input_info_reply, input_cp) == 24 ); -C_ASSERT( FIELD_OFFSET(struct get_console_input_info_reply, output_cp) == 28 ); -C_ASSERT( FIELD_OFFSET(struct get_console_input_info_reply, win) == 32 ); -C_ASSERT( sizeof(struct get_console_input_info_reply) == 40 ); C_ASSERT( FIELD_OFFSET(struct append_console_input_history_request, handle) == 12 ); C_ASSERT( sizeof(struct append_console_input_history_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_console_input_history_request, handle) == 12 ); diff --git a/server/trace.c b/server/trace.c index b04d9cc36e..a276f54212 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2070,23 +2070,6 @@ static void dump_set_console_input_info_request( const struct set_console_input_ dump_varargs_unicode_str( ", title=", cur_size ); }
-static void dump_get_console_input_info_request( const struct get_console_input_info_request *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); -} - -static void dump_get_console_input_info_reply( const struct get_console_input_info_reply *req ) -{ - fprintf( stderr, " history_mode=%d", req->history_mode ); - fprintf( stderr, ", history_size=%d", req->history_size ); - fprintf( stderr, ", history_index=%d", req->history_index ); - fprintf( stderr, ", edition_mode=%d", req->edition_mode ); - fprintf( stderr, ", input_cp=%d", req->input_cp ); - fprintf( stderr, ", output_cp=%d", req->output_cp ); - fprintf( stderr, ", win=%08x", req->win ); - dump_varargs_unicode_str( ", title=", cur_size ); -} - static void dump_append_console_input_history_request( const struct append_console_input_history_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4513,7 +4496,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_attach_console_request, (dump_func)dump_get_console_wait_event_request, (dump_func)dump_set_console_input_info_request, - (dump_func)dump_get_console_input_info_request, (dump_func)dump_append_console_input_history_request, (dump_func)dump_get_console_input_history_request, (dump_func)dump_create_console_output_request, @@ -4800,7 +4782,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, (dump_func)dump_get_console_wait_event_reply, NULL, - (dump_func)dump_get_console_input_info_reply, NULL, (dump_func)dump_get_console_input_history_reply, (dump_func)dump_create_console_output_reply, @@ -5087,7 +5068,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "attach_console", "get_console_wait_event", "set_console_input_info", - "get_console_input_info", "append_console_input_history", "get_console_input_history", "create_console_output",
-
Alexandre Julliard