Changeset 1811 for trunk/src/kernel32/mmap.cpp

Timestamp:

Nov 22, 1999, 9:35:52 PM (26 years ago)

Author:

sandervl

Message:

Rewrite of PE loader code, EB's fixes + VirtualProtect bugfix

File:

• trunk/src/kernel32/mmap.cpp (modified) (13 diffs)

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.22 1999-11-10 14:16:01 sandervl Exp $ */
+/* $Id: mmap.cpp,v 1.23 1999-11-22 20:35:50 sandervl Exp $ */
 
 /*
@@ -29 +29 @@
 #include "mmap.h"
 #include "oslibdos.h"
+#include <winimagepeldr.h>
 
 //Global DLL Data
@@ -42 +43 @@
 //******************************************************************************
 Win32MemMap::Win32MemMap(HFILE hfile, ULONG size, ULONG fdwProtect, LPSTR lpszName)
-               : nrMappings(0), pMapping(NULL), mMapAccess(0), referenced(0)
+               : nrMappings(0), pMapping(NULL), mMapAccess(0), referenced(0), image(0)
 {
   globalmapMutex.enter();
@@ -60 +61 @@
   }
   else  lpszMapName = NULL;
+}
+//******************************************************************************
+//Map constructor used for executable image maps (only used internally)
+//******************************************************************************
+Win32MemMap::Win32MemMap(Win32PeLdrImage *pImage, ULONG baseAddress, ULONG size)
+               : nrMappings(0), pMapping(NULL), mMapAccess(0), referenced(0)
+{
+  globalmapMutex.enter();
+  next    = memmaps;
+  memmaps = this;
+  globalmapMutex.leave();
+
+  hMemFile   = -1;
+
+  mSize      = size;
+  mProtFlags = PAGE_READWRITE;
+  mProcessId = GetCurrentProcess();
+
+  pMapping   = (LPVOID)baseAddress;
+
+  image      = pImage;
+  lpszMapName= NULL;
 }
 //******************************************************************************
@@ -107 +130 @@
         free(lpszMapName);
   }
-  if(pMapping) {
+  if(pMapping && !image) {
         if(lpszMapName) {
                 OSLibDosFreeMem(pMapping);
@@ -154 +177 @@
 //  mapMutex.enter();
 
+  if(image) {
+        return image->commitPage(pageAddr, fWriteAccess);
+  }
   newProt  = mProtFlags & (PAGE_READONLY | PAGE_READWRITE | PAGE_WRITECOPY);
 
@@ -199 +225 @@
                         goto fail;
                 }
-                if(mProtFlags & PAGE_READONLY) {
+                if(mProtFlags != PAGE_READWRITE) {
                         if(VirtualProtect((LPVOID)pageAddr, memInfo.RegionSize, newProt, &oldProt) == FALSE) {
                                 goto fail;
@@ -211 +237 @@
                 goto fail;
         }
-        if(VirtualAlloc((LPVOID)pageAddr, memInfo.RegionSize, MEM_COMMIT, newProt) == FALSE) {
-                goto fail;
+        if(!(memInfo.State & MEM_COMMIT))
+        {//if it's already committed, then the app tried to write to it
+                if(VirtualAlloc((LPVOID)pageAddr, memInfo.RegionSize, MEM_COMMIT, newProt) == FALSE) 
+                        goto fail;
         }
   }
@@ -282 +310 @@
 #endif
 
-  if(nrMappings == 0) {//if not mapped, reserve/commit entire view
+  //Memory has already been allocated for executable image maps (only used internally)
+  if(!pMapping && nrMappings == 0) {//if not mapped, reserve/commit entire view
         //SvL: Always read/write access or else ReadFile will crash once we
         //     start committing pages.
@@ -332 +361 @@
  ULONG nrBytesWritten, size;
  int   i;
+
+  if(image) //no flushing for image maps
+        return TRUE;
 
   dprintf(("Win32MemMap::flushView: %x %x", lpvBase, cbFlush));
@@ -447 +479 @@
         nextmap = map->next;
         if(map->getProcessId() == processId) {
-                CloseHandle(memmaps->hMemMap);
+                //Delete map directly for executable images (only used internally)
+                if(map->getImage()) {
+                        delete map;
+                }
+                else    CloseHandle(memmaps->hMemMap);
         }
         else {
@@ -492 +528 @@
   }
   
-  if(OSLibDosAliasMem(viewaddr, size, &pMapView, accessAttr) != OSLIB_NOERROR) {
-        dprintf(("new OSLibDosAliasMem FAILED"));
-        SetLastError(ERROR_NOT_ENOUGH_MEMORY);
-        errorState = 1;
-        return;
+  //view == memory mapping for executable images (only used internally)
+  if(map->getImage()) {
+        pMapView = map->getMappingAddr();
+  }
+  else {
+        if(OSLibDosAliasMem(viewaddr, size, &pMapView, accessAttr) != OSLIB_NOERROR) {
+                dprintf(("new OSLibDosAliasMem FAILED"));
+                SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+                errorState = 1;
+                return;
+        }
   }
 
@@ -530 +572 @@
         mParentMap->flushView(mOffset, mSize);
 
-  OSLibDosFreeMem(pMapView);
+  //Don't free memory for executable image map views (only used internally)
+  if(!mParentMap->getImage())
+        OSLibDosFreeMem(pMapView);
 
   globalviewMutex.enter();