New channel 'debugstr' used to print OutputDebugString API calls.

This commit is contained in:
Ulrich Czekalla 1999-10-24 00:06:17 +00:00 committed by Alexandre Julliard
parent d1a1f7d6f7
commit c9cc20cf8b
2 changed files with 139 additions and 131 deletions

View file

@ -34,138 +34,139 @@ const int dbch_dc = 22;
const int dbch_ddeml = 23; const int dbch_ddeml = 23;
const int dbch_ddraw = 24; const int dbch_ddraw = 24;
const int dbch_debug = 25; const int dbch_debug = 25;
const int dbch_delayhlp = 26; const int dbch_debugstr = 26;
const int dbch_dialog = 27; const int dbch_delayhlp = 27;
const int dbch_dinput = 28; const int dbch_dialog = 28;
const int dbch_dll = 29; const int dbch_dinput = 29;
const int dbch_dosfs = 30; const int dbch_dll = 30;
const int dbch_dosmem = 31; const int dbch_dosfs = 31;
const int dbch_dplay = 32; const int dbch_dosmem = 32;
const int dbch_driver = 33; const int dbch_dplay = 33;
const int dbch_dsound = 34; const int dbch_driver = 34;
const int dbch_edit = 35; const int dbch_dsound = 35;
const int dbch_elfdll = 36; const int dbch_edit = 36;
const int dbch_enhmetafile = 37; const int dbch_elfdll = 37;
const int dbch_event = 38; const int dbch_enhmetafile = 38;
const int dbch_exec = 39; const int dbch_event = 39;
const int dbch_file = 40; const int dbch_exec = 40;
const int dbch_fixup = 41; const int dbch_file = 41;
const int dbch_font = 42; const int dbch_fixup = 42;
const int dbch_gdi = 43; const int dbch_font = 43;
const int dbch_global = 44; const int dbch_gdi = 44;
const int dbch_graphics = 45; const int dbch_global = 45;
const int dbch_header = 46; const int dbch_graphics = 46;
const int dbch_heap = 47; const int dbch_header = 47;
const int dbch_hook = 48; const int dbch_heap = 48;
const int dbch_hotkey = 49; const int dbch_hook = 49;
const int dbch_icon = 50; const int dbch_hotkey = 50;
const int dbch_imagehlp = 51; const int dbch_icon = 51;
const int dbch_imagelist = 52; const int dbch_imagehlp = 52;
const int dbch_imm = 53; const int dbch_imagelist = 53;
const int dbch_int = 54; const int dbch_imm = 54;
const int dbch_int10 = 55; const int dbch_int = 55;
const int dbch_int16 = 56; const int dbch_int10 = 56;
const int dbch_int17 = 57; const int dbch_int16 = 57;
const int dbch_int19 = 58; const int dbch_int17 = 58;
const int dbch_int21 = 59; const int dbch_int19 = 59;
const int dbch_int31 = 60; const int dbch_int21 = 60;
const int dbch_io = 61; const int dbch_int31 = 61;
const int dbch_ipaddress = 62; const int dbch_io = 62;
const int dbch_key = 63; const int dbch_ipaddress = 63;
const int dbch_keyboard = 64; const int dbch_key = 64;
const int dbch_ldt = 65; const int dbch_keyboard = 65;
const int dbch_listbox = 66; const int dbch_ldt = 66;
const int dbch_listview = 67; const int dbch_listbox = 67;
const int dbch_local = 68; const int dbch_listview = 68;
const int dbch_mci = 69; const int dbch_local = 69;
const int dbch_mcianim = 70; const int dbch_mci = 70;
const int dbch_mciavi = 71; const int dbch_mcianim = 71;
const int dbch_mcimidi = 72; const int dbch_mciavi = 72;
const int dbch_mciwave = 73; const int dbch_mcimidi = 73;
const int dbch_mdi = 74; const int dbch_mciwave = 74;
const int dbch_menu = 75; const int dbch_mdi = 75;
const int dbch_message = 76; const int dbch_menu = 76;
const int dbch_metafile = 77; const int dbch_message = 77;
const int dbch_midi = 78; const int dbch_metafile = 78;
const int dbch_mmaux = 79; const int dbch_midi = 79;
const int dbch_mmio = 80; const int dbch_mmaux = 80;
const int dbch_mmsys = 81; const int dbch_mmio = 81;
const int dbch_mmtime = 82; const int dbch_mmsys = 82;
const int dbch_module = 83; const int dbch_mmtime = 83;
const int dbch_monthcal = 84; const int dbch_module = 84;
const int dbch_mpr = 85; const int dbch_monthcal = 85;
const int dbch_msacm = 86; const int dbch_mpr = 86;
const int dbch_msg = 87; const int dbch_msacm = 87;
const int dbch_msvideo = 88; const int dbch_msg = 88;
const int dbch_nativefont = 89; const int dbch_msvideo = 89;
const int dbch_nonclient = 90; const int dbch_nativefont = 90;
const int dbch_ntdll = 91; const int dbch_nonclient = 91;
const int dbch_ole = 92; const int dbch_ntdll = 92;
const int dbch_pager = 93; const int dbch_ole = 93;
const int dbch_palette = 94; const int dbch_pager = 94;
const int dbch_pidl = 95; const int dbch_palette = 95;
const int dbch_print = 96; const int dbch_pidl = 96;
const int dbch_process = 97; const int dbch_print = 97;
const int dbch_profile = 98; const int dbch_process = 98;
const int dbch_progress = 99; const int dbch_profile = 99;
const int dbch_prop = 100; const int dbch_progress = 100;
const int dbch_propsheet = 101; const int dbch_prop = 101;
const int dbch_psapi = 102; const int dbch_propsheet = 102;
const int dbch_psdrv = 103; const int dbch_psapi = 103;
const int dbch_ras = 104; const int dbch_psdrv = 104;
const int dbch_rebar = 105; const int dbch_ras = 105;
const int dbch_reg = 106; const int dbch_rebar = 106;
const int dbch_region = 107; const int dbch_reg = 107;
const int dbch_relay = 108; const int dbch_region = 108;
const int dbch_resource = 109; const int dbch_relay = 109;
const int dbch_scroll = 110; const int dbch_resource = 110;
const int dbch_security = 111; const int dbch_scroll = 111;
const int dbch_segment = 112; const int dbch_security = 112;
const int dbch_seh = 113; const int dbch_segment = 113;
const int dbch_selector = 114; const int dbch_seh = 114;
const int dbch_sendmsg = 115; const int dbch_selector = 115;
const int dbch_server = 116; const int dbch_sendmsg = 116;
const int dbch_shell = 117; const int dbch_server = 117;
const int dbch_snoop = 118; const int dbch_shell = 118;
const int dbch_sound = 119; const int dbch_snoop = 119;
const int dbch_static = 120; const int dbch_sound = 120;
const int dbch_statusbar = 121; const int dbch_static = 121;
const int dbch_storage = 122; const int dbch_statusbar = 122;
const int dbch_stress = 123; const int dbch_storage = 123;
const int dbch_string = 124; const int dbch_stress = 124;
const int dbch_syscolor = 125; const int dbch_string = 125;
const int dbch_system = 126; const int dbch_syscolor = 126;
const int dbch_tab = 127; const int dbch_system = 127;
const int dbch_tapi = 128; const int dbch_tab = 128;
const int dbch_task = 129; const int dbch_tapi = 129;
const int dbch_text = 130; const int dbch_task = 130;
const int dbch_thread = 131; const int dbch_text = 131;
const int dbch_thunk = 132; const int dbch_thread = 132;
const int dbch_timer = 133; const int dbch_thunk = 133;
const int dbch_toolbar = 134; const int dbch_timer = 134;
const int dbch_toolhelp = 135; const int dbch_toolbar = 135;
const int dbch_tooltips = 136; const int dbch_toolhelp = 136;
const int dbch_trackbar = 137; const int dbch_tooltips = 137;
const int dbch_treeview = 138; const int dbch_trackbar = 138;
const int dbch_ttydrv = 139; const int dbch_treeview = 139;
const int dbch_tweak = 140; const int dbch_ttydrv = 140;
const int dbch_typelib = 141; const int dbch_tweak = 141;
const int dbch_updown = 142; const int dbch_typelib = 142;
const int dbch_ver = 143; const int dbch_updown = 143;
const int dbch_virtual = 144; const int dbch_ver = 144;
const int dbch_vxd = 145; const int dbch_virtual = 145;
const int dbch_wave = 146; const int dbch_vxd = 146;
const int dbch_win = 147; const int dbch_wave = 147;
const int dbch_win16drv = 148; const int dbch_win = 148;
const int dbch_win32 = 149; const int dbch_win16drv = 149;
const int dbch_wing = 150; const int dbch_win32 = 150;
const int dbch_winsock = 151; const int dbch_wing = 151;
const int dbch_winspool = 152; const int dbch_winsock = 152;
const int dbch_wnet = 153; const int dbch_winspool = 153;
const int dbch_x11 = 154; const int dbch_wnet = 154;
const int dbch_x11drv = 155; const int dbch_x11 = 155;
const int dbch_x11drv = 156;
#define DEBUG_CHANNEL_COUNT 156 #define DEBUG_CHANNEL_COUNT 157
char __debug_msg_enabled[DEBUG_CHANNEL_COUNT][DEBUG_CLASS_COUNT] = { char __debug_msg_enabled[DEBUG_CHANNEL_COUNT][DEBUG_CLASS_COUNT] = {
{1, 1, 0, 0}, {1, 1, 0, 0},
@ -323,6 +324,7 @@ char __debug_msg_enabled[DEBUG_CHANNEL_COUNT][DEBUG_CLASS_COUNT] = {
{1, 1, 0, 0}, {1, 1, 0, 0},
{1, 1, 0, 0}, {1, 1, 0, 0},
{1, 1, 0, 0}, {1, 1, 0, 0},
{1, 1, 0, 0},
{1, 1, 0, 0} {1, 1, 0, 0}
}; };
@ -353,6 +355,7 @@ const char * const debug_ch_name[DEBUG_CHANNEL_COUNT] = {
"ddeml", "ddeml",
"ddraw", "ddraw",
"debug", "debug",
"debugstr",
"delayhlp", "delayhlp",
"dialog", "dialog",
"dinput", "dinput",

View file

@ -11,6 +11,7 @@
#include "server.h" #include "server.h"
#include "debugtools.h" #include "debugtools.h"
DECLARE_DEBUG_CHANNEL(debugstr)
/********************************************************************** /**********************************************************************
* DEBUG_SendEvent * DEBUG_SendEvent
@ -247,6 +248,8 @@ void WINAPI OutputDebugStringA( LPCSTR str )
event.length = strlen(str) + 1; event.length = strlen(str) + 1;
DEBUG_SendEvent( OUTPUT_DEBUG_STRING_EVENT, &event, sizeof(event) ); DEBUG_SendEvent( OUTPUT_DEBUG_STRING_EVENT, &event, sizeof(event) );
} }
TRACE_(debugstr)("%s\n", str);
} }
@ -263,6 +266,8 @@ void WINAPI OutputDebugStringW( LPCWSTR str )
event.length = (lstrlenW(str) + 1) * sizeof(WCHAR); event.length = (lstrlenW(str) + 1) * sizeof(WCHAR);
DEBUG_SendEvent( OUTPUT_DEBUG_STRING_EVENT, &event, sizeof(event) ); DEBUG_SendEvent( OUTPUT_DEBUG_STRING_EVENT, &event, sizeof(event) );
} }
TRACE_(debugstr)("%s\n", debugstr_w(str));
} }