ffi 1.6.0-x86-mingw32 → 1.7.0-x86-mingw32

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'rubygems/package_task'
+require 'rubygems/tasks'
 require 'rbconfig'
 
 USE_RAKE_COMPILER = (RUBY_PLATFORM =~ /java/) ? false : true
@@ -64,8 +65,6 @@ OS = case RbConfig::CONFIG['host_os'].downcase
     RbConfig::CONFIG['host_os'].downcase
   end
 
-CC = ENV['CC'] || RbConfig::CONFIG['CC'] || "gcc"
-
 GMAKE = system('which gmake >/dev/null') && 'gmake' || 'make'
 
 LIBTEST = "build/libtest.#{LIBEXT}"
@@ -76,12 +75,6 @@ def gem_spec
   @gem_spec ||= Gem::Specification.load('ffi.gemspec')
 end
 
-Gem::PackageTask.new(gem_spec) do |pkg|
-  pkg.need_zip = true
-  pkg.need_tar = true
-  pkg.package_dir = 'pkg'
-end
-
 TEST_DEPS = [ LIBTEST ]
 if RUBY_PLATFORM == "java"
   desc "Run all specs"
@@ -109,25 +102,15 @@ end
 desc "Build all packages"
 task :package => 'gem:package'
 
-desc "Install the gem locally"
-task :install => 'gem:install'
 
