Changeset 226

Timestamp:

04/05/11 15:01:41 (13 years ago)

Author:

tim

Message:

several fixes for pyregfi Windows portability
better error handling within pyregfi

Files:

• SConstruct (modified) (3 diffs)
• trunk/include/regfi.h (modified) (3 diffs)
• trunk/lib/regfi.c (modified) (5 diffs)
• trunk/python/pyregfi/__init__.py (modified) (3 diffs)
• trunk/python/pyregfi/structures.py (modified) (4 diffs)

SConstruct

@@ -1 @@
-cflags = '-std=gnu99 -pedantic -Wall'
+cflags = '-std=gnu99 -pedantic -Wall -D_FILE_OFFSET_BITS=64 -DREGFI_WIN32'
 
 libiconv_path='win32/libiconv/'
@@ -100 +100 @@
                 regfi_obj.append(s[0:-1]+'o')
 
+            # XXX: Several options here may not be necessary.  
+            #      Need to investigate why stdcall interfaces don't seem to be 
+            #      working on Windows.
             env.Command(input_prefix+'lib/libregfi.o', regfi_o+extra_obj,
                         'i586-mingw32msvc-dlltool --export-all-symbols'
-                        +' --dllname libregfi.dll -e $TARGET'
+                        +' --add-stdcall-alias  --dllname libregfi.dll -e $TARGET'
                         +' -l %slib/libregfi.dll.a %s' 
                         % (input_prefix, ' '.join(regfi_obj)))
@@ -108 +111 @@
             env.Command(input_prefix+'lib/libregfi.dll',
                         input_prefix+'lib/libregfi.o',
-                        'i586-mingw32msvc-gcc --shared -o $TARGET $SOURCE %s'
+                        'i586-mingw32msvc-gcc ' + cflags 
+                        + ' --shared -Wl,--out-implib -add-stdcall-alias -o $TARGET $SOURCE %s'
                         % ' '.join(regfi_obj+extra_obj))
 

trunk/include/regfi.h

@@ -84 +84 @@
 #undef _EXPORT
 #endif
+#ifdef REGFI_WIN32
+#define _EXPORT __declspec(dllexport)
+#else
 #define _EXPORT __attribute__((visibility("default")))
-
-
+#endif
+
+#ifndef EOVERFLOW
+# define EOVERFLOW E2BIG
+#endif
 
 /******************************************************************************/
