Changeset 36941 in vbox

Timestamp:

May 3, 2011 2:56:08 PM (14 years ago)

Author:

vboxsync

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

71528

Message:

usb rework

Location:

trunk

Files:

• include/VBox/VBoxDrvCfg-win.h (modified) (2 diffs)
• include/VBox/usblib-win.h (modified) (7 diffs)
• src/VBox/Devices/Makefile.kmk (modified) (1 diff)
• src/VBox/HostDrivers/VBoxUSB/Makefile.kmk (modified) (1 diff)
• src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.cpp (modified) (13 diffs)
• src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.h (modified) (1 diff)
• src/VBox/HostDrivers/VBoxUSB/win/Device (deleted)
• src/VBox/HostDrivers/VBoxUSB/win/Filter (deleted)
• src/VBox/HostDrivers/VBoxUSB/win/Install/USBInstall.cpp (modified) (3 diffs)
• src/VBox/HostDrivers/VBoxUSB/win/Install/USBUninstall.cpp (modified) (3 diffs)
• src/VBox/HostDrivers/VBoxUSB/win/Makefile.kmk (modified) (6 diffs)
• src/VBox/HostDrivers/VBoxUSB/win/Monitor (deleted)
• src/VBox/HostDrivers/VBoxUSB/win/USBLib-win.cpp (deleted)
• src/VBox/HostDrivers/VBoxUSB/win/testcase/USBTest.cpp (modified) (3 diffs)
• src/VBox/HostDrivers/VBoxUSB/win/usbdesc.h (deleted)
• src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp (modified) (2 diffs)
• src/VBox/Main/Makefile.kmk (modified) (1 diff)
• src/VBox/Main/src-server/win/USBProxyServiceWindows.cpp (modified) (4 diffs)

trunk/include/VBox/VBoxDrvCfg-win.h

@@ -52 +52 @@
 VBOXDRVCFG_DECL(void) VBoxDrvCfgPanicSet(PFNVBOXDRVCFG_PANIC pfnPanic, void *pvPanic);
 
+/* Driver package API*/
 VBOXDRVCFG_DECL(HRESULT) VBoxDrvCfgInfInstall(IN LPCWSTR lpszInfPath);
 VBOXDRVCFG_DECL(HRESULT) VBoxDrvCfgInfUninstall(IN LPCWSTR lpszInfPath, IN DWORD fFlags);
@@ -57 +58 @@
 VBOXDRVCFG_DECL(HRESULT) VBoxDrvCfgInfUninstallAllF(IN LPCWSTR lpszClassName, IN LPCWSTR lpszPnPId, IN DWORD fFlags);
 
+/* Service API */
+VBOXDRVCFG_DECL(HRESULT) VBoxDrvCfgSvcStart(LPCWSTR lpszSvcName);
+
 RT_C_DECLS_END
 

trunk/include/VBox/usblib-win.h

@@ -42 +42 @@
 #define USBFLT_SYMBOLIC_NAME_STRING      L"\\DosDevices\\VBoxUSBFlt"
 
-#define USBMON_SERVICE_NAME              "VBoxUSBMon"
+#define USBMON_SERVICE_NAME_W              L"VBoxUSBMon"
 #define USBMON_DEVICE_NAME               "\\\\.\\VBoxUSBMon"
 #define USBMON_DEVICE_NAME_NT            L"\\Device\\VBoxUSBMon"
@@ -74 +74 @@
 #define USBFLT_MINOR_VERSION              3
 
-#define USBMON_MAJOR_VERSION              1
-#define USBMON_MINOR_VERSION              1
-
-#define USBDRV_MAJOR_VERSION              3
-#define USBDRV_MINOR_VERSION              1
+#define USBMON_MAJOR_VERSION              4
+#define USBMON_MINOR_VERSION              0
+
+#define USBDRV_MAJOR_VERSION              4
+#define USBDRV_MINOR_VERSION              0
 
 #define SUPUSB_IOCTL_TEST                 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x601, METHOD_BUFFERED, FILE_WRITE_ACCESS)
@@ -103 +103 @@
 #define SUPUSBFLT_IOCTL_CAPTURE_DEVICE    CTL_CODE(FILE_DEVICE_UNKNOWN, 0x613, METHOD_BUFFERED, FILE_WRITE_ACCESS)
 #define SUPUSBFLT_IOCTL_RELEASE_DEVICE    CTL_CODE(FILE_DEVICE_UNKNOWN, 0x614, METHOD_BUFFERED, FILE_WRITE_ACCESS)
+#define SUPUSBFLT_IOCTL_RUN_FILTERS       CTL_CODE(FILE_DEVICE_UNKNOWN, 0x615, METHOD_BUFFERED, FILE_WRITE_ACCESS)
+#define SUPUSBFLT_IOCTL_SET_NOTIFY_EVENT  CTL_CODE(FILE_DEVICE_UNKNOWN, 0x616, METHOD_BUFFERED, FILE_WRITE_ACCESS)
+#define SUPUSBFLT_IOCTL_GET_DEVICE        CTL_CODE(FILE_DEVICE_UNKNOWN, 0x617, METHOD_BUFFERED, FILE_WRITE_ACCESS)
 
 #pragma pack(4)
@@ -109 +112 @@
 #define MAX_USB_SERIAL_STRING           64
 
-typedef struct
-{
+/* a user-mode handle that could be used for retriving device information
+ * from the monitor driver */
+typedef void* HVBOXUSBDEVUSR;
+
+typedef struct
+{
+    HVBOXUSBDEVUSR  hDevice;
     uint16_t        vid, did, rev;
     char            serial_hash[MAX_USB_SERIAL_STRING];
@@ -117 +125 @@
     uint8_t         fHiSpeed;
 } USBSUP_GETDEV, *PUSBSUP_GETDEV;
+
+typedef struct
+{
+    USBDEVICESTATE enmState;
+} USBSUP_GETDEV_MON, *PUSBSUP_GETDEV_MON;
 
 typedef struct
@@ -231 +244 @@
 } USBSUP_URB, *PUSBSUP_URB;
 
