summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroshi SHIBATA <hsbt@ruby-lang.org>2020-11-10 13:56:13 +0900
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2020-11-11 09:27:36 +0900
commitff67aac193eed4e5ea0a6801d0903ddc35f21be0 (patch)
tree1f2680b35dd004c5dcab46f4e18e422b89f125cf
parent6ddde162345dca54ae6621a6a2c1616f112c8ccd (diff)
Removed win32api
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/3712
-rw-r--r--ext/win32/lib/Win32API.rb47
-rw-r--r--test/test_extlibs.rb1
-rw-r--r--test/test_win32api.rb27
3 files changed, 0 insertions, 75 deletions
diff --git a/ext/win32/lib/Win32API.rb b/ext/win32/lib/Win32API.rb
deleted file mode 100644
index 97b29fbf74..0000000000
--- a/ext/win32/lib/Win32API.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- ruby -*-
-# frozen_string_literal: true
-
-# for backward compatibility
-warn "Win32API is deprecated after Ruby 1.9.1; use fiddle directly instead", uplevel: 2
-
-require 'fiddle/import'
-
-class Win32API
- DLL = {}
- 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(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)
- rescue Fiddle::DLError
- raise unless File.extname(dllname).empty?
- Fiddle.dlopen(dllname + ".dll")
- end
-
- @func = Fiddle::Function.new(handle[func], import, export, calltype)
- rescue Fiddle::DLError => e
- raise LoadError, e.message, e.backtrace
- end
-
- def call(*args)
- import = @proto.split("")
- args.each_with_index do |x, i|
- 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"
- end
- ret, = @func.call(*args)
- return ret || 0
- end
-
- alias Call call
-end
diff --git a/test/test_extlibs.rb b/test/test_extlibs.rb
index 1d11dbe2e0..958c9ff73e 100644
--- a/test/test_extlibs.rb
+++ b/test/test_extlibs.rb
@@ -76,7 +76,6 @@ class TestExtLibs < Test::Unit::TestCase
check_existence "strscan"
check_existence "syslog"
check_existence "thread"
- check_existence "Win32API"
check_existence "win32ole"
check_existence "zlib", "this may be false positive, but should assert because rubygems requires this"
end
diff --git a/test/test_win32api.rb b/test/test_win32api.rb
deleted file mode 100644
index f135964a27..0000000000
--- a/test/test_win32api.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# frozen_string_literal: false
-require "test/unit"
-begin
- $VERBOSE, verbose = nil, $VERBOSE
- require "Win32API"
-rescue LoadError
-ensure
- $VERBOSE = verbose
-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)