ffi 1.9.3-x86-mingw32 → 1.9.5-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  data.tar.gz: b07264c41cf4ec7490840f09c1c9379a954df6e9
-  metadata.gz: cc90b28ed64f59cdecea1d7e66f89896be9e6823
+  metadata.gz: 8388c8504e5777a39e69727d10ecf13670674e85
+  data.tar.gz: a3fbbcb12431244e647cb40f93b9366da87212ed
 SHA512: 
-  data.tar.gz: 4201167de7f2f7da0b917d46e5cba725dd982a17ab8b37c865f9166e1c098b1a9d9bf2c804127c0862aedd00884bab18637363c24faa6aec5771e420f7834870
-  metadata.gz: 00de5760a0fa8aec4186127d43a4a9dff9d3d5a3d81e00990949c2a32541594aaeebc74e2d594233bf1844af01d692d69f777ec053d7fed2c9dacd1c84161390
+  metadata.gz: 9b3ed3e25e37a153054936c60fcb63e700555477842c8be209c3ad6390151e1adb3ba97e6fb4c27b4644ba319160cccb332b1ea92957f103dbe3a394252420f2
+  data.tar.gz: 2415657adfd8815c3f478f40e8a531a6345a53b8b12487def0c8736f64bfe200aa20affd0a13500b767b37c517d177cbd12dce95c0cd5ef7cf54db8b4c6e8c06

data/Rakefile

@@ -1,18 +1,21 @@
-require 'rubygems'
-require 'rubygems/package_task'
 require 'rubygems/tasks'
 require 'rbconfig'
 require 'rake/clean'
 
 USE_RAKE_COMPILER = (RUBY_PLATFORM =~ /java/) ? false : true
 if USE_RAKE_COMPILER
-  gem 'rake-compiler', '>=0.6.0'
   require 'rake/extensiontask'
 end
 
 require 'date'
 require 'fileutils'
 require 'rbconfig'
+require 'rspec/core/rake_task'
+require 'rubygems/package_task'
+
+RSpec::Core::RakeTask.new(:spec => :compile) do |config|
+  config.rspec_opts = YAML.load_file 'spec/spec.opts'
+end
 
 
 LIBEXT = case RbConfig::CONFIG['host_os'].downcase
@@ -103,13 +106,13 @@ end
 desc "Build all packages"
 task :package => 'gem:package'
 
-
 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'
+CLOBBER.include 'spec/ffi/fixtures/libtest.dylib'
 
 task :distclean => :clobber
 
@@ -123,7 +126,7 @@ desc "Build test helper lib"
 task :libtest => "build/libtest.#{LIBEXT}"
 
 desc "Test the extension"
-task :test => [ :specs, :rbxspecs ]
+task :test => [ :spec ]
 
 
 namespace :bench do
@@ -148,7 +151,7 @@ task 'spec:specdoc' => TEST_DEPS
 task :default => :specs
 
 task 'gem:win32' do
-  sh("rake cross native gem RUBY_CC_VERSION='1.8.7:1.9.3:2.0.0'") || raise("win32 build failed!")
+  sh("rake cross native gem RUBY_CC_VERSION='1.8.7:1.9.3:2.0.0:2.1.3'") || raise("win32 build failed!")
 end
 
 
@@ -162,7 +165,7 @@ namespace 'java' do
     s.homepage = gem_spec.homepage
     s.summary = gem_spec.summary
     s.description = gem_spec.description
-    s.files = %w(History.txt LICENSE COPYING COPYING.LESSER README.md Rakefile)
+    s.files = %w(LICENSE COPYING README.md Rakefile)
     s.has_rdoc = false
     s.license = gem_spec.license
     s.platform = 'java'
