Changeset 9824 for trunk/src/kernel32/virtual.cpp

Timestamp:

Feb 18, 2003, 7:48:55 PM (23 years ago)

Author:

sandervl

Message:

Cleaned up memory map code

File:

• trunk/src/kernel32/virtual.cpp (modified) (6 diffs)

trunk/src/kernel32/virtual.cpp

@@ -1 @@
-/* $Id: virtual.cpp,v 1.49 2002-12-27 15:25:40 sandervl Exp $ */
+/* $Id: virtual.cpp,v 1.50 2003-02-18 18:48:55 sandervl Exp $ */
 
 /*
@@ -167 +167 @@
  Win32MemMap *map;
  DWORD offset;
+ BOOL ret;
 
     if (!base)
@@ -178 +179 @@
         return FALSE;
     }
-    return map->flushView(offset, cbFlush);
+    ret = map->flushView(offset, cbFlush);
+    map->Release();
+    return ret;
 }
 
@@ -196 +199 @@
 )
 {
- Win32MemMap *map;
- Win32MemMapView *view;
-
- DWORD offset;
+    Win32MemMap *map;
+    BOOL  ret;
 
     if (!addr)
@@ -206 +207 @@
         return FALSE;
     }
-    map = Win32MemMapView::findMapByView((ULONG)addr, &offset, MEMMAP_ACCESS_READ, &view);
+    map = Win32MemMapView::findMapByView((ULONG)addr);
     if(map == NULL) {
         SetLastError( ERROR_FILE_NOT_FOUND );
         return FALSE;
     }
-    return map->unmapViewOfFile(view);
+    ret = map->unmapViewOfFile(addr);
+    map->Release();
+    return ret;
 }
 
@@ -350 +353 @@
             //TODO: We don't allow protection flag changes for mmaped files now
             map->commitPage(offset, FALSE, nrpages);
+            map->Release();
             return lpvAddress;
         }