Changeset 33238 in vbox for trunk/src/VBox/Main/VirtualBoxImpl.cpp

Timestamp:

Oct 19, 2010 3:41:23 PM (14 years ago)

Author:

vboxsync

Message:

Main: new VirtualBox::ComposeMachineFilename() API; remove the 'default hard disk folder' concept and related APIs; GUI wizards need fixing

File:

• trunk/src/VBox/Main/VirtualBoxImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -1149 +1149 @@
 /////////////////////////////////////////////////////////////////////////////
 
+STDMETHODIMP VirtualBox::ComposeMachineFilename(IN_BSTR aName,
+                                                IN_BSTR aBaseFolder,
+                                                BSTR *aFilename)
+{
+    LogFlowThisFuncEnter();
+    LogFlowThisFunc(("aName=\"%ls\",aBaseFolder=\"%ls\"\n", aName, aBaseFolder));
+
+    CheckComArgStrNotEmptyOrNull(aName);
+    CheckComArgOutPointerValid(aFilename);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    /* Compose the settings file name using the following scheme:
+     *
+     *     <base_folder>/<machine_name>/<machine_name>.xml
+     *
+     * If a non-null and non-empty base folder is specified, the default
+     * machine folder will be used as a base folder.
+     */
+    Utf8Str strBase = aBaseFolder;
+    if (strBase.isEmpty())
+        /* we use the non-full folder value below to keep the path relative */
+        getDefaultMachineFolder(strBase);
+
+    Bstr bstrSettingsFile = BstrFmt("%s%c%ls%c%ls.vbox",
+                                    strBase.c_str(),
+                                    RTPATH_DELIMITER,
+                                    aName,
+                                    RTPATH_DELIMITER,
+                                    aName);
+
+    bstrSettingsFile.detachTo(aFilename);
+
+    return S_OK;
+}
+
 /** @note Locks mSystemProperties object for reading. */
 STDMETHODIMP VirtualBox::CreateMachine(IN_BSTR aName,
@@ -1167 +1204 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    /* Compose the settings file name using the following scheme:
-     *
-     *     <base_folder>/<machine_name>/<machine_name>.xml
-     *
-     * If a non-null and non-empty base folder is specified, the default
-     * machine folder will be used as a base folder.
-     */
-    Utf8Str strSettingsFile = aBaseFolder;
-    if (strSettingsFile.isEmpty())
-        /* we use the non-full folder value below to keep the path relative */
-        getDefaultMachineFolder(strSettingsFile);
-
-    strSettingsFile = Utf8StrFmt("%s%c%ls%c%ls.vbox",
-                                 strSettingsFile.c_str(),
-                                 RTPATH_DELIMITER,
-                                 aName,
-                                 RTPATH_DELIMITER,
-                                 aName);
-
-    HRESULT rc = E_FAIL;
+    Bstr bstrSettingsFilename;
+    HRESULT rc = ComposeMachineFilename(aName, aBaseFolder, bstrSettingsFilename.asOutParam());
+    if (FAILED(rc)) return rc;
 
     /* create a new object */
@@ -1204 +1224 @@
     /* initialize the machine object */
     rc = machine->init(this,
-                       strSettingsFile,
+                       Utf8Str(bstrSettingsFilename),
                        Utf8Str(aName),
                        id,
@@ -2846 +2866 @@
     AutoReadLock propsLock(m->pSystemProperties COMMA_LOCKVAL_SRC_POS);
     str = m->pSystemProperties->m->strDefaultMachineFolder;
-}
-
-/**
- * Returns the default hard disk folder from the system properties
- * with proper locking.
- * @return
- */
-void VirtualBox::getDefaultHardDiskFolder(Utf8Str &str) const
-{
-    AutoReadLock propsLock(m->pSystemProperties COMMA_LOCKVAL_SRC_POS);
-    str = m->pSystemProperties->m->strDefaultHardDiskFolder;
 }