Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-29 01:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CMD] Use correct console input mode in ConInString()

Browse source 
ENABLE_PROCESSED_INPUT is necessary to correctly deal with CR-LF
and display it only when necessary. Fixes cmd:batch winetests.

Addendum to commit db219e45c
This commit is contained in:
Hermès Bélusca-Maïto 2023-11-16 21:48:51 +01:00
parent a5c3bb5bce
commit 98353cdb37
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
base/shell/cmd/console.c
View file

@ -96,7 +96,7 @@ VOID ConInString(LPTSTR lpInput, DWORD dwLength)
hFile = GetStdHandle(STD_INPUT_HANDLE);
GetConsoleMode(hFile, &dwOldMode);
SetConsoleMode(hFile, ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT);
SetConsoleMode(hFile, ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT);
ReadFile(hFile, (PVOID)pBuf, dwLength - 1, &dwRead, NULL);
@ -106,10 +106,9 @@ VOID ConInString(LPTSTR lpInput, DWORD dwLength)
#endif
for (p = lpInput; *p; p++)
{
if (*p == _T('\r')) // Terminate at the next carriage-return.
if (*p == _T('\r')) // Terminate at the carriage-return.
{
*p = _T('\0');
ConOutChar(_T('\n')); // Output newline as well.
break;
}
}