ffi 0.2.0 → 0.3.0

data/lib/ffi/types.rb

@@ -1,5 +1,5 @@
 module FFI
-  TypeDefs = Hash.new
+#  TypeDefs = Hash.new
   def self.add_typedef(current, add)
     if current.kind_of? Integer
       code = current
@@ -103,7 +103,7 @@ module FFI
     4 => :int,
     8 => :long_long,
   }
-  SizeTypes = {
+  SizeTypes.merge!({
     NativeType::INT8 => 1,
     NativeType::UINT8 => 1,
     NativeType::INT16 => 2,
@@ -117,7 +117,7 @@ module FFI
     NativeType::LONG => FFI::Platform::LONG_SIZE / 8,
     NativeType::ULONG => FFI::Platform::LONG_SIZE / 8,
     NativeType::POINTER => FFI::Platform::ADDRESS_SIZE / 8,
-  }
+  })
 
   def self.size_to_type(size)
     if sz = TypeSizes[size]

data/lib/ffi/union.rb

@@ -0,0 +1,17 @@
+require 'ffi/struct'
+
+module FFI
+  class UnionLayoutBuilder < FFI::StructLayoutBuilder
+    private
+    def calc_alignment_of(field_class, offset); 0; end
+    def calc_current_size(offset, size)
+      @size = size if size > @size
+    end
+  end
+  class Union < FFI::Struct
+    private
+    def self.builder
+      UnionLayoutBuilder.new
+    end
+  end
+end

data/nbproject/configurations.xml

@@ -3,26 +3,31 @@
   <logicalFolder name="root" displayName="root" projectFiles="true">
     <logicalFolder name="ruby-ffi" displayName="ruby-ffi" projectFiles="true">
       <logicalFolder name="ext" displayName="ext" projectFiles="true">
-        <itemPath>ext/AbstractMemory.c</itemPath>
-        <itemPath>ext/AbstractMemory.h</itemPath>
-        <itemPath>ext/AutoPointer.c</itemPath>
-        <itemPath>ext/AutoPointer.h</itemPath>
-        <itemPath>ext/Buffer.c</itemPath>
-        <itemPath>ext/Callback.c</itemPath>
-        <itemPath>ext/Callback.h</itemPath>
-        <itemPath>ext/ffi.c</itemPath>
-        <itemPath>ext/Invoker.c</itemPath>
-        <itemPath>ext/MemoryPointer.c</itemPath>
-        <itemPath>ext/MemoryPointer.h</itemPath>
-        <itemPath>ext/NativeLibrary.c</itemPath>
-        <itemPath>ext/NativeLibrary.h</itemPath>
-        <itemPath>ext/Platform.c</itemPath>
-        <itemPath>ext/Platform.h</itemPath>
-        <itemPath>ext/Pointer.c</itemPath>
-        <itemPath>ext/Pointer.h</itemPath>
-        <itemPath>ext/rbffi.h</itemPath>
-        <itemPath>ext/Types.c</itemPath>
-        <itemPath>ext/Types.h</itemPath>
+        <itemPath>ext/ffi_c/AbstractMemory.c</itemPath>
+        <itemPath>ext/ffi_c/AbstractMemory.h</itemPath>
+        <itemPath>ext/ffi_c/AutoPointer.c</itemPath>
+        <itemPath>ext/ffi_c/AutoPointer.h</itemPath>
+        <itemPath>ext/ffi_c/Buffer.c</itemPath>
+        <itemPath>ext/ffi_c/Callback.c</itemPath>
+        <itemPath>ext/ffi_c/Callback.h</itemPath>
+        <itemPath>ext/ffi_c/compat.h</itemPath>
+        <itemPath>ext/ffi_c/extconf.rb</itemPath>
+        <itemPath>ext/ffi_c/ffi.c</itemPath>
+        <itemPath>ext/ffi_c/Invoker.c</itemPath>
+        <itemPath>ext/ffi_c/MemoryPointer.c</itemPath>
+        <itemPath>ext/ffi_c/MemoryPointer.h</itemPath>
+        <itemPath>ext/ffi_c/NativeLibrary.c</itemPath>
+        <itemPath>ext/ffi_c/NativeLibrary.h</itemPath>
+        <itemPath>ext/ffi_c/NullPointer.c</itemPath>
+        <itemPath>ext/ffi_c/Platform.c</itemPath>
+        <itemPath>ext/ffi_c/Platform.h</itemPath>
+        <itemPath>ext/ffi_c/Pointer.c</itemPath>
+        <itemPath>ext/ffi_c/Pointer.h</itemPath>
+        <itemPath>ext/ffi_c/rbffi.h</itemPath>
+        <itemPath>ext/ffi_c/Struct.c</itemPath>
+        <itemPath>ext/ffi_c/Struct.h</itemPath>
+        <itemPath>ext/ffi_c/Types.c</itemPath>
+        <itemPath>ext/ffi_c/Types.h</itemPath>
       </logicalFolder>
       <logicalFolder name="f1" displayName="lib" projectFiles="true">
         <logicalFolder name="ffi" displayName="ffi" projectFiles="true">
