From d4fa0d8de292db5c25563646a8797e0d0c2b7ca0 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Fri, 13 Jul 2012 12:53:08 +0200 Subject: [PATCH] ddraw: Get rid of some redundant TRACE_ON invocations. --- dlls/ddraw/surface.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 3f9f78f5cc6..bb594befa9e 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)) {