ByeongSik Jeon : gdi32: Unify Chinese and Japanese default font name.

[Alexandre Julliard]

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

Author: ByeongSik Jeon <bsjeon(a)hanmail.net>
Date:   Thu Dec 11 03:29:07 2008 +0900

gdi32: Unify Chinese and Japanese default font name.

---

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

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 2894dca..aac5fde 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -2276,7 +2276,7 @@ static const struct nls_update_font_list
     /* Chinese Simplified */
     { 936, 936, "vga936.fon", "svgafix.fon", "svgasys.fon",
       "coure.fon", "serife.fon", "smalle.fon", "sserife.fon",
-      "Tahoma", "Times New Roman", /* FIXME unverified */
+      "SimSun", "NSimSun",
       NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
       { 0 }, { 0 }, { 0 }
     },
diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c
index a4f2fb5..910f49b 100644
--- a/dlls/gdi32/gdiobj.c
+++ b/dlls/gdi32/gdiobj.c
@@ -341,7 +341,7 @@ static const struct DefaultFontInfo default_fonts[] =
         { /* DefaultGuiFont */
            9, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, SHIFTJIS_CHARSET,
            0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS,
-           {'M','S',' ','U','I',' ','G','o','t','h','i','c','\0'}
+           {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'}
         },
     },
     {   GB2312_CHARSET,
@@ -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,
-           {'S','i','m','S','u','n','\0'}
+           {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'}
         },
     },
     {   HANGEUL_CHARSET,
@@ -407,7 +407,7 @@ static const struct DefaultFontInfo default_fonts[] =
         { /* DefaultGuiFont */
            9, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, CHINESEBIG5_CHARSET,
            0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS,
-           {'P','M','i','n','g','L','i','U','\0'}
+           {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'}
         },
     },
     {   JOHAB_CHARSET,