nobu	2016-06-26 19:35:53 +0900 (Sun, 26 Jun 2016)

  New Revision: 55508

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

  Log:
    Convert arguments first
    
    * ext/win32/lib/Win32API.rb (Win32API#initialize): convert
      arguments before dlopen.

  Modified files:
    trunk/ext/win32/lib/Win32API.rb
Index: ext/win32/lib/Win32API.rb
===================================================================
--- ext/win32/lib/Win32API.rb	(revision 55507)
+++ ext/win32/lib/Win32API.rb	(revision 55508)
@@ -1,5 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ext/win32/lib/Win32API.rb#L1
-# frozen_string_literal: false
 # -*- ruby -*-
+# frozen_string_literal: true
+
 # for backward compatibility
 warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')}: Win32API is deprecated after Ruby 1.9.1; use fiddle directly instead" if $VERBOSE
 
@@ -10,8 +11,15 @@ class Win32API https://github.com/ruby/ruby/blob/trunk/ext/win32/lib/Win32API.rb#L11
   TYPEMAP = {"0" => Fiddle::TYPE_VOID, "S" => Fiddle::TYPE_VOIDP, "I" => Fiddle::TYPE_LONG}
   POINTER_TYPE = Fiddle::SIZEOF_VOIDP == Fiddle::SIZEOF_LONG_LONG ? 'q*' : 'l!*'
 
+  WIN32_TYPES = "VPpNnLlIi"
+  DL_TYPES = "0SSI"
+
   def initialize(dllname, func, import, export = "0", calltype = :stdcall)
-    @proto = [import].join.tr("VPpNnLlIi", "0SSI").sub(/^(.)0*$/, '\1')
+    @proto = [import].join.tr(WIN32_TYPES, DL_TYPES).sub(/^(.)0*$/, '\1')
+    import = @proto.chars.map {|win_type| TYPEMAP[win_type.tr(WIN32_TYPES, DL_TYPES)]}
+    export = TYPEMAP[export.tr(WIN32_TYPES, DL_TYPES)]
+    calltype = Fiddle::Importer.const_get(:CALL_TYPE_TO_ABI)[calltype]
+
     handle = DLL[dllname] ||=
              begin
                Fiddle.dlopen(dllname)
@@ -20,12 +28,7 @@ class Win32API https://github.com/ruby/ruby/blob/trunk/ext/win32/lib/Win32API.rb#L28
                Fiddle.dlopen(dllname + ".dll")
              end
 
-    @func = Fiddle::Function.new(
-      handle[func],
-      @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]
-    )
+    @func = Fiddle::Function.new(handle[func], import, export, calltype)
   rescue Fiddle::DLError => e
     raise LoadError, e.message, e.backtrace
   end

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