winspool: Don't print NULL pointers in traces.

This commit is contained in:
Alexandre Julliard 2008-06-23 17:10:04 +02:00
parent 606186d4c5
commit 8e2684fea4
1 changed files with 11 additions and 11 deletions

View File

@ -2296,9 +2296,9 @@ BOOL WINAPI AddMonitorA(LPSTR pName, DWORD Level, LPBYTE pMonitors)
mi2a = (LPMONITOR_INFO_2A) pMonitors; mi2a = (LPMONITOR_INFO_2A) pMonitors;
TRACE("(%s, %d, %p) : %s %s %s\n", debugstr_a(pName), Level, pMonitors, TRACE("(%s, %d, %p) : %s %s %s\n", debugstr_a(pName), Level, pMonitors,
mi2a ? debugstr_a(mi2a->pName) : NULL, debugstr_a(mi2a ? mi2a->pName : NULL),
mi2a ? debugstr_a(mi2a->pEnvironment) : NULL, debugstr_a(mi2a ? mi2a->pEnvironment : NULL),
mi2a ? debugstr_a(mi2a->pDLLName) : NULL); debugstr_a(mi2a ? mi2a->pDLLName : NULL));
if (Level != 2) { if (Level != 2) {
SetLastError(ERROR_INVALID_LEVEL); SetLastError(ERROR_INVALID_LEVEL);
@ -2372,9 +2372,9 @@ BOOL WINAPI AddMonitorW(LPWSTR pName, DWORD Level, LPBYTE pMonitors)
mi2w = (LPMONITOR_INFO_2W) pMonitors; mi2w = (LPMONITOR_INFO_2W) pMonitors;
TRACE("(%s, %d, %p) : %s %s %s\n", debugstr_w(pName), Level, pMonitors, TRACE("(%s, %d, %p) : %s %s %s\n", debugstr_w(pName), Level, pMonitors,
mi2w ? debugstr_w(mi2w->pName) : NULL, debugstr_w(mi2w ? mi2w->pName : NULL),
mi2w ? debugstr_w(mi2w->pEnvironment) : NULL, debugstr_w(mi2w ? mi2w->pEnvironment : NULL),
mi2w ? debugstr_w(mi2w->pDLLName) : NULL); debugstr_w(mi2w ? mi2w->pDLLName : NULL));
if (Level != 2) { if (Level != 2) {
SetLastError(ERROR_INVALID_LEVEL); SetLastError(ERROR_INVALID_LEVEL);
@ -2665,7 +2665,7 @@ BOOL WINAPI DeletePortW (LPWSTR pName, HWND hWnd, LPWSTR pPortName)
else else
{ {
FIXME("not implemented for %s (%p: %s => %p: %s)\n", debugstr_w(pPortName), 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 */ /* XP: ERROR_NOT_SUPPORTED, NT351,9x: ERROR_INVALID_PARAMETER */
SetLastError(ERROR_NOT_SUPPORTED); SetLastError(ERROR_NOT_SUPPORTED);
@ -6551,7 +6551,7 @@ BOOL WINAPI AddPortW(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName)
else else
{ {
FIXME("not implemented for %s (%p: %s => %p: %s)\n", debugstr_w(pMonitorName), 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 */ /* XP: ERROR_NOT_SUPPORTED, NT351,9x: ERROR_INVALID_PARAMETER */
SetLastError(ERROR_NOT_SUPPORTED); SetLastError(ERROR_NOT_SUPPORTED);
@ -6989,7 +6989,7 @@ BOOL WINAPI ConfigurePortW(LPWSTR pName, HWND hWnd, LPWSTR pPortName)
else else
{ {
FIXME("not implemented for %s (%p: %s => %p: %s)\n", debugstr_w(pPortName), 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 */ /* XP: ERROR_NOT_SUPPORTED, NT351,9x: ERROR_INVALID_PARAMETER */
SetLastError(ERROR_NOT_SUPPORTED); SetLastError(ERROR_NOT_SUPPORTED);