February 2022 - Wine-Devel - list.winehq.org

[PATCH v2 1/8] advapi32: Add AccessCheckByTypeAndAuditAlarmA stub.
by Mohamad Al-Jaf Feb. 16, 2022

Feb. 16, 2022

Needed for IE11. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: Fix whitespace error. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 16 ++++++++++++++++ include/winbase.h | 1 + include/winnt.h | 7 +++++++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index cefc8dc2899..ce9a003e127 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -8,7 +8,7 @@ @ stdcall AccessCheckAndAuditAlarmA(str ptr str str ptr long ptr long ptr ptr ptr) @ stdcall -import AccessCheckAndAuditAlarmW(wstr ptr wstr wstr ptr long ptr long ptr ptr ptr) @ stdcall -import AccessCheckByType(ptr ptr long long ptr long ptr ptr ptr ptr ptr) -# @ stub AccessCheckByTypeAndAuditAlarmA +@ stdcall AccessCheckByTypeAndAuditAlarmA(str ptr str str ptr ptr long long long ptr long ptr long ptr ptr ptr) # @ stub AccessCheckByTypeAndAuditAlarmW # @ stub AccessCheckByTypeResultList # @ stub AccessCheckByTypeResultListAndAuditAlarmA diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index e0f7b63aedb..a6247cd7f89 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1429,6 +1429,22 @@ BOOL WINAPI AccessCheckAndAuditAlarmA(LPCSTR Subsystem, LPVOID HandleId, LPSTR O return TRUE; } +/****************************************************************************** + * AccessCheckByTypeAndAuditAlarmA [ADVAPI32.@] + */ +BOOL WINAPI AccessCheckByTypeAndAuditAlarmA( LPCSTR subsystem, LPVOID id, LPCSTR type_name, + LPCSTR name, PSECURITY_DESCRIPTOR descr, PSID sid, + DWORD access, AUDIT_EVENT_TYPE audit, DWORD flags, + POBJECT_TYPE_LIST types, DWORD length, + PGENERIC_MAPPING mapping, BOOL creation, LPDWORD granted, + LPBOOL status, LPBOOL on_close ) +{ + FIXME( "stub (%s,%p,%s,%s,%p,%p,%08x,%p,%08x,%p,%08x,%p,%x,%p,%p,%p)\n", debugstr_a(subsystem), + id, debugstr_a(type_name), debugstr_a(name), descr, sid, access, audit, + flags, types, length, mapping, creation, granted, status, on_close ); + return TRUE; +} + BOOL WINAPI ObjectCloseAuditAlarmA(LPCSTR SubsystemName, LPVOID HandleId, BOOL GenerateOnClose) { FIXME("stub (%s,%p,%x)\n", debugstr_a(SubsystemName), HandleId, GenerateOnClose); diff --git a/include/winbase.h b/include/winbase.h index 0a0bfde9d10..379bd06830f 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1780,6 +1780,7 @@ WINADVAPI BOOL WINAPI AccessCheckAndAuditAlarmA(LPCSTR,LPVOID,LPSTR,LPST WINADVAPI BOOL WINAPI AccessCheckAndAuditAlarmW(LPCWSTR,LPVOID,LPWSTR,LPWSTR,PSECURITY_DESCRIPTOR,DWORD,PGENERIC_MAPPING,BOOL,LPDWORD,LPBOOL,LPBOOL); #define AccessCheckAndAuditAlarm WINELIB_NAME_AW(AccessCheckAndAuditAlarm) WINADVAPI BOOL WINAPI AccessCheckByType(PSECURITY_DESCRIPTOR,PSID,HANDLE,DWORD,POBJECT_TYPE_LIST,DWORD,PGENERIC_MAPPING,PPRIVILEGE_SET,LPDWORD,LPDWORD,LPBOOL); +WINADVAPI BOOL WINAPI AccessCheckByTypeAndAuditAlarmA(LPCSTR,LPVOID,LPCSTR,LPCSTR,PSECURITY_DESCRIPTOR,PSID,DWORD,AUDIT_EVENT_TYPE,DWORD,POBJECT_TYPE_LIST,DWORD,PGENERIC_MAPPING,BOOL,LPDWORD,LPBOOL,LPBOOL); WINBASEAPI VOID WINAPI AcquireSRWLockExclusive(PSRWLOCK); WINBASEAPI VOID WINAPI AcquireSRWLockShared(PSRWLOCK); WINADVAPI BOOL WINAPI AdjustTokenPrivileges(HANDLE,BOOL,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD); diff --git a/include/winnt.h b/include/winnt.h index bd64b092369..b82c96bfb27 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3633,6 +3633,13 @@ typedef PVOID PACCESS_TOKEN; typedef PVOID PSECURITY_DESCRIPTOR; typedef PVOID PSID; +typedef enum _AUDIT_EVENT_TYPE { + AuditEventObjectAccess, + AuditEventDirectoryServiceAccess +} AUDIT_EVENT_TYPE, *PAUDIT_EVENT_TYPE; + +#define AUDIT_ALLOW_NO_PRIVILEGE 0x1 + typedef enum _TOKEN_ELEVATION_TYPE { TokenElevationTypeDefault = 1, TokenElevationTypeFull, -- 2.35.1

1 8

[PATCH v4 1/5] ncrypt: Make NCryptOpenStorageProvider return a valid stub pointer.
by Santino Mazza Feb. 16, 2022

Feb. 16, 2022

Some applications crash when the storage provider its null. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/ncrypt/main.c | 17 ++++++++++- dlls/ncrypt/ncrypt_internal.h | 56 +++++++++++++++++++++++++++++++++++ dlls/ncrypt/tests/ncrypt.c | 2 -- 3 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 dlls/ncrypt/ncrypt_internal.h diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index f23b239d93f..3a916e5b722 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -19,10 +19,12 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" #include "ncrypt.h" +#include "ncrypt_internal.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); @@ -129,10 +131,23 @@ SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HAN return NTE_NOT_SUPPORTED; } +int allocate_storage_provider_object(struct ncrypt_object **providerobject) +{ + *providerobject = malloc(sizeof(struct ncrypt_object)); + if (providerobject == NULL) + { + ERR("Error allocating memory.\n"); + return NTE_NO_MEMORY; + } + memset(*providerobject, 0, sizeof(struct ncrypt_object)); + (*providerobject)->type = STORAGE_PROVIDER; + return ERROR_SUCCESS; +} + SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *provider, const WCHAR *name, DWORD flags) { FIXME("(%p, %s, %u): stub\n", provider, wine_dbgstr_w(name), flags); - return NTE_NOT_SUPPORTED; + return allocate_storage_provider_object((struct ncrypt_object**)provider); } SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE object, const WCHAR *property, diff --git a/dlls/ncrypt/ncrypt_internal.h b/dlls/ncrypt/ncrypt_internal.h new file mode 100644 index 00000000000..1201cdd857a --- /dev/null +++ b/dlls/ncrypt/ncrypt_internal.h @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2021 Santino Mazza + * + * 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 + */ + +#ifndef NCRYPT_INTERNAL_H +#define NCRYPT_INTERNAL_H + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winternl.h" + +struct ncrypt_storage_provider_object +{ + // FIXME Stub +}; + +enum ncrypt_object_type +{ + STORAGE_PROVIDER, +}; + +struct ncrypt_object_property +{ + WCHAR *key; + DWORD value_size; + VOID *value; +}; + +struct ncrypt_object +{ + enum ncrypt_object_type type; + DWORD number_of_properties; + struct ncrypt_object_property *properties; + union + { + struct ncrypt_storage_provider_object storage_provider; + } object; +}; + +#endif // NCRYPT_INTERNAL_H diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 045dd60c793..df2179ca10a 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -92,12 +92,10 @@ static void test_key_import_rsa(void) NCRYPT_KEY_HANDLE key; SECURITY_STATUS ret; - todo_wine { prov = 0; ret = NCryptOpenStorageProvider(&prov, NULL, 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); ok(prov, "got null handle\n"); - } todo_wine { key = 0; -- 2.32.0

1 0

[PATCH v4 1/5] ncrypt: Make NCryptOpenStorageProvider return a valid stub pointer.
by Santino Mazza Feb. 16, 2022

Feb. 16, 2022

