procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Cygwin build

Browse source 
* src/w32uniscribe.c (syms_of_w32uniscribe_for_pdumper): Define
and retrieve handle to USP10.DLL on Cygwin.
This commit is contained in:
Po Lu 2024-06-27 09:59:57 +08:00
parent 18e7a9f3d0
commit 8d55b38e2a
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/w32uniscribe.c
View file

@ -1538,12 +1538,13 @@ syms_of_w32uniscribe_for_pdumper (void)
if (!initialized) if (!initialized)
return; return;
#ifdef WINDOWSNT
/* Don't register if Uniscribe is not available. */ /* Don't register if Uniscribe is not available. */
HMODULE uniscribe = LoadLibrary ("usp10.dll"); HMODULE uniscribe;
if (!uniscribe) if (!uniscribe)
return; return;
#ifdef WINDOWSNT
uniscribe = LoadLibrary ("usp10.dll");
pfnScriptItemize = (void *) get_proc_addr (uniscribe, "ScriptItemize"); pfnScriptItemize = (void *) get_proc_addr (uniscribe, "ScriptItemize");
pfnScriptShape = (void *) get_proc_addr (uniscribe, "ScriptShape"); pfnScriptShape = (void *) get_proc_addr (uniscribe, "ScriptShape");
pfnScriptPlace = (void *) get_proc_addr (uniscribe, "ScriptPlace"); pfnScriptPlace = (void *) get_proc_addr (uniscribe, "ScriptPlace");
@ -1561,15 +1562,16 @@ syms_of_w32uniscribe_for_pdumper (void)
return; return;
} }
#else /* Cygwin */ #else /* Cygwin */
uniscribe = GetModuleHandle ("usp10.dll");
pfnScriptItemize = &ScriptItemize; pfnScriptItemize = &ScriptItemize;
pfnScriptShape = &ScriptShape; pfnScriptShape = &ScriptShape;
pfnScriptPlace = &ScriptPlace; pfnScriptPlace = &ScriptPlace;
pfnScriptGetGlyphABCWidth = &ScriptGetGlyphABCWidth; pfnScriptGetGlyphABCWidth = &ScriptGetGlyphABCWidth;
pfnScriptFreeCache = &ScriptFreeCache; pfnScriptFreeCache = &ScriptFreeCache;
pfnScriptGetCMap = &ScriptGetCMap; pfnScriptGetCMap = &ScriptGetCMap;
#endif /* Cygwin */
uniscribe_available = 1; uniscribe_available = 1;
#endif /* Cygwin */
register_font_driver (&uniscribe_font_driver, NULL); register_font_driver (&uniscribe_font_driver, NULL);