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

Timestamp:

Aug 10, 2012 9:33:34 AM (12 years ago)

Author:

vboxsync

Message:

Main/VirtualBox: add new method for querying normalized version (numeric version plus prerelease tag, but without publisher)
Main/SystemProperties: add new attribute for getting the default additions iso (setter is not implemented as the saving of the value is missing)
Frontends/VirtualBox: adjust accordingly
Frontends/VBoxManage: show the default additions iso name, and move the listing of most information into separate functions to make the code easier to read.

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (4 diffs)
• include/SystemPropertiesImpl.h (modified) (4 diffs)
• include/VirtualBoxImpl.h (modified) (4 diffs)
• src-server/SystemPropertiesImpl.cpp (modified) (4 diffs)
• src-server/VirtualBoxImpl.cpp (modified) (5 diffs)

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

@@ -1424 +1424 @@
   <interface
     name="IVirtualBox" extends="$unknown"
-    uuid="3b90eded-f061-432f-9e0f-4b53cc7b6fa0"
+    uuid="5c8814a1-2a35-402d-8680-68e5cb4e72aa"
     wsmap="managed"
     >
@@ -1452 +1452 @@
         publisher tag, at the end.  The publisher tag starts with an underscore
         just like the prerelease build type tag.
+      </desc>
+    </attribute>
+
+    <attribute name="versionNormalized" type="wstring" readonly="yes">
+      <desc>
+        A string representing the version number of the product,
+        without the publisher information (but still with other tags).
+        See <link to="#version" />.
       </desc>
     </attribute>
@@ -8193 +8201 @@
     name="ISystemProperties"
     extends="$unknown"
-    uuid="20fc263c-e1e9-4e86-b9b0-835950790d13"
+    uuid="1d7aca29-97f0-4287-9874-a60ec4f80ea6"
     wsmap="managed"
     >
@@ -8447 +8455 @@
         The path to the autostart database. Depending on the host this might
         be a filesystem path or something else.
+      </desc>
+    </attribute>
+
+    <attribute name="defaultAdditionsISO" type="wstring">
+      <desc>
+        The path to the default Guest Additions ISO image. Can be empty if
+        the location is not known in this installation.
       </desc>
     </attribute>

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -46 +46 @@
 
     BEGIN_COM_MAP(SystemProperties)
-        VBOX_DEFAULT_INTERFACE_ENTRIES (ISystemProperties)
+        VBOX_DEFAULT_INTERFACE_ENTRIES(ISystemProperties)
     END_COM_MAP()
 
@@ -94 +94 @@
     STDMETHOD(COMGETTER(AutostartDatabasePath))(BSTR *aAutostartDbPath);
     STDMETHOD(COMSETTER(AutostartDatabasePath))(IN_BSTR aAutostartDbPath);
+    STDMETHOD(COMGETTER(DefaultAdditionsISO))(BSTR *aDefaultAdditionsISO);
+    STDMETHOD(COMSETTER(DefaultAdditionsISO))(IN_BSTR aDefaultAdditionsISO);
 
     STDMETHOD(GetMaxNetworkAdapters)(ChipsetType_T aChipset, ULONG *aMaxInstances);
@@ -127 +129 @@
     HRESULT setDefaultVRDEExtPack(const Utf8Str &aPath);
     HRESULT setAutostartDatabasePath(const Utf8Str &aPath);
+    HRESULT setDefaultAdditionsISO(const Utf8Str &aPath);
 
     VirtualBox * const  mParent;

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

@@ -103 +103 @@
     /* IVirtualBox properties */
     STDMETHOD(COMGETTER(Version))(BSTR *aVersion);
+    STDMETHOD(COMGETTER(VersionNormalized))(BSTR *aVersionNormalized);
     STDMETHOD(COMGETTER(Revision))(ULONG *aRevision);
     STDMETHOD(COMGETTER(PackageType))(BSTR *aPackageType);
@@ -246 +247 @@
                             GuestOSType*& pGuestOSType);
 
-    const Guid& getGlobalRegistryId() const;
+    const Guid &getGlobalRegistryId() const;
 
     const ComObjPtr<Host>& host() const;
@@ -284 +285 @@
     void markRegistryModified(const Guid &uuid);
     void saveModifiedRegistries();
+
+    static const Bstr &getVersionNormalized();
 
     static HRESULT ensureFilePathExists(const Utf8Str &strFileName, bool fCreate);
@@ -329 +332 @@
     /* static variables (defined in VirtualBoxImpl.cpp) */
     static Bstr sVersion;
+    static Bstr sVersionNormalized;
     static ULONG sRevision;
     static Bstr sPackageType;

trunk/src/VBox/Main/src-server/SystemPropertiesImpl.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -951 +951 @@
 }
 
