1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ole_invoke: retry when calling by reference is fail.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2707 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
suke 2002-08-13 12:07:33 +00:00
parent cf5d04f663
commit 8d330378ca
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ext/win32ole/win32ole.c
View File

@ -1691,6 +1691,7 @@ ole_invoke(argc, argv, self, wFlags)
unsigned int argErr = 0; unsigned int argErr = 0;
unsigned int i; unsigned int i;
unsigned int cNamedArgs; unsigned int cNamedArgs;
int n;
struct oleparam op; struct oleparam op;
memset(&excepinfo, 0, sizeof(EXCEPINFO)); memset(&excepinfo, 0, sizeof(EXCEPINFO));
@ -1768,7 +1769,7 @@ ole_invoke(argc, argv, self, wFlags)
if(op.dp.cArgs > cNamedArgs) { if(op.dp.cArgs > cNamedArgs) {
realargs = ALLOCA_N(VARIANTARG, op.dp.cArgs-cNamedArgs+1); realargs = ALLOCA_N(VARIANTARG, op.dp.cArgs-cNamedArgs+1);
for(i = cNamedArgs; i < op.dp.cArgs; i++) { for(i = cNamedArgs; i < op.dp.cArgs; i++) {
int n = op.dp.cArgs - i + cNamedArgs - 1; n = op.dp.cArgs - i + cNamedArgs - 1;
VariantInit(&realargs[n]); VariantInit(&realargs[n]);
VariantInit(&op.dp.rgvarg[n]); VariantInit(&op.dp.rgvarg[n]);
param = rb_ary_entry(paramS, i-cNamedArgs); param = rb_ary_entry(paramS, i-cNamedArgs);
@ -1793,6 +1794,23 @@ ole_invoke(argc, argv, self, wFlags)
&IID_NULL, lcid, wFlags, &op.dp, &IID_NULL, lcid, wFlags, &op.dp,
&result, &excepinfo, &argErr); &result, &excepinfo, &argErr);
if (FAILED(hr)) { if (FAILED(hr)) {
/* retry to call args by value */
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);
ole_val2variant(param, &op.dp.rgvarg[n]);
}
memset(&excepinfo, 0, sizeof(EXCEPINFO));
hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID,
&IID_NULL, lcid, wFlags,
&op.dp, NULL,
&excepinfo, &argErr);
for(i = cNamedArgs; i < op.dp.cArgs; i++) {
n = op.dp.cArgs - i + cNamedArgs - 1;
VariantClear(&op.dp.rgvarg[n]);
}
}
/* mega kludge. if a method in WORD is called and we ask /* mega kludge. if a method in WORD is called and we ask
* for a result when one is not returned then * for a result when one is not returned then
* hResult == DISP_E_EXCEPTION. this only happens on * hResult == DISP_E_EXCEPTION. this only happens on
@ -1811,7 +1829,7 @@ ole_invoke(argc, argv, self, wFlags)
args = rb_cvar_get(cWIN32OLE, rb_intern("ARGV")); args = rb_cvar_get(cWIN32OLE, rb_intern("ARGV"));
rb_funcall(args, rb_intern("clear"), 0); rb_funcall(args, rb_intern("clear"), 0);
for(i = cNamedArgs; i < op.dp.cArgs; i++) { for(i = cNamedArgs; i < op.dp.cArgs; i++) {
int n = op.dp.cArgs - i + cNamedArgs - 1; n = op.dp.cArgs - i + cNamedArgs - 1;
rb_ary_push(args, ole_variant2val(&realargs[n])); rb_ary_push(args, ole_variant2val(&realargs[n]));
VariantClear(&realargs[n]); VariantClear(&realargs[n]);
} }