gdi32: Use correct name for elfFullName.

This commit is contained in:
Grazvydas Ignotas 2011-08-23 23:11:57 +03:00 committed by Alexandre Julliard
parent 37cdf6bd26
commit 4a463e0650
1 changed files with 5 additions and 2 deletions

View File

@ -4085,7 +4085,7 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf,
(WCHAR*)((char*)font->potm + (ULONG_PTR)font->potm->otmpFamilyName), (WCHAR*)((char*)font->potm + (ULONG_PTR)font->potm->otmpFamilyName),
LF_FACESIZE); LF_FACESIZE);
lstrcpynW(pelf->elfFullName, lstrcpynW(pelf->elfFullName,
(WCHAR*)((char*)font->potm + (ULONG_PTR)font->potm->otmpFaceName), (WCHAR*)((char*)font->potm + (ULONG_PTR)font->potm->otmpFullName),
LF_FULLFACESIZE); LF_FULLFACESIZE);
lstrcpynW(pelf->elfStyle, lstrcpynW(pelf->elfStyle,
(WCHAR*)((char*)font->potm + (ULONG_PTR)font->potm->otmpStyleName), (WCHAR*)((char*)font->potm + (ULONG_PTR)font->potm->otmpStyleName),
@ -4098,7 +4098,10 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf,
pntm->ntmTm.ntmSizeEM = pntm->ntmTm.tmHeight - pntm->ntmTm.tmInternalLeading; pntm->ntmTm.ntmSizeEM = pntm->ntmTm.tmHeight - pntm->ntmTm.tmInternalLeading;
lstrcpynW(pelf->elfLogFont.lfFaceName, face->family->FamilyName, LF_FACESIZE); lstrcpynW(pelf->elfLogFont.lfFaceName, face->family->FamilyName, LF_FACESIZE);
lstrcpynW(pelf->elfFullName, face->family->FamilyName, LF_FULLFACESIZE); if (face->FullName)
lstrcpynW(pelf->elfFullName, face->FullName, LF_FULLFACESIZE);
else
lstrcpynW(pelf->elfFullName, face->family->FamilyName, LF_FULLFACESIZE);
lstrcpynW(pelf->elfStyle, face->StyleName, LF_FACESIZE); lstrcpynW(pelf->elfStyle, face->StyleName, LF_FACESIZE);
} }