mirror of
https://github.com/reactos/reactos.git
synced 2024-11-19 05:22:59 +00:00
[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 svn path=/trunk/; revision=68905
This commit is contained in:
parent
6dfa71c487
commit
9bd7b06448
1 changed files with 2 additions and 14 deletions
|
@ -3745,19 +3745,7 @@ KdpPrompt(IN LPSTR InString,
|
||||||
* DbgPrompt does not null terminate, but it does
|
* DbgPrompt does not null terminate, but it does
|
||||||
*/
|
*/
|
||||||
*(PCHAR)(OutString + i) = 0;
|
*(PCHAR)(OutString + i) = 0;
|
||||||
|
break;
|
||||||
/* 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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Write it back and print it to the log */
|
/* Write it back and print it to the log */
|
||||||
|
@ -3779,5 +3767,5 @@ KdpPrompt(IN LPSTR InString,
|
||||||
KeLowerIrql(OldIrql);
|
KeLowerIrql(OldIrql);
|
||||||
|
|
||||||
/* Return the length */
|
/* Return the length */
|
||||||
return OutStringLength;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue