Jiangyi Chen : gdi32: Delete the external font reg key when face's name matches but the file path does not.

[Alexandre Julliard]

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

Author: Jiangyi Chen <cjy520lcy(a)163.com>
Date:   Mon May 24 11:30:46 2021 +0100

gdi32: Delete the external font reg key when face's name matches but the file path does not.

Signed-off-by: Jiangyi Chen <chenjiangyi(a)uniontech.com>
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/gdi32/font.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index 2d2831ec725..49775b7a806 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -7881,9 +7881,9 @@ static void update_external_font_keys(void)
     {
         if (type != REG_SZ) goto next;
         if ((tmp = wcsrchr( value, ' ' )) && !facename_compare( tmp, L" (TrueType)", -1 )) *tmp = 0;
-        if ((face = find_face_from_full_name( value )))
+        if ((face = find_face_from_full_name( value )) && !wcsicmp( face->file, path ))
         {
-            if (!wcsicmp( face->file, path )) face->flags |= ADDFONT_EXTERNAL_FOUND;
+            face->flags |= ADDFONT_EXTERNAL_FOUND;
             goto next;
         }
         if (tmp && !*tmp) *tmp = ' ';