Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use SHGetKnownFolderPath on vista/win7/win8, instead of deprecated SHGetSpecialFolderPath.

Browse Source
This commit is contained in:
Shyotl
2013-07-03 17:16:37 -05:00
parent 8310575fc3
commit 0219186106
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
indra/llvfs/lldir_win32.cpp
View File

@@ -63,7 +63,25 @@ LLDir_Win32::LLDir_Win32()
// //
// We used to store the cache in AppData\Roaming, and the installer // We used to store the cache in AppData\Roaming, and the installer
// cleans up that version on upgrade. JC // cleans up that version on upgrade. JC
SHGetSpecialFolderPath(NULL, w_str, CSIDL_LOCAL_APPDATA, TRUE);
if(HMODULE shell = LoadLibrary(L"shell32")) //SHGetSpecialFolderPath is deprecated from Vista an onwards. Try to use SHGetSpecialFolderPath if it's available
{
HRESULT (WINAPI* pSHGetKnownFolderPath)(REFKNOWNFOLDERID rfid, DWORD dwFlags, HANDLE hToken, PWSTR *ppszPath);
pSHGetKnownFolderPath = (HRESULT (WINAPI *)(REFKNOWNFOLDERID, DWORD, HANDLE, PWSTR *))GetProcAddress(shell, "SHGetKnownFolderPath");
WCHAR* pPath = NULL;
if(pSHGetKnownFolderPath && (*pSHGetKnownFolderPath)(FOLDERID_LocalAppData, 0, NULL, &pPath) == S_OK)
wcscpy_s(w_str,pPath);
else
SHGetSpecialFolderPath(NULL, w_str, CSIDL_LOCAL_APPDATA, TRUE);
FreeLibrary(shell);
if(pPath)
CoTaskMemFree(pPath);
}
else //XP doesn't support SHGetKnownFolderPath
{
SHGetSpecialFolderPath(NULL, w_str, CSIDL_LOCAL_APPDATA, TRUE);
}
mOSCacheDir = utf16str_to_utf8str(llutf16string(w_str)); mOSCacheDir = utf16str_to_utf8str(llutf16string(w_str));
if (GetTempPath(MAX_PATH, w_str)) if (GetTempPath(MAX_PATH, w_str))