diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-26 10:35:53 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-26 10:35:53 +0000 |
| commit | 06c57968707ba5a09e6347237fd289673269247b () | |
| tree | da326863a9b7116c0f7f1566100288cd283476ab | |
| parent | 1f2359000c429669f2ba1afc0ffd3186370181ef (diff) | |
Convert arguments first
* ext/win32/lib/Win32API.rb (Win32API#initialize): convert arguments before dlopen. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55508 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ext/win32/lib/Win32API.rb | 19 |
1 files changed, 11 insertions, 8 deletions
@@ -1,5 +1,6 @@ -# frozen_string_literal: false # -*- ruby -*- # 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 TYPEMAP = {"0" => Fiddle::TYPE_VOID, "S" => Fiddle::TYPE_VOIDP, "I" => Fiddle::TYPE_LONG} POINTER_TYPE = Fiddle::SIZEOF_VOIDP == Fiddle::SIZEOF_LONG_LONG ? 'q*' : 'l!*' def initialize(dllname, func, import, export = "0", calltype = :stdcall) - @proto = [import].join.tr("VPpNnLlIi", "0SSI").sub(/^(.)0*$/, '\1') handle = DLL[dllname] ||= begin Fiddle.dlopen(dllname) @@ -20,12 +28,7 @@ class Win32API 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] - ) rescue Fiddle::DLError => e raise LoadError, e.message, e.backtrace end |