@@ -35,6 +40,7 @@
           <itemPath>lib/ffi/platform.rb</itemPath>
           <itemPath>lib/ffi/pointer.rb</itemPath>
           <itemPath>lib/ffi/struct.rb</itemPath>
+          <itemPath>lib/ffi/types.rb</itemPath>
           <itemPath>lib/ffi/variadic.rb</itemPath>
         </logicalFolder>
         <itemPath>lib/ffi.rb</itemPath>
@@ -43,6 +49,7 @@
         <itemPath>libtest/Benchmark.c</itemPath>
         <itemPath>libtest/BufferTest.c</itemPath>
         <itemPath>libtest/ClosureTest.c</itemPath>
+        <itemPath>libtest/GlobalVariable.c</itemPath>
         <itemPath>libtest/LastErrorTest.c</itemPath>
         <itemPath>libtest/NumberTest.c</itemPath>
         <itemPath>libtest/PointerTest.c</itemPath>
@@ -51,28 +58,27 @@
         <itemPath>libtest/StructTest.c</itemPath>
         <itemPath>libtest/VariadicTest.c</itemPath>
       </logicalFolder>
-      <logicalFolder name="specs" displayName="specs" projectFiles="true">
-        <logicalFolder name="rbx" displayName="rbx" projectFiles="true">
-          <itemPath>specs/rbx/attach_function_spec.rb</itemPath>
-          <itemPath>specs/rbx/memory_pointer_spec.rb</itemPath>
-          <itemPath>specs/rbx/spec_helper.rb</itemPath>
-          <itemPath>specs/rbx/struct_spec.rb</itemPath>
-        </logicalFolder>
-        <itemPath>specs/buffer_spec.rb</itemPath>
-        <itemPath>specs/callback_spec.rb</itemPath>
-        <itemPath>specs/library_spec.rb</itemPath>
-        <itemPath>specs/number_spec.rb</itemPath>
-        <itemPath>specs/pointer_spec.rb</itemPath>
-        <itemPath>specs/spec_helper.rb</itemPath>
-        <itemPath>specs/string_spec.rb</itemPath>
-        <itemPath>specs/struct_spec.rb</itemPath>
-        <itemPath>specs/typedef_spec.rb</itemPath>
+      <logicalFolder name="f2" displayName="spec" projectFiles="true">
+        <itemPath>spec/ffi/buffer_spec.rb</itemPath>
+        <itemPath>spec/ffi/callback_spec.rb</itemPath>
+        <itemPath>spec/ffi/errno_spec.rb</itemPath>
+        <itemPath>spec/ffi/library_spec.rb</itemPath>
+        <itemPath>spec/ffi/managed_struct_spec.rb</itemPath>
+        <itemPath>spec/ffi/number_spec.rb</itemPath>
+        <itemPath>spec/ffi/pointer_spec.rb</itemPath>
+        <itemPath>spec/ffi/spec_helper.rb</itemPath>
+        <itemPath>spec/ffi/string_spec.rb</itemPath>
+        <itemPath>spec/ffi/struct_spec.rb</itemPath>
+        <itemPath>spec/ffi/typedef_spec.rb</itemPath>
+        <itemPath>spec/ffi/union_spec.rb</itemPath>
+        <itemPath>spec/ffi/variadic_spec.rb</itemPath>
       </logicalFolder>
     </logicalFolder>
     <logicalFolder name="ExternalFiles"
                    displayName="Important Files"
                    projectFiles="false">
       <itemPath>Makefile</itemPath>
