Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-15 09:01:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[0.4.12][BOOTDATA][SETUP] Fix regression CORE-16200 font rendering

Browse source 
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
811faed421

RC guilty 0.4.12-RC-13-g
8d3def0529

VBox test result:
https://reactos.org/testman/compare.php?ids=68497,68499
This commit is contained in:
Joachim Henze 2019-07-15 03:35:42 +02:00
parent 6f651b6ec5
commit ca0e00e8af
2 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
base/setup/lib/muifonts.h
View file

@ -11,7 +11,6 @@ MUI_SUBFONT LatinFonts[] =
{ L"Helv", L"Tahoma" }, { L"Helv", L"Tahoma" },
{ L"Helvetica", L"Liberation Sans" }, { L"Helvetica", L"Liberation Sans" },
{ L"Lucida Console", L"DejaVu Sans Mono" }, { L"Lucida Console", L"DejaVu Sans Mono" },
{ L"Microsoft Sans Serif", L"Tahoma" },
{ L"MS Sans Serif", L"Tahoma" }, { L"MS Sans Serif", L"Tahoma" },
{ L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" },
{ L"MS Shell Dlg 2", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" },
@ -38,7 +37,6 @@ MUI_SUBFONT CyrillicFonts[] =
{ L"Helv", L"Tahoma" }, { L"Helv", L"Tahoma" },
{ L"Helvetica", L"Liberation Sans" }, { L"Helvetica", L"Liberation Sans" },
{ L"Lucida Console", L"DejaVu Sans Mono" }, { L"Lucida Console", L"DejaVu Sans Mono" },
{ L"Microsoft Sans Serif", L"Tahoma" },
{ L"MS Sans Serif", L"Tahoma" }, { L"MS Sans Serif", L"Tahoma" },
{ L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" },
{ L"MS Shell Dlg 2", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" },
@ -65,7 +63,6 @@ MUI_SUBFONT GreekFonts[] =
{ L"Helv", L"DejaVu Sans" }, { L"Helv", L"DejaVu Sans" },
{ L"Helvetica", L"Liberation Sans" }, { L"Helvetica", L"Liberation Sans" },
{ L"Lucida Console", L"DejaVu Sans Mono" }, { L"Lucida Console", L"DejaVu Sans Mono" },
{ L"Microsoft Sans Serif", L"DejaVu Sans" },
{ L"MS Sans Serif", L"DejaVu Sans" }, { L"MS Sans Serif", L"DejaVu Sans" },
{ L"MS Shell Dlg", L"DejaVu Sans" }, { L"MS Shell Dlg", L"DejaVu Sans" },
{ L"MS Shell Dlg 2", L"DejaVu Sans" }, { L"MS Shell Dlg 2", L"DejaVu Sans" },
@ -92,7 +89,6 @@ MUI_SUBFONT HebrewFonts[] =
{ L"Helv", L"Tahoma" }, { L"Helv", L"Tahoma" },
{ L"Helvetica", L"Tahoma" }, { L"Helvetica", L"Tahoma" },
{ L"Lucida Console", L"DejaVu Sans Mono" }, { L"Lucida Console", L"DejaVu Sans Mono" },
{ L"Microsoft Sans Serif", L"Tahoma" },
{ L"MS Sans Serif", L"Tahoma" }, { L"MS Sans Serif", L"Tahoma" },
{ L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" },
{ L"MS Shell Dlg 2", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" },
@ -125,7 +121,6 @@ MUI_SUBFONT ChineseSimplifiedFonts[] =
{ L"Helv", L"Droid Sans Fallback" }, { L"Helv", L"Droid Sans Fallback" },
{ L"Helvetica", L"Liberation Sans" }, { L"Helvetica", L"Liberation Sans" },
{ L"Lucida Console", L"DejaVu Sans Mono" }, { 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 Sans Serif", L"Droid Sans Fallback" },
{ L"MS Shell Dlg", L"Droid Sans Fallback" }, { L"MS Shell Dlg", L"Droid Sans Fallback" },
{ L"MS Shell Dlg 2", 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"Helv", L"Droid Sans Fallback" },
{ L"Helvetica", L"Liberation Sans" }, { L"Helvetica", L"Liberation Sans" },
{ L"Lucida Console", L"DejaVu Sans Mono" }, { 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 Sans Serif", L"Droid Sans Fallback" },
{ L"MS Shell Dlg", L"Droid Sans Fallback" }, { L"MS Shell Dlg", L"Droid Sans Fallback" },
{ L"MS Shell Dlg 2", 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"Helv", L"Droid Sans Fallback" },
{ L"Helvetica", L"Liberation Sans" }, { L"Helvetica", L"Liberation Sans" },
{ L"Lucida Console", L"DejaVu Sans Mono" }, { 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 Sans Serif", L"Droid Sans Fallback" },
{ L"MS Shell Dlg", L"Droid Sans Fallback" }, { L"MS Shell Dlg", L"Droid Sans Fallback" },
{ L"MS Shell Dlg 2", 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"Helv", L"Droid Sans Fallback" },
{ L"Helvetica", L"Liberation Sans" }, { L"Helvetica", L"Liberation Sans" },
{ L"Lucida Console", L"DejaVu Sans Mono" }, { 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 Sans Serif", L"Droid Sans Fallback" },
{ L"MS Shell Dlg", L"Droid Sans Fallback" }, { L"MS Shell Dlg", L"Droid Sans Fallback" },
{ L"MS Shell Dlg 2", 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"Helv", L"DejaVu Sans" },
{ L"Helvetica", L"DejaVu Sans" }, { L"Helvetica", L"DejaVu Sans" },
{ L"Lucida Console", L"DejaVu Sans Mono" }, { L"Lucida Console", L"DejaVu Sans Mono" },
{ L"Microsoft Sans Serif", L"DejaVu Sans" },
{ L"MS Sans Serif", L"DejaVu Sans" }, { L"MS Sans Serif", L"DejaVu Sans" },
{ L"MS Shell Dlg", L"DejaVu Sans" }, { L"MS Shell Dlg", L"DejaVu Sans" },
{ L"MS Shell Dlg 2", L"DejaVu Sans" }, { L"MS Shell Dlg 2", L"DejaVu Sans" },
@ -329,7 +320,6 @@ MUI_SUBFONT HindiFonts[] =
{ L"Helv", L"Tahoma" }, { L"Helv", L"Tahoma" },
{ L"Helvetica", L"Liberation Sans" }, { L"Helvetica", L"Liberation Sans" },
{ L"Lucida Console", L"DejaVu Sans Mono" }, { L"Lucida Console", L"DejaVu Sans Mono" },
{ L"Microsoft Sans Serif", L"FreeSans" },
{ L"MS Sans Serif", L"FreeSans" }, { L"MS Sans Serif", L"FreeSans" },
{ L"MS Shell Dlg", L"FreeSans" }, { L"MS Shell Dlg", L"FreeSans" },
{ L"MS Shell Dlg 2", L"FreeSans" }, { L"MS Shell Dlg 2", L"FreeSans" },

1
boot/bootdata/livecd.inf
View file

@ -50,7 +50,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","Helv",0x00000000,"Tahoma"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Liberation Sans" 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","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 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",0x00000000,"Tahoma"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma"