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

Timestamp:

Jun 12, 2002, 4:28:33 PM (23 years ago)

Author:

sandervl

Message:

If bytes present in COM device buffer, read them directly; even for overlapped IO calls.

File:

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

trunk/src/kernel32/hmcomm.cpp

@@ -1 @@
-/* $Id: hmcomm.cpp,v 1.35 2002-06-11 12:51:43 sandervl Exp $ */
+/* $Id: hmcomm.cpp,v 1.36 2002-06-12 14:28:33 sandervl Exp $ */
 
 /*
@@ -566 +566 @@
     }
 
-    if(pHMHandleData->dwFlags & FILE_FLAG_OVERLAPPED) {
+    RXQUEUE qInfo;
+    ULONG ulLen = sizeof(qInfo);
+    ULONG rc = OSLibDosDevIOCtl(pHMHandleData->hHMHandle, IOCTL_ASYNC, ASYNC_GETINQUECOUNT, 0,0,0, &qInfo,ulLen,&ulLen);
+    dprintf(("ASYNC_GETINQUECOUNT -> qInfo.cch %d (queue size %d) rc %d", qInfo.cch, qInfo.cb, rc));
+
+    if(!qInfo.cch && pHMHandleData->dwFlags & FILE_FLAG_OVERLAPPED) {
         return pDevData->iohandler->ReadFile(pHMHandleData->hWin32Handle, lpBuffer, nNumberOfBytesToRead,
                                              lpNumberOfBytesRead, lpOverlapped, lpCompletionRoutine, (DWORD)pDevData);
     }
-
-#ifdef DEBUG
-    RXQUEUE qInfo;
-    ULONG ulLen = sizeof(qInfo);
-    ULONG rc = OSLibDosDevIOCtl(pHMHandleData->hHMHandle,
-                                IOCTL_ASYNC,
-                                ASYNC_GETINQUECOUNT,
-                                0,0,0,
-                                &qInfo,ulLen,&ulLen);
-    dprintf(("ASYNC_GETINQUECOUNT -> qInfo.cch %d (queue size %d) rc %d", qInfo.cch, qInfo.cb, rc));
-#endif
 
     ret = OSLibDosRead(pHMHandleData->hHMHandle, (LPVOID)lpBuffer, nNumberOfBytesToRead,
@@ -600 +594 @@
     }
 #endif
+
+    if(pHMHandleData->dwFlags & FILE_FLAG_OVERLAPPED) {
+        //reset overlapped semaphore to non-signalled
+        ::ResetEvent(lpOverlapped->hEvent);
+
+        //set event to make sure next GetOverlappedResult doesn't block
+        ::SetEvent(lpOverlapped->hEvent);
+
+        lpOverlapped->Internal     = GetLastError();
+        lpOverlapped->InternalHigh = ulBytesRead;
+    }
     return ret;
 }