gdi32: Get the font URL directly from the descriptor on macOS 10.6 and later.

It's significantly faster than the roundabout way that's necessary for 10.5, which is especially important for users with many fonts installed. Issue identified by Andrew Eikum. Signed-off-by: Ken Thomases <ken@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

gdi32: Get the font URL directly from the descriptor on macOS 10.6 and later.
d684831f · Ken Thomases · Alexandre Julliard · 8e8c991c · d684831f
Commit d684831f authored Nov 29, 2016 by Ken Thomases Committed by Alexandre Julliard Nov 29, 2016
Show whitespace changes
Inline Side-by-side

Showing with 12 additions and 5 deletions

freetype.c dlls/gdi32/freetype.c +12 -5

No files found.
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -2933,18 +2933,23 @@ static void load_mac_fonts(void)
    for (i = 0; i < CFArrayGetCount(descs); i++)
    {
        CTFontDescriptorRef desc;
-        CTFontRef font;
-        ATSFontRef atsFont;
-        OSStatus status;
-        FSRef fsref;
        CFURLRef url;
        CFStringRef ext;
        CFStringRef path;

        desc = CFArrayGetValueAtIndex(descs, i);

-        /* CTFontDescriptor doesn't support kCTFontURLAttribute until 10.6, so
+#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
+        url = CTFontDescriptorCopyAttribute(desc, kCTFontURLAttribute);
+#else
+        /* CTFontDescriptor doesn't support kCTFontURLAttribute prior to 10.6, so
           we have to go CFFontDescriptor -> CTFont -> ATSFont -> FSRef -> CFURL. */
+        {
+            CTFontRef font;
+            ATSFontRef atsFont;
+            OSStatus status;
+            FSRef fsref;
+
            font = CTFontCreateWithFontDescriptor(desc, 0, NULL);
            if (!font) continue;

@@ -2960,6 +2965,8 @@ static void load_mac_fonts(void)
            if (status != noErr) continue;

            url = CFURLCreateFromFSRef(NULL, &fsref);
+        }
+#endif
        if (!url) continue;

        ext = CFURLCopyPathExtension(url);