From da9ba659457531913af2c73d7faeced83ffbd667 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sun, 30 May 2010 22:03:16 +0000
Subject: [PATCH] [DDK/XDK] Merge recent header changes

svn path=/branches/header-work/; revision=47467
---
 include/ddk/ntifs.h      | 29 ++++++++++++++++-------------
 include/ddk/wdm.h        |  2 +-
 include/xdk/fsrtltypes.h | 29 ++++++++++++++++-------------
 include/xdk/rtlfuncs.h   |  4 ++--
 4 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h
index a0aa30b939e..c05458e81f2 100644
--- a/include/ddk/ntifs.h
+++ b/include/ddk/ntifs.h
@@ -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;
diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
index a285043dd21..44725ead733 100644
--- a/include/ddk/wdm.h
+++ b/include/ddk/wdm.h
@@ -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)) ? \
diff --git a/include/xdk/fsrtltypes.h b/include/xdk/fsrtltypes.h
index 3a9db1cca09..cc678845be8 100644
--- a/include/xdk/fsrtltypes.h
+++ b/include/xdk/fsrtltypes.h
@@ -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;
diff --git a/include/xdk/rtlfuncs.h b/include/xdk/rtlfuncs.h
index f9f98966b78..a8cd1c6d490 100644
--- a/include/xdk/rtlfuncs.h
+++ b/include/xdk/rtlfuncs.h
@@ -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_)