Changeset 31219 in vbox

Timestamp:

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

Author:

vboxsync

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

64227

Message:

Backed out r64225 for now.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/VBoxVMInformationDlg.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (modified) (1 diff)
• Main/GuestImpl.cpp (modified) (7 diffs)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/GuestImpl.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -1945 +1945 @@
             if (details == VMINFO_FULL)
             {
-                rc = guest->COMGETTER(AdditionsVBoxVersion)(guestString.asOutParam());
+                rc = guest->COMGETTER(AdditionsVersion)(guestString.asOutParam());
                 if (   SUCCEEDED(rc)
                     && !guestString.isEmpty())

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMInformationDlg.cpp

@@ -472 +472 @@
         if (!addVersion.isEmpty() && !addRevision.isEmpty())
         {
-            QString addInfo = console.GetGuest().GetAdditionsVBoxVersion();
+            QString addInfo = console.GetGuest().GetAdditionsVersion();
             addVersionStr = (addInfo.isEmpty() ? "(" : "")
                           + addVersion

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -828 +828 @@
     if (!fIsAdditionsActive)
         return;
-    /* Check the Guest Additions interface version and warn the user about possible compatibility issues in case if the installed version is outdated. */
+    /* Check the Guest Additions version and warn the user about possible compatibility issues in case if the installed version is outdated. */
     CGuest guest = session().GetConsole().GetGuest();
-    QString strVersion = guest.GetAdditionsInterfaceVersion();
+    QString strVersion = guest.GetAdditionsVersion();
     uint uVersion = strVersion.toUInt();
     /** @todo r=bird: This isn't want we want! We want the VirtualBox version of the additions, all three numbers. See @bugref{4084}.*/

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);

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

@@ -7729 +7729 @@
   <interface
      name="IGuest" extends="$unknown"
-     uuid="a3f4b219-ae2a-464c-b488-36cd8ac06b79"
+     uuid="d915dff1-ed38-495a-91f1-ab6c53932468"
      wsmap="managed"
      >
@@ -7764 +7764 @@
     </attribute>
 
-    <attribute name="additionsVBoxVersion" type="wstring" readonly="yes">
-      <desc>
-        Version of the installed Guest Additions package (3 decimal numbers
-        separated by dots) or empty when the Additions are not installed. The
-        Additions may also report a version but yet not be active as the version
-        might be refused by VirtualBox (incompatible) or other failures
-        occurred.
-      </desc>
-    </attribute>
-
-    <attribute name="additionsInterfaceVersion" type="wstring" readonly="yes">
-      <desc>
-        Version of the Guest Additions interface (2 decimal numbers separated by
-        a dot) or empty when the Additions are not installed. The Additions may
-        also report a version but yet not be active as the version might be
-        refused by VirtualBox (incompatible) or other failures occurred.
+    <attribute name="additionsVersion" type="wstring" readonly="yes">
+      <desc>
+        Version of the Guest Additions (3 decimal numbers separated
+        by dots) or empty when the Additions are not installed. The
+        Additions may also report a version but yet not be active as
+        the version might be refused by VirtualBox (incompatible) or
+        other failures occurred.
       </desc>
     </attribute>

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

@@ -80 +80 @@
 #endif
     STDMETHOD(COMGETTER(AdditionsActive)) (BOOL *aAdditionsActive);
-    STDMETHOD(COMGETTER(AdditionsInterfaceVersion)) (BSTR *aVersion);
-    STDMETHOD(COMGETTER(AdditionsVBoxVersion)) (BSTR *aVersion);
+#if 0
+    /** @todo Will replace AdditionsVersion to be more clear. */
+    STDMETHOD(COMGETTER(AdditionsAPIVersion)) (BSTR *aAdditionsVersion);
+#endif
+    STDMETHOD(COMGETTER(AdditionsVersion)) (BSTR *aAdditionsVersion);
     /** @todo Remove */
     STDMETHOD(COMGETTER(SupportsSeamless)) (BOOL *aSupportsSeamless);
@@ -172 +175 @@
         BOOL  mAdditionsActive;
         Bstr  mAdditionsVersion;
-        Bstr  mInterfaceVersion;
         BOOL  mSupportsSeamless;
         BOOL  mSupportsGraphics;