win32-api 1.0.0 → 1.0.1

data/CHANGES

@@ -1,2 +1,8 @@
+= 1.0.1 - 27-Sep-2007
+* Functions declared with a void prototype no longer require an explicit nil
+  argument to fulfill the arity requirement. You can still call them with an
+  explicit nil if you wish, however.
+* Fixed the gemspec for the native build.
+
 = 1.0.0 - 14-Sep-2007
 * Initial release

data/ext/win32/api.c

@@ -2,7 +2,7 @@
 #include <windows.h>
 
 #define MAX_BUF 1024
-#define WINDOWS_API_VERSION "1.0.0"
+#define WINDOWS_API_VERSION "1.0.1"
 
 #define _T_VOID     0
 #define _T_LONG     1
@@ -69,8 +69,20 @@ char* StringError(DWORD dwError){
 static VALUE callback_init(int argc, VALUE* argv, VALUE self)
 {
    VALUE v_proto, v_return, v_proc;
+   int i;
     
    rb_scan_args(argc, argv, "11", &v_proto, &v_return);
+   
+   /* Validate prototype characters */
+   for(i = 0; i < RSTRING(v_proto)->len; i++){
+      switch(RSTRING(v_proto)->ptr[i]){
+         case 'I': case 'L': case 'P': case 'V':
+            break;
+         default:
+            rb_raise(cCallbackError, "Illegal prototype '%c'",
+               RSTRING(v_proto)->ptr[i]);
+      }
+   }
 
    if(NIL_P(v_return) || RARRAY(v_return)->len == 0)
       v_return = rb_str_new2("L");
@@ -305,7 +317,7 @@ DWORD CallbackFunction(PARAM param)
   	              argv[i] = INT2NUM(param.params[i]);
   	              break;
   	           default:
-  	              rb_raise(cCallbackError, "Illegal prototype '%s'", a_proto[i]);
+  	              rb_raise(cCallbackError, "Illegal prototype '%c'", a_proto[i]);
             }
         }
         
