Print the tid in the first column when +tid is specified.
diff --git a/loader/pe_image.c b/loader/pe_image.c
index 8fe4fa4..a704354 100644
--- a/loader/pe_image.c
+++ b/loader/pe_image.c
@@ -731,10 +731,13 @@
(nt->OptionalHeader.AddressOfEntryPoint))
{
DLLENTRYPROC entry = (void*)((char*)module + nt->OptionalHeader.AddressOfEntryPoint);
- TRACE_(relay)("CallTo32(entryproc=%p,module=%08x,type=%ld,res=%p)\n",
- entry, module, type, lpReserved );
-
+ if (TRACE_ON(relay))
+ DPRINTF("%08lx:Call PE DLL (proc=%p,module=%08x,type=%ld,res=%p)\n",
+ GetCurrentThreadId(), entry, module, type, lpReserved );
retv = entry( module, type, lpReserved );
+ if (TRACE_ON(relay))
+ DPRINTF("%08lx:Ret PE DLL (proc=%p,module=%08x,type=%ld,res=%p) retval=%x\n",
+ GetCurrentThreadId(), entry, module, type, lpReserved, retv );
}
return retv;