[hbelusca] 57999: [USETUP/BOOTDATA/FONTS] Adjust fonts substitutions. [WIN32K] Adjust system stock fonts.
Author: hbelusca Date: Mon Dec 24 17:31:30 2012 New Revision: 57999
URL: http://svn.reactos.org/svn/reactos?rev=57999&view=rev Log: [USETUP/BOOTDATA/FONTS] Adjust fonts substitutions.
[WIN32K] Adjust system stock fonts.
Modified: trunk/reactos/base/setup/usetup/muifonts.h trunk/reactos/boot/bootdata/hivesft_arm.inf trunk/reactos/boot/bootdata/livecd.inf trunk/reactos/media/inf/font.inf trunk/reactos/win32ss/gdi/ntgdi/stockobj.c
Modified: trunk/reactos/base/setup/usetup/muifonts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muifonts.... ============================================================================== --- trunk/reactos/base/setup/usetup/muifonts.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muifonts.h [iso-8859-1] Mon Dec 24 17:31:30 2012 @@ -7,12 +7,15 @@ { L"Arial", L"Liberation Sans" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, - { L"Times New Roman", L"Liberation Serif" }, - { L"Tahoma", L"Tahoma" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01" }, + { L"Helv", L"Tahoma" }, + { L"Helvetica", L"Liberation Sans" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, - { L"Helv", L"Tahoma" }, + { L"Tahoma", L"Tahoma" }, + { L"Terminal", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, { NULL, NULL } };
@@ -21,12 +24,15 @@ { L"Arial", L"Liberation Sans" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, - { L"Times New Roman", L"Liberation Serif" }, - { L"Tahoma", L"Tahoma" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01" }, + { L"Helv", L"Tahoma" }, + { L"Helvetica", L"Liberation Sans" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, - { L"Helv", L"Tahoma" }, + { L"Tahoma", L"Tahoma" }, + { L"Terminal", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, { NULL, NULL } };
@@ -35,26 +41,32 @@ { L"Arial", L"Liberation Sans" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, - { L"Times New Roman", L"Liberation Serif" }, - { L"Tahoma", L"DejaVu Sans" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01" }, + { L"Helv", L"DejaVu Sans" }, + { L"Helvetica", L"Liberation Sans" }, { L"MS Sans Serif", L"DejaVu Sans" }, { L"MS Shell Dlg", L"DejaVu Sans" }, { L"MS Shell Dlg 2", L"DejaVu Sans" }, - { L"Helv", L"DejaVu Sans" }, + { L"Tahoma", L"DejaVu Sans" }, + { L"Terminal", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, { NULL, NULL } };
MUI_SUBFONT HebrewFonts[] = { - { L"Arial", L"DejaVu Sans" }, + { L"Arial", L"DejaVu Sans" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, - { L"Times New Roman", L"DejaVu Serif" }, - { L"Tahoma", L"DejaVu Sans" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01" }, + { L"Helv", L"DejaVu Sans" }, + { L"Helvetica", L"DejaVu Sans" }, { L"MS Sans Serif", L"DejaVu Sans" }, { L"MS Shell Dlg", L"DejaVu Sans" }, { L"MS Shell Dlg 2", L"DejaVu Sans" }, - { L"Helv", L"DejaVu Sans" }, + { L"Tahoma", L"DejaVu Sans" }, + { L"Terminal", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"DejaVu Serif" }, { NULL, NULL } };
@@ -63,27 +75,33 @@ { L"Arial", L"Liberation Sans" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, - { L"Times New Roman", L"Liberation Serif" }, - { L"Tahoma", L"Droid Sans Fallback" }, - { L"MS Sans Serif", L"Tahoma" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01" }, + { L"Helv", L"Droid Sans Fallback" }, + { L"Helvetica", L"Liberation Sans" }, + { L"MS Sans Serif", L"Droid Sans Fallback" }, { L"MS Shell Dlg", L"Droid Sans Fallback" }, { 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"Helv", L"Tahoma" }, + { L"Tahoma", L"Droid Sans Fallback" }, + { L"Terminal", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, { NULL, NULL } };
MUI_SUBFONT UnicodeFonts[] = { - { L"Arial", L"DejaVu Sans" }, + { L"Arial", L"DejaVu Sans" }, { L"Courier", L"DejaVu Sans Mono" }, { L"Courier New", L"DejaVu Sans Mono" }, - { L"Times New Roman", L"DejaVu Serif" }, - { L"Tahoma", L"DejaVu Sans" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01" }, + { L"Helv", L"DejaVu Sans" }, + { L"Helvetica", L"DejaVu Sans" }, { L"MS Sans Serif", L"DejaVu Sans" }, { L"MS Shell Dlg", L"DejaVu Sans" }, { L"MS Shell Dlg 2", L"DejaVu Sans" }, - { L"Helv", L"DejaVu Sans" }, + { L"Tahoma", L"DejaVu Sans" }, + { L"Terminal", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"DejaVu Serif" }, { NULL, NULL } };
Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.i... ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] Mon Dec 24 17:31:30 2012 @@ -122,6 +122,7 @@
; Font substitutes ; SysFontSubstitutes are also returned by EnumFontFamilies, FontSubstitutes aren't +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes",,0x00000012
; Time zone settings
Modified: trunk/reactos/boot/bootdata/livecd.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/livecd.inf?re... ============================================================================== --- trunk/reactos/boot/bootdata/livecd.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/livecd.inf [iso-8859-1] Mon Dec 24 17:31:30 2012 @@ -43,11 +43,14 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Arial",0x00000000,"Liberation Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier",0x00000000,"FreeMono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier New",0x00000000,"FreeMono" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Helv",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Helvetica",0x00000000,"Liberation Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Tahoma",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Terminal",0x00000000,"DejaVu Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Times New Roman",0x00000000,"Liberation Serif"
; FIXME: Registration
Modified: trunk/reactos/media/inf/font.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/font.inf?rev=5799... ============================================================================== Binary files - no diff available.
Modified: trunk/reactos/win32ss/gdi/ntgdi/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/stockobj.... ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/stockobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/stockobj.c [iso-8859-1] Mon Dec 24 17:31:30 2012 @@ -62,40 +62,39 @@ { PS_NULL, { 0, 0 }, 0 };
static LOGFONTW OEMFixedFont = - { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, OEM_CHARSET, - 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier New" - }; // Bitstream Vera Sans Mono + { 12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, OEM_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE | FIXED_PITCH, L"Terminal" + };
static LOGFONTW AnsiFixedFont = - { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier New" - }; // Bitstream Vera Sans Mono + { 14, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, + OUT_DEFAULT_PRECIS, /*CLIP_DEFAULT_PRECIS*/ CLIP_STROKE_PRECIS, /*DEFAULT_QUALITY*/ PROOF_QUALITY, FF_DONTCARE | FIXED_PITCH, L"Courier" + };
static LOGFONTW AnsiVarFont = { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" + OUT_DEFAULT_PRECIS, /*CLIP_DEFAULT_PRECIS*/ CLIP_STROKE_PRECIS, /*DEFAULT_QUALITY*/ PROOF_QUALITY, FF_DONTCARE | VARIABLE_PITCH, L"MS Sans Serif" };
static LOGFONTW SystemFont = - { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"Courier New" - }; // Bitstream Vera Sans + { 12, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, ANSI_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE | VARIABLE_PITCH, L"System" + };
static LOGFONTW DeviceDefaultFont = - { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" - }; // Bitstream Vera Sans + { 12, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, ANSI_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE | VARIABLE_PITCH, L"System" + };
static LOGFONTW SystemFixedFont = - { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier New" - }; // Bitstream Vera Sans Mono - -/* FIXME: Is this correct? */ + { 16, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE | FIXED_PITCH, L"Fixedsys" + }; + static LOGFONTW DefaultGuiFont = { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" - }; // Bitstream Vera Sans + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, /*DEFAULT_QUALITY*/ PROOF_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Shell Dlg" + };
HGDIOBJ StockObjects[NB_STOCK_OBJECTS];
-
hbelusca＠svn.reactos.org