From 70b504badbf9a0852fe73af26bbd602619286fc7 Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 9 Feb 2012 02:32:58 +0000 Subject: * ext/dl/lib/types.rb: Win64 support. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34504 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ ext/dl/lib/dl/types.rb | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b34735bf2f..e288d05b9e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Feb 9 11:32:36 2012 NAKAMURA Usaku + + * ext/dl/lib/types.rb: Win64 support. + Thu Feb 9 04:12:29 2012 NARUSE, Yui * test/pathname/test_pathname.rb: not read but binread. diff --git a/ext/dl/lib/dl/types.rb b/ext/dl/lib/dl/types.rb index c79f74f95c..3dfa40807a 100644 --- a/ext/dl/lib/dl/types.rb +++ b/ext/dl/lib/dl/types.rb @@ -7,6 +7,8 @@ module DL # * BOOL # * BYTE # * DWORD + # * DWORD32 + # * DWORD64 # * HANDLE # * HDC # * HINSTANCE @@ -27,6 +29,8 @@ module DL m.module_eval{ typealias "DWORD", "unsigned long" typealias "PDWORD", "unsigned long *" + typealias "DWORD32", "unsigned long" + typealias "DWORD64", "unsigned long long" typealias "WORD", "unsigned short" typealias "PWORD", "unsigned short *" typealias "BOOL", "int" @@ -36,7 +40,11 @@ module DL typealias "UINT", "unsigned int" typealias "ULONG", "unsigned long" typealias "UCHAR", "unsigned char" - typealias "HANDLE", "unsigned long" + if [nil].pack('p').bytesize == 8 + typealias "HANDLE", "unsigned long long" + else + typealias "HANDLE", "unsigned long" + end typealias "PHANDLE", "void*" typealias "PVOID", "void*" typealias "LPCSTR", "char*" -- cgit v1.2.3