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
This commit is contained in:
naruse 2015-02-26 08:23:50 +00:00
parent 244260d60b
commit 35f8beefb6
4 changed files with 33 additions and 4 deletions

23
test/test_win32api.rb Normal file
View file

@ -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)