shell32: Avoid null pointer dereference in traces.

9d6204b2 · Nikolay Sivov · Alexandre Julliard · 85ce39dd · 9d6204b2
Commit 9d6204b2 authored Nov 21, 2011 by Nikolay Sivov Committed by Alexandre Julliard Nov 21, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 21 deletions

shellpath.c dlls/shell32/shellpath.c +11 -21

No files found.
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -669,37 +669,27 @@ BOOL WINAPI PathQualifyAW(LPCVOID pszPath)
 	return PathQualifyA(pszPath);
 }
-static BOOL PathResolveA(
+static BOOL PathResolveA(LPSTR path, LPCSTR *paths, DWORD flags)
-	LPSTR lpszPath,
-	LPCSTR *alpszPaths,
-	DWORD dwFlags)
 {
-	FIXME("(%s,%p,0x%08x),stub!\n",
+    FIXME("(%s,%p,0x%08x),stub!\n", debugstr_a(path), paths, flags);
-	  lpszPath, *alpszPaths, dwFlags);
+    return FALSE;
-	return 0;
 }
-static BOOL PathResolveW(
+static BOOL PathResolveW(LPWSTR path, LPCWSTR *paths, DWORD flags)
-	LPWSTR lpszPath,
-	LPCWSTR *alpszPaths,
-	DWORD dwFlags)
 {
-	FIXME("(%s,%p,0x%08x),stub!\n",
+    FIXME("(%s,%p,0x%08x),stub!\n", debugstr_w(path), paths, flags);
-	  debugstr_w(lpszPath), debugstr_w(*alpszPaths), dwFlags);
+    return FALSE;
-	return 0;
 }
 /*************************************************************************
 * PathResolve [SHELL32.51]
 */
-BOOL WINAPI PathResolveAW(
+BOOL WINAPI PathResolveAW(LPVOID path, LPCVOID *paths, DWORD flags)
-	LPVOID lpszPath,
-	LPCVOID *alpszPaths,
-	DWORD dwFlags)
 {
-	if (SHELL_OsIsUnicode())
+    if (SHELL_OsIsUnicode())
-	  return PathResolveW(lpszPath, (LPCWSTR*)alpszPaths, dwFlags);
+        return PathResolveW(path, (LPCWSTR*)paths, flags);
-	return PathResolveA(lpszPath, (LPCSTR*)alpszPaths, dwFlags);
+    else
+        return PathResolveA(path, (LPCSTR*)paths, flags);
 }
 /*************************************************************************