Changeset 50234 in vbox for trunk

Timestamp:

Jan 24, 2014 10:48:13 PM (11 years ago)

Author:

vboxsync

Message:

USB/Proxy: More code cleanup and finish a few todos, also some new ones so it doesn't get boring

Location:

trunk/src/VBox

Files:

• Devices/USB/USBProxyDevice.cpp (modified) (7 diffs)
• Devices/USB/USBProxyDevice.h (modified) (7 diffs)
• Devices/USB/darwin/USBProxyDevice-darwin.cpp (modified) (18 diffs)
• Devices/USB/freebsd/USBProxyDevice-freebsd.cpp (modified) (13 diffs)
• Devices/USB/linux/USBProxyDevice-linux.cpp (modified) (25 diffs)
• Devices/USB/solaris/USBProxyDevice-solaris.cpp (modified) (11 diffs)
• Devices/USB/vrdp/USBProxyDevice-vrdp.cpp (modified) (9 diffs)
• Devices/USB/win/USBProxyDevice-win.cpp (modified) (21 diffs)
• RDP/client/vrdp/rdpusb.c (modified) (4 diffs)

trunk/src/VBox/Devices/USB/USBProxyDevice.cpp

@@ -53 +53 @@
          * Setup a MSG URB, queue and reap it.
          */
+        int rc = VINF_SUCCESS;
         VUSBURB Urb;
         AssertCompile(RT_SIZEOFMEMB(VUSBURB, abData) >= _4K);
@@ -79 +80 @@
         pSetup->wLength = cbHint;
 
-        if (!pProxyDev->pOps->pfnUrbQueue(&Urb))
+        rc = pProxyDev->pOps->pfnUrbQueue(pProxyDev, &Urb);
+        if (RT_FAILURE(rc))
             break;
 
@@ -89 +91 @@
         if (!pUrbReaped)
         {
-            pProxyDev->pOps->pfnUrbCancel(&Urb);
+            rc = pProxyDev->pOps->pfnUrbCancel(pProxyDev, &Urb);
+            AssertRC(rc);
+            /** @todo: This breaks the comment above... */
             pUrbReaped = pProxyDev->pOps->pfnUrbReap(pProxyDev, RT_INDEFINITE_WAIT);
         }
@@ -629 +633 @@
              pUsbIns->pszName, bInterfaceNumber, bAlternateSetting));
 
-    /** @todo this is fishy, pfnSetInterface returns true/false from what I can see... */
-    if (pProxyDev->pOps->pfnSetInterface(pProxyDev, bInterfaceNumber, bAlternateSetting) < 0)
-        return VERR_GENERAL_FAILURE;
-    return VINF_SUCCESS;
+    return pProxyDev->pOps->pfnSetInterface(pProxyDev, bInterfaceNumber, bAlternateSetting);
 }
 
@@ -647 +648 @@
              pUsbIns->pszName, uEndpoint));
 
-    if (!pProxyDev->pOps->pfnClearHaltedEndpoint(pProxyDev, uEndpoint))
-        return VERR_GENERAL_FAILURE;
-    return VINF_SUCCESS;
+    return pProxyDev->pOps->pfnClearHaltedEndpoint(pProxyDev, uEndpoint);
 }
 
@@ -660 +659 @@
 static DECLCALLBACK(int) usbProxyDevUrbQueue(PPDMUSBINS pUsbIns, PVUSBURB pUrb)
 {
+    int rc = VINF_SUCCESS;
     PUSBPROXYDEV pProxyDev = PDMINS_2_DATA(pUsbIns, PUSBPROXYDEV);
-    if (!pProxyDev->pOps->pfnUrbQueue(pUrb))
+    rc = pProxyDev->pOps->pfnUrbQueue(pProxyDev, pUrb);
+    if (RT_FAILURE(rc))
         return pProxyDev->fDetached
              ? VERR_VUSB_DEVICE_NOT_ATTACHED
              : VERR_VUSB_FAILED_TO_QUEUE_URB;
-    return VINF_SUCCESS;
+    return rc;
 }
 
@@ -677 +678 @@
 {
     PUSBPROXYDEV pProxyDev = PDMINS_2_DATA(pUsbIns, PUSBPROXYDEV);
-    pProxyDev->pOps->pfnUrbCancel(pUrb);
-    return VINF_SUCCESS;
+    return pProxyDev->pOps->pfnUrbCancel(pProxyDev, pUrb);
 }
 

trunk/src/VBox/Devices/USB/USBProxyDevice.h

@@ -25 +25 @@
 
 
-/**
- * Arguments passed to the USB proxy device constructor.
- */
-typedef struct USBPROXYDEVARGS
-{
-    /** Whether this is a remote (VRDP) or local (Host) device. */
-    bool        fRemote;
-    /** Host specific USB device address. */
-    const char *pszAddress;
-    /** Pointer to backend specific data. */
-    void       *pvBackend;
-} USBPROXYDEVARGS;
-/** Pointer to proxy device creation structure. */
-typedef USBPROXYDEVARGS *PUSBPROXYDEVARGS;
-
-
 /** Pointer to a USB proxy device. */
 typedef struct USBPROXYDEV *PUSBPROXYDEV;
@@ -73 +57 @@
      *
      * @returns VBox status code.
-     * @param   pProxyDev   The USB Proxy Device instance.
+     * @param   pProxyDev       The USB Proxy Device instance.
      */
     DECLR3CALLBACKMEMBER(int, pfnInit, (PUSBPROXYDEV pProxyDev));
@@ -80 +64 @@
      * Closes handle to the host USB device.
      *
-     * @param   pDev        The USB Proxy Device instance.
+     * @param   pProxyDev       The USB Proxy Device instance.
      */
     DECLR3CALLBACKMEMBER(void, pfnClose, (PUSBPROXYDEV pProxyDev));
@@ -90 +74 @@
      *
      * @returns VBox status code.
-     * @param   pDev            The device to reset.
+     * @param   pProxyDev       The USB Proxy Device instance.
      * @param   fResetOnLinux   It's safe to do reset on linux, we can deal with devices
      *                          being logically reconnected.
@@ -96 +80 @@
     DECLR3CALLBACKMEMBER(int, pfnReset, (PUSBPROXYDEV pProxyDev, bool fResetOnLinux));
 
-    /** @todo make it return a VBox status code! */
+    /**
+     * Sets the given configuration of the device.
+     *
+     * @returns VBox status code.
+     * @param   pProxyDev       The USB Proxy Device instance.
+     * @param   iCfg            The configuration to set.
+     */
     DECLR3CALLBACKMEMBER(int, pfnSetConfig, (PUSBPROXYDEV pProxyDev, int iCfg));
 
-    /** @todo make it return a VBox status code! */
+    /**
+     * Claim an interface for use by the prox device.
+     *
+     * @returns VBox status code.
+     * @param   pProxyDev       The USB Proxy Device instance.
+     * @param   iIf             Interface number to claim.
+     */
     DECLR3CALLBACKMEMBER(int, pfnClaimInterface, (PUSBPROXYDEV pProxyDev, int iIf));
 