+typedef struct
+{
+    union
+    {
+        /* in: event handle */
+        void* hEvent;
+        /* out: result */
+        int rc;
+    } u;
+} USBSUP_SET_NOTIFY_EVENT, *PUSBSUP_SET_NOTIFY_EVENT;
+
+typedef struct
+{
+    uint16_t        usVendorId;
+    uint16_t        usProductId;
+    uint16_t        usRevision;
+    uint16_t        usAlignment;
+    char            DrvKeyName[512];
+} USBSUP_DEVID, *PUSBSUP_DEVID;
+
+typedef struct
+{
+        USBSUP_DEVID DevId;
+        char szName[512];
+        USBDEVICESTATE enmState;
+    bool fHiSpeed;
+} USBSUP_DEVINFO, *PUSBSUP_DEVINFO;
+
+typedef struct
+{
+    int rc;
+    uint32_t cDevices;
+    USBSUP_DEVINFO aDevices[1];
+} USBSUP_GET_DEVICES, *PUSBSUP_GET_DEVICES;
+
 #pragma pack()                          /* paranoia */
 
@@ -249 +297 @@
  * @param pcbNumDevices     Number of USB devices in the list
  */
-USBLIB_DECL(int) USBLibGetDevices(PUSBDEVICE *ppDevices,  uint32_t *pcbNumDevices);
-
-/**
- * Check for USB device arrivals or removals
- *
- * @returns boolean
- */
-USBLIB_DECL(bool) USBLibHasPendingDeviceChanges(void);
-
-/**
- * Capture specified USB device
- *
- * @returns VBox status code
- * @param usVendorId        Vendor id
- * @param usProductId       Product id
- * @param usRevision        Revision
- */
-USBLIB_DECL(int) USBLibCaptureDevice(uint16_t usVendorId, uint16_t usProductId, uint16_t usRevision);
-
-/**
- * Release specified USB device to the host.
- *
- * @returns VBox status code
- * @param usVendorId        Vendor id
- * @param usProductId       Product id
- * @param usRevision        Revision
- */
-USBLIB_DECL(int) USBLibReleaseDevice(uint16_t usVendorId, uint16_t usProductId, uint16_t usRevision);
+USBLIB_DECL(int) USBLibGetDevices(PUSBDEVICE *ppDevices, uint32_t *pcbNumDevices);
+
+USBLIB_DECL(int) USBLibWaitChange(RTMSINTERVAL cMillies);
+
+USBLIB_DECL(int) USBLibInterruptWaitChange();
+
+USBLIB_DECL(int) USBLibRunFilters();
 
 /** @} */

trunk/src/VBox/Devices/Makefile.kmk

@@ -84 +84 @@
  ifdef VBOX_WITH_USB
   VBoxDDU_LIBS           += \
-        $(PATH_LIB)/USBLib$(VBOX_SUFF_LIB)
+        $(PATH_LIB)/USBLib$(VBOX_SUFF_LIB) \
+        $(PATH_LIB)/VBoxDrvCfg$(VBOX_SUFF_LIB)
  endif
  ifeq ($(KBUILD_TARGET),l4)

trunk/src/VBox/HostDrivers/VBoxUSB/Makefile.kmk

@@ -47 +47 @@
         solaris/USBLib-solaris.cpp
 USBLib_SOURCES.win = \
-        win/USBLib-win.cpp
-
+        win/lib/VBoxUsbLib-win.cpp
 
 #

trunk/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.cpp

@@ -79 +79 @@
     USBFILTER       Core;
     /** The filter owner. */
-    RTPROCESS       Owner;
+    VBOXUSBFILTER_CONTEXT       Owner;
     /** The filter Id. */
     uintptr_t       uId;
