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

Timestamp:

Aug 27, 1999, 6:51:01 PM (26 years ago)

Author:

sandervl

Message:

Implemented multiple views of memory mapped files + some bugfixes to PE loader code

File:

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

trunk/src/kernel32/virtual.cpp

@@ -1 @@
-/* $Id: virtual.cpp,v 1.10 1999-08-26 17:56:26 sandervl Exp $ */
+/* $Id: virtual.cpp,v 1.11 1999-08-27 16:51:01 sandervl Exp $ */
 
 /*
@@ -149 +149 @@
 {
  Win32MemMap *map;
+ DWORD offset;
 
     if (!base)
@@ -155 +156 @@
         return FALSE;
     }
-    map = Win32MemMap::findMap((ULONG)base);
+    map = Win32MemMapView::findMapByView((ULONG)base, &offset, MEMMAP_ACCESS_READ);
     if(map == NULL) {
         SetLastError( ERROR_FILE_NOT_FOUND );
         return FALSE;
     }
-    return map->flushView((LPVOID)base, cbFlush);
+    return map->flushView(offset, cbFlush);
 }
 
@@ -179 +180 @@
 {
  Win32MemMap *map;
+ Win32MemMapView *view;
+
+ DWORD offset;
 
     if (!addr)
@@ -185 +189 @@
         return FALSE;
     }
-    map = Win32MemMap::findMap((ULONG)addr);
+    map = Win32MemMapView::findMapByView((ULONG)addr, &offset, MEMMAP_ACCESS_READ, &view);
     if(map == NULL) {
         SetLastError( ERROR_FILE_NOT_FOUND );
         return FALSE;
     }
-    return map->unmapViewOfFile();
+    return map->unmapViewOfFile(view);
 }
 
@@ -461 +465 @@
         return 0;
   }
-  cbRangeSize = cbLength;
+  
+  cbRangeSize = cbLength & ~0xFFF;
+  if(cbLength & 0xFFF) {
+        cbRangeSize += PAGE_SIZE;
+  }
   rc = OSLibDosQueryMem((LPVOID)lpvAddress, &cbRangeSize, &dAttr);
   if(rc) {