Changeset 225 for trunk

Timestamp:

04/05/11 11:17:41 (14 years ago)

Author:

tim

Message:

added test case for python callback read/seek
began adding windows support in pyregfi
improved win32 build target

Location:

trunk

Files:

• SConstruct (modified) (1 diff)
• lib/regfi.c (modified) (1 diff)
• python/pyregfi/__init__.py (modified) (2 diffs)
• python/pyregfi/structures.py (modified) (2 diffs)

trunk/SConstruct

@@ -1 +1 @@
 import sys
 import os
-#import distutils.sysconfig
 
-#cflags = '-std=gnu99 -pedantic -Wall'
-cflags = '-std=gnu99 -pedantic -Wall -fvisibility=hidden -ggdb'
-
+cflags = '-std=gnu99 -pedantic -Wall -D_FILE_OFFSET_BITS=64 -fvisibility=hidden'
+cflags += ' -ggdb'
 
 lib_src = ['lib/regfi.c',

trunk/lib/regfi.c

@@ -612 +612 @@
   do
   {
-    rret = file_cb->read(file_cb, buf + rsize, *length - rsize);
+    rret = file_cb->read(file_cb, 
+                         buf + rsize, 
+                         *length - rsize);
     if(rret > 0)
       rsize += rret;

trunk/python/pyregfi/__init__.py

@@ -95 +95 @@
 import sys
 import time
-import weakref
 from pyregfi.structures import *
 
@@ -635 +634 @@
             pass
         
+        fh.seek(0)
         self.raw_file = structures.REGFI_RAW_FILE()
         self.raw_file.fh = fh
         self.raw_file.seek = seek_cb_type(self.raw_file.cb_seek)
         self.raw_file.read = read_cb_type(self.raw_file.cb_read)
-        self.file = regfi.regfi_alloc_cb(self.raw_file, REGFI_ENCODING_UTF8)
-
+        self.file = regfi.regfi_alloc_cb(pointer(self.raw_file), REGFI_ENCODING_UTF8)
+        if not self.file:
+            # XXX: switch to non-generic exception
+            raise Exception("Could not open registry file.  Current log:\n"
+                            + GetLogMessages())
 
     def __getattr__(self, name):

trunk/python/pyregfi/structures.py

@@ -82 +82 @@
 
 
-# XXX: how can we know for sure the size of off_t and size_t?
-seek_cb_type = CFUNCTYPE(c_int64, POINTER(REGFI_RAW_FILE), c_uint64, c_int, use_errno=True)
-read_cb_type = CFUNCTYPE(c_int64, POINTER(REGFI_RAW_FILE), POINTER(c_char), c_uint64, use_errno=True)
+# Load libregfi according to platform
+regfi = None
+if hasattr(ctypes, 'windll'):
+    #regfi = ctypes.windll.libregfi
+    regfi = ctypes.WinDLL('libregfi.dll', use_errno=True)
+    CB_FACTORY = ctypes.WINFUNCTYPE
+else:
+    regfi = ctypes.CDLL(ctypes.util.find_library('regfi'), use_errno=True)
+    CB_FACTORY = ctypes.CFUNCTYPE
+
+# XXX: how can we know for sure the size of off_t?  
+#      -D_FILE_OFFSET_BITS=64 might help, need to research this
+#      Also, may need to use something like ctypes_configure
+#seek_cb_type = CB_FACTORY(c_int64, POINTER(REGFI_RAW_FILE), c_uint64, c_int, use_errno=True)
+seek_cb_type = CB_FACTORY(c_int64, POINTER(REGFI_RAW_FILE), c_uint64, c_int)
+#read_cb_type = CB_FACTORY(c_int64, POINTER(REGFI_RAW_FILE), POINTER(c_char), c_size_t, use_errno=True)
+read_cb_type = CB_FACTORY(c_int64, POINTER(REGFI_RAW_FILE), POINTER(c_char), c_size_t)
 
 
@@ -217 +231 @@
 
 
-# Load libregfi and define function prototypes
-regfi = ctypes.CDLL(ctypes.util.find_library('regfi'), use_errno=True)
-
+# Define function prototypes
 regfi.regfi_alloc.argtypes = [c_int, REGFI_ENCODING]
 regfi.regfi_alloc.restype = POINTER(REGFI_FILE)