Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-30 02:58:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

[DDK][XDK]

Browse source 
- Do not evaluate the NT_ASSERT macro's parameter before stringifying it. Forgot this in r61008/CORE-7758

svn path=/trunk/; revision=61686
This commit is contained in:
Thomas Faber 2014-01-19 09:28:53 +00:00
parent 2de6ec8ee9
commit 32a9726da2
2 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
reactos/include/ddk/wdm.h
View file

@ -11063,9 +11063,21 @@ RtlCheckBit(
(__assert_annotationW(msg), \ (__assert_annotationW(msg), \
DbgRaiseAssertionFailure(), FALSE) : TRUE) DbgRaiseAssertionFailure(), FALSE) : TRUE)
#define NT_ASSERT(exp) ((void)NT_VERIFY(exp)) /* Can't reuse verify, see above */
#define NT_ASSERTMSG(msg, exp) ((void)NT_VERIFYMSG(msg, exp)) #define NT_ASSERT(exp) \
#define NT_ASSERTMSGW(msg, exp) ((void)NT_VERIFYMSGW(msg, exp)) ((VOID)((!(exp)) ? \
(__assert_annotationA(#exp), \
DbgRaiseAssertionFailure(), FALSE) : TRUE))
#define NT_ASSERTMSG(msg, exp) \
((VOID)((!(exp)) ? \
(__assert_annotationA(msg), \
DbgRaiseAssertionFailure(), FALSE) : TRUE))
#define NT_ASSERTMSGW(msg, exp) \
((VOID)((!(exp)) ? \
(__assert_annotationW(msg), \
DbgRaiseAssertionFailure(), FALSE) : TRUE))
#else /* !DBG */ #else /* !DBG */

18
reactos/include/xdk/rtlfuncs.h
View file

@ -3133,9 +3133,21 @@ RtlCheckBit(
(__assert_annotationW(msg), \ (__assert_annotationW(msg), \
DbgRaiseAssertionFailure(), FALSE) : TRUE) DbgRaiseAssertionFailure(), FALSE) : TRUE)
#define NT_ASSERT(exp) ((void)NT_VERIFY(exp)) /* Can't reuse verify, see above */
#define NT_ASSERTMSG(msg, exp) ((void)NT_VERIFYMSG(msg, exp)) #define NT_ASSERT(exp) \
#define NT_ASSERTMSGW(msg, exp) ((void)NT_VERIFYMSGW(msg, exp)) ((VOID)((!(exp)) ? \
(__assert_annotationA(#exp), \
DbgRaiseAssertionFailure(), FALSE) : TRUE))
#define NT_ASSERTMSG(msg, exp) \
((VOID)((!(exp)) ? \
(__assert_annotationA(msg), \
DbgRaiseAssertionFailure(), FALSE) : TRUE))
#define NT_ASSERTMSGW(msg, exp) \
((VOID)((!(exp)) ? \
(__assert_annotationW(msg), \
DbgRaiseAssertionFailure(), FALSE) : TRUE))
#else /* !DBG */ #else /* !DBG */