https://git.reactos.org/?p=reactos.git;a=commitdiff;h=257aed0e690b4cbf443c3c26a458079f9bbcfd36
commit 257aed0e690b4cbf443c3c26a458079f9bbcfd36 Author: Katayama Hirofumi MZ <[email protected]> AuthorDate: Wed Aug 7 19:01:25 2019 +0900 Commit: GitHub <[email protected]> CommitDate: Wed Aug 7 19:01:25 2019 +0900 [SETUP][BOOTDATA][INF] Delete Tahoma-to-Tahoma substitutes (#1808) Delete loopy Tahoma-to-Tahoma font substitutes. CORE-16264 --- base/setup/lib/muifonts.h | 3 --- boot/bootdata/livecd.inf | 1 - media/inf/font.inf | 3 --- 3 files changed, 7 deletions(-) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index abf76017c9d..dfad8981a9a 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -21,7 +21,6 @@ MUI_SUBFONT LatinFonts[] = { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, { L"System", L"FreeSans" }, - { L"Tahoma", L"Tahoma" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Times New Roman" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" }, @@ -53,7 +52,6 @@ MUI_SUBFONT CyrillicFonts[] = { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, { L"System", L"FreeSans" }, - { L"Tahoma", L"Tahoma" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Times New Roman" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" }, @@ -118,7 +116,6 @@ MUI_SUBFONT HebrewFonts[] = { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, { L"System", L"FreeSans" }, - { L"Tahoma", L"Tahoma" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Times New Roman" }, { L"Times New Roman", L"DejaVu Serif" }, diff --git a/boot/bootdata/livecd.inf b/boot/bootdata/livecd.inf index ab19610c8b0..3e33d8a2bad 100644 --- a/boot/bootdata/livecd.inf +++ b/boot/bootdata/livecd.inf @@ -55,7 +55,6 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica", 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","Tahoma",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" diff --git a/media/inf/font.inf b/media/inf/font.inf index 8c23423b3c5..a8c201ad5f5 100644 --- a/media/inf/font.inf +++ b/media/inf/font.inf @@ -31,7 +31,6 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica", 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","Tahoma",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" @@ -44,7 +43,6 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica", 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","Tahoma",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" @@ -71,7 +69,6 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica", 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","Tahoma",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"
