usa	2015-02-25 22:08:01 +0900 (Wed, 25 Feb 2015)

  New Revision: 49750

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49750

  Log:
    * ext/win32/Win32API.rb (initialize): accept both a string and an array
      for the arguments of the imported function.
      reported by Aaron Stone [ruby-core:68208] [Bug #10876] [Fixes GH-835]

  Added files:
    trunk/test/test_win32api.rb
  Modified files:
    trunk/ChangeLog
    trunk/ext/win32/lib/Win32API.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 49749)
+++ ChangeLog	(revision 49750)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Feb 25 22:04:04 2015  NAKAMURA Usaku  <usa@r...>
+
+	* ext/win32/Win32API.rb (initialize): accept both a string and an array
+	  for the arguments of the imported function.
+	  reported by Aaron Stone [ruby-core:68208] [Bug #10876] [Fixes GH-835]
+
 Wed Feb 25 18:12:11 2015  Eric Wong  <e@8...>
 
 	* signal.c (sighandler): preserve errno
Index: ext/win32/lib/Win32API.rb
===================================================================
--- ext/win32/lib/Win32API.rb	(revision 49749)
+++ ext/win32/lib/Win32API.rb	(revision 49750)
@@ -15,7 +15,7 @@ class Win32API https://github.com/ruby/ruby/blob/trunk/ext/win32/lib/Win32API.rb#L15
 
     @func = Fiddle::Function.new(
       handle[func],
-      import.chars.map { |win_type| TYPEMAP[win_type.tr("VPpNnLlIi", "0SSI")] },
+      @proto.chars.map { |win_type| TYPEMAP[win_type.tr("VPpNnLlIi", "0SSI")] },
       TYPEMAP[export.tr("VPpNnLlIi", "0SSI")],
       Fiddle::Importer.const_get(:CALL_TYPE_TO_ABI)[calltype]
     )
Index: test/test_win32api.rb
===================================================================
--- test/test_win32api.rb	(revision 0)
+++ test/test_win32api.rb	(revision 49750)
@@ -0,0 +1,23 @@ https://github.com/ruby/ruby/blob/trunk/test/test_win32api.rb#L1
+require "test/unit"
+begin
+  require "Win32API"
+rescue LoadError
+end
+
+class TestWin32API < Test::Unit::TestCase
+  def test_params_string
+    m2w = Win32API.new("kernel32", "MultiByteToWideChar", "ilpipi", "i")
+    str = "utf-8 string".encode("utf-8")
+    buf = "\0" * (str.size * 2)
+    assert_equal str.size, m2w.call(65001, 0, str, str.bytesize, buf, str.size)
+    assert_equal str.encode("utf-16le"), buf.force_encoding("utf-16le")
+  end
+
+  def test_params_array
+    m2w = Win32API.new("kernel32", "MultiByteToWideChar", ["i", "l", "p", "i", "p", "i"], "i")
+    str = "utf-8 string".encode("utf-8")
+    buf = "\0" * (str.size * 2)
+    assert_equal str.size, m2w.call(65001, 0, str, str.bytesize, buf, str.size)
+    assert_equal str.encode("utf-16le"), buf.force_encoding("utf-16le")
+  end
+end if defined?(Win32API)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/