Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-07 06:43:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

[0.4.14][SETUP][BOOTDATA][FONTS][INF][MEDIA][ROSTESTS] Monospaced fonts and substitution

Browse source 
Switches from "FreeMono" and "Dejavu Sans Mono" to "Courier New" and "Lucida Console"
and therefore brings us closer to 2k3sp2 stock fonts. Saves some RAM also.
Deletes some "Ubuntu" font left-overs in some Themes.

CORE-18605 (and partially CORE-16264)

By porting back the following commits:
0.4.15-dev-5362-g c47758b102 [SETUP][INF][MEDIA] Get rid of the last Ubuntu references CORE-18607 (#4871)
0.4.15-dev-5336-g bd40c13f6f [SETUP][BOOTDATA][FONTS][INF] Delete DejaVu Sans Mono and re-map (#4856)
0.4.15-dev-5335-g a4193ade03 [SETUP][FONTS][INF][GDI32_APITEST] Delete FreeMono and re-map (#4852)
0.4.15-dev-5324-g d035452148 [SETUP][INF][ROSTESTS] Delete font substitutions and tests for "DejaVu Sans" (#4829)
This commit is contained in:
Joachim Henze 2023-01-06 09:38:59 +01:00
parent 5dfa141eb6
commit fe85357afe
32 changed files with 380 additions and 9907 deletions
Download patch file Download diff file Expand all files Collapse all files

52
modules/rostests/apitests/gdi32/GetTextMetrics.c
View file

@ -74,56 +74,6 @@ static const TEST_ENTRY g_test_entries[] =
};
#define g_test_entry_count _countof(g_test_entries)
#else
static const TEST_ENTRY g_FREEMONO[] =
{
{ __LINE__, 400, 0, 3600, 400, 400, 320, 80, 0, 0 },
{ __LINE__, 300, 0, 2700, 300, 300, 240, 60, 0, 0 },
{ __LINE__, 200, 0, 1800, 200, 200, 160, 40, 0, 0 },
{ __LINE__, 100, 0, 900, 100, 100, 80, 20, 0, 0 },
{ __LINE__, 64, 0, 570, 64, 64, 51, 13, 0, 0 },
{ __LINE__, 32, 0, 285, 32, 32, 26, 6, 0, 0 },
{ __LINE__, 16, 0, 150, 16, 16, 13, 3, 0, 0 },
{ __LINE__, 15, 0, 135, 15, 15, 12, 3, 0, 0 },
{ __LINE__, 14, 0, 120, 14, 14, 11, 3, 0, 0 },
{ __LINE__, 13, 0, 120, 13, 13, 10, 3, 0, 0 },
{ __LINE__, 12, 0, 105, 12, 12, 10, 2, 0, 0 },
{ __LINE__, 11, 0, 105, 11, 11, 9, 2, 0, 0 },
{ __LINE__, 10, 0, 90, 10, 10, 8, 2, 0, 0 },
{ __LINE__, 9, 0, 77, 9, 9, 7, 2, 0, 0 },
{ __LINE__, 8, 0, 75, 8, 8, 6, 2, 0, 0 },
{ __LINE__, 7, 0, 60, 7, 7, 6, 1, 0, 0 },
{ __LINE__, 6, 0, 60, 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, -165, -18, -18, -14, -4, 0, 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, 60, 6, 6, 5, 1, 0, 0 },
{ __LINE__, -7, 0, 60, 7, 7, 6, 1, 0, 0 },
{ __LINE__, -8, 0, 75, 8, 8, 6, 2, 0, 0 },
{ __LINE__, -9, 0, 77, 9, 9, 7, 2, 0, 0 },
{ __LINE__, -10, 0, 90, 10, 10, 8, 2, 0, 0 },
{ __LINE__, -11, 0, 105, 11, 11, 9, 2, 0, 0 },
{ __LINE__, -12, 0, 105, 12, 12, 10, 2, 0, 0 },
{ __LINE__, -13, 0, 120, 13, 13, 10, 3, 0, 0 },
{ __LINE__, -14, 0, 120, 14, 14, 11, 3, 0, 0 },
{ __LINE__, -15, 0, 135, 15, 15, 12, 3, 0, 0 },
{ __LINE__, -16, 0, 150, 16, 16, 13, 3, 0, 0 },
{ __LINE__, -32, 0, 285, 32, 32, 26, 6, 0, 0 },
{ __LINE__, -64, 0, 570, 64, 64, 51, 13, 0, 0 },
{ __LINE__, -100, 0, 900, 100, 100, 80, 20, 0, 0 },
{ __LINE__, -200, 0, 1800, 200, 200, 160, 40, 0, 0 },
{ __LINE__, -300, 0, 2700, 300, 300, 240, 60, 0, 0 },
{ __LINE__, -400, 0, 3600, 400, 400, 320, 80, 0, 0 },
};
#define g_FREEMONO_count _countof(g_FREEMONO)
static const TEST_ENTRY g_MSGOTHIC[] =
{
{ __LINE__, 400, 0, 3000, 400, 400, 344, 56, 0, 0 },
@ -288,12 +238,10 @@ typedef struct FONT_ENTRY
static FONT_ENTRY g_font_entries[] =
{
#ifdef EMIT_TESTCASES
{ "FREEMONO", "FreeMono", "FreeMono.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 },
{ "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 },

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)
{
test_fullname2_helper("Arial");
test_fullname2_helper("DejaVu Sans");
test_fullname2_helper("Lucida Sans");
test_fullname2_helper("Tahoma");
test_fullname2_helper("Webdings");