Author: tfaber
Date: Mon May 9 08:12:00 2016
New Revision: 71295
URL:
http://svn.reactos.org/svn/reactos?rev=71295&view=rev
Log:
[SHELL32]
- Fix uninitialized return value in _SHGetDefaultValue. CID 1322231
CORE-11213 #resolve
Modified:
trunk/reactos/dll/win32/shell32/wine/shellpath.c
Modified: trunk/reactos/dll/win32/shell32/wine/shellpath.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she…
==============================================================================
--- trunk/reactos/dll/win32/shell32/wine/shellpath.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/wine/shellpath.c [iso-8859-1] Mon May 9 08:12:00
2016
@@ -1518,6 +1518,7 @@
; /* no corresponding env. var, do nothing */
}
+ hr = S_OK;
if (CSIDL_Data[folder].szDefaultPath)
{
if (IS_INTRESOURCE(CSIDL_Data[folder].szDefaultPath))
@@ -1525,7 +1526,6 @@
if (LoadStringW(shell32_hInstance,
LOWORD(CSIDL_Data[folder].szDefaultPath), resourcePath, MAX_PATH))
{
- hr = S_OK;
PathAppendW(pszPath, resourcePath);
}
else
@@ -1537,7 +1537,6 @@
}
else
{
- hr = S_OK;
PathAppendW(pszPath, CSIDL_Data[folder].szDefaultPath);
}
}