Changeset 5448 for trunk/src/kernel32/wprocess.cpp

Timestamp:

Apr 3, 2001, 12:51:58 AM (24 years ago)

Author:

sandervl

Message:

check executable type in CreateProcess and use PEC for VIO and PE for GUI apps

File:

• trunk/src/kernel32/wprocess.cpp (modified) (4 diffs)

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.116 2001-03-22 18:16:41 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.117 2001-04-02 22:51:58 sandervl Exp $ */
 
 /*
@@ -1651 +1651 @@
     }
 
-    dprintf(("KERNEL32:  CreateProcess %s\n", cmdline));
+    dprintf(("KERNEL32: CreateProcess %s\n", cmdline));
+    
+    DWORD Characteristics, SubSystem;
+    if(Win32ImageBase::isPEImage(exename, &Characteristics, &SubSystem)) {
+        dprintf(("CreateProcess: not a PE executable!!"));
+        SetLastError(ERROR_BAD_EXE_FORMAT);
+        return FALSE;
+    }
+
+    char *lpszPE;
+    if(SubSystem == IMAGE_SUBSYSTEM_WINDOWS_CUI) {
+         lpszPE = "PEC.EXE";
+    }
+    else lpszPE = "PE.EXE";
 
     //SvL: Allright. Before we call O32_CreateProcess, we must take care of
@@ -1659 +1672 @@
 
         newcmdline = (char *)malloc(strlen(lpCurrentDirectory) + strlen(cmdline) + 32);
-        sprintf(newcmdline, "PE.EXE /OPT:[CURDIR=%s] %s", lpCurrentDirectory, cmdline);
+        sprintf(newcmdline, "%s /OPT:[CURDIR=%s] %s", lpszPE, lpCurrentDirectory, cmdline);
         free(cmdline);
         cmdline = newcmdline;
@@ -1667 +1680 @@
 
         newcmdline = (char *)malloc(strlen(cmdline) + 16);
-        sprintf(newcmdline, "PE.EXE %s", cmdline);
+        sprintf(newcmdline, "%s %s", lpszPE, cmdline);
         free(cmdline);
         cmdline = newcmdline;
     }
-    rc = O32_CreateProcess("PE.EXE", (LPCSTR)cmdline,lpProcessAttributes,
+    rc = O32_CreateProcess(lpszPE, (LPCSTR)cmdline,lpProcessAttributes,
                          lpThreadAttributes, bInheritHandles, dwCreationFlags,
                          lpEnvironment, lpCurrentDirectory, lpStartupInfo,