ffi 1.0.12.rc3-x86-mingw32 → 1.1.0.rc2-x86-mingw32

data/README.rdoc

@@ -54,3 +54,49 @@ or from the git repository on github:
 == LICENSE:
 
 See LICENSE file.
+
+== CREDITS
+
+The following people have submitted code, bug reports, or otherwide contributed to the success of this project:
+
+Alban Peignier <alban.peignier@free.fr>
+Aman Gupta <aman@tmm1.net>
+Andrea Fazzi <andrea.fazzi@alcacoop.it>
+Andreas Niederl <rico32@gmx.net>
+Andrew Cholakian <andrew@andrewvc.com>
+Antonio Terceiro <terceiro@softwarelivre.org>
+Brian Candler <B.Candler@pobox.com>
+Brian D. Burns <burns180@gmail.com>
+Bryan Kearney <bkearney@redhat.com>
+Charlie Savage <cfis@zerista.com>
+Chikanaga Tomoyuki <nagachika00@gmail.com>
+Hongli Lai <hongli@phusion.nl>
+Ian MacLeod <ian@nevir.net>
+Jake Douglas <jake@shiftedlabs.com>
+Jean-Dominique Morani <jdmorani@mac.com>
+Jeremy Hinegardner <jeremy@hinegardner.org>
+Jesús García Sáez <blaxter@gmail.com>
+Joe Khoobyar <joe@ankhcraft.com>
+Jurij Smakov <jurij@wooyd.org>
+KISHIMOTO, Makoto <ksmakoto@dd.iij4u.or.jp>
+Kim Burgestrand <kim@burgestrand.se>
+Lars Kanis <kanis@comcard.de>
+Luc Heinrich <luc@honk-honk.com>
+Luis Lavena <luislavena@gmail.com>
+Matijs van Zuijlen <matijs@matijs.net>
+Matthew King <automatthew@gmail.com>
+Mike Dalessio <mike.dalessio@gmail.com>
+NARUSE, Yui <naruse@airemix.jp>
+Park Heesob <phasis@gmail.com>
+Shin Yee <shinyee@speedgocomputing.com>
+Stephen Bannasch <stephen.bannasch@gmail.com>
+Suraj N. Kurapati <sunaku@gmail.com>
+Sylvain Daubert <sylvain.daubert@laposte.net>
+Victor Costan
+beoran@gmail.com
+ctide <christide@christide.com>
+emboss <Martin.Bosslet@googlemail.com>
+hobophobe <unusualtears@gmail.com>
+meh <meh@paranoici.org>
+postmodern <postmodern.mod3@gmail.com>
+wycats@gmail.com <wycats@gmail.com>

data/Rakefile

@@ -5,7 +5,6 @@ USE_RAKE_COMPILER = (RUBY_PLATFORM =~ /java/) ? false : true
 if USE_RAKE_COMPILER
   gem 'rake-compiler', '>=0.6.0'
   require 'rake/extensiontask'
-  ENV['RUBY_CC_VERSION'] = '1.8.7:1.9.3'
 end
 
 require 'date'
@@ -75,7 +74,7 @@ PROJ.name = 'ffi'
 PROJ.authors = 'Wayne Meissner'
 PROJ.email = 'wmeissner@gmail.com'
 PROJ.url = 'http://wiki.github.com/ffi/ffi'
-PROJ.version = '1.0.12.rc3'
+PROJ.version = '1.1.0.rc2'
 PROJ.rubyforge.name = 'ffi'
 PROJ.readme_file = 'README.rdoc'
 
@@ -189,3 +188,6 @@ 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'") || raise("win32 build failed!")
+end

data/ext/ffi_c/AbstractMemory.c

@@ -591,6 +591,18 @@ memory_address(VALUE obj)
     return ((AbstractMemory *) DATA_PTR(obj))->address;
 }
 
+static VALUE
+memory_copy_from(VALUE self, VALUE rbsrc, VALUE rblen)
+{
+    AbstractMemory* dst;
+
+    Data_Get_Struct(self, AbstractMemory, dst);
+
+    memcpy(dst->address, rbffi_AbstractMemory_Cast(rbsrc, rbffi_AbstractMemoryClass)->address, NUM2INT(rblen));
+
+    return self;
+}
+
 AbstractMemory*
 rbffi_AbstractMemory_Cast(VALUE obj, VALUE klass)
 {
@@ -1008,6 +1020,7 @@ rbffi_AbstractMemory_Init(VALUE moduleFFI)
     rb_define_alias(classMemory, "size", "total");
     rb_define_method(classMemory, "type_size", memory_type_size, 0);
     rb_define_method(classMemory, "[]", memory_aref, 1);
+    rb_define_method(classMemory, "__copy_from__", memory_copy_from, 2);
 
     id_to_ptr = rb_intern("to_ptr");
     id_call = rb_intern("call");

data/ext/ffi_c/LongDouble.h

@@ -27,6 +27,9 @@
 extern "C" {
 #endif
 
+#ifdef _MSC_VER
+#define strtold strtod
+#endif
 
 extern VALUE rbffi_longdouble_new(long double ld);
 extern long double rbffi_num2longdouble(VALUE value);

data/ext/ffi_c/libffi.bsd.mk

@@ -7,7 +7,7 @@ INCFLAGS += -I${LIBFFI_BUILD_DIR}/include
 LOCAL_LIBS += ${LIBFFI} -lpthread
 
 LIBFFI_CFLAGS = ${FFI_MMAP_EXEC} -pthread
-LIBFFI_BUILD_DIR = ${.CURDIR}/libffi
+LIBFFI_BUILD_DIR = ${.CURDIR}/libffi-${arch}
 
 .if ${srcdir} == "."
   LIBFFI_SRC_DIR := ${.CURDIR}/libffi

data/ext/ffi_c/libffi.darwin.mk

@@ -22,6 +22,7 @@ ifneq ($(findstring -arch x86_64,$(CFLAGS)),)
 endif
 
 ifeq ($(strip $(ARCHES)),)
+LIBFFI_BUILD_DIR = $(BUILD_DIR)/libffi-$(arch)
 # Just build the one (default) architecture
 $(LIBFFI):		
 	@mkdir -p "$(LIBFFI_BUILD_DIR)"

data/ext/ffi_c/libffi.gnu.mk

@@ -9,12 +9,14 @@ INCFLAGS += -I"$(LIBFFI_BUILD_DIR)"/include
 LOCAL_LIBS += $(LIBFFI)
 BUILD_DIR = $(shell pwd)
 LIBFFI_CFLAGS = $(FFI_MMAP_EXEC)
-LIBFFI_BUILD_DIR = $(BUILD_DIR)/libffi
+LIBFFI_BUILD_DIR = $(BUILD_DIR)/libffi-$(arch)
 
 ifeq ($(srcdir),.)
   LIBFFI_SRC_DIR := $(shell pwd)/libffi
+else ifeq ($(srcdir),..)
+  LIBFFI_SRC_DIR := $(shell pwd)/../libffi
 else
-  LIBFFI_SRC_DIR := $(abspath $(srcdir)/libffi)
+  LIBFFI_SRC_DIR := $(realpath $(srcdir)/libffi)
 endif
 
 LIBFFI = "$(LIBFFI_BUILD_DIR)"/.libs/libffi_convenience.a

data/lib/ffi/struct.rb

@@ -52,9 +52,10 @@ module FFI
         type.struct_class.new(ptr.slice(self.offset, self.size))
       end
 
-#      def put(ptr, value)
-#        raise TypeError, "wrong value type (expected #{type.struct_class}" unless value.is_a(type.struct_class)
-#      end
+     def put(ptr, value)
+       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
 
     class Mapped < Field

data/spec/ffi/struct_spec.rb

@@ -442,6 +442,15 @@ describe FFI::Struct, ' with a nested struct field'  do
     @cs[:ns][:i] = 456
     LibTest.struct_align_nested_struct(@cs.to_ptr).should eq 456
   end
+
+  it 'should be able to assign struct instance to nested field' do 
+    cs = LibTest::ContainerStruct.new(LibTest.struct_make_container_struct(123))
+    ns = LibTest::NestedStruct.new
+    ns[:i] = 567
+    cs[:ns] = ns
+    cs[:ns][:i].should eq 567
+    LibTest.struct_align_nested_struct(cs.to_ptr).should eq 567
+  end
 end
 
 describe FFI::Struct, ' with a nested array of structs'  do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ffi
 version: !ruby/object:Gem::Version 
-  hash: 1025094349
-  prerelease: 7
+  hash: -2431023002
+  prerelease: 6
   segments: 
   - 1
+  - 1
   - 0
-  - 12
   - rc
-  - 3
-  version: 1.0.12.rc3
+  - 2
+  version: 1.1.0.rc2
 platform: x86-mingw32
 authors: 
 - Wayne Meissner
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-03 00:00:00 +10:00
+date: 2012-04-05 00:00:00 +10:00
 default_executable: 
 dependencies: []