wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 486624 - AppendFacesFromFontFile is called twice for the same font file r=blassey, vlad

Browse Source
This commit is contained in:
Hiroyuki Ikezoe 2009-04-13 22:49:06 -04:00
parent d92725cd1e
commit 36a0869dc8
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gfx/thebes/src/gfxWindowsPlatform.cpp
View File

@ -280,10 +280,8 @@ void
gfxWindowsPlatform::FindFonts()
{
nsTArray<nsString> searchPaths(2);
nsTArray<nsString> fontPatterns(4);
fontPatterns.AppendElement(NS_LITERAL_STRING("\\*.TTF"));
nsTArray<nsString> fontPatterns(2);
fontPatterns.AppendElement(NS_LITERAL_STRING("\\*.ttf"));
fontPatterns.AppendElement(NS_LITERAL_STRING("\\*.OTF"));
fontPatterns.AppendElement(NS_LITERAL_STRING("\\*.otf"));
wchar_t pathBuf[256];
SHGetSpecialFolderPathW(0, pathBuf, CSIDL_WINDOWS, 0);
@ -296,7 +294,12 @@ gfxWindowsPlatform::FindFonts()
for (PRUint32 j = 0; j < fontPatterns.Length(); j++) {
nsAutoString pattern(path);
pattern.Append(fontPatterns[j]);
HANDLE handle = FindFirstFileW(pattern.get(), &results);
HANDLE handle = FindFirstFileExW(pattern.get(),
FindExInfoStandard,
&results,
FindExSearchNameMatch,
NULL,
0);
PRBool moreFiles = handle != INVALID_HANDLE_VALUE;
while (moreFiles) {
nsAutoString filePath(path);