win32-api 1.5.2-universal-mingw32 → 1.5.3-universal-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40600be0a4b0d43c92a249dd1f508562d7ef399e
-  data.tar.gz: 7c13f96cb0ef6725dd590f6c93bc643aa54ba709
+  metadata.gz: 7e89ec0088d309d7ed30ab87ad2d0b657315af69
+  data.tar.gz: 9ac07477f90e4933338077c3e2fd63fff00d81a1
 SHA512:
-  metadata.gz: e48d26d32bc1ec16a985313f282f3e8d8589bc8946d3c632b6388fe273d86ca19ab3125cb735704923b6133225f0f9fec3cb1119d5532eaca2dd7c8600eebd17
-  data.tar.gz: 88912d1a2c5bf6abeb28f5f81bea9064b4faebf3bd9a9ce18a9708a12c09b01793ad7ca4f56de14b3350be5503b103d666f4aa9776cacac98898ca2b10f384a6
+  metadata.gz: 9429c396c7ea80685f43117988e8d81a33b0f0559213ff8c014d96739da7fcdb7f42aa1977923020af3a06154d9c4aac82fb41128db66794656462209bc9dc94
+  data.tar.gz: b2330025011dbb3963e43529da40dcea113adab9f2839a10f5ff1ea53fd7d448faf8ebf7a16538a64a38c05cf71290dad5083c0d4eec4e04eee2a66cad6bbc0a

data/CHANGES

@@ -1,3 +1,9 @@
+== 1.5.3 - 18-Mar-2015
+* Now includes binaries for Ruby 2.2 for both 32 and 64 bit versions.
+* Fixed potential stack corruption caused by callbacks. Thanks go to
+  rickerliang for the spot and patch.
+* Some minor updates and additions to the Rakefile.
+
 == 1.5.2 - 11-Oct-2014
 * Now includes binaries for Ruby 2.1 for both 32 and 64 bit versions.
 * Some refactoring of the gem:binary task, mostly for me.

data/README

@@ -49,6 +49,9 @@
     use capital letters.
 
 = Developer's Notes
+  [NOTE: Some of the information below is now out of date, but explains my
+  motivation at the time the project was originally created.]
+
   The current Win32API library that ships with the standard library has been
   slated for removal from Ruby 2.0 and it will not receive any updates in the
   Ruby 1.8.x branch. I have far too many libraries invested in it to let it
@@ -104,13 +107,20 @@
   http://www.gittip.com/djberg96/
 
 = Future Plans
-  I really don't have future plans for this library since I believe FFI to
-  be the preferred C interface going forward. This library will still be
-  maintained, at least until all of the win32utils libraries have been
-  converted to use either FFI or an OLE approach.
+  I really don't have future plans for this library since you should use FFI
+  as your preferred C interface going forward. All of my own projects have
+  since been converted to either use FFI or an analogous OLE interface.
+
+  I will continue to maintain this library as long as there are folks out
+  there who are still using it, but I strongly encourage you to convert
+  your projects to FFI when possible.
+
+= Maintainer Wanted!
+  Since I no longer use this project, I would like to turn it over to
+  someone who has the skill, time and desire to keep it going.
 
 = Copyright
-  (C) 2003-2014 Daniel J. Berger
+  (C) 2003-2015 Daniel J. Berger
   All Rights Reserved
 
 = License

data/Rakefile

@@ -30,7 +30,7 @@ task :build_manifest do
   if version && version.to_i >= 80
     unless File.exist?(File.join(CONFIG['bindir'], 'ruby.exe.manifest'))
       Dir.chdir(CONFIG['bindir']) do
-        sh "mt -inputresource:ruby.exe;2 -out:ruby.exe.manifest"
+        sh "mt -nologo -inputresource:ruby.exe;2 -out:ruby.exe.manifest"
       end
     end
   end
@@ -38,7 +38,7 @@ end
 
 desc "Build the win32-api library"
 task :build => [:clean, :build_manifest] do
-  require 'devkit'
+  require 'devkit' if RbConfig::CONFIG['host_os'] =~ /mingw|cygwn/i
   Dir.chdir('ext') do
     ruby "extconf.rb"
     sh make
@@ -60,8 +60,8 @@ namespace 'gem' do
   end
 
   desc 'Build a binary gem'
