archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 10:03:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

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

Browse source 
* 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
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> Wed Feb 25 15:36:26 2015 NARUSE, Yui <naruse@ruby-lang.org>
* tool/merger.rb: support 2.1+ versioning scheme. * tool/merger.rb: support 2.1+ versioning scheme.

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)

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.2.1" #define RUBY_VERSION "2.2.1"
#define RUBY_RELEASE_DATE "2015-02-25" #define RUBY_RELEASE_DATE "2015-02-26"
#define RUBY_PATCHLEVEL 84 #define RUBY_PATCHLEVEL 85
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 2 #define RUBY_RELEASE_MONTH 2
#define RUBY_RELEASE_DAY 25 #define RUBY_RELEASE_DAY 26
#include "ruby/version.h" #include "ruby/version.h"