@@ -146 +146 @@
 {
     USBFilterDelete(&pFilter->Core);
-    pFilter->Owner = NIL_RTPROCESS;
+    pFilter->Owner = VBOXUSBFILTER_CONTEXT_NIL;
     pFilter->pNext = NULL;
     RTMemFree(pFilter);
@@ -189 +189 @@
  * @param   puId        Where to store the filter ID.
  */
-int VBoxUSBFilterAdd(PCUSBFILTER pFilter, RTPROCESS Owner, uintptr_t *puId)
+int VBoxUSBFilterAdd(PCUSBFILTER pFilter, VBOXUSBFILTER_CONTEXT Owner, uintptr_t *puId)
 {
     /*
@@ -197 +197 @@
     if (RT_FAILURE(rc))
         return rc;
-    if (!Owner || Owner == NIL_RTPROCESS)
+    if (!Owner || Owner == VBOXUSBFILTER_CONTEXT_NIL)
         return VERR_INVALID_PARAMETER;
     if (!VALID_PTR(puId))
@@ -247 +247 @@
  *                      Returned by VBoxUSBFilterAdd().
  */
-int VBoxUSBFilterRemove(RTPROCESS Owner, uintptr_t uId)
+int VBoxUSBFilterRemove(VBOXUSBFILTER_CONTEXT Owner, uintptr_t uId)
 {
     /*
@@ -254 +254 @@
     if (!uId)
         return VERR_INVALID_PARAMETER;
-    if (!Owner || Owner == NIL_RTPROCESS)
+    if (!Owner || Owner == VBOXUSBFILTER_CONTEXT_NIL)
         return VERR_INVALID_PARAMETER;
 
@@ -302 +302 @@
 }
 
+VBOXUSBFILTER_CONTEXT VBoxUSBFilterGetOwner(uintptr_t uId)
+{
+    Assert(uId);
+    /*
+     * Validate input.
+     */
+    if (!uId)
+        return VBOXUSBFILTER_CONTEXT_NIL;
+
+    /*
+     * Result.
+     */
+    VBOXUSBFILTER_CONTEXT Owner = VBOXUSBFILTER_CONTEXT_NIL;
+
+    VBOXUSBFILTERMGR_LOCK();
+
+    for (unsigned i = USBFILTERTYPE_FIRST; i < RT_ELEMENTS(g_aLists); i++)
+    {
+        for (PVBOXUSBFILTER pCur = g_aLists[i].pHead; pCur; pCur = pCur->pNext)
+        {
+            if (pCur->uId == uId)
+            {
+                Owner = pCur->Owner;
+                Assert(Owner != VBOXUSBFILTER_CONTEXT_NIL);
+                break;
+            }
+        }
+    }
+
+    Assert(Owner != VBOXUSBFILTER_CONTEXT_NIL);
+
+    VBOXUSBFILTERMGR_UNLOCK();
+
+    return Owner;
+}
 
 /**
@@ -311 +346 @@
  * @param   Owner       The owner
  */
-void VBoxUSBFilterRemoveOwner(RTPROCESS Owner)
+void VBoxUSBFilterRemoveOwner(VBOXUSBFILTER_CONTEXT Owner)
 {
     /*
@@ -362 +397 @@
 }
 
-
 /**
  * Match the specified device against the filters.
- *
- * @returns Owner on if matched, NIL_RTPROCESS it not matched.
+ * Unlike the VBoxUSBFilterMatch, returns Owner also if exclude filter is matched
+ *
+ * @returns Owner on if matched, VBOXUSBFILTER_CONTEXT_NIL it not matched.
  * @param   pDevice     The device data as a filter structure.
  *                      See USBFilterMatch for how to construct this.
  * @param   puId        Where to store the filter id (optional).
- */
-RTPROCESS VBoxUSBFilterMatch(PCUSBFILTER pDevice, uintptr_t *puId)
+ * @param   pfFilter    Where to store whether the device must be filtered or not
+ */
+VBOXUSBFILTER_CONTEXT VBoxUSBFilterMatchEx(PCUSBFILTER pDevice, uintptr_t *puId, bool fRemoveFltIfOneShot, bool *pfFilter, bool *pfIsOneShot)
 {
     /*
@@ -377 +413 @@
      */
     int rc = USBFilterValidate(pDevice);
-    AssertRCReturn(rc, NIL_RTPROCESS);
+    AssertRCReturn(rc, VBOXUSBFILTER_CONTEXT_NIL);
+
+    *pfFilter = false;
+    if (puId)
+        *puId = 0;
 
     /*
@@ -403 +443 @@
                 if (puId)
                     *puId = pCur->uId;
-                RTPROCESS Owner = i != USBFILTERTYPE_IGNORE
-                               && i != USBFILTERTYPE_ONESHOT_IGNORE
-                                ? pCur->Owner
-                                : NIL_RTPROCESS;
+                VBOXUSBFILTER_CONTEXT Owner = pCur->Owner;
+                *pfFilter = !!(i != USBFILTERTYPE_IGNORE
+                            && i != USBFILTERTYPE_ONESHOT_IGNORE);
 
                 if (    i == USBFILTERTYPE_ONESHOT_IGNORE
                     ||  i == USBFILTERTYPE_ONESHOT_CAPTURE)
                 {
-                    /* unlink */
-                    PVBOXUSBFILTER pNext = pCur->pNext;
-                    if (pPrev)
-                        pPrev->pNext = pNext;
-                    else
-                        g_aLists[i].pHead = pNext;
-                    if (!pNext)
-                        g_aLists[i].pTail = pPrev;
+                    if (fRemoveFltIfOneShot)
+                    {
+                        /* unlink */
+                        PVBOXUSBFILTER pNext = pCur->pNext;
+                        if (pPrev)
+                            pPrev->pNext = pNext;
+                        else
+                            g_aLists[i].pHead = pNext;
+                        if (!pNext)
+                            g_aLists[i].pTail = pPrev;
+                    }
                 }
 
@@ -425 +467 @@
                 if (    i == USBFILTERTYPE_ONESHOT_IGNORE
                     ||  i == USBFILTERTYPE_ONESHOT_CAPTURE)
-                    vboxUSBFilterFree(pCur);
+                {
+                    if (fRemoveFltIfOneShot)
+                    {
+                        vboxUSBFilterFree(pCur);
+                    }
+                    if (pfIsOneShot)
+                        *pfIsOneShot = true;
+                }
+                else
+                {
+                    if (pfIsOneShot)
+                        *pfIsOneShot = false;
+                }
                 return Owner;
             }
@@ -435 +489 @@
 
     VBOXUSBFILTERMGR_UNLOCK();
-    return NIL_RTPROCESS;
-}
-
+    return VBOXUSBFILTER_CONTEXT_NIL;
+}
+
+/**
+ * Match the specified device against the filters.
+ *
+ * @returns Owner on if matched, VBOXUSBFILTER_CONTEXT_NIL it not matched.
+ * @param   pDevice     The device data as a filter structure.
+ *                      See USBFilterMatch for how to construct this.
+ * @param   puId        Where to store the filter id (optional).
+ */
+VBOXUSBFILTER_CONTEXT VBoxUSBFilterMatch(PCUSBFILTER pDevice, uintptr_t *puId)
+{
+    bool fFilter = false;
+    VBOXUSBFILTER_CONTEXT Owner = VBoxUSBFilterMatchEx(pDevice, puId,
+                                    true, /* remove filter is it's a one-shot*/
+                                    &fFilter, NULL /* bool * fIsOneShot */);
+    if (fFilter)
+    {
+        Assert(Owner != VBOXUSBFILTER_CONTEXT_NIL);
+        return Owner;
+    }
+    return VBOXUSBFILTER_CONTEXT_NIL;
+}
+

