[akhaldi] 47775: [XDK] - Deduplicate FSRTL_COMMON_FCB_HEADER_LAYOUT in ntifs.h - Move ECP_HEADER from the ntifs template to fsrtltypes.h [DDK] - Update ntifs.h to reflect XDK changes.
Author: akhaldi Date: Sun Jun 13 13:55:30 2010 New Revision: 47775
URL: http://svn.reactos.org/svn/reactos?rev=47775&view=rev Log: [XDK] - Deduplicate FSRTL_COMMON_FCB_HEADER_LAYOUT in ntifs.h - Move ECP_HEADER from the ntifs template to fsrtltypes.h [DDK] - Update ntifs.h to reflect XDK changes.
Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/xdk/fsrtltypes.h trunk/reactos/include/xdk/ntifs.template.h
Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=477... ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Sun Jun 13 13:55:30 2010 @@ -6202,20 +6202,6 @@ LARGE_INTEGER FileSize; \ LARGE_INTEGER ValidDataLength;
-#define FSRTL_COMMON_FCB_HEADER_LAYOUT \ - CSHORT NodeTypeCode; \ - CSHORT NodeByteSize; \ - UCHAR Flags; \ - UCHAR IsFastIoPossible; \ - UCHAR Flags2; \ - UCHAR Reserved:4; \ - UCHAR Version:4; \ - PERESOURCE Resource; \ - PERESOURCE PagingIoResource; \ - LARGE_INTEGER AllocationSize; \ - LARGE_INTEGER FileSize; \ - LARGE_INTEGER ValidDataLength; - typedef struct _FSRTL_COMMON_FCB_HEADER { FSRTL_COMMON_FCB_HEADER_LAYOUT } FSRTL_COMMON_FCB_HEADER, *PFSRTL_COMMON_FCB_HEADER; @@ -6477,6 +6463,10 @@ #endif
typedef PVOID PNOTIFY_SYNC; + +#if (NTDDI_VERSION >= NTDDI_WIN7) +typedef struct _ECP_HEADER ECP_HEADER, *PECP_HEADER; +#endif
typedef BOOLEAN (NTAPI *PCHECK_FOR_TRAVERSE_ACCESS) ( @@ -8834,10 +8824,6 @@ #undef NLS_MB_CODE_PAGE_TAG #endif #define NLS_MB_CODE_PAGE_TAG NlsMbOemCodePageTag - -#if (NTDDI_VERSION >= NTDDI_WIN7) -typedef struct _ECP_HEADER ECP_HEADER, *PECP_HEADER; -#endif
#if (NTDDI_VERSION >= NTDDI_VISTA)
Modified: trunk/reactos/include/xdk/fsrtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/fsrtltypes.h?re... ============================================================================== --- trunk/reactos/include/xdk/fsrtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/fsrtltypes.h [iso-8859-1] Sun Jun 13 13:55:30 2010 @@ -283,6 +283,10 @@
typedef PVOID PNOTIFY_SYNC;
+#if (NTDDI_VERSION >= NTDDI_WIN7) +typedef struct _ECP_HEADER ECP_HEADER, *PECP_HEADER; +#endif + typedef BOOLEAN (NTAPI *PCHECK_FOR_TRAVERSE_ACCESS) ( IN PVOID NotifyContext,
Modified: trunk/reactos/include/xdk/ntifs.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ntifs.template.... ============================================================================== --- trunk/reactos/include/xdk/ntifs.template.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/ntifs.template.h [iso-8859-1] Sun Jun 13 13:55:30 2010 @@ -1118,10 +1118,6 @@ #undef NLS_MB_CODE_PAGE_TAG #endif #define NLS_MB_CODE_PAGE_TAG NlsMbOemCodePageTag - -#if (NTDDI_VERSION >= NTDDI_WIN7) -typedef struct _ECP_HEADER ECP_HEADER, *PECP_HEADER; -#endif
#if (NTDDI_VERSION >= NTDDI_VISTA)
-
akhaldi＠svn.reactos.org