commit 4ea3c26a7d8de7c8298cdf0e1fbd31c7349e874c
author Dmitry Timoshkov <dmitry@codeweavers.com> Mon Apr 09 18:47:10 2001 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Apr 09 18:47:10 2001 +0000
tree 5fcf9c127814ee3955307fd254b30bd9e0e62a0b
parent a9f8997f49812ee84930c26b4ea07c753533adf9

Display thread id instead of %fs in relay trace.

relay32/relay386.c

diff --git a/relay32/relay386.c b/relay32/relay386.c
index 1651936..d4e251b 100644
--- a/relay32/relay386.c
+++ b/relay32/relay386.c
@@ -128,8 +128,10 @@
 
     /* Now find the function */
 
-    name = find_exported_name( base, exp, ordinal + exp->Base );
-    sprintf( buffer, "%s.%ld: %s", base + exp->Name, ordinal + exp->Base, name ? name : "@" );
+    if ((name = find_exported_name( base, exp, ordinal + exp->Base )))
+        sprintf( buffer, "%s.%s", base + exp->Name, name );
+    else
+        sprintf( buffer, "%s.%ld", base + exp->Name, ordinal + exp->Base );
 }
 
 
@@ -183,7 +185,7 @@
 
     DPRINTF( "Call %s(", buffer );
     RELAY_PrintArgs( args, nb_args, relay->argtypes );
-    DPRINTF( ") ret=%08x fs=%04x\n", ret_addr, __get_fs() );
+    DPRINTF( ") ret=%08x tid=%08lx\n", ret_addr, GetCurrentThreadId() );
     ret64 = (relay->argtypes & 0x80000000) && (nb_args < 16);
 
     /* the user driver functions may be called with the window lock held */
@@ -277,11 +279,11 @@
         }
     }
     if (ret64)
-        DPRINTF( "Ret  %s() retval=%08x%08x ret=%08x fs=%04x\n",
-                 buffer, (UINT)(ret >> 32), (UINT)ret, ret_addr, __get_fs() );
+        DPRINTF( "Ret  %s() retval=%08x%08x ret=%08x tid=%08lx\n",
+                 buffer, (UINT)(ret >> 32), (UINT)ret, ret_addr, GetCurrentThreadId() );
     else
-        DPRINTF( "Ret  %s() retval=%08x ret=%08x fs=%04x\n",
-                 buffer, (UINT)ret, ret_addr, __get_fs() );
+        DPRINTF( "Ret  %s() retval=%08x ret=%08x tid=%08lx\n",
+                 buffer, (UINT)ret, ret_addr, GetCurrentThreadId() );
 
     if (memcmp( buffer, "x11drv.", 7 ) && memcmp( buffer, "ttydrv.", 7 ))
       SYSLEVEL_CheckNotLevel( 2 );