August 2023 - Wine-Commits - list.winehq.org

Rémi Bernon : include: Add Windows.ApplicationModel.AppDisplayInfo runtimeclass definition.
by Alexandre Julliard Aug. 22, 2023

Aug. 22, 2023

Module: wine Branch: master Commit: ff6333c2b3ddc326d76a1c301214976650477382 URL: https://gitlab.winehq.org/wine/wine/-/commit/ff6333c2b3ddc326d76a1c30121497… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 11 10:15:22 2023 +0200 include: Add Windows.ApplicationModel.AppDisplayInfo runtimeclass definition. --- include/windows.applicationmodel.idl | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/windows.applicationmodel.idl b/include/windows.applicationmodel.idl index 9514c06a60e..73dcb32d93b 100644 --- a/include/windows.applicationmodel.idl +++ b/include/windows.applicationmodel.idl @@ -27,11 +27,13 @@ import "windows.system.idl"; namespace Windows.ApplicationModel { typedef struct PackageVersion PackageVersion; + interface IAppDisplayInfo; interface IPackage; interface IPackageId; interface IPackageIdWithMetadata; interface IPackageStatics; + runtimeclass AppDisplayInfo; runtimeclass Package; runtimeclass PackageId; @@ -52,6 +54,18 @@ namespace Windows.ApplicationModel { UINT16 Revision; }; + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.ApplicationModel.AppDisplayInfo), + uuid(1aeb1103-e4d4-41aa-a4f6-c4a276e79eac) + ] + interface IAppDisplayInfo : IInspectable + { + [propget] HRESULT DisplayName([out, retval] HSTRING *value); + [propget] HRESULT Description([out, retval] HSTRING *value); + HRESULT GetLogo([in] Windows.Foundation.Size size, [out, retval] Windows.Storage.Streams.RandomAccessStreamReference **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.ApplicationModel.Package), @@ -103,6 +117,16 @@ namespace Windows.ApplicationModel { [propget] HRESULT Current([out, retval] Windows.ApplicationModel.Package **value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass AppDisplayInfo + { + [default] interface Windows.ApplicationModel.IAppDisplayInfo; + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile),

1 0

Rémi Bernon : include: Add Windows.ApplicationModel.PackageStatus runtimeclass definition.
by Alexandre Julliard Aug. 22, 2023

Aug. 22, 2023

Module: wine Branch: master Commit: 3395ce23ee54af52db1e128d3e9563410c026b9f URL: https://gitlab.winehq.org/wine/wine/-/commit/3395ce23ee54af52db1e128d3e9563… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 11 10:15:22 2023 +0200 include: Add Windows.ApplicationModel.PackageStatus runtimeclass definition. --- include/windows.applicationmodel.idl | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/include/windows.applicationmodel.idl b/include/windows.applicationmodel.idl index 73dcb32d93b..70cf9178de8 100644 --- a/include/windows.applicationmodel.idl +++ b/include/windows.applicationmodel.idl @@ -29,6 +29,7 @@ namespace Windows.ApplicationModel { interface IAppDisplayInfo; interface IPackage; + interface IPackageStatus; interface IPackageId; interface IPackageIdWithMetadata; interface IPackageStatics; @@ -36,6 +37,7 @@ namespace Windows.ApplicationModel { runtimeclass AppDisplayInfo; runtimeclass Package; runtimeclass PackageId; + runtimeclass PackageStatus; declare { interface Windows.Foundation.Collections.IIterable<Windows.ApplicationModel.Package *>; @@ -79,6 +81,27 @@ namespace Windows.ApplicationModel { [propget] HRESULT Dependencies([out, retval] Windows.Foundation.Collections.IVectorView<Windows.ApplicationModel.Package *> **value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.ApplicationModel.PackageStatus), + uuid(5fe74f71-a365-4c09-a02d-046d525ea1da) + ] + interface IPackageStatus : IInspectable + { + HRESULT VerifyIsOK([out, retval] boolean *value); + [propget] HRESULT NotAvailable([out, retval] boolean *value); + [propget] HRESULT PackageOffline([out, retval] boolean *value); + [propget] HRESULT DataOffline([out, retval] boolean *value); + [propget] HRESULT Disabled([out, retval] boolean *value); + [propget] HRESULT NeedsRemediation([out, retval] boolean *value); + [propget] HRESULT LicenseIssue([out, retval] boolean *value); + [propget] HRESULT Modified([out, retval] boolean *value); + [propget] HRESULT Tampered([out, retval] boolean *value); + [propget] HRESULT DependencyIssue([out, retval] boolean *value); + [propget] HRESULT Servicing([out, retval] boolean *value); + [propget] HRESULT DeploymentInProgress([out, retval] boolean *value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.ApplicationModel.PackageId), @@ -146,6 +169,16 @@ namespace Windows.ApplicationModel { [contract(Windows.Foundation.UniversalApiContract, 10.0)] interface Windows.ApplicationModel.IPackage8; } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass PackageStatus + { + [default] interface Windows.ApplicationModel.IPackageStatus; + [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.ApplicationModel.IPackageStatus2; + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile)

