[ros-diffs] [amunger] 22335: Merge 22283 to 0.3.0

Author: amunger
Date: Tue Jun 13 07:35:48 2006
New Revision: 22335

URL: http://svn.reactos.ru/svn/reactos?rev=22335&view=rev
Log:
Merge 22283 to 0.3.0

Modified:
    branches/ros-branch-0_3_0/reactos/subsystems/win32/csrss/win32csr/conio.c

Modified: branches/ros-branch-0_3_0/reactos/subsystems/win32/csrss/win32csr/conio.c
URL:
http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/subsyst…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/subsystems/win32/csrss/win32csr/conio.c (original)
+++ branches/ros-branch-0_3_0/reactos/subsystems/win32/csrss/win32csr/conio.c Tue Jun 13
07:35:48 2006
@@ -613,13 +613,14 @@
                   i -= 2;        /* if we already have something to return, just back it
up by 2 */
                 }
               else
-                {            /* otherwise, return STATUS_NOTIFY_CLEANUP to tell client to
back up its buffer */
+                {
+                  /* otherwise, we will treat the backspace just like any other char and
let the client decide what to do */                  
                   Console->WaitingChars--;
                   ConioUnlockConsole(Console);
                   HeapFree(Win32CsrApiHeap, 0, Input);
-                  Request->Data.ReadConsoleRequest.NrCharactersRead = 0;
-                  Request->Status = STATUS_NOTIFY_CLEANUP;
-                  return STATUS_NOTIFY_CLEANUP;
+                  Request->Data.ReadConsoleRequest.NrCharactersRead++;
+                  Buffer[i] = Input->InputEvent.Event.KeyEvent.uChar.AsciiChar;
+                  return Request->Status;  
                 }
               Request->Data.ReadConsoleRequest.nCharsCanBeDeleted--;
               Input->Echoed = TRUE;   /* mark as echoed so we don't echo it below
*/