[ros-diffs] [hpoussin] 65454: [SCSIPORT] Better error messages when receiving unexpected IOCTLs of mount manager

[hpoussin]

Author: hpoussin
Date: Sun Nov 23 13:48:12 2014
New Revision: 65454

URL: http://svn.reactos.org/svn/reactos?rev=65454&view=rev
Log:
[SCSIPORT] Better error messages when receiving unexpected IOCTLs of mount 
manager

Modified:
    trunk/reactos/drivers/storage/scsiport/scsiport.c

Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/scsiport.c?rev=65454&r1=65453&r2=65454&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/scsiport/scsiport.c   [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/scsiport/scsiport.c   [iso-8859-1] Sun Nov 23 
13:48:12 2014
@@ -34,6 +34,7 @@
 #include <scsi.h>
 #include <ntddscsi.h>
 #include <ntdddisk.h>
+#include <mountdev.h>
 
 #define NDEBUG
 #include <debug.h>
@@ -2877,8 +2878,20 @@
           break;
 
       default:
-          if ('M' == (Stack->Parameters.DeviceIoControl.IoControlCode >> 16)) {
-            DPRINT1("  got ioctl intended for the mount manager: 0x%lX\n", 
Stack->Parameters.DeviceIoControl.IoControlCode);
+          if 
(DEVICE_TYPE_FROM_CTL_CODE(Stack->Parameters.DeviceIoControl.IoControlCode) == 
MOUNTDEVCONTROLTYPE)
+          {
+            switch (Stack->Parameters.DeviceIoControl.IoControlCode)
+            {
+            case IOCTL_MOUNTDEV_QUERY_DEVICE_NAME:
+                DPRINT1("Got unexpected IOCTL_MOUNTDEV_QUERY_DEVICE_NAME\n");
+                break;
+            case IOCTL_MOUNTDEV_QUERY_UNIQUE_ID:
+                DPRINT1("Got unexpected IOCTL_MOUNTDEV_QUERY_UNIQUE_ID\n");
+                break;
+            default:
+                DPRINT1("  got ioctl intended for the mount manager: 0x%lX\n", 
Stack->Parameters.DeviceIoControl.IoControlCode);
+                break;
+            }
           } else {
             DPRINT1("  unknown ioctl code: 0x%lX\n", 
Stack->Parameters.DeviceIoControl.IoControlCode);
           }