trunk/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.h

@@ -23 +23 @@
 RT_C_DECLS_BEGIN
 
+#if defined(RT_OS_WINDOWS)
+typedef struct VBOXUSBFLTCTX *VBOXUSBFILTER_CONTEXT;
+#define VBOXUSBFILTER_CONTEXT_NIL NULL
+#else
+typedef RTPROCESS VBOXUSBFILTER_CONTEXT;
+#define VBOXUSBFILTER_CONTEXT_NIL NIL_RTPROCESS
+#endif
+
 int     VBoxUSBFilterInit(void);
 void    VBoxUSBFilterTerm(void);
-void    VBoxUSBFilterRemoveOwner(RTPROCESS Owner);
-int     VBoxUSBFilterAdd(PCUSBFILTER pFilter, RTPROCESS Owner, uintptr_t *puId);
-int     VBoxUSBFilterRemove(RTPROCESS Owner, uintptr_t uId);
-RTPROCESS VBoxUSBFilterMatch(PCUSBFILTER pDevice, uintptr_t *puId);
+void    VBoxUSBFilterRemoveOwner(VBOXUSBFILTER_CONTEXT Owner);
+int     VBoxUSBFilterAdd(PCUSBFILTER pFilter, VBOXUSBFILTER_CONTEXT Owner, uintptr_t *puId);
+int     VBoxUSBFilterRemove(VBOXUSBFILTER_CONTEXT Owner, uintptr_t uId);
+VBOXUSBFILTER_CONTEXT VBoxUSBFilterMatch(PCUSBFILTER pDevice, uintptr_t *puId);
+VBOXUSBFILTER_CONTEXT VBoxUSBFilterMatchEx(PCUSBFILTER pDevice, uintptr_t *puId, bool fRemoveFltIfOneShot, bool *pfFilter, bool *pfIsOneShot);
+VBOXUSBFILTER_CONTEXT VBoxUSBFilterGetOwner(uintptr_t uId);
 
 RT_C_DECLS_END

trunk/src/VBox/HostDrivers/VBoxUSB/win/Install/USBInstall.cpp

@@ -33 +33 @@
 #include <stdio.h>
 
+#include <VBox/VBoxDrvCfg-win.h>
+
+static DECLCALLBACK(void) vboxUsbLog(VBOXDRVCFG_LOG_SEVERITY enmSeverity, char * msg, void * pvContext)
+{
+    switch (enmSeverity)
+    {
+        case VBOXDRVCFG_LOG_SEVERITY_FLOW:
+        case VBOXDRVCFG_LOG_SEVERITY_REGULAR:
+            break;
+        case VBOXDRVCFG_LOG_SEVERITY_REL:
+            RTPrintf("%s", msg);
+            break;
+        default:
+            break;
+    }
+}
+
+static DECLCALLBACK(void) vboxUsbPanic(void * pvPanic)
+{
+    AssertFailed();
+}
+
 int usblibOsCreateService(void);
 
@@ -43 +65 @@
     }
 
+    VBoxDrvCfgLoggerSet(vboxUsbLog, NULL);
+    VBoxDrvCfgPanicSet(vboxUsbPanic, NULL);
+
     RTPrintf("USB installation\n");
 
@@ -49 +74 @@
     if (RT_SUCCESS(rc))
     {
-        LPSTR  lpszFilePart;
-        TCHAR  szFullPath[MAX_PATH];
-        TCHAR  szCurDir[MAX_PATH];
+        LPWSTR  lpszFilePart;
+        WCHAR  szFullPath[MAX_PATH];
         DWORD  len;
 
-        len = GetFullPathName(".\\VBoxUSB.inf", sizeof(szFullPath), szFullPath, &lpszFilePart);
+        len = GetFullPathNameW(L".\\VBoxUSB.inf", RT_ELEMENTS(szFullPath), szFullPath, &lpszFilePart);
         Assert(len);
 
-        if (GetCurrentDirectory(sizeof(szCurDir), szCurDir) == 0)
-        {
-            rc = RTErrConvertFromWin32(GetLastError());
-            RTPrintf("GetCurrentDirectory failed with rc=%Rrc\n", rc);
+        HRESULT hr = VBoxDrvCfgInfInstall(szFullPath);
+        if (hr == S_OK)
+        {
+            RTPrintf("Installation successful.\n");
         }
         else
         {
-            /* Copy INF file to Windows\INF, so Windows will automatically install it when our USB device is detected */
-            BOOL b = SetupCopyOEMInf(szFullPath, NULL, SPOST_PATH, 0, NULL, 0, NULL, NULL);
-            if (b == FALSE)
-            {
-                rc = RTErrConvertFromWin32(GetLastError());
-                RTPrintf("SetupCopyOEMInf failed with rc=%Rrc\n", rc);
-            }
-            else
-            {
-                RTPrintf("Installation successful.\n");
-            }
-        }
-    }
+            rc = -1;
+        }
+    }
+
+    if (RT_SUCCESS(rc))
+        rc = 0;
 
     /** @todo RTR3Term(); */

trunk/src/VBox/HostDrivers/VBoxUSB/win/Install/USBUninstall.cpp

@@ -23 +23 @@
 #include <setupapi.h>
 #include <newdev.h>
