ffi 1.13.1-x86-mingw32 → 1.14.0-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd1e7e77d7ec065bfbd30a68a5e3269e80438772c79045350f0aa85e839fd5ef
-  data.tar.gz: 73435ca8b7c0531a22de3435246ce8860dbaf64e8d4d82e06664cb088dcc3a23
+  metadata.gz: 8e8184354517195803468a9eba80024040685e79b3c4417d0b0c103d2c469e04
+  data.tar.gz: 1a460d06e141c46aa5392f85fd5318d17295d04ab63907c96965f00d517c3860
 SHA512:
-  metadata.gz: 6399008d474f358e45fcfe46f1dc8105265a632812c12001d635262552babf06a94c4ed0ca5fcc8fbbdc651c2b4e1579ff7664901831c98d64fc7f70173e5c50
-  data.tar.gz: 34c6f5deadea47afe936dd291038230af20ff470bcd24b5bbb947be57fbfc0a25ed7759d41811b5985d2d583813bdecaebfedb2e987e9e8d67e8b738ddbd5296
+  metadata.gz: 3b7cb006d5f69f2f3aa394cb30493e74b50e6572438826b68778d9e4239c0b32bc7371bddac9741541e535133a141d8a35db00a910fb54d12d470477893ca4d4
+  data.tar.gz: f7585720ce34fb301e2410033d6c282fb1a0176a93858a35476a45912ca90b9ee2972554ab3d464300ed7dfc6d20c85cd9b0d0f3b42c5d85eec3a6f8e25db61d

data/CHANGELOG.md

@@ -1,3 +1,28 @@
+1.14.0 / 2020-12-18
+-------------------
+
+Added:
+* Add types.conf for x86_64-msys, x86_64-haiku, aarch64-openbsd and aarch64-darwin (alias arm64-darwin)
+* Add method AbstractMemory#size_limit? . #829
+* Add new extconf option --enable-libffi-alloc which is enabled per default on Apple M1 (arm64-darwin).
+
+Changed:
+* Do NULL pointer check only when array length > 0 . #305
+* Raise an error on an unknown order argument. #830
+* Change FFI::Pointer#write_string to terminate with a NUL byte like other string methods. #805
+* Update bundled libffi to latest master.
+
+Removed:
+* Remove win32/stdint.h and stdbool.h because of copyright issue.  #693
+
+Fixed:
+* Fix possible UTF-8 load error in loader script interpretation. #792
+* Fix segfault on non-array argument to #write_array_of_*
+* Fix memory leak in MethodHandle . #815
+* Fix possible segfault in combination with fiddle or other libffi using gems . #835
+* Fix possibility to use ffi ruby gem with JRuby-9.3 . #763
+
+
 1.13.1 / 2020-06-09
 -------------------
 

data/README.md

@@ -1,4 +1,4 @@
-# Ruby-FFI https://github.com/ffi/ffi/wiki [![Build Status](https://travis-ci.org/ffi/ffi.svg?branch=master)](https://travis-ci.org/ffi/ffi) [![Build status Windows](https://ci.appveyor.com/api/projects/status/r8wxn1sd4s794gg1/branch/master?svg=true)](https://ci.appveyor.com/project/larskanis/ffi-aofqa/branch/master)
+# Ruby-FFI https://github.com/ffi/ffi/wiki [![Build Status](https://travis-ci.com/ffi/ffi.svg?branch=master)](https://travis-ci.com/ffi/ffi) [![Build status Windows](https://ci.appveyor.com/api/projects/status/r8wxn1sd4s794gg1/branch/master?svg=true)](https://ci.appveyor.com/project/larskanis/ffi-aofqa/branch/master)
 
 ## Description
 
@@ -66,10 +66,18 @@ From rubygems:
 or from the git repository on github:
 
     git clone git://github.com/ffi/ffi.git
-    git submodule update --init --recursive
     cd ffi
+    git submodule update --init --recursive
+    bundle install
     rake install
 
+### Install options:
+
+* `--enable-system-libffi` : Force usage of system libffi
+* `--disable-system-libffi` : Force usage of builtin libffi
+* `--enable-libffi-alloc` : Force closure allocation by libffi
+* `--disable-libffi-alloc` : Force closure allocation by builtin method
+
 ## License
 
 The ffi library is covered by the BSD license, also see the LICENSE file.

data/ffi.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
     s.metadata['mailing_list_uri'] = 'http://groups.google.com/group/ruby-ffi'
   end
   s.files = `git ls-files -z`.split("\x0").reject do |f|
-    f =~ /^(bench|gen|libtest|nbproject|spec)/
+    f =~ /^(\.|bench|gen|libtest|nbproject|spec)/
   end
 
   # Add libffi git files

data/lib/ffi.rb

@@ -8,11 +8,11 @@ if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
 
   require 'ffi/ffi'
 
-elsif RUBY_ENGINE == 'jruby' && Gem::Version.new(RUBY_ENGINE_VERSION) >= Gem::Version.new("9.3.pre")
+elsif RUBY_ENGINE == 'jruby' && (RUBY_ENGINE_VERSION.split('.').map(&:to_i) <=> [9, 3]) >= 0
   JRuby::Util.load_ext("org.jruby.ext.ffi.FFIService")
   require 'ffi/ffi'
 
-elsif RUBY_ENGINE == 'truffleruby' && Gem::Version.new(RUBY_ENGINE_VERSION) >= Gem::Version.new("20.1.0-dev-a")
+elsif RUBY_ENGINE == 'truffleruby' && (RUBY_ENGINE_VERSION.split('.').map(&:to_i) <=> [20, 1, 0]) >= 0
   require 'truffleruby/ffi_backend'
   require 'ffi/ffi'
 

