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

Implement all remaining switches for the START command.

Browse source 
svn path=/trunk/; revision=40198
This commit is contained in:
Jeffrey Morlan 2009-03-23 23:52:50 +00:00
parent d17f538267
commit 2895b48a31
4 changed files with 70 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -163,6 +163,7 @@ OSVERSIONINFO osvi;
HANDLE hIn;
HANDLE hOut;
HANDLE hConsole;
LPTSTR lpOriginalEnvironment;
HANDLE CMD_ModuleHandle;
static NtQueryInformationProcessProc NtQueryInformationProcessPtr = NULL;
@ -1928,6 +1929,8 @@ int cmd_main (int argc, const TCHAR *argv[])
CONSOLE_SCREEN_BUFFER_INFO Info;
INT nExitCode;
lpOriginalEnvironment = DuplicateEnvironment();
GetCurrentDirectory(MAX_PATH,startPath);
_tchdir(startPath);
@ -1959,6 +1962,8 @@ int cmd_main (int argc, const TCHAR *argv[])
/* do the cleanup */
Cleanup();
cmd_free(lpOriginalEnvironment);
cmd_exit(nExitCode);
return(nExitCode);
}

2
reactos/base/shell/cmd/cmd.h
View file

@ -54,6 +54,7 @@
extern HANDLE hOut;
extern HANDLE hIn;
extern HANDLE hConsole;
extern LPTSTR lpOriginalEnvironment;
extern WORD wColor;
extern WORD wDefColor;
extern BOOL bCtrlBreak;
@ -437,6 +438,7 @@ INT CommandScreen (LPTSTR);
INT cmd_set (LPTSTR);
/* Prototypes for SETLOCAL.C */
LPTSTR DuplicateEnvironment(VOID);
INT cmd_setlocal (LPTSTR);
INT cmd_endlocal (LPTSTR);

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

@ -16,7 +16,8 @@ typedef struct _SETLOCAL {
} SETLOCAL;
/* Create a copy of the current environment */
static LPTSTR DuplicateEnvironment()
LPTSTR
DuplicateEnvironment(VOID)
{
LPTSTR Environ = GetEnvironmentStrings();
LPTSTR End, EnvironCopy;

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

@ -49,9 +49,15 @@ INT cmd_start (LPTSTR Rest)
PROCESS_INFORMATION prci;
STARTUPINFO stui;
INT i = 0;
DWORD Priority = 0;
#ifdef UNICODE
DWORD dwCreationFlags = CREATE_NEW_CONSOLE | CREATE_UNICODE_ENVIRONMENT;
#else
DWORD dwCreationFlags = CREATE_NEW_CONSOLE;
#endif
DWORD dwAffinityMask = 0;
LPTSTR lpTitle = NULL;
LPTSTR lpDirectory = NULL;
LPTSTR lpEnvironment = NULL;
WORD wShowWindow = SW_SHOWNORMAL;
while (1)
@ -86,6 +92,11 @@ INT cmd_start (LPTSTR Rest)
}
StripQuotes(lpDirectory);
}
else if (_totupper(*option) == _T('I'))
{
/* rest of the option is apparently ignored */
lpEnvironment = lpOriginalEnvironment;
}
else if (!_tcsicmp(option, _T("MIN")))
{
wShowWindow = SW_MINIMIZE;
@ -94,29 +105,58 @@ INT cmd_start (LPTSTR Rest)
{
wShowWindow = SW_MAXIMIZE;
}
else if (!_tcsicmp(option, _T("AFFINITY")))
{
TCHAR *end;
while (_istspace(*Rest))
Rest++;
option = GetParameter(&Rest);
/* Affinity mask is given in hexadecimal */
dwAffinityMask = _tcstoul(option, &end, 16);
if (*end != _T('\0') || dwAffinityMask == 0 ||
dwAffinityMask == (DWORD)-1)
{
ConErrResPrintf(STRING_ERROR_INVALID_PARAM_FORMAT, option);
return 1;
}
dwCreationFlags |= CREATE_SUSPENDED;
}
else if (!_tcsicmp(option, _T("B")))
{
dwCreationFlags &= ~CREATE_NEW_CONSOLE;
dwCreationFlags |= CREATE_NEW_PROCESS_GROUP;
}
else if (!_tcsicmp(option, _T("LOW")))
{
Priority = IDLE_PRIORITY_CLASS;
dwCreationFlags |= IDLE_PRIORITY_CLASS;
}
else if (!_tcsicmp(option, _T("NORMAL")))
{
Priority = NORMAL_PRIORITY_CLASS;
dwCreationFlags |= NORMAL_PRIORITY_CLASS;
}
else if (!_tcsicmp(option, _T("HIGH")))
{
Priority = HIGH_PRIORITY_CLASS;
dwCreationFlags |= HIGH_PRIORITY_CLASS;
}
else if (!_tcsicmp(option, _T("REALTIME")))
{
Priority = REALTIME_PRIORITY_CLASS;
dwCreationFlags |= REALTIME_PRIORITY_CLASS;
}
else if (!_tcsicmp(option, _T("ABOVENORMAL")))
{
Priority = ABOVE_NORMAL_PRIORITY_CLASS;
dwCreationFlags |= ABOVE_NORMAL_PRIORITY_CLASS;
}
else if (!_tcsicmp(option, _T("BELOWNORMAL")))
{
Priority = BELOW_NORMAL_PRIORITY_CLASS;
dwCreationFlags |= BELOW_NORMAL_PRIORITY_CLASS;
}
else if (!_tcsicmp(option, _T("SEPARATE")))
{
dwCreationFlags |= CREATE_SEPARATE_WOW_VDM;
}
else if (!_tcsicmp(option, _T("SHARED")))
{
dwCreationFlags |= CREATE_SHARED_WOW_VDM;
}
else if (!_tcsicmp(option, _T("W")) ||
!_tcsicmp(option, _T("WAIT")))
@ -223,18 +263,18 @@ INT cmd_start (LPTSTR Rest)
stui.lpTitle = lpTitle;
stui.wShowWindow = wShowWindow;
if (bBat == TRUE)
{
bCreate = CreateProcess (NULL, szFullCmdLine, NULL, NULL, FALSE,
CREATE_NEW_CONSOLE | Priority, NULL, lpDirectory, &stui, &prci);
}
else
{
bCreate = CreateProcess (szFullName, szFullCmdLine, NULL, NULL, FALSE,
CREATE_NEW_CONSOLE | Priority, NULL, lpDirectory, &stui, &prci);
}
bCreate = CreateProcess(bBat ? comspec : szFullName,
szFullCmdLine, NULL, NULL, TRUE, dwCreationFlags,
lpEnvironment, lpDirectory, &stui, &prci);
if (bCreate)
{
if (dwAffinityMask)
{
SetProcessAffinityMask(prci.hProcess, dwAffinityMask);
ResumeThread(prci.hThread);
}
CloseHandle(prci.hThread);
}
}
else
{
@ -246,8 +286,10 @@ INT cmd_start (LPTSTR Rest)
if (!bCreate)
{
/* CreateProcess didn't work; try ShellExecute */
prci.hProcess = RunFile(SEE_MASK_NOCLOSEPROCESS, szFullName,
param, lpDirectory, wShowWindow);
DWORD flags = SEE_MASK_NOCLOSEPROCESS;
if (!(dwCreationFlags & CREATE_NEW_CONSOLE))
flags |= SEE_MASK_NO_CONSOLE;
prci.hProcess = RunFile(flags, szFullName, param, lpDirectory, wShowWindow);
}
if (prci.hProcess != NULL)