Changeset 3872 for trunk/src/kernel32/winimagepeldr.cpp

Timestamp:

Jul 20, 2000, 8:07:00 PM (25 years ago)

Author:

sandervl

Message:

Always try to allocate an executable image at it's preferred address

File:

• trunk/src/kernel32/winimagepeldr.cpp (modified) (3 diffs)

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.49 2000-06-28 18:08:36 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.50 2000-07-20 18:07:00 sandervl Exp $ */
 
 /*
@@ -676 +676 @@
  ULONG  baseAddress;
 
+  realBaseAddress = 0;
+
+  //Allocated in peldr.dll
+  if(reservedMem && reservedMem == oh.ImageBase) {
+        realBaseAddress = oh.ImageBase;
+        return TRUE;
+  }
+
   //SvL: We don't care where the image is loaded for resource lookup
   if(fh.Characteristics & IMAGE_FILE_RELOCS_STRIPPED && loadType == REAL_LOAD) {
@@ -755 +763 @@
  APIRET rc;
  BOOL   allocFlags = flAllocMem;
-
-  realBaseAddress = 0;
-
-  //Allocated in peldr.dll
-  if(reservedMem && reservedMem == oh.ImageBase) {
-        realBaseAddress = oh.ImageBase;
-        return TRUE;
-  }
 
   //Reserve enough space to store 4096 pointers to 1MB memory chunks