From 6b3661a5d7adc9a27cb9600210f1a0d06ce9cdf1 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sat, 7 Jun 2008 19:13:53 +0000 Subject: merge revision(s) 13951: * ext/win32ole/win32ole.c (ole_invoke): bug fix. [ruby-talk:279100] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@16945 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ ext/win32ole/win32ole.c | 4 ++-- version.h | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 68ddfe4527..998805d2b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Jun 8 04:12:50 2008 Masaki Suketa + + * ext/win32ole/win32ole.c (ole_invoke): bug fix. [ruby-talk:279100] + Sun Jun 8 03:54:52 2008 NAKAMURA Usaku * ext/curses/extconf.rb: check macro if cannot find func. diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index b022a8c674..4bb318cefd 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -78,7 +78,7 @@ #define WC2VSTR(x) ole_wc2vstr((x), TRUE) -#define WIN32OLE_VERSION "0.7.2" +#define WIN32OLE_VERSION "0.7.4" typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX) (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*); @@ -2102,7 +2102,7 @@ ole_invoke(argc, argv, self, wFlags) &result, &excepinfo, &argErr); 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 d12f64894a..76686e9990 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-08" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20080608 -#define RUBY_PATCHLEVEL 148 +#define RUBY_PATCHLEVEL 149 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3