data/lib/ffi/abstract_memory.rb

@@ -0,0 +1,44 @@
+#
+# Copyright (C) 2020 Lars Kanis
+#
+# This file is part of ruby-ffi.
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of the Ruby FFI project nor the names of its contributors
+#   may be used to endorse or promote products derived from this software
+#   without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.#
+
+
+module FFI
+  class AbstractMemory
+    LONG_MAX = FFI::Pointer.new(1).size
+    private_constant :LONG_MAX
+
+    # Return +true+ if +self+ has a size limit.
+    #
+    # @return [Boolean]
+    def size_limit?
+      size != LONG_MAX
+    end
+  end
+end

data/lib/ffi/ffi.rb

@@ -33,6 +33,7 @@ require 'ffi/data_converter'
 require 'ffi/types'
 require 'ffi/library'
 require 'ffi/errno'
+require 'ffi/abstract_memory'
 require 'ffi/pointer'
 require 'ffi/memorypointer'
 require 'ffi/struct'

data/lib/ffi/library.rb

@@ -115,7 +115,7 @@ module FFI
             rescue Exception => ex
               ldscript = false
               if ex.message =~ /(([^ \t()])+\.so([^ \t:()])*):([ \t])*(invalid ELF header|file too short|invalid file format)/
-                if File.read($1) =~ /(?:GROUP|INPUT) *\( *([^ \)]+)/
+                if File.binread($1) =~ /(?:GROUP|INPUT) *\( *([^ \)]+)/
                   libname = $1
                   ldscript = true
                 end

data/lib/ffi/platform.rb

@@ -63,7 +63,7 @@ module FFI
     ARCH = case CPU.downcase
     when /amd64|x86_64|x64/
       "x86_64"
-    when /i?86|x86|i86pc/
+    when /i\d86|x86|i86pc/
       "i386"
     when /ppc64|powerpc64/
       "powerpc64"
@@ -71,13 +71,16 @@ module FFI
       "powerpc"
     when /sparcv9|sparc64/
       "sparcv9"
-    else
-      case RbConfig::CONFIG['host_cpu']
-      when /^arm/
-        "arm"
+    when /arm64|aarch64/  # MacOS calls it "arm64", other operating systems "aarch64"
+      "aarch64"
+    when /^arm/
+      if OS == "darwin"   # Ruby before 3.0 reports "arm" instead of "arm64" as host_cpu on darwin
+        "aarch64"
       else
-        RbConfig::CONFIG['host_cpu']
+        "arm"
       end
+    else
+      RbConfig::CONFIG['host_cpu']
     end
 
     private
@@ -145,6 +148,12 @@ module FFI
       "#{LIBPREFIX}c.#{LIBSUFFIX}"
     end
 
+    LITTLE_ENDIAN = 1234 unless defined?(LITTLE_ENDIAN)
+    BIG_ENDIAN = 4321 unless defined?(BIG_ENDIAN)
+    unless defined?(BYTE_ORDER)
+      BYTE_ORDER = [0x12345678].pack("I") == [0x12345678].pack("N") ? BIG_ENDIAN : LITTLE_ENDIAN
+    end
+
     # Test if current OS is a *BSD (include MAC)
     # @return [Boolean]
     def self.bsd?

data/lib/ffi/platform/aarch64-darwin/types.conf

