Changeset 50764 in vbox for trunk/src

Timestamp:

Mar 13, 2014 10:17:19 AM (11 years ago)

Author:

vboxsync

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

92778

Message:

Main/GuestCtrl: Try to fix testsuite session environment tests.

Location:

trunk/src/VBox/Main

Files:

• include/GuestSessionImpl.h (modified) (2 diffs)
• src-client/GuestSessionImpl.cpp (modified) (3 diffs)

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

@@ -259 +259 @@
 private:
 
-    // Wrapped GuuestSession Properties
+    // Wrapped GuestSession Properties
     HRESULT getUser(com::Utf8Str &aUser);
     HRESULT getDomain(com::Utf8Str &aDomain);
@@ -275 +275 @@
     HRESULT getEventSource(ComPtr<IEventSource> &aEventSource);
 
-    // Wrapped GuuestSession Methods
+    // Wrapped GuestSession Methods
     HRESULT close();
     HRESULT copyFrom(const com::Utf8Str &aSource,

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

@@ -472 +472 @@
 
     size_t cEnvVars = mData.mEnvironment.Size();
+    aEnvironment.resize(cEnvVars);
+
     LogFlowThisFunc(("[%s]: cEnvVars=%RU32\n",
                      mData.mSession.mName.c_str(), cEnvVars));
@@ -511 +513 @@
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
     aProcesses.resize(mData.mProcesses.size());
     size_t i = 0;
-    for(SessionProcesses::iterator it = mData.mProcesses.begin(); it != mData.mProcesses.end(); ++it, ++i)
+    for(SessionProcesses::iterator it  = mData.mProcesses.begin();
+                                   it != mData.mProcesses.end();
+                                   ++it, ++i)
+    {
         it->second.queryInterfaceTo(aProcesses[i].asOutParam());
+    }
 
     LogFlowFunc(("mProcesses=%zu\n", aProcesses.size()));
@@ -529 +536 @@
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
     aDirectories.resize(mData.mDirectories.size());
     size_t i = 0;
-    for(SessionDirectories::iterator it = mData.mDirectories.begin(); it != mData.mDirectories.end(); ++it, ++i)
+    for(SessionDirectories::iterator it  = mData.mDirectories.begin();
+                                     it != mData.mDirectories.end();
+                                     ++it, ++i)
+    {
         it->second.queryInterfaceTo(aDirectories[i].asOutParam());
+    }
 
     LogFlowFunc(("mDirectories=%zu\n", aDirectories.size()));