Changeset 67728 in vbox

Timestamp:

Jun 30, 2017 12:27:58 PM (7 years ago)

Author:

vboxsync

Message:

SystemPropertiesImpl: added i_getDefaultAdditionsISO so I don't need to go thru the COMGETTER/string conversion fun.

Location:

trunk/src/VBox/Main

Files:

• include/SystemPropertiesImpl.h (modified) (1 diff)
• src-server/SystemPropertiesImpl.cpp (modified) (2 diffs)

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

@@ -55 +55 @@
     int i_loadVDPlugin(const char *pszPluginLibrary);
     int i_unloadVDPlugin(const char *pszPluginLibrary);
+
+    HRESULT i_getDefaultAdditionsISO(com::Utf8Str &aDefaultAdditionsISO);
 
 private:

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

@@ -928 +928 @@
 HRESULT SystemProperties::getDefaultAdditionsISO(com::Utf8Str &aDefaultAdditionsISO)
 {
-    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();
-    }
-    aDefaultAdditionsISO = m->strDefaultAdditionsISO;
-
-    return S_OK;
+    return i_getDefaultAdditionsISO(aDefaultAdditionsISO);
 }
 
@@ -1148 +1133 @@
 {
     return VDPluginUnloadFromFilename(pszPluginLibrary);
+}
+
+/**
+ * Internally usable version of getDefaultAdditionsISO.
+ */
+HRESULT SystemProperties::i_getDefaultAdditionsISO(com::Utf8Str &aDefaultAdditionsISO)
+{
+    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);
+        if (m->strDefaultAdditionsISO.isEmpty())
+        {
+            ErrorInfoKeeper eik;
+            (void)setDefaultAdditionsISO("");
+        }
+        alock.acquire();
+    }
+    aDefaultAdditionsISO = m->strDefaultAdditionsISO;
+    return S_OK;
 }