+STDMETHODIMP SystemProperties::COMGETTER(DefaultAdditionsISO)(BSTR *aDefaultAdditionsISO)
+{
+    CheckComArgOutPointerValid(aDefaultAdditionsISO);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    if (m->strDefaultAdditionsISO.isEmpty())
+    {
+        /* no guest additions, check if it showed up in the mean time */
+        alock.release();
+        {
+            AutoWriteLock wlock(this COMMA_LOCKVAL_SRC_POS);
+            ErrorInfoKeeper eik;
+            (void)setDefaultAdditionsISO("");
+        }
+        alock.acquire();
+    }
+    m->strDefaultAdditionsISO.cloneTo(aDefaultAdditionsISO);
+
+    return S_OK;
+}
+
+STDMETHODIMP SystemProperties::COMSETTER(DefaultAdditionsISO)(IN_BSTR aDefaultAdditionsISO)
+{
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    /** @todo not yet implemented, settings handling is missing */
+    ReturnComNotImplemented();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    HRESULT rc = setDefaultAdditionsISO(aDefaultAdditionsISO);
+    alock.release();
+
+    if (SUCCEEDED(rc))
+    {
+        // VirtualBox::saveSettings() needs vbox write lock
+        AutoWriteLock vboxLock(mParent COMMA_LOCKVAL_SRC_POS);
+        rc = mParent->saveSettings();
+    }
+
+    return rc;
+}
+
 // public methods only for internal purposes
 /////////////////////////////////////////////////////////////////////////////
@@ -982 +1029 @@
     rc = setAutostartDatabasePath(data.strAutostartDatabasePath);
     if (FAILED(rc)) return rc;
+
+    {
+        /* must ignore errors signalled here, because the guest additions
+         * file may not exist, and in this case keep the empty string */
+        ErrorInfoKeeper eik;
+        (void)setDefaultAdditionsISO(data.strDefaultAdditionsISO);
+    }
 
     return S_OK;
@@ -1190 +1244 @@
     return rc;
 }
+
+HRESULT SystemProperties::setDefaultAdditionsISO(const Utf8Str &aPath)
+{
+    Utf8Str path(aPath);
+    if (path.isEmpty())
+    {
+        char strTemp[RTPATH_MAX];
+        int vrc = RTPathAppPrivateNoArch(strTemp, sizeof(strTemp));
+        AssertRC(vrc);
+        Utf8Str strSrc1 = Utf8Str(strTemp).append("/VBoxGuestAdditions.iso");
+
+        vrc = RTPathExecDir(strTemp, sizeof(strTemp));
+        AssertRC(vrc);
+        Utf8Str strSrc2 = Utf8Str(strTemp).append("/additions/VBoxGuestAdditions.iso");
+
+        vrc = RTPathUserHome(strTemp, sizeof(strTemp));
+        AssertRC(vrc);
+        Utf8Str strSrc3 = Utf8StrFmt("%s/VBoxGuestAdditions_%ls.iso", strTemp, VirtualBox::getVersionNormalized().raw());
+
+        /* Check the standard image locations */
+        if (RTFileExists(strSrc1.c_str()))
+            path = strSrc1;
+        else if (RTFileExists(strSrc2.c_str()))
+            path = strSrc2;
+        else if (RTFileExists(strSrc3.c_str()))
+            path = strSrc3;
+        else
+            return setError(E_FAIL,
+                            tr("Cannot determine default Guest Additions ISO location. Most likely they are not available"));
+    }
+
+    if (!RTPathStartsWithRoot(path.c_str()))
+        return setError(E_INVALIDARG,
+                        tr("Given default machine Guest Additions ISO file '%s' is not fully qualified"),
+                        path.c_str());
+
+    if (!RTFileExists(path.c_str()))
+        return setError(E_INVALIDARG,
+                        tr("Given default machine Guest Additions ISO file '%s' does not exist"),
+                        path.c_str());
+
+    m->strDefaultAdditionsISO = path;
+
+    return S_OK;
+}

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -40 +40 @@
 #include <VBox/param.h>
 #include <VBox/settings.h>
+#include <VBox/version.h>
 
 #include <package-generated.h>
-#include <version-generated.h>
 
 #include <algorithm>
@@ -98 +98 @@
 // static
 Bstr VirtualBox::sVersion;
+
+// static
+Bstr VirtualBox::sVersionNormalized;
 
 // static
@@ -371 +374 @@
     if (sVersion.isEmpty())
         sVersion = RTBldCfgVersion();
+    if (sVersionNormalized.isEmpty())
+    {
+        Utf8Str tmp(RTBldCfgVersion());
+        if (tmp.endsWith(VBOX_BUILD_PUBLISHER))
+            tmp = tmp.substr(0, tmp.length() - strlen(VBOX_BUILD_PUBLISHER));
+        sVersionNormalized = tmp;
+    }
     sRevision = RTBldCfgRevision();
     if (sPackageType.isEmpty())
@@ -857 +867 @@
 
     sVersion.cloneTo(aVersion);
+    return S_OK;
+}
+
+STDMETHODIMP VirtualBox::COMGETTER(VersionNormalized)(BSTR *aVersionNormalized)
+{
+    CheckComArgNotNull(aVersionNormalized);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    sVersionNormalized.cloneTo(aVersionNormalized);
     return S_OK;
 }
@@ -4466 +4487 @@
     }
     NOREF(rc); /* XXX */
+}
+
+
+/* static */
+const Bstr &VirtualBox::getVersionNormalized()
+{
+    return sVersionNormalized;
 }