diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-04 09:20:47 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-04 09:20:47 +0000 |
| commit | 63bec266391d5849dfaeb9cf1a32d5077ef22dfa (patch) | |
| tree | 3046f0a46997659af316f21e648ba8186a8c0ce8 | |
| parent | 1947a88167eb1691fabe89d7adf29003af374a84 (diff) | |
merges r22695 from trunk into ruby_1_9_1.
--
* ext/dl/win32/lib/Win32API.rb (initialize): passes rest
arguments to DL.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@22757 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/dl/win32/lib/Win32API.rb | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Mar 1 19:52:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/dl/win32/lib/Win32API.rb (initialize): passes res + arguments to DL. + Sun Mar 1 19:36:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * util.c (ruby_dtoa): allocates one more byte to get rid of buffer diff --git a/ext/dl/win32/lib/Win32API.rb b/ext/dl/win32/lib/Win32API.rb index b642e0c8fe..06a8fdc786 100644 --- a/ext/dl/win32/lib/Win32API.rb +++ b/ext/dl/win32/lib/Win32API.rb @@ -8,10 +8,10 @@ class Win32API DLL = {} TYPEMAP = {"0" => DL::TYPE_VOID, "S" => DL::TYPE_VOIDP, "I" => DL::TYPE_LONG} - def initialize(dllname, func, import, export = "0") + def initialize(dllname, func, import, export = "0", *rest) @proto = [import].join.tr("VPpNnLlIi", "0SSI").sub(/^(.)0*$/, '\1') handle = DLL[dllname] ||= DL.dlopen(dllname) - @func = DL::CFunc.new(handle[func], TYPEMAP[export.tr("VPpNnLlIi", "0SSI")], func) + @func = DL::CFunc.new(handle[func], TYPEMAP[export.tr("VPpNnLlIi", "0SSI")], func, *rest) end def call(*args) |