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

Timestamp:

Aug 26, 1999, 7:56:26 PM (26 years ago)

Author:

sandervl

Message:

Workaround for OS/2 bug + VirtualProtect/VirtualQuery bugfixes

File:

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

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.15 1999-08-26 15:05:14 sandervl Exp $ */
+/* $Id: mmap.cpp,v 1.16 1999-08-26 17:56:25 sandervl Exp $ */
 
 /*
@@ -190 +190 @@
                 }
                 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;
-//                      }
+                        if(VirtualProtect((LPVOID)pageAddr, nrpages*PAGE_SIZE, newProt, &oldProt) == FALSE) {
+                                goto fail;
+                        }
                 }
         }
@@ -256 +253 @@
 
   if(fMapped == FALSE) {//if not mapped, reserve/commit entire view
-        pMapping = VirtualAlloc(0, mSize, fAlloc, memFlags);
+        //SvL: Always read/write access or else ReadFile will crash once we
+        //     start decommitting pages. 
+        //     This is most likely an OS/2 bug and doesn't happen in Aurora
+        //     when allocating memory with the PAG_ANY bit set. (without this
+        //     flag it will also crash)
+        pMapping = VirtualAlloc(0, mSize, fAlloc, PAGE_READWRITE);
         if(pMapping == NULL) {
                 dprintf(("Win32MemMap::mapFileView: VirtualAlloc %x %x %x failed!", mSize, fAlloc, memFlags));