Changeset 89831 in vbox

Timestamp:

Jun 22, 2021 1:09:19 PM (4 years ago)

Author:

vboxsync

Message:

DrvMouseQueue,DrvKeyboardQueue: Don't keep items in the queue unless VERR_TRY_AGAIN is returns, as per documentation.

Location:

trunk/src/VBox/Devices/Input

Files:

• DrvKeyboardQueue.cpp (modified) (2 diffs)
• DrvMouseQueue.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Input/DrvKeyboardQueue.cpp

@@ -353 +353 @@
     PDRVKBDQUEUEITEM    pItem = (PDRVKBDQUEUEITEM)pItemCore;
     int rc = pThis->pUpPort->pfnPutEventHid(pThis->pUpPort, pItem->idUsage);
-    return RT_SUCCESS(rc);
+    return rc != VERR_TRY_AGAIN;
 }
 
@@ -508 +508 @@
     }
 
-    rc = PDMDrvHlpQueueCreate(pDrvIns, sizeof(DRVKBDQUEUEITEM), cItems, cMilliesInterval, drvKbdQueueConsumer, "Keyboard", &pDrv->pQueue);
+    rc = PDMDrvHlpQueueCreate(pDrvIns, sizeof(DRVKBDQUEUEITEM), cItems, cMilliesInterval,
+                              drvKbdQueueConsumer, "Keyboard", &pDrv->pQueue);
     if (RT_FAILURE(rc))
     {

trunk/src/VBox/Devices/Input/DrvMouseQueue.cpp

@@ -249 +249 @@
                                             pItem->u.Absolute.fButtons);
     else
-        return false;
-    return RT_SUCCESS(rc);
+        AssertMsgFailedReturn(("enmType=%d\n"), true /* remove buggy data */);
+    return rc != VERR_TRY_AGAIN;
 }
 
@@ -402 +402 @@
     }
 
-    rc = PDMDrvHlpQueueCreate(pDrvIns, sizeof(DRVMOUSEQUEUEITEM), cItems, cMilliesInterval, drvMouseQueueConsumer, "Mouse", &pDrv->pQueue);
+    rc = PDMDrvHlpQueueCreate(pDrvIns, sizeof(DRVMOUSEQUEUEITEM), cItems, cMilliesInterval,
+                              drvMouseQueueConsumer, "Mouse", &pDrv->pQueue);
     if (RT_FAILURE(rc))
     {