system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-02 16:23:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

dwrite: Use the Unix call helpers.

Browse source
This commit is contained in:
Alexandre Julliard 2022-11-25 10:11:36 +01:00
parent f340406417
commit 5392bd303e
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dlls/dwrite/main.c
View file

@ -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)
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)
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;
} }

4
dlls/dwrite/unixlib.h
View file

@ -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 )