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

Return success in CreateProcess when we started a non-Winelib Unix 

process.
This commit is contained in:
Alexandre Julliard 2001-11-06 22:27:41 +00:00
parent 8871a11be6
commit d7c4e4dd58
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scheduler/process.c
View File

@ -799,7 +799,6 @@ BOOL PROCESS_Create( HANDLE hFile, LPCSTR filename, LPSTR cmd_line, LPCSTR env,
LPPROCESS_INFORMATION info, LPCSTR lpCurrentDirectory ) LPPROCESS_INFORMATION info, LPCSTR lpCurrentDirectory )
{ {
BOOL ret; BOOL ret;
int pid;
const char *unixfilename = NULL; const char *unixfilename = NULL;
const char *unixdir = NULL; const char *unixdir = NULL;
DOS_FULL_NAME full_dir, full_name; DOS_FULL_NAME full_dir, full_name;
@ -807,6 +806,7 @@ BOOL PROCESS_Create( HANDLE hFile, LPCSTR filename, LPSTR cmd_line, LPCSTR env,
HANDLE process_info; HANDLE process_info;
info->hThread = info->hProcess = 0; info->hThread = info->hProcess = 0;
info->dwProcessId = info->dwThreadId = 0;
if (lpCurrentDirectory) if (lpCurrentDirectory)
{ {
@ -865,12 +865,16 @@ BOOL PROCESS_Create( HANDLE hFile, LPCSTR filename, LPSTR cmd_line, LPCSTR env,
/* fork and execute */ /* fork and execute */
pid = fork_and_exec( unixfilename, cmd_line, env, unixdir ); if (fork_and_exec( unixfilename, cmd_line, env, unixdir ) == -1)
{
CloseHandle( process_info );
return FALSE;
}
/* wait for the new process info to be ready */ /* wait for the new process info to be ready */
ret = FALSE; ret = TRUE; /* pretend success even if we don't get the new process info */
if ((pid != -1) && (WaitForSingleObject( process_info, 2000 ) == STATUS_WAIT_0)) if (WaitForSingleObject( process_info, 2000 ) == STATUS_WAIT_0)
{ {
SERVER_START_REQ( get_new_process_info ) SERVER_START_REQ( get_new_process_info )
{ {
@ -889,7 +893,7 @@ BOOL PROCESS_Create( HANDLE hFile, LPCSTR filename, LPSTR cmd_line, LPCSTR env,
SERVER_END_REQ; SERVER_END_REQ;
} }
CloseHandle( process_info ); CloseHandle( process_info );
if (!ret) goto error; if (!ret) return FALSE;
/* Wait until process is initialized (or initialization failed) */ /* Wait until process is initialized (or initialization failed) */
if (load_done_evt) if (load_done_evt)
@ -911,12 +915,6 @@ BOOL PROCESS_Create( HANDLE hFile, LPCSTR filename, LPSTR cmd_line, LPCSTR env,
} }
} }
return TRUE; return TRUE;
error:
if (load_done_evt) CloseHandle( load_done_evt );
if (info->hThread) CloseHandle( info->hThread );
if (info->hProcess) CloseHandle( info->hProcess );
return FALSE;
} }