[ros-diffs] [hbelusca] 58257: [BOOTDATA] Remove a comment becoming pointless since revision r58255. [WIN32SS] Remove an operation, redundant since revision r58255.

Author: hbelusca
Date: Thu Jan 31 21:27:01 2013
New Revision: 58257

URL: http://svn.reactos.org/svn/reactos?rev=58257&view=rev
Log:
[BOOTDATA]
Remove a comment becoming pointless since revision r58255.

[WIN32SS]
Remove an operation, redundant since revision r58255.

Modified:
    trunk/reactos/boot/bootdata/hivesft_amd64.inf
    trunk/reactos/boot/bootdata/hivesft_arm.inf
    trunk/reactos/boot/bootdata/hivesft_i386.inf
    trunk/reactos/win32ss/gdi/ntgdi/freetype.c

Modified: trunk/reactos/boot/bootdata/hivesft_amd64.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_amd6…
==============================================================================
--- trunk/reactos/boot/bootdata/hivesft_amd64.inf [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/hivesft_amd64.inf [iso-8859-1] Thu Jan 31 21:27:01 2013
@@ -195,7 +195,6 @@
 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
 

Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.…
==============================================================================
--- trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] Thu Jan 31 21:27:01 2013
@@ -121,7 +121,6 @@
 ;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
 

Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386…
==============================================================================
--- trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] Thu Jan 31 21:27:01 2013
@@ -231,7 +231,6 @@
 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
 

Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Thu Jan 31 21:27:01 2013
@@ -2660,8 +2660,7 @@
         return;
     }
 
-    if (SubstituteFontFamilyKey(FaceName, L"FontSubstitutes") ||
-            SubstituteFontFamilyKey(FaceName, L"FontSubstitutes"))
+    if (SubstituteFontFamilyKey(FaceName, L"FontSubstitutes"))
     {
         SubstituteFontFamily(FaceName, Level + 1);
     }