-namespace :gem do
-  task :install => :gem do
-    ruby %{ -S gem install pkg/ffi-#{gem_spec.version}.gem }
-  end
-end
-
-desc "Clean all built files"
-task :distclean => :clobber do
-  FileUtils.rm_rf('build')
-  FileUtils.rm_rf(Dir["lib/**/ffi_c.#{RbConfig::CONFIG['DLEXT']}"])
-  FileUtils.rm_rf(Dir["lib/**/ffi_c.so"])
-  FileUtils.rm_rf('lib/ffi/types.conf')
-  FileUtils.rm_rf('conftest.dSYM')
-  FileUtils.rm_rf('pkg')
-end
+CLOBBER.include 'build'
+CLOBBER.include FileList['lib/**/ffi_c.so']
+CLOBBER.include FileList["lib/**/ffi_c.#{RbConfig::CONFIG['DLEXT']}"]
+CLOBBER.include 'lib/ffi/types.conf'
+CLOBBER.include 'conftest.dSYM'
+CLOBBER.include 'pkg'
 
+task :distclean => :clobber
 
 desc "Build the native test lib"
 file "build/libtest.#{LIBEXT}" => FileList['libtest/**/*.[ch]'] do
@@ -200,18 +183,30 @@ if USE_RAKE_COMPILER
     # ext.lib_dir = BUILD_DIR                                 # put binaries into this folder.
     ext.tmp_dir = BUILD_DIR                                   # temporary folder used during compilation.
     ext.cross_compile = true                                  # enable cross compilation (requires cross compile toolchain)
-    ext.cross_platform = 'i386-mingw32'                       # forces the Windows platform instead of the default one
+    ext.cross_platform = %w[i386-mingw32 x64-mingw32]                     # forces the Windows platform instead of the default one
   end
 
-  task 'copy:ffi_c:i386-mingw32:1.9.3' do |t|
-    sh "i686-w64-mingw32-strip -S lib/1.9/ffi_c.so"
-  end
-  
-  task 'copy:ffi_c:i386-mingw32:2.0.0' do |t|
-    sh "i686-w64-mingw32-strip -S lib/2.0/ffi_c.so"
+  ENV['RUBY_CC_VERSION'].to_s.split(':').each do |ruby_version|
+    task "copy:ffi_c:i386-mingw32:#{ruby_version}" do |t|
+      %w[lib #{BUILD_DIR}/i386-mingw32/stage/lib].each do |dir| 
+        if File.exists?("#{dir}/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so")
+          sh "i686-w64-mingw32-strip -S #{dir}/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so"
+        end
+      end
+    end
+
+    task "copy:ffi_c:x64-mingw32:#{ruby_version}" do |t|
+      if File.exists?("#{BUILD_DIR}/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so")
+        sh "x86_64-w64-mingw32-strip -S #{dir}/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so"
+      end
+    end
   end
 end
 
+Gem::Tasks.new do |t|
+  t.scm.tag.format = '%s'
+end
+
 begin
   require 'yard'
 

data/ext/ffi_c/MethodHandle.c

@@ -77,7 +77,7 @@ typedef int bool;
 static bool prep_trampoline(void* ctx, void* code, Closure* closure, char* errmsg, size_t errmsgsize);
 static long trampoline_size(void);
 
-#if defined(__x86_64__) && defined(__GNUC__) && !defined(__sun)
+#if defined(__x86_64__) && (defined(__linux__) || defined(__APPLE__))
 # define CUSTOM_TRAMPOLINE 1
 #endif
 

data/ext/ffi_c/Pointer.c

@@ -396,6 +396,16 @@ ptr_free(VALUE self)
     return self;
 }
 
+static VALUE
+ptr_type_size(VALUE self)
+{
+    Pointer* ptr;
+
+    Data_Get_Struct(self, Pointer, ptr);
+    
+    return INT2NUM(ptr->memory.typeSize);
+}
+
 /*
  * call-seq: ptr.autorelease = autorelease
  * @param [Boolean] autorelease
@@ -481,6 +491,7 @@ rbffi_Pointer_Init(VALUE moduleFFI)
     rb_define_method(rbffi_PointerClass, "autorelease=", ptr_autorelease, 1);
     rb_define_method(rbffi_PointerClass, "autorelease?", ptr_autorelease_p, 0);
     rb_define_method(rbffi_PointerClass, "free", ptr_free, 0);
+    rb_define_method(rbffi_PointerClass, "type_size", ptr_type_size, 0);
 
     rbffi_NullPointerSingleton = rb_class_new_instance(1, &rbNullAddress, rbffi_PointerClass);
     /*

data/ffi.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = 'ffi'
-  s.version = '1.6.0'
+  s.version = '1.7.0'
   s.author = 'Wayne Meissner'
   s.email = 'wmeissner@gmail.com'
   s.homepage = 'http://wiki.github.com/ffi/ffi'
   s.summary = 'Ruby FFI'
   s.description = 'Ruby FFI library'
-  s.files = %w(ffi.gemspec History.txt LICENSE COPYING COPYING.LESSER README.md Rakefile) + Dir.glob("{ext,gen,lib,spec,libtest}/**/*").reject { |f| f =~ /lib\/1\.[89]/}
+  s.files = %w(ffi.gemspec History.txt LICENSE COPYING COPYING.LESSER README.md Rakefile) + Dir.glob("{ext,gen,lib,spec,libtest}/**/*").reject { |f| f =~ /lib\/[12]\.[089]/}
   s.extensions << 'ext/ffi_c/extconf.rb'
   s.has_rdoc = false
   s.rdoc_options = %w[--exclude=ext/ffi_c/.*\.o$ --exclude=ffi_c\.(bundle|so)$]
@@ -16,4 +16,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rake-compiler', '>=0.6.0'
   s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rubygems-tasks'
 end

data/lib/ffi/autopointer.rb

@@ -64,7 +64,7 @@ module FFI
     #  going to be useful if you subclass {AutoPointer}, and override
     #  #release, which by default does nothing.
     def initialize(ptr, proc=nil, &block)
-      super(ptr)
+      super(ptr.type_size, ptr)
       raise TypeError, "Invalid pointer" if ptr.nil? || !ptr.kind_of?(Pointer) \
         || ptr.kind_of?(MemoryPointer) || ptr.kind_of?(AutoPointer)
 

data/lib/ffi/ffi.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RUBY_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="jdk" jdkName="RVM: jruby-1.6.8" jdkType="JRUBY_SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="rake (v10.0.0, RVM: jruby-1.6.8) [gem]" level="application" />
+  </component>
+</module>
+

data/spec/ffi/pointer_spec.rb

@@ -99,6 +99,36 @@ describe "Pointer" do
     end
   end
 
+  it "Pointer.size returns sizeof pointer on platform" do
+    FFI::Pointer.size.should == (FFI::Platform::ADDRESS_SIZE / 8)
+  end
+
+  describe "#slice" do
+    before(:each) do
+      @mptr = FFI::MemoryPointer.new(:char, 12)
+      @mptr.put_uint(0, 0x12345678)
+      @mptr.put_uint(4, 0xdeadbeef)
+    end
+
+    it "contents of sliced pointer matches original pointer at offset" do
+      @mptr.slice(4, 4).get_uint(0).should == 0xdeadbeef
+    end
+
+    it "modifying sliced pointer is reflected in original pointer" do
+      @mptr.slice(4, 4).put_uint(0, 0xfee1dead)
+      @mptr.get_uint(4).should == 0xfee1dead
+    end
+
+    it "access beyond bounds should raise IndexError" do
+      lambda { @mptr.slice(4, 4).get_int(4) }.should raise_error(IndexError)
+    end
+  end
+
+  describe "#type_size" do
+    it "should be same as FFI.type_size(type)" do
+      FFI::MemoryPointer.new(:int, 1).type_size.should == FFI.type_size(:int)
+    end
+  end
 end
 
 describe "AutoPointer" do
@@ -212,5 +242,24 @@ describe "AutoPointer" do
     end
   end
 
+  describe "#type_size" do
+    ptr_class = Class.new(FFI::AutoPointer) do
+      def self.release(ptr); end
+    end
+
+    it "type_size of AutoPointer should match wrapped Pointer" do
+      aptr = ptr_class.new(FFI::Pointer.new(:int, 0xdeadbeef))
+      aptr.type_size.should == FFI.type_size(:int)
+    end
+    
+    it "[] offset should match wrapped Pointer" do
+      mptr = FFI::MemoryPointer.new(:int, 1024)
+      aptr = ptr_class.new(FFI::Pointer.new(:int, mptr))
+      aptr[0].write_uint(0xfee1dead)
+      aptr[1].write_uint(0xcafebabe)
+      mptr[0].read_uint.should == 0xfee1dead
+      mptr[1].read_uint.should == 0xcafebabe
+    end
+  end
 end
 

data/spec/ffi/{Ffi.iml → spec.iml}

@@ -2,8 +2,8 @@
 <module type="RUBY_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+    <content url="file://$MODULE_DIR$/..">
+      <sourceFolder url="file://$MODULE_DIR$/.." isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

data/spec/ffi/struct_by_ref_spec.rb

@@ -0,0 +1,43 @@
+#
+# This file is part of ruby-ffi.
+# For licensing, see LICENSE.SPECS
+#
+
+require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+
+describe FFI::Struct, ' by_ref' do
+  before :all do
+    @struct_class = struct_class = Class.new(FFI::Struct) do
+      layout :a, :pointer
+    end
+
+    @api = Module.new do 
+      extend FFI::Library
+      ffi_lib TestLibrary::PATH
+      fn = FFI::Type::POINTER.size == FFI::Type::LONG.size ? :ret_ulong : ret_uint64_t
+      attach_function :struct_test, fn, [ struct_class.by_ref ], :pointer
+    end
+  end
+
+  it "should accept instances of exact struct class" do
+    s = @struct_class.new
+    @api.struct_test(s).should == s.pointer
+  end
+  
+  it "should accept nil" do
+    @api.struct_test(nil).should == nil
+  end
+
+  it "should reject other types" do
+    lambda { @api.struct_test('test').should == nil }.should raise_error(TypeError)
+  end
+
+  it "should reject instances of other struct classes" do
+    other_class = Class.new(FFI::Struct) do
+      layout :a, :pointer
+    end
+
+    lambda { @api.struct_test(other_class.new) }.should raise_error(TypeError)
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ffi
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 1
-  - 6
+  - 7
   - 0
-  version: 1.6.0
+  version: 1.7.0
 platform: x86-mingw32
 authors: 
 - Wayne Meissner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-25 00:00:00 Z
+date: 2013-04-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -61,6 +61,20 @@ dependencies:
   type: :development
   name: rspec
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  name: rubygems-tasks
+  version_requirements: *id004
 description: Ruby FFI library
 email: wmeissner@gmail.com
 executables: []
@@ -87,12 +101,12 @@ files:
 - ext/ffi_c/ClosurePool.c
 - ext/ffi_c/ClosurePool.h
 - ext/ffi_c/compat.h
+- ext/ffi_c/cruby-ext.iml
 - ext/ffi_c/DataConverter.c
 - ext/ffi_c/DynamicLibrary.c
 - ext/ffi_c/DynamicLibrary.h
 - ext/ffi_c/extconf.rb
 - ext/ffi_c/ffi.c
-- ext/ffi_c/Ffi_c.iml
 - ext/ffi_c/Function.c
 - ext/ffi_c/Function.h
 - ext/ffi_c/FunctionInfo.c
@@ -411,6 +425,7 @@ files:
 - lib/ffi/callback.rb
 - lib/ffi/enum.rb
 - lib/ffi/errno.rb
+- lib/ffi/ffi.iml
 - lib/ffi/ffi.rb
 - lib/ffi/io.rb
 - lib/ffi/library.rb
@@ -466,7 +481,6 @@ files:
 - spec/ffi/dup_spec.rb
 - spec/ffi/enum_spec.rb
 - spec/ffi/errno_spec.rb
-- spec/ffi/Ffi.iml
 - spec/ffi/ffi_spec.rb
 - spec/ffi/function_spec.rb
 - spec/ffi/library_spec.rb
@@ -478,9 +492,11 @@ files:
 - spec/ffi/rbx/memory_pointer_spec.rb
 - spec/ffi/rbx/spec_helper.rb
 - spec/ffi/rbx/struct_spec.rb
+- spec/ffi/spec.iml
 - spec/ffi/spec_helper.rb
 - spec/ffi/string_spec.rb
 - spec/ffi/strptr_spec.rb
+- spec/ffi/struct_by_ref_spec.rb
 - spec/ffi/struct_callback_spec.rb
 - spec/ffi/struct_initialize_spec.rb
 - spec/ffi/struct_packed_spec.rb