Alexandre Julliard : gdi32: Initialize fontconfig even when fonts are cached.
Alexandre Julliard
julliard at winehq.org
Tue Jan 15 13:46:18 CST 2013
Module: wine
Branch: master
Commit: 0b10f0b8547f05780841bc476955ea2e1faa1e0b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b10f0b8547f05780841bc476955ea2e1faa1e0b
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Jan 15 14:28:10 2013 +0100
gdi32: Initialize fontconfig even when fonts are cached.
---
dlls/gdi32/freetype.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 59ac9a4..639fb63 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -3703,10 +3703,6 @@ static void init_font_list(void)
char *unixname;
const char *data_dir;
-#ifdef SONAME_LIBFONTCONFIG
- init_fontconfig();
-#endif
-
delete_external_font_keys();
/* load the system bitmap fonts */
@@ -3885,6 +3881,10 @@ BOOL WineEngInit(void)
if(!init_freetype()) return FALSE;
+#ifdef SONAME_LIBFONTCONFIG
+ init_fontconfig();
+#endif
+
if((font_mutex = CreateMutexW(NULL, FALSE, font_mutex_nameW)) == NULL)
{
ERR("Failed to create font mutex\n");
More information about the wine-cvs
mailing list