Changeset 2050 for trunk/src/kernel32/hmopen32.cpp

Timestamp:

Dec 9, 1999, 8:08:29 PM (26 years ago)

Author:

sandervl

Message:

Read/WriteFile return value type changes

File:

• trunk/src/kernel32/hmopen32.cpp (modified) (10 diffs)

trunk/src/kernel32/hmopen32.cpp

@@ -1 @@
-/* $Id: hmopen32.cpp,v 1.14 1999-11-22 20:35:49 sandervl Exp $ */
+/* $Id: hmopen32.cpp,v 1.15 1999-12-09 19:08:28 sandervl Exp $ */
 
 /*
@@ -251 +251 @@
 
 /*****************************************************************************
- * Name      : DWORD HMDeviceOpen32Class::ReadFile
+ * Name      : BOOL HMDeviceOpen32Class::ReadFile
  * Purpose   : read data from handle / device
  * Parameters: PHMHANDLEDATA pHMHandleData,
@@ -259 +259 @@
  *             LPOVERLAPPED  lpOverlapped
  * Variables :
- * Result    : API returncode
+ * Result    : Boolean
  * Remark    :
  * Status    :
@@ -266 +266 @@
  *****************************************************************************/
 
-DWORD HMDeviceOpen32Class::ReadFile(PHMHANDLEDATA pHMHandleData,
-                                    LPCVOID       lpBuffer,
-                                    DWORD         nNumberOfBytesToRead,
-                                    LPDWORD       lpNumberOfBytesRead,
-                                    LPOVERLAPPED  lpOverlapped)
+BOOL HMDeviceOpen32Class::ReadFile(PHMHANDLEDATA pHMHandleData,
+                                   LPCVOID       lpBuffer,
+                                   DWORD         nNumberOfBytesToRead,
+                                   LPDWORD       lpNumberOfBytesRead,
+                                   LPOVERLAPPED  lpOverlapped)
 {
   BOOL bRC;
@@ -284 +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);
+        DWORD nrpages = nNumberOfBytesToRead/4096;
+        if(offset & 0xfff) 
+                nrpages++;
+        else
+        if(nNumberOfBytesToRead & 0xfff) 
+                nrpages++;
+
+        map->commitPage(offset & ~0xfff, TRUE, nrpages);
+  }
+  else  lpRealBuf = (LPVOID)lpBuffer;
+  
   bRC = O32_ReadFile(pHMHandleData->hHMHandle,
-                     (PVOID)lpBuffer,
+                     (PVOID)lpRealBuf,
                      nNumberOfBytesToRead,
                      lpNumberOfBytesRead,
@@ -298 +318 @@
                    bRC));
 
-  return (DWORD)bRC;
+  return bRC;
 #else
   rc = OSLibDosRead(pHMHandleData->hHMHandle,
@@ -319 +339 @@
 
 /*****************************************************************************
- * Name      : DWORD HMDeviceOpen32Class::WriteFile
+ * Name      : BOOL HMDeviceOpen32Class::WriteFile
  * Purpose   : write data to handle / device
  * Parameters: PHMHANDLEDATA pHMHandleData,
@@ -327 +347 @@
  *             LPOVERLAPPED  lpOverlapped
  * Variables :
- * Result    : API returncode
+ * Result    : Boolean
  * Remark    :
  * Status    :
@@ -334 +354 @@
  *****************************************************************************/
 
-DWORD HMDeviceOpen32Class::WriteFile(PHMHANDLEDATA pHMHandleData,
-                                 LPCVOID       lpBuffer,
-                                 DWORD         nNumberOfBytesToWrite,
-                                 LPDWORD       lpNumberOfBytesWritten,
-                                 LPOVERLAPPED  lpOverlapped)
+BOOL HMDeviceOpen32Class::WriteFile(PHMHANDLEDATA pHMHandleData,
+                                    LPCVOID       lpBuffer,
+                                    DWORD         nNumberOfBytesToWrite,
+                                    LPDWORD       lpNumberOfBytesWritten,
+                                    LPOVERLAPPED  lpOverlapped)
 {
   BOOL bRC;
@@ -360 +380 @@
            bRC));
 
-  return (DWORD)bRC;
+  return bRC;
 #else
   rc = OSLibDosWrite(pHMHandleData->hHMHandle,