Rémi Bernon : gdi32: Load registry fonts after system fonts.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3c0137f81e35c3868ad543f1433f034c03809884
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=3c0137f81e35c3868ad543f14...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Fri Nov 27 15:38:01 2020 +0100

gdi32: Load registry fonts after system fonts.

This fixes an issue when, if an external font path was modified in the
Windows key, it was then not considered as external anymore, but still
present in the external key, and then dropped from both on update.

This now forcefully updates the font path in both keys if needed.

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/gdi32/font.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index db87a283b13..28179aec54a 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -7958,8 +7958,8 @@ void font_init(void)
         HKEY key = load_external_font_keys();
         load_system_bitmap_fonts();
         load_file_system_fonts();
-        load_registry_fonts();
         font_funcs->load_fonts();
+        load_registry_fonts();
         update_external_font_keys( key );
         RegCloseKey( key );
     }