@@ -0,0 +1,130 @@
+rbx.platform.typedef.__darwin_blkcnt_t = long_long
+rbx.platform.typedef.__darwin_blksize_t = int
+rbx.platform.typedef.__darwin_clock_t = ulong
+rbx.platform.typedef.__darwin_ct_rune_t = int
+rbx.platform.typedef.__darwin_dev_t = int
+rbx.platform.typedef.__darwin_fsblkcnt_t = uint
+rbx.platform.typedef.__darwin_fsfilcnt_t = uint
+rbx.platform.typedef.__darwin_gid_t = uint
+rbx.platform.typedef.__darwin_id_t = uint
+rbx.platform.typedef.__darwin_ino64_t = ulong_long
+rbx.platform.typedef.__darwin_ino_t = ulong_long
+rbx.platform.typedef.__darwin_intptr_t = long
+rbx.platform.typedef.__darwin_mach_port_name_t = uint
+rbx.platform.typedef.__darwin_mach_port_t = uint
+rbx.platform.typedef.__darwin_mode_t = ushort
+rbx.platform.typedef.__darwin_natural_t = uint
+rbx.platform.typedef.__darwin_off_t = long_long
+rbx.platform.typedef.__darwin_pid_t = int
+rbx.platform.typedef.__darwin_pthread_key_t = ulong
+rbx.platform.typedef.__darwin_ptrdiff_t = long
+rbx.platform.typedef.__darwin_rune_t = int
+rbx.platform.typedef.__darwin_sigset_t = uint
+rbx.platform.typedef.__darwin_size_t = ulong
+rbx.platform.typedef.__darwin_socklen_t = uint
+rbx.platform.typedef.__darwin_ssize_t = long
+rbx.platform.typedef.__darwin_suseconds_t = int
+rbx.platform.typedef.__darwin_time_t = long
+rbx.platform.typedef.__darwin_uid_t = uint
+rbx.platform.typedef.__darwin_useconds_t = uint
+rbx.platform.typedef.__darwin_uuid_string_t[37] = char
+rbx.platform.typedef.__darwin_uuid_t[16] = uchar
+rbx.platform.typedef.__darwin_wchar_t = int
+rbx.platform.typedef.__darwin_wint_t = int
+rbx.platform.typedef.__int16_t = short
+rbx.platform.typedef.__int32_t = int
+rbx.platform.typedef.__int64_t = long_long
+rbx.platform.typedef.__int8_t = char
+rbx.platform.typedef.__uint16_t = ushort
+rbx.platform.typedef.__uint32_t = uint
+rbx.platform.typedef.__uint64_t = ulong_long
+rbx.platform.typedef.__uint8_t = uchar
+rbx.platform.typedef.blkcnt_t = long_long
+rbx.platform.typedef.blksize_t = int
+rbx.platform.typedef.caddr_t = string
+rbx.platform.typedef.clock_t = ulong
+rbx.platform.typedef.daddr_t = int
+rbx.platform.typedef.dev_t = int
+rbx.platform.typedef.errno_t = int
+rbx.platform.typedef.fd_mask = int
+rbx.platform.typedef.fixpt_t = uint
+rbx.platform.typedef.fsblkcnt_t = uint
+rbx.platform.typedef.fsfilcnt_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.ino64_t = ulong_long
+rbx.platform.typedef.ino_t = ulong_long
+rbx.platform.typedef.int16_t = short
+rbx.platform.typedef.int32_t = int
+rbx.platform.typedef.int64_t = long_long
+rbx.platform.typedef.int8_t = char
+rbx.platform.typedef.int_fast16_t = short
+rbx.platform.typedef.int_fast32_t = int
+rbx.platform.typedef.int_fast64_t = long_long
+rbx.platform.typedef.int_fast8_t = char
+rbx.platform.typedef.int_least16_t = short
+rbx.platform.typedef.int_least32_t = int
+rbx.platform.typedef.int_least64_t = long_long
+rbx.platform.typedef.int_least8_t = char
+rbx.platform.typedef.intmax_t = long
+rbx.platform.typedef.intptr_t = long
+rbx.platform.typedef.key_t = int
+rbx.platform.typedef.mode_t = ushort
+rbx.platform.typedef.nlink_t = ushort
+rbx.platform.typedef.off_t = long_long
+rbx.platform.typedef.pid_t = int
+rbx.platform.typedef.pthread_key_t = ulong
+rbx.platform.typedef.ptrdiff_t = long
+rbx.platform.typedef.qaddr_t = pointer
+rbx.platform.typedef.quad_t = long_long
+rbx.platform.typedef.register_t = long_long
+rbx.platform.typedef.rlim_t = ulong_long
+rbx.platform.typedef.rsize_t = ulong
+rbx.platform.typedef.sa_family_t = uchar
+rbx.platform.typedef.sae_associd_t = uint
+rbx.platform.typedef.sae_connid_t = uint
+rbx.platform.typedef.segsz_t = int
+rbx.platform.typedef.size_t = ulong
+rbx.platform.typedef.socklen_t = uint
+rbx.platform.typedef.ssize_t = long
+rbx.platform.typedef.suseconds_t = int
+rbx.platform.typedef.swblk_t = int
+rbx.platform.typedef.syscall_arg_t = ulong_long
+rbx.platform.typedef.time_t = long
+rbx.platform.typedef.u_char = uchar
+rbx.platform.typedef.u_int = uint
+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.u_int8_t = uchar
+rbx.platform.typedef.u_long = ulong
+rbx.platform.typedef.u_quad_t = ulong_long
+rbx.platform.typedef.u_short = ushort
+rbx.platform.typedef.uid_t = uint
+rbx.platform.typedef.uint = uint
+rbx.platform.typedef.uint16_t = ushort
+rbx.platform.typedef.uint32_t = uint
+rbx.platform.typedef.uint64_t = ulong_long
+rbx.platform.typedef.uint8_t = uchar
+rbx.platform.typedef.uint_fast16_t = ushort
+rbx.platform.typedef.uint_fast32_t = uint
+rbx.platform.typedef.uint_fast64_t = ulong_long
+rbx.platform.typedef.uint_fast8_t = uchar
+rbx.platform.typedef.uint_least16_t = ushort
+rbx.platform.typedef.uint_least32_t = uint
+rbx.platform.typedef.uint_least64_t = ulong_long
+rbx.platform.typedef.uint_least8_t = uchar
+rbx.platform.typedef.uintmax_t = ulong
+rbx.platform.typedef.uintptr_t = ulong
+rbx.platform.typedef.useconds_t = uint
+rbx.platform.typedef.user_addr_t = ulong_long
+rbx.platform.typedef.user_long_t = long_long
+rbx.platform.typedef.user_off_t = long_long
+rbx.platform.typedef.user_size_t = ulong_long
+rbx.platform.typedef.user_ssize_t = long_long
+rbx.platform.typedef.user_time_t = long_long
+rbx.platform.typedef.user_ulong_t = ulong_long
+rbx.platform.typedef.ushort = ushort
+rbx.platform.typedef.wchar_t = int

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

@@ -0,0 +1,134 @@
+rbx.platform.typedef.__blkcnt_t = long_long
+rbx.platform.typedef.__blksize_t = int
+rbx.platform.typedef.__clock_t = long_long
+rbx.platform.typedef.__clockid_t = int
+rbx.platform.typedef.__cpuid_t = ulong
+rbx.platform.typedef.__dev_t = int
+rbx.platform.typedef.__fd_mask = uint
+rbx.platform.typedef.__fixpt_t = uint
+rbx.platform.typedef.__fsblkcnt_t = ulong_long
+rbx.platform.typedef.__fsfilcnt_t = ulong_long
+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 = ulong_long
+rbx.platform.typedef.__int16_t = short
+rbx.platform.typedef.__int32_t = int
+rbx.platform.typedef.__int64_t = long_long
+rbx.platform.typedef.__int8_t = char
+rbx.platform.typedef.__int_fast16_t = int
+rbx.platform.typedef.__int_fast32_t = int
+rbx.platform.typedef.__int_fast64_t = long_long
+rbx.platform.typedef.__int_fast8_t = int
+rbx.platform.typedef.__int_least16_t = short
+rbx.platform.typedef.__int_least32_t = int
+rbx.platform.typedef.__int_least64_t = long_long
+rbx.platform.typedef.__int_least8_t = char
+rbx.platform.typedef.__intmax_t = long_long
+rbx.platform.typedef.__intptr_t = long
+rbx.platform.typedef.__key_t = long
+rbx.platform.typedef.__mode_t = uint
+rbx.platform.typedef.__nlink_t = uint
+rbx.platform.typedef.__off_t = long_long
+rbx.platform.typedef.__paddr_t = ulong
+rbx.platform.typedef.__pid_t = int
+rbx.platform.typedef.__psize_t = ulong
+rbx.platform.typedef.__ptrdiff_t = long
+rbx.platform.typedef.__register_t = long
+rbx.platform.typedef.__rlim_t = ulong_long
+rbx.platform.typedef.__rune_t = int
+rbx.platform.typedef.__sa_family_t = uchar
+rbx.platform.typedef.__segsz_t = int
+rbx.platform.typedef.__size_t = ulong
+rbx.platform.typedef.__socklen_t = uint
+rbx.platform.typedef.__ssize_t = long
+rbx.platform.typedef.__suseconds_t = long
+rbx.platform.typedef.__swblk_t = int
+rbx.platform.typedef.__time_t = long_long
+rbx.platform.typedef.__timer_t = int
+rbx.platform.typedef.__uid_t = uint
+rbx.platform.typedef.__uint16_t = ushort
+rbx.platform.typedef.__uint32_t = uint
+rbx.platform.typedef.__uint64_t = ulong_long
+rbx.platform.typedef.__uint8_t = uchar
+rbx.platform.typedef.__uint_fast16_t = uint
+rbx.platform.typedef.__uint_fast32_t = uint
+rbx.platform.typedef.__uint_fast64_t = ulong_long
+rbx.platform.typedef.__uint_fast8_t = uint
+rbx.platform.typedef.__uint_least16_t = ushort
+rbx.platform.typedef.__uint_least32_t = uint
+rbx.platform.typedef.__uint_least64_t = ulong_long
+rbx.platform.typedef.__uint_least8_t = uchar
+rbx.platform.typedef.__uintmax_t = ulong_long
+rbx.platform.typedef.__uintptr_t = ulong
+rbx.platform.typedef.__useconds_t = uint
+rbx.platform.typedef.__vaddr_t = ulong
+rbx.platform.typedef.__vsize_t = ulong
+rbx.platform.typedef.__wchar_t = int
+rbx.platform.typedef.__wctrans_t = pointer
+rbx.platform.typedef.__wctype_t = pointer
+rbx.platform.typedef.__wint_t = int
+rbx.platform.typedef.blkcnt_t = long_long
+rbx.platform.typedef.blksize_t = int
+rbx.platform.typedef.caddr_t = string
+rbx.platform.typedef.clock_t = long_long
+rbx.platform.typedef.clockid_t = int
+rbx.platform.typedef.cpuid_t = ulong
+rbx.platform.typedef.daddr32_t = int
+rbx.platform.typedef.daddr_t = long_long
+rbx.platform.typedef.dev_t = int
+rbx.platform.typedef.fixpt_t = uint
+rbx.platform.typedef.fsblkcnt_t = ulong_long
+rbx.platform.typedef.fsfilcnt_t = ulong_long
+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 = ulong_long
+rbx.platform.typedef.int16_t = short
+rbx.platform.typedef.int32_t = int
+rbx.platform.typedef.int64_t = long_long
+rbx.platform.typedef.int8_t = char
+rbx.platform.typedef.key_t = long
+rbx.platform.typedef.mode_t = uint
+rbx.platform.typedef.nlink_t = uint
+rbx.platform.typedef.off_t = long_long
+rbx.platform.typedef.paddr_t = ulong
+rbx.platform.typedef.pid_t = int
+rbx.platform.typedef.psize_t = ulong
+rbx.platform.typedef.qaddr_t = pointer
+rbx.platform.typedef.quad_t = long_long
+rbx.platform.typedef.register_t = long
+rbx.platform.typedef.rlim_t = ulong_long
+rbx.platform.typedef.sa_family_t = uchar
+rbx.platform.typedef.segsz_t = int
+rbx.platform.typedef.sigset_t = uint
+rbx.platform.typedef.size_t = ulong
+rbx.platform.typedef.socklen_t = uint
+rbx.platform.typedef.ssize_t = long
+rbx.platform.typedef.suseconds_t = long
+rbx.platform.typedef.swblk_t = int
+rbx.platform.typedef.time_t = long_long
+rbx.platform.typedef.timer_t = int
+rbx.platform.typedef.u_char = uchar
+rbx.platform.typedef.u_int = uint
+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.u_int8_t = uchar
+rbx.platform.typedef.u_long = ulong
+rbx.platform.typedef.u_quad_t = ulong_long
+rbx.platform.typedef.u_short = ushort
+rbx.platform.typedef.uid_t = uint
+rbx.platform.typedef.uint = uint
+rbx.platform.typedef.uint16_t = ushort
+rbx.platform.typedef.uint32_t = uint
+rbx.platform.typedef.uint64_t = ulong_long
+rbx.platform.typedef.uint8_t = uchar
+rbx.platform.typedef.ulong = ulong
+rbx.platform.typedef.unchar = uchar
+rbx.platform.typedef.useconds_t = uint
+rbx.platform.typedef.ushort = ushort
+rbx.platform.typedef.vaddr_t = ulong
+rbx.platform.typedef.vsize_t = ulong

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

