ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmd.exe: Attempt to launch pgm even if fails to locate it.

This commit is contained in:
Jason Edmeades 2007-04-05 22:47:54 +01:00 committed by Alexandre Julliard
parent b573f68b36
commit 5704b4bec9
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
programs/cmd/wcmdmain.c
View File

@ -814,6 +814,7 @@ void WCMD_run_program (char *command, int called) {
BOOL extensionsupplied = FALSE;
BOOL launched = FALSE;
BOOL status;
BOOL assumeInternal = FALSE;
DWORD len;
@ -849,6 +850,7 @@ void WCMD_run_program (char *command, int called) {
/* Loop through the search path, dir by dir */
pathposn = pathtosearch;
WINE_TRACE("Searching in '%s' for '%s'\n", pathtosearch, stemofsearch);
while (!launched && pathposn) {
char thisDir[MAX_PATH] = "";
@ -917,8 +919,20 @@ void WCMD_run_program (char *command, int called) {
}
}
/* Internal programs won't be picked up by this search, so even
though not found, try one last createprocess and wait for it
to complete.
Note: Ideally we could tell between a console app (wait) and a
windows app, but the API's for it fail in this case */
if (!found && pathposn == NULL) {
WINE_TRACE("ASSUMING INTERNAL\n");
assumeInternal = TRUE;
} else {
WINE_TRACE("Found as %s\n", thisDir);
}
/* Once found, launch it */
if (found) {
if (found || assumeInternal) {
STARTUPINFO st;
PROCESS_INFORMATION pe;
SHFILEINFO psfi;
@ -938,7 +952,7 @@ void WCMD_run_program (char *command, int called) {
/* thisDir contains the file to be launched, but with what?
eg. a.exe will require a.exe to be launched, a.html may be iexplore */
hinst = FindExecutable (param1, NULL, temp);
hinst = FindExecutable (thisDir, NULL, temp);
if ((INT_PTR)hinst < 32)
console = 0;
else
@ -948,9 +962,10 @@ void WCMD_run_program (char *command, int called) {
st.cb = sizeof(STARTUPINFO);
init_msvcrt_io_block(&st);
/* Launch the process and if a CUI wait on it to complete */
status = CreateProcess (thisDir, command, NULL, NULL, TRUE,
0, NULL, NULL, &st, &pe);
/* Launch the process and if a CUI wait on it to complete
Note: Launching internal wine processes cannot specify a full path to exe */
status = CreateProcess (assumeInternal?NULL : thisDir,
command, NULL, NULL, TRUE, 0, NULL, NULL, &st, &pe);
if ((opt_c || opt_k) && !opt_s && !status
&& GetLastError()==ERROR_FILE_NOT_FOUND && command[0]=='\"') {
/* strip first and last quote characters and try again */
@ -966,10 +981,10 @@ void WCMD_run_program (char *command, int called) {
errorlevel = 9009;
return;
}
if (!console) errorlevel = 0;
if (!assumeInternal && !console) errorlevel = 0;
else
{
if (!HIWORD(console)) WaitForSingleObject (pe.hProcess, INFINITE);
if (assumeInternal || !HIWORD(console)) WaitForSingleObject (pe.hProcess, INFINITE);
GetExitCodeProcess (pe.hProcess, &errorlevel);
if (errorlevel == STILL_ACTIVE) errorlevel = 0;
}