Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-115049: Fix py.exe failing when user has no LocalAppData. (GH-115185) 

Also ensure we always display a debug message or error for RC_INTERNAL_ERROR
This commit is contained in:
Steve Dower 2024-02-12 17:05:38 +00:00 committed by GitHub
parent 91bf01d4b1
commit c39272e143
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/Windows/2024-02-08-21-37-22.gh-issue-115049.X1ObpJ.rst Normal file
View File

@ -0,0 +1 @@
Fixes ``py.exe`` launcher failing when run as users without user profiles.

15
PC/launcher2.c
View File

@ -1594,6 +1594,7 @@ _registryReadLegacyEnvironment(const SearchInfo *search, HKEY root, EnvironmentI
int count = swprintf_s(realTag, tagLength + 4, L"%s-32", env->tag); int count = swprintf_s(realTag, tagLength + 4, L"%s-32", env->tag);
if (count == -1) { if (count == -1) {
debug(L"# Failed to generate 32bit tag\n");
free(realTag); free(realTag);
return RC_INTERNAL_ERROR; return RC_INTERNAL_ERROR;
} }
@ -1749,10 +1750,18 @@ appxSearch(const SearchInfo *search, EnvironmentInfo **result, const wchar_t *pa
exeName = search->windowed ? L"pythonw.exe" : L"python.exe"; exeName = search->windowed ? L"pythonw.exe" : L"python.exe";
} }
if (FAILED(SHGetFolderPathW(NULL, CSIDL_LOCAL_APPDATA, NULL, 0, buffer)) || // Failure to get LocalAppData may just mean we're running as a user who
!join(buffer, MAXLEN, L"Microsoft\\WindowsApps") || // doesn't have a profile directory.
// In this case, return "not found", but don't fail.
// Chances are they can't launch Store installs anyway.
if (FAILED(SHGetFolderPathW(NULL, CSIDL_LOCAL_APPDATA, NULL, 0, buffer))) {
return RC_NO_PYTHON;
}
if (!join(buffer, MAXLEN, L"Microsoft\\WindowsApps") ||
!join(buffer, MAXLEN, packageFamilyName) || !join(buffer, MAXLEN, packageFamilyName) ||
!join(buffer, MAXLEN, exeName)) { !join(buffer, MAXLEN, exeName)) {
debug(L"# Failed to construct App Execution Alias path\n");
return RC_INTERNAL_ERROR; return RC_INTERNAL_ERROR;
} }
@ -1982,6 +1991,7 @@ collectEnvironments(const SearchInfo *search, EnvironmentInfo **result)
EnvironmentInfo *env = NULL; EnvironmentInfo *env = NULL;
if (!result) { if (!result) {
debug(L"# collectEnvironments() was passed a NULL result\n");
return RC_INTERNAL_ERROR; return RC_INTERNAL_ERROR;
} }
*result = NULL; *result = NULL;
@ -2276,6 +2286,7 @@ int
selectEnvironment(const SearchInfo *search, EnvironmentInfo *root, EnvironmentInfo **best) selectEnvironment(const SearchInfo *search, EnvironmentInfo *root, EnvironmentInfo **best)
{ {
if (!best) { if (!best) {
debug(L"# selectEnvironment() was passed a NULL best\n");
return RC_INTERNAL_ERROR; return RC_INTERNAL_ERROR;
} }
if (!root) { if (!root) {