From 07211395f32174a5d12d6bd41eaba9021f41abe2 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 24 Nov 2022 10:32:09 +0100 Subject: [PATCH] wineoss.drv: Use the Unix call helpers. --- dlls/wineoss.drv/mmdevdrv.c | 6 +----- dlls/wineoss.drv/unixlib.h | 4 +--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 3bcb0f5f288..7411f87a4d7 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -47,8 +47,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(oss); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) -unixlib_handle_t oss_handle = 0; - static const REFERENCE_TIME DefaultPeriod = 100000; static const REFERENCE_TIME MinimumPeriod = 50000; @@ -209,9 +207,7 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) switch (reason) { case DLL_PROCESS_ATTACH: - if(NtQueryVirtualMemory(GetCurrentProcess(), dll, MemoryWineUnixFuncs, - &oss_handle, sizeof(oss_handle), NULL)) - return FALSE; + if(__wine_init_unix_call()) return FALSE; break; case DLL_PROCESS_DETACH: diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 1c3ee7b93b3..f921b00e0a2 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -29,6 +29,4 @@ NTSTATUS oss_wow64_midi_in_message(void *args) DECLSPEC_HIDDEN; NTSTATUS oss_wow64_midi_notify_wait(void *args) DECLSPEC_HIDDEN; #endif -extern unixlib_handle_t oss_handle; - -#define OSS_CALL(func, params) __wine_unix_call(oss_handle, func, params) +#define OSS_CALL(func, params) WINE_UNIX_CALL(func, params) -- 2.11.4.GIT