+      <itemPath>Rakefile</itemPath>
       <itemPath>ruby-ffi-Makefile.mk</itemPath>
     </logicalFolder>
   </logicalFolder>
@@ -99,81 +105,79 @@
         <requiredProjects>
         </requiredProjects>
       </makefileType>
-      <item path="ext/AbstractMemory.c">
-        <itemExcluded>true</itemExcluded>
+      <item path="ext/ffi_c/AbstractMemory.c">
         <itemTool>0</itemTool>
       </item>
-      <item path="ext/AbstractMemory.h">
-        <itemExcluded>true</itemExcluded>
+      <item path="ext/ffi_c/AbstractMemory.h">
         <itemTool>3</itemTool>
       </item>
-      <item path="ext/AutoPointer.c">
+      <item path="ext/ffi_c/AutoPointer.c">
         <itemTool>0</itemTool>
       </item>
-      <item path="ext/AutoPointer.h">
+      <item path="ext/ffi_c/AutoPointer.h">
         <itemTool>3</itemTool>
       </item>
-      <item path="ext/Buffer.c">
-        <itemExcluded>true</itemExcluded>
+      <item path="ext/ffi_c/Buffer.c">
         <itemTool>0</itemTool>
       </item>
-      <item path="ext/Callback.c">
-        <itemExcluded>true</itemExcluded>
-        <itemTool>3</itemTool>
+      <item path="ext/ffi_c/Callback.c">
+        <itemTool>0</itemTool>
       </item>
-      <item path="ext/Callback.h">
-        <itemExcluded>true</itemExcluded>
+      <item path="ext/ffi_c/Callback.h">
         <itemTool>3</itemTool>
       </item>
-      <item path="ext/Invoker.c">
-        <itemExcluded>true</itemExcluded>
+      <item path="ext/ffi_c/Invoker.c">
         <itemTool>0</itemTool>
       </item>
-      <item path="ext/MemoryPointer.c">
-        <itemExcluded>true</itemExcluded>
-        <itemTool>3</itemTool>
+      <item path="ext/ffi_c/MemoryPointer.c">
+        <itemTool>0</itemTool>
       </item>
-      <item path="ext/MemoryPointer.h">
-        <itemExcluded>true</itemExcluded>
+      <item path="ext/ffi_c/MemoryPointer.h">
         <itemTool>3</itemTool>
       </item>
-      <item path="ext/NativeLibrary.c">
-        <itemExcluded>true</itemExcluded>
+      <item path="ext/ffi_c/NativeLibrary.c">
         <itemTool>0</itemTool>
       </item>
-      <item path="ext/NativeLibrary.h">
+      <item path="ext/ffi_c/NativeLibrary.h">
         <itemTool>3</itemTool>
       </item>
-      <item path="ext/Platform.c">
-        <itemExcluded>true</itemExcluded>
+      <item path="ext/ffi_c/NullPointer.c">
         <itemTool>0</itemTool>
       </item>
-      <item path="ext/Platform.h">
-        <itemExcluded>true</itemExcluded>
+      <item path="ext/ffi_c/Platform.c">
+        <itemTool>0</itemTool>
+      </item>
+      <item path="ext/ffi_c/Platform.h">
         <itemTool>3</itemTool>
       </item>
-      <item path="ext/Pointer.c">
-        <itemExcluded>true</itemExcluded>
+      <item path="ext/ffi_c/Pointer.c">
+        <itemTool>0</itemTool>
+      </item>
+      <item path="ext/ffi_c/Pointer.h">
         <itemTool>3</itemTool>
       </item>
-      <item path="ext/Pointer.h">
-        <itemExcluded>true</itemExcluded>
+      <item path="ext/ffi_c/Struct.c">
+        <itemTool>0</itemTool>
+      </item>
+      <item path="ext/ffi_c/Struct.h">
         <itemTool>3</itemTool>
       </item>
