[tkreuzer] 47467: [DDK/XDK] Merge recent header changes

Author: tkreuzer
Date: Mon May 31 00:03:16 2010
New Revision: 47467

URL: http://svn.reactos.org/svn/reactos?rev=47467&view=rev
Log:
[DDK/XDK]
Merge recent header changes

Modified:
    branches/header-work/include/ddk/ntifs.h
    branches/header-work/include/ddk/wdm.h
    branches/header-work/include/xdk/fsrtltypes.h
    branches/header-work/include/xdk/rtlfuncs.h

Modified: branches/header-work/include/ddk/ntifs.h
URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntifs.h?...
==============================================================================
--- branches/header-work/include/ddk/ntifs.h [iso-8859-1] (original)
+++ branches/header-work/include/ddk/ntifs.h [iso-8859-1] Mon May 31 00:03:16 2010
@@ -6188,26 +6188,29 @@
 typedef ULONG VBN;
 typedef VBN *PVBN;

+#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 {
-  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;
+  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;

Modified: branches/header-work/include/ddk/wdm.h
URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/wdm.h?re...
==============================================================================
--- branches/header-work/include/ddk/wdm.h [iso-8859-1] (original)
+++ branches/header-work/include/ddk/wdm.h [iso-8859-1] Mon May 31 00:03:16 2010
@@ -9435,7 +9435,7 @@

#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)) ? \

Modified: branches/header-work/include/xdk/fsrtltypes.h
URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/fsrtltyp...
==============================================================================
--- branches/header-work/include/xdk/fsrtltypes.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/fsrtltypes.h [iso-8859-1] Mon May 31 00:03:16 2010
@@ -7,26 +7,29 @@
 typedef ULONG VBN;
 typedef VBN *PVBN;

+#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 {
-  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;
+  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;

Modified: branches/header-work/include/xdk/rtlfuncs.h
URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/rtlfuncs...
==============================================================================
--- branches/header-work/include/xdk/rtlfuncs.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/rtlfuncs.h [iso-8859-1] Mon May 31 00:03:16 2010
@@ -2769,7 +2769,7 @@

#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 @@

#define RtlOffsetToPointer(B,O) ((PCHAR)(((PCHAR)(B)) + ((ULONG_PTR)(O))))
 #define RtlPointerToOffset(B,P) ((ULONG)(((PCHAR)(P)) - ((PCHAR)(B))))
-$endif (_NTIFS_)
+$endif (_NTIFS_)