[reactos] 01/01: [BOOTDATA][SETUP] Fix regression CORE-16200 font rendering

[Joachim Henze]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5dbc677cdda28c64d6dbc…

commit 5dbc677cdda28c64d6dbc6c27c2f3d0d20e5db69
Author:     Joachim Henze <Joachim.Henze(a)reactos.org>
AuthorDate: Tue Jul 16 22:51:42 2019 +0200
Commit:     Joachim Henze <Joachim.Henze(a)reactos.org>
CommitDate: Tue Jul 16 22:51:42 2019 +0200

    [BOOTDATA][SETUP] Fix regression CORE-16200 font rendering
    
    By removing font substitution for 'Microsoft Sans Serif'.
    Thanks to the patches author Katayama Hirofumi MZ.
    
    This is a partial revert of the guilty rev
    master guilty 0.4.13-dev-9-g
    811faed421a798659af3cb3f09369af84fc4edf0
    
    RC guilty 0.4.12-RC-13-g
    8d3def0529e7e1bb9095713d46f5fbb64df0d299
    
    VBox test result:
    https://reactos.org/testman/compare.php?ids=68497,68499
    
    The same fix has been applied before to 0.4.12-RC-44-g
    ca0e00e8af009679351747150605857be580c538
---
 base/setup/lib/muifonts.h | 10 ----------
 boot/bootdata/livecd.inf  |  1 -
 2 files changed, 11 deletions(-)

diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h
index 826d512bdc1..72292afc466 100644
--- a/base/setup/lib/muifonts.h
+++ b/base/setup/lib/muifonts.h
@@ -11,7 +11,6 @@ MUI_SUBFONT LatinFonts[] =
     { L"Helv",                   L"Tahoma" },
     { L"Helvetica",              L"Liberation Sans" },
     { L"Lucida Console",         L"DejaVu Sans Mono" },
-    { L"Microsoft Sans Serif",   L"Tahoma" },
     { L"MS Sans Serif",          L"Tahoma" },
     { L"MS Shell Dlg",           L"Tahoma" },
     { L"MS Shell Dlg 2",         L"Tahoma" },
@@ -38,7 +37,6 @@ MUI_SUBFONT CyrillicFonts[] =
     { L"Helv",                   L"Tahoma" },
     { L"Helvetica",              L"Liberation Sans" },
     { L"Lucida Console",         L"DejaVu Sans Mono" },
-    { L"Microsoft Sans Serif",   L"Tahoma" },
     { L"MS Sans Serif",          L"Tahoma" },
     { L"MS Shell Dlg",           L"Tahoma" },
     { L"MS Shell Dlg 2",         L"Tahoma" },
@@ -65,7 +63,6 @@ MUI_SUBFONT GreekFonts[] =
     { L"Helv",                   L"DejaVu Sans" },
     { L"Helvetica",              L"Liberation Sans" },
     { L"Lucida Console",         L"DejaVu Sans Mono" },
-    { L"Microsoft Sans Serif",   L"DejaVu Sans" },
     { L"MS Sans Serif",          L"DejaVu Sans" },
     { L"MS Shell Dlg",           L"DejaVu Sans" },
     { L"MS Shell Dlg 2",         L"DejaVu Sans" },
@@ -92,7 +89,6 @@ MUI_SUBFONT HebrewFonts[] =
     { L"Helv",                   L"Tahoma" },
     { L"Helvetica",              L"Tahoma" },
     { L"Lucida Console",         L"DejaVu Sans Mono" },
-    { L"Microsoft Sans Serif",   L"Tahoma" },
     { L"MS Sans Serif",          L"Tahoma" },
     { L"MS Shell Dlg",           L"Tahoma" },
     { L"MS Shell Dlg 2",         L"Tahoma" },
@@ -125,7 +121,6 @@ MUI_SUBFONT ChineseSimplifiedFonts[] =
     { L"Helv",                   L"Droid Sans Fallback" },
     { L"Helvetica",              L"Liberation Sans" },
     { L"Lucida Console",         L"DejaVu Sans Mono" },
