https://github.com/python/cpython/commit/c39272e143b346bd6a3c04ca4fbf299163888277
commit: c39272e143b346bd6a3c04ca4fbf299163888277
branch: main
author: Steve Dower <[email protected]>
committer: zooba <[email protected]>
date: 2024-02-12T17:05:38Z
summary:
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
files:
A Misc/NEWS.d/next/Windows/2024-02-08-21-37-22.gh-issue-115049.X1ObpJ.rst
M PC/launcher2.c
diff --git
a/Misc/NEWS.d/next/Windows/2024-02-08-21-37-22.gh-issue-115049.X1ObpJ.rst
b/Misc/NEWS.d/next/Windows/2024-02-08-21-37-22.gh-issue-115049.X1ObpJ.rst
new file mode 100644
index 00000000000000..a679391857dcb3
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2024-02-08-21-37-22.gh-issue-115049.X1ObpJ.rst
@@ -0,0 +1 @@
+Fixes ``py.exe`` launcher failing when run as users without user profiles.
diff --git a/PC/launcher2.c b/PC/launcher2.c
index e426eccd700044..90b0fdebd3bdfb 100644
--- a/PC/launcher2.c
+++ b/PC/launcher2.c
@@ -1594,6 +1594,7 @@ _registryReadLegacyEnvironment(const SearchInfo *search,
HKEY root, EnvironmentI
int count = swprintf_s(realTag, tagLength + 4, L"%s-32", env->tag);
if (count == -1) {
+ debug(L"# Failed to generate 32bit tag\n");
free(realTag);
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";
}
- if (FAILED(SHGetFolderPathW(NULL, CSIDL_LOCAL_APPDATA, NULL, 0, buffer)) ||
- !join(buffer, MAXLEN, L"Microsoft\\WindowsApps") ||
+ // Failure to get LocalAppData may just mean we're running as a user who
+ // 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, exeName)) {
+ debug(L"# Failed to construct App Execution Alias path\n");
return RC_INTERNAL_ERROR;
}
@@ -1982,6 +1991,7 @@ collectEnvironments(const SearchInfo *search,
EnvironmentInfo **result)
EnvironmentInfo *env = NULL;
if (!result) {
+ debug(L"# collectEnvironments() was passed a NULL result\n");
return RC_INTERNAL_ERROR;
}
*result = NULL;
@@ -2276,6 +2286,7 @@ int
selectEnvironment(const SearchInfo *search, EnvironmentInfo *root,
EnvironmentInfo **best)
{
if (!best) {
+ debug(L"# selectEnvironment() was passed a NULL best\n");
return RC_INTERNAL_ERROR;
}
if (!root) {
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]