Changeset 42546 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 2, 2012 2:45:37 PM (13 years ago)

Author:

vboxsync

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

79722

Message:

Guest Control 2.0: Update.

Location:

trunk/src/VBox/Main

Files:

• include/GuestSessionImpl.h (modified) (1 diff)
• src-client/GuestCtrlImpl.cpp (modified) (1 diff)
• src-client/GuestSessionImpl.cpp (modified) (1 diff)

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

@@ -131 +131 @@
     const GuestCredentials &getCredentials(void);
     const GuestEnvironment &getEnvironment(void);
+    Utf8Str                 getName(void);
     uint32_t                getProtocolVersion(void) { return mData.mProtocolVersion; }
     int                     processClose(ComObjPtr<GuestProcess> pProcess);

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

@@ -2844 +2844 @@
 STDMETHODIMP Guest::FindSession(IN_BSTR aSessionName, ComSafeArrayOut(IGuestSession *, aSessions))
 {
+#ifndef VBOX_WITH_GUEST_CONTROL
     ReturnComNotImplemented();
-}
-
+#else /* VBOX_WITH_GUEST_CONTROL */
+
+    CheckComArgOutSafeArrayPointerValid(aSessions);
+
+    LogFlowFuncEnter();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    Utf8Str strName(aSessionName);
+    std::list < ComObjPtr<GuestSession> > listSessions;
+
+    GuestSessions::const_iterator itSessions = mData.mGuestSessions.begin();
+    while (itSessions != mData.mGuestSessions.end())
+    {
+        if (strName.equals(itSessions->second->getName()))
+            listSessions.push_back(itSessions->second);
+        itSessions++;
+    }
+
+    LogFlowFunc(("Sessions with \"%ls\" = %RU32\n",
+                 aSessionName, listSessions.size()));
+
+    if (listSessions.size())
+    {
+        SafeIfaceArray<IGuestSession> sessionIfacs(listSessions);
+        sessionIfacs.detachTo(ComSafeArrayOutArg(aSessions));
+
+        return S_OK;
+    }
+
+    return setErrorNoLog(VBOX_E_OBJECT_NOT_FOUND,
+                         tr("Could not find sessions with name '%ls'"),
+                         aSessionName);
+#endif /* VBOX_WITH_GUEST_CONTROL */
+}
+

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

@@ -596 +596 @@
 }
 
+Utf8Str GuestSession::getName(void)
+{
+    return mData.mName;
+}
+
 int GuestSession::processClose(ComObjPtr<GuestProcess> pProcess)
 {