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

data/spec/ffi/custom_param_type.rb

@@ -0,0 +1,31 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+
+describe "functions with custom parameter types" do
+  before :each do
+
+    Custom_enum = Class.new do
+      extend FFI::DataConverter
+      ToNativeMap= { :a => 1, :b => 2 }
+      FromNativeMap = { 1 => :a, 2 => :b }
+
+      def self.native_type
+        @native_type_called = true
+        FFI::Type::INT32
+      end
+
+      def self.to_native(val, ctx)
+        @to_native_called = true
+        ToNativeMap[val]
+      end
+
+      def self.from_native(val, ctx)
+        @from_native_called = true
+        FromNativeMap[val]
+      end
+      def self.native_type_called?; @native_type_called; end
+      def self.from_native_called?; @from_native_called; end
+      def self.to_native_called?; @to_native_called; end
+    end
+
+  end
+end

data/spec/ffi/custom_type_spec.rb

@@ -0,0 +1,73 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+
+describe "functions with custom types" do
+  before :each do
+    
+    Custom_enum = Class.new do
+      extend FFI::DataConverter
+      ToNativeMap= { :a => 1, :b => 2, :c => 3 }
+      FromNativeMap = { 1 => :a, 2 => :b, 3 => :c }
+
+      def self.native_type
+        @native_type_called = true
+        FFI::Type::INT32
+      end
+
+      def self.to_native(val, ctx)
+        @to_native_called = true
+        ToNativeMap[val]
+      end
+
+      def self.from_native(val, ctx)
+        @from_native_called = true
+        FromNativeMap[val]
+      end
+      def self.native_type_called?; @native_type_called; end
+      def self.from_native_called?; @from_native_called; end
+      def self.to_native_called?; @to_native_called; end
+    end
+
+  end
+
+  it "can attach with custom return type" do
+    lambda do
+      m = Module.new do
+        extend FFI::Library
+        ffi_lib TestLibrary::PATH
+        attach_function :ret_s32, [ :int ], Custom_enum
+      end
+    end.should_not raise_error
+  end
+
+  it "should return object of correct type" do
+
+    m = Module.new do
+
+      extend FFI::Library
+      ffi_lib TestLibrary::PATH
+      attach_function :ret_s32, [ :int ], Custom_enum
+    end
+
+    m.ret_s32(1).is_a?(Symbol).should be_true
+  end
+
+  it "from_native should be called for result" do
+    m = Module.new do
+      extend FFI::Library
+      ffi_lib TestLibrary::PATH
+      attach_function :ret_s32, [ :int ], Custom_enum
+    end
+    m.ret_s32(1)
+    Custom_enum.from_native_called?.should be_true
+  end
+
+  it "to_native should be called for parameter" do
+    m = Module.new do
+      extend FFI::Library
+      ffi_lib TestLibrary::PATH
+      attach_function :ret_s32, [ Custom_enum ], :int
+    end
+    m.ret_s32(:a)
+    Custom_enum.to_native_called?.should be_true
+  end
+end

data/spec/ffi/enum_spec.rb

@@ -89,6 +89,25 @@ describe "A tagged typedef enum" do
     TestEnum3.test_tagged_typedef_enum4(:c15).should == :c15
     TestEnum3.test_tagged_typedef_enum4(:c16).should == :c16
   end
+
+  it "integers can be used instead of constants" do
+    TestEnum3.test_tagged_typedef_enum1(0).should == :c1
+    TestEnum3.test_tagged_typedef_enum1(1).should == :c2
+    TestEnum3.test_tagged_typedef_enum1(2).should == :c3
+    TestEnum3.test_tagged_typedef_enum1(3).should == :c4
+    TestEnum3.test_tagged_typedef_enum2(42).should == :c5
+    TestEnum3.test_tagged_typedef_enum2(43).should == :c6
+    TestEnum3.test_tagged_typedef_enum2(44).should == :c7
+    TestEnum3.test_tagged_typedef_enum2(45).should == :c8
+    TestEnum3.test_tagged_typedef_enum3(42).should == :c9
+    TestEnum3.test_tagged_typedef_enum3(43).should == :c10
+    TestEnum3.test_tagged_typedef_enum3(4242).should == :c11
+    TestEnum3.test_tagged_typedef_enum3(4243).should == :c12
+    TestEnum3.test_tagged_typedef_enum4(42).should == :c13
+    TestEnum3.test_tagged_typedef_enum4(4242).should == :c14
+    TestEnum3.test_tagged_typedef_enum4(424242).should == :c15
+    TestEnum3.test_tagged_typedef_enum4(42424242).should == :c16
+  end
 end
 
 describe "All enums" do

