Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-07 10:20:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] In _SHGetUserShellFolderPath(), check the return value of _SHExpandEnvironmentStrings()

Browse source 
and bail out if it failed. That way we won't use and cache in the registry an invalid-expanded string.

CORE-14981
This commit is contained in:
Hermès Bélusca-Maïto 2018-09-22 23:37:43 +02:00
parent 41a5b11fcd
commit e29609147b
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dll/win32/shell32/wine/shellpath.c
View file

@ -1480,7 +1480,9 @@ static HRESULT _SHGetUserShellFolderPath(HKEY rootKey, HANDLE hToken, LPCWSTR us
#ifndef __REACTOS__ #ifndef __REACTOS__
_SHExpandEnvironmentStrings(path, szTemp); _SHExpandEnvironmentStrings(path, szTemp);
#else #else
_SHExpandEnvironmentStrings(hToken, path, szTemp, _countof(szTemp)); hr = _SHExpandEnvironmentStrings(hToken, path, szTemp, _countof(szTemp));
if (FAILED(hr))
goto end;
#endif #endif
lstrcpynW(path, szTemp, MAX_PATH); lstrcpynW(path, szTemp, MAX_PATH);
} }
@ -1493,6 +1495,9 @@ static HRESULT _SHGetUserShellFolderPath(HKEY rootKey, HANDLE hToken, LPCWSTR us
} }
else else
hr = E_FAIL; hr = E_FAIL;
#ifdef __REACTOS__
end:
#endif
RegCloseKey(shellFolderKey); RegCloseKey(shellFolderKey);
RegCloseKey(userShellFolderKey); RegCloseKey(userShellFolderKey);
TRACE("returning 0x%08x\n", hr); TRACE("returning 0x%08x\n", hr);