Changeset 8882 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

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

Location:

trunk/src/kernel32

Files:

• oslibmem.cpp (modified) (5 diffs)
• oslibmem.h (modified) (2 diffs)
• winimagepeldr.cpp (modified) (5 diffs)

trunk/src/kernel32/oslibmem.cpp

@@ -1 @@
-/* $Id: oslibmem.cpp,v 1.3 2002-07-15 14:28:52 sandervl Exp $ */
+/* $Id: oslibmem.cpp,v 1.4 2002-07-16 08:16:47 sandervl Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -94 +94 @@
 //Allocate memory aligned at 64kb boundary
 //******************************************************************************
-DWORD OSLibDosAllocMem(LPVOID *lplpMemAddr, DWORD cbSize, DWORD flFlags)
+DWORD OSLibDosAllocMem(LPVOID *lplpMemAddr, DWORD cbSize, DWORD flFlags, BOOL fLowMemory)
 {
     PVOID   pvMemAddr;
     DWORD   offset;
     APIRET  rc;
-
+    BOOL    fMemFlags = flAllocMem;
+
+    //Override low/high memory flag if necessary
+    if(fLowMemory) {
+        fMemFlags = 0;
+    }
     /*
      * Let's try use the extended DosAllocMem API of Win32k.sys.
@@ -105 +110 @@
     if (libWin32kInstalled())
     {
-        rc = DosAllocMemEx(lplpMemAddr, cbSize, flFlags | flAllocMem | OBJ_ALIGN64K);
+        rc = DosAllocMemEx(lplpMemAddr, cbSize, flFlags | fMemFlags | OBJ_ALIGN64K);
         if (rc != ERROR_NOT_SUPPORTED)  /* This call was stubbed until recently. */
             return rc;
@@ -114 +119 @@
      */
 
-    rc = DosAllocMem(&pvMemAddr, cbSize, flFlags | flAllocMem);
+    rc = DosAllocMem(&pvMemAddr, cbSize, flFlags | fMemFlags);
     if(rc) {
         dprintf(("!ERROR!: DosAllocMem failed with rc %d", rc));
@@ -128 +133 @@
 
         //Allocate 64kb more so we can round the address to a 64kb aligned value
-        rc = DosAllocMem((PPVOID)&addr64kb, cbSize + 64*1024,  (flFlags & ~PAG_COMMIT) | flAllocMem);
+        rc = DosAllocMem((PPVOID)&addr64kb, cbSize + 64*1024,  (flFlags & ~PAG_COMMIT) | fMemFlags);
         if(rc) {
             dprintf(("!ERROR!: DosAllocMem failed with rc %d", rc));

trunk/src/kernel32/oslibmem.h

@@ -1 @@
-/* $Id: oslibmem.h,v 1.1 2002-07-15 14:28:52 sandervl Exp $ */
+/* $Id: oslibmem.h,v 1.2 2002-07-16 08:16:48 sandervl Exp $ */
 /*
  * OS/2 Memory management procedures
@@ -42 +42 @@
                
 DWORD OSLibDosAliasMem(LPVOID pb, ULONG cb, LPVOID *ppbAlias, ULONG fl);
-DWORD OSLibDosAllocMem(LPVOID *lplpMemAddr, DWORD size, DWORD flags);
+DWORD OSLibDosAllocMem(LPVOID *lplpMemAddr, DWORD size, DWORD flags, BOOL fLowMemory = FALSE);
 DWORD OSLibDosFreeMem(LPVOID lpMemAddr);
 DWORD OSLibDosQueryMem(LPVOID lpMemAddr, DWORD *lpRangeSize, DWORD *lpAttr);

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;