-    /** @todo make it return a VBox status code! */
+    /**
+     * Releases an interface which was claimed before.
+     *
+     * @returns VBox status code.
+     * @param   pProxyDev       The USB Proxy Device instance.
+     * @param   iIf             Interface number to release.
+     */
     DECLR3CALLBACKMEMBER(int, pfnReleaseInterface, (PUSBPROXYDEV pProxyDev, int iIf));
 
-    /** @todo make it return a VBox status code! */
-    DECLR3CALLBACKMEMBER(int, pfnSetInterface, (PUSBPROXYDEV pProxyDev, int iIf, int setting));
-
-    /** @todo make it return a VBox status code! */
-    DECLR3CALLBACKMEMBER(bool, pfnClearHaltedEndpoint, (PUSBPROXYDEV  pDev, unsigned int iEp));
-
-    /** @todo make it return a VBox status code! Add pDev. */
-    DECLR3CALLBACKMEMBER(int, pfnUrbQueue, (PVUSBURB pUrb));
+    /**
+     * Sets the given alternate interface for the device.
+     *
+     * @returns VBox status code.
+     * @param   pProxyDev       The USB Proxy Device instance.
+     * @param   iIf             Interface to use.
+     * @param   iSetting        The alternate setting to use.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnSetInterface, (PUSBPROXYDEV pProxyDev, int iIf, int iSetting));
+
+    /**
+     * Clears the given halted endpoint.
+     *
+     * @returns VBox status code.
+     * @param   pProxyDev       The USB Proxy Device instance.
+     * @param   iEp             The endpoint to clear.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnClearHaltedEndpoint, (PUSBPROXYDEV  pDev, unsigned int iEp));
+
+    /**
+     * Queue a new URB.
+     *
+     * @returns VBox status code.
+     * @param   pProxyDev       The USB Proxy Device instance.
+     * @param   pUrb            The URB to queue.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnUrbQueue, (PUSBPROXYDEV pProxyDev, PVUSBURB pUrb));
 
     /**
      * Cancel an in-flight URB.
      *
-     * @param   pUrb        The URB to cancel.
-     * @todo make it return a VBox status code! Add pDev.
-     */
-    DECLR3CALLBACKMEMBER(void, pfnUrbCancel, (PVUSBURB pUrb));
+     * @returns VBox status code.
+     * @param   pProxyDev       The USB Proxy Device instance.
+     * @param   pUrb            The URB to cancel.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnUrbCancel, (PUSBPROXYDEV pProxyDev, PVUSBURB pUrb));
 
     /**
@@ -127 +149 @@
      * @returns Pointer to a completed URB.
      * @returns NULL if no URB was completed.
-     * @param   pDev        The device.
-     * @param   cMillies    Number of milliseconds to wait. Use 0 to not
-     *                      wait at all.
+     * @param   pProxyDev       The USB Proxy Device instance.
+     * @param   cMillies        Number of milliseconds to wait. Use 0 to not
+     *                          wait at all.
      */
     DECLR3CALLBACKMEMBER(PVUSBURB, pfnUrbReap, (PUSBPROXYDEV pProxyDev, RTMSINTERVAL cMillies));
@@ -137 +159 @@
      *
      * @returns VBox status code.
-     * @param   pProxyDev   The device.
+     * @param   pProxyDev       The USB Proxy Device instance.
      */
     DECLR3CALLBACKMEMBER(int, pfnWakeup, (PUSBPROXYDEV pProxyDev));

trunk/src/VBox/Devices/USB/darwin/USBProxyDevice-darwin.cpp

@@ -1482 +1482 @@
     {
         Log(("usbProxyDarwinSetConfig: Set configuration -> %#x\n", irc));
-        return false;
+        return RTErrConvertFromDarwin(irc);
     }
 
     usbProxyDarwinReleaseAllInterfaces(pDevOsX);
     usbProxyDarwinSeizeAllInterfaces(pDevOsX, true /* make the best out of it */);
-    return true;
+    return VINF_SUCCESS;
 }
 
@@ -1497 +1497 @@
  * open/reset/setconfig time.
  *
- * @returns success indicator (always true).
+ * @returns success indicator (always VINF_SUCCESS).
  */
 static DECLCALLBACK(int) usbProxyDarwinClaimInterface(PUSBPROXYDEV pProxyDev, int iIf)
 {
-    return true;
+    return VINF_SUCCESS;
 }
 
@@ -1515 +1515 @@
 static DECLCALLBACK(int) usbProxyDarwinReleaseInterface(PUSBPROXYDEV pProxyDev, int iIf)
 {
-    return true;
+    return VINF_SUCCESS;
 }
 
@@ -1540 +1540 @@
             {
                 usbProxyDarwinGetPipeProperties(pDevOsX, pIf);
-                return true;
+                return VINF_SUCCESS;
             }
         }
@@ -1558 +1558 @@
             irc = (*pDevOsX->ppDevI)->DeviceRequest(pDevOsX->ppDevI, &Req);
             Log(("usbProxyDarwinSetInterface: SET_INTERFACE(%d,%d) -> irc=%#x\n", iIf, iAlt, irc));
-            return true;
+            return VINF_SUCCESS;
         }
     }
@@ -1564 +1564 @@
     LogFlow(("usbProxyDarwinSetInterface: pProxyDev=%s eiIf=%#x iAlt=%#x - failure - pIf=%p irc=%#x\n",
              pProxyDev->pUsbIns->pszName, iIf, iAlt, pIf, irc));
-    return false;
+    return RTErrConvertFromDarwin(irc);
 }
 
@@ -1571 +1571 @@
  * Clears the halted endpoint 'EndPt'.
  */
-static DECLCALLBACK(bool) usbProxyDarwinClearHaltedEp(PUSBPROXYDEV pProxyDev, unsigned int EndPt)
+static DECLCALLBACK(int) usbProxyDarwinClearHaltedEp(PUSBPROXYDEV pProxyDev, unsigned int EndPt)
 {
     PUSBPROXYDEVOSX pDevOsX = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVOSX);
@@ -1581 +1581 @@
      */
     if (EndPt == 0)
-        return true;
+        return VINF_SUCCESS;
 
     /*
@@ -1595 +1595 @@
         irc = (*pIf->ppIfI)->ClearPipeStallBothEnds(pIf->ppIfI, u8PipeRef);
         if (irc == kIOReturnSuccess)
-            return true;
+            return VINF_SUCCESS;
         AssertMsg(irc == kIOReturnNoDevice || irc == kIOReturnNotResponding, ("irc=#x (control pipe?)\n", irc));
     }
@@ -1601 +1601 @@
     LogFlow(("usbProxyDarwinClearHaltedEp: pProxyDev=%s EndPt=%#x - failure - pIf=%p irc=%#x\n",
              pProxyDev->pUsbIns->pszName, EndPt, pIf, irc));
-    return false;
+    return RTErrConvertFromDarwin(irc);
 }
 
@@ -1608 +1608 @@
  * @copydoc USBPROXYBACK::pfnUrbQueue
  */
