merge revision(s) 49750: [Backport #10876]

	* 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]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49761 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 33 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index f212c33059..65a0dc4db4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Feb 26 15:48:41 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* 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 15:36:26 2015  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* tool/merger.rb: support 2.1+ versioning scheme.
diff --git a/ext/win32/lib/Win32API.rb b/ext/win32/lib/Win32API.rb
index 7cabd9f84a..71f1d30e01 100644
--- a/ext/win32/lib/Win32API.rb
+++ b/ext/win32/lib/Win32API.rb
@@ -15,7 +15,7 @@ class Win32API
 
     @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]
     )
diff --git a/test/test_win32api.rb b/test/test_win32api.rb
new file mode 100644
index 0000000000..b1856a3364
--- /dev/null
+++ b/test/test_win32api.rb
@@ -0,0 +1,23 @@
+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)
diff --git a/version.h b/version.h
index 7695b05e47..85e62a4158 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.2.1"
-#define RUBY_RELEASE_DATE "2015-02-25"
-#define RUBY_PATCHLEVEL 84
+#define RUBY_RELEASE_DATE "2015-02-26"
+#define RUBY_PATCHLEVEL 85
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 25
+#define RUBY_RELEASE_DAY 26
 
 #include "ruby/version.h"