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

kernelbase: Remove window position adjustment from SetConsoleCursorPosition. 

It's done in conhost now.

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2020-10-13 16:28:12 +02:00 committed by Alexandre Julliard
parent 98dcd3a7ea
commit eca4d91cad
1 changed files with 1 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
dlls/kernelbase/console.c
View File

@ -1183,46 +1183,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleCursorInfo( HANDLE handle, CONSOLE_CURSO
BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleCursorPosition( HANDLE handle, COORD pos ) BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleCursorPosition( HANDLE handle, COORD pos )
{ {
struct condrv_output_info_params params = { SET_CONSOLE_OUTPUT_INFO_CURSOR_POS }; struct condrv_output_info_params params = { SET_CONSOLE_OUTPUT_INFO_CURSOR_POS };
CONSOLE_SCREEN_BUFFER_INFO info;
int w, h, do_move = 0;
TRACE( "%p %d %d\n", handle, pos.X, pos.Y ); TRACE( "%p %d %d\n", handle, pos.X, pos.Y );
params.info.cursor_x = pos.X; params.info.cursor_x = pos.X;
params.info.cursor_y = pos.Y; params.info.cursor_y = pos.Y;
if (!console_ioctl( handle, IOCTL_CONDRV_SET_OUTPUT_INFO, &params, sizeof(params), NULL, 0, NULL )) return console_ioctl( handle, IOCTL_CONDRV_SET_OUTPUT_INFO, &params, sizeof(params), NULL, 0, NULL );
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;
h = info.srWindow.Bottom - info.srWindow.Top + 1;
if (pos.X < info.srWindow.Left)
{
info.srWindow.Left = min(pos.X, info.dwSize.X - w);
do_move = 1;
}
else if (pos.X > info.srWindow.Right)
{
info.srWindow.Left = max(pos.X, w) - w + 1;
do_move = 1;
}
info.srWindow.Right = info.srWindow.Left + w - 1;
if (pos.Y < info.srWindow.Top)
{
info.srWindow.Top = min(pos.Y, info.dwSize.Y - h);
do_move = 1;
}
else if (pos.Y > info.srWindow.Bottom)
{
info.srWindow.Top = max(pos.Y, h) - h + 1;
do_move = 1;
}
info.srWindow.Bottom = info.srWindow.Top + h - 1;
return !do_move || SetConsoleWindowInfo( handle, TRUE, &info.srWindow );
} }