Registered modules could only exist in HKEY_LOCAL_MACHINE - now HKEY_CURRENT_USER...

diff --git a/PC/import_nt.c b/PC/import_nt.c
index f0a27350b0844519916c5e1de47c65699c022eaf..573106fd3ff2f390dcaa56fab41b7b37a0d38831 100644 (file)
--- a/PC/import_nt.c
+++ b/PC/import_nt.c
@@ -34,7 +34,7 @@ FILE *PyWin_FindRegisteredModule(const char *moduleName,
 #endif
        struct filedescr *fdp = NULL;
        FILE *fp;
-       HKEY keyBase = HKEY_LOCAL_MACHINE;
+       HKEY keyBase = HKEY_CURRENT_USER;
        int modNameSize;
        long regStat;
 
@@ -56,8 +56,17 @@ FILE *PyWin_FindRegisteredModule(const char *moduleName,
 
        modNameSize = pathLen;
        regStat = RegQueryValue(keyBase, moduleKey, pathBuf, &modNameSize);
-       if (regStat != ERROR_SUCCESS)
-               return NULL;
+       if (regStat != ERROR_SUCCESS) {
+               /* No user setting - lookup in machine settings */
+               keyBase = HKEY_LOCAL_MACHINE;
+               /* be anal - failure may have reset size param */
+               modNameSize = pathLen;
+               regStat = RegQueryValue(keyBase, moduleKey, 
+                                       pathBuf, &modNameSize);
+
+               if (regStat != ERROR_SUCCESS)
+                       return NULL;
+       }
        /* use the file extension to locate the type entry. */
        for (fdp = _PyImport_Filetab; fdp->suffix != NULL; fdp++) {
                size_t extLen = strlen(fdp->suffix);