Changeset 295 for trunk/src/sh_registry.c

Timestamp:

Oct 31, 2010, 10:36:04 AM (14 years ago)

Author:

katerina

Message:

Support for IPv6 (ticket #222).

File:

• trunk/src/sh_registry.c (modified) (5 diffs)

trunk/src/sh_registry.c

@@ -447 +447 @@
 }
 
+#if !defined(KEY_WOW64_64KEY)
+#define KEY_WOW64_64KEY 0x0100;
+#endif
+#if !defined(KEY_WOW64_32KEY)
+#define KEY_WOW64_32KEY 0x0200;
+#endif
 
 
@@ -790 +796 @@
 
 
-int CheckThisSubkey (HKEY key, char * subkey, char * path, int isSingle)
+int CheckThisSubkey (HKEY key, char * subkey, char * path, int isSingle,
+                     int view)
 {
   HKEY hTestKey;
@@ -826 +833 @@
                     subkey,
                     0,
-                    KEY_READ,
+                    (KEY_READ | view),
                     &hTestKey) == ERROR_SUCCESS
       )
@@ -867 +874 @@
   char path[20] = "";
   int pos = 0;
+  int retval = -1;
   
   if      (0 == strncmp(key, _("HKEY_CLASSES_ROOT"), 17))
@@ -924 +932 @@
       return -1;
     }
-  
-  return CheckThisSubkey (topKey, subkey, path, isSingle);
+
+  /************************  
+  if (ShCheckBothViews)
+    {
+      CheckThisSubkey (topKey, subkey, path, isSingle, KEY_WOW64_32KEY);
+      return CheckThisSubkey (topKey, subkey, path, isSingle, KEY_WOW64_64KEY);
+    }
+  *************************/
+
+  return CheckThisSubkey (topKey, subkey, path, isSingle, 0);
 }