Changeset 128 for trunk

Timestamp:

01/10/09 12:32:28 (16 years ago)

Author:

tim

Message:

added secondary root key type found in Vista registries by Jolanta Thomassen

Location:

trunk

Files:

• include/regfi.h (modified) (1 diff)
• lib/regfi.c (modified) (4 diffs)

trunk/include/regfi.h

@@ -113 +113 @@
 #define NK_TYPE_LINKKEY            0x0010
 #define NK_TYPE_NORMALKEY          0x0020
-#define NK_TYPE_ROOTKEY            0x002c
+#define NK_TYPE_ROOTKEY1           0x002c
+#define NK_TYPE_ROOTKEY2           0x00ac
  /* XXX: Unknown type that shows up in Vista registries */
 #define NK_TYPE_UNKNOWN1           0x1020

trunk/lib/regfi.c

@@ -541 +541 @@
       sublists[i] = regfi_load_subkeylist(file, off, 0, max_length, strict);
     }
-
+    
     return regfi_merge_subkeylists(num_sublists, sublists, strict);
   }
@@ -893 +893 @@
       if(nk->subkeys == NULL)
       {
-        /* XXX: Temporary hack to get around 'ri' records */
+        /* XXX: Should we free the key and bail out here instead?  
+         *      During nonstrict? 
+         */
         nk->num_subkeys = 0;
       }
@@ -931 +933 @@
       if(nk != NULL)
       {
-        if(nk->key_type == NK_TYPE_ROOTKEY)
+        if((nk->key_type == NK_TYPE_ROOTKEY1)
+           || (nk->key_type == NK_TYPE_ROOTKEY2))
         {
           found = true;
@@ -1612 +1615 @@
   /* A bit of validation before bothering to allocate memory */
   if((nk_header[0x0] != 'n') || (nk_header[0x1] != 'k'))
-  {
-    /* XXX: Deal with subkey-lists that reference other subkey-lists
-     *      (e.g. 'ri' records). 
-     */
-    return NULL;
-  }
+    return NULL;
 
   ret_val = (REGF_NK_REC*)zalloc(sizeof(REGF_NK_REC));