https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02eeee15f0463e1a534dd2a46840ad81964f190b
commit 02eeee15f0463e1a534dd2a46840ad81964f190b Author: Luo Yufan <[email protected]> AuthorDate: Sun Feb 10 22:46:19 2019 +0800 Commit: Hermès BÉLUSCA - MAÏTO <[email protected]> CommitDate: Sun Feb 10 15:46:19 2019 +0100 [SETUP][INF] Add font substitute for CJK. (#1346) Fix CJK font problem in Royale theme in ReactOS. The reason for this PR is similar to the previous one (#1127). CORE-15738 --- base/setup/lib/muifonts.h | 10 ++++++++-- media/inf/font.inf | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index b865a40d4b..72292afc46 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -117,7 +117,7 @@ MUI_SUBFONT ChineseSimplifiedFonts[] = { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, - { L"Franklin Gothic Medium", L"Libre Franklin" }, + { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, { L"Helv", L"Droid Sans Fallback" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, @@ -131,7 +131,7 @@ MUI_SUBFONT ChineseSimplifiedFonts[] = { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, - { L"Trebuchet MS", L"Open Sans" }, + { L"Trebuchet MS", L"Droid Sans Fallback" }, { L"SimSun", L"Droid Sans Fallback" }, { L"NSimSun", L"Droid Sans Fallback" }, { L"SimHei", L"Droid Sans Fallback" }, @@ -173,6 +173,7 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, + { L"Trebuchet MS", L"Droid Sans Fallback" }, { L"Ming Light", L"Droid Sans Fallback" }, { L"MingLiU", L"Droid Sans Fallback" }, { L"PMingLiU", L"Droid Sans Fallback" }, @@ -180,6 +181,7 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"DLCMingBold", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, { L"Comic Sans MS", L"Ubuntu" }, + { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"DejaVu Serif" }, { L"Ubuntu", L"Droid Sans Fallback" }, @@ -214,12 +216,14 @@ MUI_SUBFONT JapaneseFonts[] = { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, + { L"Trebuchet MS", L"Droid Sans Fallback" }, { L"MS Mincho", L"Droid Sans Fallback" }, { L"MS PMincho", L"Droid Sans Fallback" }, { L"MS Gothic", L"Droid Sans Fallback" }, { L"MS PGothic", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, { L"Comic Sans MS", L"Ubuntu" }, + { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"DejaVu Serif" }, { L"Ubuntu", L"Droid Sans Fallback" }, @@ -256,6 +260,7 @@ MUI_SUBFONT KoreanFonts[] = { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, + { L"Trebuchet MS", L"Droid Sans Fallback" }, { L"Batang", L"Droid Sans Fallback" }, { L"BatangChe", L"Droid Sans Fallback" }, { L"Gungsuh", L"Droid Sans Fallback" }, @@ -264,6 +269,7 @@ MUI_SUBFONT KoreanFonts[] = { L"GulimChe", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, { L"Comic Sans MS", L"Ubuntu" }, + { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"DejaVu Serif" }, { L"Ubuntu", L"Droid Sans Fallback" }, diff --git a/media/inf/font.inf b/media/inf/font.inf index 62eedd1f49..2327a76866 100644 --- a/media/inf/font.inf +++ b/media/inf/font.inf @@ -97,6 +97,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Arial",0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"FreeMono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier New",0x00000000,"FreeMono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Franklin Gothic Medium",0x00000000,"Droid Sans Fallback" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Droid Sans Fallback" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Liberation Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Lucida Console",0x00000000,"DejaVu Sans Mono" @@ -110,6 +111,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Liberation Serif" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times New Roman",0x00000000,"Liberation Serif" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Liberation Serif" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Trebuchet MS",0x00000000,"Droid Sans Fallback" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Ubuntu",0x00000000,"Droid Sans Fallback" [Font.Unicode.Reg]
