mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* win32ole.c(EVENTSINK_Invoke): set pvarResult.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
020caa3fc8
commit
9dce0d8f0b
1 changed files with 8 additions and 3 deletions
|
@ -4754,7 +4754,7 @@ STDMETHODIMP EVENTSINK_Invoke(
|
|||
unsigned int i;
|
||||
ITypeInfo *pTypeInfo;
|
||||
VARIANT *pvar;
|
||||
VALUE ary, obj, event, handler, args, argv, ev;
|
||||
VALUE ary, obj, event, handler, args, argv, ev, result;
|
||||
BOOL is_default_handler = FALSE;
|
||||
|
||||
PIEVENTSINKOBJ pEV = (PIEVENTSINKOBJ)pEventSink;
|
||||
|
@ -4794,12 +4794,17 @@ STDMETHODIMP EVENTSINK_Invoke(
|
|||
if (rb_ary_entry(event, 3) == Qtrue) {
|
||||
argv = rb_ary_new();
|
||||
rb_ary_push(args, argv);
|
||||
rb_apply(handler, rb_intern("call"), args);
|
||||
result = rb_apply(handler, rb_intern("call"), args);
|
||||
ary2ptr_dispparams(argv, pdispparams);
|
||||
}
|
||||
else {
|
||||
rb_apply(handler, rb_intern("call"), args);
|
||||
result = rb_apply(handler, rb_intern("call"), args);
|
||||
}
|
||||
|
||||
if (pvarResult) {
|
||||
ole_val2variant(result, pvarResult);
|
||||
}
|
||||
|
||||
return NOERROR;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue