I'm sorry, but r27177 does not work for me. I just tested LiveCD on real

hardware, something goes wrong. So I'm reverting it for now. Please test it 
more carefully.

svn path=/trunk/; revision=27195
This commit is contained in:
Dmitry Gorbachev 2007-06-15 21:39:28 +00:00
parent e6e9d500a4
commit 7bba5bf9ba

View file

@ -2574,19 +2574,11 @@ CSR_API(CsrScrollConsoleScreenBuffer)
if (! ConioGetIntersection(&SrcRegion, &ScreenBuffer, &ScrollRectangle)) if (! ConioGetIntersection(&SrcRegion, &ScreenBuffer, &ScrollRectangle))
{ {
ConioUnlockScreenBuffer(Buff); ConioUnlockScreenBuffer(Buff);
if (NULL != Console)
{
ConioUnlockConsole(Console);
}
return Request->Status = STATUS_INVALID_PARAMETER; return Request->Status = STATUS_INVALID_PARAMETER;
} }
if (UseClipRectangle && ! ConioGetIntersection(&SrcRegion, &SrcRegion, &ClipRectangle)) if (UseClipRectangle && ! ConioGetIntersection(&SrcRegion, &SrcRegion, &ClipRectangle))
{ {
if (NULL != Console)
{
ConioUnlockConsole(Console);
}
ConioUnlockScreenBuffer(Buff); ConioUnlockScreenBuffer(Buff);
return Request->Status = STATUS_SUCCESS; return Request->Status = STATUS_SUCCESS;
} }
@ -2601,10 +2593,6 @@ CSR_API(CsrScrollConsoleScreenBuffer)
/* Make sure destination rectangle is inside the screen buffer */ /* Make sure destination rectangle is inside the screen buffer */
if (! ConioGetIntersection(&DstRegion, &DstRegion, &ScreenBuffer)) if (! ConioGetIntersection(&DstRegion, &DstRegion, &ScreenBuffer))
{ {
if (NULL != Console)
{
ConioUnlockConsole(Console);
}
ConioUnlockScreenBuffer(Buff); ConioUnlockScreenBuffer(Buff);
return Request->Status = STATUS_INVALID_PARAMETER; return Request->Status = STATUS_INVALID_PARAMETER;
} }
@ -2675,10 +2663,6 @@ CSR_API(CsrReadConsoleOutputChar)
Status = ConioLockScreenBuffer(ProcessData, Request->Data.ReadConsoleOutputCharRequest.ConsoleHandle, &Buff); Status = ConioLockScreenBuffer(ProcessData, Request->Data.ReadConsoleOutputCharRequest.ConsoleHandle, &Buff);
if (! NT_SUCCESS(Status)) if (! NT_SUCCESS(Status))
{ {
if (NULL != Console)
{
ConioUnlockConsole(Console);
}
return Request->Status = Status; return Request->Status = Status;
} }