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

Timestamp:

Jan 25, 2001, 9:18:05 PM (25 years ago)

Author:

sandervl

Message:

memory map commit bugfix

File:

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

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.49 2001-01-22 18:26:51 sandervl Exp $ */
+/* $Id: mmap.cpp,v 1.50 2001-01-25 20:18:05 sandervl Exp $ */
 
 /*
@@ -241 +241 @@
         //(returned in memInfo.RegionSize)
         //If it's smaller than the mNrPages, it simply means one or more of the
-            //other pages have already been committed
+        //other pages have already been committed
         if(!(memInfo.State & MEM_COMMIT))
         {
@@ -247 +247 @@
                 goto fail;
             }
-            if(!fWriteAccess) {
-                offset = pageAddr - (ULONG)pMapping;
-                size   = memInfo.RegionSize;
-                if(offset + size > mSize) {
-                    dprintf(("Adjusting size from %d to %d", size, mSize - offset));
-                    size = mSize - offset;
-                }
-                if(SetFilePointer(hMemFile, offset, NULL, FILE_BEGIN) != offset) {
-                    dprintf(("Win32MemMap::commitPage: SetFilePointer failed to set pos to %x", offset));
-                    goto fail;
-                }
-                if(ReadFile(hMemFile, (LPSTR)pageAddr, size, &nrBytesRead, NULL) == FALSE) {
-                    dprintf(("Win32MemMap::commitPage: ReadFile failed for %x", pageAddr));
-                    goto fail;
-                }
-                if(nrBytesRead != size) {
-                    dprintf(("Win32MemMap::commitPage: ReadFile didn't read all bytes for %x", pageAddr));
-                    goto fail;
-                }
+            offset = pageAddr - (ULONG)pMapping;
+            size   = memInfo.RegionSize;
+            if(offset + size > mSize) {
+                dprintf(("Adjusting size from %d to %d", size, mSize - offset));
+                size = mSize - offset;
+            }
+            if(SetFilePointer(hMemFile, offset, NULL, FILE_BEGIN) != offset) {
+                dprintf(("Win32MemMap::commitPage: SetFilePointer failed to set pos to %x", offset));
+                goto fail;
+            }
+            if(ReadFile(hMemFile, (LPSTR)pageAddr, size, &nrBytesRead, NULL) == FALSE) {
+                dprintf(("Win32MemMap::commitPage: ReadFile failed for %x", pageAddr));
+                goto fail;
+            }
+            if(nrBytesRead != size) {
+                dprintf(("Win32MemMap::commitPage: ReadFile didn't read all bytes for %x", pageAddr));
+                goto fail;
             }
             if(newProt != PAGE_READWRITE) {