mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-06 07:27:12 +00:00
mshtml: Use unlink and destructor in the vtbl for HTMLTxtRange.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
This commit is contained in:
parent
5c3f4e4b7c
commit
1904dd0be3
|
@ -855,14 +855,8 @@ static ULONG WINAPI HTMLTxtRange_Release(IHTMLTxtRange *iface)
|
|||
|
||||
TRACE("(%p) ref=%ld\n", This, ref);
|
||||
|
||||
if(!ref) {
|
||||
if(This->nsrange)
|
||||
nsIDOMRange_Release(This->nsrange);
|
||||
if(This->doc)
|
||||
list_remove(&This->entry);
|
||||
if(!ref)
|
||||
release_dispex(&This->dispex);
|
||||
free(This);
|
||||
}
|
||||
|
||||
return ref;
|
||||
}
|
||||
|
@ -1718,13 +1712,39 @@ static const IOleCommandTargetVtbl OleCommandTargetVtbl = {
|
|||
RangeCommandTarget_Exec
|
||||
};
|
||||
|
||||
static inline HTMLTxtRange *HTMLTxtRange_from_DispatchEx(DispatchEx *iface)
|
||||
{
|
||||
return CONTAINING_RECORD(iface, HTMLTxtRange, dispex);
|
||||
}
|
||||
|
||||
static void HTMLTxtRange_unlink(DispatchEx *dispex)
|
||||
{
|
||||
HTMLTxtRange *This = HTMLTxtRange_from_DispatchEx(dispex);
|
||||
unlink_ref(&This->nsrange);
|
||||
if(This->doc) {
|
||||
This->doc = NULL;
|
||||
list_remove(&This->entry);
|
||||
}
|
||||
}
|
||||
|
||||
static void HTMLTxtRange_destructor(DispatchEx *dispex)
|
||||
{
|
||||
HTMLTxtRange *This = HTMLTxtRange_from_DispatchEx(dispex);
|
||||
free(This);
|
||||
}
|
||||
|
||||
static const dispex_static_data_vtbl_t HTMLTxtRange_dispex_vtbl = {
|
||||
HTMLTxtRange_destructor,
|
||||
HTMLTxtRange_unlink
|
||||
};
|
||||
|
||||
static const tid_t HTMLTxtRange_iface_tids[] = {
|
||||
IHTMLTxtRange_tid,
|
||||
0
|
||||
};
|
||||
static dispex_static_data_t HTMLTxtRange_dispex = {
|
||||
L"TextRange",
|
||||
NULL,
|
||||
&HTMLTxtRange_dispex_vtbl,
|
||||
IHTMLTxtRange_tid,
|
||||
HTMLTxtRange_iface_tids
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue