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

Timestamp:

Jul 15, 2002, 4:28:53 PM (23 years ago)

Author:

sandervl

Message:

Rewrote algorithm for 64kb alignment in VirtualAlloc'ed memory; allocation changes for heap (in 64kb chunks) & PE image (align at 64kb)

File:

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

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.95 2002-02-06 16:33:39 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.96 2002-07-15 14:28:53 sandervl Exp $ */
 
 /*
@@ -53 +53 @@
 #include <win\virtual.h>
 #include "oslibdos.h"
+#include "oslibmem.h"
 #include "mmap.h"
 #include <wprocess.h>
@@ -159 +160 @@
 
     if(realBaseAddress)
-        DosFreeMem((PVOID)realBaseAddress);
+        OSLibDosFreeMem((PVOID)realBaseAddress);
 
     if(nameexports)
@@ -924 +925 @@
         return allocFixedMem(reservedMem);
     }
-    rc = DosAllocMem((PPVOID)&baseAddress, imageSize, PAG_READ | PAG_WRITE | flAllocMem);
+    rc = OSLibDosAllocMem((PPVOID)&baseAddress, imageSize, PAG_READ | PAG_WRITE);
     if(rc) {
         dprintf((LOG, "Win32PeLdrImage::allocSections, DosAllocMem returned %d", rc));
@@ -1011 +1012 @@
     }
     while(TRUE) {
-        rc = DosAllocMem((PPVOID)&address, FALLOC_SIZE, PAG_READ | allocFlags);
+        rc = OSLibDosAllocMem((PPVOID)&address, FALLOC_SIZE, PAG_READ | allocFlags);
         if(rc) break;
 
@@ -1017 +1018 @@
         if(address + FALLOC_SIZE >= oh.ImageBase) {
             if(address > oh.ImageBase) {//we've passed it!
-                DosFreeMem((PVOID)address);
+                OSLibDosFreeMem((PVOID)address);
                 break;
             }
             //found the right address
-            DosFreeMem((PVOID)address);
+            OSLibDosFreeMem((PVOID)address);
 
             diff = oh.ImageBase - address;
             if(diff) {
-                rc = DosAllocMem((PPVOID)&address, diff, PAG_READ | allocFlags);
+                rc = OSLibDosAllocMem((PPVOID)&address, diff, PAG_READ | allocFlags);
                 if(rc) break;
             }
-            rc = DosAllocMem((PPVOID)&baseAddress, imageSize, PAG_READ | PAG_WRITE | allocFlags);
+            rc = OSLibDosAllocMem((PPVOID)&baseAddress, imageSize, PAG_READ | PAG_WRITE | allocFlags);
             if(rc) break;
 
-            if(diff) DosFreeMem((PVOID)address);
+            if(diff) OSLibDosFreeMem((PVOID)address);
 
             realBaseAddress = baseAddress;
@@ -1039 +1040 @@
     }
     for(i=0;i<alloccnt;i++) {
-        DosFreeMem((PVOID)memallocs[i]);
+        OSLibDosFreeMem((PVOID)memallocs[i]);
     }
     free(memallocs);