Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-01 15:07:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32]

Browse source 
- Fix uninitialized return value in _SHGetDefaultValue. CID 1322231
CORE-11213 #resolve

svn path=/trunk/; revision=71295
This commit is contained in:
Thomas Faber 2016-05-09 08:12:00 +00:00
parent 8a8de70eb2
commit d9217570cb
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
reactos/dll/win32/shell32/wine/shellpath.c
View file

@ -1518,6 +1518,7 @@ static HRESULT _SHGetDefaultValue(HANDLE hToken, BYTE folder, LPWSTR pszPath)
; /* no corresponding env. var, do nothing */ ; /* no corresponding env. var, do nothing */
} }
hr = S_OK;
if (CSIDL_Data[folder].szDefaultPath) if (CSIDL_Data[folder].szDefaultPath)
{ {
if (IS_INTRESOURCE(CSIDL_Data[folder].szDefaultPath)) if (IS_INTRESOURCE(CSIDL_Data[folder].szDefaultPath))
@ -1525,7 +1526,6 @@ static HRESULT _SHGetDefaultValue(HANDLE hToken, BYTE folder, LPWSTR pszPath)
if (LoadStringW(shell32_hInstance, if (LoadStringW(shell32_hInstance,
LOWORD(CSIDL_Data[folder].szDefaultPath), resourcePath, MAX_PATH)) LOWORD(CSIDL_Data[folder].szDefaultPath), resourcePath, MAX_PATH))
{ {
hr = S_OK;
PathAppendW(pszPath, resourcePath); PathAppendW(pszPath, resourcePath);
} }
else else
@ -1537,7 +1537,6 @@ static HRESULT _SHGetDefaultValue(HANDLE hToken, BYTE folder, LPWSTR pszPath)
} }
else else
{ {
hr = S_OK;
PathAppendW(pszPath, CSIDL_Data[folder].szDefaultPath); PathAppendW(pszPath, CSIDL_Data[folder].szDefaultPath);
} }
} }