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

Convert arguments first

Browse source 
* 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
This commit is contained in:
nobu 2016-06-26 10:35:53 +00:00
parent 1f2359000c
commit 06c5796870
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,6 @@
# frozen_string_literal: false
# -*- ruby -*- # -*- ruby -*-
# frozen_string_literal: true
# for backward compatibility # for backward compatibility
warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')}: Win32API is deprecated after Ruby 1.9.1; use fiddle directly instead" if $VERBOSE 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} TYPEMAP = {"0" => Fiddle::TYPE_VOID, "S" => Fiddle::TYPE_VOIDP, "I" => Fiddle::TYPE_LONG}
POINTER_TYPE = Fiddle::SIZEOF_VOIDP == Fiddle::SIZEOF_LONG_LONG ? 'q*' : 'l!*' 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) 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] ||= handle = DLL[dllname] ||=
begin begin
Fiddle.dlopen(dllname) Fiddle.dlopen(dllname)
@ -20,12 +28,7 @@ class Win32API
Fiddle.dlopen(dllname + ".dll") Fiddle.dlopen(dllname + ".dll")
end end
@func = Fiddle::Function.new( @func = Fiddle::Function.new(handle[func], import, export, calltype)
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 rescue Fiddle::DLError => e
raise LoadError, e.message, e.backtrace raise LoadError, e.message, e.backtrace
end end