Skip to content

Fixes #51: Enable pyshellext to search all registered runtimes #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 1, 2025
Merged

Fixes #51: Enable pyshellext to search all registered runtimes #52

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 51 additions & 21 deletions src/pyshellext/shellext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,26 +59,26 @@ static LRESULT RegReadStr(HKEY key, LPCWSTR valueName, std::wstring& result)
}


static HRESULT ReadIdleInstalls(std::vector<IdleData> &idles, HKEY hive, REGSAM flags)
static HRESULT ReadIdleInstalls(std::vector<IdleData> &idles, HKEY hkPython, LPCWSTR company, REGSAM flags)
{
HKEY hkPythonCore = NULL, hkTag = NULL, hkInstall = NULL;
HKEY hkCompany = NULL, hkTag = NULL, hkInstall = NULL;
LSTATUS err = RegOpenKeyExW(
hive,
L"Software\\Python\\PythonCore",
hkPython,
company,
0,
KEY_READ | flags,
&hkPythonCore
&hkCompany
);

for (DWORD i = 0; !err && i < 64; ++i) {
wchar_t name[128];
wchar_t name[512];
DWORD cchName = sizeof(name) / sizeof(name[0]);
err = RegEnumKeyExW(hkPythonCore, i, name, &cchName, NULL, NULL, NULL, NULL);
err = RegEnumKeyExW(hkCompany, i, name, &cchName, NULL, NULL, NULL, NULL);
if (!err) {
err = RegOpenKeyExW(hkPythonCore, name, 0, KEY_READ, &hkTag);
err = RegOpenKeyExW(hkCompany, name, 0, KEY_READ | flags, &hkTag);
}
if (!err) {
err = RegOpenKeyExW(hkTag, L"InstallPath", 0, KEY_READ, &hkInstall);
err = RegOpenKeyExW(hkTag, L"InstallPath", 0, KEY_READ | flags, &hkInstall);
}
if (err) {
break;
Expand Down Expand Up @@ -111,12 +111,15 @@ static HRESULT ReadIdleInstalls(std::vector<IdleData> &idles, HKEY hive, REGSAM

err = RegReadStr(hkInstall, L"IdlePath", data.idle);
if (err == ERROR_FILE_NOT_FOUND || err == ERROR_INVALID_DATA) {
err = RegReadStr(hkInstall, NULL, data.idle);
if (!err) {
if (data.idle.back() != L'\\') {
data.idle += L"\\Lib\\idlelib\\idle.pyw";
} else {
data.idle += L"Lib\\idlelib\\idle.pyw";
if (0 == wcsicmp(company, L"PythonCore")) {
// Only use fallback logic for PythonCore
err = RegReadStr(hkInstall, NULL, data.idle);
if (!err) {
if (data.idle.back() != L'\\') {
data.idle += L"\\Lib\\idlelib\\idle.pyw";
} else {
data.idle += L"Lib\\idlelib\\idle.pyw";
}
}
}
}
Expand All @@ -129,7 +132,9 @@ static HRESULT ReadIdleInstalls(std::vector<IdleData> &idles, HKEY hive, REGSAM
RegCloseKey(hkTag);
hkTag = NULL;

if (GetFileAttributesW(data.exe.c_str()) != INVALID_FILE_ATTRIBUTES
if (!data.exe.empty()
&& !data.idle.empty()
&& GetFileAttributesW(data.exe.c_str()) != INVALID_FILE_ATTRIBUTES
&& GetFileAttributesW(data.idle.c_str()) != INVALID_FILE_ATTRIBUTES) {
idles.push_back(data);
}
Expand All @@ -140,15 +145,40 @@ static HRESULT ReadIdleInstalls(std::vector<IdleData> &idles, HKEY hive, REGSAM
if (hkTag) {
RegCloseKey(hkTag);
}
if (hkPythonCore) {
RegCloseKey(hkPythonCore);
if (hkCompany) {
RegCloseKey(hkCompany);
}
if (err && err != ERROR_NO_MORE_ITEMS && err != ERROR_FILE_NOT_FOUND) {
return HRESULT_FROM_WIN32(err);
}
return S_OK;
}

static HRESULT ReadAllIdleInstalls(std::vector<IdleData> &idles, HKEY hive, REGSAM flags)
{
HKEY hkPython = NULL;
HRESULT hr = S_OK;
LSTATUS err = RegOpenKeyExW(hive, L"Software\\Python", 0, KEY_READ | flags, &hkPython);

for (DWORD i = 0; !err && hr == S_OK && i < 64; ++i) {
wchar_t name[512];
DWORD cchName = sizeof(name) / sizeof(name[0]);
err = RegEnumKeyExW(hkPython, i, name, &cchName, NULL, NULL, NULL, NULL);
if (!err) {
hr = ReadIdleInstalls(idles, hkPython, name, flags);
}
}

if (hkPython) {
RegCloseKey(hkPython);
}

if (err && err != ERROR_NO_MORE_ITEMS && err != ERROR_FILE_NOT_FOUND) {
return HRESULT_FROM_WIN32(err);
}
return hr;
}

class DECLSPEC_UUID(CLSID_LAUNCH_COMMAND) LaunchCommand
: public RuntimeClass<RuntimeClassFlags<ClassicCom>, IExplorerCommand>
{
Expand Down Expand Up @@ -319,12 +349,12 @@ class DECLSPEC_UUID(CLSID_IDLE_COMMAND) IdleCommand
iconPath += L",-4";
}

hr = ReadIdleInstalls(idles, HKEY_LOCAL_MACHINE, KEY_WOW64_32KEY);
hr = ReadAllIdleInstalls(idles, HKEY_LOCAL_MACHINE, KEY_WOW64_32KEY);
if (SUCCEEDED(hr)) {
hr = ReadIdleInstalls(idles, HKEY_LOCAL_MACHINE, KEY_WOW64_64KEY);
hr = ReadAllIdleInstalls(idles, HKEY_LOCAL_MACHINE, KEY_WOW64_64KEY);
}
if (SUCCEEDED(hr)) {
hr = ReadIdleInstalls(idles, HKEY_CURRENT_USER, 0);
hr = ReadAllIdleInstalls(idles, HKEY_CURRENT_USER, 0);
}

if (FAILED(hr)) {
Expand Down