- Wine-Commits - list.winehq.org

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

Aug. 22, 2023

Module: wine Branch: master Commit: 9c661ff3f1a6bb154d3ba2adf94184ff8e0d1e83 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c661ff3f1a6bb154d3ba2adf94184… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 18 09:10:18 2023 +0200 include: Add Windows.ApplicationModel.IPackage3 interface definition. --- include/windows.applicationmodel.idl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/windows.applicationmodel.idl b/include/windows.applicationmodel.idl index 13984d27f8a..47557f7efb9 100644 --- a/include/windows.applicationmodel.idl +++ b/include/windows.applicationmodel.idl @@ -34,6 +34,7 @@ namespace Windows.ApplicationModel { interface IAppDisplayInfo; interface IPackage; + interface IPackage3; interface IPackageStatus; interface IPackageId; interface IPackageIdWithMetadata; @@ -48,6 +49,9 @@ namespace Windows.ApplicationModel { interface Windows.Foundation.Collections.IIterable<Windows.ApplicationModel.Package *>; interface Windows.Foundation.Collections.IIterator<Windows.ApplicationModel.Package *>; interface Windows.Foundation.Collections.IVectorView<Windows.ApplicationModel.Package *>; + interface Windows.Foundation.Collections.IVectorView<Windows.ApplicationModel.Core.AppListEntry *>; + interface Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVectorView<Windows.ApplicationModel.Core.AppListEntry *> *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Foundation.Collections.IVectorView<Windows.ApplicationModel.Core.AppListEntry *> *>; } [ @@ -86,6 +90,18 @@ namespace Windows.ApplicationModel { [propget] HRESULT Dependencies([out, retval] Windows.Foundation.Collections.IVectorView<Windows.ApplicationModel.Package *> **value); } + [ + exclusiveto(Windows.ApplicationModel.Package), + uuid(5f738b61-f86a-4917-93d1-f1ee9d3b35d9), + version(0x0a000000) + ] + interface IPackage3 : IInspectable + { + [propget] HRESULT Status([out, retval] Windows.ApplicationModel.PackageStatus **value); + [propget] HRESULT InstalledDate([out, retval] Windows.Foundation.DateTime *value); + HRESULT GetAppListEntriesAsync([out, retval] Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVectorView<Windows.ApplicationModel.Core.AppListEntry *> *> **operation); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.ApplicationModel.PackageStatus),

1 0

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

Aug. 22, 2023

Module: wine Branch: master Commit: 4752e1d86adda2a67c8def636e5805e74bfbc8be URL: https://gitlab.winehq.org/wine/wine/-/commit/4752e1d86adda2a67c8def636e5805… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 11 10:15:22 2023 +0200 include: Add Windows.ApplicationModel.Core.AppListEntry runtimeclass definition. --- include/Makefile.in | 1 + include/windows.applicationmodel.core.idl | 60 +++++++++++++++++++++++++++++++ include/windows.applicationmodel.idl | 5 +++ 3 files changed, 66 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 025fdca7326..adbc4165b48 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -811,6 +811,7 @@ SOURCES = \ windef.h \ windns.h \ windot11.h \ + windows.applicationmodel.core.idl \ windows.applicationmodel.idl \ windows.devices.bluetooth.idl \ windows.devices.enumeration.idl \ diff --git a/include/windows.applicationmodel.core.idl b/include/windows.applicationmodel.core.idl new file mode 100644 index 00000000000..cc830609f7f --- /dev/null +++ b/include/windows.applicationmodel.core.idl @@ -0,0 +1,60 @@ +/* + * 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.storage.idl"; +import "windows.system.idl"; +import "windows.applicationmodel.idl"; + +namespace Windows.ApplicationModel { + runtimeclass AppDisplayInfo; +} + +namespace Windows.ApplicationModel.Core { + interface IAppListEntry; + + runtimeclass AppListEntry; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.ApplicationModel.Core.AppListEntry), + uuid(ef00f07f-2108-490a-877a-8a9f17c25fad) + ] + interface IAppListEntry : IInspectable + { + [propget] HRESULT DisplayInfo([out, retval] Windows.ApplicationModel.AppDisplayInfo **value); + HRESULT LaunchAsync([out, retval] Windows.Foundation.IAsyncOperation<boolean> **operation); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass AppListEntry + { + [default] interface Windows.ApplicationModel.Core.IAppListEntry; + [contract(Windows.Foundation.UniversalApiContract, 5.0)] interface Windows.ApplicationModel.Core.IAppListEntry2; + [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.ApplicationModel.Core.IAppListEntry3; + [contract(Windows.Foundation.UniversalApiContract, 11.0)] interface Windows.ApplicationModel.Core.IAppListEntry4; + } +} diff --git a/include/windows.applicationmodel.idl b/include/windows.applicationmodel.idl index 70cf9178de8..13984d27f8a 100644 --- a/include/windows.applicationmodel.idl +++ b/include/windows.applicationmodel.idl @@ -23,6 +23,11 @@ import "windows.foundation.idl"; import "windows.storage.idl"; import "windows.system.idl"; +import "windows.applicationmodel.core.idl"; + +namespace Windows.ApplicationModel.Core { + runtimeclass AppListEntry; +} namespace Windows.ApplicationModel { typedef struct PackageVersion PackageVersion;

1 0

Rémi Bernon : widl: Guard against re-import of the main input file.
by Alexandre Julliard Aug. 22, 2023

Aug. 22, 2023

Module: wine Branch: master Commit: 3b7398b403347e9a127e08afb79b03394aaa5b12 URL: https://gitlab.winehq.org/wine/wine/-/commit/3b7398b403347e9a127e08afb79b03… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 18 09:35:41 2023 +0200 widl: Guard against re-import of the main input file. --- tools/widl/parser.l | 1 + tools/widl/parser.y | 2 +- tools/widl/widl.c | 9 ++++++--- tools/widl/widl.h | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 951998de381..61266efb9e3 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -520,6 +520,7 @@ void push_import( const char *import_name, struct location *where ) LIST_FOR_EACH_ENTRY( import, &imports, struct import, entry ) if (!strcmp( import->name, import_name )) return; /* already imported */ + if (!strcmp( idl_name, import_name )) return; /* already imported */ import = xmalloc( sizeof(struct import) ); import->name = xstrdup( import_name ); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index f66dc62492f..bfd41aa9807 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2270,7 +2270,7 @@ char *gen_name(void) if (! file_id) { - char *dst = replace_extension( get_basename(input_idl_name), ".idl", "" ); + char *dst = replace_extension( idl_name, ".idl", "" ); file_id = dst; for (; *dst; ++dst) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 5bbaeb970fb..e37160e3869 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -114,7 +114,7 @@ static int stdinc = 1; static enum stub_mode stub_mode = MODE_Os; char *input_name; -char *input_idl_name; +char *idl_name; char *acf_name; char *header_name; char *local_stubs_name; @@ -435,7 +435,7 @@ void write_id_data(const statement_list_t *stmts) } fprintf(idfile, "/*** Autogenerated by WIDL %s ", PACKAGE_VERSION); - fprintf(idfile, "from %s - Do not edit ***/\n\n", input_idl_name); + fprintf(idfile, "from %s - Do not edit ***/\n\n", idl_name); fprintf(idfile, "#include <rpc.h>\n"); fprintf(idfile, "#include <rpcndr.h>\n\n"); @@ -782,7 +782,10 @@ int main(int argc,char *argv[]) return 1; } else - input_idl_name = input_name = xstrdup(files.str[0]); + { + input_name = xstrdup( files.str[0] ); + idl_name = get_basename( input_name ); + } } else { fprintf(stderr, "%s", usage); diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 518ae613f83..7595cfe7311 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -52,7 +52,7 @@ extern int winrt_mode; extern int use_abi_namespace; extern char *input_name; -extern char *input_idl_name; +extern char *idl_name; extern char *acf_name; extern char *header_name; extern char *header_token;

1 0

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