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

data/CHANGES

@@ -1,3 +1,13 @@
+= 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
+  going to be ASCII.
+* Cleaned up some -W3 warnings.
+* Added the build_manifest task to the Rakefile, which is automatically run if
+  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
 * 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).

data/ext/win32/api.c

@@ -2,7 +2,7 @@
 #include <windows.h>
 
 #define MAX_BUF 1024
-#define WINDOWS_API_VERSION "1.0.5"
+#define WINDOWS_API_VERSION "1.0.6"
 
 #define _T_VOID     0
 #define _T_LONG     1
@@ -71,7 +71,7 @@ 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);
+   rb_scan_args(argc, argv, "11&", &v_proto, &v_return, &v_proc);
    
    /* Validate prototype characters */
    for(i = 0; i < RSTRING(v_proto)->len; i++){
@@ -87,14 +87,9 @@ static VALUE callback_init(int argc, VALUE* argv, VALUE self)
    if(NIL_P(v_return) || RARRAY(v_return)->len == 0)
       v_return = rb_str_new2("L");
 
-   if(rb_block_given_p())
-      v_proc = rb_block_proc();
-   else
-      v_proc = Qnil;
-
-    rb_iv_set(self, "@function", v_proc);
-    rb_iv_set(self, "@prototype", v_proto);
-    rb_iv_set(self, "@return_type", v_return);
+   rb_iv_set(self, "@function", v_proc);
+   rb_iv_set(self, "@prototype", v_proto);
+   rb_iv_set(self, "@return_type", v_return);
     
     return self;
 }
@@ -148,7 +143,7 @@ static VALUE api_init(int argc, VALUE* argv, VALUE self)
    int i;
    char* first  = "A";
    char* second = "W";
-   VALUE v_proc, v_proto, v_return, v_dll, v_bool, v_name;
+   VALUE v_proc, v_proto, v_return, v_dll;
    
    rb_scan_args(argc, argv, "13", &v_proc, &v_proto, &v_return, &v_dll);
    
@@ -198,7 +193,7 @@ static VALUE api_init(int argc, VALUE* argv, VALUE self)
    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")){
+   if(!strcmp(rb_get_kcode(), "UTF8")){
       first  = "W";
       second = "A";
    }
@@ -223,8 +218,17 @@ static VALUE api_init(int argc, VALUE* argv, VALUE self)
                StringError(GetLastError())
             );
          }
+         else{
+            rb_iv_set(self, "@effective_function_name", v_unicode);
+         }
+      }
+      else{
+         rb_iv_set(self, "@effective_function_name", v_ascii);
       }
    }
+   else{
+      rb_iv_set(self, "@effective_function_name", v_proc);
+   }
 
    ptr->function = fProc;
 
@@ -508,9 +512,15 @@ void Init_api(){
    /* The name of the DLL that exports the API function */
    rb_define_attr(cAPI, "dll_name", 1, 0);
    
-   /* The name of the function */
+   /* The name of the function passed to the constructor */
    rb_define_attr(cAPI, "function_name", 1, 0);
    
+   /* The name of the actual function that is returned by the constructor.
+    * For example, if you passed 'GetUserName' to the constructor, then the
+    * effective function name would be either 'GetUserNameA' or 'GetUserNameW'.
+    */
+   rb_define_attr(cAPI, "effective_function_name", 1, 0);
+   
    /* The prototype, returned as an array of characters */
    rb_define_attr(cAPI, "prototype", 1, 0);
    

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.5', API::VERSION)
+      assert_equal('1.0.6', API::VERSION)
    end
  
    def test_call
@@ -40,6 +40,11 @@ class TC_Win32_API < Test::Unit::TestCase
       assert_equal('GetCurrentDirectory', @api.function_name)
    end
    
+   def test_effective_function_name
+      assert_respond_to(@api, :effective_function_name)
+      assert_equal('GetCurrentDirectoryA', @api.effective_function_name)
+   end
+   
    def test_prototype
       assert_respond_to(@api, :prototype)
       assert_equal(['L', 'P'], @api.prototype)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: win32-api
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  version: 1.0.6
 platform: x86-mswin32-60
 authors: 
 - Daniel J. Berger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-01 00:00:00 -07:00
+date: 2008-04-18 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -25,15 +25,14 @@ extra_rdoc_files:
 - MANIFEST
 - ext/win32/api.c
 files: 
-- ext/extconf.rb
-- ext/win32
-- ext/win32/api.c
+- lib/win32
+- lib/win32/api.so
 - test/tc_win32_api.rb
 - test/tc_win32_api_callback.rb
-- lib/win32/api.so
 - README
 - CHANGES
 - MANIFEST
+- ext/win32/api.c
 has_rdoc: true
 homepage: http://www.rubyforge.org/projects/win32utils
 post_install_message: 
@@ -56,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: win32utils
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: A superior replacement for Win32API

data/ext/extconf.rb

@@ -1,10 +0,0 @@
-##########################################################################
-# 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')