Jacek Caban : mshtml: Use get_handler_vector in detach_event.
Alexandre Julliard
julliard at winehq.org
Tue Feb 14 16:24:51 CST 2017
Module: wine
Branch: master
Commit: 57239e7822ac7d3bc41a3734ed2201bc801ab208
URL: http://source.winehq.org/git/wine.git/?a=commit;h=57239e7822ac7d3bc41a3734ed2201bc801ab208
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Feb 13 21:11:38 2017 +0100
mshtml: Use get_handler_vector in detach_event.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mshtml/htmlevent.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c
index d144eeb..e844728 100644
--- a/dlls/mshtml/htmlevent.c
+++ b/dlls/mshtml/htmlevent.c
@@ -1539,9 +1539,9 @@ HRESULT attach_event(EventTarget *event_target, BSTR name, IDispatch *disp, VARI
HRESULT detach_event(EventTarget *event_target, BSTR name, IDispatch *disp)
{
- event_target_t *data;
+ handler_vector_t *handler_vector;
eventid_t eid;
- DWORD i = 0;
+ unsigned i;
eid = attr_to_eid(name);
if(eid == EVENTID_LAST) {
@@ -1549,19 +1549,15 @@ HRESULT detach_event(EventTarget *event_target, BSTR name, IDispatch *disp)
return S_OK;
}
- data = get_event_target_data(event_target, FALSE);
- if(!data)
- return S_OK;
-
- if(!data->event_table[eid])
+ handler_vector = get_handler_vector(event_target, eid, FALSE);
+ if(!handler_vector)
return S_OK;
- while(i < data->event_table[eid]->handler_cnt) {
- if(data->event_table[eid]->handlers[i] == disp) {
- IDispatch_Release(data->event_table[eid]->handlers[i]);
- data->event_table[eid]->handlers[i] = NULL;
+ for(i = 0; i < handler_vector->handler_cnt; i++) {
+ if(handler_vector->handlers[i] == disp) {
+ IDispatch_Release(handler_vector->handlers[i]);
+ handler_vector->handlers[i] = NULL;
}
- i++;
}
return S_OK;
More information about the wine-cvs
mailing list