-static DECLCALLBACK(int) usbProxyDarwinUrbQueue(PVUSBURB pUrb)
-{
-    PUSBPROXYDEV    pProxyDev = PDMINS_2_DATA(pUrb->pUsbIns, PUSBPROXYDEV);
+static DECLCALLBACK(int) usbProxyDarwinUrbQueue(PUSBPROXYDEV pProxyDev, PVUSBURB pUrb)
+{
     PUSBPROXYDEVOSX pDevOsX = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVOSX);
     LogFlow(("%s: usbProxyDarwinUrbQueue: pProxyDev=%s pUrb=%p EndPt=%d cbData=%d\n",
@@ -1629 +1628 @@
             LogFlow(("%s: usbProxyDarwinUrbQueue: pProxyDev=%s EndPt=%d cbData=%d - can't find interface / pipe!!!\n",
                      pUrb->pszDesc, pProxyDev->pUsbIns->pszName, pUrb->EndPt, pUrb->cbData));
-            return false;
+            return VERR_NOT_FOUND;
         }
 
@@ -1646 +1645 @@
     PUSBPROXYURBOSX pUrbOsX = usbProxyDarwinUrbAlloc(pDevOsX);
     if (!pUrbOsX)
-        return false;
+        return VERR_NO_MEMORY;
 
     pUrbOsX->u64SubmitTS = RTTimeMilliTS();
@@ -1795 +1794 @@
     {
         Log(("%s: usbProxyDarwinUrbQueue: success\n", pUrb->pszDesc));
-        return true;
+        return VINF_SUCCESS;
     }
     switch (irc)
@@ -1804 +1803 @@
             Log(("%s: usbProxyDarwinUrbQueue: pProxyDev=%s EndPt=%d cbData=%d - failed irc=%#x! (stall)\n",
                  pUrb->pszDesc, pProxyDev->pUsbIns->pszName, pUrb->EndPt, pUrb->cbData, irc));
-            return true;
+            return VINF_SUCCESS;
         }
     }
@@ -1810 +1809 @@
     Log(("%s: usbProxyDarwinUrbQueue: pProxyDev=%s EndPt=%d cbData=%d - failed irc=%#x!\n",
          pUrb->pszDesc, pProxyDev->pUsbIns->pszName, pUrb->EndPt, pUrb->cbData, irc));
-    return false;
+    return RTErrConvertFromDarwin(irc);
 }
 
@@ -1896 +1895 @@
  *          requests, we should probably be fine...
  */
-static DECLCALLBACK(void) usbProxyDarwinUrbCancel(PVUSBURB pUrb)
-{
-    PUSBPROXYDEV pProxyDev = PDMINS_2_DATA(pUrb->pUsbIns, PUSBPROXYDEV);
+static DECLCALLBACK(int) usbProxyDarwinUrbCancel(PUSBPROXYDEV pProxyDev, PVUSBURB pUrb)
+{
     PUSBPROXYDEVOSX pDevOsX = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVOSX);
-    //PUSBPROXYURBOSX pUrbOsX = (PUSBPROXYURBOSX)pUrb->Dev.pvProxyUrb;
     LogFlow(("%s: usbProxyDarwinUrbCancel: pProxyDev=%s EndPt=%d\n",
              pUrb->pszDesc, pProxyDev->pUsbIns->pszName, pUrb->EndPt));
@@ -1921 +1918 @@
                  pProxyDev->pUsbIns->pszName, pUrb, pUrb->EndPt));
     }
+
+    int rc = VINF_SUCCESS;
     if (irc != kIOReturnSuccess)
+    {
         Log(("usbProxyDarwinUrbCancel: pProxyDev=%s pUrb=%p EndPt=%d -> %#x!\n",
              pProxyDev->pUsbIns->pszName, pUrb, pUrb->EndPt, irc));
+        rc = RTErrConvertFromDarwin(irc);
+    }
+
+    return rc;
 }
 

trunk/src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp

@@ -537 +537 @@
         LogFlow(("usbProxyFreeBSDSetInterface: Freeing kernel resources "
                  "failed failed rc=%d\n", rc));
-        return false;
+        return rc;
     }
 
@@ -558 +558 @@
             LogFlow(("usbProxyFreeBSDSetConfig: configuration "
                      "%d not found\n", iCfg));
-            return false;
+            return VERR_NOT_FOUND;
         }
     }
@@ -565 +565 @@
     rc = usbProxyFreeBSDDoIoCtl(pProxyDev, USB_SET_CONFIG, &iCfgIndex, true);
     if (RT_FAILURE(rc))
-        return false;
+        return rc;
 
     /* Allocate kernel ressources again. */
-    rc = usbProxyFreeBSDFsInit(pProxyDev);
-    if (RT_FAILURE(rc))
-        return false;
-
-    return true;
+    return usbProxyFreeBSDFsInit(pProxyDev);
 }
 
@@ -590 +586 @@
      * failures
      */
-    rc = usbProxyFreeBSDDoIoCtl(pProxyDev, USB_IFACE_DRIVER_DETACH, &iIf, true);
+    usbProxyFreeBSDDoIoCtl(pProxyDev, USB_IFACE_DRIVER_DETACH, &iIf, true);
 
     /* Try to claim interface */
-    rc = usbProxyFreeBSDDoIoCtl(pProxyDev, USB_CLAIM_INTERFACE, &iIf, true);
-    if (RT_FAILURE(rc))
-        return false;
-
-    return true;
+    return usbProxyFreeBSDDoIoCtl(pProxyDev, USB_CLAIM_INTERFACE, &iIf, true);
 }
 
@@ -611 +603 @@
         "ifnum=%x\n", pProxyDev->pUsbIns->pszName, iIf));
 
-    rc = usbProxyFreeBSDDoIoCtl(pProxyDev, USB_RELEASE_INTERFACE, &iIf, true);
-    if (RT_FAILURE(rc))
-        return false;
-
-    return true;
+    return usbProxyFreeBSDDoIoCtl(pProxyDev, USB_RELEASE_INTERFACE, &iIf, true);
 }
 
@@ -623 +611 @@
  * @returns success indicator.
  */
-static DECLCALLBACK(int)
-usbProxyFreeBSDSetInterface(PUSBPROXYDEV pProxyDev, int iIf, int iAlt)
+static DECLCALLBACK(int) usbProxyFreeBSDSetInterface(PUSBPROXYDEV pProxyDev, int iIf, int iAlt)
 {
     PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
@@ -639 +626 @@
         LogFlow(("usbProxyFreeBSDSetInterface: Freeing kernel resources "
                  "failed failed rc=%d\n", rc));
-        return false;
+        return rc;
     }
     memset(&UsbIntAlt, 0, sizeof(UsbIntAlt));
@@ -650 +637 @@
         LogFlow(("usbProxyFreeBSDSetInterface: Setting interface %d %d "
                  "failed rc=%d\n", iIf, iAlt, rc));
-        return false;
-    }
-
-    rc = usbProxyFreeBSDFsInit(pProxyDev);
-    if (RT_FAILURE(rc))
-        return false;
-
-    return true;
+        return rc;
+    }
+
+    return usbProxyFreeBSDFsInit(pProxyDev);
 }
 
@@ -663 +646 @@
  * Clears the halted endpoint 'ep_num'.
  */
-static DECLCALLBACK(bool) usbProxyFreeBSDClearHaltedEp(PUSBPROXYDEV pProxyDev, unsigned int ep_num)
-{
-    struct usb_ctl_request Req;
-    int rc;
-
+static DECLCALLBACK(int) usbProxyFreeBSDClearHaltedEp(PUSBPROXYDEV pProxyDev, unsigned int ep_num)
+{
     LogFlow(("usbProxyFreeBSDClearHaltedEp: pProxyDev=%s ep_num=%u\n",
              pProxyDev->pUsbIns->pszName, ep_num));
@@ -676 +656 @@
      */
     if ((ep_num & 0xF) == 0)
-        return true;
-
+        return VINF_SUCCESS;
+
+    struct usb_ctl_request Req;
     memset(&Req, 0, sizeof(Req));
-
     usbProxyFreeBSDSetupReq(&Req.ucr_request,
                             VUSB_DIR_TO_DEV | VUSB_TO_ENDPOINT,
                             VUSB_REQ_CLEAR_FEATURE, 0, ep_num, 0);
 
-    rc = usbProxyFreeBSDDoIoCtl(pProxyDev, USB_DO_REQUEST, &Req, true);
+    int rc = usbProxyFreeBSDDoIoCtl(pProxyDev, USB_DO_REQUEST, &Req, true);
 
     LogFlow(("usbProxyFreeBSDClearHaltedEp: rc=%Rrc\n", rc));
-
-    if (RT_FAILURE(rc))
-        return false;
-
-    return true;
+    return rc;
 }
 
@@ -727 +703 @@
 
     if (index < 0)
-        return false;
+        return VERR_INVALID_PARAMETER;
 
     pEndpointFBSD = &pDevFBSD->aSwEndpoint[index];
@@ -997 +973 @@
  * The URB requires reaping, so we don't change its state.
  */
-static DECLCALLBACK(void) usbProxyFreeBSDUrbCancel(PVUSBURB pUrb)
-{
-    PUSBPROXYDEV pProxyDev = PDMINS_2_DATA(pUrb->pUsbIns, PUSBPROXYDEV);
+static DECLCALLBACK(int) usbProxyFreeBSDUrbCancel(PUSBPROXYDEV pProxyDev, PVUSBURB pUrb)
+{
     int index;
 
@@ -1005 +980 @@
 
     if (index < 0 || index >= USBFBSD_MAXENDPOINTS)
-        return;
+        return VINF_SUCCESS; /* invalid index, pretend success. */
 
     LogFlow(("usbProxyFreeBSDUrbCancel: epindex=%u\n", (unsigned)index));
-
-    usbProxyFreeBSDEndpointClose(pProxyDev, index);
+    return usbProxyFreeBSDEndpointClose(pProxyDev, index);
 }
 

trunk/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp

@@ -1126 +1126 @@
     {
         Log(("usb-linux: Set configuration. errno=%d\n", errno));
-        return false;
-    }
-    return true;
+        return RTErrConvertFromErrno(errno);
+    }
+    return VINF_SUCCESS;
 }
 
@@ -1144 +1144 @@
     {
         Log(("usb-linux: Claim interface. errno=%d pProxyDev=%s\n", errno, usbProxyGetName(pProxyDev)));
-        return false;
-    }
-    return true;
+        return RTErrConvertFromErrno(errno);
+    }
+    return VINF_SUCCESS;
 }
 
@@ -1161 +1161 @@
     {
         Log(("usb-linux: Release interface, errno=%d. pProxyDev=%s\n", errno, usbProxyGetName(pProxyDev)));
-        return false;
-    }
-    return true;
+        return RTErrConvertFromErrno(errno);
+    }
+    return VINF_SUCCESS;
 }
 
@@ -1182 +1182 @@
     {
         Log(("usb-linux: Set interface, errno=%d. pProxyDev=%s\n", errno, usbProxyGetName(pProxyDev)));
-        return false;
-    }
-    return true;
+        return RTErrConvertFromErrno(errno);
+    }
+    return VINF_SUCCESS;
 }
 
@@ -1191 +1191 @@
  * Clears the halted endpoint 'EndPt'.
  */
-static bool usbProxyLinuxClearHaltedEp(PUSBPROXYDEV pProxyDev, unsigned int EndPt)
+static int usbProxyLinuxClearHaltedEp(PUSBPROXYDEV pProxyDev, unsigned int EndPt)
 {
     LogFlow(("usbProxyLinuxClearHaltedEp: pProxyDev=%s EndPt=%u\n", usbProxyGetName(pProxyDev), EndPt));
@@ -1206 +1206 @@
             Log(("usb-linux: clear_halted_ep failed errno=%d. pProxyDev=%s ep=%d - IGNORED\n",
                  errno, usbProxyGetName(pProxyDev), EndPt));
-            return true;
+            return VINF_SUCCESS;
         }
         Log(("usb-linux: clear_halted_ep failed errno=%d. pProxyDev=%s ep=%d\n",
              errno, usbProxyGetName(pProxyDev), EndPt));
-        return false;
-    }
-    return true;
+        return RTErrConvertFromErrno(errno);
+    }
+    return VINF_SUCCESS;
 }
 
@@ -1277 +1277 @@
  * retries
  *
- * @returns true / false.
- */
-static bool usbProxyLinuxSubmitURB(PUSBPROXYDEV pProxyDev, PUSBPROXYURBLNX pCur, PVUSBURB pUrb, bool *pfUnplugged)
-{
+ * @returns VBox status code.
+ */
+static int usbProxyLinuxSubmitURB(PUSBPROXYDEV pProxyDev, PUSBPROXYURBLNX pCur, PVUSBURB pUrb, bool *pfUnplugged)
+{
+    int rc = VINF_SUCCESS;
     PUSBPROXYDEVLNX pDevLnx = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVLNX);
     unsigned        cTries = 0;
@@ -1292 +1293 @@
             Log(("usbProxyLinuxSubmitURB: ENODEV -> unplugged. pProxyDev=%s\n", usbProxyGetName(pProxyDev)));
             *pfUnplugged = true;
-            return false;
+            return RTErrConvertFromErrno(errno);
         }
 
@@ -1302 +1303 @@
             continue;
         }
-        return false;
-    }
-    return true;
+        return RTErrConvertFromErrno(errno);
+    }
+    return VINF_SUCCESS;
 }
 
@@ -1353 +1354 @@
  * URB at a time -> worse performance but correct behaviour.
  *
- * @returns true / false.
+ * @returns VBox status code.
  * @param   pProxyDev   The proxy device.
  * @param   pUrbLnx     The linux URB which was rejected because of being too big.
@@ -1379 +1380 @@
             AssertMsgFailed(("We can't split isochronous URBs!\n"));
             usbProxyLinuxUrbFree(pProxyDev, pUrbLnx);
-            return false;
+            return VERR_INVALID_PARAMETER; /** @todo: Better status code. */
     }
     pUrbLnx->KUrb.endpoint          = pUrb->EndPt;
@@ -1402 +1403 @@
     pUrbLnx->cbSplitRemaining = cbLeft;
 
