traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-38359: Ensures pyw.exe launcher reads correct registry key (GH-16561)

This commit is contained in:
Steve Dower 2019-10-03 08:31:21 -07:00 committed by GitHub
parent a0e3d27e4e
commit 353fb1ecbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/Windows/2019-10-03-08-04-14.bpo-38359.wzwsl_.rst Normal file
View File

@ -0,0 +1 @@
Ensures ``pyw.exe`` launcher reads correct registry key.

10
PC/launcher.c
View File

@ -141,6 +141,8 @@ static wchar_t * get_env(wchar_t * key)
} }
#if defined(_DEBUG) #if defined(_DEBUG)
/* Do not define EXECUTABLEPATH_VALUE in debug builds as it'll
never point to the debug build. */
#if defined(_WINDOWS) #if defined(_WINDOWS)
#define PYTHON_EXECUTABLE L"pythonw_d.exe" #define PYTHON_EXECUTABLE L"pythonw_d.exe"
@ -154,10 +156,12 @@ static wchar_t * get_env(wchar_t * key)
#if defined(_WINDOWS) #if defined(_WINDOWS)
#define PYTHON_EXECUTABLE L"pythonw.exe" #define PYTHON_EXECUTABLE L"pythonw.exe"
#define EXECUTABLEPATH_VALUE L"WindowedExecutablePath"
#else #else
#define PYTHON_EXECUTABLE L"python.exe" #define PYTHON_EXECUTABLE L"python.exe"
#define EXECUTABLEPATH_VALUE L"ExecutablePath"
#endif #endif
#endif #endif
@ -297,8 +301,12 @@ _locate_pythons_for_key(HKEY root, LPCWSTR subkey, REGSAM flags, int bits,
} }
data_size = sizeof(ip->executable) - 1; data_size = sizeof(ip->executable) - 1;
append_name = FALSE; append_name = FALSE;
status = RegQueryValueExW(ip_key, L"ExecutablePath", NULL, &type, #ifdef EXECUTABLEPATH_VALUE
status = RegQueryValueExW(ip_key, EXECUTABLEPATH_VALUE, NULL, &type,
(LPBYTE)ip->executable, &data_size); (LPBYTE)ip->executable, &data_size);
#else
status = ERROR_FILE_NOT_FOUND; /* actual error doesn't matter */
#endif
if (status != ERROR_SUCCESS || type != REG_SZ || !data_size) { if (status != ERROR_SUCCESS || type != REG_SZ || !data_size) {
append_name = TRUE; append_name = TRUE;
data_size = sizeof(ip->executable) - 1; data_size = sizeof(ip->executable) - 1;