Module: wine Branch: master Commit: c372caaebceff9fe751b122ff30a1b9797101cdc URL: https://gitlab.winehq.org/wine/wine/-/commit/c372caaebceff9fe751b122ff30a1b9...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Nov 24 10:31:49 2022 +0100
winecoreaudio.drv: Use the Unix call helpers.
---
dlls/winecoreaudio.drv/mmdevdrv.c | 5 +---- dlls/winecoreaudio.drv/unixlib.h | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 6715ab72e88..367f7ba0ab8 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -43,8 +43,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(coreaudio);
-unixlib_handle_t coreaudio_handle = 0; - #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER)
static const REFERENCE_TIME DefaultPeriod = 100000; @@ -199,8 +197,7 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(dll); - if(NtQueryVirtualMemory(GetCurrentProcess(), dll, MemoryWineUnixFuncs, - &coreaudio_handle, sizeof(coreaudio_handle), NULL)) + if (__wine_init_unix_call()) return FALSE; g_timer_q = CreateTimerQueue(); if(!g_timer_q) diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index caa352d2dfa..1ff4a0bac24 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -33,6 +33,4 @@ NTSTATUS unix_wow64_midi_in_message(void *args) DECLSPEC_HIDDEN; NTSTATUS unix_wow64_midi_notify_wait(void *args) DECLSPEC_HIDDEN; #endif
-extern unixlib_handle_t coreaudio_handle; - -#define UNIX_CALL( func, params ) __wine_unix_call( coreaudio_handle, func, params ) +#define UNIX_CALL( func, params ) WINE_UNIX_CALL( func, params )