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

Alexandre Julliard : server: Send the APC call data as vararg in the select request.
by Alexandre Julliard June 6, 2023

June 6, 2023

Module: wine Branch: master Commit: 6b5561b60104a912d30a87c69af15d4c611efcab URL: https://gitlab.winehq.org/wine/wine/-/commit/6b5561b60104a912d30a87c69af15d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 6 16:06:37 2023 +0200 server: Send the APC call data as vararg in the select request. --- dlls/ntdll/unix/server.c | 18 +++++++++++++----- include/wine/server_protocol.h | 4 ++-- server/protocol.def | 2 +- server/request.h | 8 +++----- server/thread.c | 23 ++++++++++++++++------- server/trace.c | 4 ++-- tools/make_requests | 1 - 7 files changed, 37 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index fe57b622f94..5348b07fe13 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -691,10 +691,15 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT int cookie; obj_handle_t apc_handle = 0; BOOL suspend_context = !!context; - apc_call_t call; apc_result_t result; sigset_t old_set; int signaled; + data_size_t reply_size; + struct + { + apc_call_t call; + context_t context[2]; + } reply_data; memset( &result, 0, sizeof(result) ); @@ -718,16 +723,17 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT wine_server_add_data( req, context, ctx_size ); suspend_context = FALSE; /* server owns the context now */ } - if (context) wine_server_set_reply( req, context, 2 * sizeof(*context) ); + wine_server_set_reply( req, &reply_data, + context ? sizeof(reply_data) : sizeof(reply_data.call) ); ret = server_call_unlocked( req ); signaled = reply->signaled; apc_handle = reply->apc_handle; - call = reply->call; + reply_size = wine_server_reply_size( reply ); } SERVER_END_REQ; if (ret != STATUS_KERNEL_APC) break; - invoke_system_apc( &call, &result, FALSE ); + invoke_system_apc( &reply_data.call, &result, FALSE ); /* don't signal multiple times */ if (size >= sizeof(select_op->signal_and_wait) && select_op->op == SELECT_SIGNAL_AND_WAIT) @@ -740,7 +746,9 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT } while (ret == STATUS_USER_APC || ret == STATUS_KERNEL_APC); - if (ret == STATUS_USER_APC) *user_apc = call.user; + if (ret == STATUS_USER_APC) *user_apc = reply_data.call.user; + if (reply_size > sizeof(reply_data.call)) + memcpy( context, reply_data.context, reply_size - sizeof(reply_data.call) ); return ret; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 340512a054e..5a14a3c4370 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1381,9 +1381,9 @@ struct select_request struct select_reply { struct reply_header __header; - apc_call_t call; obj_handle_t apc_handle; int signaled; + /* VARARG(call,apc_call); */ /* VARARG(contexts,contexts); */ }; #define SELECT_ALERTABLE 1 @@ -6413,7 +6413,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 773 +#define SERVER_PROTOCOL_VERSION 774 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 7995f481e19..4237737ab40 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1221,9 +1221,9 @@ typedef struct VARARG(data,select_op,size); /* operation-specific data */ VARARG(contexts,contexts); /* suspend context(s) */ @REPLY - apc_call_t call; /* APC call arguments */ obj_handle_t apc_handle; /* handle to next APC */ int signaled; /* were the handles immediately signaled? */ + VARARG(call,apc_call); /* APC call arguments */ VARARG(contexts,contexts); /* suspend context(s) */ @END #define SELECT_ALERTABLE 1 diff --git a/server/request.h b/server/request.h index b13381d3fe1..ea08babdda8 100644 --- a/server/request.h +++ b/server/request.h @@ -689,7 +689,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = C_ASSERT( sizeof(abstime_t) == 8 ); C_ASSERT( sizeof(affinity_t) == 8 ); -C_ASSERT( sizeof(apc_call_t) == 48 ); C_ASSERT( sizeof(apc_param_t) == 8 ); C_ASSERT( sizeof(apc_result_t) == 40 ); C_ASSERT( sizeof(async_data_t) == 40 ); @@ -909,10 +908,9 @@ C_ASSERT( FIELD_OFFSET(struct select_request, timeout) == 24 ); C_ASSERT( FIELD_OFFSET(struct select_request, size) == 32 ); C_ASSERT( FIELD_OFFSET(struct select_request, prev_apc) == 36 ); C_ASSERT( sizeof(struct select_request) == 40 ); -C_ASSERT( FIELD_OFFSET(struct select_reply, call) == 8 ); -C_ASSERT( FIELD_OFFSET(struct select_reply, apc_handle) == 56 ); -C_ASSERT( FIELD_OFFSET(struct select_reply, signaled) == 60 ); -C_ASSERT( sizeof(struct select_reply) == 64 ); +C_ASSERT( FIELD_OFFSET(struct select_reply, apc_handle) == 8 ); +C_ASSERT( FIELD_OFFSET(struct select_reply, signaled) == 12 ); +C_ASSERT( sizeof(struct select_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct create_event_request, access) == 12 ); C_ASSERT( FIELD_OFFSET(struct create_event_request, manual_reset) == 16 ); C_ASSERT( FIELD_OFFSET(struct create_event_request, initial_state) == 20 ); diff --git a/server/thread.c b/server/thread.c index 5299f6c042d..3e35b27f694 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1658,17 +1658,19 @@ DECL_HANDLER(select) reply->signaled = select_on( &select_op, op_size, req->cookie, req->flags, req->timeout ); - if (get_error() == STATUS_USER_APC) + if (get_error() == STATUS_USER_APC && get_reply_max_size() >= sizeof(apc_call_t)) { apc = thread_dequeue_apc( current, 0 ); - reply->call = apc->call; + set_reply_data( &apc->call, sizeof(apc->call) ); release_object( apc ); } - else if (get_error() == STATUS_KERNEL_APC) + else if (get_error() == STATUS_KERNEL_APC && get_reply_max_size() >= sizeof(apc_call_t)) { apc = thread_dequeue_apc( current, 1 ); if ((reply->apc_handle = alloc_handle( current->process, apc, SYNCHRONIZE, 0 ))) - reply->call = apc->call; + { + set_reply_data( &apc->call, sizeof(apc->call) ); + } else { apc->executed = 1; @@ -1676,16 +1678,23 @@ DECL_HANDLER(select) } release_object( apc ); } - else if (reply->signaled && get_reply_max_size() >= sizeof(context_t) && + else if (reply->signaled && get_reply_max_size() >= sizeof(apc_call_t) + sizeof(context_t) && current->context && current->suspend_cookie == req->cookie) { ctx = current->context; if (ctx->regs[CTX_NATIVE].flags || ctx->regs[CTX_WOW].flags) { - data_size_t size = (ctx->regs[CTX_WOW].flags ? 2 : 1) * sizeof(context_t); + apc_call_t *data; + data_size_t size = sizeof(*data) + (ctx->regs[CTX_WOW].flags ? 2 : 1) * sizeof(context_t); unsigned int flags = system_flags & ctx->regs[CTX_NATIVE].flags; + if (flags) set_thread_context( current, &ctx->regs[CTX_NATIVE], flags ); - set_reply_data( ctx->regs, min( size, get_reply_max_size() )); + size = min( size, get_reply_max_size() ); + if ((data = set_reply_data_size( size ))) + { + memset( data, 0, sizeof(*data) ); + memcpy( data + 1, ctx->regs, size - sizeof(*data) ); + } } release_object( ctx ); current->context = NULL; diff --git a/server/trace.c b/server/trace.c index 7cd6f8938d3..96b8992f351 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1752,9 +1752,9 @@ static void dump_select_request( const struct select_request *req ) static void dump_select_reply( const struct select_reply *req ) { - dump_apc_call( " call=", &req->call ); - fprintf( stderr, ", apc_handle=%04x", req->apc_handle ); + fprintf( stderr, " apc_handle=%04x", req->apc_handle ); fprintf( stderr, ", signaled=%d", req->signaled ); + dump_varargs_apc_call( ", call=", cur_size ); dump_varargs_contexts( ", contexts=", cur_size ); } diff --git a/tools/make_requests b/tools/make_requests index 158b2006ae5..e5db1c7fc0a 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -45,7 +45,6 @@ my %formats = "timeout_t" => [ 8, 8, "&dump_timeout" ], "abstime_t" => [ 8, 8, "&dump_abstime" ], "rectangle_t" => [ 16, 4, "&dump_rectangle" ], - "apc_call_t" => [ 48, 8, "&dump_apc_call" ], "apc_result_t" => [ 40, 8, "&dump_apc_result" ], "async_data_t" => [ 40, 8, "&dump_async_data" ], "irp_params_t" => [ 32, 8, "&dump_irp_params" ],