Some applications crash when the storage provider its null. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/ncrypt/main.c | 17 ++++++++++- dlls/ncrypt/ncrypt_internal.h | 56 +++++++++++++++++++++++++++++++++++ dlls/ncrypt/tests/ncrypt.c | 2 -- 3 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 dlls/ncrypt/ncrypt_internal.h diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index f23b239d93f..3a916e5b722 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -19,10 +19,12 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" #include "ncrypt.h" +#include "ncrypt_internal.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); @@ -129,10 +131,23 @@ SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HAN return NTE_NOT_SUPPORTED; } +int allocate_storage_provider_object(struct ncrypt_object **providerobject) +{ + *providerobject = malloc(sizeof(struct ncrypt_object)); + if (providerobject == NULL) + { + ERR("Error allocating memory.\n"); + return NTE_NO_MEMORY; + } + memset(*providerobject, 0, sizeof(struct ncrypt_object)); + (*providerobject)->type = STORAGE_PROVIDER; + return ERROR_SUCCESS; +} + SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *provider, const WCHAR *name, DWORD flags) { FIXME("(%p, %s, %u): stub\n", provider, wine_dbgstr_w(name), flags); - return NTE_NOT_SUPPORTED; + return allocate_storage_provider_object((struct ncrypt_object**)provider); } SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE object, const WCHAR *property, diff --git a/dlls/ncrypt/ncrypt_internal.h b/dlls/ncrypt/ncrypt_internal.h new file mode 100644 index 00000000000..1201cdd857a --- /dev/null +++ b/dlls/ncrypt/ncrypt_internal.h @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2021 Santino Mazza + * + * 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 + */ + +#ifndef NCRYPT_INTERNAL_H +#define NCRYPT_INTERNAL_H + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winternl.h" + +struct ncrypt_storage_provider_object +{ + // FIXME Stub +}; + +enum ncrypt_object_type +{ + STORAGE_PROVIDER, +}; + +struct ncrypt_object_property +{ + WCHAR *key; + DWORD value_size; + VOID *value; +}; + +struct ncrypt_object +{ + enum ncrypt_object_type type; + DWORD number_of_properties; + struct ncrypt_object_property *properties; + union + { + struct ncrypt_storage_provider_object storage_provider; + } object; +}; + +#endif // NCRYPT_INTERNAL_H diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 045dd60c793..df2179ca10a 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -92,12 +92,10 @@ static void test_key_import_rsa(void) NCRYPT_KEY_HANDLE key; SECURITY_STATUS ret; - todo_wine { prov = 0; ret = NCryptOpenStorageProvider(&prov, NULL, 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); ok(prov, "got null handle\n"); - } todo_wine { key = 0; -- 2.32.0

1 4

Re: [PATCH 4/6] dlls/quartz: use VIDEOINFOHEADER instead of partially allocated VIDEOINFO structure
by Zebediah Figura Feb. 15, 2022

Feb. 15, 2022

On 2/14/22 13:32, Eric Pouech wrote: >> I think this is a gcc bug. It now warns about *any* access to a >> structure which was allocated with anything but sizeof(). E.g. the >> following will generate warnings with -O2 -Warray-bounds=1: >> >> -- >> >> #include <stddef.h> >> #include <stdlib.h> >> >> struct apple >> { >> unsigned int u; >> char v[10]; >> }; >> >> struct apple *func(void) >> { >> struct apple *a = malloc(offsetof(struct apple, v[10])); >> >> a->u = 1; >> a->v[9] = 3; >> return a; >> } >> >> -- >> >> Same with malloc(14). Only malloc(sizeof(struct apple)) works, even >> though the three expressions are obviously identical. >> >> If we must work around this in Wine, I'd rather either disable >> -Warray-bounds or else just use sizeof() and over-allocate. > > compiling here your snipnet gives 16 bytes for apple not 14 > > > using malloc(16) instead of malloc(offsetof(struct apple, v[10])) > doesn't generate warning > > > my understanding if that gcc generates a warning when accessing a > structure which allocation is strictly smaller than the structure size > > even if all required bits are inside the allocated part Right, I managed to forget how struct alignment works. [1] claims the following: "It's not valid to access an object of one type using an lvalue of another. In simple cases GCC diagnoses violations of this requirement by -Wstrict-aliasing. -Warray-bounds doesn't detect aliasing violations but it does detect a subset of the problem that's apparent when the size of the lvalue's type is greater than the size of the object. The object must be big enough for the whole lvalue, even if the accessed member is within the bounds of the smaller object." I can't easily find this in the C specification, but it's also not the easiest thing to search for, and it wouldn't surprise me if it's true. Still, I'm not convinced we really want to change our usage accordingly. I'm guessing this is one of those things that may be undefined behaviour but always works in practice, and from the looks of things we have more false positives from -Warray-bounds than true positives. But if we really do want -Warray-bounds, I'd rather just allocate the whole VIDEOINFO structure here. [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103292 P.S. can you please remember to keep wine-devel in CC?

2 1

[PATCH] server: Use a free list for unallocated object handles.
by Zebediah Figura Feb. 15, 2022

Feb. 15, 2022

