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

mshtml: Implement Cycle Collection for HTMLDOMAttribute.

Browse source 
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
This commit is contained in:
Gabriel Ivăncescu 2023-08-21 16:41:50 +03:00 committed by Alexandre Julliard
parent 84847d7de9
commit 4b2bcdb651
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
dlls/mshtml/htmlattr.c
View file

@ -50,7 +50,7 @@ static HRESULT WINAPI HTMLDOMAttribute_QueryInterface(IHTMLDOMAttribute *iface,
*ppv = &This->IHTMLDOMAttribute_iface;
}else if(IsEqualGUID(&IID_IHTMLDOMAttribute2, riid)) {
*ppv = &This->IHTMLDOMAttribute2_iface;
}else if(dispex_query_interface_no_cc(&This->dispex, riid, ppv)) {
}else if(dispex_query_interface(&This->dispex, riid, ppv)) {
return *ppv ? S_OK : E_NOINTERFACE;
}else {
WARN("%s not supported\n", debugstr_mshtml_guid(riid));
@ -65,7 +65,7 @@ static HRESULT WINAPI HTMLDOMAttribute_QueryInterface(IHTMLDOMAttribute *iface,
static ULONG WINAPI HTMLDOMAttribute_AddRef(IHTMLDOMAttribute *iface)
{
HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface);
LONG ref = InterlockedIncrement(&This->ref);
LONG ref = dispex_ref_incr(&This->dispex);
TRACE("(%p) ref=%ld\n", This, ref);
@ -75,13 +75,10 @@ static ULONG WINAPI HTMLDOMAttribute_AddRef(IHTMLDOMAttribute *iface)
static ULONG WINAPI HTMLDOMAttribute_Release(IHTMLDOMAttribute *iface)
{
HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface);
LONG ref = InterlockedDecrement(&This->ref);
LONG ref = dispex_ref_decr(&This->dispex);
TRACE("(%p) ref=%ld\n", This, ref);
if(!ref)
release_dispex(&This->dispex);
return ref;
}
@ -480,6 +477,12 @@ static inline HTMLDOMAttribute *impl_from_DispatchEx(DispatchEx *iface)
return CONTAINING_RECORD(iface, HTMLDOMAttribute, dispex);
}
static void HTMLDOMAttribute_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb)
{
HTMLDOMAttribute *This = impl_from_DispatchEx(dispex);
traverse_variant(&This->value, "value", cb);
}
static void HTMLDOMAttribute_unlink(DispatchEx *dispex)
{
HTMLDOMAttribute *This = impl_from_DispatchEx(dispex);
@ -497,6 +500,7 @@ static void HTMLDOMAttribute_destructor(DispatchEx *dispex)
static const dispex_static_data_vtbl_t HTMLDOMAttribute_dispex_vtbl = {
.destructor = HTMLDOMAttribute_destructor,
.traverse = HTMLDOMAttribute_traverse,
.unlink = HTMLDOMAttribute_unlink
};
@ -529,7 +533,6 @@ HRESULT HTMLDOMAttribute_Create(const WCHAR *name, HTMLElement *elem, DISPID dis
ret->IHTMLDOMAttribute_iface.lpVtbl = &HTMLDOMAttributeVtbl;
ret->IHTMLDOMAttribute2_iface.lpVtbl = &HTMLDOMAttribute2Vtbl;
ret->ref = 1;
ret->dispid = dispid;
ret->elem = elem;

2
dlls/mshtml/mshtml_private.h
View file

@ -1171,8 +1171,6 @@ typedef struct {
IHTMLDOMAttribute IHTMLDOMAttribute_iface;
IHTMLDOMAttribute2 IHTMLDOMAttribute2_iface;
LONG ref;
/* value is valid only for detached attributes (when elem == NULL). */
VARIANT value;
/* name must be valid for detached attributes */