Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 18:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SETUP][INF][ROSTESTS] Delete font substitutions and tests for "DejaVu Sans" (#4829)

Browse source 
I manually applied the final state of the reviewed (#4829) by hand.

The commit relies on (#4837) which added the Greek Tahoma glyphs, and the result now
does finally draw fine with unbold Tahoma also for the Greek ros installation.
See the final screenshot that I added today within (#4829).

Since 0.4.14-dev-6-g f45dd65 we do have a proper "Verdana" font,
so there is no need for substitution with "DejaVu Sans" any longer. That is the proper MS name for such a font.

And with 0.4.14-dev-20-g 2f4fb90 we even deleted the "DejaVu Sans" font,
so it makes no sense to keep it as a substitution target.

So adapt fonts.inf and muifonts.h, and also a test where it was still referenced.
MS 2k3sp2 does neither have such a font substitute, nor such a font.
This commit is contained in:
Joachim Henze 2022-11-04 15:39:32 +01:00
parent 94c8f271c9
commit d035452148
3 changed files with 8 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -77,13 +77,12 @@ MUI_SUBFONT GreekFonts[] =
{ L"Courier New Greek,161", L"Courier New,161" }, { L"Courier New Greek,161", L"Courier New,161" },
{ L"Courier New TUR,162", L"Courier New,162" }, { L"Courier New TUR,162", L"Courier New,162" },
{ L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" },
{ L"Helv", L"DejaVu Sans" }, { L"Helv", L"Tahoma" },
{ L"Helvetica", L"Arial" }, { L"Helvetica", L"Arial" },
{ L"MS Sans Serif", L"DejaVu Sans" }, { L"MS Sans Serif", L"Tahoma" },
{ L"MS Shell Dlg", L"DejaVu Sans" }, { L"MS Shell Dlg", L"Tahoma" },
{ L"MS Shell Dlg 2", L"DejaVu Sans" }, { L"MS Shell Dlg 2", L"Tahoma" },
{ L"System", L"FreeSans" }, { L"System", L"FreeSans" },
{ L"Tahoma", L"DejaVu Sans" },
{ L"Terminal", L"DejaVu Sans Mono" }, { L"Terminal", L"DejaVu Sans Mono" },
{ L"Times", L"Times New Roman" }, { L"Times", L"Times New Roman" },
{ L"Times New Roman Baltic,186", L"Times New Roman,186" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" },
@ -97,7 +96,6 @@ MUI_SUBFONT GreekFonts[] =
MUI_SUBFONT HebrewFonts[] = MUI_SUBFONT HebrewFonts[] =
{ {
{ L"Arial", L"DejaVu Sans" },
{ L"Arial Baltic,186", L"Arial,186" }, { L"Arial Baltic,186", L"Arial,186" },
{ L"Arial CE,238", L"Arial,238" }, { L"Arial CE,238", L"Arial,238" },
{ L"Arial CYR,204", L"Arial,204" }, { L"Arial CYR,204", L"Arial,204" },
@ -343,7 +341,6 @@ MUI_SUBFONT KoreanFonts[] =
MUI_SUBFONT UnicodeFonts[] = MUI_SUBFONT UnicodeFonts[] =
{ {
{ L"Arial", L"DejaVu Sans" },
{ L"Arial Baltic,186", L"Arial,186" }, { L"Arial Baltic,186", L"Arial,186" },
{ L"Arial CE,238", L"Arial,238" }, { L"Arial CE,238", L"Arial,238" },
{ L"Arial CYR,204", L"Arial,204" }, { L"Arial CYR,204", L"Arial,204" },
@ -357,13 +354,8 @@ MUI_SUBFONT UnicodeFonts[] =
{ L"Courier New Greek,161", L"Courier New,161" }, { L"Courier New Greek,161", L"Courier New,161" },
{ L"Courier New TUR,162", L"Courier New,162" }, { L"Courier New TUR,162", L"Courier New,162" },
{ L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" },
{ L"Helv", L"DejaVu Sans" },
{ L"Helvetica", L"Arial" }, { L"Helvetica", L"Arial" },
{ L"MS Sans Serif", L"DejaVu Sans" },
{ L"MS Shell Dlg", L"DejaVu Sans" },
{ L"MS Shell Dlg 2", L"DejaVu Sans" },
{ L"System", L"FreeSans" }, { L"System", L"FreeSans" },
{ L"Tahoma", L"DejaVu Sans" },
{ L"Terminal", L"DejaVu Sans Mono" }, { L"Terminal", L"DejaVu Sans Mono" },
{ L"Times", L"Times New Roman" }, { L"Times", L"Times New Roman" },
{ L"Times New Roman Baltic,186", L"Times New Roman,186" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" },

16
media/inf/font.inf
View file

@ -50,18 +50,16 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x
[Font.Greek.Reg] [Font.Greek.Reg]
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"FreeMono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"FreeMono"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"DejaVu Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Tahoma"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"DejaVu Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"DejaVu Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"DejaVu Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tahoma",0x00000000,"DejaVu Sans"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"DejaVu Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"DejaVu Sans Mono"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman"
[Font.Hebrew.Reg] [Font.Hebrew.Reg]
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Arial",0x00000000,"DejaVu Sans"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"FreeMono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"FreeMono"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" 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,"Tahoma"
@ -94,16 +92,10 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Trebuchet M
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Ubuntu",0x00000000,"Droid Sans Fallback" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Ubuntu",0x00000000,"Droid Sans Fallback"
[Font.Unicode.Reg] [Font.Unicode.Reg]
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Arial",0x00000000,"DejaVu Sans"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"DejaVu Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"DejaVu Sans Mono"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier New",0x00000000,"DejaVu Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier New",0x00000000,"DejaVu Sans Mono"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"DejaVu Sans"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"DejaVu Sans"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"DejaVu Sans"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"DejaVu Sans"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tahoma",0x00000000,"DejaVu Sans"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"DejaVu Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"DejaVu Sans Mono"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman"

1
modules/rostests/winetests/gdi32/font.c
View file

@ -5590,7 +5590,6 @@ static void test_fullname2_helper(const char *Family)
static void test_fullname2(void) static void test_fullname2(void)
{ {
test_fullname2_helper("Arial"); test_fullname2_helper("Arial");
test_fullname2_helper("DejaVu Sans");
test_fullname2_helper("Lucida Sans"); test_fullname2_helper("Lucida Sans");
test_fullname2_helper("Tahoma"); test_fullname2_helper("Tahoma");
test_fullname2_helper("Webdings"); test_fullname2_helper("Webdings");