win32-api 1.0.4 → 1.0.5

data/CHANGES

@@ -1,3 +1,8 @@
+= 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
 * 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.
@@ -21,4 +26,4 @@
 * Fixed the gemspec for the native build.
 
 = 1.0.0 - 14-Sep-2007
-* Initial release
+* Initial release

data/MANIFEST

@@ -1,9 +1,9 @@
-* CHANGES
-* MANIFEST
-* README
-* Rakefile
-* win32-api.gemspec
-* ext/extconf.rb
-* ext/win32/api.c
-* test/tc_win32_api_callback.rb
+* CHANGES
+* MANIFEST
+* README
+* Rakefile
+* win32-api.gemspec
+* ext/extconf.rb
+* ext/win32/api.c
+* test/tc_win32_api_callback.rb
 * test/tc_win32_api.rb

data/README

@@ -1,72 +1,85 @@
-= Description
-   This is a drop-in replacement for the Win32API library currently part of
-   Ruby's standard library.
-	
-= Synopsis
-   require 'win32/api'
-   include Win32
-   
-   buf = 0.chr * 260
-   len = [@buf.length].pack('L')
-   
-   GetUserName = API.new('GetUserName', 'PP', 'I', 'advapi32')
-   GetUserName.call(buf, len)
-   
-   puts buf.strip
-   
-= Differences between win32-api and Win32API
-   * Argument order change. The DLL name is now last, not first.
-   * Removed the 'N' and 'n'. Always use 'L' for longs now.
-   * Sensible default arguments for the prototype, return type and DLL name.
-   * Reader methods for the function name, prototype, return type and DLL.
-   * Removed the support for lower case prototype and return types. Always
-     use capital letters.
-   
-= Developer's Notes
-   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
-   die at this point.
-   
-   In addition, the current Win32API library was written in the bad old Ruby
-   1.6.x days, which means it doesn't use the newer allocation framework.
-   There were several other refactorings that I felt it needed to more closely
-   match how it was actually being used in practice.
-   
-   The first order of business was changing the order of the arguments. By
-   moving the DLL name from first to last, I was able to provide reasonable
-   default arguments for the prototype, return type and the DLL. Only the
-   function name is required now.
-   
-   There was a laundry list of other refactorings that were needed: sensical
-   instance variable names with proper accessors, removing support for lower
-   case prototype and return value characters that no one used in practice,
-   better naming conventions, the addition of RDoc ready comments and,
-   especially, callback support.
-   
-   Most importantly, we can now add, modify and fix any features that we feel
-   best benefit our end users.
-
-= Documentation
-   The source file contains inline RDoc documentation. If you installed
-   this file as a gem, then you have the docs.
-   
-= Warranty
-   This package is provided "as is" and without any express or
-   implied warranties, including, without limitation, the implied
-   warranties of merchantability and fitness for a particular purpose.
-   
-= Known Bugs
-   None that I'm aware of. Please submit any bug reports to the project page
-   at http://www.rubyforge.org/projects/win32utils.
-
-= Copyright
-   (C) 2003-2007 Daniel J. Berger
-   All Rights Reserved
-
-= License
-   Ruby's
-
-= Authors
-   Daniel J. Berger
+= Description
+   This is a drop-in replacement for the Win32API library currently part of
+   Ruby's standard library.
+	
+= Synopsis
+   require 'win32/api'
+   include Win32
+   
+   buf = 0.chr * 260
+   len = [@buf.length].pack('L')
+   
+   GetUserName = API.new('GetUserName', 'PP', 'I', 'advapi32')
+   GetUserName.call(buf, len)
+   
+   puts buf.strip
+   
+   # Callback example
+   EnumWindows     = API.new('EnumWindows', 'KP', 'L', 'user32')
+   GetWindowText   = API.new('GetWindowText', 'LPI', 'I', 'user32')
+   EnumWindowsProc = API::Callback.new('LP', 'I'){ |handle, param|
+      buf = "\0" * 200
+      GetWindowText.call(handle, buf, 200);
+      puts buf.strip
+      buf.index(param).nil? ? true : false
+   } 
+   
+= Differences between win32-api and Win32API
+   * This library has callback support!
+   * Argument order change. The DLL name is now last, not first.
+   * Removed the 'N' and 'n'. Always use 'L' for longs now.
+   * Sensible default arguments for the prototype, return type and DLL name.
+   * Reader methods for the function name, prototype, return type and DLL.
+   * Removed the support for lower case prototype and return types. Always
+     use capital letters.
+   * Resorts to wide character functions (where possible) when $KCODE is set
+     to UTF8.
+   
+= Developer's Notes
+   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
+   die at this point.
+   
+   In addition, the current Win32API library was written in the bad old Ruby
+   1.6.x days, which means it doesn't use the newer allocation framework.
+   There were several other refactorings that I felt it needed to more closely
+   match how it was actually being used in practice.
+   
+   The first order of business was changing the order of the arguments. By
+   moving the DLL name from first to last, I was able to provide reasonable
+   default arguments for the prototype, return type and the DLL. Only the
+   function name is required now.
+   
+   There was a laundry list of other refactorings that were needed: sensical
+   instance variable names with proper accessors, removing support for lower
+   case prototype and return value characters that no one used in practice,
+   better naming conventions, the addition of RDoc ready comments and,
+   especially, callback support.
+   
+   Most importantly, we can now add, modify and fix any features that we feel
+   best benefit our end users.
+
+= Documentation
+   The source file contains inline RDoc documentation. If you installed
+   this file as a gem, then you have the docs.
+   
+= Warranty
+   This package is provided "as is" and without any express or
+   implied warranties, including, without limitation, the implied
+   warranties of merchantability and fitness for a particular purpose.
+   
+= Known Bugs
+   None that I'm aware of. Please submit any bug reports to the project page
+   at http://www.rubyforge.org/projects/win32utils.
+
+= Copyright
+   (C) 2003-2007 Daniel J. Berger
+   All Rights Reserved
+
+= License
+   Ruby's
+
+= Authors
+   Daniel J. Berger
    Park Heesob

