ffi 1.9.3-x64-mingw32 → 1.9.5-x64-mingw32

data/spec/ffi/io_spec.rb

@@ -0,0 +1,17 @@
+#
+# This file is part of ruby-ffi.
+# For licensing, see LICENSE.SPECS
+#
+
+require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+require 'ffi'
+
+if false # disabled for #390
+  describe "FFI::IO.for_fd" do
+    it "produces an IO wrapping the specified file descriptor" do
+      expect do
+        FFI::IO.for_fd(2, "r")
+      end.to_not raise_error
+    end
+  end
+end

data/spec/ffi/library_spec.rb

@@ -4,6 +4,8 @@
 #
 
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+require 'ffi'
+
 describe "Library" do
   describe "#ffi_convention" do
     it "defaults to :default" do
@@ -24,6 +26,29 @@ describe "Library" do
     end
   end
 
+  if FFI::Platform::OS =~ /windows|cygwin/ && FFI::Platform::ARCH == 'i386'
+    module LibTestStdcall
+      extend FFI::Library
+      ffi_lib TestLibrary::PATH
+      ffi_convention :stdcall
+
+      class StructUCDP < FFI::Struct
+        layout :a1, :uchar,
+          :a2, :double,
+          :a3, :pointer
+      end
+
+      attach_function :testStdcallManyParams, [ :pointer, :int8, :int16, :int32, :int64,
+              StructUCDP.by_value, StructUCDP.by_ref, :float, :double ], :void
+    end
+
+    it "adds stdcall decoration: testStdcallManyParams@64" do
+      s = LibTestStdcall::StructUCDP.new
+      po = FFI::MemoryPointer.new :long
+      LibTestStdcall.testStdcallManyParams po, 1, 2, 3, 4, s, s, 1.0, 2.0
+    end
+  end
+
   describe "ffi_lib" do
     it "empty name list should raise error" do
       lambda {

data/spec/ffi/long_double.rb

@@ -4,6 +4,7 @@
 #
 
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+require 'ffi'
 require 'bigdecimal'
 
 describe ":long_double arguments and return values" do

data/spec/ffi/managed_struct_spec.rb

@@ -4,7 +4,7 @@
 #
 
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
-require 'java' if RUBY_PLATFORM =~ /java/
+require 'ffi'
 
 describe "Managed Struct" do
   include FFI

data/spec/ffi/memorypointer_spec.rb

@@ -0,0 +1,72 @@
+#
+# This file is part of ruby-ffi.
+# For licensing, see LICENSE.SPECS
+#
+
+require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+require 'ffi'
+
+MemoryPointer = FFI::MemoryPointer
+
+describe "MemoryPointer#total" do
+  it "MemoryPointer.new(:char, 1).total == 1" do
+    expect(MemoryPointer.new(:char, 1).total).to eq 1
+  end
+  it "MemoryPointer.new(:short, 1).total == 2" do
+    expect(MemoryPointer.new(:short, 1).total).to eq 2
+  end
+  it "MemoryPointer.new(:int, 1).total == 4" do
+    expect(MemoryPointer.new(:int, 1).total).to eq 4
+  end
+  it "MemoryPointer.new(:long_long, 1).total == 8" do
+    expect(MemoryPointer.new(:long_long, 1).total).to eq 8
+  end
+  it "MemoryPointer.new(1024).total == 1024" do
+    expect(MemoryPointer.new(1024).total).to eq 1024
+  end
+end
+describe "MemoryPointer#read_array_of_long" do
+  it "foo" do
+    ptr = MemoryPointer.new(:long, 1024)
+    ptr[0].write_long 1234
+    ptr[1].write_long 5678
+    l = ptr.read_array_of_long(2)
+    expect(l[0]).to eq 1234
+    expect(l[1]).to eq 5678
+  end
+end
+describe "MemoryPointer argument" do
+  module Ptr
+    extend FFI::Library
+    ffi_lib FFI::Platform::LIBC
+    attach_function :memset, [ :pointer, :int, :ulong ], :pointer
+    attach_function :memcpy, [ :pointer, :pointer, :ulong ], :pointer
+  end
+  it "Pointer passed correctly" do
+    p = MemoryPointer.new :int, 1
+    ret = Ptr.memset(p, 0, p.total)
+    expect(ret).to eq p
+  end
+  it "Data passed to native function" do
+    p = MemoryPointer.new :int, 1
+    p2 = MemoryPointer.new :int, 1
+    p2.put_int(0, 0x5eadbeef)
+    Ptr.memcpy(p, p2, p.total)
+    expect(p.get_int(0)).to eq p2.get_int(0)
+    expect(p2.get_int(0)).not_to eql 0
+  end
+end
+describe "MemoryPointer return value" do
+  module Stdio
+    extend FFI::Library
+    ffi_lib FFI::Platform::LIBC
+    attach_function :fopen, [ :string, :string ], :pointer
+    attach_function :fclose, [ :pointer ], :int
+    attach_function :fwrite, [ :pointer, :ulong, :ulong, :string ], :ulong
+  end
+  it "fopen returns non-nil" do
+    fp = Stdio.fopen("/dev/null", "w")
+    expect(fp).to_not be_nil
+    expect(Stdio.fclose(fp)).to  eq 0 unless fp.nil? or fp.null? 
+  end
+end

data/spec/ffi/number_spec.rb

@@ -4,6 +4,8 @@
 #
 
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+require 'ffi'
+
 describe "Function with primitive integer arguments" do
   module LibTest
     extend FFI::Library

data/spec/ffi/platform_spec.rb

@@ -0,0 +1,97 @@
+#
+# This file is part of ruby-ffi.
+# For licensing, see LICENSE.SPECS
+#
+
+require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+require 'ffi'
+
+describe "FFI::Platform::LIBSUFFIX" do
+  it "returns 'so'", if: RbConfig::CONFIG['host_os'].match('linux') do
+    FFI::Platform::LIBSUFFIX.should == 'so'
+  end
+
+  it "returns 'dll'", if: RbConfig::CONFIG['host_os'].match('windows') do
+    FFI::Platform::LIBSUFFIX.should == 'dll'
+  end
+
+  it "returns 'dylib'", if: RbConfig::CONFIG['host_os'].match('darwin') do
+    FFI::Platform::LIBSUFFIX.should == 'dylib'
+  end
+end
+
+describe "FFI::Platform::IS_WINDOWS" do
+  it "returns false", if: RbConfig::CONFIG['host_os'].match('linux') do
+    FFI::Platform::IS_WINDOWS.should == false
+  end
+
+  it "returns true", if: RbConfig::CONFIG['host_os'].match('windows') do
+    FFI::Platform::IS_WINDOWS.should == true
+  end
+
+  it "returns false", if: RbConfig::CONFIG['host_os'].match('darwin') do
+    FFI::Platform::IS_WINDOWS.should == false
+  end
+end
+
+describe "FFI::Platform::ARCH" do
+  it "returns the architecture type" do
+    FFI::Platform::ARCH.should == RbConfig::CONFIG["target_cpu"]
+  end
+end
+
+describe "FFI::Platform::OS" do
+  it "returns 'linux' as a string", if: RbConfig::CONFIG['host_os'].match('linux') do
+    FFI::Platform::OS.should == 'linux'
+  end
+
+  it "returns 'windows' as a string", if: RbConfig::CONFIG['host_os'].match('windows') do
+    FFI::Platform::OS.should == 'windows'
+  end
+
+  it "returns 'darwin' as a string", if: RbConfig::CONFIG['host_os'].match('darwin') do
+    FFI::Platform::OS.should == 'darwin'
+  end
+
+  describe "FFI::Platform.windows?" do
+    it "returns false", if: RbConfig::CONFIG['host_os'].match('linux') do
+      FFI::Platform.windows?.should == false
+    end
+
+    it "returns true", if: RbConfig::CONFIG['host_os'].match('windows') do
+      FFI::Platform.windows?.should == true
+    end
+
+    it "returns false", if: RbConfig::CONFIG['host_os'].match('darwin') do
+      FFI::Platform.windows?.should == false
+    end
+  end
+
+  describe "FFI::Platform.mac?" do
+    it "returns false", if: RbConfig::CONFIG['host_os'].match('linux') do
+      FFI::Platform.mac?.should == false
+    end
+
+    it "returns false", if: RbConfig::CONFIG['host_os'].match('windows') do
+      FFI::Platform.mac?.should == false
+    end
+
+    it "returns true", if: RbConfig::CONFIG['host_os'].match('darwin') do
+      FFI::Platform.mac?.should == true
+    end
+  end
+
+  describe "FFI::Platform.unix?" do
+    it "returns true", if: RbConfig::CONFIG['host_os'].match('linux') do
+      FFI::Platform.unix?.should == true
+    end
+
+    it "returns false", if: RbConfig::CONFIG['host_os'].match('windows') do
+      FFI::Platform.unix?.should == false
+    end
+
+    it "returns true", if: RbConfig::CONFIG['host_os'].match('darwin') do
+      FFI::Platform.unix?.should == true
+    end
+  end
+end

data/spec/ffi/pointer_spec.rb

@@ -2,14 +2,20 @@
 # This file is part of ruby-ffi.
 # For licensing, see LICENSE.SPECS
 #
+
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+require 'ffi'
 require 'delegate'
-require 'java' if RUBY_PLATFORM =~ /java/
 
 module PointerTestLib
   extend FFI::Library
   ffi_lib TestLibrary::PATH
-  attach_function :ptr_ret_int32_t, [ :pointer, :int ], :int
+  begin
+    attach_function :ptr_ret_int32_t, [ :pointer, :int ], :int
+  rescue FFI::NotFoundError
+    # NetBSD uses #define instead of typedef for these
+    attach_function :ptr_ret_int32_t, :ptr_ret___int32_t, [ :pointer, :int ], :int
+  end
   attach_function :ptr_from_address, [ FFI::Platform::ADDRESS_SIZE == 32 ? :uint : :ulong_long ], :pointer
   attach_function :ptr_set_pointer, [ :pointer, :int, :pointer ], :void
   attach_function :ptr_ret_pointer, [ :pointer, :int ], :pointer

data/spec/ffi/rbx/attach_function_spec.rb

@@ -1,4 +1,10 @@
+#
+# This file is part of ruby-ffi.
+# For licensing, see LICENSE.SPECS
+#
+
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+require 'ffi'
 
 class Timeval < FFI::Struct
   layout :tv_sec, :ulong, 0, :tv_usec, :ulong, 4  

data/spec/ffi/rbx/memory_pointer_spec.rb

@@ -1,6 +1,11 @@
 # coding: utf-8
-require "rubygems"
+#
+# This file is part of ruby-ffi.
+# For licensing, see LICENSE.SPECS
+#
+
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+require 'ffi'
 
 module CTest
   extend FFI::Library
@@ -17,7 +22,7 @@ describe "MemoryPointer" do
   end
 
   it "does not make a pointer from non-strings" do
-    expect { FFI::MemoryPointer.from_string(nil) }.to raise_error(TypeError)
+    expect {FFI::MemoryPointer.from_string(nil)}.to raise_error(TypeError)
   end
 
   it "makes a pointer from a string with multibyte characters" do

data/spec/ffi/rbx/spec_helper.rb

@@ -1 +1,7 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper"))
+#
+# This file is part of ruby-ffi.
+# For licensing, see LICENSE.SPECS
+#
+
+require File.expand_path(File.join(File.dirname(__FILE__), "../spec_helper"))
+require 'ffi'

data/spec/ffi/rbx/struct_spec.rb

@@ -1,4 +1,10 @@
+#
+# This file is part of ruby-ffi.
+# For licensing, see LICENSE.SPECS
+#
+
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+require 'ffi'
 
 class Timeval < FFI::Struct
   layout :tv_sec, :ulong, 0, :tv_usec, :ulong, 4  
@@ -10,4 +16,4 @@ describe FFI::Struct do
     t[:tv_sec] = 12
     t[:tv_sec].should == 12
   end
-end
+end

data/spec/ffi/spec_helper.rb

@@ -2,21 +2,80 @@
 # This file is part of ruby-ffi.
 # For licensing, see LICENSE.SPECS
 #
-require 'rubygems'
+
 require 'rbconfig'
+require 'ffi'
+
+CPU = case RbConfig::CONFIG['host_cpu'].downcase
+  when /i[3456]86/
+    # Darwin always reports i686, even when running in 64bit mode
+    if RbConfig::CONFIG['host_os'] =~ /darwin/ && 0xfee1deadbeef.is_a?(Fixnum)
+      "x86_64"
+    else
+      "i386"
+    end
+
+  when /amd64|x86_64/
+    "x86_64"
+
+  when /ppc64|powerpc64/
+    "powerpc64"
+
+  when /ppc|powerpc/
+    "powerpc"
+
+  when /^arm/
+    "arm"
+
+  else
+    RbConfig::CONFIG['host_cpu']
+  end
+
+OS = case RbConfig::CONFIG['host_os'].downcase
+  when /linux/
+    "linux"
+  when /darwin/
+    "darwin"
+  when /freebsd/
+    "freebsd"
+  when /openbsd/
+    "openbsd"
+  when /sunos|solaris/
+    "solaris"
+  when /mswin|mingw/
+    "win32"
+  else
+    RbConfig::CONFIG['host_os'].downcase
+  end
+
+def compile_library(path, lib)
+
+  dir = File.expand_path(path, File.dirname(__FILE__))
+  lib = "#{dir}/#{lib}"
+  if !File.exists?(lib)
+    ldshared  = RbConfig::CONFIG["LDSHARED"]
+    libs      = RbConfig::CONFIG["LIBS"]
+    dldflags  = RbConfig::CONFIG["DLDFLAGS"]
+
+    puts Dir.pwd, dir, File.dirname(__FILE__)
+
+    FileUtils.cd(dir) do
+      output = system(*%{#{system('which gmake >/dev/null') && 'gmake' || 'make'} CPU=#{CPU} OS=#{OS} }.tap{|x| puts x.inspect})
+    end
 
-if RUBY_PLATFORM =~/java/
-  libdir = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib"))
-  $:.reject! { |p| p == libdir }
-else
-  $:.unshift File.join(File.dirname(__FILE__), "..", "..", "lib"),
-    File.join(File.dirname(__FILE__), "..", "..", "build", "#{RbConfig::CONFIG['host_cpu''arch']}", "ffi_c", RUBY_VERSION)
+    if $?.exitstatus != 0
+      raise "Unable to compile \"#{lib}\""
+    end
+  end
+
+  lib
 end
-# puts "loadpath=#{$:.join(':')}"
+
 require "ffi"
 
 module TestLibrary
-  PATH = "build/libtest.#{FFI::Platform::LIBSUFFIX}"
+  PATH = compile_library("fixtures", "libtest.#{FFI::Platform::LIBSUFFIX}")
+
   def self.force_gc
     if RUBY_PLATFORM =~ /java/
       java.lang.System.gc

data/spec/ffi/string_spec.rb

@@ -4,6 +4,8 @@
 #
 
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+require 'ffi'
+
 describe "String tests" do
   include FFI
   module StrLibTest
@@ -43,7 +45,7 @@ describe "String tests" do
     end
   end if false
   it "casts nil as NULL pointer" do
-    StrLibTest.string_dummy(nil)
+    StrLibTest.string_dummy(nil).should == nil
   end
   it "return nil for NULL char*" do
     StrLibTest.string_null.should == nil