https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4615c824db153724da055e...
commit 4615c824db153724da055ec3479c5c0452ac1460 Author: Joachim Henze joachim.henze@reactos.org AuthorDate: Mon Oct 31 02:00:01 2022 +0100 Commit: GitHub noreply@github.com CommitDate: Mon Oct 31 02:00:01 2022 +0100
[SETUP][INF] Delete obsolete font substitutions "DejaVu Serif" (#4827)
[INF] These 2 lines are nonsense now for 2 different reasons even: Since 0.4.13-dev-764-g dbb4432b25dc65b9d65f02bfc09d47d63b8cd5e5 we do have a proper "Times New Roman" font, so there is no need for substitution any longer.
And since 0.4.14-dev-20-g 2f4fb903b46207ab380365908401ded63752a108 we don't even have the substitution-target "DejaVu Serif" anymore.
[SETUP] Similar glitch in muifonts.h
[ROSTESTS] Thin out gdi32:GetTextMetrics test Deletes tests for 3 fonts that we do not longer have --- base/setup/lib/muifonts.h | 3 - media/inf/font.inf | 2 - modules/rostests/apitests/gdi32/GetTextMetrics.c | 156 ----------------------- 3 files changed, 161 deletions(-)
diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index 9c471192638..32a9b1cc33c 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -118,7 +118,6 @@ MUI_SUBFONT HebrewFonts[] = { L"System", L"FreeSans" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Times New Roman" }, - { L"Times New Roman", L"DejaVu Serif" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" }, { L"Times New Roman CE,238", L"Times New Roman,238" }, { L"Times New Roman CYR,204", L"Times New Roman,204" }, @@ -367,7 +366,6 @@ MUI_SUBFONT UnicodeFonts[] = { L"Tahoma", L"DejaVu Sans" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Times New Roman" }, - { L"Times New Roman", L"DejaVu Serif" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" }, { L"Times New Roman CE,238", L"Times New Roman,238" }, { L"Times New Roman CYR,204", L"Times New Roman,204" }, @@ -402,7 +400,6 @@ MUI_SUBFONT HindiFonts[] = { L"Tahoma", L"FreeSans" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Times New Roman" }, - { L"Times New Roman", L"DejaVu Serif" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" }, { L"Times New Roman CE,238", L"Times New Roman,238" }, { L"Times New Roman CYR,204", L"Times New Roman,204" }, diff --git a/media/inf/font.inf b/media/inf/font.inf index 55a0bed0cd0..4c505f3c505 100644 --- a/media/inf/font.inf +++ b/media/inf/font.inf @@ -71,7 +71,6 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dl 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","Times New Roman",0x00000000,"DejaVu Serif" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Ubuntu",0x00000000,"Tahoma"
@@ -107,7 +106,6 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dl 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","Times New Roman",0x00000000,"DejaVu Serif" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman"
; cp1252/cp437 US diff --git a/modules/rostests/apitests/gdi32/GetTextMetrics.c b/modules/rostests/apitests/gdi32/GetTextMetrics.c index b6b33aef545..3c9ee92d402 100644 --- a/modules/rostests/apitests/gdi32/GetTextMetrics.c +++ b/modules/rostests/apitests/gdi32/GetTextMetrics.c @@ -124,156 +124,6 @@ static const TEST_ENTRY g_FREEMONO[] = }; #define g_FREEMONO_count _countof(g_FREEMONO)
-static const TEST_ENTRY g_DEJAVUSERIF[] = -{ - { __LINE__, 400, 0, 2323, 400, 400, 319, 81, 56, 0 }, - { __LINE__, 300, 0, 1743, 300, 300, 239, 61, 42, 0 }, - { __LINE__, 200, 0, 1162, 200, 200, 159, 41, 28, 0 }, - { __LINE__, 100, 0, 580, 100, 100, 80, 20, 14, 0 }, - { __LINE__, 64, 0, 370, 64, 64, 51, 13, 9, 0 }, - { __LINE__, 32, 0, 190, 32, 32, 26, 6, 4, 0 }, - { __LINE__, 16, 0, 91, 16, 16, 13, 3, 2, 0 }, - { __LINE__, 15, 0, 84, 15, 15, 12, 3, 2, 0 }, - { __LINE__, 14, 0, 82, 14, 14, 11, 3, 2, 0 }, - { __LINE__, 13, 0, 77, 13, 13, 10, 3, 2, 0 }, - { __LINE__, 12, 0, 66, 12, 12, 10, 2, 2, 0 }, - { __LINE__, 11, 0, 63, 11, 11, 9, 2, 2, 0 }, - { __LINE__, 10, 0, 63, 10, 10, 8, 2, 1, 0 }, - { __LINE__, 9, 0, 56, 9, 9, 7, 2, 1, 0 }, - { __LINE__, 8, 0, 49, 8, 8, 6, 2, 1, 0 }, - { __LINE__, 7, 0, 42, 7, 7, 6, 1, 1, 0 }, - { __LINE__, 6, 0, 36, 6, 6, 5, 1, 1, 0 }, - { __LINE__, 5, 0, 26, 5, 5, 4, 1, 1, 0 }, - { __LINE__, 4, 0, 22, 4, 4, 3, 1, 1, 0 }, - { __LINE__, 3, 0, 22, 3, 3, 2, 1, 0, 0 }, - { __LINE__, 2, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, 1, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, 0, 0, -125, -21, -21, -17, -4, -3, 0 }, - { __LINE__, -1, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, -2, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, -3, 0, 22, 4, 4, 3, 1, 1, 0 }, - { __LINE__, -4, 0, 26, 5, 5, 4, 1, 1, 0 }, - { __LINE__, -5, 0, 36, 6, 6, 5, 1, 1, 0 }, - { __LINE__, -6, 0, 42, 7, 7, 6, 1, 1, 0 }, - { __LINE__, -7, 0, 49, 8, 8, 6, 2, 1, 0 }, - { __LINE__, -8, 0, 56, 9, 9, 7, 2, 1, 0 }, - { __LINE__, -9, 0, 63, 10, 10, 8, 2, 1, 0 }, - { __LINE__, -10, 0, 66, 11, 11, 9, 2, 1, 0 }, - { __LINE__, -11, 0, 77, 13, 13, 10, 3, 2, 0 }, - { __LINE__, -12, 0, 82, 14, 14, 11, 3, 2, 0 }, - { __LINE__, -13, 0, 84, 15, 15, 12, 3, 2, 0 }, - { __LINE__, -14, 0, 91, 16, 16, 13, 3, 2, 0 }, - { __LINE__, -15, 0, 103, 18, 18, 14, 4, 3, 0 }, - { __LINE__, -16, 0, 114, 19, 19, 15, 4, 3, 0 }, - { __LINE__, -32, 0, 214, 38, 38, 30, 8, 6, 0 }, - { __LINE__, -64, 0, 431, 74, 74, 59, 15, 10, 0 }, - { __LINE__, -100, 0, 674, 117, 117, 93, 24, 17, 0 }, - { __LINE__, -200, 0, 1352, 233, 233, 186, 47, 33, 0 }, - { __LINE__, -300, 0, 2026, 349, 349, 278, 71, 49, 0 }, - { __LINE__, -400, 0, 2702, 465, 465, 371, 94, 65, 0 }, -}; -#define g_DEJAVUSERIF_count _countof(g_DEJAVUSERIF) - -static const TEST_ENTRY g_DEJAVUSANS[] = -{ - { __LINE__, 400, 0, 2286, 400, 400, 319, 81, 56, 0 }, - { __LINE__, 300, 0, 1715, 300, 300, 239, 61, 42, 0 }, - { __LINE__, 200, 0, 1145, 200, 200, 159, 41, 28, 0 }, - { __LINE__, 100, 0, 573, 100, 100, 80, 20, 14, 0 }, - { __LINE__, 64, 0, 366, 64, 64, 51, 13, 9, 0 }, - { __LINE__, 32, 0, 188, 32, 32, 26, 6, 4, 0 }, - { __LINE__, 16, 0, 91, 16, 16, 13, 3, 2, 0 }, - { __LINE__, 15, 0, 84, 15, 15, 12, 3, 2, 0 }, - { __LINE__, 14, 0, 84, 14, 14, 11, 3, 2, 0 }, - { __LINE__, 13, 0, 79, 13, 13, 10, 3, 2, 0 }, - { __LINE__, 12, 0, 62, 12, 12, 10, 2, 2, 0 }, - { __LINE__, 11, 0, 64, 11, 11, 9, 2, 2, 0 }, - { __LINE__, 10, 0, 64, 10, 10, 8, 2, 1, 0 }, - { __LINE__, 9, 0, 54, 9, 9, 7, 2, 1, 0 }, - { __LINE__, 8, 0, 46, 8, 8, 6, 2, 1, 0 }, - { __LINE__, 7, 0, 41, 7, 7, 6, 1, 1, 0 }, - { __LINE__, 6, 0, 35, 6, 6, 5, 1, 1, 0 }, - { __LINE__, 5, 0, 25, 5, 5, 4, 1, 1, 0 }, - { __LINE__, 4, 0, 22, 4, 4, 3, 1, 1, 0 }, - { __LINE__, 3, 0, 22, 3, 3, 2, 1, 0, 0 }, - { __LINE__, 2, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, 1, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, 0, 0, -116, -21, -21, -17, -4, -3, 0 }, - { __LINE__, -1, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, -2, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, -3, 0, 22, 4, 4, 3, 1, 1, 0 }, - { __LINE__, -4, 0, 25, 5, 5, 4, 1, 1, 0 }, - { __LINE__, -5, 0, 35, 6, 6, 5, 1, 1, 0 }, - { __LINE__, -6, 0, 41, 7, 7, 6, 1, 1, 0 }, - { __LINE__, -7, 0, 46, 8, 8, 6, 2, 1, 0 }, - { __LINE__, -8, 0, 54, 9, 9, 7, 2, 1, 0 }, - { __LINE__, -9, 0, 64, 10, 10, 8, 2, 1, 0 }, - { __LINE__, -10, 0, 62, 11, 11, 9, 2, 1, 0 }, - { __LINE__, -11, 0, 79, 13, 13, 10, 3, 2, 0 }, - { __LINE__, -12, 0, 84, 14, 14, 11, 3, 2, 0 }, - { __LINE__, -13, 0, 84, 15, 15, 12, 3, 2, 0 }, - { __LINE__, -14, 0, 91, 16, 16, 13, 3, 2, 0 }, - { __LINE__, -15, 0, 98, 18, 18, 14, 4, 3, 0 }, - { __LINE__, -16, 0, 102, 19, 19, 15, 4, 3, 0 }, - { __LINE__, -32, 0, 215, 38, 38, 30, 8, 6, 0 }, - { __LINE__, -64, 0, 423, 74, 74, 59, 15, 10, 0 }, - { __LINE__, -100, 0, 665, 117, 117, 93, 24, 17, 0 }, - { __LINE__, -200, 0, 1331, 233, 233, 186, 47, 33, 0 }, - { __LINE__, -300, 0, 1992, 349, 349, 278, 71, 49, 0 }, - { __LINE__, -400, 0, 2657, 465, 465, 371, 94, 65, 0 }, -}; -#define g_DEJAVUSANS_count _countof(g_DEJAVUSANS) - -static const TEST_ENTRY g_UBUNTUMONO[] = -{ - { __LINE__, 400, 0, 3000, 400, 400, 332, 68, 0, 0 }, - { __LINE__, 300, 0, 2250, 300, 300, 249, 51, 0, 0 }, - { __LINE__, 200, 0, 1500, 200, 200, 166, 34, 1, 0 }, - { __LINE__, 100, 0, 735, 100, 100, 83, 17, 2, 0 }, - { __LINE__, 64, 0, 465, 63, 63, 53, 10, 2, 0 }, - { __LINE__, 32, 0, 240, 31, 31, 26, 5, 0, 0 }, - { __LINE__, 16, 0, 105, 16, 16, 13, 3, 3, 0 }, - { __LINE__, 15, 0, 90, 15, 15, 12, 3, 4, 0 }, - { __LINE__, 14, 0, 75, 14, 14, 11, 3, 5, 0 }, - { __LINE__, 13, 0, 60, 13, 13, 10, 3, 5, 0 }, - { __LINE__, 12, 0, 60, 12, 12, 10, 2, 5, 0 }, - { __LINE__, 11, 0, 60, 11, 11, 9, 2, 4, 0 }, - { __LINE__, 10, 0, 60, 10, 10, 8, 2, 3, 0 }, - { __LINE__, 9, 0, 60, 9, 9, 7, 2, 2, 0 }, - { __LINE__, 8, 0, 60, 8, 8, 7, 1, 1, 0 }, - { __LINE__, 7, 0, 60, 7, 7, 6, 1, 0, 0 }, - { __LINE__, 6, 0, 45, 6, 6, 5, 1, 0, 0 }, - { __LINE__, 5, 0, 45, 5, 5, 4, 1, 0, 0 }, - { __LINE__, 4, 0, 30, 4, 4, 3, 1, 0, 0 }, - { __LINE__, 3, 0, 30, 3, 3, 2, 1, 0, 0 }, - { __LINE__, 2, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, 1, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, 0, 0, -135, -19, -19, -16, -3, -1, 0 }, - { __LINE__, -1, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, -2, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, -3, 0, 30, 3, 3, 2, 1, 0, 0 }, - { __LINE__, -4, 0, 30, 4, 4, 3, 1, 0, 0 }, - { __LINE__, -5, 0, 45, 5, 5, 4, 1, 0, 0 }, - { __LINE__, -6, 0, 45, 6, 6, 5, 1, 0, 0 }, - { __LINE__, -7, 0, 60, 7, 7, 6, 1, 0, 0 }, - { __LINE__, -8, 0, 60, 13, 13, 10, 3, 5, 0 }, - { __LINE__, -9, 0, 75, 14, 14, 11, 3, 5, 0 }, - { __LINE__, -10, 0, 75, 14, 14, 11, 3, 4, 0 }, - { __LINE__, -11, 0, 90, 15, 15, 12, 3, 4, 0 }, - { __LINE__, -12, 0, 90, 15, 15, 12, 3, 3, 0 }, - { __LINE__, -13, 0, 105, 16, 16, 13, 3, 3, 0 }, - { __LINE__, -14, 0, 105, 17, 17, 14, 3, 3, 0 }, - { __LINE__, -15, 0, 105, 17, 17, 14, 3, 2, 0 }, - { __LINE__, -16, 0, 120, 18, 18, 15, 3, 2, 0 }, - { __LINE__, -32, 0, 240, 33, 33, 28, 5, 1, 0 }, - { __LINE__, -64, 0, 480, 66, 66, 55, 11, 2, 0 }, - { __LINE__, -100, 0, 750, 101, 101, 84, 17, 1, 0 }, - { __LINE__, -200, 0, 1500, 201, 201, 167, 34, 1, 0 }, - { __LINE__, -300, 0, 2250, 300, 300, 249, 51, 0, 0 }, - { __LINE__, -400, 0, 3000, 400, 400, 332, 68, 0, 0 }, -}; -#define g_UBUNTUMONO_count _countof(g_UBUNTUMONO) - static const TEST_ENTRY g_MSGOTHIC[] = { { __LINE__, 400, 0, 3000, 400, 400, 344, 56, 0, 0 }, @@ -439,17 +289,11 @@ static FONT_ENTRY g_font_entries[] = { #ifdef EMIT_TESTCASES { "FREEMONO", "FreeMono", "FreeMono.ttf" }, - { "DEJAVUSERIF", "DejaVu Serif", "DejaVuSerif.ttf" }, - { "DEJAVUSANS", "DejaVu Sans", "DejaVuSans.ttf" }, - { "UBUNTUMONO", "Ubuntu Mono", "UbuntuMono-R.ttf" }, { "MSGOTHIC", "MS Gothic", "msgothic.ttc" }, { "MSMINCHO", "MS Mincho", "msmincho.ttc" }, { "TAHOMA", "Tahoma", "tahoma.ttf" }, #else { "FREEMONO", "FreeMono", "FreeMono.ttf", g_FREEMONO_count, g_FREEMONO }, - { "DEJAVUSERIF", "DejaVu Serif", "DejaVuSerif.ttf", g_DEJAVUSERIF_count, g_DEJAVUSERIF }, - { "DEJAVUSANS", "DejaVu Sans", "DejaVuSans.ttf", g_DEJAVUSANS_count, g_DEJAVUSANS }, - { "UBUNTUMONO", "Ubuntu Mono", "UbuntuMono-R.ttf", g_UBUNTUMONO_count, g_UBUNTUMONO }, { "MSGOTHIC", "MS Gothic", "msgothic.ttc", g_MSGOTHIC_count, g_MSGOTHIC }, { "MSMINCHO", "MS Mincho", "msmincho.ttc", g_MSMINCHO_count, g_MSMINCHO }, { "TAHOMA", "Tahoma", "Tahoma.ttf", g_TAHOMA_count, g_TAHOMA },
-
Joachim Henze