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

Timestamp:

Jul 16, 2002, 10:16:48 AM (23 years ago)

Author:

sandervl

Message:

Fix for loading PE images in low memory (introduced yesterday)

File:

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

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.96 2002-07-15 14:28:53 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.97 2002-07-16 08:16:48 sandervl Exp $ */
 
 /*
@@ -431 +431 @@
     }
 
-    dprintf((LOG, "OS/2 base address %x", realBaseAddress ));
+    dprintf((LOG, "OS/2 base address   %x", realBaseAddress ));
     if(oh.AddressOfEntryPoint) {
         entryPoint = realBaseAddress + oh.AddressOfEntryPoint;
@@ -999 +999 @@
  ULONG  diff, i, baseAddress;
  APIRET rc;
- BOOL   allocFlags = flAllocMem;
+ BOOL   fLowMemory = FALSE;
 
     //Reserve enough space to store 4096 pointers to 1MB memory chunks
@@ -1009 +1009 @@
 
     if(oh.ImageBase < 512*1024*1024) {
-        allocFlags = 0;
+        fLowMemory = TRUE;
     }
     while(TRUE) {
-        rc = OSLibDosAllocMem((PPVOID)&address, FALLOC_SIZE, PAG_READ | allocFlags);
+        rc = OSLibDosAllocMem((PPVOID)&address, FALLOC_SIZE, PAG_READ, fLowMemory);
         if(rc) break;
 
@@ -1026 +1026 @@
             diff = oh.ImageBase - address;
             if(diff) {
-                rc = OSLibDosAllocMem((PPVOID)&address, diff, PAG_READ | allocFlags);
+                rc = OSLibDosAllocMem((PPVOID)&address, diff, PAG_READ, fLowMemory);
                 if(rc) break;
             }
-            rc = OSLibDosAllocMem((PPVOID)&baseAddress, imageSize, PAG_READ | PAG_WRITE | allocFlags);
+            rc = OSLibDosAllocMem((PPVOID)&baseAddress, imageSize, PAG_READ | PAG_WRITE, fLowMemory);
             if(rc) break;