https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e2b1ee9a53d971a884b02ce59266f51f56e618c2
commit e2b1ee9a53d971a884b02ce59266f51f56e618c2
Author: Katayama Hirofumi MZ <katayama.hirofumi...@gmail.com>
AuthorDate: Mon Dec 11 20:51:04 2023 +0900
Commit: GitHub <nore...@github.com>
CommitDate: Mon Dec 11 20:51:04 2023 +0900
[SETUP][BOOTDATA][INF] Add font substitute ('Segoe UI Symbol' to 'Arial')
(#6155)
Based on CORE-19346 "segoe-ui-symbo.patch".
In order to display gender glyphs (U+2642 and
U+2640; ♂ and ♀), we add a font substitute from
"Segoe UI Symbol" to "Arial".
ReactOS Arial has many symbol glyphs, so I think
we can use it for "Segoe UI Symbol" font substitute.
The glyph size problem will be fixed in #6156.
CORE-19346
---
base/setup/lib/muifonts.h | 10 ++++++++++
boot/bootdata/livecd.inf | 1 +
media/inf/font.inf | 6 ++++++
3 files changed, 17 insertions(+)
diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h
index 72afe0a5083..8a8ef990bdc 100644
--- a/base/setup/lib/muifonts.h
+++ b/base/setup/lib/muifonts.h
@@ -20,6 +20,7 @@ MUI_SUBFONT LatinFonts[] =
{ L"MS Sans Serif", L"Tahoma" },
{ L"MS Shell Dlg", L"Tahoma" },
{ L"MS Shell Dlg 2", L"Tahoma" },
+ { L"Segoe UI Symbol", L"Arial" },
{ L"System", L"FreeSans" },
{ L"Terminal", L"Lucida Console" },
{ L"Times", L"Times New Roman" },
@@ -51,6 +52,7 @@ MUI_SUBFONT CyrillicFonts[] =
{ L"MS Sans Serif", L"Tahoma" },
{ L"MS Shell Dlg", L"Tahoma" },
{ L"MS Shell Dlg 2", L"Tahoma" },
+ { L"Segoe UI Symbol", L"Arial" },
{ L"System", L"FreeSans" },
{ L"Terminal", L"Lucida Console" },
{ L"Times", L"Times New Roman" },
@@ -82,6 +84,7 @@ MUI_SUBFONT GreekFonts[] =
{ L"MS Sans Serif", L"Tahoma" },
{ L"MS Shell Dlg", L"Tahoma" },
{ L"MS Shell Dlg 2", L"Tahoma" },
+ { L"Segoe UI Symbol", L"Arial" },
{ L"System", L"FreeSans" },
{ L"Terminal", L"Lucida Console" },
{ L"Times", L"Times New Roman" },
@@ -113,6 +116,7 @@ MUI_SUBFONT HebrewFonts[] =
{ L"MS Sans Serif", L"Tahoma" },
{ L"MS Shell Dlg", L"Tahoma" },
{ L"MS Shell Dlg 2", L"Tahoma" },
+ { L"Segoe UI Symbol", L"Arial" },
{ L"System", L"FreeSans" },
{ L"Terminal", L"Courier New" },
{ L"Times", L"Times New Roman" },
@@ -154,6 +158,7 @@ MUI_SUBFONT ChineseSimplifiedFonts[] =
{ L"MS UI Gothic", L"Droid Sans Fallback" },
{ L"MS UI Gothic 2", L"Droid Sans Fallback" },
{ L"NSimSun", L"Droid Sans Fallback" },
+ { L"Segoe UI Symbol", L"Arial" },
{ L"SimHei", L"Droid Sans Fallback" },
{ L"SimSun", L"Droid Sans Fallback" },
{ L"Source Sans Pro", L"Droid Sans Fallback" },
@@ -208,6 +213,7 @@ MUI_SUBFONT ChineseTraditionalFonts[] =
{ L"Ming Light", L"Droid Sans Fallback" },
{ L"MingLiU", L"Droid Sans Fallback" },
{ L"PMingLiU", L"Droid Sans Fallback" },
+ { L"Segoe UI Symbol", L"Arial" },
{ L"Source Sans Pro", L"Droid Sans Fallback" },
{ L"System", L"Droid Sans Fallback" },
{ L"Tahoma", L"Droid Sans Fallback" },
@@ -258,6 +264,7 @@ MUI_SUBFONT JapaneseFonts[] =
{ L"MS Shell Dlg 2", L"Droid Sans Fallback" },
{ L"MS UI Gothic", L"Droid Sans Fallback" },
{ L"MS UI Gothic 2", L"Droid Sans Fallback" },
+ { L"Segoe UI Symbol", L"Arial" },
{ L"Source Sans Pro", L"Droid Sans Fallback" },
{ L"System", L"Droid Sans Fallback" },
{ L"Tahoma", L"Droid Sans Fallback" },
@@ -312,6 +319,7 @@ MUI_SUBFONT KoreanFonts[] =
{ L"MS Shell Dlg 2", L"Droid Sans Fallback" },
{ L"MS UI Gothic", L"Droid Sans Fallback" },
{ L"MS UI Gothic 2", L"Droid Sans Fallback" },
+ { L"Segoe UI Symbol", L"Arial" },
{ L"Source Sans Pro", L"Droid Sans Fallback" },
{ L"System", L"Droid Sans Fallback" },
{ L"Tahoma", L"Droid Sans Fallback" },
@@ -349,6 +357,7 @@ MUI_SUBFONT UnicodeFonts[] =
{ L"Courier New TUR,162", L"Courier New,162" },
{ L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" },
{ L"Helvetica", L"Arial" },
+ { L"Segoe UI Symbol", L"Arial" },
{ L"System", L"FreeSans" },
{ L"Terminal", L"Courier New" },
{ L"Times", L"Times New Roman" },
@@ -382,6 +391,7 @@ MUI_SUBFONT HindiFonts[] =
{ L"MS Shell Dlg", L"FreeSans" },
{ L"MS Shell Dlg 2", L"FreeSans" },
{ L"Palatino Linotype", L"FreeSans" },
+ { L"Segoe UI Symbol", L"Arial" },
{ L"System", L"FreeSans" },
{ L"Tahoma", L"FreeSans" },
{ L"Terminal", L"Lucida Console" },
diff --git a/boot/bootdata/livecd.inf b/boot/bootdata/livecd.inf
index a9202d068ce..41f2bd38d23 100644
--- a/boot/bootdata/livecd.inf
+++ b/boot/bootdata/livecd.inf
@@ -54,6 +54,7 @@ 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","Segoe UI
Symbol",0x00000000,"Arial"
HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"Lucida Console"
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 749d673b01c..e6dc0cf8647 100644
--- a/media/inf/font.inf
+++ b/media/inf/font.inf
@@ -31,6 +31,7 @@ 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","Segoe UI
Symbol",0x00000000,"Arial"
HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"Lucida Console"
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"
@@ -43,6 +44,7 @@ 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","Segoe UI
Symbol",0x00000000,"Arial"
HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"Lucida Console"
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"
@@ -55,6 +57,7 @@ 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","Segoe UI
Symbol",0x00000000,"Arial"
HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"Lucida Console"
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"
@@ -67,6 +70,7 @@ 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","Segoe UI
Symbol",0x00000000,"Arial"
HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"Courier New"
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"
@@ -82,6 +86,7 @@ HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","MS Shell Dl
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell
Dlg 2",0x00000000,"Droid Sans Fallback"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS UI
Gothic",0x00000000,"Droid Sans Fallback"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS UI
Gothic 2",0x00000000,"Droid Sans Fallback"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Segoe UI
Symbol",0x00000000,"Arial"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Source
Sans Pro",0x00000000,"Droid Sans Fallback"
HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Tahoma",0x00000000,"Droid Sans Fallback"
HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"Lucida Console"
@@ -93,6 +98,7 @@ HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Trebuchet M
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","Helvetica",0x00000000,"Arial"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Segoe UI
Symbol",0x00000000,"Arial"
HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"Courier New"
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"
