ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/common/win_process.c

Comparing ray/src/common/win_process.c (file contents):
Revision 3.4 by schorsch, Tue Oct 21 19:19:28 2003 UTC vs.
Revision 3.11 by greg, Fri Mar 4 19:13:53 2016 UTC

#	Line 167 | Line 167 | start_process(SUBPROC *proc, char *cmdstr)
167		CloseHandle(hFromChildWrite); hFromChildWrite = NULL;
168		CloseHandle(hToChildRead); hToChildRead = NULL;
169		/* get the file descriptors */
170	<	proc->r = _open_osfhandle((long)hRead, _O_RDONLY);
171	<	proc->w = _open_osfhandle((long)hWrite, _O_APPEND);
170	>	proc->r = _open_osfhandle((long)hRead, _O_RDONLY|_O_BINARY);
171	>	proc->w = _open_osfhandle((long)hWrite, _O_APPEND|_O_BINARY);
172		proc->pid = PInfo.dwProcessId;
173		proc->running = 1;
174		CloseHandle(hCurProc);
#	Line 185 | Line 185 | error: /* cleanup */
185		if(hWrite) CloseHandle(hWrite);
186		if(hCurProc) CloseHandle(hCurProc);
187		proc->running = 0;
188	<	return 0;
188	>	return -1;
189		/* There... Are we happy now? */
190		}
191
#	Line 279 | Line 279 | open_process(SUBPROC *proc, char *av[])
279		char *cmdpath;
280		char *cmdstr;
281
282	+	if (av == NULL || av[0] == NULL) {
283	+	fputs("Illegal call to open_process()!\n", stderr);
284	+	return -1;
285	+	}
286	+	proc->pid = 0;
287		proc->running = 0;
288	+	if (av == NULL) { return -1; }
289		cmdpath = getpath(av[0], getenv("PATH"), X_OK);
290	<	cmdstr = quoted_cmdline(cmdpath, av);
290	>	cmdstr = quoted_cmdline(cmdpath, av+1);
291		if (cmdstr == NULL) { return 0; }
292		return start_process(proc, cmdstr);
293		}
294
295
296	<	int
297	<	close_process(SUBPROC *proc) {
292	<	int icres, ocres;
293	<	DWORD pid;
296	>	int win_kill(RT_PID pid, int sig) /* we ignore sig... */
297	>	{
298		HANDLE hProc;
299
300	<	ocres = close(proc->w);
301	<	icres = close(proc->r);
302	<	pid = proc->pid;
299	<	if(ocres != 0 || icres != 0) {
300	<	hProc = OpenProcess(SYNCHRONIZE|PROCESS_TERMINATE, FALSE, pid);
301	<	/* something went wrong: enforce infanticide */
302	<	/* other than that, it looks like we want to ignore errors here */
303	<	if (proc->running) {
304	<	if(hProc != NULL) {
300	>	hProc = OpenProcess(SYNCHRONIZE|PROCESS_TERMINATE, FALSE, pid);
301	>	/*  it looks like we want to ignore errors here */
302	>	if(hProc != NULL) {
303		#ifdef OBSOLETE_WINDOWS
304		#define KILL_TIMEOUT 10 * 1000 /* milliseconds */
305	<	/* it might have some windows open... */
306	<	EnumWindows((WNDENUMPROC)TerminateAppEnum, (LPARAM)pid);
307	<	if(WaitForSingleObject(hProc, KILL_TIMEOUT)!=WAIT_OBJECT_0) {
308	<	/* No way to avoid dangling DLLs here. */
309	<	TerminateProcess(hProc, 0);
310	<	}
305	>	/* it might have some windows open... */
306	>	EnumWindows((WNDENUMPROC)TerminateAppEnum, (LPARAM)pid);
307	>	if(WaitForSingleObject(hProc, KILL_TIMEOUT)!=WAIT_OBJECT_0) {
308	>	/* No way to avoid dangling DLLs here. */
309	>	TerminateProcess(hProc, 0);
310	>	}
311		#else
312	<	SafeTerminateProcess(hProc, 0);
312	>	SafeTerminateProcess(hProc, 0);
313		#endif
314	<	/* WaitForSingleObject(hProc, 0); */
315	<	/* not much use to wait on Windows */
316	<	CloseHandle(hProc);
314	>	/* WaitForSingleObject(hProc, 0); */
315	>	/* not much use to wait on Windows */
316	>	CloseHandle(hProc);
317	>	}
318	>	return 0; /* XXX we need to figure out more here... */
319	>	}
320	>
321	>
322	>	int
323	>	close_processes(SUBPROC pd[], int nproc) {
324	>	int i, icres, ocres;
325	>	DWORD pid;
326	>
327	>	for (i = 0; i < nproc; i++) {
328	>	if (pid[i].running) {
329	>	ocres = close(pd[i].w);
330	>	icres = close(pd[i].r);
331	>	pd[i].running = 0;
332	>	if(ocres != 0 || icres != 0) {
333	>	/* something went wrong: enforce infanticide */
334	>	/* other than that, it looks like we want to ignore errors here */
335	>	win_kill(pd[i].pid, 0);
336		}
337		}
338	+	pd[i].pid = 0;
339		}
322	–	proc->running = 0;
340		return 0; /* XXX we need to figure out more here... */
341		}
342

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)