Changeset 55523 in vbox

Timestamp:

Apr 29, 2015 2:33:39 PM (10 years ago)

Author:

vboxsync

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

99882

Message:

Main: extend IVetoEvent interface to support approvals too.

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (2 diffs)
• idl/comimpl.xsl (modified) (1 diff)
• include/EventImpl.h (modified) (1 diff)
• src-all/EventImpl.cpp (modified) (4 diffs)

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

@@ -22055 +22055 @@
   <interface
     name="IVetoEvent" extends="IEvent"
-    uuid="9a1a4130-69fe-472f-ac10-c6fa25d75007"
+    uuid="7c5e945f-2354-4267-883f-2f417d216519"
     wsmap="managed"
     >
@@ -22089 +22089 @@
         <desc>
           Array of reasons for veto provided by different event handlers.
+        </desc>
+      </param>
+    </method>
+
+    <method name="addApproval">
+      <desc>
+        Adds an approval on this event.
+      </desc>
+      <param name="reason" type="wstring" dir="in">
+        <desc>
+          Reason for approval, could be null or empty string.
+        </desc>
+      </param>
+    </method>
+
+    <method name="isApproved">
+      <desc>
+        If this event was approved.
+      </desc>
+      <param name="result" type="boolean" dir="return" />
+    </method>
+
+    <method name="getApprovals">
+      <desc>
+        Current approval reason list, if size is 0 - no approvals.
+      </desc>
+      <param name="result" type="wstring" dir="return" safearray="yes">
+        <desc>
+          Array of reasons for approval provided by different event handlers.
         </desc>
       </param>

trunk/src/VBox/Main/idl/comimpl.xsl

@@ -556 +556 @@
        return mEvent->GetVetos(ComSafeArrayOutArg(aVetos));
     }
+    STDMETHOD(AddApproval)(IN_BSTR aReason)
+    {
+        return mEvent->AddApproval(aReason);
+    }
+    STDMETHOD(IsApproved)(BOOL *aResult)
+    {
+       return mEvent->IsApproved(aResult);
+    }
+    STDMETHOD(GetApprovals)(ComSafeArrayOut(BSTR, aReasons))
+    {
+       return mEvent->GetApprovals(ComSafeArrayOutArg(aReasons));
+    }
 private:
     ComObjPtr<VBoxVetoEvent>      mEvent;

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

@@ -79 +79 @@
     HRESULT isVetoed(BOOL *aResult);
     HRESULT getVetos(std::vector<com::Utf8Str> &aResult);
+    HRESULT addApproval(const com::Utf8Str &aReason);
+    HRESULT isApproved(BOOL *aResult);
+    HRESULT getApprovals(std::vector<com::Utf8Str> &aResult);
 
     struct Data;

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

@@ -228 +228 @@
 
 typedef std::list<Utf8Str> VetoList;
+typedef std::list<Utf8Str> ApprovalList;
 struct VBoxVetoEvent::Data
 {
@@ -236 +237 @@
     BOOL                    mVetoed;
     VetoList                mVetoList;
+    ApprovalList            mApprovalList;
 };
 
@@ -272 +274 @@
     m->mVetoed = FALSE;
     m->mVetoList.clear();
+    m->mApprovalList.clear();
 
     /* Confirm a successful initialization */
@@ -350 +353 @@
     return S_OK;
 
+}
+
+HRESULT VBoxVetoEvent::addApproval(const com::Utf8Str &aReason)
+{
+    // AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    m->mApprovalList.push_back(aReason);
+    return S_OK;
+}
+
+HRESULT VBoxVetoEvent::isApproved(BOOL *aResult)
+{
+    // AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    *aResult = !m->mApprovalList.empty();
+    return S_OK;
+}
+
+HRESULT VBoxVetoEvent::getApprovals(std::vector<com::Utf8Str> &aResult)
+{
+    // AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    aResult.resize(m->mApprovalList.size());
+    size_t i = 0;
+    for (ApprovalList::const_iterator it = m->mApprovalList.begin(); it != m->mApprovalList.end(); ++it, ++i)
+        aResult[i] = (*it);
+    return S_OK;
 }