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

Timestamp:

Nov 14, 2007 1:15:00 PM (17 years ago)

Author:

vboxsync

Message:

enclosed some more code in VBOX_WITH_VBOX tests.

File:

• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -1926 +1926 @@
 STDMETHODIMP Console::AttachUSBDevice (INPTR GUIDPARAM aId)
 {
+#ifdef VBOX_WITH_USB
     AutoCaller autoCaller (this);
     CheckComRCReturnRC (autoCaller.rc());
@@ -1974 +1975 @@
 
     return rc;
+
+#else   /* !VBOX_WITH_USB */
+    return setError (E_FAIL,
+        tr ("The virtual machine does not have a USB controller"));
+#endif  /* !VBOX_WITH_USB */
 }
 
 STDMETHODIMP Console::DetachUSBDevice (INPTR GUIDPARAM aId, IUSBDevice **aDevice)
 {
+#ifdef VBOX_WITH_USB
     if (!aDevice)
         return E_POINTER;
@@ -2004 +2011 @@
             Guid (aId).raw());
 
-#ifdef RT_OS_DARWIN
+# ifdef RT_OS_DARWIN
     /* Notify the USB Proxy that we're about to detach the device. Since
      * we don't dare do IPC when holding the console lock, so we'll have
@@ -2019 +2026 @@
     if (it == mUSBDevices.end())
         return S_OK;
-#endif
+# endif
 
     /* First, request VMM to detach the device */
@@ -2036 +2043 @@
 
     return rc;
+
+
+#else   /* !VBOX_WITH_USB */
+
+    return setError (E_INVALIDARG,
+        tr ("USB device with UUID {%Vuuid} is not attached to this machine"),
+        Guid (aId).raw());
+#endif  /* !VBOX_WITH_USB */
 }