[ros-diffs] [tfaber] 70306: [CLASS2] - Add a Signature member to make devices created from class2's AddDevice recognizable CORE-8911

Author: tfaber
Date: Tue Dec  8 13:25:37 2015
New Revision: 70306

URL: http://svn.reactos.org/svn/reactos?rev=70306&view=rev
Log:
[CLASS2]
- Add a Signature member to make devices created from class2's AddDevice recognizable
CORE-8911

Modified:
    trunk/reactos/drivers/storage/class/class2/class2.c

Modified: trunk/reactos/drivers/storage/class/class2/class2.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas…
==============================================================================
--- trunk/reactos/drivers/storage/class/class2/class2.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/class/class2/class2.c	[iso-8859-1] Tue Dec  8 13:25:37
2015
@@ -137,6 +137,7 @@
 /* The following hack to assign drive letters with a non-PnP storage stack */
 
 typedef struct _CLASS_DEVICE_INFO {
+  ULONG Signature;
   ULONG DeviceType;
   ULONG Partitions;
   ULONG DeviceNumber;
@@ -350,6 +351,7 @@
 
     if (IrpSp->MinorFunction == IRP_MN_START_DEVICE)
     {
+        ASSERT(DeviceInfo->Signature == '2slc');
         IoSkipCurrentIrpStackLocation(Irp);
         return STATUS_SUCCESS;
     }
@@ -357,6 +359,7 @@
     {
         PCLASS_DEVICE_INFO DeviceInfo = DeviceObject->DeviceExtension;
 
+        ASSERT(DeviceInfo->Signature == '2slc');
         ScsiClassRemoveDriveLetter(DeviceInfo);
 
         Irp->IoStatus.Status = STATUS_SUCCESS;
@@ -403,6 +406,7 @@
 
         DeviceInfo = DeviceObject->DeviceExtension;
         RtlZeroMemory(DeviceInfo, sizeof(CLASS_DEVICE_INFO));
+        DeviceInfo->Signature = '2slc';
 
         /* Attach it to the PDO */
         DeviceInfo->LowerDevice = IoAttachDeviceToDeviceStack(DeviceObject,
PhysicalDeviceObject);
@@ -624,6 +628,8 @@
 {
     PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension;
 
+    ASSERT(*(PULONG)deviceExtension != '2slc');
+
     //
     // Invoke the device-specific routine, if one exists. Otherwise complete
     // with SUCCESS
@@ -677,6 +683,8 @@
     ULONG               transferByteCount = currentIrpStack->Parameters.Read.Length;
     ULONG               maximumTransferLength =
deviceExtension->PortCapabilities->MaximumTransferLength;
     NTSTATUS            status;
+
+    ASSERT(*(PULONG)deviceExtension != '2slc');
 
     if (DeviceObject->Flags & DO_VERIFY_VOLUME &&
         !(currentIrpStack->Flags & SL_OVERRIDE_VERIFY_VOLUME)) {
@@ -1041,6 +1049,8 @@
     SCSI_REQUEST_BLOCK  srb;
     NTSTATUS            status;
 
+    ASSERT(*(PULONG)deviceExtension != '2slc');
+
     //
     // Allocate read capacity buffer from nonpaged pool.
     //
@@ -1263,6 +1273,8 @@
     PCOMPLETION_CONTEXT context;
     PSCSI_REQUEST_BLOCK srb;
     KIRQL currentIrql;
+
+    ASSERT(*(PULONG)deviceExtension != '2slc');
 
     //
     // Allocate context from nonpaged pool.
@@ -1408,6 +1420,8 @@
     PSCSI_REQUEST_BLOCK srb;
     PCOMPLETION_CONTEXT context;
     PCDB cdb;
+
+    ASSERT(*(PULONG)deviceExtension != '2slc');
 
     //
     // Allocate Srb from nonpaged pool.
@@ -1633,6 +1647,8 @@
     DebugPrint((2, "ScsiClassSplitRequest: Requires %d IRPs\n", irpCount));
     DebugPrint((2, "ScsiClassSplitRequest: Original IRP %lx\n", Irp));
 
+    ASSERT(*(PULONG)deviceExtension != '2slc');
+
     //
     // If all partial transfers complete successfully then the status and
     // bytes transferred are already set up. Failing a partial-transfer IRP
@@ -1817,6 +1833,8 @@
     NTSTATUS status;
     BOOLEAN retry;
 
+    ASSERT(*(PULONG)deviceExtension != '2slc');
+
     //
     // Check SRB status for success of completing request.
     //
@@ -1968,6 +1986,8 @@
     LONG                irpCount;
     NTSTATUS            status;
     BOOLEAN             retry;
+
+    ASSERT(*(PULONG)deviceExtension != '2slc');
 
     //
     // Check SRB status for success of completing request.
@@ -2189,6 +2209,8 @@
     LARGE_INTEGER dummy;
 
     PAGED_CODE();
+
+    ASSERT(*(PULONG)deviceExtension != '2slc');
 
     dummy.QuadPart = 0;
 
@@ -2481,6 +2503,7 @@
     ULONG             i;
 #endif
 
+    ASSERT(*(PULONG)deviceExtension != '2slc');
 
     //
     // Check that request sense buffer is valid.
@@ -3161,6 +3184,8 @@
     PIO_STACK_LOCATION nextIrpStack = IoGetNextIrpStackLocation(Irp);
     ULONG transferByteCount;
 
+    ASSERT(*(PULONG)deviceExtension != '2slc');
+
     //
     // Determine the transfer count of the request.  If this is a read or a
     // write then the transfer count is in the Irp stack.  Otherwise assume
@@ -3291,6 +3316,8 @@
     PCDB                cdb;
     ULONG               logicalBlockAddress;
     USHORT              transferBlocks;
+
+    ASSERT(*(PULONG)deviceExtension != '2slc');
 
     //
     // Calculate relative sector address.
@@ -3510,6 +3537,8 @@
     SCSI_REQUEST_BLOCK srb;
     ULONG retries = 1;
     NTSTATUS status;
+
+    ASSERT(*(PULONG)deviceExtension != '2slc');
 
     RtlZeroMemory(&srb, sizeof(SCSI_REQUEST_BLOCK));
 
@@ -3687,6 +3716,8 @@
 
     PAGED_CODE();
 
+    ASSERT(*(PULONG)deviceExtension != '2slc');
+
     //
     // Write length to SRB.
     //
@@ -3860,6 +3891,7 @@
 
     PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension;
 
+    ASSERT(*(PULONG)deviceExtension != '2slc');
 
     //
     // Call the class specific driver DeviceControl routine.
@@ -3908,6 +3940,8 @@
     PCDB cdb;
     NTSTATUS status;
     ULONG modifiedIoControlCode;
+
+    ASSERT(*(PULONG)deviceExtension != '2slc');
 
     if (irpStack->Parameters.DeviceIoControl.IoControlCode ==
         IOCTL_STORAGE_RESET_DEVICE) {
@@ -4456,6 +4490,8 @@
 {
     PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension;
 
+    ASSERT(*(PULONG)deviceExtension != '2slc');
+
     if (deviceExtension->ClassShutdownFlush) {
 
         //
@@ -4609,6 +4645,8 @@
 
         PDEVICE_EXTENSION deviceExtension = deviceObject->DeviceExtension;
 
+        ASSERT(*(PULONG)deviceExtension != '2slc');
+
         //
         // Fill in entry points
         //
@@ -4853,6 +4891,8 @@
     PIO_STACK_LOCATION irpStack = IoGetCurrentIrpStackLocation(Irp);
     PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension;
     PSCSI_REQUEST_BLOCK srb;
+
+    ASSERT(*(PULONG)deviceExtension != '2slc');
 
     //
     // Get a pointer to the SRB.
@@ -5108,6 +5148,9 @@
                         deviceExtension->PhysicalDevice->DeviceExtension;
     PIRP originalIrp;
 
+    ASSERT(*(PULONG)deviceExtension != '2slc');
+    ASSERT(*(PULONG)physicalExtension != '2slc');
+
     originalIrp = irpStack->Parameters.Others.Argument1;
 
     //