[Python-checkins] python/dist/src/PC/bdist_wininst install.c, 1.10, 1.10.4.1

[theller at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/PC/bdist_wininst
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4213

Modified Files:
      Tag: release24-maint
	install.c 
Log Message:
Backport of rev. 1.12 from the trunk.


Index: install.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/bdist_wininst/install.c,v
retrieving revision 1.10
retrieving revision 1.10.4.1
diff -u -d -r1.10 -r1.10.4.1
--- install.c	19 Jul 2004 09:57:58 -0000	1.10
+++ install.c	22 Dec 2004 16:33:38 -0000	1.10.4.1
@@ -612,11 +612,14 @@
 {
 	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, "\\");