@@ -0,0 +1,117 @@
+rbx.platform.typedef.__haiku_addr_t = ulong
+rbx.platform.typedef.__haiku_generic_addr_t = ulong
+rbx.platform.typedef.__haiku_int16 = short
+rbx.platform.typedef.__haiku_int32 = int
+rbx.platform.typedef.__haiku_int64 = long
+rbx.platform.typedef.__haiku_int8 = char
+rbx.platform.typedef.__haiku_phys_addr_t = ulong
+rbx.platform.typedef.__haiku_phys_saddr_t = long
+rbx.platform.typedef.__haiku_saddr_t = long
+rbx.platform.typedef.__haiku_std_int16 = short
+rbx.platform.typedef.__haiku_std_int32 = int
+rbx.platform.typedef.__haiku_std_int64 = long
+rbx.platform.typedef.__haiku_std_int8 = char
+rbx.platform.typedef.__haiku_std_uint16 = ushort
+rbx.platform.typedef.__haiku_std_uint32 = uint
+rbx.platform.typedef.__haiku_std_uint64 = ulong
+rbx.platform.typedef.__haiku_std_uint8 = uchar
+rbx.platform.typedef.__haiku_uint16 = ushort
+rbx.platform.typedef.__haiku_uint32 = uint
+rbx.platform.typedef.__haiku_uint64 = ulong
+rbx.platform.typedef.__haiku_uint8 = uchar
+rbx.platform.typedef.addr_t = ulong
+rbx.platform.typedef.bigtime_t = long
+rbx.platform.typedef.blkcnt_t = long
+rbx.platform.typedef.blksize_t = int
+rbx.platform.typedef.caddr_t = pointer
+rbx.platform.typedef.clock_t = int
+rbx.platform.typedef.clockid_t = int
+rbx.platform.typedef.cnt_t = int
+rbx.platform.typedef.daddr_t = long
+rbx.platform.typedef.dev_t = int
+rbx.platform.typedef.fd_mask = uint
+rbx.platform.typedef.fsblkcnt_t = long
+rbx.platform.typedef.fsfilcnt_t = long
+rbx.platform.typedef.generic_addr_t = ulong
+rbx.platform.typedef.generic_size_t = ulong
+rbx.platform.typedef.gid_t = uint
+rbx.platform.typedef.id_t = int
+rbx.platform.typedef.in_addr_t = uint
+rbx.platform.typedef.in_port_t = ushort
+rbx.platform.typedef.ino_t = long
+rbx.platform.typedef.int16 = short
+rbx.platform.typedef.int16_t = short
+rbx.platform.typedef.int32 = int
+rbx.platform.typedef.int32_t = int
+rbx.platform.typedef.int64 = long
+rbx.platform.typedef.int64_t = long
+rbx.platform.typedef.int8 = char
+rbx.platform.typedef.int8_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.int_fast8_t = int
+rbx.platform.typedef.int_least16_t = short
+rbx.platform.typedef.int_least32_t = int
+rbx.platform.typedef.int_least64_t = long
+rbx.platform.typedef.int_least8_t = char
+rbx.platform.typedef.intmax_t = long
+rbx.platform.typedef.intptr_t = long
+rbx.platform.typedef.key_t = int
+rbx.platform.typedef.mode_t = uint
+rbx.platform.typedef.nanotime_t = long
+rbx.platform.typedef.nlink_t = int
+rbx.platform.typedef.off_t = long
+rbx.platform.typedef.perform_code = uint
+rbx.platform.typedef.phys_addr_t = ulong
+rbx.platform.typedef.phys_size_t = ulong
+rbx.platform.typedef.pid_t = int
+rbx.platform.typedef.pthread_key_t = int
+rbx.platform.typedef.ptrdiff_t = long
+rbx.platform.typedef.rlim_t = ulong
+rbx.platform.typedef.sa_family_t = uchar
+rbx.platform.typedef.sig_atomic_t = int
+rbx.platform.typedef.sigset_t = ulong
+rbx.platform.typedef.size_t = ulong
+rbx.platform.typedef.socklen_t = uint
+rbx.platform.typedef.status_t = int
+rbx.platform.typedef.suseconds_t = int
+rbx.platform.typedef.time_t = long
+rbx.platform.typedef.type_code = uint
+rbx.platform.typedef.u_char = uchar
+rbx.platform.typedef.u_int = uint
+rbx.platform.typedef.u_int16_t = ushort
+rbx.platform.typedef.u_int32_t = uint
+rbx.platform.typedef.u_int64_t = ulong
+rbx.platform.typedef.u_int8_t = uchar
+rbx.platform.typedef.u_long = ulong
+rbx.platform.typedef.u_short = ushort
+rbx.platform.typedef.uchar = uchar
+rbx.platform.typedef.uid_t = uint
+rbx.platform.typedef.uint = uint
+rbx.platform.typedef.uint16 = ushort
+rbx.platform.typedef.uint16_t = ushort
+rbx.platform.typedef.uint32 = uint
+rbx.platform.typedef.uint32_t = uint
+rbx.platform.typedef.uint64 = ulong
+rbx.platform.typedef.uint64_t = ulong
+rbx.platform.typedef.uint8 = uchar
+rbx.platform.typedef.uint8_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.uint_fast8_t = uint
+rbx.platform.typedef.uint_least16_t = ushort
+rbx.platform.typedef.uint_least32_t = uint
+rbx.platform.typedef.uint_least64_t = ulong
+rbx.platform.typedef.uint_least8_t = uchar
+rbx.platform.typedef.uintmax_t = ulong
+rbx.platform.typedef.uintptr_t = ulong
+rbx.platform.typedef.ulong = ulong
+rbx.platform.typedef.umode_t = uint
+rbx.platform.typedef.unchar = uchar
+rbx.platform.typedef.unichar = ushort
+rbx.platform.typedef.useconds_t = uint
+rbx.platform.typedef.ushort = ushort
+rbx.platform.typedef.void*) = pointer
+rbx.platform.typedef.wchar_t = int

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