-    bool fSucceeded = false;
+    int rc = VINF_SUCCESS;
     bool fUnplugged = false;
     if (pUrb->enmDir == VUSBDIRECTION_IN && !pUrb->fShortNotOk)
@@ -1409 +1410 @@
          * and only if necessary.
          */
-        fSucceeded = true;
         Log(("usb-linux: Large ShortOK read, only queuing first fragment.\n"));
         Assert(pUrbLnx->cbSplitRemaining > 0 && pUrbLnx->cbSplitRemaining < 256 * _1K);
-        fSucceeded = usbProxyLinuxSubmitURB(pProxyDev, pUrbLnx, pUrb, &fUnplugged);
+        rc = usbProxyLinuxSubmitURB(pProxyDev, pUrbLnx, pUrb, &fUnplugged);
     }
     else
@@ -1422 +1422 @@
             pCur = usbProxyLinuxSplitURBFragment(pProxyDev, pUrbLnx, pCur);
             if (!pCur)
-            {
-                return false;
-            }
+                return VERR_NO_MEMORY;
         }
         Assert(pCur->cbSplitRemaining == 0);
@@ -1432 +1430 @@
         for (i = 0; i < cKUrbs; i++, pCur = pCur->pSplitNext)
         {
-            fSucceeded = usbProxyLinuxSubmitURB(pProxyDev, pCur, pUrb, &fUnplugged);
-            if (!fSucceeded)
+            rc = usbProxyLinuxSubmitURB(pProxyDev, pCur, pUrb, &fUnplugged);
+            if (RT_FAILURE(rc))
                 break;
         }
     }
 
-    if (fSucceeded)
+    if (RT_SUCCESS(rc))
     {
         pUrb->Dev.pvPrivate = pUrbLnx;
         LogFlow(("usbProxyLinuxUrbQueueSplit: ok\n"));
-        return true;
+        return VINF_SUCCESS;
     }
 
     usbProxyLinuxCleanupFailedSubmit(pProxyDev, pUrbLnx, pCur, pUrb, &fUnplugged);
-    return false;
+    return rc;
 }
 
@@ -1453 +1451 @@
  * @copydoc USBPROXYBACK::pfnUrbQueue
  */
-static DECLCALLBACK(int) usbProxyLinuxUrbQueue(PVUSBURB pUrb)
-{
+static DECLCALLBACK(int) usbProxyLinuxUrbQueue(PUSBPROXYDEV pProxyDev, PVUSBURB pUrb)
+{
+    int             rc = VINF_SUCCESS;
     unsigned        cTries;
-#ifndef RDESKTOP
-    PUSBPROXYDEV    pProxyDev = PDMINS_2_DATA(pUrb->pUsbIns, PUSBPROXYDEV);
-#else
-    PUSBPROXYDEV    pProxyDev = usbProxyFromVusbDev(pUrb->pDev);
-#endif
     PUSBPROXYDEVLNX pDevLnx = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVLNX);
     LogFlow(("usbProxyLinuxUrbQueue: pProxyDev=%s pUrb=%p EndPt=%d cbData=%d\n",
@@ -1470 +1464 @@
     PUSBPROXYURBLNX pUrbLnx = usbProxyLinuxUrbAlloc(pProxyDev, NULL);
     if (!pUrbLnx)
-        return false;
+        return VERR_NO_MEMORY;
 
     pUrbLnx->KUrb.endpoint          = pUrb->EndPt | (pUrb->enmDir == VUSBDIRECTION_IN ? 0x80 : 0);
@@ -1491 +1485 @@
             {
                 usbProxyLinuxUrbFree(pProxyDev, pUrbLnx);
-                return false;
+                return VERR_BUFFER_UNDERFLOW;
             }
             usbProxyLinuxUrbSwapSetup((PVUSBSETUP)pUrb->abData);
@@ -1515 +1509 @@
             break;
         default:
-            goto l_err;
+            rc = VERR_INVALID_PARAMETER; /** @todo: better status code. */
     }
 
@@ -1534 +1528 @@
 
             usbProxLinuxUrbUnplugged(pProxyDev);
-            return false;
+            return RTErrConvertFromErrno(errno);
         }
 
@@ -1553 +1547 @@
         if (errno != EBUSY && ++cTries < 3) /* this doesn't work for the floppy :/ */
             continue;
+
+        rc = RTErrConvertFromErrno(errno);
+
 l_err:
         if (pUrb->enmType == VUSBXFERTYPE_MSG)
             usbProxyLinuxUrbSwapSetup((PVUSBSETUP)pUrb->abData);
         usbProxyLinuxUrbFree(pProxyDev, pUrbLnx);
-        return false;
+        return rc;
     }
     pUrbLnx->u64SubmitTS = RTTimeMilliTS();
@@ -1563 +1560 @@
     LogFlow(("usbProxyLinuxUrbQueue: ok\n"));
     pUrb->Dev.pvPrivate = pUrbLnx;
-    return true;
+    return rc;
 }
 
@@ -1951 +1948 @@
  * The URB requires reaping, so we don't change its state.
  */
-static DECLCALLBACK(void) usbProxyLinuxUrbCancel(PVUSBURB pUrb)
-{
-#ifndef RDESKTOP
-    PUSBPROXYDEV pProxyDev = PDMINS_2_DATA(pUrb->pUsbIns, PUSBPROXYDEV);
-#else
-    PUSBPROXYDEV pProxyDev = usbProxyFromVusbDev(pUrb->pDev);
-#endif
+static DECLCALLBACK(int) usbProxyLinuxUrbCancel(PUSBPROXYDEV pProxyDev, PVUSBURB pUrb)
+{
+    int rc = VINF_SUCCESS;
     PUSBPROXYURBLNX pUrbLnx = (PUSBPROXYURBLNX)pUrb->Dev.pvPrivate;
     if (pUrbLnx->pSplitHead)
@@ -1973 +1966 @@
             if (errno == ENODEV)
                 break;
+            /** @todo: Think about how to handle errors wrt. to the status code. */
             Log(("usb-linux: Discard URB %p failed, errno=%d. pProxyDev=%s!!! (split)\n",
                  pUrb, errno, usbProxyGetName(pProxyDev)));
@@ -1983 +1977 @@
             &&  errno != ENODEV /* deal with elsewhere. */
             &&  errno != ENOENT)
+        {
             Log(("usb-linux: Discard URB %p failed, errno=%d. pProxyDev=%s!!!\n",
                  pUrb, errno, usbProxyGetName(pProxyDev)));
-    }
+            rc = RTErrConvertFromErrno(errno);
+        }
+    }
+
+    return rc;
 }
 

trunk/src/VBox/Devices/USB/solaris/USBProxyDevice-solaris.cpp

@@ -494 +494 @@
     SetConfigReq.bConfigValue = iCfg;
     int rc = usbProxySolarisIOCtl(pDevSol, VBOXUSB_IOCTL_SET_CONFIG, &SetConfigReq, sizeof(SetConfigReq));
