ffi 1.0.7-x86-mingw32 → 1.0.9-x86-mingw32

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

@@ -0,0 +1,100 @@
+rbx.platform.typedef.__u_char = uchar
+rbx.platform.typedef.__u_short = ushort
+rbx.platform.typedef.__u_int = uint
+rbx.platform.typedef.__u_long = ulong
+rbx.platform.typedef.__int8_t = char
+rbx.platform.typedef.__uint8_t = uchar
+rbx.platform.typedef.__int16_t = short
+rbx.platform.typedef.__uint16_t = ushort
+rbx.platform.typedef.__int32_t = int
+rbx.platform.typedef.__uint32_t = uint
+rbx.platform.typedef.__int64_t = long
+rbx.platform.typedef.__uint64_t = ulong
+rbx.platform.typedef.__quad_t = long
+rbx.platform.typedef.__u_quad_t = ulong
+rbx.platform.typedef.__dev_t = ulong
+rbx.platform.typedef.__uid_t = uint
+rbx.platform.typedef.__gid_t = uint
+rbx.platform.typedef.__ino_t = ulong
+rbx.platform.typedef.__ino64_t = ulong
+rbx.platform.typedef.__mode_t = uint
+rbx.platform.typedef.__nlink_t = ulong
+rbx.platform.typedef.__off_t = long
+rbx.platform.typedef.__off64_t = long
+rbx.platform.typedef.__pid_t = int
+rbx.platform.typedef.__clock_t = long
+rbx.platform.typedef.__rlim_t = ulong
+rbx.platform.typedef.__rlim64_t = ulong
+rbx.platform.typedef.__id_t = uint
+rbx.platform.typedef.__time_t = long
+rbx.platform.typedef.__useconds_t = uint
+rbx.platform.typedef.__suseconds_t = long
+rbx.platform.typedef.__daddr_t = int
+rbx.platform.typedef.__swblk_t = long
+rbx.platform.typedef.__key_t = int
+rbx.platform.typedef.__clockid_t = int
+rbx.platform.typedef.__timer_t = pointer
+rbx.platform.typedef.__blksize_t = long
+rbx.platform.typedef.__blkcnt_t = long
+rbx.platform.typedef.__blkcnt64_t = long
+rbx.platform.typedef.__fsblkcnt_t = ulong
+rbx.platform.typedef.__fsblkcnt64_t = ulong
+rbx.platform.typedef.__fsfilcnt_t = ulong
+rbx.platform.typedef.__fsfilcnt64_t = ulong
+rbx.platform.typedef.__ssize_t = long
+rbx.platform.typedef.__loff_t = long
+rbx.platform.typedef.*__qaddr_t = long
+rbx.platform.typedef.*__caddr_t = char
+rbx.platform.typedef.__intptr_t = long
+rbx.platform.typedef.__socklen_t = uint
+rbx.platform.typedef.u_char = uchar
+rbx.platform.typedef.u_short = ushort
+rbx.platform.typedef.u_int = uint
+rbx.platform.typedef.u_long = ulong
+rbx.platform.typedef.quad_t = long
+rbx.platform.typedef.u_quad_t = ulong
+rbx.platform.typedef.loff_t = long
+rbx.platform.typedef.ino_t = ulong
+rbx.platform.typedef.dev_t = ulong
+rbx.platform.typedef.gid_t = uint
+rbx.platform.typedef.mode_t = uint
+rbx.platform.typedef.nlink_t = ulong
+rbx.platform.typedef.uid_t = uint
+rbx.platform.typedef.off_t = long
+rbx.platform.typedef.pid_t = int
+rbx.platform.typedef.id_t = uint
+rbx.platform.typedef.ssize_t = long
+rbx.platform.typedef.daddr_t = int
+rbx.platform.typedef.key_t = int
+rbx.platform.typedef.time_t = long
+rbx.platform.typedef.clockid_t = int
+rbx.platform.typedef.timer_t = pointer
+rbx.platform.typedef.size_t = ulong
+rbx.platform.typedef.ulong = ulong
+rbx.platform.typedef.ushort = ushort
+rbx.platform.typedef.uint = uint
+rbx.platform.typedef.int8_t = char
+rbx.platform.typedef.int16_t = short
+rbx.platform.typedef.int32_t = int
+rbx.platform.typedef.int64_t = long_long
+rbx.platform.typedef.u_int8_t = uchar
+rbx.platform.typedef.u_int16_t = ushort
+rbx.platform.typedef.u_int32_t = uint
+rbx.platform.typedef.u_int64_t = ulong_long
+rbx.platform.typedef.register_t = long
+rbx.platform.typedef.__sig_atomic_t = int
+rbx.platform.typedef.suseconds_t = long
+rbx.platform.typedef.__fd_mask = long
+rbx.platform.typedef.fd_mask = long
+rbx.platform.typedef.blkcnt_t = long
+rbx.platform.typedef.fsblkcnt_t = ulong
+rbx.platform.typedef.fsfilcnt_t = ulong
+rbx.platform.typedef.pthread_t = ulong
+rbx.platform.typedef.pthread_key_t = uint
+rbx.platform.typedef.pthread_once_t = int
+rbx.platform.typedef.socklen_t = uint
+rbx.platform.typedef.sa_family_t = ushort
+rbx.platform.typedef.rlim_t = ulong
+rbx.platform.typedef.__rlimit_resource_t = int
+rbx.platform.typedef.__rusage_who_t = int
+rbx.platform.typedef.__priority_which_t = int

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

