[PATCH 0/2] Use +threadname channel for both methods of thread renaming.

[Brendan Shanks]

Currently, the two methods of setting thread names in Windows
(SetThreadDescription() and the 0x406D1388 exception) log to different channels.

I think it would be useful for these to both log to the same +threadname
channel. My thinking is that this would be similar to +debugstr, in that
all messages are human-readable descriptions which would be useful for
debugging crashes.

Brendan Shanks (2):
  kernelbase: Use +threadname channel for SetThreadDescription().
  ntdll: Use +threadname channel for thread rename exceptions.

dlls/kernelbase/thread.c   | 6 +++++-
 dlls/ntdll/signal_arm.c    | 7 ++++++-
 dlls/ntdll/signal_arm64.c  | 7 ++++++-
 dlls/ntdll/signal_i386.c   | 7 ++++++-
 dlls/ntdll/signal_x86_64.c | 8 ++++++--
 5 files changed, 29 insertions(+), 6 deletions(-)

[PATCH 1/2] kernelbase: Use +threadname channel for SetThreadDescription().

[Brendan Shanks]

Signed-off-by: Brendan Shanks 
---
 dlls/kernelbase/thread.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c
index e9c12d85771..3dd83befe10 100644
--- a/dlls/kernelbase/thread.c
+++ b/dlls/kernelbase/thread.c
@@ -37,6 +37,7 @@
 #include "wine/heap.h"

WINE_DEFAULT_DEBUG_CHANNEL(thread);
+WINE_DECLARE_DEBUG_CHANNEL(threadname);