1 0

Alexandre Julliard : kernelbase: Use nameless unions/structs for IO_STATUS_BLOCK.
by Alexandre Julliard June 6, 2023

June 6, 2023

Module: wine Branch: master Commit: 0d2046ccf30188e28198a07a802bd535562025f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/0d2046ccf30188e28198a07a802bd5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 6 17:54:45 2023 +0200 kernelbase: Use nameless unions/structs for IO_STATUS_BLOCK. --- dlls/kernelbase/console.c | 1 - dlls/kernelbase/file.c | 62 +++++++++++++++++++++++------------------------ dlls/kernelbase/sync.c | 17 ++++++------- 3 files changed, 38 insertions(+), 42 deletions(-)

1 0

Alexandre Julliard : kernelbase: Use nameless unions/structs for CPU-related data.
by Alexandre Julliard June 6, 2023

June 6, 2023

Module: wine Branch: master Commit: 4f6a40b1e220a711451fdd199f1c3fccca424b59 URL: https://gitlab.winehq.org/wine/wine/-/commit/4f6a40b1e220a711451fdd199f1c3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 6 17:54:32 2023 +0200 kernelbase: Use nameless unions/structs for CPU-related data. --- dlls/kernelbase/memory.c | 16 +++++++--------- dlls/kernelbase/process.c | 2 -- dlls/kernelbase/thread.c | 21 ++++++++++----------- 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 19381e00b31..804d46d7c36 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -26,8 +26,6 @@ #include "ntstatus.h" #define WIN32_NO_STATUS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winnls.h" @@ -86,8 +84,8 @@ SIZE_T WINAPI GetLargePageMinimum(void) static void fill_system_info( SYSTEM_INFO *si, const SYSTEM_BASIC_INFORMATION *basic_info, const SYSTEM_CPU_INFORMATION *cpu_info ) { - si->u.s.wProcessorArchitecture = cpu_info->ProcessorArchitecture; - si->u.s.wReserved = 0; + si->wProcessorArchitecture = cpu_info->ProcessorArchitecture; + si->wReserved = 0; si->dwPageSize = basic_info->PageSize; si->lpMinimumApplicationAddress = basic_info->LowestUserAddress; si->lpMaximumApplicationAddress = basic_info->HighestUserAddress; @@ -146,7 +144,7 @@ void WINAPI DECLSPEC_HOTPATCH GetNativeSystemInfo( SYSTEM_INFO *si ) if (native_machine != IMAGE_FILE_MACHINE_AMD64) { GetSystemInfo( si ); - si->u.s.wProcessorArchitecture = PROCESSOR_ARCHITECTURE_AMD64; + si->wProcessorArchitecture = PROCESSOR_ARCHITECTURE_AMD64; return; } } @@ -715,7 +713,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH HeapWalk( HANDLE heap, PROCESS_HEAP_ENTRY *entry ) rtl_entry.wFlags |= RTL_HEAP_ENTRY_REGION; if (entry->wFlags & PROCESS_HEAP_UNCOMMITTED_RANGE) rtl_entry.wFlags |= RTL_HEAP_ENTRY_UNCOMMITTED; - memcpy( &rtl_entry.Region, &entry->u.Region, sizeof(entry->u.Region) ); + memcpy( &rtl_entry.Region, &entry->Region, sizeof(entry->Region) ); if (!(status = RtlWalkHeap( heap, &rtl_entry ))) { @@ -733,7 +731,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH HeapWalk( HANDLE heap, PROCESS_HEAP_ENTRY *entry ) else entry->wFlags = 0; - memcpy( &entry->u.Region, &rtl_entry.Region, sizeof(entry->u.Region) ); + memcpy( &entry->Region, &rtl_entry.Region, sizeof(entry->Region) ); } return set_ntstatus( status ); @@ -1542,13 +1540,13 @@ void * WINAPI LocateXStateFeature( CONTEXT *context, DWORD feature_id, DWORD *le if (length) *length = sizeof(M128A) * 16; - return &context->u.FltSave.XmmRegisters; + return &context->FltSave.XmmRegisters; } if (length) *length = offsetof(XSAVE_FORMAT, XmmRegisters); - return &context->u.FltSave; + return &context->FltSave; } /*********************************************************************** diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 54a524abe04..97eb55a3f1d 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -23,8 +23,6 @@ #include "ntstatus.h" #define WIN32_NO_STATUS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winnls.h" diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 721d61f60f5..ccedb62f930 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -24,7 +24,6 @@ #include "ntstatus.h" #define WIN32_NO_STATUS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "winnls.h" @@ -906,7 +905,7 @@ void WINAPI switch_fiber( CONTEXT *old, CONTEXT *new ) /* call the fiber initial function once we have switched stack */ static void CDECL start_fiber(void) { - struct fiber_data *fiber = NtCurrentTeb()->Tib.u.FiberData; + struct fiber_data *fiber = NtCurrentTeb()->Tib.FiberData; LPFIBER_START_ROUTINE start = fiber->start; __TRY @@ -1020,12 +1019,12 @@ LPVOID WINAPI DECLSPEC_HOTPATCH CreateFiberEx( SIZE_T stack_commit, SIZE_T stack */ BOOL WINAPI DECLSPEC_HOTPATCH ConvertFiberToThread(void) { - struct fiber_data *fiber = NtCurrentTeb()->Tib.u.FiberData; + struct fiber_data *fiber = NtCurrentTeb()->Tib.FiberData; if (fiber) { relocate_thread_actctx_stack( &NtCurrentTeb()->ActivationContextStack ); - NtCurrentTeb()->Tib.u.FiberData = NULL; + NtCurrentTeb()->Tib.FiberData = NULL; HeapFree( GetProcessHeap(), 0, fiber ); } return TRUE; @@ -1048,7 +1047,7 @@ LPVOID WINAPI DECLSPEC_HOTPATCH ConvertThreadToFiberEx( LPVOID param, DWORD flag { struct fiber_data *fiber; - if (NtCurrentTeb()->Tib.u.FiberData) + if (NtCurrentTeb()->Tib.FiberData) { SetLastError( ERROR_ALREADY_FIBER ); return NULL; @@ -1068,7 +1067,7 @@ LPVOID WINAPI DECLSPEC_HOTPATCH ConvertThreadToFiberEx( LPVOID param, DWORD flag fiber->flags = flags; fiber->fls_slots = NtCurrentTeb()->FlsSlots; relocate_thread_actctx_stack( &fiber->actctx.stack_space ); - NtCurrentTeb()->Tib.u.FiberData = fiber; + NtCurrentTeb()->Tib.FiberData = fiber; return fiber; } @@ -1081,7 +1080,7 @@ void WINAPI DECLSPEC_HOTPATCH DeleteFiber( LPVOID fiber_ptr ) struct fiber_data *fiber = fiber_ptr; if (!fiber) return; - if (fiber == NtCurrentTeb()->Tib.u.FiberData) + if (fiber == NtCurrentTeb()->Tib.FiberData) { relocate_thread_actctx_stack( &NtCurrentTeb()->ActivationContextStack ); HeapFree( GetProcessHeap(), 0, fiber ); @@ -1099,7 +1098,7 @@ void WINAPI DECLSPEC_HOTPATCH DeleteFiber( LPVOID fiber_ptr ) */ BOOL WINAPI DECLSPEC_HOTPATCH IsThreadAFiber(void) { - return NtCurrentTeb()->Tib.u.FiberData != NULL; + return NtCurrentTeb()->Tib.FiberData != NULL; } @@ -1109,7 +1108,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsThreadAFiber(void) void WINAPI DECLSPEC_HOTPATCH SwitchToFiber( LPVOID fiber ) { struct fiber_data *new_fiber = fiber; - struct fiber_data *current_fiber = NtCurrentTeb()->Tib.u.FiberData; + struct fiber_data *current_fiber = NtCurrentTeb()->Tib.FiberData; current_fiber->except = NtCurrentTeb()->Tib.ExceptionList; current_fiber->stack_limit = NtCurrentTeb()->Tib.StackLimit; @@ -1118,7 +1117,7 @@ void WINAPI DECLSPEC_HOTPATCH SwitchToFiber( LPVOID fiber ) /* stack_allocation and stack_base never change */ /* FIXME: should save floating point context if requested in fiber->flags */ - NtCurrentTeb()->Tib.u.FiberData = new_fiber; + NtCurrentTeb()->Tib.FiberData = new_fiber; NtCurrentTeb()->Tib.ExceptionList = new_fiber->except; NtCurrentTeb()->Tib.StackBase = new_fiber->stack_base; NtCurrentTeb()->Tib.StackLimit = new_fiber->stack_limit; @@ -1213,7 +1212,7 @@ PTP_CLEANUP_GROUP WINAPI DECLSPEC_HOTPATCH CreateThreadpoolCleanupGroup(void) static void WINAPI tp_io_callback( TP_CALLBACK_INSTANCE *instance, void *userdata, void *cvalue, IO_STATUS_BLOCK *iosb, TP_IO *io ) { PTP_WIN32_IO_CALLBACK callback = *(void **)io; - callback( instance, userdata, cvalue, RtlNtStatusToDosError( iosb->u.Status ), iosb->Information, io ); + callback( instance, userdata, cvalue, RtlNtStatusToDosError( iosb->Status ), iosb->Information, io ); }

