Module: wine Branch: master Commit: c37f91c78b467c366c0babb747e8655a14cd4d63 URL: https://gitlab.winehq.org/wine/wine/-/commit/c37f91c78b467c366c0babb747e8655...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Nov 28 11:41:44 2022 +0100
winspool.drv: Use the Unix call helpers.
---
dlls/winspool.drv/wspool.c | 4 +--- dlls/winspool.drv/wspool.h | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/dlls/winspool.drv/wspool.c b/dlls/winspool.drv/wspool.c index ff0e4418719..1454cd18e2c 100644 --- a/dlls/winspool.drv/wspool.c +++ b/dlls/winspool.drv/wspool.c @@ -48,7 +48,6 @@ static CRITICAL_SECTION backend_cs = { &backend_cs_debug, -1, 0, 0, 0, 0 }; /* ############################### */
HINSTANCE WINSPOOL_hInstance = NULL; -unixlib_handle_t winspool_handle = 0;
static HMODULE hlocalspl; static BOOL (WINAPI *pInitializePrintProvidor)(LPPRINTPROVIDOR, DWORD, LPWSTR); @@ -115,8 +114,7 @@ BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) case DLL_PROCESS_ATTACH: WINSPOOL_hInstance = instance; DisableThreadLibraryCalls( instance ); - if (!NtQueryVirtualMemory( GetCurrentProcess(), instance, MemoryWineUnixFuncs, - &winspool_handle, sizeof(winspool_handle), NULL )) + if (!__wine_init_unix_call()) UNIX_CALL( process_attach, NULL ); WINSPOOL_LoadSystemPrinters(); break; diff --git a/dlls/winspool.drv/wspool.h b/dlls/winspool.drv/wspool.h index a464e2aaf12..63b8ccae466 100644 --- a/dlls/winspool.drv/wspool.h +++ b/dlls/winspool.drv/wspool.h @@ -72,9 +72,7 @@ struct schedule_job_params const WCHAR *wine_port; };
-extern unixlib_handle_t winspool_handle DECLSPEC_HIDDEN; - -#define UNIX_CALL( func, params ) __wine_unix_call( winspool_handle, unix_ ## func, params ) +#define UNIX_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params )
enum cups_funcs {