Changeset 50234 in vbox for trunk/src/VBox/Devices/USB/win

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

91835

Message:

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

File:

• trunk/src/VBox/Devices/USB/win/USBProxyDevice-win.cpp (modified) (21 diffs)

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