@@ -0,0 +1,119 @@
+rbx.platform.typedef.*addr_t = char
+rbx.platform.typedef.__ULong = uint
+rbx.platform.typedef.__blkcnt_t = long
+rbx.platform.typedef.__blksize_t = int
+rbx.platform.typedef.__clock_t = ulong
+rbx.platform.typedef.__clockid_t = ulong
+rbx.platform.typedef.__cpu_mask = ulong
+rbx.platform.typedef.__dev_t = uint
+rbx.platform.typedef.__fsblkcnt_t = ulong
+rbx.platform.typedef.__fsfilcnt_t = ulong
+rbx.platform.typedef.__gid_t = uint
+rbx.platform.typedef.__id_t = uint
+rbx.platform.typedef.__ino_t = ulong
+rbx.platform.typedef.__int32_t = int
+rbx.platform.typedef.__int64_t = long
+rbx.platform.typedef.__int8_t = char
+rbx.platform.typedef.__int_least32_t = int
+rbx.platform.typedef.__int_least64_t = long
+rbx.platform.typedef.__int_least8_t = char
+rbx.platform.typedef.__intmax_t = long
+rbx.platform.typedef.__intptr_t = long
+rbx.platform.typedef.__key_t = long_long
+rbx.platform.typedef.__loff_t = long_long
+rbx.platform.typedef.__mode_t = uint
+rbx.platform.typedef.__nl_item = int
+rbx.platform.typedef.__nlink_t = ushort
+rbx.platform.typedef.__off_t = long
+rbx.platform.typedef.__pid_t = int
+rbx.platform.typedef.__sigset_t = ulong
+rbx.platform.typedef.__size_t = ulong
+rbx.platform.typedef.__socklen_t = int
+rbx.platform.typedef.__suseconds_t = long
+rbx.platform.typedef.__time_t = long
+rbx.platform.typedef.__timer_t = ulong
+rbx.platform.typedef.__uid_t = uint
+rbx.platform.typedef.__uint32_t = uint
+rbx.platform.typedef.__uint64_t = ulong
+rbx.platform.typedef.__uint8_t = uchar
+rbx.platform.typedef.__uint_least32_t = uint
+rbx.platform.typedef.__uint_least64_t = ulong
+rbx.platform.typedef.__uint_least8_t = uchar
+rbx.platform.typedef.__uintmax_t = ulong
+rbx.platform.typedef.__uintptr_t = ulong
+rbx.platform.typedef.__useconds_t = ulong
+rbx.platform.typedef._fpos64_t = long_long
+rbx.platform.typedef._fpos_t = long
+rbx.platform.typedef._off64_t = long_long
+rbx.platform.typedef._off_t = long
+rbx.platform.typedef.blkcnt_t = long
+rbx.platform.typedef.blksize_t = int
+rbx.platform.typedef.caddr_t = string
+rbx.platform.typedef.clock_t = ulong
+rbx.platform.typedef.clockid_t = ulong
+rbx.platform.typedef.daddr_t = long
+rbx.platform.typedef.dev_t = uint
+rbx.platform.typedef.fd_mask = ulong
+rbx.platform.typedef.fsblkcnt_t = ulong
+rbx.platform.typedef.fsfilcnt_t = ulong
+rbx.platform.typedef.gid_t = uint
+rbx.platform.typedef.id_t = uint
+rbx.platform.typedef.in_addr_t = uint
+rbx.platform.typedef.ino_t = ulong
+rbx.platform.typedef.int32_t = int
+rbx.platform.typedef.int64_t = long
+rbx.platform.typedef.int8_t = char
+rbx.platform.typedef.int_fast16_t = long
+rbx.platform.typedef.int_fast32_t = long
+rbx.platform.typedef.int_fast64_t = long
+rbx.platform.typedef.int_fast8_t = char
+rbx.platform.typedef.int_least32_t = int
+rbx.platform.typedef.int_least64_t = long
+rbx.platform.typedef.int_least8_t = char
+rbx.platform.typedef.intmax_t = long
+rbx.platform.typedef.intptr_t = long
+rbx.platform.typedef.key_t = long_long
+rbx.platform.typedef.loff_t = long_long
+rbx.platform.typedef.mode_t = uint
+rbx.platform.typedef.nlink_t = ushort
+rbx.platform.typedef.off_t = long
+rbx.platform.typedef.pid_t = int
+rbx.platform.typedef.ptrdiff_t = long
+rbx.platform.typedef.register_t = long
+rbx.platform.typedef.rlim_t = ulong
+rbx.platform.typedef.sbintime_t = long
+rbx.platform.typedef.sig_atomic_t = int
+rbx.platform.typedef.sigset_t = ulong
+rbx.platform.typedef.size_t = ulong
+rbx.platform.typedef.socklen_t = int
+rbx.platform.typedef.suseconds_t = long
+rbx.platform.typedef.time_t = long
+rbx.platform.typedef.timer_t = ulong
+rbx.platform.typedef.u_char = uchar
+rbx.platform.typedef.u_int = uint
+rbx.platform.typedef.u_int32_t = uint
+rbx.platform.typedef.u_int64_t = ulong
+rbx.platform.typedef.u_int8_t = uchar
+rbx.platform.typedef.u_long = ulong
+rbx.platform.typedef.u_register_t = ulong
+rbx.platform.typedef.u_short = ushort
+rbx.platform.typedef.uid_t = uint
+rbx.platform.typedef.uint = uint
+rbx.platform.typedef.uint32_t = uint
+rbx.platform.typedef.uint64_t = ulong
+rbx.platform.typedef.uint8_t = uchar
+rbx.platform.typedef.uint_fast16_t = ulong
+rbx.platform.typedef.uint_fast32_t = ulong
+rbx.platform.typedef.uint_fast64_t = ulong
+rbx.platform.typedef.uint_fast8_t = uchar
+rbx.platform.typedef.uint_least32_t = uint
+rbx.platform.typedef.uint_least64_t = ulong
+rbx.platform.typedef.uint_least8_t = uchar
+rbx.platform.typedef.uintmax_t = ulong
+rbx.platform.typedef.uintptr_t = ulong
+rbx.platform.typedef.ulong = ulong
+rbx.platform.typedef.useconds_t = ulong
+rbx.platform.typedef.ushort = ushort
+rbx.platform.typedef.vm_offset_t = ulong
+rbx.platform.typedef.vm_size_t = ulong
+rbx.platform.typedef.wint_t = uint