The Legend of Heroes: Trails of Cold Steel III suffers from an application bug, where it tries to wait on a handle after closing it. Because of the usage patterns of the game and the way Wine allocates handles, the handle is usually reused by a separate object, which is effectively never signaled, resulting in a hang. This patch changes our handle allocation strategy to resemble Windows, and in the process makes the race much less likely, although still theoretically possible. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52461 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- A more detailed explanation of the bug can be found in the linked bug report. server/handle.c | 125 +++++++++++++++++++++++++----------------------- 1 file changed, 65 insertions(+), 60 deletions(-) diff --git a/server/handle.c b/server/handle.c index bc692b8ebeb..75b1f7969df 100644 --- a/server/handle.c +++ b/server/handle.c @@ -41,8 +41,13 @@ struct handle_entry { - struct object *ptr; /* object */ - unsigned int access; /* access rights */ + union + { + struct object *ptr; /* object */ + struct handle_entry *next; /* next free entry */ + } u; + unsigned int access; /* access rights */ + int used; /* is the entry currently in use? */ }; struct handle_table @@ -51,8 +56,8 @@ struct handle_table struct process *process; /* process owning this table */ int count; /* number of allocated entries */ int last; /* last used entry */ - int free; /* first entry that may be free */ struct handle_entry *entries; /* handle entries */ + struct handle_entry *freelist; /* head of free list */ }; static struct handle_table *global_table; @@ -157,11 +162,11 @@ static void handle_table_dump( struct object *obj, int verbose ) entry = table->entries; for (i = 0; i <= table->last; i++, entry++) { - if (!entry->ptr) continue; + if (!entry->used) continue; fprintf( stderr, " %04x: %p %08x ", - index_to_handle(i), entry->ptr, entry->access ); - dump_object_name( entry->ptr ); - entry->ptr->ops->dump( entry->ptr, 0 ); + index_to_handle(i), entry->u.ptr, entry->access ); + dump_object_name( entry->u.ptr ); + entry->u.ptr->ops->dump( entry->u.ptr, 0 ); } } @@ -176,12 +181,14 @@ static void handle_table_destroy( struct object *obj ) for (i = 0, entry = table->entries; i <= table->last; i++, entry++) { - struct object *obj = entry->ptr; - entry->ptr = NULL; - if (obj) + if (entry->used) { + struct object *obj = entry->u.ptr; if (table->process) obj->ops->close_handle( obj, table->process, index_to_handle(i) ); + entry->used = 0; + entry->u.next = table->freelist; + table->freelist = entry; release_object_from_handle( obj ); } } @@ -208,7 +215,7 @@ struct handle_table *alloc_handle_table( struct process *process, int count ) table->process = process; table->count = count; table->last = -1; - table->free = 0; + table->freelist = NULL; if ((table->entries = mem_alloc( count * sizeof(*table->entries) ))) return table; release_object( table ); return NULL; @@ -234,21 +241,23 @@ static int grow_handle_table( struct handle_table *table ) /* allocate the first free entry in the handle table */ static obj_handle_t alloc_entry( struct handle_table *table, void *obj, unsigned int access ) { - struct handle_entry *entry = table->entries + table->free; - int i; + struct handle_entry *entry; - for (i = table->free; i <= table->last; i++, entry++) if (!entry->ptr) goto found; - if (i >= table->count) + if (table->freelist) { - if (!grow_handle_table( table )) return 0; - entry = table->entries + i; /* the entries may have moved */ + entry = table->freelist; + table->freelist = entry->u.next; } - table->last = i; - found: - table->free = i + 1; - entry->ptr = grab_object_for_handle( obj ); + else + { + if (table->last + 1 >= table->count && !grow_handle_table( table )) return 0; + entry = &table->entries[++table->last]; + } + + entry->used = 1; + entry->u.ptr = grab_object_for_handle( obj ); entry->access = access; - return index_to_handle(i); + return index_to_handle( entry - table->entries ); } /* allocate a handle for an object, incrementing its refcount */ @@ -327,31 +336,10 @@ static struct handle_entry *get_handle( struct process *process, obj_handle_t ha if (index < 0) return NULL; if (index > table->last) return NULL; entry = table->entries + index; - if (!entry->ptr) return NULL; + if (!entry->used) return NULL; return entry; } -/* attempt to shrink a table */ -static void shrink_handle_table( struct handle_table *table ) -{ - struct handle_entry *entry = table->entries + table->last; - struct handle_entry *new_entries; - int count = table->count; - - while (table->last >= 0) - { - if (entry->ptr) break; - table->last--; - entry--; - } - if (table->last >= count / 4) return; /* no need to shrink */ - if (count < MIN_HANDLE_ENTRIES * 2) return; /* too small to shrink */ - count /= 2; - if (!(new_entries = realloc( table->entries, count * sizeof(*new_entries) ))) return; - table->count = count; - table->entries = new_entries; -} - static void inherit_handle( struct process *parent, const obj_handle_t handle, struct handle_table *table ) { struct handle_entry *dst, *src; @@ -362,8 +350,9 @@ static void inherit_handle( struct process *parent, const obj_handle_t handle, s src = get_handle( parent, handle ); if (!src || !(src->access & RESERVED_INHERIT)) return; index = handle_to_index( handle ); - if (dst[index].ptr) return; - grab_object_for_handle( src->ptr ); + if (dst[index].used) return; + + grab_object_for_handle( src->u.ptr ); dst[index] = *src; table->last = max( table->last, index ); } @@ -397,6 +386,18 @@ struct handle_table *copy_handle_table( struct process *process, struct process { inherit_handle( parent, std_handles[i], table ); } + + /* iterate in reverse so that low values are allocated first */ + for (i = table->last; i >= 0; --i) + { + struct handle_entry *entry = &table->entries[i]; + + if (!entry->used) + { + entry->u.next = table->freelist; + table->freelist = entry; + } + } } else { @@ -406,14 +407,16 @@ struct handle_table *copy_handle_table( struct process *process, struct process memcpy( ptr, parent_table->entries, (table->last + 1) * sizeof(struct handle_entry) ); for (i = 0; i <= table->last; i++, ptr++) { - if (!ptr->ptr) continue; - if (ptr->access & RESERVED_INHERIT) grab_object_for_handle( ptr->ptr ); - else ptr->ptr = NULL; /* don't inherit this entry */ + if (ptr->used && (ptr->access & RESERVED_INHERIT)) grab_object_for_handle( ptr->u.ptr ); + else + { + ptr->used = 0; + ptr->u.next = table->freelist; + table->freelist = ptr; + } } } } - /* attempt to shrink the table */ - shrink_handle_table( table ); return table; } @@ -426,12 +429,14 @@ unsigned int close_handle( struct process *process, obj_handle_t handle ) if (!(entry = get_handle( process, handle ))) return STATUS_INVALID_HANDLE; if (entry->access & RESERVED_CLOSE_PROTECT) return STATUS_HANDLE_NOT_CLOSABLE; - obj = entry->ptr; + obj = entry->u.ptr; if (!obj->ops->close_handle( obj, process, handle )) return STATUS_HANDLE_NOT_CLOSABLE; - entry->ptr = NULL; + table = handle_is_global(handle) ? global_table : process->handles; - if (entry < table->entries + table->free) table->free = entry - table->entries; - if (entry == table->entries + table->last) shrink_handle_table( table ); + entry->used = 0; + entry->u.next = table->freelist; + table->freelist = entry; + release_object_from_handle( obj ); return STATUS_SUCCESS; } @@ -471,7 +476,7 @@ struct object *get_handle_obj( struct process *process, obj_handle_t handle, set_error( STATUS_INVALID_HANDLE ); return NULL; } - obj = entry->ptr; + obj = entry->u.ptr; if (ops && (obj->ops != ops)) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); /* not the right type */ @@ -513,8 +518,8 @@ obj_handle_t find_inherited_handle( struct process *process, const struct object for (i = 0, ptr = table->entries; i <= table->last; i++, ptr++) { - if (!ptr->ptr) continue; - if (ptr->ptr->ops != ops) continue; + if (!ptr->used) continue; + if (ptr->u.ptr->ops != ops) continue; if (ptr->access & RESERVED_INHERIT) return index_to_handle(i); } return 0; @@ -825,7 +830,7 @@ static int enum_handles( struct process *process, void *user ) for (i = 0, entry = table->entries; i <= table->last; i++, entry++) { - if (!entry->ptr) continue; + if (!entry->used) continue; if (!info->handle) { info->count++; @@ -836,7 +841,7 @@ static int enum_handles( struct process *process, void *user ) handle->owner = process->id; handle->handle = index_to_handle(i); handle->access = entry->access & ~RESERVED_ALL; - handle->type = entry->ptr->ops->type->index; + handle->type = entry->u.ptr->ops->type->index; handle->attributes = 0; if (entry->access & RESERVED_INHERIT) handle->attributes |= OBJ_INHERIT; if (entry->access & RESERVED_CLOSE_PROTECT) handle->attributes |= OBJ_PROTECT_CLOSE; -- 2.34.1

2 4

[PATCH v2 1/2] winevulkan: Manually fixup struct alignment for VkPipelineCreationFeedback.
by Georg Lehmann Feb. 15, 2022

Feb. 15, 2022

We can't reasonably auto generate this because it's output in an otherwise input pNext chain. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 8 +++ dlls/winevulkan/vulkan.c | 110 ++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index c609bbfd151..2f3d647ef9b 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -205,6 +205,8 @@ FUNCTION_OVERRIDES = { # Device functions "vkAllocateCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, "vkCreateCommandPool" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, + "vkCreateComputePipelines" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, + "vkCreateGraphicsPipelines" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, "vkDestroyCommandPool" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, "vkDestroyDevice" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, "vkFreeCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, @@ -250,6 +252,9 @@ FUNCTION_OVERRIDES = { "vkGetDeviceGroupSurfacePresentModesKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, "vkGetPhysicalDevicePresentRectanglesKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, + # VK_KHR_ray_tracing_pipeline + "vkCreateRayTracingPipelinesKHR" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, + # VK_EXT_calibrated_timestamps "vkGetPhysicalDeviceCalibrateableTimeDomainsEXT" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, "vkGetCalibratedTimestampsEXT" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, @@ -261,6 +266,9 @@ FUNCTION_OVERRIDES = { # VK_EXT_debug_report "vkCreateDebugReportCallbackEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, "vkDestroyDebugReportCallbackEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, + + # VK_NV_ray_tracing + "vkCreateRayTracingPipelinesNV" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, } STRUCT_CHAIN_CONVERSIONS = { diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 19cc999433b..f5d1a1f4fc2 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1758,6 +1758,116 @@ NTSTATUS wine_vkDestroyDebugReportCallbackEXT(void *args) return STATUS_SUCCESS; } +static void fixup_pipeline_feedback(VkPipelineCreationFeedback *feedback, uint32_t count) +{ +#if defined(USE_STRUCT_CONVERSION) + struct host_pipeline_feedback + { + VkPipelineCreationFeedbackFlags flags; + uint64_t duration; + } *host_feedback; + int64_t i; + + host_feedback = (void *) feedback; + + for (i = count - 1; i >= 0; i--) + { + memmove(&feedback[i].duration, &host_feedback[i].duration, sizeof(uint64_t)); + feedback[i].flags = host_feedback[i].flags; + } +#else + (void)feedback; + (void)count; +#endif +} + +static void fixup_pipeline_feedback_info(const void *pipeline_info) +{ + VkPipelineCreationFeedbackCreateInfo *feedback; + + feedback = wine_vk_find_struct(pipeline_info, PIPELINE_CREATION_FEEDBACK_CREATE_INFO); + + if (!feedback) + return; + + fixup_pipeline_feedback(feedback->pPipelineCreationFeedback, 1); + fixup_pipeline_feedback(feedback->pPipelineStageCreationFeedbacks, + feedback->pipelineStageCreationFeedbackCount); +} + +NTSTATUS wine_vkCreateComputePipelines(void *args) +{ + struct vkCreateComputePipelines_params *params = args; + VkResult res; + uint32_t i; + + TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + res = thunk_vkCreateComputePipelines(params->device, params->pipelineCache, + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + for (i = 0; i < params->createInfoCount; i++) + fixup_pipeline_feedback_info(&params->pCreateInfos[i]); + + return res; +} + +NTSTATUS wine_vkCreateGraphicsPipelines(void *args) +{ + struct vkCreateGraphicsPipelines_params *params = args; + VkResult res; + uint32_t i; + + TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + res = thunk_vkCreateGraphicsPipelines(params->device, params->pipelineCache, + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + for (i = 0; i < params->createInfoCount; i++) + fixup_pipeline_feedback_info(&params->pCreateInfos[i]); + + return res; +} + +NTSTATUS wine_vkCreateRayTracingPipelinesKHR(void *args) +{ + struct vkCreateRayTracingPipelinesKHR_params *params = args; + VkResult res; + uint32_t i; + + TRACE("%p, 0x%s, 0x%s, %u, %p, %p, %p\n", params->device, + wine_dbgstr_longlong(params->deferredOperation), wine_dbgstr_longlong(params->pipelineCache), + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + res = thunk_vkCreateRayTracingPipelinesKHR(params->device, params->deferredOperation, params->pipelineCache, + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + for (i = 0; i < params->createInfoCount; i++) + fixup_pipeline_feedback_info(&params->pCreateInfos[i]); + + return res; +} + +NTSTATUS wine_vkCreateRayTracingPipelinesNV(void *args) +{ + struct vkCreateRayTracingPipelinesNV_params *params = args; + VkResult res; + uint32_t i; + + TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + res = thunk_vkCreateRayTracingPipelinesNV(params->device, params->pipelineCache, + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + for (i = 0; i < params->createInfoCount; i++) + fixup_pipeline_feedback_info(&params->pCreateInfos[i]); + + return res; +} + BOOL WINAPI wine_vk_is_available_instance_function(VkInstance instance, const char *name) { return !!vk_funcs->p_vkGetInstanceProcAddr(instance->instance, name); -- 2.35.1

2 6

[PATCH 1/2] gdiplus/tests: New path that can cause stack overflow in GdipFlattenPath.
by Robert Feuerbach Feb. 15, 2022

Feb. 15, 2022

A bezier curve found in an application has caused endless recursive calls to flatten_bezier due to float point precision limitations in the flatness test. This curve has been added to the graphicpath.c test to check for the resulting stack overflow error. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52492 Signed-off-by: Robert Feuerbach <rjfeuerbach(a)gmail.com> --- dlls/gdiplus/tests/graphicspath.c | 55 ++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 07e6dd166ad..36508776ed3 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1253,6 +1253,58 @@ static void test_flatten(void) GdipDeletePath(path); } +static void test_flatten2(void) +{ + GpStatus status; + GpPath *path; + INT count; + + status = GdipCreatePath(0, &path); + expect(Ok, status); + status = GdipStartPathFigure(path); + expect(Ok, status); + /* path seen in the wild that caused a stack overflow */ + /* low-precision points that can cause a crash */ + status = GdipAddPathBezier(path, + 154.950806, 33.391144, + 221.586075, 15.536285, + 291.747314, 15.536285, + 358.382568, 33.391144); + expect(Ok, status); + status = GdipAddPathBezier(path, + 256.666809, 412.999512, + 256.666718, 412.999481, + 256.666656, 412.999481, + 256.666565, 412.999512); + expect(Ok, status); + status = GdipClosePathFigure(path); + expect(Ok, status); + trace("Flattening good and problematic bezier curves\n"); + status = GdipFlattenPath(path, NULL, 1.0); + + /* now redo with hexadecimal floats to replicate the points exactly */ + status = GdipResetPath(path); + expect(Ok, status); + status = GdipAddPathBezier(path, + 0x1.35e6d00000000p+7, 0x1.0b21100000000p+5, + 0x1.bb2c120000000p+7, 0x1.f129400000000p+3, + 0x1.23bf500000000p+8, 0x1.f129400000000p+3, + 0x1.6661f00000000p+8, 0x1.0b21100000000p+5); + expect(Ok, status); + status = GdipAddPathBezier(path, + 0x1.00aab40000000p+8, 0x1.9cffe00000000p+8, + 0x1.00aaae0000000p+8, 0x1.9cffde0000000p+8, + 0x1.00aaaa0000000p+8, 0x1.9cffde0000000p+8, + 0x1.00aaa40000000p+8, 0x1.9cffe00000000p+8); + expect(Ok, status); + status = GdipClosePathFigure(path); + expect(Ok, status); + trace("Flattening precise copied problematic curves\n"); + status = GdipFlattenPath(path, NULL, 1.0); + + GdipDeletePath(path); +} + static path_test_t widenline_path[] = { {5.0, 5.0, PathPointTypeStart, 0, 0}, /*0*/ {50.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ @@ -1900,6 +1952,7 @@ START_TEST(graphicspath) test_widen_cap(); test_isvisible(); test_empty_rect(); - + test_flatten2(); + GdiplusShutdown(gdiplusToken); } -- 2.32.0 (Apple Git-132)

5 15

Arbitrary DOS device name
by Daniel Kucera Feb. 15, 2022

Feb. 15, 2022

Hello all, I have a Windows software which tries to access dos device name but it is failing: 0009:Call KERNEL32.CreateFileA(0060f588 "\\\\.\\d6CDE-0",40000000,00000002,00000000,00000003,00000000,00000000) ret=00b1117f 0009:Call ntdll.RtlInitAnsiString(0060f49c,0060f588 "\\\\.\\d6CDE-0") ret=7b036296 0009:Ret ntdll.RtlInitAnsiString() retval=0060f49c ret=7b036296 0009:Call ntdll.RtlAnsiStringToUnicodeString(3fff8bf8,0060f49c,00000000) ret=7b0362fb 0009:Ret ntdll.RtlAnsiStringToUnicodeString() retval=00000000 ret=7b0362fb 0009:Call ntdll._wcsicmp(3fff8c00 L"\\\\.\\d6CDE-0",7b09d0c0 L"CONIN$") ret=7b0355c9 0009:Ret ntdll._wcsicmp() retval=fffffff9 ret=7b0355c9 0009:Call ntdll._wcsicmp(3fff8c00 L"\\\\.\\d6CDE-0",7b09d0ce L"CONOUT$") ret=7b035636 0009:Ret ntdll._wcsicmp() retval=fffffff9 ret=7b035636 0009:Call ntdll.wcsncmp(3fff8c00 L"\\\\.\\d6CDE-0",7b09d644 L"\\\\.\\",00000004) ret=7b035670 0009:Ret ntdll.wcsncmp() retval=00000000 ret=7b035670 0009:Call ntdll.iswalpha(00000064) ret=7b0356cd 0009:Ret ntdll.iswalpha() retval=00000102 ret=7b0356cd 0009:Call ntdll._wcsnicmp(3fff8c08 L"d6CDE-0",7b09d638 L"PIPE\\",00000005) ret=7b0356f5 0009:Ret ntdll._wcsnicmp() retval=fffffff4 ret=7b0356f5 0009:Call ntdll._wcsnicmp(3fff8c08 L"d6CDE-0",7b09d624 L"MAILSLOT\\",00000009) ret=7b03570e 0009:Ret ntdll._wcsnicmp() retval=fffffff7 ret=7b03570e 0009:Call ntdll.RtlIsDosDeviceName_U(3fff8c08 L"d6CDE-0") ret=7b035724 0009:Ret ntdll.RtlIsDosDeviceName_U() retval=00000000 ret=7b035724 0009:Call ntdll.RtlDosPathNameToNtPathName_U(3fff8c00 L"\\\\.\\d6CDE-0",0060f458,00000000,00000000) ret=7b035769 0009:Ret ntdll.RtlDosPathNameToNtPathName_U() retval=00000001 ret=7b035769 0009:Call ntdll.NtCreateFile(0060f454,40100080,0060f474,0060f460,00000000,00000000,00000002,00000001,00000060,00000000,00000000) ret=7b03581e 0009:Ret ntdll.NtCreateFile() retval=c0000034 ret=7b03581e 0009:Call ntdll.RtlNtStatusToDosError(c0000034) ret=7b035a11 0009:Ret ntdll.RtlNtStatusToDosError() retval=00000002 ret=7b035a11 0009:Call ntdll.RtlFreeUnicodeString(0060f458) ret=7b03592b 0009:Ret ntdll.RtlFreeUnicodeString() retval=0060f458 ret=7b03592b 0009:Ret KERNEL32.CreateFileA() retval=ffffffff ret=00b1117f The problem is, that wine doesn't recognize "\\\\.\\d6CDE-0" as valid DOS device name: https://github.com/wine-mirror/wine/blob/e909986e6ea5ecd49b2b847f321ad89b2a… Even when I created the device in HKEY_LOCAL_MACHINE\Software\Wine\Ports it doesn't allow to open it. When I patched the corresponding DLL to use COM81 and created the device in Ports, it works okay (can open the device). I want to write a patch for ntdll/path.c to recognize my string as DOS device but I want it to be generic enough to be acceptable. What approach do you suggest? Can I add a generic match, something like: "\\\\.\\[^\\]+$" ? To add some context here, the software is for controlling USB osclloscope from Hantek: http://hantek.com/uploadpic/hantek/files/20210731/Hantek-6000_Ver2.2.7_D202… It installs a driver which creates mentioned "DOS device" and communicates through it using ioctl. I am reversing the driver and I'll create a Linux char device to handle those ioctl calls and talk to the USB device using libusb. Thanks. -- S pozdravom / Best regards Daniel Kucera.

6 30

[PATCH 1/2] kernel32/tests: Add additional Get/SetThreadDescription() tests.
by Brendan Shanks Feb. 15, 2022

Feb. 15, 2022

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/kernel32/tests/thread.c | 77 ++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 6ccf7af85f8..9c58095fe01 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -100,6 +100,8 @@ static BOOL (WINAPI *pSetThreadGroupAffinity)(HANDLE,const GROUP_AFFINITY*,GROUP static NTSTATUS (WINAPI *pNtSetInformationThread)(HANDLE,THREADINFOCLASS,LPCVOID,ULONG); static HRESULT (WINAPI *pSetThreadDescription)(HANDLE,const WCHAR *); static HRESULT (WINAPI *pGetThreadDescription)(HANDLE,WCHAR **); +static PVOID (WINAPI *pRtlAddVectoredExceptionHandler)(ULONG,PVECTORED_EXCEPTION_HANDLER); +static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID); static HANDLE create_target_process(const char *arg) { @@ -2351,6 +2353,23 @@ static void test_thread_info(void) CloseHandle(thread); } +typedef struct tagTHREADNAME_INFO +{ + DWORD dwType; /* Must be 0x1000. */ + LPCSTR szName; /* Pointer to name (in user addr space). */ + DWORD dwThreadID; /* Thread ID (-1 = caller thread). */ + DWORD dwFlags; /* Reserved for future use, must be zero. */ +} THREADNAME_INFO; + +static LONG CALLBACK msvc_threadname_vec_handler(EXCEPTION_POINTERS *ExceptionInfo) +{ + if (ExceptionInfo->ExceptionRecord != NULL && + ExceptionInfo->ExceptionRecord->ExceptionCode == EXCEPTION_WINE_NAME_THREAD) + return EXCEPTION_CONTINUE_EXECUTION; + + return EXCEPTION_CONTINUE_SEARCH; +} + static void test_thread_description(void) { THREAD_NAME_INFORMATION *thread_desc; @@ -2360,6 +2379,9 @@ static void test_thread_description(void) char buff[128]; WCHAR *ptr; HRESULT hr; + HANDLE thread; + PVOID vectored_handler; + THREADNAME_INFO info; if (!pGetThreadDescription) { @@ -2476,6 +2498,59 @@ static void test_thread_description(void) ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); ok(!lstrcmpW(ptr, L""), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); LocalFree(ptr); + + /* Get with only THREAD_QUERY_LIMITED_INFORMATION access. */ + thread = OpenThread(THREAD_QUERY_LIMITED_INFORMATION, FALSE, GetCurrentThreadId()); + + ptr = NULL; + hr = pGetThreadDescription(thread, &ptr); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); + ok(!lstrcmpW(ptr, L""), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); + LocalFree(ptr); + + len = 0; + status = pNtQueryInformationThread(thread, ThreadNameInformation, NULL, 0, &len); + ok(status == STATUS_BUFFER_TOO_SMALL, "Unexpected status %#x.\n", status); + ok(len == sizeof(*thread_desc), "Unexpected structure length %u.\n", len); + + CloseHandle(thread); + + /* Set with only THREAD_SET_LIMITED_INFORMATION access. */ + thread = OpenThread(THREAD_SET_LIMITED_INFORMATION, FALSE, GetCurrentThreadId()); + + hr = pSetThreadDescription(thread, desc); + todo_wine + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); + + ptr = NULL; + hr = pGetThreadDescription(GetCurrentThread(), &ptr); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); + todo_wine + ok(!lstrcmpW(ptr, desc), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); + LocalFree(ptr); + + CloseHandle(thread); + + /* The old exception-based thread name method should not affect GetThreadDescription. */ + hr = pSetThreadDescription(GetCurrentThread(), desc); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); + + vectored_handler = pRtlAddVectoredExceptionHandler(FALSE, &msvc_threadname_vec_handler); + ok(vectored_handler != 0, "RtlAddVectoredExceptionHandler failed\n"); + + info.dwType = 0x1000; + info.szName = "123"; + info.dwThreadID = -1; + info.dwFlags = 0; + RaiseException(EXCEPTION_WINE_NAME_THREAD, 0, sizeof(info) / sizeof(ULONG_PTR), (ULONG_PTR*)&info); + + pRtlRemoveVectoredExceptionHandler(vectored_handler); + + ptr = NULL; + hr = pGetThreadDescription(GetCurrentThread(), &ptr); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); + ok(!lstrcmpW(ptr, desc), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); + LocalFree(ptr); } static void init_funcs(void) @@ -2524,6 +2599,8 @@ static void init_funcs(void) X(NtQueryInformationThread); X(RtlGetThreadErrorMode); X(NtSetInformationThread); + X(RtlAddVectoredExceptionHandler); + X(RtlRemoveVectoredExceptionHandler); } #undef X } -- 2.34.1

