Changed some debug messages from one channel to another, to clean up a
bit the debug channel usage.
diff --git a/controls/menu.c b/controls/menu.c
index 14af490..4a65fd2 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -3830,7 +3830,7 @@
if (str[0] == '#') name = (SEGPTR)atoi( str + 1 );
}
else
- TRACE(resource,"(%04x,%04x)\n",instance,LOWORD(name));
+ TRACE(menu,"(%04x,%04x)\n",instance,LOWORD(name));
if (!name) return 0;
diff --git a/controls/uitools.c b/controls/uitools.c
index 84067a6..c83a805 100644
--- a/controls/uitools.c
+++ b/controls/uitools.c
@@ -927,7 +927,7 @@
return UITOOLS95_DFC_ButtonRadio(hdc, rc, uState);
default:
- WARN(uitools, "Invalid button state=0x%04x\n", uState);
+ WARN(graphics, "Invalid button state=0x%04x\n", uState);
}
return FALSE;
@@ -1063,7 +1063,7 @@
break;
default:
- WARN(uitools, "Invalid caption; flags=0x%04x\n", uFlags);
+ WARN(graphics, "Invalid caption; flags=0x%04x\n", uFlags);
return FALSE;
}
@@ -1233,7 +1233,7 @@
return TRUE;
default:
- WARN(uitools, "Invalid scroll; flags=0x%04x\n", uFlags);
+ WARN(graphics, "Invalid scroll; flags=0x%04x\n", uFlags);
return FALSE;
}
@@ -1335,7 +1335,7 @@
break;
default:
- WARN(uitools, "Invalid menu; flags=0x%04x\n", uFlags);
+ WARN(graphics, "Invalid menu; flags=0x%04x\n", uFlags);
retval = FALSE;
break;
}
@@ -1383,7 +1383,7 @@
case DFC_SCROLL:
return UITOOLS95_DrawFrameScroll(hdc, rc, uState);
default:
- WARN(uitools, "(%x,%p,%d,%x), bad type!\n",
+ WARN(graphics, "(%x,%p,%d,%x), bad type!\n",
hdc,rc,uType,uState );
}
return FALSE;
diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c
index 6f07552..54a4415 100644
--- a/dlls/comctl32/comboex.c
+++ b/dlls/comctl32/comboex.c
@@ -162,7 +162,7 @@
/* allocate memory for info structure */
infoPtr = (COMBOEX_INFO *)COMCTL32_Alloc (sizeof(COMBOEX_INFO));
if (infoPtr == NULL) {
- ERR (listview, "could not allocate info memory!\n");
+ ERR (comboex, "could not allocate info memory!\n");
return 0;
}
diff --git a/graphics/x11drv/brush.c b/graphics/x11drv/brush.c
index cbc54e0..a28104c 100644
--- a/graphics/x11drv/brush.c
+++ b/graphics/x11drv/brush.c
@@ -184,7 +184,7 @@
return 0;
if(bmp->DDBitmap->funcs != dc->funcs) {
- WARN(bitmap, "Trying to select non-X11 DDB into an X11 dc\n");
+ WARN(gdi, "Trying to select non-X11 DDB into an X11 dc\n");
return 0;
}
diff --git a/graphics/x11drv/graphics.c b/graphics/x11drv/graphics.c
index b48ae5d..531caf9 100644
--- a/graphics/x11drv/graphics.c
+++ b/graphics/x11drv/graphics.c
@@ -293,7 +293,7 @@
GCFont, &val );
return TRUE;
}
- WARN(dc, "Physical font failure\n" );
+ WARN(graphics, "Physical font failure\n" );
return FALSE;
}
diff --git a/include/debug.h b/include/debug.h
index 8dc8908..6c9ae80 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -32,119 +32,119 @@
#define dbch_ddeml 24
#define dbch_ddraw 25
#define dbch_debug 26
-#define dbch_dialog 27
-#define dbch_dinput 28
-#define dbch_dll 29
-#define dbch_dosfs 30
-#define dbch_dosmem 31
-#define dbch_dplay 32
-#define dbch_driver 33
-#define dbch_dsound 34
-#define dbch_edit 35
-#define dbch_event 36
-#define dbch_exec 37
-#define dbch_file 38
-#define dbch_fixup 39
-#define dbch_font 40
-#define dbch_gdi 41
-#define dbch_global 42
-#define dbch_graphics 43
-#define dbch_header 44
-#define dbch_heap 45
-#define dbch_hook 46
-#define dbch_hotkey 47
-#define dbch_icon 48
-#define dbch_imagehlp 49
-#define dbch_imagelist 50
-#define dbch_imm 51
-#define dbch_int 52
-#define dbch_int10 53
-#define dbch_int16 54
-#define dbch_int17 55
-#define dbch_int19 56
-#define dbch_int21 57
-#define dbch_int31 58
-#define dbch_io 59
-#define dbch_ipaddress 60
-#define dbch_key 61
-#define dbch_keyboard 62
-#define dbch_ldt 63
-#define dbch_listbox 64
-#define dbch_listview 65
-#define dbch_local 66
-#define dbch_mci 67
-#define dbch_mcianim 68
-#define dbch_mciavi 69
-#define dbch_mcimidi 70
-#define dbch_mciwave 71
-#define dbch_mdi 72
-#define dbch_menu 73
-#define dbch_message 74
-#define dbch_metafile 75
-#define dbch_midi 76
-#define dbch_mmaux 77
-#define dbch_mmio 78
-#define dbch_mmsys 79
-#define dbch_mmtime 80
-#define dbch_module 81
-#define dbch_monthcal 82
-#define dbch_mpr 83
-#define dbch_msacm 84
-#define dbch_msg 85
-#define dbch_msvideo 86
-#define dbch_nativefont 87
-#define dbch_nonclient 88
-#define dbch_ntdll 89
-#define dbch_ole 90
-#define dbch_pager 91
-#define dbch_palette 92
-#define dbch_pidl 93
-#define dbch_print 94
-#define dbch_process 95
-#define dbch_profile 96
-#define dbch_progress 97
-#define dbch_prop 98
-#define dbch_propsheet 99
-#define dbch_psapi 100
-#define dbch_psdrv 101
-#define dbch_ras 102
-#define dbch_rebar 103
-#define dbch_reg 104
-#define dbch_region 105
-#define dbch_relay 106
-#define dbch_resource 107
-#define dbch_scroll 108
-#define dbch_security 109
-#define dbch_segment 110
-#define dbch_selector 111
-#define dbch_sem 112
-#define dbch_sendmsg 113
-#define dbch_server 114
-#define dbch_shell 115
-#define dbch_shm 116
-#define dbch_snoop 117
-#define dbch_sound 118
-#define dbch_static 119
-#define dbch_statusbar 120
-#define dbch_stress 121
-#define dbch_string 122
-#define dbch_syscolor 123
-#define dbch_system 124
-#define dbch_tab 125
-#define dbch_tapi 126
-#define dbch_task 127
-#define dbch_text 128
-#define dbch_thread 129
-#define dbch_thunk 130
-#define dbch_timer 131
-#define dbch_toolbar 132
-#define dbch_toolhelp 133
-#define dbch_tooltips 134
-#define dbch_trackbar 135
-#define dbch_treeview 136
-#define dbch_ttydrv 137
-#define dbch_tweak 138
-#define dbch_uitools 139
+#define dbch_delayhlp 27
+#define dbch_dialog 28
+#define dbch_dinput 29
+#define dbch_dll 30
+#define dbch_dosfs 31
+#define dbch_dosmem 32
+#define dbch_dplay 33
+#define dbch_driver 34
+#define dbch_dsound 35
+#define dbch_edit 36
+#define dbch_event 37
+#define dbch_exec 38
+#define dbch_file 39
+#define dbch_fixup 40
+#define dbch_font 41
+#define dbch_gdi 42
+#define dbch_global 43
+#define dbch_graphics 44
+#define dbch_header 45
+#define dbch_heap 46
+#define dbch_hook 47
+#define dbch_hotkey 48
+#define dbch_icon 49
+#define dbch_imagehlp 50
+#define dbch_imagelist 51
+#define dbch_imm 52
+#define dbch_int 53
+#define dbch_int10 54
+#define dbch_int16 55
+#define dbch_int17 56
+#define dbch_int19 57
+#define dbch_int21 58
+#define dbch_int31 59
+#define dbch_io 60
+#define dbch_ipaddress 61
+#define dbch_key 62
+#define dbch_keyboard 63
+#define dbch_ldt 64
+#define dbch_listbox 65
+#define dbch_listview 66
+#define dbch_local 67
+#define dbch_mci 68
+#define dbch_mcianim 69
+#define dbch_mciavi 70
+#define dbch_mcimidi 71
+#define dbch_mciwave 72
+#define dbch_mdi 73
+#define dbch_menu 74
+#define dbch_message 75
+#define dbch_metafile 76
+#define dbch_midi 77
+#define dbch_mmaux 78
+#define dbch_mmio 79
+#define dbch_mmsys 80
+#define dbch_mmtime 81
+#define dbch_module 82
+#define dbch_monthcal 83
+#define dbch_mpr 84
+#define dbch_msacm 85
+#define dbch_msg 86
+#define dbch_msvideo 87
+#define dbch_nativefont 88
+#define dbch_nonclient 89
+#define dbch_ntdll 90
+#define dbch_ole 91
+#define dbch_pager 92
+#define dbch_palette 93
+#define dbch_pidl 94
+#define dbch_print 95
+#define dbch_process 96
+#define dbch_profile 97
+#define dbch_progress 98
+#define dbch_prop 99
+#define dbch_propsheet 100
+#define dbch_psapi 101
+#define dbch_psdrv 102
+#define dbch_ras 103
+#define dbch_rebar 104
+#define dbch_reg 105
+#define dbch_region 106
+#define dbch_relay 107
+#define dbch_resource 108
+#define dbch_scroll 109
+#define dbch_security 110
+#define dbch_segment 111
+#define dbch_selector 112
+#define dbch_sem 113
+#define dbch_sendmsg 114
+#define dbch_server 115
+#define dbch_shell 116
+#define dbch_shm 117
+#define dbch_snoop 118
+#define dbch_sound 119
+#define dbch_static 120
+#define dbch_statusbar 121
+#define dbch_stress 122
+#define dbch_string 123
+#define dbch_syscolor 124
+#define dbch_system 125
+#define dbch_tab 126
+#define dbch_tapi 127
+#define dbch_task 128
+#define dbch_text 129
+#define dbch_thread 130
+#define dbch_thunk 131
+#define dbch_timer 132
+#define dbch_toolbar 133
+#define dbch_toolhelp 134
+#define dbch_tooltips 135
+#define dbch_trackbar 136
+#define dbch_treeview 137
+#define dbch_ttydrv 138
+#define dbch_tweak 139
#define dbch_unknown 140
#define dbch_updown 141
#define dbch_ver 142
diff --git a/include/debugdefs.h b/include/debugdefs.h
index 2e5b986..6a240f4 100644
--- a/include/debugdefs.h
+++ b/include/debugdefs.h
@@ -190,6 +190,7 @@
"ddeml",
"ddraw",
"debug",
+"delayhlp",
"dialog",
"dinput",
"dll",
@@ -302,7 +303,6 @@
"treeview",
"ttydrv",
"tweak",
-"uitools",
"unknown",
"updown",
"ver",
diff --git a/memory/global.c b/memory/global.c
index c64b63e..f39df52 100644
--- a/memory/global.c
+++ b/memory/global.c
@@ -886,7 +886,6 @@
*/
WORD WINAPI GlobalHandleToSel16( HGLOBAL16 handle )
{
- TRACE(toolhelp, "%04x\n", handle );
if (!handle) return 0;
#ifdef CONFIG_IPC
if (is_dde_handle(handle)) return DDE_GlobalHandleToSel(handle);
diff --git a/misc/ddeml.c b/misc/ddeml.c
index 7493c81..44a45b4 100644
--- a/misc/ddeml.c
+++ b/misc/ddeml.c
@@ -326,19 +326,21 @@
SECURITY_ATTRIBUTES s_attrib;
s_att = &s_attrib;
-// probably not really capable of handling mutliple processes, but should handle
-// multiple instances within one process
+ /* probably not really capable of handling mutliple processes,
+ but should handle multiple instances within one process */
if( ulRes )
{
- ERR(dde, "Reserved value not zero? What does this mean?\n");
- FIXME(ddeml, "(%p,%p,0x%lx,%ld): stub\n",pidInst,pfnCallback,afCmd,ulRes);
+ ERR(ddeml, "Reserved value not zero? What does this mean?\n");
+ FIXME(ddeml, "(%p,%p,0x%lx,%ld): stub\n", pidInst, pfnCallback,
+ afCmd,ulRes);
/* trap this and no more until we know more */
return DMLERR_NO_ERROR;
}
if (!pfnCallback )
{
- /* this one may be wrong - MS dll seems to accept the condition, leave this until we find out more !! */
+ /* this one may be wrong - MS dll seems to accept the condition,
+ leave this until we find out more !! */
/* can't set up the instance with nothing to act as a callback */
@@ -346,13 +348,14 @@
return DMLERR_INVALIDPARAMETER; /* might be DMLERR_DLL_USAGE */
}
- /* grab enough heap for one control struct - not really necessary for re-initialise
- but allows us to use same validation routines */
- this_instance= (DDE_HANDLE_ENTRY*)HeapAlloc( SystemHeap, 0, sizeof(DDE_HANDLE_ENTRY) );
+ /* grab enough heap for one control struct - not really necessary
+ for re-initialise but allows us to use same validation routines */
+ this_instance= (DDE_HANDLE_ENTRY*)HeapAlloc( SystemHeap, 0,
+ sizeof(DDE_HANDLE_ENTRY) );
if ( this_instance == NULL )
{
// catastrophe !! warn user & abort
- ERR (ddeml,"Instance create failed - out of memory\n");
+ ERR (ddeml, "Instance create failed - out of memory\n");
return DMLERR_SYS_ERROR;
}
this_instance->Next_Entry = NULL;
diff --git a/windows/x11drv/event.c b/windows/x11drv/event.c
index a45b812..e1bf6da 100644
--- a/windows/x11drv/event.c
+++ b/windows/x11drv/event.c
@@ -1130,7 +1130,7 @@
if (event->target != XA_STRING) X11DRV_CLIPBOARD_ReadSelection( 0, None );
else X11DRV_CLIPBOARD_ReadSelection( event->requestor, event->property );
- TRACE(clipboard,"\tSelectionNotify done!\n");
+ TRACE(event, "\tSelectionNotify done!\n");
}