data/spec/ffi/ffi_spec.rb

@@ -0,0 +1,24 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+
+describe "FFI" do
+
+  describe ".map_library_name" do
+
+    let(:prefix) { FFI::Platform::LIBPREFIX }
+    let(:suffix) { FFI::Platform::LIBSUFFIX }
+    
+    it "should add platform library extension if not present" do
+      FFI.map_library_name("#{prefix}dummy").should == "#{prefix}dummy.#{suffix}"
+    end
+
+    it "should add platform library extension even if lib suffix is present in name" do
+      FFI.map_library_name("#{prefix}dummy_with_#{suffix}").should == "#{prefix}dummy_with_#{suffix}.#{suffix}"
+    end
+
+    it "should return Platform::LIBC when called with 'c'" do
+      FFI.map_library_name('c').should == FFI::Library::LIBC
+    end
+
+  end
+
+end

data/spec/ffi/pointer_spec.rb

@@ -177,7 +177,21 @@ describe "AutoPointer" do
     end
     AutoPointerTestHelper.gc_everything loop_count
   end
+
+  it "can be used as the return type of a function" do
+    lambda do
+      Module.new do
+        extend FFI::Library
+        ffi_lib TestLibrary::PATH
+        class CustomAutoPointer < FFI::AutoPointer
+          def self.release(ptr); end
+        end
+        attach_function :ptr_from_address, [ FFI::Platform::ADDRESS_SIZE == 32 ? :uint : :ulong_long ], CustomAutoPointer
+      end
+    end.should_not raise_error
+  end
 end
+
 describe "AutoPointer#new" do
   class AutoPointerSubclass < FFI::AutoPointer
     def self.release(ptr); end
@@ -193,3 +207,4 @@ describe "AutoPointer#new" do
   end
 
 end
+

data/spec/ffi/rbx/memory_pointer_spec.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require "rubygems"
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
 
@@ -13,7 +14,12 @@ describe "MemoryPointer" do
     m = FFI::MemoryPointer.from_string("FFI is Awesome")
     m.type_size.should == 15
   end
-  
+
+  it "makes a pointer from a string with multibyte characters" do
+    m = FFI::MemoryPointer.from_string("ぱんだ")
+    m.type_size.should == 10
+  end
+
   it "reads back a string" do
     m = FFI::MemoryPointer.from_string("FFI is Awesome")
     m.read_string.should == "FFI is Awesome"

data/spec/ffi/strptr_spec.rb

@@ -0,0 +1,36 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+
+describe "functions returning :strptr" do
+  it "can attach function with :strptr return type" do
+    lambda do
+      m = Module.new do
+        extend FFI::Library
+        ffi_lib FFI::Library::LIBC
+        attach_function :strdup, [ :string ], :strptr
+      end
+    end.should_not raise_error
+  end
+
+  module StrPtr
+    extend FFI::Library
+    ffi_lib FFI::Library::LIBC
+    attach_function :strdup, [ :string ], :strptr
+    attach_function :free, [ :pointer ], :void
+  end
+
+  it "should return [ String, Pointer ]" do
+    result = StrPtr.strdup("test")
+    result[0].is_a?(String).should be_true
+    result[1].is_a?(FFI::Pointer).should be_true
+  end
+
+  it "should return the correct value" do
+    result = StrPtr.strdup("test")
+    result[0].should == "test"
+  end
+
+  it "should return non-NULL pointer" do
+    result = StrPtr.strdup("test")
+    result[1].null?.should be_false
+  end
+end

data/spec/ffi/struct_packed_spec.rb

