diff options
Diffstat (limited to 'src/w32uniscribe.c')
| -rw-r--r-- | src/w32uniscribe.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c index 1763ca5dc34..8e16d6a198c 100644 --- a/src/w32uniscribe.c +++ b/src/w32uniscribe.c | |||
| @@ -1540,11 +1540,12 @@ syms_of_w32uniscribe_for_pdumper (void) | |||
| 1540 | 1540 | ||
| 1541 | /* Don't register if Uniscribe is not available. */ | 1541 | /* Don't register if Uniscribe is not available. */ |
| 1542 | HMODULE uniscribe; | 1542 | HMODULE uniscribe; |
| 1543 | if (!uniscribe) | ||
| 1544 | return; | ||
| 1545 | 1543 | ||
| 1546 | #ifdef WINDOWSNT | 1544 | #ifdef WINDOWSNT |
| 1547 | uniscribe = LoadLibrary ("usp10.dll"); | 1545 | uniscribe = LoadLibrary ("usp10.dll"); |
| 1546 | if (!uniscribe) | ||
| 1547 | return; | ||
| 1548 | |||
| 1548 | pfnScriptItemize = (void *) get_proc_addr (uniscribe, "ScriptItemize"); | 1549 | pfnScriptItemize = (void *) get_proc_addr (uniscribe, "ScriptItemize"); |
| 1549 | pfnScriptShape = (void *) get_proc_addr (uniscribe, "ScriptShape"); | 1550 | pfnScriptShape = (void *) get_proc_addr (uniscribe, "ScriptShape"); |
| 1550 | pfnScriptPlace = (void *) get_proc_addr (uniscribe, "ScriptPlace"); | 1551 | pfnScriptPlace = (void *) get_proc_addr (uniscribe, "ScriptPlace"); |
| @@ -1563,6 +1564,9 @@ syms_of_w32uniscribe_for_pdumper (void) | |||
| 1563 | } | 1564 | } |
| 1564 | #else /* Cygwin */ | 1565 | #else /* Cygwin */ |
| 1565 | uniscribe = GetModuleHandle ("usp10.dll"); | 1566 | uniscribe = GetModuleHandle ("usp10.dll"); |
| 1567 | if (!uniscribe) | ||
| 1568 | return; | ||
| 1569 | |||
| 1566 | pfnScriptItemize = &ScriptItemize; | 1570 | pfnScriptItemize = &ScriptItemize; |
| 1567 | pfnScriptShape = &ScriptShape; | 1571 | pfnScriptShape = &ScriptShape; |
| 1568 | pfnScriptPlace = &ScriptPlace; | 1572 | pfnScriptPlace = &ScriptPlace; |