Marcus Meissner : gdi32: Fixed loop end setting (Coverity).

[Alexandre Julliard]

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

Author: Marcus Meissner <marcus at jet.franken.de>
Date:   Sat Nov 12 12:09:33 2011 +0100

gdi32: Fixed loop end setting (Coverity).

---

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

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 9137322..06350be 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -4588,7 +4588,7 @@ static BOOL enum_face_charsets(Face *face, struct enum_charset_list *list,
         if(!face->scalable && face->fs.fsCsb[0] == 0) { /* OEM bitmap */
             elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = OEM_CHARSET;
             load_script_name( IDS_OEM_DOS, elf.elfScript );
-            i = 32; /* break out of loop */
+            i = list->total; /* break out of loop after enumeration */
         } else if(!(face->fs.fsCsb[0] & list->element[i].mask))
             continue;
         else {
@@ -4600,7 +4600,7 @@ static BOOL enum_face_charsets(Face *face, struct enum_charset_list *list,
         TRACE("enuming face %s full %s style %s charset = %d type %d script %s it %d weight %d ntmflags %08x\n",
               debugstr_w(elf.elfLogFont.lfFaceName),
               debugstr_w(elf.elfFullName), debugstr_w(elf.elfStyle),
-              list->element[i].charset, type, debugstr_w(elf.elfScript),
+              elf.elfLogFont.lfCharSet, type, debugstr_w(elf.elfScript),
               elf.elfLogFont.lfItalic, elf.elfLogFont.lfWeight,
               ntm.ntmTm.ntmFlags);
         /* release section before callback (FIXME) */