-      <item path="ext/Types.c">
-        <itemExcluded>true</itemExcluded>
+      <item path="ext/ffi_c/Types.c">
         <itemTool>0</itemTool>
       </item>
-      <item path="ext/Types.h">
-        <itemExcluded>true</itemExcluded>
+      <item path="ext/ffi_c/Types.h">
+        <itemTool>3</itemTool>
+      </item>
+      <item path="ext/ffi_c/compat.h">
+        <itemTool>3</itemTool>
+      </item>
+      <item path="ext/ffi_c/extconf.rb">
         <itemTool>3</itemTool>
       </item>
-      <item path="ext/ffi.c">
-        <itemExcluded>true</itemExcluded>
+      <item path="ext/ffi_c/ffi.c">
         <itemTool>0</itemTool>
       </item>
-      <item path="ext/rbffi.h">
-        <itemExcluded>true</itemExcluded>
+      <item path="ext/ffi_c/rbffi.h">
         <itemTool>3</itemTool>
       </item>
       <item path="lib/ffi.rb">
@@ -206,6 +210,9 @@
       <item path="lib/ffi/struct.rb">
         <itemTool>3</itemTool>
       </item>
+      <item path="lib/ffi/types.rb">
+        <itemTool>3</itemTool>
+      </item>
       <item path="lib/ffi/variadic.rb">
         <itemTool>3</itemTool>
       </item>
@@ -218,6 +225,9 @@
       <item path="libtest/ClosureTest.c">
         <itemTool>0</itemTool>
       </item>
+      <item path="libtest/GlobalVariable.c">
+        <itemTool>0</itemTool>
+      </item>
       <item path="libtest/LastErrorTest.c">
         <itemTool>0</itemTool>
       </item>
@@ -239,43 +249,43 @@
       <item path="libtest/VariadicTest.c">
         <itemTool>0</itemTool>
       </item>
-      <item path="specs/buffer_spec.rb">
+      <item path="spec/ffi/buffer_spec.rb">
         <itemTool>3</itemTool>
       </item>
-      <item path="specs/callback_spec.rb">
+      <item path="spec/ffi/callback_spec.rb">
         <itemTool>3</itemTool>
       </item>
-      <item path="specs/library_spec.rb">
+      <item path="spec/ffi/errno_spec.rb">
         <itemTool>3</itemTool>
       </item>
-      <item path="specs/number_spec.rb">
+      <item path="spec/ffi/library_spec.rb">
         <itemTool>3</itemTool>
       </item>
-      <item path="specs/pointer_spec.rb">
+      <item path="spec/ffi/managed_struct_spec.rb">
         <itemTool>3</itemTool>
       </item>
-      <item path="specs/rbx/attach_function_spec.rb">
+      <item path="spec/ffi/number_spec.rb">
         <itemTool>3</itemTool>
       </item>
-      <item path="specs/rbx/memory_pointer_spec.rb">
+      <item path="spec/ffi/pointer_spec.rb">
         <itemTool>3</itemTool>
       </item>
-      <item path="specs/rbx/spec_helper.rb">
+      <item path="spec/ffi/spec_helper.rb">
         <itemTool>3</itemTool>
       </item>
-      <item path="specs/rbx/struct_spec.rb">
+      <item path="spec/ffi/string_spec.rb">
         <itemTool>3</itemTool>
       </item>
-      <item path="specs/spec_helper.rb">
+      <item path="spec/ffi/struct_spec.rb">
         <itemTool>3</itemTool>
       </item>
-      <item path="specs/string_spec.rb">
+      <item path="spec/ffi/typedef_spec.rb">
         <itemTool>3</itemTool>
       </item>
-      <item path="specs/struct_spec.rb">
+      <item path="spec/ffi/union_spec.rb">
         <itemTool>3</itemTool>
       </item>
-      <item path="specs/typedef_spec.rb">
+      <item path="spec/ffi/variadic_spec.rb">
         <itemTool>3</itemTool>
       </item>
     </conf>

data/samples/hello.rb

