Module: wine Branch: master Commit: 5392bd303efc0073b49f53d54a637a919527d542 URL: https://gitlab.winehq.org/wine/wine/-/commit/5392bd303efc0073b49f53d54a637a9...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Nov 25 10:11:36 2022 +0100
dwrite: Use the Unix call helpers.
---
dlls/dwrite/main.c | 6 ++---- dlls/dwrite/unixlib.h | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 8cc5d4dccf7..6776b1ce974 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -36,7 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite);
HMODULE dwrite_module = 0; -unixlib_handle_t unixlib_handle = 0; static IDWriteFactory7 *shared_factory; static void release_shared_factory(IDWriteFactory7 *factory);
@@ -47,8 +46,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) case DLL_PROCESS_ATTACH: dwrite_module = hinstDLL; DisableThreadLibraryCalls( hinstDLL ); - if (!NtQueryVirtualMemory(GetCurrentProcess(), hinstDLL, MemoryWineUnixFuncs, - &unixlib_handle, sizeof(unixlib_handle), NULL)) + if (!__wine_init_unix_call()) UNIX_CALL(process_attach, NULL); init_local_fontfile_loader(); break; @@ -56,7 +54,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) if (reserved) break; release_shared_factory(shared_factory); release_system_fallback_data(); - if (unixlib_handle) UNIX_CALL(process_detach, NULL); + UNIX_CALL(process_detach, NULL); } return TRUE; } diff --git a/dlls/dwrite/unixlib.h b/dlls/dwrite/unixlib.h index 533c3168b99..c63d5bea722 100644 --- a/dlls/dwrite/unixlib.h +++ b/dlls/dwrite/unixlib.h @@ -108,6 +108,4 @@ enum font_backend_funcs unix_get_design_glyph_metrics, };
-extern unixlib_handle_t unixlib_handle DECLSPEC_HIDDEN; - -#define UNIX_CALL( func, params ) __wine_unix_call( unixlib_handle, unix_ ## func, params ) +#define UNIX_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params )