diff options
author | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-19 00:29:31 +0000 |
---|---|---|
committer | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-19 00:29:31 +0000 |
commit | 1b8aac32698f2148fdf7b4ee45b33749e4fafc25 (patch) | |
tree | c133b101d4078efd3d3dfad75bfc3862089d95c0 /ext | |
parent | 8d37cefaf8795fe80d457f101fb9678fc7f6adf6 (diff) | |
download | ruby-1b8aac32698f2148fdf7b4ee45b33749e4fafc25.tar.gz |
* ext/win32ole/win32ole.c (ole_set_safe_array): should not use
recursive calling.
* test/win32ole/test_win32ole_variant.rb: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15121 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/win32ole/win32ole.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 0c77d0404b..4761e92f9b 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -115,7 +115,7 @@ #define WC2VSTR(x) ole_wc2vstr((x), TRUE) -#define WIN32OLE_VERSION "1.1.2" +#define WIN32OLE_VERSION "1.1.3" typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX) (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*); @@ -1074,29 +1074,28 @@ ole_set_safe_array(long n, SAFEARRAY *psa, long *pid, long *pub, VALUE val, long HRESULT hr = S_OK; VARIANT var; VOID *p = NULL; - VariantInit(&var); - if(n < 0) return; - if(n == dim - 1) { + long i = n; + while(i >= 0) { val1 = ole_ary_m_entry(val, pid); + VariantInit(&var); p = val2variant_ptr(val1, &var, vt); if (is_all_index_under(pid, pub, dim) == Qtrue) { - if ((V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == NULL) || - (V_VT(&var) == VT_UNKNOWN && V_UNKNOWN(&var) == NULL)) { - rb_raise(eWIN32OLERuntimeError, "argument does not have IDispatch or IUnknown Interface"); + if ((V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == NULL) || + (V_VT(&var) == VT_UNKNOWN && V_UNKNOWN(&var) == NULL)) { + rb_raise(eWIN32OLERuntimeError, "element of array does not have IDispatch or IUnknown Interface"); } hr = SafeArrayPutElement(psa, pid, p); } if (FAILED(hr)) { ole_raise(hr, rb_eRuntimeError, "failed to SafeArrayPutElement"); } - } - pid[n] += 1; - if (pid[n] <= pub[n]) { - ole_set_safe_array(dim-1, psa, pid, pub, val, dim, vt); - } - else { - pid[n] = 0; - ole_set_safe_array(n-1, psa, pid, pub, val, dim, vt); + pid[i] += 1; + if (pid[i] > pub[i]) { + pid[i] = 0; + i -= 1; + } else { + i = dim - 1; + } } } |