projects
/
reactos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
86ae6b0
)
[WIN32SS][NTGDI] Keep FontSubstitutes enumeration CORE-15785 (#1532)
author
Katayama Hirofumi MZ
<katayama.hirofumi.mz@gmail.com>
Fri, 26 Apr 2019 12:56:36 +0000
(21:56 +0900)
committer
GitHub
<noreply@github.com>
Fri, 26 Apr 2019 12:56:36 +0000
(21:56 +0900)
Fix CORE-15785. When LOGFONT.lfFaceName[0] == 0, then enumeration of font substitutes had failed. CORE-15785
win32ss/gdi/ntgdi/freetype.c
patch
|
blob
|
history
diff --git
a/win32ss/gdi/ntgdi/freetype.c
b/win32ss/gdi/ntgdi/freetype.c
index
a613a9f
..
ae6feb0
100644
(file)
--- a/
win32ss/gdi/ntgdi/freetype.c
+++ b/
win32ss/gdi/ntgdi/freetype.c
@@
-2821,7
+2821,13
@@
GetFontFamilyInfoForSubstitutes(const LOGFONTW *LogFont,
GetFontFamilyInfoForList(&lf, Info, pFromW->Buffer, pCount, MaxCount,
&Win32Process->PrivateFontListHead);
IntUnLockProcessPrivateFonts(Win32Process);
- break;
+
+ if (LogFont->lfFaceName[0])
+ {
+ /* it's already matched to the exact name and charset if the name
+ was specified at here, then so don't scan more for another name */
+ break;
+ }
}
return TRUE;