1 1

[PATCH 6/6] winealsa: Move get_endpoints_id to the unixlib.
by Huw Davies Feb. 15, 2022

Feb. 15, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/Makefile.in | 2 + dlls/winealsa.drv/alsa.c | 458 ++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 458 +++++----------------------------- dlls/winealsa.drv/unixlib.h | 42 ++++ 4 files changed, 560 insertions(+), 400 deletions(-) create mode 100644 dlls/winealsa.drv/alsa.c create mode 100644 dlls/winealsa.drv/unixlib.h diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in index 7ce382e64c2..2158e087251 100644 --- a/dlls/winealsa.drv/Makefile.in +++ b/dlls/winealsa.drv/Makefile.in @@ -1,5 +1,6 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winealsa.drv +UNIXLIB = winealsa.so IMPORTS = uuid ole32 advapi32 DELAYIMPORTS = winmm EXTRALIBS = $(ALSA_LIBS) @@ -7,5 +8,6 @@ EXTRALIBS = $(ALSA_LIBS) EXTRADLLFLAGS = -mcygwin C_SRCS = \ + alsa.c \ midi.c \ mmdevdrv.c diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c new file mode 100644 index 00000000000..ae05c7a8b9b --- /dev/null +++ b/dlls/winealsa.drv/alsa.c @@ -0,0 +1,458 @@ +/* + * Copyright 2010 Maarten Lankhorst for CodeWeavers + * Copyright 2011 Andrew Eikum for CodeWeavers + * Copyright 2022 Huw Davies + * + * 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 + */ +#if 0 +#pragma makedep unix +#endif + +#include "config.h" + +#include <stdarg.h> +#include <stdio.h> + +#include <alsa/asoundlib.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "mmdeviceapi.h" + +#include "wine/debug.h" +#include "wine/list.h" +#include "wine/unixlib.h" + +#include "unixlib.h" + +WINE_DEFAULT_DEBUG_CHANNEL(alsa); + +static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', + 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', + 'w','i','n','e','a','l','s','a','.','d','r','v'}; + +static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) +{ + while (len--) *dst++ = (unsigned char)*src++; +} + +static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) +{ + UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; + OBJECT_ATTRIBUTES attr; + HANDLE ret; + + attr.Length = sizeof(attr); + attr.RootDirectory = root; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + if (NtOpenKeyEx( &ret, MAXIMUM_ALLOWED, &attr, 0 )) return 0; + return ret; +} + +static HKEY open_hkcu(void) +{ + char buffer[256]; + WCHAR bufferW[256]; + DWORD_PTR sid_data[(sizeof(TOKEN_USER) + SECURITY_MAX_SID_SIZE) / sizeof(DWORD_PTR)]; + DWORD i, len = sizeof(sid_data); + SID *sid; + + if (NtQueryInformationToken( GetCurrentThreadEffectiveToken(), TokenUser, sid_data, len, &len )) + return 0; + + sid = ((TOKEN_USER *)sid_data)->User.Sid; + len = sprintf( buffer, "\\Registry\\User\\S-%u-%u", sid->Revision, + MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5], sid->IdentifierAuthority.Value[4] ), + MAKEWORD( sid->IdentifierAuthority.Value[3], sid->IdentifierAuthority.Value[2] ))); + for (i = 0; i < sid->SubAuthorityCount; i++) + len += sprintf( buffer + len, "-%u", sid->SubAuthority[i] ); + ascii_to_unicode( bufferW, buffer, len + 1 ); + + return reg_open_key( NULL, bufferW, len * sizeof(WCHAR) ); +} + +static HKEY reg_open_hkcu_key( const WCHAR *name, ULONG name_len ) +{ + HKEY hkcu = open_hkcu(), key; + + key = reg_open_key( hkcu, name, name_len ); + NtClose( hkcu ); + + return key; +} + +ULONG reg_query_value( HKEY hkey, const WCHAR *name, + KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) +{ + unsigned int name_size = name ? wcslen( name ) * sizeof(WCHAR) : 0; + UNICODE_STRING nameW = { name_size, name_size, (WCHAR *)name }; + + if (NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, + info, size, &size )) + return 0; + + return size - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); +} + +static snd_pcm_stream_t alsa_get_direction(EDataFlow flow) +{ + return (flow == eRender) ? SND_PCM_STREAM_PLAYBACK : SND_PCM_STREAM_CAPTURE; +} + +static WCHAR *strdupAtoW(const char *str) +{ + unsigned int len; + WCHAR *ret; + + if(!str) return NULL; + + len = strlen(str) + 1; + ret = malloc(len * sizeof(WCHAR)); + if(ret) ntdll_umbstowcs(str, len, ret, len); + return ret; +} + +static BOOL alsa_try_open(const char *devnode, EDataFlow flow) +{ + snd_pcm_t *handle; + int err; + + TRACE("devnode: %s, flow: %d\n", devnode, flow); + + if((err = snd_pcm_open(&handle, devnode, alsa_get_direction(flow), SND_PCM_NONBLOCK)) < 0){ + WARN("The device \"%s\" failed to open: %d (%s).\n", devnode, err, snd_strerror(err)); + return FALSE; + } + + snd_pcm_close(handle); + return TRUE; +} + +static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const WCHAR *chunk2) +{ + WCHAR *ret; + const WCHAR *prefix; + size_t len_wchars = 0, chunk1_len = 0, chunk2_len = 0, copied = 0, prefix_len; + + static const WCHAR dashW[] = {' ','-',' ',0}; + static const size_t dashW_len = ARRAY_SIZE(dashW) - 1; + static const WCHAR outW[] = {'O','u','t',':',' ',0}; + static const WCHAR inW[] = {'I','n',':',' ',0}; + + if(flow == eRender){ + prefix = outW; + prefix_len = ARRAY_SIZE(outW) - 1; + len_wchars += prefix_len; + }else{ + prefix = inW; + prefix_len = ARRAY_SIZE(inW) - 1; + len_wchars += prefix_len; + } + if(chunk1){ + chunk1_len = wcslen(chunk1); + len_wchars += chunk1_len; + } + if(chunk1 && chunk2) + len_wchars += dashW_len; + if(chunk2){ + chunk2_len = wcslen(chunk2); + len_wchars += chunk2_len; + } + len_wchars += 1; /* NULL byte */ + + ret = malloc(len_wchars * sizeof(WCHAR)); + + memcpy(ret, prefix, prefix_len * sizeof(WCHAR)); + copied += prefix_len; + if(chunk1){ + memcpy(ret + copied, chunk1, chunk1_len * sizeof(WCHAR)); + copied += chunk1_len; + } + if(chunk1 && chunk2){ + memcpy(ret + copied, dashW, dashW_len * sizeof(WCHAR)); + copied += dashW_len; + } + if(chunk2){ + memcpy(ret + copied, chunk2, chunk2_len * sizeof(WCHAR)); + copied += chunk2_len; + } + ret[copied] = 0; + + TRACE("Enumerated device: %s\n", wine_dbgstr_w(ret)); + + return ret; +} + +struct endpoints_info +{ + unsigned int num, size; + struct endpoint *endpoints; +}; + +static void endpoints_add(struct endpoints_info *endpoints, WCHAR *name, char *device) +{ + if(endpoints->num >= endpoints->size){ + if (!endpoints->size) endpoints->size = 16; + else endpoints->size *= 2; + endpoints->endpoints = realloc(endpoints->endpoints, endpoints->size * sizeof(*endpoints->endpoints)); + } + + endpoints->endpoints[endpoints->num].name = name; + endpoints->endpoints[endpoints->num++].device = device; +} + +static HRESULT alsa_get_card_devices(EDataFlow flow, struct endpoints_info *endpoints_info, + snd_ctl_t *ctl, int card, const WCHAR *cardname) +{ + int err, device; + snd_pcm_info_t *info; + + info = calloc(1, snd_pcm_info_sizeof()); + if(!info) + return E_OUTOFMEMORY; + + snd_pcm_info_set_subdevice(info, 0); + snd_pcm_info_set_stream(info, alsa_get_direction(flow)); + + device = -1; + for(err = snd_ctl_pcm_next_device(ctl, &device); device != -1 && err >= 0; + err = snd_ctl_pcm_next_device(ctl, &device)){ + char devnode[32]; + WCHAR *devname; + + snd_pcm_info_set_device(info, device); + + if((err = snd_ctl_pcm_info(ctl, info)) < 0){ + if(err == -ENOENT) + /* This device doesn't have the right stream direction */ + continue; + + WARN("Failed to get info for card %d, device %d: %d (%s)\n", + card, device, err, snd_strerror(err)); + continue; + } + + sprintf(devnode, "plughw:%d,%d", card, device); + if(!alsa_try_open(devnode, flow)) + continue; + + devname = strdupAtoW(snd_pcm_info_get_name(info)); + if(!devname){ + WARN("Unable to get device name for card %d, device %d\n", card, device); + continue; + } + + endpoints_add(endpoints_info, construct_device_id(flow, cardname, devname), strdup(devnode)); + free(devname); + } + + free(info); + + if(err != 0) + WARN("Got a failure during device enumeration on card %d: %d (%s)\n", + card, err, snd_strerror(err)); + + return S_OK; +} + +static void get_reg_devices(EDataFlow flow, struct endpoints_info *endpoints_info) +{ + static const WCHAR ALSAOutputDevices[] = {'A','L','S','A','O','u','t','p','u','t','D','e','v','i','c','e','s',0}; + static const WCHAR ALSAInputDevices[] = {'A','L','S','A','I','n','p','u','t','D','e','v','i','c','e','s',0}; + char buffer[4096]; + KEY_VALUE_PARTIAL_INFORMATION *key_info = (void *)buffer; + HKEY key; + DWORD size; + const WCHAR *value_name = (flow == eRender) ? ALSAOutputDevices : ALSAInputDevices; + + /* @@ Wine registry key: HKCU\Software\Wine\Drivers\winealsa.drv */ + if((key = reg_open_hkcu_key(drv_keyW, sizeof(drv_keyW)))){ + if((size = reg_query_value(key, value_name, key_info, sizeof(buffer)))){ + WCHAR *p = (WCHAR *)key_info->Data; + + if(key_info->Type != REG_MULTI_SZ){ + ERR("Registry ALSA device list value type must be REG_MULTI_SZ\n"); + NtClose(key); + return; + } + + while(*p){ + int len = wcslen(p); + char *devname = malloc(len * 3 + 1); + + ntdll_wcstoumbs(p, len + 1, devname, len * 3 + 1, FALSE); + + if(alsa_try_open(devname, flow)) + endpoints_add(endpoints_info, construct_device_id(flow, p, NULL), strdup(devname)); + + free(devname); + p += len + 1; + } + } + + NtClose(key); + } +} + +struct card_type { + struct list entry; + int first_card_number; + char string[1]; +}; + +static struct list card_types = LIST_INIT(card_types); + +static BOOL need_card_number(int card, const char *string) +{ + struct card_type *cptr; + + LIST_FOR_EACH_ENTRY(cptr, &card_types, struct card_type, entry) + { + if(!strcmp(string, cptr->string)) + return card != cptr->first_card_number; + } + + /* this is the first instance of string */ + cptr = malloc(sizeof(struct card_type) + strlen(string)); + if(!cptr) + /* Default to displaying card number if we can't track cards */ + return TRUE; + + cptr->first_card_number = card; + strcpy(cptr->string, string); + list_add_head(&card_types, &cptr->entry); + return FALSE; +} + +static WCHAR *alsa_get_card_name(int card) +{ + char *cardname; + WCHAR *ret; + int err; + + if((err = snd_card_get_name(card, &cardname)) < 0){ + /* FIXME: Should be localized */ + WARN("Unable to get card name for ALSA device %d: %d (%s)\n", card, err, snd_strerror(err)); + cardname = strdup("Unknown soundcard"); + } + + if(need_card_number(card, cardname)){ + char *cardnameN; + /* + * For identical card names, second and subsequent instances get + * card number prefix to distinguish them (like Windows). + */ + if(asprintf(&cardnameN, "%u-%s", card, cardname) > 0){ + free(cardname); + cardname = cardnameN; + } + } + + ret = strdupAtoW(cardname); + free(cardname); + + return ret; +} + +static NTSTATUS get_endpoint_ids(void *args) +{ + static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0}; + struct get_endpoint_ids_params *params = args; + struct endpoints_info endpoints_info; + unsigned int i, needed, name_len, device_len; + struct endpoint *endpoint; + int err, card; + char *ptr; + + card = -1; + + endpoints_info.num = endpoints_info.size = 0; + endpoints_info.endpoints = NULL; + + if(alsa_try_open("default", params->flow)) + endpoints_add(&endpoints_info, construct_device_id(params->flow, defaultW, NULL), strdup("default")); + + get_reg_devices(params->flow, &endpoints_info); + + for(err = snd_card_next(&card); card != -1 && err >= 0; err = snd_card_next(&card)){ + char cardpath[64]; + WCHAR *cardname; + snd_ctl_t *ctl; + + sprintf(cardpath, "hw:%u", card); + + if((err = snd_ctl_open(&ctl, cardpath, 0)) < 0){ + WARN("Unable to open ctl for ALSA device %s: %d (%s)\n", cardpath, + err, snd_strerror(err)); + continue; + } + + cardname = alsa_get_card_name(card); + alsa_get_card_devices(params->flow, &endpoints_info, ctl, card, cardname); + free(cardname); + + snd_ctl_close(ctl); + } + + if(err != 0) + WARN("Got a failure during card enumeration: %d (%s)\n", err, snd_strerror(err)); + + needed = endpoints_info.num * sizeof(*params->endpoints); + endpoint = params->endpoints; + ptr = (char *)(endpoint + endpoints_info.num); + + for(i = 0; i < endpoints_info.num; i++){ + name_len = wcslen(endpoints_info.endpoints[i].name) + 1; + device_len = strlen(endpoints_info.endpoints[i].device) + 1; + needed += name_len * sizeof(WCHAR) + ((device_len + 1) & ~1); + + if(needed <= params->size){ + endpoint->name = (WCHAR *)ptr; + memcpy(endpoint->name, endpoints_info.endpoints[i].name, name_len * sizeof(WCHAR)); + ptr += name_len * sizeof(WCHAR); + endpoint->device = ptr; + memcpy(endpoint->device, endpoints_info.endpoints[i].device, device_len); + ptr += (device_len + 1) & ~1; + endpoint++; + } + free(endpoints_info.endpoints[i].name); + free(endpoints_info.endpoints[i].device); + } + free(endpoints_info.endpoints); + + params->num = endpoints_info.num; + params->default_idx = 0; + + if(needed > params->size){ + params->size = needed; + params->result = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } else + params->result = S_OK; + + return STATUS_SUCCESS; +} + +unixlib_entry_t __wine_unix_call_funcs[] = +{ + get_endpoint_ids, +}; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 9a8f80a7beb..516bba1e5fc 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1,6 +1,7 @@ /* * Copyright 2010 Maarten Lankhorst for CodeWeavers * Copyright 2011 Andrew Eikum for CodeWeavers + * Copyright 2022 Huw Davies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -32,6 +33,7 @@ #include "wine/debug.h" #include "wine/unicode.h" #include "wine/list.h" +#include "wine/unixlib.h" #include "propsys.h" #include "initguid.h" @@ -49,8 +51,12 @@ #include <alsa/asoundlib.h> +#include "unixlib.h" + WINE_DEFAULT_DEBUG_CHANNEL(alsa); +unixlib_handle_t alsa_handle = 0; + #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) static const REFERENCE_TIME DefaultPeriod = 100000; @@ -161,12 +167,6 @@ static CRITICAL_SECTION_DEBUG g_sessions_lock_debug = static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, 0 }; static struct list g_sessions = LIST_INIT(g_sessions); -static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0}; -static const char defname[] = "default"; - -static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', - 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', - 'w','i','n','e','a','l','s','a','.','d','r','v'}; static const WCHAR drv_key_devicesW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', 'w','i','n','e','a','l','s','a','.','d','r','v','\\','d','e','v','i','c','e','s',0}; @@ -240,6 +240,9 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) switch (reason) { case DLL_PROCESS_ATTACH: + if(NtQueryVirtualMemory(GetCurrentProcess(), dll, MemoryWineUnixFuncs, + &alsa_handle, sizeof(alsa_handle), NULL)) + return FALSE; g_timer_q = CreateTimerQueue(); if(!g_timer_q) return FALSE; @@ -266,19 +269,6 @@ int WINAPI AUDDRV_GetPriority(void) return Priority_Neutral; } -static WCHAR *strdupAtoW(const char *str) -{ - unsigned int len; - WCHAR *ret; - - if(!str) return NULL; - - len = MultiByteToWideChar(CP_UNIXCP, 0, str, -1, NULL, 0); - ret = malloc(len * sizeof(WCHAR)); - if(ret) MultiByteToWideChar(CP_UNIXCP, 0, str, -1, ret, len); - return ret; -} - static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, GUID *guid) { @@ -351,399 +341,67 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) RegCloseKey(key); } -static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) -{ - while (len--) *dst++ = (unsigned char)*src++; -} - -static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) -{ - UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; - OBJECT_ATTRIBUTES attr; - HANDLE ret; - - attr.Length = sizeof(attr); - attr.RootDirectory = root; - attr.ObjectName = &nameW; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - - if (NtOpenKeyEx( &ret, MAXIMUM_ALLOWED, &attr, 0 )) return 0; - return ret; -} - -static HKEY open_hkcu(void) -{ - char buffer[256]; - WCHAR bufferW[256]; - DWORD_PTR sid_data[(sizeof(TOKEN_USER) + SECURITY_MAX_SID_SIZE) / sizeof(DWORD_PTR)]; - DWORD i, len = sizeof(sid_data); - SID *sid; - - if (NtQueryInformationToken( GetCurrentThreadEffectiveToken(), TokenUser, sid_data, len, &len )) - return 0; - - sid = ((TOKEN_USER *)sid_data)->User.Sid; - len = sprintf( buffer, "\\Registry\\User\\S-%u-%u", sid->Revision, - MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5], sid->IdentifierAuthority.Value[4] ), - MAKEWORD( sid->IdentifierAuthority.Value[3], sid->IdentifierAuthority.Value[2] ))); - for (i = 0; i < sid->SubAuthorityCount; i++) - len += sprintf( buffer + len, "-%u", sid->SubAuthority[i] ); - ascii_to_unicode( bufferW, buffer, len + 1 ); - - return reg_open_key( NULL, bufferW, len * sizeof(WCHAR) ); -} - -static HKEY reg_open_hkcu_key( const WCHAR *name, ULONG name_len ) -{ - HKEY hkcu = open_hkcu(), key; - - key = reg_open_key( hkcu, name, name_len ); - NtClose( hkcu ); - - return key; -} - -ULONG reg_query_value( HKEY hkey, const WCHAR *name, - KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) -{ - unsigned int name_size = name ? lstrlenW( name ) * sizeof(WCHAR) : 0; - UNICODE_STRING nameW = { name_size, name_size, (WCHAR *)name }; - - if (NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, - info, size, &size )) - return 0; - - return size - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); -} - static snd_pcm_stream_t alsa_get_direction(EDataFlow flow) { return (flow == eRender) ? SND_PCM_STREAM_PLAYBACK : SND_PCM_STREAM_CAPTURE; } -static BOOL alsa_try_open(const char *devnode, EDataFlow flow) -{ - snd_pcm_t *handle; - int err; - - TRACE("devnode: %s, flow: %d\n", devnode, flow); - - if((err = snd_pcm_open(&handle, devnode, alsa_get_direction(flow), SND_PCM_NONBLOCK)) < 0){ - WARN("The device \"%s\" failed to open: %d (%s).\n", devnode, err, snd_strerror(err)); - return FALSE; - } - - snd_pcm_close(handle); - return TRUE; -} - -static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const WCHAR *chunk2) -{ - WCHAR *ret; - const WCHAR *prefix; - size_t len_wchars = 0, chunk1_len = 0, chunk2_len = 0, copied = 0, prefix_len; - - static const WCHAR dashW[] = {' ','-',' ',0}; - static const size_t dashW_len = ARRAY_SIZE(dashW) - 1; - static const WCHAR outW[] = {'O','u','t',':',' ',0}; - static const WCHAR inW[] = {'I','n',':',' ',0}; - - if(flow == eRender){ - prefix = outW; - prefix_len = ARRAY_SIZE(outW) - 1; - len_wchars += prefix_len; - }else{ - prefix = inW; - prefix_len = ARRAY_SIZE(inW) - 1; - len_wchars += prefix_len; - } - if(chunk1){ - chunk1_len = strlenW(chunk1); - len_wchars += chunk1_len; - } - if(chunk1 && chunk2) - len_wchars += dashW_len; - if(chunk2){ - chunk2_len = strlenW(chunk2); - len_wchars += chunk2_len; - } - len_wchars += 1; /* NULL byte */ - - ret = HeapAlloc(GetProcessHeap(), 0, len_wchars * sizeof(WCHAR)); - - memcpy(ret, prefix, prefix_len * sizeof(WCHAR)); - copied += prefix_len; - if(chunk1){ - memcpy(ret + copied, chunk1, chunk1_len * sizeof(WCHAR)); - copied += chunk1_len; - } - if(chunk1 && chunk2){ - memcpy(ret + copied, dashW, dashW_len * sizeof(WCHAR)); - copied += dashW_len; - } - if(chunk2){ - memcpy(ret + copied, chunk2, chunk2_len * sizeof(WCHAR)); - copied += chunk2_len; - } - ret[copied] = 0; - - TRACE("Enumerated device: %s\n", wine_dbgstr_w(ret)); - - return ret; -} - -static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num, - snd_ctl_t *ctl, int card, const WCHAR *cardname) -{ - int err, device; - snd_pcm_info_t *info; - - info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, snd_pcm_info_sizeof()); - if(!info) - return E_OUTOFMEMORY; - - snd_pcm_info_set_subdevice(info, 0); - snd_pcm_info_set_stream(info, alsa_get_direction(flow)); - - device = -1; - for(err = snd_ctl_pcm_next_device(ctl, &device); device != -1 && err >= 0; - err = snd_ctl_pcm_next_device(ctl, &device)){ - char devnode[32]; - WCHAR *devname; - - snd_pcm_info_set_device(info, device); - - if((err = snd_ctl_pcm_info(ctl, info)) < 0){ - if(err == -ENOENT) - /* This device doesn't have the right stream direction */ - continue; - - WARN("Failed to get info for card %d, device %d: %d (%s)\n", - card, device, err, snd_strerror(err)); - continue; - } - - sprintf(devnode, "plughw:%d,%d", card, device); - if(!alsa_try_open(devnode, flow)) - continue; - - if(*num){ - *ids = HeapReAlloc(GetProcessHeap(), 0, *ids, sizeof(WCHAR *) * (*num + 1)); - *guids = HeapReAlloc(GetProcessHeap(), 0, *guids, sizeof(GUID) * (*num + 1)); - }else{ - *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *)); - *guids = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID)); - } - - devname = strdupAtoW(snd_pcm_info_get_name(info)); - if(!devname){ - WARN("Unable to get device name for card %d, device %d\n", card, device); - continue; - } - - (*ids)[*num] = construct_device_id(flow, cardname, devname); - get_device_guid(flow, devnode, &(*guids)[*num]); - free(devname); - - ++(*num); - } - - HeapFree(GetProcessHeap(), 0, info); - - if(err != 0) - WARN("Got a failure during device enumeration on card %d: %d (%s)\n", - card, err, snd_strerror(err)); - - return S_OK; -} - -static void get_reg_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num) -{ - static const WCHAR ALSAOutputDevices[] = {'A','L','S','A','O','u','t','p','u','t','D','e','v','i','c','e','s',0}; - static const WCHAR ALSAInputDevices[] = {'A','L','S','A','I','n','p','u','t','D','e','v','i','c','e','s',0}; - char buffer[4096]; - KEY_VALUE_PARTIAL_INFORMATION *key_info = (void *)buffer; - HKEY key; - DWORD size; - const WCHAR *value_name = (flow == eRender) ? ALSAOutputDevices : ALSAInputDevices; - - /* @@ Wine registry key: HKCU\Software\Wine\Drivers\winealsa.drv */ - if((key = reg_open_hkcu_key(drv_keyW, sizeof(drv_keyW)))){ - if((size = reg_query_value(key, value_name, key_info, sizeof(buffer)))){ - WCHAR *p = (WCHAR *)key_info->Data; - - if(key_info->Type != REG_MULTI_SZ){ - ERR("Registry ALSA device list value type must be REG_MULTI_SZ\n"); - NtClose(key); - return; - } - - while(*p){ - int len = lstrlenW(p); - char *devname = malloc(len * 3 + 1); - - WideCharToMultiByte(CP_UNIXCP, 0, p, -1, devname, len * 3 + 1, NULL, NULL); - - if(alsa_try_open(devname, flow)){ - if(*num){ - *ids = HeapReAlloc(GetProcessHeap(), 0, *ids, sizeof(WCHAR *) * (*num + 1)); - *guids = HeapReAlloc(GetProcessHeap(), 0, *guids, sizeof(GUID) * (*num + 1)); - }else{ - *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *)); - *guids = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID)); - } - (*ids)[*num] = construct_device_id(flow, p, NULL); - get_device_guid(flow, devname, &(*guids)[*num]); - ++*num; - } - free(devname); - p += len + 1; - } - } - - NtClose(key); - } -} - -struct card_type { - struct list entry; - int first_card_number; - char string[1]; -}; - -static struct list card_types = LIST_INIT(card_types); - -static BOOL need_card_number(int card, const char *string) -{ - struct card_type *cptr; - - LIST_FOR_EACH_ENTRY(cptr, &card_types, struct card_type, entry) - { - if(!strcmp(string, cptr->string)) - return card != cptr->first_card_number; - } - - /* this is the first instance of string */ - cptr = HeapAlloc(GetProcessHeap(), 0, sizeof(struct card_type) + strlen(string)); - if(!cptr) - /* Default to displaying card number if we can't track cards */ - return TRUE; - - cptr->first_card_number = card; - strcpy(cptr->string, string); - list_add_head(&card_types, &cptr->entry); - return FALSE; -} - -static WCHAR *alsa_get_card_name(int card) -{ - char *cardname; - WCHAR *ret; - int err; - - if((err = snd_card_get_name(card, &cardname)) < 0){ - /* FIXME: Should be localized */ - WARN("Unable to get card name for ALSA device %d: %d (%s)\n", card, err, snd_strerror(err)); - cardname = strdup("Unknown soundcard"); - } - - if(need_card_number(card, cardname)){ - char *cardnameN; - /* - * For identical card names, second and subsequent instances get - * card number prefix to distinguish them (like Windows). - */ - if(asprintf(&cardnameN, "%u-%s", card, cardname) > 0){ - free(cardname); - cardname = cardnameN; - } - } - - ret = strdupAtoW(cardname); - free(cardname); - - return ret; -} - -static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, - UINT *num) -{ - int err, card; - - card = -1; - *num = 0; - - if(alsa_try_open(defname, flow)){ - *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *)); - (*ids)[0] = construct_device_id(flow, defaultW, NULL); - *guids = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID)); - get_device_guid(flow, defname, &(*guids)[0]); - ++*num; - } - - get_reg_devices(flow, ids, guids, num); - - for(err = snd_card_next(&card); card != -1 && err >= 0; err = snd_card_next(&card)){ - char cardpath[64]; - WCHAR *cardname; - snd_ctl_t *ctl; - - sprintf(cardpath, "hw:%u", card); - - if((err = snd_ctl_open(&ctl, cardpath, 0)) < 0){ - WARN("Unable to open ctl for ALSA device %s: %d (%s)\n", cardpath, - err, snd_strerror(err)); - continue; - } - - cardname = alsa_get_card_name(card); - alsa_get_card_devices(flow, ids, guids, num, ctl, card, cardname); - free(cardname); - - snd_ctl_close(ctl); - } - - if(err != 0) - WARN("Got a failure during card enumeration: %d (%s)\n", - err, snd_strerror(err)); - - return S_OK; -} - -HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, +HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out, UINT *num, UINT *def_index) { - HRESULT hr; + struct get_endpoint_ids_params params; + unsigned int i; + GUID *guids = NULL; + WCHAR **ids = NULL; TRACE("%d %p %p %p %p\n", flow, ids, guids, num, def_index); - *ids = NULL; - *guids = NULL; - - hr = alsa_enum_devices(flow, ids, guids, num); - if(FAILED(hr)){ - UINT i; - for(i = 0; i < *num; ++i) - HeapFree(GetProcessHeap(), 0, (*ids)[i]); - HeapFree(GetProcessHeap(), 0, *ids); - HeapFree(GetProcessHeap(), 0, *guids); - return E_OUTOFMEMORY; - } - - TRACE("Enumerated %u devices\n", *num); - - if(*num == 0){ - HeapFree(GetProcessHeap(), 0, *ids); - *ids = NULL; - HeapFree(GetProcessHeap(), 0, *guids); - *guids = NULL; + params.flow = flow; + params.size = 1000; + params.endpoints = NULL; + do{ + HeapFree(GetProcessHeap(), 0, params.endpoints); + params.endpoints = HeapAlloc(GetProcessHeap(), 0, params.size); + ALSA_CALL(get_endpoint_ids, &params); + }while(params.result == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)); + + if(FAILED(params.result)) goto end; + + ids = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, params.num * sizeof(*ids)); + guids = HeapAlloc(GetProcessHeap(), 0, params.num * sizeof(*guids)); + if(!ids || !guids){ + params.result = E_OUTOFMEMORY; + goto end; + } + + for(i = 0; i < params.num; i++){ + unsigned int size = (strlenW(params.endpoints[i].name) + 1) * sizeof(WCHAR); + ids[i] = HeapAlloc(GetProcessHeap(), 0, size); + if(!ids[i]){ + params.result = E_OUTOFMEMORY; + goto end; + } + memcpy(ids[i], params.endpoints[i].name, size); + get_device_guid(flow, params.endpoints[i].device, guids + i); + } + *def_index = params.default_idx; + +end: + HeapFree(GetProcessHeap(), 0, params.endpoints); + if(FAILED(params.result)){ + HeapFree(GetProcessHeap(), 0, guids); + if(ids){ + for(i = 0; i < params.num; i++) + HeapFree(GetProcessHeap(), 0, ids[i]); + HeapFree(GetProcessHeap(), 0, ids); + } + }else{ + *ids_out = ids; + *guids_out = guids; + *num = params.num; } - *def_index = 0; - - return S_OK; + return params.result; } static BOOL get_alsa_name_by_guid(GUID *guid, char *name, DWORD name_size, EDataFlow *flow) diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h new file mode 100644 index 00000000000..f3014d0b448 --- /dev/null +++ b/dlls/winealsa.drv/unixlib.h @@ -0,0 +1,42 @@ +/* + * Copyright 2022 Huw Davies + * + * 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 + */ + +struct endpoint +{ + WCHAR *name; + char *device; +}; + +struct get_endpoint_ids_params +{ + EDataFlow flow; + struct endpoint *endpoints; + unsigned int size; + HRESULT result; + unsigned int num; + unsigned int default_idx; +}; + +enum alsa_funcs +{ + alsa_get_endpoint_ids, +}; + +extern unixlib_handle_t alsa_handle; + +#define ALSA_CALL(func, params) __wine_unix_call(alsa_handle, alsa_ ## func, params) -- 2.25.1

2 1