Changeset 4441 for trunk/src

Timestamp:

Oct 6, 2000, 1:04:42 PM (25 years ago)

Author:

sandervl

Message:

console change for pe loader

File:

• trunk/src/peldr/pe.cpp (modified) (4 diffs)

trunk/src/peldr/pe.cpp

@@ -1 @@
-/* $Id: pe.cpp,v 1.21 2000-09-10 21:54:44 sandervl Exp $ */
+/* $Id: pe.cpp,v 1.22 2000-10-06 11:04:42 sandervl Exp $ */
 
 /*
@@ -63 +63 @@
 
 //should be the same as in ..\kernel32\winexepeldr.h
-typedef BOOL (* WIN32API WIN32CTOR)(char *, char *, ULONG);
-
-WIN32CTOR              CreateWin32Exe       = 0;
-
-ULONG                  reservedMemory       = 0;
+typedef BOOL (* WIN32API WIN32CTOR)(char *, char *, ULONG, BOOL);
+
+WIN32CTOR   CreateWin32Exe       = 0;
+ULONG       reservedMemory       = 0;
+BOOL        fConsoleApp          = FALSE;
 
 void AllocateExeMem(char *filename);
@@ -186 +186 @@
         goto fail;
   }
-  rc = DosQueryProcAddr(hmodKernel32, 0, "_CreateWin32PeLdrExe@12", (PFN *)&CreateWin32Exe);
-
-  if(CreateWin32Exe(exeName, win32cmdline, reservedMemory) == FALSE) {
+  rc = DosQueryProcAddr(hmodKernel32, 0, "_CreateWin32PeLdrExe@16", (PFN *)&CreateWin32Exe);
+
+  if(CreateWin32Exe(exeName, win32cmdline, reservedMemory, fConsoleApp) == FALSE) {
         goto fail;
   }
@@ -272 +272 @@
         goto end;
   }
-//  if(!(fh.Characteristics & IMAGE_FILE_RELOCS_STRIPPED)) {
-//      goto end; //no need to allocate anything now
-//  }
+  fConsoleApp = (oh.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI);
 
   // check for high memory support