sec_auth.cc: Drop prototype for CreateProfile, don't expect failed autoload

This commit is contained in:
Corinna Vinschen 2015-12-15 17:08:05 +01:00
parent bfb5d3ffbb
commit ecea753689
1 changed files with 2 additions and 11 deletions

View File

@ -218,13 +218,6 @@ get_user_profile_directory (PCWSTR sidstr, PWCHAR path, SIZE_T path_len)
return path; return path;
} }
/* The CreateProfile prototype is for some reason missing in our w32api headers,
even though it's defined upstream since Dec-2013. */
extern "C" {
HRESULT WINAPI CreateProfile (LPCWSTR pszUserSid, LPCWSTR pszUserName,
LPWSTR pszProfilePath, DWORD cchProfilePath);
}
/* Load user profile if it's not already loaded. If the user profile doesn't /* Load user profile if it's not already loaded. If the user profile doesn't
exist on the machine, and if we're running Vista or later, try to create it. exist on the machine, and if we're running Vista or later, try to create it.
@ -258,12 +251,10 @@ load_user_profile (HANDLE token, struct passwd *pw, cygpsid &usersid)
/* Check if the local profile dir has already been created. */ /* Check if the local profile dir has already been created. */
if (!get_user_profile_directory (sid, userpath, MAX_PATH)) if (!get_user_profile_directory (sid, userpath, MAX_PATH))
{ {
/* No, try to create it. This function exists only on Vista and later. */ /* No, try to create it. */
HRESULT res = CreateProfile (sid, username, userpath, MAX_PATH); HRESULT res = CreateProfile (sid, username, userpath, MAX_PATH);
if (res != S_OK) if (res != S_OK)
{ {
/* If res is 1 (S_FALSE), autoloading failed (XP or 2K3). */
if (res != S_FALSE)
debug_printf ("CreateProfile, HRESULT %x", res); debug_printf ("CreateProfile, HRESULT %x", res);
return NULL; return NULL;
} }