儲存庫 vbox 的更動 34288

時間撮記:

2010-11-23 下午04:02:26 (14 年 以前)

作者:

vboxsync

訊息:

Main/Keyboard: eliminate code duplication, handle keyboard queue overflow correctly and send only actually processed keycodes in the event

檔案:

• trunk/src/VBox/Main/KeyboardImpl.cpp (修改) (5 筆差異)

trunk/src/VBox/Main/KeyboardImpl.cpp

@@ -156 +156 @@
 STDMETHODIMP Keyboard::PutScancode(LONG scancode)
 {
-    HRESULT rc = S_OK;
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    CHECK_CONSOLE_DRV(mpDrv[0]);
-
-    PPDMIKEYBOARDPORT pUpPort = NULL;
-    for (int i = KEYBOARD_MAX_DEVICES - 1; i >= 0 ; --i)
-    {
-        if (mpDrv[i] && (mpDrv[i]->u32DevCaps & KEYBOARD_DEVCAP_ENABLED))
-        {
-            pUpPort = mpDrv[i]->pUpPort;
-            break;
-        }
-    }
-    /* No enabled keyboard - throw the input away. */
-    if (!pUpPort)
-        return rc;
-
-    int vrc = pUpPort->pfnPutEvent(pUpPort, (uint8_t)scancode);
-
-    if (RT_FAILURE(vrc))
-        rc = setError(VBOX_E_IPRT_ERROR,
-                      tr("Could not send scan code 0x%08X to the virtual keyboard (%Rrc)"),
-                      scancode, vrc);
-
-    VBoxEventDesc evDesc;
     com::SafeArray<LONG> scancodes(1);
     scancodes[0] = scancode;
-    evDesc.init(mEventSource, VBoxEventType_OnGuestKeyboardEvent, ComSafeArrayAsInParam(scancodes));
-    evDesc.fire(0);
-    return rc;
+    return PutScancodes(ComSafeArrayAsInParam(scancodes), NULL);
 }
 
@@ -206 +174 @@
                                     ULONG *codesStored)
 {
-    HRESULT rc = S_OK;
-
     if (ComSafeArrayInIsNull(scancodes))
         return E_INVALIDARG;
@@ -213 +179 @@
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    com::SafeArray<LONG> keys(ComSafeArrayInArg(scancodes));
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -232 +200 @@
     /* No enabled keyboard - throw the input away. */
     if (!pUpPort)
-        return rc;
-
-    com::SafeArray<LONG> keys(ComSafeArrayInArg(scancodes));
+    {
+        if (codesStored)
+            *codesStored = (uint32_t)keys.size();
+        return S_OK;
+    }
+
     int vrc = VINF_SUCCESS;
 
-    for (uint32_t i = 0; (i < keys.size()) && RT_SUCCESS(vrc); i++)
-        vrc = pUpPort->pfnPutEvent(pUpPort, (uint8_t)keys[i]);
+    uint32_t sent;
+    for (sent = 0; (sent < keys.size()) && RT_SUCCESS(vrc); sent++)
+        vrc = pUpPort->pfnPutEvent(pUpPort, (uint8_t)keys[sent]);
+
+    if (codesStored)
+        *codesStored = sent;
+
+    /* Only signal the keys in the event which have been actually sent. */
+    keys.resize(sent);
+    VBoxEventDesc evDesc;
+    evDesc.init(mEventSource, VBoxEventType_OnGuestKeyboardEvent, ComSafeArrayAsInParam(keys));
+    evDesc.fire(0);
 
     if (RT_FAILURE(vrc))
@@ -245 +226 @@
                         vrc);
 
-    /// @todo is it actually possible that not all scancodes can be transmitted?
-    if (codesStored)
-        *codesStored = (uint32_t)keys.size();
-
-    VBoxEventDesc evDesc;
-    evDesc.init(mEventSource, VBoxEventType_OnGuestKeyboardEvent, ComSafeArrayAsInParam(keys));
-    evDesc.fire(0);
-
-    return rc;
+    return S_OK;
 }