Changeset 31219 in vbox for trunk/src/VBox/Main/GuestImpl.cpp

Timestamp:

Jul 29, 2010 3:16:51 PM (14 years ago)

Author:

vboxsync

Message:

Backed out r64225 for now.

File:

• trunk/src/VBox/Main/GuestImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Main/GuestImpl.cpp

@@ -176 +176 @@
 }
 
-STDMETHODIMP Guest::COMGETTER(AdditionsInterfaceVersion) (BSTR *aVersion)
-{
-    CheckComArgOutPointerValid(aVersion);
+STDMETHODIMP Guest::COMGETTER(AdditionsVersion) (BSTR *aAdditionsVersion)
+{
+    CheckComArgOutPointerValid(aAdditionsVersion);
 
     AutoCaller autoCaller(this);
@@ -185 +185 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    mData.mInterfaceVersion.cloneTo(aVersion);
-
-    return S_OK;
-}
-
-STDMETHODIMP Guest::COMGETTER(AdditionsVBoxVersion) (BSTR *aVersion)
-{
-    CheckComArgOutPointerValid(aVersion);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    mData.mAdditionsVersion.cloneTo(aVersion);
+    mData.mAdditionsVersion.cloneTo(aAdditionsVersion);
 
     return S_OK;
@@ -1457 +1443 @@
  * API version and OS type.
  *
- * @param aInterfaceVersion
+ * @param aVersion
  * @param aOsType
  */
-void Guest::setAdditionsInfo(Bstr aInterfaceVersion, VBOXOSTYPE aOsType)
+void Guest::setAdditionsInfo(Bstr aVersion, VBOXOSTYPE aOsType)
 {
     AutoCaller autoCaller(this);
@@ -1471 +1457 @@
      * Note that this is *not* the actual Guest Additions version and may differ!
      */
-    mData.mInterfaceVersion = aInterfaceVersion;
+    mData.mAdditionsVersion = aVersion;
     /*
      * Older Additions rely on the Additions API version whether they
@@ -1477 +1463 @@
      * this immediately.
      */
-    mData.mAdditionsActive = !aInterfaceVersion.isEmpty();
+    mData.mAdditionsActive = !aVersion.isEmpty();
     /*
      * Older Additions didn't have this finer grained capability bit,
@@ -1501 +1487 @@
  * @param ulFlags
  */
-void Guest::setAdditionsStatus(VBoxGuestStatusFacility Facility, VBoxGuestStatusCurrent Status, ULONG ulFlags)
+void Guest::setAdditionsStatus (VBoxGuestStatusFacility Facility, VBoxGuestStatusCurrent Status, ULONG ulFlags)
 {
     AutoCaller autoCaller(this);
@@ -1521 +1507 @@
  * @param ulActive
  */
-void Guest::setSupportedFeatures(ULONG64 ulCaps, ULONG64 ulActive)
+void Guest::setSupportedFeatures (ULONG64 ulCaps, ULONG64 ulActive)
 {
     AutoCaller autoCaller(this);