From 8e2684fea4a1f456305da1e6ce36ca505d562259 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Mon, 23 Jun 2008 17:10:04 +0200 Subject: [PATCH] winspool: Don't print NULL pointers in traces. --- dlls/winspool.drv/info.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 5057c0da69f..abc33974447 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2295,10 +2295,10 @@ BOOL WINAPI AddMonitorA(LPSTR pName, DWORD Level, LPBYTE pMonitors) MONITOR_INFO_2W mi2w; mi2a = (LPMONITOR_INFO_2A) pMonitors; - TRACE("(%s, %d, %p) : %s %s %s\n", debugstr_a(pName), Level, pMonitors, - mi2a ? debugstr_a(mi2a->pName) : NULL, - mi2a ? debugstr_a(mi2a->pEnvironment) : NULL, - mi2a ? debugstr_a(mi2a->pDLLName) : NULL); + TRACE("(%s, %d, %p) : %s %s %s\n", debugstr_a(pName), Level, pMonitors, + debugstr_a(mi2a ? mi2a->pName : NULL), + debugstr_a(mi2a ? mi2a->pEnvironment : NULL), + debugstr_a(mi2a ? mi2a->pDLLName : NULL)); if (Level != 2) { SetLastError(ERROR_INVALID_LEVEL); @@ -2371,10 +2371,10 @@ BOOL WINAPI AddMonitorW(LPWSTR pName, DWORD Level, LPBYTE pMonitors) BOOL res = FALSE; mi2w = (LPMONITOR_INFO_2W) pMonitors; - TRACE("(%s, %d, %p) : %s %s %s\n", debugstr_w(pName), Level, pMonitors, - mi2w ? debugstr_w(mi2w->pName) : NULL, - mi2w ? debugstr_w(mi2w->pEnvironment) : NULL, - mi2w ? debugstr_w(mi2w->pDLLName) : NULL); + TRACE("(%s, %d, %p) : %s %s %s\n", debugstr_w(pName), Level, pMonitors, + debugstr_w(mi2w ? mi2w->pName : NULL), + debugstr_w(mi2w ? mi2w->pEnvironment : NULL), + debugstr_w(mi2w ? mi2w->pDLLName : NULL)); if (Level != 2) { SetLastError(ERROR_INVALID_LEVEL); @@ -2665,7 +2665,7 @@ BOOL WINAPI DeletePortW (LPWSTR pName, HWND hWnd, LPWSTR pPortName) else { FIXME("not implemented for %s (%p: %s => %p: %s)\n", debugstr_w(pPortName), - pm, pm ? debugstr_w(pm->dllname) : NULL, pui, pui ? debugstr_w(pui->dllname) : NULL); + pm, debugstr_w(pm ? pm->dllname : NULL), pui, debugstr_w(pui ? pui->dllname : NULL)); /* XP: ERROR_NOT_SUPPORTED, NT351,9x: ERROR_INVALID_PARAMETER */ SetLastError(ERROR_NOT_SUPPORTED); @@ -6551,7 +6551,7 @@ BOOL WINAPI AddPortW(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName) else { FIXME("not implemented for %s (%p: %s => %p: %s)\n", debugstr_w(pMonitorName), - pm, pm ? debugstr_w(pm->dllname) : NULL, pui, pui ? debugstr_w(pui->dllname) : NULL); + pm, debugstr_w(pm ? pm->dllname : NULL), pui, debugstr_w(pui ? pui->dllname : NULL)); /* XP: ERROR_NOT_SUPPORTED, NT351,9x: ERROR_INVALID_PARAMETER */ SetLastError(ERROR_NOT_SUPPORTED); @@ -6989,7 +6989,7 @@ BOOL WINAPI ConfigurePortW(LPWSTR pName, HWND hWnd, LPWSTR pPortName) else { FIXME("not implemented for %s (%p: %s => %p: %s)\n", debugstr_w(pPortName), - pm, pm ? debugstr_w(pm->dllname) : NULL, pui, pui ? debugstr_w(pui->dllname) : NULL); + pm, debugstr_w(pm ? pm->dllname : NULL), pui, debugstr_w(pui ? pui->dllname : NULL)); /* XP: ERROR_NOT_SUPPORTED, NT351,9x: ERROR_INVALID_PARAMETER */ SetLastError(ERROR_NOT_SUPPORTED); -- 2.11.4.GIT