[ros-diffs] [akhaldi] 55544: [PSDK] * ntdddisk.h: Import a recent fix from trunk.

Author: akhaldi
Date: Sat Feb 11 10:34:28 2012
New Revision: 55544

URL: http://svn.reactos.org/svn/reactos?rev=55544&view=rev
Log:
[PSDK]
* ntdddisk.h: Import a recent fix from trunk.

Modified:
    branches/usb-bringup-trunk/include/psdk/ntdddisk.h

Modified: branches/usb-bringup-trunk/include/psdk/ntdddisk.h
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/include/psdk/…
==============================================================================
--- branches/usb-bringup-trunk/include/psdk/ntdddisk.h [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/include/psdk/ntdddisk.h [iso-8859-1] Sat Feb 11 10:34:28
2012
@@ -151,6 +151,19 @@
 #define IOCTL_DISK_SET_CACHE_INFORMATION \
   CTL_CODE(IOCTL_DISK_BASE, 0x0036, METHOD_BUFFERED, FILE_READ_ACCESS |
FILE_WRITE_ACCESS)
 
+//
+// NTDDI_WIN2003 was an older define used in the early beta builds, which
+// Microsoft forgot to fix in a few headers.
+// NTDDI_WS03 is the correct term.
+//
+#if (NTDDI_VERSION < NTDDI_WS03)
+#define IOCTL_DISK_GET_WRITE_CACHE_STATE \
+  CTL_CODE(IOCTL_DISK_BASE, 0x0037, METHOD_BUFFERED, FILE_READ_ACCESS)
+#else
+#define OBSOLETE_DISK_GET_WRITE_CACHE_STATE \
+  CTL_CODE(IOCTL_DISK_BASE, 0x0037, METHOD_BUFFERED, FILE_READ_ACCESS)
+#endif
+
 #define IOCTL_DISK_SET_DRIVE_LAYOUT \
   CTL_CODE(IOCTL_DISK_BASE, 0x0004, METHOD_BUFFERED, FILE_READ_ACCESS |
FILE_WRITE_ACCESS)
 
@@ -183,7 +196,6 @@
 #define IOCTL_DISK_GROW_PARTITION           CTL_CODE(IOCTL_DISK_BASE, 0x0034,
METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
 #define IOCTL_DISK_GET_CACHE_INFORMATION    CTL_CODE(IOCTL_DISK_BASE, 0x0035,
METHOD_BUFFERED, FILE_READ_ACCESS)
 #define IOCTL_DISK_SET_CACHE_INFORMATION    CTL_CODE(IOCTL_DISK_BASE, 0x0036,
METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-#define IOCTL_DISK_GET_WRITE_CACHE_STATE    CTL_CODE(IOCTL_DISK_BASE, 0x0037,
METHOD_BUFFERED, FILE_READ_ACCESS)
 #define IOCTL_DISK_DELETE_DRIVE_LAYOUT      CTL_CODE(IOCTL_DISK_BASE, 0x0040,
METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
 #define IOCTL_DISK_UPDATE_PROPERTIES        CTL_CODE(IOCTL_DISK_BASE, 0x0050,
METHOD_BUFFERED, FILE_ANY_ACCESS)
 #define IOCTL_DISK_FORMAT_DRIVE             CTL_CODE(IOCTL_DISK_BASE, 0x00f3,
METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)