Michael Stefaniuc : dmloader: Simplify tracing of the DMUS_CONTAINER_NOLOADS flag.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1ca7f9a36fac0ac49f3629b47d70b103273ded35
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=1ca7f9a36fac0ac49f3629b47...

Author: Michael Stefaniuc 
Date:   Fri Dec 13 00:47:17 2019 +0100

dmloader: Simplify tracing of the DMUS_CONTAINER_NOLOADS flag.

Signed-off-by: Michael Stefaniuc 
Signed-off-by: Alexandre Julliard

---

dlls/dmloader/debug.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c
index 398ce690d1..30e3fd69cc 100644
--- a/dlls/dmloader/debug.c
+++ b/dlls/dmloader/debug.c
@@ -62,14 +62,6 @@ static const char* debugstr_flags (DWORD flags, const flag_info* names, size_t n
    return ptr;
 }

-/* dump DMUS_CONTAINER flags */
-static const char *debugstr_DMUS_CONTAINER_FLAGS (DWORD flagmask) {
-    static const flag_info flags[] = {
-	    FE(DMUS_CONTAINER_NOLOADS)
-	};
-    return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags));
-}
-
 /* dump DMUS_CONTAINED_OBJF flags */
 static const char *debugstr_DMUS_CONTAINED_OBJF_FLAGS (DWORD flagmask) {
     static const flag_info flags[] = {
@@ -81,10 +73,11 @@ static const char *debugstr_DMUS_CONTAINED_OBJF_FLAGS (DWORD flagmask) {
 const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeader) {
    if (pHeader) {
    	char buffer[1024], *ptr = buffer;
-		
+
    	ptr += sprintf(ptr, "DMUS_IO_CONTAINER_HEADER (%p):", pHeader);
-		ptr += sprintf(ptr, "\n - dwFlags = %s", debugstr_DMUS_CONTAINER_FLAGS(pHeader->dwFlags));
-		
+		ptr += sprintf(ptr, "\n - dwFlags = %#x%s", pHeader->dwFlags,
+                        pHeader->dwFlags & DMUS_CONTAINER_NOLOADS ? " (DMUS_CONTAINER_NOLOADS)" : "");
+
    	return wine_dbg_sprintf("%s", buffer);
    } else {
    	return wine_dbg_sprintf("(NULL)");