@@ -1,5 +1,4 @@
-require 'rubygems'
-require 'ffi'
+require File.expand_path(File.join(File.dirname(__FILE__), "sample_helper"))
 module Foo
   extend FFI::Library
   attach_function("cputs", "puts", [ :string ], :int)

data/samples/sample_helper.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+require 'spec'
+
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib"), File.join(File.dirname(__FILE__), "..", "build", RUBY_VERSION) unless RUBY_PLATFORM =~ /java/
+require "ffi"
+

data/{specs → spec/ffi}/callback_spec.rb

@@ -1,33 +1,33 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
 
 describe "Callback" do
-  module LibC
-    extend FFI::Library
-    callback :qsort_cmp, [ :pointer, :pointer ], :int
-    attach_function :qsort, [ :pointer, :int, :int, :qsort_cmp ], :int
-  end
-  it "arguments get passed correctly" do
-    p = MemoryPointer.new(:int, 2)
-    p.put_array_of_int32(0, [ 1 , 2 ])
-    args = []
-    cmp = proc do |p1, p2| args.push(p1.get_int(0)); args.push(p2.get_int(0)); 0; end
-    # this is a bit dodgey, as it relies on qsort passing the args in order
-    LibC.qsort(p, 2, 4, cmp)
-    args.should == [ 1, 2 ]
-  end
-
-  it "Block can be substituted for Callback as last argument" do
-    p = MemoryPointer.new(:int, 2)
-    p.put_array_of_int32(0, [ 1 , 2 ])
-    args = []
-    # this is a bit dodgey, as it relies on qsort passing the args in order
-    LibC.qsort(p, 2, 4) do |p1, p2|
-      args.push(p1.get_int(0))
-      args.push(p2.get_int(0))
-      0
-    end
-    args.should == [ 1, 2 ]
-  end
+#  module LibC
+#    extend FFI::Library
+#    callback :qsort_cmp, [ :pointer, :pointer ], :int
+#    attach_function :qsort, [ :pointer, :int, :int, :qsort_cmp ], :int
+#  end
+#  it "arguments get passed correctly" do
+#    p = MemoryPointer.new(:int, 2)
+#    p.put_array_of_int32(0, [ 1 , 2 ])
+#    args = []
+#    cmp = proc do |p1, p2| args.push(p1.get_int(0)); args.push(p2.get_int(0)); 0; end
+#    # this is a bit dodgey, as it relies on qsort passing the args in order
+#    LibC.qsort(p, 2, 4, cmp)
+#    args.should == [ 1, 2 ]
+#  end
+#
+#  it "Block can be substituted for Callback as last argument" do
+#    p = MemoryPointer.new(:int, 2)
+#    p.put_array_of_int32(0, [ 1 , 2 ])
+#    args = []
+#    # this is a bit dodgey, as it relies on qsort passing the args in order
+#    LibC.qsort(p, 2, 4) do |p1, p2|
+#      args.push(p1.get_int(0))
+#      args.push(p2.get_int(0))
+#      0
+#    end
+#    args.should == [ 1, 2 ]
+#  end
   module LibTest
     extend FFI::Library
     ffi_lib TestLibrary::PATH
@@ -39,6 +39,7 @@ describe "Callback" do
     callback :cbVrU32, [ ], :uint
     callback :cbVrS64, [ ], :long_long
     callback :cbVrU64, [ ], :ulong_long
+    callback :cbVrP, [], :pointer
     callback :cbCrV, [ :char ], :void
     callback :cbSrV, [ :short ], :void
     callback :cbIrV, [ :int ], :void
@@ -51,119 +52,143 @@ describe "Callback" do
     attach_function :testCallbackVrU32, :testClosureVrI, [ :cbVrU32 ], :uint
     attach_function :testCallbackVrS64, :testClosureVrL, [ :cbVrS64 ], :long_long
     attach_function :testCallbackVrU64, :testClosureVrL, [ :cbVrU64 ], :ulong_long
+    attach_function :testCallbackVrP, :testClosureVrP, [ :cbVrP ], :pointer
     attach_function :testCallbackCrV, :testClosureBrV, [ :cbCrV, :char ], :void