-  task :binary, :ruby18, :ruby19, :ruby2_32, :ruby2_64, :ruby21, :ruby21_64 do |task, args|
-    require 'devkit'
+  task :binary, :ruby18, :ruby19, :ruby2_32, :ruby2_64, :ruby21, :ruby21_64, :ruby22, :ruby22_64 do |task, args|
+    require 'devkit' if RbConfig::CONFIG['host_os'] =~ /mingw|cygwn/i
 
     # These are just what's on my system at the moment. Adjust as needed.
     args.with_defaults(
@@ -70,7 +70,9 @@ namespace 'gem' do
       :ruby2_32  => "c:/ruby2/bin/ruby",
       :ruby2_64  => "c:/ruby264/bin/ruby",
       :ruby21_32 => "c:/ruby21/bin/ruby",
-      :ruby21_64 => "c:/ruby21-x64/bin/ruby"
+      :ruby21_64 => "c:/ruby21-x64/bin/ruby",
+      :ruby22_32 => "c:/ruby22/bin/ruby",
+      :ruby22_64 => "c:/ruby22-x64/bin/ruby"
     )
 
     Rake::Task[:clobber].invoke
@@ -94,22 +96,38 @@ namespace 'gem' do
     }
 
 text = <<HERE
-case 
-  when RUBY_VERSION =~ /1\\.8/
-    require File.join(File.dirname(__FILE__), 'ruby18/win32/api')
-  when RUBY_VERSION =~ /1\\.9/
-    require File.join(File.dirname(__FILE__), 'ruby19/win32/api')
-  when RUBY_VERSION =~ /2\\.0/
-    if RbConfig::CONFIG['arch'] =~ /x64/i
-      require File.join(File.dirname(__FILE__), 'ruby2_64/win32/api')
+require 'rbconfig'
+
+case RbConfig::CONFIG['MAJOR']
+  when '1'
+    if RbConfig::CONFIG['MINOR'] == '8'
+      require File.join(File.dirname(__FILE__), 'ruby18/win32/api')
     else
-      require File.join(File.dirname(__FILE__), 'ruby2_32/win32/api')
+      require File.join(File.dirname(__FILE__), 'ruby19/win32/api')
     end
-  when RUBY_VERSION =~ /2\\.1/
-    if RbConfig::CONFIG['arch'] =~ /x64/i
-      require File.join(File.dirname(__FILE__), 'ruby21_64/win32/api')
-    else
-      require File.join(File.dirname(__FILE__), 'ruby21_32/win32/api')
+  when '2'
+    if RbConfig::CONFIG['MINOR'] == '0'
+      if RbConfig::CONFIG['arch'] =~ /x64/i
+        require File.join(File.dirname(__FILE__), 'ruby2_64/win32/api')
+      else
+        require File.join(File.dirname(__FILE__), 'ruby2_32/win32/api')
+      end
+    end
+
+    if RbConfig::CONFIG['MINOR'] == '1'
+      if RbConfig::CONFIG['arch'] =~ /x64/i
+        require File.join(File.dirname(__FILE__), 'ruby21_64/win32/api')
+      else
+        require File.join(File.dirname(__FILE__), 'ruby21_32/win32/api')
+      end
+    end
+
+    if RbConfig::CONFIG['MINOR'] == '2'
+      if RbConfig::CONFIG['arch'] =~ /x64/i
+        require File.join(File.dirname(__FILE__), 'ruby22_64/win32/api')
+      else
+        require File.join(File.dirname(__FILE__), 'ruby22_32/win32/api')
+      end
     end
 end
 HERE

data/ext/win32/api.c

@@ -37,7 +37,7 @@
 
 
 #define MAX_BUF 1024
-#define WINDOWS_API_VERSION "1.5.2"
+#define WINDOWS_API_VERSION "1.5.3"
 
 #define _T_VOID     0
 #define _T_LONG     1
