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

Alexandre Julliard : ntdll: Return the TEB pointer in NtCreateThreadEx().
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: c6fea822a99ca4b5c82e5217a0a631434ad52c29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6fea822a99ca4b5c82e5217… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 13 18:36:56 2020 +0200 ntdll: Return the TEB pointer in NtCreateThreadEx(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 19 ++++++++++++++----- dlls/ntdll/unix/thread.c | 13 ++++++++++--- include/wine/server_protocol.h | 3 ++- server/protocol.def | 1 + 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 4e65b0eab2..9a593f7725 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -533,9 +533,11 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result ) break; case APC_CREATE_THREAD: { - PS_ATTRIBUTE_LIST attr = { sizeof(attr) }; + ULONG_PTR buffer[offsetof( PS_ATTRIBUTE_LIST, Attributes[2] ) / sizeof(ULONG_PTR)]; + PS_ATTRIBUTE_LIST *attr = (PS_ATTRIBUTE_LIST *)buffer; CLIENT_ID id; HANDLE handle; + TEB *teb; SIZE_T reserve = call->create_thread.reserve; SIZE_T commit = call->create_thread.commit; void *func = wine_server_get_ptr( call->create_thread.func ); @@ -545,16 +547,23 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result ) if (reserve == call->create_thread.reserve && commit == call->create_thread.commit && (ULONG_PTR)func == call->create_thread.func && (ULONG_PTR)arg == call->create_thread.arg) { - attr.Attributes[0].Attribute = PS_ATTRIBUTE_CLIENT_ID; - attr.Attributes[0].Size = sizeof(id); - attr.Attributes[0].ValuePtr = &id; + attr->TotalLength = sizeof(buffer); + attr->Attributes[0].Attribute = PS_ATTRIBUTE_CLIENT_ID; + attr->Attributes[0].Size = sizeof(id); + attr->Attributes[0].ValuePtr = &id; + attr->Attributes[0].ReturnLength = NULL; + attr->Attributes[1].Attribute = PS_ATTRIBUTE_TEB_ADDRESS; + attr->Attributes[1].Size = sizeof(teb); + attr->Attributes[1].ValuePtr = &teb; + attr->Attributes[1].ReturnLength = NULL; result->create_thread.status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, NULL, NtCurrentProcess(), func, arg, call->create_thread.flags, 0, - commit, reserve, &attr ); + commit, reserve, attr ); result->create_thread.handle = wine_server_obj_handle( handle ); result->create_thread.pid = HandleToULong(id.UniqueProcess); result->create_thread.tid = HandleToULong(id.UniqueThread); + result->create_thread.teb = wine_server_client_ptr( teb ); } else result->create_thread.status = STATUS_INVALID_PARAMETER; break; diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 78da6ae638..6c64eecf1f 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -123,7 +123,7 @@ static void start_thread( TEB *teb ) * * Update the output attributes. */ -static void update_attr_list( PS_ATTRIBUTE_LIST *attr, const CLIENT_ID *id ) +static void update_attr_list( PS_ATTRIBUTE_LIST *attr, const CLIENT_ID *id, TEB *teb ) { SIZE_T i, count = (attr->TotalLength - sizeof(attr->TotalLength)) / sizeof(PS_ATTRIBUTE); @@ -135,6 +135,12 @@ static void update_attr_list( PS_ATTRIBUTE_LIST *attr, const CLIENT_ID *id ) memcpy( attr->Attributes[i].ValuePtr, id, size ); if (attr->Attributes[i].ReturnLength) *attr->Attributes[i].ReturnLength = size; } + else if (attr->Attributes[i].Attribute == PS_ATTRIBUTE_TEB_ADDRESS) + { + SIZE_T size = min( attr->Attributes[i].Size, sizeof(teb) ); + memcpy( attr->Attributes[i].ValuePtr, &teb, size ); + if (attr->Attributes[i].ReturnLength) *attr->Attributes[i].ReturnLength = size; + } } } @@ -181,10 +187,11 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT if (result.create_thread.status == STATUS_SUCCESS) { + TEB *teb = wine_server_get_ptr( result.create_thread.teb ); *handle = wine_server_ptr_handle( result.create_thread.handle ); client_id.UniqueProcess = ULongToHandle( result.create_thread.pid ); client_id.UniqueThread = ULongToHandle( result.create_thread.tid ); - if (attr_list) update_attr_list( attr_list, &client_id ); + if (attr_list) update_attr_list( attr_list, &client_id, teb ); } return result.create_thread.status; } @@ -275,7 +282,7 @@ done: close( request_pipe[1] ); return status; } - if (attr_list) update_attr_list( attr_list, &client_id ); + if (attr_list) update_attr_list( attr_list, &client_id, teb ); return STATUS_SUCCESS; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 8a282155eb..730e368f0c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -647,6 +647,7 @@ typedef union unsigned int status; process_id_t pid; thread_id_t tid; + client_ptr_t teb; obj_handle_t handle; } create_thread; struct @@ -6481,7 +6482,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 624 +#define SERVER_PROTOCOL_VERSION 625 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 36e674f086..90c695ec0b 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -663,6 +663,7 @@ typedef union unsigned int status; /* status returned by call */ process_id_t pid; /* process id */ thread_id_t tid; /* thread id */ + client_ptr_t teb; /* thread teb (in process address space) */ obj_handle_t handle; /* handle to new thread */ } create_thread; struct

