Module: wine Branch: master Commit: 5ac3c41eee8e91afc44311b9a81281237dcae68c URL: https://gitlab.winehq.org/wine/wine/-/commit/5ac3c41eee8e91afc44311b9a812812...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Nov 24 10:30:44 2022 +0100
winemac.drv: Use the Unix call helpers.
---
dlls/winemac.drv/dllmain.c | 5 +---- dlls/winemac.drv/unixlib.h | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/dlls/winemac.drv/dllmain.c b/dlls/winemac.drv/dllmain.c index dd12321fa7f..41e9e908b61 100644 --- a/dlls/winemac.drv/dllmain.c +++ b/dlls/winemac.drv/dllmain.c @@ -27,7 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(macdrv);
HMODULE macdrv_module = 0; -unixlib_handle_t macdrv_handle;
struct quit_info { HWND *wins; @@ -406,9 +405,7 @@ static BOOL process_attach(void) { .id = 0 } };
- if (NtQueryVirtualMemory(GetCurrentProcess(), macdrv_module, MemoryWineUnixFuncs, - &macdrv_handle, sizeof(macdrv_handle), NULL)) - return FALSE; + if (__wine_init_unix_call()) return FALSE;
for (str = strings; str->id; str++) str->len = LoadStringW(macdrv_module, str->id, (WCHAR *)&str->str, 0); diff --git a/dlls/winemac.drv/unixlib.h b/dlls/winemac.drv/unixlib.h index 5fe19a94fee..614e3ddb11a 100644 --- a/dlls/winemac.drv/unixlib.h +++ b/dlls/winemac.drv/unixlib.h @@ -35,8 +35,7 @@ enum macdrv_funcs unix_funcs_count };
-extern unixlib_handle_t macdrv_handle DECLSPEC_HIDDEN; -#define MACDRV_CALL(func, params) __wine_unix_call(macdrv_handle, unix_ ## func, params) +#define MACDRV_CALL(func, params) WINE_UNIX_CALL(unix_ ## func, params)
/* macdrv_dnd_get_data params */ struct dnd_get_data_params