-    if (RT_SUCCESS(rc))
-        return true;
-
-    if (rc != VERR_VUSB_DEVICE_NOT_ATTACHED)
+    if (   RT_FAILURE(rc)
+        && rc != VERR_VUSB_DEVICE_NOT_ATTACHED)
         LogRel((USBPROXY ":usbProxySolarisSetConfig failed to switch configuration. rc=%Rrc\n", rc));
 
-    return false;
+    return rc;
 }
 
@@ -514 +512 @@
 static DECLCALLBACK(int) usbProxySolarisClaimInterface(PUSBPROXYDEV pProxyDev, int iIf)
 {
-    return true;
+    return VINF_SUCCESS;
 }
 
@@ -528 +526 @@
 static DECLCALLBACK(int) usbProxySolarisReleaseInterface(PUSBPROXYDEV pProxyDev, int iIf)
 {
-    return true;
+    return VINF_SUCCESS;
 }
 
@@ -548 +546 @@
     SetInterfaceReq.bAlternate = iAlt;
     int rc = usbProxySolarisIOCtl(pDevSol, VBOXUSB_IOCTL_SET_INTERFACE, &SetInterfaceReq, sizeof(SetInterfaceReq));
-    if (RT_SUCCESS(rc))
-        return true;
-
-    if (rc != VERR_VUSB_DEVICE_NOT_ATTACHED)
+    if (   RT_FAILURE(rc)
+        && rc != VERR_VUSB_DEVICE_NOT_ATTACHED)
         LogRel((USBPROXY ":usbProxySolarisSetInterface failed to set interface. rc=%Rrc\n", rc));
 
-    return false;
+    return rc;
 }
 
@@ -561 +557 @@
  * Clears the halted endpoint 'EndPt'.
  */
-static DECLCALLBACK(bool) usbProxySolarisClearHaltedEp(PUSBPROXYDEV pProxyDev, unsigned int EndPt)
+static DECLCALLBACK(int) usbProxySolarisClearHaltedEp(PUSBPROXYDEV pProxyDev, unsigned int EndPt)
 {
     LogFlowFunc((USBPROXY ":usbProxySolarisClearHaltedEp pProxyDev=%p EndPt=%#x\n", pProxyDev, EndPt));
@@ -571 +567 @@
     ClearEpReq.bEndpoint = EndPt;
     int rc = usbProxySolarisIOCtl(pDevSol, VBOXUSB_IOCTL_CLEAR_EP, &ClearEpReq, sizeof(ClearEpReq));
-    if (RT_SUCCESS(rc))
-        return true;
-
-    if (rc != VERR_VUSB_DEVICE_NOT_ATTACHED)
+    if (   RT_FAILURE(rc)
+        && rc != VERR_VUSB_DEVICE_NOT_ATTACHED)
         LogRel((USBPROXY ":usbProxySolarisClearHaltedEp failed! rc=%Rrc\n", rc));
 
-    return false;
+    return rc;
 }
 
@@ -596 +590 @@
     {
         LogRel((USBPROXY ":usbProxySolarisUrbQueue: Failed to allocate URB.\n"));
-        return false;
+        return VERR_NO_MEMORY;
     }
 
@@ -632 +626 @@
             LogFlow((USBPROXY ":usbProxySolarisUrbQueue success cbData=%d.\n", pUrb->cbData));
         pUrb->Dev.pvPrivate = pUrbSol;
-        return true;
+        return VINF_SUCCESS;
     }
 
@@ -639 +633 @@
              pProxyDev->pUsbIns->pszName, pUrb, pUrb->EndPt, UrbReq.bEndpoint, pUrb->enmType, pUrb->enmDir, pUrb->cbData, rc));
 
-    return false;
+    return rc;
 }
 
@@ -650 +644 @@
  *          on Solaris. So we just abort pending URBs on the pipe.
  */
-static DECLCALLBACK(void) usbProxySolarisUrbCancel(PVUSBURB pUrb)
+static DECLCALLBACK(int) usbProxySolarisUrbCancel(PUSBPROXYDEV pProxyDev, PVUSBURB pUrb)
 {
     PUSBPROXYURBSOL pUrbSol = (PUSBPROXYURBSOL)pUrb->Dev.pvPrivate;
-
-    PUSBPROXYDEV pProxyDev = PDMINS_2_DATA(pUrb->pUsbIns, PUSBPROXYDEV);
     PUSBPROXYDEVSOL pDevSol = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVSOL);
     AssertPtrReturnVoid(pDevSol);
@@ -662 +654 @@
     /* Aborting the control pipe isn't supported, pretend success. */
     if (!pUrb->EndPt)
-        return;
+        return VINF_SUCCESS;
 
     VBOXUSBREQ_ABORT_PIPE AbortPipeReq;
     AbortPipeReq.bEndpoint = pUrb->EndPt | (pUrb->enmDir == VUSBDIRECTION_IN ? VUSB_DIR_TO_HOST : VUSB_DIR_TO_DEVICE);
     int rc = usbProxySolarisIOCtl(pDevSol, VBOXUSB_IOCTL_ABORT_PIPE, &AbortPipeReq, sizeof(AbortPipeReq));
-    if (RT_FAILURE(rc))
-    {
-        if (rc != VERR_VUSB_DEVICE_NOT_ATTACHED)
-            LogRel((USBPROXY ":usbProxySolarisUrbCancel failed to abort pipe. rc=%Rrc\n", rc));
-        return;
-    }
-
-    LogFlow((USBPROXY ":usbProxySolarisUrbCancel success.\n", rc));
+    if (   RT_FAILURE(rc)
+        && rc != VERR_VUSB_DEVICE_NOT_ATTACHED)
+        LogRel((USBPROXY ":usbProxySolarisUrbCancel failed to abort pipe. rc=%Rrc\n", rc));
+
+    LogFlow((USBPROXY ":usbProxySolarisUrbCancel: rc=%Rrc.\n", rc));
+    return rc;
 }
 

trunk/src/VBox/Devices/USB/vrdp/USBProxyDevice-vrdp.cpp

@@ -118 +118 @@
     }
 
-    return RT_SUCCESS(rc);
+    return rc;
 }
 
@@ -135 +135 @@
     }
 
-    return RT_SUCCESS(rc);
+    return rc;
 }
 
@@ -152 +152 @@
     }
 
-    return RT_SUCCESS(rc);
+    return rc;
 }
 
@@ -169 +169 @@
     }
 
-    return RT_SUCCESS(rc);
-}
-
-static DECLCALLBACK(bool) usbProxyVrdpClearHaltedEp(PUSBPROXYDEV pProxyDev, unsigned int ep)
+    return rc;
+}
+
+static DECLCALLBACK(int) usbProxyVrdpClearHaltedEp(PUSBPROXYDEV pProxyDev, unsigned int ep)
 {
     LogFlow(("usbProxyVrdpClearHaltedEp: pProxyDev=%s ep=%u\n", pProxyDev->pUsbIns->pszName, ep));
@@ -186 +186 @@
     }
 
