Changeset 85286 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Jul 12, 2020 11:08:50 PM (5 years ago)

Author:

vboxsync

Message:

Main: Refactored the generated event code implementation as Clang 11 claims va_start() on an VBoxEventType_T may trigger undefined behaviour due to type promotion (or something to that effect), but also because that variadict approach was horrible from the start. Refactored code as a dedicated factory method for each event, removing a dependency on VBoxEventDesc in veto cases. The fireXxxxEvent functions now return a HRESULT are no longer DECLINLINE (no need to compile all of them all the time). Reusable events got a ReinitXxxxxEvent function for helping with that. The VirtualBox::CallbackEvent stuff was a horrid misdesign from the start, it could've been done with a single class carrying a VBoxEventDesc member that the i_onXxxx methods would init() with all the event specific parameters and stuff. Refactored code passes a IEvent around, as that's even easier. I've left much of the old code in place for reference, but will remove once I've had a chance to test it a bit more (still struggling building VBox on the mac). bugref:9790

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImpl.cpp (modified) (1 diff)
• KeyboardImpl.cpp (modified) (2 diffs)
• MouseImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -7358 +7358 @@
     AssertComRCReturnRC(autoCaller.rc());
 
-    VBoxEventDesc evDesc;
+    ComPtr<IEvent> ptrEvent;
     if (aCheck)
     {
-        evDesc.init(mEventSource, VBoxEventType_OnCanShowWindow);
-        BOOL fDelivered = evDesc.fire(5000); /* Wait up to 5 secs for delivery */
-        //Assert(fDelivered);
-        if (fDelivered)
-        {
-            ComPtr<IEvent> pEvent;
-            evDesc.getEvent(pEvent.asOutParam());
-            // bit clumsy
-            ComPtr<ICanShowWindowEvent> pCanShowEvent = pEvent;
-            if (pCanShowEvent)
+        *aCanShow = TRUE;
+        HRESULT hrc = CreateCanShowWindowEvent(ptrEvent.asOutParam(), mEventSource);
+        if (SUCCEEDED(hrc))
+        {
+            VBoxEventDesc EvtDesc(ptrEvent, mEventSource);
+            BOOL fDelivered = EvtDesc.fire(5000); /* Wait up to 5 secs for delivery */
+            //Assert(fDelivered);
+            if (fDelivered)
             {
-                BOOL fVetoed = FALSE;
-                BOOL fApproved = FALSE;
-                pCanShowEvent->IsVetoed(&fVetoed);
-                pCanShowEvent->IsApproved(&fApproved);
-                *aCanShow = fApproved || !fVetoed;
+                // bit clumsy
+                ComPtr<ICanShowWindowEvent> ptrCanShowEvent = ptrEvent;
+                if (ptrCanShowEvent)
+                {
+                    BOOL fVetoed   = FALSE;
+                    BOOL fApproved = FALSE;
+                    ptrCanShowEvent->IsVetoed(&fVetoed);
+                    ptrCanShowEvent->IsApproved(&fApproved);
+                    *aCanShow = fApproved || !fVetoed;
+                }
+                else
+                    AssertFailed();
             }
-            else
+        }
+    }
+    else
+    {
+        HRESULT hrc = CreateShowWindowEvent(ptrEvent.asOutParam(), mEventSource, 0);
+        if (SUCCEEDED(hrc))
+        {
+            VBoxEventDesc EvtDesc(ptrEvent, mEventSource);
+            BOOL fDelivered = EvtDesc.fire(5000); /* Wait up to 5 secs for delivery */
+            //Assert(fDelivered);
+            if (fDelivered)
             {
-                AssertFailed();
-                *aCanShow = TRUE;
+                ComPtr<IShowWindowEvent> ptrShowEvent = ptrEvent;
+                if (ptrShowEvent)
+                {
+                    LONG64 idWindow = 0;
+                    ptrShowEvent->COMGETTER(WinId)(&idWindow);
+                    if (idWindow != 0 && *aWinId == 0)
+                        *aWinId = idWindow;
+                }
+                else
+                    AssertFailed();
             }
-        }
-        else
-            *aCanShow = TRUE;
-    }
-    else
-    {
-        evDesc.init(mEventSource, VBoxEventType_OnShowWindow, INT64_C(0));
-        BOOL fDelivered = evDesc.fire(5000); /* Wait up to 5 secs for delivery */
-        //Assert(fDelivered);
-        if (fDelivered)
-        {
-            ComPtr<IEvent> pEvent;
-            evDesc.getEvent(pEvent.asOutParam());
-            ComPtr<IShowWindowEvent> pShowEvent = pEvent;
-            if (pShowEvent)
-            {
-                LONG64 iEvWinId = 0;
-                pShowEvent->COMGETTER(WinId)(&iEvWinId);
-                if (iEvWinId != 0 && *aWinId == 0)
-                    *aWinId = iEvWinId;
-            }
-            else
-                AssertFailed();
         }
     }

trunk/src/VBox/Main/src-client/KeyboardImpl.cpp

@@ -23 +23 @@
 
 #include "AutoCaller.h"
+#include "VBoxEvents.h"
 
 #include <VBox/com/array.h>
@@ -212 +213 @@
         keys[i] = aScancodes[i];
 
-    VBoxEventDesc evDesc;
-    evDesc.init(mEventSource, VBoxEventType_OnGuestKeyboard, ComSafeArrayAsInParam(keys));
-    evDesc.fire(0);
+    fireGuestKeyboardEvent(mEventSource, ComSafeArrayAsInParam(keys));
 
     if (RT_FAILURE(vrc))

trunk/src/VBox/Main/src-client/MouseImpl.cpp

@@ -25 +25 @@
 #include "VMMDev.h"
 #include "MousePointerShapeWrap.h"
+#include "VBoxEvents.h"
 
 #include <VBox/vmm/pdmdrv.h>
@@ -266 +267 @@
     HRESULT rc = mEventSource->init();
     AssertComRCReturnRC(rc);
-    mMouseEvent.init(mEventSource, VBoxEventType_OnGuestMouse,
-                     0, 0, 0, 0, 0, 0);
+
+    ComPtr<IEvent> ptrEvent;
+    rc = CreateGuestMouseEvent(ptrEvent.asOutParam(), mEventSource,
+                               (GuestMouseEventMode_T)0, 0 /*x*/, 0 /*y*/, 0 /*z*/, 0 /*w*/, 0 /*buttons*/);
+    AssertComRCReturnRC(rc);
+    mMouseEvent.init(ptrEvent, mEventSource);
 
     /* Confirm a successful initialization */
@@ -688 +693 @@
 
     if (fButtons != 0)
-    {
-        VBoxEventDesc evDesc;
-        evDesc.init(mEventSource, VBoxEventType_OnGuestMouse, mode, x, y,
-                    dz, dw, fButtons);
-        evDesc.fire(0);
-    }
+        fireGuestMouseEvent(mEventSource, mode, x, y, dz, dw, fButtons);
     else
     {
-        mMouseEvent.reinit(VBoxEventType_OnGuestMouse, mode, x, y, dz, dw,
-                           fButtons);
+        ComPtr<IEvent> ptrEvent;
+        mMouseEvent.getEvent(ptrEvent.asOutParam());
+        ReinitGuestMouseEvent(ptrEvent, mode, x, y, dz, dw, fButtons);
         mMouseEvent.fire(0);
     }
@@ -722 +723 @@
     }
 
-    VBoxEventDesc evDesc;
-    evDesc.init(mEventSource, VBoxEventType_OnGuestMultiTouch,
-                cContacts, ComSafeArrayAsInParam(xPositions), ComSafeArrayAsInParam(yPositions),
-                ComSafeArrayAsInParam(contactIds), ComSafeArrayAsInParam(contactFlags), u32ScanTime);
-    evDesc.fire(0);
+    fireGuestMultiTouchEvent(mEventSource, cContacts, ComSafeArrayAsInParam(xPositions), ComSafeArrayAsInParam(yPositions),
+                             ComSafeArrayAsInParam(contactIds), ComSafeArrayAsInParam(contactFlags), u32ScanTime);
 }