Changeset 35757 in vbox for trunk/src/VBox/Main/include

Timestamp:

Jan 28, 2011 12:51:37 PM (14 years ago)

Author:

vboxsync

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

69718

Message:

Main: do not fail loading machine settings if a shared folder path is not absolute (that breaks importing OVF and machine folders from other hosts since the rules about what constitutes an absolute path differ between host OSes). Instead, issue a runtime warning if a shared folder path is not absolute or does not exist on the host when the VM is powered up.

File:

• trunk/src/VBox/Main/include/SharedFolderImpl.h (modified) (2 diffs)

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

@@ -46 +46 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init(Machine *aMachine, const Utf8Str &aName, const Utf8Str &aHostPath, bool aWritable, bool aAutoMount);
+    HRESULT init(Machine *aMachine, const Utf8Str &aName, const Utf8Str &aHostPath, bool aWritable, bool aAutoMount, bool fFailOnError);
     HRESULT initCopy(Machine *aMachine, SharedFolder *aThat);
-    HRESULT init(Console *aConsole, const Utf8Str &aName, const Utf8Str &aHostPath, bool aWritable, bool aAutoMount);
-    HRESULT init(VirtualBox *aVirtualBox, const Utf8Str &aName, const Utf8Str &aHostPath, bool aWritable, bool aAutoMount);
+    HRESULT init(Console *aConsole, const Utf8Str &aName, const Utf8Str &aHostPath, bool aWritable, bool aAutoMount, bool fFailOnError);
+//     HRESULT init(VirtualBox *aVirtualBox, const Utf8Str &aName, const Utf8Str &aHostPath, bool aWritable, bool aAutoMount, bool fFailOnError);
     void uninit();
 
@@ -89 +89 @@
 protected:
 
-    HRESULT protectedInit(VirtualBoxBase *aParent, const Utf8Str &aName, const Utf8Str &aHostPath, bool aWritable, bool aAutoMount);
+    HRESULT protectedInit(VirtualBoxBase *aParent,
+                          const Utf8Str &aName,
+                          const Utf8Str &aHostPath,
+                          bool aWritable,
+                          bool aAutoMount,
+                          bool fFailOnError);
 private: