ffi 1.0.4-x86-mingw32 → 1.0.5-x86-mingw32

data/ext/ffi_c/Thread.c

@@ -24,6 +24,8 @@
 # include <pthread.h>
 # include <errno.h>
 # include <signal.h>
+#else
+# include <windows.h>
 #endif
 #include <fcntl.h>
 #include "Thread.h"
@@ -36,26 +38,42 @@ rbffi_thread_t
 rbffi_thread_self()
 {
     rbffi_thread_t self;
+#ifdef _WIN32
+    self.id = GetCurrentThreadId();
+#else
     self.id = pthread_self();
+#endif
     self.valid = true;
 
     return self;
 }
 
 bool
-rbffi_thread_equal(rbffi_thread_t* lhs, rbffi_thread_t* rhs)
+rbffi_thread_equal(const rbffi_thread_t* lhs, const rbffi_thread_t* rhs)
 {
-    return lhs->valid && rhs->valid && pthread_equal(lhs->id, rhs->id);
+    return lhs->valid && rhs->valid && 
+#ifdef _WIN32
+            lhs->id == rhs->id;
+#else
+            pthread_equal(lhs->id, rhs->id);
+#endif
 }
 
 bool
 rbffi_thread_has_gvl_p(void)
 {
+#ifdef _WIN32
+    return rbffi_active_thread.valid && rbffi_active_thread.id == GetCurrentThreadId();
+#else
     return rbffi_active_thread.valid && pthread_equal(rbffi_active_thread.id, pthread_self());
+#endif
 }
 #endif // HAVE_RUBY_THREAD_HAS_GVL_P
 
 #ifndef HAVE_RB_THREAD_BLOCKING_REGION
+
+#if !defined(_WIN32)
+
 struct BlockingThread {
     pthread_t tid;
     VALUE (*fn)(void *);
@@ -67,13 +85,6 @@ struct BlockingThread {
     int rdfd;
 };
 
-typedef struct BlockingCall_ {
-    void* function;
-    void* info;
-    void **ffiValues;
-    void* retval;
-} BlockingCall;
-
 static void*
 rbffi_blocking_thread(void* args)
 {
@@ -167,4 +178,19 @@ rbffi_thread_blocking_region(VALUE (*func)(void *), void *data1, void (*ubf)(voi
     return thr->retval;
 }
 
-#endif // HAVE_RB_THREAD_BLOCKING_REGION
+#else
+
+/*
+ * FIXME: someone needs to implement something similar to the posix pipe based
+ * blocking region implementation above for ruby1.8.x on win32
+ */
+VALUE
+rbffi_thread_blocking_region(VALUE (*func)(void *), void *data1, void (*ubf)(void *), void *data2)
+{
+    return (*func)(data1);
+}
+
+#endif /* !_WIN32 */
+
+#endif // HAVE_RB_THREAD_BLOCKING_REGION
+

data/ext/ffi_c/Thread.h

@@ -18,8 +18,8 @@
  * version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef THREAD_H
-#define	THREAD_H
+#ifndef RBFFI_THREAD_H
+#define	RBFFI_THREAD_H
 
 #include <stdbool.h>
 #include <ruby.h>
@@ -31,19 +31,28 @@ extern "C" {
 
 
 #ifdef HAVE_RUBY_THREAD_HAS_GVL_P
+    extern int ruby_thread_has_gvl_p(void);
 # define rbffi_thread_has_gvl_p ruby_thread_has_gvl_p
 #else
 
-#include <pthread.h>
+#ifdef _WIN32
+# include <windows.h>
+#else
+# include <pthread.h>
+#endif
 
 typedef struct {
+#ifdef _WIN32
+    DWORD id;
+#else
     pthread_t id;
+#endif
     bool valid;
 } rbffi_thread_t;
 
 extern rbffi_thread_t rbffi_active_thread;
 rbffi_thread_t rbffi_thread_self();
-bool rbffi_thread_equal(rbffi_thread_t* lhs, rbffi_thread_t* rhs);
+bool rbffi_thread_equal(const rbffi_thread_t* lhs, const rbffi_thread_t* rhs);
 bool rbffi_thread_has_gvl_p(void);
 
 #endif
@@ -60,5 +69,5 @@ VALUE rbffi_thread_blocking_region(VALUE (*func)(void *), void *data1, void (*ub
 }
 #endif
 
-#endif	/* THREAD_H */
+#endif	/* RBFFI_THREAD_H */
 

data/ext/ffi_c/Type.c

@@ -287,3 +287,4 @@ rbffi_Type_Init(VALUE moduleFFI)
     T(BOOL, &ffi_type_uchar);
     T(VARARGS, &ffi_type_void);
 }
+

data/ext/ffi_c/Types.c

@@ -2,29 +2,22 @@
  * Copyright (c) 2009, Wayne Meissner
  * Copyright (c) 2009, Luc Heinrich
  * Copyright (c) 2009, Aman Gupta.
+ *
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * 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.
  *
- * * 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.
- * * The name of the author or authors may not be used to endorse or promote
- *   products derived from this software without specific prior written permission.
+ * 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.
  *
- * 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.
+ * 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/>.
  */
 
 #include <ruby.h>

data/ext/ffi_c/Types.h

@@ -4,27 +4,19 @@
  *
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * This file is part of ruby-ffi.
  *
- * * 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.
- * * The name of the author or authors may not be used to endorse or promote
- *   products derived from this software without specific prior written permission.
+ * 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 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.
+ * 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/>.
  */
 
 #ifndef RBFFI_TYPES_H

data/ext/ffi_c/Variadic.c

@@ -229,7 +229,7 @@ variadic_invoke(VALUE self, VALUE parameterTypes, VALUE parameterValues)
     rbffi_active_thread = rbffi_thread_self();
 #endif
 
-    ffi_call(&cif, invoker->function, retval, ffiValues);
+    ffi_call(&cif, FFI_FN(invoker->function), retval, ffiValues);
 
 #ifndef HAVE_RUBY_THREAD_HAS_GVL_P
     rbffi_active_thread = oldThread;

data/ext/ffi_c/compat.h

@@ -1,28 +1,21 @@
 /*
  * Copyright (c) 2008, 2009, Wayne Meissner
+ *
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * 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.
  *
- * * 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.
- * * The name of the author or authors may not be used to endorse or promote
- *   products derived from this software without specific prior written permission.
+ * 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.
  *
- * 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.
+ * 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/>.
  */
 
 #ifndef RBFFI_COMPAT_H
@@ -70,3 +63,4 @@
 #endif
 
 #endif /* RBFFI_COMPAT_H */
+

data/ext/ffi_c/endian.h

@@ -38,3 +38,4 @@
 #endif
 
 #endif /* JFFI_ENDIAN_H */
+

data/ext/ffi_c/extconf.rb

@@ -27,7 +27,9 @@ create_header
 
 $CFLAGS << " -mwin32 " if RbConfig::CONFIG['host_os'] =~ /cygwin/
 #$CFLAGS << " -Werror -Wunused -Wformat -Wimplicit -Wreturn-type "
-$CFLAGS << " -Wno-declaration-after-statement "
+if (ENV['CC'] || RbConfig::MAKEFILE_CONFIG['CC'])  =~ /gcc/
+  $CFLAGS << " -Wno-declaration-after-statement "
+end
 
 create_makefile("ffi_c")
 unless libffi_ok

data/ext/ffi_c/ffi.c

@@ -1,28 +1,21 @@
 /*
  * Copyright (c) 2008, 2009, Wayne Meissner
+ *
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * 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.
  *
- * * 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.
- * * The name of the author or authors may not be used to endorse or promote
- *   products derived from this software without specific prior written permission.
+ * 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.
  *
- * 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.
+ * 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/>.
  */
 
 #include <sys/types.h>

data/ext/ffi_c/rbffi.h

@@ -1,5 +1,25 @@
-#ifndef _RBFFI_H
-#define	_RBFFI_H
+/*
+ * Copyright (c) 2008, 2009, Wayne Meissner
+ *
+ * All rights reserved.
+ *
+ * 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/>.
+ */
+
+#ifndef RBFFI_RBFFI_H
+#define	RBFFI_RBFFI_H
 
 #include <ruby.h>
 
@@ -23,5 +43,5 @@ extern int rbffi_type_size(VALUE type);
 }
 #endif
 
-#endif	/* _RBFFI_H */
+#endif	/* RBFFI_RBFFI_H */
 

data/lib/ffi/tools/const_generator.rb

@@ -117,7 +117,7 @@ module FFI
 
     def dump_constants(io)
       @constants.each do |name, constant|
-        name = [@prefix, name].join '.'
+        name = [@prefix, name].join '.' if @prefix
         io.puts "#{name} = #{constant.converted_value}"
       end
     end

data/spec/ffi/async_callback_spec.rb

@@ -1,3 +1,19 @@
+#
+# 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 "async callback" do
@@ -6,18 +22,25 @@ describe "async callback" do
     ffi_lib TestLibrary::PATH
     AsyncIntCallback = callback [ :int ], :void
 
-#    @blocking = true
-    attach_function :testAsyncCallback, [ AsyncIntCallback, :int ], :void, :blocking => true
+    @blocking = true
+    attach_function :testAsyncCallback, [ AsyncIntCallback, :int ], :void
   end
 
-#  unless RUBY_VERSION =~ /1.8/
-    it ":int (0x7fffffff) argument" do
-      v = 0xdeadbeef
-      called = false
-      cb = Proc.new {|i| v = i; called = true }
-      LibTest.testAsyncCallback(cb, 0x7fffffff) 
-      called.should be_true
-      v.should == 0x7fffffff
-    end
-#  end
+  it ":int (0x7fffffff) argument" do
+    v = 0xdeadbeef
+    called = false
+    cb = Proc.new {|i| v = i; called = true }
+    LibTest.testAsyncCallback(cb, 0x7fffffff) 
+    called.should be_true
+    v.should == 0x7fffffff
+  end
+  
+  it "called a second time" do
+    v = 0xdeadbeef
+    called = false
+    cb = Proc.new {|i| v = i; called = true }
+    LibTest.testAsyncCallback(cb, 0x7fffffff) 
+    called.should be_true
+    v.should == 0x7fffffff
+  end
 end

data/spec/ffi/bool_spec.rb

@@ -1,3 +1,19 @@
+#
+# 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 "Function with primitive boolean arguments and return values" do
   module LibTest