freetype replacement fix
Aric Stewart
aric at codeweavers.com
Thu Apr 19 09:00:02 CDT 2007
make the compareson for system link replacement not case sensitive
also if no fsCab is set then do not check it.
---
dlls/gdi32/freetype.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
-------------- next part --------------
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index c372477..caadf4b 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -1031,7 +1031,7 @@ static BOOL AddFontFileToList(const char
if (target_family)
{
localised_family = get_familyname(ft_face);
- if (localised_family && lstrcmpW(localised_family,target_family)!=0)
+ if (localised_family && strcmpiW(localised_family,target_family)!=0)
{
TRACE("Skipping Index %i: Incorrect Family name for replacement\n",(INT)face_index);
HeapFree(GetProcessHeap(), 0, localised_family);
@@ -2767,7 +2767,7 @@ GdiFont *WineEngCreateFontInstance(DC *d
*/
LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry)
{
- if(!strcmpW(font_link->font_name, lf.lfFaceName))
+ if(!strcmpiW(font_link->font_name, lf.lfFaceName))
{
TRACE("found entry in system list\n");
LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry)
@@ -2778,7 +2778,7 @@ GdiFont *WineEngCreateFontInstance(DC *d
{
family = face->family;
if(csi.fs.fsCsb[0] &
- (face->fs.fsCsb[0] | face->fs_links.fsCsb[0]))
+ (face->fs.fsCsb[0] | face->fs_links.fsCsb[0]) || !csi.fs.fsCsb[0])
{
if(face->scalable || can_use_bitmap)
goto found;
More information about the wine-patches
mailing list