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

Timestamp:

Jan 24, 2014 9:16:37 PM (11 years ago)

Author:

vboxsync

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

91829

Message:

USB/Proxy: Start a source code cleanup, remove unused struct members and make the generic proxy code do the backend specific memory allocation (fixes a small memory leak in the VRDP backend when closing a proxy device)

File:

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

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

@@ -9 +9 @@
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -90 +90 @@
  * @returns VBox status code.
  */
-static int usbProxyWinOpen(PUSBPROXYDEV pProxyDev, const char *pszAddress, void *pvBackend)
-{
-    /* Here you just need to use pProxyDev->priv to store whatever per-device
-     * data is needed
-     */
-    /*
-     * Allocate private device instance data and use USBPROXYDEV::Backend::pv to point to it.
-     */
-    PPRIV_USBW32 pPriv = (PPRIV_USBW32)RTMemAllocZ(sizeof(PRIV_USBW32));
-    if (!pPriv)
-        return VERR_NO_MEMORY;
-    pProxyDev->Backend.pv = pPriv;
+static DECLCALLBACK(int) usbProxyWinOpen(PUSBPROXYDEV pProxyDev, const char *pszAddress, void *pvBackend)
+{
+    PPRIV_USBW32 pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
 
     int rc = VINF_SUCCESS;
@@ -192 +183 @@
     RTMemFree(pPriv->paQueuedUrbs);
     RTMemFree(pPriv->paHandles);
-    RTMemFree(pPriv);
-    pProxyDev->Backend.pv = NULL;
     return rc;
 }
@@ -200 +189 @@
  * Copy the device and free resources associated with the backend.
  */
-static void usbProxyWinClose(PUSBPROXYDEV pProxyDev)
+static DECLCALLBACK(void) usbProxyWinClose(PUSBPROXYDEV pProxyDev)
 {
     /* Here we just close the device and free up p->priv
@@ -206 +195 @@
      * that will have been done already
      */
-    PPRIV_USBW32 pPriv = (PPRIV_USBW32)pProxyDev->Backend.pv;
+    PPRIV_USBW32 pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
     Assert(pPriv);
     if (!pPriv)
@@ -233 +222 @@
     RTMemFree(pPriv->paQueuedUrbs);
     RTMemFree(pPriv->paHandles);
-    RTMemFree(pPriv);
-    pProxyDev->Backend.pv = NULL;
-}
-
-
-static int usbProxyWinReset(PUSBPROXYDEV pProxyDev, bool fResetOnLinux)
-{
-    PPRIV_USBW32 pPriv = (PPRIV_USBW32)pProxyDev->Backend.pv;
+}
+
+
+static DECLCALLBACK(int) usbProxyWinReset(PUSBPROXYDEV pProxyDev, bool fResetOnLinux)
+{
+    PPRIV_USBW32 pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
     DWORD cbReturned;
     int  rc;
@@ -271 +258 @@
 }
 
-static int usbProxyWinSetConfig(PUSBPROXYDEV pProxyDev, int cfg)
+static DECLCALLBACK(int) usbProxyWinSetConfig(PUSBPROXYDEV pProxyDev, int cfg)
 {
     /* Send a SET_CONFIGURATION command to the device. We don't do this
@@ -280 +267 @@
      * point but it has to be synchronous.
     */
-    PPRIV_USBW32 pPriv = (PPRIV_USBW32)pProxyDev->Backend.pv;
+    PPRIV_USBW32 pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
     USBSUP_SET_CONFIG in;
     DWORD cbReturned;
@@ -306 +293 @@
 }
 
-static int usbProxyWinClaimInterface(PUSBPROXYDEV p, int ifnum)
+static DECLCALLBACK(int) usbProxyWinClaimInterface(PUSBPROXYDEV p, int ifnum)
 {
     /* Called just before we use an interface. Needed on Linux to claim
@@ -313 +300 @@
      * Not relevant for Windows.
      */
-    PPRIV_USBW32 pPriv = (PPRIV_USBW32)p->Backend.pv;
+    PPRIV_USBW32 pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
 
     pPriv->bInterfaceNumber = ifnum;
@@ -321 +308 @@
 }
 
-static int usbProxyWinReleaseInterface(PUSBPROXYDEV p, int ifnum)
+static DECLCALLBACK(int) usbProxyWinReleaseInterface(PUSBPROXYDEV p, int ifnum)
 {
     /* The opposite of claim_interface. */
-    PPRIV_USBW32 pPriv = (PPRIV_USBW32)p->Backend.pv;
+    PPRIV_USBW32 pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
 
     Assert(pPriv);
@@ -330 +317 @@
 }
 
-static int usbProxyWinSetInterface(PUSBPROXYDEV pProxyDev, int ifnum, int setting)
+static DECLCALLBACK(int) usbProxyWinSetInterface(PUSBPROXYDEV pProxyDev, int ifnum, int setting)
 {
     /* Select an alternate setting for an interface, the same applies
@@ -336 +323 @@
      * message if you want but it must be synchronous
      */
-    PPRIV_USBW32 pPriv = (PPRIV_USBW32)pProxyDev->Backend.pv;
+    PPRIV_USBW32 pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
     USBSUP_SELECT_INTERFACE in;
     DWORD cbReturned;
@@ -365 +352 @@
  * Clears the halted endpoint 'ep'.
  */
-static bool usbProxyWinClearHaltedEndPt(PUSBPROXYDEV pProxyDev, unsigned int ep)
-{
-    PPRIV_USBW32 pPriv = (PPRIV_USBW32)pProxyDev->Backend.pv;
+static DECLCALLBACK(bool) usbProxyWinClearHaltedEndPt(PUSBPROXYDEV pProxyDev, unsigned int ep)
+{
+    PPRIV_USBW32 pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
     USBSUP_CLEAR_ENDPOINT in;
     DWORD cbReturned;
@@ -396 +383 @@
 static int usbProxyWinAbortEndPt(PUSBPROXYDEV pProxyDev, unsigned int ep)
 {
-    PPRIV_USBW32 pPriv = (PPRIV_USBW32)pProxyDev->Backend.pv;
+    PPRIV_USBW32 pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
     USBSUP_CLEAR_ENDPOINT in;
     DWORD cbReturned;
@@ -425 +412 @@
  * @copydoc USBPROXYBACK::pfnUrbQueue
  */
-static int usbProxyWinUrbQueue(PVUSBURB pUrb)
+static DECLCALLBACK(int) usbProxyWinUrbQueue(PVUSBURB pUrb)
 {
     PUSBPROXYDEV    pProxyDev = PDMINS_2_DATA(pUrb->pUsbIns, PUSBPROXYDEV);
-    PPRIV_USBW32    pPriv = (PPRIV_USBW32)pProxyDev->Backend.pv;
+    PPRIV_USBW32 pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
     Assert(pPriv);
 
@@ -571 +558 @@
  *                      wait at all.
  */
-static PVUSBURB usbProxyWinUrbReap(PUSBPROXYDEV pProxyDev, RTMSINTERVAL cMillies)
-{
-    PPRIV_USBW32      pPriv = (PPRIV_USBW32)pProxyDev->Backend.pv;
+static DECLCALLBACK(PVUSBURB) usbProxyWinUrbReap(PUSBPROXYDEV pProxyDev, RTMSINTERVAL cMillies)
+{
+    PPRIV_USBW32 pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
     AssertReturn(pPriv, NULL);
 
@@ -732 +719 @@
  *          exactly what the guest wants to do.
  */
-static void usbProxyWinUrbCancel(PVUSBURB pUrb)
+static DECLCALLBACK(void) usbProxyWinUrbCancel(PVUSBURB pUrb)
 {
     PUSBPROXYDEV      pProxyDev = PDMINS_2_DATA(pUrb->pUsbIns, PUSBPROXYDEV);
-    PPRIV_USBW32      pPriv     = (PPRIV_USBW32)pProxyDev->Backend.pv;
+    PPRIV_USBW32      pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
     PQUEUED_URB       pQUrbWin  = (PQUEUED_URB)pUrb->Dev.pvPrivate;
     int                     rc;
@@ -760 +747 @@
 }
 
-static int usbProxyWinWakeup(PUSBPROXYDEV pProxyDev)
-{
-    PPRIV_USBW32 pPriv = (PPRIV_USBW32)pProxyDev->Backend.pv;
+static DECLCALLBACK(int) usbProxyWinWakeup(PUSBPROXYDEV pProxyDev)
+{
+    PPRIV_USBW32 pPriv = USBPROXYDEV_2_DATA(pProxyDev, PPRIV_USBW32);
 
     SetEvent(pPriv->hEventWakeup);
@@ -773 +760 @@
 extern const USBPROXYBACK g_USBProxyDeviceHost =
 {
+    /* pszName */
     "host",
+    /* cbBackend */
+    sizeof(PRIV_USBW32),
     usbProxyWinOpen,
     NULL,