儲存庫 vbox 的更動 86057

時間撮記:

2020-9-7 下午11:15:45 (5 年 以前)

作者:

vboxsync

svn:sync-xref-src-repo-rev:

140271

訊息:

OCI: Add ICloudProfileRegisteredEvent and its implementation for OCI.
The events should be autogenerated a-la VBoxEvents, but the first one
is manual to test what we need to generate.

位置:

trunk

檔案:

• include/VBox/ExtPack/ExtPack.h (修改) (2 筆差異)
• include/VBox/log.h (修改) (2 筆差異)
• src/VBox/Main/idl/VirtualBox.xidl (修改) (2 筆差異)
• src/VBox/Main/include/ExtPackManagerImpl.h (修改) (1 筆差異)
• src/VBox/Main/src-all/ExtPackManagerImpl.cpp (修改) (2 筆差異)

trunk/include/VBox/ExtPack/ExtPack.h

@@ -47 +47 @@
 VBOXEXTPACK_IF_CS(IVirtualBox);
 VBOXEXTPACK_IF_CS(IProgress);
+VBOXEXTPACK_IF_CS(IEvent);
+VBOXEXTPACK_IF_CS(IEventSource);
 
 /**
@@ -313 +315 @@
                                                         uint32_t uResultCode));
 
+
+    DECLR3CALLBACKMEMBER(uint32_t, pfnCreateEvent,(PCVBOXEXTPACKHLP pHlp,
+                                                   VBOXEXTPACK_IF_CS(IEventSource) *aSource,
+                                                   /* VBoxEventType_T */ uint32_t aType, bool aWaitable,
+                                                   VBOXEXTPACK_IF_CS(IEvent) **ppEventOut));
+
     DECLR3CALLBACKMEMBER(int, pfnReserved1,(PCVBOXEXTPACKHLP pHlp)); /**< Reserved for minor structure revisions. */
     DECLR3CALLBACKMEMBER(int, pfnReserved2,(PCVBOXEXTPACKHLP pHlp)); /**< Reserved for minor structure revisions. */

trunk/include/VBox/log.h

@@ -381 +381 @@
     /** Main group, ICloudProviderManager. */
     LOG_GROUP_MAIN_CLOUDPROVIDERMANAGER,
-    /** Main group, ICloudProviderRegisteredEvent. */
-    LOG_GROUP_MAIN_CLOUDPROVIDERREGISTEREDEVENT,
+    /** Main group, ICloudProfileRegisteredEvent. */
+    LOG_GROUP_MAIN_CLOUDPROFILEREGISTEREDEVENT,
     /** Main group, IConsole. */
     LOG_GROUP_MAIN_CONSOLE,
@@ -943 +943 @@
     "MAIN_CLOUDPROVIDER", \
     "MAIN_CLOUDPROVIDERMANAGER", \
-    "MAIN_CLOUDPROVIDERREGISTEREDEVENT", \
+    "MAIN_CLOUDPROFILEREGISTEREDEVENT",   \
     "MAIN_CONSOLE", \
     "MAIN_CPUPROFILE", \

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -24901 +24901 @@
       </desc>
     </const>
+    <const name="OnCloudProfileRegistered" value="106">
+      <desc>
+        See <link to="ICloudProfileRegisteredEvent"/>.
+      </desc>
+    </const>
+    <const name="OnCloudProfileChanged" value="107">
+      <desc>
+        See <link to="ICloudProfileChangedEvent"/>.
+      </desc>
+    </const>
     <!-- End event marker -->
     <!-- @todo rename to 'End' as it is exclusive (we use 'last' to be inclusive). -->
-    <const name="Last" value="106">
+    <const name="Last" value="108">
       <desc>
         Must be last event, used for iterations and structures relying on numerical event values.
@@ -28248 +28258 @@
     id="OnCloudProviderRegistered" waitable="yes"
     >
-    <!-- should be in ICloudProviderEvent if we ever have one -->
     <attribute name="id" type="uuid" mod="string" readonly="yes"/>
-
+    <attribute name="registered" type="boolean" readonly="yes"/>
+  </interface>
+
+  <interface name="ICloudProfileRegisteredEvent" extends="IEvent"
+    uuid="6a5e65ba-eeb9-11ea-ae38-73242bc0f172"
+    wsmap="managed"
+    id="OnCloudProfileRegistered" waitable="yes"
+    >
+    <attribute name="providerId" type="uuid" mod="string" readonly="yes"/>
+    <attribute name="name" type="wstring" readonly="yes"/>
     <attribute name="registered" type="boolean" readonly="yes"/>
   </interface>

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

@@ -174 +174 @@
     static DECLCALLBACK(uint32_t) i_hlpCompleteProgress(PCVBOXEXTPACKHLP pHlp, VBOXEXTPACK_IF_CS(IProgress) *pProgress,
                                                         uint32_t uResultCode);
+    static DECLCALLBACK(uint32_t) i_hlpCreateEvent(PCVBOXEXTPACKHLP pHlp,
+                                                   VBOXEXTPACK_IF_CS(IEventSource) *aSource,
+                                                   /* VBoxEventType_T */ uint32_t aType, bool aWaitable,
+                                                   VBOXEXTPACK_IF_CS(IEvent) **ppEventOut);
     static DECLCALLBACK(int)    i_hlpReservedN(PCVBOXEXTPACKHLP pHlp);
     /** @}  */

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

@@ -756 +756 @@
         /* pfnWaitOtherProgress = */ ExtPack::i_hlpWaitOtherProgress,
         /* pfnCompleteProgress  = */ ExtPack::i_hlpCompleteProgress,
+        /* pfnCreateEvent       = */ ExtPack::i_hlpCreateEvent,
         /* pfnReserved1         = */ ExtPack::i_hlpReservedN,
         /* pfnReserved2         = */ ExtPack::i_hlpReservedN,
@@ -1920 +1921 @@
     return pProgressControl->NotifyComplete((LONG)uResultCode, errorInfo);
 }
+
+
+/*static*/ DECLCALLBACK(uint32_t)
+ExtPack::i_hlpCreateEvent(PCVBOXEXTPACKHLP pHlp,
+                          VBOXEXTPACK_IF_CS(IEventSource) *aSource,
+                          /* VBoxEventType_T */ uint32_t aType, bool aWaitable,
+                          VBOXEXTPACK_IF_CS(IEvent) **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<VBoxEvent> pEvent;
+
+    hrc = pEvent.createObject();
+    if (FAILED(hrc))
+        return hrc;
+
+    /* 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(int)