@@ -0,0 +1,46 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+
+describe FFI::Struct do
+  it "packed :char followed by :int should have size of 5" do
+    Class.new(FFI::Struct) do
+      packed
+      layout :c, :char, :i, :int
+    end.size.should == 5
+  end
+
+  it "packed :char followed by :int should have alignment of 1" do
+    Class.new(FFI::Struct) do
+      packed
+      layout :c, :char, :i, :int
+    end.alignment.should == 1
+  end
+
+  it "packed(2) :char followed by :int should have size of 6" do
+    Class.new(FFI::Struct) do
+      packed 2
+      layout :c, :char, :i, :int
+    end.size.should == 6
+  end
+
+  it "packed(2)  :char followed by :int should have alignment of 2" do
+    Class.new(FFI::Struct) do
+      packed 2
+      layout :c, :char, :i, :int
+    end.alignment.should == 2
+  end
+
+  it "packed :short followed by int should have size of 6" do
+    Class.new(FFI::Struct) do
+      packed
+      layout :s, :short, :i, :int
+    end.size.should == 6
+  end
+
+  it "packed :short followed by int should have alignment of 1" do
+    Class.new(FFI::Struct) do
+      packed
+      layout :s, :short, :i, :int
+    end.alignment.should == 1
+  end
+
+end

data/spec/ffi/struct_spec.rb

@@ -158,7 +158,7 @@ describe "Struct tests" do
       class TestStruct < FFI::Struct
         layout :c, :char
       end
-      attach_function :struct_field_s8, [ TestStruct ], :char
+      attach_function :struct_field_s8, [ TestStruct.in ], :char
     end
   end
   it "Can use Struct subclass as IN parameter type" do
@@ -327,8 +327,8 @@ describe "Struct tests" do
       layout :add, :add,
         :sub, :sub
     end
-    attach_function :struct_call_add_cb, [TestStruct, :int, :int], :int
-    attach_function :struct_call_sub_cb, [TestStruct, :int, :int], :int
+    attach_function :struct_call_add_cb, [TestStruct.in, :int, :int], :int
+    attach_function :struct_call_sub_cb, [TestStruct.in, :int, :int], :int
   end
   it "Can have CallbackInfo struct field" do
       s = CallbackMember::TestStruct.new
@@ -336,8 +336,8 @@ describe "Struct tests" do
       sub_proc = lambda { |a, b| a-b }
       s[:add] = add_proc
       s[:sub] = sub_proc
-      CallbackMember.struct_call_add_cb(s.pointer, 40, 2).should == 42
-      CallbackMember.struct_call_sub_cb(s.pointer, 44, 2).should == 42
+      CallbackMember.struct_call_add_cb(s, 40, 2).should == 42
+      CallbackMember.struct_call_sub_cb(s, 44, 2).should == 42
   end
   it "Can return its members as a list" do
     class TestStruct < FFI::Struct
@@ -621,4 +621,18 @@ describe "Struct allocation" do
     p.put_uint(4, 0xdeadbeef)
     S.new(p[1])[:i].should == 0xdeadbeef
   end
+
+  it "null? should be true when initialized with NULL pointer" do
+    class S < FFI::Struct
+      layout :i, :uint
+    end
+    S.new(Pointer::NULL).null?.should be_true
+  end
+
+  it "null? should be false when initialized with non-NULL pointer" do
+    class S < FFI::Struct
+      layout :i, :uint
+    end
+    S.new(MemoryPointer.new(S)).null?.should be_false
+  end
 end

data/spec/ffi/typedef_spec.rb

@@ -45,4 +45,18 @@ describe "Custom type definitions" do
     s[:a] = 0x12345678
     s.pointer.get_uint(0).should == 0x12345678
   end
+
+  it "attach_function after a typedef should not reject normal types" do
+    lambda do
+      Module.new do
+        extend FFI::Library
+        # enum() will insert a custom typedef called :foo for the enum
+        enum :foo, [ :a, :b ]
+        typedef :int, :bar
+        
+        ffi_lib TestLibrary::PATH
+        attach_function :ptr_ret_int32_t, [ :string, :foo ], :bar
+      end
+    end.should_not raise_error
+  end
 end

data/tasks/setup.rb

