mirror of
https://github.com/reactos/reactos.git
synced 2024-07-31 00:28:56 +00:00
[CONSRV]
Use the ConsoleGetPerProcessData macro (--> CONSOLE_PROCESS_DATA structure). svn path=/branches/ros-csrss/; revision=57730
This commit is contained in:
parent
4b04f7d488
commit
a4ef6acb0a
|
@ -1302,7 +1302,7 @@ CSR_API(SrvCreateConsoleScreenBuffer)
|
||||||
return Status;
|
return Status;
|
||||||
}
|
}
|
||||||
|
|
||||||
CSR_API(SrvGetConsoleScreenBufferInfo) // CsrGetScreenBufferInfo
|
CSR_API(SrvGetConsoleScreenBufferInfo)
|
||||||
{
|
{
|
||||||
NTSTATUS Status;
|
NTSTATUS Status;
|
||||||
PCSRSS_SCREEN_BUFFER_INFO ScreenBufferInfoRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ScreenBufferInfoRequest;
|
PCSRSS_SCREEN_BUFFER_INFO ScreenBufferInfoRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ScreenBufferInfoRequest;
|
||||||
|
@ -1312,11 +1312,9 @@ CSR_API(SrvGetConsoleScreenBufferInfo) // CsrGetScreenBufferInfo
|
||||||
|
|
||||||
DPRINT("SrvGetConsoleScreenBufferInfo\n");
|
DPRINT("SrvGetConsoleScreenBufferInfo\n");
|
||||||
|
|
||||||
Status = ConioLockScreenBuffer(CsrGetClientThread()->Process, ScreenBufferInfoRequest->ConsoleHandle, &Buff, GENERIC_READ);
|
Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), ScreenBufferInfoRequest->ConsoleHandle, &Buff, GENERIC_READ);
|
||||||
if (! NT_SUCCESS(Status))
|
if (!NT_SUCCESS(Status)) return Status;
|
||||||
{
|
|
||||||
return Status;
|
|
||||||
}
|
|
||||||
Console = Buff->Header.Console;
|
Console = Buff->Header.Console;
|
||||||
pInfo = &ScreenBufferInfoRequest->Info;
|
pInfo = &ScreenBufferInfoRequest->Info;
|
||||||
pInfo->dwSize.X = Buff->MaxX;
|
pInfo->dwSize.X = Buff->MaxX;
|
||||||
|
@ -1344,11 +1342,9 @@ CSR_API(SrvSetConsoleActiveScreenBuffer)
|
||||||
|
|
||||||
DPRINT("SrvSetConsoleActiveScreenBuffer\n");
|
DPRINT("SrvSetConsoleActiveScreenBuffer\n");
|
||||||
|
|
||||||
Status = ConioLockScreenBuffer(CsrGetClientThread()->Process, SetScreenBufferRequest->OutputHandle, &Buff, GENERIC_WRITE);
|
Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), SetScreenBufferRequest->OutputHandle, &Buff, GENERIC_WRITE);
|
||||||
if (! NT_SUCCESS(Status))
|
if (!NT_SUCCESS(Status)) return Status;
|
||||||
{
|
|
||||||
return Status;
|
|
||||||
}
|
|
||||||
Console = Buff->Header.Console;
|
Console = Buff->Header.Console;
|
||||||
|
|
||||||
if (Buff == Console->ActiveBuffer)
|
if (Buff == Console->ActiveBuffer)
|
||||||
|
@ -1362,8 +1358,10 @@ CSR_API(SrvSetConsoleActiveScreenBuffer)
|
||||||
{
|
{
|
||||||
ConioDeleteScreenBuffer(Console->ActiveBuffer);
|
ConioDeleteScreenBuffer(Console->ActiveBuffer);
|
||||||
}
|
}
|
||||||
/* tie console to new buffer */
|
|
||||||
|
/* Tie console to new buffer */
|
||||||
Console->ActiveBuffer = Buff;
|
Console->ActiveBuffer = Buff;
|
||||||
|
|
||||||
/* Redraw the console */
|
/* Redraw the console */
|
||||||
ConioDrawConsole(Console);
|
ConioDrawConsole(Console);
|
||||||
|
|
||||||
|
@ -1397,11 +1395,9 @@ CSR_API(SrvScrollConsoleScreenBuffer)
|
||||||
DestinationOrigin = ScrollConsoleScreenBufferRequest->DestinationOrigin;
|
DestinationOrigin = ScrollConsoleScreenBufferRequest->DestinationOrigin;
|
||||||
Fill = ScrollConsoleScreenBufferRequest->Fill;
|
Fill = ScrollConsoleScreenBufferRequest->Fill;
|
||||||
|
|
||||||
Status = ConioLockScreenBuffer(CsrGetClientThread()->Process, ConsoleHandle, &Buff, GENERIC_WRITE);
|
Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), ConsoleHandle, &Buff, GENERIC_WRITE);
|
||||||
if (! NT_SUCCESS(Status))
|
if (!NT_SUCCESS(Status)) return Status;
|
||||||
{
|
|
||||||
return Status;
|
|
||||||
}
|
|
||||||
Console = Buff->Header.Console;
|
Console = Buff->Header.Console;
|
||||||
|
|
||||||
ScrollRectangle = ScrollConsoleScreenBufferRequest->ScrollRectangle;
|
ScrollRectangle = ScrollConsoleScreenBufferRequest->ScrollRectangle;
|
||||||
|
@ -1470,17 +1466,12 @@ CSR_API(SrvSetConsoleScreenBufferSize)
|
||||||
{
|
{
|
||||||
NTSTATUS Status;
|
NTSTATUS Status;
|
||||||
PCSRSS_SET_SCREEN_BUFFER_SIZE SetScreenBufferSize = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetScreenBufferSize;
|
PCSRSS_SET_SCREEN_BUFFER_SIZE SetScreenBufferSize = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetScreenBufferSize;
|
||||||
PCSRSS_CONSOLE Console;
|
|
||||||
PCSRSS_SCREEN_BUFFER Buff;
|
PCSRSS_SCREEN_BUFFER Buff;
|
||||||
|
|
||||||
Status = ConioLockScreenBuffer(CsrGetClientThread()->Process, SetScreenBufferSize->OutputHandle, &Buff, GENERIC_WRITE);
|
Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), SetScreenBufferSize->OutputHandle, &Buff, GENERIC_WRITE);
|
||||||
if (!NT_SUCCESS(Status))
|
if (!NT_SUCCESS(Status)) return Status;
|
||||||
{
|
|
||||||
return Status;
|
|
||||||
}
|
|
||||||
Console = Buff->Header.Console;
|
|
||||||
|
|
||||||
Status = ConioResizeBuffer(Console, Buff, SetScreenBufferSize->Size);
|
Status = ConioResizeBuffer(Buff->Header.Console, Buff, SetScreenBufferSize->Size);
|
||||||
ConioUnlockScreenBuffer(Buff);
|
ConioUnlockScreenBuffer(Buff);
|
||||||
|
|
||||||
return Status;
|
return Status;
|
||||||
|
|
Loading…
Reference in a new issue