Use MS_DLL_ID and similar changes

diff --git a/PC/config.h b/PC/config.h
index 0367e3b048477e81b47c79d6c794bae2ed4ba1c6..d7271022d4aa0ba50acef09845f6160272c4bec0 100644 (file)
--- a/PC/config.h
+++ b/PC/config.h
@@ -44,10 +44,6 @@ compiler specific".  Therefore, these should be very rare.
 #define PREFIX ""
 #define EXEC_PREFIX ""
 
-#ifndef WIN32_PATCH_LEVEL
-#define WIN32_PATCH_LEVEL "14"
-#endif
-
 /* Microsoft C defines _MSC_VER */
 
 #if defined(_MSC_VER) && _MSC_VER > 850

diff --git a/PC/getpath_nt.c b/PC/getpath_nt.c
index 039a39e0f65d8956f3626c65cfdf1809b298e0ef..99e8b06af756c6e2b662267aed36cf1afd056778 100644 (file)
--- a/PC/getpath_nt.c
+++ b/PC/getpath_nt.c
@@ -54,7 +54,7 @@ getpythonregpath(HKEY keyBase, BOOL bWin32s)
        LONG rc;
        char *retval = NULL;
        char *dataBuf;
-       if ((rc=RegOpenKey(keyBase, "Software\\Python\\PythonCore\\" WIN32_PATCH_LEVEL "\\PythonPath", 
+       if ((rc=RegOpenKey(keyBase, "Software\\Python\\PythonCore\\" MS_DLL_ID "\\PythonPath", 
                           &newKey))==ERROR_SUCCESS) {
                RegQueryInfoKey(newKey, NULL, NULL, NULL, NULL, NULL, NULL, 
                                &numEntries, &nameSize, &dataSize, NULL, NULL );

diff --git a/PC/import_nt.c b/PC/import_nt.c
index b6609a942bf5a2469d14212637250938b0bfcc68..d34033cf91aac4175d2fabb9e7b76b739aff8263 100644 (file)
--- a/PC/import_nt.c
+++ b/PC/import_nt.c
@@ -9,7 +9,6 @@
 #include "allobjects.h"
 #include "osdefs.h"
 #include <windows.h>
-#include "import.h"
 #include "importdl.h"
 
 extern BOOL PyWin_IsWin32s();
@@ -21,7 +20,7 @@ FILE *PyWin_FindRegisteredModule( const char *moduleName, struct filedescr **ppF
        FILE *fp;
        int modNameSize = pathLen;
        HKEY keyBase = PyWin_IsWin32s() ? HKEY_CLASSES_ROOT : HKEY_LOCAL_MACHINE;
-       strcpy(moduleKey, "Software\\Python\\PythonCore\\" WIN32_PATCH_LEVEL "\\Modules\\");
+       strcpy(moduleKey, "Software\\Python\\PythonCore\\" MS_DLL_ID "\\Modules\\");
        strcat(moduleKey, moduleName);
        if (RegQueryValue(keyBase, moduleKey, pathBuf, &modNameSize)!=ERROR_SUCCESS)
                return NULL;

diff --git a/PC/python_nt.rc b/PC/python_nt.rc
index 92dc0c6d2e499628b6885920da420021cd4bfe4b..8ccf1e35699ed9375d68c83a873146e0ae273f9d 100644 (file)
--- a/PC/python_nt.rc
+++ b/PC/python_nt.rc
@@ -10,6 +10,10 @@
 
 #define PYTHON_VERSION MS_DLL_ID "." PYTHON_API_STRING "\0"
 
+#ifndef PYTHON_DLL_NAME
+#define PYTHON_DLL_NAME "Python14.dll"
+#endif
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
@@ -32,14 +36,12 @@ BEGIN
     BEGIN
         BLOCK "000004b0"
         BEGIN
-            VALUE "CompanyName", "PSA\0"
+            VALUE "CompanyName", "Corporation for National Research Initatives\0"
             VALUE "FileDescription", "Python Core\0"
             VALUE "FileVersion", PYTHON_VERSION
             VALUE "InternalName", "Python DLL\0"
             VALUE "LegalCopyright", "Copyright © 1991-1996 Stichting Mathematisch Centrum, Amsterdam\0"
-#ifdef PYTHON_DLL_NAME
             VALUE "OriginalFilename", PYTHON_DLL_NAME "\0"
-#endif
             VALUE "ProductName", "Python\0"
             VALUE "ProductVersion", PYTHON_VERSION
         END