win32-api 1.4.3 → 1.4.4

data/CHANGES

@@ -1,17 +1,25 @@
-= 1.4.3 - 23-Jun-2009
+== 1.4.4 - 18-Aug-2009
+* Fixed a bug where functions that returned a long return type were unsigned
+  instead of signed.
+* The Rakefile has been refactored somewhat, including the removal of FFI
+  related tasks. Those are now in a separate branch in the repository.
+* The test-unit library is now a development dependency instead of a runtime
+  dependency.
+
+== 1.4.3 - 23-Jun-2009
 * Bug fix for mingw.
 * License now set to Artistic 2.0.
 
-= 1.4.2 - 31-May-2009
+== 1.4.2 - 31-May-2009
 * Updated the internal StringError() function to better handle the possibility
   of the English .mui file not being found. Thanks go to Michel Demazure for
   the spot.
 
-= 1.4.1 - 29-May-2009
+== 1.4.1 - 29-May-2009
 * Callback handling improvements.
 * Updated the gemspec description.
 
-= 1.4.0 - 19-Feb-2009
+== 1.4.0 - 19-Feb-2009
 * Now compatible with Ruby 1.9.x.
 * In what will go down as, "It seemed like a good idea at the time", I have
   removed the feature where W (wide) character functions were used first if
@@ -21,7 +29,7 @@
 * Fixed RF bug #23944 - bad error message for MSVCRT functions that failed
   to load properly.
 
-= 1.3.0 - 1-Jan-2009
+== 1.3.0 - 1-Jan-2009
 * Fixed RubyForge bug #23395, which was caused by inadvertently modifying
   a variable within a loop. This caused callbacks to fail in certain
   situations.
@@ -34,7 +42,7 @@
 * Refactored a high iteration test so that it counts as only one test
   instead of 1000.
 
-= 1.2.2 - 27-Nov-2008
+== 1.2.2 - 27-Nov-2008
 * Fixed bug in the error message for illegal prototypes and illegal return
   types where the character in question would come out as empty or garbage.
 * Passing a bad return type to Win32::API::Callback now raises an error.
@@ -49,14 +57,14 @@
 * Added tests for the Win32::API::Callback#address method.
 * Added tests to all Win32::API classes that explicitly check error messages.
 
-= 1.2.1 - 14-Nov-2008
+== 1.2.1 - 14-Nov-2008
 * Fixed and updated callback handling.
 * Fixed wide string return handling for pointers and strings.
 * Added the Win32::API::Callback#address instance method.
 * All errors are now in English instead of your native language, because
   that's what Ruby itself does.
 
-= 1.2.0 - 22-Jul-2008
+== 1.2.0 - 22-Jul-2008
 * Added support for the 'S' (string) prototype and return type. It can be
   used instead of 'P' (pointer) for const char*.
 * Some internal refactoring. The attempts to load ANSI and/or Wide character
@@ -65,12 +73,12 @@
 * Added a couple of gem building Rake tasks.
 * Added a few more tests.
 
-= 1.1.0 - 12-Jun-2008
+== 1.1.0 - 12-Jun-2008
 * Added the Windows::API::Function class. This is a subclass of Win32::API
   meant only for use with raw function pointers.
 * Some documentation updates in the source and README files.
 
-= 1.0.6 - 18-Apr-2008
+== 1.0.6 - 18-Apr-2008
 * Added the effective_function_name method. This allows you to see what the
   actual function name is that was defined, e.g. GetUserNameA vs GetUserNameW.
 * Replaced an instance of _tcscmp with strcmp. The case in question was always
