Author: pschweitzer
Date: Tue Sep  1 22:32:55 2015
New Revision: 68905

URL: http://svn.reactos.org/svn/reactos?rev=68905&view=rev
Log:
[NTOSKRNL]
Fix KdpPrompt():
- Don't attempt to return in the middle of the loop. It leads to keep the mouse 
disabled instead of reenabling it.
- Also, return a string length that actually matches what was written to the 
output buffer.

This fixes invalid behavior on RtlAssert when used with #if 0 moved to #if 1, 
or when Windows NTDLL is used in ReactOS.

CORE-10082 #resolve #comment Fixed with r68905
CORE-10083 #resolve #comment Fixed with r68905

Modified:
    trunk/reactos/ntoskrnl/kdbg/kdb_cli.c

Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?rev=68905&r1=68904&r2=68905&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c       [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c       [iso-8859-1] Tue Sep  1 
22:32:55 2015
@@ -3745,19 +3745,7 @@
              * DbgPrompt does not null terminate, but it does
              */
             *(PCHAR)(OutString + i) = 0;
-
-            /* Print a new line */
-            KdPortPutByteEx(&SerialPortInfo, '\r');
-            KdPortPutByteEx(&SerialPortInfo, '\n');
-
-            /* Release spinlock */
-            KiReleaseSpinLock(&KdpSerialSpinLock);
-
-            /* Lower IRQL back */
-            KeLowerIrql(OldIrql);
-
-            /* Return the length  */
-            return OutStringLength + 1;
+            break;
         }
 
         /* Write it back and print it to the log */
@@ -3779,5 +3767,5 @@
     KeLowerIrql(OldIrql);
 
     /* Return the length  */
-    return OutStringLength;
-}
+    return i;
+}


Reply via email to