diff --git a/include/wine/condrv.h b/include/wine/condrv.h index a8b7c049158..2ead8a2f29f 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -41,6 +41,13 @@ /* console renderer ioctls */ #define IOCTL_CONDRV_GET_RENDERER_EVENTS CTL_CODE(FILE_DEVICE_CONSOLE, 70, METHOD_BUFFERED, FILE_READ_PROPERTIES) +/* structure for console char/attribute info */ +typedef struct +{ + WCHAR ch; + unsigned short attr; +} char_info_t; + /* IOCTL_CONDRV_GET_INPUT_INFO result */ struct condrv_input_info { diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 730e368f0c9..e6e772553cf 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -353,13 +353,6 @@ typedef union } message_data_t; -typedef struct -{ - WCHAR ch; - unsigned short attr; -} char_info_t; - - struct filesystem_event { int action; @@ -2019,26 +2012,6 @@ enum char_info_mode -struct fill_console_output_request -{ - struct request_header __header; - obj_handle_t handle; - int x; - int y; - int mode; - int count; - int wrap; - char_info_t data; -}; -struct fill_console_output_reply -{ - struct reply_header __header; - int written; - char __pad_12[4]; -}; - - - struct read_console_output_request { struct request_header __header; @@ -5674,7 +5647,6 @@ enum request REQ_get_console_input_history, REQ_create_console_output, REQ_write_console_output, - REQ_fill_console_output, REQ_read_console_output, REQ_move_console_output, REQ_send_console_signal, @@ -5969,7 +5941,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 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; struct move_console_output_request move_console_output_request; struct send_console_signal_request send_console_signal_request; @@ -6262,7 +6233,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 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; struct move_console_output_reply move_console_output_reply; struct send_console_signal_reply send_console_signal_reply; @@ -6482,7 +6452,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 625 +#define SERVER_PROTOCOL_VERSION 626 /* ### protocol_version end ### */ diff --git a/server/console.c b/server/console.c index a5ddd82478a..739664bf8e6 100644 --- a/server/console.c +++ b/server/console.c @@ -2080,26 +2080,6 @@ DECL_HANDLER(write_console_output) } } -/* fill a screen buffer with constant data (chars and/or attributes) */ -DECL_HANDLER(fill_console_output) -{ - struct screen_buffer *screen_buffer; - - if ((screen_buffer = (struct screen_buffer*)get_handle_obj( current->process, req->handle, - FILE_WRITE_DATA, &screen_buffer_ops))) - { - if (console_input_is_bare( screen_buffer->input )) - { - set_error( STATUS_OBJECT_TYPE_MISMATCH ); - release_object( screen_buffer ); - return; - } - reply->written = fill_console_output( screen_buffer, req->data, req->mode, - req->x, req->y, req->count, req->wrap ); - release_object( screen_buffer ); - } -} - /* move a rect of data in a screen buffer */ DECL_HANDLER(move_console_output) { diff --git a/server/protocol.def b/server/protocol.def index 90c695ec0b0..03e567c3dd4 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -368,13 +368,6 @@ typedef union struct winevent_msg_data winevent; } message_data_t; -/* structure for console char/attribute info */ -typedef struct -{ - WCHAR ch; - unsigned short attr; -} char_info_t; - /* structure returned in filesystem events */ struct filesystem_event { @@ -1592,20 +1585,6 @@ enum char_info_mode }; -/* fill a screen buffer with constant data (chars and/or attributes) */ -@REQ(fill_console_output) - obj_handle_t handle; /* handle to the console output */ - int x; /* position where to start writing */ - int y; - int mode; /* char info mode */ - int count; /* number to write */ - int wrap; /* wrap around at end of line? */ - char_info_t data; /* data to write */ -@REPLY - int written; /* number of char infos actually written */ -@END - - /* read data (chars and/or attributes) from a screen buffer */ @REQ(read_console_output) obj_handle_t handle; /* handle to the console output */ diff --git a/server/request.h b/server/request.h index deb547267a5..0b271b8479a 100644 --- a/server/request.h +++ b/server/request.h @@ -191,7 +191,6 @@ DECL_HANDLER(append_console_input_history); DECL_HANDLER(get_console_input_history); DECL_HANDLER(create_console_output); DECL_HANDLER(write_console_output); -DECL_HANDLER(fill_console_output); DECL_HANDLER(read_console_output); DECL_HANDLER(move_console_output); DECL_HANDLER(send_console_signal); @@ -485,7 +484,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_write_console_output, - (req_handler)req_fill_console_output, (req_handler)req_read_console_output, (req_handler)req_move_console_output, (req_handler)req_send_console_signal, @@ -711,7 +709,6 @@ C_ASSERT( sizeof(apc_result_t) == 40 ); C_ASSERT( sizeof(async_data_t) == 40 ); C_ASSERT( sizeof(atom_t) == 4 ); C_ASSERT( sizeof(char) == 1 ); -C_ASSERT( sizeof(char_info_t) == 4 ); C_ASSERT( sizeof(client_cpu_t) == 4 ); C_ASSERT( sizeof(client_ptr_t) == 8 ); C_ASSERT( sizeof(data_size_t) == 4 ); @@ -1182,16 +1179,6 @@ C_ASSERT( FIELD_OFFSET(struct write_console_output_reply, written) == 8 ); C_ASSERT( FIELD_OFFSET(struct write_console_output_reply, width) == 12 ); C_ASSERT( FIELD_OFFSET(struct write_console_output_reply, height) == 16 ); C_ASSERT( sizeof(struct write_console_output_reply) == 24 ); -C_ASSERT( FIELD_OFFSET(struct fill_console_output_request, handle) == 12 ); -C_ASSERT( FIELD_OFFSET(struct fill_console_output_request, x) == 16 ); -C_ASSERT( FIELD_OFFSET(struct fill_console_output_request, y) == 20 ); -C_ASSERT( FIELD_OFFSET(struct fill_console_output_request, mode) == 24 ); -C_ASSERT( FIELD_OFFSET(struct fill_console_output_request, count) == 28 ); -C_ASSERT( FIELD_OFFSET(struct fill_console_output_request, wrap) == 32 ); -C_ASSERT( FIELD_OFFSET(struct fill_console_output_request, data) == 36 ); -C_ASSERT( sizeof(struct fill_console_output_request) == 40 ); -C_ASSERT( FIELD_OFFSET(struct fill_console_output_reply, written) == 8 ); -C_ASSERT( sizeof(struct fill_console_output_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct read_console_output_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct read_console_output_request, x) == 16 ); C_ASSERT( FIELD_OFFSET(struct read_console_output_request, y) == 20 ); diff --git a/server/trace.c b/server/trace.c index d244589bae9..a35b6c19189 100644 --- a/server/trace.c +++ b/server/trace.c @@ -108,13 +108,6 @@ static void dump_rectangle( const char *prefix, const rectangle_t *rect ) rect->left, rect->top, rect->right, rect->bottom ); } -static void dump_char_info( const char *prefix, const char_info_t *info ) -{ - fprintf( stderr, "%s{'", prefix ); - dump_strW( &info->ch, sizeof(info->ch), stderr, "\'\'" ); - fprintf( stderr, "',%04x}", info->attr ); -} - static void dump_ioctl_code( const char *prefix, const ioctl_code_t *code ) { switch(*code) @@ -2143,22 +2136,6 @@ static void dump_write_console_output_reply( const struct write_console_output_r fprintf( stderr, ", height=%d", req->height ); } -static void dump_fill_console_output_request( const struct fill_console_output_request *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", x=%d", req->x ); - fprintf( stderr, ", y=%d", req->y ); - fprintf( stderr, ", mode=%d", req->mode ); - fprintf( stderr, ", count=%d", req->count ); - fprintf( stderr, ", wrap=%d", req->wrap ); - dump_char_info( ", data=", &req->data ); -} - -static void dump_fill_console_output_reply( const struct fill_console_output_reply *req ) -{ - fprintf( stderr, " written=%d", req->written ); -} - static void dump_read_console_output_request( const struct read_console_output_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4580,7 +4557,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_write_console_output_request, - (dump_func)dump_fill_console_output_request, (dump_func)dump_read_console_output_request, (dump_func)dump_move_console_output_request, (dump_func)dump_send_console_signal_request, @@ -4871,7 +4847,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, (dump_func)dump_write_console_output_reply, - (dump_func)dump_fill_console_output_reply, (dump_func)dump_read_console_output_reply, NULL, NULL, @@ -5162,7 +5137,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "get_console_input_history", "create_console_output", "write_console_output", - "fill_console_output", "read_console_output", "move_console_output", "send_console_signal", diff --git a/tools/make_requests b/tools/make_requests index 60324d07989..cd3405e47d3 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -45,7 +45,6 @@ my %formats = "timeout_t" => [ 8, 8, "&dump_timeout" ], "abstime_t" => [ 8, 8, "&dump_abstime" ], "rectangle_t" => [ 16, 4, "&dump_rectangle" ], - "char_info_t" => [ 4, 2, "&dump_char_info" ], "apc_call_t" => [ 48, 8, "&dump_apc_call" ], "apc_result_t" => [ 40, 8, "&dump_apc_result" ], "async_data_t" => [ 40, 8, "&dump_async_data" ],