From 9f859692f9d9fadce4368f58b894a7a4eae40327 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Sun, 25 Sep 2005 15:23:21 +0000
Subject: [PATCH] Replace DPRINTF by TRACE in a few places.

---
 dlls/kernel/instr.c         | 12 +++----
 dlls/kernel/local16.c       | 18 +++++-----
 dlls/kernel/ne_module.c     | 68 ++++++++++++++++++-------------------
 dlls/kernel/version.c       |  2 +-
 dlls/msvcrt/cppexcept.c     | 20 +++++------
 dlls/ntdll/virtual.c        | 16 ++++-----
 dlls/opengl32/wgl.c         |  6 ++--
 dlls/quartz/dsoundrender.c  |  6 ++--
 dlls/quartz/transform.c     |  6 ++--
 dlls/quartz/videorenderer.c |  6 ++--
 dlls/user/menu.c            | 32 ++++++++---------
 dlls/x11drv/opengl.c        | 48 +++++++++++++-------------
 12 files changed, 119 insertions(+), 121 deletions(-)

diff --git a/dlls/kernel/instr.c b/dlls/kernel/instr.c
index 76b6a8372d4..e22024a955d 100644
--- a/dlls/kernel/instr.c
+++ b/dlls/kernel/instr.c
@@ -381,15 +381,15 @@ static DWORD INSTR_inport( WORD port, int size, CONTEXT86 *context )
         switch(size)
         {
         case 1:
-            DPRINTF( "0x%x < %02x @ %04x:%04x\n", port, LOBYTE(res),
+            TRACE_(io)( "0x%x < %02x @ %04x:%04x\n", port, LOBYTE(res),
                      (WORD)context->SegCs, LOWORD(context->Eip));
             break;
         case 2:
-            DPRINTF( "0x%x < %04x @ %04x:%04x\n", port, LOWORD(res),
+            TRACE_(io)( "0x%x < %04x @ %04x:%04x\n", port, LOWORD(res),
                      (WORD)context->SegCs, LOWORD(context->Eip));
             break;
         case 4:
-            DPRINTF( "0x%x < %08lx @ %04x:%04x\n", port, res,
+            TRACE_(io)( "0x%x < %08lx @ %04x:%04x\n", port, res,
                      (WORD)context->SegCs, LOWORD(context->Eip));
             break;
         }
@@ -413,15 +413,15 @@ static void INSTR_outport( WORD port, int size, DWORD val, CONTEXT86 *context )
         switch(size)
         {
         case 1:
-            DPRINTF("0x%x > %02x @ %04x:%04x\n", port, LOBYTE(val),
+            TRACE_(io)("0x%x > %02x @ %04x:%04x\n", port, LOBYTE(val),
                     (WORD)context->SegCs, LOWORD(context->Eip));
             break;
         case 2:
-            DPRINTF("0x%x > %04x @ %04x:%04x\n", port, LOWORD(val),
+            TRACE_(io)("0x%x > %04x @ %04x:%04x\n", port, LOWORD(val),
                     (WORD)context->SegCs, LOWORD(context->Eip));
             break;
         case 4:
-            DPRINTF("0x%x > %08lx @ %04x:%04x\n", port, val,
+            TRACE_(io)("0x%x > %08lx @ %04x:%04x\n", port, val,
                     (WORD)context->SegCs, LOWORD(context->Eip));
             break;
         }
diff --git a/dlls/kernel/local16.c b/dlls/kernel/local16.c
index 8499d645c2f..3805db63b6f 100644
--- a/dlls/kernel/local16.c
+++ b/dlls/kernel/local16.c
@@ -346,42 +346,42 @@ static void LOCAL_PrintHeap( HANDLE16 ds )
 
     if (!pInfo)
     {
-        DPRINTF( "Local Heap corrupted!  ds=%04x\n", ds );
+        ERR( "Local Heap corrupted!  ds=%04x\n", ds );
         return;
     }
-    DPRINTF( "Local Heap  ds=%04x first=%04x last=%04x items=%d\n",
+    TRACE( "Local Heap  ds=%04x first=%04x last=%04x items=%d\n",
              ds, pInfo->first, pInfo->last, pInfo->items );
 
     arena = pInfo->first;
     for (;;)
     {
         LOCALARENA *pArena = ARENA_PTR(ptr,arena);
-        DPRINTF( "  %04x: prev=%04x next=%04x type=%d\n", arena,
-	      pArena->prev & ~3, pArena->next, pArena->prev & 3 );
+        TRACE( "  %04x: prev=%04x next=%04x type=%d\n", arena,
+               pArena->prev & ~3, pArena->next, pArena->prev & 3 );
         if (arena == pInfo->first)
 	{
-            DPRINTF( "        size=%d free_prev=%04x free_next=%04x\n",
+            TRACE( "        size=%d free_prev=%04x free_next=%04x\n",
                      pArena->size, pArena->free_prev, pArena->free_next );
 	}
         if ((pArena->prev & 3) == LOCAL_ARENA_FREE)
         {
-            DPRINTF( "        size=%d free_prev=%04x free_next=%04x\n",
+            TRACE( "        size=%d free_prev=%04x free_next=%04x\n",
                      pArena->size, pArena->free_prev, pArena->free_next );
             if (pArena->next == arena) break;  /* last one */
             if (ARENA_PTR(ptr,pArena->free_next)->free_prev != arena)
             {
-                DPRINTF( "*** arena->free_next->free_prev != arena\n" );
+                TRACE( "*** arena->free_next->free_prev != arena\n" );
                 break;
             }
         }
         if (pArena->next == arena)
         {
-	    DPRINTF( "*** last block is not marked free\n" );
+            TRACE( "*** last block is not marked free\n" );
             break;
         }
         if ((ARENA_PTR(ptr,pArena->next)->prev & ~3) != arena)
         {
-            DPRINTF( "*** arena->next->prev != arena (%04x, %04x)\n",
+            TRACE( "*** arena->next->prev != arena (%04x, %04x)\n",
                      pArena->next, ARENA_PTR(ptr,pArena->next)->prev);
             break;
         }
diff --git a/dlls/kernel/ne_module.c b/dlls/kernel/ne_module.c
index 58686820d7f..4770587c16e 100644
--- a/dlls/kernel/ne_module.c
+++ b/dlls/kernel/ne_module.c
@@ -263,72 +263,72 @@ void NE_DumpModule( HMODULE16 hModule )
 
     if (!(pModule = NE_GetPtr( hModule )))
     {
-        MESSAGE( "**** %04x is not a module handle\n", hModule );
+        ERR( "**** %04x is not a module handle\n", hModule );
         return;
     }
 
       /* Dump the module info */
-    DPRINTF( "---\n" );
-    DPRINTF( "Module %04x:\n", hModule );
-    DPRINTF( "count=%d flags=%04x heap=%d stack=%d\n",
+    TRACE( "---\n" );
+    TRACE( "Module %04x:\n", hModule );
+    TRACE( "count=%d flags=%04x heap=%d stack=%d\n",
              pModule->count, pModule->ne_flags,
              pModule->ne_heap, pModule->ne_stack );
-    DPRINTF( "cs:ip=%04x:%04x ss:sp=%04x:%04x ds=%04x nb seg=%d modrefs=%d\n",
+    TRACE( "cs:ip=%04x:%04x ss:sp=%04x:%04x ds=%04x nb seg=%d modrefs=%d\n",
              SELECTOROF(pModule->ne_csip), OFFSETOF(pModule->ne_csip),
              SELECTOROF(pModule->ne_sssp), OFFSETOF(pModule->ne_sssp),
              pModule->ne_autodata, pModule->ne_cseg, pModule->ne_cmod );
-    DPRINTF( "os_flags=%d swap_area=%d version=%04x\n",
+    TRACE( "os_flags=%d swap_area=%d version=%04x\n",
              pModule->ne_exetyp, pModule->ne_swaparea, pModule->ne_expver );
     if (pModule->ne_flags & NE_FFLAGS_WIN32)
-        DPRINTF( "PE module=%p\n", pModule->module32 );
+        TRACE( "PE module=%p\n", pModule->module32 );
 
       /* Dump the file info */
-    DPRINTF( "---\n" );
-    DPRINTF( "Filename: '%s'\n", NE_MODULE_NAME(pModule) );
+    TRACE( "---\n" );
+    TRACE( "Filename: '%s'\n", NE_MODULE_NAME(pModule) );
 
       /* Dump the segment table */
-    DPRINTF( "---\n" );
-    DPRINTF( "Segment table:\n" );
+    TRACE( "---\n" );
+    TRACE( "Segment table:\n" );
     pSeg = NE_SEG_TABLE( pModule );
     for (i = 0; i < pModule->ne_cseg; i++, pSeg++)
-        DPRINTF( "%02x: pos=%d size=%d flags=%04x minsize=%d hSeg=%04x\n",
+        TRACE( "%02x: pos=%d size=%d flags=%04x minsize=%d hSeg=%04x\n",
                  i + 1, pSeg->filepos, pSeg->size, pSeg->flags,
                  pSeg->minsize, pSeg->hSeg );
 
       /* Dump the resource table */
-    DPRINTF( "---\n" );
-    DPRINTF( "Resource table:\n" );
+    TRACE( "---\n" );
+    TRACE( "Resource table:\n" );
     if (pModule->ne_rsrctab)
     {
         pword = (WORD *)((BYTE *)pModule + pModule->ne_rsrctab);
-        DPRINTF( "Alignment: %d\n", *pword++ );
+        TRACE( "Alignment: %d\n", *pword++ );
         while (*pword)
         {
             NE_TYPEINFO *ptr = (NE_TYPEINFO *)pword;
             NE_NAMEINFO *pname = (NE_NAMEINFO *)(ptr + 1);
-            DPRINTF( "id=%04x count=%d\n", ptr->type_id, ptr->count );
+            TRACE( "id=%04x count=%d\n", ptr->type_id, ptr->count );
             for (i = 0; i < ptr->count; i++, pname++)
-                DPRINTF( "offset=%d len=%d id=%04x\n",
+                TRACE( "offset=%d len=%d id=%04x\n",
 		      pname->offset, pname->length, pname->id );
             pword = (WORD *)pname;
         }
     }
-    else DPRINTF( "None\n" );
+    else TRACE( "None\n" );
 
       /* Dump the resident name table */
-    DPRINTF( "---\n" );
-    DPRINTF( "Resident-name table:\n" );
+    TRACE( "---\n" );
+    TRACE( "Resident-name table:\n" );
     pstr = (BYTE*) pModule + pModule->ne_restab;
     while (*pstr)
     {
-        DPRINTF( "%*.*s: %d\n", *pstr, *pstr, pstr + 1,
+        TRACE( "%*.*s: %d\n", *pstr, *pstr, pstr + 1,
                  *(WORD *)(pstr + *pstr + 1) );
         pstr += *pstr + 1 + sizeof(WORD);
     }
 
       /* Dump the module reference table */
-    DPRINTF( "---\n" );
-    DPRINTF( "Module ref table:\n" );
+    TRACE( "---\n" );
+    TRACE( "Module ref table:\n" );
     if (pModule->ne_modtab)
     {
         pword = (WORD *)((BYTE *)pModule + pModule->ne_modtab);
@@ -336,43 +336,43 @@ void NE_DumpModule( HMODULE16 hModule )
         {
             char name[10];
             GetModuleName16( *pword, name, sizeof(name) );
-            DPRINTF( "%d: %04x -> '%s'\n", i, *pword, name );
+            TRACE( "%d: %04x -> '%s'\n", i, *pword, name );
         }
     }
-    else DPRINTF( "None\n" );
+    else TRACE( "None\n" );
 
       /* Dump the entry table */
-    DPRINTF( "---\n" );
-    DPRINTF( "Entry table:\n" );
+    TRACE( "---\n" );
+    TRACE( "Entry table:\n" );
     bundle = (ET_BUNDLE *)((BYTE *)pModule+pModule->ne_enttab);
     do {
         entry = (ET_ENTRY *)((BYTE *)bundle+6);
-        DPRINTF( "Bundle %d-%d: %02x\n", bundle->first, bundle->last, entry->type);
+        TRACE( "Bundle %d-%d: %02x\n", bundle->first, bundle->last, entry->type);
         ordinal = bundle->first;
         while (ordinal < bundle->last)
         {
             if (entry->type == 0xff)
-                DPRINTF("%d: %02x:%04x (moveable)\n", ordinal++, entry->segnum, entry->offs);
+                TRACE("%d: %02x:%04x (moveable)\n", ordinal++, entry->segnum, entry->offs);
             else
-                DPRINTF("%d: %02x:%04x (fixed)\n", ordinal++, entry->segnum, entry->offs);
+                TRACE("%d: %02x:%04x (fixed)\n", ordinal++, entry->segnum, entry->offs);
             entry++;
         }
     } while ( (bundle->next) && (bundle = ((ET_BUNDLE *)((BYTE *)pModule + bundle->next))) );
 
     /* Dump the non-resident names table */
-    DPRINTF( "---\n" );
-    DPRINTF( "Non-resident names table:\n" );
+    TRACE( "---\n" );
+    TRACE( "Non-resident names table:\n" );
     if (pModule->nrname_handle)
     {
         pstr = GlobalLock16( pModule->nrname_handle );
         while (*pstr)
         {
-            DPRINTF( "%*.*s: %d\n", *pstr, *pstr, pstr + 1,
+            TRACE( "%*.*s: %d\n", *pstr, *pstr, pstr + 1,
                    *(WORD *)(pstr + *pstr + 1) );
             pstr += *pstr + 1 + sizeof(WORD);
         }
     }
-    DPRINTF( "\n" );
+    TRACE( "\n" );
 }
 
 
diff --git a/dlls/kernel/version.c b/dlls/kernel/version.c
index 6978b481d93..1ddff054a67 100644
--- a/dlls/kernel/version.c
+++ b/dlls/kernel/version.c
@@ -360,5 +360,5 @@ BOOL16 WINAPI DiagQuery16(void)
 void WINAPI DiagOutput16(LPCSTR str)
 {
         /* FIXME */
-        DPRINTF("DIAGOUTPUT:%s\n", debugstr_a(str));
+        TRACE("DIAGOUTPUT:%s\n", debugstr_a(str));
 }
diff --git a/dlls/msvcrt/cppexcept.c b/dlls/msvcrt/cppexcept.c
index cd1534c6390..229c836aa52 100644
--- a/dlls/msvcrt/cppexcept.c
+++ b/dlls/msvcrt/cppexcept.c
@@ -78,7 +78,7 @@ inline static void call_dtor( void *func, void *object )
 
 static inline void dump_type( const cxx_type_info *type )
 {
-    DPRINTF( "flags %x type %p %s offsets %d,%d,%d size %d copy ctor %p\n",
+    TRACE( "flags %x type %p %s offsets %d,%d,%d size %d copy ctor %p\n",
              type->flags, type->type_info, dbgstr_type_info(type->type_info),
              type->offsets.this_offset, type->offsets.vbase_descr, type->offsets.vbase_offset,
              type->size, type->copy_ctor );
@@ -88,12 +88,11 @@ static void dump_exception_type( const cxx_exception_type *type )
 {
     UINT i;
 
-    DPRINTF( "exception type:\n" );
-    DPRINTF( "flags %x destr %p handler %p type info %p\n",
+    TRACE( "flags %x destr %p handler %p type info %p\n",
              type->flags, type->destructor, type->custom_handler, type->type_info_table );
     for (i = 0; i < type->type_info_table->count; i++)
     {
-        DPRINTF( "    %d: ", i );
+        TRACE( "    %d: ", i );
         dump_type( type->type_info_table->info[i] );
     }
 }
@@ -103,25 +102,24 @@ static void dump_function_descr( const cxx_function_descr *descr, const cxx_exce
     UINT i;
     int j;
 
-    DPRINTF( "function descr:\n" );
-    DPRINTF( "magic %x\n", descr->magic );
-    DPRINTF( "unwind table: %p %d\n", descr->unwind_table, descr->unwind_count );
+    TRACE( "magic %x\n", descr->magic );
+    TRACE( "unwind table: %p %d\n", descr->unwind_table, descr->unwind_count );
     for (i = 0; i < descr->unwind_count; i++)
     {
-        DPRINTF( "    %d: prev %d func %p\n", i,
+        TRACE( "    %d: prev %d func %p\n", i,
                  descr->unwind_table[i].prev, descr->unwind_table[i].handler );
     }
-    DPRINTF( "try table: %p %d\n", descr->tryblock, descr->tryblock_count );
+    TRACE( "try table: %p %d\n", descr->tryblock, descr->tryblock_count );
     for (i = 0; i < descr->tryblock_count; i++)
     {
-        DPRINTF( "    %d: start %d end %d catchlevel %d catch %p %d\n", i,
+        TRACE( "    %d: start %d end %d catchlevel %d catch %p %d\n", i,
                  descr->tryblock[i].start_level, descr->tryblock[i].end_level,
                  descr->tryblock[i].catch_level, descr->tryblock[i].catchblock,
                  descr->tryblock[i].catchblock_count );
         for (j = 0; j < descr->tryblock[i].catchblock_count; j++)
         {
             catchblock_info *ptr = &descr->tryblock[i].catchblock[j];
-            DPRINTF( "        %d: flags %x offset %d handler %p type %p %s\n",
+            TRACE( "        %d: flags %x offset %d handler %p type %p %s\n",
                      j, ptr->flags, ptr->offset, ptr->handler,
                      ptr->type_info, dbgstr_type_info( ptr->type_info ) );
         }
diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
index 54c5e6a6572..ddc5af80ccb 100644
--- a/dlls/ntdll/virtual.c
+++ b/dlls/ntdll/virtual.c
@@ -164,27 +164,27 @@ static void VIRTUAL_DumpView( FILE_VIEW *view )
     char *addr = view->base;
     BYTE prot = view->prot[0];
 
-    DPRINTF( "View: %p - %p", addr, addr + view->size - 1 );
+    TRACE( "View: %p - %p", addr, addr + view->size - 1 );
     if (view->flags & VFLAG_SYSTEM)
-        DPRINTF( " (system)\n" );
+        TRACE( " (system)\n" );
     else if (view->flags & VFLAG_VALLOC)
-        DPRINTF( " (valloc)\n" );
+        TRACE( " (valloc)\n" );
     else if (view->mapping)
-        DPRINTF( " %p\n", view->mapping );
+        TRACE( " %p\n", view->mapping );
     else
-        DPRINTF( " (anonymous)\n");
+        TRACE( " (anonymous)\n");
 
     for (count = i = 1; i < view->size >> page_shift; i++, count++)
     {
         if (view->prot[i] == prot) continue;
-        DPRINTF( "      %p - %p %s\n",
+        TRACE( "      %p - %p %s\n",
                  addr, addr + (count << page_shift) - 1, VIRTUAL_GetProtStr(prot) );
         addr += (count << page_shift);
         prot = view->prot[i];
         count = 0;
     }
     if (count)
-        DPRINTF( "      %p - %p %s\n",
+        TRACE( "      %p - %p %s\n",
                  addr, addr + (count << page_shift) - 1, VIRTUAL_GetProtStr(prot) );
 }
 
@@ -196,7 +196,7 @@ void VIRTUAL_Dump(void)
 {
     struct file_view *view;
 
-    DPRINTF( "\nDump of all virtual memory views:\n\n" );
+    TRACE( "Dump of all virtual memory views:\n" );
     RtlEnterCriticalSection(&csVirtual);
     LIST_FOR_EACH_ENTRY( view, &views_list, FILE_VIEW, entry )
     {
diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index 22e1d3a50d0..14015cb23a4 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -633,12 +633,12 @@ static BOOL internal_wglUseFontBitmaps(HDC hdc,
 			    bitmask = 0x80;
 			}
 			if (*bitmap_ & bitmask)
-			    DPRINTF("*");
+			    TRACE("*");
 			else
-			    DPRINTF(" ");
+			    TRACE(" ");
 		    }
 		    bitmap_ += (4 - ((UINT_PTR)bitmap_ & 0x03));
-		    DPRINTF("\n");
+		    TRACE("\n");
 		}
 	    }
 	}
diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c
index d2e0f97c3da..900ba26bf18 100644
--- a/dlls/quartz/dsoundrender.c
+++ b/dlls/quartz/dsoundrender.c
@@ -245,10 +245,10 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample)
         for(i = 0; i < cbSrcStream; i++)
         {
 	    if ((i!=0) && !(i%16))
-	        DPRINTF("\n");
-	    DPRINTF("%02x ", pbSrcStream[i]);
+                TRACE("\n");
+            TRACE("%02x ", pbSrcStream[i]);
         }
-        DPRINTF("\n");
+        TRACE("\n");
     }
 #endif
   
diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c
index 1f0d18d8a99..684993869e0 100644
--- a/dlls/quartz/transform.c
+++ b/dlls/quartz/transform.c
@@ -85,10 +85,10 @@ static HRESULT TransformFilter_Sample(LPVOID iface, IMediaSample * pSample)
         for(i = 0; i < cbSrcStream; i++)
         {
 	    if ((i!=0) && !(i%16))
-	        DPRINTF("\n");
-	    DPRINTF("%02x ", pbSrcStream[i]);
+                TRACE("\n");
+            TRACE("%02x ", pbSrcStream[i]);
         }
-        DPRINTF("\n");
+        TRACE("\n");
     }
 #endif
 
diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c
index 1f437f8a27c..a29953ff816 100644
--- a/dlls/quartz/videorenderer.c
+++ b/dlls/quartz/videorenderer.c
@@ -377,10 +377,10 @@ static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample)
         for(i = 0; i < cbSrcStream; i++)
         {
             if ((i!=0) && !(i%16))
-                DPRINTF("\n");
-                DPRINTF("%02x ", pbSrcStream[i]);
+                TRACE("\n");
+                TRACE("%02x ", pbSrcStream[i]);
         }
-        DPRINTF("\n");
+        TRACE("\n");
     }
 #endif
     
diff --git a/dlls/user/menu.c b/dlls/user/menu.c
index ec8cd854a36..dd4462d42b4 100644
--- a/dlls/user/menu.c
+++ b/dlls/user/menu.c
@@ -201,7 +201,7 @@ const struct builtin_class_descr MENU_builtin_class =
   if(!TRACE_ON(menu)) ; else do_debug_print_menuitem(pre, mp, post)
 
 #define MENUOUT(text) \
-  DPRINTF("%s%s", (count++ ? "," : ""), (text))
+  TRACE("%s%s", (count++ ? "," : ""), (text))
 
 #define MENUFLAG(bit,text) \
   do { \
@@ -215,12 +215,12 @@ static void do_debug_print_menuitem(const char *prefix, MENUITEM * mp,
     if (mp) {
 	UINT flags = mp->fType;
 	int type = MENU_ITEM_TYPE(flags);
-	DPRINTF( "{ ID=0x%x", mp->wID);
+	TRACE( "{ ID=0x%x", mp->wID);
 	if (flags & MF_POPUP)
-	    DPRINTF( ", Sub=%p", mp->hSubMenu);
+	    TRACE( ", Sub=%p", mp->hSubMenu);
 	if (flags) {
 	    int count = 0;
-	    DPRINTF( ", Type=");
+	    TRACE( ", Type=");
 	    if (type == MFT_STRING)
 		/* Nothing */ ;
 	    else if (type == MFT_SEPARATOR)
@@ -242,12 +242,12 @@ static void do_debug_print_menuitem(const char *prefix, MENUITEM * mp,
 	    MENUFLAG(MFT_RIGHTJUSTIFY, "right");	/* same as MF_HELP */
 
 	    if (flags)
-		DPRINTF( "+0x%x", flags);
+		TRACE( "+0x%x", flags);
 	}
 	flags = mp->fState;
 	if (flags) {
 	    int count = 0;
-	    DPRINTF( ", State=");
+	    TRACE( ", State=");
 	    MENUFLAG(MFS_GRAYED, "grey");
 	    MENUFLAG(MFS_DEFAULT, "default");
 	    MENUFLAG(MFS_DISABLED, "dis");
@@ -256,30 +256,30 @@ static void do_debug_print_menuitem(const char *prefix, MENUITEM * mp,
 	    MENUFLAG(MF_USECHECKBITMAPS, "usebit");
 	    MENUFLAG(MF_MOUSESELECT, "mouse");
 	    if (flags)
-		DPRINTF( "+0x%x", flags);
+		TRACE( "+0x%x", flags);
 	}
 	if (mp->hCheckBit)
-	    DPRINTF( ", Chk=%p", mp->hCheckBit);
+	    TRACE( ", Chk=%p", mp->hCheckBit);
 	if (mp->hUnCheckBit)
-	    DPRINTF( ", Unc=%p", mp->hUnCheckBit);
+	    TRACE( ", Unc=%p", mp->hUnCheckBit);
 
 	if (type == MFT_STRING) {
 	    if (mp->text)
-		DPRINTF( ", Text=%s", debugstr_w(mp->text));
+		TRACE( ", Text=%s", debugstr_w(mp->text));
 	    else
-		DPRINTF( ", Text=Null");
+		TRACE( ", Text=Null");
 	} else if (mp->text == NULL)
 	    /* Nothing */ ;
 	else
-	    DPRINTF( ", Text=%p", mp->text);
+	    TRACE( ", Text=%p", mp->text);
 	if (mp->dwItemData)
-	    DPRINTF( ", ItemData=0x%08lx", mp->dwItemData);
-	DPRINTF( " }");
+	    TRACE( ", ItemData=0x%08lx", mp->dwItemData);
+	TRACE( " }");
     } else {
-	DPRINTF( "NULL");
+	TRACE( "NULL");
     }
 
-    DPRINTF(" %s\n", postfix);
+    TRACE(" %s\n", postfix);
 }
 
 #undef MENUOUT
diff --git a/dlls/x11drv/opengl.c b/dlls/x11drv/opengl.c
index 20a90ec630c..8f1ca083c42 100644
--- a/dlls/x11drv/opengl.c
+++ b/dlls/x11drv/opengl.c
@@ -57,9 +57,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(opengl);
 
 
 static void dump_PIXELFORMATDESCRIPTOR(const PIXELFORMATDESCRIPTOR *ppfd) {
-  DPRINTF("  - size / version : %d / %d\n", ppfd->nSize, ppfd->nVersion);
-  DPRINTF("  - dwFlags : ");
-#define TEST_AND_DUMP(t,tv) if ((t) & (tv)) DPRINTF(#tv " ")
+  TRACE("  - size / version : %d / %d\n", ppfd->nSize, ppfd->nVersion);
+  TRACE("  - dwFlags : ");
+#define TEST_AND_DUMP(t,tv) if ((t) & (tv)) TRACE(#tv " ")
   TEST_AND_DUMP(ppfd->dwFlags, PFD_DEPTH_DONTCARE);
   TEST_AND_DUMP(ppfd->dwFlags, PFD_DOUBLEBUFFER);
   TEST_AND_DUMP(ppfd->dwFlags, PFD_DOUBLEBUFFER_DONTCARE);
@@ -77,32 +77,32 @@ static void dump_PIXELFORMATDESCRIPTOR(const PIXELFORMATDESCRIPTOR *ppfd) {
   TEST_AND_DUMP(ppfd->dwFlags, PFD_SWAP_EXCHANGE);
   TEST_AND_DUMP(ppfd->dwFlags, PFD_SWAP_LAYER_BUFFERS);
 #undef TEST_AND_DUMP
-  DPRINTF("\n");
+  TRACE("\n");
 
-  DPRINTF("  - iPixelType : ");
+  TRACE("  - iPixelType : ");
   switch (ppfd->iPixelType) {
-  case PFD_TYPE_RGBA: DPRINTF("PFD_TYPE_RGBA"); break;
-  case PFD_TYPE_COLORINDEX: DPRINTF("PFD_TYPE_COLORINDEX"); break;
+  case PFD_TYPE_RGBA: TRACE("PFD_TYPE_RGBA"); break;
+  case PFD_TYPE_COLORINDEX: TRACE("PFD_TYPE_COLORINDEX"); break;
   }
-  DPRINTF("\n");
-
-  DPRINTF("  - Color   : %d\n", ppfd->cColorBits);
-  DPRINTF("  - Red     : %d\n", ppfd->cRedBits);
-  DPRINTF("  - Green   : %d\n", ppfd->cGreenBits);
-  DPRINTF("  - Blue    : %d\n", ppfd->cBlueBits);
-  DPRINTF("  - Alpha   : %d\n", ppfd->cAlphaBits);
-  DPRINTF("  - Accum   : %d\n", ppfd->cAccumBits);
-  DPRINTF("  - Depth   : %d\n", ppfd->cDepthBits);
-  DPRINTF("  - Stencil : %d\n", ppfd->cStencilBits);
-  DPRINTF("  - Aux     : %d\n", ppfd->cAuxBuffers);
-
-  DPRINTF("  - iLayerType : ");
+  TRACE("\n");
+
+  TRACE("  - Color   : %d\n", ppfd->cColorBits);
+  TRACE("  - Red     : %d\n", ppfd->cRedBits);
+  TRACE("  - Green   : %d\n", ppfd->cGreenBits);
+  TRACE("  - Blue    : %d\n", ppfd->cBlueBits);
+  TRACE("  - Alpha   : %d\n", ppfd->cAlphaBits);
+  TRACE("  - Accum   : %d\n", ppfd->cAccumBits);
+  TRACE("  - Depth   : %d\n", ppfd->cDepthBits);
+  TRACE("  - Stencil : %d\n", ppfd->cStencilBits);
+  TRACE("  - Aux     : %d\n", ppfd->cAuxBuffers);
+
+  TRACE("  - iLayerType : ");
   switch (ppfd->iLayerType) {
-  case PFD_MAIN_PLANE: DPRINTF("PFD_MAIN_PLANE"); break;
-  case PFD_OVERLAY_PLANE: DPRINTF("PFD_OVERLAY_PLANE"); break;
-  case (BYTE)PFD_UNDERLAY_PLANE: DPRINTF("PFD_UNDERLAY_PLANE"); break;
+  case PFD_MAIN_PLANE: TRACE("PFD_MAIN_PLANE"); break;
+  case PFD_OVERLAY_PLANE: TRACE("PFD_OVERLAY_PLANE"); break;
+  case (BYTE)PFD_UNDERLAY_PLANE: TRACE("PFD_UNDERLAY_PLANE"); break;
   }
-  DPRINTF("\n");
+  TRACE("\n");
 }
 
 /* No need to load any other libraries as according to the ABI, libGL should be self-sufficient and
-- 
GitLab