@@ -171,7 +171,8 @@ HAVE_GIT = (Dir.entries(Dir.pwd).include?('.git') and
 # Add bones as a development dependency
 #
 if HAVE_BONES
-  PROJ.gem.development_dependencies << ['bones', ">= #{Bones::VERSION}"]
+  bones_version = defined?(Bones::VERSION) ? Bones::VERSION : Bones.version
+  PROJ.gem.development_dependencies << ['bones', ">= #{bones_version}"]
 end
 
 # Reads a file at +path+ and spits out an array of the +paragraphs+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ffi
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  version: 1.0.1
 platform: x86-mingw32
 authors: 
 - Wayne Meissner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-10 00:00:00 +10:00
+date: 2010-12-03 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,14 +45,13 @@ files:
 - ext/ffi_c/AbstractMemory.h
 - ext/ffi_c/ArrayType.c
 - ext/ffi_c/ArrayType.h
-- ext/ffi_c/AutoPointer.c
-- ext/ffi_c/AutoPointer.h
 - ext/ffi_c/Buffer.c
 - ext/ffi_c/Call.c
 - ext/ffi_c/Call.h
 - ext/ffi_c/ClosurePool.c
 - ext/ffi_c/ClosurePool.h
 - ext/ffi_c/compat.h
+- ext/ffi_c/DataConverter.c
 - ext/ffi_c/DynamicLibrary.c
 - ext/ffi_c/DynamicLibrary.h
 - ext/ffi_c/endian.h
@@ -318,6 +317,8 @@ files:
 - ext/ffi_c/libffi.darwin.mk
 - ext/ffi_c/libffi.gnu.mk
 - ext/ffi_c/libffi.mk
+- ext/ffi_c/MappedType.c
+- ext/ffi_c/MappedType.h
 - ext/ffi_c/MemoryPointer.c
 - ext/ffi_c/MemoryPointer.h
 - ext/ffi_c/MethodHandle.c
@@ -329,6 +330,8 @@ files:
 - ext/ffi_c/rbffi.h
 - ext/ffi_c/Struct.c
 - ext/ffi_c/Struct.h
+- ext/ffi_c/StructByReference.c
+- ext/ffi_c/StructByReference.h
 - ext/ffi_c/StructByValue.c
 - ext/ffi_c/StructByValue.h
 - ext/ffi_c/StructLayout.c
@@ -351,6 +354,7 @@ files:
 - lib/ffi/platform.rb
 - lib/ffi/pointer.rb
 - lib/ffi/struct.rb
+- lib/ffi/struct_layout_builder.rb
 - lib/ffi/tools/const_generator.rb
 - lib/ffi/tools/generator.rb
 - lib/ffi/tools/generator_task.rb
@@ -360,11 +364,15 @@ files:
 - lib/ffi/union.rb
 - lib/ffi/variadic.rb
 - lib/ffi.rb
+- spec/ffi/async_callback_spec.rb
 - spec/ffi/bool_spec.rb
 - spec/ffi/buffer_spec.rb
 - spec/ffi/callback_spec.rb
+- spec/ffi/custom_param_type.rb
+- spec/ffi/custom_type_spec.rb
 - spec/ffi/enum_spec.rb
 - spec/ffi/errno_spec.rb
+- spec/ffi/ffi_spec.rb
 - spec/ffi/function_spec.rb
 - spec/ffi/library_spec.rb
 - spec/ffi/managed_struct_spec.rb
@@ -376,8 +384,10 @@ files:
 - spec/ffi/rbx/struct_spec.rb
 - spec/ffi/spec_helper.rb
 - spec/ffi/string_spec.rb
+- spec/ffi/strptr_spec.rb
 - spec/ffi/struct_callback_spec.rb
 - spec/ffi/struct_initialize_spec.rb
+- spec/ffi/struct_packed_spec.rb
 - spec/ffi/struct_spec.rb
 - spec/ffi/typedef_spec.rb
 - spec/ffi/union_spec.rb
@@ -395,8 +405,7 @@ files:
 - tasks/spec.rake
 - tasks/svn.rake
 - tasks/test.rake
-- lib/1.8/ffi_c.so
-- lib/1.9/ffi_c.so
+- lib/ffi_c.so
 has_rdoc: true
 homepage: http://wiki.github.com/ffi/ffi
 licenses: []