data/lib/ffi/pointer.rb

@@ -85,23 +85,37 @@ module FFI
     # @param [String] str string to write
     # @param [Numeric] len length of string to return
     # @return [self]
-    # Write +len+ first bytes of +str+ in pointer's contents.
+    # Write +len+ first bytes of +str+ in pointer's contents and a final \0 byte.
     #
     # Same as:
     #  ptr.write_string(str, len)   # with len not nil
     def write_string_length(str, len)
-      put_bytes(0, str, 0, len)
+      write_string(str, len)
     end unless method_defined?(:write_string_length)
 
     # @param [String] str string to write
     # @param [Numeric] len length of string to return
     # @return [self]
-    # Write +str+ in pointer's contents, or first +len+ bytes if 
-    # +len+ is not +nil+.
+    # Write +str+ in pointer's contents.
+    # If +len+ is given, write the first +len+ bytes of +str+.
+    # In both cases a final \0 byte is written after the string.
     def write_string(str, len=nil)
-      len = str.bytesize unless len
-      # Write the string data without NUL termination
-      put_bytes(0, str, 0, len)
+      if len
+        if len == size
+          warn "[DEPRECATION] Memory too small to write a final 0-byte in #{caller(1, 1)[0]}. This will raise an error in ffi-2.0. Please use write_bytes instead or enlarge the memory region."
+          write_bytes(str, 0, len)
+        else
+          put_char(len, 0) # Check size before writing str
+          write_bytes(str, 0, len)
+        end
+      else
+        if str.bytesize == size
+          warn "[DEPRECATION] Memory too small to write a final 0-byte in #{caller(1, 1)[0]}. This will raise an error in ffi-2.0. Please use write_bytes instead or enlarge the memory region."
+          write_bytes(str)
+        else
+          put_string(0, str)
+        end
+      end
     end unless method_defined?(:write_string)
 
     # @param [Type] type type of data to read from pointer's contents

data/lib/ffi/version.rb

@@ -1,3 +1,3 @@
 module FFI
-  VERSION = '1.13.1'
+  VERSION = '1.14.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.14.0
 platform: x86-mingw32
 authors:
 - Wayne Meissner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-09 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -86,12 +86,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".appveyor.yml"
-- ".github/workflows/ci.yml"
-- ".gitignore"
-- ".gitmodules"
-- ".travis.yml"
-- ".yardopts"
 - CHANGELOG.md
 - COPYING
 - Gemfile
@@ -106,6 +100,7 @@ files:
 - lib/2.6/ffi_c.so
 - lib/2.7/ffi_c.so
 - lib/ffi.rb
+- lib/ffi/abstract_memory.rb
 - lib/ffi/autopointer.rb
 - lib/ffi/buffer.rb
 - lib/ffi/callback.rb
@@ -118,9 +113,11 @@ files:
 - lib/ffi/managedstruct.rb
 - lib/ffi/memorypointer.rb
 - lib/ffi/platform.rb
+- lib/ffi/platform/aarch64-darwin/types.conf
 - lib/ffi/platform/aarch64-freebsd/types.conf
 - lib/ffi/platform/aarch64-freebsd12/types.conf
 - lib/ffi/platform/aarch64-linux/types.conf
+- lib/ffi/platform/aarch64-openbsd/types.conf
 - lib/ffi/platform/arm-freebsd/types.conf
 - lib/ffi/platform/arm-freebsd12/types.conf
 - lib/ffi/platform/arm-linux/types.conf
@@ -160,7 +157,9 @@ files:
 - lib/ffi/platform/x86_64-dragonflybsd/types.conf
 - lib/ffi/platform/x86_64-freebsd/types.conf
 - lib/ffi/platform/x86_64-freebsd12/types.conf
+- lib/ffi/platform/x86_64-haiku/types.conf
 - lib/ffi/platform/x86_64-linux/types.conf
+- lib/ffi/platform/x86_64-msys/types.conf
 - lib/ffi/platform/x86_64-netbsd/types.conf
 - lib/ffi/platform/x86_64-openbsd/types.conf
 - lib/ffi/platform/x86_64-solaris/types.conf

data/.appveyor.yml

