[PATCH 3/9] dmband: Use only the 'dmfile' debug channel in dmutils.c

[Michael Stefaniuc]

Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
 dlls/dmband/dmutils.c | 45 +++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c
index 1309c7c318..39d6358211 100644
--- a/dlls/dmband/dmutils.c
+++ b/dlls/dmband/dmutils.c
@@ -42,8 +42,7 @@
 #include "dmutils.h"
 #include "dmobject.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
-WINE_DECLARE_DEBUG_CHANNEL(dmfile);
+WINE_DEFAULT_DEBUG_CHANNEL(dmfile);
 
 /* generic flag-dumping function */
 static const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){
@@ -127,37 +126,37 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* p
 
   switch (pChunk->fccID) {
   case DMUS_FOURCC_GUID_CHUNK: {
-    TRACE_(dmfile)(": GUID chunk\n");
+    TRACE(": GUID chunk\n");
     pDesc->dwValidData |= DMUS_OBJ_OBJECT;
     IStream_Read (pStm, &pDesc->guidObject, pChunk->dwSize, NULL);
     break;
   }
   case DMUS_FOURCC_DATE_CHUNK: {
-    TRACE_(dmfile)(": file date chunk\n");
+    TRACE(": file date chunk\n");
     pDesc->dwValidData |= DMUS_OBJ_DATE;
     IStream_Read (pStm, &pDesc->ftDate, pChunk->dwSize, NULL);
     break;
   }
   case DMUS_FOURCC_NAME_CHUNK: {
-    TRACE_(dmfile)(": name chunk\n");
+    TRACE(": name chunk\n");
     pDesc->dwValidData |= DMUS_OBJ_NAME;
     IStream_Read (pStm, pDesc->wszName, pChunk->dwSize, NULL);
     break;
   }
   case DMUS_FOURCC_FILE_CHUNK: {
-    TRACE_(dmfile)(": file name chunk\n");
+    TRACE(": file name chunk\n");
     pDesc->dwValidData |= DMUS_OBJ_FILENAME;
     IStream_Read (pStm, pDesc->wszFileName, pChunk->dwSize, NULL);
     break;
   }
   case DMUS_FOURCC_VERSION_CHUNK: {
-    TRACE_(dmfile)(": version chunk\n");
+    TRACE(": version chunk\n");
     pDesc->dwValidData |= DMUS_OBJ_VERSION;
     IStream_Read (pStm, &pDesc->vVersion, pChunk->dwSize, NULL);
     break;
   }
   case DMUS_FOURCC_CATEGORY_CHUNK: {
-    TRACE_(dmfile)(": category chunk\n");
+    TRACE(": category chunk\n");
     pDesc->dwValidData |= DMUS_OBJ_CATEGORY;
     IStream_Read (pStm, pDesc->wszCategory, pChunk->dwSize, NULL);
     break;
@@ -182,37 +181,37 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseUNFOGeneric (DMUS_PRIVATE_CHUNK* p
 
   case mmioFOURCC('I','N','A','M'):
   case DMUS_FOURCC_UNAM_CHUNK: {
-    TRACE_(dmfile)(": name chunk\n");
+    TRACE(": name chunk\n");
     pDesc->dwValidData |= DMUS_OBJ_NAME;
     IStream_Read (pStm, pDesc->wszName, pChunk->dwSize, NULL);
-    TRACE_(dmfile)(" - wszName: %s\n", debugstr_w(pDesc->wszName));
+    TRACE(" - wszName: %s\n", debugstr_w(pDesc->wszName));
     break;
   }
 
   case mmioFOURCC('I','A','R','T'):
   case DMUS_FOURCC_UART_CHUNK: {
-    TRACE_(dmfile)(": artist chunk (ignored)\n");
+    TRACE(": artist chunk (ignored)\n");
     liMove.QuadPart = pChunk->dwSize;
     IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
     break;
   }
   case mmioFOURCC('I','C','O','P'):
   case DMUS_FOURCC_UCOP_CHUNK: {
-    TRACE_(dmfile)(": copyright chunk (ignored)\n");
+    TRACE(": copyright chunk (ignored)\n");
     liMove.QuadPart = pChunk->dwSize;
     IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
     break;
   }
   case mmioFOURCC('I','S','B','J'):
   case DMUS_FOURCC_USBJ_CHUNK: {
-    TRACE_(dmfile)(": subject chunk (ignored)\n");
+    TRACE(": subject chunk (ignored)\n");
     liMove.QuadPart = pChunk->dwSize;
     IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
     break;
   }
   case mmioFOURCC('I','C','M','T'):
   case DMUS_FOURCC_UCMT_CHUNK: {
-    TRACE_(dmfile)(": comment chunk (ignored)\n");
+    TRACE(": comment chunk (ignored)\n");
     liMove.QuadPart = pChunk->dwSize;
     IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
     break;
@@ -248,7 +247,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface,
   do {
     IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
     ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
-    TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+    TRACE(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
 
     hr = IDirectMusicUtils_IPersistStream_ParseDescGeneric(&Chunk, pStm, &ref_desc);
     if (FAILED(hr)) return hr;
@@ -256,29 +255,29 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface,
     if (hr == S_FALSE) {
       switch (Chunk.fccID) { 
       case DMUS_FOURCC_REF_CHUNK: {
-	TRACE_(dmfile)(": Reference chunk\n");
+	TRACE(": Reference chunk\n");
 	if (Chunk.dwSize != sizeof(DMUS_IO_REFERENCE)) return E_FAIL;
 	IStream_Read (pStm, &ref, sizeof(DMUS_IO_REFERENCE), NULL);
-	TRACE_(dmfile)(" - guidClassID: %s\n", debugstr_dmguid(&ref.guidClassID));
-	TRACE_(dmfile)(" - dwValidData: %u\n", ref.dwValidData);
+	TRACE(" - guidClassID: %s\n", debugstr_dmguid(&ref.guidClassID));
+	TRACE(" - dwValidData: %u\n", ref.dwValidData);
 	break;
       } 
       default: {
-	TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
+	TRACE(": unknown chunk (irrelevant & skipping)\n");
 	liMove.QuadPart = Chunk.dwSize;
 	IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
 	break;						
       }
       }
     }
-    TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]);
+    TRACE(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]);
   } while (ListCount[0] < ListSize[0]);
 
   ref_desc.dwValidData |= DMUS_OBJ_CLASS;
   ref_desc.guidClass = ref.guidClassID;
 
-  TRACE_(dmfile)("** DM Reference Begin of Load ***\n");
-  TRACE_(dmfile)("With Desc:\n");
+  TRACE("** DM Reference Begin of Load ***\n");
+  TRACE("With Desc:\n");
   debug_DMUS_OBJECTDESC(&ref_desc);
 
   {
@@ -292,7 +291,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface,
     hr = IDirectMusicLoader_GetObject (pLoader, &ref_desc, &IID_IDirectMusicObject, (LPVOID*)ppObject);
     IDirectMusicLoader_Release (pLoader); /* release loader */
   }
-  TRACE_(dmfile)("** DM Reference End of Load ***\n");
+  TRACE("** DM Reference End of Load ***\n");
 
   return hr;
 }
-- 
2.23.0