Changeset 94730 in vbox for trunk

Timestamp:

Apr 28, 2022 8:51:13 AM (3 years ago)

Author:

vboxsync

Message:

Main/Update check: Added the agent COM object to the IUpdateAgentEvent base class (abstract), to identify the signalling agent. This is needed because FE/Qt works a bit differently with regards to event handling / proxying, e.g. it does not use global event sources other than IVirtualBox / IVirtualBoxClient. bugref:7983

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (1 diff)
• src-server/UpdateAgentImpl.cpp (modified) (4 diffs)

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

@@ -28316 +28316 @@
   <interface
     name="IUpdateAgentEvent" extends="IEvent"
-    uuid="0e33366a-670e-4e1f-9ddc-41c8a346cafd"
+    uuid="ff58a51d-54a1-411c-93e9-3047eb4dcd21"
     wsmap="managed">
     <desc>
       Abstract base interface for update agent events.
     </desc>
-    <attribute name="midlDoesNotLikeEmptyInterfaces" readonly="yes" type="boolean"/>
+    <attribute name="agent" readonly="yes" type="IUpdateAgent">
+      <desc>Update agent this event belongs to.</desc>
+    </attribute>
   </interface>
 

trunk/src/VBox/Main/src-server/UpdateAgentImpl.cpp

@@ -725 +725 @@
     aLock.release();
 
-    ::FireUpdateAgentSettingsChangedEvent(m_EventSource, "" /** @todo Include attribute hints */);
+    ::FireUpdateAgentSettingsChangedEvent(m_EventSource, this, "" /** @todo Include attribute hints */);
 
     AutoWriteLock vboxLock(m_VirtualBox COMMA_LOCKVAL_SRC_POS);
@@ -758 +758 @@
     LogRel(("Update agent (%s): %s\n", mData.m_strName.c_str(), strMsg.c_str()));
 
-    ::FireUpdateAgentErrorEvent(m_EventSource, strMsg.c_str(), vrc);
+    ::FireUpdateAgentErrorEvent(m_EventSource, this, strMsg.c_str(), vrc);
 
     return setErrorBoth(VBOX_E_IPRT_ERROR, vrc, strMsg.c_str());
@@ -1045 +1045 @@
         alock.release(); /* Release lock before firing off event. */
 
-        ::FireUpdateAgentStateChangedEvent(m_EventSource, UpdateState_NotAvailable);
+        ::FireUpdateAgentStateChangedEvent(m_EventSource, this, UpdateState_NotAvailable);
     }
     else
@@ -1072 +1072 @@
                 alock.release(); /* Release lock before firing off events. */
 
-                ::FireUpdateAgentStateChangedEvent(m_EventSource, UpdateState_Available);
-                ::FireUpdateAgentAvailableEvent(m_EventSource, mData.m_lastResult.strVer, m->enmChannel,
+                ::FireUpdateAgentStateChangedEvent(m_EventSource, this, UpdateState_Available);
+                ::FireUpdateAgentAvailableEvent(m_EventSource, this, mData.m_lastResult.strVer, m->enmChannel,
                                                 mData.m_lastResult.enmSeverity, mData.m_lastResult.strDownloadUrl,
                                                 mData.m_lastResult.strWebUrl, mData.m_lastResult.strReleaseNotes);