mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 02:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

When loading the Python dll to run the postinstall script, try to load

Browse source 
it from the install directory (as reported by the registry) in case it
is not found on the default Loadlibrary search path.

Fixes SF 935091: bdist_winist post-install script fails on non-admin Python

Already backported.
This commit is contained in:
Thomas Heller 2004-06-18 17:03:38 +00:00
parent a42bc21ef8
commit 48340390ac
1 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
PC/bdist_wininst/install.c
View file

@ -590,6 +590,22 @@ PyMethodDef meth[] = {
{"message_box", PyMessageBox, METH_VARARGS, NULL},
};
static HINSTANCE LoadPythonDll(char *fname)
{
char fullpath[_MAX_PATH];
LONG size = sizeof(fullpath);
HINSTANCE h = LoadLibrary(fname);
if (h)
return h;
if (ERROR_SUCCESS != RegQueryValue(HKEY_CURRENT_USER,
"SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath",
fullpath, &size))
return NULL;
strcat(fullpath, "\\");
strcat(fullpath, fname);
return LoadLibrary(fullpath);
}
static int prepare_script_environment(HINSTANCE hPython)
{
PyObject *mod;
@ -715,7 +731,7 @@ static int run_simple_script(char *script)
freopen(tempname, "a", stderr);
freopen(tempname, "a", stdout);
hPython = LoadLibrary (pythondll);
hPython = LoadPythonDll(pythondll);
if (!hPython) {
set_failure_reason("Can't load Python for pre-install script");
return -1;
@ -1745,7 +1761,7 @@ InstallFilesDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
"Compiling files to .pyc...");
SetDlgItemText(hDialog, IDC_INFO, "Loading python...");
hPython = LoadLibrary(pythondll);
hPython = LoadPythonDll(pythondll);
if (hPython) {
errors = compile_filelist(hPython, FALSE);
FreeLibrary(hPython);
@ -1764,7 +1780,7 @@ InstallFilesDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
"Compiling files to .pyo...");
SetDlgItemText(hDialog, IDC_INFO, "Loading python...");
hPython = LoadLibrary(pythondll);
hPython = LoadPythonDll(pythondll);
if (hPython) {
errors = compile_filelist(hPython, TRUE);
FreeLibrary(hPython);
@ -1840,7 +1856,7 @@ FinishedDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
argv[0] = fname;
hPython = LoadLibrary(pythondll);
hPython = LoadPythonDll(pythondll);
if (hPython) {
int result;
result = run_installscript(hPython, fname, 2, argv);