[ros-dev] [ros-diffs] [spetreolle] 58255: Fix font substitutes registry key's name. SysFontSubstitutes => FontSubstitutes.
Timo Kreuzer
timo.kreuzer at web.de
Fri Feb 1 09:57:19 UTC 2013
IIRC we intentionally had 2 keys. One implements the equal Windows
functionality and one replaces the Windows system fonts with our fonts.
Am 31.01.2013 19:04, schrieb spetreolle at svn.reactos.org:
> Author: spetreolle
> Date: Thu Jan 31 18:04:13 2013
> New Revision: 58255
>
> URL: http://svn.reactos.org/svn/reactos?rev=58255&view=rev
> Log:
> Fix font substitutes registry key's name.
> SysFontSubstitutes => FontSubstitutes.
>
> Modified:
> trunk/reactos/base/setup/usetup/mui.c
> trunk/reactos/boot/bootdata/hivesft_amd64.inf
> trunk/reactos/boot/bootdata/hivesft_arm.inf
> trunk/reactos/boot/bootdata/hivesft_i386.inf
> trunk/reactos/boot/bootdata/livecd.inf
> trunk/reactos/media/inf/font.inf
> trunk/reactos/win32ss/gdi/ntgdi/freetype.c
>
> Modified: trunk/reactos/base/setup/usetup/mui.c
> URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?rev=58255&r1=58254&r2=58255&view=diff
> ==============================================================================
> --- trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] (original)
> +++ trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] Thu Jan 31 18:04:13 2013
> @@ -614,7 +614,7 @@
> ULONG uIndex = 0;
>
> RtlInitUnicodeString(&KeyName,
> - L"\\Registry\\Machine\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\SysFontSubstitutes");
> + L"\\Registry\\Machine\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\FontSubstitutes");
> InitializeObjectAttributes(&ObjectAttributes,
> &KeyName,
> OBJ_CASE_INSENSITIVE,
>
> Modified: trunk/reactos/boot/bootdata/hivesft_amd64.inf
> URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_amd64.inf?rev=58255&r1=58254&r2=58255&view=diff
> ==============================================================================
> --- trunk/reactos/boot/bootdata/hivesft_amd64.inf [iso-8859-1] (original)
> +++ trunk/reactos/boot/bootdata/hivesft_amd64.inf [iso-8859-1] Thu Jan 31 18:04:13 2013
> @@ -195,9 +195,9 @@
> HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList","ProfilesDirectory",0x00020000,"%SystemDrive%\Documents and Settings"
>
> ; Font substitutes
> -; SysFontSubstitutes are also returned by EnumFontFamilies, FontSubstitutes aren't
> +; FontSubstitutes are also returned by EnumFontFamilies, FontSubstitutes aren't
> HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts",,0x00000012
> -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes",,0x00000012
> +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes",,0x00000012
>
> ; Time zone settings
> HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones",,0x00000012
>
> Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf
> URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.inf?rev=58255&r1=58254&r2=58255&view=diff
> ==============================================================================
> --- trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original)
> +++ trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] Thu Jan 31 18:04:13 2013
> @@ -121,9 +121,9 @@
> ;HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList","ProfilesDirectory",0x00020000,"%SystemDrive%\Documents and Settings"
>
> ; Font substitutes
> -; SysFontSubstitutes are also returned by EnumFontFamilies, FontSubstitutes aren't
> +; FontSubstitutes are also returned by EnumFontFamilies, FontSubstitutes aren't
> HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts",,0x00000012
> -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes",,0x00000012
> +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes",,0x00000012
>
> ; Time zone settings
> HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones",,0x00000012
>
> Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf
> URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386.inf?rev=58255&r1=58254&r2=58255&view=diff
> ==============================================================================
> --- trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] (original)
> +++ trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] Thu Jan 31 18:04:13 2013
> @@ -231,9 +231,9 @@
> HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList","ProfilesDirectory",0x00020000,"%SystemDrive%\Documents and Settings"
>
> ; Font substitutes
> -; SysFontSubstitutes are also returned by EnumFontFamilies, FontSubstitutes aren't
> +; FontSubstitutes are also returned by EnumFontFamilies, FontSubstitutes aren't
> HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts",,0x00000012
> -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes",,0x00000012
> +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes",,0x00000012
>
> ; Time zone settings
> HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones",,0x00000012
>
> Modified: trunk/reactos/boot/bootdata/livecd.inf
> URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/livecd.inf?rev=58255&r1=58254&r2=58255&view=diff
> ==============================================================================
> --- trunk/reactos/boot/bootdata/livecd.inf [iso-8859-1] (original)
> +++ trunk/reactos/boot/bootdata/livecd.inf [iso-8859-1] Thu Jan 31 18:04:13 2013
> @@ -40,18 +40,18 @@
> HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management","PagingFiles",0x00000000,""
>
> ; Font Substitution
> -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"
> +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Arial",0x00000000,"Liberation Sans"
> +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"FreeMono"
> +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier New",0x00000000,"FreeMono"
> +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01"
> +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","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 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=58255&r1=58254&r2=58255&view=diff
> ==============================================================================
> Binary files - no diff available.
>
> Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c
> URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype.c?rev=58255&r1=58254&r2=58255&view=diff
> ==============================================================================
> --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original)
> +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Thu Jan 31 18:04:13 2013
> @@ -1264,7 +1264,7 @@
> FONT_FAMILY_INFO_CALLBACK_CONTEXT Context;
> NTSTATUS Status;
>
> - /* Enumerate font families found in HKLM\Software\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes
> + /* Enumerate font families found in HKLM\Software\Microsoft\Windows NT\CurrentVersion\FontSubstitutes
> The real work is done in the registry callback function */
> Context.LogFont = LogFont;
> Context.Info = Info;
> @@ -1283,7 +1283,7 @@
> QueryTable[1].Name = NULL;
>
> Status = RtlQueryRegistryValues(RTL_REGISTRY_WINDOWS_NT,
> - L"SysFontSubstitutes",
> + L"FontSubstitutes",
> QueryTable,
> &Context,
> NULL);
> @@ -2660,7 +2660,7 @@
> return;
> }
>
> - if (SubstituteFontFamilyKey(FaceName, L"SysFontSubstitutes") ||
> + if (SubstituteFontFamilyKey(FaceName, L"FontSubstitutes") ||
> SubstituteFontFamilyKey(FaceName, L"FontSubstitutes"))
> {
> SubstituteFontFamily(FaceName, Level + 1);
>
>
>
More information about the Ros-dev
mailing list