Skip to content

W
wine-winehq
Commit 4a463e06 authored by Grazvydas Ignotas's avatar Grazvydas Ignotas Committed by Alexandre Julliard
Browse files
Options

gdi32: Use correct name for elfFullName.

parent 37cdf6bd
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
dlls/gdi32/freetype.c
View file @ 4a463e06
...@@ -4085,7 +4085,7 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, ...@@ -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, ...@@ -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);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment