Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

[DDK/XDK]

Browse source 
Merge recent header changes

svn path=/branches/header-work/; revision=47467
This commit is contained in:
Timo Kreuzer 2010-05-30 22:03:16 +00:00
parent 9c2f5ba446
commit da9ba65945
4 changed files with 35 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
include/ddk/ntifs.h
View file

@ -6188,26 +6188,29 @@ typedef LBN *PLBN;
typedef ULONG VBN; typedef ULONG VBN;
typedef VBN *PVBN; typedef VBN *PVBN;
typedef struct _FSRTL_COMMON_FCB_HEADER { #define FSRTL_COMMON_FCB_HEADER_LAYOUT \
CSHORT NodeTypeCode; CSHORT NodeTypeCode; \
CSHORT NodeByteSize; CSHORT NodeByteSize; \
UCHAR Flags; UCHAR Flags; \
UCHAR IsFastIoPossible; UCHAR IsFastIoPossible; \
UCHAR Flags2; UCHAR Flags2; \
UCHAR Reserved:4; UCHAR Reserved:4; \
UCHAR Version:4; UCHAR Version:4; \
PERESOURCE Resource; PERESOURCE Resource; \
PERESOURCE PagingIoResource; PERESOURCE PagingIoResource; \
LARGE_INTEGER AllocationSize; LARGE_INTEGER AllocationSize; \
LARGE_INTEGER FileSize; LARGE_INTEGER FileSize; \
LARGE_INTEGER ValidDataLength; LARGE_INTEGER ValidDataLength;
typedef struct _FSRTL_COMMON_FCB_HEADER {
FSRTL_COMMON_FCB_HEADER_LAYOUT
} FSRTL_COMMON_FCB_HEADER, *PFSRTL_COMMON_FCB_HEADER; } FSRTL_COMMON_FCB_HEADER, *PFSRTL_COMMON_FCB_HEADER;
#ifdef __cplusplus #ifdef __cplusplus
typedef struct _FSRTL_ADVANCED_FCB_HEADER:FSRTL_COMMON_FCB_HEADER { typedef struct _FSRTL_ADVANCED_FCB_HEADER:FSRTL_COMMON_FCB_HEADER {
#else /* __cplusplus */ #else /* __cplusplus */
typedef struct _FSRTL_ADVANCED_FCB_HEADER { typedef struct _FSRTL_ADVANCED_FCB_HEADER {
FSRTL_COMMON_FCB_HEADER DUMMYSTRUCTNAME; FSRTL_COMMON_FCB_HEADER_LAYOUT
#endif /* __cplusplus */ #endif /* __cplusplus */
PFAST_MUTEX FastMutex; PFAST_MUTEX FastMutex;
LIST_ENTRY FilterContexts; LIST_ENTRY FilterContexts;

2
include/ddk/wdm.h
View file

@ -9435,7 +9435,7 @@ RtlCheckBit(
#define ASSERTMSG(msg, exp) \ #define ASSERTMSG(msg, exp) \
(VOID)((!(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) \ #define RTL_SOFT_ASSERT(exp) \
(VOID)((!(exp)) ? \ (VOID)((!(exp)) ? \

29
include/xdk/fsrtltypes.h
View file

@ -7,26 +7,29 @@ typedef LBN *PLBN;
typedef ULONG VBN; typedef ULONG VBN;
typedef VBN *PVBN; typedef VBN *PVBN;
typedef struct _FSRTL_COMMON_FCB_HEADER { #define FSRTL_COMMON_FCB_HEADER_LAYOUT \
CSHORT NodeTypeCode; CSHORT NodeTypeCode; \
CSHORT NodeByteSize; CSHORT NodeByteSize; \
UCHAR Flags; UCHAR Flags; \
UCHAR IsFastIoPossible; UCHAR IsFastIoPossible; \
UCHAR Flags2; UCHAR Flags2; \
UCHAR Reserved:4; UCHAR Reserved:4; \
UCHAR Version:4; UCHAR Version:4; \
PERESOURCE Resource; PERESOURCE Resource; \
PERESOURCE PagingIoResource; PERESOURCE PagingIoResource; \
LARGE_INTEGER AllocationSize; LARGE_INTEGER AllocationSize; \
LARGE_INTEGER FileSize; LARGE_INTEGER FileSize; \
LARGE_INTEGER ValidDataLength; LARGE_INTEGER ValidDataLength;
typedef struct _FSRTL_COMMON_FCB_HEADER {
FSRTL_COMMON_FCB_HEADER_LAYOUT
} FSRTL_COMMON_FCB_HEADER, *PFSRTL_COMMON_FCB_HEADER; } FSRTL_COMMON_FCB_HEADER, *PFSRTL_COMMON_FCB_HEADER;
#ifdef __cplusplus #ifdef __cplusplus
typedef struct _FSRTL_ADVANCED_FCB_HEADER:FSRTL_COMMON_FCB_HEADER { typedef struct _FSRTL_ADVANCED_FCB_HEADER:FSRTL_COMMON_FCB_HEADER {
#else /* __cplusplus */ #else /* __cplusplus */
typedef struct _FSRTL_ADVANCED_FCB_HEADER { typedef struct _FSRTL_ADVANCED_FCB_HEADER {
FSRTL_COMMON_FCB_HEADER DUMMYSTRUCTNAME; FSRTL_COMMON_FCB_HEADER_LAYOUT
#endif /* __cplusplus */ #endif /* __cplusplus */
PFAST_MUTEX FastMutex; PFAST_MUTEX FastMutex;
LIST_ENTRY FilterContexts; LIST_ENTRY FilterContexts;

2
include/xdk/rtlfuncs.h
View file

@ -2769,7 +2769,7 @@ RtlCheckBit(
#define ASSERTMSG(msg, exp) \ #define ASSERTMSG(msg, exp) \
(VOID)((!(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) \ #define RTL_SOFT_ASSERT(exp) \
(VOID)((!(exp)) ? \ (VOID)((!(exp)) ? \