Nikolay Sivov : shell32: Avoid null pointer dereference in traces.
Alexandre Julliard
julliard at winehq.org
Mon Nov 21 11:10:07 CST 2011
Module: wine
Branch: master
Commit: 9d6204b297a756f7823bc75d1ec88c968fab96c0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6204b297a756f7823bc75d1ec88c968fab96c0
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Mon Nov 21 10:58:58 2011 +0300
shell32: Avoid null pointer dereference in traces.
---
dlls/shell32/shellpath.c | 32 +++++++++++---------------------
1 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index 25ba4be..9612687 100644
--- 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(
- LPSTR lpszPath,
- LPCSTR *alpszPaths,
- DWORD dwFlags)
+static BOOL PathResolveA(LPSTR path, LPCSTR *paths, DWORD flags)
{
- FIXME("(%s,%p,0x%08x),stub!\n",
- lpszPath, *alpszPaths, dwFlags);
- return 0;
+ FIXME("(%s,%p,0x%08x),stub!\n", debugstr_a(path), paths, flags);
+ return FALSE;
}
-static BOOL PathResolveW(
- LPWSTR lpszPath,
- LPCWSTR *alpszPaths,
- DWORD dwFlags)
+static BOOL PathResolveW(LPWSTR path, LPCWSTR *paths, DWORD flags)
{
- FIXME("(%s,%p,0x%08x),stub!\n",
- debugstr_w(lpszPath), debugstr_w(*alpszPaths), dwFlags);
- return 0;
+ FIXME("(%s,%p,0x%08x),stub!\n", debugstr_w(path), paths, flags);
+ return FALSE;
}
/*************************************************************************
* PathResolve [SHELL32.51]
*/
-BOOL WINAPI PathResolveAW(
- LPVOID lpszPath,
- LPCVOID *alpszPaths,
- DWORD dwFlags)
+BOOL WINAPI PathResolveAW(LPVOID path, LPCVOID *paths, DWORD flags)
{
- if (SHELL_OsIsUnicode())
- return PathResolveW(lpszPath, (LPCWSTR*)alpszPaths, dwFlags);
- return PathResolveA(lpszPath, (LPCSTR*)alpszPaths, dwFlags);
+ if (SHELL_OsIsUnicode())
+ return PathResolveW(path, (LPCWSTR*)paths, flags);
+ else
+ return PathResolveA(path, (LPCSTR*)paths, flags);
}
/*************************************************************************
More information about the wine-cvs
mailing list