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 unlink and destructor in the vtbl for HTMLEventObj.

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

34
dlls/mshtml/htmlevent.c
View file

@ -385,12 +385,8 @@ static ULONG WINAPI HTMLEventObj_Release(IHTMLEventObj *iface)
TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) {
if(This->event)
IDOMEvent_Release(&This->event->IDOMEvent_iface);
if(!ref)
release_dispex(&This->dispex);
free(This);
}
return ref;
}
@ -872,6 +868,32 @@ static inline HTMLEventObj *unsafe_impl_from_IHTMLEventObj(IHTMLEventObj *iface)
return iface->lpVtbl == &HTMLEventObjVtbl ? impl_from_IHTMLEventObj(iface) : NULL;
}
static inline HTMLEventObj *HTMLEventObj_from_DispatchEx(DispatchEx *iface)
{
return CONTAINING_RECORD(iface, HTMLEventObj, dispex);
}
static void HTMLEventObj_unlink(DispatchEx *dispex)
{
HTMLEventObj *This = HTMLEventObj_from_DispatchEx(dispex);
if(This->event) {
DOMEvent *event = This->event;
This->event = NULL;
IDOMEvent_Release(&event->IDOMEvent_iface);
}
}
static void HTMLEventObj_destructor(DispatchEx *dispex)
{
HTMLEventObj *This = HTMLEventObj_from_DispatchEx(dispex);
free(This);
}
static const dispex_static_data_vtbl_t HTMLEventObj_dispex_vtbl = {
HTMLEventObj_destructor,
HTMLEventObj_unlink
};
static const tid_t HTMLEventObj_iface_tids[] = {
IHTMLEventObj_tid,
0
@ -879,7 +901,7 @@ static const tid_t HTMLEventObj_iface_tids[] = {
static dispex_static_data_t HTMLEventObj_dispex = {
L"MSEventObj",
NULL,
&HTMLEventObj_dispex_vtbl,
DispCEventObj_tid,
HTMLEventObj_iface_tids
};