Changeset 5448 for trunk/src

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

Location:

trunk/src/kernel32

Files:

• winimagebase.cpp (modified) (6 diffs)
• winimagebase.h (modified) (2 diffs)
• winimagepeldr.cpp (modified) (2 diffs)
• wprocess.cpp (modified) (4 diffs)

trunk/src/kernel32/winimagebase.cpp

@@ -1 @@
-/* $Id: winimagebase.cpp,v 1.30 2000-10-23 13:42:44 sandervl Exp $ */
+/* $Id: winimagebase.cpp,v 1.31 2001-04-02 22:51:58 sandervl Exp $ */
 
 /*
@@ -204 +204 @@
 //the Characteristics member of the file header structure)
 //******************************************************************************
-ULONG Win32ImageBase::isPEImage(char *szFileName, DWORD *Characteristics)
+ULONG Win32ImageBase::isPEImage(char *szFileName, DWORD *Characteristics, DWORD *subsystem)
 {
  char   filename[CCHMAXPATH];
@@ -210 +210 @@
  HFILE  dllfile;
  IMAGE_FILE_HEADER     fh;
+ IMAGE_OPTIONAL_HEADER oh;
  HFILE  win32handle;
  ULONG  ulAction       = 0;      /* Action taken by DosOpen */
@@ -262 +263 @@
         return ERROR_INVALID_EXE_SIGNATURE_W;
   }
-  ULONG hdrsize = pdoshdr->e_lfanew + SIZE_OF_NT_SIGNATURE + sizeof(IMAGE_FILE_HEADER);
+  ULONG hdrsize = pdoshdr->e_lfanew + SIZE_OF_NT_SIGNATURE + sizeof(IMAGE_FILE_HEADER) + sizeof(IMAGE_OPTIONAL_HEADER);
   free(pdoshdr);
 
@@ -281 +282 @@
         goto failure;
   }
+  if(GetPEOptionalHeader (win32file, &oh) == FALSE) {
+        goto failure;
+  }
 
   if(!(fh.Characteristics & IMAGE_FILE_EXECUTABLE_IMAGE)) {//not valid
@@ -294 +298 @@
   if(Characteristics) {
         *Characteristics = fh.Characteristics;
+  }
+  if(subsystem) {
+        *subsystem = oh.Subsystem;
   }
   DosClose(win32handle);

trunk/src/kernel32/winimagebase.h

@@ -1 @@
-/* $Id: winimagebase.h,v 1.17 2000-10-10 17:14:07 sandervl Exp $ */
+/* $Id: winimagebase.h,v 1.18 2001-04-02 22:51:58 sandervl Exp $ */
 
 /*
@@ -97 +97 @@
 //returns ERROR_SUCCESS or error code (Characteristics will contain
 //the Characteristics member of the file header structure)
-static  ULONG isPEImage(char *szFileName, DWORD *Characteristics = NULL);
+static  ULONG isPEImage(char *szFileName, DWORD *Characteristics, DWORD *subsystem = NULL);
 static  BOOL  findDll(const char *pszFileName, char *pszFullName,
                       int cchFullName, const char *pszAltPath = NULL);

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.72 2001-04-02 09:52:26 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.73 2001-04-02 22:51:58 sandervl Exp $ */
 
 /*
@@ -1469 +1469 @@
     }
 
-    if(isPEImage(modname) != ERROR_SUCCESS_W)
+    if(isPEImage(modname, NULL) != ERROR_SUCCESS_W)
     {//LX image, so let OS/2 do all the work for us
         APIRET rc;

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,