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

mshtml: Implement Cycle Collection for HTMLCSSStyleDeclaration.

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 2ee74c592b
commit 4ee59922fe
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
dlls/mshtml/htmlstyle.c
View file

@ -4743,7 +4743,7 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_QueryInterface(IHTMLCSSStyleDeclar
*ppv = &This->IHTMLCSSStyleDeclaration_iface;
}else if(IsEqualGUID(&IID_IHTMLCSSStyleDeclaration2, riid)) {
*ppv = &This->IHTMLCSSStyleDeclaration2_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 if(!This->qi || !(*ppv = This->qi(This, riid))) {
*ppv = NULL;
@ -4758,7 +4758,7 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_QueryInterface(IHTMLCSSStyleDeclar
static ULONG WINAPI HTMLCSSStyleDeclaration_AddRef(IHTMLCSSStyleDeclaration *iface)
{
CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface);
LONG ref = InterlockedIncrement(&This->ref);
LONG ref = dispex_ref_incr(&This->dispex);
TRACE("(%p) ref=%ld\n", This, ref);
@ -4768,13 +4768,10 @@ static ULONG WINAPI HTMLCSSStyleDeclaration_AddRef(IHTMLCSSStyleDeclaration *ifa
static ULONG WINAPI HTMLCSSStyleDeclaration_Release(IHTMLCSSStyleDeclaration *iface)
{
CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration(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;
}
@ -9965,6 +9962,13 @@ static inline CSSStyle *impl_from_DispatchEx(DispatchEx *dispex)
return CONTAINING_RECORD(dispex, CSSStyle, dispex);
}
static void CSSStyle_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb)
{
CSSStyle *This = impl_from_DispatchEx(dispex);
if(This->nsstyle)
note_cc_edge((nsISupports*)This->nsstyle, "nsstyle", cb);
}
static void CSSStyle_unlink(DispatchEx *dispex)
{
CSSStyle *This = impl_from_DispatchEx(dispex);
@ -10006,6 +10010,7 @@ void CSSStyle_init_dispex_info(dispex_data_t *info, compat_mode_t mode)
const dispex_static_data_vtbl_t CSSStyle_dispex_vtbl = {
.destructor = CSSStyle_destructor,
.traverse = CSSStyle_traverse,
.unlink = CSSStyle_unlink,
.get_dispid = CSSStyle_get_dispid,
};
@ -10070,7 +10075,6 @@ void init_css_style(CSSStyle *style, nsIDOMCSSStyleDeclaration *nsstyle, style_q
{
style->IHTMLCSSStyleDeclaration_iface.lpVtbl = &HTMLCSSStyleDeclarationVtbl;
style->IHTMLCSSStyleDeclaration2_iface.lpVtbl = &HTMLCSSStyleDeclaration2Vtbl;
style->ref = 1;
style->qi = qi;
style->nsstyle = nsstyle;
nsIDOMCSSStyleDeclaration_AddRef(nsstyle);

2
dlls/mshtml/htmlstyle.h
View file

@ -23,8 +23,6 @@ struct CSSStyle {
DispatchEx dispex;
IHTMLCSSStyleDeclaration IHTMLCSSStyleDeclaration_iface;
IHTMLCSSStyleDeclaration2 IHTMLCSSStyleDeclaration2_iface;
LONG ref;
style_qi_t qi;
nsIDOMCSSStyleDeclaration *nsstyle;