Changeset 83803 in vbox for trunk/src/VBox/HostDrivers/VBoxUSB/win/mon

Timestamp:

Apr 18, 2020 6:20:34 PM (5 years ago)

Author:

vboxsync

Message:

VBoxUSB: VC++ 14.1 adjustments and warnings (and some cleanups). bugref:8489

File:

• trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp (modified) (10 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp

@@ -109 +109 @@
 *   Defined Constants And Macros                                                                                                 *
 *********************************************************************************************************************************/
+#define VBOXUSBMON_MEMTAG 'MUBV'
+
+
+/*********************************************************************************************************************************
+*   Structures and Typedefs                                                                                                      *
+*********************************************************************************************************************************/
+typedef struct VBOXUSBMONINS
+{
+    void * pvDummy;
+} VBOXUSBMONINS, *PVBOXUSBMONINS;
+
+typedef struct VBOXUSBMONCTX
+{
+    VBOXUSBFLTCTX FltCtx;
+} VBOXUSBMONCTX, *PVBOXUSBMONCTX;
+
+typedef struct VBOXUSBHUB_PNPHOOK
+{
+    VBOXUSBHOOK_ENTRY Hook;
+    bool fUninitFailed;
+} VBOXUSBHUB_PNPHOOK, *PVBOXUSBHUB_PNPHOOK;
+
+typedef struct VBOXUSBHUB_PNPHOOK_COMPLETION
+{
+    VBOXUSBHOOK_REQUEST Rq;
+} VBOXUSBHUB_PNPHOOK_COMPLETION, *PVBOXUSBHUB_PNPHOOK_COMPLETION;
+
+#define VBOXUSBMON_MAXDRIVERS 5
+typedef struct VBOXUSB_PNPDRIVER
+{
+    PDRIVER_OBJECT     DriverObject;
+    VBOXUSBHUB_PNPHOOK UsbHubPnPHook;
+    PDRIVER_DISPATCH   pfnHookStub;
+} VBOXUSB_PNPDRIVER, *PVBOXUSB_PNPDRIVER;
+
+typedef struct VBOXUSBMONGLOBALS
+{
+    PDEVICE_OBJECT pDevObj;
+    VBOXUSB_PNPDRIVER pDrivers[VBOXUSBMON_MAXDRIVERS];
+    KEVENT OpenSynchEvent;
+    IO_REMOVE_LOCK RmLock;
+    uint32_t cOpens;
+    volatile LONG ulPreventUnloadOn;
+    PFILE_OBJECT pPreventUnloadFileObj;
+} VBOXUSBMONGLOBALS, *PVBOXUSBMONGLOBALS;
+
+
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
+static VBOXUSBMONGLOBALS g_VBoxUsbMonGlobals;
+
 /*
  * Note: Must match the VID & PID in the USB driver .inf file!!
@@ -122 +174 @@
 */
 
-#define szBusQueryDeviceId       L"USB\\Vid_80EE&Pid_CAFE"
-#define szBusQueryHardwareIDs    L"USB\\Vid_80EE&Pid_CAFE&Rev_0100\0USB\\Vid_80EE&Pid_CAFE\0\0"
-#define szBusQueryCompatibleIDs  L"USB\\Class_ff&SubClass_00&Prot_00\0USB\\Class_ff&SubClass_00\0USB\\Class_ff\0\0"
-
-#define szDeviceTextDescription          L"VirtualBox USB"
-
-
-#define VBOXUSBMON_MEMTAG 'MUBV'
-
-
-/*********************************************************************************************************************************
-*   Structures and Typedefs                                                                                                      *
-*********************************************************************************************************************************/
-typedef struct VBOXUSBMONINS
-{
-    void * pvDummy;
-} VBOXUSBMONINS, *PVBOXUSBMONINS;
-
-typedef struct VBOXUSBMONCTX
-{
-    VBOXUSBFLTCTX FltCtx;
-} VBOXUSBMONCTX, *PVBOXUSBMONCTX;
-
-typedef struct VBOXUSBHUB_PNPHOOK
-{
-    VBOXUSBHOOK_ENTRY Hook;
-    bool fUninitFailed;
-} VBOXUSBHUB_PNPHOOK, *PVBOXUSBHUB_PNPHOOK;
-
-typedef struct VBOXUSBHUB_PNPHOOK_COMPLETION
-{
-    VBOXUSBHOOK_REQUEST Rq;
-} VBOXUSBHUB_PNPHOOK_COMPLETION, *PVBOXUSBHUB_PNPHOOK_COMPLETION;
-
-#define VBOXUSBMON_MAXDRIVERS 5
-typedef struct VBOXUSB_PNPDRIVER
-{
-    PDRIVER_OBJECT     DriverObject;
-    VBOXUSBHUB_PNPHOOK UsbHubPnPHook;
-    PDRIVER_DISPATCH   pfnHookStub;
-} VBOXUSB_PNPDRIVER, *PVBOXUSB_PNPDRIVER;
-
-typedef struct VBOXUSBMONGLOBALS
-{
-    PDEVICE_OBJECT pDevObj;
-    VBOXUSB_PNPDRIVER pDrivers[VBOXUSBMON_MAXDRIVERS];
-    KEVENT OpenSynchEvent;
-    IO_REMOVE_LOCK RmLock;
-    uint32_t cOpens;
-    volatile LONG ulPreventUnloadOn;
-    PFILE_OBJECT pPreventUnloadFileObj;
-} VBOXUSBMONGLOBALS, *PVBOXUSBMONGLOBALS;
-
-
-/*********************************************************************************************************************************
-*   Global Variables                                                                                                             *
-*********************************************************************************************************************************/
-static VBOXUSBMONGLOBALS g_VBoxUsbMonGlobals;
+static WCHAR const g_szBusQueryDeviceId[]      = L"USB\\Vid_80EE&Pid_CAFE";
+static WCHAR const g_szBusQueryHardwareIDs[]   = L"USB\\Vid_80EE&Pid_CAFE&Rev_0100\0USB\\Vid_80EE&Pid_CAFE\0\0";
+static WCHAR const g_szBusQueryCompatibleIDs[] = L"USB\\Class_ff&SubClass_00&Prot_00\0USB\\Class_ff&SubClass_00\0USB\\Class_ff\0\0";
+static WCHAR const g_szDeviceTextDescription[] = L"VirtualBox USB";
 
 
@@ -377 +375 @@
                     /* IRQL should be always passive here */
                     ASSERT_WARN(Iqrl == PASSIVE_LEVEL, ("irql is not PASSIVE"));
-                    switch(pSl->Parameters.QueryDeviceText.DeviceTextType)
+                    switch (pSl->Parameters.QueryDeviceText.DeviceTextType)
                     {
                         case DeviceTextLocationInformation:
@@ -390 +388 @@
                             {
                                 LOG(("PDO (0x%p) is filtered", pDevObj));
-                                WCHAR *pId = (WCHAR *)ExAllocatePool(PagedPool, sizeof(szDeviceTextDescription));
-                                if (!pId)
-                                {
-                                    AssertFailed();
-                                    break;
-                                }
-                                memcpy(pId, szDeviceTextDescription, sizeof(szDeviceTextDescription));
+                                WCHAR *pId2 = (WCHAR *)ExAllocatePool(PagedPool, sizeof(g_szDeviceTextDescription));
+                                AssertBreak(pId2);
+                                memcpy(pId2, g_szDeviceTextDescription, sizeof(g_szDeviceTextDescription));
                                 LOG(("NEW szDeviceTextDescription"));
-                                LOG_STRW(pId);
+                                LOG_STRW(pId2);
                                 ExFreePool((PVOID)pIoStatus->Information);
-                                pIoStatus->Information = (ULONG_PTR)pId;
+                                pIoStatus->Information = (ULONG_PTR)pId2;
                             }
                             else
@@ -443 +437 @@
                         {
                             LOG(("BusQueryDeviceID"));
-                            pId = (WCHAR *)ExAllocatePool(PagedPool, sizeof(szBusQueryDeviceId));
+                            pId = (WCHAR *)ExAllocatePool(PagedPool, sizeof(g_szBusQueryDeviceId));
                             if (!pId)
                             {
@@ -468 +462 @@
                             LOG(("PDO (0x%p) is filtered", pDevObj));
                             ExFreePool((PVOID)pIoStatus->Information);
-                            memcpy(pId, szBusQueryDeviceId, sizeof(szBusQueryDeviceId));
+                            memcpy(pId, g_szBusQueryDeviceId, sizeof(g_szBusQueryDeviceId));
                             pIoStatus->Information = (ULONG_PTR)pId;
                             break;
@@ -483 +477 @@
                         }
 #endif
-                        pId = (WCHAR *)ExAllocatePool(PagedPool, sizeof(szBusQueryHardwareIDs));
+                        pId = (WCHAR *)ExAllocatePool(PagedPool, sizeof(g_szBusQueryHardwareIDs));
                         if (!pId)
                         {
@@ -508 +502 @@
                         LOG(("PDO (0x%p) is filtered", pDevObj));
 
-                        memcpy(pId, szBusQueryHardwareIDs, sizeof(szBusQueryHardwareIDs));
+                        memcpy(pId, g_szBusQueryHardwareIDs, sizeof(g_szBusQueryHardwareIDs));
 #ifdef VBOX_USB_WITH_VERBOSE_LOGGING
                         LOG(("NEW BusQueryHardwareIDs"));
@@ -537 +531 @@
                         {
                             LOG(("PDO (0x%p) is filtered", pDevObj));
-                            pId = (WCHAR *)ExAllocatePool(PagedPool, sizeof(szBusQueryCompatibleIDs));
+                            pId = (WCHAR *)ExAllocatePool(PagedPool, sizeof(g_szBusQueryCompatibleIDs));
                             if (!pId)
                             {
@@ -543 +537 @@
                                 break;
                             }
-                            memcpy(pId, szBusQueryCompatibleIDs, sizeof(szBusQueryCompatibleIDs));
+                            memcpy(pId, g_szBusQueryCompatibleIDs, sizeof(g_szBusQueryCompatibleIDs));
 #ifdef VBOX_USB_WITH_VERBOSE_LOGGING
                             LOG(("NEW BusQueryCompatibleIDs"));