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

Timestamp:

Dec 10, 2001, 1:55:13 PM (24 years ago)

Author:

sandervl

Message:

overlapped io updates & fixes

File:

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

trunk/src/kernel32/hmcomm.cpp

@@ -1 @@
-/* $Id: hmcomm.cpp,v 1.32 2001-12-09 21:19:28 sandervl Exp $ */
+/* $Id: hmcomm.cpp,v 1.33 2001-12-10 12:55:12 sandervl Exp $ */
 
 /*
@@ -238 +238 @@
             comnr = comname[3] - '1';
 
-            if(handler[comnr] == NULL) {
+            if(handler[comnr] == NULL) 
+            {
                 try {
                     handler[comnr] = new OverlappedIOHandler(CommReadIOHandler, CommWriteIOHandler, CommPollIOHandler);
@@ -272 +273 @@
  * Author    : SvL
  *****************************************************************************/
-
 DWORD HMDeviceCommClass::GetFileType(PHMHANDLEDATA pHMHandleData)
 {
@@ -421 +421 @@
         dwEvent |= (COMEvt&0x0080)? EV_ERR:0;
         dwEvent |= (COMEvt&0x0100)? EV_RING:0;
+ 
+        if((dwEvent & EV_RXCHAR) && (dwMask & EV_RXCHAR)) 
+        {
+            //check if there's really data in the in queue
+            RXQUEUE qInfo;
+            ULONG ulLen = sizeof(qInfo);
+            ULONG rc = OSLibDosDevIOCtl(pHMHandleData->hHMHandle,
+                                        IOCTL_ASYNC,
+                                        ASYNC_GETINQUECOUNT,
+                                        0,0,0,
+                                        &qInfo,ulLen,&ulLen);
+            if(qInfo.cch == 0) {
+                dprintf(("!WARNING!: CommPollIOHandler -> EV_RXCHAR but no DATA"));
+                dwEvent &= ~EV_RXCHAR;
+            }
+        }
         if((dwEvent & dwMask)) {
             dprintf(("CommPollIOHandler: event(s) %x occured", (dwEvent & dwMask)));
@@ -726 +742 @@
   PHMDEVCOMDATA pDevData = (PHMDEVCOMDATA)pHMHandleData->lpHandlerData;
 
-    dprintf(("KERNEL32-WARNING: HMDeviceCommClass::GetOverlappedResult(%08xh,%08xh,%08xh,%08xh)",
+    dprintf(("KERNEL32-HMDeviceCommClass: HMDeviceCommClass::GetOverlappedResult(%08xh,%08xh,%08xh,%08xh)",
              pHMHandleData->hHMHandle, lpOverlapped, lpcbTransfer, fWait));