Changeset 8438 in vbox for trunk/src

Timestamp:

Apr 28, 2008 7:31:29 PM (17 years ago)

Author:

vboxsync

Message:

Moved the requestCaptureForVM code.

File:

• trunk/src/VBox/Main/HostImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/HostImpl.cpp

@@ -1284 +1284 @@
     CHECK_READY();
 
+    /*
+     * Translate the device id into a device object.
+     */
     Guid id (aId);
-
     ComObjPtr <HostUSBDevice> device;
     USBDeviceList::iterator it = mUSBDevices.begin();
@@ -1294 +1296 @@
         ++ it;
     }
-
     if (!device)
         return setError (E_INVALIDARG,
@@ -1300 +1301 @@
             id.raw());
 
-/** @todo r=bird this doesn't belong here but in the HostUSBDevice bit. */
+    /*
+     * Try to capture the device
+     */
     AutoWriteLock devLock (device);
-
-    if (device->isStatePending())
-        return setError (E_INVALIDARG,
-            tr ("USB device '%s' with UUID {%Vuuid} is busy (waiting for a pending "
-                "state change). Please try later"),
-            device->name().raw(), id.raw());
-
-    if (device->state() == USBDeviceState_NotSupported)
-        return setError (E_INVALIDARG,
-            tr ("USB device '%s' with UUID {%Vuuid} cannot be accessed by guest "
-                "computers"),
-            device->name().raw(), id.raw());
-
-    if (device->state() == USBDeviceState_Unavailable)
-        return setError (E_INVALIDARG,
-            tr ("USB device '%s' with UUID {%Vuuid} is being exclusively used by the "
-                "host computer"),
-            device->name().raw(), id.raw());
-
-    if (device->state() == USBDeviceState_Captured)
-    {
-        /* Machine::name() requires a read lock */
-        AutoReadLock machLock (device->machine());
-
-        return setError (E_INVALIDARG,
-            tr ("USB device '%s' with UUID {%Vuuid} is already captured by the virtual "
-                "machine '%ls'"),
-            device->name().raw(), id.raw(),
-            device->machine()->name().raw());
-    }
-
-    /* try to capture the device */
-    device->requestCaptureForVM (aMachine);
+    device->requestCaptureForVM (aMachine, true /* aSetError */);
 
     return S_OK;
@@ -2142 +2113 @@
         /** @todo r=bird: this is wrong as requestAttachToVM may return false for different reasons that we. */
         /* try to capture the device */
-        return aDevice->requestCaptureForVM (aMachine, maskedIfs);
+        HRESULT hrc = aDevice->requestCaptureForVM (aMachine, false /* aSetError */, maskedIfs);
+        return SUCCEEDED (hrc);
     }