[DDK/XDK]
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Sun, 30 May 2010 22:03:16 +0000 (22:03 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Sun, 30 May 2010 22:03:16 +0000 (22:03 +0000)
Merge recent header changes

svn path=/branches/header-work/; revision=47467

include/ddk/ntifs.h
include/ddk/wdm.h
include/xdk/fsrtltypes.h
include/xdk/rtlfuncs.h

index a0aa30b..c05458e 100644 (file)
@@ -6188,26 +6188,29 @@ typedef LBN *PLBN;
 typedef ULONG VBN;
 typedef VBN *PVBN;
 
-typedef struct _FSRTL_COMMON_FCB_HEADER {
-  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;
+#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;
 
 #ifdef __cplusplus
 typedef struct _FSRTL_ADVANCED_FCB_HEADER:FSRTL_COMMON_FCB_HEADER {
 #else /* __cplusplus */
 typedef struct _FSRTL_ADVANCED_FCB_HEADER {
-  FSRTL_COMMON_FCB_HEADER DUMMYSTRUCTNAME;
+  FSRTL_COMMON_FCB_HEADER_LAYOUT
 #endif  /* __cplusplus */
   PFAST_MUTEX FastMutex;
   LIST_ENTRY FilterContexts;
index a285043..44725ea 100644 (file)
@@ -9435,7 +9435,7 @@ RtlCheckBit(
 
 #define ASSERTMSG(msg, exp) \
   (VOID)((!(exp)) ? \
-    RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, msg ), FALSE : TRUE)
+    RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, (PCHAR)msg ), FALSE : TRUE)
 
 #define RTL_SOFT_ASSERT(exp) \
   (VOID)((!(exp)) ? \
index 3a9db1c..cc67884 100644 (file)
@@ -7,26 +7,29 @@ typedef LBN *PLBN;
 typedef ULONG VBN;
 typedef VBN *PVBN;
 
-typedef struct _FSRTL_COMMON_FCB_HEADER {
-  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;
+#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;
 
 #ifdef __cplusplus
 typedef struct _FSRTL_ADVANCED_FCB_HEADER:FSRTL_COMMON_FCB_HEADER {
 #else /* __cplusplus */
 typedef struct _FSRTL_ADVANCED_FCB_HEADER {
-  FSRTL_COMMON_FCB_HEADER DUMMYSTRUCTNAME;
+  FSRTL_COMMON_FCB_HEADER_LAYOUT
 #endif  /* __cplusplus */
   PFAST_MUTEX FastMutex;
   LIST_ENTRY FilterContexts;
index f9f9896..a8cd1c6 100644 (file)
@@ -2769,7 +2769,7 @@ RtlCheckBit(
 
 #define ASSERTMSG(msg, exp) \
   (VOID)((!(exp)) ? \
-    RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, msg ), FALSE : TRUE)
+    RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, (PCHAR)msg ), FALSE : TRUE)
 
 #define RTL_SOFT_ASSERT(exp) \
   (VOID)((!(exp)) ? \
@@ -3190,4 +3190,4 @@ $if (_NTIFS_)
 
 #define RtlOffsetToPointer(B,O) ((PCHAR)(((PCHAR)(B)) + ((ULONG_PTR)(O))))
 #define RtlPointerToOffset(B,P) ((ULONG)(((PCHAR)(P)) - ((PCHAR)(B))))
-$endif (_NTIFS_)
\ No newline at end of file
+$endif (_NTIFS_)