1 0

Rémi Bernon : include: Add Windows.Storage.Streams.RandomAccessStreamReference runtimeclass definition.
by Alexandre Julliard Aug. 22, 2023

Aug. 22, 2023

Module: wine Branch: master Commit: d48a1d15d62f7497de8ef6f3e09136b6983df163 URL: https://gitlab.winehq.org/wine/wine/-/commit/d48a1d15d62f7497de8ef6f3e09136… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 11 10:15:22 2023 +0200 include: Add Windows.Storage.Streams.RandomAccessStreamReference runtimeclass definition. --- include/windows.storage.streams.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/windows.storage.streams.idl b/include/windows.storage.streams.idl index 5bdeb3689ff..8e8aba3b377 100644 --- a/include/windows.storage.streams.idl +++ b/include/windows.storage.streams.idl @@ -34,10 +34,12 @@ namespace Windows.Storage.Streams { interface IOutputStream; interface IRandomAccessStream; interface IRandomAccessStreamReference; + interface IRandomAccessStreamReferenceStatics; interface IRandomAccessStreamStatics; interface IRandomAccessStreamWithContentType; runtimeclass Buffer; runtimeclass RandomAccessStream; + runtimeclass RandomAccessStreamReference; declare { interface Windows.Foundation.Collections.IIterable<Windows.Storage.Streams.IRandomAccessStream *>; @@ -138,4 +140,14 @@ namespace Windows.Storage.Streams { { [default] interface Windows.Storage.Streams.IBuffer; } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Storage.Streams.IRandomAccessStreamReferenceStatics, Windows.Foundation.UniversalApiContract, 1.0) + ] + runtimeclass RandomAccessStreamReference + { + [default] interface Windows.Storage.Streams.IRandomAccessStreamReference; + } }

1 0

Rémi Bernon : include: Add Windows.Management.Deployment.PackageManager runtimeclass definition.
by Alexandre Julliard Aug. 22, 2023

Aug. 22, 2023

Module: wine Branch: master Commit: f6fd79a3b9926c9c3dfefd64fefbccbe2f60527c URL: https://gitlab.winehq.org/wine/wine/-/commit/f6fd79a3b9926c9c3dfefd64fefbcc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 11 10:15:22 2023 +0200 include: Add Windows.Management.Deployment.PackageManager runtimeclass definition. --- include/windows.management.deployment.idl | 121 ++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+)

1 0

Rémi Bernon : include: Add Windows.Management.Deployment.PackageUserInformation runtimeclass definition.
by Alexandre Julliard Aug. 22, 2023

Aug. 22, 2023

