From d7d716a64c0757ed1b3238d8a96e7d85c0160c0f Mon Sep 17 00:00:00 2001
From: Victor Perevertkin <victor.perevertkin@reactos.org>
Date: Thu, 24 Sep 2020 05:47:48 +0300
Subject: [PATCH] [DDK] Add definitions required for newer storage class
 drivers (cdrom)

CORE-17129
---
 sdk/include/ddk/scsi.h    |  1 +
 sdk/include/ddk/usbdlib.h | 16 ++++++++++++++--
 sdk/include/ddk/wdmguid.h |  4 ++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/sdk/include/ddk/scsi.h b/sdk/include/ddk/scsi.h
index 42027d5b84d..465880aee76 100644
--- a/sdk/include/ddk/scsi.h
+++ b/sdk/include/ddk/scsi.h
@@ -113,6 +113,7 @@ extern "C" {
 #define NOTIFICATION_BUSY_EVENT_NO_EVENT            0x0
 #define NOTIFICATION_BUSY_EVENT_NO_CHANGE           0x0
 #define NOTIFICATION_BUSY_EVENT_BUSY                0x1
+#define NOTIFICATION_BUSY_EVENT_LO_CHANGE           0x2
 
 #define NOTIFICATION_BUSY_STATUS_NO_EVENT           0x0
 #define NOTIFICATION_BUSY_STATUS_POWER              0x1
diff --git a/sdk/include/ddk/usbdlib.h b/sdk/include/ddk/usbdlib.h
index 0a05d83ee70..3530ed9c108 100644
--- a/sdk/include/ddk/usbdlib.h
+++ b/sdk/include/ddk/usbdlib.h
@@ -89,11 +89,24 @@ typedef struct _USBD_INTERFACE_LIST_ENTRY {
   (urb)->UrbOSFeatureDescriptorRequest.TransferBuffer = (transferBuffer);                                                                  \
   (urb)->UrbOSFeatureDescriptorRequest.InterfaceNumber = (interface);                                                                      \
   (urb)->UrbOSFeatureDescriptorRequest.MS_FeatureDescriptorIndex = (index);                                                                \
-  urb)->UrbOSFeatureDescriptorRequest.UrbLink = (link);                                                                                    \
+  (urb)->UrbOSFeatureDescriptorRequest.UrbLink = (link);                                                                                    \
 }
 
 #endif /* NTDDI_VERSION >= NTDDI_WINXP */
 
+#if (NTDDI_VERSION >= NTDDI_VISTA)
+
+#define USBD_CLIENT_CONTRACT_VERSION_INVALID 0xFFFFFFFF
+#define USBD_CLIENT_CONTRACT_VERSION_602 0x602
+
+#define USBD_INTERFACE_VERSION_600 0x600
+#define USBD_INTERFACE_VERSION_602 0x602
+#define USBD_INTERFACE_VERSION_603 0x603
+
+DECLARE_HANDLE(USBD_HANDLE);
+
+#endif // NTDDI_VISTA
+
 #define URB_STATUS(urb)                      ((urb)->UrbHeader.Status)
 
 #define GET_SELECT_CONFIGURATION_REQUEST_SIZE(totalInterfaces, totalPipes) \
@@ -230,4 +243,3 @@ USBD_ValidateConfigurationDescriptor(
 #endif
 
 #endif /* ! _USBD_ */
-
diff --git a/sdk/include/ddk/wdmguid.h b/sdk/include/ddk/wdmguid.h
index dadbddb7dcb..57b54cd1877 100644
--- a/sdk/include/ddk/wdmguid.h
+++ b/sdk/include/ddk/wdmguid.h
@@ -74,6 +74,10 @@ DEFINE_GUID(GUID_ACPI_PORT_RANGES_INTERFACE_STANDARD,
   0xf14f609b, 0xcbbd, 0x4957, 0xa6, 0x74, 0xbc, 0x00, 0x21, 0x3f, 0x1c, 0x97);
 DEFINE_GUID(GUID_PNP_LOCATION_INTERFACE,
   0x70211b0e, 0x0afb, 0x47db, 0xaf, 0xc1, 0x41, 0x0b, 0xf8, 0x42, 0x49, 0x7a);
+DEFINE_GUID(GUID_D3COLD_SUPPORT_INTERFACE,
+  0xb38290e5, 0x3cd0, 0x4f9d, 0x99, 0x37, 0xf5, 0xfe, 0x2b, 0x44, 0xd4, 0x7a);
+DEFINE_GUID(GUID_REENUMERATE_SELF_INTERFACE_STANDARD,
+  0x2aeb0243, 0x6a6e, 0x486b, 0x82, 0xfc, 0xd8, 0x15, 0xf6, 0xb9, 0x70, 0x06);
 
 DEFINE_GUID(GUID_BUS_TYPE_INTERNAL,
   0x1530ea73, 0x086b, 0x11d1, 0xa0, 0x9f, 0x00, 0xc0, 0x4f, 0xc3, 0x40, 0xb1);