+    attach_variable :cbVrS8, :gvar_pointer, :cbVrS8
+    attach_variable :pVrS8, :gvar_pointer, :pointer
+    attach_function :testGVarCallbackVrS8, :testClosureVrB, [ :pointer ], :char
+    attach_function :testOptionalCallbackCrV, :testOptionalClosureBrV, [ :cbCrV, :char ], :void
+
   end
   it "function with Callback plus another arg should raise error if no arg given" do
     lambda { LibTest.testCallbackCrV { |*a| }}.should raise_error
   end
-  it "Callback returning :char (0)" do
+  it "returning :char (0)" do
     LibTest.testCallbackVrS8 { 0 }.should == 0
   end
-  it "Callback returning :char (127)" do
+  it "returning :char (127)" do
     LibTest.testCallbackVrS8 { 127 }.should == 127
   end
-  it "Callback returning :char (-128)" do
+  it "returning :char (-128)" do
     LibTest.testCallbackVrS8 { -128 }.should == -128
   end
   # test wrap around
-  it "Callback returning :char (128)" do
+  it "returning :char (128)" do
     LibTest.testCallbackVrS8 { 128 }.should == -128
   end
-  it "Callback returning :char (255)" do
+  it "returning :char (255)" do
     LibTest.testCallbackVrS8 { 0xff }.should == -1
   end
-  it "Callback returning :uchar (0)" do
+  it "returning :uchar (0)" do
     LibTest.testCallbackVrU8 { 0 }.should == 0
   end
-  it "Callback returning :uchar (0xff)" do
+  it "returning :uchar (0xff)" do
     LibTest.testCallbackVrU8 { 0xff }.should == 0xff
   end
-  it "Callback returning :uchar (-1)" do
+  it "returning :uchar (-1)" do
     LibTest.testCallbackVrU8 { -1 }.should == 0xff
   end
-  it "Callback returning :uchar (128)" do
+  it "returning :uchar (128)" do
     LibTest.testCallbackVrU8 { 128 }.should == 128
   end
-  it "Callback returning :uchar (-128)" do
+  it "returning :uchar (-128)" do
     LibTest.testCallbackVrU8 { -128 }.should == 128
   end
-  it "Callback returning :short (0)" do
+  it "returning :short (0)" do
     LibTest.testCallbackVrS16 { 0 }.should == 0
   end
-  it "Callback returning :short (0x7fff)" do
+  it "returning :short (0x7fff)" do
     LibTest.testCallbackVrS16 { 0x7fff }.should == 0x7fff
   end
   # test wrap around
-  it "Callback returning :short (0x8000)" do
+  it "returning :short (0x8000)" do
     LibTest.testCallbackVrS16 { 0x8000 }.should == -0x8000
   end
-  it "Callback returning :short (0xffff)" do
+  it "returning :short (0xffff)" do
     LibTest.testCallbackVrS16 { 0xffff }.should == -1
   end
-  it "Callback returning :ushort (0)" do
+  it "returning :ushort (0)" do
     LibTest.testCallbackVrU16 { 0 }.should == 0
   end
-  it "Callback returning :ushort (0x7fff)" do
+  it "returning :ushort (0x7fff)" do
     LibTest.testCallbackVrU16 { 0x7fff }.should == 0x7fff
   end
-  it "Callback returning :ushort (0x8000)" do
+  it "returning :ushort (0x8000)" do
     LibTest.testCallbackVrU16 { 0x8000 }.should == 0x8000
   end
-  it "Callback returning :ushort (0xffff)" do
+  it "returning :ushort (0xffff)" do
     LibTest.testCallbackVrU16 { 0xffff }.should == 0xffff
   end
-  it "Callback returning :ushort (-1)" do
+  it "returning :ushort (-1)" do
     LibTest.testCallbackVrU16 { -1 }.should == 0xffff
   end
 
-  it "Callback returning :int (0)" do
+  it "returning :int (0)" do
     LibTest.testCallbackVrS32 { 0 }.should == 0
   end
-  it "Callback returning :int (0x7fffffff)" do
+  it "returning :int (0x7fffffff)" do
     LibTest.testCallbackVrS32 { 0x7fffffff }.should == 0x7fffffff
   end
   # test wrap around