+
 #include <iprt/assert.h>
 #include <iprt/err.h>
@@ -29 +30 @@
 #include <iprt/string.h>
 #include <VBox/err.h>
+#include <VBox/VBoxDrvCfg-win.h>
 #include <stdio.h>
 
@@ -35 +37 @@
 int usblibOsDeleteService(void);
 
+static DECLCALLBACK(void) vboxUsbLog(VBOXDRVCFG_LOG_SEVERITY enmSeverity, char * msg, void * pvContext)
+{
+    switch (enmSeverity)
+    {
+        case VBOXDRVCFG_LOG_SEVERITY_FLOW:
+        case VBOXDRVCFG_LOG_SEVERITY_REGULAR:
+            break;
+        case VBOXDRVCFG_LOG_SEVERITY_REL:
+            printf("%s", msg);
+            break;
+        default:
+            break;
+    }
+}
+
+static DECLCALLBACK(void) vboxUsbPanic(void * pvPanic)
+{
+    AssertFailed();
+}
+
 
 int __cdecl main(int argc, char **argv)
 {
-    BOOL   rc;
-    TCHAR  szFullPath[MAX_PATH];
-    CHAR  *lpszFilePart;
-    int    len;
+    printf("USB uninstallation\n");
 
-    printf("USB uninstallation\n");
+    VBoxDrvCfgLoggerSet(vboxUsbLog, NULL);
+    VBoxDrvCfgPanicSet(vboxUsbPanic, NULL);
 
     usblibOsStopService();
     usblibOsDeleteService();
 
-    len = GetFullPathName(".\\VBoxUSB.inf", sizeof(szFullPath), szFullPath, &lpszFilePart);
-    Assert(len);
-
-    /* Remove the inf plus all associated files. */
-    rc = SetupUninstallOEMInf(szFullPath, SUOI_FORCEDELETE, NULL);
-    if (rc == FALSE)
+    HRESULT hr = VBoxDrvCfgInfUninstallAllF(L"USB", L"USB\\VID_80EE&PID_CAFE", SUOI_FORCEDELETE);
+    if (hr != S_OK)
     {
-        printf("SetupUninstallOEMInf failed with rc=%x\n", GetLastError());
+        printf("SetupUninstallOEMInf failed with hr=0x%x\n", hr);
         return 1;
     }
+
+    printf("USB uninstallation succeeded!\n");
+
     return 0;
 }

trunk/src/VBox/HostDrivers/VBoxUSB/win/Makefile.kmk

@@ -42 +42 @@
 VBoxUSB_LDFLAGS.amd64 = -Entry:DriverEntry
 VBoxUSB_SOURCES     = \
-        Device/vboxusb.cpp \
-        Device/vboxdev.cpp \
-        Device/vboxpnp.cpp \
-        Device/vboxpwr.cpp \
-        Device/vboxrwr.cpp \
-        Device/vboxusb.rc
+        dev/VBoxUsbDev.cpp \
+        dev/VBoxUsbRt.cpp \
+        dev/VBoxUsbPnP.cpp \
+        dev/VBoxUsbPwr.cpp \
+        cmn/VBoxUsbTool.cpp \
+        cmn/VBoxDrvTool.cpp \
+        dev/VBoxUsbDev.rc
 VBoxUSB_LIBS        = \
-        $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \
-        $(PATH_SDK_W2K3DDK_LIB)/hal.lib \
-        $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) \
-        $(TARGET_usbd)
-
-#
-# VBoxUSBFlt
-#
-VBoxUSBFlt_TEMPLATE    = VBOXR0DRV
-VBoxUSBFlt_SDKS        = W2K3DDK WINPSDKINCS
-VBoxUSBFlt_DEFS        = IN_SUP_R0 i386=1 STD_CALL CONDITION_HANDLING=1 NT_INST=0 \
-        WIN32=100 _NT1X_=100 WINNT=1 _WIN32_WINNT=0x0501 WINVER=0x0501 _WIN32_IE=0x0600 WIN32_LEAN_AND_MEAN=1
-VBoxUSBFlt_LDFLAGS.x86 = -Entry:DriverEntry@8
-VBoxUSBFlt_LDFLAGS.amd64 = -Entry:DriverEntry
-VBoxUSBFlt_SOURCES     = \
-        Filter/USBFilter.c  \
-        Filter/USBFilt-win32.cpp  \
-        Filter/USBFilter.rc
-VBoxUSBFlt_LIBS        = \
         $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \
         $(PATH_SDK_W2K3DDK_LIB)/hal.lib \
@@ -87 +69 @@
 VBoxUSBMon_LDFLAGS.x86 = -Entry:DriverEntry@8
 VBoxUSBMon_LDFLAGS.amd64 = -Entry:DriverEntry
+ifdef VBOX_USBMON_WITH_FILTER_AUTOAPPLY
+ VBoxUSBMon_DEFS      += VBOX_USBMON_WITH_FILTER_AUTOAPPLY
+endif
 VBoxUSBMon_SOURCES     = \
-        Monitor/USBMon.cpp  \
-        Monitor/USBMonFlt.cpp  \
+        mon/VBoxUsbMon.cpp  \
+        mon/VBoxUsbFlt.cpp  \
+        mon/VBoxUsbHook.cpp \
+        cmn/VBoxUsbTool.cpp \
+        cmn/VBoxDrvTool.cpp \
         ../USBFilter.cpp \
         ../VBoxUSBFilterMgr.cpp \
-        Monitor/USBMon.rc
+        mon/VBoxUsbMon.rc
 VBoxUSBMon_LIBS        = \
         $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \
@@ -112 +100 @@
         $(PATH_SDK_W2K3DDK_LIB)/newdev.lib \
         $(LIB_RUNTIME) \
