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

Timestamp:

Aug 25, 1999, 5:27:20 PM (26 years ago)

Author:

sandervl

Message:

Readonly memory mapped files work now + PE loader uses those apis

File:

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

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.11 1999-08-25 14:27:07 sandervl Exp $ */
+/* $Id: mmap.cpp,v 1.12 1999-08-25 15:27:19 sandervl Exp $ */
 
 /*
@@ -150 +150 @@
 
   dprintf(("Win32MemMap::commitPage %x (faultaddr %x), nr of pages %d", pageAddr, lpPageFaultAddr, nrpages));
-  if(VirtualAlloc((LPVOID)pageAddr, nrpages*PAGE_SIZE, MEM_COMMIT, newProt) == FALSE) {
-        goto fail;
-  }
   if(hMemFile != -1) {
+        if(VirtualAlloc((LPVOID)pageAddr, nrpages*PAGE_SIZE, MEM_COMMIT, PAGE_READWRITE) == FALSE) {
+                goto fail;
+        }
         offset = pageAddr - (ULONG)pMapping;
         size   = nrpages*PAGE_SIZE;
@@ -171 +171 @@
                 goto fail;
         }
+        if(mProtFlags & PAGE_READONLY) {
+//DosSetMem returns flags with EXECUTE bit set, even though the initial allocation is without this bit set!
+//Also returns access denied when trying to set it back to READONLY
+                VirtualProtect((LPVOID)pageAddr, nrpages*PAGE_SIZE, newProt, &oldProt);
+//              if(VirtualProtect((LPVOID)pageAddr, nrpages*PAGE_SIZE, newProt, &oldProt) == FALSE) {
+//                      goto fail;
+//              }
+        }
+  }
+  else {
+        if(VirtualAlloc((LPVOID)pageAddr, nrpages*PAGE_SIZE, MEM_COMMIT, newProt) == FALSE) {
+                goto fail;
+        }
   }
 
@@ -224 +237 @@
 
   if(fMapped == FALSE) {//if not mapped, reserve/commit entire view
-        pMapping = VirtualAlloc(0, mSize, fAlloc, mProtFlags);
+        pMapping = VirtualAlloc(0, mSize, fAlloc, memFlags);
         if(pMapping == NULL) {
                 dprintf(("Win32MemMap::mapFileView: VirtualAlloc %x %x %x failed!", mSize, fAlloc, memFlags));
@@ -255 +268 @@
 
 //  mapMutex.enter();
+  dprintf(("Win32MemMap::flushView: %x %x", lpvBase, cbFlush));
   if(fMapped == FALSE)
         goto parmfail;