https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9bb5627df60392b90039266f277ff668b574b4cd
commit 9bb5627df60392b90039266f277ff668b574b4cd Author: Hermès Bélusca-Maïto <[email protected]> AuthorDate: Tue Nov 8 19:06:26 2022 +0100 Commit: Hermès Bélusca-Maïto <[email protected]> CommitDate: Sun Nov 13 00:26:13 2022 +0100 [SETUP][INF] Use the standard "Helv" -> "MS Sans Serif" substitution... (#4864) ... and let the latter one substitute to whatever we want. Hindi however had "Helv" -> "Tahoma", but "MS Sans Serif" -> "FreeSans". Now its "Helv" will go to "FreeSans". --- base/setup/lib/muifonts.h | 18 +++++++++--------- media/inf/font.inf | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index 82cf04cfe43..72afe0a5083 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -15,7 +15,7 @@ MUI_SUBFONT LatinFonts[] = { L"Courier New Greek,161", L"Courier New,161" }, { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, - { L"Helv", L"Tahoma" }, + { L"Helv", L"MS Sans Serif" }, { L"Helvetica", L"Arial" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, @@ -46,7 +46,7 @@ MUI_SUBFONT CyrillicFonts[] = { L"Courier New Greek,161", L"Courier New,161" }, { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, - { L"Helv", L"Tahoma" }, + { L"Helv", L"MS Sans Serif" }, { L"Helvetica", L"Arial" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, @@ -77,7 +77,7 @@ MUI_SUBFONT GreekFonts[] = { L"Courier New Greek,161", L"Courier New,161" }, { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, - { L"Helv", L"Tahoma" }, + { L"Helv", L"MS Sans Serif" }, { L"Helvetica", L"Arial" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, @@ -108,7 +108,7 @@ MUI_SUBFONT HebrewFonts[] = { L"Courier New Greek,161", L"Courier New,161" }, { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, - { L"Helv", L"Tahoma" }, + { L"Helv", L"MS Sans Serif" }, { L"Helvetica", L"Arial" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, @@ -145,7 +145,7 @@ MUI_SUBFONT ChineseSimplifiedFonts[] = { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, - { L"Helv", L"Droid Sans Fallback" }, + { L"Helv", L"MS Sans Serif" }, { L"Helvetica", L"Arial" }, { L"MS Sans Serif", L"Droid Sans Fallback" }, { L"MS Shell Dlg", L"Droid Sans Fallback" }, @@ -198,7 +198,7 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"DLCMingMedium", L"Droid Sans Fallback" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, - { L"Helv", L"Droid Sans Fallback" }, + { L"Helv", L"MS Sans Serif" }, { L"Helvetica", L"Arial" }, { L"MS Sans Serif", L"Droid Sans Fallback" }, { L"MS Shell Dlg", L"Droid Sans Fallback" }, @@ -247,7 +247,7 @@ MUI_SUBFONT JapaneseFonts[] = { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, - { L"Helv", L"Droid Sans Fallback" }, + { L"Helv", L"MS Sans Serif" }, { L"Helvetica", L"Arial" }, { L"MS Gothic", L"Droid Sans Fallback" }, { L"MS Mincho", L"Droid Sans Fallback" }, @@ -305,7 +305,7 @@ MUI_SUBFONT KoreanFonts[] = { L"GulimChe", L"Droid Sans Fallback" }, { L"Gungsuh", L"Droid Sans Fallback" }, { L"GungsuhChe", L"Droid Sans Fallback" }, - { L"Helv", L"Droid Sans Fallback" }, + { L"Helv", L"MS Sans Serif" }, { L"Helvetica", L"Arial" }, { L"MS Sans Serif", L"Droid Sans Fallback" }, { L"MS Shell Dlg", L"Droid Sans Fallback" }, @@ -376,7 +376,7 @@ MUI_SUBFONT HindiFonts[] = { L"Courier New Greek,161", L"Courier New,161" }, { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, - { L"Helv", L"Tahoma" }, + { L"Helv", L"MS Sans Serif" }, { L"Helvetica", L"Arial" }, { L"MS Sans Serif", L"FreeSans" }, { L"MS Shell Dlg", L"FreeSans" }, diff --git a/media/inf/font.inf b/media/inf/font.inf index f14707f1835..749d673b01c 100644 --- a/media/inf/font.inf +++ b/media/inf/font.inf @@ -26,7 +26,7 @@ HKLM,"System\CurrentControlSet\Hardware Profiles\Current\Software\Fonts","LogPix [Font.Latin.Reg] HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"Courier New" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"MS Sans Serif" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" @@ -38,7 +38,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x [Font.Cyrillic.Reg] HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"Courier New" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"MS Sans Serif" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" @@ -50,7 +50,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x [Font.Greek.Reg] HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"Courier New" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"MS Sans Serif" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" @@ -62,7 +62,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x [Font.Hebrew.Reg] HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"Courier New" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"MS Sans Serif" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" @@ -75,7 +75,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"Courier New" 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","Helv",0x00000000,"MS Sans Serif" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Droid Sans Fallback" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Droid Sans Fallback"
