mirrors/reactos
0
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-27 21:43:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

[SETUP][FONTS][INF][GDI32_APITEST] Delete FreeMono and re-map (#4852)

Browse Source 
- Delete FreeMono fonts.
- Re-map "Courier" font substitutes to "Courier New" fonts.
CORE-18605
This commit is contained in:
Katayama Hirofumi MZ 2022-11-07 08:04:38 +09:00 committed by GitHub
parent 075ec50298
commit a4193ade03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 14 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
base/setup/lib/muifonts.h
View File

@ -8,7 +8,7 @@ MUI_SUBFONT LatinFonts[] =
{ L"Arial CYR,204", L"Arial,204" },
{ L"Arial Greek,161", L"Arial,161" },
{ L"Arial TUR,162", L"Arial,162" },
{ L"Courier", L"FreeMono" },
{ L"Courier", L"Courier New" },
{ L"Courier New Baltic,186", L"Courier New,186" },
{ L"Courier New CE,238", L"Courier New,238" },
{ L"Courier New CYR,204", L"Courier New,204" },
@ -39,7 +39,7 @@ MUI_SUBFONT CyrillicFonts[] =
{ L"Arial CYR,204", L"Arial,204" },
{ L"Arial Greek,161", L"Arial,161" },
{ L"Arial TUR,162", L"Arial,162" },
{ L"Courier", L"FreeMono" },
{ L"Courier", L"Courier New" },
{ L"Courier New Baltic,186", L"Courier New,186" },
{ L"Courier New CE,238", L"Courier New,238" },
{ L"Courier New CYR,204", L"Courier New,204" },
@ -70,7 +70,7 @@ MUI_SUBFONT GreekFonts[] =
{ L"Arial CYR,204", L"Arial,204" },
{ L"Arial Greek,161", L"Arial,161" },
{ L"Arial TUR,162", L"Arial,162" },
{ L"Courier", L"FreeMono" },
{ L"Courier", L"Courier New" },
{ L"Courier New Baltic,186", L"Courier New,186" },
{ L"Courier New CE,238", L"Courier New,238" },
{ L"Courier New CYR,204", L"Courier New,204" },
@ -101,7 +101,7 @@ MUI_SUBFONT HebrewFonts[] =
{ L"Arial CYR,204", L"Arial,204" },
{ L"Arial Greek,161", L"Arial,161" },
{ L"Arial TUR,162", L"Arial,162" },
{ L"Courier", L"FreeMono" },
{ L"Courier", L"Courier New" },
{ L"Courier New Baltic,186", L"Courier New,186" },
{ L"Courier New CE,238", L"Courier New,238" },
{ L"Courier New CYR,204", L"Courier New,204" },
@ -138,7 +138,7 @@ MUI_SUBFONT ChineseSimplifiedFonts[] =
{ L"Arial CYR,204", L"Arial,204" },
{ L"Arial Greek,161", L"Arial,161" },
{ L"Arial TUR,162", L"Arial,162" },
{ L"Courier", L"FreeMono" },
{ L"Courier", L"Courier New" },
{ L"Courier New Baltic,186", L"Courier New,186" },
{ L"Courier New CE,238", L"Courier New,238" },
{ L"Courier New CYR,204", L"Courier New,204" },
@ -190,7 +190,7 @@ MUI_SUBFONT ChineseTraditionalFonts[] =
{ L"Arial CYR,204", L"Arial,204" },
{ L"Arial Greek,161", L"Arial,161" },
{ L"Arial TUR,162", L"Arial,162" },
{ L"Courier", L"FreeMono" },
{ L"Courier", L"Courier New" },
{ L"Courier New Baltic,186", L"Courier New,186" },
{ L"Courier New CE,238", L"Courier New,238" },
{ L"Courier New CYR,204", L"Courier New,204" },
@ -242,7 +242,7 @@ MUI_SUBFONT JapaneseFonts[] =
{ L"Arial CYR,204", L"Arial,204" },
{ L"Arial Greek,161", L"Arial,161" },
{ L"Arial TUR,162", L"Arial,162" },
{ L"Courier", L"FreeMono" },
{ L"Courier", L"Courier New" },
{ L"Courier New Baltic,186", L"Courier New,186" },
{ L"Courier New CE,238", L"Courier New,238" },
{ L"Courier New CYR,204", L"Courier New,204" },
@ -297,7 +297,7 @@ MUI_SUBFONT KoreanFonts[] =
{ L"Arial TUR,162", L"Arial,162" },
{ L"Batang", L"Droid Sans Fallback" },
{ L"BatangChe", L"Droid Sans Fallback" },
{ L"Courier", L"FreeMono" },
{ L"Courier", L"Courier New" },
{ L"Courier New Baltic,186", L"Courier New,186" },
{ L"Courier New CE,238", L"Courier New,238" },
{ L"Courier New CYR,204", L"Courier New,204" },
@ -375,7 +375,7 @@ MUI_SUBFONT HindiFonts[] =
{ L"Arial CYR,204", L"Arial,204" },
{ L"Arial Greek,161", L"Arial,161" },
{ L"Arial TUR,162", L"Arial,162" },
{ L"Courier", L"FreeMono" },
{ L"Courier", L"Courier New" },
{ L"Courier New Baltic,186", L"Courier New,186" },
{ L"Courier New CE,238", L"Courier New,238" },
{ L"Courier New CYR,204", L"Courier New,204" },

4
media/fonts/CMakeLists.txt
View File

@ -17,10 +17,6 @@ list(APPEND FONT_FILES
DejaVuSansMono.ttf
framd.ttf
framdit.ttf
FreeMono.ttf
FreeMonoBold.ttf
FreeMonoBoldOblique.ttf
FreeMonoOblique.ttf
FreeSans.ttf
FreeSansBold.ttf
FreeSansBoldOblique.ttf

BIN
media/fonts/FreeMono.ttf
View File

Binary file not shown.

BIN
media/fonts/FreeMonoBold.ttf
View File

Binary file not shown.

BIN
media/fonts/FreeMonoBoldOblique.ttf
View File

Binary file not shown.

BIN
media/fonts/FreeMonoOblique.ttf
View File

Binary file not shown.

10
media/inf/font.inf
View File

@ -24,7 +24,7 @@ HKLM,"Software\Microsoft\Windows NT\CurrentVersion\FontDPI","LogPixels",0x000100
HKLM,"System\CurrentControlSet\Hardware Profiles\Current\Software\Fonts","LogPixels",0x00010003,120
[Font.Latin.Reg]
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"FreeMono"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"Courier New"
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","Helvetica",0x00000000,"Arial"
@ -36,7 +36,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman"
[Font.Cyrillic.Reg]
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"FreeMono"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"Courier New"
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","Helvetica",0x00000000,"Arial"
@ -48,7 +48,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman"
[Font.Greek.Reg]
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"FreeMono"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"Courier New"
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","Helvetica",0x00000000,"Arial"
@ -60,7 +60,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman"
[Font.Hebrew.Reg]
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"FreeMono"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"Courier New"
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","Helvetica",0x00000000,"Arial"
@ -73,7 +73,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Ubuntu",0x00000000,"Tahoma"
[Font.CJK.Reg]
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"FreeMono"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"Courier New"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Franklin Gothic Medium",0x00000000,"Droid Sans Fallback"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Droid Sans Fallback"

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 },