Skip to content

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

server: Remove no longer needed get_console_output_info request.

Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 56ee3a8a
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 162 deletions
include/wine/server_protocol.h
View file @ 0a57d385
......@@ -2059,39 +2059,6 @@ struct set_console_output_info_reply
struct get_console_output_info_request
{
struct request_header __header;
obj_handle_t handle;
};
struct get_console_output_info_reply
{
struct reply_header __header;
short int cursor_size;
short int cursor_visible;
short int cursor_x;
short int cursor_y;
short int width;
short int height;
short int attr;
short int popup_attr;
short int win_left;
short int win_top;
short int win_right;
short int win_bottom;
short int max_width;
short int max_height;
short int font_width;
short int font_height;
short int font_weight;
short int font_pitch_family;
/* VARARG(colors,uints,64); */
/* VARARG(face_name,unicode_str); */
char __pad_44[4];
};
struct write_console_output_request
{
struct request_header __header;
......@@ -5777,7 +5744,6 @@ enum request
REQ_get_console_input_history,
REQ_create_console_output,
REQ_set_console_output_info,
REQ_get_console_output_info,
REQ_write_console_output,
REQ_fill_console_output,
REQ_read_console_output,
......@@ -6076,7 +6042,6 @@ union generic_request
struct get_console_input_history_request get_console_input_history_request;
struct create_console_output_request create_console_output_request;
struct set_console_output_info_request set_console_output_info_request;
struct get_console_output_info_request get_console_output_info_request;
struct write_console_output_request write_console_output_request;
struct fill_console_output_request fill_console_output_request;
struct read_console_output_request read_console_output_request;
......@@ -6373,7 +6338,6 @@ union generic_reply
struct get_console_input_history_reply get_console_input_history_reply;
struct create_console_output_reply create_console_output_reply;
struct set_console_output_info_reply set_console_output_info_reply;
struct get_console_output_info_reply get_console_output_info_reply;
struct write_console_output_reply write_console_output_reply;
struct fill_console_output_reply fill_console_output_reply;
struct read_console_output_reply read_console_output_reply;
......@@ -6595,7 +6559,7 @@ union generic_reply
/* ### protocol_version begin ### */
#define SERVER_PROTOCOL_VERSION 621
#define SERVER_PROTOCOL_VERSION 622
/* ### protocol_version end ### */
......
server/console.c
View file @ 0a57d385
......@@ -2035,49 +2035,6 @@ DECL_HANDLER(set_console_output_info)
}
}
/* get info about a console screen buffer */
DECL_HANDLER(get_console_output_info)
{
struct screen_buffer *screen_buffer;
void *data;
data_size_t total;
if ((screen_buffer = (struct screen_buffer *)get_handle_obj( current->process, req->handle,
FILE_READ_PROPERTIES, &screen_buffer_ops)))
{
reply->cursor_size = screen_buffer->cursor_size;
reply->cursor_visible = screen_buffer->cursor_visible;
reply->cursor_x = screen_buffer->cursor_x;
reply->cursor_y = screen_buffer->cursor_y;
reply->width = screen_buffer->width;
reply->height = screen_buffer->height;
reply->attr = screen_buffer->attr;
reply->popup_attr = screen_buffer->popup_attr;
reply->win_left = screen_buffer->win.left;
reply->win_top = screen_buffer->win.top;
reply->win_right = screen_buffer->win.right;
reply->win_bottom = screen_buffer->win.bottom;
reply->max_width = screen_buffer->max_width;
reply->max_height = screen_buffer->max_height;
reply->font_width = screen_buffer->font.width;
reply->font_height = screen_buffer->font.height;
reply->font_weight = screen_buffer->font.weight;
reply->font_pitch_family = screen_buffer->font.pitch_family;
total = min( sizeof(screen_buffer->color_map) + screen_buffer->font.face_len, get_reply_max_size() );
if (total)
{
data = set_reply_data_size( total );
memcpy( data, screen_buffer->color_map, min( total, sizeof(screen_buffer->color_map) ));
if (screen_buffer->font.face_len && total > sizeof(screen_buffer->color_map))
{
memcpy( (char *)data + sizeof(screen_buffer->color_map), screen_buffer->font.face_name,
min( total - sizeof(screen_buffer->color_map), screen_buffer->font.face_len ));
}
}
release_object( screen_buffer );
}
}
/* read data (chars & attrs) from a screen buffer */
DECL_HANDLER(read_console_output)
{
......
server/protocol.def
View file @ 0a57d385
......@@ -1619,33 +1619,6 @@ enum server_fd_type
#define SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR 0x0100
/* Get info about a console (output only) */
@REQ(get_console_output_info)
obj_handle_t handle; /* handle to the console */
@REPLY
short int cursor_size; /* size of cursor (percentage filled) */
short int cursor_visible;/* cursor visibility flag */
short int cursor_x; /* position of cursor (x, y) */
short int cursor_y;
short int width; /* width of the screen buffer */
short int height; /* height of the screen buffer */
short int attr; /* default fill attributes (screen colors) */
short int popup_attr; /* pop-up color attributes */
short int win_left; /* window actually displayed by renderer */
short int win_top; /* the rect area is expressed within the */
short int win_right; /* boundaries of the screen buffer */
short int win_bottom;
short int max_width; /* maximum size (width x height) for the window */
short int max_height;
short int font_width; /* font size (width x height) */
short int font_height;
short int font_weight; /* font weight */
short int font_pitch_family; /* font pitch & family */
VARARG(colors,uints,64); /* color table */
VARARG(face_name,unicode_str); /* font face name */
@END
/* write data (chars and/or attributes) in a screen buffer */
@REQ(write_console_output)
obj_handle_t handle; /* handle to the console output */
......
server/request.h
View file @ 0a57d385
......@@ -193,7 +193,6 @@ DECL_HANDLER(append_console_input_history);
DECL_HANDLER(get_console_input_history);
DECL_HANDLER(create_console_output);
DECL_HANDLER(set_console_output_info);
DECL_HANDLER(get_console_output_info);
DECL_HANDLER(write_console_output);
DECL_HANDLER(fill_console_output);
DECL_HANDLER(read_console_output);
......@@ -491,7 +490,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] =
(req_handler)req_get_console_input_history,
(req_handler)req_create_console_output,
(req_handler)req_set_console_output_info,
(req_handler)req_get_console_output_info,
(req_handler)req_write_console_output,
(req_handler)req_fill_console_output,
(req_handler)req_read_console_output,
......@@ -1208,27 +1206,6 @@ C_ASSERT( FIELD_OFFSET(struct set_console_output_info_request, font_height) == 5
C_ASSERT( FIELD_OFFSET(struct set_console_output_info_request, font_weight) == 52 );
C_ASSERT( FIELD_OFFSET(struct set_console_output_info_request, font_pitch_family) == 54 );
C_ASSERT( sizeof(struct set_console_output_info_request) == 56 );
C_ASSERT( FIELD_OFFSET(struct get_console_output_info_request, handle) == 12 );
C_ASSERT( sizeof(struct get_console_output_info_request) == 16 );
C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, cursor_size) == 8 );
C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, cursor_visible) == 10 );
C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, cursor_x) == 12 );
C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, cursor_y) == 14 );
C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, width) == 16 );
C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, height) == 18 );
C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, attr) == 20 );
C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, popup_attr) == 22 );
C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, win_left) == 24 );
C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, win_top) == 26 );
C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, win_right) == 28 );
C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, win_bottom) == 30 );
C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, max_width) == 32 );
C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, max_height) == 34 );
C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, font_width) == 36 );
C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, font_height) == 38 );
C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, font_weight) == 40 );
C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, font_pitch_family) == 42 );
C_ASSERT( sizeof(struct get_console_output_info_reply) == 48 );
C_ASSERT( FIELD_OFFSET(struct write_console_output_request, handle) == 12 );
C_ASSERT( FIELD_OFFSET(struct write_console_output_request, x) == 16 );
C_ASSERT( FIELD_OFFSET(struct write_console_output_request, y) == 20 );
......
server/trace.c
View file @ 0a57d385
......@@ -2168,35 +2168,6 @@ static void dump_set_console_output_info_request( const struct set_console_outpu
dump_varargs_unicode_str( ", face_name=", cur_size );
}
static void dump_get_console_output_info_request( const struct get_console_output_info_request *req )
{
fprintf( stderr, " handle=%04x", req->handle );
}
static void dump_get_console_output_info_reply( const struct get_console_output_info_reply *req )
{
fprintf( stderr, " cursor_size=%d", req->cursor_size );
fprintf( stderr, ", cursor_visible=%d", req->cursor_visible );
fprintf( stderr, ", cursor_x=%d", req->cursor_x );
fprintf( stderr, ", cursor_y=%d", req->cursor_y );
fprintf( stderr, ", width=%d", req->width );
fprintf( stderr, ", height=%d", req->height );
fprintf( stderr, ", attr=%d", req->attr );
fprintf( stderr, ", popup_attr=%d", req->popup_attr );
fprintf( stderr, ", win_left=%d", req->win_left );
fprintf( stderr, ", win_top=%d", req->win_top );
fprintf( stderr, ", win_right=%d", req->win_right );
fprintf( stderr, ", win_bottom=%d", req->win_bottom );
fprintf( stderr, ", max_width=%d", req->max_width );
fprintf( stderr, ", max_height=%d", req->max_height );
fprintf( stderr, ", font_width=%d", req->font_width );
fprintf( stderr, ", font_height=%d", req->font_height );
fprintf( stderr, ", font_weight=%d", req->font_weight );
fprintf( stderr, ", font_pitch_family=%d", req->font_pitch_family );
dump_varargs_uints( ", colors=", min(cur_size,64) );
dump_varargs_unicode_str( ", face_name=", cur_size );
}
static void dump_write_console_output_request( const struct write_console_output_request *req )
{
fprintf( stderr, " handle=%04x", req->handle );
......@@ -4653,7 +4624,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = {
(dump_func)dump_get_console_input_history_request,
(dump_func)dump_create_console_output_request,
(dump_func)dump_set_console_output_info_request,
(dump_func)dump_get_console_output_info_request,
(dump_func)dump_write_console_output_request,
(dump_func)dump_fill_console_output_request,
(dump_func)dump_read_console_output_request,
......@@ -4948,7 +4918,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = {
(dump_func)dump_get_console_input_history_reply,
(dump_func)dump_create_console_output_reply,
NULL,
(dump_func)dump_get_console_output_info_reply,
(dump_func)dump_write_console_output_reply,
(dump_func)dump_fill_console_output_reply,
(dump_func)dump_read_console_output_reply,
......@@ -5243,7 +5212,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = {
"get_console_input_history",
"create_console_output",
"set_console_output_info",
"get_console_output_info",
"write_console_output",
"fill_console_output",
"read_console_output",
......
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