Changeset 5448 for trunk/src/kernel32/winimagebase.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/winimagebase.cpp (modified) (6 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);