diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-25 13:08:01 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-25 13:08:01 +0000 |
| commit | dad59fcd12229edc05d8655f7895b8957c5dd114 (patch) | |
| tree | 71c3e62d204f7298cc77f3695bdbaa9fde15dee2 | |
| parent | 25edb07cb3155b7c614b6000663ae96f90dc10fb (diff) | |
* 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/trunk@49750 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/win32/lib/Win32API.rb | 2 | ||||
| -rw-r--r-- | test/test_win32api.rb | 23 |
3 files changed, 30 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Wed Feb 25 22:04:04 2015 NAKAMURA Usaku <[email protected]> + + * 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 <[email protected]> * signal.c (sighandler): preserve errno 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) |