Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 05:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CMD]

Browse source 
Fix the default input & output console modes. Now, you can use the command interpreter via serial port redirection, by:
1- Enabling a serial port on the machine on which ReactOS runs.
2- Launching:
   cmd > AUX
   at a command prompt.

svn path=/trunk/; revision=59405
This commit is contained in:
Hermès Bélusca-Maïto 2013-07-01 00:07:39 +00:00
parent ce910f7e5f
commit f4f73b4848
2 changed files with 45 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
reactos/base/shell/cmd/cmd.c
View file

@ -414,21 +414,20 @@ Execute(LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd)
stui.dwFlags = STARTF_USESHOWWINDOW; stui.dwFlags = STARTF_USESHOWWINDOW;
stui.wShowWindow = SW_SHOWDEFAULT; stui.wShowWindow = SW_SHOWDEFAULT;
// return console to standard mode /* Set the console to standard mode */
SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE),
ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT | ENABLE_ECHO_INPUT); ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT);
if (CreateProcess (szFullName,
szFullCmdLine,
NULL,
NULL,
TRUE,
0, /* CREATE_NEW_PROCESS_GROUP */
NULL,
NULL,
&stui,
&prci))
if (CreateProcess(szFullName,
szFullCmdLine,
NULL,
NULL,
TRUE,
0, /* CREATE_NEW_PROCESS_GROUP */
NULL,
NULL,
&stui,
&prci))
{ {
CloseHandle(prci.hThread); CloseHandle(prci.hThread);
} }
@ -449,32 +448,33 @@ Execute(LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd)
EnterCriticalSection(&ChildProcessRunningLock); EnterCriticalSection(&ChildProcessRunningLock);
dwChildProcessId = prci.dwProcessId; dwChildProcessId = prci.dwProcessId;
WaitForSingleObject (prci.hProcess, INFINITE); WaitForSingleObject(prci.hProcess, INFINITE);
LeaveCriticalSection(&ChildProcessRunningLock); LeaveCriticalSection(&ChildProcessRunningLock);
GetExitCodeProcess (prci.hProcess, &dwExitCode); GetExitCodeProcess(prci.hProcess, &dwExitCode);
nErrorLevel = (INT)dwExitCode; nErrorLevel = (INT)dwExitCode;
} }
CloseHandle (prci.hProcess); CloseHandle(prci.hProcess);
} }
else else
{ {
TRACE ("[ShellExecute failed!: %s]\n", debugstr_aw(Full)); TRACE ("[ShellExecute failed!: %s]\n", debugstr_aw(Full));
error_bad_command (first); error_bad_command(first);
dwExitCode = 1; dwExitCode = 1;
} }
// restore console mode /* Restore our default console mode */
SetConsoleMode ( SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE),
GetStdHandle( STD_INPUT_HANDLE ), ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT);
ENABLE_PROCESSED_INPUT ); SetConsoleMode(GetStdHandle(STD_OUTPUT_HANDLE),
ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT);
} }
/* Get code page if it has been change */ /* Get code page if it has been changed */
InputCodePage= GetConsoleCP(); InputCodePage= GetConsoleCP();
OutputCodePage = GetConsoleOutputCP(); OutputCodePage = GetConsoleOutputCP();
SetConsoleTitle (szWindowTitle); SetConsoleTitle(szWindowTitle);
return dwExitCode; return dwExitCode;
} }
@ -1360,7 +1360,7 @@ DoDelayedExpansion(LPTSTR Line)
*/ */
BOOL BOOL
ReadLine (TCHAR *commandline, BOOL bMore) ReadLine(TCHAR *commandline, BOOL bMore)
{ {
TCHAR readline[CMDLINE_LENGTH]; TCHAR readline[CMDLINE_LENGTH];
LPTSTR ip; LPTSTR ip;
@ -1426,7 +1426,7 @@ ProcessInput()
/* /*
* control-break handler. * control-break handler.
*/ */
BOOL WINAPI BreakHandler (DWORD dwCtrlType) BOOL WINAPI BreakHandler(DWORD dwCtrlType)
{ {
DWORD dwWritten; DWORD dwWritten;
INPUT_RECORD rec; INPUT_RECORD rec;
@ -1637,18 +1637,18 @@ Initialize()
NtReadVirtualMemoryPtr = (NtReadVirtualMemoryProc)GetProcAddress(NtDllModule, "NtReadVirtualMemory"); NtReadVirtualMemoryPtr = (NtReadVirtualMemoryProc)GetProcAddress(NtDllModule, "NtReadVirtualMemory");
} }
InitLocale (); InitLocale();
/* get default input and output console handles */ /* get default input and output console handles */
hOut = GetStdHandle (STD_OUTPUT_HANDLE); hOut = GetStdHandle(STD_OUTPUT_HANDLE);
hIn = GetStdHandle (STD_INPUT_HANDLE); hIn = GetStdHandle(STD_INPUT_HANDLE);
/* Set EnvironmentVariable PROMPT if it does not exists any env value. /* Set EnvironmentVariable PROMPT if it does not exists any env value.
for you can change the EnvirommentVariable for prompt before cmd start for you can change the EnvirommentVariable for prompt before cmd start
this patch are not 100% right, if it does not exists a PROMPT value cmd should use this patch are not 100% right, if it does not exists a PROMPT value cmd should use
$P$G as defualt not set EnvirommentVariable PROMPT to $P$G if it does not exists */ $P$G as defualt not set EnvirommentVariable PROMPT to $P$G if it does not exists */
if (GetEnvironmentVariable(_T("PROMPT"),lpBuffer, sizeof(lpBuffer) / sizeof(lpBuffer[0])) == 0) if (GetEnvironmentVariable(_T("PROMPT"),lpBuffer, sizeof(lpBuffer) / sizeof(lpBuffer[0])) == 0)
SetEnvironmentVariable (_T("PROMPT"), _T("$P$G")); SetEnvironmentVariable(_T("PROMPT"), _T("$P$G"));
#ifdef FEATURE_DIR_STACK #ifdef FEATURE_DIR_STACK
/* initialize directory stack */ /* initialize directory stack */
@ -1667,10 +1667,13 @@ Initialize()
SetEnvironmentVariable (_T("COMSPEC"), ModuleName); SetEnvironmentVariable (_T("COMSPEC"), ModuleName);
} }
/* add ctrl break handler */ /* Add ctrl break handler */
AddBreakHandler (); AddBreakHandler();
SetConsoleMode (hIn, ENABLE_PROCESSED_INPUT); /* Set our default console mode */
SetConsoleMode(hOut, 0); // Reinitialize the console output mode
SetConsoleMode(hOut, ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT);
SetConsoleMode(hIn , ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT);
cmdLine = GetCommandLine(); cmdLine = GetCommandLine();
TRACE ("[command args: %s]\n", debugstr_aw(cmdLine)); TRACE ("[command args: %s]\n", debugstr_aw(cmdLine));
@ -1800,10 +1803,15 @@ static VOID Cleanup()
/* free GetEnvVar's buffer */ /* free GetEnvVar's buffer */
GetEnvVar(NULL); GetEnvVar(NULL);
/* remove ctrl break handler */ /* Remove ctrl break handler */
RemoveBreakHandler (); RemoveBreakHandler();
SetConsoleMode(GetStdHandle( STD_INPUT_HANDLE ),
ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT | ENABLE_ECHO_INPUT); /* Restore the default console mode */
SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE),
ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT);
SetConsoleMode(GetStdHandle(STD_OUTPUT_HANDLE),
ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT);
DeleteCriticalSection(&ChildProcessRunningLock); DeleteCriticalSection(&ChildProcessRunningLock);
} }

3
reactos/base/shell/cmd/redir.c
View file

@ -61,8 +61,7 @@ PerformRedirection(REDIRECTION *RedirList)
static SECURITY_ATTRIBUTES SecAttr = { sizeof(SECURITY_ATTRIBUTES), NULL, TRUE }; static SECURITY_ATTRIBUTES SecAttr = { sizeof(SECURITY_ATTRIBUTES), NULL, TRUE };
/* Some parameters used for read, write, and append, respectively */ /* Some parameters used for read, write, and append, respectively */
static static struct REDIR_PARAMS
struct REDIR_PARAMS
{ {
DWORD dwDesiredAccess; DWORD dwDesiredAccess;
DWORD dwShareMode; DWORD dwShareMode;