Changeset 252 for trunk/python

Timestamp:

05/08/11 13:33:49 (14 years ago)

Author:

tim

Message:

updated pyregfi to work with regfi changes
renamed some functions for more clarity
fixed some issues related to talloc_reference

Location:

trunk/python/pyregfi

Files:

• __init__.py (modified) (7 diffs)
• structures.py (modified) (5 diffs)

trunk/python/pyregfi/__init__.py

@@ -174 +174 @@
     i = 0
     s = chars_pointer[i]
-    while s != None:
+    while s:
         ret_val.append(s.decode('utf-8', 'replace'))
         i += 1
@@ -180 +180 @@
 
     return ret_val
+
 
 
@@ -316 +317 @@
             raise Exception("Could not create _GenericList; key is NULL."
                             + "Current log:\n" + getLogMessages())
-        
-        if not regfi.regfi_reference_record(key._hive.file, key._base):
+
+        base = regfi.regfi_reference_record(key._hive.file, key._base)
+        if not base:
             raise Exception("Could not create _GenericList; memory error."
                             + "Current log:\n" + getLogMessages())
-        self._key_base = key._base
+        self._key_base = cast(base, type(key._base))
         self._length = self._fetch_num(self._key_base)
         self._hive = key._hive
@@ -461 +463 @@
             ret_val = super(Key, self).__getattr__(name)
 
-            if ret_val == None:
+            if not ret_val:
                 ret_val = self.name_raw
             else:
@@ -624 +626 @@
         ret_val = super(Value, self).__getattr__(name)
         if name == "name":
-            if ret_val == None:
+            if not ret_val:
                 ret_val = self.name_raw
             else:
@@ -984 +986 @@
         return ret_val
 
-
     ## Traverse downward multiple levels
     #
@@ -996 +997 @@
 
         self._lock.acquire()
-        result = regfi.regfi_iterator_walk_path(self._iter, cpath)
+        result = regfi.regfi_iterator_descend(self._iter, cpath)
         self._lock.release()
         if not result:
             # XXX: Use non-generic exception
             raise Exception('Could not locate path.\n'+getLogMessages())
+
+    ## Obtains a list of the current key's ancestry
+    #
+    # @return A list of all parent keys starting with the root Key and ending
+    #         with the current Key
+    def ancestry(self):
+        self._lock.acquire()
+        result = regfi.regfi_iterator_ancestry(self._iter)
+        self._lock.release()
+
+        ret_val = []
+        i = 0
+        k = result[i]
+        while k:
+            k = cast(regfi.regfi_reference_record(self._hive.file, k), POINTER(REGFI_NK))
+            ret_val.append(Key(self._hive, k))
+            i += 1
+            k = result[i]
+
+        regfi.regfi_free_record(self._hive.file, result)
+        return ret_val
+
+    ## Obtains the current path of the iterator
+    #
+    # @return A list of key names starting with the root up to and
+    #         including the current key
+    #
+    def current_path(self):
+        ancestry = self.ancestry()
+        return [str(a.name) for a in ancestry]
 
 

trunk/python/pyregfi/structures.py

@@ -20 +20 @@
 
 REGFI_DATA_TYPE = c_uint32
-
+REGFI_NTTIME = c_uint64
 
 # Prototype everything first so we don't have to worry about reference order
-class REGFI_NTTIME(Structure):
-    pass
-
 class REGFI_VK(Structure):
     pass
@@ -97 +94 @@
 read_cb_type = CB_FACTORY(c_int64, POINTER(REGFI_RAW_FILE), POINTER(c_char), c_size_t, use_errno=True)
 
-
-REGFI_NTTIME._fields_ = [('low', c_uint32),
-                         ('high', c_uint32)]
 
 REGFI_VK._fields_ = [('offset', c_uint32),
@@ -253 +247 @@
 
 regfi.regfi_reference_record.argtypes = [POINTER(REGFI_FILE), c_void_p]
-regfi.regfi_reference_record.restype = c_bool
+regfi.regfi_reference_record.restype = c_void_p
 
 regfi.regfi_fetch_num_subkeys.argtypes = [POINTER(REGFI_NK)]
@@ -307 +301 @@
 regfi.regfi_iterator_to_root.restype = c_bool
 
-regfi.regfi_iterator_walk_path.argtypes = [POINTER(REGFI_ITERATOR), POINTER(c_char_p)]
-regfi.regfi_iterator_walk_path.restype = c_bool
+regfi.regfi_iterator_descend.argtypes = [POINTER(REGFI_ITERATOR), POINTER(c_char_p)]
+regfi.regfi_iterator_descend.restype = c_bool
 
 regfi.regfi_iterator_cur_key.argtypes = [POINTER(REGFI_ITERATOR)]
@@ -337 +331 @@
 regfi.regfi_iterator_find_value.restype = c_bool
 
+regfi.regfi_iterator_ancestry.argtypes = [POINTER(REGFI_ITERATOR)]
+regfi.regfi_iterator_ancestry.restype = POINTER(POINTER(REGFI_NK))
 
 regfi.regfi_init.argtypes = []