-        $(PATH_LIB)/SUPR3$(VBOX_SUFF_LIB)
+        $(PATH_LIB)/SUPR3$(VBOX_SUFF_LIB) \
+        $(TARGET_VBoxDrvCfg)
+        
 
 #
@@ -127 +117 @@
         $(PATH_SDK_W2K3DDK_LIB)/newdev.lib \
         $(LIB_RUNTIME) \
-        $(PATH_LIB)/SUPR3$(VBOX_SUFF_LIB)
+        $(PATH_LIB)/SUPR3$(VBOX_SUFF_LIB) \
+    $(TARGET_VBoxDrvCfg)
 
 #
@@ -142 +133 @@
         $(PATH_SDK_W2K3DDK_LIB)/newdev.lib \
         $(LIB_RUNTIME) \
-        $(PATH_LIB)/SUPR3$(VBOX_SUFF_LIB)
-
+        $(PATH_LIB)/SUPR3$(VBOX_SUFF_LIB) \
+        $(TARGET_VBoxDrvCfg)
+        
 #
 # Install the INF files.
@@ -157 +149 @@
         $(PATH_TARGET)/VBoxUSBMonCat.dir
 
-$(PATH_TARGET)/VBoxUSBCat.dir/VBoxUSB.inf: $(PATH_SUB_CURRENT)/Device/VBoxUSB.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
+$(PATH_TARGET)/VBoxUSBCat.dir/VBoxUSB.inf: $(PATH_SUB_CURRENT)/dev/VBoxUSB.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
         $(call MSG_GENERATE,install-infs,$@,$<)
         $(call VBOX_EDIT_INF_FN,$<,$@)
 
-$(PATH_TARGET)/VBoxUSBMonCat.dir/VBoxUSBMon.inf: $(PATH_SUB_CURRENT)/Monitor/VBoxUSBMon.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
-        $(call MSG_GENERATE,install-infs,$@,$<)
-        $(call VBOX_EDIT_INF_FN,$<,$@)
-
-$(PATH_TARGET)/VBoxUSBFltCat.dir/VBoxUSBFlt.inf: $(PATH_SUB_CURRENT)/Filter/VBoxUSBFlt.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
+$(PATH_TARGET)/VBoxUSBMonCat.dir/VBoxUSBMon.inf: $(PATH_SUB_CURRENT)/mon/VBoxUSBMon.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
         $(call MSG_GENERATE,install-infs,$@,$<)
         $(call VBOX_EDIT_INF_FN,$<,$@)

trunk/src/VBox/HostDrivers/VBoxUSB/win/testcase/USBTest.cpp

@@ -31 +31 @@
 #include <stdio.h>
 #include <VBox/usblib.h>
+#include <VBox/VBoxDrvCfg-win.h>
 
 /** Handle to the open device. */
