system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 07:57:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

mshtml: Use separate dispex destructors for different event types.

Browse source 
And get rid of the destroy method. This especially simplifies it when
traversal and unlinking is implemented.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
This commit is contained in:
Gabriel Ivăncescu 2023-08-01 19:45:24 +03:00 committed by Alexandre Julliard
parent 6a2ca11c65
commit 548b681185
2 changed files with 112 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

165
dlls/mshtml/htmlevent.c
View file

@ -965,16 +965,8 @@ static ULONG WINAPI DOMEvent_Release(IDOMEvent *iface)
TRACE("(%p) ref=%lu\n", This, ref);
if(!ref) {
if(This->destroy)
This->destroy(This);
if(This->target)
IEventTarget_Release(&This->target->IEventTarget_iface);
nsIDOMEvent_Release(This->nsevent);
if(!ref)
release_dispex(&This->dispex);
free(This->type);
free(This);
}
return ref;
}
@ -1234,6 +1226,29 @@ static const IDOMEventVtbl DOMEventVtbl = {
DOMEvent_get_srcElement
};
static inline DOMEvent *DOMEvent_from_DispatchEx(DispatchEx *iface)
{
return CONTAINING_RECORD(iface, DOMEvent, dispex);
}
static void DOMEvent_unlink(DispatchEx *dispex)
{
DOMEvent *This = DOMEvent_from_DispatchEx(dispex);
if(This->target) {
EventTarget *target = This->target;
This->target = NULL;
IEventTarget_Release(&target->IEventTarget_iface);
}
unlink_ref(&This->nsevent);
}
static void DOMEvent_destructor(DispatchEx *dispex)
{
DOMEvent *This = DOMEvent_from_DispatchEx(dispex);
free(This->type);
free(This);
}
static inline DOMUIEvent *impl_from_IDOMUIEvent(IDOMUIEvent *iface)
{
return CONTAINING_RECORD(iface, DOMUIEvent, IDOMUIEvent_iface);
@ -1382,10 +1397,11 @@ static void *DOMUIEvent_query_interface(DOMEvent *event, REFIID riid)
return NULL;
}
static void DOMUIEvent_destroy(DOMEvent *event)
static void DOMUIEvent_unlink(DispatchEx *dispex)
{
DOMUIEvent *This = DOMUIEvent_from_DOMEvent(event);
nsIDOMUIEvent_Release(This->nsevent);
DOMUIEvent *This = DOMUIEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex));
DOMEvent_unlink(&This->event.dispex);
unlink_ref(&This->nsevent);
}
typedef struct {
@ -1913,11 +1929,11 @@ static void *DOMMouseEvent_query_interface(DOMEvent *event, REFIID riid)
return NULL;
}
static void DOMMouseEvent_destroy(DOMEvent *event)
static void DOMMouseEvent_unlink(DispatchEx *dispex)
{
DOMMouseEvent *This = DOMMouseEvent_from_DOMEvent(event);
DOMUIEvent_destroy(&This->ui_event.event);
nsIDOMMouseEvent_Release(This->nsevent);
DOMMouseEvent *This = DOMMouseEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex));
DOMUIEvent_unlink(&This->ui_event.event.dispex);
unlink_ref(&This->nsevent);
}
typedef struct {
@ -2212,11 +2228,11 @@ static void *DOMKeyboardEvent_query_interface(DOMEvent *event, REFIID riid)
return NULL;
}
static void DOMKeyboardEvent_destroy(DOMEvent *event)
static void DOMKeyboardEvent_unlink(DispatchEx *dispex)
{
DOMKeyboardEvent *This = DOMKeyboardEvent_from_DOMEvent(event);
DOMUIEvent_destroy(&This->ui_event.event);
nsIDOMKeyEvent_Release(This->nsevent);
DOMKeyboardEvent *This = DOMKeyboardEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex));
DOMUIEvent_unlink(&This->ui_event.event.dispex);
unlink_ref(&This->nsevent);
}
typedef struct {
@ -2420,9 +2436,10 @@ static void *DOMCustomEvent_query_interface(DOMEvent *event, REFIID riid)
return NULL;
}
static void DOMCustomEvent_destroy(DOMEvent *event)
static void DOMCustomEvent_unlink(DispatchEx *dispex)
{
DOMCustomEvent *custom_event = DOMCustomEvent_from_DOMEvent(event);
DOMCustomEvent *custom_event = DOMCustomEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex));
DOMEvent_unlink(&custom_event->event.dispex);
VariantClear(&custom_event->detail);
}
@ -2564,9 +2581,10 @@ static void *DOMMessageEvent_query_interface(DOMEvent *event, REFIID riid)
return NULL;
}
static void DOMMessageEvent_destroy(DOMEvent *event)
static void DOMMessageEvent_unlink(DispatchEx *dispex)
{
DOMMessageEvent *message_event = DOMMessageEvent_from_DOMEvent(event);
DOMMessageEvent *message_event = DOMMessageEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex));
DOMEvent_unlink(&message_event->event.dispex);
VariantClear(&message_event->data);
}
@ -2737,10 +2755,11 @@ static void *DOMProgressEvent_query_interface(DOMEvent *event, REFIID riid)
return NULL;
}
static void DOMProgressEvent_destroy(DOMEvent *event)
static void DOMProgressEvent_unlink(DispatchEx *dispex)
{
DOMProgressEvent *This = DOMProgressEvent_from_DOMEvent(event);
nsIDOMProgressEvent_Release(This->nsevent);
DOMProgressEvent *This = DOMProgressEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex));
DOMEvent_unlink(&This->event.dispex);
unlink_ref(&This->nsevent);
}
typedef struct {
@ -2899,15 +2918,21 @@ static void *DOMStorageEvent_query_interface(DOMEvent *event, REFIID riid)
return NULL;
}
static void DOMStorageEvent_destroy(DOMEvent *event)
static void DOMStorageEvent_destructor(DispatchEx *dispex)
{
DOMStorageEvent *storage_event = DOMStorageEvent_from_DOMEvent(event);
DOMStorageEvent *storage_event = DOMStorageEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex));
SysFreeString(storage_event->key);
SysFreeString(storage_event->old_value);
SysFreeString(storage_event->new_value);
SysFreeString(storage_event->url);
DOMEvent_destructor(dispex);
}
static const dispex_static_data_vtbl_t DOMEvent_dispex_vtbl = {
DOMEvent_destructor,
DOMEvent_unlink
};
static const tid_t DOMEvent_iface_tids[] = {
IDOMEvent_tid,
0
@ -2915,11 +2940,16 @@ static const tid_t DOMEvent_iface_tids[] = {
static dispex_static_data_t DOMEvent_dispex = {
L"Event",
NULL,
&DOMEvent_dispex_vtbl,
DispDOMEvent_tid,
DOMEvent_iface_tids
};
static const dispex_static_data_vtbl_t DOMUIEvent_dispex_vtbl = {
DOMEvent_destructor,
DOMUIEvent_unlink
};
static const tid_t DOMUIEvent_iface_tids[] = {
IDOMEvent_tid,
IDOMUIEvent_tid,
@ -2928,11 +2958,16 @@ static const tid_t DOMUIEvent_iface_tids[] = {
static dispex_static_data_t DOMUIEvent_dispex = {
L"UIEvent",
NULL,
&DOMUIEvent_dispex_vtbl,
DispDOMUIEvent_tid,
DOMUIEvent_iface_tids
};
static const dispex_static_data_vtbl_t DOMMouseEvent_dispex_vtbl = {
DOMEvent_destructor,
DOMMouseEvent_unlink
};
static const tid_t DOMMouseEvent_iface_tids[] = {
IDOMEvent_tid,
IDOMUIEvent_tid,
@ -2942,11 +2977,16 @@ static const tid_t DOMMouseEvent_iface_tids[] = {
static dispex_static_data_t DOMMouseEvent_dispex = {
L"MouseEvent",
NULL,
&DOMMouseEvent_dispex_vtbl,
DispDOMMouseEvent_tid,
DOMMouseEvent_iface_tids
};
static const dispex_static_data_vtbl_t DOMKeyboardEvent_dispex_vtbl = {
DOMEvent_destructor,
DOMKeyboardEvent_unlink
};
static const tid_t DOMKeyboardEvent_iface_tids[] = {
IDOMEvent_tid,
IDOMUIEvent_tid,
@ -2956,7 +2996,7 @@ static const tid_t DOMKeyboardEvent_iface_tids[] = {
static dispex_static_data_t DOMKeyboardEvent_dispex = {
L"KeyboardEvent",
NULL,
&DOMKeyboardEvent_dispex_vtbl,
DispDOMKeyboardEvent_tid,
DOMKeyboardEvent_iface_tids
};
@ -2967,14 +3007,19 @@ static void DOMPageTransitionEvent_init_dispex_info(dispex_data_t *info, compat_
dispex_info_add_interface(info, IWinePageTransitionEvent_tid, NULL);
}
dispex_static_data_t DOMPageTransitionEvent_dispex = {
static dispex_static_data_t DOMPageTransitionEvent_dispex = {
L"PageTransitionEvent",
NULL,
&DOMEvent_dispex_vtbl,
DispDOMEvent_tid,
DOMEvent_iface_tids,
DOMPageTransitionEvent_init_dispex_info
};
static const dispex_static_data_vtbl_t DOMCustomEvent_dispex_vtbl = {
DOMEvent_destructor,
DOMCustomEvent_unlink
};
static const tid_t DOMCustomEvent_iface_tids[] = {
IDOMEvent_tid,
IDOMCustomEvent_tid,
@ -2983,52 +3028,67 @@ static const tid_t DOMCustomEvent_iface_tids[] = {
static dispex_static_data_t DOMCustomEvent_dispex = {
L"CustomEvent",
NULL,
&DOMCustomEvent_dispex_vtbl,
DispDOMCustomEvent_tid,
DOMCustomEvent_iface_tids
};
static const dispex_static_data_vtbl_t DOMMessageEvent_dispex_vtbl = {
DOMEvent_destructor,
DOMMessageEvent_unlink
};
static const tid_t DOMMessageEvent_iface_tids[] = {
IDOMEvent_tid,
0
};
dispex_static_data_t DOMMessageEvent_dispex = {
static dispex_static_data_t DOMMessageEvent_dispex = {
L"MessageEvent",
NULL,
&DOMMessageEvent_dispex_vtbl,
DispDOMMessageEvent_tid,
DOMMessageEvent_iface_tids,
DOMMessageEvent_init_dispex_info
};
static const dispex_static_data_vtbl_t DOMProgressEvent_dispex_vtbl = {
DOMEvent_destructor,
DOMProgressEvent_unlink
};
static const tid_t DOMProgressEvent_iface_tids[] = {
IDOMEvent_tid,
IDOMProgressEvent_tid,
0
};
dispex_static_data_t DOMProgressEvent_dispex = {
static dispex_static_data_t DOMProgressEvent_dispex = {
L"ProgressEvent",
NULL,
&DOMProgressEvent_dispex_vtbl,
DispDOMProgressEvent_tid,
DOMProgressEvent_iface_tids
};
static const dispex_static_data_vtbl_t DOMStorageEvent_dispex_vtbl = {
DOMStorageEvent_destructor,
DOMEvent_unlink
};
static const tid_t DOMStorageEvent_iface_tids[] = {
IDOMEvent_tid,
IDOMStorageEvent_tid,
0
};
dispex_static_data_t DOMStorageEvent_dispex = {
static dispex_static_data_t DOMStorageEvent_dispex = {
L"StorageEvent",
NULL,
&DOMStorageEvent_dispex_vtbl,
DispDOMStorageEvent_tid,
DOMStorageEvent_iface_tids
};
static void *event_ctor(unsigned size, dispex_static_data_t *dispex_data, void *(*query_interface)(DOMEvent*,REFIID),
void (*destroy)(DOMEvent*), nsIDOMEvent *nsevent, eventid_t event_id, compat_mode_t compat_mode)
nsIDOMEvent *nsevent, eventid_t event_id, compat_mode_t compat_mode)
{
DOMEvent *event = calloc(1, size);
@ -3036,7 +3096,6 @@ static void *event_ctor(unsigned size, dispex_static_data_t *dispex_data, void *
return NULL;
event->IDOMEvent_iface.lpVtbl = &DOMEventVtbl;
event->query_interface = query_interface;
event->destroy = destroy;
event->ref = 1;
event->event_id = event_id;
if(event_id != EVENTID_LAST) {
@ -3064,13 +3123,13 @@ static void fill_parent_ui_event(nsIDOMEvent *nsevent, DOMUIEvent *ui_event)
static DOMEvent *generic_event_ctor(void *iface, nsIDOMEvent *nsevent, eventid_t event_id, compat_mode_t compat_mode)
{
return event_ctor(sizeof(DOMEvent), &DOMEvent_dispex, NULL, NULL, nsevent, event_id, compat_mode);
return event_ctor(sizeof(DOMEvent), &DOMEvent_dispex, NULL, nsevent, event_id, compat_mode);
}
static DOMEvent *ui_event_ctor(void *iface, nsIDOMEvent *nsevent, eventid_t event_id, compat_mode_t compat_mode)
{
DOMUIEvent *ui_event = event_ctor(sizeof(DOMUIEvent), &DOMUIEvent_dispex,
DOMUIEvent_query_interface, DOMUIEvent_destroy, nsevent, event_id, compat_mode);
DOMUIEvent_query_interface, nsevent, event_id, compat_mode);
if(!ui_event) return NULL;
ui_event->IDOMUIEvent_iface.lpVtbl = &DOMUIEventVtbl;
ui_event->nsevent = iface;
@ -3080,7 +3139,7 @@ static DOMEvent *ui_event_ctor(void *iface, nsIDOMEvent *nsevent, eventid_t even
static DOMEvent *mouse_event_ctor(void *iface, nsIDOMEvent *nsevent, eventid_t event_id, compat_mode_t compat_mode)
{
DOMMouseEvent *mouse_event = event_ctor(sizeof(DOMMouseEvent), &DOMMouseEvent_dispex,
DOMMouseEvent_query_interface, DOMMouseEvent_destroy, nsevent, event_id, compat_mode);
DOMMouseEvent_query_interface, nsevent, event_id, compat_mode);
if(!mouse_event) return NULL;
mouse_event->IDOMMouseEvent_iface.lpVtbl = &DOMMouseEventVtbl;
mouse_event->nsevent = iface;
@ -3091,7 +3150,7 @@ static DOMEvent *mouse_event_ctor(void *iface, nsIDOMEvent *nsevent, eventid_t e
static DOMEvent *keyboard_event_ctor(void *iface, nsIDOMEvent *nsevent, eventid_t event_id, compat_mode_t compat_mode)
{
DOMKeyboardEvent *keyboard_event = event_ctor(sizeof(DOMKeyboardEvent), &DOMKeyboardEvent_dispex,
DOMKeyboardEvent_query_interface, DOMKeyboardEvent_destroy, nsevent, event_id, compat_mode);
DOMKeyboardEvent_query_interface, nsevent, event_id, compat_mode);
if(!keyboard_event) return NULL;
keyboard_event->IDOMKeyboardEvent_iface.lpVtbl = &DOMKeyboardEventVtbl;
keyboard_event->nsevent = iface;
@ -3102,7 +3161,7 @@ static DOMEvent *keyboard_event_ctor(void *iface, nsIDOMEvent *nsevent, eventid_
static DOMEvent *page_transition_event_ctor(void *iface, nsIDOMEvent *nsevent, eventid_t event_id, compat_mode_t compat_mode)
{
DOMPageTransitionEvent *page_transition_event = event_ctor(sizeof(DOMCustomEvent), &DOMPageTransitionEvent_dispex,
DOMPageTransitionEvent_query_interface, NULL, nsevent, event_id, compat_mode);
DOMPageTransitionEvent_query_interface, nsevent, event_id, compat_mode);
if(!page_transition_event) return NULL;
page_transition_event->IWinePageTransitionEvent_iface.lpVtbl = &DOMPageTransitionEventVtbl;
return &page_transition_event->event;
@ -3111,7 +3170,7 @@ static DOMEvent *page_transition_event_ctor(void *iface, nsIDOMEvent *nsevent, e
static DOMEvent *custom_event_ctor(void *iface, nsIDOMEvent *nsevent, eventid_t event_id, compat_mode_t compat_mode)
{
DOMCustomEvent *custom_event = event_ctor(sizeof(DOMCustomEvent), &DOMCustomEvent_dispex,
DOMCustomEvent_query_interface, DOMCustomEvent_destroy, nsevent, event_id, compat_mode);
DOMCustomEvent_query_interface, nsevent, event_id, compat_mode);
if(!custom_event) return NULL;
custom_event->IDOMCustomEvent_iface.lpVtbl = &DOMCustomEventVtbl;
nsIDOMCustomEvent_Release(iface);
@ -3123,7 +3182,7 @@ static DOMEvent *progress_event_ctor(void *iface, nsIDOMEvent *nsevent, eventid_
DOMProgressEvent *progress_event;
if(!(progress_event = event_ctor(sizeof(DOMProgressEvent), &DOMProgressEvent_dispex,
DOMProgressEvent_query_interface, DOMProgressEvent_destroy, nsevent, event_id, compat_mode)))
DOMProgressEvent_query_interface, nsevent, event_id, compat_mode)))
return NULL;
progress_event->IDOMProgressEvent_iface.lpVtbl = &DOMProgressEventVtbl;
progress_event->nsevent = iface;
@ -3133,7 +3192,7 @@ static DOMEvent *progress_event_ctor(void *iface, nsIDOMEvent *nsevent, eventid_
static DOMEvent *message_event_ctor(void *iface, nsIDOMEvent *nsevent, eventid_t event_id, compat_mode_t compat_mode)
{
DOMMessageEvent *message_event = event_ctor(sizeof(DOMMessageEvent), &DOMMessageEvent_dispex,
DOMMessageEvent_query_interface, DOMMessageEvent_destroy, nsevent, event_id, compat_mode);
DOMMessageEvent_query_interface, nsevent, event_id, compat_mode);
if(!message_event) return NULL;
message_event->IDOMMessageEvent_iface.lpVtbl = &DOMMessageEventVtbl;
return &message_event->event;
@ -3142,7 +3201,7 @@ static DOMEvent *message_event_ctor(void *iface, nsIDOMEvent *nsevent, eventid_t
static DOMEvent *storage_event_ctor(void *iface, nsIDOMEvent *nsevent, eventid_t event_id, compat_mode_t compat_mode)
{
DOMStorageEvent *storage_event = event_ctor(sizeof(DOMStorageEvent), &DOMStorageEvent_dispex,
DOMStorageEvent_query_interface, DOMStorageEvent_destroy, nsevent, event_id, compat_mode);
DOMStorageEvent_query_interface, nsevent, event_id, compat_mode);
if(!storage_event) return NULL;
storage_event->IDOMStorageEvent_iface.lpVtbl = &DOMStorageEventVtbl;
return &storage_event->event;

1
dlls/mshtml/htmlevent.h
View file

@ -78,7 +78,6 @@ typedef struct DOMEvent {
LONG ref;
void *(*query_interface)(struct DOMEvent*,REFIID);
void (*destroy)(struct DOMEvent*);
nsIDOMEvent *nsevent;