From: Thomas Heller <theller@ctypes.org>
Date: Wed, 22 Dec 2004 16:33:38 +0000 (+0000)
Subject: Backport of rev. 1.12 from the trunk.
X-Git-Tag: v2.4.1c1~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=625ba9511cfcb29fe0006c6a243329a3f3b34479;p=thirdparty%2FPython%2Fcpython.git

Backport of rev. 1.12 from the trunk.
---

diff --git a/PC/bdist_wininst/install.c b/PC/bdist_wininst/install.c
index d268624e98d5..3d0eacdfd8e1 100644
--- a/PC/bdist_wininst/install.c
+++ b/PC/bdist_wininst/install.c
@@ -612,11 +612,14 @@ static HINSTANCE LoadPythonDll(char *fname)
 {
 	char fullpath[_MAX_PATH];
 	LONG size = sizeof(fullpath);
+	char subkeyname[80];
 	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, "\\");