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

Timestamp:

Jul 29, 2016 10:12:45 PM (9 years ago)

Author:

vboxsync

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

109293

Message:

HostDrivers: warnings

File:

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

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

@@ -913 +913 @@
             switch(pSl->Parameters.QueryDeviceRelations.Type)
             {
-            case BusRelations:
-            {
-                LOG(("BusRelations"));
-
-                if (pIoStatus->Status == STATUS_SUCCESS)
-                {
-                    PDEVICE_RELATIONS pRel = (PDEVICE_RELATIONS)pIoStatus->Information;
-                    LOG(("pRel = %p", pRel));
-                    if (VALID_PTR(pRel))
+                case BusRelations:
+                    LOG(("BusRelations"));
+
+                    if (pIoStatus->Status == STATUS_SUCCESS)
                     {
-                        for (unsigned i=0;i<pRel->Count;i++)
+                        PDEVICE_RELATIONS pRel = (PDEVICE_RELATIONS)pIoStatus->Information;
+                        LOG(("pRel = %p", pRel));
+                        if (VALID_PTR(pRel))
                         {
-                            if (VBoxUsbFltPdoIsFiltered(pDevObj))
-                                LOG(("New PDO %p", pRel->Objects[i]));
+                            for (unsigned i=0;i<pRel->Count;i++)
+                            {
+                                if (VBoxUsbFltPdoIsFiltered(pDevObj))
+                                    LOG(("New PDO %p", pRel->Objects[i]));
+                            }
                         }
+                        else
+                            LOG(("Invalid pointer %p", pRel));
                     }
-                    else
-                        LOG(("Invalid pointer %p", pRel));
-                }
-                break;
-            }
-            case TargetDeviceRelation:
-                LOG(("TargetDeviceRelation"));
-                break;
-            case RemovalRelations:
-                LOG(("RemovalRelations"));
-                break;
-            case EjectionRelations:
-                LOG(("EjectionRelations"));
-                break;
+                    break;
+                case TargetDeviceRelation:
+                    LOG(("TargetDeviceRelation"));
+                    break;
+                case RemovalRelations:
+                    LOG(("RemovalRelations"));
+                    break;
+                case EjectionRelations:
+                    LOG(("EjectionRelations"));
+                    break;
+                default:
+                    LOG(("QueryDeviceRelations.Type=%d", pSl->Parameters.QueryDeviceRelations.Type));
             }
             break;
@@ -1595 +1595 @@
 }
 
-static NTSTATUS vboxUsbMonIoctlDispatch(PVBOXUSBMONCTX pContext, ULONG Ctl, PVOID pvBuffer, ULONG cbInBuffer, ULONG cbOutBuffer, ULONG_PTR* pInfo)
+static NTSTATUS vboxUsbMonIoctlDispatch(PVBOXUSBMONCTX pContext, ULONG Ctl, PVOID pvBuffer, ULONG cbInBuffer,
+                                        ULONG cbOutBuffer, ULONG_PTR *pInfo)
 {
     NTSTATUS Status = STATUS_SUCCESS;
@@ -1659 +1660 @@
             {
                 /* we've validated that already */
-                Assert(cbOutBuffer == *pRc);
+                Assert(cbOutBuffer == (ULONG)*pRc);
                 *pRc = rc;
                 Info = sizeof (*pRc);