Module: wine Branch: master Commit: d4fa0d8de292db5c25563646a8797e0d0c2b7ca0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4fa0d8de292db5c25563646a8...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Fri Jul 13 12:53:08 2012 +0200
ddraw: Get rid of some redundant TRACE_ON invocations.
---
dlls/ddraw/surface.c | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 3f9f78f..bb594be 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -712,14 +712,11 @@ static HRESULT WINAPI ddraw_surface7_GetAttachedSurface(IDirectDrawSurface7 *ifa surf = This->complex_array[i]; if(!surf) break;
- if (TRACE_ON(ddraw)) - { - TRACE("Surface: (%p) caps: %x,%x,%x,%x\n", surf, - surf->surface_desc.ddsCaps.dwCaps, - surf->surface_desc.ddsCaps.dwCaps2, - surf->surface_desc.ddsCaps.dwCaps3, - surf->surface_desc.ddsCaps.dwCaps4); - } + TRACE("Surface: (%p) caps: %#x, %#x, %#x, %#x.\n", surf, + surf->surface_desc.ddsCaps.dwCaps, + surf->surface_desc.ddsCaps.dwCaps2, + surf->surface_desc.ddsCaps.dwCaps3, + surf->surface_desc.ddsCaps.dwCaps4);
if (((surf->surface_desc.ddsCaps.dwCaps & our_caps.dwCaps) == our_caps.dwCaps) && ((surf->surface_desc.ddsCaps.dwCaps2 & our_caps.dwCaps2) == our_caps.dwCaps2)) { @@ -745,14 +742,11 @@ static HRESULT WINAPI ddraw_surface7_GetAttachedSurface(IDirectDrawSurface7 *ifa
while( (surf = surf->next_attached) ) { - if (TRACE_ON(ddraw)) - { - TRACE("Surface: (%p) caps: %x,%x,%x,%x\n", surf, - surf->surface_desc.ddsCaps.dwCaps, - surf->surface_desc.ddsCaps.dwCaps2, - surf->surface_desc.ddsCaps.dwCaps3, - surf->surface_desc.ddsCaps.dwCaps4); - } + TRACE("Surface: (%p) caps: %#x, %#x, %#x, %#x.\n", surf, + surf->surface_desc.ddsCaps.dwCaps, + surf->surface_desc.ddsCaps.dwCaps2, + surf->surface_desc.ddsCaps.dwCaps3, + surf->surface_desc.ddsCaps.dwCaps4);
if (((surf->surface_desc.ddsCaps.dwCaps & our_caps.dwCaps) == our_caps.dwCaps) && ((surf->surface_desc.ddsCaps.dwCaps2 & our_caps.dwCaps2) == our_caps.dwCaps2)) {
-
Alexandre Julliard