From ed70c40395887fcc65c9957bfe9114fcd2be7dfe Mon Sep 17 00:00:00 2001 From: Thomas Heller Date: Wed, 22 Dec 2004 15:12:46 +0000 Subject: [PATCH] Backport from trunk, rev. 1.11 and 1.12. Don't hardcode the Python version number. --- PC/bdist_wininst/install.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/PC/bdist_wininst/install.c b/PC/bdist_wininst/install.c index 515e9eae4d24..8a92364f3f82 100644 --- a/PC/bdist_wininst/install.c +++ b/PC/bdist_wininst/install.c @@ -1510,12 +1510,15 @@ static void CloseLogfile(void) static HINSTANCE LoadPythonDll(char *fname) { char fullpath[_MAX_PATH]; + char subkey_name[80]; 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", + wsprintf(subkey_name, + "SOFTWARE\\Python\\PythonCore\\%d.%d\\InstallPath", + py_major, py_minor); + if (ERROR_SUCCESS != RegQueryValue(HKEY_CURRENT_USER, subkey_name, fullpath, &size)) return NULL; strcat(fullpath, "\\"); -- 2.47.3