Changeset 86058 in vbox for trunk/src

Timestamp:

Sep 7, 2020 11:33:30 PM (4 years ago)

Author:

vboxsync

Message:

Main/ExtPack: belatedly bump VBOXEXTPACKHLP_VERSION for the event
creation callback. While here, as a fore/after-thought add another,
so far not used, callback for creation of IVetoEvent.

Location:

trunk/src/VBox/Main

Files:

• include/ExtPackManagerImpl.h (modified) (1 diff)
• src-all/ExtPackManagerImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/include/ExtPackManagerImpl.h

@@ -178 +178 @@
                                                    /* VBoxEventType_T */ uint32_t aType, bool aWaitable,
                                                    VBOXEXTPACK_IF_CS(IEvent) **ppEventOut);
+    static DECLCALLBACK(uint32_t) i_hlpCreateVetoEvent(PCVBOXEXTPACKHLP pHlp,
+                                                       VBOXEXTPACK_IF_CS(IEventSource) *aSource,
+                                                       /* VBoxEventType_T */ uint32_t aType,
+                                                       VBOXEXTPACK_IF_CS(IVetoEvent) **ppEventOut);
     static DECLCALLBACK(int)    i_hlpReservedN(PCVBOXEXTPACKHLP pHlp);
     /** @}  */

trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp

@@ -757 +757 @@
         /* pfnCompleteProgress  = */ ExtPack::i_hlpCompleteProgress,
         /* pfnCreateEvent       = */ ExtPack::i_hlpCreateEvent,
+        /* pfnCreateVetoEvent   = */ ExtPack::i_hlpCreateVetoEvent,
         /* pfnReserved1         = */ ExtPack::i_hlpReservedN,
         /* pfnReserved2         = */ ExtPack::i_hlpReservedN,
@@ -1943 +1944 @@
     /* default aSource to pVirtualBox? */
     hrc = pEvent->init(aSource, static_cast<VBoxEventType_T>(aType), aWaitable);
+    if (FAILED(hrc))
+        return hrc;
+
+    return pEvent.queryInterfaceTo(ppEventOut);
+}
+
+
+/*static*/ DECLCALLBACK(uint32_t)
+ExtPack::i_hlpCreateVetoEvent(PCVBOXEXTPACKHLP pHlp,
+                              VBOXEXTPACK_IF_CS(IEventSource) *aSource,
+                              /* VBoxEventType_T */ uint32_t aType,
+                              VBOXEXTPACK_IF_CS(IVetoEvent) **ppEventOut)
+{
+    HRESULT hrc;
+
+    AssertPtrReturn(pHlp, (uint32_t)E_INVALIDARG);
+    AssertReturn(pHlp->u32Version == VBOXEXTPACKHLP_VERSION, (uint32_t)E_INVALIDARG);
+    AssertPtrReturn(ppEventOut, (uint32_t)E_INVALIDARG);
+
+    ComObjPtr<VBoxVetoEvent> pEvent;
+
+    hrc = pEvent.createObject();
+    if (FAILED(hrc))
+        return hrc;
+
+    /* default aSource to pVirtualBox? */
+    hrc = pEvent->init(aSource, static_cast<VBoxEventType_T>(aType));
     if (FAILED(hrc))
         return hrc;