Changeset 21667 for trunk/src/kernel32/hmfile.cpp

Timestamp:

Jul 7, 2011, 1:44:25 PM (14 years ago)

Author:

dmik

Message:

kernel32: Fixed a regression in r21655 that caused crashes in DOSCALL1 when writing to memory mapped files. The wrong code path would incorrectly invalidate memory pages on each write. Closes Java ticket 129.

File:

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

trunk/src/kernel32/hmfile.cpp

@@ -556 +556 @@
       dprintf(("Flush memory maps to disk before reading!!"));
       map->flushView(MMAP_FLUSHVIEW_ALL, curpos, nNumberOfBytesToRead);
+      map->Release();
   }
 
@@ -644 +645 @@
   else lpRealBuf = (LPVOID)lpBuffer;
 
-  //If this file is also used in a memory map somewhere, then we need
-  //to tell the map to flush all modified contents to disk right NOW
-  DWORD curfilepos;
-  map = Win32MemMap::findMapByFile(pHMHandleData->hWin32Handle);
-  if(map && map->getFileHandle() != pHMHandleData->hWin32Handle) {
-      curfilepos = SetFilePointer(pHMHandleData, 0, NULL, FILE_CURRENT);
-
-      dprintf(("Flush memory maps to disk before writing!!"));
-      map->flushView(MMAP_FLUSHVIEW_ALL, curfilepos, nNumberOfBytesToWrite);
-  }
-
   if(pHMHandleData->dwFlags & FILE_FLAG_OVERLAPPED) {
     dprintf(("ERROR: Overlapped IO not yet implememented!!"));
@@ -665 +655 @@
 //  }
 
-  if(map && bRC) {
-      dprintf(("Invalidate memory map after file writing!!"));
-      map->invalidatePages(curfilepos, *lpNumberOfBytesWritten);
+  if (bRC) {
+    //If this file is also used in a memory map somewhere, then we need
+    //to invalidate memory pages that we just wrote
+    DWORD curfilepos;
+    map = Win32MemMap::findMapByFile(pHMHandleData->hWin32Handle);
+    if(map) {
+        curfilepos = SetFilePointer(pHMHandleData, 0, NULL, FILE_CURRENT);
+
+        dprintf(("Invalidate memory map after file writing!!"));
+        map->invalidatePages(curfilepos, *lpNumberOfBytesWritten);
+        map->Release();
+    }
   }