Changeset 72 for trunk

Timestamp:

07/30/06 16:09:07 (18 years ago)

Author:

tim

Message:

Added QWORD type support.

Location:

trunk

Files:

• doc/reglookup.1.docbook (modified) (1 diff)
• include/regfio.h (modified) (1 diff)
• lib/regfio.c (modified) (1 diff)
• src/reglookup.c (modified) (3 diffs)

trunk/doc/reglookup.1.docbook

@@ -64 +64 @@
             <command>
               NONE, SZ, EXPAND_SZ, BINARY, DWORD, DWORD_BE,
-              LINK, MULTI_SZ, RSRC_LIST, RSRC_DESC, RSRC_REQ_LIST,
+              LINK, MULTI_SZ, RSRC_LIST, RSRC_DESC, RSRC_REQ_LIST, QWORD
             </command>
             and

trunk/include/regfio.h

@@ -64 +64 @@
 #define REG_FULL_RESOURCE_DESCRIPTOR   9
 #define REG_RESOURCE_REQUIREMENTS_LIST 10
+#define REG_QWORD                      11 /* 64-bit little endian */
+/* XXX: Has MS defined a REG_QWORD_BE? */
 /* Not a real type in the registry */
 #define REG_KEY                        255

trunk/lib/regfio.c

@@ -29 +29 @@
 
 /* Registry types mapping */
-const unsigned int regfio_num_reg_types = 11;
+const unsigned int regfio_num_reg_types = 12;
 static const char* regfio_type_names[] =
   {"NONE", "SZ", "EXPAND_SZ", "BINARY", "DWORD", "DWORD_BE", "LINK",
-   "MULTI_SZ", "RSRC_LIST", "RSRC_DESC", "RSRC_REQ_LIST"};
+   "MULTI_SZ", "RSRC_LIST", "RSRC_DESC", "RSRC_REQ_LIST", "QWORD"};
 
 

trunk/src/reglookup.c

@@ -241 +241 @@
 
   case REG_DWORD:
-    ascii_max = sizeof(char)*11;
+    ascii_max = sizeof(char)*(8+2+1);
     ascii = malloc(ascii_max);
     if(ascii == NULL)
@@ -252 +252 @@
 
   case REG_DWORD_BE:
-    ascii_max = sizeof(char)*11;
+    ascii_max = sizeof(char)*(8+2+1);
     ascii = malloc(ascii_max);
     if(ascii == NULL)
@@ -261 +261 @@
     return ascii;
     break;
+
+  case REG_QWORD:
+    ascii_max = sizeof(char)*(16+2+1);
+    ascii = malloc(ascii_max);
+    if(ascii == NULL)
+      return NULL;
+
+    snprintf(ascii, ascii_max, "0x%.2X%.2X%.2X%.2X%.2X%.2X%.2X%.2X",
+             datap[7], datap[6], datap[5], datap[4],
+             datap[3], datap[2], datap[1], datap[0]);
+    return ascii;
+    break;
+    
 
   /* XXX: this MULTI_SZ parser is pretty inefficient.  Should be