ntdef.h, ntddstor.h: sync with r/os svn@48864.


git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@3631 4407c894-4637-0410-b4f5-ada5f102cad1

mingw-w64-headers/include/ntddstor.h

diff --git a/mingw-w64-headers/include/ntddstor.h b/mingw-w64-headers/include/ntddstor.h
index cbf81df..618c82b 100644
--- a/mingw-w64-headers/include/ntddstor.h
+++ b/mingw-w64-headers/include/ntddstor.h
@@ -124,10 +124,10 @@
   CTL_CODE(IOCTL_STORAGE_BASE, 0x0301, METHOD_BUFFERED, FILE_ANY_ACCESS)
 
 #define IOCTL_STORAGE_RESET_BUS \
-  CTL_CODE(IOCTL_STORAGE_BASE, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
+  CTL_CODE(IOCTL_STORAGE_BASE, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS)
 
 #define IOCTL_STORAGE_RESET_DEVICE \
-  CTL_CODE(IOCTL_STORAGE_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
+  CTL_CODE(IOCTL_STORAGE_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS)
 
 #define IOCTL_STORAGE_GET_DEVICE_NUMBER \
   CTL_CODE(IOCTL_STORAGE_BASE, 0x0420, METHOD_BUFFERED, FILE_ANY_ACCESS)

mingw-w64-headers/include/ntdef.h

diff --git a/mingw-w64-headers/include/ntdef.h b/mingw-w64-headers/include/ntdef.h
index 2621e38..e298abf 100644
--- a/mingw-w64-headers/include/ntdef.h
+++ b/mingw-w64-headers/include/ntdef.h
@@ -587,6 +587,12 @@
 
 #define RTL_FIELD_SIZE(type, field) (sizeof(((type *)0)->field))
 
+#define RTL_SIZEOF_THROUGH_FIELD(type, field) \
+    (FIELD_OFFSET(type, field) + RTL_FIELD_SIZE(type, field))
+
+#define RTL_CONTAINS_FIELD(Struct, Size, Field) \
+    ( (((PCHAR)(&(Struct)->Field)) + sizeof((Struct)->Field)) <= (((PCHAR)(Struct))+(Size)) )
+
 #define RTL_NUMBER_OF_V1(A) (sizeof(A)/sizeof((A)[0]))
 #define RTL_NUMBER_OF_V2(A) RTL_NUMBER_OF_V1(A)
 #ifdef ENABLE_RTL_NUMBER_OF_V2