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

Timestamp:

May 24, 2000, 9:28:26 PM (25 years ago)

Author:

sandervl

Message:

memory map fixes

File:

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

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.39 2000-04-15 10:00:45 sandervl Exp $ */
+/* $Id: mmap.cpp,v 1.40 2000-05-24 19:28:26 sandervl Exp $ */
 
 /*
@@ -322 +322 @@
       goto parmfail;
 
-  if(offset+size > mSize && (!(fdwAccess & FILE_MAP_WRITE) || !hMemFile))
+  if(offset+size > mSize && (!(fdwAccess & FILE_MAP_WRITE) || hMemFile == -1))
         goto parmfail;
 
@@ -348 +348 @@
         //     when allocating memory with the PAG_ANY bit set. (without this
         //     flag it will also crash)
-        if(!hMemFile && lpszMapName) {
+        if(hMemFile == -1 && lpszMapName) {
                 pMapping = VirtualAllocShared(mSize, fAlloc, PAGE_READWRITE, lpszMapName);
         }
@@ -362 +362 @@
                 VirtualAlloc(pMapping, mSize, MEM_COMMIT, PAGE_READWRITE);
         }
-        if(hMemFile && (mProtFlags & SEC_COMMIT)) {
+        if(hMemFile != -1 && (mProtFlags & SEC_COMMIT)) {
                 DWORD nrPages = mSize >> PAGE_SHIFT;
                 if(mSize & 0xFFF)
@@ -564 +564 @@
         break;
   }
-  if(map->getMemName() != NULL && !map->getFileHandle()) {
+  if(map->getMemName() != NULL && map->getFileHandle() == -1) {
         //shared memory map, so map it into our address space
         if(OSLibDosGetNamedSharedMem((LPVOID *)&viewaddr, map->getMemName()) != OSLIB_NOERROR) {