@@ -184,22 +187,16 @@ 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 = %w[i386-mingw32 x64-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
 
   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
+      sh "i686-w64-mingw32-strip -S #{BUILD_DIR}/i386-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so"
     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 #{BUILD_DIR}/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so"
-      end
+      sh "x86_64-w64-mingw32-strip -S #{BUILD_DIR}/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so"
     end
   end
 end

data/ext/ffi_c/DynamicLibrary.c

@@ -73,15 +73,11 @@ static void* dl_open(const char* name, int flags);
 static void dl_error(char* buf, int size);
 #define dl_sym(handle, name) GetProcAddress(handle, name)
 #define dl_close(handle) FreeLibrary(handle)
-enum { RTLD_LAZY=1, RTLD_NOW, RTLD_GLOBAL, RTLD_LOCAL };
 #else
 # define dl_open(name, flags) dlopen(name, flags != 0 ? flags : RTLD_LAZY)
 # define dl_error(buf, size) do { snprintf(buf, size, "%s", dlerror()); } while(0)
 # define dl_sym(handle, name) dlsym(handle, name)
 # define dl_close(handle) dlclose(handle)
-#ifndef RTLD_LOCAL
-# define RTLD_LOCAL 8
-#endif
 #endif
 
 static VALUE
@@ -321,13 +317,21 @@ rbffi_DynamicLibrary_Init(VALUE moduleFFI)
     rb_undef_method(SymbolClass, "new");
     rb_define_method(SymbolClass, "inspect", symbol_inspect, 0);
     rb_define_method(SymbolClass, "initialize_copy", symbol_initialize_copy, 1);
-    
 
 #define DEF(x) rb_define_const(LibraryClass, "RTLD_" #x, UINT2NUM(RTLD_##x))
     DEF(LAZY);
     DEF(NOW);
     DEF(GLOBAL);
     DEF(LOCAL);
+    DEF(NOLOAD);
+    DEF(NODELETE);
+    DEF(FIRST);
+    DEF(DEEPBIND);
+    DEF(MEMBER);
+    DEF(BINDING_MASK);
+    DEF(LOCATION_MASK);
+    DEF(ALL_MASK);
+#undef DEF
 
 }
 

data/ext/ffi_c/DynamicLibrary.h