@@ -46 +47 @@
 int usbMonStartService(void)
 {
-    /*
-     * Check if the driver service is there.
-     */
-    SC_HANDLE hSMgr = OpenSCManager(NULL, NULL, SERVICE_QUERY_STATUS | SERVICE_START);
-    if (hSMgr == NULL)
-    {
-        AssertMsgFailed(("couldn't open service manager in SERVICE_QUERY_CONFIG | SERVICE_QUERY_STATUS mode!\n"));
+    HRESULT hr = VBoxDrvCfgSvcStart(USBMON_SERVICE_NAME_W);
+    if (hr != S_OK)
+    {
+        AssertMsgFailed(("couldn't start service, hr (0x%x)\n", hr));
         return -1;
     }
-
-    /*
-     * Try open our service to check it's status.
-     */
-    SC_HANDLE hService = OpenService(hSMgr, USBMON_SERVICE_NAME, SERVICE_QUERY_STATUS | SERVICE_START);
-    if (!hService)
-        return -1;
-
-    /*
-     * Check if open and on demand create succeeded.
-     */
-    int rc = -1;
-    if (hService)
-    {
-
-        /*
-         * Query service status to see if we need to start it or not.
-         */
-        SERVICE_STATUS  Status;
-        BOOL fRc = QueryServiceStatus(hService, &Status);
-        Assert(fRc);
-        if (    Status.dwCurrentState != SERVICE_RUNNING
-            &&  Status.dwCurrentState != SERVICE_START_PENDING)
-        {
-            /*
-             * Start it.
-             */
-            printf("usbMonStartService -> start it\n");
-
-            fRc = StartService(hService, 0, NULL);
-            DWORD LastError = GetLastError(); NOREF(LastError);
-            AssertMsg(fRc, ("StartService failed with LastError=%Rwa\n", LastError));
-            if (fRc)
-                g_fStartedService = true;
-        }
-
-        /*
-         * Wait for the service to finish starting.
-         * We'll wait for 10 seconds then we'll give up.
-         */
-        QueryServiceStatus(hService, &Status);
-        if (Status.dwCurrentState == SERVICE_START_PENDING)
-        {
-            int iWait;
-            for (iWait = 100; iWait > 0 && Status.dwCurrentState == SERVICE_START_PENDING; iWait--)
-            {
-                Sleep(100);
-                QueryServiceStatus(hService, &Status);
-            }
-            DWORD LastError = GetLastError(); NOREF(LastError);
-            AssertMsg(Status.dwCurrentState != SERVICE_RUNNING,
-                      ("Failed to start. LastError=%Rwa iWait=%d status=%d\n",
-                       LastError, iWait, Status.dwCurrentState));
-        }
-
-        if (Status.dwCurrentState == SERVICE_RUNNING)
-            rc = 0;
-
-        /*
-         * Close open handles.
-         */
-        CloseServiceHandle(hService);
-    }
-    else
-    {
-        DWORD LastError = GetLastError(); NOREF(LastError);
-        AssertMsgFailed(("OpenService failed! LastError=%Rwa\n", LastError));
-    }
-    if (!CloseServiceHandle(hSMgr))
-        AssertFailed();
-
-    return rc;
+    return 0;
 }
 
@@ -147 +74 @@
     if (hSMgr)
     {
-        SC_HANDLE hService = OpenService(hSMgr, USBMON_SERVICE_NAME, SERVICE_STOP | SERVICE_QUERY_STATUS);
+        SC_HANDLE hService = OpenServiceW(hSMgr, USBMON_SERVICE_NAME_W, SERVICE_STOP | SERVICE_QUERY_STATUS);
         if (hService)
         {

trunk/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp

@@ -637 +637 @@
     {
         winEr = GetLastError();
-        Assert(winEr == ERROR_CLASS_MISMATCH);
+//        Assert(winEr == ERROR_CLASS_MISMATCH);
         if (winEr != ERROR_CLASS_MISMATCH)
         {
@@ -714 +714 @@
 }
 
+/* time intervals in milliseconds */
+/* max time to wait for the service to startup */
+#define VBOXDRVCFG_SVC_WAITSTART_TIME 10000
+/* sleep time before service status polls */
+#define VBOXDRVCFG_SVC_WAITSTART_TIME_PERIOD 100
+/* number of service start polls */
+#define VBOXDRVCFG_SVC_WAITSTART_RETRIES (VBOXDRVCFG_SVC_WAITSTART_TIME/VBOXDRVCFG_SVC_WAITSTART_TIME_PERIOD)
+
+VBOXDRVCFG_DECL(HRESULT) VBoxDrvCfgSvcStart(LPCWSTR lpszSvcName)
+{
+    SC_HANDLE hMgr = OpenSCManager(NULL, NULL, SERVICE_QUERY_STATUS | SERVICE_START);
+    if (hMgr == NULL)
+    {
+        DWORD winEr = GetLastError();
+        LogRel((__FUNCTION__": OpenSCManager failed, winEr (%d)\n", winEr));
+        return HRESULT_FROM_WIN32(winEr);
+    }
+
+    HRESULT hr = S_OK;
+    SC_HANDLE hSvc = OpenServiceW(hMgr, lpszSvcName, SERVICE_QUERY_STATUS | SERVICE_START);
+    if (hSvc)
+    {
+        do
+        {
+            SERVICE_STATUS Status;
+            BOOL fRc = QueryServiceStatus(hSvc, &Status);
+            if (!fRc)
+            {
+                DWORD winEr = GetLastError();
+                LogRel((__FUNCTION__": QueryServiceStatus failed winEr (%d)\n", winEr));
+                hr = HRESULT_FROM_WIN32(winEr);
+                break;
+            }
+
+            if (Status.dwCurrentState != SERVICE_RUNNING && Status.dwCurrentState != SERVICE_START_PENDING)
+            {
+                LogRel(("Starting service (%S)\n", lpszSvcName));
+
+                fRc = StartService(hSvc, 0, NULL);
+                if (!fRc)
+                {
+                    DWORD winEr = GetLastError();
+                    LogRel((__FUNCTION__": StartService failed winEr (%d)\n", winEr));
+                    hr = HRESULT_FROM_WIN32(winEr);
+                    break;
+                }
+            }
+
+            fRc = QueryServiceStatus(hSvc, &Status);
+            if (!fRc)
+            {
+                DWORD winEr = GetLastError();
+                LogRel((__FUNCTION__": QueryServiceStatus failed winEr (%d)\n", winEr));
+                hr = HRESULT_FROM_WIN32(winEr);
+                break;
+            }
+
+            if (Status.dwCurrentState == SERVICE_START_PENDING)
+            {
+                for (int i = 0; i < VBOXDRVCFG_SVC_WAITSTART_RETRIES; ++i)
+                {
+                    Sleep(VBOXDRVCFG_SVC_WAITSTART_TIME_PERIOD);
+                    fRc = QueryServiceStatus(hSvc, &Status);
+                    if (!fRc)
+                    {
+                        DWORD winEr = GetLastError();
+                        LogRel((__FUNCTION__": QueryServiceStatus failed winEr (%d)\n", winEr));
+                        hr = HRESULT_FROM_WIN32(winEr);
+                        break;
+                    }
+                    else if (Status.dwCurrentState != SERVICE_START_PENDING)
+                        break;
+                }
+            }
+
+            if (hr != S_OK || Status.dwCurrentState != SERVICE_RUNNING)
+            {
+                LogRel((__FUNCTION__": Failed to start the service\n"));
+                hr = E_FAIL;
+                break;
+            }
+
+        } while (0);
+
+        CloseServiceHandle(hSvc);
+    }
+    else
+    {
+        DWORD winEr = GetLastError();
+        LogRel((__FUNCTION__": OpenServiceW failed, winEr (%d)\n", winEr));
+        hr = HRESULT_FROM_WIN32(winEr);
+    }
+
+    CloseServiceHandle(hMgr);
+
+    return hr;
+}

trunk/src/VBox/Main/Makefile.kmk

@@ -382 +382 @@
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/comsupp.lib \
         $(PATH_SDK_WINPSDK_LIB)/WbemUuid.Lib
- ifdef VBOX_NETFLT_ONDEMAND_BIND
-  VBoxSVC_DEFS.win += VBOX_NETFLT_ONDEMAND_BIND
- endif
 endif
 VBoxSVC_LDFLAGS.darwin    = -framework IOKit -framework SystemConfiguration

trunk/src/VBox/Main/src-server/win/USBProxyServiceWindows.cpp

@@ -143 +143 @@
 int USBProxyServiceWindows::captureDevice(HostUSBDevice *aDevice)
 {
-    AssertReturn(aDevice, VERR_GENERAL_FAILURE);
-    AssertReturn(aDevice->isWriteLockOnCurrentThread(), VERR_GENERAL_FAILURE);
-    Assert(aDevice->getUnistate() == kHostUSBDeviceState_Capturing);
-
-/** @todo pass up a one-shot filter like on darwin?  */
-    USHORT vendorId, productId, revision;
-
-    HRESULT rc;
-
-    rc = aDevice->COMGETTER(VendorId)(&vendorId);
-    AssertComRCReturn(rc, VERR_INTERNAL_ERROR);
-
-    rc = aDevice->COMGETTER(ProductId)(&productId);
-    AssertComRCReturn(rc, VERR_INTERNAL_ERROR);
-
-    rc = aDevice->COMGETTER(Revision)(&revision);
-    AssertComRCReturn(rc, VERR_INTERNAL_ERROR);
-
-    return USBLibCaptureDevice(vendorId, productId, revision);
+    /*
+     * Create a one-shot ignore filter for the device
+     * and trigger a re-enumeration of it.
+     */
+    USBFILTER Filter;
+    USBFilterInit(&Filter, USBFILTERTYPE_ONESHOT_CAPTURE);
+    initFilterFromDevice(&Filter, aDevice);
+    Log(("USBFILTERIDX_PORT=%#x\n", USBFilterGetNum(&Filter, USBFILTERIDX_PORT)));
+    Log(("USBFILTERIDX_BUS=%#x\n", USBFilterGetNum(&Filter, USBFILTERIDX_BUS)));
+
+    void *pvId = USBLibAddFilter(&Filter);
+    if (!pvId)
+    {
+        AssertMsgFailed(("Add one-shot Filter failed\n"));
+        return VERR_GENERAL_FAILURE;
+    }
+
+    int rc = USBLibRunFilters();
+    if (!RT_SUCCESS(rc))
+    {
+        AssertMsgFailed(("Run Filters failed\n"));
+        USBLibRemoveFilter(pvId);
+        return rc;
+    }
+
+    return VINF_SUCCESS;
 }
 
@@ -167 +174 @@
 int USBProxyServiceWindows::releaseDevice(HostUSBDevice *aDevice)
 {
-    AssertReturn(aDevice, VERR_GENERAL_FAILURE);
-    AssertReturn(aDevice->isWriteLockOnCurrentThread(), VERR_GENERAL_FAILURE);
-    Assert(aDevice->getUnistate() == kHostUSBDeviceState_ReleasingToHost);
-
-/** @todo pass up a one-shot filter like on darwin?  */
-    USHORT vendorId, productId, revision;
-    HRESULT rc;
-
-    rc = aDevice->COMGETTER(VendorId)(&vendorId);
-    AssertComRCReturn(rc, VERR_INTERNAL_ERROR);
-
-    rc = aDevice->COMGETTER(ProductId)(&productId);
-    AssertComRCReturn(rc, VERR_INTERNAL_ERROR);
-
-    rc = aDevice->COMGETTER(Revision)(&revision);
-    AssertComRCReturn(rc, VERR_INTERNAL_ERROR);
-
-    Log(("USBProxyServiceWindows::releaseDevice\n"));
-    return USBLibReleaseDevice(vendorId, productId, revision);
+    /*
+     * Create a one-shot ignore filter for the device
+     * and trigger a re-enumeration of it.
+     */
+    USBFILTER Filter;
+    USBFilterInit(&Filter, USBFILTERTYPE_ONESHOT_IGNORE);
+    initFilterFromDevice(&Filter, aDevice);
+    Log(("USBFILTERIDX_PORT=%#x\n", USBFilterGetNum(&Filter, USBFILTERIDX_PORT)));
+    Log(("USBFILTERIDX_BUS=%#x\n", USBFilterGetNum(&Filter, USBFILTERIDX_BUS)));
+
+    void *pvId = USBLibAddFilter(&Filter);
+    if (!pvId)
+    {
+        AssertMsgFailed(("Add one-shot Filter failed\n"));
+        return VERR_GENERAL_FAILURE;
+    }
+
+    int rc = USBLibRunFilters();
+    if (!RT_SUCCESS(rc))
+    {
+        AssertMsgFailed(("Run Filters failed\n"));
+        USBLibRemoveFilter(pvId);
+        return rc;
+    }
+
+
+    return VINF_SUCCESS;
 }
 
@@ -223 +238 @@
 int USBProxyServiceWindows::wait(unsigned aMillies)
 {
-    DWORD rc;
-
-    /* Not going to do something fancy where we block in the filter
-     * driver and are woken up when the state has changed.
-     * Would be better, but this is good enough.
-     */
-    do
-    {
-        rc = WaitForSingleObject(mhEventInterrupt, RT_MIN(aMillies, 100));
-        if (rc == WAIT_OBJECT_0)
-            return VINF_SUCCESS;
-        /** @todo handle WAIT_FAILED here */
-
-        if (USBLibHasPendingDeviceChanges() == true)
-        {
-            Log(("wait thread detected usb change\n"));
-            return VINF_SUCCESS;
-        }
-
-        if (aMillies > 100)
-            aMillies -= 100;
-    }
-    while (aMillies > 100);
-
-    return VERR_TIMEOUT;
+    return USBLibWaitChange(aMillies);
 }
 
@@ -253 +244 @@
 int USBProxyServiceWindows::interruptWait(void)
 {
-    SetEvent(mhEventInterrupt);
-    return VINF_SUCCESS;
-}
-
+    return USBLibInterruptWaitChange();
+}
 
 /**