[ros-diffs] [reactos] 01/01: [SETUP][INF][ROSTESTS] Delete font substitutions and tests for "DejaVu Sans" (#4829)

[Joachim Henze]

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

commit d03545214831c3c603fa2f3056c8a26d30de3b69
Author:     Joachim Henze <Joachim.Henze(a)reactos.org>
AuthorDate: Fri Nov 4 15:39:32 2022 +0100
Commit:     Joachim Henze <Joachim.Henze(a)reactos.org>
CommitDate: Fri Nov 4 15:39:32 2022 +0100

    [SETUP][INF][ROSTESTS] Delete font substitutions and tests for "DejaVu Sans"
(#4829)
    
    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.
---
 base/setup/lib/muifonts.h               | 16 ++++------------
 media/inf/font.inf                      | 16 ++++------------
 modules/rostests/winetests/gdi32/font.c |  1 -
 3 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h
index 32a9b1cc33c..c3c90b6aad5 100644
--- a/base/setup/lib/muifonts.h
+++ b/base/setup/lib/muifonts.h
@@ -77,13 +77,12 @@ 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"DejaVu Sans" },
+    { L"Helv",                   L"Tahoma" },
     { 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"MS Sans Serif",          L"Tahoma" },
+    { L"MS Shell Dlg",           L"Tahoma" },
+    { L"MS Shell Dlg 2",         L"Tahoma" },
     { L"System",                 L"FreeSans" },
-    { L"Tahoma",                 L"DejaVu Sans" },
     { L"Terminal",               L"DejaVu Sans Mono" },
     { L"Times",                  L"Times New Roman" },
     { L"Times New Roman Baltic,186",   L"Times New Roman,186" },
@@ -97,7 +96,6 @@ MUI_SUBFONT GreekFonts[] =
 
 MUI_SUBFONT HebrewFonts[] =
 {
-    { L"Arial",                  L"DejaVu Sans" },
     { L"Arial Baltic,186",       L"Arial,186" },
     { L"Arial CE,238",           L"Arial,238" },
     { L"Arial CYR,204",          L"Arial,204" },
@@ -343,7 +341,6 @@ MUI_SUBFONT KoreanFonts[] =
 
 MUI_SUBFONT UnicodeFonts[] =
 {
-    { L"Arial",                  L"DejaVu Sans" },
     { L"Arial Baltic,186",       L"Arial,186" },
     { L"Arial CE,238",           L"Arial,238" },
     { 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 TUR,162",    L"Courier New,162" },
     { L"Fixedsys",               L"Fixedsys Excelsior 3.01-L2" },
-    { L"Helv",                   L"DejaVu Sans" },
     { 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"Tahoma",                 L"DejaVu Sans" },
     { L"Terminal",               L"DejaVu Sans Mono" },
     { L"Times",                  L"Times New Roman" },
     { L"Times New Roman Baltic,186",   L"Times New Roman,186" },
diff --git a/media/inf/font.inf b/media/inf/font.inf
index 4c505f3c505..b49f3bfe477 100644
--- a/media/inf/font.inf
+++ b/media/inf/font.inf
@@ -50,18 +50,16 @@ HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x
 [Font.Greek.Reg]
 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","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","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","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"
 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","Tms
Rmn",0x00000000,"Times New Roman"
 
 [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","Fixedsys",0x00000000,"Fixedsys
Excelsior 3.01-L2"
 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"
 
 [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 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","Helv",0x00000000,"DejaVu
Sans"
 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","Times",0x00000000,"Times New
Roman"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms
Rmn",0x00000000,"Times New Roman"
diff --git a/modules/rostests/winetests/gdi32/font.c
b/modules/rostests/winetests/gdi32/font.c
index a554e153c8f..da0027c9cfa 100644
--- a/modules/rostests/winetests/gdi32/font.c
+++ b/modules/rostests/winetests/gdi32/font.c
@@ -5590,7 +5590,6 @@ static void test_fullname2_helper(const char *Family)
 static void test_fullname2(void)
 {
     test_fullname2_helper("Arial");
-    test_fullname2_helper("DejaVu Sans");
     test_fullname2_helper("Lucida Sans");
     test_fullname2_helper("Tahoma");
     test_fullname2_helper("Webdings");