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

Timestamp:

Jul 15, 2000, 7:12:48 PM (25 years ago)

Author:

sandervl

Message:

Fixed bugs in Read/WriteFile; nr of bytes written/read pointer can be NULL

File:

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

trunk/src/kernel32/hmfile.cpp

@@ -1 @@
-/* $Id: hmfile.cpp,v 1.11 2000-07-12 18:21:43 sandervl Exp $ */
+/* $Id: hmfile.cpp,v 1.12 2000-07-15 17:12:48 sandervl Exp $ */
 
 /*
@@ -410 +410 @@
   LPVOID       lpRealBuf;
   Win32MemMap *map;
-  DWORD        offset;
+  DWORD        offset, bytesread;
   BOOL         bRC;
 
@@ -420 +420 @@
            lpNumberOfBytesRead,
            lpOverlapped));
+
+  //SvL: It's legal for this pointer to be NULL
+  if(lpNumberOfBytesRead) {
+        lpNumberOfBytesRead = 0;
+  }
+  else  lpNumberOfBytesRead = &bytesread;
 
   if((pHMHandleData->dwFlags & FILE_FLAG_OVERLAPPED) && !lpOverlapped) {
@@ -527 +533 @@
   LPVOID       lpRealBuf;
   Win32MemMap *map;
-  DWORD        offset;
+  DWORD        offset, byteswritten;
   BOOL         bRC;
 
@@ -537 +543 @@
            lpNumberOfBytesWritten,
            lpOverlapped));
+
+  //SvL: It's legal for this pointer to be NULL
+  if(lpNumberOfBytesWritten) {
+        lpNumberOfBytesWritten = 0;
+  }
+  else  lpNumberOfBytesWritten = &byteswritten;
 
   if((pHMHandleData->dwFlags & FILE_FLAG_OVERLAPPED) && !lpOverlapped) {