wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Jacek Caban : kernelbase: Use IOCTL_CONDRV_GET_OUTPUT_INFO in GetConsoleScreenBufferInfoEx.
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: 94c1640bb38edd76bab13b29f1444bce20edcacc URL: https://source.winehq.org/git/wine.git/?a=commit;h=94c1640bb38edd76bab13b29… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 9 19:29:05 2020 +0200 kernelbase: Use IOCTL_CONDRV_GET_OUTPUT_INFO in GetConsoleScreenBufferInfoEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 15f6ea7d3e..37ca8b599b 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -669,7 +669,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleScreenBufferInfo( HANDLE handle, CONSOLE BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleScreenBufferInfoEx( HANDLE handle, CONSOLE_SCREEN_BUFFER_INFOEX *info ) { - BOOL ret; + struct condrv_output_info condrv_info; if (info->cbSize != sizeof(CONSOLE_SCREEN_BUFFER_INFOEX)) { @@ -677,29 +677,28 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleScreenBufferInfoEx( HANDLE handle, return FALSE; } - SERVER_START_REQ( get_console_output_info ) + if (!DeviceIoControl( handle, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, &condrv_info, + sizeof(condrv_info), NULL, NULL )) { - req->handle = console_handle_unmap( handle ); - wine_server_set_reply( req, info->ColorTable, sizeof(info->ColorTable) ); - if ((ret = !wine_server_call_err( req ))) - { - info->dwSize.X = reply->width; - info->dwSize.Y = reply->height; - info->dwCursorPosition.X = reply->cursor_x; - info->dwCursorPosition.Y = reply->cursor_y; - info->wAttributes = reply->attr; - info->srWindow.Left = reply->win_left; - info->srWindow.Top = reply->win_top; - info->srWindow.Right = reply->win_right; - info->srWindow.Bottom = reply->win_bottom; - info->dwMaximumWindowSize.X = min( reply->width, reply->max_width ); - info->dwMaximumWindowSize.Y = min( reply->height, reply->max_height ); - info->wPopupAttributes = reply->popup_attr; - info->bFullscreenSupported = FALSE; - } + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; } - SERVER_END_REQ; - return ret; + + info->dwSize.X = condrv_info.width; + info->dwSize.Y = condrv_info.height; + info->dwCursorPosition.X = condrv_info.cursor_x; + info->dwCursorPosition.Y = condrv_info.cursor_y; + info->wAttributes = condrv_info.attr; + info->srWindow.Left = condrv_info.win_left; + info->srWindow.Top = condrv_info.win_top; + info->srWindow.Right = condrv_info.win_right; + info->srWindow.Bottom = condrv_info.win_bottom; + info->dwMaximumWindowSize.X = min( condrv_info.width, condrv_info.max_width ); + info->dwMaximumWindowSize.Y = min( condrv_info.height, condrv_info.max_height ); + info->wPopupAttributes = condrv_info.popup_attr; + info->bFullscreenSupported = FALSE; + memcpy( info->ColorTable, condrv_info.color_map, sizeof(info->ColorTable) ); + return TRUE; }

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_GET_OUTPUT_INFO in GetConsoleScreenBufferInfo.
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: 587ca81f8de4fec07217b4e55e370f3fb6095773 URL: https://source.winehq.org/git/wine.git/?a=commit;h=587ca81f8de4fec07217b4e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 9 19:28:57 2020 +0200 kernelbase: Use IOCTL_CONDRV_GET_OUTPUT_INFO in GetConsoleScreenBufferInfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index fe4b798988..15f6ea7d3e 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -634,33 +634,32 @@ UINT WINAPI DECLSPEC_HOTPATCH GetConsoleOutputCP(void) */ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleScreenBufferInfo( HANDLE handle, CONSOLE_SCREEN_BUFFER_INFO *info ) { - BOOL ret; + struct condrv_output_info condrv_info; - SERVER_START_REQ( get_console_output_info ) + if (!DeviceIoControl( handle , IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, + &condrv_info, sizeof(condrv_info), NULL, NULL )) { - req->handle = console_handle_unmap( handle ); - if ((ret = !wine_server_call_err( req ))) - { - info->dwSize.X = reply->width; - info->dwSize.Y = reply->height; - info->dwCursorPosition.X = reply->cursor_x; - info->dwCursorPosition.Y = reply->cursor_y; - info->wAttributes = reply->attr; - info->srWindow.Left = reply->win_left; - info->srWindow.Right = reply->win_right; - info->srWindow.Top = reply->win_top; - info->srWindow.Bottom = reply->win_bottom; - info->dwMaximumWindowSize.X = min(reply->width, reply->max_width); - info->dwMaximumWindowSize.Y = min(reply->height, reply->max_height); - } + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; } - SERVER_END_REQ; + + info->dwSize.X = condrv_info.width; + info->dwSize.Y = condrv_info.height; + info->dwCursorPosition.X = condrv_info.cursor_x; + info->dwCursorPosition.Y = condrv_info.cursor_y; + info->wAttributes = condrv_info.attr; + info->srWindow.Left = condrv_info.win_left; + info->srWindow.Right = condrv_info.win_right; + info->srWindow.Top = condrv_info.win_top; + info->srWindow.Bottom = condrv_info.win_bottom; + info->dwMaximumWindowSize.X = min(condrv_info.width, condrv_info.max_width); + info->dwMaximumWindowSize.Y = min(condrv_info.height, condrv_info.max_height); TRACE( "(%p,(%d,%d) (%d,%d) %d (%d,%d-%d,%d) (%d,%d)\n", handle, info->dwSize.X, info->dwSize.Y, info->dwCursorPosition.X, info->dwCursorPosition.Y, - info->wAttributes, info->srWindow.Left, info->srWindow.Top, info->srWindow.Right, + info->wAttributes, info->srWindow.Left, info->srWindow.Top, info->srWindow.Right, info->srWindow.Bottom, info->dwMaximumWindowSize.X, info->dwMaximumWindowSize.Y ); - return ret; + return TRUE; }

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_GET_OUTPUT_INFO in GetConsoleCursorInfo.
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: 547855e623c561c23b205f18d017e53d5ee75b7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=547855e623c561c23b205f18… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 9 19:28:48 2020 +0200 kernelbase: Use IOCTL_CONDRV_GET_OUTPUT_INFO in GetConsoleCursorInfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 83cbce38d5..fe4b798988 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -541,26 +541,22 @@ UINT WINAPI DECLSPEC_HOTPATCH GetConsoleCP(void) */ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleCursorInfo( HANDLE handle, CONSOLE_CURSOR_INFO *info ) { - BOOL ret; + struct condrv_output_info condrv_info; - SERVER_START_REQ( get_console_output_info ) + if (!DeviceIoControl( handle, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, &condrv_info, sizeof(condrv_info), NULL, NULL )) { - req->handle = console_handle_unmap( handle ); - ret = !wine_server_call_err( req ); - if (ret && info) - { - info->dwSize = reply->cursor_size; - info->bVisible = reply->cursor_visible; - } + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; } - SERVER_END_REQ; - if (!ret) return FALSE; if (!info) { SetLastError( ERROR_INVALID_ACCESS ); return FALSE; } + + info->dwSize = condrv_info.cursor_size; + info->bVisible = condrv_info.cursor_visible; TRACE("(%p) returning (%d,%d)\n", handle, info->dwSize, info->bVisible); return TRUE; }

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_GET_OUTPUT_INFO in GetLargestConsoleWindowSize.
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: d25a267978de5949a283c5f76405175316f8f773 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d25a267978de5949a283c5f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 9 19:28:42 2020 +0200 kernelbase: Use IOCTL_CONDRV_GET_OUTPUT_INFO in GetLargestConsoleWindowSize. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index f5612de407..83cbce38d5 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -159,18 +159,17 @@ static void fill_console_output( HANDLE handle, int i, int j, int len, CHAR_INFO /* helper function for GetLargestConsoleWindowSize */ static COORD get_largest_console_window_size( HANDLE handle ) { + struct condrv_output_info info; COORD c = { 0, 0 }; - SERVER_START_REQ( get_console_output_info ) + if (!DeviceIoControl( handle, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, &info, sizeof(info), NULL, NULL )) { - req->handle = console_handle_unmap( handle ); - if (!wine_server_call_err( req )) - { - c.X = reply->max_width; - c.Y = reply->max_height; - } + SetLastError( ERROR_INVALID_HANDLE ); + return c; } - SERVER_END_REQ; + + c.X = info.max_width; + c.Y = info.max_height; TRACE( "(%p), returning %dx%d\n", handle, c.X, c.Y ); return c; }

1 0

Jacek Caban : kernel32: Use IOCT_CONDRV_GET_OUTPUT_INFO in GetCurrentConsoleFontEx.
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: 2789787f011e1a923dc22b6884433826e9350725 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2789787f011e1a923dc22b68… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 9 19:28:32 2020 +0200 kernel32: Use IOCT_CONDRV_GET_OUTPUT_INFO in GetCurrentConsoleFontEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 57 ++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 32 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 0a45a0e294..e21c8a890e 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1326,11 +1326,11 @@ BOOL WINAPI SetConsoleKeyShortcuts(BOOL set, BYTE keys, VOID *a, DWORD b) BOOL WINAPI GetCurrentConsoleFontEx(HANDLE hConsole, BOOL maxwindow, CONSOLE_FONT_INFOEX *fontinfo) { - BOOL ret; + DWORD size; struct { - unsigned int color_map[16]; - WCHAR face_name[LF_FACESIZE]; + struct condrv_output_info info; + WCHAR face_name[LF_FACESIZE - 1]; } data; if (fontinfo->cbSize != sizeof(CONSOLE_FONT_INFOEX)) @@ -1339,37 +1339,30 @@ BOOL WINAPI GetCurrentConsoleFontEx(HANDLE hConsole, BOOL maxwindow, CONSOLE_FON return FALSE; } - SERVER_START_REQ(get_console_output_info) + if (!DeviceIoControl( hConsole, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, + &data, sizeof(data), &size, NULL )) { - req->handle = console_handle_unmap(hConsole); - wine_server_set_reply( req, &data, sizeof(data) - sizeof(WCHAR) ); - if ((ret = !wine_server_call_err(req))) - { - fontinfo->nFont = 0; - if (maxwindow) - { - fontinfo->dwFontSize.X = min(reply->width, reply->max_width); - fontinfo->dwFontSize.Y = min(reply->height, reply->max_height); - } - else - { - fontinfo->dwFontSize.X = reply->win_right - reply->win_left + 1; - fontinfo->dwFontSize.Y = reply->win_bottom - reply->win_top + 1; - } - if (wine_server_reply_size( reply ) > sizeof(data.color_map)) - { - data_size_t len = wine_server_reply_size( reply ) - sizeof(data.color_map); - memcpy( fontinfo->FaceName, data.face_name, len ); - fontinfo->FaceName[len / sizeof(WCHAR)] = 0; - } - else - fontinfo->FaceName[0] = 0; - fontinfo->FontFamily = reply->font_pitch_family; - fontinfo->FontWeight = reply->font_weight; - } + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; } - SERVER_END_REQ; - return ret; + + fontinfo->nFont = 0; + if (maxwindow) + { + fontinfo->dwFontSize.X = min( data.info.width, data.info.max_width ); + fontinfo->dwFontSize.Y = min( data.info.height, data.info.max_height ); + } + else + { + fontinfo->dwFontSize.X = data.info.win_right - data.info.win_left + 1; + fontinfo->dwFontSize.Y = data.info.win_bottom - data.info.win_top + 1; + } + size -= sizeof(data.info); + if (size) memcpy( fontinfo->FaceName, data.face_name, size ); + fontinfo->FaceName[size / sizeof(WCHAR)] = 0; + fontinfo->FontFamily = data.info.font_pitch_family; + fontinfo->FontWeight = data.info.font_weight; + return TRUE; } BOOL WINAPI GetCurrentConsoleFont(HANDLE hConsole, BOOL maxwindow, CONSOLE_FONT_INFO *fontinfo)

1 0

Jacek Caban : kernel32: Use IOCTL_CONDRV_GET_OUTPUT_INFO in get_console_font_size.
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: 0c3c89b74decfdab8e0227d87e5eecdb3380806c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c3c89b74decfdab8e0227d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 9 19:28:20 2020 +0200 kernel32: Use IOCTL_CONDRV_GET_OUTPUT_INFO in get_console_font_size. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index e919fcf3f1..0a45a0e294 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1391,6 +1391,7 @@ BOOL WINAPI GetCurrentConsoleFont(HANDLE hConsole, BOOL maxwindow, CONSOLE_FONT_ static COORD get_console_font_size(HANDLE hConsole, DWORD index) { + struct condrv_output_info info; COORD c = {0,0}; if (index >= GetNumberOfConsoleFonts()) @@ -1399,16 +1400,12 @@ static COORD get_console_font_size(HANDLE hConsole, DWORD index) return c; } - SERVER_START_REQ(get_console_output_info) + if (DeviceIoControl( hConsole, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, &info, sizeof(info), NULL, NULL )) { - req->handle = console_handle_unmap(hConsole); - if (!wine_server_call_err(req)) - { - c.X = reply->font_width; - c.Y = reply->font_height; - } + c.X = info.font_width; + c.Y = info.font_height; } - SERVER_END_REQ; + else SetLastError( ERROR_INVALID_HANDLE ); return c; }

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_GET_OUTPUT_INFO ioctl.
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: af3320c57576166e0d306c1e4d9d4d3964ad58b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af3320c57576166e0d306c1e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 9 19:28:13 2020 +0200 server: Introduce IOCTL_CONDRV_GET_OUTPUT_INFO ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 27 +++++++++++++++++++++ server/console.c | 65 ++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 81 insertions(+), 11 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 36412f5731..4d681f6ea7 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -29,6 +29,9 @@ #define IOCTL_CONDRV_PEEK CTL_CODE(FILE_DEVICE_CONSOLE, 12, METHOD_BUFFERED, FILE_READ_ACCESS) #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) + /* console renderer ioctls */ #define IOCTL_CONDRV_GET_RENDERER_EVENTS CTL_CODE(FILE_DEVICE_CONSOLE, 70, METHOD_BUFFERED, FILE_READ_PROPERTIES) @@ -41,6 +44,30 @@ struct condrv_input_info unsigned int input_count; /* number of available input records */ }; +/* IOCTL_CONDRV_GET_OUTPUT_INFO result */ +struct condrv_output_info +{ + 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 */ + unsigned int color_map[16]; /* color table */ +}; + /* IOCTL_CONDRV_GET_RENDERER_EVENTS result */ struct condrv_renderer_event { diff --git a/server/console.c b/server/console.c index d67cec5f4c..22af8e3b35 100644 --- a/server/console.c +++ b/server/console.c @@ -553,18 +553,18 @@ static struct screen_buffer *create_console_output( struct console_input *consol memset( screen_buffer->color_map, 0, sizeof(screen_buffer->color_map) ); list_add_head( &screen_buffer_list, &screen_buffer->entry ); - if (fd == -1) - screen_buffer->fd = NULL; + if (fd != -1) + screen_buffer->fd = create_anonymous_fd( &screen_buffer_fd_ops, fd, &screen_buffer->obj, + FILE_SYNCHRONOUS_IO_NONALERT ); else + screen_buffer->fd = alloc_pseudo_fd( &screen_buffer_fd_ops, &screen_buffer->obj, + FILE_SYNCHRONOUS_IO_NONALERT ); + if (!screen_buffer->fd) { - if (!(screen_buffer->fd = create_anonymous_fd( &screen_buffer_fd_ops, fd, &screen_buffer->obj, - FILE_SYNCHRONOUS_IO_NONALERT ))) - { - release_object( screen_buffer ); - return NULL; - } - allow_fd_caching(screen_buffer->fd); + release_object( screen_buffer ); + return NULL; } + allow_fd_caching(screen_buffer->fd); if (!(screen_buffer->data = malloc( screen_buffer->width * screen_buffer->height * sizeof(*screen_buffer->data) ))) @@ -1634,8 +1634,51 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { - set_error( STATUS_INVALID_HANDLE ); - return 0; + struct screen_buffer *screen_buffer = get_fd_user( fd ); + + switch (code) + { + case IOCTL_CONDRV_GET_OUTPUT_INFO: + { + struct condrv_output_info *info; + data_size_t size; + + size = min( sizeof(*info) + screen_buffer->font.face_len, get_reply_max_size() ); + if (size < sizeof(*info)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + if (!(info = set_reply_data_size( size ))) return 0; + + 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) ); + size -= sizeof(*info); + if (size) memcpy( info + 1, screen_buffer->font.face_name, size ); + return 1; + } + + default: + set_error( STATUS_INVALID_HANDLE ); + return 0; + } } static int console_input_events_ioctl( struct fd *fd, ioctl_code_t code, struct async *async )

1 0

Jacek Caban : server: Use separated fd ops for screen_buffer fd object.
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: d8739008bd33dfe2587d4afc524b17ec87f59ddd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8739008bd33dfe2587d4afc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 9 19:28:07 2020 +0200 server: Use separated fd ops for screen_buffer fd object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/server/console.c b/server/console.c index a18892b156..d67cec5f4c 100644 --- a/server/console.c +++ b/server/console.c @@ -79,7 +79,6 @@ static void console_input_destroy( struct object *obj ); static struct fd *console_input_get_fd( struct object *obj ); static struct object *console_input_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); -static enum server_fd_type console_get_fd_type( struct fd *fd ); static const struct object_ops console_input_ops = { @@ -104,6 +103,24 @@ static const struct object_ops console_input_ops = console_input_destroy /* destroy */ }; +static enum server_fd_type console_get_fd_type( struct fd *fd ); +static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); + +static const struct fd_ops console_input_fd_ops = +{ + default_fd_get_poll_events, /* get_poll_events */ + default_poll_event, /* poll_event */ + console_get_fd_type, /* get_fd_type */ + no_fd_read, /* read */ + no_fd_write, /* write */ + no_fd_flush, /* flush */ + no_fd_get_file_info, /* get_file_info */ + no_fd_get_volume_info, /* get_volume_info */ + console_input_ioctl, /* ioctl */ + default_fd_queue_async, /* queue_async */ + default_fd_reselect_async /* reselect_async */ +}; + static void console_input_events_dump( struct object *obj, int verbose ); static void console_input_events_destroy( struct object *obj ); static struct fd *console_input_events_get_fd( struct object *obj ); @@ -221,9 +238,9 @@ static const struct object_ops screen_buffer_ops = screen_buffer_destroy /* destroy */ }; -static int console_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); +static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); -static const struct fd_ops console_fd_ops = +static const struct fd_ops screen_buffer_fd_ops = { default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ @@ -233,7 +250,7 @@ static const struct fd_ops console_fd_ops = no_fd_flush, /* flush */ no_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ - console_ioctl, /* ioctl */ + screen_buffer_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; @@ -446,12 +463,12 @@ static struct object *create_console_input( struct thread* renderer, int fd ) } if (fd != -1) /* bare console */ { - console_input->fd = create_anonymous_fd( &console_fd_ops, fd, &console_input->obj, + console_input->fd = create_anonymous_fd( &console_input_fd_ops, fd, &console_input->obj, FILE_SYNCHRONOUS_IO_NONALERT ); } else { - console_input->fd = alloc_pseudo_fd( &console_fd_ops, &console_input->obj, + console_input->fd = alloc_pseudo_fd( &console_input_fd_ops, &console_input->obj, FILE_SYNCHRONOUS_IO_NONALERT ); } if (!console_input->fd) @@ -540,7 +557,7 @@ static struct screen_buffer *create_console_output( struct console_input *consol screen_buffer->fd = NULL; else { - if (!(screen_buffer->fd = create_anonymous_fd( &console_fd_ops, fd, &screen_buffer->obj, + if (!(screen_buffer->fd = create_anonymous_fd( &screen_buffer_fd_ops, fd, &screen_buffer->obj, FILE_SYNCHRONOUS_IO_NONALERT ))) { release_object( screen_buffer ); @@ -1550,7 +1567,7 @@ static void scroll_console_output( struct screen_buffer *screen_buffer, int xsrc console_input_events_append( screen_buffer->input, &evt ); } -static int console_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) +static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { struct console_input *console = get_fd_user( fd ); @@ -1615,6 +1632,12 @@ static int console_ioctl( struct fd *fd, ioctl_code_t code, struct async *async } } +static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) +{ + set_error( STATUS_INVALID_HANDLE ); + return 0; +} + static int console_input_events_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { struct console_input_events *evts = get_fd_user( fd );

1 0

Jacek Caban : kernel32/tests: Add more invalid handle tests.
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: eeb1f2b0f03198a9f13d1741943a1b4fc701797c URL: https://source.winehq.org/git/wine.git/?a=commit;h=eeb1f2b0f03198a9f13d1741… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 9 19:27:57 2020 +0200 kernel32/tests: Add more invalid handle tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 63 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 45951afef8..b923348015 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -143,6 +143,7 @@ static void testCursorInfo(HANDLE hCon) { BOOL ret; CONSOLE_CURSOR_INFO info; + HANDLE pipe1, pipe2; SetLastError(0xdeadbeef); ret = GetConsoleCursorInfo(NULL, NULL); @@ -169,6 +170,15 @@ static void testCursorInfo(HANDLE hCon) ok(GetLastError() == 0xdeadbeef, "GetLastError: expecting %u got %u\n", 0xdeadbeef, GetLastError()); + CreatePipe(&pipe1, &pipe2, NULL, 0); + info.dwSize = -1; + ret = GetConsoleCursorInfo(pipe1, &info); + ok(!ret, "Expected failure\n"); + ok(info.dwSize == -1, "Expected no change for dwSize\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError: %u\n", GetLastError()); + CloseHandle(pipe1); + CloseHandle(pipe2); + /* Don't test NULL CONSOLE_CURSOR_INFO, it crashes on win9x and win7 */ } @@ -2692,6 +2702,7 @@ static void test_GetCurrentConsoleFont(HANDLE std_output) CONSOLE_FONT_INFO cfi; CONSOLE_SCREEN_BUFFER_INFO csbi; short int width, height; + HANDLE pipe1, pipe2; COORD c; memset(&cfi, 0, sizeof(CONSOLE_FONT_INFO)); @@ -2726,6 +2737,17 @@ static void test_GetCurrentConsoleFont(HANDLE std_output) ok(!cfi.dwFontSize.X, "got %d, expected 0\n", cfi.dwFontSize.X); ok(!cfi.dwFontSize.Y, "got %d, expected 0\n", cfi.dwFontSize.Y); + CreatePipe(&pipe1, &pipe2, NULL, 0); + memset(&cfi, 0, sizeof(CONSOLE_FONT_INFO)); + SetLastError(0xdeadbeef); + ret = GetCurrentConsoleFont(pipe1, TRUE, &cfi); + ok(!ret, "got %d, expected 0\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(!cfi.dwFontSize.X, "got %d, expected 0\n", cfi.dwFontSize.X); + ok(!cfi.dwFontSize.Y, "got %d, expected 0\n", cfi.dwFontSize.Y); + CloseHandle(pipe1); + CloseHandle(pipe2); + memset(&cfi, 0, sizeof(CONSOLE_FONT_INFO)); SetLastError(0xdeadbeef); ret = GetCurrentConsoleFont(std_output, FALSE, &cfi); @@ -2759,6 +2781,7 @@ static void test_GetCurrentConsoleFontEx(HANDLE std_output) CONSOLE_FONT_INFOEX cfix; BOOL ret; HANDLE std_input = GetStdHandle(STD_INPUT_HANDLE); + HANDLE pipe1, pipe2; hmod = GetModuleHandleA("kernel32.dll"); pGetCurrentConsoleFontEx = (void *)GetProcAddress(hmod, "GetCurrentConsoleFontEx"); @@ -2820,6 +2843,15 @@ static void test_GetCurrentConsoleFontEx(HANDLE std_output) ok(!ret, "got %d, expected 0\n", ret); ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + CreatePipe(&pipe1, &pipe2, NULL, 0); + memset(&cfi, 0, sizeof(CONSOLE_FONT_INFO)); + SetLastError(0xdeadbeef); + ret = pGetCurrentConsoleFontEx(pipe1, TRUE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + CloseHandle(pipe1); + CloseHandle(pipe2); + SetLastError(0xdeadbeef); ret = pGetCurrentConsoleFontEx(std_output, FALSE, &cfix); ok(ret, "got %d, expected non-zero\n", ret); @@ -2859,6 +2891,7 @@ static void test_GetConsoleFontSize(HANDLE std_output) LONG font_width, font_height; HMODULE hmod; DWORD (WINAPI *pGetNumberOfConsoleFonts)(void); + HANDLE pipe1, pipe2; memset(&c, 10, sizeof(COORD)); SetLastError(0xdeadbeef); @@ -2874,6 +2907,16 @@ static void test_GetConsoleFontSize(HANDLE std_output) ok(!c.X, "got %d, expected 0\n", c.X); ok(!c.Y, "got %d, expected 0\n", c.Y); + CreatePipe(&pipe1, &pipe2, NULL, 0); + memset(&c, 10, sizeof(COORD)); + SetLastError(0xdeadbeef); + c = GetConsoleFontSize(pipe1, index); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(!c.X, "got %d, expected 0\n", c.X); + ok(!c.Y, "got %d, expected 0\n", c.Y); + CloseHandle(pipe1); + CloseHandle(pipe2); + GetCurrentConsoleFont(std_output, FALSE, &cfi); memset(&c, 10, sizeof(COORD)); SetLastError(0xdeadbeef); @@ -2914,6 +2957,7 @@ static void test_GetLargestConsoleWindowSize(HANDLE std_output) LONG workarea_w, workarea_h, maxcon_w, maxcon_h; CONSOLE_SCREEN_BUFFER_INFO sbi; CONSOLE_FONT_INFO cfi; + HANDLE pipe1, pipe2; DWORD index, i; HMODULE hmod; BOOL ret; @@ -2934,6 +2978,16 @@ static void test_GetLargestConsoleWindowSize(HANDLE std_output) ok(!c.X, "got %d, expected 0\n", c.X); ok(!c.Y, "got %d, expected 0\n", c.Y); + CreatePipe(&pipe1, &pipe2, NULL, 0); + memset(&c, 10, sizeof(COORD)); + SetLastError(0xdeadbeef); + c = GetLargestConsoleWindowSize(pipe1); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(!c.X, "got %d, expected 0\n", c.X); + ok(!c.Y, "got %d, expected 0\n", c.Y); + CloseHandle(pipe1); + CloseHandle(pipe2); + SystemParametersInfoW(SPI_GETWORKAREA, 0, &r, 0); workarea_w = r.right - r.left; workarea_h = r.bottom - r.top - GetSystemMetrics(SM_CYCAPTION); @@ -3155,6 +3209,7 @@ static void test_GetConsoleScreenBufferInfoEx(HANDLE std_output) HANDLE hmod; BOOL (WINAPI *pGetConsoleScreenBufferInfoEx)(HANDLE, CONSOLE_SCREEN_BUFFER_INFOEX *); CONSOLE_SCREEN_BUFFER_INFOEX csbix; + HANDLE pipe1, pipe2; BOOL ret; HANDLE std_input = GetStdHandle(STD_INPUT_HANDLE); @@ -3193,6 +3248,14 @@ static void test_GetConsoleScreenBufferInfoEx(HANDLE std_output) ok(!ret, "got %d, expected zero\n", ret); ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + CreatePipe(&pipe1, &pipe2, NULL, 0); + SetLastError(0xdeadbeef); + ret = pGetConsoleScreenBufferInfoEx(std_input, &csbix); + ok(!ret, "got %d, expected zero\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + CloseHandle(pipe1); + CloseHandle(pipe2); + SetLastError(0xdeadbeef); ret = pGetConsoleScreenBufferInfoEx(std_output, &csbix); ok(ret, "got %d, expected non-zero\n", ret);

1 0

Paul Gofman : ntdll: Fix stack adjustment condition in call_user_exception_dispatcher on x86_64.
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: 095b0f5acc225ab79db2406d42686b8c51b4d887 URL: https://source.winehq.org/git/wine.git/?a=commit;h=095b0f5acc225ab79db2406d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jul 9 19:31:58 2020 +0300 ntdll: Fix stack adjustment condition in call_user_exception_dispatcher on x86_64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index eed622851f..a2240900ab 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2003,7 +2003,7 @@ __ASM_GLOBAL_FUNC( call_user_exception_dispatcher, "movq 0x98(%rdx),%r9\n\t" /* context->Rsp */ "andq $~0xf,%r9\n\t" "subq $0x630,%r9\n\t" /* sizeof(struct stack_layout) */ - "cmpq %r9,%rsp\n\t" + "cmpq %rsp,%r9\n\t" "cmovbq %r9,%rsp\n\t" "jmp " __ASM_NAME("do_call_user_exception_dispatcher") "\n\t")

1 0

← Newer
1
...
59
60
61
62
63
64
65
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2020