kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/win32/Win32API.rb (initialize): accept both a string and an array

Browse source 
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
This commit is contained in:
usa 2015-02-25 13:08:01 +00:00
parent 25edb07cb3
commit dad59fcd12
3 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Wed Feb 25 22:04:04 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 18:12:11 2015 Eric Wong <e@80x24.org> Wed Feb 25 18:12:11 2015 Eric Wong <e@80x24.org>
* signal.c (sighandler): preserve errno * signal.c (sighandler): preserve errno

2
ext/win32/lib/Win32API.rb
View file

@ -15,7 +15,7 @@ class Win32API
@func = Fiddle::Function.new( @func = Fiddle::Function.new(
handle[func], 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")], TYPEMAP[export.tr("VPpNnLlIi", "0SSI")],
Fiddle::Importer.const_get(:CALL_TYPE_TO_ABI)[calltype] Fiddle::Importer.const_get(:CALL_TYPE_TO_ABI)[calltype]
) )

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)