[WIN32SS][FONT] Move IntUnLockFreeType(); in ftGdiGetTextMetricsW (#1002)
authorKatayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Fri, 2 Nov 2018 07:29:18 +0000 (16:29 +0900)
committerGitHub <noreply@github.com>
Fri, 2 Nov 2018 07:29:18 +0000 (16:29 +0900)
Adjust timing of FreeType unlocking in ftGdiGetTextMetricsW function of "freetype.c". JIRA issue: N/A

win32ss/gdi/ntgdi/freetype.c

index dfdb376..693056b 100644 (file)
@@ -4326,8 +4326,6 @@ ftGdiGetTextMetricsW(
 
             Error = FT_Get_WinFNT_Header(Face, &Win);
 
-            IntUnLockFreeType();
-
             if (NT_SUCCESS(Status))
             {
                 FillTM(&ptmwi->TextMetric, FontGDI, pOS2, pHori, !Error ? &Win : 0);
@@ -4335,6 +4333,8 @@ ftGdiGetTextMetricsW(
                 /* FIXME: Fill Diff member */
                 RtlZeroMemory(&ptmwi->Diff, sizeof(ptmwi->Diff));
             }
+
+            IntUnLockFreeType();
         }
         TEXTOBJ_UnlockText(TextObj);
     }