diff options
| author | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-08-06 16:35:38 +0000 |
|---|---|---|
| committer | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-08-06 16:35:38 +0000 |
| commit | 663b69c5a97dfb000c25d925853a76b51ac7533b (patch) | |
| tree | 4f6b87f4032f0bd3063ff0e00c15d8eacbcc2303 /ext/win32ole/win32ole.c | |
| parent | 8cccadd659536072e9f11feabd1bcd6a13c78cbb (diff) | |
should set only one handler in WIN32OLE_EVENT#on_event
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8937 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/win32ole/win32ole.c')
| -rw-r--r-- | ext/win32ole/win32ole.c | 51 |
1 files changed, 42 insertions, 9 deletions
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 45ea0199b5..56580183fa 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.6.2" +#define WIN32OLE_VERSION "0.6.3" typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX) (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*); @@ -4859,6 +4859,33 @@ STDMETHODIMP EVENTSINK_GetIDsOfNames( return DISP_E_UNKNOWNNAME; } +static long +ole_search_event_at(ary, ev) + VALUE ary; + VALUE ev; +{ + VALUE event; + VALUE def_event; + VALUE event_name; + long i, len; + long ret = -1; + def_event = Qnil; + len = RARRAY(ary)->len; + for(i = 0; i < len; i++) { + event = rb_ary_entry(ary, i); + event_name = rb_ary_entry(event, 1); + if(NIL_P(event_name) && NIL_P(ev)) { + ret = i; + break; + } + else if (rb_str_cmp(ev, event_name) == 0) { + ret = i; + break; + } + } + return ret; +} + static VALUE ole_search_event(ary, ev, is_default) VALUE ary; @@ -4868,7 +4895,7 @@ ole_search_event(ary, ev, is_default) VALUE event; VALUE def_event; VALUE event_name; - int i, len; + long i, len; *is_default = FALSE; def_event = Qnil; len = RARRAY(ary)->len; @@ -5414,16 +5441,22 @@ fev_s_msg_loop(klass) static void -add_event_call_back(obj, data) +add_event_call_back(obj, event, data) VALUE obj; + VALUE event; VALUE data; { - VALUE ary = rb_ivar_get(obj, id_events); - if (NIL_P(ary) || TYPE(ary) != T_ARRAY) { - ary = rb_ary_new(); - rb_ivar_set(obj, id_events, ary); + long at; + VALUE events = rb_ivar_get(obj, id_events); + if (NIL_P(events) || TYPE(events) != T_ARRAY) { + events = rb_ary_new(); + rb_ivar_set(obj, id_events, events); + } + at = ole_search_event_at(events, event); + if (at >= -1) { + rb_ary_delete_at(events, at); } - rb_ary_push(ary, data); + rb_ary_push(events, data); } static VALUE @@ -5439,7 +5472,7 @@ ev_on_event(argc, argv, self, is_ary_arg) Check_SafeStr(event); } data = rb_ary_new3(4, rb_block_proc(), event, args, is_ary_arg); - add_event_call_back(self, data); + add_event_call_back(self, event, data); return Qnil; } |