Changeset 8644 for trunk/src/kernel32/hmcomm.cpp

Timestamp:

Jun 11, 2002, 2:52:03 PM (23 years ago)

Author:

sandervl

Message:

Overlapped IO bugfixes

File:

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

trunk/src/kernel32/hmcomm.cpp

@@ -1 @@
-/* $Id: hmcomm.cpp,v 1.34 2001-12-10 14:04:24 sandervl Exp $ */
+/* $Id: hmcomm.cpp,v 1.35 2002-06-11 12:51:43 sandervl Exp $ */
 
 /*
@@ -297 +297 @@
     PHMHANDLEDATA pHMHandleData;
     BOOL          ret;
-    ULONG         ulBytesRead;
+    ULONG         ulBytesRead, len;
 
     pHMHandleData = HMQueryHandleData(lpRequest->hHandle);
@@ -317 +317 @@
 #endif
 
-    ret = OSLibDosRead(pHMHandleData->hHMHandle, (LPVOID)lpRequest->lpBuffer, lpRequest->nNumberOfBytes,
-                       &ulBytesRead);
+    ret = OSLibDosRead(pHMHandleData->hHMHandle, (LPVOID)lpRequest->lpBuffer, lpRequest->nNumberOfBytes, &ulBytesRead);
 
     *lpdwResult = (ret) ? ulBytesRead : 0;
@@ -327 +326 @@
     }
     else {
-        //testestestest
+#ifdef DEBUG
         dprintf2(("%d Bytes read:", ulBytesRead));
-        for(int i=0;i<ulBytesRead;i++) {
+        for(int i=0;i<min(ulBytesRead, 16);i++) {
             dprintf2(("%x %c", ((char *)lpRequest->lpBuffer)[i], ((char *)lpRequest->lpBuffer)[i]));
         }
-        //testestestset
+#endif
     }
     return GetLastError();
@@ -352 +351 @@
     }
 
-    //testestestest
+#ifdef DEBUG
     dprintf2(("Bytes to write:"));
-    for(int i=0;i<lpRequest->nNumberOfBytes;i++) {
+    for(int i=0;i<min(lpRequest->nNumberOfBytes, 16);i++) {
         dprintf2(("%x %c", ((char *)lpRequest->lpBuffer)[i], ((char *)lpRequest->lpBuffer)[i]));
     }
-    //testestestset
+#endif
 
     ret = OSLibDosWrite(pHMHandleData->hHMHandle, (LPVOID)lpRequest->lpBuffer, lpRequest->nNumberOfBytes,
@@ -593 +592 @@
         dprintf(("!ERROR!: ReadFile failed with rc %d", GetLastError()));
     }
+#ifdef DEBUG
     else {
-        //testestestest
         dprintf2(("%d Bytes read:", ulBytesRead));
-        for(int i=0;i<ulBytesRead;i++) {
+        for(int i=0;i<min(ulBytesRead, 16);i++) {
             dprintf2(("%x %c", ((char *)lpBuffer)[i], ((char *)lpBuffer)[i]));
         }
-        //testestestset
-    }
+    }
+#endif
     return ret;
 }