[0.4.7][WIN32K] Fix DBG_PRINT macro.

picked from 0.4.10-dev-215-g 9d3d5e464d78921240c695dca09491fbb2b1c457

diff --git a/win32ss/user/ntuser/msgqueue.c b/win32ss/user/ntuser/msgqueue.c
index bba976a..4468959 100644 (file)
--- 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 c83f3fd..dd58b75 100644 (file)
--- 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__)