1 0

Alexandre Julliard : kernelbase: Use nameless unions/structs for loader data.
by Alexandre Julliard June 6, 2023

June 6, 2023

Module: wine Branch: master Commit: 9276d53ee8f9185d13fcb77a6a54b25cfb2ebc72 URL: https://gitlab.winehq.org/wine/wine/-/commit/9276d53ee8f9185d13fcb77a6a54b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 6 17:54:17 2023 +0200 kernelbase: Use nameless unions/structs for loader data. --- dlls/kernelbase/loader.c | 30 ++++++++++++++---------------- dlls/kernelbase/version.c | 18 ++++++++---------- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index 22dff7ba56b..8778503fc2a 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -22,8 +22,6 @@ #include <stdarg.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -683,7 +681,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumResourceLanguagesExA( HMODULE module, LPCSTR t { for (i = 0; i < resdir->NumberOfNamedEntries + resdir->NumberOfIdEntries; i++) { - ret = func( module, type, name, et[i].u.Id, param ); + ret = func( module, type, name, et[i].Id, param ); if (!ret) break; } } @@ -743,7 +741,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumResourceLanguagesExW( HMODULE module, LPCWSTR { for (i = 0; i < resdir->NumberOfNamedEntries + resdir->NumberOfIdEntries; i++) { - ret = func( module, type, name, et[i].u.Id, param ); + ret = func( module, type, name, et[i].Id, param ); if (!ret) break; } } @@ -801,9 +799,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumResourceNamesExA( HMODULE module, LPCSTR type, { for (i = 0; i < resdir->NumberOfNamedEntries+resdir->NumberOfIdEntries; i++) { - if (et[i].u.s.NameIsString) + if (et[i].NameIsString) { - str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)basedir + et[i].u.s.NameOffset); + str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)basedir + et[i].NameOffset); newlen = WideCharToMultiByte(CP_ACP, 0, str->NameString, str->Length, NULL, 0, NULL, NULL); if (newlen + 1 > len) { @@ -821,7 +819,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumResourceNamesExA( HMODULE module, LPCSTR type, } else { - ret = func( module, type, UIntToPtr(et[i].u.Id), param ); + ret = func( module, type, UIntToPtr(et[i].Id), param ); } if (!ret) break; } @@ -880,9 +878,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumResourceNamesExW( HMODULE module, LPCWSTR type { for (i = 0; i < resdir->NumberOfNamedEntries+resdir->NumberOfIdEntries; i++) { - if (et[i].u.s.NameIsString) + if (et[i].NameIsString) { - str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)basedir + et[i].u.s.NameOffset); + str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)basedir + et[i].NameOffset); if (str->Length + 1 > len) { len = str->Length + 1; @@ -899,7 +897,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumResourceNamesExW( HMODULE module, LPCWSTR type } else { - ret = func( module, type, UIntToPtr(et[i].u.Id), param ); + ret = func( module, type, UIntToPtr(et[i].Id), param ); } if (!ret) break; } @@ -957,9 +955,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumResourceTypesExA( HMODULE module, ENUMRESTYPEP et = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1); for (i = 0; i < resdir->NumberOfNamedEntries+resdir->NumberOfIdEntries; i++) { - if (et[i].u.s.NameIsString) + if (et[i].NameIsString) { - str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)resdir + et[i].u.s.NameOffset); + str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)resdir + et[i].NameOffset); newlen = WideCharToMultiByte( CP_ACP, 0, str->NameString, str->Length, NULL, 0, NULL, NULL); if (newlen + 1 > len) { @@ -973,7 +971,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumResourceTypesExA( HMODULE module, ENUMRESTYPEP } else { - ret = func( module, UIntToPtr(et[i].u.Id), param ); + ret = func( module, UIntToPtr(et[i].Id), param ); } if (!ret) break; } @@ -1007,9 +1005,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumResourceTypesExW( HMODULE module, ENUMRESTYPEP et = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1); for (i = 0; i < resdir->NumberOfNamedEntries + resdir->NumberOfIdEntries; i++) { - if (et[i].u.s.NameIsString) + if (et[i].NameIsString) { - str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)resdir + et[i].u.s.NameOffset); + str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)resdir + et[i].NameOffset); if (str->Length + 1 > len) { len = str->Length + 1; @@ -1022,7 +1020,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumResourceTypesExW( HMODULE module, ENUMRESTYPEP } else { - ret = func( module, UIntToPtr(et[i].u.Id), param ); + ret = func( module, UIntToPtr(et[i].Id), param ); } if (!ret) break; } diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index 8b2d0e1ee1f..d8db79b1263 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -30,8 +30,6 @@ #include "ntstatus.h" #define WIN32_NO_STATUS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winver.h" @@ -286,13 +284,13 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_by_id( const IMAGE_RESOURCE_DI while (min <= max) { pos = (min + max) / 2; - if (entry[pos].u.Id == id) + if (entry[pos].Id == id) { - DWORD offset = entry[pos].u2.s2.OffsetToDirectory; + DWORD offset = entry[pos].OffsetToDirectory; if (offset > root_size - sizeof(*dir)) return NULL; return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + offset); } - if (entry[pos].u.Id > id) max = pos - 1; + if (entry[pos].Id > id) max = pos - 1; else min = pos + 1; } return NULL; @@ -311,7 +309,7 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_default( const IMAGE_RESOURCE_ const IMAGE_RESOURCE_DIRECTORY_ENTRY *entry; entry = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1); - return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry->u2.s2.OffsetToDirectory); + return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry->OffsetToDirectory); } @@ -1698,19 +1696,19 @@ LONG WINAPI PackageIdFromFullName(const WCHAR *full_name, UINT32 flags, UINT32 * } buffer += sizeof(*id); - id->version.u.s.Major = wcstol(version_str, NULL, 10); + id->version.Major = wcstol(version_str, NULL, 10); if (!(s = wcschr(version_str, L'.'))) return ERROR_INVALID_PARAMETER; ++s; - id->version.u.s.Minor = wcstol(s, NULL, 10); + id->version.Minor = wcstol(s, NULL, 10); if (!(s = wcschr(s, L'.'))) return ERROR_INVALID_PARAMETER; ++s; - id->version.u.s.Build = wcstol(s, NULL, 10); + id->version.Build = wcstol(s, NULL, 10); if (!(s = wcschr(s, L'.'))) return ERROR_INVALID_PARAMETER; ++s; - id->version.u.s.Revision = wcstol(s, NULL, 10); + id->version.Revision = wcstol(s, NULL, 10); id->name = (WCHAR *)buffer; len = version_str - name - 1;

