Alexandre Julliard : winedevice: Use the magic format string prefix for relay traces.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7ca2a1ade5acbe36854049cc713abf5821d8bffc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7ca2a1ade5acbe36854049cc71...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Sat Nov 25 11:48:19 2017 +0100

winedevice: Use the magic format string prefix for relay traces.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 programs/winedevice/device.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c
index 44aa1a0..397676d 100644
--- a/programs/winedevice/device.c
+++ b/programs/winedevice/device.c
@@ -263,15 +263,13 @@ static NTSTATUS WINAPI init_driver( DRIVER_OBJECT *driver_object, UNICODE_STRING
     if (!nt->OptionalHeader.AddressOfEntryPoint) return STATUS_SUCCESS;
     driver_object->DriverInit = (PDRIVER_INITIALIZE)((char *)module + nt->OptionalHeader.AddressOfEntryPoint);
 
-    if (WINE_TRACE_ON(relay))
-        WINE_DPRINTF( "%04x:Call driver init %p (obj=%p,str=%s)\n", GetCurrentThreadId(),
-                      driver_object->DriverInit, driver_object, wine_dbgstr_w(keyname->Buffer) );
+    TRACE_(relay)( "\1Call driver init %p (obj=%p,str=%s)\n",
+                   driver_object->DriverInit, driver_object, wine_dbgstr_w(keyname->Buffer) );
 
     status = driver_object->DriverInit( driver_object, keyname );
 
-    if (WINE_TRACE_ON(relay))
-        WINE_DPRINTF( "%04x:Ret  driver init %p (obj=%p,str=%s) retval=%08x\n", GetCurrentThreadId(),
-                      driver_object->DriverInit, driver_object, wine_dbgstr_w(keyname->Buffer), status );
+    TRACE_(relay)( "\1Ret  driver init %p (obj=%p,str=%s) retval=%08x\n",
+                   driver_object->DriverInit, driver_object, wine_dbgstr_w(keyname->Buffer), status );
 
     WINE_TRACE( "init done for %s obj %p\n", wine_dbgstr_w(driver_name), driver_object );
     WINE_TRACE( "- DriverInit = %p\n", driver_object->DriverInit );
@@ -303,15 +301,11 @@ static void WINAPI async_unload_driver( PTP_CALLBACK_INSTANCE instance, void *co
     DRIVER_OBJECT *driver_obj = driver->driver_obj;
     LDR_MODULE *ldr;
 
-    if (WINE_TRACE_ON(relay))
-        WINE_DPRINTF( "%04x:Call driver unload %p (obj=%p)\n", GetCurrentThreadId(),
-                      driver_obj->DriverUnload, driver_obj );
+    TRACE_(relay)( "\1Call driver unload %p (obj=%p)\n", driver_obj->DriverUnload, driver_obj );
 
     driver_obj->DriverUnload( driver_obj );
 
-    if (WINE_TRACE_ON(relay))
-        WINE_DPRINTF( "%04x:Ret  driver unload %p (obj=%p)\n", GetCurrentThreadId(),
-                      driver_obj->DriverUnload, driver_obj );
+    TRACE_(relay)( "\1Ret  driver unload %p (obj=%p)\n", driver_obj->DriverUnload, driver_obj );
 
     ldr = driver_obj->DriverSection;
     FreeLibrary( ldr->BaseAddress );