ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

server: Remove no longer used set_console_input_info. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2020-08-17 15:07:51 +02:00 committed by Alexandre Julliard
parent 6cff65900d
commit 2a62242747
6 changed files with 8 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/wine/condrv.h
View File

@ -87,6 +87,13 @@ struct condrv_input_info_params
struct condrv_input_info info; /* input_info */
};
#define SET_CONSOLE_INPUT_INFO_EDITION_MODE 0x01
#define SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE 0x02
#define SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE 0x04
#define SET_CONSOLE_INPUT_INFO_WIN 0x08
#define SET_CONSOLE_INPUT_INFO_HISTORY_MODE 0x10
#define SET_CONSOLE_INPUT_INFO_HISTORY_SIZE 0x20
/* IOCTL_CONDRV_WRITE_OUTPUT and IOCTL_CONDRV_READ_OUTPUT params */
struct condrv_output_params
{

33
include/wine/server_protocol.h
View File

@ -1876,34 +1876,6 @@ struct get_console_wait_event_reply
struct set_console_input_info_request
{
struct request_header __header;
obj_handle_t handle;
int mask;
obj_handle_t active_sb;
int history_mode;
int history_size;
int edition_mode;
int input_cp;
int output_cp;
user_handle_t win;
/* VARARG(title,unicode_str); */
};
struct set_console_input_info_reply
{
struct reply_header __header;
};
#define SET_CONSOLE_INPUT_INFO_TITLE 0x02
#define SET_CONSOLE_INPUT_INFO_HISTORY_MODE 0x04
#define SET_CONSOLE_INPUT_INFO_HISTORY_SIZE 0x08
#define SET_CONSOLE_INPUT_INFO_EDITION_MODE 0x10
#define SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE 0x20
#define SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE 0x40
#define SET_CONSOLE_INPUT_INFO_WIN 0x80
struct append_console_input_history_request
{
struct request_header __header;
@ -5544,7 +5516,6 @@ enum request
REQ_free_console,
REQ_attach_console,
REQ_get_console_wait_event,
REQ_set_console_input_info,
REQ_append_console_input_history,
REQ_get_console_input_history,
REQ_create_console_output,
@ -5834,7 +5805,6 @@ union generic_request
struct free_console_request free_console_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 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;
@ -6122,7 +6092,6 @@ union generic_reply
struct free_console_reply free_console_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 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;
@ -6343,7 +6312,7 @@ union generic_reply
/* ### protocol_version begin ### */
#define SERVER_PROTOCOL_VERSION 636
#define SERVER_PROTOCOL_VERSION 637
/* ### protocol_version end ### */

48
server/console.c
View File

@ -825,48 +825,6 @@ static int write_console_input( struct console_input* console, int count,
return 1;
}
/* set misc console input information */
static int set_console_input_info( const struct set_console_input_info_request *req,
const WCHAR *title, data_size_t len )
{
struct console_input *console;
struct condrv_renderer_event evt;
if (!(console = console_input_get( req->handle, FILE_WRITE_PROPERTIES ))) goto error;
if (console_input_is_bare(console) && (req->mask & SET_CONSOLE_INPUT_INFO_WIN))
{
set_error( STATUS_UNSUCCESSFUL );
goto error;
}
memset(&evt.u, 0, sizeof(evt.u));
if (req->mask & SET_CONSOLE_INPUT_INFO_TITLE)
{
WCHAR *new_title = NULL;
len = (len / sizeof(WCHAR)) * sizeof(WCHAR);
if (len && !(new_title = memdup( title, len ))) goto error;
free( console->title );
console->title = new_title;
console->title_len = len;
evt.event = CONSOLE_RENDERER_TITLE_EVENT;
console_input_events_append( console, &evt );
}
if (req->mask & SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE)
{
console->input_cp = req->input_cp;
}
if (req->mask & SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE)
{
console->output_cp = req->output_cp;
}
release_object( console );
return 1;
error:
if (console) release_object( console );
return 0;
}
/* resize a screen buffer */
static int change_screen_buffer_size( struct screen_buffer *screen_buffer,
int new_width, int new_height )
@ -2125,12 +2083,6 @@ DECL_HANDLER(attach_console)
return;
}
/* set info about a console input */
DECL_HANDLER(set_console_input_info)
{
set_console_input_info( req, get_req_data(), get_req_data_size() );
}
/* appends a string to console's history */
DECL_HANDLER(append_console_input_history)
{

22
server/protocol.def
View File

@ -1486,28 +1486,6 @@ enum server_fd_type
@END
/* Set info about a console (input only) */
@REQ(set_console_input_info)
obj_handle_t handle; /* handle to console input, or 0 for process' console */
int mask; /* setting mask (see below) */
obj_handle_t active_sb; /* active screen buffer */
int history_mode; /* whether we duplicate lines in history */
int history_size; /* number of 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
#define SET_CONSOLE_INPUT_INFO_TITLE 0x02
#define SET_CONSOLE_INPUT_INFO_HISTORY_MODE 0x04
#define SET_CONSOLE_INPUT_INFO_HISTORY_SIZE 0x08
#define SET_CONSOLE_INPUT_INFO_EDITION_MODE 0x10
#define SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE 0x20
#define SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE 0x40
#define SET_CONSOLE_INPUT_INFO_WIN 0x80
/* 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 */

12
server/request.h
View File

@ -185,7 +185,6 @@ DECL_HANDLER(alloc_console);
DECL_HANDLER(free_console);
DECL_HANDLER(attach_console);
DECL_HANDLER(get_console_wait_event);
DECL_HANDLER(set_console_input_info);
DECL_HANDLER(append_console_input_history);
DECL_HANDLER(get_console_input_history);
DECL_HANDLER(create_console_output);
@ -474,7 +473,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] =
(req_handler)req_free_console,
(req_handler)req_attach_console,
(req_handler)req_get_console_wait_event,
(req_handler)req_set_console_input_info,
(req_handler)req_append_console_input_history,
(req_handler)req_get_console_input_history,
(req_handler)req_create_console_output,
@ -1116,16 +1114,6 @@ 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 set_console_input_info_request, handle) == 12 );
C_ASSERT( FIELD_OFFSET(struct set_console_input_info_request, mask) == 16 );
C_ASSERT( FIELD_OFFSET(struct set_console_input_info_request, active_sb) == 20 );
C_ASSERT( FIELD_OFFSET(struct set_console_input_info_request, history_mode) == 24 );
C_ASSERT( FIELD_OFFSET(struct set_console_input_info_request, history_size) == 28 );
C_ASSERT( FIELD_OFFSET(struct set_console_input_info_request, edition_mode) == 32 );
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 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 );

17
server/trace.c
View File

@ -2056,20 +2056,6 @@ static void dump_get_console_wait_event_reply( const struct get_console_wait_eve
fprintf( stderr, " event=%04x", req->event );
}
static void dump_set_console_input_info_request( const struct set_console_input_info_request *req )
{
fprintf( stderr, " handle=%04x", req->handle );
fprintf( stderr, ", mask=%d", req->mask );
fprintf( stderr, ", active_sb=%04x", req->active_sb );
fprintf( stderr, ", history_mode=%d", req->history_mode );
fprintf( stderr, ", history_size=%d", req->history_size );
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 );
@ -4495,7 +4481,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = {
(dump_func)dump_free_console_request,
(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_append_console_input_history_request,
(dump_func)dump_get_console_input_history_request,
(dump_func)dump_create_console_output_request,
@ -4782,7 +4767,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = {
NULL,
(dump_func)dump_get_console_wait_event_reply,
NULL,
NULL,
(dump_func)dump_get_console_input_history_reply,
(dump_func)dump_create_console_output_reply,
NULL,
@ -5067,7 +5051,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = {
"free_console",
"attach_console",
"get_console_wait_event",
"set_console_input_info",
"append_console_input_history",
"get_console_input_history",
"create_console_output",