From 7bba5bf9ba63d1f77fe35d69ea21c021c09a0f0c Mon Sep 17 00:00:00 2001 From: Dmitry Gorbachev Date: Fri, 15 Jun 2007 21:39:28 +0000 Subject: [PATCH] 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 --- reactos/subsystems/win32/csrss/win32csr/conio.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/reactos/subsystems/win32/csrss/win32csr/conio.c b/reactos/subsystems/win32/csrss/win32csr/conio.c index 5019b9c22fb..96186ba029b 100644 --- a/reactos/subsystems/win32/csrss/win32csr/conio.c +++ b/reactos/subsystems/win32/csrss/win32csr/conio.c @@ -2574,19 +2574,11 @@ CSR_API(CsrScrollConsoleScreenBuffer) if (! ConioGetIntersection(&SrcRegion, &ScreenBuffer, &ScrollRectangle)) { ConioUnlockScreenBuffer(Buff); - if (NULL != Console) - { - ConioUnlockConsole(Console); - } return Request->Status = STATUS_INVALID_PARAMETER; } if (UseClipRectangle && ! ConioGetIntersection(&SrcRegion, &SrcRegion, &ClipRectangle)) { - if (NULL != Console) - { - ConioUnlockConsole(Console); - } ConioUnlockScreenBuffer(Buff); return Request->Status = STATUS_SUCCESS; } @@ -2601,10 +2593,6 @@ CSR_API(CsrScrollConsoleScreenBuffer) /* Make sure destination rectangle is inside the screen buffer */ if (! ConioGetIntersection(&DstRegion, &DstRegion, &ScreenBuffer)) { - if (NULL != Console) - { - ConioUnlockConsole(Console); - } ConioUnlockScreenBuffer(Buff); return Request->Status = STATUS_INVALID_PARAMETER; } @@ -2675,10 +2663,6 @@ CSR_API(CsrReadConsoleOutputChar) Status = ConioLockScreenBuffer(ProcessData, Request->Data.ReadConsoleOutputCharRequest.ConsoleHandle, &Buff); if (! NT_SUCCESS(Status)) { - if (NULL != Console) - { - ConioUnlockConsole(Console); - } return Request->Status = Status; }