/***********************************************************************
@@ -420,7 +421,10 @@ HRESULT WINAPI DECLSPEC_HOTPATCH SetThreadDescription( HANDLE thread, PCWSTR des
     THREAD_NAME_INFORMATION info;
     int length;

-    TRACE( "(%p, %s)\n", thread, debugstr_w( description ));
+    if (thread == GetCurrentThread())
+        WARN_(threadname)( "Thread renamed to %s\n", debugstr_w( description ));
+    else
+        WARN_(threadname)( "Thread %p renamed to %s\n", thread, debugstr_w( description ));

length = description ? lstrlenW( description ) * sizeof(WCHAR) : 0;

[PATCH 1/2] kernelbase: Use +threadname channel for SetThreadDescription().

[Zebediah Figura]

On 12/7/21 00:23, Brendan Shanks wrote:
> Signed-off-by: Brendan Shanks
>
> dlls/kernelbase/thread.c | 6 +++++-
>   1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c
> index e9c12d85771..3dd83befe10 100644
> --- a/dlls/kernelbase/thread.c
> +++ b/dlls/kernelbase/thread.c
> @@ -37,6 +37,7 @@
>   #include "wine/heap.h"
>
> WINE_DEFAULT_DEBUG_CHANNEL(thread);
> +WINE_DECLARE_DEBUG_CHANNEL(threadname);
>
> /***********************************************************************
> @@ -420,7 +421,10 @@ HRESULT WINAPI DECLSPEC_HOTPATCH SetThreadDescription( HANDLE thread, PCWSTR des
>       THREAD_NAME_INFORMATION info;
>       int length;
> - TRACE( "(%p, %s)\n", thread, debugstr_w( description ));
> -
>
> if (thread == GetCurrentThread())
> -
>    WARN_(threadname)( "Thread renamed to %s\n", debugstr_w( description ));
> -
>
> else
> -
>    WARN_(threadname)( "Thread %p renamed to %s\n", thread, debugstr_w( description ));
>
> length = description ? lstrlenW( description ) * sizeof(WCHAR) : 0;

It really seems non-ideal that this is a thread handle, but the other, 
nearly identical, message prints a thread ID...

[PATCH 1/2] kernelbase: Use +threadname channel for SetThreadDescription().

[Brendan Shanks]

> On Dec 7, 2021, at 8:11 AM, Zebediah Figura  wrote:
>
> On 12/7/21 00:23, Brendan Shanks wrote:
> > Signed-off-by: Brendan Shanks
> >
> > dlls/kernelbase/thread.c | 6 +++++-
> >  1 file changed, 5 insertions(+), 1 deletion(-)
> > diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c
> > index e9c12d85771..3dd83befe10 100644
> > --- a/dlls/kernelbase/thread.c
> > +++ b/dlls/kernelbase/thread.c
> > @@ -37,6 +37,7 @@
> >  #include "wine/heap.h"
> >    WINE_DEFAULT_DEBUG_CHANNEL(thread);
> > +WINE_DECLARE_DEBUG_CHANNEL(threadname);
> >      /***********************************************************************
> > @@ -420,7 +421,10 @@ HRESULT WINAPI DECLSPEC_HOTPATCH SetThreadDescription( HANDLE thread, PCWSTR des
> >      THREAD_NAME_INFORMATION info;
> >      int length;
> > - TRACE( "(%p, %s)\n", thread, debugstr_w( description ));
> > - if (thread == GetCurrentThread())
> > -
> >    WARN_(threadname)( "Thread renamed to %s\n", debugstr_w( description ));
> > - else
> > -
> >    WARN_(threadname)( "Thread %p renamed to %s\n", thread, debugstr_w( description ));
> >  length = description ? lstrlenW( description ) * sizeof(WCHAR) : 0;
>
> It really seems non-ideal that this is a thread handle, but the other, nearly identical, message prints a thread ID...

Good point, I’ll make that clearer.

[PATCH 2/2] ntdll: Use +threadname channel for thread rename exceptions.

[Brendan Shanks]

Signed-off-by: Brendan Shanks 
---
 dlls/ntdll/signal_arm.c    | 7 ++++++-
 dlls/ntdll/signal_arm64.c  | 7 ++++++-
 dlls/ntdll/signal_i386.c   | 7 ++++++-
 dlls/ntdll/signal_x86_64.c | 8 ++++++--
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c
index 72f3b023e45..fe7b99baa7c 100644
--- a/dlls/ntdll/signal_arm.c
+++ b/dlls/ntdll/signal_arm.c
@@ -36,6 +36,7 @@
 #include "winnt.h"

WINE_DEFAULT_DEBUG_CHANNEL(seh);
+WINE_DECLARE_DEBUG_CHANNEL(threadname);

typedef struct _SCOPE_TABLE
 {
@@ -475,7 +476,11 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte
     }
     else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000)
     {
-        WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) );
+        if ((DWORD)rec->ExceptionInformation[2] == -1)
+            WARN_(threadname)( "Thread renamed to %s\n", debugstr_a((char *)rec->ExceptionInformation[1]) );
+        else
+            WARN_(threadname)( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2],
+                               debugstr_a((char *)rec->ExceptionInformation[1]) );
     }
     else if (rec->ExceptionCode == DBG_PRINTEXCEPTION_C)
     {
diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c
index 290639b676b..0340207d199 100644
--- a/dlls/ntdll/signal_arm64.c
+++ b/dlls/ntdll/signal_arm64.c
@@ -38,6 +38,7 @@
 #include "winnt.h"

WINE_DEFAULT_DEBUG_CHANNEL(seh);
+WINE_DECLARE_DEBUG_CHANNEL(threadname);

typedef struct _SCOPE_TABLE
 {
@@ -507,7 +508,11 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte
     }
     else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000)
     {
-        WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) );
+        if ((DWORD)rec->ExceptionInformation[2] == -1)
+            WARN_(threadname)( "Thread renamed to %s\n", debugstr_a((char *)rec->ExceptionInformation[1]) );
+        else
+            WARN_(threadname)( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2],
+                               debugstr_a((char *)rec->ExceptionInformation[1]) );
     }
     else if (rec->ExceptionCode == DBG_PRINTEXCEPTION_C)
     {
diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
index 14971032ce6..d1e2fefe408 100644
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -35,6 +35,7 @@
 #include "wine/debug.h"

WINE_DEFAULT_DEBUG_CHANNEL(seh);
+WINE_DECLARE_DEBUG_CHANNEL(threadname);

struct x86_thread_data
 {
@@ -194,7 +195,11 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context )
     }
     else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000)
     {
-        WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) );
+        if ((DWORD)rec->ExceptionInformation[2] == -1)
+            WARN_(threadname)( "Thread renamed to %s\n", debugstr_a((char *)rec->ExceptionInformation[1]) );
+        else
+            WARN_(threadname)( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2],
+                               debugstr_a((char *)rec->ExceptionInformation[1]) );
     }
     else if (rec->ExceptionCode == DBG_PRINTEXCEPTION_C)
     {
diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
index e0372b111fd..b99e17d13a7 100644
--- a/dlls/ntdll/signal_x86_64.c
+++ b/dlls/ntdll/signal_x86_64.c
@@ -36,6 +36,7 @@

WINE_DEFAULT_DEBUG_CHANNEL(unwind);
 WINE_DECLARE_DEBUG_CHANNEL(seh);
+WINE_DECLARE_DEBUG_CHANNEL(threadname);

typedef struct _SCOPE_TABLE
 {
@@ -523,8 +524,11 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context )
     }
     else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000)
     {
-        WARN_(seh)( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2],
-                    debugstr_a((char *)rec->ExceptionInformation[1]) );
+        if ((DWORD)rec->ExceptionInformation[2] == -1)
+            WARN_(threadname)( "Thread renamed to %s\n", debugstr_a((char *)rec->ExceptionInformation[1]) );
+        else
+            WARN_(threadname)( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2],
+                               debugstr_a((char *)rec->ExceptionInformation[1]) );
     }
     else if (rec->ExceptionCode == DBG_PRINTEXCEPTION_C)
     {