Changeset 161 for trunk/include

Timestamp:

12/07/09 12:01:22 (14 years ago)

Author:

tim

Message:

added support for UTF-16LE key names

File:

• trunk/include/regfi.h (modified) (9 diffs)

trunk/include/regfi.h

@@ -60 +60 @@
 #define REGFI_MSG_WARN  0x0004
 #define REGFI_MSG_ERROR 0x0010
+
+typedef uint8 REGFI_ENCODING;
+/* regfi library supported character encodings */
+#define REGFI_ENCODING_ASCII   0
+#define REGFI_ENCODING_UTF8    1
+#define REGFI_ENCODING_DEFAULT REGFI_ENCODING_ASCII
+/* UTF16LE is not supported for output */
+#define REGFI_ENCODING_UTF16LE 2
+
+#define REGFI_NUM_ENCODINGS    3
 
 /* Windows is lame */
@@ -360 +370 @@
   
   /* header information */
-  uint16 key_type;
+  uint16 flags;
   uint8  magic[REGFI_CELL_MAGIC_SIZE];
   NTTIME mtime;
@@ -479 +489 @@
   void_stack* key_positions;
   REGFI_NK_REC* cur_key;
-  const char* string_encoding;
+  REGFI_ENCODING string_encoding;
   uint32 cur_subkey;
   uint32 cur_value;
@@ -529 +539 @@
  *   file            -- The opened registry file the iterator should be
  *                      created for.
- *   output_encoding -- An integer representing the output string encoding.
- *                      These integers currently map to a specific set of 
- *                      iconv(3) encodings.
+ *   output_encoding -- Character encoding that strings should be returned in.
+ *                      Only supply the REGFI_ENCODING_* constants, as others 
+ *                      will be rejected.
  *                      The following values are currently accepted:
- *                      0 - default (currently US-ASCII//TRANSLIT)
- *                      1 - US-ASCII//TRANSLIT
- *                      2 - UTF-8//TRANSLIT
+ *                      REGFI_ENCODING_DEFAULT (currently REGFI_ENCODING_ASCII)
+ *                      REGFI_ENCODING_ASCII
+ *                      REGFI_ENCODING_UTF8
  *
  *                      XXX: This encoding only applies to specific data 
@@ -545 +555 @@
  */
 REGFI_ITERATOR*       regfi_iterator_new(REGFI_FILE* file,
-                                         uint32 output_encoding);
+                                         REGFI_ENCODING output_encoding);
 void                  regfi_iterator_free(REGFI_ITERATOR* i);
 bool                  regfi_iterator_down(REGFI_ITERATOR* i);
@@ -578 +588 @@
 /********************************************************/
 REGFI_NK_REC*         regfi_load_key(REGFI_FILE* file, uint32 offset, 
+                                     REGFI_ENCODING output_encoding, 
                                      bool strict);
 REGFI_VK_REC*         regfi_load_value(REGFI_FILE* file, uint32 offset, 
@@ -597 +608 @@
                                           bool strict);
 bool                  regfi_interpret_data(REGFI_FILE* file, 
-                                           const char* string_encoding,
+                                           REGFI_ENCODING string_encoding,
                                            uint32 type, REGFI_DATA* data);
 void                  regfi_free_classname(REGFI_CLASSNAME* classname);
@@ -666 +677 @@
 /*    Private Functions             */
 /************************************/
-REGFI_NK_REC*         regfi_rootkey(REGFI_FILE* file);
+REGFI_NK_REC*         regfi_rootkey(REGFI_FILE* file, 
+                                    REGFI_ENCODING output_encoding);
 void                  regfi_subkeylist_free(REGFI_SUBKEY_LIST* list);
 uint32                regfi_read(int fd, uint8* buf, uint32* length);
@@ -689 +701 @@
 REGFI_VK_REC*         regfi_copy_vk(const REGFI_VK_REC* vk);
 int32                 regfi_calc_maxsize(REGFI_FILE* file, uint32 offset);
-int32                 regfi_conv_charset(const char* output_charset, 
+int32                 regfi_conv_charset(const char* input_charset, 
+                                         const char* output_charset,
                                          uint8* input, char* output, 
                                          uint32 input_len, uint32 output_max);