xemacs-beta: src/process-nt.c comparison

comparison src/process-nt.c @ 278:90d73dddcdc4 r21-0b37

Import from CVS: tag r21-0b37

author	cvs
date	Mon, 13 Aug 2007 10:31:29 +0200
parents	6330739388db
children	7df0dd720c89

comparison

equal deleted inserted replaced

-:cfdf3ff11843
+:90d73dddcdc4
 #include "hash.h"
 #include "lstream.h"
 #include "process.h"
 #include "procimpl.h"
+#include "sysdep.h"
 #include <windows.h>
+#include <shellapi.h>
 /* Implemenation-specific data. Pointed to by Lisp_Process->process_data */
 struct nt_process_data
 {
 HANDLE h_process;
 * must signal an error instead.
 */
 /* #### This function completely ignores Vprocess_environment */
+static void
+signal_cannot_launch (char* image_file, DWORD err)
+{
+mswindows_set_errno (err);
+error ("Starting \"%s\": %s", image_file, strerror (errno));
+}
 static int
 nt_create_process (struct Lisp_Process *p,
 		   char **argv, CONST char *current_dir)
 {
 HANDLE hmyshove, hmyslurp, hprocin, hprocout;
 LPTSTR command_line;
+BOOL do_io, windowed;
+/* Find out whether the application is windowed or not */
+{
+/* SHGetFileInfo tends to return ERROR_FILE_NOT_FOUND on most
+errors. This leads to bogus error message. */
+DWORD image_type = SHGetFileInfo (argv[0], 0, NULL, 0, SHGFI_EXETYPE);
+if (image_type == 0)
+signal_cannot_launch (argv[0], (GetLastError () == ERROR_FILE_NOT_FOUND
+				      ? ERROR_BAD_FORMAT : GetLastError ()));
+windowed = HIWORD (image_type) != 0;
+}
+/* Decide whether to do I/O on process handles, or just mark the
+process exited immediately upon successful launching. We do I/O if the
+process is a console one, or if it is windowed but windowed_process_io
+is non-zero */
+do_io = !windowed || windowed_process_io ;
-/* Create two unidirectional named pipes */
+if (do_io)
 {
-HANDLE htmp;
+/* Create two unidirectional named pipes */
-SECURITY_ATTRIBUTES sa;
+HANDLE htmp;
+SECURITY_ATTRIBUTES sa;
-sa.nLength = sizeof(sa);
-sa.bInheritHandle = TRUE;
+sa.nLength = sizeof(sa);
-sa.lpSecurityDescriptor = NULL;
+sa.bInheritHandle = TRUE;
+sa.lpSecurityDescriptor = NULL;
-CreatePipe (&hprocin, &hmyshove, &sa, 0);
-CreatePipe (&hmyslurp, &hprocout, &sa, 0);
+CreatePipe (&hprocin, &hmyshove, &sa, 0);
+CreatePipe (&hmyslurp, &hprocout, &sa, 0);
-/* Stupid Win32 allows to create a pipe with *both* ends either
-inheritable or not. We need process ends inheritable, and local
+/* Stupid Win32 allows to create a pipe with *both* ends either
-ends not inheritable. */
+	 inheritable or not. We need process ends inheritable, and local
-/* #### Perhaps even stupider me does not know how to do this better */
+	 ends not inheritable. */
 DuplicateHandle (GetCurrentProcess(), hmyshove, GetCurrentProcess(), &htmp,
-		     0, FALSE, DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS);
+		       0, FALSE, DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS);
 hmyshove = htmp;
 DuplicateHandle (GetCurrentProcess(), hmyslurp, GetCurrentProcess(), &htmp,
-		     0, FALSE, DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS);
+		       0, FALSE, DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS);
 hmyslurp = htmp;
 }
 /* Convert an argv vector into Win32 style command line.
 #### This works only for cmd, and not for cygwin bash.  Perhaps,
 instead of ad-hoc fiddling with different methods for quoting
 /* Create process */
 {
 STARTUPINFO si;
 PROCESS_INFORMATION pi;
 DWORD err;
-BOOL windowed;
 xzero (si);
-si.hStdInput = hprocin;
+si.dwFlags = STARTF_USESHOWWINDOW;
-si.hStdOutput = hprocout;
+si.wShowWindow = windowed ? SW_SHOWNORMAL : SW_HIDE;
-si.hStdError = hprocout;
+if (do_io)
-si.wShowWindow = SW_HIDE;
+{
-si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;
+	si.hStdInput = hprocin;
+	si.hStdOutput = hprocout;
+	si.hStdError = hprocout;
+	si.dwFlags |= STARTF_USESTDHANDLES;
+}
 err = (CreateProcess (NULL, command_line, NULL, NULL, TRUE,
-			  CREATE_NEW_CONSOLE | CREATE_NEW_PROCESS_GROUP |	CREATE_SUSPENDED,
+			  CREATE_NEW_CONSOLE | CREATE_NEW_PROCESS_GROUP,
 			  NULL, current_dir, &si, &pi)
 	   ? 0 : GetLastError ());
-CloseHandle (hprocin);
+if (do_io)
-CloseHandle (hprocout);
+{
+	/* These just have been inherited; we do not need a copy */
-/* See if we succeeded with process creation */
+	CloseHandle (hprocin);
+	CloseHandle (hprocout);
+}
+/* Handle process creation failure */
 if (err)
 {
-process_error__One_of_those_nasty_uses_for_goto_statement:
+	if (do_io)
-	CloseHandle (hmyshove);
-	CloseHandle (hmyslurp);
-	error ("Cannot start \"%s\": error code was %lu", argv[0], err);
-}
-/* Determine if the new process is a windowed one */
-windowed = WaitForInputIdle (pi.hProcess, 100) == WAIT_TIMEOUT;
-if (windowed)
-{
-	/* We restart windowed process fire-and forget style, and
-	   indicate successful process creation, just as if the
-	   process ended instantly upon launching */
-	CloseHandle (hmyshove);
-	CloseHandle (hmyslurp);
-	/* TerminateProcess is safe becuase the process is not yet
-	   running */
-	TerminateProcess (pi.hProcess, 0);
-	si.dwFlags = STARTF_USESHOWWINDOW;
-	si.wShowWindow = SW_SHOWNORMAL;
-	if (!CreateProcess (NULL, command_line, NULL, NULL, FALSE,
-			    DETACHED_PROCESS , NULL, current_dir, &si, &pi))
 	  {
-	    err = GetLastError ();
+	    CloseHandle (hmyshove);
-	    goto process_error__One_of_those_nasty_uses_for_goto_statement;
+	    CloseHandle (hmyslurp);
 	  }
+	signal_cannot_launch (argv[0], GetLastError ());
-	/* We just launched a windowed process. Fake it as if a
+}
-	   process launched has already ended */
+/* The process started successfully */
+if (do_io)
+{
+	NT_DATA(p)->h_process = pi.hProcess;
+	init_process_io_handles (p, (void*)hmyslurp, (void*)hmyshove, 0);
+}
+else
+{
+	/* Indicate as if the process has exited immediately. */
 	p->status_symbol = Qexit;
-	/* Get rid of process and thread handles */
-	CloseHandle (pi.hThread);
 	CloseHandle (pi.hProcess);
 }
-else
-{
+CloseHandle (pi.hThread);
-	/* Just started a console subprocess */
+/* Hack to support Windows 95 negative pids */
-	NT_DATA(p)->h_process = pi.hProcess;
-	init_process_io_handles (p, (void*)hmyslurp, (void*)hmyshove, 0);
-	/* We created it suspended. Resume the only thread */
-	ResumeThread (pi.hThread);
-	CloseHandle (pi.hThread);
-}
 return ((int)pi.dwProcessId < 0
 	    ? -(int)pi.dwProcessId : (int)pi.dwProcessId);
 }
 }

Mercurial > hg > xemacs-beta

comparison src/process-nt.c @ 278:90d73dddcdc4 r21-0b37