@@ -709 +715 @@
 typedef struct _regfi_raw_file
 {
-  off_t    (* seek)(); /* (REGFI_RAW_FILE* self, off_t offset, int whence) */
+  int64_t  (* seek)(); /* (REGFI_RAW_FILE* self, uint64_t offset, int whence) */
   ssize_t  (* read)(); /* (REGFI_RAW_FILE* self, void* buf, size_t count) */
 
@@ -1627 +1633 @@
 /*    Private (and undocumented) Functions                                    */
 /******************************************************************************/
-off_t                 regfi_raw_seek(REGFI_RAW_FILE* self, 
-                                     off_t offset, int whence);
+int64_t               regfi_raw_seek(REGFI_RAW_FILE* self, 
+                                     uint64_t offset, int whence);
 ssize_t               regfi_raw_read(REGFI_RAW_FILE* self, 
                                      void* buf, size_t count);
 _EXPORT
-off_t                 regfi_seek(REGFI_RAW_FILE* file_cb, 
-                                 off_t offset, int whence);
+uint64_t              regfi_seek(REGFI_RAW_FILE* file_cb, 
+                                 uint64_t offset, int whence);
 _EXPORT
 uint32_t              regfi_read(REGFI_RAW_FILE* file_cb, 

trunk/lib/regfi.c

@@ -573 +573 @@
 
 
-off_t regfi_raw_seek(REGFI_RAW_FILE* self, off_t offset, int whence)
-{
+int64_t regfi_raw_seek(REGFI_RAW_FILE* self, uint64_t offset, int whence)
+{
+  if(sizeof(off_t) == 4 && offset > 2147483647)
+  {
+    errno = EOVERFLOW;
+    return -1;
+  }
   return lseek(*(int*)self->state, offset, whence);
 }
@@ -587 +592 @@
  * Convenience function to wrap up the ugly callback stuff
  *****************************************************************************/
-off_t regfi_seek(REGFI_RAW_FILE* file_cb, off_t offset, int whence)
+uint64_t regfi_seek(REGFI_RAW_FILE* file_cb, uint64_t offset, int whence)
 {
   return file_cb->seek(file_cb, offset, whence);
@@ -1561 +1566 @@
   REGFI_HBIN* hbin = NULL;
   uint32_t hbin_off, cache_secret;
-  int32_t file_length;
+  int64_t file_length;
   bool rla;
 
@@ -1567 +1572 @@
    * and one hbin.
    */
-  file_length = file_cb->seek(file_cb, 0, SEEK_END);
+  file_length = regfi_seek(file_cb, 0, SEEK_END);
   if(file_length < REGFI_REGF_SIZE+REGFI_HBIN_ALLOC)
   {
@@ -1574 +1579 @@
     return NULL;
   }
-  file_cb->seek(file_cb, 0, SEEK_SET);
+  regfi_seek(file_cb, 0, SEEK_SET);
 
   if(output_encoding != REGFI_ENCODING_UTF8

trunk/python/pyregfi/__init__.py

@@ -177 +177 @@
 def GetLogMessages():
     msgs = regfi.regfi_log_get_str()
-    if msgs == None:
+    if not msgs:
         return ''
     return msgs.decode('utf-8')
@@ -625 +625 @@
     # @note Supplied file must be seekable
     def __init__(self, fh):
+        # The fileno method may not exist, or it may throw an exception
+        # when called if the file isn't backed with a descriptor.
+        fn = None
         try:
-            # The fileno method may not exist, or it may throw an exception
-            # when called if the file isn't backed with a descriptor.
-            if hasattr(fh, 'fileno'):
-                self.file = regfi.regfi_alloc(fh.fileno(), REGFI_ENCODING_UTF8)
-                return
+            # XXX: Native calls to Windows filenos don't seem to work.  
+            #      Need to investigate why.
+            if not is_win32 and hasattr(fh, 'fileno'):
+                fn = fh.fileno()
         except:
             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(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())
+
+        if fn != None:
+            self.file = regfi.regfi_alloc(fn, REGFI_ENCODING_UTF8)
+            if not self.file:
+                # XXX: switch to non-generic exception
+                raise Exception("Could not open registry file.  Current log:\n"
+                                + GetLogMessages())
+        else:
+            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(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):
@@ -703 +713 @@
     def __init__(self, hive):
         self._iter = regfi.regfi_iterator_new(hive.file, REGFI_ENCODING_UTF8)
-        if self._iter == None:
+        if not self._iter:
             raise Exception("Could not create iterator.  Current log:\n"
                             + GetLogMessages())

trunk/python/pyregfi/structures.py

@@ -13 +13 @@
 from ctypes import *
 
+is_win32 = hasattr(ctypes, 'windll')
 
 # XXX: can we always be sure enums are this size?
@@ -61 +62 @@
         except Exception:
             traceback.print_exc()
-            # XXX: os.EX_IOERR may not be available on Windoze
-            set_errno(os.EX_IOERR)
+            set_errno(74) # os.EX_IOERR
             return -1
 
@@ -76 +76 @@
         except Exception:
             traceback.print_exc()
-            # XXX: os.EX_IOERR may not be available on Windoze
-            set_errno(os.EX_IOERR)
+            set_errno(74) # os.EX_IOERR
             return -1
         return len(tmp)
@@ -84 +83 @@
 # Load libregfi according to platform
 regfi = None
-if hasattr(ctypes, 'windll'):
+if is_win32:
+    # XXX: Using C calling conventions on cross-compiled DLLs seems to work fine
+    #      on Windows, but I'm not sure if stdcall symbols are supported 
+    #      correctly for native Windows binaries...
     #regfi = ctypes.windll.libregfi
-    regfi = ctypes.WinDLL('libregfi.dll', use_errno=True)
-    CB_FACTORY = ctypes.WINFUNCTYPE
+    #CB_FACTORY = ctypes.WINFUNCTYPE
+    regfi = ctypes.CDLL('libregfi.dll', use_errno=True)
+    CB_FACTORY = ctypes.CFUNCTYPE
 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)
+seek_cb_type = CB_FACTORY(c_int64, POINTER(REGFI_RAW_FILE), c_uint64, c_int, use_errno=True)
+read_cb_type = CB_FACTORY(c_int64, POINTER(REGFI_RAW_FILE), POINTER(c_char), c_size_t, use_errno=True)