@@ -0,0 +1,126 @@
+rbx.platform.typedef.__int8_t = char
+rbx.platform.typedef.__uint8_t = uchar
+rbx.platform.typedef.__int16_t = short
+rbx.platform.typedef.__uint16_t = ushort
+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.__int_least8_t = char
+rbx.platform.typedef.__uint_least8_t = uchar
+rbx.platform.typedef.__int_least16_t = short
+rbx.platform.typedef.__uint_least16_t = ushort
+rbx.platform.typedef.__int_least32_t = int
+rbx.platform.typedef.__uint_least32_t = uint
+rbx.platform.typedef.__int_least64_t = long_long
+rbx.platform.typedef.__uint_least64_t = ulong_long
+rbx.platform.typedef.__int_fast8_t = int
+rbx.platform.typedef.__uint_fast8_t = uint
+rbx.platform.typedef.__int_fast16_t = int
+rbx.platform.typedef.__uint_fast16_t = uint
+rbx.platform.typedef.__int_fast32_t = int
+rbx.platform.typedef.__uint_fast32_t = uint
+rbx.platform.typedef.__int_fast64_t = long_long
+rbx.platform.typedef.__uint_fast64_t = ulong_long
+rbx.platform.typedef.__intptr_t = long
+rbx.platform.typedef.__uintptr_t = ulong
+rbx.platform.typedef.__intmax_t = long_long
+rbx.platform.typedef.__uintmax_t = ulong_long
+rbx.platform.typedef.__register_t = int
+rbx.platform.typedef.__vaddr_t = ulong
+rbx.platform.typedef.__paddr_t = ulong
+rbx.platform.typedef.__vsize_t = ulong
+rbx.platform.typedef.__psize_t = ulong
+rbx.platform.typedef.__clock_t = int
+rbx.platform.typedef.__clockid_t = int
+rbx.platform.typedef.__off_t = long_long
+rbx.platform.typedef.__ptrdiff_t = long
+rbx.platform.typedef.__size_t = ulong
+rbx.platform.typedef.__ssize_t = long
+rbx.platform.typedef.__time_t = int
+rbx.platform.typedef.__timer_t = int
+rbx.platform.typedef.__wchar_t = int
+rbx.platform.typedef.__wint_t = int
+rbx.platform.typedef.__rune_t = int
+rbx.platform.typedef.__wctrans_t = pointer
+rbx.platform.typedef.__wctype_t = pointer
+rbx.platform.typedef.__cpuid_t = ulong
+rbx.platform.typedef.__dev_t = int
+rbx.platform.typedef.__fixpt_t = uint
+rbx.platform.typedef.__gid_t = uint
+rbx.platform.typedef.__id_t = uint
+rbx.platform.typedef.__in_addr_t = uint
+rbx.platform.typedef.__in_port_t = ushort
+rbx.platform.typedef.__ino_t = uint
+rbx.platform.typedef.__key_t = long
+rbx.platform.typedef.__mode_t = uint
+rbx.platform.typedef.__nlink_t = uint
+rbx.platform.typedef.__pid_t = int
+rbx.platform.typedef.__rlim_t = ulong_long
+rbx.platform.typedef.__sa_family_t = uchar
+rbx.platform.typedef.__segsz_t = int
+rbx.platform.typedef.__socklen_t = uint
+rbx.platform.typedef.__swblk_t = int
+rbx.platform.typedef.__uid_t = uint
+rbx.platform.typedef.__useconds_t = uint
+rbx.platform.typedef.__suseconds_t = int
+rbx.platform.typedef.u_char = uchar
+rbx.platform.typedef.u_short = ushort
+rbx.platform.typedef.u_int = uint
+rbx.platform.typedef.u_long = ulong
+rbx.platform.typedef.unchar = uchar
+rbx.platform.typedef.ushort = ushort
+rbx.platform.typedef.uint = uint
+rbx.platform.typedef.ulong = ulong
+rbx.platform.typedef.cpuid_t = ulong
+rbx.platform.typedef.register_t = int
+rbx.platform.typedef.int8_t = char
+rbx.platform.typedef.uint8_t = uchar
+rbx.platform.typedef.int16_t = short
+rbx.platform.typedef.uint16_t = ushort
+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.u_int8_t = uchar
+rbx.platform.typedef.u_int16_t = ushort
+rbx.platform.typedef.u_int32_t = uint
+rbx.platform.typedef.u_int64_t = ulong_long
+rbx.platform.typedef.quad_t = long_long
+rbx.platform.typedef.u_quad_t = ulong_long
+rbx.platform.typedef.qaddr_t = pointer
+rbx.platform.typedef.vaddr_t = ulong
+rbx.platform.typedef.paddr_t = ulong
+rbx.platform.typedef.vsize_t = ulong
+rbx.platform.typedef.psize_t = ulong
+rbx.platform.typedef.caddr_t = string
+rbx.platform.typedef.daddr_t = int
+rbx.platform.typedef.daddr32_t = int
+rbx.platform.typedef.daddr64_t = long_long
+rbx.platform.typedef.dev_t = int
+rbx.platform.typedef.fixpt_t = uint
+rbx.platform.typedef.gid_t = uint
+rbx.platform.typedef.id_t = uint
+rbx.platform.typedef.ino_t = uint
+rbx.platform.typedef.key_t = long
+rbx.platform.typedef.mode_t = uint
+rbx.platform.typedef.nlink_t = uint
+rbx.platform.typedef.pid_t = int
+rbx.platform.typedef.rlim_t = ulong_long
+rbx.platform.typedef.segsz_t = int
+rbx.platform.typedef.swblk_t = int
+rbx.platform.typedef.uid_t = uint
+rbx.platform.typedef.useconds_t = uint
+rbx.platform.typedef.suseconds_t = int
+rbx.platform.typedef.in_addr_t = uint
+rbx.platform.typedef.in_port_t = ushort
+rbx.platform.typedef.sa_family_t = uchar
+rbx.platform.typedef.socklen_t = uint
+rbx.platform.typedef.clock_t = int
+rbx.platform.typedef.clockid_t = int
+rbx.platform.typedef.size_t = ulong
+rbx.platform.typedef.ssize_t = long
+rbx.platform.typedef.time_t = int
+rbx.platform.typedef.timer_t = int
+rbx.platform.typedef.off_t = long_long
+rbx.platform.typedef.__fd_mask = int

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

