projects
/
reactos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
ce077bb
)
[WIN32SS][FONT] Move IntUnLockFreeType(); in ftGdiGetTextMetricsW (#1002)
author
Katayama Hirofumi MZ
<katayama.hirofumi.mz@gmail.com>
Fri, 2 Nov 2018 07:29:18 +0000
(16:29 +0900)
committer
GitHub
<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
patch
|
blob
|
history
diff --git
a/win32ss/gdi/ntgdi/freetype.c
b/win32ss/gdi/ntgdi/freetype.c
index
dfdb376
..
693056b
100644
(file)
--- a/
win32ss/gdi/ntgdi/freetype.c
+++ b/
win32ss/gdi/ntgdi/freetype.c
@@
-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);
}