diff options
| author | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-19 11:40:33 +0000 |
|---|---|---|
| committer | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-19 11:40:33 +0000 |
| commit | cfa37a9deff6c37aacce90c658f2c2be8512cfa0 (patch) | |
| tree | 897c84f3aa489947c17e046f2d046e79244d4723 /ext/win32ole | |
| parent | 860bdc3b61dbcacecd4a2fb2c40cf222e91b8fd5 (diff) | |
* ext/win32ole.c(ole_invoke): retrieve the result value when
retrying the IDispatch::invoke.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7072 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/win32ole')
| -rw-r--r-- | ext/win32ole/win32ole.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index f1b0a6c766..31f4ceb050 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); } |