From 9e4e8de7c19cb0fb0447357f9117ddeac0af6978 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 24 Nov 2022 10:31:29 +0100 Subject: [PATCH] winealsa.drv: Use the Unix call helpers. --- dlls/winealsa.drv/mmdevdrv.c | 6 +----- dlls/winealsa.drv/unixlib.h | 4 +--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 20a27d501d3..ea48143005b 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -48,8 +48,6 @@ 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; @@ -203,9 +201,7 @@ 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; + if(__wine_init_unix_call()) return FALSE; break; case DLL_PROCESS_DETACH: diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 8c82281012a..de6ce71571c 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -29,6 +29,4 @@ NTSTATUS alsa_wow64_midi_in_message(void *args) DECLSPEC_HIDDEN; NTSTATUS alsa_wow64_midi_notify_wait(void *args) DECLSPEC_HIDDEN; #endif -extern unixlib_handle_t alsa_handle; - -#define ALSA_CALL(func, params) __wine_unix_call(alsa_handle, func, params) +#define ALSA_CALL(func, params) WINE_UNIX_CALL(func, params)