@@ -1,30 +0,0 @@
-install:
-  - SET PATH=C:\Ruby%RUBYVER%\bin;%PATH%
-  - SET RAKEOPT=-rdevkit
-  - ps: |
-      if ($env:RUBYVER -like "*head*") {
-        $(new-object net.webclient).DownloadFile("https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-$env:RUBYVER.exe", "$pwd/ruby-setup.exe")
-        cmd /c ruby-setup.exe /verysilent /dir=C:/Ruby$env:RUBYVER
-      }
-  - ridk version
-  - gem --version
-  - gem install bundler --quiet --no-document
-  - bundle install
-  # Update to libffi-3.3 since Appveyor version fails on LongDouble specs
-  - ridk exec pacman --sync --refresh --needed --noconfirm  mingw-w64-x86_64-libffi mingw-w64-i686-libffi
-build: off
-build_script:
-  - bundle exec rake libffi compile -- %EXTCONFOPTS% || bundle exec rake compile -- %EXTCONFOPTS%
-test_script:
-  - bundle exec rake test
-  - bundle exec rake types_conf && git --no-pager diff
-environment:
-  matrix:
-    - RUBYVER: "head-x64"
-      EXTCONFOPTS: "--disable-system-libffi"
-    - RUBYVER: 24
-      EXTCONFOPTS: "--disable-system-libffi"
-    - RUBYVER: 25-x64
-      EXTCONFOPTS: "--enable-system-libffi"
-    - RUBYVER: 26
-      EXTCONFOPTS: "--enable-system-libffi"

data/.github/workflows/ci.yml

@@ -1,64 +0,0 @@
-name: CI
-on: [push, pull_request]
-jobs:
-  system-libffi:
-    # Run on latest MRI with explicit selection of system or builtin libffi
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ ubuntu, macos, windows ]
-        extconfopts: [ --disable-system-libffi, --enable-system-libffi ]
-    runs-on: ${{ matrix.os }}-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.7
-
-    - run: brew install automake libffi pkg-config
-      if: matrix.os == 'macos'
-    - run: ridk exec pacman --sync --refresh --needed --noconfirm  mingw-w64-x86_64-libffi
-      if: matrix.os == 'windows' && matrix.extconfopts == '--enable-system-libffi'
-
-    - run: bundle install
-    - run: bundle exec rake libffi
-    - run: bundle exec rake compile -- ${{ matrix.extconfopts }}
-      env:
-        # work around misconfiguration of libffi on MacOS with homebrew
-        PKG_CONFIG_PATH: ${{ env.PKG_CONFIG_PATH }}:/usr/local/opt/libffi/lib/pkgconfig
-    - run: bundle exec rake test
-    - run: bundle exec rake types_conf && git --no-pager diff
-
-  specs:
-    # Run all specs on all ruby implementations
-    # Use automatic libffi selection on MRI
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ ubuntu, macos, windows ]
-        ruby: [ 2.3, 2.4, 2.5, 2.6, 2.7, ruby-head, truffleruby-head ]
-        exclude:
-        - os: windows
-          ruby: truffleruby-head
-        - os: windows
-          ruby: 2.3 # compilation fails
-    runs-on: ${{ matrix.os }}-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-
-    - run: brew install automake
-      if: matrix.os == 'macos'
-
-    - run: bundle install
-    - run: bundle exec rake libffi
-    - run: bundle exec rake compile
-
-    - run: bundle exec rake test
-
-    - run: bundle exec rake bench:all
-      if: matrix.ruby != 'truffleruby-head'
-      env:
-        ITER: 10

data/.gitignore

@@ -1,25 +0,0 @@
-doc/
-bin/
-.yardoc
-*.orig
-nbproject/private
-pkg
-*.orig
-*.rej
-*.patch
-*.diff
-build
-*.so
-*.[oa]
-core
-lib/ffi/types.conf
-lib/ffi_c.bundle
-lib/ffi_c.so
-vendor
-.bundle
-Gemfile.lock
-types_log
-*.gem
-embed-test.log
-spec/ffi/embed-test/ext/Makefile
-spec/ffi/embed-test/ext/embed_test.bundle

data/.gitmodules

@@ -1,4 +0,0 @@
-[submodule "ext/ffi_c/libffi"]
-	path = ext/ffi_c/libffi
-	url = https://github.com/libffi/libffi.git
-	branch = master

data/.travis.yml

@@ -1,58 +0,0 @@
-dist: trusty
-group: beta
-language: ruby
-git:
-  submodules: false
-
-script:
-  - bundle exec rake libffi
-  - bundle exec rake compile
-  - bundle exec rake test
-  - |
-      if [[ $(ruby -v) != *truffleruby* ]]; then
-        ITER=10 bundle exec rake bench:all
-      fi
-  - bundle exec rake types_conf && git --no-pager diff
-os:
-  - linux
-  - osx
-rvm:
-  - 2.3.8
-  - 2.4.6
-  - 2.5.5
-  - 2.6.5
-  - 2.7.0
-  - ruby-head
-  - truffleruby-head
-
-env:
-  - CC=gcc
-  - CC=clang
-matrix:
-  allow_failures:
-    - os: osx
-      rvm: ruby-head
-    - os: osx
-      rvm: 2.3.8
-    - os: linux
-      rvm: ruby-head
-  include:
-    - name: powerpc
-      language: generic
-      before_install: |
-        docker run --rm --privileged multiarch/qemu-user-static:register --reset &&
-          docker build --rm -t ffi-powerpc -f spec/env/Dockerfile.powerpc .
-      script: |
-        docker run --rm -t -v `pwd`:/ffi ffi-powerpc
-    - name: armhf
-      language: generic
-      before_install: |
-        docker run --rm --privileged multiarch/qemu-user-static:register --reset &&
-          docker build --rm -t ffi-armhf -f spec/env/Dockerfile.armhf .
-      script: |
-        docker run --rm -t -v `pwd`:/ffi ffi-armhf
-  exclude:
-    - os: osx
-      rvm: truffleruby-head
-after_failure:
-  - "find build -name mkmf.log | xargs cat"

data/.yardopts

@@ -1,5 +0,0 @@
---title "Ruby FFI"
---charset UTF-8
---private
-lib/**/*.rb
-ext/**/*.c