win32-api 1.0.4-x86-mswin32-60 → 1.0.5-x86-mswin32-60

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/README

@@ -14,13 +14,26 @@
    
    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

data/ext/extconf.rb

@@ -0,0 +1,10 @@
+##########################################################################
+# extconf.rb
+# 
+# The Windows::API binary should be built using the Rake task, i.e.
+# 'rake build' or 'rake install'.
+##########################################################################
+require 'mkmf'
+
+have_func('strncpy_s')
+create_makefile('win32/api', 'win32')

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,21 +1,46 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4.6
-specification_version: 2
 name: win32-api
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
-date: 2007-10-26 00:00:00 -06: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
+  version: 1.0.5
+platform: x86-mswin32-60
+authors: 
+- Daniel J. Berger
 autorequire: 
-default_executable: 
 bindir: bin
+cert_chain: []
+
+date: 2008-01-01 00:00:00 -07:00
+default_executable: 
+dependencies: []
+
+description: A superior replacement for Win32API
+email: djberg96@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+- CHANGES
+- MANIFEST
+- ext/win32/api.c
+files: 
+- ext/extconf.rb
+- ext/win32
+- ext/win32/api.c
+- test/tc_win32_api.rb
+- test/tc_win32_api_callback.rb
+- lib/win32/api.so
+- README
+- CHANGES
+- MANIFEST
 has_rdoc: true
+homepage: http://www.rubyforge.org/projects/win32utils
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
@@ -28,41 +53,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version 
       version: "0"
   version: 
-platform: !ruby/object:Gem::Platform 
-  cpu: x86
-  os: mswin32
-  version: "60"
-signing_key: 
-cert_chain: []
+requirements: []
 
-post_install_message: 
-authors: 
-- Daniel J. Berger
-files: 
-- ext/win32
-- ext/win32/api.c
-- lib/win32
-- lib/win32/api.so
-- test/tc_win32_api.rb
-- test/tc_win32_api_callback.rb
-- README
-- CHANGES
-- MANIFEST
+rubyforge_project: win32utils
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: A superior replacement for Win32API
 test_files: 
 - test/tc_win32_api.rb
 - test/tc_win32_api_callback.rb
-rdoc_options: []
-
-extra_rdoc_files: 
-- README
-- CHANGES
-- MANIFEST
-- ext/win32/api.c
-executables: []
-
-extensions: []
-
-requirements: []
-
-dependencies: []
-