Module: wine Branch: master Commit: cdf3355dc8aedc4800cc5ae0904682f5a800583e URL: https://gitlab.winehq.org/wine/wine/-/commit/cdf3355dc8aedc4800cc5ae0904682… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 18 09:13:54 2023 +0200 include: Add Windows.Management.Deployment.PackageUserInformation runtimeclass definition. --- include/windows.management.deployment.idl | 34 +++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/include/windows.management.deployment.idl b/include/windows.management.deployment.idl index 91a7488f650..07a6c9b711e 100644 --- a/include/windows.management.deployment.idl +++ b/include/windows.management.deployment.idl @@ -25,9 +25,23 @@ import "windows.applicationmodel.idl"; namespace Windows.Management.Deployment { + typedef enum PackageInstallState PackageInstallState; + interface IDeploymentResult; + interface IPackageUserInformation; runtimeclass DeploymentResult; + runtimeclass PackageUserInformation; + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + enum PackageInstallState + { + NotInstalled = 0, + Staged = 1, + Installed = 2, + [contract(Windows.Foundation.UniversalApiContract, 2.0)] + Paused = 6, + }; [ contract(Windows.Foundation.UniversalApiContract, 1.0), @@ -41,6 +55,17 @@ namespace Windows.Management.Deployment { [propget] HRESULT ExtendedErrorCode([out, retval] HRESULT *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Management.Deployment.PackageUserInformation), + uuid(f6383423-fa09-4cbc-9055-15ca275e2e7e) + ] + interface IPackageUserInformation : IInspectable + { + [propget] HRESULT UserSecurityId([out, retval] HSTRING *value); + [propget] HRESULT InstallState([out, retval] Windows.Management.Deployment.PackageInstallState *value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile) @@ -51,4 +76,13 @@ namespace Windows.Management.Deployment { [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.Management.Deployment.IDeploymentResult2; } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass PackageUserInformation + { + [default] interface Windows.Management.Deployment.IPackageUserInformation; + } + }

1 0

Rémi Bernon : include: Add Windows.Management.Deployment.DeploymentResult runtimeclass definition.
by Alexandre Julliard Aug. 22, 2023

Aug. 22, 2023

Module: wine Branch: master Commit: a936bcad144a50eda05f3377378c1b0d49c20d75 URL: https://gitlab.winehq.org/wine/wine/-/commit/a936bcad144a50eda05f3377378c1b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 11 10:15:22 2023 +0200 include: Add Windows.Management.Deployment.DeploymentResult runtimeclass definition. --- include/Makefile.in | 1 + include/windows.management.deployment.idl | 54 +++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index f4475d9438f..025fdca7326 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -835,6 +835,7 @@ SOURCES = \ windows.graphics.effects.idl \ windows.graphics.holographic.idl \ windows.h \ + windows.management.deployment.idl \ windows.media.closedcaptioning.idl \ windows.media.devices.idl \ windows.media.idl \ diff --git a/include/windows.management.deployment.idl b/include/windows.management.deployment.idl new file mode 100644 index 00000000000..91a7488f650 --- /dev/null +++ b/include/windows.management.deployment.idl @@ -0,0 +1,54 @@ +/* + * Copyright 2023 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "windows.foundation.idl"; +import "windows.applicationmodel.idl"; + +namespace Windows.Management.Deployment { + + interface IDeploymentResult; + + runtimeclass DeploymentResult; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Management.Deployment.DeploymentResult), + uuid(2563b9ae-b77d-4c1f-8a7b-20e6ad515ef3) + ] + interface IDeploymentResult : IInspectable + { + [propget] HRESULT ErrorText([out, retval] HSTRING *value); + [propget] HRESULT ActivityId([out, retval] GUID *value); + [propget] HRESULT ExtendedErrorCode([out, retval] HRESULT *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass DeploymentResult + { + [default] interface Windows.Management.Deployment.IDeploymentResult; + [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.Management.Deployment.IDeploymentResult2; + } + +}

1 0

Gabriel Ivăncescu : mshtml: Implement Cycle Collection for DOM Events.
by Alexandre Julliard Aug. 22, 2023

