https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d3d5e464d78921240c695dca09491fbb2b1c457
commit 9d3d5e464d78921240c695dca09491fbb2b1c457 Author: Hermès Bélusca-Maïto <[email protected]> AuthorDate: Sun Jun 10 00:48:45 2018 +0200 Commit: Hermès Bélusca-Maïto <[email protected]> CommitDate: Sun Jun 10 04:00:06 2018 +0200 [WIN32K] Fix DBG_PRINT macro. --- win32ss/user/ntuser/msgqueue.c | 4 ++-- win32ss/user/ntuser/win32kdebug.h | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/win32ss/user/ntuser/msgqueue.c b/win32ss/user/ntuser/msgqueue.c index bba976ad2b..446895915c 100644 --- a/win32ss/user/ntuser/msgqueue.c +++ b/win32ss/user/ntuser/msgqueue.c @@ -751,7 +751,7 @@ MsqCreateMessage(LPMSG Msg) VOID FASTCALL MsqDestroyMessage(PUSER_MESSAGE Message) { - TRACE("Post Destroy %d\n",PostMsgCount) + TRACE("Post Destroy %d\n",PostMsgCount); if (Message->pti == NULL) { ERR("Double Free Message\n"); @@ -1151,7 +1151,7 @@ co_MsqSendMessage(PTHREADINFO ptirec, } Timeout.QuadPart = Int32x32To64(-10000,uTimeout); // Pass SMTO test with a TO of 0x80000000. - TRACE("Timeout val %lld\n",Timeout.QuadPart) + TRACE("Timeout val %lld\n",Timeout.QuadPart); Message->Msg.hwnd = Wnd; Message->Msg.message = Msg; diff --git a/win32ss/user/ntuser/win32kdebug.h b/win32ss/user/ntuser/win32kdebug.h index c83f3fdb2c..dd58b75b85 100644 --- a/win32ss/user/ntuser/win32kdebug.h +++ b/win32ss/user/ntuser/win32kdebug.h @@ -134,10 +134,11 @@ #define DBG_DISABLE_CHANNEL(ppi,ch,level) ((ppi)->DbgChannelLevel[ch] &= ~level) #define DBG_IS_CHANNEL_ENABLED(ppi,ch,level) (((ppi)->DbgChannelLevel[ch] & level) == level) - #define DBG_PRINT(ppi,ch,level,fmt, ...) do { \ - if((level == ERR_LEVEL) || (ppi && DBG_IS_CHANNEL_ENABLED(ppi,ch,level))) \ - DbgPrint("(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__); \ - }while(0); + #define DBG_PRINT(ppi,ch,level,fmt, ...) \ + do { \ + if ((level == ERR_LEVEL) || (ppi && DBG_IS_CHANNEL_ENABLED(ppi,ch,level))) \ + DbgPrint("(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__); \ + } while (0) #define ERR(fmt, ...) DBG_PRINT(DBG_GET_PPI, DbgDefaultChannel, ERR_LEVEL,"err: " fmt, ##__VA_ARGS__) #define FIXME(fmt, ...) DBG_PRINT(DBG_GET_PPI, DbgDefaultChannel, FIXME_LEVEL,"fixme: " fmt, ##__VA_ARGS__)
