From: Thomas Heller <theller@ctypes.org>
Date: Wed, 22 Dec 2004 15:12:46 +0000 (+0000)
Subject: Backport from trunk, rev. 1.11 and 1.12.  Don't hardcode the Python
X-Git-Tag: v2.3.5c1~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed70c40395887fcc65c9957bfe9114fcd2be7dfe;p=thirdparty%2FPython%2Fcpython.git

Backport from trunk, rev. 1.11 and 1.12.  Don't hardcode the Python
version number.
---

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, "\\");