Changeset 1718 for trunk/src

Timestamp:

Nov 13, 1999, 3:21:30 PM (26 years ago)

Author:

sandervl

Message:

Fixed ReadFile & aliased memory problems

Location:

trunk/src/kernel32

Files:

• heap.cpp (modified) (3 diffs)
• hmopen32.cpp (modified) (6 diffs)

trunk/src/kernel32/heap.cpp

@@ -1 @@
-/* $Id: heap.cpp,v 1.15 1999-11-09 19:22:32 sandervl Exp $ */
+/* $Id: heap.cpp,v 1.16 1999-11-13 14:21:30 sandervl Exp $ */
 
 /*
@@ -28 +28 @@
 {
  OS2Heap *curheap = OS2Heap::find(hHeap);
-
-  dprintf2(("HeapAlloc %X bytes", dwBytes));
+ LPVOID   rc;
+
   if(curheap == NULL)
         return(NULL);
 
-  return(curheap->Alloc(dwFlags, dwBytes));
+  rc = curheap->Alloc(dwFlags, dwBytes);
+  dprintf2(("HeapAlloc %X bytes -> %x", dwBytes, rc));
+  return rc;
 }
 //******************************************************************************
@@ -157 +159 @@
  HANDLE hHeap;
 
-    dprintf2(("KERNEL32: GetProcessHeap\n"));
+//    dprintf2(("KERNEL32: GetProcessHeap\n"));
     //SvL: Only one process heap per process
     if(processheap == NULL) {

trunk/src/kernel32/hmopen32.cpp

@@ -1 @@
-/* $Id: hmopen32.cpp,v 1.11 1999-11-12 14:57:15 sandervl Exp $ */
+/* $Id: hmopen32.cpp,v 1.12 1999-11-13 14:21:30 sandervl Exp $ */
 
 /*
@@ -29 +29 @@
 #include "HandleManager.h"
 #include "HMOpen32.h"
-
+#include "mmap.h"
 
 /*****************************************************************************
@@ -273 +273 @@
 {
   BOOL bRC;
+  LPVOID lpRealBuf;
 
   dprintfl(("KERNEL32: HandleManager::Open32::ReadFile %s(%08x,%08x,%08x,%08x,%08x) - stub?\n",
@@ -283 +284 @@
 
 #if 1
+  Win32MemMap *map;
+  DWORD offset;
+
+  //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);
+  if(map) {
+        lpRealBuf = (LPVOID)((ULONG)map->getMappingAddr() + offset);
+  }
+  else  lpRealBuf = (LPVOID)lpBuffer;
+  
   bRC = O32_ReadFile(pHMHandleData->hHMHandle,
-                     (PVOID)lpBuffer,
+                     (PVOID)lpRealBuf,
                      nNumberOfBytesToRead,
                      lpNumberOfBytesRead,
                      lpOverlapped);
 
-  dprintfl(("KERNEL32: HandleManager::Open32::ReadFile returned %08xh\n",
-           bRC));
+  if(bRC == 0) {
+        dprintf(("KERNEL32: HandleManager::Open32::ReadFile returned %08xh %x\n",
+                  bRC, GetLastError()));
+        dprintf(("%x -> %d", lpBuffer, IsBadWritePtr((LPVOID)lpBuffer, nNumberOfBytesToRead)));
+  }
+  else  dprintfl(("KERNEL32: HandleManager::Open32::ReadFile returned %08xh\n",
+                   bRC));
 
   return (DWORD)bRC;
@@ -497 +515 @@
 
 DWORD HMDeviceOpen32Class::GetFileSize(PHMHANDLEDATA pHMHandleData,
-                                       PDWORD        pSize)
+                                       PDWORD        lpdwFileSizeHigh)
 {
   dprintfl(("KERNEL32: HandleManager::Open32::GetFileSize %s(%08xh,%08xh)\n",
            lpHMDeviceName,
            pHMHandleData,
-           pSize));
+           lpdwFileSizeHigh));
 
 #if 1
+  if(lpdwFileSizeHigh)
+    *lpdwFileSizeHigh = 0;
+
   return O32_GetFileSize(pHMHandleData->hHMHandle,
-                         pSize);
+                         lpdwFileSizeHigh);
 #else
   size = OSLibDosGetFileSize(pHMHandleData->hHMHandle);
   if(pSize)
-    *pSize = size;
+    *pSize = 0;
   return size;
 #endif
@@ -544 +565 @@
 
 #if 1
+  if(lpDistanceToMoveHigh)
+    *lpDistanceToMoveHigh = 0;
+
   return O32_SetFilePointer(pHMHandleData->hHMHandle,
                             lDistanceToMove,