Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-01 17:31:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FREETYPE] Allow a NULL style_name.

Browse source 
CORE-14775
This commit is contained in:
Mark Jansen 2018-06-29 21:55:54 +02:00
parent 97df61edfa
commit ae8762e15e
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
win32ss/gdi/ntgdi/freetype.c
View file

@ -193,7 +193,7 @@ SharedFace_Create(FT_Face Face, PSHARED_MEM Memory)
SharedFaceCache_Init(&Ptr->UserLanguage); SharedFaceCache_Init(&Ptr->UserLanguage);
SharedMem_AddRef(Memory); SharedMem_AddRef(Memory);
DPRINT("Creating SharedFace for %s\n", Face->family_name); DPRINT("Creating SharedFace for %s\n", Face->family_name ? Face->family_name : "<NULL>");
} }
return Ptr; return Ptr;
} }
@ -294,7 +294,7 @@ SharedFace_Release(PSHARED_FACE Ptr)
--Ptr->RefCount; --Ptr->RefCount;
if (Ptr->RefCount == 0) if (Ptr->RefCount == 0)
{ {
DPRINT("Releasing SharedFace for %s\n", Ptr->Face->family_name); DPRINT("Releasing SharedFace for %s\n", Ptr->Face->family_name ? Ptr->Face->family_name : "<NULL>");
RemoveCacheEntries(Ptr->Face); RemoveCacheEntries(Ptr->Face);
FT_Done_Face(Ptr->Face); FT_Done_Face(Ptr->Face);
SharedMem_Release(Ptr->Memory); SharedMem_Release(Ptr->Memory);
@ -989,7 +989,9 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont,
} }
++FaceCount; ++FaceCount;
DPRINT("Font loaded: %s (%s)\n", Face->family_name, Face->style_name); DPRINT("Font loaded: %s (%s)\n",
Face->family_name ? Face->family_name : "<NULL>",
Face->style_name ? Face->style_name : "<NULL>");
DPRINT("Num glyphs: %d\n", Face->num_glyphs); DPRINT("Num glyphs: %d\n", Face->num_glyphs);
DPRINT("CharSet: %d\n", FontGDI->CharSet); DPRINT("CharSet: %d\n", FontGDI->CharSet);
@ -4028,7 +4030,6 @@ GetFontPenalty(const LOGFONTW * LogFont,
ASSERT(Otm); ASSERT(Otm);
ASSERT(LogFont); ASSERT(LogFont);
ASSERT(style_name);
/* FIXME: Aspect Penalty 30 */ /* FIXME: Aspect Penalty 30 */
/* FIXME: IntSizeSynth Penalty 20 */ /* FIXME: IntSizeSynth Penalty 20 */