Skip to content

Fix loading tk on windows when current process has >1024 modules. #22445

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
Mar 3, 2022
Merged

Fix loading tk on windows when current process has >1024 modules. #22445

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
39 changes: 23 additions & 16 deletions src/_tkagg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,25 +256,32 @@ int load_tcl(T lib)

void load_tkinter_funcs(void)
{
// Load Tcl/Tk functions by searching all modules in current process.
HMODULE hMods[1024];
HANDLE hProcess;
DWORD cbNeeded;
unsigned int i;
HANDLE process = GetCurrentProcess(); // Pseudo-handle, doesn't need closing.
HMODULE* modules = NULL;
DWORD size;
if (!EnumProcessModules(process, NULL, 0, &size)) {
PyErr_SetFromWindowsErr(0);
goto exit;
}
if (!(modules = static_cast<HMODULE*>(malloc(size)))) {
PyErr_NoMemory();
goto exit;
}
if (!EnumProcessModules(process, modules, size, &size)) {
PyErr_SetFromWindowsErr(0);
goto exit;
}
bool tcl_ok = false, tk_ok = false;
// Returns pseudo-handle that does not need to be closed
hProcess = GetCurrentProcess();
// Iterate through modules in this process looking for Tcl/Tk names.
if (EnumProcessModules(hProcess, hMods, sizeof(hMods), &cbNeeded)) {
for (i = 0; i < (cbNeeded / sizeof(HMODULE)); i++) {
if (!tcl_ok) {
tcl_ok = load_tcl(hMods[i]);
}
if (!tk_ok) {
tk_ok = load_tk(hMods[i]);
}
for (unsigned i = 0; i < size / sizeof(HMODULE); ++i) {
if (!tcl_ok) {
tcl_ok = load_tcl(modules[i]);
}
if (!tk_ok) {
tk_ok = load_tk(modules[i]);
}
}
exit:
free(modules);
}

#else // not Windows
Expand Down