Commit 5392bd30 authored by Alexandre Julliard's avatar Alexandre Julliard

dwrite: Use the Unix call helpers.

parent f3404064
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(dwrite); WINE_DEFAULT_DEBUG_CHANNEL(dwrite);
HMODULE dwrite_module = 0; HMODULE dwrite_module = 0;
unixlib_handle_t unixlib_handle = 0;
static IDWriteFactory7 *shared_factory; static IDWriteFactory7 *shared_factory;
static void release_shared_factory(IDWriteFactory7 *factory); static void release_shared_factory(IDWriteFactory7 *factory);
...@@ -47,8 +46,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) ...@@ -47,8 +46,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved)
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:
dwrite_module = hinstDLL; dwrite_module = hinstDLL;
DisableThreadLibraryCalls( hinstDLL ); DisableThreadLibraryCalls( hinstDLL );
if (!NtQueryVirtualMemory(GetCurrentProcess(), hinstDLL, MemoryWineUnixFuncs, if (!__wine_init_unix_call())
&unixlib_handle, sizeof(unixlib_handle), NULL))
UNIX_CALL(process_attach, NULL); UNIX_CALL(process_attach, NULL);
init_local_fontfile_loader(); init_local_fontfile_loader();
break; break;
...@@ -56,7 +54,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) ...@@ -56,7 +54,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved)
if (reserved) break; if (reserved) break;
release_shared_factory(shared_factory); release_shared_factory(shared_factory);
release_system_fallback_data(); release_system_fallback_data();
if (unixlib_handle) UNIX_CALL(process_detach, NULL); UNIX_CALL(process_detach, NULL);
} }
return TRUE; return TRUE;
} }
......
...@@ -108,6 +108,4 @@ enum font_backend_funcs ...@@ -108,6 +108,4 @@ enum font_backend_funcs
unix_get_design_glyph_metrics, unix_get_design_glyph_metrics,
}; };
extern unixlib_handle_t unixlib_handle DECLSPEC_HIDDEN; #define UNIX_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params )
#define UNIX_CALL( func, params ) __wine_unix_call( unixlib_handle, unix_ ## func, params )
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment