Commit 4abebb8e authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

shell32: There is no need to check strings for NULL when using debugstr_w().

Also don't put single quotes around '%s' in that case.
parent 6834945e
...@@ -576,7 +576,7 @@ UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOperation, ...@@ -576,7 +576,7 @@ UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOperation,
WCHAR xlpFile[256]; /* result of SearchPath */ WCHAR xlpFile[256]; /* result of SearchPath */
DWORD attribs; /* file attributes */ DWORD attribs; /* file attributes */
TRACE("%s\n", (lpFile != NULL) ? debugstr_w(lpFile) : "-"); TRACE("%s\n", debugstr_w(lpFile));
if (!lpResult) if (!lpResult)
return ERROR_INVALID_PARAMETER; return ERROR_INVALID_PARAMETER;
...@@ -828,7 +828,7 @@ static unsigned dde_connect(WCHAR* key, const WCHAR* start, WCHAR* ddeexec, ...@@ -828,7 +828,7 @@ static unsigned dde_connect(WCHAR* key, const WCHAR* start, WCHAR* ddeexec,
if (!hConv) if (!hConv)
{ {
static const WCHAR wIfexec[] = {'\\','i','f','e','x','e','c',0}; static const WCHAR wIfexec[] = {'\\','i','f','e','x','e','c',0};
TRACE("Launching '%s'\n", debugstr_w(start)); TRACE("Launching %s\n", debugstr_w(start));
ret = execfunc(start, env, TRUE, psei, psei_out); ret = execfunc(start, env, TRUE, psei, psei_out);
if (ret <= 32) if (ret <= 32)
{ {
...@@ -1009,8 +1009,7 @@ HINSTANCE WINAPI FindExecutableW(LPCWSTR lpFile, LPCWSTR lpDirectory, LPWSTR lpR ...@@ -1009,8 +1009,7 @@ HINSTANCE WINAPI FindExecutableW(LPCWSTR lpFile, LPCWSTR lpDirectory, LPWSTR lpR
UINT_PTR retval = SE_ERR_NOASSOC; UINT_PTR retval = SE_ERR_NOASSOC;
WCHAR old_dir[1024]; WCHAR old_dir[1024];
TRACE("File %s, Dir %s\n", TRACE("File %s, Dir %s\n", debugstr_w(lpFile), debugstr_w(lpDirectory));
(lpFile != NULL ? debugstr_w(lpFile) : "-"), (lpDirectory != NULL ? debugstr_w(lpDirectory) : "-"));
lpResult[0] = '\0'; /* Start off with an empty return string */ lpResult[0] = '\0'; /* Start off with an empty return string */
if (lpFile == NULL) if (lpFile == NULL)
...@@ -1413,7 +1412,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) ...@@ -1413,7 +1412,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc )
wszParameters, sizeof(wszParameters)/sizeof(WCHAR)); wszParameters, sizeof(wszParameters)/sizeof(WCHAR));
/* FIXME: get the extension of lpFile, check if it fits to the lpClass */ /* FIXME: get the extension of lpFile, check if it fits to the lpClass */
TRACE("SEE_MASK_CLASSNAME->'%s', doc->'%s'\n", debugstr_w(wszParameters), debugstr_w(wszApplicationName)); TRACE("SEE_MASK_CLASSNAME->%s, doc->%s\n", debugstr_w(wszParameters), debugstr_w(wszApplicationName));
wcmd[0] = '\0'; wcmd[0] = '\0';
done = SHELL_ArgifyW(wcmd, sizeof(wcmd)/sizeof(WCHAR), wszParameters, wszApplicationName, sei_tmp.lpIDList, NULL, &resultLen); done = SHELL_ArgifyW(wcmd, sizeof(wcmd)/sizeof(WCHAR), wszParameters, wszApplicationName, sei_tmp.lpIDList, NULL, &resultLen);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment