Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-12 07:35:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DDK][XDK]

Browse source 
- Do not evaluate the ASSERT macro's parameter before stringifying it
CORE-7588 #resolve

svn path=/trunk/; revision=61008
This commit is contained in:
Thomas Faber 2013-11-16 15:00:11 +00:00
parent 9bd70d2688
commit 154b389724
2 changed files with 36 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11010,14 +11010,27 @@ RtlCheckBit(
DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n", __FILE__, __LINE__, #exp), FALSE : TRUE)
#define RTL_SOFT_VERIFYMSG(msg, exp) \
(VOID)((!(exp)) ? \
((!(exp)) ? \
DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n Message: %s\n", __FILE__, __LINE__, #exp, (msg)), FALSE : TRUE)
#define ASSERT(exp) ((void)RTL_VERIFY(exp))
#define ASSERTMSG(msg, exp) ((void)RTL_VERIFYMSG(msg, exp))
/* The ASSERTs must be cast to void to avoid warnings about unused results.
* We also cannot invoke the VERIFY versions because the indirection messes
* with stringify. */
#define ASSERT(exp) \
((VOID)((!(exp)) ? \
RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, NULL ), FALSE : TRUE))
#define RTL_SOFT_ASSERT(exp) ((void)RTL_SOFT_VERIFY(exp))
#define RTL_SOFT_ASSERTMSG(msg, exp) ((void)RTL_SOFT_VERIFYMSG(msg, exp))
#define ASSERTMSG(msg, exp) \
((VOID)((!(exp)) ? \
RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, (PCHAR)msg ), FALSE : TRUE))
#define RTL_SOFT_ASSERT(exp) \
((VOID)((!(exp)) ? \
DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n", __FILE__, __LINE__, #exp), FALSE : TRUE))
#define RTL_SOFT_ASSERTMSG(msg, exp) \
((VOID)((!(exp)) ? \
DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n Message: %s\n", __FILE__, __LINE__, #exp, (msg)), FALSE : TRUE))
#if defined(_MSC_VER)
# define __assert_annotationA(msg) __annotation(L"Debug", L"AssertFail", L ## msg)

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

@ -3076,14 +3076,27 @@ RtlCheckBit(
DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n", __FILE__, __LINE__, #exp), FALSE : TRUE)
#define RTL_SOFT_VERIFYMSG(msg, exp) \
(VOID)((!(exp)) ? \
((!(exp)) ? \
DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n Message: %s\n", __FILE__, __LINE__, #exp, (msg)), FALSE : TRUE)
#define ASSERT(exp) ((void)RTL_VERIFY(exp))
#define ASSERTMSG(msg, exp) ((void)RTL_VERIFYMSG(msg, exp))
/* The ASSERTs must be cast to void to avoid warnings about unused results.
* We also cannot invoke the VERIFY versions because the indirection messes
* with stringify. */
#define ASSERT(exp) \
((VOID)((!(exp)) ? \
RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, NULL ), FALSE : TRUE))
#define RTL_SOFT_ASSERT(exp) ((void)RTL_SOFT_VERIFY(exp))
#define RTL_SOFT_ASSERTMSG(msg, exp) ((void)RTL_SOFT_VERIFYMSG(msg, exp))
#define ASSERTMSG(msg, exp) \
((VOID)((!(exp)) ? \
RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, (PCHAR)msg ), FALSE : TRUE))
#define RTL_SOFT_ASSERT(exp) \
((VOID)((!(exp)) ? \
DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n", __FILE__, __LINE__, #exp), FALSE : TRUE))
#define RTL_SOFT_ASSERTMSG(msg, exp) \
((VOID)((!(exp)) ? \
DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n Message: %s\n", __FILE__, __LINE__, #exp, (msg)), FALSE : TRUE))
#if defined(_MSC_VER)
# define __assert_annotationA(msg) __annotation(L"Debug", L"AssertFail", L ## msg)