[ros-diffs] [jmorlan] 40198: Implement all remaining switches for the START command.
jmorlan at svn.reactos.org
jmorlan at svn.reactos.org
Tue Mar 24 00:52:51 CET 2009
Author: jmorlan
Date: Tue Mar 24 02:52:50 2009
New Revision: 40198
URL: http://svn.reactos.org/svn/reactos?rev=40198&view=rev
Log:
Implement all remaining switches for the START command.
Modified:
trunk/reactos/base/shell/cmd/cmd.c
trunk/reactos/base/shell/cmd/cmd.h
trunk/reactos/base/shell/cmd/setlocal.c
trunk/reactos/base/shell/cmd/start.c
Modified: trunk/reactos/base/shell/cmd/cmd.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=40198&r1=40197&r2=40198&view=diff
==============================================================================
--- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Tue Mar 24 02:52:50 2009
@@ -163,6 +163,7 @@
HANDLE hIn;
HANDLE hOut;
HANDLE hConsole;
+LPTSTR lpOriginalEnvironment;
HANDLE CMD_ModuleHandle;
static NtQueryInformationProcessProc NtQueryInformationProcessPtr = NULL;
@@ -1928,6 +1929,8 @@
CONSOLE_SCREEN_BUFFER_INFO Info;
INT nExitCode;
+ lpOriginalEnvironment = DuplicateEnvironment();
+
GetCurrentDirectory(MAX_PATH,startPath);
_tchdir(startPath);
@@ -1959,6 +1962,8 @@
/* do the cleanup */
Cleanup();
+ cmd_free(lpOriginalEnvironment);
+
cmd_exit(nExitCode);
return(nExitCode);
}
Modified: trunk/reactos/base/shell/cmd/cmd.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=40198&r1=40197&r2=40198&view=diff
==============================================================================
--- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Tue Mar 24 02:52:50 2009
@@ -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 cmd_set (LPTSTR);
/* Prototypes for SETLOCAL.C */
+LPTSTR DuplicateEnvironment(VOID);
INT cmd_setlocal (LPTSTR);
INT cmd_endlocal (LPTSTR);
Modified: trunk/reactos/base/shell/cmd/setlocal.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/setlocal.c?rev=40198&r1=40197&r2=40198&view=diff
==============================================================================
--- trunk/reactos/base/shell/cmd/setlocal.c [iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/setlocal.c [iso-8859-1] Tue Mar 24 02:52:50 2009
@@ -16,7 +16,8 @@
} SETLOCAL;
/* Create a copy of the current environment */
-static LPTSTR DuplicateEnvironment()
+LPTSTR
+DuplicateEnvironment(VOID)
{
LPTSTR Environ = GetEnvironmentStrings();
LPTSTR End, EnvironCopy;
Modified: trunk/reactos/base/shell/cmd/start.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/start.c?rev=40198&r1=40197&r2=40198&view=diff
==============================================================================
--- trunk/reactos/base/shell/cmd/start.c [iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/start.c [iso-8859-1] Tue Mar 24 02:52:50 2009
@@ -49,9 +49,15 @@
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 @@
}
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 @@
{
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 @@
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 @@
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)
More information about the Ros-diffs
mailing list