diff --git a/sdk/include/ddk/srbhelper.h b/sdk/include/ddk/srbhelper.h
new file mode 100644
index 00000000000..3a5db21cad8
--- /dev/null
+++ b/sdk/include/ddk/srbhelper.h
@@ -0,0 +1,1414 @@
+#ifndef _SRBHELPER_H_
+#define _SRBHELPER_H_
+
+#if !defined(_NTSTORPORT_) && !defined(_NTSTORPORTP_) && !defined(_NTSRB_)
+#include <scsi.h>
+#include <srb.h>
+#endif
+
+#if (NTDDI_VERSION >= NTDDI_WIN8)
+
+#if !defined(SRBHELPER_ASSERT)
+#define SRBHELPER_ASSERT NT_ASSERT
+#endif
+
+#if !defined(SRB_ALIGN_SIZEOF)
+#define SRB_ALIGN_SIZEOF(x) (((ULONG_PTR)(sizeof(x) + sizeof(PVOID) - 1)) & ~(sizeof(PVOID) - 1))
+#endif
+
+#if defined(_NTSTORPORT_) || defined(_NTSTORPORTP_)
+#define SrbMoveMemory(Destination, Source, Length) StorPortMoveMemory(Destination, Source, Length)
+#elif defined(_NTDDK_)
+#define SrbMoveMemory(Destination, Source, Length) RtlMoveMemory(Destination, Source, Length)
+#else
+#define SrbMoveMemory(Destination, Source, Length) memmove(Destination, Source, Length)
+#endif
+
+#if defined(_NTDDK_)
+#define SrbCopyMemory(Destination, Source, Length) RtlCopyMemory(Destination, Source, Length)
+#else
+#define SrbCopyMemory(Destination, Source, Length) memcpy(Destination, Source, Length)
+#endif
+
+#if defined(_NTDDK_)
+#define SrbZeroMemory(Destination, Length) RtlZeroMemory(Destination, Length)
+#else
+#define SrbZeroMemory(Destination, Length) memset(Destination, 0, Length)
+#endif
+
+#if defined(_NTDDK_)
+#define SrbEqualMemory(Source1, Source2, Length) RtlEqualMemory(Source1, Source2, Length)
+#else
+#define SrbEqualMemory(Source1, Source2, Length) (memcmp(Source1, Source2, Length) == 0)
+#endif
+
+FORCEINLINE
+PSRBEX_DATA
+SrbGetSrbExDataByIndex(
+  _In_ PSTORAGE_REQUEST_BLOCK Srb,
+  _In_ ULONG SrbExDataIndex)
+{
+  PSRBEX_DATA srbExData = NULL;
+
+  if ((Srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK) &&
+      (SrbExDataIndex < Srb->NumSrbExData) && (Srb->SrbExDataOffset[SrbExDataIndex]) &&
+      (Srb->SrbExDataOffset[SrbExDataIndex] >= sizeof(STORAGE_REQUEST_BLOCK)) &&
+      (Srb->SrbExDataOffset[SrbExDataIndex] < Srb->SrbLength))
+  {
+    srbExData = (PSRBEX_DATA)((PUCHAR)Srb + Srb->SrbExDataOffset[SrbExDataIndex]);
+  }
+
+  return srbExData;
+}
+
+FORCEINLINE
+PSRBEX_DATA
+SrbGetSrbExDataByType(
+  _In_ PSTORAGE_REQUEST_BLOCK Srb,
+  _In_ SRBEXDATATYPE Type)
+{
+  if ((Srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK) && (Srb->NumSrbExData > 0))
+  {
+    PSRBEX_DATA srbExData = NULL;
+    UCHAR i = 0;
+
+    for (i = 0; i < Srb->NumSrbExData; i++)
+    {
+      if (Srb->SrbExDataOffset[i] >= sizeof(STORAGE_REQUEST_BLOCK) &&
+          Srb->SrbExDataOffset[i] < Srb->SrbLength)
+      {
+        srbExData = (PSRBEX_DATA)((PUCHAR)Srb + Srb->SrbExDataOffset[i]);
+        if (srbExData->Type == Type)
+        {
+          return srbExData;
+        }
+      }
+    }
+  }
+
+  return NULL;
+}
+
+FORCEINLINE
+PSRBEX_DATA
+SrbGetPrimarySrbExData(
+  _In_ PSTORAGE_REQUEST_BLOCK Srb)
+{
+  if (Srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    switch (Srb->SrbFunction)
+    {
+    case SRB_FUNCTION_POWER:
+      return SrbGetSrbExDataByType(Srb, SrbExDataTypePower);
+
+    case SRB_FUNCTION_PNP:
+      return SrbGetSrbExDataByType(Srb, SrbExDataTypePnP);
+
+    case SRB_FUNCTION_WMI:
+      return SrbGetSrbExDataByType(Srb, SrbExDataTypeWmi);
+
+    case SRB_FUNCTION_EXECUTE_SCSI: {
+      PSRBEX_DATA srbExData = NULL;
+      UCHAR i = 0;
+
+      for (i = 0; i < Srb->NumSrbExData; i++)
+      {
+        if (Srb->SrbExDataOffset[i] >= sizeof(STORAGE_REQUEST_BLOCK) &&
+            Srb->SrbExDataOffset[i] < Srb->SrbLength)
+        {
+          srbExData = (PSRBEX_DATA)((PUCHAR)Srb + Srb->SrbExDataOffset[i]);
+          if (srbExData->Type == SrbExDataTypeScsiCdb16 ||
+              srbExData->Type == SrbExDataTypeScsiCdb32 ||
+              srbExData->Type == SrbExDataTypeScsiCdbVar)
+          {
+            return srbExData;
+          }
+        }
+      }
+      return NULL;
+    }
+
+    default:
+      return NULL;
+    }
+  }
+
+  return NULL;
+}
+
+FORCEINLINE PSTOR_ADDRESS SrbGetAddress(_In_ PSTORAGE_REQUEST_BLOCK Srb)
+{
+  PSTOR_ADDRESS storAddr = NULL;
+
+  if (Srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    SRBHELPER_ASSERT(Srb->AddressOffset);
+
+    if (Srb->AddressOffset)
+    {
+      storAddr = (PSTOR_ADDRESS)((PUCHAR)Srb + Srb->AddressOffset);
+      SRBHELPER_ASSERT(storAddr->Type == STOR_ADDRESS_TYPE_BTL8);
+    }
+  }
+
+  return storAddr;
+}
+
+FORCEINLINE
+BOOLEAN
+SrbCopySrb(
+  _In_ PVOID DestinationSrb,
+  _In_ ULONG DestinationSrbLength,
+  _In_ PVOID SourceSrb)
+{
+  PSTORAGE_REQUEST_BLOCK sourceSrb = (PSTORAGE_REQUEST_BLOCK)SourceSrb;
+  BOOLEAN status = FALSE;
+
+  if (sourceSrb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    if (DestinationSrbLength >= sourceSrb->SrbLength)
+    {
+      SrbCopyMemory(DestinationSrb, SourceSrb, sourceSrb->SrbLength);
+      status = TRUE;
+    }
+  }
+  else
+  {
+    if (DestinationSrbLength >= SCSI_REQUEST_BLOCK_SIZE)
+    {
+      SrbCopyMemory(DestinationSrb, SourceSrb, SCSI_REQUEST_BLOCK_SIZE);
+      status = TRUE;
+    }
+  }
+
+  return status;
+}
+
+FORCEINLINE
+VOID
+SrbZeroSrb(
+  _In_ PVOID Srb)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+  UCHAR function = srb->Function;
+  USHORT length = srb->Length;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    ULONG srbLength = srb->SrbLength;
+
+    SrbZeroMemory(Srb, srb->SrbLength);
+
+    srb->SrbLength = srbLength;
+  }
+  else
+  {
+    SrbZeroMemory(Srb, sizeof(SCSI_REQUEST_BLOCK));
+  }
+
+  srb->Function = function;
+  srb->Length = length;
+}
+
+FORCEINLINE
+ULONG
+SrbGetSrbLength(
+  _In_ PVOID Srb)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    return srb->SrbLength;
+  }
+  else
+  {
+    return sizeof(SCSI_REQUEST_BLOCK);
+  }
+}
+
+FORCEINLINE
+VOID
+SrbSetSrbLength(
+  _In_ PVOID Srb,
+  _In_ ULONG Length)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    srb->SrbLength = Length;
+  }
+}
+
+FORCEINLINE
+ULONG
+SrbGetDefaultSrbLengthFromFunction(
+  _In_ ULONG SrbFunction)
+{
+  switch (SrbFunction)
+  {
+  case SRB_FUNCTION_PNP:
+    return SRB_ALIGN_SIZEOF(STORAGE_REQUEST_BLOCK) + SRB_ALIGN_SIZEOF(STOR_ADDR_BTL8) +
+           SRB_ALIGN_SIZEOF(SRBEX_DATA_PNP);
+  case SRB_FUNCTION_POWER:
+    return SRB_ALIGN_SIZEOF(STORAGE_REQUEST_BLOCK) + SRB_ALIGN_SIZEOF(STOR_ADDR_BTL8) +
+           SRB_ALIGN_SIZEOF(SRBEX_DATA_POWER);
+  case SRB_FUNCTION_WMI:
+    return SRB_ALIGN_SIZEOF(STORAGE_REQUEST_BLOCK) + SRB_ALIGN_SIZEOF(STOR_ADDR_BTL8) +
+           SRB_ALIGN_SIZEOF(SRBEX_DATA_WMI);
+  case SRB_FUNCTION_EXECUTE_SCSI:
+    return SRB_ALIGN_SIZEOF(STORAGE_REQUEST_BLOCK) + SRB_ALIGN_SIZEOF(STOR_ADDR_BTL8) +
+           SRB_ALIGN_SIZEOF(SRBEX_DATA_SCSI_CDB16);
+  case SRB_FUNCTION_IO_CONTROL:
+    return SRB_ALIGN_SIZEOF(STORAGE_REQUEST_BLOCK) + SRB_ALIGN_SIZEOF(STOR_ADDR_BTL8);
+  default:
+    return SRB_ALIGN_SIZEOF(STORAGE_REQUEST_BLOCK) + SRB_ALIGN_SIZEOF(STOR_ADDR_BTL8);
+  }
+}
+
+FORCEINLINE
+PCDB
+SrbGetScsiData(
+  _In_ PSTORAGE_REQUEST_BLOCK SrbEx,
+  _In_opt_ PUCHAR CdbLength8,
+  _In_opt_ PULONG CdbLength32,
+  _In_opt_ PUCHAR ScsiStatus,
+  _In_opt_ PVOID *SenseInfoBuffer,
+  _In_opt_ PUCHAR SenseInfoBufferLength)
+{
+  PCDB Cdb = NULL;
+  ULONG i;
+  PSRBEX_DATA SrbExData = NULL;
+  BOOLEAN FoundEntry = FALSE;
+
+  if ((SrbEx->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK) &&
+      (SrbEx->SrbFunction == SRB_FUNCTION_EXECUTE_SCSI))
+  {
+    SRBHELPER_ASSERT(SrbEx->NumSrbExData > 0);
+
+    for (i = 0; i < SrbEx->NumSrbExData; i++)
+    {
+      if ((SrbEx->SrbExDataOffset[i] < sizeof(STORAGE_REQUEST_BLOCK)) ||
+          (SrbEx->SrbExDataOffset[i] >= SrbEx->SrbLength))
+      {
+        SRBHELPER_ASSERT(FALSE);
+        continue;
+      }
+
+      SrbExData = (PSRBEX_DATA)((PUCHAR)SrbEx + SrbEx->SrbExDataOffset[i]);
+
+      switch (SrbExData->Type)
+      {
+          case SrbExDataTypeScsiCdb16:
+            if (SrbEx->SrbExDataOffset[i] + sizeof(SRBEX_DATA_SCSI_CDB16) <= SrbEx->SrbLength)
+            {
+              FoundEntry = TRUE;
+              if (CdbLength8)
+              {
+                *CdbLength8 = ((PSRBEX_DATA_SCSI_CDB16)SrbExData)->CdbLength;
+              }
+
+              if (((PSRBEX_DATA_SCSI_CDB16)SrbExData)->CdbLength > 0)
+              {
+                Cdb = (PCDB)((PSRBEX_DATA_SCSI_CDB16)SrbExData)->Cdb;
+              }
+
+              if (ScsiStatus)
+              {
+                *ScsiStatus = ((PSRBEX_DATA_SCSI_CDB16)SrbExData)->ScsiStatus;
+              }
+
+              if (SenseInfoBuffer)
+              {
+                *SenseInfoBuffer = ((PSRBEX_DATA_SCSI_CDB16)SrbExData)->SenseInfoBuffer;
+              }
+
+              if (SenseInfoBufferLength)
+              {
+                *SenseInfoBufferLength = ((PSRBEX_DATA_SCSI_CDB16)SrbExData)->SenseInfoBufferLength;
+              }
+            }
+            else
+            {
+              // Catch invalid offset
+              SRBHELPER_ASSERT(FALSE);
+            }
+            break;
+
+          case SrbExDataTypeScsiCdb32:
+            if (SrbEx->SrbExDataOffset[i] + sizeof(SRBEX_DATA_SCSI_CDB32) <= SrbEx->SrbLength)
+            {
+              FoundEntry = TRUE;
+              if (CdbLength8)
+              {
+                *CdbLength8 = ((PSRBEX_DATA_SCSI_CDB32)SrbExData)->CdbLength;
+              }
+
+              if (((PSRBEX_DATA_SCSI_CDB32)SrbExData)->CdbLength > 0)
+              {
+                Cdb = (PCDB)((PSRBEX_DATA_SCSI_CDB32)SrbExData)->Cdb;
+              }
+
+              if (ScsiStatus)
+              {
+                *ScsiStatus = ((PSRBEX_DATA_SCSI_CDB32)SrbExData)->ScsiStatus;
+              }
+
+              if (SenseInfoBuffer)
+              {
+                *SenseInfoBuffer = ((PSRBEX_DATA_SCSI_CDB32)SrbExData)->SenseInfoBuffer;
+              }
+
+              if (SenseInfoBufferLength)
+              {
+                *SenseInfoBufferLength = ((PSRBEX_DATA_SCSI_CDB32)SrbExData)->SenseInfoBufferLength;
+              }
+            }
+            else
+            {
+              // Catch invalid offset
+              SRBHELPER_ASSERT(FALSE);
+            }
+            break;
+
+          case SrbExDataTypeScsiCdbVar:
+            if (SrbEx->SrbExDataOffset[i] + sizeof(SRBEX_DATA_SCSI_CDB_VAR) <= SrbEx->SrbLength)
+            {
+              FoundEntry = TRUE;
+              if (CdbLength32)
+              {
+                *CdbLength32 = ((PSRBEX_DATA_SCSI_CDB_VAR)SrbExData)->CdbLength;
+              }
+
+              if (((PSRBEX_DATA_SCSI_CDB_VAR)SrbExData)->CdbLength > 0)
+              {
+                Cdb = (PCDB)((PSRBEX_DATA_SCSI_CDB_VAR)SrbExData)->Cdb;
+              }
+
+              if (ScsiStatus)
+              {
+                *ScsiStatus = ((PSRBEX_DATA_SCSI_CDB_VAR)SrbExData)->ScsiStatus;
+              }
+
+              if (SenseInfoBuffer)
+              {
+                *SenseInfoBuffer = ((PSRBEX_DATA_SCSI_CDB_VAR)SrbExData)->SenseInfoBuffer;
+              }
+
+              if (SenseInfoBufferLength)
+              {
+                *SenseInfoBufferLength = ((PSRBEX_DATA_SCSI_CDB_VAR)SrbExData)->SenseInfoBufferLength;
+              }
+            }
+            else
+            {
+              SRBHELPER_ASSERT(FALSE);
+            }
+            break;
+      }
+
+      if (FoundEntry)
+      {
+        break;
+      }
+    }
+  }
+  else
+  {
+
+    if (CdbLength8)
+    {
+      *CdbLength8 = 0;
+    }
+
+    if (CdbLength32)
+    {
+      *CdbLength32 = 0;
+    }
+
+    if (ScsiStatus)
+    {
+      *ScsiStatus = SCSISTAT_GOOD;
+    }
+
+    if (SenseInfoBuffer)
+    {
+      *SenseInfoBuffer = NULL;
+    }
+
+    if (SenseInfoBufferLength)
+    {
+      *SenseInfoBufferLength = 0;
+    }
+  }
+
+  return Cdb;
+}
+
+FORCEINLINE
+VOID
+SrbSetScsiData(
+  _In_ PSTORAGE_REQUEST_BLOCK SrbEx,
+  _In_opt_ PUCHAR CdbLength8,
+  _In_opt_ PULONG CdbLength32,
+  _In_opt_ PUCHAR ScsiStatus,
+  _In_opt_ PVOID *SenseInfoBuffer,
+  _In_opt_ PUCHAR SenseInfoBufferLength)
+{
+  ULONG i;
+  PSRBEX_DATA SrbExData = NULL;
+  BOOLEAN FoundEntry = FALSE;
+
+  if ((SrbEx->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK) &&
+      (SrbEx->SrbFunction == SRB_FUNCTION_EXECUTE_SCSI))
+  {
+    SRBHELPER_ASSERT(SrbEx->NumSrbExData > 0);
+
+    for (i = 0; i < SrbEx->NumSrbExData; i++)
+    {
+      if ((SrbEx->SrbExDataOffset[i] < sizeof(STORAGE_REQUEST_BLOCK)) ||
+          (SrbEx->SrbExDataOffset[i] >= SrbEx->SrbLength))
+      {
+        SRBHELPER_ASSERT(FALSE);
+        continue;
+      }
+
+      SrbExData = (PSRBEX_DATA)((PUCHAR)SrbEx + SrbEx->SrbExDataOffset[i]);
+
+      switch (SrbExData->Type)
+      {
+          case SrbExDataTypeScsiCdb16:
+            if (SrbEx->SrbExDataOffset[i] + sizeof(SRBEX_DATA_SCSI_CDB16) <= SrbEx->SrbLength)
+            {
+              FoundEntry = TRUE;
+              if (CdbLength8)
+              {
+                ((PSRBEX_DATA_SCSI_CDB16)SrbExData)->CdbLength = *CdbLength8;
+              }
+
+              if (ScsiStatus)
+              {
+                ((PSRBEX_DATA_SCSI_CDB16)SrbExData)->ScsiStatus = *ScsiStatus;
+              }
+
+              if (SenseInfoBuffer)
+              {
+                ((PSRBEX_DATA_SCSI_CDB16)SrbExData)->SenseInfoBuffer = *SenseInfoBuffer;
+              }
+
+              if (SenseInfoBufferLength)
+              {
+                ((PSRBEX_DATA_SCSI_CDB16)SrbExData)->SenseInfoBufferLength = *SenseInfoBufferLength;
+              }
+            }
+            else
+            {
+              // Catch invalid offset
+              SRBHELPER_ASSERT(FALSE);
+            }
+            break;
+
+          case SrbExDataTypeScsiCdb32:
+            if (SrbEx->SrbExDataOffset[i] + sizeof(SRBEX_DATA_SCSI_CDB32) <= SrbEx->SrbLength)
+            {
+              FoundEntry = TRUE;
+              if (CdbLength8)
+              {
+                ((PSRBEX_DATA_SCSI_CDB32)SrbExData)->CdbLength = *CdbLength8;
+              }
+
+              if (ScsiStatus)
+              {
+                ((PSRBEX_DATA_SCSI_CDB32)SrbExData)->ScsiStatus = *ScsiStatus;
+              }
+
+              if (SenseInfoBuffer)
+              {
+                ((PSRBEX_DATA_SCSI_CDB32)SrbExData)->SenseInfoBuffer = *SenseInfoBuffer;
+              }
+
+              if (SenseInfoBufferLength)
+              {
+                ((PSRBEX_DATA_SCSI_CDB32)SrbExData)->SenseInfoBufferLength = *SenseInfoBufferLength;
+              }
+            }
+            else
+            {
+              SRBHELPER_ASSERT(FALSE);
+            }
+            break;
+
+          case SrbExDataTypeScsiCdbVar:
+            if (SrbEx->SrbExDataOffset[i] + sizeof(SRBEX_DATA_SCSI_CDB_VAR) <= SrbEx->SrbLength)
+            {
+              FoundEntry = TRUE;
+              if (CdbLength32)
+              {
+                ((PSRBEX_DATA_SCSI_CDB_VAR)SrbExData)->CdbLength = *CdbLength32;
+              }
+
+              if (ScsiStatus)
+              {
+                ((PSRBEX_DATA_SCSI_CDB_VAR)SrbExData)->ScsiStatus = *ScsiStatus;
+              }
+
+              if (SenseInfoBuffer)
+              {
+                ((PSRBEX_DATA_SCSI_CDB_VAR)SrbExData)->SenseInfoBuffer = *SenseInfoBuffer;
+              }
+
+              if (SenseInfoBufferLength)
+              {
+                ((PSRBEX_DATA_SCSI_CDB_VAR)SrbExData)->SenseInfoBufferLength = *SenseInfoBufferLength;
+              }
+            }
+            else
+            {
+              SRBHELPER_ASSERT(FALSE);
+            }
+            break;
+      }
+
+      if (FoundEntry)
+      {
+        break;
+      }
+    }
+  }
+}
+
+FORCEINLINE
+PCDB
+SrbGetCdb(
+  _In_ PVOID Srb)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+  PCDB pCdb = NULL;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    return SrbGetScsiData(srb, NULL, NULL, NULL, NULL, NULL);
+  }
+  else
+  {
+    pCdb = (PCDB)((PSCSI_REQUEST_BLOCK)srb)->Cdb;
+  }
+  return pCdb;
+}
+
+FORCEINLINE
+ULONG
+SrbGetSrbFunction(
+  _In_ PVOID Srb)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    return srb->SrbFunction;
+  }
+  else
+  {
+    return (ULONG)((PSCSI_REQUEST_BLOCK)srb)->Function;
+  }
+}
+
+FORCEINLINE
+PVOID
+SrbGetSenseInfoBuffer(
+  _In_ PVOID Srb)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+  PVOID pSenseInfoBuffer = NULL;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    SrbGetScsiData(srb, NULL, NULL, NULL, &pSenseInfoBuffer, NULL);
+  }
+  else
+  {
+    pSenseInfoBuffer = ((PSCSI_REQUEST_BLOCK)srb)->SenseInfoBuffer;
+  }
+  return pSenseInfoBuffer;
+}
+
+FORCEINLINE
+UCHAR
+SrbGetSenseInfoBufferLength(
+  _In_ PVOID Srb)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+  UCHAR SenseInfoBufferLength = 0;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    SrbGetScsiData(srb, NULL, NULL, NULL, NULL, &SenseInfoBufferLength);
+  }
+  else
+  {
+    SenseInfoBufferLength = ((PSCSI_REQUEST_BLOCK)srb)->SenseInfoBufferLength;
+  }
+  return SenseInfoBufferLength;
+}
+
+FORCEINLINE
+VOID
+SrbSetSenseInfoBuffer(
+  _In_ PVOID Srb,
+  _In_opt_ PVOID SenseInfoBuffer)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    SrbSetScsiData(srb, NULL, NULL, NULL, &SenseInfoBuffer, NULL);
+  }
+  else
+  {
+    ((PSCSI_REQUEST_BLOCK)srb)->SenseInfoBuffer = SenseInfoBuffer;
+  }
+}
+
+FORCEINLINE
+VOID
+SrbSetSenseInfoBufferLength(
+  _In_ PVOID Srb,
+  _In_ UCHAR SenseInfoBufferLength)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    SrbSetScsiData(srb, NULL, NULL, NULL, NULL, &SenseInfoBufferLength);
+  }
+  else
+  {
+    ((PSCSI_REQUEST_BLOCK)srb)->SenseInfoBufferLength = SenseInfoBufferLength;
+  }
+}
+
+FORCEINLINE
+PVOID
+SrbGetOriginalRequest(
+  _In_ PVOID Srb)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    return srb->OriginalRequest;
+  }
+  else
+  {
+    return ((PSCSI_REQUEST_BLOCK)srb)->OriginalRequest;
+  }
+}
+
+FORCEINLINE
+VOID
+SrbSetOriginalRequest(
+  _In_ PVOID Srb,
+  _In_opt_ PVOID OriginalRequest)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    srb->OriginalRequest = OriginalRequest;
+  }
+  else
+  {
+    ((PSCSI_REQUEST_BLOCK)srb)->OriginalRequest = OriginalRequest;
+  }
+}
+
+FORCEINLINE
+PVOID
+SrbGetDataBuffer(
+  _In_ PVOID Srb)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+  PVOID DataBuffer;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    DataBuffer = srb->DataBuffer;
+  }
+  else
+  {
+    DataBuffer = ((PSCSI_REQUEST_BLOCK)srb)->DataBuffer;
+  }
+  return DataBuffer;
+}
+
+FORCEINLINE
+VOID
+SrbSetDataBuffer(
+  _In_ PVOID Srb,
+  _In_opt_ __drv_aliasesMem PVOID DataBuffer)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    srb->DataBuffer = DataBuffer;
+  }
+  else
+  {
+    ((PSCSI_REQUEST_BLOCK)srb)->DataBuffer = DataBuffer;
+  }
+}
+
+FORCEINLINE
+ULONG
+SrbGetDataTransferLength(
+  _In_ PVOID Srb)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+  ULONG DataTransferLength;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    DataTransferLength = srb->DataTransferLength;
+  }
+  else
+  {
+    DataTransferLength = ((PSCSI_REQUEST_BLOCK)srb)->DataTransferLength;
+  }
+  return DataTransferLength;
+}
+
+FORCEINLINE
+VOID
+SrbSetDataTransferLength(
+  _In_ PVOID Srb,
+  _In_ ULONG DataTransferLength)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    srb->DataTransferLength = DataTransferLength;
+  }
+  else
+  {
+    ((PSCSI_REQUEST_BLOCK)srb)->DataTransferLength = DataTransferLength;
+  }
+}
+
+FORCEINLINE
+ULONG
+SrbGetTimeOutValue(
+  _In_ PVOID Srb)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+  ULONG timeOutValue;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    timeOutValue = srb->TimeOutValue;
+  }
+  else
+  {
+    timeOutValue = ((PSCSI_REQUEST_BLOCK)srb)->TimeOutValue;
+  }
+  return timeOutValue;
+}
+
+FORCEINLINE
+VOID
+SrbSetTimeOutValue(
+  _In_ PVOID Srb,
+  _In_ ULONG TimeOutValue)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    srb->TimeOutValue = TimeOutValue;
+  }
+  else
+  {
+    ((PSCSI_REQUEST_BLOCK)srb)->TimeOutValue = TimeOutValue;
+  }
+}
+
+FORCEINLINE
+VOID
+SrbSetQueueSortKey(
+  _In_ PVOID Srb,
+  _In_ ULONG QueueSortKey)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+
+  if (srb->Function != SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    ((PSCSI_REQUEST_BLOCK)srb)->QueueSortKey = QueueSortKey;
+  }
+}
+
+FORCEINLINE
+VOID
+SrbSetQueueTag(
+  _In_ PVOID Srb,
+  _In_ ULONG QueueTag)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    srb->RequestTag = QueueTag;
+  }
+  else
+  {
+    ((PSCSI_REQUEST_BLOCK)srb)->QueueTag = (UCHAR)QueueTag;
+  }
+}
+
+#define SrbSetRequestTag SrbSetQueueTag
+
+FORCEINLINE
+ULONG
+SrbGetQueueTag(
+  _In_ PVOID Srb)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    return srb->RequestTag;
+  }
+  else
+  {
+    return ((PSCSI_REQUEST_BLOCK)srb)->QueueTag;
+  }
+}
+
+#define SrbGetRequestTag SrbGetQueueTag
+
+FORCEINLINE
+PVOID
+SrbGetNextSrb(
+  _In_ PVOID Srb)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    return (PVOID)srb->NextSrb;
+  }
+  else
+  {
+    return (PVOID)((PSCSI_REQUEST_BLOCK)srb)->NextSrb;
+  }
+}
+
+FORCEINLINE
+VOID
+SrbSetNextSrb(
+  _In_ PVOID Srb,
+  _In_opt_ PVOID NextSrb)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    srb->NextSrb = (PSTORAGE_REQUEST_BLOCK)NextSrb;
+  }
+  else
+  {
+    ((PSCSI_REQUEST_BLOCK)srb)->NextSrb = (PSCSI_REQUEST_BLOCK)NextSrb;
+  }
+}
+
+FORCEINLINE
+ULONG
+SrbGetSrbFlags(
+  _In_ PVOID Srb)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+  ULONG srbFlags;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    srbFlags = srb->SrbFlags;
+  }
+  else
+  {
+    srbFlags = ((PSCSI_REQUEST_BLOCK)srb)->SrbFlags;
+  }
+  return srbFlags;
+}
+
+FORCEINLINE
+VOID
+SrbAssignSrbFlags(
+  _In_ PVOID Srb,
+  _In_ ULONG Flags)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    srb->SrbFlags = Flags;
+  }
+  else
+  {
+    ((PSCSI_REQUEST_BLOCK)srb)->SrbFlags = Flags;
+  }
+}
+
+FORCEINLINE
+VOID
+SrbSetSrbFlags(
+  _In_ PVOID Srb,
+  _In_ ULONG Flags)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    srb->SrbFlags |= Flags;
+  }
+  else
+  {
+    ((PSCSI_REQUEST_BLOCK)srb)->SrbFlags |= Flags;
+  }
+}
+
+FORCEINLINE
+VOID
+SrbClearSrbFlags(
+  _In_ PVOID Srb,
+  _In_ ULONG Flags)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    srb->SrbFlags &= ~Flags;
+  }
+  else
+  {
+    ((PSCSI_REQUEST_BLOCK)srb)->SrbFlags &= ~Flags;
+  }
+}
+
+FORCEINLINE
+ULONG
+SrbGetSystemStatus(
+  _In_ PVOID Srb)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+  ULONG systemStatus;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    systemStatus = srb->SystemStatus;
+  }
+  else
+  {
+    systemStatus = ((PSCSI_REQUEST_BLOCK)srb)->InternalStatus;
+  }
+  return systemStatus;
+}
+
+FORCEINLINE
+VOID
+SrbSetSystemStatus(
+  _In_ PVOID Srb,
+  _In_ ULONG Status)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    srb->SystemStatus = Status;
+  }
+  else
+  {
+    ((PSCSI_REQUEST_BLOCK)srb)->InternalStatus = Status;
+  }
+}
+
+FORCEINLINE
+UCHAR
+SrbGetScsiStatus(
+  _In_ PVOID Srb)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+  UCHAR scsiStatus = 0;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    SrbGetScsiData(srb, NULL, NULL, &scsiStatus, NULL, NULL);
+  }
+  else
+  {
+    scsiStatus = ((PSCSI_REQUEST_BLOCK)srb)->ScsiStatus;
+  }
+  return scsiStatus;
+}
+
+FORCEINLINE
+VOID
+SrbSetScsiStatus(
+  _In_ PVOID Srb,
+  _In_ UCHAR ScsiStatus)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    SrbSetScsiData(srb, NULL, NULL, &ScsiStatus, NULL, NULL);
+  }
+  else
+  {
+    ((PSCSI_REQUEST_BLOCK)srb)->ScsiStatus = ScsiStatus;
+  }
+}
+
+FORCEINLINE
+UCHAR
+SrbGetCdbLength(
+  _In_ PVOID Srb)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+  UCHAR CdbLength = 0;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    SrbGetScsiData(srb, &CdbLength, NULL, NULL, NULL, NULL);
+  }
+  else
+  {
+    CdbLength = ((PSCSI_REQUEST_BLOCK)srb)->CdbLength;
+  }
+  return CdbLength;
+}
+
+FORCEINLINE
+VOID
+SrbSetCdbLength(
+  _In_ PVOID Srb,
+  _In_ UCHAR CdbLength)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    SrbSetScsiData(srb, &CdbLength, NULL, NULL, NULL, NULL);
+  }
+  else
+  {
+    ((PSCSI_REQUEST_BLOCK)srb)->CdbLength = CdbLength;
+  }
+}
+
+FORCEINLINE
+ULONG
+SrbGetRequestAttribute(
+  _In_ PVOID Srb)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+  ULONG RequestAttribute;
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    RequestAttribute = srb->RequestAttribute;
+  }
+  else
+  {
+    RequestAttribute = ((PSCSI_REQUEST_BLOCK)srb)->QueueAction;
+  }
+  return RequestAttribute;
+}
+
+#define SrbGetQueueAction SrbGetRequestAttribute
+
+FORCEINLINE
+VOID
+SrbSetRequestAttribute(
+  _In_ PVOID Srb,
+  _In_ UCHAR RequestAttribute)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    srb->RequestAttribute = RequestAttribute;
+  }
+  else
+  {
+    ((PSCSI_REQUEST_BLOCK)srb)->QueueAction = RequestAttribute;
+  }
+}
+
+#define SrbSetQueueAction SrbSetRequestAttribute
+
+FORCEINLINE
+UCHAR
+SrbGetPathId(
+  _In_ PVOID Srb)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+  UCHAR PathId = 0;
+  PSTOR_ADDRESS storAddr = NULL;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    storAddr = (PSTOR_ADDRESS)SrbGetAddress(srb);
+    if (storAddr)
+    {
+      switch (storAddr->Type)
+      {
+        case STOR_ADDRESS_TYPE_BTL8:
+          PathId = ((PSTOR_ADDR_BTL8)storAddr)->Path;
+          break;
+
+        default:
+          SRBHELPER_ASSERT(FALSE);
+          break;
+      }
+    }
+  }
+  else
+  {
+    PathId = ((PSCSI_REQUEST_BLOCK)srb)->PathId;
+  }
+  return PathId;
+}
+
+FORCEINLINE
+UCHAR
+SrbGetTargetId(
+  _In_ PVOID Srb)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+  UCHAR TargetId = 0;
+  PSTOR_ADDRESS storAddr = NULL;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    storAddr = (PSTOR_ADDRESS)SrbGetAddress(srb);
+    if (storAddr)
+    {
+      switch (storAddr->Type)
+      {
+        case STOR_ADDRESS_TYPE_BTL8:
+          TargetId = ((PSTOR_ADDR_BTL8)storAddr)->Target;
+          break;
+
+        default:
+          SRBHELPER_ASSERT(FALSE);
+          break;
+      }
+    }
+  }
+  else
+  {
+    TargetId = ((PSCSI_REQUEST_BLOCK)srb)->TargetId;
+  }
+  return TargetId;
+}
+
+FORCEINLINE
+UCHAR
+SrbGetLun(
+  _In_ PVOID Srb)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+  UCHAR Lun = 0;
+  PSTOR_ADDRESS storAddr = NULL;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    storAddr = (PSTOR_ADDRESS)SrbGetAddress(srb);
+    if (storAddr)
+    {
+      switch (storAddr->Type)
+      {
+        case STOR_ADDRESS_TYPE_BTL8:
+          Lun = ((PSTOR_ADDR_BTL8)storAddr)->Lun;
+          break;
+
+        default:
+          SRBHELPER_ASSERT(FALSE);
+          break;
+      }
+    }
+  }
+  else
+  {
+    Lun = ((PSCSI_REQUEST_BLOCK)srb)->Lun;
+  }
+  return Lun;
+}
+
+FORCEINLINE
+VOID
+SrbGetPathTargetLun(
+  _In_ PVOID Srb,
+  _In_opt_ PUCHAR PathId,
+  _In_opt_ PUCHAR TargetId,
+  _In_opt_ PUCHAR Lun)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+  PSTOR_ADDRESS storAddr = NULL;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    storAddr = (PSTOR_ADDRESS)SrbGetAddress(srb);
+    if (storAddr)
+    {
+      switch (storAddr->Type)
+      {
+        case STOR_ADDRESS_TYPE_BTL8:
+          if (PathId != NULL)
+          {
+            *PathId = ((PSTOR_ADDR_BTL8)storAddr)->Path;
+          }
+
+          if (TargetId != NULL)
+          {
+            *TargetId = ((PSTOR_ADDR_BTL8)storAddr)->Target;
+          }
+
+          if (Lun != NULL)
+          {
+            *Lun = ((PSTOR_ADDR_BTL8)storAddr)->Lun;
+          }
+
+          break;
+
+        default:
+          SRBHELPER_ASSERT(FALSE);
+          break;
+      }
+    }
+  }
+  else
+  {
+    if (PathId != NULL)
+    {
+      *PathId = ((PSCSI_REQUEST_BLOCK)srb)->PathId;
+    }
+
+    if (TargetId != NULL)
+    {
+      *TargetId = ((PSCSI_REQUEST_BLOCK)srb)->TargetId;
+    }
+
+    if (Lun != NULL)
+    {
+      *Lun = ((PSCSI_REQUEST_BLOCK)srb)->Lun;
+    }
+  }
+
+  return;
+}
+
+FORCEINLINE
+PVOID
+SrbGetMiniportContext(
+  _In_ PVOID Srb)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    return srb->MiniportContext;
+  }
+  else
+  {
+    return ((PSCSI_REQUEST_BLOCK)srb)->SrbExtension;
+  }
+}
+
+FORCEINLINE
+UCHAR
+SrbGetSrbStatus(
+  _In_ PVOID Srb)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    return srb->SrbStatus;
+  }
+  else
+  {
+    return ((PSCSI_REQUEST_BLOCK)srb)->SrbStatus;
+  }
+}
+
+FORCEINLINE
+VOID
+SrbSetSrbStatus(
+  _In_ PVOID Srb,
+  _In_ UCHAR status)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    if (srb->SrbStatus & SRB_STATUS_AUTOSENSE_VALID)
+    {
+      srb->SrbStatus = status | SRB_STATUS_AUTOSENSE_VALID;
+    }
+    else
+    {
+      srb->SrbStatus = status;
+    }
+  }
+  else
+  {
+    if (((PSCSI_REQUEST_BLOCK)srb)->SrbStatus & SRB_STATUS_AUTOSENSE_VALID)
+    {
+      ((PSCSI_REQUEST_BLOCK)srb)->SrbStatus = status | SRB_STATUS_AUTOSENSE_VALID;
+    }
+    else
+    {
+      ((PSCSI_REQUEST_BLOCK)srb)->SrbStatus = status;
+    }
+  }
+}
+
+FORCEINLINE
+PVOID
+SrbGetPortContext(
+  _In_ PVOID Srb)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    return srb->PortContext;
+  }
+  else
+  {
+    SRBHELPER_ASSERT(FALSE);
+    return NULL;
+  }
+}
+
+FORCEINLINE
+VOID
+SrbSetPortContext(
+  _In_ PVOID Srb,
+  _In_ PVOID PortContext)
+{
+  PSTORAGE_REQUEST_BLOCK srb = (PSTORAGE_REQUEST_BLOCK)Srb;
+
+  if (srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK)
+  {
+    srb->PortContext = PortContext;
+  }
+  else
+  {
+    SRBHELPER_ASSERT(FALSE);
+  }
+}
+
+#endif /* (NTDDI_VERSION >= NTDDI_WIN8) */
+#endif /* _SRBHELPER_H_ */
diff --git a/sdk/include/ddk/storduid.h b/sdk/include/ddk/storduid.h
new file mode 100644
index 00000000000..fa8d89eb751
--- /dev/null
+++ b/sdk/include/ddk/storduid.h
@@ -0,0 +1,241 @@
+#ifndef _STORDUID_H_
+#define _STORDUID_H_
+
+typedef enum _DUID_MATCH_STATUS
+{
+  DuidExactMatch = 0,
+  DuidSubIdMatch,
+  DuidNoMatch,
+  DuidErrorGeneral = 100,
+  DuidErrorMissingDuid,
+  DuidErrorVersionMismatch,
+  DuidErrorInvalidDuid,
+  DuidErrorInvalidDeviceIdDescSize,
+  DuidErrorInvalidDeviceDescSize,
+  DuidErrorInvalidLayoutSigSize,
+  DuidErrorInvalidLayoutSigVersion,
+  DuidErrorMaximum
+} DUID_MATCH_STATUS;
+
+#define DUID_VERSION_1 1
+
+#define DUID_HARDWARE_IDS_ONLY 0
+#define DUID_INCLUDE_SOFTWARE_IDS 1
+
+#define DUID_MATCH_ERROR(_duid_status) ((_duid_status) >= DuidErrorGeneral ? TRUE : FALSE)
+#define DUID_MATCH_SUCCESS(_duid_status) ((_duid_status) < DuidErrorGeneral ? TRUE : FALSE)
+
+typedef struct _STORAGE_DEVICE_UNIQUE_IDENTIFIER
+{
+  ULONG Version;
+  ULONG Size;
+  ULONG StorageDeviceIdOffset;
+  ULONG StorageDeviceOffset;
+  ULONG DriveLayoutSignatureOffset;
+} STORAGE_DEVICE_UNIQUE_IDENTIFIER, *PSTORAGE_DEVICE_UNIQUE_IDENTIFIER;
+
+typedef struct _STORAGE_DEVICE_LAYOUT_SIGNATURE
+{
+  ULONG Version;
+  ULONG Size;
+  BOOLEAN Mbr;
+  union {
+    ULONG MbrSignature;
+    GUID GptDiskId;
+  } DeviceSpecific;
+} STORAGE_DEVICE_LAYOUT_SIGNATURE, *PSTORAGE_DEVICE_LAYOUT_SIGNATURE;
+
+inline
+DUID_MATCH_STATUS
+CompareStorageDuids(
+  _In_ PSTORAGE_DEVICE_UNIQUE_IDENTIFIER Duid1,
+  _In_ PSTORAGE_DEVICE_UNIQUE_IDENTIFIER Duid2);
+
+inline
+DUID_MATCH_STATUS
+CompareStorageDuids(
+  _In_ PSTORAGE_DEVICE_UNIQUE_IDENTIFIER Duid1,
+  _In_ PSTORAGE_DEVICE_UNIQUE_IDENTIFIER Duid2)
+{
+  if (!Duid1 || !Duid2)
+  {
+    return DuidErrorMissingDuid;
+  }
+
+  if (Duid1->Size < sizeof(STORAGE_DEVICE_UNIQUE_IDENTIFIER) ||
+      Duid2->Size < sizeof(STORAGE_DEVICE_UNIQUE_IDENTIFIER))
+  {
+    return DuidErrorGeneral;
+  }
+
+  if (Duid1->Version != DUID_VERSION_1 || Duid2->Version != DUID_VERSION_1)
+  {
+    return DuidErrorVersionMismatch;
+  }
+
+  if (Duid1->StorageDeviceIdOffset == 0 && Duid1->StorageDeviceOffset == 0 &&
+      Duid1->DriveLayoutSignatureOffset == 0)
+  {
+    return DuidErrorInvalidDuid;
+  }
+
+  if (Duid2->StorageDeviceIdOffset == 0 && Duid2->StorageDeviceOffset == 0 &&
+      Duid2->DriveLayoutSignatureOffset == 0)
+  {
+    return DuidErrorInvalidDuid;
+  }
+
+  if (Duid1->Size == Duid2->Size)
+  {
+    if (memcmp(Duid1, Duid2, Duid1->Size) == 0)
+    {
+      return DuidExactMatch;
+    }
+  }
+
+  if (Duid1->StorageDeviceIdOffset && Duid2->StorageDeviceIdOffset)
+  {
+    PSTORAGE_DEVICE_ID_DESCRIPTOR idDesc1;
+    PSTORAGE_DEVICE_ID_DESCRIPTOR idDesc2;
+
+    PSTORAGE_IDENTIFIER ident1;
+    PSTORAGE_IDENTIFIER ident2;
+
+    ULONG idx1;
+    ULONG idx2;
+
+    idDesc1 = (PSTORAGE_DEVICE_ID_DESCRIPTOR)((PUCHAR)Duid1 + Duid1->StorageDeviceIdOffset);
+    idDesc2 = (PSTORAGE_DEVICE_ID_DESCRIPTOR)((PUCHAR)Duid2 + Duid2->StorageDeviceIdOffset);
+
+    if (idDesc1->Size < sizeof(STORAGE_DEVICE_ID_DESCRIPTOR) ||
+        idDesc2->Size < sizeof(STORAGE_DEVICE_ID_DESCRIPTOR))
+    {
+      return DuidErrorInvalidDeviceIdDescSize;
+    }
+
+    if (idDesc1->Size == idDesc2->Size)
+    {
+      if (memcmp(idDesc1, idDesc2, idDesc1->Size) == 0)
+      {
+        return DuidSubIdMatch;
+      }
+    }
+
+    ident1 = (PSTORAGE_IDENTIFIER)(idDesc1->Identifiers);
+
+    for (idx1 = 0; idx1 < idDesc1->NumberOfIdentifiers; idx1++)
+    {
+      if ((ident1->Type == StorageIdTypeScsiNameString || ident1->Type == StorageIdTypeFCPHName ||
+           ident1->Type == StorageIdTypeEUI64 || ident1->Type == StorageIdTypeVendorId) &&
+          (ident1->Association == StorageIdAssocPort) &&
+          (ident1->CodeSet == StorageIdCodeSetUtf8 || ident1->CodeSet == StorageIdCodeSetAscii ||
+           ident1->CodeSet == StorageIdCodeSetBinary))
+      {
+        ident2 = (PSTORAGE_IDENTIFIER)(idDesc2->Identifiers);
+
+        for (idx2 = 0; idx2 < idDesc2->NumberOfIdentifiers; idx2++)
+        {
+          if (ident1->Type == ident2->Type && ident1->Association == ident2->Association &&
+              ident1->CodeSet == ident2->CodeSet &&
+              ident1->IdentifierSize == ident2->IdentifierSize &&
+              (memcmp(ident1->Identifier, ident2->Identifier, ident1->IdentifierSize) == 0))
+          {
+            return DuidSubIdMatch;
+          }
+
+          ident2 = (PSTORAGE_IDENTIFIER)((PUCHAR)ident2 + ident2->NextOffset);
+        }
+      }
+
+      ident1 = (PSTORAGE_IDENTIFIER)((PUCHAR)ident1 + ident1->NextOffset);
+    }
+  }
+
+  if (Duid1->StorageDeviceOffset && Duid2->StorageDeviceOffset)
+  {
+    PSTORAGE_DEVICE_DESCRIPTOR desc1;
+    PSTORAGE_DEVICE_DESCRIPTOR desc2;
+
+    desc1 = (PSTORAGE_DEVICE_DESCRIPTOR)((PUCHAR)Duid1 + Duid1->StorageDeviceOffset);
+    desc2 = (PSTORAGE_DEVICE_DESCRIPTOR)((PUCHAR)Duid2 + Duid2->StorageDeviceOffset);
+
+    if (desc1->Size < sizeof(STORAGE_DEVICE_DESCRIPTOR) ||
+        desc2->Size < sizeof(STORAGE_DEVICE_DESCRIPTOR))
+    {
+      return DuidErrorInvalidDeviceDescSize;
+    }
+
+    if (desc1->Size == desc2->Size)
+    {
+      if (memcmp(desc1, desc2, desc1->Size) == 0)
+      {
+        return DuidSubIdMatch;
+      }
+    }
+
+    if (desc1->SerialNumberOffset && desc2->SerialNumberOffset)
+    {
+      const char *string1;
+      const char *string2;
+
+      string1 = (const char *)((PUCHAR)desc1 + desc1->SerialNumberOffset);
+      string2 = (const char *)((PUCHAR)desc2 + desc2->SerialNumberOffset);
+
+      if (strcmp(string1, string2) == 0)
+      {
+        if (desc1->VendorIdOffset && desc2->VendorIdOffset)
+        {
+          string1 = (const char *)((PUCHAR)desc1 + desc1->VendorIdOffset);
+          string2 = (const char *)((PUCHAR)desc2 + desc2->VendorIdOffset);
+
+          if (strcmp(string1, string2) != 0)
+          {
+            return DuidNoMatch;
+          }
+        }
+
+        if (desc1->ProductIdOffset && desc2->ProductIdOffset)
+        {
+          string1 = (const char *)((PUCHAR)desc1 + desc1->ProductIdOffset);
+          string2 = (const char *)((PUCHAR)desc2 + desc2->ProductIdOffset);
+
+          if (strcmp(string1, string2) != 0)
+          {
+            return DuidNoMatch;
+          }
+        }
+
+        return DuidSubIdMatch;
+      }
+    }
+  }
+
+  if (Duid1->DriveLayoutSignatureOffset && Duid2->DriveLayoutSignatureOffset)
+  {
+    PSTORAGE_DEVICE_LAYOUT_SIGNATURE sig1;
+    PSTORAGE_DEVICE_LAYOUT_SIGNATURE sig2;
+
+    sig1 = (PSTORAGE_DEVICE_LAYOUT_SIGNATURE)((PUCHAR)Duid1 + Duid1->DriveLayoutSignatureOffset);
+    sig2 = (PSTORAGE_DEVICE_LAYOUT_SIGNATURE)((PUCHAR)Duid2 + Duid2->DriveLayoutSignatureOffset);
+
+    if (sig1->Version != DUID_VERSION_1 && sig2->Version != DUID_VERSION_1)
+    {
+      return DuidErrorInvalidLayoutSigVersion;
+    }
+
+    if (sig1->Size < sizeof(STORAGE_DEVICE_LAYOUT_SIGNATURE) ||
+        sig2->Size < sizeof(STORAGE_DEVICE_LAYOUT_SIGNATURE))
+    {
+      return DuidErrorInvalidLayoutSigSize;
+    }
+
+    if (memcmp(sig1, sig2, sizeof(STORAGE_DEVICE_LAYOUT_SIGNATURE)) == 0)
+    {
+      return DuidSubIdMatch;
+    }
+  }
+
+  return DuidNoMatch;
+}
+
+#endif /* _STORDUID_H_ */
diff --git a/sdk/include/ddk/storswtr.h b/sdk/include/ddk/storswtr.h
new file mode 100644
index 00000000000..4f9074fb112
--- /dev/null
+++ b/sdk/include/ddk/storswtr.h
@@ -0,0 +1,130 @@
+#ifndef _STORSWTR_H_
+#define _STORSWTR_H_
+
+#include <stdarg.h>
+
+#ifdef TRACE_LEVEL_FATAL
+#undef TRACE_LEVEL_FATAL
+#endif
+
+#ifdef TRACE_LEVEL_ERROR
+#undef TRACE_LEVEL_ERROR
+#endif
+
+#ifdef TRACE_LEVEL_WARNING
+#undef TRACE_LEVEL_WARNING
+#endif
+
+#ifdef TRACE_LEVEL_INFORMATION
+#undef TRACE_LEVEL_INFORMATION
+#endif
+
+#ifdef TRACE_LEVEL_VERBOSE
+#undef TRACE_LEVEL_VERBOSE
+#endif
+
+#define TRACE_LEVEL_FATAL       1
+#define TRACE_LEVEL_ERROR       2
+#define TRACE_LEVEL_WARNING     3
+#define TRACE_LEVEL_INFORMATION 4
+#define TRACE_LEVEL_VERBOSE     5
+
+// if defined, uses KdPrint instead of WMI tracing
+#ifndef DEBUG_USE_KDPRINT
+
+#define WPP_NORMAL_FLAGS    WPP_DEFINE_BIT(TRACE_FLAG_GENERAL)  \
+                            WPP_DEFINE_BIT(TRACE_FLAG_PNP)      \
+                            WPP_DEFINE_BIT(TRACE_FLAG_POWER)    \
+                            WPP_DEFINE_BIT(TRACE_FLAG_RW)       \
+                            WPP_DEFINE_BIT(TRACE_FLAG_IOCTL)    \
+                            WPP_DEFINE_BIT(TRACE_FLAG_QUEUE)    \
+                            WPP_DEFINE_BIT(TRACE_FLAG_WMI)      \
+                            WPP_DEFINE_BIT(TRACE_FLAG_TIMER)    \
+                            WPP_DEFINE_BIT(TRACE_FLAG_INIT)     \
+                            WPP_DEFINE_BIT(TRACE_FLAG_LOCK)     \
+                            WPP_DEFINE_BIT(TRACE_FLAG_DEBUG1)   \
+                            WPP_DEFINE_BIT(TRACE_FLAG_DEBUG2)   \
+                            WPP_DEFINE_BIT(TRACE_FLAG_MCN)      \
+                            WPP_DEFINE_BIT(TRACE_FLAG_ISR)      \
+                            WPP_DEFINE_BIT(TRACE_FLAG_ENUM)     \
+                            WPP_DEFINE_BIT(TRACE_FLAG_LOGOTEST) \
+                            WPP_DEFINE_BIT(TRACE_FLAG_DUMP)     \
+                            WPP_DEFINE_BIT(TRACE_FLAG_SCSI)
+
+#define WPP_CONTROL_GUIDS_NORMAL_FLAGS(_GUID)   \
+    WPP_DEFINE_CONTROL_GUID(wppCtlGuid, _GUID, WPP_NORMAL_FLAGS)
+
+#define WPP_LEVEL_FLAGS_ENABLED(lvl, flags) \
+   (WPP_LEVEL_ENABLED(flags) && WPP_CONTROL(WPP_BIT_ ## flags).Level >= lvl)
+#define WPP_LEVEL_FLAGS_LOGGER(lvl,flags)   WPP_LEVEL_LOGGER(flags)
+
+#define DEBUG_USE_WPP
+
+#else // DEBUG_USE_KDPRINT
+
+#ifdef DEBUG_USE_WPP
+#undef DEBUG_USE_WPP
+#endif
+
+#ifdef WPP_INIT_TRACING
+#undef WPP_INIT_TRACING
+#endif
+
+#ifdef WPP_CLEANUP
+#undef WPP_CLEANUP
+#endif
+
+#define WPP_INIT_TRACING(_DRIVER, _REGISTRY)
+#define WPP_CLEANUP(_DRIVER)
+
+typedef enum _DEBUG_FLAGS {
+  TRACE_FLAG_GENERAL = 0,
+  TRACE_FLAG_PNP,
+  TRACE_FLAG_POWER,
+  TRACE_FLAG_RW,
+  TRACE_FLAG_IOCTL,
+  TRACE_FLAG_QUEUE,
+  TRACE_FLAG_WMI,
+  TRACE_FLAG_TIMER,
+  TRACE_FLAG_INIT,
+  TRACE_FLAG_LOCK,
+  TRACE_FLAG_DEBUG1,
+  TRACE_FLAG_DEBUG2,
+  TRACE_FLAG_MCN,
+  TRACE_FLAG_ISR,
+  TRACE_FLAG_ENUM,
+  TRACE_FLAG_LOGOTEST,
+  TRACE_FLAG_DUMP,
+  TRACE_FLAG_SCSI
+} DEBUG_FLAGS, *PDEBUG_FLAGS;
+
+#if DBG && (NTDDI_VERSION >= NTDDI_WINXP)
+
+#define TracePrint(x)   StorDebugPrint x
+
+#if DEBUG_MAIN_SOURCE
+
+void StorDebugPrint(int DebugPrintLevel, DEBUG_FLAGS DebugPrintFlags, PCCHAR DebugMessage, ...)
+{
+  va_list ap;
+  UNREFERENCED_PARAMETER(DebugPrintFlags);
+  va_start(ap, DebugMessage);
+  vDbgPrintEx(DEBUG_COMP_ID, DebugPrintLevel, DebugMessage, ap);
+  va_end(ap);
+}
+
+#else
+
+void StorDebugPrint(int DebugPrintLevel, DEBUG_FLAGS DebugPrintFlags, PCCHAR DebugMessage, ...);
+
+#endif  // DEBUG_MAIN_SOURCE
+
+#else // DBG && (NTDDI_VERSION >= NTDDI_WINXP)
+
+#define TracePrint(x)
+
+#endif  // DBG && (NTDDI_VERSION >= NTDDI_WINXP)
+
+#endif  // DEBUG_USE_KDPRINT
+
+#endif  // _STORSWTR_H_