From de71551fbd5c69dba3dada0f4c07ebf6445e93b3 Mon Sep 17 00:00:00 2001 From: suke Date: Tue, 19 Oct 2004 11:40:33 +0000 Subject: * ext/win32ole.c(ole_invoke): retrieve the result value when retrying the IDispatch::invoke. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7072 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/win32ole/win32ole.c | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 53c2343f1..a66538c54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Oct 19 20:41:37 2004 Masaki Suketa + + * ext/win32ole.c(ole_invoke): retrieve the result value when + retrying the IDispatch::invoke. + Tue Oct 19 17:24:11 2004 Yukihiro Matsumoto * io.c (read_all): block string buffer modification during diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index f1b0a6c76..31f4ceb05 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.5.8" +#define WIN32OLE_VERSION "0.5.9" typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX) (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*); @@ -1976,9 +1976,10 @@ ole_invoke(argc, argv, self, wFlags) ole_val2variant(param, &op.dp.rgvarg[n]); } memset(&excepinfo, 0, sizeof(EXCEPINFO)); + VariantInit(&result); hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID, &IID_NULL, lcid, wFlags, - &op.dp, NULL, + &op.dp, &result, &excepinfo, &argErr); for(i = cNamedArgs; i < op.dp.cArgs; i++) { n = op.dp.cArgs - i + cNamedArgs - 1; @@ -1991,9 +1992,10 @@ ole_invoke(argc, argv, self, wFlags) * functions whose DISPID > 0x8000 */ if (hr == DISP_E_EXCEPTION && DispID > 0x8000) { memset(&excepinfo, 0, sizeof(EXCEPINFO)); + VariantInit(&result); hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID, &IID_NULL, lcid, wFlags, - &op.dp, NULL, + &op.dp, &result, &excepinfo, &argErr); } -- cgit