Changeset 3782 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

memory map fixes

Location:

trunk/src/kernel32

Files:

• hmfile.cpp (modified) (6 diffs)
• mmap.cpp (modified) (4 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);

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.41 2000-05-26 18:42:55 sandervl Exp $ */
+/* $Id: mmap.cpp,v 1.42 2000-07-01 09:50:55 sandervl Exp $ */
 
 /*
@@ -197 +197 @@
 
   dprintf(("Win32MemMap::commitPage %x (faultaddr %x)", pageAddr, lpPageFaultAddr));
-  if(hMemFile != -1) {
-//      for(i=0;i<nrpages;i++) {
+  if(hMemFile != -1) 
+  {
+        int faultsize = nrpages*PAGE_SIZE;
+
+        offset = pageAddr - (ULONG)pMapping;
+        if(offset + faultsize > mSize) {
+                faultsize = mSize - offset;
+        }
+
+        while(faultsize) {
                 if(VirtualQuery((LPSTR)pageAddr, &memInfo, sizeof(MEMORY_BASIC_INFORMATION)) == 0) {
                         dprintf(("Win32MemMap::commitPage: VirtualQuery (%x,%x) failed for %x", pageAddr, nrpages*PAGE_SIZE));
                         goto fail;
                 }
-                memInfo.RegionSize = min(memInfo.RegionSize, nrpages*PAGE_SIZE);
+                memInfo.RegionSize = min(memInfo.RegionSize, faultsize);
                 //Only changes the state of the pages with the same attribute flags
                 //(returned in memInfo.RegionSize)
                 //If it's smaller than the mNrPages, it simply means one or more of the
                 //other pages have already been committed
-                if(memInfo.State & MEM_COMMIT)
-                {//if it's already committed, then the app tried to write to it
-                        if(!fWriteAccess) {
-                                dprintf(("Win32MemMap::commitPage: Huh? Already committed and not trying to write (%x,%x) failed for %x", pageAddr, memInfo.RegionSize));
-                                goto fail;
-                        }
-                        if(VirtualProtect((LPVOID)pageAddr, memInfo.RegionSize, newProt, &oldProt) == FALSE) {
-                                dprintf(("Win32MemMap::commitPage: Failed to set write flag on page (%x,%x) failed for %x", pageAddr, memInfo.RegionSize));
-                                goto fail;
-                        }
-                }
-                else {
+                if(!(memInfo.State & MEM_COMMIT))
+                {
                         if(VirtualAlloc((LPVOID)pageAddr, memInfo.RegionSize, MEM_COMMIT, PAGE_READWRITE) == FALSE) {
                                 goto fail;
@@ -243 +241 @@
                                 }
                         }
-                        if(mProtFlags != PAGE_READWRITE) {
+                        if(newProt != PAGE_READWRITE) {
                                 if(VirtualProtect((LPVOID)pageAddr, memInfo.RegionSize, newProt, &oldProt) == FALSE) {
                                         goto fail;
@@ -249 +247 @@
                         }
                 }
-//              pageAddr += PAGE_SIZE;
-//      }
+                faultsize -= memInfo.RegionSize;
+                pageAddr  += memInfo.RegionSize;
+        }
   }
   else {
         ULONG sizeleft = nrpages*PAGE_SIZE;
-        while(sizeleft) {
-
+        while(sizeleft) 
+        {
                 if(VirtualQuery((LPSTR)pageAddr, &memInfo, sizeof(MEMORY_BASIC_INFORMATION)) == 0) {
                         dprintf(("Win32MemMap::commitPage: VirtualQuery (%x,%x) failed", pageAddr, sizeleft));