From 3e5bf70341b8b155fe96b55490fef94d1bd7b073 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Mon, 28 Nov 2022 11:41:28 +0100 Subject: [PATCH] sane.ds: Use the Unix call helpers. --- dlls/sane.ds/sane_main.c | 4 +--- dlls/sane.ds/unixlib.h | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index 832c333ae57..8f07ce6d52a 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -30,7 +30,6 @@ struct tagActiveDS activeDS; DSMENTRYPROC SANE_dsmentry; HINSTANCE SANE_instance; -unixlib_handle_t sane_handle = 0; BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -41,8 +40,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: { SANE_instance = hinstDLL; DisableThreadLibraryCalls(hinstDLL); - if (NtQueryVirtualMemory( GetCurrentProcess(), hinstDLL, MemoryWineUnixFuncs, - &sane_handle, sizeof(sane_handle), NULL )) return FALSE; + if (__wine_init_unix_call()) return FALSE; SANE_CALL( process_attach, NULL ); break; } diff --git a/dlls/sane.ds/unixlib.h b/dlls/sane.ds/unixlib.h index 6e38936ae90..d3ffbf1878d 100644 --- a/dlls/sane.ds/unixlib.h +++ b/dlls/sane.ds/unixlib.h @@ -97,6 +97,4 @@ enum sane_funcs unix_option_find_descriptor, }; -extern unixlib_handle_t sane_handle DECLSPEC_HIDDEN; - -#define SANE_CALL( func, params ) __wine_unix_call( sane_handle, unix_ ## func, params ) +#define SANE_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params )