Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Typeface name of the font must not exceed LF_FACESIZE characters

Browse Source
This commit is contained in:
Artur Wieczorek
2017-01-28 21:47:49 +01:00
parent f0bf5b6fd7
commit 5520702674
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/msw/graphicsd2d.cpp
View File

@@ -2614,12 +2614,16 @@ wxD2DFontData::wxD2DFontData(wxGraphicsRenderer* renderer, ID2D1Factory* d2dFact
wxCHECK_RET( n > 0, wxS("Failed to obtain font info") ); wxCHECK_RET( n > 0, wxS("Failed to obtain font info") );
// Ensure the LOGFONT object contains the correct font face name // Ensure the LOGFONT object contains the correct font face name
if (logfont.lfFaceName[0] == '\0') if (lstrlen(logfont.lfFaceName) == 0)
{ {
for (unsigned int i = 0; i < font.GetFaceName().Length(); ++i) // The length of the font name must not exceed LF_FACESIZE TCHARs,
// including the terminating NULL.
wxString name = font.GetFaceName().Mid(0, WXSIZEOF(logfont.lfFaceName)-1);
for (unsigned int i = 0; i < name.Length(); ++i)
{ {
logfont.lfFaceName[i] = font.GetFaceName().GetChar(i); logfont.lfFaceName[i] = name.GetChar(i);
} }
logfont.lfFaceName[name.Length()] = L'\0';
} }
hr = gdiInterop->CreateFontFromLOGFONT(&logfont, &m_font); hr = gdiInterop->CreateFontFromLOGFONT(&logfont, &m_font);