Skip to content

W
wine-winehq
Commit 9f859692 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Replace DPRINTF by TRACE in a few places.

parent b1e23784
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 121 deletions
dlls/kernel/instr.c
View file @ 9f859692
...@@ -381,15 +381,15 @@ static DWORD INSTR_inport( WORD port, int size, CONTEXT86 *context ) ...@@ -381,15 +381,15 @@ static DWORD INSTR_inport( WORD port, int size, CONTEXT86 *context )
switch(size) switch(size)
{ {
case 1: 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)); (WORD)context->SegCs, LOWORD(context->Eip));
break; break;
case 2: 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)); (WORD)context->SegCs, LOWORD(context->Eip));
break; break;
case 4: 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)); (WORD)context->SegCs, LOWORD(context->Eip));
break; break;
} }
...@@ -413,15 +413,15 @@ static void INSTR_outport( WORD port, int size, DWORD val, CONTEXT86 *context ) ...@@ -413,15 +413,15 @@ static void INSTR_outport( WORD port, int size, DWORD val, CONTEXT86 *context )
switch(size) switch(size)
{ {
case 1: 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)); (WORD)context->SegCs, LOWORD(context->Eip));
break; break;
case 2: 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)); (WORD)context->SegCs, LOWORD(context->Eip));
break; break;
case 4: 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)); (WORD)context->SegCs, LOWORD(context->Eip));
break; break;
} }
......
dlls/kernel/local16.c
View file @ 9f859692
...@@ -346,42 +346,42 @@ static void LOCAL_PrintHeap( HANDLE16 ds ) ...@@ -346,42 +346,42 @@ static void LOCAL_PrintHeap( HANDLE16 ds )
if (!pInfo) if (!pInfo)
{ {
DPRINTF( "Local Heap corrupted! ds=%04x\n", ds ); ERR( "Local Heap corrupted! ds=%04x\n", ds );
return; 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 ); ds, pInfo->first, pInfo->last, pInfo->items );
arena = pInfo->first; arena = pInfo->first;
for (;;) for (;;)
{ {
LOCALARENA *pArena = ARENA_PTR(ptr,arena); LOCALARENA *pArena = ARENA_PTR(ptr,arena);
DPRINTF( " %04x: prev=%04x next=%04x type=%d\n", arena, TRACE( " %04x: prev=%04x next=%04x type=%d\n", arena,
pArena->prev & ~3, pArena->next, pArena->prev & 3 ); pArena->prev & ~3, pArena->next, pArena->prev & 3 );
if (arena == pInfo->first) 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 ); pArena->size, pArena->free_prev, pArena->free_next );
} }
if ((pArena->prev & 3) == LOCAL_ARENA_FREE) 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 ); pArena->size, pArena->free_prev, pArena->free_next );
if (pArena->next == arena) break; /* last one */ if (pArena->next == arena) break; /* last one */
if (ARENA_PTR(ptr,pArena->free_next)->free_prev != arena) 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; break;
} }
} }
if (pArena->next == arena) if (pArena->next == arena)
{ {
DPRINTF( "*** last block is not marked free\n" ); TRACE( "*** last block is not marked free\n" );
break; break;
} }
if ((ARENA_PTR(ptr,pArena->next)->prev & ~3) != arena) 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); pArena->next, ARENA_PTR(ptr,pArena->next)->prev);
break; break;
} }
......
dlls/kernel/ne_module.c
View file @ 9f859692
...@@ -263,72 +263,72 @@ void NE_DumpModule( HMODULE16 hModule ) ...@@ -263,72 +263,72 @@ void NE_DumpModule( HMODULE16 hModule )
if (!(pModule = NE_GetPtr( 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; return;
} }
/* Dump the module info */ /* Dump the module info */
DPRINTF( "---\n" ); TRACE( "---\n" );
DPRINTF( "Module %04x:\n", hModule ); TRACE( "Module %04x:\n", hModule );
DPRINTF( "count=%d flags=%04x heap=%d stack=%d\n", TRACE( "count=%d flags=%04x heap=%d stack=%d\n",
pModule->count, pModule->ne_flags, pModule->count, pModule->ne_flags,
pModule->ne_heap, pModule->ne_stack ); 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_csip), OFFSETOF(pModule->ne_csip),
SELECTOROF(pModule->ne_sssp), OFFSETOF(pModule->ne_sssp), SELECTOROF(pModule->ne_sssp), OFFSETOF(pModule->ne_sssp),
pModule->ne_autodata, pModule->ne_cseg, pModule->ne_cmod ); 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 ); pModule->ne_exetyp, pModule->ne_swaparea, pModule->ne_expver );
if (pModule->ne_flags & NE_FFLAGS_WIN32) 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 */ /* Dump the file info */
DPRINTF( "---\n" ); TRACE( "---\n" );
DPRINTF( "Filename: '%s'\n", NE_MODULE_NAME(pModule) ); TRACE( "Filename: '%s'\n", NE_MODULE_NAME(pModule) );
/* Dump the segment table */ /* Dump the segment table */
DPRINTF( "---\n" ); TRACE( "---\n" );
DPRINTF( "Segment table:\n" ); TRACE( "Segment table:\n" );
pSeg = NE_SEG_TABLE( pModule ); pSeg = NE_SEG_TABLE( pModule );
for (i = 0; i < pModule->ne_cseg; i++, pSeg++) 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, i + 1, pSeg->filepos, pSeg->size, pSeg->flags,
pSeg->minsize, pSeg->hSeg ); pSeg->minsize, pSeg->hSeg );
/* Dump the resource table */ /* Dump the resource table */
DPRINTF( "---\n" ); TRACE( "---\n" );
DPRINTF( "Resource table:\n" ); TRACE( "Resource table:\n" );
if (pModule->ne_rsrctab) if (pModule->ne_rsrctab)
{ {
pword = (WORD *)((BYTE *)pModule + pModule->ne_rsrctab); pword = (WORD *)((BYTE *)pModule + pModule->ne_rsrctab);
DPRINTF( "Alignment: %d\n", *pword++ ); TRACE( "Alignment: %d\n", *pword++ );
while (*pword) while (*pword)
{ {
NE_TYPEINFO *ptr = (NE_TYPEINFO *)pword; NE_TYPEINFO *ptr = (NE_TYPEINFO *)pword;
NE_NAMEINFO *pname = (NE_NAMEINFO *)(ptr + 1); 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++) 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 ); pname->offset, pname->length, pname->id );
pword = (WORD *)pname; pword = (WORD *)pname;
} }
} }
else DPRINTF( "None\n" ); else TRACE( "None\n" );
/* Dump the resident name table */ /* Dump the resident name table */
DPRINTF( "---\n" ); TRACE( "---\n" );
DPRINTF( "Resident-name table:\n" ); TRACE( "Resident-name table:\n" );
pstr = (BYTE*) pModule + pModule->ne_restab; pstr = (BYTE*) pModule + pModule->ne_restab;
while (*pstr) while (*pstr)
{ {
DPRINTF( "%*.*s: %d\n", *pstr, *pstr, pstr + 1, TRACE( "%*.*s: %d\n", *pstr, *pstr, pstr + 1,
*(WORD *)(pstr + *pstr + 1) ); *(WORD *)(pstr + *pstr + 1) );
pstr += *pstr + 1 + sizeof(WORD); pstr += *pstr + 1 + sizeof(WORD);
} }
/* Dump the module reference table */ /* Dump the module reference table */
DPRINTF( "---\n" ); TRACE( "---\n" );
DPRINTF( "Module ref table:\n" ); TRACE( "Module ref table:\n" );
if (pModule->ne_modtab) if (pModule->ne_modtab)
{ {
pword = (WORD *)((BYTE *)pModule + pModule->ne_modtab); pword = (WORD *)((BYTE *)pModule + pModule->ne_modtab);
...@@ -336,43 +336,43 @@ void NE_DumpModule( HMODULE16 hModule ) ...@@ -336,43 +336,43 @@ void NE_DumpModule( HMODULE16 hModule )
{ {
char name[10]; char name[10];
GetModuleName16( *pword, name, sizeof(name) ); 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 */ /* Dump the entry table */
DPRINTF( "---\n" ); TRACE( "---\n" );
DPRINTF( "Entry table:\n" ); TRACE( "Entry table:\n" );
bundle = (ET_BUNDLE *)((BYTE *)pModule+pModule->ne_enttab); bundle = (ET_BUNDLE *)((BYTE *)pModule+pModule->ne_enttab);
do { do {
entry = (ET_ENTRY *)((BYTE *)bundle+6); 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; ordinal = bundle->first;
while (ordinal < bundle->last) while (ordinal < bundle->last)
{ {
if (entry->type == 0xff) 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 else
DPRINTF("%d: %02x:%04x (fixed)\n", ordinal++, entry->segnum, entry->offs); TRACE("%d: %02x:%04x (fixed)\n", ordinal++, entry->segnum, entry->offs);
entry++; entry++;
} }
} while ( (bundle->next) && (bundle = ((ET_BUNDLE *)((BYTE *)pModule + bundle->next))) ); } while ( (bundle->next) && (bundle = ((ET_BUNDLE *)((BYTE *)pModule + bundle->next))) );
/* Dump the non-resident names table */ /* Dump the non-resident names table */
DPRINTF( "---\n" ); TRACE( "---\n" );
DPRINTF( "Non-resident names table:\n" ); TRACE( "Non-resident names table:\n" );
if (pModule->nrname_handle) if (pModule->nrname_handle)
{ {
pstr = GlobalLock16( pModule->nrname_handle ); pstr = GlobalLock16( pModule->nrname_handle );
while (*pstr) while (*pstr)
{ {
DPRINTF( "%*.*s: %d\n", *pstr, *pstr, pstr + 1, TRACE( "%*.*s: %d\n", *pstr, *pstr, pstr + 1,
*(WORD *)(pstr + *pstr + 1) ); *(WORD *)(pstr + *pstr + 1) );
pstr += *pstr + 1 + sizeof(WORD); pstr += *pstr + 1 + sizeof(WORD);
} }
} }
DPRINTF( "\n" ); TRACE( "\n" );
} }
......
dlls/kernel/version.c
View file @ 9f859692
...@@ -360,5 +360,5 @@ BOOL16 WINAPI DiagQuery16(void) ...@@ -360,5 +360,5 @@ BOOL16 WINAPI DiagQuery16(void)
void WINAPI DiagOutput16(LPCSTR str) void WINAPI DiagOutput16(LPCSTR str)
{ {
/* FIXME */ /* FIXME */
DPRINTF("DIAGOUTPUT:%s\n", debugstr_a(str)); TRACE("DIAGOUTPUT:%s\n", debugstr_a(str));
} }
dlls/msvcrt/cppexcept.c
View file @ 9f859692
...@@ -78,7 +78,7 @@ inline static void call_dtor( void *func, void *object ) ...@@ -78,7 +78,7 @@ inline static void call_dtor( void *func, void *object )
static inline void dump_type( const cxx_type_info *type ) 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->flags, type->type_info, dbgstr_type_info(type->type_info),
type->offsets.this_offset, type->offsets.vbase_descr, type->offsets.vbase_offset, type->offsets.this_offset, type->offsets.vbase_descr, type->offsets.vbase_offset,
type->size, type->copy_ctor ); type->size, type->copy_ctor );
...@@ -88,12 +88,11 @@ static void dump_exception_type( const cxx_exception_type *type ) ...@@ -88,12 +88,11 @@ static void dump_exception_type( const cxx_exception_type *type )
{ {
UINT i; UINT i;
DPRINTF( "exception type:\n" ); TRACE( "flags %x destr %p handler %p type info %p\n",
DPRINTF( "flags %x destr %p handler %p type info %p\n",
type->flags, type->destructor, type->custom_handler, type->type_info_table ); type->flags, type->destructor, type->custom_handler, type->type_info_table );
for (i = 0; i < type->type_info_table->count; i++) for (i = 0; i < type->type_info_table->count; i++)
{ {
DPRINTF( " %d: ", i ); TRACE( " %d: ", i );
dump_type( type->type_info_table->info[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 ...@@ -103,25 +102,24 @@ static void dump_function_descr( const cxx_function_descr *descr, const cxx_exce
UINT i; UINT i;
int j; int j;
DPRINTF( "function descr:\n" ); TRACE( "magic %x\n", descr->magic );
DPRINTF( "magic %x\n", descr->magic ); TRACE( "unwind table: %p %d\n", descr->unwind_table, descr->unwind_count );
DPRINTF( "unwind table: %p %d\n", descr->unwind_table, descr->unwind_count );
for (i = 0; i < descr->unwind_count; i++) 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 ); 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++) 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].start_level, descr->tryblock[i].end_level,
descr->tryblock[i].catch_level, descr->tryblock[i].catchblock, descr->tryblock[i].catch_level, descr->tryblock[i].catchblock,
descr->tryblock[i].catchblock_count ); descr->tryblock[i].catchblock_count );
for (j = 0; j < descr->tryblock[i].catchblock_count; j++) for (j = 0; j < descr->tryblock[i].catchblock_count; j++)
{ {
catchblock_info *ptr = &descr->tryblock[i].catchblock[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, j, ptr->flags, ptr->offset, ptr->handler,
ptr->type_info, dbgstr_type_info( ptr->type_info ) ); ptr->type_info, dbgstr_type_info( ptr->type_info ) );
} }
......
dlls/ntdll/virtual.c
View file @ 9f859692
...@@ -164,27 +164,27 @@ static void VIRTUAL_DumpView( FILE_VIEW *view ) ...@@ -164,27 +164,27 @@ static void VIRTUAL_DumpView( FILE_VIEW *view )
char *addr = view->base; char *addr = view->base;
BYTE prot = view->prot[0]; 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) if (view->flags & VFLAG_SYSTEM)
DPRINTF( " (system)\n" ); TRACE( " (system)\n" );
else if (view->flags & VFLAG_VALLOC) else if (view->flags & VFLAG_VALLOC)
DPRINTF( " (valloc)\n" ); TRACE( " (valloc)\n" );
else if (view->mapping) else if (view->mapping)
DPRINTF( " %p\n", view->mapping ); TRACE( " %p\n", view->mapping );
else else
DPRINTF( " (anonymous)\n"); TRACE( " (anonymous)\n");
for (count = i = 1; i < view->size >> page_shift; i++, count++) for (count = i = 1; i < view->size >> page_shift; i++, count++)
{ {
if (view->prot[i] == prot) continue; 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, addr + (count << page_shift) - 1, VIRTUAL_GetProtStr(prot) );
addr += (count << page_shift); addr += (count << page_shift);
prot = view->prot[i]; prot = view->prot[i];
count = 0; count = 0;
} }
if (count) if (count)
DPRINTF( " %p - %p %s\n", TRACE( " %p - %p %s\n",
addr, addr + (count << page_shift) - 1, VIRTUAL_GetProtStr(prot) ); addr, addr + (count << page_shift) - 1, VIRTUAL_GetProtStr(prot) );
} }
...@@ -196,7 +196,7 @@ void VIRTUAL_Dump(void) ...@@ -196,7 +196,7 @@ void VIRTUAL_Dump(void)
{ {
struct file_view *view; struct file_view *view;
DPRINTF( "\nDump of all virtual memory views:\n\n" ); TRACE( "Dump of all virtual memory views:\n" );
RtlEnterCriticalSection(&csVirtual); RtlEnterCriticalSection(&csVirtual);
LIST_FOR_EACH_ENTRY( view, &views_list, FILE_VIEW, entry ) LIST_FOR_EACH_ENTRY( view, &views_list, FILE_VIEW, entry )
{ {
......
dlls/opengl32/wgl.c
View file @ 9f859692
...@@ -633,12 +633,12 @@ static BOOL internal_wglUseFontBitmaps(HDC hdc, ...@@ -633,12 +633,12 @@ static BOOL internal_wglUseFontBitmaps(HDC hdc,
bitmask = 0x80; bitmask = 0x80;
} }
if (*bitmap_ & bitmask) if (*bitmap_ & bitmask)
DPRINTF("*"); TRACE("*");
else else
DPRINTF(" "); TRACE(" ");
} }
bitmap_ += (4 - ((UINT_PTR)bitmap_ & 0x03)); bitmap_ += (4 - ((UINT_PTR)bitmap_ & 0x03));
DPRINTF("\n"); TRACE("\n");
} }
} }
} }
......
dlls/quartz/dsoundrender.c
View file @ 9f859692
...@@ -245,10 +245,10 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) ...@@ -245,10 +245,10 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample)
for(i = 0; i < cbSrcStream; i++) for(i = 0; i < cbSrcStream; i++)
{ {
if ((i!=0) && !(i%16)) if ((i!=0) && !(i%16))
DPRINTF("\n"); TRACE("\n");
DPRINTF("%02x ", pbSrcStream[i]); TRACE("%02x ", pbSrcStream[i]);
} }
DPRINTF("\n"); TRACE("\n");
} }
#endif #endif
......
dlls/quartz/transform.c
View file @ 9f859692
...@@ -85,10 +85,10 @@ static HRESULT TransformFilter_Sample(LPVOID iface, IMediaSample * pSample) ...@@ -85,10 +85,10 @@ static HRESULT TransformFilter_Sample(LPVOID iface, IMediaSample * pSample)
for(i = 0; i < cbSrcStream; i++) for(i = 0; i < cbSrcStream; i++)
{ {
if ((i!=0) && !(i%16)) if ((i!=0) && !(i%16))
DPRINTF("\n"); TRACE("\n");
DPRINTF("%02x ", pbSrcStream[i]); TRACE("%02x ", pbSrcStream[i]);
} }
DPRINTF("\n"); TRACE("\n");
} }
#endif #endif
......
dlls/quartz/videorenderer.c
View file @ 9f859692
...@@ -377,10 +377,10 @@ static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample) ...@@ -377,10 +377,10 @@ static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample)
for(i = 0; i < cbSrcStream; i++) for(i = 0; i < cbSrcStream; i++)
{ {
if ((i!=0) && !(i%16)) if ((i!=0) && !(i%16))
DPRINTF("\n"); TRACE("\n");
DPRINTF("%02x ", pbSrcStream[i]); TRACE("%02x ", pbSrcStream[i]);
} }
DPRINTF("\n"); TRACE("\n");
} }
#endif #endif
......
dlls/user/menu.c
View file @ 9f859692
...@@ -201,7 +201,7 @@ const struct builtin_class_descr MENU_builtin_class = ...@@ -201,7 +201,7 @@ const struct builtin_class_descr MENU_builtin_class =
if(!TRACE_ON(menu)) ; else do_debug_print_menuitem(pre, mp, post) if(!TRACE_ON(menu)) ; else do_debug_print_menuitem(pre, mp, post)
#define MENUOUT(text) \ #define MENUOUT(text) \
DPRINTF("%s%s", (count++ ? "," : ""), (text)) TRACE("%s%s", (count++ ? "," : ""), (text))
#define MENUFLAG(bit,text) \ #define MENUFLAG(bit,text) \
do { \ do { \
...@@ -215,12 +215,12 @@ static void do_debug_print_menuitem(const char *prefix, MENUITEM * mp, ...@@ -215,12 +215,12 @@ static void do_debug_print_menuitem(const char *prefix, MENUITEM * mp,
if (mp) { if (mp) {
UINT flags = mp->fType; UINT flags = mp->fType;
int type = MENU_ITEM_TYPE(flags); int type = MENU_ITEM_TYPE(flags);
DPRINTF( "{ ID=0x%x", mp->wID); TRACE( "{ ID=0x%x", mp->wID);
if (flags & MF_POPUP) if (flags & MF_POPUP)
DPRINTF( ", Sub=%p", mp->hSubMenu); TRACE( ", Sub=%p", mp->hSubMenu);
if (flags) { if (flags) {
int count = 0; int count = 0;
DPRINTF( ", Type="); TRACE( ", Type=");
if (type == MFT_STRING) if (type == MFT_STRING)
/* Nothing */ ; /* Nothing */ ;
else if (type == MFT_SEPARATOR) else if (type == MFT_SEPARATOR)
...@@ -242,12 +242,12 @@ static void do_debug_print_menuitem(const char *prefix, MENUITEM * mp, ...@@ -242,12 +242,12 @@ static void do_debug_print_menuitem(const char *prefix, MENUITEM * mp,
MENUFLAG(MFT_RIGHTJUSTIFY, "right"); /* same as MF_HELP */ MENUFLAG(MFT_RIGHTJUSTIFY, "right"); /* same as MF_HELP */
if (flags) if (flags)
DPRINTF( "+0x%x", flags); TRACE( "+0x%x", flags);
} }
flags = mp->fState; flags = mp->fState;
if (flags) { if (flags) {
int count = 0; int count = 0;
DPRINTF( ", State="); TRACE( ", State=");
MENUFLAG(MFS_GRAYED, "grey"); MENUFLAG(MFS_GRAYED, "grey");
MENUFLAG(MFS_DEFAULT, "default"); MENUFLAG(MFS_DEFAULT, "default");
MENUFLAG(MFS_DISABLED, "dis"); MENUFLAG(MFS_DISABLED, "dis");
...@@ -256,30 +256,30 @@ static void do_debug_print_menuitem(const char *prefix, MENUITEM * mp, ...@@ -256,30 +256,30 @@ static void do_debug_print_menuitem(const char *prefix, MENUITEM * mp,
MENUFLAG(MF_USECHECKBITMAPS, "usebit"); MENUFLAG(MF_USECHECKBITMAPS, "usebit");
MENUFLAG(MF_MOUSESELECT, "mouse"); MENUFLAG(MF_MOUSESELECT, "mouse");
if (flags) if (flags)
DPRINTF( "+0x%x", flags); TRACE( "+0x%x", flags);
} }
if (mp->hCheckBit) if (mp->hCheckBit)
DPRINTF( ", Chk=%p", mp->hCheckBit); TRACE( ", Chk=%p", mp->hCheckBit);
if (mp->hUnCheckBit) if (mp->hUnCheckBit)
DPRINTF( ", Unc=%p", mp->hUnCheckBit); TRACE( ", Unc=%p", mp->hUnCheckBit);
if (type == MFT_STRING) { if (type == MFT_STRING) {
if (mp->text) if (mp->text)
DPRINTF( ", Text=%s", debugstr_w(mp->text)); TRACE( ", Text=%s", debugstr_w(mp->text));
else else
DPRINTF( ", Text=Null"); TRACE( ", Text=Null");
} else if (mp->text == NULL) } else if (mp->text == NULL)
/* Nothing */ ; /* Nothing */ ;
else else
DPRINTF( ", Text=%p", mp->text); TRACE( ", Text=%p", mp->text);
if (mp->dwItemData) if (mp->dwItemData)
DPRINTF( ", ItemData=0x%08lx", mp->dwItemData); TRACE( ", ItemData=0x%08lx", mp->dwItemData);
DPRINTF( " }"); TRACE( " }");
} else { } else {
DPRINTF( "NULL"); TRACE( "NULL");
} }
DPRINTF(" %s\n", postfix); TRACE(" %s\n", postfix);
} }
#undef MENUOUT #undef MENUOUT
......
dlls/x11drv/opengl.c
View file @ 9f859692
...@@ -57,9 +57,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(opengl); ...@@ -57,9 +57,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(opengl);
static void dump_PIXELFORMATDESCRIPTOR(const PIXELFORMATDESCRIPTOR *ppfd) { static void dump_PIXELFORMATDESCRIPTOR(const PIXELFORMATDESCRIPTOR *ppfd) {
DPRINTF(" - size / version : %d / %d\n", ppfd->nSize, ppfd->nVersion); TRACE(" - size / version : %d / %d\n", ppfd->nSize, ppfd->nVersion);
DPRINTF(" - dwFlags : "); TRACE(" - dwFlags : ");
#define TEST_AND_DUMP(t,tv) if ((t) & (tv)) DPRINTF(#tv " ") #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_DEPTH_DONTCARE);
TEST_AND_DUMP(ppfd->dwFlags, PFD_DOUBLEBUFFER); TEST_AND_DUMP(ppfd->dwFlags, PFD_DOUBLEBUFFER);
TEST_AND_DUMP(ppfd->dwFlags, PFD_DOUBLEBUFFER_DONTCARE); TEST_AND_DUMP(ppfd->dwFlags, PFD_DOUBLEBUFFER_DONTCARE);
...@@ -77,32 +77,32 @@ static void dump_PIXELFORMATDESCRIPTOR(const PIXELFORMATDESCRIPTOR *ppfd) { ...@@ -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_EXCHANGE);
TEST_AND_DUMP(ppfd->dwFlags, PFD_SWAP_LAYER_BUFFERS); TEST_AND_DUMP(ppfd->dwFlags, PFD_SWAP_LAYER_BUFFERS);
#undef TEST_AND_DUMP #undef TEST_AND_DUMP
DPRINTF("\n"); TRACE("\n");
DPRINTF(" - iPixelType : "); TRACE(" - iPixelType : ");
switch (ppfd->iPixelType) { switch (ppfd->iPixelType) {
case PFD_TYPE_RGBA: DPRINTF("PFD_TYPE_RGBA"); break; case PFD_TYPE_RGBA: TRACE("PFD_TYPE_RGBA"); break;
case PFD_TYPE_COLORINDEX: DPRINTF("PFD_TYPE_COLORINDEX"); break; case PFD_TYPE_COLORINDEX: TRACE("PFD_TYPE_COLORINDEX"); break;
} }
DPRINTF("\n"); TRACE("\n");
DPRINTF(" - Color : %d\n", ppfd->cColorBits); TRACE(" - Color : %d\n", ppfd->cColorBits);
DPRINTF(" - Red : %d\n", ppfd->cRedBits); TRACE(" - Red : %d\n", ppfd->cRedBits);
DPRINTF(" - Green : %d\n", ppfd->cGreenBits); TRACE(" - Green : %d\n", ppfd->cGreenBits);
DPRINTF(" - Blue : %d\n", ppfd->cBlueBits); TRACE(" - Blue : %d\n", ppfd->cBlueBits);
DPRINTF(" - Alpha : %d\n", ppfd->cAlphaBits); TRACE(" - Alpha : %d\n", ppfd->cAlphaBits);
DPRINTF(" - Accum : %d\n", ppfd->cAccumBits); TRACE(" - Accum : %d\n", ppfd->cAccumBits);
DPRINTF(" - Depth : %d\n", ppfd->cDepthBits); TRACE(" - Depth : %d\n", ppfd->cDepthBits);
DPRINTF(" - Stencil : %d\n", ppfd->cStencilBits); TRACE(" - Stencil : %d\n", ppfd->cStencilBits);
DPRINTF(" - Aux : %d\n", ppfd->cAuxBuffers); TRACE(" - Aux : %d\n", ppfd->cAuxBuffers);
DPRINTF(" - iLayerType : "); TRACE(" - iLayerType : ");
switch (ppfd->iLayerType) { switch (ppfd->iLayerType) {
case PFD_MAIN_PLANE: DPRINTF("PFD_MAIN_PLANE"); break; case PFD_MAIN_PLANE: TRACE("PFD_MAIN_PLANE"); break;
case PFD_OVERLAY_PLANE: DPRINTF("PFD_OVERLAY_PLANE"); break; case PFD_OVERLAY_PLANE: TRACE("PFD_OVERLAY_PLANE"); break;
case (BYTE)PFD_UNDERLAY_PLANE: DPRINTF("PFD_UNDERLAY_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 /* No need to load any other libraries as according to the ABI, libGL should be self-sufficient and
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment