Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-31 23:18:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- When running a non-executable file, if the program handling the file type is a console program (e.g. Perl/Python) it should run in the same console as cmd, and cmd should wait for it. Implement this by using ShellExecuteEx instead of plain ShellExecute, with the SEE_MASK_NOCLOSEPROCESS and SEE_MASK_NO_CONSOLE flags. (SEE_MASK_NO_CONSOLE does the opposite of its MSDN description)

Browse source 
- Use NULL as the lpVerb to get the default action ("open" is not necessarily the default)
- Allow passing parameters besides just the file name

svn path=/trunk/; revision=40148
This commit is contained in:
Jeffrey Morlan 2009-03-21 02:12:23 +00:00
parent 10f13abcb5
commit 9618066a26
1 changed files with 33 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -258,52 +258,50 @@ static BOOL IsConsoleProcess(HANDLE Process)
#ifdef _UNICODE
#define SHELLEXECUTETEXT "ShellExecuteW"
#define SHELLEXECUTETEXT "ShellExecuteExW"
#else
#define SHELLEXECUTETEXT "ShellExecuteA"
#define SHELLEXECUTETEXT "ShellExecuteExA"
#endif
typedef HINSTANCE (WINAPI *MYEX)(
HWND hwnd,
LPCTSTR lpOperation,
LPCTSTR lpFile,
LPCTSTR lpParameters,
LPCTSTR lpDirectory,
INT nShowCmd
);
typedef BOOL (WINAPI *MYEX)(LPSHELLEXECUTEINFO lpExecInfo);
static BOOL RunFile(LPTSTR filename)
static HANDLE RunFile(LPTSTR filename, LPTSTR params)
{
SHELLEXECUTEINFO sei;
HMODULE hShell32;
MYEX hShExt;
HINSTANCE ret;
BOOL ret;
TRACE ("RunFile(%s)\n", debugstr_aw(filename));
hShell32 = LoadLibrary(_T("SHELL32.DLL"));
if (!hShell32)
{
WARN ("RunFile: couldn't load SHELL32.DLL!\n");
return FALSE;
return NULL;
}
hShExt = (MYEX)(FARPROC)GetProcAddress(hShell32, SHELLEXECUTETEXT);
if (!hShExt)
{
WARN ("RunFile: couldn't find ShellExecuteA/W in SHELL32.DLL!\n");
WARN ("RunFile: couldn't find ShellExecuteExA/W in SHELL32.DLL!\n");
FreeLibrary(hShell32);
return FALSE;
return NULL;
}
TRACE ("RunFile: ShellExecuteA/W is at %x\n", hShExt);
TRACE ("RunFile: ShellExecuteExA/W is at %x\n", hShExt);
ret = (hShExt)(NULL, _T("open"), filename, NULL, NULL, SW_SHOWNORMAL);
memset(&sei, 0, sizeof sei);
sei.cbSize = sizeof sei;
sei.fMask = SEE_MASK_NOCLOSEPROCESS | SEE_MASK_NO_CONSOLE;
sei.lpFile = filename;
sei.lpParameters = params;
sei.nShow = SW_SHOWNORMAL;
ret = hShExt(&sei);
TRACE ("RunFile: ShellExecuteA/W returned 0x%p\n", ret);
TRACE ("RunFile: ShellExecuteExA/W returned 0x%p\n", ret);
FreeLibrary(hShell32);
return (((DWORD_PTR)ret) > 32);
return ret ? sei.hProcess : NULL;
}
@ -495,6 +493,16 @@ Execute (LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd)
&stui,
&prci))
{
CloseHandle(prci.hThread);
}
else
{
// See if we can run this with ShellExecute() ie myfile.xls
prci.hProcess = RunFile(szFullName, rest);
}
if (prci.hProcess != NULL)
{
if (IsConsoleProcess(prci.hProcess))
{
@ -514,24 +522,15 @@ Execute (LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd)
{
nErrorLevel = 0;
}
CloseHandle (prci.hThread);
CloseHandle (prci.hProcess);
}
else
{
TRACE ("[ShellExecute: %s]\n", debugstr_aw(full));
// See if we can run this with ShellExecute() ie myfile.xls
if (!RunFile(full))
{
TRACE ("[ShellExecute failed!: %s]\n", debugstr_aw(full));
error_bad_command (first);
nErrorLevel = 1;
}
else
{
nErrorLevel = 0;
}
TRACE ("[ShellExecute failed!: %s]\n", debugstr_aw(full));
error_bad_command (first);
nErrorLevel = 1;
}
// restore console mode
SetConsoleMode (
GetStdHandle( STD_INPUT_HANDLE ),