-  it "Callback returning :int (-0x80000000)" do
+  it "returning :int (-0x80000000)" do
     LibTest.testCallbackVrS32 { -0x80000000 }.should == -0x80000000
   end
-  it "Callback returning :int (-1)" do
+  it "returning :int (-1)" do
     LibTest.testCallbackVrS32 { -1 }.should == -1
   end
 
-  it "Callback returning :uint (0)" do
+  it "returning :uint (0)" do
     LibTest.testCallbackVrU32 { 0 }.should == 0
   end
-  it "Callback returning :uint (0x7fffffff)" do
+  it "returning :uint (0x7fffffff)" do
     LibTest.testCallbackVrU32 { 0x7fffffff }.should == 0x7fffffff
   end
   # test wrap around
-  it "Callback returning :uint (0x80000000)" do
+  it "returning :uint (0x80000000)" do
     LibTest.testCallbackVrU32 { 0x80000000 }.should == 0x80000000
   end
-  it "Callback returning :uint (0xffffffff)" do
+  it "returning :uint (0xffffffff)" do
     LibTest.testCallbackVrU32 { 0xffffffff }.should == 0xffffffff
   end
   it "Callback returning :uint (-1)" do
     LibTest.testCallbackVrU32 { -1 }.should == 0xffffffff
   end
 
-  it "Callback returning :long_long (0)" do
+  it "returning :long_long (0)" do
     LibTest.testCallbackVrS64 { 0 }.should == 0
   end
-  it "Callback returning :long_long (0x7fffffffffffffff)" do
+  it "returning :long_long (0x7fffffffffffffff)" do
     LibTest.testCallbackVrS64 { 0x7fffffffffffffff }.should == 0x7fffffffffffffff
   end
   # test wrap around
-  it "Callback returning :long_long (-0x8000000000000000)" do
+  it "returning :long_long (-0x8000000000000000)" do
     LibTest.testCallbackVrS64 { -0x8000000000000000 }.should == -0x8000000000000000
   end
-  it "Callback returning :long_long (-1)" do
+  it "returning :long_long (-1)" do
     LibTest.testCallbackVrS64 { -1 }.should == -1
   end
+  it "returning :pointer (nil)" do
+    LibTest.testCallbackVrP { nil }.null?.should be_true
+  end
+  it "returning :pointer (MemoryPointer)" do
+    p = MemoryPointer.new :long
+    LibTest.testCallbackVrP { p }.should == p
+  end
+
+  it "global variable" do
+    proc = Proc.new { 0x1e }
+    LibTest.cbVrS8 = proc
+    LibTest.testGVarCallbackVrS8(LibTest.pVrS8).should == 0x1e
+  end
+
+  describe "When the callback is considered optional by the underlying library" do
+    it "should handle receiving 'nil' in place of the closure" do
+      LibTest.testOptionalCallbackCrV(nil, 13)
+    end
+  end
 
-  
 end
-describe "Callback with primitive argument" do
+describe "primitive argument" do
   #
   # Test callbacks that take an argument, returning void
   #
@@ -185,151 +210,151 @@ describe "Callback with primitive argument" do
     attach_function :testCallbackU32rV, :testClosureIrV, [ :cbU32rV, :uint ], :void
     attach_function :testCallbackLrV, :testClosureLrV, [ :cbS64rV, :long_long ], :void
   end
-  it "Callback with :char (0) argument" do
+  it ":char (0) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackCrV(0) { |i| v = i }
     v.should == 0
   end
-  it "Callback with :char (127) argument" do
+  it ":char (127) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackCrV(127) { |i| v = i }
     v.should == 127
   end
-  it "Callback with :char (-128) argument" do
+  it ":char (-128) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackCrV(-128) { |i| v = i }
     v.should == -128
   end
-  it "Callback with :char (-1) argument" do
+  it ":char (-1) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackCrV(-1) { |i| v = i }
     v.should == -1
   end
 
-  it "Callback with :uchar (0) argument" do
+  it ":uchar (0) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackU8rV(0) { |i| v = i }
     v.should == 0
   end
