[ros-diffs] [reactos] 01/01: [SETUP][BOOTDATA][INF] Helvetica-to-Arial substitutes (#1809)

[Katayama Hirofumi MZ]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=10c08e1d62705a3ac59d6…

commit 10c08e1d62705a3ac59d6c8050280bfbd96540ed
Author:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Wed Aug 7 19:02:38 2019 +0900
Commit:     GitHub <noreply(a)github.com>
CommitDate: Wed Aug 7 19:02:38 2019 +0900

    [SETUP][BOOTDATA][INF] Helvetica-to-Arial substitutes (#1809)
    
    Set the destinations of "Helvetica" font substitutes to "Arial".
CORE-16264
---
 base/setup/lib/muifonts.h | 4 ++--
 boot/bootdata/livecd.inf  | 2 +-
 media/inf/font.inf        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h
index dfad8981a9a..45cca3f03eb 100644
--- a/base/setup/lib/muifonts.h
+++ b/base/setup/lib/muifonts.h
@@ -111,7 +111,7 @@ MUI_SUBFONT HebrewFonts[] =
     { L"Courier New TUR,162",    L"Courier New,162" },
     { L"Fixedsys",               L"Fixedsys Excelsior 3.01-L2" },
     { L"Helv",                   L"Tahoma" },
-    { L"Helvetica",              L"Tahoma" },
+    { L"Helvetica",              L"Arial" },
     { L"MS Sans Serif",          L"Tahoma" },
     { L"MS Shell Dlg",           L"Tahoma" },
     { L"MS Shell Dlg 2",         L"Tahoma" },
@@ -355,7 +355,7 @@ MUI_SUBFONT UnicodeFonts[] =
     { L"Courier New TUR,162",    L"Courier New,162" },
     { L"Fixedsys",               L"Fixedsys Excelsior 3.01-L2" },
     { L"Helv",                   L"DejaVu Sans" },
-    { L"Helvetica",              L"DejaVu Sans" },
+    { L"Helvetica",              L"Arial" },
     { L"MS Sans Serif",          L"DejaVu Sans" },
     { L"MS Shell Dlg",           L"DejaVu Sans" },
     { L"MS Shell Dlg 2",         L"DejaVu Sans" },
diff --git a/boot/bootdata/livecd.inf b/boot/bootdata/livecd.inf
index 3e33d8a2bad..eae91147fa4 100644
--- a/boot/bootdata/livecd.inf
+++ b/boot/bootdata/livecd.inf
@@ -51,7 +51,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Memory
Management","Pagin
 HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"FreeMono"
 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,"Liberation
Sans"
+HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial"
 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"
diff --git a/media/inf/font.inf b/media/inf/font.inf
index a8c201ad5f5..611728168f0 100644
--- a/media/inf/font.inf
+++ b/media/inf/font.inf
@@ -65,7 +65,7 @@ HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Arial",0x00
 HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"FreeMono"
 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,"Tahoma"
+HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial"
 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"
@@ -99,7 +99,7 @@ HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Courier",0x
 HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Courier New",0x00000000,"DejaVu
Sans Mono"
 HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys
Excelsior 3.01-L2"
 HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"DejaVu
Sans"
-HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"DejaVu
Sans"
+HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS
Sans Serif",0x00000000,"DejaVu Sans"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS
Shell Dlg",0x00000000,"DejaVu Sans"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS
Shell Dlg 2",0x00000000,"DejaVu Sans"