Author: fireball Date: Fri Oct 23 14:49:38 2009 New Revision: 43697
URL: http://svn.reactos.org/svn/reactos?rev=43697&view=rev Log: - Enable debug dump routines.
Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/atom.c branches/arwinss/reactos/subsystems/win32/win32k/wine/object.c
Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/atom.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win32... ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/atom.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/atom.c [iso-8859-1] Fri Oct 23 14:49:38 2009 @@ -169,24 +169,23 @@ /* dump an atom table */ static void atom_table_dump( struct object *obj, int verbose ) { -#if 0 int i; struct atom_table *table = (struct atom_table *)obj; assert( obj->ops == &atom_table_ops );
- fprintf( stderr, "Atom table size=%d entries=%d\n", + DPRINT1( "Atom table size=%d entries=%d\n", table->last + 1, table->entries_count ); if (!verbose) return; for (i = 0; i <= table->last; i++) { struct atom_entry *entry = table->handles[i]; if (!entry) continue; - fprintf( stderr, " %04x: ref=%d pinned=%c hash=%d "", + DPRINT1( " %04x: ref=%d pinned=%c hash=%d "", entry->atom, entry->count, entry->pinned ? 'Y' : 'N', entry->hash ); - dump_strW( entry->str, entry->len / sizeof(WCHAR), stderr, """"); - fprintf( stderr, ""\n" ); - } -#endif + //dump_strW( entry->str, entry->len / sizeof(WCHAR), stderr, """"); + DbgPrint("skipping dump_strW..."); + DPRINT1( ""\n" ); + } }
/* destroy the atom table */
Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/object.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win32... ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/object.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/object.c [iso-8859-1] Fri Oct 23 14:49:38 2009 @@ -48,22 +48,20 @@
void dump_objects(void) { -#ifndef __REACTOS__ struct list *p;
LIST_FOR_EACH( p, &static_object_list ) { struct object *ptr = LIST_ENTRY( p, struct object, obj_list ); - fprintf( stderr, "%p:%d: ", ptr, ptr->refcount ); + DPRINT1( "%p:%d: ", ptr, ptr->refcount ); ptr->ops->dump( ptr, 1 ); } LIST_FOR_EACH( p, &object_list ) { struct object *ptr = LIST_ENTRY( p, struct object, obj_list ); - fprintf( stderr, "%p:%d: ", ptr, ptr->refcount ); + DPRINT1( "%p:%d: ", ptr, ptr->refcount ); ptr->ops->dump( ptr, 1 ); } -#endif }
void close_objects(void) @@ -224,15 +222,14 @@ /* dump the name of an object to stderr */ void dump_object_name( struct object *obj ) { -#ifndef __REACTOS__ - if (!obj->name) fprintf( stderr, "name=""" ); - else - { - fprintf( stderr, "name=L"" ); - dump_strW( obj->name->name, obj->name->len/sizeof(WCHAR), stderr, """" ); - fputc( '"', stderr ); - } -#endif + if (!obj->name) DbgPrint( "name=""" ); + else + { + DbgPrint( "name=L"" ); + //dump_strW( obj->name->name, obj->name->len/sizeof(WCHAR), stderr, """" ); + DbgPrint("[dump_strW is missing]"); + DbgPrint( """ ); + } }
/* unlink a named object from its namespace, without freeing the object itself */