From 16bc7253b93cfb3eb36d2d3663367e0fa65faf31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Thu, 31 Jan 2013 21:27:01 +0000 Subject: [PATCH] [BOOTDATA] Remove a comment becoming pointless since revision r58255. [WIN32SS] Remove an operation, redundant since revision r58255. svn path=/trunk/; revision=58257 --- reactos/boot/bootdata/hivesft_amd64.inf | 1 - reactos/boot/bootdata/hivesft_arm.inf | 1 - reactos/boot/bootdata/hivesft_i386.inf | 1 - reactos/win32ss/gdi/ntgdi/freetype.c | 3 +-- 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/reactos/boot/bootdata/hivesft_amd64.inf b/reactos/boot/bootdata/hivesft_amd64.inf index 9e4522b7551..09d1ae172b3 100644 --- a/reactos/boot/bootdata/hivesft_amd64.inf +++ b/reactos/boot/bootdata/hivesft_amd64.inf @@ -195,7 +195,6 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList","ProfilesDirectory",0x00020000,"%SystemDrive%\Documents and Settings" ; Font substitutes -; FontSubstitutes are also returned by EnumFontFamilies, FontSubstitutes aren't HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes",,0x00000012 diff --git a/reactos/boot/bootdata/hivesft_arm.inf b/reactos/boot/bootdata/hivesft_arm.inf index f0f2f0173ab..bed3d9d29c9 100644 --- a/reactos/boot/bootdata/hivesft_arm.inf +++ b/reactos/boot/bootdata/hivesft_arm.inf @@ -121,7 +121,6 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList",,0x00000012 ;HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList","ProfilesDirectory",0x00020000,"%SystemDrive%\Documents and Settings" ; Font substitutes -; FontSubstitutes are also returned by EnumFontFamilies, FontSubstitutes aren't HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes",,0x00000012 diff --git a/reactos/boot/bootdata/hivesft_i386.inf b/reactos/boot/bootdata/hivesft_i386.inf index 2a07cec60f1..95b51ec33a5 100644 --- a/reactos/boot/bootdata/hivesft_i386.inf +++ b/reactos/boot/bootdata/hivesft_i386.inf @@ -231,7 +231,6 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList","ProfilesDirectory",0x00020000,"%SystemDrive%\Documents and Settings" ; Font substitutes -; FontSubstitutes are also returned by EnumFontFamilies, FontSubstitutes aren't HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes",,0x00000012 diff --git a/reactos/win32ss/gdi/ntgdi/freetype.c b/reactos/win32ss/gdi/ntgdi/freetype.c index 9abcefeeca3..c25e15571b2 100644 --- a/reactos/win32ss/gdi/ntgdi/freetype.c +++ b/reactos/win32ss/gdi/ntgdi/freetype.c @@ -2660,8 +2660,7 @@ SubstituteFontFamily(PUNICODE_STRING FaceName, UINT Level) return; } - if (SubstituteFontFamilyKey(FaceName, L"FontSubstitutes") || - SubstituteFontFamilyKey(FaceName, L"FontSubstitutes")) + if (SubstituteFontFamilyKey(FaceName, L"FontSubstitutes")) { SubstituteFontFamily(FaceName, Level + 1); }