Changeset 52085 in vbox

Timestamp:

Jul 17, 2014 7:26:24 PM (11 years ago)

Author:

vboxsync

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

95091

Message:

6813 - GuestImpl using COM Wrappers - bug fixes

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestCtrlImpl.cpp (modified) (2 diffs)
• GuestImpl.cpp (modified) (1 diff)

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

@@ -127 +127 @@
             fFlags |= aFlags[i];
 
-    com::SafeArray<AdditionsUpdateFlag_T> aaFlags;
-    aaFlags.resize(aFlags.size());
-    for (size_t i = 0; i < aFlags.size(); ++i)
-        aaFlags[i] = aFlags[i];
-
     if (fFlags && !(fFlags & AdditionsUpdateFlag_WaitForUpdateStartOnly))
-        return setError(E_INVALIDARG, tr("Unknown flags (%#x)"), aaFlags);
+        return setError(E_INVALIDARG, tr("Unknown flags (%#x)"), fFlags);
 
     int rc = VINF_SUCCESS;
@@ -562 +557 @@
                  aSessionName.c_str(), listSessions.size()));
 
+    aSessions.resize(listSessions.size());
     if (listSessions.size())
     {
-        aSessions.resize(listSessions.size());
         size_t i = 0;
         for (std::list < ComObjPtr<GuestSession> >::const_iterator it = listSessions.begin(); it != listSessions.end(); ++it, ++i)

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

@@ -926 +926 @@
     if (a_uFullVersion)
     {
-        mData.mAdditionsVersionNew  = Utf8Str(BstrFmt(*a_pszName ? "%u.%u.%u_%s" : "%u.%u.%u",
-                                              VBOX_FULL_VERSION_GET_MAJOR(a_uFullVersion),
-                                              VBOX_FULL_VERSION_GET_MINOR(a_uFullVersion),
-                                              VBOX_FULL_VERSION_GET_BUILD(a_uFullVersion),
-                                              a_pszName));
+        mData.mAdditionsVersionNew  = Utf8StrFmt(*a_pszName ? "%u.%u.%u_%s" : "%u.%u.%u",
+                                                 VBOX_FULL_VERSION_GET_MAJOR(a_uFullVersion),
+                                                 VBOX_FULL_VERSION_GET_MINOR(a_uFullVersion),
+                                                 VBOX_FULL_VERSION_GET_BUILD(a_uFullVersion),
+                                                 a_pszName);
         mData.mAdditionsVersionFull = a_uFullVersion;
         mData.mAdditionsRevision    = a_uRevision;