@@ -0,0 +1,122 @@
+rbx.platform.typedef.lock_t = uchar
+rbx.platform.typedef.int8_t = char
+rbx.platform.typedef.int16_t = short
+rbx.platform.typedef.int32_t = int
+rbx.platform.typedef.int64_t = long
+rbx.platform.typedef.uint8_t = uchar
+rbx.platform.typedef.uint16_t = ushort
+rbx.platform.typedef.uint32_t = uint
+rbx.platform.typedef.uint64_t = ulong
+rbx.platform.typedef.intmax_t = long
+rbx.platform.typedef.uintmax_t = ulong
+rbx.platform.typedef.intptr_t = long
+rbx.platform.typedef.uintptr_t = ulong
+rbx.platform.typedef.int_fast8_t = char
+rbx.platform.typedef.int_fast16_t = int
+rbx.platform.typedef.int_fast32_t = int
+rbx.platform.typedef.int_fast64_t = long
+rbx.platform.typedef.uint_fast8_t = uchar
+rbx.platform.typedef.uint_fast16_t = uint
+rbx.platform.typedef.uint_fast32_t = uint
+rbx.platform.typedef.uint_fast64_t = ulong
+rbx.platform.typedef.int_least8_t = char
+rbx.platform.typedef.int_least16_t = short
+rbx.platform.typedef.int_least32_t = int
+rbx.platform.typedef.int_least64_t = long
+rbx.platform.typedef.uint_least8_t = uchar
+rbx.platform.typedef.uint_least16_t = ushort
+rbx.platform.typedef.uint_least32_t = uint
+rbx.platform.typedef.uint_least64_t = ulong
+rbx.platform.typedef.longlong_t = long_long
+rbx.platform.typedef.u_longlong_t = ulong_long
+rbx.platform.typedef.t_scalar_t = int
+rbx.platform.typedef.t_uscalar_t = uint
+rbx.platform.typedef.uchar_t = uchar
+rbx.platform.typedef.ushort_t = ushort
+rbx.platform.typedef.uint_t = uint
+rbx.platform.typedef.ulong_t = ulong
+rbx.platform.typedef.*caddr_t = char
+rbx.platform.typedef.daddr_t = long
+rbx.platform.typedef.cnt_t = short
+rbx.platform.typedef.ptrdiff_t = long
+rbx.platform.typedef.pfn_t = ulong
+rbx.platform.typedef.pgcnt_t = ulong
+rbx.platform.typedef.spgcnt_t = long
+rbx.platform.typedef.use_t = uchar
+rbx.platform.typedef.sysid_t = short
+rbx.platform.typedef.index_t = short
+rbx.platform.typedef.off_t = long
+rbx.platform.typedef.off64_t = long
+rbx.platform.typedef.ino_t = ulong
+rbx.platform.typedef.blkcnt_t = long
+rbx.platform.typedef.fsblkcnt_t = ulong
+rbx.platform.typedef.fsfilcnt_t = ulong
+rbx.platform.typedef.ino64_t = ulong
+rbx.platform.typedef.blkcnt64_t = long
+rbx.platform.typedef.fsblkcnt64_t = ulong
+rbx.platform.typedef.fsfilcnt64_t = ulong
+rbx.platform.typedef.blksize_t = int
+rbx.platform.typedef.pad64_t = long
+rbx.platform.typedef.upad64_t = ulong
+rbx.platform.typedef.offset_t = long_long
+rbx.platform.typedef.u_offset_t = ulong_long
+rbx.platform.typedef.len_t = ulong_long
+rbx.platform.typedef.diskaddr_t = ulong_long
+rbx.platform.typedef.k_fltset_t = uint
+rbx.platform.typedef.id_t = int
+rbx.platform.typedef.lgrp_id_t = int
+rbx.platform.typedef.useconds_t = uint
+rbx.platform.typedef.suseconds_t = long
+rbx.platform.typedef.major_t = uint
+rbx.platform.typedef.minor_t = uint
+rbx.platform.typedef.pri_t = short
+rbx.platform.typedef.cpu_flag_t = ushort
+rbx.platform.typedef.o_mode_t = ushort
+rbx.platform.typedef.o_dev_t = short
+rbx.platform.typedef.o_uid_t = ushort
+rbx.platform.typedef.o_gid_t = ushort
+rbx.platform.typedef.o_nlink_t = short
+rbx.platform.typedef.o_pid_t = short
+rbx.platform.typedef.o_ino_t = ushort
+rbx.platform.typedef.key_t = int
+rbx.platform.typedef.mode_t = uint
+rbx.platform.typedef.uid_t = uint
+rbx.platform.typedef.gid_t = uint
+rbx.platform.typedef.datalink_id_t = uint
+rbx.platform.typedef.taskid_t = int
+rbx.platform.typedef.projid_t = int
+rbx.platform.typedef.poolid_t = int
+rbx.platform.typedef.zoneid_t = int
+rbx.platform.typedef.ctid_t = int
+rbx.platform.typedef.pthread_t = uint
+rbx.platform.typedef.pthread_key_t = uint
+rbx.platform.typedef.dev_t = ulong
+rbx.platform.typedef.nlink_t = uint
+rbx.platform.typedef.pid_t = int
+rbx.platform.typedef.size_t = ulong
+rbx.platform.typedef.ssize_t = long
+rbx.platform.typedef.time_t = long
+rbx.platform.typedef.clock_t = long
+rbx.platform.typedef.clockid_t = int
+rbx.platform.typedef.timer_t = int
+rbx.platform.typedef.unchar = uchar
+rbx.platform.typedef.ushort = ushort
+rbx.platform.typedef.uint = uint
+rbx.platform.typedef.ulong = ulong
+rbx.platform.typedef.u_char = uchar
+rbx.platform.typedef.u_short = ushort
+rbx.platform.typedef.u_int = uint
+rbx.platform.typedef.u_long = ulong
+rbx.platform.typedef.hrtime_t = long_long
+rbx.platform.typedef.fd_mask = long
+rbx.platform.typedef.fds_mask = long
+rbx.platform.typedef.sa_family_t = ushort
+rbx.platform.typedef.socklen_t = uint
+rbx.platform.typedef.nfds_t = ulong
+rbx.platform.typedef.disp_lock_t = uchar
+rbx.platform.typedef.model_t = uint
+rbx.platform.typedef.in_port_t = ushort
+rbx.platform.typedef.in_addr_t = uint
+rbx.platform.typedef.ipaddr_t = uint
+rbx.platform.typedef.rlim_t = ulong
+rbx.platform.typedef.rlim64_t = ulong_long

