From 24dcd39f193332e85485fabec0b9e730957b0aca Mon Sep 17 00:00:00 2001 From: suke Date: Sat, 17 Nov 2007 15:04:55 +0000 Subject: [PATCH] ext/win32ole/win32ole.c (ole_invoke): bug fix. [ruby-talk:279100] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13952 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ ext/win32ole/win32ole.c | 4 ++-- version.h | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5d722bd9fd..8fa29417ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat Nov 17 23:51:29 2007 Masaki Suketa + + * ext/win32ole/win32ole.c (ole_invoke): bug fix. [ruby-talk:279100] + Fri Nov 16 23:31:18 2007 Yukihiro Matsumoto * bignum.c (rb_big_odd_p): new method added. a patch from Tadashi diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index a9750753dd..8612d5a244 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -116,7 +116,7 @@ #define WC2VSTR(x) ole_wc2vstr((x), TRUE) -#define WIN32OLE_VERSION "1.1.1" +#define WIN32OLE_VERSION "1.1.2" typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX) (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*); @@ -3021,7 +3021,7 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket) if (FAILED(hr)) { /* retry to call args by value */ - if(op.dp.cArgs > cNamedArgs) { + if(op.dp.cArgs >= cNamedArgs) { for(i = cNamedArgs; i < op.dp.cArgs; i++) { n = op.dp.cArgs - i + cNamedArgs - 1; param = rb_ary_entry(paramS, i-cNamedArgs); diff --git a/version.h b/version.h index 6b99613005..cd7edafa23 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-11-16" +#define RUBY_RELEASE_DATE "2007-11-17" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20071116 +#define RUBY_RELEASE_CODE 20071117 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 16 +#define RUBY_RELEASE_DAY 17 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[];