- Move DRIVE_LAYOUT_INFORMATION_MBR, DRIVE_LAYOUT_INFORMATION_GPT and
  PARTITION_INFORMATION_MBR structures from winddk.h to ntdddisk.h.
- Add definitions of IOCTL_DISK_HISTOGRAM_STRUCTURE, IOCTL_DISK_HISTOGRAM_DATA,
  IOCTL_DISK_HISTOGRAM_RESET, IOCTL_DISK_LOGGING, IOCTL_DISK_REQUEST_DATA,
  IOCTL_DISK_REQUEST_STRUCTURE, PARTITION_INFORMATION_MBR,
  DRIVE_LAYOUT_INFORMATION and IO_QUERY_DEVICE_DATA_FORMAT.

Modified: trunk/reactos/w32api/include/ddk/ntdddisk.h
Modified: trunk/reactos/w32api/include/ddk/winddk.h

--- trunk/reactos/w32api/include/ddk/ntdddisk.h	2005-06-17 17:08:04 UTC (rev 15992)
+++ trunk/reactos/w32api/include/ddk/ntdddisk.h	2005-06-17 17:12:17 UTC (rev 15993)
@@ -90,6 +90,15 @@

 #define IOCTL_DISK_GROW_PARTITION \
   CTL_CODE(IOCTL_DISK_BASE, 0x0034, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
 

+#define IOCTL_DISK_HISTOGRAM_STRUCTURE \
+  CTL_CODE(IOCTL_DISK_BASE, 0x000c, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+#define IOCTL_DISK_HISTOGRAM_DATA \
+  CTL_CODE(IOCTL_DISK_BASE, 0x000d, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+#define IOCTL_DISK_HISTOGRAM_RESET \
+  CTL_CODE(IOCTL_DISK_BASE, 0x000e, METHOD_BUFFERED, FILE_ANY_ACCESS)
+

 #define IOCTL_DISK_INTERNAL_CLEAR_VERIFY \
   CTL_CODE(IOCTL_DISK_BASE, 0x0101, METHOD_NEITHER, FILE_ANY_ACCESS)
 
@@ -99,6 +108,9 @@

 #define IOCTL_DISK_IS_WRITABLE \
   CTL_CODE(IOCTL_DISK_BASE, 0x0009, METHOD_BUFFERED, FILE_ANY_ACCESS)
 

+#define IOCTL_DISK_LOGGING \
+  CTL_CODE(IOCTL_DISK_BASE, 0x000a, METHOD_BUFFERED, FILE_ANY_ACCESS)
+

 #define IOCTL_DISK_PERFORMANCE \
   CTL_CODE(IOCTL_DISK_BASE, 0x0008, METHOD_BUFFERED, FILE_ANY_ACCESS)
 
@@ -108,6 +120,12 @@

 #define IOCTL_DISK_REASSIGN_BLOCKS \
   CTL_CODE(IOCTL_DISK_BASE, 0x0007, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
 

+#define IOCTL_DISK_REQUEST_DATA \
+  CTL_CODE(IOCTL_DISK_BASE, 0x0010, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+#define IOCTL_DISK_REQUEST_STRUCTURE \
+  CTL_CODE(IOCTL_DISK_BASE, 0x000f, METHOD_BUFFERED, FILE_ANY_ACCESS)
+

 #define IOCTL_DISK_RESERVE \
   CTL_CODE(IOCTL_DISK_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS)
 
@@ -325,6 +343,13 @@

   WCHAR  StorageManagerName[8];
 } DISK_PERFORMANCE, *PDISK_PERFORMANCE;
 

+typedef struct _PARTITION_INFORMATION_MBR {
+  UCHAR  PartitionType;
+  BOOLEAN  BootIndicator;
+  BOOLEAN  RecognizedPartition;
+  ULONG  HiddenSectors;
+} PARTITION_INFORMATION_MBR, *PPARTITION_INFORMATION_MBR;
+

 typedef struct _PARTITION_INFORMATION_EX {
   PARTITION_STYLE  PartitionStyle;
   LARGE_INTEGER  StartingOffset;
@@ -337,6 +362,23 @@

   } DUMMYUNIONNAME;
 } PARTITION_INFORMATION_EX, *PPARTITION_INFORMATION_EX;
 

+typedef struct _DRIVE_LAYOUT_INFORMATION {
+  ULONG  PartitionCount;
+  ULONG  Signature;
+  PARTITION_INFORMATION  PartitionEntry[1];
+} DRIVE_LAYOUT_INFORMATION, *PDRIVE_LAYOUT_INFORMATION;
+
+typedef struct _DRIVE_LAYOUT_INFORMATION_MBR {
+  ULONG  Signature;
+} DRIVE_LAYOUT_INFORMATION_MBR, *PDRIVE_LAYOUT_INFORMATION_MBR;
+
+typedef struct _DRIVE_LAYOUT_INFORMATION_GPT {
+  GUID  DiskId;
+  LARGE_INTEGER  StartingUsableOffset;
+  LARGE_INTEGER  UsableLength;
+  ULONG  MaxPartitionCount;
+} DRIVE_LAYOUT_INFORMATION_GPT, *PDRIVE_LAYOUT_INFORMATION_GPT;
+

 typedef struct _FORMAT_EX_PARAMETERS {
   MEDIA_TYPE  MediaType;
   ULONG  StartCylinderNumber;

--- trunk/reactos/w32api/include/ddk/winddk.h	2005-06-17 17:08:04 UTC (rev 15992)
+++ trunk/reactos/w32api/include/ddk/winddk.h	2005-06-17 17:12:17 UTC (rev 15993)
@@ -1091,26 +1091,6 @@

    IRP_RETRY_IO_COMPLETION = 0x4000
 };
 

-
-typedef struct _DRIVE_LAYOUT_INFORMATION_MBR {
-  ULONG  Signature;
-} DRIVE_LAYOUT_INFORMATION_MBR, *PDRIVE_LAYOUT_INFORMATION_MBR;
-
-typedef struct _DRIVE_LAYOUT_INFORMATION_GPT {
-  GUID  DiskId;
-  LARGE_INTEGER  StartingUsableOffset;
-  LARGE_INTEGER  UsableLength;
-  ULONG  MaxPartitionCount;
-} DRIVE_LAYOUT_INFORMATION_GPT, *PDRIVE_LAYOUT_INFORMATION_GPT;
-
-typedef struct _PARTITION_INFORMATION_MBR {
-  UCHAR  PartitionType;
-  BOOLEAN  BootIndicator;
-  BOOLEAN  RecognizedPartition;
-  ULONG  HiddenSectors;
-} PARTITION_INFORMATION_MBR, *PPARTITION_INFORMATION_MBR;
-
-

 typedef struct _BOOTDISK_INFORMATION {
   LONGLONG  BootPartitionOffset;
   LONGLONG  SystemPartitionOffset;
@@ -3715,6 +3695,13 @@

   IN ULONG  PeripheralNumber,
   IN PKEY_VALUE_FULL_INFORMATION  *PeripheralInformation);
 

+typedef enum _IO_QUERY_DEVICE_DATA_FORMAT {
+  IoQueryDeviceIdentifier = 0,
+  IoQueryDeviceConfigurationData,
+  IoQueryDeviceComponentInformation,
+  IoQueryDeviceMaxData
+} IO_QUERY_DEVICE_DATA_FORMAT, *PIO_QUERY_DEVICE_DATA_FORMAT;
+

 typedef enum _WORK_QUEUE_TYPE {
   CriticalWorkQueue,
   DelayedWorkQueue,