@@ -33,7 +33,56 @@
 extern "C" {
 #endif
 
+/* if these aren't defined (eg. windows), we need sensible defaults */
+#ifndef RTLD_LAZY
+#define RTLD_LAZY 1
+#endif
+
+#ifndef RTLD_NOW
+#define RTLD_NOW 2
+#endif
+
+#ifndef RTLD_LOCAL
+#define RTLD_LOCAL 4
+#endif
+
+#ifndef RTLD_GLOBAL
+#define RTLD_GLOBAL 8
+#endif
+
+/* If these aren't defined, they're not supported so define as 0 */
+#ifndef RTLD_NOLOAD
+#define RTLD_NOLOAD 0
+#endif
+
+#ifndef RTLD_NODELETE
+#define RTLD_NODELETE 0
+#endif
 
+#ifndef RTLD_FIRST
+#define RTLD_FIRST 0
+#endif
+
+#ifndef RTLD_DEEPBIND
+#define RTLD_DEEPBIND 0
+#endif
+
+#ifndef RTLD_MEMBER
+#define RTLD_MEMBER 0
+#endif
+
+/* convenience */
+#ifndef RTLD_BINDING_MASK
+#define RTLD_BINDING_MASK (RTLD_LAZY | RTLD_NOW)
+#endif
+
+#ifndef RTLD_LOCATION_MASK
+#define RTLD_LOCATION_MASK (RTLD_LOCAL | RTLD_GLOBAL)
+#endif
+
+#ifndef RTLD_ALL_MASK
+#define RTLD_ALL_MASK (RTLD_BINDING_MASK | RTLD_LOCATION_MASK | RTLD_NOLOAD | RTLD_NODELETE | RTLD_FIRST | RTLD_DEEPBIND | RTLD_MEMBER)
+#endif
 
 typedef struct Library {
     void* handle;

data/ext/ffi_c/Function.c

@@ -86,7 +86,7 @@ static void function_free(Function *);
 static VALUE function_init(VALUE self, VALUE rbFunctionInfo, VALUE rbProc);
 static void callback_invoke(ffi_cif* cif, void* retval, void** parameters, void* user_data);
 static bool callback_prep(void* ctx, void* code, Closure* closure, char* errmsg, size_t errmsgsize);
-static VALUE callback_with_gvl(void* data);
+static void* callback_with_gvl(void* data);
 static VALUE invoke_callback(void* data);
 static VALUE save_callback_exception(void* data, VALUE exc);
 
@@ -731,10 +731,11 @@ async_cb_call(void *data)
 
 #endif
 
-static VALUE
+static void *
 callback_with_gvl(void* data)
 {
     rb_rescue2(invoke_callback, (VALUE) data, save_callback_exception, (VALUE) data, rb_eException, (VALUE) 0);
+    return NULL;
 }
 
 static VALUE
@@ -759,8 +760,8 @@ invoke_callback(void* data)
         VALUE rbParamType = rb_ary_entry(cbInfo->rbParameterTypes, i);
 
         if (unlikely(paramType->nativeType == NATIVE_MAPPED)) {
-            paramType = ((MappedType *) paramType)->type;
             rbParamType = ((MappedType *) paramType)->rbType;
+            paramType = ((MappedType *) paramType)->type;
         }
 
         switch (paramType->nativeType) {

data/ext/ffi_c/FunctionInfo.c

@@ -119,7 +119,7 @@ fntype_initialize(int argc, VALUE* argv, VALUE self)
     ffi_status status;
     VALUE rbReturnType = Qnil, rbParamTypes = Qnil, rbOptions = Qnil;
     VALUE rbEnums = Qnil, rbConvention = Qnil, rbBlocking = Qnil;
-#if defined(_WIN32) || defined(__WIN32__)
+#if defined(X86_WIN32)
     VALUE rbConventionStr;
 #endif
     int i, nargs;
@@ -181,7 +181,7 @@ fntype_initialize(int argc, VALUE* argv, VALUE self)
     fnInfo->ffiReturnType = fnInfo->returnType->ffiType;
 
 
-#if (defined(_WIN32) || defined(__WIN32__)) && defined(FFI_STDCALL) 
+#if defined(X86_WIN32)
     rbConventionStr = (rbConvention != Qnil) ? rb_funcall2(rbConvention, rb_intern("to_s"), 0, NULL) : Qnil;
     fnInfo->abi = (rbConventionStr != Qnil && strcmp(StringValueCStr(rbConventionStr), "stdcall") == 0)
             ? FFI_STDCALL : FFI_DEFAULT_ABI;

data/ext/ffi_c/Platform.c

@@ -43,7 +43,7 @@
 #include "rbffi_endian.h"
 #include "Platform.h"
 
-#if defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
+#if defined(__GNU__) || defined(__GLIBC__)
 # include <gnu/lib-names.h>
 #endif
 
@@ -113,7 +113,7 @@ rbffi_Platform_Init(VALUE moduleFFI)
     rb_define_const(PlatformModule, "LITTLE_ENDIAN", INT2FIX(LITTLE_ENDIAN));
     rb_define_const(PlatformModule, "BIG_ENDIAN", INT2FIX(BIG_ENDIAN));
     rb_define_const(PlatformModule, "CPU", rb_str_new2(CPU));
-#if defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
+#if defined(__GNU__) || defined(__GLIBC__)
     rb_define_const(PlatformModule, "GNU_LIBC", rb_str_new2(LIBC_SO));
 #endif
     export_primitive_types(PlatformModule);

data/ext/ffi_c/Struct.c

@@ -289,6 +289,7 @@ struct_field(Struct* s, VALUE fieldName)
         return rbField;
     }
 
+    // TODO does this ever return anything?
     rbField = rb_hash_aref(layout->rbFieldMap, fieldName);
     if (rbField == Qnil) {
         VALUE str = rb_funcall2(fieldName, id_to_s, 0, NULL);

data/ext/ffi_c/Variadic.c

@@ -103,7 +103,7 @@ variadic_initialize(VALUE self, VALUE rbFunction, VALUE rbParameterTypes, VALUE
     VALUE retval = Qnil;
     VALUE convention = Qnil;
     VALUE fixed = Qnil;
-#if defined(_WIN32) || defined(__WIN32__)
+#if defined(X86_WIN32)
     VALUE rbConventionStr;
 #endif
     int i;
@@ -116,7 +116,7 @@ variadic_initialize(VALUE self, VALUE rbFunction, VALUE rbParameterTypes, VALUE
     invoker->rbAddress = rbFunction;
     invoker->function = rbffi_AbstractMemory_Cast(rbFunction, rbffi_PointerClass)->address;
 
-#if (defined(_WIN32) || defined(__WIN32__)) && defined(FFI_STDCALL)
+#if defined(X86_WIN32)
     rbConventionStr = rb_funcall2(convention, rb_intern("to_s"), 0, NULL);
     invoker->abi = (RTEST(convention) && strcmp(StringValueCStr(rbConventionStr), "stdcall") == 0)
             ? FFI_STDCALL : FFI_DEFAULT_ABI;

data/ffi.gemspec

@@ -8,15 +8,15 @@ Gem::Specification.new do |s|
   s.homepage = 'http://wiki.github.com/ffi/ffi'
   s.summary = 'Ruby FFI'
   s.description = 'Ruby FFI library'
-  s.files = %w(ffi.gemspec LICENSE COPYING README.md Rakefile) + Dir.glob("{ext,gen,lib,spec,libtest}/**/*").reject { |f| f =~ /(lib\/[12]\.[089]|\.so$|\.bundle$)/ }
+  s.files = %w(ffi.gemspec LICENSE COPYING README.md Rakefile) + Dir.glob("{ext,gen,lib,spec,libtest}/**/*").reject { |f| f =~ /(lib\/[12]\.[089]|\.so$|\.bundle|\.dylib$)/ }
   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)$]
   s.license = 'BSD'
   s.require_paths << 'ext/ffi_c'
   s.required_ruby_version = '>= 1.8.7'
-  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'
+  s.add_development_dependency 'rake', '~> 10.1'
+  s.add_development_dependency 'rake-compiler', '~> 0.9'
+  s.add_development_dependency 'rspec', '~> 2.14.1'
+  s.add_development_dependency 'rubygems-tasks', "~> 0.2.4"
 end

data/lib/ffi/library.rb

@@ -114,8 +114,8 @@ module FFI
 
             rescue Exception => ex
               ldscript = false
-              if ex.message =~ /(([^ \t()])+\.so([^ \t:()])*):([ \t])*invalid ELF header/
-                if File.read($1) =~ /GROUP *\( *([^ \)]+) *\)/
+              if ex.message =~ /(([^ \t()])+\.so([^ \t:()])*):([ \t])*(invalid ELF header|file too short|invalid file format)/
+                if File.read($1) =~ /(?:GROUP|INPUT) *\( *([^ \)]+)/
                   libname = $1
                   ldscript = true
                 end
@@ -279,12 +279,12 @@ module FFI
       if ffi_convention == :stdcall
         # Get the size of each parameter
         size = arg_types.inject(0) do |mem, arg|
-          mem + arg.size
+          size = arg.size
+          # The size must be a multiple of 4
+          size += (4 - size) % 4
+          mem + size
         end
 
-        # Next, the size must be a multiple of 4
-        size += (4 - size) % 4
-
         result << "_#{name.to_s}@#{size}" # win32
         result << "#{name.to_s}@#{size}" # win64
       end
@@ -334,7 +334,7 @@ module FFI
           def self.#{mname}
             @@ffi_gvar_#{mname}
           end
-code
+        code
 
       else
         sc = Class.new(FFI::Struct)

data/lib/ffi/platform.rb

@@ -42,6 +42,8 @@ module FFI
       "darwin"
     when /freebsd/
       "freebsd"
+    when /netbsd/
+      "netbsd"
     when /openbsd/
       "openbsd"
     when /sunos|solaris/
@@ -81,9 +83,10 @@ module FFI
     IS_LINUX = is_os("linux")
     IS_MAC = is_os("darwin")
     IS_FREEBSD = is_os("freebsd")
+    IS_NETBSD = is_os("netbsd")
     IS_OPENBSD = is_os("openbsd")
     IS_WINDOWS = is_os("windows")
-    IS_BSD = IS_MAC || IS_FREEBSD || IS_OPENBSD
+    IS_BSD = IS_MAC || IS_FREEBSD || IS_NETBSD || IS_OPENBSD
     CONF_DIR = File.join(File.dirname(__FILE__), 'platform', NAME)
     public
 

data/lib/ffi/platform/x86_64-netbsd/types.conf

@@ -82,6 +82,8 @@ rbx.platform.typedef.int32_t = int
 rbx.platform.typedef.uint32_t = uint
 rbx.platform.typedef.int64_t = long_long
 rbx.platform.typedef.uint64_t = ulong_long
+rbx.platform.typedef.intptr_t = long
+rbx.platform.typedef.uintptr_t = ulong
 rbx.platform.typedef.u_int8_t = uchar
 rbx.platform.typedef.u_int16_t = ushort
 rbx.platform.typedef.u_int32_t = uint

data/lib/ffi/struct.rb

@@ -76,7 +76,7 @@ module FFI
       end
 
      def put(ptr, value)
-       raise TypeError, "wrong value type (expected #{type.struct_class}" unless value.is_a?(type.struct_class)
+       raise TypeError, "wrong value type (expected #{type.struct_class})" unless value.is_a?(type.struct_class)
        ptr.slice(self.offset, self.size).__copy_from__(value.pointer, self.size)
      end
     end
@@ -258,7 +258,7 @@ module FFI
       #    end
       #  @note Creating a layout from a hash +spec+ is supported only for Ruby 1.9.
       def layout(*spec)
-#        raise RuntimeError, "struct layout already defined for #{self.inspect}" if defined?(@layout)
+        #raise RuntimeError, "struct layout already defined for #{self.inspect}" if defined?(@layout)
         return @layout if spec.size == 0
 
         builder = StructLayoutBuilder.new

data/lib/ffi/version.rb

@@ -1,4 +1,4 @@
 module FFI
-  VERSION = '1.9.3'
+  VERSION = '1.9.5'
 end
 

data/libtest/ClosureTest.c

@@ -50,6 +50,21 @@ P(D, double);
 P(P, const void*);
 P(UL, unsigned long);
 
+#if defined(_WIN32) && !defined(_WIN64)
+bool __stdcall testClosureStdcall(long *a1, void __stdcall(*closure)(void *, long), long a2) { \
+    void* sp_pre;
+    void* sp_post;
+
+    asm volatile (" movl %%esp,%0" : "=g" (sp_pre));
+    (*closure)(a1, a2);
+    asm volatile (" movl %%esp,%0" : "=g" (sp_post));
+
+    /* %esp before pushing parameters on the stack and after the call returns
+     * should be equal, if both sides respects the stdcall convention */
+    return sp_pre == sp_post;
+}
+#endif
+
 void testOptionalClosureBrV(void (*closure)(char), char a1)
 {
     if (closure) {

data/libtest/FunctionTest.c

@@ -56,3 +56,15 @@ void testAsyncCallback(void (*fn)(int), int value)
     (*fn)(value);
 #endif
 } 
+
+#if defined(_WIN32) && !defined(_WIN64)
+struct StructUCDP {
+  unsigned char a1;
+  double a2;
+  void *a3;
+};
+
+void __stdcall testStdcallManyParams(long *a1, char a2, short int a3, int a4, __int64 a5,
+            struct StructUCDP a6, struct StructUCDP *a7, float a8, double a9) {
+}
+#endif