1 0

Davide Beatrici : wineoss: Use mmdevapi's AudioClient's GetService.
by Alexandre Julliard June 6, 2023

June 6, 2023

Module: wine Branch: master Commit: 59b175d96c90578b6aa9a43f141bc12b5e635360 URL: https://gitlab.winehq.org/wine/wine/-/commit/59b175d96c90578b6aa9a43f141bc1… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu May 25 10:53:58 2023 +0200 wineoss: Use mmdevapi's AudioClient's GetService. --- dlls/wineoss.drv/mmdevdrv.c | 87 ++------------------------------------------- 1 file changed, 3 insertions(+), 84 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 23a116f0c45..188bf37aac9 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -858,89 +858,8 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, return params.result; } -static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, - void **ppv) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - - TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); - - if(!ppv) - return E_POINTER; - *ppv = NULL; - - sessions_lock(); - - if(!This->stream){ - sessions_unlock(); - return AUDCLNT_E_NOT_INITIALIZED; - } - - if(IsEqualIID(riid, &IID_IAudioRenderClient)){ - if(This->dataflow != eRender){ - sessions_unlock(); - return AUDCLNT_E_WRONG_ENDPOINT_TYPE; - } - IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface); - *ppv = &This->IAudioRenderClient_iface; - }else if(IsEqualIID(riid, &IID_IAudioCaptureClient)){ - if(This->dataflow != eCapture){ - sessions_unlock(); - return AUDCLNT_E_WRONG_ENDPOINT_TYPE; - } - IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface); - *ppv = &This->IAudioCaptureClient_iface; - }else if(IsEqualIID(riid, &IID_IAudioClock)){ - IAudioClock_AddRef(&This->IAudioClock_iface); - *ppv = &This->IAudioClock_iface; - }else if(IsEqualIID(riid, &IID_IAudioStreamVolume)){ - IAudioStreamVolume_AddRef(&This->IAudioStreamVolume_iface); - *ppv = &This->IAudioStreamVolume_iface; - }else if(IsEqualIID(riid, &IID_IAudioSessionControl)){ - if(!This->session_wrapper){ - This->session_wrapper = session_wrapper_create(This); - if(!This->session_wrapper){ - sessions_unlock(); - return E_OUTOFMEMORY; - } - }else - IAudioSessionControl2_AddRef(&This->session_wrapper->IAudioSessionControl2_iface); - - *ppv = &This->session_wrapper->IAudioSessionControl2_iface; - }else if(IsEqualIID(riid, &IID_IChannelAudioVolume)){ - if(!This->session_wrapper){ - This->session_wrapper = session_wrapper_create(This); - if(!This->session_wrapper){ - sessions_unlock(); - return E_OUTOFMEMORY; - } - }else - IChannelAudioVolume_AddRef(&This->session_wrapper->IChannelAudioVolume_iface); - - *ppv = &This->session_wrapper->IChannelAudioVolume_iface; - }else if(IsEqualIID(riid, &IID_ISimpleAudioVolume)){ - if(!This->session_wrapper){ - This->session_wrapper = session_wrapper_create(This); - if(!This->session_wrapper){ - sessions_unlock(); - return E_OUTOFMEMORY; - } - }else - ISimpleAudioVolume_AddRef(&This->session_wrapper->ISimpleAudioVolume_iface); - - *ppv = &This->session_wrapper->ISimpleAudioVolume_iface; - } - - if(*ppv){ - sessions_unlock(); - return S_OK; - } - - sessions_unlock(); - - FIXME("stub %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; -} +extern HRESULT WINAPI client_GetService(IAudioClient3 *iface, REFIID riid, + void **ppv); extern HRESULT WINAPI client_IsOffloadCapable(IAudioClient3 *iface, AUDIO_STREAM_CATEGORY category, BOOL *offload_capable); @@ -979,7 +898,7 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_Stop, AudioClient_Reset, AudioClient_SetEventHandle, - AudioClient_GetService, + client_GetService, client_IsOffloadCapable, client_SetClientProperties, client_GetBufferSizeLimits,

