ffi 0.6.3-x86-mingw32 → 1.0.1-x86-mingw32

data/ext/ffi_c/Type.h

@@ -1,28 +1,19 @@
 /*
  * Copyright (c) 2009, Wayne Meissner
- * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * This file is part of ruby-ffi.
  *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * * The name of the author or authors may not be used to endorse or promote
- *   products derived from this software without specific prior written permission.
+ * This code is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3 only, as
+ * published by the Free Software Foundation.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * version 3 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef RBFFI_TYPE_H
@@ -44,8 +35,7 @@ struct Type_ {
     ffi_type* ffiType;
 };
 
-extern VALUE rbffi_TypeClass, rbffi_EnumTypeClass;
-extern int rbffi_Type_GetIntValue(VALUE type);
+extern VALUE rbffi_TypeClass;
 extern VALUE rbffi_Type_Lookup(VALUE type);
 extern VALUE rbffi_Type_Find(VALUE type);
 

data/ext/ffi_c/Types.c

@@ -34,9 +34,10 @@
 #include "StructByValue.h"
 #include "Types.h"
 #include "Struct.h"
+#include "MappedType.h"
 #include "MemoryPointer.h"
 
-static ID id_find = 0;
+static ID id_from_native = 0;
 
 
 VALUE
@@ -77,13 +78,14 @@ rbffi_NativeValue_ToRuby(Type* type, VALUE rbType, const void* ptr, VALUE enums)
             return rbffi_Pointer_NewInstance(*(void **) ptr);
         case NATIVE_BOOL:
             return ((unsigned char) *(ffi_arg *) ptr) ? Qtrue : Qfalse;
-        case NATIVE_ENUM:
-            return rb_funcall(rbType, id_find, 1, INT2NUM((unsigned int) *(ffi_arg *) ptr));
         
         case NATIVE_FUNCTION:
         case NATIVE_CALLBACK: {
-            return rbffi_Function_NewInstance(rbType, rbffi_Pointer_NewInstance(*(void **) ptr));
+            return *(void **) ptr != NULL 
+                    ? rbffi_Function_NewInstance(rbType, rbffi_Pointer_NewInstance(*(void **) ptr))
+                    : Qnil;
         }
+
         case NATIVE_STRUCT: {
             StructByValue* sbv = (StructByValue *)type;
             AbstractMemory* mem;
@@ -95,6 +97,19 @@ rbffi_NativeValue_ToRuby(Type* type, VALUE rbType, const void* ptr, VALUE enums)
             return rb_class_new_instance(1, &rbMemory, sbv->rbStructClass);
         }
 
+        case NATIVE_MAPPED: {
+            // For mapped types, first convert to the real native type, then upcall to
+            // ruby to convert to the expected return type
+            MappedType* m;
+            VALUE values[2];
+
+            Data_Get_Struct(rbType, MappedType, m);
+            values[0] = rbffi_NativeValue_ToRuby(m->type, m->rbType, ptr, enums);
+            values[1] = Qnil;
+
+            return rb_funcall2(m->rbConverter, id_from_native, 2, values);
+        }
+    
         default:
             rb_raise(rb_eRuntimeError, "Unknown type: %d", type->nativeType);
             return Qnil;
@@ -104,6 +119,6 @@ rbffi_NativeValue_ToRuby(Type* type, VALUE rbType, const void* ptr, VALUE enums)
 void
 rbffi_Types_Init(VALUE moduleFFI)
 {
-    id_find = rb_intern("find");
+    id_from_native = rb_intern("from_native");
 }
 

data/ext/ffi_c/Types.h

@@ -57,20 +57,20 @@ typedef enum {
     NATIVE_CHAR_ARRAY,
     NATIVE_BOOL,
     
-    /**
-     * An immutable string.  Nul terminated, but only copies in to the native function
-     */
+    /** An immutable string.  Nul terminated, but only copies in to the native function */
     NATIVE_STRING,
-    /** A Rubinus :string arg - copies data both ways, and nul terminates */
-    NATIVE_RBXSTRING,
+    
     /** The function takes a variable number of arguments */
     NATIVE_VARARGS,
-    /** A typedef-ed enum */
-    NATIVE_ENUM,
+    
     /** Struct-by-value param or result */
     NATIVE_STRUCT,
+
     /** An array type definition */
     NATIVE_ARRAY,
+
+    /** Custom native type */
+    NATIVE_MAPPED,
 } NativeType;
 
 #include <ffi.h>

data/ext/ffi_c/Variadic.c

@@ -155,7 +155,7 @@ variadic_invoke(VALUE self, VALUE parameterTypes, VALUE parameterValues)
     void** ffiValues;
     ffi_type** ffiParamTypes;
     ffi_type* ffiReturnType;
-    NativeType* paramTypes;
+    Type** paramTypes;
     VALUE* argv;
     int paramCount = 0, i;
     ffi_status ffiStatus;
