Module: wine Branch: master Commit: f0881854712e55b9b1e85b939c65f3737d197fd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0881854712e55b9b1e85b939c...
Author: Akihiro Sagawa sagawa.aki@gmail.com Date: Fri Apr 1 21:19:57 2011 +0900
gdi32: Remove redundant charset assignments.
---
dlls/gdi32/freetype.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 31fe4f2..0b50330 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4121,10 +4121,7 @@ static BOOL enum_face_charsets(Face *face, FONTENUMPROCW proc, LPARAM lparam) else { fs.fsCsb[0] = 1L << i; fs.fsCsb[1] = 0; - if(!TranslateCharsetInfo(fs.fsCsb, &csi, TCI_SRCFONTSIG)) - csi.ciCharset = DEFAULT_CHARSET; - if(i == 31) csi.ciCharset = SYMBOL_CHARSET; - if(csi.ciCharset != DEFAULT_CHARSET) { + if(TranslateCharsetInfo(fs.fsCsb, &csi, TCI_SRCFONTSIG)) elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = csi.ciCharset; if(ElfScriptsW[i]) strcpyW(elf.elfScript, ElfScriptsW[i]);