1 0

Alexandre Julliard : kernel32: Use nameless unions/structs.
by Alexandre Julliard June 6, 2023

June 6, 2023

Module: wine Branch: master Commit: 0d4f20ca183d95c6047956a074dc3eba7853823b URL: https://gitlab.winehq.org/wine/wine/-/commit/0d4f20ca183d95c6047956a074dc3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 6 17:54:55 2023 +0200 kernel32: Use nameless unions/structs. --- dlls/kernel32/console.c | 1 - dlls/kernel32/file.c | 2 -- dlls/kernel32/resource.c | 40 +++++++++++++++++++--------------------- dlls/kernel32/sync.c | 9 ++++----- dlls/kernel32/tests/loader.c | 2 -- dlls/kernel32/virtual.c | 1 - 6 files changed, 23 insertions(+), 32 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index da8171dcccf..0ab7d53d867 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -28,7 +28,6 @@ #include <string.h> #include <limits.h> -#define NONAMELESSUNION #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index be355c9090d..fab914898ec 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -24,8 +24,6 @@ #include <stdio.h> #include <errno.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index ab30a88bfb4..2ea5d59e0ae 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -22,8 +22,6 @@ #include <stdarg.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -541,10 +539,10 @@ static LPWSTR resource_dup_string( const IMAGE_RESOURCE_DIRECTORY *root, const I const IMAGE_RESOURCE_DIR_STRING_U* string; LPWSTR s; - if (!entry->u.s.NameIsString) - return UIntToPtr(entry->u.Id); + if (!entry->NameIsString) + return UIntToPtr(entry->Id); - string = (const IMAGE_RESOURCE_DIR_STRING_U*) (((const char *)root) + entry->u.s.NameOffset); + string = (const IMAGE_RESOURCE_DIR_STRING_U*) (((const char *)root) + entry->NameOffset); s = HeapAlloc(GetProcessHeap(), 0, (string->Length + 1)*sizeof (WCHAR) ); memcpy( s, string->NameString, (string->Length + 1)*sizeof (WCHAR) ); s[string->Length] = 0; @@ -573,7 +571,7 @@ static BOOL enumerate_mapped_resources( QUEUEDUPDATES *updates, Type = resource_dup_string( root, e1 ); - namedir = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + e1->u2.s2.OffsetToDirectory); + namedir = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + e1->OffsetToDirectory); for (j = 0; j < namedir->NumberOfNamedEntries + namedir->NumberOfIdEntries; j++) { LPWSTR Name; @@ -582,7 +580,7 @@ static BOOL enumerate_mapped_resources( QUEUEDUPDATES *updates, Name = resource_dup_string( root, e2 ); - langdir = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + e2->u2.s2.OffsetToDirectory); + langdir = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + e2->OffsetToDirectory); for (k = 0; k < langdir->NumberOfNamedEntries + langdir->NumberOfIdEntries; k++) { LANGID Lang; @@ -591,9 +589,9 @@ static BOOL enumerate_mapped_resources( QUEUEDUPDATES *updates, e3 = (const IMAGE_RESOURCE_DIRECTORY_ENTRY*)(langdir + 1) + k; - Lang = e3->u.Id; + Lang = e3->Id; - data = (const IMAGE_RESOURCE_DATA_ENTRY *)((const char *)root + e3->u2.OffsetToData); + data = (const IMAGE_RESOURCE_DATA_ENTRY *)((const char *)root + e3->OffsetToData); p = address_from_rva( base, mapping_size, data->OffsetToData, data->Size ); @@ -828,8 +826,8 @@ static BOOL write_resources( QUEUEDUPDATES *updates, LPBYTE base, struct resourc DWORD len; root->NumberOfNamedEntries++; - e1->u.s.NameIsString = 1; - e1->u.s.NameOffset = si->strings_ofs; + e1->NameIsString = 1; + e1->NameOffset = si->strings_ofs; strings = (WCHAR*) &base[si->strings_ofs]; len = lstrlenW( types->id ); @@ -840,10 +838,10 @@ static BOOL write_resources( QUEUEDUPDATES *updates, LPBYTE base, struct resourc else { root->NumberOfIdEntries++; - e1->u.Id = LOWORD( types->id ); + e1->Id = LOWORD( types->id ); } - e1->u2.s2.OffsetToDirectory = si->names_ofs; - e1->u2.s2.DataIsDirectory = TRUE; + e1->OffsetToDirectory = si->names_ofs; + e1->DataIsDirectory = TRUE; si->types_ofs += sizeof (IMAGE_RESOURCE_DIRECTORY_ENTRY); namedir = (IMAGE_RESOURCE_DIRECTORY*) &base[si->names_ofs]; @@ -864,8 +862,8 @@ static BOOL write_resources( QUEUEDUPDATES *updates, LPBYTE base, struct resourc DWORD len; namedir->NumberOfNamedEntries++; - e2->u.s.NameIsString = 1; - e2->u.s.NameOffset = si->strings_ofs; + e2->NameIsString = 1; + e2->NameOffset = si->strings_ofs; strings = (WCHAR*) &base[si->strings_ofs]; len = lstrlenW( names->id ); @@ -876,10 +874,10 @@ static BOOL write_resources( QUEUEDUPDATES *updates, LPBYTE base, struct resourc else { namedir->NumberOfIdEntries++; - e2->u.Id = LOWORD( names->id ); + e2->Id = LOWORD( names->id ); } - e2->u2.s2.OffsetToDirectory = si->langs_ofs; - e2->u2.s2.DataIsDirectory = TRUE; + e2->OffsetToDirectory = si->langs_ofs; + e2->DataIsDirectory = TRUE; si->names_ofs += sizeof (IMAGE_RESOURCE_DIRECTORY_ENTRY); langdir = (IMAGE_RESOURCE_DIRECTORY*) &base[si->langs_ofs]; @@ -896,8 +894,8 @@ static BOOL write_resources( QUEUEDUPDATES *updates, LPBYTE base, struct resourc e3 = (IMAGE_RESOURCE_DIRECTORY_ENTRY*) &base[si->langs_ofs]; memset( e3, 0, sizeof *e3 ); langdir->NumberOfIdEntries++; - e3->u.Id = LOWORD( data->lang ); - e3->u2.OffsetToData = si->data_entry_ofs; + e3->Id = LOWORD( data->lang ); + e3->OffsetToData = si->data_entry_ofs; si->langs_ofs += sizeof (IMAGE_RESOURCE_DIRECTORY_ENTRY); diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 219800a46e5..53419cd4618 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -25,7 +25,6 @@ #include "ntstatus.h" #define WIN32_NO_STATUS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "wincon.h" @@ -87,10 +86,10 @@ ULONGLONG WINAPI DECLSPEC_HOTPATCH GetTickCount64(void) do { - high = user_shared_data->u.TickCount.High1Time; - low = user_shared_data->u.TickCount.LowPart; + high = user_shared_data->TickCount.High1Time; + low = user_shared_data->TickCount.LowPart; } - while (high != user_shared_data->u.TickCount.High2Time); + while (high != user_shared_data->TickCount.High2Time); /* note: we ignore TickCountMultiplier */ return (ULONGLONG)high << 32 | low; } @@ -101,7 +100,7 @@ ULONGLONG WINAPI DECLSPEC_HOTPATCH GetTickCount64(void) DWORD WINAPI DECLSPEC_HOTPATCH GetTickCount(void) { /* note: we ignore TickCountMultiplier */ - return user_shared_data->u.TickCount.LowPart; + return user_shared_data->TickCount.LowPart; } /*********************************************************************** diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 3f826537a62..696ffae4430 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include <stdarg.h> #include <stdio.h> #include <assert.h> diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index f5693de4e28..0314b362e86 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -27,7 +27,6 @@ #define WINE_NO_INLINE_STRING #include "ntstatus.h" #define WIN32_NO_STATUS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "winnls.h"