-    { L"Microsoft Sans Serif",   L"Droid Sans Fallback" },
     { L"MS Sans Serif",          L"Droid Sans Fallback" },
     { L"MS Shell Dlg",           L"Droid Sans Fallback" },
     { L"MS Shell Dlg 2",         L"Droid Sans Fallback" },
@@ -168,7 +163,6 @@ MUI_SUBFONT ChineseTraditionalFonts[] =
     { L"Helv",            L"Droid Sans Fallback" },
     { L"Helvetica",       L"Liberation Sans" },
     { L"Lucida Console",  L"DejaVu Sans Mono" },
-    { L"Microsoft Sans Serif",   L"Droid Sans Fallback" },
     { L"MS Sans Serif",   L"Droid Sans Fallback" },
     { L"MS Shell Dlg",    L"Droid Sans Fallback" },
     { L"MS Shell Dlg 2",  L"Droid Sans Fallback" },
@@ -212,7 +206,6 @@ MUI_SUBFONT JapaneseFonts[] =
     { L"Helv",            L"Droid Sans Fallback" },
     { L"Helvetica",       L"Liberation Sans" },
     { L"Lucida Console",  L"DejaVu Sans Mono" },
-    { L"Microsoft Sans Serif",   L"Droid Sans Fallback" },
     { L"MS Sans Serif",   L"Droid Sans Fallback" },
     { L"MS Shell Dlg",    L"Droid Sans Fallback" },
     { L"MS Shell Dlg 2",  L"Droid Sans Fallback" },
@@ -257,7 +250,6 @@ MUI_SUBFONT KoreanFonts[] =
     { L"Helv",            L"Droid Sans Fallback" },
     { L"Helvetica",       L"Liberation Sans" },
     { L"Lucida Console",  L"DejaVu Sans Mono" },
-    { L"Microsoft Sans Serif",   L"Droid Sans Fallback" },
     { L"MS Sans Serif",   L"Droid Sans Fallback" },
     { L"MS Shell Dlg",    L"Droid Sans Fallback" },
     { L"MS Shell Dlg 2",  L"Droid Sans Fallback" },
@@ -301,7 +293,6 @@ MUI_SUBFONT UnicodeFonts[] =
     { L"Helv",                   L"DejaVu Sans" },
     { L"Helvetica",              L"DejaVu Sans" },
     { L"Lucida Console",         L"DejaVu Sans Mono" },
-    { L"Microsoft Sans Serif",   L"DejaVu Sans" },
     { L"MS Sans Serif",          L"DejaVu Sans" },
     { L"MS Shell Dlg",           L"DejaVu Sans" },
     { L"MS Shell Dlg 2",         L"DejaVu Sans" },
@@ -329,7 +320,6 @@ MUI_SUBFONT HindiFonts[] =
     { L"Helv",                   L"Tahoma" },
     { L"Helvetica",              L"Liberation Sans" },
     { L"Lucida Console",         L"DejaVu Sans Mono" },
-    { L"Microsoft Sans Serif",   L"FreeSans" },
     { L"MS Sans Serif",          L"FreeSans" },
     { L"MS Shell Dlg",           L"FreeSans" },
     { L"MS Shell Dlg 2",         L"FreeSans" },
diff --git a/boot/bootdata/livecd.inf b/boot/bootdata/livecd.inf
index 9c6e38d005f..465f9ef1969 100644
--- a/boot/bootdata/livecd.inf
+++ b/boot/bootdata/livecd.inf
@@ -55,7 +55,6 @@ HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Fixedsys",0
 HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Tahoma"
 HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Liberation
Sans"
 HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Lucida Console",0x00000000,"DejaVu
Sans Mono"
-HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Microsoft Sans
Serif",0x00000000,"Tahoma"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS
Sans Serif",0x00000000,"Tahoma"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS
Shell Dlg",0x00000000,"Tahoma"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS
Shell Dlg 2",0x00000000,"Tahoma"