X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=uffi%2Fclsql-uffi.lisp;h=76dfd043c7aac23907eb9f530c745c94518cb4a7;hp=e08c157432c1b8fb5feca9a860d0b938cdedda71;hb=eabede9da3e61ef5191b601dcf9b30f30f613f3e;hpb=3b0f3c991b373e3f1734bc624ba6e04ccafea357

diff --git a/uffi/clsql-uffi.lisp b/uffi/clsql-uffi.lisp
index e08c157..76dfd04 100644
--- a/uffi/clsql-uffi.lisp
+++ b/uffi/clsql-uffi.lisp
@@ -71,6 +71,20 @@
      (radix :int))
   :returning :unsigned-long)
 
+#-windows
+(uffi:def-function ("strtoull" c-strtoull)
+    ((str (* :unsigned-char))
+     (endptr (* :unsigned-char))
+     (radix :int))
+  :returning :unsigned-long-long)
+
+#+windows
+(uffi:def-function ("_strtoui64" c-strtoull)
+    ((str (* :unsigned-char))
+     (endptr (* :unsigned-char))
+     (radix :int))
+  :returning :unsigned-long-long)
+
 (uffi:def-function "atol"
     ((str (* :unsigned-char)))
   :returning :long)
@@ -108,47 +122,55 @@
            (type char-ptr-def char-ptr))
   (c-strtoul char-ptr uffi:+null-cstring-pointer+ 10))
 
-(defun convert-raw-field (char-ptr types index &optional length)
+(defun strtoull (char-ptr)
   (declare (optimize (speed 3) (safety 0) (space 0))
            (type char-ptr-def char-ptr))
-  (let ((type (if (consp types)
-                  (nth index types)
-                  types)))
-    (cond
-      ((uffi:null-pointer-p char-ptr)
-       nil)
+  (c-strtoull char-ptr uffi:+null-cstring-pointer+ 10))
+
+(defun convert-raw-field (char-ptr type &key length encoding)
+ (declare (optimize (speed 3) (safety 0) (space 0))
+          (type char-ptr-def char-ptr))
+ (cond
+   ((uffi:null-pointer-p char-ptr)
+    nil)
+   (t
+    (case type
+      (:double
+       (atof char-ptr))
+      (:int
+       (atol char-ptr))
+      (:int32
+       (atoi char-ptr))
+      (:uint32
+       (strtoul char-ptr))
+      (:uint
+       (strtoul char-ptr))
+      ((:int64 :uint64)
+       (strtoull char-ptr)
+       #|(uffi:with-foreign-object (high32-ptr :unsigned-int)
+         (let ((low32 (atol64 char-ptr high32-ptr))
+               (high32 (uffi:deref-pointer high32-ptr :unsigned-int)))
+           (if (zerop high32)
+               low32
+               (make-64-bit-integer high32 low32))))|#
+)
+      (:blob
+       (if length
+           (uffi:convert-from-foreign-usb8 char-ptr length)
+           (error "Can't return blob since length is not specified.")))
       (t
-       (case type
-         (:double
-          (atof char-ptr))
-         (:int
-          (atol char-ptr))
-         (:int32
-          (atoi char-ptr))
-         (:uint32
-          (strtoul char-ptr))
-         (:uint
-          (strtoul char-ptr))
-         ((:int64 :uint64)
-          (uffi:with-foreign-object (high32-ptr :unsigned-int)
-            (let ((low32 (atol64 char-ptr high32-ptr))
-                  (high32 (uffi:deref-pointer high32-ptr :unsigned-int)))
-              (if (zerop high32)
-                  low32
-                (make-64-bit-integer high32 low32)))))
-         (:blob
-          (if length
-              (uffi:convert-from-foreign-usb8 char-ptr length)
-            (error "Can't return blob since length is not specified.")))
-         (t
-          ;; sb-unicode still broken with converting with length, assume
-          ;; that string is null terminated
-          #+sb-unicode
-          (uffi:convert-from-foreign-string char-ptr :locale :none)
-          #-sb-unicode
-          (if length
-              (uffi:convert-from-foreign-string char-ptr
-                                                :null-terminated-p nil
-                                                :length length)
-            (uffi:convert-from-foreign-string char-ptr))))))))
-
+       (if encoding
+           (if length
+               (uffi:convert-from-foreign-string char-ptr
+                                                 :null-terminated-p nil
+                                                 :length length
+                                                 :encoding encoding)
+               (uffi:convert-from-foreign-string char-ptr
+                                                 :null-terminated-p t
+                                                 :encoding encoding))
+           (if length
+               (uffi:convert-from-foreign-string char-ptr
+                                                 :null-terminated-p nil
+                                                 :length length)
+               (uffi:convert-from-foreign-string char-ptr
+                                                 :null-terminated-p t))))))))