Aug. 22, 2023

Module: wine Branch: master Commit: f6d9eb6712c6e0f4b25b29427f7435ade490cf8b URL: https://gitlab.winehq.org/wine/wine/-/commit/f6d9eb6712c6e0f4b25b29427f7435… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 22 16:21:48 2023 +0300 mshtml: Implement Cycle Collection for DOM Events. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 73 ++++++++++++++++++++++++++++++++++++++++++++----- dlls/mshtml/htmlevent.h | 1 - 2 files changed, 66 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 22fe681abda..13fa4e5b505 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -960,7 +960,7 @@ static HRESULT WINAPI DOMEvent_QueryInterface(IDOMEvent *iface, REFIID riid, voi *ppv = &This->IDOMEvent_iface; else if(IsEqualGUID(&IID_IDOMEvent, riid)) *ppv = &This->IDOMEvent_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->query_interface || !(*ppv = This->query_interface(This, riid))) { *ppv = NULL; @@ -975,7 +975,7 @@ static HRESULT WINAPI DOMEvent_QueryInterface(IDOMEvent *iface, REFIID riid, voi static ULONG WINAPI DOMEvent_AddRef(IDOMEvent *iface) { DOMEvent *This = impl_from_IDOMEvent(iface); - LONG ref = InterlockedIncrement(&This->ref); + LONG ref = dispex_ref_incr(&This->dispex); TRACE("(%p) ref=%lu\n", This, ref); @@ -985,13 +985,10 @@ static ULONG WINAPI DOMEvent_AddRef(IDOMEvent *iface) static ULONG WINAPI DOMEvent_Release(IDOMEvent *iface) { DOMEvent *This = impl_from_IDOMEvent(iface); - LONG ref = InterlockedDecrement(&This->ref); + LONG ref = dispex_ref_decr(&This->dispex); TRACE("(%p) ref=%lu\n", This, ref); - if(!ref) - release_dispex(&This->dispex); - return ref; } @@ -1255,6 +1252,15 @@ static inline DOMEvent *DOMEvent_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, DOMEvent, dispex); } +static void DOMEvent_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + DOMEvent *This = DOMEvent_from_DispatchEx(dispex); + if(This->target) + note_cc_edge((nsISupports*)&This->target->IEventTarget_iface, "target", cb); + if(This->nsevent) + note_cc_edge((nsISupports*)This->nsevent, "nsevent", cb); +} + static void DOMEvent_unlink(DispatchEx *dispex) { DOMEvent *This = DOMEvent_from_DispatchEx(dispex); @@ -1421,6 +1427,14 @@ static void *DOMUIEvent_query_interface(DOMEvent *event, REFIID riid) return NULL; } +static void DOMUIEvent_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + DOMUIEvent *This = DOMUIEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex)); + DOMEvent_traverse(&This->event.dispex, cb); + if(This->nsevent) + note_cc_edge((nsISupports*)This->nsevent, "UIEvent.nsevent", cb); +} + static void DOMUIEvent_unlink(DispatchEx *dispex) { DOMUIEvent *This = DOMUIEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex)); @@ -1953,6 +1967,14 @@ static void *DOMMouseEvent_query_interface(DOMEvent *event, REFIID riid) return NULL; } +static void DOMMouseEvent_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + DOMMouseEvent *This = DOMMouseEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex)); + DOMUIEvent_traverse(&This->ui_event.event.dispex, cb); + if(This->nsevent) + note_cc_edge((nsISupports*)This->nsevent, "MouseEvent.nsevent", cb); +} + static void DOMMouseEvent_unlink(DispatchEx *dispex) { DOMMouseEvent *This = DOMMouseEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex)); @@ -2252,6 +2274,14 @@ static void *DOMKeyboardEvent_query_interface(DOMEvent *event, REFIID riid) return NULL; } +static void DOMKeyboardEvent_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + DOMKeyboardEvent *This = DOMKeyboardEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex)); + DOMUIEvent_traverse(&This->ui_event.event.dispex, cb); + if(This->nsevent) + note_cc_edge((nsISupports*)This->nsevent, "KeyboardEvent.nsevent", cb); +} + static void DOMKeyboardEvent_unlink(DispatchEx *dispex) { DOMKeyboardEvent *This = DOMKeyboardEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex)); @@ -2460,6 +2490,13 @@ static void *DOMCustomEvent_query_interface(DOMEvent *event, REFIID riid) return NULL; } +static void DOMCustomEvent_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + DOMCustomEvent *custom_event = DOMCustomEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex)); + DOMEvent_traverse(&custom_event->event.dispex, cb); + traverse_variant(&custom_event->detail, "detail", cb); +} + static void DOMCustomEvent_unlink(DispatchEx *dispex) { DOMCustomEvent *custom_event = DOMCustomEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex)); @@ -2612,6 +2649,13 @@ static void *DOMMessageEvent_query_interface(DOMEvent *event, REFIID riid) return NULL; } +static void DOMMessageEvent_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + DOMMessageEvent *message_event = DOMMessageEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex)); + DOMEvent_traverse(&message_event->event.dispex, cb); + traverse_variant(&message_event->data, "data", cb); +} + static void DOMMessageEvent_unlink(DispatchEx *dispex) { DOMMessageEvent *message_event = DOMMessageEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex)); @@ -2793,6 +2837,14 @@ static void *DOMProgressEvent_query_interface(DOMEvent *event, REFIID riid) return NULL; } +static void DOMProgressEvent_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + DOMProgressEvent *This = DOMProgressEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex)); + DOMEvent_traverse(&This->event.dispex, cb); + if(This->nsevent) + note_cc_edge((nsISupports*)This->nsevent, "ProgressEvent.nsevent", cb); +} + static void DOMProgressEvent_unlink(DispatchEx *dispex) { DOMProgressEvent *This = DOMProgressEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex)); @@ -2968,6 +3020,7 @@ static void DOMStorageEvent_destructor(DispatchEx *dispex) static const dispex_static_data_vtbl_t DOMEvent_dispex_vtbl = { .destructor = DOMEvent_destructor, + .traverse = DOMEvent_traverse, .unlink = DOMEvent_unlink }; @@ -2985,6 +3038,7 @@ static dispex_static_data_t DOMEvent_dispex = { static const dispex_static_data_vtbl_t DOMUIEvent_dispex_vtbl = { .destructor = DOMEvent_destructor, + .traverse = DOMUIEvent_traverse, .unlink = DOMUIEvent_unlink }; @@ -3003,6 +3057,7 @@ static dispex_static_data_t DOMUIEvent_dispex = { static const dispex_static_data_vtbl_t DOMMouseEvent_dispex_vtbl = { .destructor = DOMEvent_destructor, + .traverse = DOMMouseEvent_traverse, .unlink = DOMMouseEvent_unlink }; @@ -3022,6 +3077,7 @@ static dispex_static_data_t DOMMouseEvent_dispex = { static const dispex_static_data_vtbl_t DOMKeyboardEvent_dispex_vtbl = { .destructor = DOMEvent_destructor, + .traverse = DOMKeyboardEvent_traverse, .unlink = DOMKeyboardEvent_unlink }; @@ -3055,6 +3111,7 @@ static dispex_static_data_t DOMPageTransitionEvent_dispex = { static const dispex_static_data_vtbl_t DOMCustomEvent_dispex_vtbl = { .destructor = DOMCustomEvent_destructor, + .traverse = DOMCustomEvent_traverse, .unlink = DOMCustomEvent_unlink }; @@ -3073,6 +3130,7 @@ static dispex_static_data_t DOMCustomEvent_dispex = { static const dispex_static_data_vtbl_t DOMMessageEvent_dispex_vtbl = { .destructor = DOMMessageEvent_destructor, + .traverse = DOMMessageEvent_traverse, .unlink = DOMMessageEvent_unlink }; @@ -3091,6 +3149,7 @@ static dispex_static_data_t DOMMessageEvent_dispex = { static const dispex_static_data_vtbl_t DOMProgressEvent_dispex_vtbl = { .destructor = DOMEvent_destructor, + .traverse = DOMProgressEvent_traverse, .unlink = DOMProgressEvent_unlink }; @@ -3109,6 +3168,7 @@ static dispex_static_data_t DOMProgressEvent_dispex = { static const dispex_static_data_vtbl_t DOMStorageEvent_dispex_vtbl = { .destructor = DOMStorageEvent_destructor, + .traverse = DOMEvent_traverse, .unlink = DOMEvent_unlink }; @@ -3134,7 +3194,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->ref = 1; event->event_id = event_id; if(event_id != EVENTID_LAST) { event->type = wcsdup(event_info[event_id].name); diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index f6c7cbc381b..cf33daa4709 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -76,7 +76,6 @@ typedef struct DOMEvent { DispatchEx dispex; IDOMEvent IDOMEvent_iface; - LONG ref; void *(*query_interface)(struct DOMEvent*,REFIID); nsIDOMEvent *nsevent;