1 0

Davide Beatrici : winepulse: Lock sessions in AudioClient's GetService.
by Alexandre Julliard June 6, 2023

June 6, 2023

Module: wine Branch: master Commit: aa9a69f86108c4d4aeaffdee186762df1e05feae URL: https://gitlab.winehq.org/wine/wine/-/commit/aa9a69f86108c4d4aeaffdee186762… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue Jun 6 10:03:17 2023 +0200 winepulse: Lock sessions in AudioClient's GetService. --- dlls/winepulse.drv/mmdevdrv.c | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 3cd0073a6ad..7b996b3b40e 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1025,6 +1025,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, void **ppv) { ACImpl *This = impl_from_IAudioClient3(iface); + HRESULT hr; TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); @@ -1032,18 +1033,26 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, return E_POINTER; *ppv = NULL; - if (!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; + sessions_lock(); + + if (!This->stream) { + hr = AUDCLNT_E_NOT_INITIALIZED; + goto exit; + } if (IsEqualIID(riid, &IID_IAudioRenderClient)) { - if (This->dataflow != eRender) - return AUDCLNT_E_WRONG_ENDPOINT_TYPE; + if (This->dataflow != eRender) { + hr = AUDCLNT_E_WRONG_ENDPOINT_TYPE; + goto exit; + } IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface); *ppv = &This->IAudioRenderClient_iface; } else if (IsEqualIID(riid, &IID_IAudioCaptureClient)) { - if (This->dataflow != eCapture) - return AUDCLNT_E_WRONG_ENDPOINT_TYPE; + if (This->dataflow != eCapture) { + hr = AUDCLNT_E_WRONG_ENDPOINT_TYPE; + goto exit; + } IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface); *ppv = &This->IAudioCaptureClient_iface; @@ -1059,8 +1068,10 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, const BOOLEAN new_session = !This->session_wrapper; if (new_session) { This->session_wrapper = session_wrapper_create(This); - if (!This->session_wrapper) - return E_OUTOFMEMORY; + if (!This->session_wrapper) { + hr = E_OUTOFMEMORY; + goto exit; + } } if (IsEqualIID(riid, &IID_IAudioSessionControl)) @@ -1074,10 +1085,15 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, IUnknown_AddRef((IUnknown *)*ppv); } else { FIXME("stub %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + hr = E_NOINTERFACE; + goto exit; } - return S_OK; + hr = S_OK; +exit: + sessions_unlock(); + + return hr; } extern HRESULT WINAPI client_IsOffloadCapable(IAudioClient3 *iface,