@@ -822,7 +822,6 @@ static VALUE api_call(int argc, VALUE* argv, VALUE self){
                break;
             case _T_CALLBACK:
                ActiveCallback = v_arg;
-               v_proto = rb_iv_get(ActiveCallback, "@prototype");
                param.params[i] = (LPARAM)NUM2SIZET(rb_iv_get(ActiveCallback, "@address"));;
                break;
             case _T_STRING:
@@ -834,14 +833,131 @@ static VALUE api_call(int argc, VALUE* argv, VALUE self){
    }
 
    /* Call the function, get the return value */
-#ifdef _WIN64    
-   return_value = ptr->function(param.params[0],param.params[1],param.params[2],param.params[3],param.params[4],
-                                param.params[5],param.params[6],param.params[7],param.params[8],param.params[9],
-                                param.params[10],param.params[11],param.params[12],param.params[13],param.params[14],
-                                param.params[15],param.params[16],param.params[17],param.params[18],param.params[19]);
-#else    
-   return_value = ptr->function(param);
-#endif
+   if(strcmp(StringValuePtr(RARRAY_PTR(v_proto)[0]), "V") == 0 && len == 1)
+   {
+        return_value = ptr->function();
+   }
+   else
+   {   
+        switch(len)
+        {
+        case 0:
+            return_value = ptr->function();
+            break;
+        case 1:
+            return_value = ptr->function(param.params[0]);
+            break;
+        case 2:
+            return_value = ptr->function(param.params[0], param.params[1]);
+            break;
+        case 3:
+            return_value = ptr->function(param.params[0], param.params[1], 
+                param.params[2]);
+            break;
+        case 4:
+            return_value = ptr->function(param.params[0], param.params[1], 
+                param.params[2], param.params[3]);
+            break;
+        case 5:
+            return_value = ptr->function(param.params[0], param.params[1], 
+                param.params[2], param.params[3], param.params[4]);
+            break;
+        case 6:
+            return_value = ptr->function(param.params[0], param.params[1], 
+                param.params[2], param.params[3], param.params[4], param.params[5]);
+            break;
+        case 7:
+            return_value = ptr->function(param.params[0], param.params[1],
+                param.params[2], param.params[3], param.params[4], param.params[5], 
+                param.params[6]);
+            break;
+        case 8:
+            return_value = ptr->function(param.params[0], param.params[1], 
+                param.params[2], param.params[3], param.params[4], param.params[5],
+                param.params[6], param.params[7]);
+            break;
+        case 9:
+            return_value = ptr->function(param.params[0], param.params[1], 
+                param.params[2], param.params[3], param.params[4], param.params[5],
+                param.params[6], param.params[7], param.params[8]);
+            break;
+        case 10:
+            return_value = ptr->function(param.params[0], param.params[1], 
+                param.params[2], param.params[3], param.params[4], param.params[5], 
+                param.params[6], param.params[7], param.params[8], param.params[9]);
+            break;
+        case 11:
+            return_value = ptr->function(param.params[0], param.params[1], 
+                param.params[2], param.params[3], param.params[4], param.params[5], 
+                param.params[6], param.params[7], param.params[8], param.params[9],
+                param.params[10]);
+            break;
+        case 12:
+            return_value = ptr->function(param.params[0], param.params[1], 
+                param.params[2], param.params[3], param.params[4], param.params[5],
+                param.params[6], param.params[7], param.params[8], param.params[9],
+                param.params[10], param.params[11]);
+            break;
+        case 13:
+            return_value = ptr->function(param.params[0], param.params[1],
+                param.params[2], param.params[3], param.params[4], param.params[5],
+                param.params[6], param.params[7], param.params[8], param.params[9],
+                param.params[10], param.params[11], param.params[12]);
+            break;
+        case 14:
+            return_value = ptr->function(param.params[0], param.params[1],
+                param.params[2], param.params[3], param.params[4], param.params[5],
+                param.params[6], param.params[7], param.params[8], param.params[9],
+                param.params[10], param.params[11], param.params[12], param.params[13]);
+            break;
+        case 15:
+            return_value = ptr->function(param.params[0], param.params[1],
+                param.params[2], param.params[3], param.params[4], param.params[5],
+                param.params[6], param.params[7], param.params[8], param.params[9],
+                param.params[10], param.params[11], param.params[12], param.params[13],
+                param.params[14]);
+            break;
+        case 16:
+            return_value = ptr->function(param.params[0], param.params[1],
+                param.params[2], param.params[3], param.params[4], param.params[5],
+                param.params[6], param.params[7], param.params[8], param.params[9],
+                param.params[10], param.params[11], param.params[12], param.params[13],
+                param.params[14], param.params[15]);
+            break;
+        case 17:
+            return_value = ptr->function(param.params[0], param.params[1],
+                param.params[2], param.params[3], param.params[4], param.params[5],
+                param.params[6], param.params[7], param.params[8], param.params[9],
+                param.params[10], param.params[11], param.params[12], param.params[13],
+                param.params[14], param.params[15], param.params[16]);
+            break;
+        case 18:
+            return_value = ptr->function(param.params[0], param.params[1],
+                param.params[2], param.params[3], param.params[4], param.params[5],
+                param.params[6], param.params[7], param.params[8], param.params[9],
+                param.params[10], param.params[11], param.params[12], param.params[13],
+                param.params[14], param.params[15], param.params[16], param.params[17]);
+            break;
+        case 19:
+            return_value = ptr->function(param.params[0], param.params[1],
+                param.params[2], param.params[3], param.params[4], param.params[5],
+                param.params[6], param.params[7], param.params[8], param.params[9],
+                param.params[10], param.params[11], param.params[12], param.params[13],
+                param.params[14], param.params[15], param.params[16], param.params[17],
+                param.params[18]);
+            break;
+        case 20:
+            return_value = ptr->function(param.params[0], param.params[1],
+                param.params[2], param.params[3], param.params[4], param.params[5],
+                param.params[6], param.params[7], param.params[8], param.params[9],
+                param.params[10], param.params[11], param.params[12], param.params[13],
+                param.params[14], param.params[15], param.params[16], param.params[17],
+                param.params[18], param.params[19]);
+            break;
+        default:
+            rb_raise(rb_eArgError,"number of parameters exceed 20!");
+        }
+   }
 
    /* Return the appropriate type based on the return type specified
     * in the constructor.
@@ -971,6 +1087,6 @@ void Init_api(){
 
    /* Constants */
 
-   /* 1.5.2: The version of the win32-api library */
+   /* 1.5.3: The version of the win32-api library */
    rb_define_const(cAPI, "VERSION", rb_str_new2(WINDOWS_API_VERSION));
 }

data/lib/win32/api.rb

@@ -1,18 +1,34 @@
-case 
-  when RUBY_VERSION =~ /1\.8/
-    require File.join(File.dirname(__FILE__), 'ruby18/win32/api')
-  when RUBY_VERSION =~ /1\.9/
-    require File.join(File.dirname(__FILE__), 'ruby19/win32/api')
-  when RUBY_VERSION =~ /2\.0/
-    if RbConfig::CONFIG['arch'] =~ /x64/i
-      require File.join(File.dirname(__FILE__), 'ruby2_64/win32/api')
+require 'rbconfig'
+
+case RbConfig::CONFIG['MAJOR']
+  when '1'
+    if RbConfig::CONFIG['MINOR'] == '8'
+      require File.join(File.dirname(__FILE__), 'ruby18/win32/api')
     else
-      require File.join(File.dirname(__FILE__), 'ruby2_32/win32/api')
+      require File.join(File.dirname(__FILE__), 'ruby19/win32/api')
     end
-  when RUBY_VERSION =~ /2\.1/
-    if RbConfig::CONFIG['arch'] =~ /x64/i
-      require File.join(File.dirname(__FILE__), 'ruby21_64/win32/api')
-    else
-      require File.join(File.dirname(__FILE__), 'ruby21_32/win32/api')
+  when '2'
+    if RbConfig::CONFIG['MINOR'] == '0'
+      if RbConfig::CONFIG['arch'] =~ /x64/i
+        require File.join(File.dirname(__FILE__), 'ruby2_64/win32/api')
+      else
+        require File.join(File.dirname(__FILE__), 'ruby2_32/win32/api')
+      end
+    end
+
+    if RbConfig::CONFIG['MINOR'] == '1'
+      if RbConfig::CONFIG['arch'] =~ /x64/i
+        require File.join(File.dirname(__FILE__), 'ruby21_64/win32/api')
+      else
+        require File.join(File.dirname(__FILE__), 'ruby21_32/win32/api')
+      end
+    end
+
+    if RbConfig::CONFIG['MINOR'] == '2'
+      if RbConfig::CONFIG['arch'] =~ /x64/i
+        require File.join(File.dirname(__FILE__), 'ruby22_64/win32/api')
+      else
+        require File.join(File.dirname(__FILE__), 'ruby22_32/win32/api')
+      end
     end
 end

data/test/test_win32_api.rb

@@ -18,7 +18,7 @@ class TC_Win32_API < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal('1.5.2', API::VERSION)
+      assert_equal('1.5.3', API::VERSION)
    end
 
    def test_constructor_basic

data/win32-api.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'win32-api'
-  spec.version    = '1.5.2'
+  spec.version    = '1.5.3'
   spec.authors    = ['Daniel J. Berger', 'Park Heesob']
   spec.license    = 'Artistic 2.0'
   spec.email      = 'djberg96@gmail.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win32-api
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: universal-mingw32
 authors:
 - Daniel J. Berger
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-11 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -63,6 +63,8 @@ files:
 - lib/win32/ruby19/win32/api.so
 - lib/win32/ruby21_32/win32/api.so
 - lib/win32/ruby21_64/win32/api.so
+- lib/win32/ruby22_32/win32/api.so
+- lib/win32/ruby22_64/win32/api.so
 - lib/win32/ruby2_32/win32/api.so
 - lib/win32/ruby2_64/win32/api.so
 - test/test_win32_api.rb
@@ -89,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A superior replacement for Win32API