August 2020 - Wine-commits - list.winehq.org

Martin Storsjo : winedump: Fix the dumping of arm64 packed float restoration.
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: wine Branch: master Commit: 7ca68a86313e39d21cc92eac84a00841318143ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ca68a86313e39d21cc92eac… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Aug 28 12:45:36 2020 +0300 winedump: Fix the dumping of arm64 packed float restoration. This previously dumped one register pair too few. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/pe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index f03c523be0..fef95c6bb6 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1412,7 +1412,7 @@ static void dump_arm64_packed_info( const struct runtime_function_arm64 *func ) { if (func->u.s.RegF % 2 == 0) printf( " %04x: str d%u,[sp,#%#x]\n", pos++, 8 + func->u.s.RegF, intsz + fpsz - 8 ); - for (i = func->u.s.RegF / 2 - 1; i >= 0; i--) + for (i = (func->u.s.RegF - 1)/ 2; i >= 0; i--) { if (!i && !intsz) printf( " %04x: stp d8,d9,[sp,-#%#x]!\n", pos++, savesz );

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_GET_OUTPUT_INFO.
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: wine Branch: master Commit: df8578da8ef4f6e9e480e1c49cd82ebdf8281d38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df8578da8ef4f6e9e480e1c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 28 14:25:13 2020 +0200 conhost: Implement IOCTL_CONDRV_GET_OUTPUT_INFO. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 7c20cd4eb3..f20d8c29ec 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -42,6 +42,16 @@ struct history_line WCHAR text[1]; }; +struct font_info +{ + short int width; + short int height; + short int weight; + short int pitch_family; + WCHAR *face_name; + size_t face_len; +}; + struct console { HANDLE server; /* console server handle */ @@ -70,6 +80,17 @@ struct screen_buffer unsigned int mode; /* output mode */ unsigned int width; /* size (w-h) of the screen buffer */ unsigned int height; + unsigned int cursor_size; /* size of cursor (percentage filled) */ + unsigned int cursor_visible;/* cursor visibility flag */ + unsigned int cursor_x; /* position of cursor */ + unsigned int cursor_y; /* position of cursor */ + unsigned short attr; /* default fill attributes (screen colors) */ + unsigned short popup_attr; /* pop-up color attributes */ + unsigned int max_width; /* size (w-h) of the window given font size */ + unsigned int max_height; + unsigned int color_map[16]; /* color table */ + RECT win; /* current visible window on the screen buffer */ + struct font_info font; /* console font information */ struct wine_rb_entry entry; /* map entry */ }; @@ -104,8 +125,27 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->console = console; screen_buffer->id = id; screen_buffer->mode = ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT; + screen_buffer->cursor_size = 100; + screen_buffer->cursor_visible = 1; + screen_buffer->cursor_x = 0; + screen_buffer->cursor_y = 0; screen_buffer->width = width; screen_buffer->height = height; + screen_buffer->attr = 0x07; + screen_buffer->popup_attr = 0xf5; + screen_buffer->max_width = 80; + screen_buffer->max_height = 25; + screen_buffer->win.left = 0; + screen_buffer->win.right = screen_buffer->max_width - 1; + screen_buffer->win.top = 0; + screen_buffer->win.bottom = screen_buffer->max_height - 1; + screen_buffer->font.width = 0; + screen_buffer->font.height = 0; + screen_buffer->font.weight = FW_NORMAL; + screen_buffer->font.pitch_family = FIXED_PITCH | FF_DONTCARE; + screen_buffer->font.face_name = NULL; + screen_buffer->font.face_len = 0; + memset( screen_buffer->color_map, 0, sizeof(screen_buffer->color_map) ); if (wine_rb_put( &screen_buffer_map, (const void *)id, &screen_buffer->entry )) { @@ -202,6 +242,38 @@ static NTSTATUS write_console_input( struct console *console, const INPUT_RECORD return STATUS_SUCCESS; } +static NTSTATUS get_output_info( struct screen_buffer *screen_buffer, size_t *out_size ) +{ + struct condrv_output_info *info; + + TRACE( "%p\n", screen_buffer ); + + *out_size = min( *out_size, sizeof(*info) + screen_buffer->font.face_len ); + if (!(info = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY; + + info->cursor_size = screen_buffer->cursor_size; + info->cursor_visible = screen_buffer->cursor_visible; + info->cursor_x = screen_buffer->cursor_x; + info->cursor_y = screen_buffer->cursor_y; + info->width = screen_buffer->width; + info->height = screen_buffer->height; + info->attr = screen_buffer->attr; + info->popup_attr = screen_buffer->popup_attr; + info->win_left = screen_buffer->win.left; + info->win_top = screen_buffer->win.top; + info->win_right = screen_buffer->win.right; + info->win_bottom = screen_buffer->win.bottom; + info->max_width = screen_buffer->max_width; + info->max_height = screen_buffer->max_height; + info->font_width = screen_buffer->font.width; + info->font_height = screen_buffer->font.height; + info->font_weight = screen_buffer->font.weight; + info->font_pitch_family = screen_buffer->font.pitch_family; + memcpy( info->color_map, screen_buffer->color_map, sizeof(info->color_map) ); + if (*out_size > sizeof(*info)) memcpy( info + 1, screen_buffer->font.face_name, *out_size - sizeof(*info) ); + return STATUS_SUCCESS; +} + static NTSTATUS set_console_title( struct console *console, const WCHAR *in_title, size_t size ) { WCHAR *title = NULL; @@ -250,6 +322,10 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign TRACE( "set %x mode\n", screen_buffer->mode ); return STATUS_SUCCESS; + case IOCTL_CONDRV_GET_OUTPUT_INFO: + if (in_size || *out_size < sizeof(struct condrv_output_info)) return STATUS_INVALID_PARAMETER; + return get_output_info( screen_buffer, out_size ); + default: FIXME( "unsupported ioctl %x\n", code ); return STATUS_NOT_SUPPORTED;

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_SET_OUTPUT_INFO.
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: wine Branch: master Commit: 151b42953b49bc0417c53656b0040ef765a8cbef URL: https://source.winehq.org/git/wine.git/?a=commit;h=151b42953b49bc0417c53656… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 28 14:25:24 2020 +0200 conhost: Implement IOCTL_CONDRV_SET_OUTPUT_INFO. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 199 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 199 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=151b42953b49bc0417c5…

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_WRITE_OUTPUT.
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: wine Branch: master Commit: 01c05387ce56ad99bd0b629a41317d7058a82462 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01c05387ce56ad99bd0b629a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 28 14:25:37 2020 +0200 conhost: Implement IOCTL_CONDRV_WRITE_OUTPUT. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index a8fd9abf28..4fbfc19a08 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -469,6 +469,82 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, return STATUS_SUCCESS; } +static NTSTATUS write_output( struct screen_buffer *screen_buffer, const struct condrv_output_params *params, + size_t in_size, size_t *out_size ) +{ + unsigned int i, entry_size, entry_cnt, x, y; + char_info_t *dest; + char *src; + + entry_size = params->mode == CHAR_INFO_MODE_TEXTATTR ? sizeof(char_info_t) : sizeof(WCHAR); + entry_cnt = (in_size - sizeof(*params)) / entry_size; + + TRACE( "(%u,%u) cnt %u\n", params->x, params->y, entry_cnt ); + + if (params->x >= screen_buffer->width) + { + *out_size = 0; + return STATUS_SUCCESS; + } + + for (i = 0, src = (char *)(params + 1); i < entry_cnt; i++, src += entry_size) + { + if (params->width) + { + x = params->x + i % params->width; + y = params->y + i / params->width; + if (x >= screen_buffer->width) continue; + } + else + { + x = (params->x + i) % screen_buffer->width; + y = params->y + (params->x + i) / screen_buffer->width; + } + if (y >= screen_buffer->height) break; + + dest = &screen_buffer->data[y * screen_buffer->width + x]; + switch(params->mode) + { + case CHAR_INFO_MODE_TEXT: + dest->ch = *(const WCHAR *)src; + break; + case CHAR_INFO_MODE_ATTR: + dest->attr = *(const unsigned short *)src; + break; + case CHAR_INFO_MODE_TEXTATTR: + *dest = *(const char_info_t *)src; + break; + case CHAR_INFO_MODE_TEXTSTDATTR: + dest->ch = *(const WCHAR *)src; + dest->attr = screen_buffer->attr; + break; + default: + return STATUS_INVALID_PARAMETER; + } + } + + if (*out_size == sizeof(SMALL_RECT)) + { + SMALL_RECT *region; + unsigned int width = params->width; + x = params->x; + y = params->y; + if (!(region = alloc_ioctl_buffer( sizeof(*region )))) return STATUS_NO_MEMORY; + region->Left = x; + region->Top = y; + region->Right = min( x + width, screen_buffer->width ) - 1; + region->Bottom = min( y + entry_cnt / width, screen_buffer->height ) - 1; + } + else + { + DWORD *result; + if (!(result = alloc_ioctl_buffer( sizeof(*result )))) return STATUS_NO_MEMORY; + *result = i; + } + + return STATUS_SUCCESS; +} + static NTSTATUS set_console_title( struct console *console, const WCHAR *in_title, size_t size ) { WCHAR *title = NULL; @@ -517,6 +593,12 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign TRACE( "set %x mode\n", screen_buffer->mode ); return STATUS_SUCCESS; + case IOCTL_CONDRV_WRITE_OUTPUT: + if ((*out_size != sizeof(DWORD) && *out_size != sizeof(SMALL_RECT)) || + in_size < sizeof(struct condrv_output_params)) + return STATUS_INVALID_PARAMETER; + return write_output( screen_buffer, in_data, in_size, out_size ); + case IOCTL_CONDRV_GET_OUTPUT_INFO: if (in_size || *out_size < sizeof(struct condrv_output_info)) return STATUS_INVALID_PARAMETER; return get_output_info( screen_buffer, out_size );

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_READ_OUTPUT.
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: wine Branch: master Commit: f4661f1b38c479bd08baee93d9ddb1f9e93c173d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4661f1b38c479bd08baee93… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 28 14:27:05 2020 +0200 conhost: Implement IOCTL_CONDRV_READ_OUTPUT. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 4fbfc19a08..d17a8f4e68 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -545,6 +545,84 @@ static NTSTATUS write_output( struct screen_buffer *screen_buffer, const struct return STATUS_SUCCESS; } +static NTSTATUS read_output( struct screen_buffer *screen_buffer, const struct condrv_output_params *params, + size_t *out_size ) +{ + enum char_info_mode mode; + unsigned int x, y, width; + unsigned int i, count; + + x = params->x; + y = params->y; + mode = params->mode; + width = params->width; + TRACE( "(%u %u) mode %u width %u\n", x, y, mode, width ); + + switch(mode) + { + case CHAR_INFO_MODE_TEXT: + { + WCHAR *data; + char_info_t *src; + if (x >= screen_buffer->width || y >= screen_buffer->height) + { + *out_size = 0; + return STATUS_SUCCESS; + } + src = screen_buffer->data + y * screen_buffer->width + x; + count = min( screen_buffer->data + screen_buffer->height * screen_buffer->width - src, + *out_size / sizeof(*data) ); + *out_size = count * sizeof(*data); + if (!(data = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY; + for (i = 0; i < count; i++) data[i] = src[i].ch; + } + break; + case CHAR_INFO_MODE_ATTR: + { + unsigned short *data; + char_info_t *src; + if (x >= screen_buffer->width || y >= screen_buffer->height) + { + *out_size = 0; + return STATUS_SUCCESS; + } + src = screen_buffer->data + y * screen_buffer->width + x; + count = min( screen_buffer->data + screen_buffer->height * screen_buffer->width - src, + *out_size / sizeof(*data) ); + *out_size = count * sizeof(*data); + if (!(data = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY; + for (i = 0; i < count; i++) data[i] = src[i].attr; + } + break; + case CHAR_INFO_MODE_TEXTATTR: + { + SMALL_RECT *region; + char_info_t *data; + if (!width || *out_size < sizeof(*region) || x >= screen_buffer->width || y >= screen_buffer->height) + return STATUS_INVALID_PARAMETER; + count = min( (*out_size - sizeof(*region)) / (width * sizeof(*data)), screen_buffer->height - y ); + width = min( width, screen_buffer->width - x ); + *out_size = sizeof(*region) + width * count * sizeof(*data); + if (!(region = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY; + region->Left = x; + region->Top = y; + region->Right = x + width - 1; + region->Bottom = y + count - 1; + data = (char_info_t *)(region + 1); + for (i = 0; i < count; i++) + { + memcpy( &data[i * width], &screen_buffer->data[(y + i) * screen_buffer->width + x], + width * sizeof(*data) ); + } + } + break; + default: + return STATUS_INVALID_PARAMETER; + } + + return STATUS_SUCCESS; +} + static NTSTATUS set_console_title( struct console *console, const WCHAR *in_title, size_t size ) { WCHAR *title = NULL; @@ -599,6 +677,10 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign return STATUS_INVALID_PARAMETER; return write_output( screen_buffer, in_data, in_size, out_size ); + case IOCTL_CONDRV_READ_OUTPUT: + if (in_size != sizeof(struct condrv_output_params)) return STATUS_INVALID_PARAMETER; + return read_output( screen_buffer, in_data, out_size ); + case IOCTL_CONDRV_GET_OUTPUT_INFO: if (in_size || *out_size < sizeof(struct condrv_output_info)) return STATUS_INVALID_PARAMETER; return get_output_info( screen_buffer, out_size );

1 0

Zebediah Figura : devenum: Correct the size of "name" in register_avicap_devices().
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: wine Branch: master Commit: 7bae2aaf95fa2dd6eae7dc1d688e7d4a82b10dde URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bae2aaf95fa2dd6eae7dc1d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Aug 28 11:59:12 2020 -0500 devenum: Correct the size of "name" in register_avicap_devices(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/createdevenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index c72bb683f9..f7b53ad271 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -726,7 +726,7 @@ static void register_avicap_devices(void) REGFILTERPINS2 rgpins = {0}; REGPINTYPES rgtypes; REGFILTER2 rgf; - WCHAR name[6]; + WCHAR name[7]; VARIANT var; HRESULT hr; int i = 0;

1 0

Jacek Caban : server: Allow passing screen buffer ioctls to conhost.
by Alexandre Julliard 27 Aug '20

27 Aug '20

Module: wine Branch: master Commit: 15684bd5aa557562072a749ab4782489fcd27546 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15684bd5aa557562072a749a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 27 15:04:27 2020 +0200 server: Allow passing screen buffer ioctls to conhost. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 4 ++++ include/wine/server_protocol.h | 4 +++- server/console.c | 47 ++++++++++++++++++++++++++++++------------ server/protocol.def | 1 + server/request.h | 5 +++-- server/trace.c | 1 + 6 files changed, 46 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=15684bd5aa557562072a…

1 0

Jacek Caban : conhost: Initial support for screen buffers.
by Alexandre Julliard 27 Aug '20

27 Aug '20

Module: wine Branch: master Commit: 029843176b11404a77384b40ca3e9a99226477fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=029843176b11404a77384b40… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 27 15:04:48 2020 +0200 conhost: Initial support for screen buffers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 100 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 2 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 05a160f9cc..a5d9a8feeb 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -31,6 +31,7 @@ #include "wine/condrv.h" #include "wine/server.h" +#include "wine/rbtree.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(conhost); @@ -45,6 +46,7 @@ struct console { HANDLE server; /* console server handle */ unsigned int mode; /* input mode */ + struct screen_buffer *active; /* active screen buffer */ INPUT_RECORD *records; /* input records */ unsigned int record_count; /* number of input records */ unsigned int record_size; /* size of input records buffer */ @@ -61,6 +63,15 @@ struct console unsigned int win; /* window handle if backend supports it */ }; +struct screen_buffer +{ + struct console *console; /* console reference */ + unsigned int id; /* screen buffer id */ + unsigned int width; /* size (w-h) of the screen buffer */ + unsigned int height; + struct wine_rb_entry entry; /* map entry */ +}; + static void *ioctl_buffer; static size_t ioctl_buffer_size; @@ -76,6 +87,41 @@ static void *alloc_ioctl_buffer( size_t size ) return ioctl_buffer; } +static int screen_buffer_compare_id( const void *key, const struct wine_rb_entry *entry ) +{ + struct screen_buffer *screen_buffer = WINE_RB_ENTRY_VALUE( entry, struct screen_buffer, entry ); + return (unsigned int)key - screen_buffer->id; +} + +static struct wine_rb_tree screen_buffer_map = { screen_buffer_compare_id }; + +static struct screen_buffer *create_screen_buffer( struct console *console, int id, int width, int height ) +{ + struct screen_buffer *screen_buffer; + + if (!(screen_buffer = malloc( sizeof(*screen_buffer) ))) return NULL; + screen_buffer->console = console; + screen_buffer->id = id; + screen_buffer->width = width; + screen_buffer->height = height; + + if (wine_rb_put( &screen_buffer_map, (const void *)id, &screen_buffer->entry )) + { + ERR( "id %x already exists\n", id ); + return NULL; + } + + return screen_buffer; +} + +static void destroy_screen_buffer( struct screen_buffer *screen_buffer ) +{ + if (screen_buffer->console->active == screen_buffer) + screen_buffer->console->active = NULL; + wine_rb_remove( &screen_buffer_map, &screen_buffer->entry ); + free( screen_buffer ); +} + static NTSTATUS read_console_input( struct console *console, size_t out_size ) { size_t count = min( out_size / sizeof(INPUT_RECORD), console->record_count ); @@ -158,7 +204,7 @@ static NTSTATUS set_console_title( struct console *console, const WCHAR *in_titl { WCHAR *title = NULL; - TRACE( "%s\n", debugstr_wn(in_title, size) ); + TRACE( "%s\n", debugstr_wn(in_title, size / sizeof(WCHAR)) ); if (size) { @@ -171,6 +217,27 @@ static NTSTATUS set_console_title( struct console *console, const WCHAR *in_titl return STATUS_SUCCESS; } +static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsigned int code, + const void *in_data, size_t in_size, size_t *out_size ) +{ + switch (code) + { + case IOCTL_CONDRV_CLOSE_OUTPUT: + if (in_size || *out_size) return STATUS_INVALID_PARAMETER; + destroy_screen_buffer( screen_buffer ); + return STATUS_SUCCESS; + + case IOCTL_CONDRV_ACTIVATE: + if (in_size || *out_size) return STATUS_INVALID_PARAMETER; + screen_buffer->console->active = screen_buffer; + return STATUS_SUCCESS; + + default: + FIXME( "unsupported ioctl %x\n", code ); + return STATUS_NOT_SUPPORTED; + } +} + static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, const void *in_data, size_t in_size, size_t *out_size ) { @@ -324,6 +391,7 @@ static NTSTATUS process_console_ioctls( struct console *console ) { size_t out_size = 0, in_size; unsigned int code; + int output; NTSTATUS status = STATUS_SUCCESS; for (;;) @@ -339,6 +407,7 @@ static NTSTATUS process_console_ioctls( struct console *console ) wine_server_set_reply( req, ioctl_buffer, ioctl_buffer_size ); status = wine_server_call( req ); code = reply->code; + output = reply->output; out_size = reply->out_size; in_size = wine_server_reply_size( reply ); } @@ -357,7 +426,32 @@ static NTSTATUS process_console_ioctls( struct console *console ) return status; } - status = console_input_ioctl( console, code, ioctl_buffer, in_size, &out_size ); + if (code == IOCTL_CONDRV_INIT_OUTPUT) + { + TRACE( "initializing output %x\n", output ); + if (console->active) + create_screen_buffer( console, output, console->active->width, console->active->height ); + else + create_screen_buffer( console, output, 80, 150 ); + } + else if (!output) + { + status = console_input_ioctl( console, code, ioctl_buffer, in_size, &out_size ); + } + else + { + struct wine_rb_entry *entry; + if (!(entry = wine_rb_get( &screen_buffer_map, (const void *)output ))) + { + ERR( "invalid screen buffer id %x\n", output ); + status = STATUS_INVALID_HANDLE; + } + else + { + status = screen_buffer_ioctl( WINE_RB_ENTRY_VALUE( entry, struct screen_buffer, entry ), code, + ioctl_buffer, in_size, &out_size ); + } + } } } @@ -484,5 +578,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) return 1; } + if (!(console.active = create_screen_buffer( &console, 1, width, height ))) return 1; + return main_loop( &console, signal ); }

1 0

Jacek Caban : server: Forward screen buffer ioctls to conhost if possible.
by Alexandre Julliard 27 Aug '20

27 Aug '20

Module: wine Branch: master Commit: eb293d7645eddbac8e94086a58d460b4407f4b58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb293d7645eddbac8e94086a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 27 15:05:09 2020 +0200 server: Forward screen buffer ioctls to conhost if possible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/server/console.c b/server/console.c index 7a2ebc1b71..93ea509ae4 100644 --- a/server/console.c +++ b/server/console.c @@ -261,6 +261,7 @@ struct screen_buffer * as seen in wineconsole */ struct font_info font; /* console font information */ struct fd *fd; /* for bare console, attached output fd */ + struct async_queue ioctl_q; /* ioctl queue */ }; static void screen_buffer_dump( struct object *obj, int verbose ); @@ -679,6 +680,7 @@ static struct object *create_console_output( struct console_input *console_input screen_buffer->font.face_name = NULL; screen_buffer->font.face_len = 0; memset( screen_buffer->color_map, 0, sizeof(screen_buffer->color_map) ); + init_async_queue( &screen_buffer->ioctl_q ); list_add_head( &screen_buffer_list, &screen_buffer->entry ); if (fd != -1) @@ -1290,6 +1292,7 @@ static void screen_buffer_destroy( struct object *obj ) queue_host_ioctl( screen_buffer->input->server, IOCTL_CONDRV_CLOSE_OUTPUT, screen_buffer->id, NULL, NULL ); if (screen_buffer->fd) release_object( screen_buffer->fd ); + free_async_queue( &screen_buffer->ioctl_q ); free( screen_buffer->data ); free( screen_buffer->font.face_name ); } @@ -1854,6 +1857,9 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * switch (code) { case IOCTL_CONDRV_GET_MODE: + if (screen_buffer->input && screen_buffer->input->server) + return queue_host_ioctl( screen_buffer->input->server, code, screen_buffer->id, + async, &screen_buffer->ioctl_q ); if (get_reply_max_size() != sizeof(screen_buffer->mode)) { set_error( STATUS_INVALID_PARAMETER ); @@ -1862,6 +1868,9 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * return set_reply_data( &screen_buffer->mode, sizeof(screen_buffer->mode) ) != NULL; case IOCTL_CONDRV_SET_MODE: + if (screen_buffer->input && screen_buffer->input->server) + return queue_host_ioctl( screen_buffer->input->server, code, screen_buffer->id, + async, &screen_buffer->ioctl_q ); if (get_req_data_size() != sizeof(screen_buffer->mode)) { set_error( STATUS_INVALID_PARAMETER ); @@ -1873,6 +1882,9 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * case IOCTL_CONDRV_READ_OUTPUT: { const struct condrv_output_params *params = get_req_data(); + if (screen_buffer->input && screen_buffer->input->server) + return queue_host_ioctl( screen_buffer->input->server, code, screen_buffer->id, + async, &screen_buffer->ioctl_q ); if (get_req_data_size() != sizeof(*params)) { set_error( STATUS_INVALID_PARAMETER ); @@ -1888,6 +1900,9 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * } case IOCTL_CONDRV_WRITE_OUTPUT: + if (screen_buffer->input && screen_buffer->input->server) + return queue_host_ioctl( screen_buffer->input->server, code, screen_buffer->id, + async, &screen_buffer->ioctl_q ); if (get_req_data_size() < sizeof(struct condrv_output_params) || (get_reply_max_size() != sizeof(SMALL_RECT) && get_reply_max_size() != sizeof(unsigned int))) { @@ -1907,6 +1922,9 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * struct condrv_output_info *info; data_size_t size; + if (screen_buffer->input && screen_buffer->input->server) + return queue_host_ioctl( screen_buffer->input->server, code, screen_buffer->id, + async, &screen_buffer->ioctl_q ); size = min( sizeof(*info) + screen_buffer->font.face_len, get_reply_max_size() ); if (size < sizeof(*info)) { @@ -1942,6 +1960,9 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * case IOCTL_CONDRV_SET_OUTPUT_INFO: { const struct condrv_output_info_params *params = get_req_data(); + if (screen_buffer->input && screen_buffer->input->server) + return queue_host_ioctl( screen_buffer->input->server, code, screen_buffer->id, + async, &screen_buffer->ioctl_q ); if (get_req_data_size() < sizeof(*params)) { set_error( STATUS_INVALID_PARAMETER ); @@ -1956,6 +1977,10 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * } case IOCTL_CONDRV_ACTIVATE: + if (screen_buffer->input && screen_buffer->input->server) + return queue_host_ioctl( screen_buffer->input->server, code, screen_buffer->id, + async, &screen_buffer->ioctl_q ); + if (!screen_buffer->input) { set_error( STATUS_INVALID_HANDLE ); @@ -1970,6 +1995,9 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * const struct condrv_fill_output_params *params = get_req_data(); char_info_t data; DWORD written; + if (screen_buffer->input && screen_buffer->input->server) + return queue_host_ioctl( screen_buffer->input->server, code, screen_buffer->id, + async, &screen_buffer->ioctl_q ); if (get_req_data_size() != sizeof(*params) || (get_reply_max_size() && get_reply_max_size() != sizeof(written))) { @@ -1989,6 +2017,11 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * { const struct condrv_scroll_params *params = get_req_data(); rectangle_t clip; + + if (screen_buffer->input && screen_buffer->input->server) + return queue_host_ioctl( screen_buffer->input->server, code, screen_buffer->id, + async, &screen_buffer->ioctl_q ); + if (get_req_data_size() != sizeof(*params)) { set_error( STATUS_INVALID_PARAMETER );

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_GET_MODE.
by Alexandre Julliard 27 Aug '20

27 Aug '20

Module: wine Branch: master Commit: e5bd1ba4ad4802c3f589fc91b8953205af52a978 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5bd1ba4ad4802c3f589fc91… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 27 15:05:25 2020 +0200 conhost: Implement IOCTL_CONDRV_GET_MODE. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 8 ++++++-- programs/conhost/conhost.c | 12 ++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 09c48ee705..5efe4ee38c 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3945,7 +3945,7 @@ static void test_AllocConsole(void) CloseHandle(pipe_write); } -static void test_pseudo_console_child(HANDLE input) +static void test_pseudo_console_child(HANDLE input, HANDLE output) { DWORD mode; BOOL ret; @@ -3967,6 +3967,10 @@ static void test_pseudo_console_child(HANDLE input) ret = SetConsoleMode(input, mode | ENABLE_AUTO_POSITION); ok(ret, "SetConsoleMode failed: %u\n", GetLastError()); + ret = GetConsoleMode(output, &mode); + ok(ret, "GetConsoleMode failed: %u\n", GetLastError()); + ok(mode == (ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT), "mode = %x\n", mode); + test_console_title(); test_WriteConsoleInputW(input); } @@ -4144,7 +4148,7 @@ START_TEST(console) if (using_pseudo_console) { - test_pseudo_console_child(hConIn); + test_pseudo_console_child(hConIn, hConOut); return; } diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index a5d9a8feeb..06d2b15d2a 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -67,6 +67,7 @@ struct screen_buffer { struct console *console; /* console reference */ unsigned int id; /* screen buffer id */ + unsigned int mode; /* output mode */ unsigned int width; /* size (w-h) of the screen buffer */ unsigned int height; struct wine_rb_entry entry; /* map entry */ @@ -102,6 +103,7 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int if (!(screen_buffer = malloc( sizeof(*screen_buffer) ))) return NULL; screen_buffer->console = console; screen_buffer->id = id; + screen_buffer->mode = ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT; screen_buffer->width = width; screen_buffer->height = height; @@ -232,6 +234,16 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign screen_buffer->console->active = screen_buffer; return STATUS_SUCCESS; + case IOCTL_CONDRV_GET_MODE: + { + DWORD *mode; + TRACE( "returning mode %x\n", screen_buffer->mode ); + if (in_size || *out_size != sizeof(*mode)) return STATUS_INVALID_PARAMETER; + if (!(mode = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY; + *mode = screen_buffer->mode; + return STATUS_SUCCESS; + } + default: FIXME( "unsupported ioctl %x\n", code ); return STATUS_NOT_SUPPORTED;

1 0