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

Timestamp:

Aug 25, 1999, 4:27:07 PM (26 years ago)

Author:

sandervl

Message:

handle manager changes for DuplicateHandle + memory mapped file changes/bugfixes

File:

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

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.10 1999-08-25 11:40:18 sandervl Exp $ */
+/* $Id: mmap.cpp,v 1.11 1999-08-25 14:27:07 sandervl Exp $ */
 
 /*
@@ -40 +40 @@
 {
   globalmapMutex.enter();
+  next    = memmaps;
   memmaps = this;
-  next    = memmaps;
   globalmapMutex.leave();
 
@@ -68 +68 @@
                 goto fail;
         }
+        mSize = SetFilePointer(hMemFile, 0, NULL, FILE_END);
+        if(mSize == -1) {
+                dprintf(("Win32MemMap::init: SetFilePointer failed to set pos end"));
+                goto fail;
+        }
   }
   this->hMemMap = hMemMap;
@@ -143 +148 @@
 //  mapMutex.enter();
   newProt  = mProtFlags & (PAGE_READONLY | PAGE_READWRITE | PAGE_WRITECOPY);
-  newProt |= MEM_COMMIT;
 
   dprintf(("Win32MemMap::commitPage %x (faultaddr %x), nr of pages %d", pageAddr, lpPageFaultAddr, nrpages));
-  if(VirtualProtect((LPVOID)pageAddr, nrpages*PAGE_SIZE, newProt, &oldProt) == FALSE) {
+  if(VirtualAlloc((LPVOID)pageAddr, nrpages*PAGE_SIZE, MEM_COMMIT, newProt) == FALSE) {
         goto fail;
   }
@@ -201 +205 @@
   LPVOID mapview;
 
-  if(fdwAccess & (FILE_MAP_WRITE|FILE_MAP_ALL_ACCESS) && !(mProtFlags & PAGE_READWRITE)) 
-        goto parmfail;
-  if(fdwAccess & FILE_MAP_READ && !(mProtFlags & (PAGE_READWRITE|PAGE_READONLY))) 
-        goto parmfail;
-  if(fdwAccess & FILE_MAP_COPY && !(mProtFlags & PAGE_WRITECOPY)) 
+  if((fdwAccess & FILE_MAP_WRITE) && !(mProtFlags & PAGE_READWRITE)) 
+        goto parmfail;
+  if((fdwAccess & FILE_MAP_READ) && !(mProtFlags & (PAGE_READWRITE|PAGE_READONLY))) 
+        goto parmfail;
+  if((fdwAccess & FILE_MAP_COPY) && !(mProtFlags & PAGE_WRITECOPY)) 
         goto parmfail;