[ros-diffs] [dgorbachev] 27195: 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.

Author: dgorbachev
Date: Sat Jun 16 01:39:28 2007
New Revision: 27195

URL: http://svn.reactos.org/svn/reactos?rev=27195&view=rev
Log:
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.

Modified:
    trunk/reactos/subsystems/win32/csrss/win32csr/conio.c

Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win3...
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c (original)
+++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Sat Jun 16 01:39:28 2007
@@ -2574,19 +2574,11 @@
   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 @@
   /* 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 @@
   Status = ConioLockScreenBuffer(ProcessData, Request->Data.ReadConsoleOutputCharRequest.ConsoleHandle, &Buff);
   if (! NT_SUCCESS(Status))
     {
-      if (NULL != Console)
-        {
-          ConioUnlockConsole(Console);
-        }
       return Request->Status = Status;
     }