naruse	2015-02-26 17:23:50 +0900 (Thu, 26 Feb 2015)

  New Revision: 49761

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49761

  Log:
    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]

  Added files:
    branches/ruby_2_2/test/test_win32api.rb
  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/ext/win32/lib/Win32API.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 49760)
+++ ruby_2_2/ChangeLog	(revision 49761)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Thu Feb 26 15:48:41 2015  NAKAMURA Usaku  <usa@r...>
+
+	* 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@r...>
 
 	* tool/merger.rb: support 2.1+ versioning scheme.
Index: ruby_2_2/ext/win32/lib/Win32API.rb
===================================================================
--- ruby_2_2/ext/win32/lib/Win32API.rb	(revision 49760)
+++ ruby_2_2/ext/win32/lib/Win32API.rb	(revision 49761)
@@ -15,7 +15,7 @@ class Win32API https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/win32/lib/Win32API.rb#L15
 
     @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]
     )
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49760)
+++ ruby_2_2/version.h	(revision 49761)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #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"
 
Index: ruby_2_2/test/test_win32api.rb
===================================================================
--- ruby_2_2/test/test_win32api.rb	(revision 0)
+++ ruby_2_2/test/test_win32api.rb	(revision 49761)
@@ -0,0 +1,23 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/test_win32api.rb#L1
+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)

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49750


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/