@@ -165,7 +165,7 @@ variadic_invoke(VALUE self, VALUE parameterTypes, VALUE parameterValues)
 
     Data_Get_Struct(self, VariadicInvoker, invoker);
     paramCount = RARRAY_LEN(parameterTypes);
-    paramTypes = ALLOCA_N(NativeType, paramCount);
+    paramTypes = ALLOCA_N(Type *, paramCount);
     ffiParamTypes = ALLOCA_N(ffi_type *, paramCount);
     params = ALLOCA_N(FFIStorage, paramCount);
     ffiValues = ALLOCA_N(void*, paramCount);
@@ -173,36 +173,40 @@ variadic_invoke(VALUE self, VALUE parameterTypes, VALUE parameterValues)
     retval = alloca(MAX(invoker->returnType->ffiType->size, FFI_SIZEOF_ARG));
 
     for (i = 0; i < paramCount; ++i) {
-        VALUE entry = rb_ary_entry(parameterTypes, i);
-        int paramType = rbffi_Type_GetIntValue(entry);
-        Type* type;
-        Data_Get_Struct(entry, Type, type);
+        VALUE rbType = rb_ary_entry(parameterTypes, i);
+        
+        if (!rb_obj_is_kind_of(rbType, rbffi_TypeClass)) {
+            rb_raise(rb_eTypeError, "wrong type.  Expected (FFI::Type)");
+        }
+        Data_Get_Struct(rbType, Type, paramTypes[i]);
 
-        switch (paramType) {
+        switch (paramTypes[i]->nativeType) {
             case NATIVE_INT8:
             case NATIVE_INT16:
             case NATIVE_INT32:
-            case NATIVE_ENUM:
-                paramType = NATIVE_INT32;
-                ffiParamTypes[i] = &ffi_type_sint;
+                rbType = rb_const_get(rbffi_TypeClass, rb_intern("INT32"));
+                Data_Get_Struct(rbType, Type, paramTypes[i]);
                 break;
             case NATIVE_UINT8:
             case NATIVE_UINT16:
             case NATIVE_UINT32:
-                paramType = NATIVE_UINT32;
-                ffiParamTypes[i] = &ffi_type_uint;
+                rbType = rb_const_get(rbffi_TypeClass, rb_intern("UINT32"));
+                Data_Get_Struct(rbType, Type, paramTypes[i]);
                 break;
+            
             case NATIVE_FLOAT32:
-                paramType = NATIVE_FLOAT64;
-                ffiParamTypes[i] = &ffi_type_double;
+                rbType = rb_const_get(rbffi_TypeClass, rb_intern("DOUBLE"));
+                Data_Get_Struct(rbType, Type, paramTypes[i]);
                 break;
+
             default:
-                ffiParamTypes[i] = type->ffiType;
                 break;
         }
-        paramTypes[i] = paramType;
+        
+        
+        ffiParamTypes[i] = paramTypes[i]->ffiType;
         if (ffiParamTypes[i] == NULL) {
-            rb_raise(rb_eArgError, "Invalid parameter type #%x", paramType);
+            rb_raise(rb_eArgError, "Invalid parameter type #%x", paramTypes[i]);
         }
         argv[i] = rb_ary_entry(parameterValues, i);
     }

data/ext/ffi_c/extconf.rb

@@ -15,9 +15,13 @@ unless Config::CONFIG['host_os'] =~ /mswin32|mingw32/
 end
 
 have_func('rb_thread_blocking_region')
+have_func('ruby_thread_has_gvl_p')
+have_func('ruby_native_thread_p')
+have_func('rb_thread_call_with_gvl')
 
 $defs << "-DHAVE_EXTCONF_H" if $defs.empty? # needed so create_header works
 $defs << "-DUSE_INTERNAL_LIBFFI" unless libffi_ok
+$defs << "-DRUBY_1_9" if RUBY_VERSION >= "1.9.0"
 
 create_header
 

data/ext/ffi_c/ffi.c

@@ -35,9 +35,9 @@
 #include "AbstractMemory.h"
 #include "Pointer.h"
 #include "MemoryPointer.h"
-#include "AutoPointer.h"
 #include "Struct.h"
 #include "StructByValue.h"
+#include "StructByReference.h"
 #include "DynamicLibrary.h"
 #include "Platform.h"
 #include "Types.h"
@@ -47,6 +47,7 @@
 #include "MethodHandle.h"
 #include "Call.h"
 #include "ArrayType.h"
+#include "MappedType.h"
 
 void Init_ffi_c(void);
 
@@ -59,8 +60,12 @@ Init_ffi_c(void) {
     rbffi_FFIModule = moduleFFI = rb_define_module("FFI");
     rb_global_variable(&moduleFFI);
 
+
     // FFI::Type needs to be initialized before most other classes
     rbffi_Type_Init(moduleFFI);
+
+    rbffi_DataConverter_Init(moduleFFI);
+
     rbffi_ArrayType_Init(moduleFFI);
     rbffi_LastError_Init(moduleFFI);
     rbffi_Call_Init(moduleFFI);
@@ -69,14 +74,15 @@ Init_ffi_c(void) {
     rbffi_Platform_Init(moduleFFI);
     rbffi_AbstractMemory_Init(moduleFFI);
     rbffi_Pointer_Init(moduleFFI);
-    rbffi_AutoPointer_Init(moduleFFI);
     rbffi_Function_Init(moduleFFI);
     rbffi_MemoryPointer_Init(moduleFFI);
     rbffi_Buffer_Init(moduleFFI);
     rbffi_StructByValue_Init(moduleFFI);
+    rbffi_StructByReference_Init(moduleFFI);
     rbffi_Struct_Init(moduleFFI);
     rbffi_DynamicLibrary_Init(moduleFFI);
     rbffi_Variadic_Init(moduleFFI);
     rbffi_Types_Init(moduleFFI);
+    rbffi_MappedType_Init(moduleFFI);
 }
 

data/ext/ffi_c/rbffi.h

@@ -15,6 +15,7 @@ extern void rbffi_Type_Init(VALUE ffiModule);
 extern void rbffi_Buffer_Init(VALUE ffiModule);
 extern void rbffi_Invoker_Init(VALUE ffiModule);
 extern void rbffi_Variadic_Init(VALUE ffiModule);
+extern void rbffi_DataConverter_Init(VALUE ffiModule);
 extern VALUE rbffi_AbstractMemoryClass, rbffi_InvokerClass;
 extern int rbffi_type_size(VALUE type);
 

data/lib/ffi/autopointer.rb

@@ -1,34 +1,27 @@
 #
-# Copyright (C) 2008, 2009 Wayne Meissner
+# Copyright (C) 2008-2010 Wayne Meissner
 # Copyright (C) 2008 Mike Dalessio
 #
 # All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# This file is part of ruby-ffi.
 #
-# * Redistributions of source code must retain the above copyright notice, this
-#   list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright notice
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * Neither the name of the Evan Phoenix nor the names of its contributors
-#   may be used to endorse or promote products derived from this software
-#   without specific prior written permission.
+# This code is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License version 3 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# version 3 for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 module FFI
   class AutoPointer < Pointer
+    extend DataConverter
 
     # call-seq:
     #   AutoPointer.new(pointer, method)     => the passed Method will be invoked at GC time
@@ -57,6 +50,7 @@ module FFI
     # release(), which by default does nothing.
     #
     def initialize(ptr, proc=nil, &block)
+      super(ptr)
       raise TypeError, "Invalid pointer" if ptr.nil? || !ptr.kind_of?(Pointer) \
         || ptr.kind_of?(MemoryPointer) || ptr.kind_of?(AutoPointer)
 
@@ -69,7 +63,6 @@ module FFI
                     DefaultReleaser.new(ptr, self.class)
                   end
 
-      self.parent = ptr
       ObjectSpace.define_finalizer(self, @releaser)
       self
     end
@@ -115,6 +108,14 @@ module FFI
       end
     end
 
+    def self.native_type
+      raise RuntimeError.new("no release method defined for #{self.inspect}") unless self.respond_to?(:release)
+      Type::POINTER
+    end
+
+    def self.from_native(val, ctx)
+      self.new(val)
+    end
   end
 
 end

data/lib/ffi/enum.rb

@@ -1,30 +1,23 @@
 #
+# Copyright (C) 2009, 2010 Wayne Meissner
 # Copyright (C) 2009 Luc Heinrich
 #
 # All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# This file is part of ruby-ffi.
 #
-# * Redistributions of source code must retain the above copyright notice, this
-#   list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright notice
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * Neither the name of the Evan Phoenix nor the names of its contributors
-#   may be used to endorse or promote products derived from this software
-#   without specific prior written permission.
+# This code is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License version 3 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# version 3 for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 module FFI
 
@@ -57,6 +50,8 @@ module FFI
   end
 
   class Enum
+    include DataConverter
+
     attr_reader :tag
 
     def initialize(info, tag=nil)
@@ -99,8 +94,28 @@ module FFI
     def symbol_map
       @kv_map
     end
+    
     alias to_h symbol_map
+    alias to_hash symbol_map
+
+    def native_type
+      Type::INT
+    end
+
+    def to_native(val, ctx)
+      @kv_map[val] || if val.is_a?(Integer)
+        val
+      elsif val.respond_to?(:to_int)
+        val.to_int
+      else
+        raise ArgumentError, "invalid enum value, #{val.inspect}"
+      end
+    end
+
+    def from_native(val, ctx)
+      @vk_map[val] || val
+    end
 
   end
 
-end
+end

data/lib/ffi/errno.rb

@@ -1,3 +1,23 @@
+#
+# Copyright (C) 2008-2010 Wayne Meissner
+#
+# All rights reserved.
+#
+# This file is part of ruby-ffi.
+#
+# This code is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License version 3 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# version 3 for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 module FFI
   def self.errno
     FFI::LastError.error