1 0

Zebediah Figura : ntdll: Don't translate Unix virtual disks to FILE_DEVICE_VIRTUAL_DISK.
by Alexandre Julliard 10 Jul '20

10 Jul '20

Module: wine Branch: master Commit: fb8a44f3ee50badd85af4b50fdbc1db28ce76ab0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb8a44f3ee50badd85af4b50… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 9 22:39:00 2020 -0500 ntdll: Don't translate Unix virtual disks to FILE_DEVICE_VIRTUAL_DISK. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36546 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index af7c214984..3368d2105c 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -6029,12 +6029,15 @@ static NTSTATUS get_device_info( int fd, FILE_FS_DEVICE_INFORMATION *info ) info->DeviceType = FILE_DEVICE_NETWORK_FILE_SYSTEM; info->Characteristics |= FILE_REMOTE_DEVICE; break; - case 0x01021994: /* tmpfs */ - case 0x28cd3d45: /* cramfs */ case 0x1373: /* devfs */ case 0x9fa0: /* procfs */ info->DeviceType = FILE_DEVICE_VIRTUAL_DISK; break; + case 0x01021994: /* tmpfs */ + case 0x28cd3d45: /* cramfs */ + /* Don't map these to FILE_DEVICE_VIRTUAL_DISK by default. Virtual + * filesystems are rare on Windows, and some programs refuse to + * recognize them as valid. */ default: info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM; break; @@ -6078,8 +6081,9 @@ static NTSTATUS get_device_info( int fd, FILE_FS_DEVICE_INFORMATION *info ) info->Characteristics |= FILE_REMOVABLE_MEDIA; break; case DKC_MD: - info->DeviceType = FILE_DEVICE_VIRTUAL_DISK; - break; + /* Don't map these to FILE_DEVICE_VIRTUAL_DISK by default. Virtual + * filesystems are rare on Windows, and some programs refuse to + * recognize them as valid. */ default: info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM; }

1 0

Zebediah Figura : kernel32/tests: Avoid testing that WaitCommEvent() doesn't return immediately.
by Alexandre Julliard 10 Jul '20

10 Jul '20

