Changeset 57910 in vbox

Timestamp:

Sep 26, 2015 5:24:17 PM (9 years ago)

Author:

vboxsync

Message:

DrvHostSerial.cpp: Should call GetOverlappedResult if ReadFile returns ERROR_IO_PENDING. Observed with Free Virtual Serial Ports v3.20.00.0545 on 64-bit Windows 10.

File:

• trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp

@@ -474 +474 @@
     {
         int rc = RTSemEventWait(pThis->SendSem, RT_INDEFINITE_WAIT);
-        if (RT_FAILURE(rc))
-            break;
+        AssertRCBreak(rc);
 
         /*
@@ -770 +769 @@
                 if (!ReadFile(pThis->hDeviceFile, abBuffer, sizeof(abBuffer), &dwNumberOfBytesTransferred, &pThis->overlappedRecv))
                 {
-                    rcThread = RTErrConvertFromWin32(GetLastError());
-                    LogRel(("HostSerial#%d: Read failed with error %Rrc; terminating the worker thread.\n", pDrvIns->iInstance, rcThread));
-                    break;
+                    dwRet = GetLastError();
+                    if (dwRet == ERROR_IO_PENDING)
+                    {
+                        if (GetOverlappedResult(pThis->hDeviceFile, &pThis->overlappedRecv, &dwNumberOfBytesTransferred, TRUE))
+                            dwRet = NO_ERROR;
+                        else
+                            dwRet = GetLastError();
+                    }
+                    if (dwRet != NO_ERROR)
+                    {
+                        rcThread = RTErrConvertFromWin32(dwRet);
+                        LogRel(("HostSerial#%d: Read failed with error %Rrc; terminating the worker thread.\n", pDrvIns->iInstance, rcThread));
+                        break;
+                    }
                 }
                 cbRemaining = dwNumberOfBytesTransferred;