ruby-changes:5445
From: shyouhei <ko1@a...>
Date: Sun, 8 Jun 2008 04:15:10 +0900 (JST)
Subject: [ruby-changes:5445] Ruby:r16947 (ruby_1_8_6): merge revision(s) 13951:
shyouhei 2008-06-08 04:14:49 +0900 (Sun, 08 Jun 2008) New Revision: 16947 Modified files: branches/ruby_1_8_6/ChangeLog branches/ruby_1_8_6/ext/win32ole/win32ole.c branches/ruby_1_8_6/version.h Log: merge revision(s) 13951: * ext/win32ole/win32ole.c (ole_invoke): bug fix. [ruby-talk:279100] http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=16947&r2=16946&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=16947&r2=16946&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ext/win32ole/win32ole.c?r1=16947&r2=16946&diff_format=u Index: ruby_1_8_6/ext/win32ole/win32ole.c =================================================================== --- ruby_1_8_6/ext/win32ole/win32ole.c (revision 16946) +++ ruby_1_8_6/ext/win32ole/win32ole.c (revision 16947) @@ -79,7 +79,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*); @@ -2103,7 +2103,7 @@ &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); Index: ruby_1_8_6/ChangeLog =================================================================== --- ruby_1_8_6/ChangeLog (revision 16946) +++ ruby_1_8_6/ChangeLog (revision 16947) @@ -1,3 +1,7 @@ +Sun Jun 8 04:14:16 2008 Masaki Suketa <masaki.suketa@n...> + + * ext/win32ole/win32ole.c (ole_invoke): bug fix. [ruby-talk:279100] + Sun Jun 8 03:59:31 2008 NAKAMURA Usaku <usa@r...> * ext/curses/extconf.rb: check macro if cannot find func. Index: ruby_1_8_6/version.h =================================================================== --- ruby_1_8_6/version.h (revision 16946) +++ ruby_1_8_6/version.h (revision 16947) @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-08" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080608 -#define RUBY_PATCHLEVEL 147 +#define RUBY_PATCHLEVEL 148 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/