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

* ext/dl/win32/lib/Win32API.rb (Win32API#call): use 64bit pointer for x64

Browse source 
Windows. This would fix
  TestSecureRandom#test_s_random_bytes_without_openssl error.
  [ruby-core:47451] [Bug #6990]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37476 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shirosaki 2012-11-05 14:00:41 +00:00
parent 868ab650eb
commit 9bb55f7633
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Mon Nov 5 22:45:03 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
* ext/dl/win32/lib/Win32API.rb (Win32API#call): use 64bit pointer for x64
Windows. This would fix
TestSecureRandom#test_s_random_bytes_without_openssl error.
[ruby-core:47451] [Bug #6990]
Mon Nov 5 22:09:26 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com> Mon Nov 5 22:09:26 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
* cygwin/GNUmakefile.in (uncommon.mk): link *.res.o. * cygwin/GNUmakefile.in (uncommon.mk): link *.res.o.

3
ext/dl/win32/lib/Win32API.rb
View file

@ -7,6 +7,7 @@ require 'dl'
class Win32API class Win32API
DLL = {} DLL = {}
TYPEMAP = {"0" => DL::TYPE_VOID, "S" => DL::TYPE_VOIDP, "I" => DL::TYPE_LONG} TYPEMAP = {"0" => DL::TYPE_VOID, "S" => DL::TYPE_VOIDP, "I" => DL::TYPE_LONG}
POINTER_TYPE = DL::SIZEOF_VOIDP == DL::SIZEOF_LONG_LONG ? 'q*' : 'l!*'
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("VPpNnLlIi", "0SSI").sub(/^(.)0*$/, '\1')
@ -19,7 +20,7 @@ class Win32API
def call(*args) def call(*args)
import = @proto.split("") import = @proto.split("")
args.each_with_index do |x, i| args.each_with_index do |x, i|
args[i], = [x == 0 ? nil : x].pack("p").unpack("l!*") if import[i] == "S" args[i], = [x == 0 ? nil : x].pack("p").unpack(POINTER_TYPE) if import[i] == "S"
args[i], = [x].pack("I").unpack("i") if import[i] == "I" args[i], = [x].pack("I").unpack("i") if import[i] == "I"
end end
ret, = @func.call(args) ret, = @func.call(args)