Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 08:25:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CONSRV]: Fixes for SetConsoleWindowInfo, where one notices that again the MSDN documentation on SetConsoleWindowInfo is partially wrong.

Browse source 
This makes all the kernel32_apitest:SetConsoleWindowInfo tests pass now.
Also, notify the console window about the size change.

svn path=/trunk/; revision=72984
This commit is contained in:
Hermès Bélusca-Maïto 2016-10-18 17:16:57 +00:00
parent 0d6632cdfb
commit 76c73fc423
1 changed files with 30 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

38
reactos/win32ss/user/winsrv/consrv/condrv/text.c
View file

@ -1225,7 +1225,7 @@ ConDrvSetConsoleWindowInfo(IN PCONSOLE Console,
CapturedWindowRect = *WindowRect; CapturedWindowRect = *WindowRect;
if (Absolute == FALSE) if (!Absolute)
{ {
/* Relative positions given. Transform them to absolute ones */ /* Relative positions given. Transform them to absolute ones */
CapturedWindowRect.Left += Buffer->ViewOrigin.X; CapturedWindowRect.Left += Buffer->ViewOrigin.X;
@ -1234,12 +1234,34 @@ ConDrvSetConsoleWindowInfo(IN PCONSOLE Console,
CapturedWindowRect.Bottom += Buffer->ViewOrigin.Y + Buffer->ViewSize.Y - 1; CapturedWindowRect.Bottom += Buffer->ViewOrigin.Y + Buffer->ViewSize.Y - 1;
} }
/* See MSDN documentation on SetConsoleWindowInfo about the performed checks */ /*
if ( (CapturedWindowRect.Left < 0) || (CapturedWindowRect.Top < 0) || * The MSDN documentation on SetConsoleWindowInfo is partially wrong about
(CapturedWindowRect.Right >= Buffer->ScreenBufferSize.X) || * the performed checks this API performs. While it is correct that the
(CapturedWindowRect.Bottom >= Buffer->ScreenBufferSize.Y) || * 'Right'/'Bottom' members cannot be strictly smaller than the 'Left'/'Top'
(CapturedWindowRect.Right <= CapturedWindowRect.Left) || * members, they can be equal.
(CapturedWindowRect.Bottom <= CapturedWindowRect.Top) ) * Also, if the 'Left' or 'Top' members are negative, this is automatically
* corrected for, and the window rectangle coordinates are shifted accordingly.
*/
if ((CapturedWindowRect.Right < CapturedWindowRect.Left) ||
(CapturedWindowRect.Bottom < CapturedWindowRect.Top))
{
return STATUS_INVALID_PARAMETER;
}
/* Shift the window rectangle coordinates if 'Left' or 'Top' are negative */
if (CapturedWindowRect.Left < 0)
{
CapturedWindowRect.Right -= CapturedWindowRect.Left;
CapturedWindowRect.Left = 0;
}
if (CapturedWindowRect.Top < 0)
{
CapturedWindowRect.Bottom -= CapturedWindowRect.Top;
CapturedWindowRect.Top = 0;
}
if ((CapturedWindowRect.Right >= Buffer->ScreenBufferSize.X) ||
(CapturedWindowRect.Bottom >= Buffer->ScreenBufferSize.Y))
{ {
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
} }
@ -1250,7 +1272,7 @@ ConDrvSetConsoleWindowInfo(IN PCONSOLE Console,
Buffer->ViewSize.X = CapturedWindowRect.Right - CapturedWindowRect.Left + 1; Buffer->ViewSize.X = CapturedWindowRect.Right - CapturedWindowRect.Left + 1;
Buffer->ViewSize.Y = CapturedWindowRect.Bottom - CapturedWindowRect.Top + 1; Buffer->ViewSize.Y = CapturedWindowRect.Bottom - CapturedWindowRect.Top + 1;
// TermResizeTerminal(Console); TermResizeTerminal(Console);
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }