[user.dll] get rid of DPRINTF
Christian Gmeiner
christian.gmeiner at students.fh-vorarlberg.ac.at
Mon Mar 6 04:34:23 CST 2006
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
This patch eliminates DPRINTF calls and replaces it with TRACE calls, as
suggested here: http://wiki.winehq.org/DebugTracingCleanup
- --
Christian Gmeiner - student of computer science
http://dxr3plugin.sf.net
http://itb04.ath.cx
http://javamill.ath.cx
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFEDBAvDwe2AbwGBA8RAqukAJ9cH9VkVrEA1SRCLmRu5P/KDVyN0wCfZLma
+z3RibTxNq/xT4U7AMfZt2g=
=dxlM
-----END PGP SIGNATURE-----
-------------- next part --------------
Index: dlls/user/hook.c
===================================================================
RCS file: /home/wine/wine/dlls/user/hook.c,v
retrieving revision 1.23
diff -u -r1.23 hook.c
--- dlls/user/hook.c 30 Jan 2006 14:06:07 -0000 1.23
+++ dlls/user/hook.c 6 Mar 2006 10:28:51 -0000
@@ -281,17 +281,15 @@
{
LRESULT ret;
- if (TRACE_ON(relay))
- DPRINTF( "%04lx:Call hook proc %p (id=%s,code=%x,wp=%08x,lp=%08lx)\n",
- GetCurrentThreadId(), proc, hook_names[id-WH_MINHOOK], code, wparam, lparam );
+ TRACE( "%04lx:Call hook proc %p (id=%s,code=%x,wp=%08x,lp=%08lx)\n",
+ GetCurrentThreadId(), proc, hook_names[id-WH_MINHOOK], code, wparam, lparam );
if (!prev_unicode == !next_unicode) ret = proc( code, wparam, lparam );
else if (prev_unicode) ret = call_hook_WtoA( proc, id, code, wparam, lparam );
else ret = call_hook_AtoW( proc, id, code, wparam, lparam );
- if (TRACE_ON(relay))
- DPRINTF( "%04lx:Ret hook proc %p (id=%s,code=%x,wp=%08x,lp=%08lx) retval=%08lx\n",
- GetCurrentThreadId(), proc, hook_names[id-WH_MINHOOK], code, wparam, lparam, ret );
+ TRACE( "%04lx:Ret hook proc %p (id=%s,code=%x,wp=%08x,lp=%08lx) retval=%08lx\n",
+ GetCurrentThreadId(), proc, hook_names[id-WH_MINHOOK], code, wparam, lparam, ret );
return ret;
}
@@ -824,17 +822,15 @@
if (!info.module[0] || (info.proc = get_hook_proc( info.proc, info.module )) != NULL)
{
- if (TRACE_ON(relay))
- DPRINTF( "%04lx:Call winevent hook proc %p (hhook=%p,event=%lx,hwnd=%p,object_id=%lx,child_id=%lx,tid=%04lx,time=%lx)\n",
- GetCurrentThreadId(), info.proc, info.handle, event, hwnd, object_id,
+ TRACE( "%04lx:Call winevent hook proc %p (hhook=%p,event=%lx,hwnd=%p,object_id=%lx,child_id=%lx,tid=%04lx,time=%lx)\n",
+ GetCurrentThreadId(), info.proc, info.handle, event, hwnd, object_id,
child_id, GetCurrentThreadId(), GetCurrentTime());
info.proc(info.handle, event, hwnd, object_id, child_id,
GetCurrentThreadId(), GetCurrentTime());
- if (TRACE_ON(relay))
- DPRINTF( "%04lx:Ret winevent hook proc %p (hhook=%p,event=%lx,hwnd=%p,object_id=%lx,child_id=%lx,tid=%04lx,time=%lx)\n",
- GetCurrentThreadId(), info.proc, info.handle, event, hwnd, object_id,
+ TRACE( "%04lx:Ret winevent hook proc %p (hhook=%p,event=%lx,hwnd=%p,object_id=%lx,child_id=%lx,tid=%04lx,time=%lx)\n",
+ GetCurrentThreadId(), info.proc, info.handle, event, hwnd, object_id,
child_id, GetCurrentThreadId(), GetCurrentTime());
}
}
Index: dlls/user/message.c
===================================================================
RCS file: /home/wine/wine/dlls/user/message.c,v
retrieving revision 1.101
diff -u -r1.101 message.c
--- dlls/user/message.c 24 Feb 2006 20:31:11 -0000 1.101
+++ dlls/user/message.c 6 Mar 2006 10:28:53 -0000
@@ -1864,15 +1864,13 @@
static inline void call_sendmsg_callback( SENDASYNCPROC callback, HWND hwnd, UINT msg,
ULONG_PTR data, LRESULT result )
{
- if (TRACE_ON(relay))
- DPRINTF( "%04lx:Call message callback %p (hwnd=%p,msg=%s,data=%08lx,result=%08lx)\n",
- GetCurrentThreadId(), callback, hwnd, SPY_GetMsgName( msg, hwnd ),
- data, result );
+ TRACE( "%04lx:Call message callback %p (hwnd=%p,msg=%s,data=%08lx,result=%08lx)\n",
+ GetCurrentThreadId(), callback, hwnd, SPY_GetMsgName( msg, hwnd ),
+ data, result );
callback( hwnd, msg, data, result );
- if (TRACE_ON(relay))
- DPRINTF( "%04lx:Ret message callback %p (hwnd=%p,msg=%s,data=%08lx,result=%08lx)\n",
- GetCurrentThreadId(), callback, hwnd, SPY_GetMsgName( msg, hwnd ),
- data, result );
+ TRACE( "%04lx:Ret message callback %p (hwnd=%p,msg=%s,data=%08lx,result=%08lx)\n",
+ GetCurrentThreadId(), callback, hwnd, SPY_GetMsgName( msg, hwnd ),
+ data, result );
}
@@ -1991,20 +1989,18 @@
goto next;
}
}
- if (TRACE_ON(relay))
- DPRINTF( "%04lx:Call winevent proc %p (hook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%lx,tid=%04lx,time=%lx)\n",
- GetCurrentThreadId(), info.hook_proc,
- info.hook, info.msg.message, info.msg.hwnd, info.msg.wParam,
- info.msg.lParam, extra_info, info.msg.time);
+ TRACE( "%04lx:Call winevent proc %p (hook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%lx,tid=%04lx,time=%lx)\n",
+ GetCurrentThreadId(), info.hook_proc,
+ info.hook, info.msg.message, info.msg.hwnd, info.msg.wParam,
+ info.msg.lParam, extra_info, info.msg.time);
info.hook_proc( info.hook, info.msg.message, info.msg.hwnd, info.msg.wParam,
info.msg.lParam, extra_info, info.msg.time );
- if (TRACE_ON(relay))
- DPRINTF( "%04lx:Ret winevent proc %p (hook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%lx,tid=%04lx,time=%lx)\n",
- GetCurrentThreadId(), info.hook_proc,
- info.hook, info.msg.message, info.msg.hwnd, info.msg.wParam,
- info.msg.lParam, extra_info, info.msg.time);
+ TRACE( "%04lx:Ret winevent proc %p (hook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%lx,tid=%04lx,time=%lx)\n",
+ GetCurrentThreadId(), info.hook_proc,
+ info.hook, info.msg.message, info.msg.hwnd, info.msg.wParam,
+ info.msg.lParam, extra_info, info.msg.time);
goto next;
case MSG_OTHER_PROCESS:
info.flags = ISMEX_SEND;
Index: dlls/user/nonclient.c
===================================================================
RCS file: /home/wine/wine/dlls/user/nonclient.c,v
retrieving revision 1.8
diff -u -r1.8 nonclient.c
--- dlls/user/nonclient.c 22 Sep 2005 10:44:40 -0000 1.8
+++ dlls/user/nonclient.c 6 Mar 2006 10:28:54 -0000
@@ -1615,7 +1615,7 @@
}
else
if (wParam == SC_PUTMARK)
- DPRINTF("Debug mark requested by user\n");
+ TRACE("Debug mark requested by user\n");
break;
case SC_HOTKEY:
Index: dlls/user/winproc.c
===================================================================
RCS file: /home/wine/wine/dlls/user/winproc.c,v
retrieving revision 1.16
diff -u -r1.16 winproc.c
--- dlls/user/winproc.c 19 Jan 2006 11:50:11 -0000 1.16
+++ dlls/user/winproc.c 6 Mar 2006 10:28:56 -0000
@@ -409,15 +409,12 @@
USER_CheckNotLock();
hwnd = WIN_GetFullHandle( hwnd );
- if (TRACE_ON(relay))
- DPRINTF( "%04lx:Call window proc %p (hwnd=%p,msg=%s,wp=%08x,lp=%08lx)\n",
- GetCurrentThreadId(), proc, hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam );
-
+ TRACE( "%04lx:Call window proc %p (hwnd=%p,msg=%s,wp=%08x,lp=%08lx)\n",
+ GetCurrentThreadId(), proc, hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam );
retvalue = WINPROC_wrapper( proc, hwnd, msg, wParam, lParam );
- if (TRACE_ON(relay))
- DPRINTF( "%04lx:Ret window proc %p (hwnd=%p,msg=%s,wp=%08x,lp=%08lx) retval=%08lx\n",
- GetCurrentThreadId(), proc, hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam, retvalue );
+ TRACE( "%04lx:Ret window proc %p (hwnd=%p,msg=%s,wp=%08x,lp=%08lx) retval=%08lx\n",
+ GetCurrentThreadId(), proc, hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam, retvalue );
return retvalue;
}
More information about the wine-patches
mailing list