@@ -373,10 +385,19 @@ static VALUE api_call(int argc, VALUE* argv, VALUE self){
 
    v_proto = rb_iv_get(self, "@prototype");
 
-   if(RARRAY(v_proto)->len != RARRAY(v_args)->len)
-      rb_raise(rb_eArgError, "wrong number of parameters: expected %d, got %d",
-         RARRAY(v_proto)->len, RARRAY(v_args)->len
-      );
+   /* For void prototypes, allow either no args or an explicit nil */
+   if(RARRAY(v_proto)->len != RARRAY(v_args)->len){
+      char* c = StringValuePtr(RARRAY(v_proto)->ptr[0]);
+      if(!strcmp(c, "V")){
+         rb_ary_push(v_args, Qnil);
+      }
+      else{
+         rb_raise(rb_eArgError,
+            "wrong number of parameters: expected %d, got %d",
+            RARRAY(v_proto)->len, RARRAY(v_args)->len
+         );
+      }
+   }
 
    for(i = 0; i < RARRAY(v_proto)->len; i++){
       v_arg = RARRAY(v_args)->ptr[i];

data/test/tc_win32_api.rb

@@ -12,10 +12,11 @@ class TC_Win32_API < Test::Unit::TestCase
    def setup
       @buf = 0.chr * 260
       @api = API.new('GetCurrentDirectory', 'LP')
+      @gle = API.new('GetLastError', 'V', 'L')
    end
 
    def test_version
-      assert_equal('1.0.0', API::VERSION)
+      assert_equal('1.0.1', API::VERSION)
    end
  
    def test_call
@@ -24,6 +25,11 @@ class TC_Win32_API < Test::Unit::TestCase
       assert_equal(Dir.pwd.tr('/', "\\"), @buf.strip)
    end
    
+   def test_call_with_void
+      assert_nothing_raised{ @gle.call }
+      assert_nothing_raised{ @gle.call(nil) }
+   end
+   
    def test_dll_name
       assert_respond_to(@api, :dll_name)
       assert_equal('kernel32', @api.dll_name)
@@ -57,5 +63,6 @@ class TC_Win32_API < Test::Unit::TestCase
    def teardown
       @buf = nil
       @api = nil
+      @gle = nil
    end
 end

data/test/tc_win32_api_callback.rb

@@ -1,58 +1,58 @@
-############################################################################
-# tc_win32_api_callback.rb
-# 
-# Test case for the Win32::API::Callback class. You should run this as Rake
-# task, i.e. 'rake test', instead of running it directly.
-############################################################################
-require 'win32/api'
-require 'test/unit'
-include Win32
-
-class TC_Win32_API_Callback < Test::Unit::TestCase
-   def setup
-      @buffer   = 0.chr * 260
-      @api_ew   = API.new('EnumWindows', 'KP', 'L', 'user32')
-      @api_gwt  = API.new('GetWindowText', 'LPI', 'I', 'user32')
-      @callback = nil
-   end
-   
-   def test_constructor
-      assert_respond_to(API::Callback, :new)
-      assert_nothing_raised{ API::Callback.new('LP', 'I') }
-      assert_nothing_raised{ API::Callback.new('LP', 'I'){} }
-   end
-   
-   def test_prototype
-      assert_nothing_raised{ @callback = API::Callback.new('LP', 'I') }
-      assert_respond_to(@callback, :prototype)
-      assert_equal('LP', @callback.prototype)
-   end
-   
-   def test_return_value
-      assert_nothing_raised{ @callback = API::Callback.new('LP', 'I') }
-      assert_respond_to(@callback, :return_type)
-      assert_equal('I', @callback.return_type)
-   end
-   
-   def test_callback
-      assert_nothing_raised{
-         @callback = API::Callback.new('LP', 'I'){ |handle, param|
-         	buf = "\0" * 200
-            @api_gwt.call(handle, buf, 200);
-            buf.index(param).nil? ? true : false           
-         }
-      }
-      assert_nothing_raised{ @api_ew.call(@callback, 'UEDIT32') }
-   end
-   
-   def test_constructor_expected_errors
-      assert_raise(API::Callback::Error){ API::Callback.new('X') }
-   end
-   
-   def teardown
-      @buffer   = nil
-      @api_ew   = nil
-      @api_gwt  = nil
-      @callback = nil
-   end
+############################################################################
+# tc_win32_api_callback.rb
+# 
+# Test case for the Win32::API::Callback class. You should run this as Rake
+# task, i.e. 'rake test', instead of running it directly.
+############################################################################
+require 'win32/api'
+require 'test/unit'
+include Win32
+
+class TC_Win32_API_Callback < Test::Unit::TestCase
+   def setup
+      @buffer   = 0.chr * 260
+      @api_ew   = API.new('EnumWindows', 'KP', 'L', 'user32')
+      @api_gwt  = API.new('GetWindowText', 'LPI', 'I', 'user32')
+      @callback = nil
+   end
+   
+   def test_constructor
+      assert_respond_to(API::Callback, :new)
+      assert_nothing_raised{ API::Callback.new('LP', 'I') }
+      assert_nothing_raised{ API::Callback.new('LP', 'I'){} }
+   end
+   
+   def test_prototype
+      assert_nothing_raised{ @callback = API::Callback.new('LP', 'I') }
+      assert_respond_to(@callback, :prototype)
+      assert_equal('LP', @callback.prototype)
+   end
+   
+   def test_return_value
+      assert_nothing_raised{ @callback = API::Callback.new('LP', 'I') }
+      assert_respond_to(@callback, :return_type)
+      assert_equal('I', @callback.return_type)
+   end
+   
+   def test_callback
+      assert_nothing_raised{
+         @callback = API::Callback.new('LP', 'I'){ |handle, param|
+         	buf = "\0" * 200
+            @api_gwt.call(handle, buf, 200);
+            buf.index(param).nil? ? true : false           
+         }
+      }
+      assert_nothing_raised{ @api_ew.call(@callback, 'UEDIT32') }
+   end
+   
+   def test_constructor_expected_errors
+      assert_raise(API::Callback::Error){ API::Callback.new('X') }
+   end
+   
+   def teardown
+      @buffer   = nil
+      @api_ew   = nil
+      @api_gwt  = nil
+      @callback = nil
+   end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: win32-api
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2007-09-14 00:00:00 -06:00
+  version: 1.0.1
+date: 2007-09-27 00:00:00 -06:00
 summary: A superior replacement for Win32API
 require_paths: 
 - lib
@@ -31,12 +31,12 @@ authors:
 files: 
 - ext/extconf.rb
 - ext/win32
+- ext/win32/api.c
 - test/tc_win32_api.rb
 - test/tc_win32_api_callback.rb
 - README
 - CHANGES
 - MANIFEST
-- ext/win32/api.c
 test_files: 
 - test/tc_win32_api.rb
 - test/tc_win32_api_callback.rb