Skip to content

W
wine-winehq
Commit 0e46dd09 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

server: Remove no longer needed get_console_mode and set_console_mode requests.

Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 7aadafbd
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 139 deletions
include/wine/server_protocol.h
View file @ 0e46dd09
......@@ -1891,33 +1891,6 @@ struct get_console_wait_event_reply
};
struct get_console_mode_request
{
struct request_header __header;
obj_handle_t handle;
};
struct get_console_mode_reply
{
struct reply_header __header;
int mode;
char __pad_12[4];
};
struct set_console_mode_request
{
struct request_header __header;
obj_handle_t handle;
int mode;
char __pad_20[4];
};
struct set_console_mode_reply
{
struct reply_header __header;
};
struct set_console_input_info_request
{
......@@ -5694,8 +5667,6 @@ enum request
REQ_open_console,
REQ_attach_console,
REQ_get_console_wait_event,
REQ_get_console_mode,
REQ_set_console_mode,
REQ_set_console_input_info,
REQ_get_console_input_info,
REQ_append_console_input_history,
......@@ -5991,8 +5962,6 @@ union generic_request
struct open_console_request open_console_request;
struct attach_console_request attach_console_request;
struct get_console_wait_event_request get_console_wait_event_request;
struct get_console_mode_request get_console_mode_request;
struct set_console_mode_request set_console_mode_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;
......@@ -6286,8 +6255,6 @@ union generic_reply
struct open_console_reply open_console_reply;
struct attach_console_reply attach_console_reply;
struct get_console_wait_event_reply get_console_wait_event_reply;
struct get_console_mode_reply get_console_mode_reply;
struct set_console_mode_reply set_console_mode_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;
......@@ -6514,7 +6481,7 @@ union generic_reply
/* ### protocol_version begin ### */
#define SERVER_PROTOCOL_VERSION 623
#define SERVER_PROTOCOL_VERSION 624
/* ### protocol_version end ### */
......
server/console.c
View file @ 0e46dd09
......@@ -715,52 +715,6 @@ static void propagate_console_signal( struct console_input *console,
enum_processes(propagate_console_signal_cb, &csi);
}
static int get_console_mode( obj_handle_t handle )
{
struct object *obj;
int ret = 0;
if ((obj = get_handle_obj( current->process, handle, FILE_READ_PROPERTIES, NULL )))
{
if (obj->ops == &console_input_ops)
{
ret = ((struct console_input *)obj)->mode;
}
else if (obj->ops == &screen_buffer_ops)
{
ret = ((struct screen_buffer *)obj)->mode;
}
else
set_error( STATUS_OBJECT_TYPE_MISMATCH );
release_object( obj );
}
return ret;
}
/* changes the mode of either a console input or a screen buffer */
static int set_console_mode( obj_handle_t handle, int mode )
{
struct object *obj;
int ret = 0;
if (!(obj = get_handle_obj( current->process, handle, FILE_WRITE_PROPERTIES, NULL )))
return 0;
if (obj->ops == &console_input_ops)
{
/* FIXME: if we remove the edit mode bits, we need (???) to clean up the history */
((struct console_input *)obj)->mode = mode;
ret = 1;
}
else if (obj->ops == &screen_buffer_ops)
{
((struct screen_buffer *)obj)->mode = mode;
ret = 1;
}
else set_error( STATUS_OBJECT_TYPE_MISMATCH );
release_object( obj );
return ret;
}
/* retrieve a pointer to the console input records */
static int read_console_input( struct console_input *console, struct async *async, int flush )
{
......@@ -2003,18 +1957,6 @@ DECL_HANDLER(get_console_input_info)
release_object( console );
}
/* get a console mode (input or output) */
DECL_HANDLER(get_console_mode)
{
reply->mode = get_console_mode( req->handle );
}
/* set a console mode (input or output) */
DECL_HANDLER(set_console_mode)
{
set_console_mode( req->handle, req->mode );
}
/* appends a string to console's history */
DECL_HANDLER(append_console_input_history)
{
......
server/protocol.def
View file @ 0e46dd09
......@@ -1501,20 +1501,6 @@ enum server_fd_type
obj_handle_t event;
@END
/* Get a console mode (input or output) */
@REQ(get_console_mode)
obj_handle_t handle; /* handle to the console */
@REPLY
int mode; /* console mode */
@END
/* Set a console mode (input or output) */
@REQ(set_console_mode)
obj_handle_t handle; /* handle to the console */
int mode; /* console mode */
@END
/* Set info about a console (input only) */
@REQ(set_console_input_info)
......
server/request.h
View file @ 0e46dd09
......@@ -185,8 +185,6 @@ DECL_HANDLER(free_console);
DECL_HANDLER(open_console);
DECL_HANDLER(attach_console);
DECL_HANDLER(get_console_wait_event);
DECL_HANDLER(get_console_mode);
DECL_HANDLER(set_console_mode);
DECL_HANDLER(set_console_input_info);
DECL_HANDLER(get_console_input_info);
DECL_HANDLER(append_console_input_history);
......@@ -481,8 +479,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] =
(req_handler)req_open_console,
(req_handler)req_attach_console,
(req_handler)req_get_console_wait_event,
(req_handler)req_get_console_mode,
(req_handler)req_set_console_mode,
(req_handler)req_set_console_input_info,
(req_handler)req_get_console_input_info,
(req_handler)req_append_console_input_history,
......@@ -1141,13 +1137,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 get_console_mode_request, handle) == 12 );
C_ASSERT( sizeof(struct get_console_mode_request) == 16 );
C_ASSERT( FIELD_OFFSET(struct get_console_mode_reply, mode) == 8 );
C_ASSERT( sizeof(struct get_console_mode_reply) == 16 );
C_ASSERT( FIELD_OFFSET(struct set_console_mode_request, handle) == 12 );
C_ASSERT( FIELD_OFFSET(struct set_console_mode_request, mode) == 16 );
C_ASSERT( sizeof(struct set_console_mode_request) == 24 );
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 );
......
server/trace.c
View file @ 0e46dd09
......@@ -2063,22 +2063,6 @@ static void dump_get_console_wait_event_reply( const struct get_console_wait_eve
fprintf( stderr, " event=%04x", req->event );
}
static void dump_get_console_mode_request( const struct get_console_mode_request *req )
{
fprintf( stderr, " handle=%04x", req->handle );
}
static void dump_get_console_mode_reply( const struct get_console_mode_reply *req )
{
fprintf( stderr, " mode=%d", req->mode );
}
static void dump_set_console_mode_request( const struct set_console_mode_request *req )
{
fprintf( stderr, " handle=%04x", req->handle );
fprintf( stderr, ", mode=%d", req->mode );
}
static void dump_set_console_input_info_request( const struct set_console_input_info_request *req )
{
fprintf( stderr, " handle=%04x", req->handle );
......@@ -4590,8 +4574,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = {
(dump_func)dump_open_console_request,
(dump_func)dump_attach_console_request,
(dump_func)dump_get_console_wait_event_request,
(dump_func)dump_get_console_mode_request,
(dump_func)dump_set_console_mode_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,
......@@ -4883,8 +4865,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = {
(dump_func)dump_open_console_reply,
(dump_func)dump_attach_console_reply,
(dump_func)dump_get_console_wait_event_reply,
(dump_func)dump_get_console_mode_reply,
NULL,
NULL,
(dump_func)dump_get_console_input_info_reply,
NULL,
......@@ -5176,8 +5156,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = {
"open_console",
"attach_console",
"get_console_wait_event",
"get_console_mode",
"set_console_mode",
"set_console_input_info",
"get_console_input_info",
"append_console_input_history",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment