Changeset 8121 for trunk/src

Timestamp:

Mar 24, 2002, 2:10:30 PM (23 years ago)

Author:

sandervl

Message:

all named file mappings are shared

Location:

trunk/src/kernel32

Files:

• hmfile.cpp (modified) (3 diffs)
• mmap.cpp (modified) (3 diffs)

trunk/src/kernel32/hmfile.cpp

@@ -1 @@
-/* $Id: hmfile.cpp,v 1.33 2001-12-05 18:06:01 sandervl Exp $ */
+/* $Id: hmfile.cpp,v 1.34 2002-03-24 13:10:30 sandervl Exp $ */
 
 /*
@@ -473 +473 @@
   map = Win32MemMapView::findMapByView((ULONG)lpBuffer, &offset, MEMMAP_ACCESS_WRITE);
   if(map) {
-    lpRealBuf = (LPVOID)((ULONG)map->getMappingAddr() + offset);
-    DWORD nrpages = nNumberOfBytesToRead/4096;
-    if(offset & 0xfff)
-        nrpages++;
-    if(nNumberOfBytesToRead & 0xfff)
-        nrpages++;
-
-    map->commitPage(offset & ~0xfff, TRUE, nrpages);
-  }
-  else  lpRealBuf = (LPVOID)lpBuffer;
+       lpRealBuf = (LPVOID)((ULONG)map->getMappingAddr() + offset);
+       DWORD nrpages = nNumberOfBytesToRead/4096;
+       if(offset & 0xfff)
+           nrpages++;
+       if(nNumberOfBytesToRead & 0xfff)
+           nrpages++;
+
+       map->commitPage(offset & ~0xfff, TRUE, nrpages);
+  }
+  else lpRealBuf = (LPVOID)lpBuffer;
 
   if(pHMHandleData->dwFlags & FILE_FLAG_OVERLAPPED) {
@@ -560 +560 @@
   map = Win32MemMapView::findMapByView((ULONG)lpBuffer, &offset, MEMMAP_ACCESS_READ);
   if(map) {
-    lpRealBuf = (LPVOID)((ULONG)map->getMappingAddr() + offset);
-    DWORD nrpages = nNumberOfBytesToWrite/4096;
-    if(offset & 0xfff)
-        nrpages++;
-    if(nNumberOfBytesToWrite & 0xfff)
-        nrpages++;
-
-    map->commitPage(offset & ~0xfff, TRUE, nrpages);
-  }
-  else  lpRealBuf = (LPVOID)lpBuffer;
+       lpRealBuf = (LPVOID)((ULONG)map->getMappingAddr() + offset);
+       DWORD nrpages = nNumberOfBytesToWrite/4096;
+       if(offset & 0xfff)
+           nrpages++;
+       if(nNumberOfBytesToWrite & 0xfff)
+           nrpages++;
+ 
+       map->commitPage(offset & ~0xfff, TRUE, nrpages);
+  }
+  else lpRealBuf = (LPVOID)lpBuffer;
 
   if(pHMHandleData->dwFlags & FILE_FLAG_OVERLAPPED) {

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.53 2001-10-30 00:46:17 sandervl Exp $ */
+/* $Id: mmap.cpp,v 1.54 2002-03-24 13:10:30 sandervl Exp $ */
 
 /*
@@ -382 +382 @@
         //     when allocating memory with the PAG_ANY bit set. (without this
         //     flag it will also crash)
-        if(hMemFile == -1 && lpszMapName) {
+        //All named file mappings are shared (files & memory only)
+        if(lpszMapName) {
             pMapping = VirtualAllocShared(mSize, fAlloc, PAGE_READWRITE, lpszMapName);
         }
@@ -601 +602 @@
         break;
     }
-    if(map->getMemName() != NULL && map->getFileHandle() == -1 && 
-       map->getProcessId() != mProcessId) 
+    //Named file mappings from other processes are always shared;
+    //map into our address space
+    if(map->getMemName() != NULL && map->getProcessId() != mProcessId) 
     {
         //shared memory map, so map it into our address space