Changeset 14224 in vbox for trunk/src/VBox/Main/SystemPropertiesImpl.cpp

Timestamp:

Nov 14, 2008 4:17:20 PM (16 years ago)

Author:

vboxsync

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

39340

Message:

Main: Added ISystemProperties::defaultHardDiskFormat.

File:

• trunk/src/VBox/Main/SystemPropertiesImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/SystemPropertiesImpl.cpp

@@ -75 +75 @@
     setDefaultMachineFolder (NULL);
     setDefaultHardDiskFolder (NULL);
+    setDefaultHardDiskFormat (NULL);
+
     setRemoteDisplayAuthLibrary (NULL);
 
@@ -362 +364 @@
 }
 
+STDMETHODIMP SystemProperties::COMGETTER(DefaultHardDiskFormat) (BSTR *aDefaultHardDiskFormat)
+{
+    if (!aDefaultHardDiskFormat)
+        return E_POINTER;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReadLock alock (this);
+
+    mDefaultHardDiskFormat.cloneTo (aDefaultHardDiskFormat);
+
+    return S_OK;
+}
+
+STDMETHODIMP SystemProperties::COMSETTER(DefaultHardDiskFormat) (INPTR BSTR aDefaultHardDiskFormat)
+{
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    /* VirtualBox::saveSettings() needs a write lock */
+    AutoMultiWriteLock2 alock (mParent, this);
+
+    HRESULT rc = setDefaultHardDiskFormat (aDefaultHardDiskFormat);
+    if (SUCCEEDED (rc))
+        rc = mParent->saveSettings();
+
+    return rc;
+}
+
 STDMETHODIMP SystemProperties::COMGETTER(RemoteDisplayAuthLibrary) (BSTR *aRemoteDisplayAuthLibrary)
 {
@@ -508 +540 @@
     bstr = properties.stringValue ("defaultHardDiskFolder");
     rc = setDefaultHardDiskFolder (bstr);
+    CheckComRCReturnRC (rc);
+
+    bstr = properties.stringValue ("defaultHardDiskFormat");
+    rc = setDefaultHardDiskFormat (bstr);
     CheckComRCReturnRC (rc);
 
@@ -549 +585 @@
     if (mDefaultHardDiskFolder)
         properties.setValue <Bstr> ("defaultHardDiskFolder", mDefaultHardDiskFolder);
+
+    if (mDefaultHardDiskFormat)
+        properties.setValue <Bstr> ("defaultHardDiskFormat", mDefaultHardDiskFormat);
 
     if (mRemoteDisplayAuthLibrary)
@@ -610 +649 @@
 }
 
+HRESULT SystemProperties::setDefaultHardDiskFormat (const BSTR aFormat)
+{
+    if (aFormat && *aFormat)
+        mDefaultHardDiskFormat = aFormat;
+    else
+        mDefaultHardDiskFormat = "VDI";
+
+    return S_OK;
+}
+
 HRESULT SystemProperties::setRemoteDisplayAuthLibrary (const BSTR aPath)
 {
-    Utf8Str path;
     if (aPath && *aPath)
-        path = aPath;
+        mRemoteDisplayAuthLibrary = aPath;
     else
-        path = "VRDPAuth";
-
-    mRemoteDisplayAuthLibrary = path;
+        mRemoteDisplayAuthLibrary = "VRDPAuth";
 
     return S_OK;
@@ -625 +671 @@
 HRESULT SystemProperties::setWebServiceAuthLibrary (const BSTR aPath)
 {
-    Utf8Str path;
     if (aPath && *aPath)
-        path = aPath;
+        mWebServiceAuthLibrary = aPath;
     else
-        path = "VRDPAuth";
-
-    mWebServiceAuthLibrary = path;
-
-    return S_OK;
-}
+        mWebServiceAuthLibrary = "VRDPAuth";
+
+    return S_OK;
+}