-    return RT_SUCCESS(rc);
-}
-
-static DECLCALLBACK(int) usbProxyVrdpUrbQueue(PVUSBURB pUrb)
+    return rc;
+}
+
+static DECLCALLBACK(int) usbProxyVrdpUrbQueue(PUSBPROXYDEV pProxyDev, PVUSBURB pUrb)
 {
     LogFlow(("usbProxyVrdpUrbQueue: pUrb=%p\n", pUrb));
@@ -197 +197 @@
     {
         Log(("usbproxy: isochronous transfers aren't implemented yet.\n"));
-        return false;
-    }
-
-    PUSBPROXYDEV pProxyDev = PDMINS_2_DATA(pUrb->pUsbIns, PUSBPROXYDEV);
-    PUSBPROXYDEVVRDP pDevVrdp = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVVRDP);
-
+        return VERR_NOT_IMPLEMENTED;
+    }
+
+    PUSBPROXYDEVVRDP pDevVrdp = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVVRDP);
     int rc = pDevVrdp->pCallback->pfnQueueURB (pDevVrdp->pDevice, pUrb->enmType, pUrb->EndPt, pUrb->enmDir, pUrb->cbData,
                                                pUrb->abData, pUrb, (PREMOTEUSBQURB *)&pUrb->Dev.pvPrivate);
@@ -212 +210 @@
     }
 
-    return RT_SUCCESS(rc);
+    return rc;
 }
 
@@ -245 +243 @@
 }
 
-static DECLCALLBACK(void) usbProxyVrdpUrbCancel(PVUSBURB pUrb)
+static DECLCALLBACK(int) usbProxyVrdpUrbCancel(PUSBPROXYDEV pProxyDev, PVUSBURB pUrb)
 {
     LogFlow(("usbProxyVrdpUrbCancel: pUrb=%p\n", pUrb));
 
-    PUSBPROXYDEV pProxyDev = PDMINS_2_DATA(pUrb->pUsbIns, PUSBPROXYDEV);
-    PUSBPROXYDEVVRDP pDevVrdp = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVVRDP);
-
+    PUSBPROXYDEVVRDP pDevVrdp = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVVRDP);
     pDevVrdp->pCallback->pfnCancelURB (pDevVrdp->pDevice, (PREMOTEUSBQURB)pUrb->Dev.pvPrivate);
+    return VINF_SUCCESS; /** @todo: Enhance remote interface to pass a status code. */
 }
 
@@ -260 +257 @@
 
     PUSBPROXYDEVVRDP pDevVrdp = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVVRDP);
-
     return pDevVrdp->pCallback->pfnWakeup (pDevVrdp->pDevice);
 }

trunk/src/VBox/Devices/USB/win/USBProxyDevice-win.cpp

@@ -83 +83 @@
 *******************************************************************************/
 static int usbProxyWinSetInterface(PUSBPROXYDEV p, int ifnum, int setting);
-static DECLCALLBACK(int) usbProxyWinAsyncIoThread(RTTHREAD ThreadSelf, void *lpParameter);
+
+/**
+ * Converts the given Windows error code to VBox handling unplugged devices.
+ *
+ * @returns VBox status code.
+ * @param   pProxDev    The USB proxy device instance.
+ * @param   dwErr       Windows error code.
+ */
+static int usbProxyWinHandleUnpluggedDevice(PUSBPROXYDEV pProxyDev, DWORD dwErr)
+{
+    PPRIV_USBW32 pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
+
+    if (   dwErr == ERROR_INVALID_HANDLE_STATE
+        || dwErr == ERROR_BAD_COMMAND)
+    {
+        Log(("usbproxy: device %x unplugged!!\n", pPriv->hDev));
+        pProxyDev->fDetached = true;
+    }
+    else
+        AssertMsgFailed(("lasterr=%d\n", dwErr));
+    return RTErrConvertFromWin32(dwErr);
+}
 
 /**
@@ -279 +300 @@
     cbReturned = 0;
     if (DeviceIoControl(pPriv->hDev, SUPUSB_IOCTL_USB_SET_CONFIG, &in, sizeof(in), NULL, 0, &cbReturned, NULL))
-        return 1;
-
-    if (   GetLastError() == ERROR_INVALID_HANDLE_STATE
-        || GetLastError() == ERROR_BAD_COMMAND)
-    {
-        Log(("usbproxy: device %p unplugged!!\n", pPriv->hDev));
-        pProxyDev->fDetached = true;
-    }
-    else
-        AssertMsgFailed(("lasterr=%u\n", GetLastError()));
-
-    return 0;
+        return VINF_SUCCESS;
+
+    return usbProxyWinHandleUnpluggedDevice(pProxyDev, GetLastError());
 }
 
@@ -305 +317 @@
 
     Assert(pPriv);
-    return true;
+    return VINF_SUCCESS;
 }
 
@@ -314 +326 @@
 
     Assert(pPriv);
-    return true;
+    return VINF_SUCCESS;
 }
 
@@ -336 +348 @@
     cbReturned = 0;
     if (DeviceIoControl(pPriv->hDev, SUPUSB_IOCTL_USB_SELECT_INTERFACE, &in, sizeof(in), NULL, 0, &cbReturned, NULL))
-        return true;
-
-    if (    GetLastError() == ERROR_INVALID_HANDLE_STATE
-        ||  GetLastError() == ERROR_BAD_COMMAND)
-    {
-        Log(("usbproxy: device %x unplugged!!\n", pPriv->hDev));
-        pProxyDev->fDetached = true;
-    }
-    else
-        AssertMsgFailed(("lasterr=%d\n", GetLastError()));
-    return 0;
+        return VINF_SUCCESS;
+
+    return usbProxyWinHandleUnpluggedDevice(pProxyDev, GetLastError());
 }
 
@@ -352 +356 @@
  * Clears the halted endpoint 'ep'.
  */
-static DECLCALLBACK(bool) usbProxyWinClearHaltedEndPt(PUSBPROXYDEV pProxyDev, unsigned int ep)
+static DECLCALLBACK(int) usbProxyWinClearHaltedEndPt(PUSBPROXYDEV pProxyDev, unsigned int ep)
 {
     PPRIV_USBW32 pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
@@ -365 +369 @@
     cbReturned = 0;
     if (DeviceIoControl(pPriv->hDev, SUPUSB_IOCTL_USB_CLEAR_ENDPOINT, &in, sizeof(in), NULL, 0, &cbReturned, NULL))
-        return true;
-
-    if (    GetLastError() == ERROR_INVALID_HANDLE_STATE
-        ||  GetLastError() == ERROR_BAD_COMMAND)
-    {
-        Log(("usbproxy: device %x unplugged!!\n", pPriv->hDev));
-        pProxyDev->fDetached = true;
-    }
-    else
-        AssertMsgFailed(("lasterr=%d\n", GetLastError()));
-    return 0;
+        return VINF_SUCCESS;
+
+    return usbProxyWinHandleUnpluggedDevice(pProxyDev, GetLastError());
 }
 
@@ -397 +393 @@
         return VINF_SUCCESS;
 
-    rc = GetLastError();
-    if (    rc == ERROR_INVALID_HANDLE_STATE
-        ||  rc == ERROR_BAD_COMMAND)
-    {
-        Log(("usbproxy: device %x unplugged!!\n", pPriv->hDev));
-        pProxyDev->fDetached = true;
-    }
-    else
-        AssertMsgFailed(("lasterr=%d\n", rc));
-    return RTErrConvertFromWin32(rc);
+    return usbProxyWinHandleUnpluggedDevice(pProxyDev, GetLastError());
 }
 