1 0

Davide Beatrici : winecoreaudio: Use mmdevapi's session_wrapper_create.
by Alexandre Julliard June 6, 2023

June 6, 2023

Module: wine Branch: master Commit: 883f1f3421a32bec902f9b572e935d74f626cc5f URL: https://gitlab.winehq.org/wine/wine/-/commit/883f1f3421a32bec902f9b572e935d… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu Jun 1 21:19:33 2023 +0200 winecoreaudio: Use mmdevapi's session_wrapper_create. --- dlls/winecoreaudio.drv/mmdevdrv.c | 35 ++++++----------------------------- 1 file changed, 6 insertions(+), 29 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 67bf7b122a4..196f2897b39 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -70,7 +70,8 @@ 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 AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); +extern struct audio_session_wrapper *session_wrapper_create( + struct audio_client *client) DECLSPEC_HIDDEN; void DECLSPEC_HIDDEN sessions_lock(void) { @@ -899,7 +900,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, *ppv = &This->IAudioStreamVolume_iface; }else if(IsEqualIID(riid, &IID_IAudioSessionControl)){ if(!This->session_wrapper){ - This->session_wrapper = AudioSessionWrapper_Create(This); + This->session_wrapper = session_wrapper_create(This); if(!This->session_wrapper){ hr = E_OUTOFMEMORY; goto end; @@ -910,7 +911,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, *ppv = &This->session_wrapper->IAudioSessionControl2_iface; }else if(IsEqualIID(riid, &IID_IChannelAudioVolume)){ if(!This->session_wrapper){ - This->session_wrapper = AudioSessionWrapper_Create(This); + This->session_wrapper = session_wrapper_create(This); if(!This->session_wrapper){ hr = E_OUTOFMEMORY; goto end; @@ -921,7 +922,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, *ppv = &This->session_wrapper->IChannelAudioVolume_iface; }else if(IsEqualIID(riid, &IID_ISimpleAudioVolume)){ if(!This->session_wrapper){ - This->session_wrapper = AudioSessionWrapper_Create(This); + This->session_wrapper = session_wrapper_create(This); if(!This->session_wrapper){ hr = E_OUTOFMEMORY; goto end; @@ -989,30 +990,6 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = client_InitializeSharedAudioStream, }; -static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) -{ - AudioSessionWrapper *ret; - - ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(AudioSessionWrapper)); - if(!ret) - return NULL; - - ret->IAudioSessionControl2_iface.lpVtbl = &AudioSessionControl2_Vtbl; - ret->ISimpleAudioVolume_iface.lpVtbl = &SimpleAudioVolume_Vtbl; - ret->IChannelAudioVolume_iface.lpVtbl = &ChannelAudioVolume_Vtbl; - - ret->ref = 1; - - ret->client = client; - if(client){ - ret->session = client->session; - IAudioClient3_AddRef(&client->IAudioClient3_iface); - } - - return ret; -} - HRESULT WINAPI AUDDRV_GetAudioSessionWrapper(const GUID *guid, IMMDevice *device, AudioSessionWrapper **out) { @@ -1022,7 +999,7 @@ HRESULT WINAPI AUDDRV_GetAudioSessionWrapper(const GUID *guid, IMMDevice *device if(FAILED(hr)) return hr; - *out = AudioSessionWrapper_Create(NULL); + *out = session_wrapper_create(NULL); if(!*out) return E_OUTOFMEMORY;

1 0

Davide Beatrici : wineoss: Use mmdevapi's session_wrapper_create.
by Alexandre Julliard June 6, 2023

June 6, 2023

Module: wine Branch: master Commit: d94ac14e2a67882cc7ffd22cbf1a8611b828fee1 URL: https://gitlab.winehq.org/wine/wine/-/commit/d94ac14e2a67882cc7ffd22cbf1a86… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu Jun 1 21:19:41 2023 +0200 wineoss: Use mmdevapi's session_wrapper_create. --- dlls/wineoss.drv/mmdevdrv.c | 37 +++++++------------------------------ 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index c282fb88831..23a116f0c45 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -72,8 +72,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 AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); - static const IAudioClient3Vtbl AudioClient3_Vtbl; extern const IAudioRenderClientVtbl AudioRenderClient_Vtbl; extern const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; @@ -84,6 +82,9 @@ extern const IAudioClock2Vtbl AudioClock2_Vtbl; extern const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl; extern const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl; +extern struct audio_session_wrapper *session_wrapper_create( + struct audio_client *client) DECLSPEC_HIDDEN; + void DECLSPEC_HIDDEN sessions_lock(void) { EnterCriticalSection(&g_sessions_lock); @@ -897,7 +898,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, *ppv = &This->IAudioStreamVolume_iface; }else if(IsEqualIID(riid, &IID_IAudioSessionControl)){ if(!This->session_wrapper){ - This->session_wrapper = AudioSessionWrapper_Create(This); + This->session_wrapper = session_wrapper_create(This); if(!This->session_wrapper){ sessions_unlock(); return E_OUTOFMEMORY; @@ -908,7 +909,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, *ppv = &This->session_wrapper->IAudioSessionControl2_iface; }else if(IsEqualIID(riid, &IID_IChannelAudioVolume)){ if(!This->session_wrapper){ - This->session_wrapper = AudioSessionWrapper_Create(This); + This->session_wrapper = session_wrapper_create(This); if(!This->session_wrapper){ sessions_unlock(); return E_OUTOFMEMORY; @@ -919,7 +920,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, *ppv = &This->session_wrapper->IChannelAudioVolume_iface; }else if(IsEqualIID(riid, &IID_ISimpleAudioVolume)){ if(!This->session_wrapper){ - This->session_wrapper = AudioSessionWrapper_Create(This); + This->session_wrapper = session_wrapper_create(This); if(!This->session_wrapper){ sessions_unlock(); return E_OUTOFMEMORY; @@ -987,30 +988,6 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = client_InitializeSharedAudioStream, }; -static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) -{ - AudioSessionWrapper *ret; - - ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(AudioSessionWrapper)); - if(!ret) - return NULL; - - ret->IAudioSessionControl2_iface.lpVtbl = &AudioSessionControl2_Vtbl; - ret->ISimpleAudioVolume_iface.lpVtbl = &SimpleAudioVolume_Vtbl; - ret->IChannelAudioVolume_iface.lpVtbl = &ChannelAudioVolume_Vtbl; - - ret->ref = 1; - - ret->client = client; - if(client){ - ret->session = client->session; - IAudioClient3_AddRef(&client->IAudioClient3_iface); - } - - return ret; -} - HRESULT WINAPI AUDDRV_GetAudioSessionWrapper(const GUID *guid, IMMDevice *device, AudioSessionWrapper **out) { @@ -1020,7 +997,7 @@ HRESULT WINAPI AUDDRV_GetAudioSessionWrapper(const GUID *guid, IMMDevice *device if(FAILED(hr)) return hr; - *out = AudioSessionWrapper_Create(NULL); + *out = session_wrapper_create(NULL); if(!*out) return E_OUTOFMEMORY;

1 0

Davide Beatrici : winealsa: Use mmdevapi's AudioClient's GetService.
by Alexandre Julliard June 6, 2023

June 6, 2023

Module: wine Branch: master Commit: 09b243177195d6c70fc996ad875c827a51d5b95f URL: https://gitlab.winehq.org/wine/wine/-/commit/09b243177195d6c70fc996ad875c82… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu May 25 10:49:32 2023 +0200 winealsa: Use mmdevapi's AudioClient's GetService. --- dlls/winealsa.drv/mmdevdrv.c | 87 ++------------------------------------------ 1 file changed, 3 insertions(+), 84 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 1eee5a8faa9..b96eba1e0fe 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -895,89 +895,8 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, return params.result; } -static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, - void **ppv) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - - TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); - - if(!ppv) - return E_POINTER; - *ppv = NULL; - - sessions_lock(); - - if(!This->stream){ - sessions_unlock(); - return AUDCLNT_E_NOT_INITIALIZED; - } - - if(IsEqualIID(riid, &IID_IAudioRenderClient)){ - if(This->dataflow != eRender){ - sessions_unlock(); - return AUDCLNT_E_WRONG_ENDPOINT_TYPE; - } - IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface); - *ppv = &This->IAudioRenderClient_iface; - }else if(IsEqualIID(riid, &IID_IAudioCaptureClient)){ - if(This->dataflow != eCapture){ - sessions_unlock(); - return AUDCLNT_E_WRONG_ENDPOINT_TYPE; - } - IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface); - *ppv = &This->IAudioCaptureClient_iface; - }else if(IsEqualIID(riid, &IID_IAudioClock)){ - IAudioClock_AddRef(&This->IAudioClock_iface); - *ppv = &This->IAudioClock_iface; - }else if(IsEqualIID(riid, &IID_IAudioStreamVolume)){ - IAudioStreamVolume_AddRef(&This->IAudioStreamVolume_iface); - *ppv = &This->IAudioStreamVolume_iface; - }else if(IsEqualIID(riid, &IID_IAudioSessionControl)){ - if(!This->session_wrapper){ - This->session_wrapper = session_wrapper_create(This); - if(!This->session_wrapper){ - sessions_unlock(); - return E_OUTOFMEMORY; - } - }else - IAudioSessionControl2_AddRef(&This->session_wrapper->IAudioSessionControl2_iface); - - *ppv = &This->session_wrapper->IAudioSessionControl2_iface; - }else if(IsEqualIID(riid, &IID_IChannelAudioVolume)){ - if(!This->session_wrapper){ - This->session_wrapper = session_wrapper_create(This); - if(!This->session_wrapper){ - sessions_unlock(); - return E_OUTOFMEMORY; - } - }else - IChannelAudioVolume_AddRef(&This->session_wrapper->IChannelAudioVolume_iface); - - *ppv = &This->session_wrapper->IChannelAudioVolume_iface; - }else if(IsEqualIID(riid, &IID_ISimpleAudioVolume)){ - if(!This->session_wrapper){ - This->session_wrapper = session_wrapper_create(This); - if(!This->session_wrapper){ - sessions_unlock(); - return E_OUTOFMEMORY; - } - }else - ISimpleAudioVolume_AddRef(&This->session_wrapper->ISimpleAudioVolume_iface); - - *ppv = &This->session_wrapper->ISimpleAudioVolume_iface; - } - - if(*ppv){ - sessions_unlock(); - return S_OK; - } - - sessions_unlock(); - - FIXME("stub %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; -} +extern HRESULT WINAPI client_GetService(IAudioClient3 *iface, REFIID riid, + void **ppv); extern HRESULT WINAPI client_IsOffloadCapable(IAudioClient3 *iface, AUDIO_STREAM_CATEGORY category, BOOL *offload_capable); @@ -1016,7 +935,7 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_Stop, AudioClient_Reset, AudioClient_SetEventHandle, - AudioClient_GetService, + client_GetService, client_IsOffloadCapable, client_SetClientProperties, client_GetBufferSizeLimits,

1 0