1 0

Gabriel Ivăncescu : mshtml: Implement Cycle Collection for HTMLEventObj.
by Alexandre Julliard Aug. 22, 2023

Aug. 22, 2023

Module: wine Branch: master Commit: 81c681fc171553cf89eb79870562fd545b6ec085 URL: https://gitlab.winehq.org/wine/wine/-/commit/81c681fc171553cf89eb79870562fd… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 22 16:21:48 2023 +0300 mshtml: Implement Cycle Collection for HTMLEventObj. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 9f3dbae81d7..22fe681abda 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -335,8 +335,6 @@ typedef struct { DispatchEx dispex; IHTMLEventObj IHTMLEventObj_iface; - LONG ref; - DOMEvent *event; VARIANT return_value; } HTMLEventObj; @@ -356,7 +354,7 @@ static HRESULT WINAPI HTMLEventObj_QueryInterface(IHTMLEventObj *iface, REFIID r *ppv = &This->IHTMLEventObj_iface; }else if(IsEqualGUID(&IID_IHTMLEventObj, riid)) { *ppv = &This->IHTMLEventObj_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 { *ppv = NULL; @@ -371,7 +369,7 @@ static HRESULT WINAPI HTMLEventObj_QueryInterface(IHTMLEventObj *iface, REFIID r static ULONG WINAPI HTMLEventObj_AddRef(IHTMLEventObj *iface) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - LONG ref = InterlockedIncrement(&This->ref); + LONG ref = dispex_ref_incr(&This->dispex); TRACE("(%p) ref=%ld\n", This, ref); @@ -381,13 +379,10 @@ static ULONG WINAPI HTMLEventObj_AddRef(IHTMLEventObj *iface) static ULONG WINAPI HTMLEventObj_Release(IHTMLEventObj *iface) { HTMLEventObj *This = impl_from_IHTMLEventObj(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; } @@ -873,6 +868,13 @@ static inline HTMLEventObj *HTMLEventObj_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLEventObj, dispex); } +static void HTMLEventObj_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLEventObj *This = HTMLEventObj_from_DispatchEx(dispex); + if(This->event) + note_cc_edge((nsISupports*)&This->event->IDOMEvent_iface, "event", cb); +} + static void HTMLEventObj_unlink(DispatchEx *dispex) { HTMLEventObj *This = HTMLEventObj_from_DispatchEx(dispex); @@ -891,6 +893,7 @@ static void HTMLEventObj_destructor(DispatchEx *dispex) static const dispex_static_data_vtbl_t HTMLEventObj_dispex_vtbl = { .destructor = HTMLEventObj_destructor, + .traverse = HTMLEventObj_traverse, .unlink = HTMLEventObj_unlink }; @@ -915,7 +918,6 @@ static HTMLEventObj *alloc_event_obj(DOMEvent *event, compat_mode_t compat_mode) return NULL; event_obj->IHTMLEventObj_iface.lpVtbl = &HTMLEventObjVtbl; - event_obj->ref = 1; event_obj->event = event; if(event) IDOMEvent_AddRef(&event->IDOMEvent_iface);

