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

Davide Beatrici : wineoss: Update device cache in get_device_guid().
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: ef1e9aa051e0653064db4f0ae4fda16e3d285268 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef1e9aa051e0653064db4f0ae4fda1… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Aug 13 16:26:54 2023 +0200 wineoss: Update device cache in get_device_guid(). --- dlls/wineoss.drv/mmdevdrv.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 4a45c532dd0..343581ee9e1 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -95,6 +95,18 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) return TRUE; } +static void device_add(OSSDevice *oss_dev) +{ + OSSDevice *dev_item; + LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry) + if(IsEqualGUID(&oss_dev->guid, &dev_item->guid)){ /* already in list */ + HeapFree(GetProcessHeap(), 0, oss_dev); + return; + } + + list_add_tail(&g_devices, &oss_dev->entry); +} + static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, GUID *guid) { @@ -135,6 +147,15 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) HKEY key = NULL, dev_key; DWORD type, size = sizeof(*guid); WCHAR key_name[256]; + const unsigned int dev_size = strlen(device) + 1; + OSSDevice *oss_dev = HeapAlloc(GetProcessHeap(), 0, offsetof(OSSDevice, devnode[dev_size])); + + if(oss_dev){ + oss_dev->flow = flow; + oss_dev->guid = *guid; + memcpy(oss_dev->devnode, device, dev_size); + device_add(oss_dev); + } if(flow == eCapture) key_name[0] = '1'; @@ -185,18 +206,6 @@ BOOL WINAPI get_device_name_from_guid(GUID *guid, char **name, EDataFlow *flow) return FALSE; } -static void device_add(OSSDevice *oss_dev) -{ - OSSDevice *dev_item; - LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry) - if(IsEqualGUID(&oss_dev->guid, &dev_item->guid)){ /* already in list */ - HeapFree(GetProcessHeap(), 0, oss_dev); - return; - } - - list_add_tail(&g_devices, &oss_dev->entry); -} - HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out, UINT *num, UINT *def_index) { @@ -229,23 +238,14 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **gu WCHAR *name = (WCHAR *)((char *)params.endpoints + params.endpoints[i].name); char *device = (char *)params.endpoints + params.endpoints[i].device; unsigned int name_size = (wcslen(name) + 1) * sizeof(WCHAR); - unsigned int dev_size = strlen(device) + 1; - OSSDevice *oss_dev; ids[i] = HeapAlloc(GetProcessHeap(), 0, name_size); - oss_dev = HeapAlloc(GetProcessHeap(), 0, offsetof(OSSDevice, devnode[dev_size])); - if(!ids[i] || !oss_dev){ - HeapFree(GetProcessHeap(), 0, oss_dev); + if(!ids[i]){ params.result = E_OUTOFMEMORY; goto end; } memcpy(ids[i], name, name_size); get_device_guid(flow, device, guids + i); - - oss_dev->flow = flow; - oss_dev->guid = guids[i]; - memcpy(oss_dev->devnode, device, dev_size); - device_add(oss_dev); } *def_index = params.default_idx;

1 0

Davide Beatrici : winealsa: Export get_device_guid().
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: ac324a06e24a070f235fde98ca5f11304ba6a482 URL: https://gitlab.winehq.org/wine/wine/-/commit/ac324a06e24a070f235fde98ca5f11… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Aug 13 02:14:57 2023 +0200 winealsa: Export get_device_guid(). --- dlls/winealsa.drv/mmdevdrv.c | 2 +- dlls/winealsa.drv/winealsa.drv.spec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index caeade5be56..eaf4679ce9b 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -117,7 +117,7 @@ exit: RegCloseKey(drv_key); } -static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) +void WINAPI get_device_guid(EDataFlow flow, const char *device, GUID *guid) { HKEY key = NULL, dev_key; DWORD type, size = sizeof(*guid); diff --git a/dlls/winealsa.drv/winealsa.drv.spec b/dlls/winealsa.drv/winealsa.drv.spec index 64089c6df10..47db9f1a179 100644 --- a/dlls/winealsa.drv/winealsa.drv.spec +++ b/dlls/winealsa.drv/winealsa.drv.spec @@ -4,5 +4,6 @@ @ stdcall -private modMessage(long long long long long) ALSA_modMessage # MMDevAPI driver functions +@ stdcall -private get_device_guid(long ptr ptr) get_device_guid @ stdcall -private get_device_name_from_guid(ptr ptr ptr) get_device_name_from_guid @ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs

1 0

Daniel Lehman : include: Add [_w]getenv_s.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: 8fb70648d13875eefb07ae26c53bdb7bd2db8141 URL: https://gitlab.winehq.org/wine/wine/-/commit/8fb70648d13875eefb07ae26c53bdb… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Aug 21 22:32:06 2023 -0700 include: Add [_w]getenv_s. --- include/msvcrt/corecrt_wstdlib.h | 11 +++++++++++ include/msvcrt/stdlib.h | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/include/msvcrt/corecrt_wstdlib.h b/include/msvcrt/corecrt_wstdlib.h index eef1fa26e0b..e37da1848ac 100644 --- a/include/msvcrt/corecrt_wstdlib.h +++ b/include/msvcrt/corecrt_wstdlib.h @@ -24,6 +24,7 @@ _ACRTIMP wchar_t* __cdecl _ultow(__msvcrt_ulong,wchar_t*,int); _ACRTIMP errno_t __cdecl _ultow_s(__msvcrt_ulong, wchar_t*, size_t, int); _ACRTIMP wchar_t* __cdecl _wfullpath(wchar_t*,const wchar_t*,size_t); _ACRTIMP wchar_t* __cdecl _wgetenv(const wchar_t*); +_ACRTIMP errno_t __cdecl _wgetenv_s(size_t *,wchar_t *,size_t,const wchar_t *); _ACRTIMP void __cdecl _wmakepath(wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*); _ACRTIMP int __cdecl _wmakepath_s(wchar_t*,size_t,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*); _ACRTIMP void __cdecl _wperror(const wchar_t*); @@ -63,6 +64,16 @@ _ACRTIMP unsigned __int64 __cdecl wcstoull(const wchar_t*,wchar_t**,int); _ACRTIMP unsigned __int64 __cdecl _wcstoull_l(const wchar_t*,wchar_t**,int,_locale_t); #ifdef __cplusplus +extern "C++" { + +template <size_t size> +inline errno_t _wgetenv_s(size_t *ret, wchar_t (&buf)[size], const wchar_t *var) +{ + return _wgetenv_s(ret, buf, size, var); +} + +} /* extern "C++" */ + } #endif diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index e7dd2caefc4..b7ced413440 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -216,6 +216,7 @@ _ACRTIMP ldiv_t __cdecl ldiv(__msvcrt_long,__msvcrt_long); _ACRTIMP lldiv_t __cdecl lldiv(__int64,__int64); _ACRTIMP DECLSPEC_NORETURN void __cdecl exit(int); _ACRTIMP char* __cdecl getenv(const char*); +_ACRTIMP errno_t __cdecl getenv_s(size_t*,char*,size_t,const char*); _ACRTIMP __msvcrt_long __cdecl labs(__msvcrt_long); _ACRTIMP __int64 __cdecl llabs(__int64); _ACRTIMP int __cdecl mblen(const char*,size_t); @@ -255,6 +256,16 @@ static inline long double strtold(const char *string, char **endptr) { return _s #endif /* _UCRT */ #ifdef __cplusplus +extern "C++" { + +template <size_t size> +inline errno_t getenv_s(size_t *ret, char (&buf)[size], const char *var) +{ + return getenv_s(ret, buf, size, var); +} + +} /* extern "C++" */ + } #endif

1 0

Alex Henrie : cryptui: Use CRT allocation functions.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: 73695eff14b15edee173be50e8326ced1e82cdf6 URL: https://gitlab.winehq.org/wine/wine/-/commit/73695eff14b15edee173be50e8326c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 22 22:11:53 2023 -0600 cryptui: Use CRT allocation functions. --- dlls/cryptui/main.c | 367 +++++++++++++++++++++++----------------------------- 1 file changed, 159 insertions(+), 208 deletions(-)

1 0

Conor McCarthy : vkd3d: Fix invalid atomic behaviour in the view cache linked list.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: vkd3d Branch: master Commit: 3ca225980755032b385b36142d4cc44e78a987fd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3ca225980755032b385b36142d4cc… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Aug 9 00:48:19 2023 +1000 vkd3d: Fix invalid atomic behaviour in the view cache linked list. The list suffers from the ABA problem, where comparison with the head succeeds but the head's `next` pointer has changed. Occurs in Cyberpunk 2077, on NVIDIA at least. --- libs/vkd3d/device.c | 12 ++++++---- libs/vkd3d/resource.c | 57 ++++++++++++++++++++++++++++++++++------------ libs/vkd3d/vkd3d_private.h | 10 +++++++- 3 files changed, 60 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index a2e1f13d..19ecb0eb 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2435,19 +2435,23 @@ static void device_init_descriptor_pool_sizes(struct d3d12_device *device) static void vkd3d_desc_object_cache_init(struct vkd3d_desc_object_cache *cache, size_t size) { - cache->head = NULL; + memset(cache, 0, sizeof(*cache)); cache->size = size; } static void vkd3d_desc_object_cache_cleanup(struct vkd3d_desc_object_cache *cache) { union d3d12_desc_object u; + unsigned int i; void *next; - for (u.object = cache->head; u.object; u.object = next) + for (i = 0; i < ARRAY_SIZE(cache->heads); ++i) { - next = u.header->next; - vkd3d_free(u.object); + for (u.object = cache->heads[i].head; u.object; u.object = next) + { + next = u.header->next; + vkd3d_free(u.object); + } } } diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index cd3856c2..f4158eba 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2282,38 +2282,67 @@ ULONG vkd3d_resource_decref(ID3D12Resource *resource) return d3d12_resource_decref(impl_from_ID3D12Resource(resource)); } -/* Objects are cached so that vkd3d_view_incref() can safely check the refcount - * of an object freed by another thread. */ +#define HEAD_INDEX_MASK (ARRAY_SIZE(cache->heads) - 1) + +/* Objects are cached so that vkd3d_view_incref() can safely check the refcount of an + * object freed by another thread. This could be implemented as a single atomic linked + * list, but it requires handling the ABA problem, which brings issues with cross-platform + * support, compiler support, and non-universal x86-64 support for 128-bit CAS. */ static void *vkd3d_desc_object_cache_get(struct vkd3d_desc_object_cache *cache) { union d3d12_desc_object u; - void *next; + unsigned int i; - do + STATIC_ASSERT(!(ARRAY_SIZE(cache->heads) & HEAD_INDEX_MASK)); + + i = (vkd3d_atomic_increment(&cache->next_index)) & HEAD_INDEX_MASK; + for (;;) { - u.object = cache->head; - if (!u.object) + if (vkd3d_atomic_compare_exchange(&cache->heads[i].spinlock, 0, 1)) + { + if ((u.object = cache->heads[i].head)) + { + vkd3d_atomic_decrement(&cache->free_count); + cache->heads[i].head = u.header->next; + vkd3d_atomic_exchange(&cache->heads[i].spinlock, 0); + return u.object; + } + vkd3d_atomic_exchange(&cache->heads[i].spinlock, 0); + } + /* Keeping a free count avoids uncertainty over when this loop should terminate, + * which could result in excess allocations gradually increasing without limit. */ + if (cache->free_count < ARRAY_SIZE(cache->heads)) return vkd3d_malloc(cache->size); - next = u.header->next; - } - while (!vkd3d_atomic_compare_exchange_pointer(&cache->head, u.object, next)); - return u.object; + i = (i + 1) & HEAD_INDEX_MASK; + } } static void vkd3d_desc_object_cache_push(struct vkd3d_desc_object_cache *cache, void *object) { union d3d12_desc_object u = {object}; + unsigned int i; void *head; - do + /* Using the same index as above may result in a somewhat uneven distribution, + * but the main objective is to avoid costly spinlock contention. */ + i = (vkd3d_atomic_increment(&cache->next_index)) & HEAD_INDEX_MASK; + for (;;) { - head = cache->head; - u.header->next = head; + if (vkd3d_atomic_compare_exchange(&cache->heads[i].spinlock, 0, 1)) + break; + i = (i + 1) & HEAD_INDEX_MASK; } - while (!vkd3d_atomic_compare_exchange_pointer(&cache->head, head, u.object)); + + head = cache->heads[i].head; + u.header->next = head; + cache->heads[i].head = u.object; + vkd3d_atomic_exchange(&cache->heads[i].spinlock, 0); + vkd3d_atomic_increment(&cache->free_count); } +#undef HEAD_INDEX_MASK + static struct vkd3d_cbuffer_desc *vkd3d_cbuffer_desc_create(struct d3d12_device *device) { struct vkd3d_cbuffer_desc *desc; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 4bd6812b..de8072f6 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1690,9 +1690,17 @@ struct vkd3d_uav_clear_state HRESULT vkd3d_uav_clear_state_init(struct vkd3d_uav_clear_state *state, struct d3d12_device *device); void vkd3d_uav_clear_state_cleanup(struct vkd3d_uav_clear_state *state, struct d3d12_device *device); +struct desc_object_cache_head +{ + void *head; + unsigned int spinlock; +}; + struct vkd3d_desc_object_cache { - void * volatile head; + struct desc_object_cache_head heads[16]; + unsigned int next_index; + unsigned int free_count; size_t size; };

1 0

Piotr Caban : wmic: Use fwprintf to output error messages.
by Alexandre Julliard Aug. 22, 2023

Aug. 22, 2023

Module: wine Branch: master Commit: 846d164092490f58bcae0355160c2eb70aaa9840 URL: https://gitlab.winehq.org/wine/wine/-/commit/846d164092490f58bcae0355160c2e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 22 13:48:50 2023 +0200 wmic: Use fwprintf to output error messages. --- programs/wmic/main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index e49300c9cbc..20030101224 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -19,6 +19,7 @@ #define COBJMACROS +#include <locale.h> #include <stdio.h> #include "windows.h" #include "ocidl.h" @@ -64,7 +65,6 @@ static const WCHAR *find_class( const WCHAR *alias ) static int WINAPIV output_string( HANDLE handle, const WCHAR *msg, ... ) { - BOOL output = GetStdHandle(STD_OUTPUT_HANDLE) == handle; static const WCHAR bomW[] = {0xfeff}; static BOOL bom; va_list va_args; @@ -78,7 +78,7 @@ static int WINAPIV output_string( HANDLE handle, const WCHAR *msg, ... ) if (!WriteConsoleW( handle, buffer, len, &count, NULL )) { - if (output && !bom) + if (!bom) { WriteFile( handle, bomW, sizeof(bomW), &bom_count, FALSE ); bom = TRUE; @@ -94,7 +94,7 @@ static int output_error( int msg ) WCHAR buffer[8192]; LoadStringW( GetModuleHandleW(NULL), msg, buffer, ARRAY_SIZE(buffer)); - return output_string( GetStdHandle(STD_ERROR_HANDLE), L"%s", buffer ); + return fwprintf( stderr, L"%s", buffer ); } static int output_text( const WCHAR *str, ULONG column_width ) @@ -340,6 +340,8 @@ int __cdecl wmain(int argc, WCHAR *argv[]) const WCHAR *class, *value; int i; + setlocale( LC_ALL, "" ); + for (i = 1; i < argc && argv[i][0] == '/'; i++) WINE_FIXME( "command line switch %s not supported\n", debugstr_w(argv[i]) );

1 0

Piotr Caban : wmic: Fix output when redirected to pipe.
by Alexandre Julliard Aug. 22, 2023

Aug. 22, 2023

Module: wine Branch: master Commit: 707d299da62414e6582c5c0c8cfec0cd43c3ac97 URL: https://gitlab.winehq.org/wine/wine/-/commit/707d299da62414e6582c5c0c8cfec0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 22 14:18:12 2023 +0200 wmic: Fix output when redirected to pipe. --- programs/wmic/main.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index 20030101224..936fe45139d 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -19,6 +19,8 @@ #define COBJMACROS +#include <fcntl.h> +#include <io.h> #include <locale.h> #include <stdio.h> #include "windows.h" @@ -63,29 +65,25 @@ static const WCHAR *find_class( const WCHAR *alias ) return NULL; } -static int WINAPIV output_string( HANDLE handle, const WCHAR *msg, ... ) +static int WINAPIV output_string( const WCHAR *msg, ... ) { - static const WCHAR bomW[] = {0xfeff}; + int count, bom_count = 0; static BOOL bom; va_list va_args; - int len; - DWORD count, bom_count = 0; - WCHAR buffer[8192]; - - va_start( va_args, msg ); - len = vswprintf( buffer, ARRAY_SIZE(buffer), msg, va_args ); - va_end( va_args ); - if (!WriteConsoleW( handle, buffer, len, &count, NULL )) + if (!bom) { - if (!bom) + if (GetFileType((HANDLE)_get_osfhandle( STDOUT_FILENO )) == FILE_TYPE_DISK) { - WriteFile( handle, bomW, sizeof(bomW), &bom_count, FALSE ); - bom = TRUE; + _setmode( STDOUT_FILENO, _O_U16TEXT ); + bom_count = wprintf( L"\xfeff" ); } - WriteFile( handle, buffer, len * sizeof(WCHAR), &count, FALSE ); + bom = TRUE; } + va_start( va_args, msg ); + count = vwprintf( msg, va_args ); + va_end( va_args ); return count + bom_count; } @@ -99,12 +97,12 @@ static int output_error( int msg ) static int output_text( const WCHAR *str, ULONG column_width ) { - return output_string( GetStdHandle(STD_OUTPUT_HANDLE), L"%-*s", column_width, str ); + return output_string( L"%-*s", column_width, str ); } static int output_newline( void ) { - return output_string( GetStdHandle(STD_OUTPUT_HANDLE), L"\r\n" ); + return output_string( L"\n" ); } static WCHAR * strip_spaces(WCHAR *start)

1 0

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