[ros-diffs] [reactos] 01/02: [SOUND] mmebuddy_debug.h: Sort out macro inclusions

[Serge Gautherie]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b30fde37977c0a323f5c6…

commit b30fde37977c0a323f5c6739dc7fafdeca953b10
Author:     Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr>
AuthorDate: Sun Jun 14 13:49:22 2020 +0200
Commit:     Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com>
CommitDate: Thu Aug 15 17:50:12 2024 +0200

    [SOUND] mmebuddy_debug.h: Sort out macro inclusions
    
    - POPUP() is used on DBG only.
    - SND_ERR() and SND_ASSERT() are wanted even when defined(NDEBUG).
    - Add a FIXME as !defined(NDEBUG) code compilation remains broken.
    
    Follow-up of c7a4984 (0.4.15-dev-8414).
---
 sdk/include/reactos/libs/sound/mmebuddy_debug.h | 59 ++++++++++++++++---------
 1 file changed, 37 insertions(+), 22 deletions(-)

diff --git a/sdk/include/reactos/libs/sound/mmebuddy_debug.h
b/sdk/include/reactos/libs/sound/mmebuddy_debug.h
index 92d72009db5..31f85c4dd34 100644
--- a/sdk/include/reactos/libs/sound/mmebuddy_debug.h
+++ b/sdk/include/reactos/libs/sound/mmebuddy_debug.h
@@ -5,28 +5,19 @@
     Hacky debug macro
 */
 
-#define POPUP(...) \
-    { \
-        WCHAR dbg_popup_msg[1024], dbg_popup_title[256]; \
-        wsprintf(dbg_popup_title, L"%hS(%d)", __FILE__, __LINE__); \
-        wsprintf(dbg_popup_msg, __VA_ARGS__); \
-        MessageBox(0, dbg_popup_msg, dbg_popup_title, MB_OK | MB_TASKMODAL); \
-    }
+// FIXME: sdk\lib\...\mmebuddy compilation would fail: wsprintf() and MessageBox() are
undefined!
+#if DBG && !defined(NDEBUG) // #if DBG
 
-#if DBG && !defined(NDEBUG)
-    #define SND_ERR(...) \
-        { \
-            WCHAR dbg_popup_msg[1024]; \
-            wsprintf(dbg_popup_msg, __VA_ARGS__); \
-            OutputDebugString(dbg_popup_msg); \
-        }
-    #define SND_WARN(...) \
+    // Helper for SND_ASSERT().
+    #define POPUP(...) \
         { \
-            WCHAR dbg_popup_msg[1024]; \
+            WCHAR dbg_popup_msg[1024], dbg_popup_title[256]; \
+            wsprintf(dbg_popup_title, L"%hS(%d)", __FILE__, __LINE__); \
             wsprintf(dbg_popup_msg, __VA_ARGS__); \
-            OutputDebugString(dbg_popup_msg); \
+            MessageBox(0, dbg_popup_msg, dbg_popup_title, MB_OK | MB_TASKMODAL); \
         }
-    #define SND_TRACE(...) \
+
+    #define SND_ERR(...) \
         { \
             WCHAR dbg_popup_msg[1024]; \
             wsprintf(dbg_popup_msg, __VA_ARGS__); \
@@ -43,6 +34,29 @@
             } \
         }
 
+#else // DBG
+
+    #define SND_ERR(...) do {} while ( 0 )
+    #define SND_ASSERT(condition) do {(void)(condition);} while ( 0 )
+
+#endif // DBG
+
+#if DBG && !defined(NDEBUG)
+
+    #define SND_WARN(...) \
+        { \
+            WCHAR dbg_popup_msg[1024]; \
+            wsprintf(dbg_popup_msg, __VA_ARGS__); \
+            OutputDebugString(dbg_popup_msg); \
+        }
+
+    #define SND_TRACE(...) \
+        { \
+            WCHAR dbg_popup_msg[1024]; \
+            wsprintf(dbg_popup_msg, __VA_ARGS__); \
+            OutputDebugString(dbg_popup_msg); \
+        }
+
     #define DUMP_WAVEHDR_QUEUE(sound_device_instance) \
         { \
             PWAVEHDR CurrDumpHdr = sound_device_instance->HeadWaveHeader; \
@@ -55,12 +69,13 @@
                 CurrDumpHdr = CurrDumpHdr->lpNext; \
             } \
         }
-#else
-    #define SND_ERR(...) do {} while ( 0 )
+
+#else // DBG && !defined(NDEBUG)
+
     #define SND_WARN(...) do {} while ( 0 )
     #define SND_TRACE(...) do {} while ( 0 )
-    #define SND_ASSERT(condition) do {(void)(condition);} while ( 0 )
     #define DUMP_WAVEHDR_QUEUE(condition) do {} while ( 0 )
-#endif
+
+#endif // DBG && !defined(NDEBUG)
 
 #endif /* ROS_AUDIO_MMEBUDDY_DEBUG_H */