data/lib/ffi/struct.rb

@@ -222,7 +222,7 @@ module FFI
       def aligned(alignment = 1)
         @min_alignment = alignment
       end
-      alias :align :aligned
+      alias_method :align, :aligned
 
       def enclosing_module
         begin

data/lib/ffi/tools/generator.rb

@@ -16,7 +16,7 @@ module FFI
         indent = $1
         original_lines = $2.count "\n"
 
-        instance_eval $2
+        instance_eval $2, @ffi_name, $`.count("\n")
 
         new_lines = []
         @constants.each { |c| new_lines << c.to_ruby }

data/lib/ffi/types.rb

@@ -126,7 +126,7 @@ module FFI
     native_type Type::POINTER
 
     def self.from_native(val, ctx)
-      [ val.null? ? Qnil : val.get_string(0), val ]
+      [ val.null? ? nil : val.get_string(0), val ]
     end
 
   end
@@ -148,6 +148,7 @@ module FFI
         end
       }
     end
+    typedef :pointer, :caddr_t
   rescue Errno::ENOENT
   end
 end

data/spec/ffi/dup_spec.rb

@@ -0,0 +1,65 @@
+#
+# 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/>.
+#
+
+
+require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+
+describe "Pointer#dup" do 
+  it "clone should be independent" do
+    p1 = FFI::MemoryPointer.new(:char, 1024)
+    p1.put_string(0, "test123");
+    p2 = p1.dup
+    p1.put_string(0, "deadbeef")
+    
+    p2.get_string(0).should == "test123"
+  end
+  
+  it "sliced pointer can be cloned" do
+    p1 = FFI::MemoryPointer.new(:char, 1024)
+    p1.put_string(0, "test123");
+    p2 = p1[1].dup
+    
+    # first char will be excised
+    p2.get_string(0).should == "est123"
+    p1.get_string(0).should == "test123"
+  end
+  
+  it "sliced pointer when cloned is independent" do
+    p1 = FFI::MemoryPointer.new(:char, 1024)
+    p1.put_string(0, "test123");
+    p2 = p1[1].dup
+    
+    p1.put_string(0, "deadbeef")
+    # first char will be excised
+    p2.get_string(0).should == "est123"
+  end
+end
+
+
+describe "Struct#dup" do
+  it "clone should be independent" do
+    s = Class.new(FFI::Struct) do
+      layout :i, :int
+    end
+    s1 = s.new
+    s1[:i] = 0x12345
+    s2 = s1.dup
+    s1[:i] = 0x98765
+    s2[:i].should == 0x12345
+    s1[:i].should == 0x98765
+  end
+  
+end