tyler.durden/Win32-OpenSSH
1
0
Fork 0
mirror of https://github.com/PowerShell/Win32-OpenSSH.git synced 2025-07-21 13:04:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replaced usage of deprecated SHGetFolderPathW with SHGetKnownFolderPath. Added fallback if SHGetKnownFolderPath fails

Browse Source 
SHGetKnownFolderPath fails on Nano
This commit is contained in:
Manoj Ampalam 2016-04-04 14:54:11 -07:00
parent 2adee0027d
commit 2679669da6
1 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
contrib/win32/win32compat/pwd.c
View File

@ -130,6 +130,7 @@ char *GetHomeDirFromToken(char *userName, HANDLE token)
{ {
UCHAR domain[200]; UCHAR domain[200];
wchar_t pw_buf[MAX_PATH] = { L'\0' }; wchar_t pw_buf[MAX_PATH] = { L'\0' };
PWSTR tmp;
debug("-> GetHomeDirFromToken()..."); debug("-> GetHomeDirFromToken()...");
@ -152,49 +153,34 @@ char *GetHomeDirFromToken(char *userName, HANDLE token)
profileInfo.hProfile = NULL; profileInfo.hProfile = NULL;
profileInfo.dwSize = sizeof(profileInfo); profileInfo.dwSize = sizeof(profileInfo);
if (LoadUserProfile(token, &profileInfo) == FALSE)
{
debug("<- GetHomeDirFromToken()...");
debug("LoadUserProfile failure: %d", GetLastError());
return NULL;
}
/* /*
* And retrieve homedir from profile. * And retrieve homedir from profile.
*/ */
if (!SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_PROFILE, token, 0, pw_homedir)))
{
debug("<- GetHomeDirFromToken()...");
debug("SHGetFolderPath failed");
return NULL;
}
// update APPDATA user's env variable if (SUCCEEDED(SHGetKnownFolderPath(&FOLDERID_Documents, 0, token, &tmp)))
if (SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_APPDATA, token, 0, pw_buf)))
{ {
SetEnvironmentVariableW(L"APPDATA", pw_buf); wcscpy_s(pw_homedir, MAX_PATH, tmp);
CoTaskMemFree(tmp);
} else
{
debug("SHGetKnownFolderPath on FOLDERID_Documents failed");
GetWindowsDirectoryW(pw_homedir, MAX_PATH);
}
// update APPDATA user's env variable
if (SUCCEEDED(SHGetKnownFolderPath(&FOLDERID_RoamingAppData, 0, token, &tmp)))
{
SetEnvironmentVariableW(L"APPDATA", tmp);
CoTaskMemFree(tmp);
} }
// update LOCALAPPDATA user's env variable // update LOCALAPPDATA user's env variable
if (SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_LOCAL_APPDATA, token, 0, pw_buf))) if (SUCCEEDED(SHGetKnownFolderPath(&FOLDERID_LocalAppData, 0, token, &tmp)))
{ {
SetEnvironmentVariableW(L"LOCALAPPDATA", pw_buf); SetEnvironmentVariableW(L"LOCALAPPDATA", tmp);
CoTaskMemFree(tmp);
} }
/*
* Unload user profile.
*/
if (UnloadUserProfile(token, profileInfo.hProfile) == FALSE)
{
debug("WARNING. Cannot unload user profile (%u).", GetLastError());
}
debug("<- GetHomeDirFromToken()..."); debug("<- GetHomeDirFromToken()...");
return pw_homedir; return pw_homedir;