ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernelbase: Use IOCTL_CONDRV_GET_OUTPUT_INFO in GetConsoleScreenBufferInfoEx. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2020-07-09 19:29:05 +02:00 committed by Alexandre Julliard
parent 587ca81f8d
commit 94c1640bb3
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dlls/kernelbase/console.c
View File

@ -669,7 +669,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleScreenBufferInfo( HANDLE handle, CONSOLE
BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleScreenBufferInfoEx( HANDLE handle, BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleScreenBufferInfoEx( HANDLE handle,
CONSOLE_SCREEN_BUFFER_INFOEX *info ) CONSOLE_SCREEN_BUFFER_INFOEX *info )
{ {
BOOL ret; struct condrv_output_info condrv_info;
if (info->cbSize != sizeof(CONSOLE_SCREEN_BUFFER_INFOEX)) if (info->cbSize != sizeof(CONSOLE_SCREEN_BUFFER_INFOEX))
{ {
@ -677,29 +677,28 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleScreenBufferInfoEx( HANDLE handle,
return FALSE; 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 ); SetLastError( ERROR_INVALID_HANDLE );
wine_server_set_reply( req, info->ColorTable, sizeof(info->ColorTable) ); return FALSE;
if ((ret = !wine_server_call_err( req ))) }
{
info->dwSize.X = reply->width; info->dwSize.X = condrv_info.width;
info->dwSize.Y = reply->height; info->dwSize.Y = condrv_info.height;
info->dwCursorPosition.X = reply->cursor_x; info->dwCursorPosition.X = condrv_info.cursor_x;
info->dwCursorPosition.Y = reply->cursor_y; info->dwCursorPosition.Y = condrv_info.cursor_y;
info->wAttributes = reply->attr; info->wAttributes = condrv_info.attr;
info->srWindow.Left = reply->win_left; info->srWindow.Left = condrv_info.win_left;
info->srWindow.Top = reply->win_top; info->srWindow.Top = condrv_info.win_top;
info->srWindow.Right = reply->win_right; info->srWindow.Right = condrv_info.win_right;
info->srWindow.Bottom = reply->win_bottom; info->srWindow.Bottom = condrv_info.win_bottom;
info->dwMaximumWindowSize.X = min( reply->width, reply->max_width ); info->dwMaximumWindowSize.X = min( condrv_info.width, condrv_info.max_width );
info->dwMaximumWindowSize.Y = min( reply->height, reply->max_height ); info->dwMaximumWindowSize.Y = min( condrv_info.height, condrv_info.max_height );
info->wPopupAttributes = reply->popup_attr; info->wPopupAttributes = condrv_info.popup_attr;
info->bFullscreenSupported = FALSE; info->bFullscreenSupported = FALSE;
} memcpy( info->ColorTable, condrv_info.color_map, sizeof(info->ColorTable) );
} return TRUE;
SERVER_END_REQ;
return ret;
} }