reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-28 22:20:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ntdll: Added new pid debug channel to append process id to debug output.

Browse Source
This commit is contained in:
Jacek Caban 2015-08-25 12:31:21 +02:00 committed by Alexandre Julliard
parent 4ca5a35670
commit 719a7d32c5
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/ntdll/debugtools.c
View File

@ -39,6 +39,7 @@
#include "ntdll_misc.h" #include "ntdll_misc.h"
WINE_DECLARE_DEBUG_CHANNEL(tid); WINE_DECLARE_DEBUG_CHANNEL(tid);
WINE_DECLARE_DEBUG_CHANNEL(pid);
WINE_DECLARE_DEBUG_CHANNEL(timestamp); WINE_DECLARE_DEBUG_CHANNEL(timestamp);
static struct __wine_debug_functions default_funcs; static struct __wine_debug_functions default_funcs;
@ -170,6 +171,8 @@ static int NTDLL_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_chan
ULONG ticks = NtGetTickCount(); ULONG ticks = NtGetTickCount();
ret = wine_dbg_printf( "%3u.%03u:", ticks / 1000, ticks % 1000 ); ret = wine_dbg_printf( "%3u.%03u:", ticks / 1000, ticks % 1000 );
} }
if (TRACE_ON(pid))
ret += wine_dbg_printf( "%04x:", GetCurrentProcessId() );
if (TRACE_ON(tid)) if (TRACE_ON(tid))
ret += wine_dbg_printf( "%04x:", GetCurrentThreadId() ); ret += wine_dbg_printf( "%04x:", GetCurrentThreadId() );
if (cls < sizeof(classes)/sizeof(classes[0])) if (cls < sizeof(classes)/sizeof(classes[0]))

3
libs/wine/debug.c
View File

@ -35,6 +35,7 @@
#if defined(__MINGW32__) || defined(_MSC_VER) #if defined(__MINGW32__) || defined(_MSC_VER)
WINE_DECLARE_DEBUG_CHANNEL(tid); WINE_DECLARE_DEBUG_CHANNEL(tid);
WINE_DECLARE_DEBUG_CHANNEL(pid);
#endif #endif
static const char * const debug_classes[] = { "fixme", "err", "warn", "trace" }; static const char * const debug_classes[] = { "fixme", "err", "warn", "trace" };
@ -407,6 +408,8 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch
int ret = 0; int ret = 0;
#if defined(__MINGW32__) || defined(_MSC_VER) #if defined(__MINGW32__) || defined(_MSC_VER)
if (TRACE_ON(pid))
ret += wine_dbg_printf( "%04x:", GetCurrentProcessId() );
if (TRACE_ON(tid)) if (TRACE_ON(tid))
ret += wine_dbg_printf( "%04x:", GetCurrentThreadId() ); ret += wine_dbg_printf( "%04x:", GetCurrentThreadId() );
#endif #endif