-  it "Callback with :uchar (127) argument" do
+  it ":uchar (127) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackU8rV(127) { |i| v = i }
     v.should == 127
   end
-  it "Callback with :uchar (128) argument" do
+  it ":uchar (128) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackU8rV(128) { |i| v = i }
     v.should == 128
   end
-  it "Callback with :uchar (255) argument" do
+  it ":uchar (255) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackU8rV(255) { |i| v = i }
     v.should == 255
   end
 
-  it "Callback with :short (0) argument" do
+  it ":short (0) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackSrV(0) { |i| v = i }
     v.should == 0
   end
-  it "Callback with :short (0x7fff) argument" do
+  it ":short (0x7fff) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackSrV(0x7fff) { |i| v = i }
     v.should == 0x7fff
   end
-  it "Callback with :short (-0x8000) argument" do
+  it ":short (-0x8000) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackSrV(-0x8000) { |i| v = i }
     v.should == -0x8000
   end
-  it "Callback with :short (-1) argument" do
+  it ":short (-1) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackSrV(-1) { |i| v = i }
     v.should == -1
   end
 
-  it "Callback with :ushort (0) argument" do
+  it ":ushort (0) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackU16rV(0) { |i| v = i }
     v.should == 0
   end
-  it "Callback with :ushort (0x7fff) argument" do
+  it ":ushort (0x7fff) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackU16rV(0x7fff) { |i| v = i }
     v.should == 0x7fff
   end
-  it "Callback with :ushort (0x8000) argument" do
+  it ":ushort (0x8000) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackU16rV(0x8000) { |i| v = i }
     v.should == 0x8000
   end
-  it "Callback with :ushort (0xffff) argument" do
+  it ":ushort (0xffff) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackU16rV(0xffff) { |i| v = i }
     v.should == 0xffff
   end
 
-  it "Callback with :int (0) argument" do
+  it ":int (0) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackIrV(0) { |i| v = i }
     v.should == 0
   end
-  it "Callback with :int (0x7fffffff) argument" do
+  it ":int (0x7fffffff) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackIrV(0x7fffffff) { |i| v = i }
     v.should == 0x7fffffff
   end
-  it "Callback with :int (-0x80000000) argument" do
+  it ":int (-0x80000000) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackIrV(-0x80000000) { |i| v = i }
     v.should == -0x80000000
   end
-  it "Callback with :int (-1) argument" do
+  it ":int (-1) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackIrV(-1) { |i| v = i }
     v.should == -1
   end
 
-  it "Callback with :uint (0) argument" do
+  it ":uint (0) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackU32rV(0) { |i| v = i }
     v.should == 0
   end
-  it "Callback with :uint (0x7fffffff) argument" do
+  it ":uint (0x7fffffff) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackU32rV(0x7fffffff) { |i| v = i }
     v.should == 0x7fffffff
   end
-  it "Callback with :uint (0x80000000) argument" do
+  it ":uint (0x80000000) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackU32rV(0x80000000) { |i| v = i }
     v.should == 0x80000000
   end
-  it "Callback with :uint (0xffffffff) argument" do
+  it ":uint (0xffffffff) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackU32rV(0xffffffff) { |i| v = i }
     v.should == 0xffffffff
   end
 
-  it "Callback with :long_long (0) argument" do
+  it ":long_long (0) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackLrV(0) { |i| v = i }
     v.should == 0
   end
-  it "Callback with :long_long (0x7fffffffffffffff) argument" do
+  it ":long_long (0x7fffffffffffffff) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackLrV(0x7fffffffffffffff) { |i| v = i }
     v.should == 0x7fffffffffffffff
   end
-  it "Callback with :long_long (-0x8000000000000000) argument" do
+  it ":long_long (-0x8000000000000000) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackLrV(-0x8000000000000000) { |i| v = i }
     v.should == -0x8000000000000000
   end
-  it "Callback with :long_long (-1) argument" do
+  it ":long_long (-1) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackLrV(-1) { |i| v = i }
     v.should == -1
   end
   
-end unless true
+end unless true