From 0e4f8d1e2c0e3feb94a738daf302de5c35581646 Mon Sep 17 00:00:00 2001 From: Zhangrong Huang Date: Thu, 20 Dec 2007 23:02:44 +0800 Subject: [PATCH] gdi32, winex11.drv: Correct default Chinese font name. --- dlls/gdi32/gdiobj.c | 6 +++--- dlls/winex11.drv/xfont.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 56d3f91e785..91cfb71539c 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -363,7 +363,7 @@ static const struct DefaultFontInfo default_fonts[] = { /* DefaultGuiFont */ 9, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, GB2312_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'M','S',' ','S','o','n','g','\0'} /* FIXME: Is this correct? */ + {'S','i','m','S','u','n','\0'} }, }, { HANGEUL_CHARSET, @@ -405,9 +405,9 @@ static const struct DefaultFontInfo default_fonts[] = {'\0'} }, { /* DefaultGuiFont */ - 8, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, CHINESEBIG5_CHARSET, + 9, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, CHINESEBIG5_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'\0'} /* FIXME - what is the native font??? */ + {'P','M','i','n','g','L','i','U','\0'} }, }, { JOHAB_CHARSET, diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index 0ef18fc86aa..3298818153f 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -308,8 +308,8 @@ static const struct CharsetBindingInfo charsetbindings[] = { "\x82\x6c\x82\x72 \x82\x6f\x96\xbe\x92\xa9", SHIFTJIS_CHARSET }, /* MS P mincho */ { "GulimChe", HANGEUL_CHARSET }, - { "MS Song", GB2312_CHARSET }, - { "MS Hei", GB2312_CHARSET }, + { "\xcb\xce\xcc\xe5", GB2312_CHARSET }, /* SimSun */ + { "\xba\xda\xcc\xe5", GB2312_CHARSET }, /* SimHei */ { "\xb7\x73\xb2\xd3\xa9\xfa\xc5\xe9", CHINESEBIG5_CHARSET },/*MS Mingliu*/ { "\xb2\xd3\xa9\xfa\xc5\xe9", CHINESEBIG5_CHARSET }, -- 2.11.4.GIT