1 0

Gabriel Ivăncescu : mshtml: Implement Cycle Collection for HTMLSelectionObject.
by Alexandre Julliard Aug. 22, 2023

Aug. 22, 2023

Module: wine Branch: master Commit: f888c91bd96207dc47fddff50945988098688841 URL: https://gitlab.winehq.org/wine/wine/-/commit/f888c91bd96207dc47fddff5094598… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 22 16:21:48 2023 +0300 mshtml: Implement Cycle Collection for HTMLSelectionObject. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/selection.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index ae53d83f642..97f65a2b22c 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -36,8 +36,6 @@ typedef struct { IHTMLSelectionObject IHTMLSelectionObject_iface; IHTMLSelectionObject2 IHTMLSelectionObject2_iface; - LONG ref; - nsISelection *nsselection; HTMLDocumentNode *doc; @@ -64,7 +62,7 @@ static HRESULT WINAPI HTMLSelectionObject_QueryInterface(IHTMLSelectionObject *i *ppv = &This->IHTMLSelectionObject_iface; }else if(IsEqualGUID(&IID_IHTMLSelectionObject2, riid)) { *ppv = &This->IHTMLSelectionObject2_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 { *ppv = NULL; @@ -79,7 +77,7 @@ static HRESULT WINAPI HTMLSelectionObject_QueryInterface(IHTMLSelectionObject *i static ULONG WINAPI HTMLSelectionObject_AddRef(IHTMLSelectionObject *iface) { HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); - LONG ref = InterlockedIncrement(&This->ref); + LONG ref = dispex_ref_incr(&This->dispex); TRACE("(%p) ref=%ld\n", This, ref); @@ -89,13 +87,10 @@ static ULONG WINAPI HTMLSelectionObject_AddRef(IHTMLSelectionObject *iface) static ULONG WINAPI HTMLSelectionObject_Release(IHTMLSelectionObject *iface) { HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(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; } @@ -328,6 +323,13 @@ static inline HTMLSelectionObject *impl_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLSelectionObject, dispex); } +static void HTMLSelectionObject_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLSelectionObject *This = impl_from_DispatchEx(dispex); + if(This->nsselection) + note_cc_edge((nsISupports*)This->nsselection, "nsselection", cb); +} + static void HTMLSelectionObject_unlink(DispatchEx *dispex) { HTMLSelectionObject *This = impl_from_DispatchEx(dispex); @@ -346,6 +348,7 @@ static void HTMLSelectionObject_destructor(DispatchEx *dispex) static const dispex_static_data_vtbl_t HTMLSelectionObject_dispex_vtbl = { .destructor = HTMLSelectionObject_destructor, + .traverse = HTMLSelectionObject_traverse, .unlink = HTMLSelectionObject_unlink }; @@ -374,7 +377,6 @@ HRESULT HTMLSelectionObject_Create(HTMLDocumentNode *doc, nsISelection *nsselect selection->IHTMLSelectionObject_iface.lpVtbl = &HTMLSelectionObjectVtbl; selection->IHTMLSelectionObject2_iface.lpVtbl = &HTMLSelectionObject2Vtbl; - selection->ref = 1; selection->nsselection = nsselection; /* We shouldn't call AddRef here */ selection->doc = doc;

