Changeset 63899 in vbox

Timestamp:

Sep 19, 2016 4:58:04 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:7846: Runtime UI: Fixing regression of r110260 where the keyboard code-flow was simplified to omit the machine-view (if possible) while required separate UI workaround was forgotten in machine-view.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIKeyboardHandler.cpp (modified) (1 diff)
• UIMachineView.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp

@@ -1215 +1215 @@
         case WM_SYSKEYUP:
         {
+            // WORKAROUND:
+            // Can't do COM inter-process calls from a SendMessage handler,
+            // see http://support.microsoft.com/kb/131056.
+            if (vboxGlobal().isSeparateProcess() && InSendMessage())
+            {
+                PostMessage(pMsg->hwnd, pMsg->message, pMsg->wParam, pMsg->lParam);
+                fResult = true;
+                break;
+            }
+
             /* Check for our own special flag to ignore this event.
              * That flag could only be set later in this function

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -1978 +1978 @@
         {
             // WORKAROUND:
-            // Can't do COM inter-process calls from a SendMessage handler,
-            // see http://support.microsoft.com/kb/131056.
-            if (vboxGlobal().isSeparateProcess() && InSendMessage())
-            {
-                PostMessage(pEvent->hwnd, pEvent->message, pEvent->wParam, pEvent->lParam);
-                return true;
-            }
-
-            // WORKAROUND:
             // There is an issue in the Windows Qt5 event processing sequence
             // causing QAbstractNativeEventFilter to receive Windows native events