python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-27 17:54:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Support arbitrary number of loaded modules on Windows

Browse Source 
Changed the TKinter module loading function for Windows to support the rare (but possible) case of having more than 1024 modules loaded. This is an adaptation of the same fix that was added to Matplotlib in [PR #22445](https://github.com/matplotlib/matplotlib/pull/22445).
This commit is contained in:
Javier Dehesa 2022-11-25 15:10:05 +00:00 committed by GitHub
parent ad938d5421
commit 73b91f58d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Tk/tkImaging.c
View File

@ -310,7 +310,7 @@ load_tkinter_funcs(void) {
* Return 0 for success, non-zero for failure.
*/
HMODULE hMods[1024];
HMODULE* hMods = NULL;
HANDLE hProcess;
DWORD cbNeeded;
unsigned int i;
@ -327,33 +327,45 @@ load_tkinter_funcs(void) {
/* Returns pseudo-handle that does not need to be closed */
hProcess = GetCurrentProcess();
/* Allocate module handlers array */
if (!EnumProcessModules(hProcess, NULL, 0, &cbNeeded)) {
PyErr_SetFromWindowsErr(0);
return 1;
}
if (!(hMods = static_cast<HMODULE*>(malloc(cbNeeded)))) {
PyErr_NoMemory();
return 1;
}
/* Iterate through modules in this process looking for Tcl / Tk names */
if (EnumProcessModules(hProcess, hMods, sizeof(hMods), &cbNeeded)) {
if (EnumProcessModules(hProcess, hMods, cbNeeded, &cbNeeded)) {
for (i = 0; i < (cbNeeded / sizeof(HMODULE)); i++) {
if (!found_tcl) {
found_tcl = get_tcl(hMods[i]);
if (found_tcl == -1) {
return 1;
goto exit;
}
}
if (!found_tk) {
found_tk = get_tk(hMods[i]);
if (found_tk == -1) {
return 1;
goto exit;
}
}
if (found_tcl && found_tk) {
return 0;
goto exit;
}
}
}
if (found_tcl == 0) {
exit:
free(hMods);
if (found_tcl != 1) {
PyErr_SetString(PyExc_RuntimeError, "Could not find Tcl routines");
} else {
} else if (found_tk != 1) {
PyErr_SetString(PyExc_RuntimeError, "Could not find Tk routines");
}
return 1;
return int((found_tcl != 1) && (found_tk != 1));
}
#else /* not Windows */