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

Timestamp:

Sep 28, 2013 10:47:38 PM (11 years ago)

Author:

vboxsync

Message:

Get VBoxInternal2 variables from both machine leveal as well as global level extra data.

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (8 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -120 +120 @@
 # include "ExtPackManagerImpl.h"
 #endif
-
 #if defined(RT_OS_DARWIN)
-
 # include "IOKit/IOKitLib.h"
+#endif
+
+
+/*******************************************************************************
+*   Internal Functions                                                         *
+*******************************************************************************/
+static Utf8Str *GetExtraDataBoth(IVirtualBox *pVirtualBox, IMachine *pMachine, const char *pszName, Utf8Str *pStrValue);
+
+
+
+#if defined(RT_OS_DARWIN)
 
 static int DarwinSmcKey(char *pabKey, uint32_t cbKey)
@@ -248 +257 @@
 }
 
-static int getSmcDeviceKey(IMachine *pMachine, BSTR *aKey, bool *pfGetKeyFromRealSMC)
+/**
+ * @throws HRESULT on extra data retrival error.
+ */
+static int getSmcDeviceKey(IVirtualBox *pVirtualBox, IMachine *pMachine, Utf8Str *pStrKey, bool *pfGetKeyFromRealSMC)
 {
     *pfGetKeyFromRealSMC = false;
@@ -255 +267 @@
      * The extra data takes precedence (if non-zero).
      */
-    HRESULT hrc = pMachine->GetExtraData(Bstr("VBoxInternal2/SmcDeviceKey").raw(),
-                                         aKey);
-    if (FAILED(hrc))
-        return Global::vboxStatusCodeFromCOM(hrc);
-    if (   SUCCEEDED(hrc)
-        && *aKey
-        && **aKey)
+    GetExtraDataBoth(pVirtualBox, pMachine, "VBoxInternal2/SmcDeviceKey", pStrKey);
+    if (pStrKey->isNotEmpty())
         return VINF_SUCCESS;
 
@@ -465 +472 @@
         throw ConfigError("CFGMR3RemoveValue", vrc, pcszName);
 }
+
+/**
+ * Gets an extra data value, consulting both machine and global extra data.
+ *
+ * @throws  HRESULT on failure
+ * @returns pStrValue for the callers convenience.
+ * @param   pVirtualBox     Pointer to the IVirtualBox interface.
+ * @param   pMachine        Pointer to the IMachine interface.
+ * @param   pszName         The value to get.
+ * @param   pStrValue       Where to return it's value (empty string if not
+ *                          found).
+ */
+static Utf8Str *GetExtraDataBoth(IVirtualBox *pVirtualBox, IMachine *pMachine, const char *pszName, Utf8Str *pStrValue)
+{
+    pStrValue->setNull();
+
+    Bstr bstrName(pszName);
+    Bstr bstrValue;
+    HRESULT hrc = pMachine->GetExtraData(bstrName.raw(), bstrValue.asOutParam());
+    if (FAILED(hrc))
+        throw hrc;
+    if (bstrValue.isEmpty())
+    {
+        hrc = pVirtualBox->GetExtraData(bstrName.raw(), bstrValue.asOutParam());
+        if (FAILED(hrc))
+            throw hrc;
+    }
+
+    if (bstrValue.isNotEmpty())
+        *pStrValue = bstrValue;
+    return pStrValue;
+}
+
+
 /** Helper that finds out the next SATA port used
  */
@@ -711 +752 @@
     int             rc;
     HRESULT         hrc;
+    Utf8Str         strTmp;
     Bstr            bstr;
 
@@ -1259 +1301 @@
 
             bool fGetKeyFromRealSMC;
-            Bstr bstrKey;
-            rc = getSmcDeviceKey(pMachine, bstrKey.asOutParam(), &fGetKeyFromRealSMC);
+            Utf8Str strKey;
+            rc = getSmcDeviceKey(virtualBox, pMachine, &strKey, &fGetKeyFromRealSMC);
             AssertRCReturn(rc, rc);
 
-            InsertConfigString(pCfg,   "DeviceKey", bstrKey);
+            InsertConfigString(pCfg,   "DeviceKey", strKey);
             InsertConfigInteger(pCfg,  "GetKeyFromRealSMC", fGetKeyFromRealSMC);
         }
@@ -1476 +1518 @@
 
             /* Get boot args */
-            Bstr bootArgs;
-            hrc = pMachine->GetExtraData(Bstr("VBoxInternal2/EfiBootArgs").raw(), bootArgs.asOutParam()); H();
+            Utf8Str bootArgs;
+            GetExtraDataBoth(virtualBox, pMachine, "VBoxInternal2/EfiBootArgs", &bootArgs);
 
             /* Get device props */
-            Bstr deviceProps;
-            hrc = pMachine->GetExtraData(Bstr("VBoxInternal2/EfiDeviceProps").raw(), deviceProps.asOutParam()); H();
+            Utf8Str deviceProps;
+            GetExtraDataBoth(virtualBox, pMachine, "VBoxInternal2/EfiDeviceProps", &deviceProps);
 
             /* Get GOP mode settings */
             uint32_t u32GopMode = UINT32_MAX;
-            hrc = pMachine->GetExtraData(Bstr("VBoxInternal2/EfiGopMode").raw(), bstr.asOutParam()); H();
-            if (!bstr.isEmpty())
-                u32GopMode = Utf8Str(bstr).toUInt32();
+            GetExtraDataBoth(virtualBox, pMachine, "VBoxInternal2/EfiGopMode", &strTmp);
+            if (!strTmp.isEmpty())
+                u32GopMode = strTmp.toUInt32();
 
             /* UGA mode settings */
             uint32_t u32UgaHorisontal = 0;
-            hrc = pMachine->GetExtraData(Bstr("VBoxInternal2/EfiUgaHorizontalResolution").raw(), bstr.asOutParam()); H();
-            if (!bstr.isEmpty())
-                u32UgaHorisontal = Utf8Str(bstr).toUInt32();
+            GetExtraDataBoth(virtualBox, pMachine, "VBoxInternal2/EfiUgaHorizontalResolution", &strTmp);
+            if (!strTmp.isEmpty())
+                u32UgaHorisontal = strTmp.toUInt32();
 
             uint32_t u32UgaVertical = 0;
-            hrc = pMachine->GetExtraData(Bstr("VBoxInternal2/EfiUgaVerticalResolution").raw(), bstr.asOutParam()); H();
-            if (!bstr.isEmpty())
-                u32UgaVertical = Utf8Str(bstr).toUInt32();
+            GetExtraDataBoth(virtualBox, pMachine, "VBoxInternal2/EfiUgaVerticalResolution", &strTmp);
+            if (!strTmp.isEmpty())
+                u32UgaVertical = strTmp.toUInt32();
 
             /*
@@ -2827 +2869 @@
         // InsertConfig threw something:
         return x.m_vrc;
+    }
+    catch (HRESULT hrcXcpt)
+    {
+        AssertMsgFailedReturn(("hrc=%Rhrc\n", hrcXcpt), VERR_GENERAL_FAILURE);
     }