data/ext/win32/api.c

@@ -2,7 +2,7 @@
 #include <windows.h>
 
 #define MAX_BUF 1024
-#define WINDOWS_API_VERSION "1.0.4"
+#define WINDOWS_API_VERSION "1.0.5"
 
 #define _T_VOID     0
 #define _T_LONG     1
@@ -146,6 +146,8 @@ static VALUE api_init(int argc, VALUE* argv, VALUE self)
    FARPROC fProc;
    Win32API* ptr;
    int i;
+   char* first  = "A";
+   char* second = "W";
    VALUE v_proc, v_proto, v_return, v_dll, v_bool, v_name;
    
    rb_scan_args(argc, argv, "13", &v_proc, &v_proto, &v_return, &v_dll);
@@ -190,19 +192,25 @@ static VALUE api_init(int argc, VALUE* argv, VALUE self)
    ptr->library = hLibrary;
 
    /* Attempt to get the function.  If it fails, try again with an 'A'
-    * appended.  If that fails, try again with a 'W' appended.  If that
+    * appended.  If that fails, try again with a 'W' appended. If that
     * still fails, raise an API::Error.
     */
    fProc = GetProcAddress(hLibrary, TEXT(RSTRING(v_proc)->ptr));
 
+   /* The order of 'A' and 'W' is reversed if $KCODE is set to 'UTF8'. */
+   if(!_tcscmp(rb_get_kcode(), "UTF8")){
+      first  = "W";
+      second = "A";
+   }
+
    if(!fProc){
       VALUE v_ascii = rb_str_new3(v_proc);
-      v_ascii = rb_str_cat(v_ascii, "A", 1);
+      v_ascii = rb_str_cat(v_ascii, first, 1);
       fProc = GetProcAddress(hLibrary, TEXT(RSTRING(v_ascii)->ptr));
 
       if(!fProc){
          VALUE v_unicode = rb_str_new3(v_proc);
-         v_unicode = rb_str_cat(v_unicode, "W", 1);
+         v_unicode = rb_str_cat(v_unicode, second, 1);
          fProc = GetProcAddress(hLibrary, TEXT(RSTRING(v_unicode)->ptr));
 
          if(!fProc){
@@ -342,7 +350,7 @@ DWORD CallbackFunction(PARAM param)
 	           if(NIL_P(v_retval)){
 	              return 0;
 	           }
-	           else if (FIXNUM_P(v_retval)){
+	           else if(FIXNUM_P(v_retval)){
 	              return NUM2ULONG(v_retval);
 	           }
 	           else{
@@ -519,6 +527,6 @@ void Init_api(){
  
    /* Constants */
    
-   /* 1.0.0: The version of this library, returned as a String */
+   /* 1.1.0: The version of this library, returned as a String */
    rb_define_const(cAPI, "VERSION", rb_str_new2(WINDOWS_API_VERSION));
 }

data/test/tc_win32_api.rb

@@ -16,7 +16,7 @@ class TC_Win32_API < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal('1.0.4', API::VERSION)
+      assert_equal('1.0.5', API::VERSION)
    end
  
    def test_call

metadata

@@ -1,33 +1,29 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: win32-api
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
-date: 2007-10-29 00:00:00 -07:00
-summary: A superior replacement for Win32API
-require_paths: 
-- lib
-email: djberg96@gmail.com
-homepage: http://www.rubyforge.org/projects/win32utils
-rubyforge_project: win32utils
-description: A superior replacement for Win32API
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.8.0
-  version: 
+  version: 1.0.5
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Daniel J. Berger
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2007-11-20 00:00:00 -07:00
+default_executable: 
+dependencies: []
+
+description: A superior replacement for Win32API
+email: djberg96@gmail.com
+executables: []
+
+extensions: 
+- ext/extconf.rb
+extra_rdoc_files: 
+- README
+- CHANGES
+- MANIFEST
+- ext/win32/api.c
 files: 
 - ext/extconf.rb
 - ext/win32
@@ -37,21 +33,32 @@ files:
 - README
 - CHANGES
 - MANIFEST
-test_files: 
-- test/tc_win32_api.rb
-- test/tc_win32_api_callback.rb
+has_rdoc: true
+homepage: http://www.rubyforge.org/projects/win32utils
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: 
-- README
-- CHANGES
-- MANIFEST
-- ext/win32/api.c
-executables: []
-
-extensions: 
-- ext/extconf.rb
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: 1.8.0
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
-
+rubyforge_project: win32utils
+rubygems_version: 0.9.5
+signing_key: 
+specification_version: 2
+summary: A superior replacement for Win32API
+test_files: 
+- test/tc_win32_api.rb
+- test/tc_win32_api_callback.rb