diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/win32ole/test_win32ole_method.rb | 22 |
2 files changed, 9 insertions, 19 deletions
@@ -1,3 +1,9 @@ +Mon Jun 28 20:32:33 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp> + + * test/win32ole/test_win32ole_method.rb (test_offset_vtbl): check + that Ruby is 32bit or 64bit binary in order to get correct offset + value. [ruby-dev:41741] + Mon Jun 28 05:32:51 2010 Yusuke Endoh <mame@tsg.ne.jp> * lib/rdoc/ri/driver.rb (RDoc::RI::Driver#formatter): should use bs diff --git a/test/win32ole/test_win32ole_method.rb b/test/win32ole/test_win32ole_method.rb index 2be93ab070..87d7a81267 100644 --- a/test/win32ole/test_win32ole_method.rb +++ b/test/win32ole/test_win32ole_method.rb @@ -108,28 +108,12 @@ if defined?(WIN32OLE_METHOD) assert_equal(1610743810, @m_namespace.dispid) end - def is_win64? - if /win64$/ =~ RUBY_PLATFORM - return true - end - require 'Win32API' - get_current_process = Win32API.new('kernel32', 'GetCurrentProcess', nil, 'i') - handle = get_current_process.call - is_wow64 = false - begin - is_wow64_process = Win32API.new('Kernel32', 'IsWow64Process', ['i', 'p'], 'i') - bool = "\0\0\0\0" - if is_wow64_process.call(handle, bool) != 0 - is_wow64 = bool != "\0\0\0\0" - end - rescue RuntimeError - # no IsWow64Process - end - is_wow64 + def is_ruby64? + /win64/ =~ RUBY_PLATFORM end def test_offset_vtbl - exp = is_win64? ? 48 : 24 + exp = is_ruby64? ? 48 : 24 assert_equal(exp, @m_invoke.offset_vtbl) end |