Changeset 99828 in vbox for trunk/src/VBox/HostDrivers/VBoxUSB/win

Timestamp:

May 17, 2023 1:48:57 PM (23 months ago)

Author:

vboxsync

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

157464

Message:

*: A bunch of adjustments that allows using /permissive- with Visual C++ (qt 6.x necessity).

Location:

trunk/src/VBox/HostDrivers/VBoxUSB/win/mon

Files:

• VBoxUsbFlt.cpp (modified) (1 diff)
• VBoxUsbMon.cpp (modified) (2 diffs)

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

@@ -1688 +1688 @@
     RTL_QUERY_REGISTRY_TABLE aParams[] =
     {
-        {vboxUsbFltRegKeyQuery, 0, L"ForceReplugWhenDevPopulateFails", &g_VBoxUsbFltGlobals.dwForceReplugWhenDevPopulateFails, REG_DWORD, &g_VBoxUsbFltGlobals.dwForceReplugWhenDevPopulateFails, sizeof(ULONG) },
-        {                 NULL, 0,                               NULL,                                                   NULL,         0,                                                     0,             0 }
+        {vboxUsbFltRegKeyQuery, 0, (PWSTR)L"ForceReplugWhenDevPopulateFails", &g_VBoxUsbFltGlobals.dwForceReplugWhenDevPopulateFails, REG_DWORD, &g_VBoxUsbFltGlobals.dwForceReplugWhenDevPopulateFails, sizeof(ULONG) },
+        {                 NULL, 0,                                      NULL,                                                   NULL,         0,                                                      0,             0 }
     };
     UNICODE_STRING UnicodePath = RTL_CONSTANT_STRING(L"\\VBoxUSB");

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

@@ -804 +804 @@
  * @param   uErrId         Unique error id representing the location in the driver.
  * @param   cbDumpData     Number of bytes at pDumpData.
- * @param   pDumpData      Pointer to data that will be added to the message (see 'details' tab).
+ * @param   pvDumpData     Pointer to data that will be added to the message
+ *                         (see 'details' tab).
  *
  * NB: We only use IoLogMsg.dll as the message file, limiting
  * ErrCode to status codes and messages defined in ntiologc.h
  */
-static void vboxUsbMonLogError(NTSTATUS ErrCode, NTSTATUS ReturnedStatus, ULONG uErrId, USHORT cbDumpData, PVOID pDumpData)
+static void vboxUsbMonLogError(NTSTATUS ErrCode, NTSTATUS ReturnedStatus, ULONG uErrId, USHORT cbDumpData, void const *pvDumpData)
 {
     PIO_ERROR_LOG_PACKET pErrEntry;
@@ -824 +825 @@
         uint8_t *pDump = (uint8_t *)pErrEntry->DumpData;
         if (cbDumpData)
-            memcpy(pDump, pDumpData, cbDumpData);
+            memcpy(pDump, pvDumpData, cbDumpData);
         pErrEntry->MajorFunctionCode = 0;
         pErrEntry->RetryCount = 0;