Grazvydas Ignotas : gdi32: Use correct name for elfFullName.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4a463e06505af991f23b9c2ce47efedaf9738928
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4a463e06505af991f23b9c2ce4...

Author: Grazvydas Ignotas 
Date:   Tue Aug 23 23:11:57 2011 +0300

gdi32: Use correct name for elfFullName.

---

dlls/gdi32/freetype.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 426dc05..716a37f 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -4085,7 +4085,7 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf,
                  (WCHAR*)((char*)font->potm + (ULONG_PTR)font->potm->otmpFamilyName),
                  LF_FACESIZE);
         lstrcpynW(pelf->elfFullName,
-                 (WCHAR*)((char*)font->potm + (ULONG_PTR)font->potm->otmpFaceName),
+                 (WCHAR*)((char*)font->potm + (ULONG_PTR)font->potm->otmpFullName),
                  LF_FULLFACESIZE);
         lstrcpynW(pelf->elfStyle,
                  (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;

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);
     }