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

Timestamp:

Jul 1, 2000, 11:50:55 AM (25 years ago)

Author:

sandervl

Message:

memory map fixes

File:

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

trunk/src/kernel32/hmfile.cpp

@@ -1 @@
-/* $Id: hmfile.cpp,v 1.7 2000-06-28 18:08:34 sandervl Exp $ */
+/* $Id: hmfile.cpp,v 1.8 2000-07-01 09:50:54 sandervl Exp $ */
 
 /*
@@ -425 +425 @@
   //SvL: DosRead doesn't like writing to memory addresses returned by 
   //     DosAliasMem -> search for original memory mapped pointer and use 
-  //     that one
-  map = Win32MemMapView::findMapByView((ULONG)lpBuffer, &offset, MEMMAP_ACCESS_READ);
+  //     that one + commit pages if not already present
+  map = Win32MemMapView::findMapByView((ULONG)lpBuffer, &offset, MEMMAP_ACCESS_WRITE);
   if(map) {
         lpRealBuf = (LPVOID)((ULONG)map->getMappingAddr() + offset);
@@ -432 +432 @@
         if(offset & 0xfff) 
                 nrpages++;
-        else
         if(nNumberOfBytesToRead & 0xfff) 
                 nrpages++;
@@ -519 +518 @@
                                     LPOVERLAPPED  lpOverlapped)
 {
-  BOOL bRC;
+  LPVOID       lpRealBuf;
+  Win32MemMap *map;
+  DWORD        offset;
+  BOOL         bRC;
 
   dprintfl(("KERNEL32: HMDeviceFileClass::WriteFile %s(%08x,%08x,%08x,%08x,%08x) - stub?\n",
@@ -538 +540 @@
   }
 
+  //SvL: DosWrite doesn't like reading from memory addresses returned by 
+  //     DosAliasMem -> search for original memory mapped pointer and use 
+  //     that one + commit pages if not already present
+  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;
+
   if(pHMHandleData->dwFlags & FILE_FLAG_OVERLAPPED) {
         dprintf(("ERROR: Overlapped IO not yet implememented!!"));
@@ -543 +561 @@
 //  else {
         bRC = OSLibDosWrite(pHMHandleData->hHMHandle,
-                            (PVOID)lpBuffer,
+                            (PVOID)lpRealBuf,
                             nNumberOfBytesToWrite,
                             lpNumberOfBytesWritten);