@@ -412 +399 @@
  * @copydoc USBPROXYBACK::pfnUrbQueue
  */
-static DECLCALLBACK(int) usbProxyWinUrbQueue(PVUSBURB pUrb)
-{
-    PUSBPROXYDEV    pProxyDev = PDMINS_2_DATA(pUrb->pUsbIns, PUSBPROXYDEV);
+static DECLCALLBACK(int) usbProxyWinUrbQueue(PUSBPROXYDEV pProxyDev, PVUSBURB pUrb)
+{
     PPRIV_USBW32 pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
     Assert(pPriv);
@@ -424 +410 @@
     PQUEUED_URB pQUrbWin = (PQUEUED_URB)RTMemAllocZ(sizeof(QUEUED_URB));
     if (!pQUrbWin)
-        return false;
+        return VERR_NO_MEMORY;
 
     switch (pUrb->enmType)
@@ -443 +429 @@
         default:
             AssertMsgFailed(("Invalid type %d\n", pUrb->enmType));
-            return false;
+            return VERR_INVALID_PARAMETER;
     }
 
@@ -460 +446 @@
         default:
             AssertMsgFailed(("Invalid direction %d\n", pUrb->enmDir));
-            return false;
+            return VERR_INVALID_PARAMETER;
     }
 
@@ -474 +460 @@
         pQUrbWin->urbwin.flags = USBSUP_FLAG_SHORT_OK;
 
+    int rc = VINF_SUCCESS;
     pQUrbWin->overlapped.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
     if (pQUrbWin->overlapped.hEvent != INVALID_HANDLE_VALUE)
@@ -492 +479 @@
             RTCritSectLeave(&pPriv->CritSect);
             SetEvent(pPriv->hEventWakeup);
-            return true;
+            return VINF_SUCCESS;
         }
         else
@@ -500 +487 @@
                 || dwErr == ERROR_BAD_COMMAND)
             {
-                PUSBPROXYDEV pProxyDev = PDMINS_2_DATA(pQUrbWin->urb->pUsbIns, PUSBPROXYDEV);
                 Log(("usbproxy: device %p unplugged!!\n", pPriv->hDev));
                 pProxyDev->fDetached = true;
@@ -506 +492 @@
             else
                 AssertMsgFailed(("dwErr=%X urbwin.error=%d (submit urb)\n", dwErr, pQUrbWin->urbwin.error));
+            rc = RTErrConvertFromWin32(dwErr);
             CloseHandle(pQUrbWin->overlapped.hEvent);
             pQUrbWin->overlapped.hEvent = INVALID_HANDLE_VALUE;
@@ -514 +501 @@
     {
         AssertMsgFailed(("FAILED!!, hEvent(0x%p)\n", pQUrbWin->overlapped.hEvent));
+        rc = VERR_NO_MEMORY;
     }
 #endif
@@ -519 +507 @@
     Assert(pQUrbWin->overlapped.hEvent == INVALID_HANDLE_VALUE);
     RTMemFree(pQUrbWin);
-    return false;
+    return rc;
 }
 
@@ -587 +575 @@
         RTCritSectEnter(&pPriv->CritSect);
 
-        /* Ensure we've got sufficient space in the arrays.
-         * Do it inside the lock to ensure we do not concur
-         * with the usbProxyWinAsyncIoThread */
+        /* Ensure we've got sufficient space in the arrays. */
         if (pPriv->cQueuedUrbs + pPriv->cPendingUrbs + 1 > pPriv->cAllocatedUrbs)
         {
@@ -719 +705 @@
  *          exactly what the guest wants to do.
  */
-static DECLCALLBACK(void) usbProxyWinUrbCancel(PVUSBURB pUrb)
-{
-    PUSBPROXYDEV      pProxyDev = PDMINS_2_DATA(pUrb->pUsbIns, PUSBPROXYDEV);
+static DECLCALLBACK(int) usbProxyWinUrbCancel(PUSBPROXYDEV pProxyDev, PVUSBURB pUrb)
+{
     PPRIV_USBW32      pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
     PQUEUED_URB       pQUrbWin  = (PQUEUED_URB)pUrb->Dev.pvPrivate;
-    int                     rc;
     USBSUP_CLEAR_ENDPOINT   in;
     DWORD                   cbReturned;
-    Assert(pQUrbWin);
+
+    AssertPtrReturn(pQUrbWin, VERR_INVALID_PARAMETER);
 
     in.bEndpoint = pUrb->EndPt | (pUrb->enmDir == VUSBDIRECTION_IN ? 0x80 : 0);
@@ -734 +719 @@
     cbReturned = 0;
     if (DeviceIoControl(pPriv->hDev, SUPUSB_IOCTL_USB_ABORT_ENDPOINT, &in, sizeof(in), NULL, 0, &cbReturned, NULL))
-        return;
-
-    rc = GetLastError();
-    if (    rc == ERROR_INVALID_HANDLE_STATE
-        ||  rc == ERROR_BAD_COMMAND)
+        return VINF_SUCCESS;
+
+    DWORD dwErr = GetLastError();
+    if (    dwErr == ERROR_INVALID_HANDLE_STATE
+        ||  dwErr == ERROR_BAD_COMMAND)
     {
         Log(("usbproxy: device %x unplugged!!\n", pPriv->hDev));
         pProxyDev->fDetached = true;
+        return VINF_SUCCESS; /* Fake success and deal with the unplugged device elsewhere. */
     }
     else

trunk/src/VBox/RDP/client/vrdp/rdpusb.c

@@ -133 +133 @@
 }
 
-static inline int op_usbproxy_back_queue_urb(PVUSBURB pUrb)
-{
-    return g_USBProxyDeviceHost.pfnUrbQueue(pUrb);
+static inline int op_usbproxy_back_queue_urb(PUSBPROXYDEV pDev, PVUSBURB pUrb)
+{
+    return g_USBProxyDeviceHost.pfnUrbQueue(pDev, pUrb);
 }
 
@@ -148 +148 @@
 }
 
-static inline void op_usbproxy_back_cancel_urb(PVUSBURB pUrb)
-{
-    return g_USBProxyDeviceHost.pfnUrbCancel (pUrb);
+static inline int op_usbproxy_back_cancel_urb(PUSBPROXYDEV pDev, PVUSBURB pUrb)
+{
+    return g_USBProxyDeviceHost.pfnUrbCancel (pDev, pUrb);
 }
 
@@ -699 +699 @@
                         }
 
-                        rc = op_usbproxy_back_queue_urb(pUrb);
+                        rc = op_usbproxy_back_queue_urb(proxy, pUrb);
 
                         /* No reply required. */
@@ -772 +772 @@
                         if (pUrb)
                         {
-                                op_usbproxy_back_cancel_urb(pUrb);
+                                op_usbproxy_back_cancel_urb(proxy, pUrb);
 
                                 /* No reply required. */