Changeset 34907 in vbox for trunk/src/VBox

Timestamp:

Dec 9, 2010 4:39:41 PM (14 years ago)

Author:

vboxsync

Message:

Main/FE/Qt: don't enable USB 2.0 support for new VMs if the proper ExtPack is not installed

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp (modified) (1 diff)
• Main/ExtPackManagerImpl.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (1 diff)
• Main/include/ExtPackManagerImpl.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp

@@ -742 +742 @@
     {
         usbController.SetEnabled(true);
-        usbController.SetEnabledEhci(true);
+
+        /*
+         * USB 2.0 is only available if the proper ExtPack is installed.
+         *
+         * Note. Configuring EHCI here and providing messages about
+         * the missing extpack isn't exactly clean, but it is a
+         * necessary evil to patch over legacy compatability issues
+         * introduced by the new distribution model.
+         */
+        static const char *s_pszUsbExtPackName = "Oracle VM VirtualBox Extension Pack";
+        CExtPackManager manager = vboxGlobal().virtualBox().GetExtensionPackManager();
+        if (manager.IsExtPackUsable(s_pszUsbExtPackName))
+            usbController.SetEnabledEhci(true);
     }
 

trunk/src/VBox/Main/ExtPackManagerImpl.cpp

@@ -2008 +2008 @@
 }
 
+STDMETHODIMP ExtPackManager::IsExtPackUsable(IN_BSTR a_bstrExtPack, BOOL *aUsable)
+{
+    CheckComArgNotNull(a_bstrExtPack);
+    Utf8Str strExtPack(a_bstrExtPack);
+    *aUsable = isExtPackUsable(strExtPack.c_str());
+    return S_OK;
+}
+
 
 /**

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -14563 +14563 @@
     </method>
 
+    <method name="IsExtPackUsable">
+      <desc>Check if the given extension pack is loaded and usable.</desc>
+      <param name="name" type="wstring" dir="in">
+        <desc>The name of the extension pack to check for.</desc>
+      </param>
+      <param name="usable" type="boolean" dir="return"/>
+    </method>
+
   </interface>
 

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

@@ -214 +214 @@
     STDMETHOD(Cleanup)(void);
     STDMETHOD(QueryAllPlugInsForFrontend)(IN_BSTR a_bstrFrontend, ComSafeArrayOut(BSTR, a_pabstrPlugInModules));
+    STDMETHOD(IsExtPackUsable(IN_BSTR a_bstrExtPack, BOOL *aUsable));
     /** @}  */