1 0

Gabriel Ivăncescu : mshtml: Implement Cycle Collection for MediaQueryList.
by Alexandre Julliard Aug. 22, 2023

Aug. 22, 2023

Module: wine Branch: master Commit: 98e0cd857772e00f4ffecf425d323b10b61eb855 URL: https://gitlab.winehq.org/wine/wine/-/commit/98e0cd857772e00f4ffecf425d323b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 22 16:21:48 2023 +0300 mshtml: Implement Cycle Collection for MediaQueryList. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/omnavigator.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index a22abe2045e..9713e9c0b80 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -2826,7 +2826,6 @@ struct media_query_list_callback; struct media_query_list { DispatchEx dispex; IWineMSHTMLMediaQueryList IWineMSHTMLMediaQueryList_iface; - LONG ref; nsIDOMMediaQueryList *nsquerylist; struct media_query_list_callback *callback; struct list listeners; @@ -2851,7 +2850,7 @@ static HRESULT WINAPI media_query_list_QueryInterface(IWineMSHTMLMediaQueryList if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IWineMSHTMLMediaQueryList, riid)) { *ppv = &media_query_list->IWineMSHTMLMediaQueryList_iface; - }else if(dispex_query_interface_no_cc(&media_query_list->dispex, riid, ppv)) { + }else if(dispex_query_interface(&media_query_list->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { *ppv = NULL; @@ -2865,7 +2864,7 @@ static HRESULT WINAPI media_query_list_QueryInterface(IWineMSHTMLMediaQueryList static ULONG WINAPI media_query_list_AddRef(IWineMSHTMLMediaQueryList *iface) { struct media_query_list *media_query_list = impl_from_IWineMSHTMLMediaQueryList(iface); - LONG ref = InterlockedIncrement(&media_query_list->ref); + LONG ref = dispex_ref_incr(&media_query_list->dispex); TRACE("(%p) ref=%ld\n", media_query_list, ref); @@ -2875,13 +2874,10 @@ static ULONG WINAPI media_query_list_AddRef(IWineMSHTMLMediaQueryList *iface) static ULONG WINAPI media_query_list_Release(IWineMSHTMLMediaQueryList *iface) { struct media_query_list *media_query_list = impl_from_IWineMSHTMLMediaQueryList(iface); - LONG ref = InterlockedDecrement(&media_query_list->ref); + LONG ref = dispex_ref_decr(&media_query_list->dispex); TRACE("(%p) ref=%ld\n", media_query_list, ref); - if(!ref) - release_dispex(&media_query_list->dispex); - return ref; } @@ -3106,6 +3102,17 @@ static inline struct media_query_list *media_query_list_from_DispatchEx(Dispatch return CONTAINING_RECORD(iface, struct media_query_list, dispex); } +static void media_query_list_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + struct media_query_list *media_query_list = media_query_list_from_DispatchEx(dispex); + struct media_query_list_listener *listener; + + LIST_FOR_EACH_ENTRY(listener, &media_query_list->listeners, struct media_query_list_listener, entry) + note_cc_edge((nsISupports*)listener->function, "function", cb); + if(media_query_list->nsquerylist) + note_cc_edge((nsISupports*)media_query_list->nsquerylist, "nsquerylist", cb); +} + static void media_query_list_unlink(DispatchEx *dispex) { struct media_query_list *media_query_list = media_query_list_from_DispatchEx(dispex); @@ -3129,6 +3136,7 @@ static void media_query_list_destructor(DispatchEx *dispex) static const dispex_static_data_vtbl_t media_query_list_dispex_vtbl = { .destructor = media_query_list_destructor, + .traverse = media_query_list_traverse, .unlink = media_query_list_unlink }; @@ -3180,7 +3188,6 @@ HRESULT create_media_query_list(HTMLWindow *window, BSTR media_query, IDispatch assert(NS_SUCCEEDED(nsres)); media_query_list->IWineMSHTMLMediaQueryList_iface.lpVtbl = &media_query_list_vtbl; - media_query_list->ref = 1; list_init(&media_query_list->listeners); init_dispatch(&media_query_list->dispex, (IUnknown*)&media_query_list->IWineMSHTMLMediaQueryList_iface, &media_query_list_dispex, dispex_compat_mode(&window->inner_window->event_target.dispex));

1 0