@@ -80,32 +88,32 @@
   you're using a version of Ruby built with VC++ 8 or later. This builds a
   ruby.exe.manifest file (if it doesn't already exist).
 
-= 1.0.5 - 20-Nov-2007
+== 1.0.5 - 20-Nov-2007
 * The API.new method now defaults to "W" (wide character functions) before "A"
   (ANSI functions) if the $KCODE global variable is set to 'u' (UTF8).
 * Minor improvements to the Rakefile.
 
-= 1.0.4 - 26-Oct-2007
+== 1.0.4 - 26-Oct-2007
 * Fixed a bug where methods that returned pointers ('P') could choke if the
   resulting pointer was 0 or NULL. In this case, nil is now returned instead.
 * Tweak to the extconf.rb file that helps the gem build it from source
   properly.
 
-= 1.0.3 - 28-Sep-2007
+== 1.0.3 - 28-Sep-2007
 * Fixed a subtle but dangerous copy-on-write bug in the API#call method.
 
-= 1.0.2 - 28-Sep-2007
+== 1.0.2 - 28-Sep-2007
 * Fixed a bug in an internal struct member that was causing segfaults. Thanks
   go to Lars Olsson for the spot.
 * Fixed the 'install' task in the Rakefile. This only affected native builds,
   not the prebuilt binary.
 * Added a few more tests.
 
-= 1.0.1 - 27-Sep-2007
+== 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
+== 1.0.0 - 14-Sep-2007
 * Initial release

data/README

@@ -96,7 +96,7 @@
    All Rights Reserved
 
 = License
-   Ruby's
+   Artistic 2.0
 
 = Authors
    Daniel J. Berger

data/Rakefile

@@ -20,7 +20,7 @@ end
 desc 'Install the win32-api library (non-gem)'
 task :install => [:build] do
    Dir.chdir('ext'){
-      sh "nmake install"
+      sh 'nmake install'
    }
 end
 
@@ -30,17 +30,20 @@ task :install_gem do
    sh "gem install #{file}"
 end
 
-desc "Clean any build files for Win32::API"
+desc 'Clean any build files for Win32::API'
 task :clean do
    Dir.chdir('ext') do
-      if File.exists?("api.so") || File.exists?("win32/api.so") ||
-         File.exists?("api.obj")
+      if File.exists?('api.so') || File.exists?('win32/api.so') ||
+         File.exists?('api.obj')
       then
-         sh "nmake distclean"
-         rm "win32/api.so" if File.exists?("win32/api.so")
-         rm "api.so" if File.exists?("api.so") 
+         sh 'nmake distclean'
+         rm 'win32/api.so' if File.exists?('win32/api.so')
+         rm 'api.so' if File.exists?('api.so') 
       end
    end
+
+   # Cleanup any files generated by the build_binary_gem task
+   rm_rf('lib') if File.exists?('lib')
 end
 
 desc "Build Win32::API (but don't install it)"
@@ -52,66 +55,47 @@ task :build => [:clean, :build_manifest] do
    end
 end
 
-desc "Build a standard gem"
+desc 'Build a standard gem'
 task :build_gem => [:clean] do 
-   spec = Gem::Specification.new do |gem|
-      gem.name         = "win32-api"
-      gem.version      = "1.4.3"
-      gem.authors      = ["Daniel J. Berger", "Park Heesob"]
-      gem.email        = "djberg96@gmail.com"
-      gem.homepage     = "http://www.rubyforge.org/projects/win32utils"
-      gem.rubyforge_project = "win32utils"
-      gem.platform     = Gem::Platform::RUBY
-      gem.summary      = "A superior replacement for Win32API"
-      gem.has_rdoc     = true
-      gem.test_files   = Dir['test/test*']
-      gem.extensions   = ['ext/extconf.rb']
-      gem.license      = 'Artistic 2.0'
-      files            = Dir["ext/win32/api.c"] + Dir["test/*"]
-      files.delete_if{ |f| f.include?('CVS') }
-      gem.files = files
-      gem.extra_rdoc_files = ['README', 'CHANGES', 'MANIFEST', 'ext/win32/api.c']
-      gem.rubyforge_project = 'win32utils'
-      gem.required_ruby_version = '>= 1.8.2'
-      
-      gem.description = <<-EOF
-         The Win32::API library is meant as a replacement for the Win32API
-         library that ships as part of the standard library. It contains several
-         advantages over Win32API, including callback support, raw function
-         pointers, an additional string type, and more.
-      EOF
-   end
-
-   Gem::Builder.new(spec).build
+   eval(IO.read('win32-api.gemspec'))
 end
 
-desc "Build a binary gem"
+desc 'Build a binary gem'
 task :build_binary_gem => [:build] do
    mkdir_p 'lib/win32'
    mv 'ext/win32/api.so', 'lib/win32'
-   rm_rf 'lib/ffi'
-   rm_rf 'lib/jruby'
 
    task :build_binary_gem => [:clean]
 
    spec = Gem::Specification.new do |gem|
-      gem.name         = "win32-api"
-      gem.version      = "1.4.3"
-      gem.authors      = ["Daniel J. Berger", "Park Heesob"]
-      gem.email        = "djberg96@gmail.com"
-      gem.homepage     = "http://www.rubyforge.org/projects/win32utils"
-      gem.rubyforge_project = "win32utils"
-      gem.platform     = Gem::Platform::CURRENT
-      gem.summary      = "A superior replacement for Win32API"
-      gem.has_rdoc     = true
-      gem.test_files   = Dir['test/test*']
-      gem.license      = 'Artistic 2.0'
-      files            = Dir["lib/win32/api.so"] + Dir["test/*"]
-      files.delete_if{ |f| f.include?('CVS') }
-      gem.files = files
-      gem.extra_rdoc_files = ['README', 'CHANGES', 'MANIFEST', 'ext/win32/api.c']
+      gem.name       = 'win32-api'
+      gem.version    = '1.4.4'
+      gem.authors    = ['Daniel J. Berger', 'Park Heesob']
+      gem.license    = 'Artistic 2.0'
+      gem.email      = 'djberg96@gmail.com'
+      gem.homepage   = 'http://www.rubyforge.org/projects/win32utils'
+      gem.platform   = Gem::Platform::CURRENT
+      gem.summary    = 'A superior replacement for Win32API'
+      gem.has_rdoc   = true
+      gem.test_files = Dir['test/test*']
+
+      gem.files = [
+         Dir['*'],
+         Dir['test/*'],
+         'ext/extconf.rb',
+         'ext/win32/api.c',
+         'lib/win32/api.so'
+      ].flatten.reject{ |f| f.include?('CVS') }
+
       gem.rubyforge_project = 'win32utils'
       gem.required_ruby_version = '>= 1.8.2'
+
+      gem.extra_rdoc_files = [
+         'README',
+         'CHANGES',
+         'MANIFEST',
+         'ext/win32/api.c'
+      ]
       
       gem.description = <<-EOF
          The Win32::API library is meant as a replacement for the Win32API
@@ -124,23 +108,13 @@ task :build_binary_gem => [:build] do
    Gem::Builder.new(spec).build
 end
 
-Rake::TestTask.new('test') do |test|
-   if RUBY_PLATFORM.match('java')
-      test.libs << 'lib/ffi'
-      test.test_files = Dir['test/test_win32_api.rb']
-   else
-      task :test => [:build]
-      test.libs << 'ext'
-      test.libs.delete('lib')
-   end
-
+Rake::TestTask.new(:test) do |test|
+   task :test => [:build]
+   test.libs << 'ext'
    test.warning = true
    test.verbose = true
 end
 
 task :test do
-   Rake.application[:clean].execute
-
-Rake::TestTask.new('test_jruby') do |test|
-   test.warning = true
+   Rake.application[:clean].execute
 end

data/ext/win32/api.c

@@ -17,7 +17,7 @@
 #endif
 
 #define MAX_BUF 1024
-#define WINDOWS_API_VERSION "1.4.3"
+#define WINDOWS_API_VERSION "1.4.4"
 
 #define _T_VOID     0
 #define _T_LONG     1
@@ -740,7 +740,7 @@ void *find_callback(VALUE obj,int len)
 static VALUE api_call(int argc, VALUE* argv, VALUE self){
    VALUE v_proto, v_args, v_arg, v_return;
    Win32API* ptr;
-   unsigned long return_value;
+   long return_value;
    int i = 0;
    int len;
 
@@ -823,7 +823,7 @@ static VALUE api_call(int argc, VALUE* argv, VALUE self){
          v_return = INT2NUM(return_value);
          break;
       case _T_LONG:
-         v_return = ULONG2NUM(return_value);
+         v_return = LONG2NUM(return_value);
          break;
       case _T_VOID:
          v_return = Qnil;
@@ -943,6 +943,6 @@ void Init_api(){
 
    /* Constants */
 
-   /* 1.4.3: The version of this library, returned as a String */
+   /* 1.4.4: The version of the win32-api library */
    rb_define_const(cAPI, "VERSION", rb_str_new2(WINDOWS_API_VERSION));
 }

data/test/test_win32_api.rb

@@ -14,13 +14,14 @@ include Win32
 class TC_Win32_API < Test::Unit::TestCase
    def setup
       @buf = 0.chr * 260
+      @gfa = API.new('GetFileAttributes', 'S', 'L')
       @gcd = API.new('GetCurrentDirectory', 'LP')
       @gle = API.new('GetLastError', 'V', 'L')
       @str = API.new('strstr', 'PP', 'P', 'msvcrt')
    end
 
    def test_version
-      assert_equal('1.4.3', API::VERSION)
+      assert_equal('1.4.4', API::VERSION)
    end
 
    def test_constructor_basic
@@ -40,6 +41,10 @@ class TC_Win32_API < Test::Unit::TestCase
       assert_nothing_raised{ @gle.call }
       assert_nothing_raised{ @gle.call(nil) }
    end
+
+   def test_call_returns_negative_value_on_failure
+      assert_equal(-1, @gfa.call('C:/foobarbazblah'))
+   end
    
    def test_dll_name
       assert_respond_to(@gcd, :dll_name)

data/win32-api.gemspec

@@ -1,24 +1,24 @@
-require "rubygems"
+require 'rubygems'
 
 spec = Gem::Specification.new do |gem|
-   gem.name         = 'win32-api'
-   gem.version      = '1.4.3'
-   gem.authors      = ['Daniel J. Berger', 'Park Heesob']
-   gem.email        = 'djberg96@gmail.com'
-   gem.homepage     = 'http://www.rubyforge.org/projects/win32utils'
-   gem.platform     = Gem::Platform::RUBY
-   gem.summary      = 'A superior replacement for Win32API'
-   gem.has_rdoc     = true
-   gem.test_files   = Dir['test/test*']
-   gem.extensions   = ['ext/extconf.rb']
-   gem.files        = Dir['**/*'].delete_if{ |f| f.include?('CVS') || f.include?('lib') }
-   gem.license      = 'Artistic 2.0'
+   gem.name       = 'win32-api'
+   gem.version    = '1.4.4'
+   gem.authors    = ['Daniel J. Berger', 'Park Heesob']
+   gem.license    = 'Artistic 2.0'
+   gem.email      = 'djberg96@gmail.com'
+   gem.homepage   = 'http://www.rubyforge.org/projects/win32utils'
+   gem.platform   = Gem::Platform::RUBY
+   gem.summary    = 'A superior replacement for Win32API'
+   gem.has_rdoc   = true
+   gem.test_files = Dir['test/test*']
+   gem.extensions = ['ext/extconf.rb']
+   gem.files      = Dir['**/*'].reject{ |f| f.include?('CVS') || f.include?('lib') }
    
-   gem.extra_rdoc_files = ['README', 'CHANGES', 'MANIFEST', 'ext/win32/api.c']
    gem.rubyforge_project = 'win32utils'
    gem.required_ruby_version = '>= 1.8.2'
+   gem.extra_rdoc_files = ['README', 'CHANGES', 'MANIFEST', 'ext/win32/api.c']
    
-   gem.add_dependency('test-unit', '>= 2.0.2')
+   gem.add_development_dependency('test-unit', '>= 2.0.2')
    
    gem.description = <<-EOF
       The Win32::API library is meant as a replacement for the Win32API
@@ -28,6 +28,4 @@ spec = Gem::Specification.new do |gem|
    EOF
 end
 
-if $0 == __FILE__
-   Gem::Builder.new(spec).build
-end
+Gem::Builder.new(spec).build

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: win32-api
 version: !ruby/object:Gem::Version 
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -10,12 +10,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-23 00:00:00 -06:00
+date: 2009-08-18 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: test-unit
-  type: :runtime
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: win32utils
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A superior replacement for Win32API