Module: wine Branch: master Commit: 39f59eb020a5de9d8424cdc6bdb93211a86a0d8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=39f59eb020a5de9d8424cdc6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 9 22:58:09 2020 -0500 kernel32/tests: Avoid testing that WaitCommEvent() doesn't return immediately. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/comm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index a43a290947..f82e5e6067 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -852,7 +852,7 @@ static void test_waittxempty(void) before = GetTickCount(); SetLastError(0xdeadbeef); res = WaitCommEvent(hcom, &evtmask, &ovl_wait); - ok(!res && GetLastError() == ERROR_IO_PENDING, "WaitCommEvent error %d\n", GetLastError()); + ok(res || GetLastError() == ERROR_IO_PENDING, "WaitCommEvent error %d\n", GetLastError()); after = GetTickCount(); ok(after - before < 30, "WaitCommEvent should have returned immediately, took %d ms\n", after - before); res = WaitForSingleObject(ovl_wait.hEvent, 1500);

1 0

Jacek Caban : kernelbase: Introduce console_ioctl helper.
by Alexandre Julliard 10 Jul '20

10 Jul '20

Module: wine Branch: master Commit: 674ec0c7f6754c47a5a513ceff80663bb8f5a3e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=674ec0c7f6754c47a5a513ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 10 17:06:01 2020 +0200 kernelbase: Introduce console_ioctl helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 50 ++++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 37ca8b599b..606589339e 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -80,6 +80,28 @@ static inline obj_handle_t console_handle_unmap( HANDLE h ) return wine_server_obj_handle( console_handle_map( h ) ); } +static BOOL console_ioctl( HANDLE handle, DWORD code, void *in_buff, DWORD in_count, + void *out_buff, DWORD out_count, DWORD *read ) +{ + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtDeviceIoControlFile( handle, NULL, NULL, NULL, &io, code, in_buff, in_count, + out_buff, out_count ); + switch( status ) + { + case STATUS_SUCCESS: + if (read) *read = io.Information; + return TRUE; + case STATUS_INVALID_PARAMETER: + break; + default: + status = STATUS_INVALID_HANDLE; + break; + } + return set_ntstatus( status ); +} + /* map input records to ASCII */ static void input_records_WtoA( INPUT_RECORD *buffer, int count ) { @@ -162,11 +184,8 @@ static COORD get_largest_console_window_size( HANDLE handle ) struct condrv_output_info info; COORD c = { 0, 0 }; - if (!DeviceIoControl( handle, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, &info, sizeof(info), NULL, NULL )) - { - SetLastError( ERROR_INVALID_HANDLE ); + if (!console_ioctl( handle, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, &info, sizeof(info), NULL )) return c; - } c.X = info.max_width; c.Y = info.max_height; @@ -543,11 +562,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleCursorInfo( HANDLE handle, CONSOLE_CURSO { struct condrv_output_info condrv_info; - if (!DeviceIoControl( handle, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, &condrv_info, sizeof(condrv_info), NULL, NULL )) - { - SetLastError( ERROR_INVALID_HANDLE ); + if (!console_ioctl( handle, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, &condrv_info, sizeof(condrv_info), NULL )) return FALSE; - } if (!info) { @@ -636,12 +652,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleScreenBufferInfo( HANDLE handle, CONSOLE { struct condrv_output_info condrv_info; - if (!DeviceIoControl( handle , IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, - &condrv_info, sizeof(condrv_info), NULL, NULL )) - { - SetLastError( ERROR_INVALID_HANDLE ); + if (!console_ioctl( handle , IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, + &condrv_info, sizeof(condrv_info), NULL )) return FALSE; - } info->dwSize.X = condrv_info.width; info->dwSize.Y = condrv_info.height; @@ -677,12 +690,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleScreenBufferInfoEx( HANDLE handle, return FALSE; } - if (!DeviceIoControl( handle, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, &condrv_info, - sizeof(condrv_info), NULL, NULL )) - { - SetLastError( ERROR_INVALID_HANDLE ); + if (!console_ioctl( handle, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, &condrv_info, + sizeof(condrv_info), NULL )) return FALSE; - } info->dwSize.X = condrv_info.width; info->dwSize.Y = condrv_info.height; @@ -755,7 +765,7 @@ COORD WINAPI DECLSPEC_HOTPATCH GetLargestConsoleWindowSize( HANDLE handle ) BOOL WINAPI DECLSPEC_HOTPATCH GetNumberOfConsoleInputEvents( HANDLE handle, DWORD *count ) { struct condrv_input_info info; - if (!DeviceIoControl( handle, IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL, NULL )) + if (!console_ioctl( handle, IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL )) return FALSE; *count = info.input_count; return TRUE; @@ -784,7 +794,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH PeekConsoleInputW( HANDLE handle, INPUT_RECORD *bu DWORD length, DWORD *count ) { DWORD read; - if (!DeviceIoControl( handle, IOCTL_CONDRV_PEEK, NULL, 0, buffer, length * sizeof(*buffer), &read, NULL )) + if (!console_ioctl( handle, IOCTL_CONDRV_PEEK, NULL, 0, buffer, length * sizeof(*buffer), &read )) return FALSE; if (count) *count = read / sizeof(*buffer); return TRUE;

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_SET_OUTPUT_INFO ioctl.
by Alexandre Julliard 10 Jul '20

10 Jul '20

Module: wine Branch: master Commit: 86acbd0122ddad629f4ac55595782f2c704d54dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=86acbd0122ddad629f4ac555… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 10 17:07:03 2020 +0200 server: Introduce IOCTL_CONDRV_SET_OUTPUT_INFO ioctl. Based on set_console_output_info request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 10 ++- server/console.c | 197 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 206 insertions(+), 1 deletion(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 4d681f6ea7..49eb3459c0 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -30,7 +30,8 @@ #define IOCTL_CONDRV_GET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 13, METHOD_BUFFERED, FILE_READ_PROPERTIES) /* console output ioctls */ -#define IOCTL_CONDRV_GET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 32, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) +#define IOCTL_CONDRV_GET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 32, METHOD_BUFFERED, FILE_READ_PROPERTIES) +#define IOCTL_CONDRV_SET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 33, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) /* console renderer ioctls */ #define IOCTL_CONDRV_GET_RENDERER_EVENTS CTL_CODE(FILE_DEVICE_CONSOLE, 70, METHOD_BUFFERED, FILE_READ_PROPERTIES) @@ -68,6 +69,13 @@ struct condrv_output_info unsigned int color_map[16]; /* color table */ }; +/* IOCTL_CONDRV_SET_OUTPUT_INFO params */ +struct condrv_output_info_params +{ + unsigned int mask; /* setting mask */ + struct condrv_output_info info; /* output info */ +}; + /* IOCTL_CONDRV_GET_RENDERER_EVENTS result */ struct condrv_renderer_event { diff --git a/server/console.c b/server/console.c index ba2e4c776d..89f6fae863 100644 --- a/server/console.c +++ b/server/console.c @@ -1196,6 +1196,187 @@ static int set_console_output_info( struct screen_buffer *screen_buffer, return 1; } +static int set_output_info( struct screen_buffer *screen_buffer, + const struct condrv_output_info_params *params, data_size_t extra_size ) +{ + const struct condrv_output_info *info = &params->info; + struct condrv_renderer_event evt; + WCHAR *font_name; + + if (params->mask & SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM) + { + if (info->cursor_size < 1 || info->cursor_size > 100) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + if (screen_buffer->cursor_size != info->cursor_size || + screen_buffer->cursor_visible != info->cursor_visible) + { + screen_buffer->cursor_size = info->cursor_size; + screen_buffer->cursor_visible = info->cursor_visible; + evt.event = CONSOLE_RENDERER_CURSOR_GEOM_EVENT; + memset( &evt.u, 0, sizeof(evt.u) ); + evt.u.cursor_geom.size = info->cursor_size; + evt.u.cursor_geom.visible = info->cursor_visible; + console_input_events_append( screen_buffer->input, &evt ); + } + } + if (params->mask & SET_CONSOLE_OUTPUT_INFO_CURSOR_POS) + { + if (info->cursor_x < 0 || info->cursor_x >= screen_buffer->width || + info->cursor_y < 0 || info->cursor_y >= screen_buffer->height) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + if (screen_buffer->cursor_x != info->cursor_x || screen_buffer->cursor_y != info->cursor_y) + { + screen_buffer->cursor_x = info->cursor_x; + screen_buffer->cursor_y = info->cursor_y; + evt.event = CONSOLE_RENDERER_CURSOR_POS_EVENT; + memset( &evt.u, 0, sizeof(evt.u) ); + evt.u.cursor_pos.x = info->cursor_x; + evt.u.cursor_pos.y = info->cursor_y; + console_input_events_append( screen_buffer->input, &evt ); + } + } + if (params->mask & SET_CONSOLE_OUTPUT_INFO_SIZE) + { + unsigned cc; + + /* new screen-buffer cannot be smaller than actual window */ + if (info->width < screen_buffer->win.right - screen_buffer->win.left + 1 || + info->height < screen_buffer->win.bottom - screen_buffer->win.top + 1) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + /* FIXME: there are also some basic minimum and max size to deal with */ + if (!change_screen_buffer_size( screen_buffer, info->width, info->height )) return 0; + + evt.event = CONSOLE_RENDERER_SB_RESIZE_EVENT; + memset( &evt.u, 0, sizeof(evt.u) ); + evt.u.resize.width = info->width; + evt.u.resize.height = info->height; + console_input_events_append( screen_buffer->input, &evt ); + + evt.event = CONSOLE_RENDERER_UPDATE_EVENT; + memset( &evt.u, 0, sizeof(evt.u) ); + evt.u.update.top = 0; + evt.u.update.bottom = screen_buffer->height - 1; + console_input_events_append( screen_buffer->input, &evt ); + + /* scroll window to display sb */ + if (screen_buffer->win.right >= info->width) + { + screen_buffer->win.right -= screen_buffer->win.left; + screen_buffer->win.left = 0; + } + if (screen_buffer->win.bottom >= info->height) + { + screen_buffer->win.bottom -= screen_buffer->win.top; + screen_buffer->win.top = 0; + } + /* reset cursor if needed (normally, if cursor was outside of new sb, the + * window has been shifted so that the new position of the cursor will be + * visible */ + cc = 0; + if (screen_buffer->cursor_x >= info->width) + { + screen_buffer->cursor_x = info->width - 1; + cc++; + } + if (screen_buffer->cursor_y >= info->height) + { + screen_buffer->cursor_y = info->height - 1; + cc++; + } + if (cc) + { + evt.event = CONSOLE_RENDERER_CURSOR_POS_EVENT; + memset( &evt.u, 0, sizeof(evt.u) ); + evt.u.cursor_pos.x = info->cursor_x; + evt.u.cursor_pos.y = info->cursor_y; + console_input_events_append( screen_buffer->input, &evt ); + } + + if (screen_buffer == screen_buffer->input->active && + screen_buffer->input->mode & ENABLE_WINDOW_INPUT) + { + INPUT_RECORD ir; + ir.EventType = WINDOW_BUFFER_SIZE_EVENT; + ir.Event.WindowBufferSizeEvent.dwSize.X = info->width; + ir.Event.WindowBufferSizeEvent.dwSize.Y = info->height; + write_console_input( screen_buffer->input, 1, &ir ); + } + } + if (params->mask & SET_CONSOLE_OUTPUT_INFO_ATTR) + { + screen_buffer->attr = info->attr; + } + if (params->mask & SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR) + { + screen_buffer->popup_attr = info->popup_attr; + } + if (params->mask & SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW) + { + if (info->win_left < 0 || info->win_left > info->win_right || + info->win_right >= screen_buffer->width || + info->win_top < 0 || info->win_top > info->win_bottom || + info->win_bottom >= screen_buffer->height) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + if (screen_buffer->win.left != info->win_left || screen_buffer->win.top != info->win_top || + screen_buffer->win.right != info->win_right || screen_buffer->win.bottom != info->win_bottom) + { + screen_buffer->win.left = info->win_left; + screen_buffer->win.top = info->win_top; + screen_buffer->win.right = info->win_right; + screen_buffer->win.bottom = info->win_bottom; + evt.event = CONSOLE_RENDERER_DISPLAY_EVENT; + memset( &evt.u, 0, sizeof(evt.u) ); + evt.u.display.left = info->win_left; + evt.u.display.top = info->win_top; + evt.u.display.width = info->win_right - info->win_left + 1; + evt.u.display.height = info->win_bottom - info->win_top + 1; + console_input_events_append( screen_buffer->input, &evt ); + } + } + if (params->mask & SET_CONSOLE_OUTPUT_INFO_MAX_SIZE) + { + screen_buffer->max_width = info->max_width; + screen_buffer->max_height = info->max_height; + } + if (params->mask & SET_CONSOLE_OUTPUT_INFO_COLORTABLE) + { + memcpy( screen_buffer->color_map, info->color_map, sizeof(info->color_map) ); + } + if (params->mask & SET_CONSOLE_OUTPUT_INFO_FONT) + { + screen_buffer->font.width = info->font_width; + screen_buffer->font.height = info->font_height; + screen_buffer->font.weight = info->font_weight; + screen_buffer->font.pitch_family = info->font_pitch_family; + if (extra_size) + { + extra_size = extra_size / sizeof(WCHAR) * sizeof(WCHAR); + font_name = mem_alloc( extra_size ); + if (font_name) + { + memcpy( font_name, info + 1, extra_size ); + free( screen_buffer->font.face_name ); + screen_buffer->font.face_name = font_name; + screen_buffer->font.face_len = extra_size; + } + } + } + + return 1; +} + /* appends a new line to history (history is a fixed size array) */ static void console_input_append_hist( struct console_input* console, const WCHAR* buf, data_size_t len ) { @@ -1675,6 +1856,22 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * return 1; } + case IOCTL_CONDRV_SET_OUTPUT_INFO: + { + const struct condrv_output_info_params *params = get_req_data(); + if (get_req_data_size() < sizeof(*params)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + if (!screen_buffer->input) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } + return set_output_info( screen_buffer, params, get_req_data_size() - sizeof(*params) ); + } + default: set_error( STATUS_INVALID_HANDLE ); return 0;

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_SET_OUTPUT_INFO in SetConsoleCursorInfo.
by Alexandre Julliard 10 Jul '20

10 Jul '20

Module: wine Branch: master Commit: 3b81ea316198e1b128e0e41534da48218f5b641a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b81ea316198e1b128e0e415… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 10 17:07:09 2020 +0200 kernelbase: Use IOCTL_CONDRV_SET_OUTPUT_INFO in SetConsoleCursorInfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 606589339e..1740f84b59 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1179,20 +1179,14 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleCtrlHandler( PHANDLER_ROUTINE func, BOOL */ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleCursorInfo( HANDLE handle, CONSOLE_CURSOR_INFO *info ) { - BOOL ret; + struct condrv_output_info_params params = { SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM }; TRACE( "(%p,%d,%d)\n", handle, info->dwSize, info->bVisible); - SERVER_START_REQ( set_console_output_info ) - { - req->handle = console_handle_unmap( handle ); - req->cursor_size = info->dwSize; - req->cursor_visible = info->bVisible; - req->mask = SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + params.info.cursor_size = info->dwSize; + params.info.cursor_visible = info->bVisible; + return console_ioctl( handle, IOCTL_CONDRV_SET_OUTPUT_INFO, &params, sizeof(params), + NULL, 0, NULL ); }

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_SET_OUTPUT_INFO in SetConsoleCursorPosition.
by Alexandre Julliard 10 Jul '20

10 Jul '20

Module: wine Branch: master Commit: 5ff23d2218b6166c78cd587b1f633a2a3540a541 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ff23d2218b6166c78cd587b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 10 17:07:14 2020 +0200 kernelbase: Use IOCTL_CONDRV_SET_OUTPUT_INFO in SetConsoleCursorPosition. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 1740f84b59..107c909d57 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1195,23 +1195,18 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleCursorInfo( HANDLE handle, CONSOLE_CURSO */ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleCursorPosition( HANDLE handle, COORD pos ) { + struct condrv_output_info_params params = { SET_CONSOLE_OUTPUT_INFO_CURSOR_POS }; CONSOLE_SCREEN_BUFFER_INFO info; int w, h, do_move = 0; - BOOL ret; TRACE( "%p %d %d\n", handle, pos.X, pos.Y ); - SERVER_START_REQ( set_console_output_info ) - { - req->handle = console_handle_unmap( handle ); - req->cursor_x = pos.X; - req->cursor_y = pos.Y; - req->mask = SET_CONSOLE_OUTPUT_INFO_CURSOR_POS; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; + params.info.cursor_x = pos.X; + params.info.cursor_y = pos.Y; + if (!console_ioctl( handle, IOCTL_CONDRV_SET_OUTPUT_INFO, &params, sizeof(params), NULL, 0, NULL )) + return FALSE; - if (!ret || !GetConsoleScreenBufferInfo( handle, &info )) return FALSE; + if (!GetConsoleScreenBufferInfo( handle, &info )) return FALSE; /* if cursor is no longer visible, scroll the visible window... */ w = info.srWindow.Right - info.srWindow.Left + 1; @@ -1240,8 +1235,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleCursorPosition( HANDLE handle, COORD pos } info.srWindow.Bottom = info.srWindow.Top + h - 1; - if (do_move) ret = SetConsoleWindowInfo( handle, TRUE, &info.srWindow ); - return ret; + return !do_move || SetConsoleWindowInfo( handle, TRUE, &info.srWindow ); }

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_SET_OUTPUT_INFO in SetConsoleScreenBufferInfoEx.
by Alexandre Julliard 10 Jul '20

10 Jul '20

Module: wine Branch: master Commit: b21d2e5f58dc5fa713174616de5042e05e13a1fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=b21d2e5f58dc5fa713174616… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 10 17:07:24 2020 +0200 kernelbase: Use IOCTL_CONDRV_SET_OUTPUT_INFO in SetConsoleScreenBufferInfoEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 107c909d57..cf64eff74a 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1323,7 +1323,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleOutputCP( UINT cp ) BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleScreenBufferInfoEx( HANDLE handle, CONSOLE_SCREEN_BUFFER_INFOEX *info ) { - BOOL ret; + struct condrv_output_info_params params = + { SET_CONSOLE_OUTPUT_INFO_CURSOR_POS | SET_CONSOLE_OUTPUT_INFO_SIZE | + SET_CONSOLE_OUTPUT_INFO_ATTR | SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR | + SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW | SET_CONSOLE_OUTPUT_INFO_MAX_SIZE }; TRACE("(%p, %p)\n", handle, info); @@ -1333,29 +1336,19 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleScreenBufferInfoEx( HANDLE handle, return FALSE; } - SERVER_START_REQ( set_console_output_info ) - { - req->handle = console_handle_unmap( handle ); - req->mask = SET_CONSOLE_OUTPUT_INFO_CURSOR_POS | SET_CONSOLE_OUTPUT_INFO_SIZE | - SET_CONSOLE_OUTPUT_INFO_ATTR | SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR | - SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW | SET_CONSOLE_OUTPUT_INFO_MAX_SIZE; - req->width = info->dwSize.X; - req->height = info->dwSize.Y; - req->cursor_x = info->dwCursorPosition.X; - req->cursor_y = info->dwCursorPosition.Y; - req->attr = info->wAttributes; - req->win_left = info->srWindow.Left; - req->win_top = info->srWindow.Top; - req->win_right = info->srWindow.Right; - req->win_bottom = info->srWindow.Bottom; - req->popup_attr = info->wPopupAttributes; - req->max_width = min( info->dwMaximumWindowSize.X, info->dwSize.X ); - req->max_height = min( info->dwMaximumWindowSize.Y, info->dwSize.Y ); - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - - return ret; + params.info.width = info->dwSize.X; + params.info.height = info->dwSize.Y; + params.info.cursor_x = info->dwCursorPosition.X; + params.info.cursor_y = info->dwCursorPosition.Y; + params.info.attr = info->wAttributes; + params.info.win_left = info->srWindow.Left; + params.info.win_top = info->srWindow.Top; + params.info.win_right = info->srWindow.Right; + params.info.win_bottom = info->srWindow.Bottom; + params.info.popup_attr = info->wPopupAttributes; + params.info.max_width = min( info->dwMaximumWindowSize.X, info->dwSize.X ); + params.info.max_height = min( info->dwMaximumWindowSize.Y, info->dwSize.Y ); + return console_ioctl( handle, IOCTL_CONDRV_SET_OUTPUT_INFO, &params, sizeof(params), NULL, 0, NULL ); }

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_SET_OUTPUT_INFO in SetConsoleScreenBufferSize.
by Alexandre Julliard 10 Jul '20

10 Jul '20

Module: wine Branch: master Commit: f7a7633aa107003238171c12f52d2f57b93bc3f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7a7633aa107003238171c12… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 10 17:07:35 2020 +0200 kernelbase: Use IOCTL_CONDRV_SET_OUTPUT_INFO in SetConsoleScreenBufferSize. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index cf64eff74a..e13abcb23f 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1357,19 +1357,13 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleScreenBufferInfoEx( HANDLE handle, */ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleScreenBufferSize( HANDLE handle, COORD size ) { - BOOL ret; + struct condrv_output_info_params params = { SET_CONSOLE_OUTPUT_INFO_SIZE }; TRACE( "(%p,(%d,%d))\n", handle, size.X, size.Y ); - SERVER_START_REQ( set_console_output_info ) - { - req->handle = console_handle_unmap( handle ); - req->width = size.X; - req->height = size.Y; - req->mask = SET_CONSOLE_OUTPUT_INFO_SIZE; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + + params.info.width = size.X; + params.info.height = size.Y; + return console_ioctl( handle, IOCTL_CONDRV_SET_OUTPUT_INFO, &params, sizeof(params), NULL, 0, NULL ); }

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_SET_OUTPUT_INFO in SetConsoleTextAttribute.
by Alexandre Julliard 10 Jul '20

10 Jul '20

Module: wine Branch: master Commit: 2efb498a7b088a0d1d072754b668fcf752532de7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2efb498a7b088a0d1d072754… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 10 17:07:44 2020 +0200 kernelbase: Use IOCTL_CONDRV_SET_OUTPUT_INFO in SetConsoleTextAttribute. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index e13abcb23f..85854851ce 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1372,18 +1372,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleScreenBufferSize( HANDLE handle, COORD s */ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleTextAttribute( HANDLE handle, WORD attr ) { - BOOL ret; + struct condrv_output_info_params params = { SET_CONSOLE_OUTPUT_INFO_ATTR }; TRACE( "(%p,%d)\n", handle, attr ); - SERVER_START_REQ( set_console_output_info ) - { - req->handle = console_handle_unmap( handle ); - req->attr = attr; - req->mask = SET_CONSOLE_OUTPUT_INFO_ATTR; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + + params.info.attr = attr; + return console_ioctl( handle, IOCTL_CONDRV_SET_OUTPUT_INFO, &params, sizeof(params), NULL, 0, NULL ); }

1 0