From 1b6f705ca73f67e91bd75daabeb1945dce4aefb2 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Date: Tue, 1 Dec 2015 16:43:18 +0100
Subject: Windows: Load DirectWrite dynamically.

DirectWrite is not supported on Windows XP.

Task-number: QTBUG-49711
Change-Id: Ie1df6250814226d53fe4fb3a1c6bd024f6018796
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
---
 .../platforms/windows/qwindowsfontdatabase.cpp     | 52 +++++++++++++++-------
 1 file changed, 37 insertions(+), 15 deletions(-)

(limited to 'src/plugins/platforms/windows/qwindowsfontdatabase.cpp')

diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
index c8eaccd956..334c6a9407 100644
--- a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
+++ b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
@@ -46,6 +46,7 @@
 #include <QtCore/QDebug>
 #include <QtCore/QtEndian>
 #include <QtCore/QThreadStorage>
+#include <QtCore/private/qsystemlibrary_p.h>
 
 #include <wchar.h>
 
@@ -60,6 +61,38 @@
 
 QT_BEGIN_NAMESPACE
 
+#ifndef QT_NO_DIRECTWRITE
+// ### fixme: Consider direct linking of dwrite.dll once Windows Vista pre SP2 is dropped (QTBUG-49711)
+
+typedef HRESULT (WINAPI *DWriteCreateFactoryType)(DWRITE_FACTORY_TYPE, const IID &, IUnknown **);
+
+static inline DWriteCreateFactoryType resolveDWriteCreateFactory()
+{
+    if (QSysInfo::windowsVersion() < QSysInfo::WV_VISTA)
+        return Q_NULLPTR;
+    QSystemLibrary library(QStringLiteral("dwrite"));
+    QFunctionPointer result = library.resolve("DWriteCreateFactory");
+    if (Q_UNLIKELY(!result)) {
+        qWarning("Unable to load dwrite.dll");
+        return Q_NULLPTR;
+    }
+    return reinterpret_cast<DWriteCreateFactoryType>(result);
+}
+
+static IDWriteFactory *createDirectWriteFactory()
+{
+    static const DWriteCreateFactoryType dWriteCreateFactory = resolveDWriteCreateFactory();
+    if (!dWriteCreateFactory)
+        return Q_NULLPTR;
+    IUnknown *result = Q_NULLPTR;
+    if (FAILED(dWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory), &result))) {
+        qErrnoWarning("DWriteCreateFactory failed");
+        return Q_NULLPTR;
+    }
+    return reinterpret_cast<IDWriteFactory *>(result);
+}
+#endif // !QT_NO_DIRECTWRITE
+
 // Helper classes for creating font engines directly from font data
 namespace {
 
@@ -466,14 +499,9 @@ namespace {
     class CustomFontFileLoader
     {
     public:
-        CustomFontFileLoader() : m_directWriteFactory(0), m_directWriteFontFileLoader(0)
+        CustomFontFileLoader() : m_directWriteFactory(createDirectWriteFactory()), m_directWriteFontFileLoader(0)
         {
-            HRESULT hres = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED,
-                                               __uuidof(IDWriteFactory),
-                                               reinterpret_cast<IUnknown **>(&m_directWriteFactory));
-            if (FAILED(hres)) {
-                qErrnoWarning(hres, "%s: DWriteCreateFactory failed.", __FUNCTION__);
-            } else {
+            if (m_directWriteFactory) {
                 m_directWriteFontFileLoader = new DirectWriteFontFileLoader();
                 m_directWriteFactory->RegisterFontFileLoader(m_directWriteFontFileLoader);
             }
@@ -571,15 +599,9 @@ qreal QWindowsFontDatabase::fontSmoothingGamma()
 static inline bool initDirectWrite(QWindowsFontEngineData *d)
 {
     if (!d->directWriteFactory) {
-        const HRESULT hr = DWriteCreateFactory(
-                    DWRITE_FACTORY_TYPE_SHARED,
-                    __uuidof(IDWriteFactory),
-                    reinterpret_cast<IUnknown **>(&d->directWriteFactory)
-                    );
-        if (FAILED(hr)) {
-            qErrnoWarning("%s: DWriteCreateFactory failed", __FUNCTION__);
+        d->directWriteFactory = createDirectWriteFactory();
+        if (!d->directWriteFactory)
             return false;
-        }
     }
     if (!d->directWriteGdiInterop) {
         const HRESULT  hr = d->directWriteFactory->GetGdiInterop(&d->directWriteGdiInterop);
-- 
cgit v1.2.3


From a2ef3479b8e6fcebf97e6c67f4eb1910db66cdba Mon Sep 17 00:00:00 2001
From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Date: Thu, 19 Nov 2015 17:49:46 +0100
Subject: Differ between vertical and no hinting on Windows

Symmetric text rendering seems to be the equivalent to no hinting
at all since it does subpixel antialiasing in both horizontal and vertical
directions. Let people select non-symmetric, natural rendering as well,
by setting vertical hinting on the font. This is the mode used for many
UI elements in newer versions of Windows (like the title bar of windows
etc.)

[ChangeLog][Windows] Added differentiation between vertical hinting and
no hinting in DirectWrite font engine.

Task-number: QTBUG-48546
Change-Id: I2f75ae2d16fdf26706587d92da43daf29afbbcf2
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
---
 src/plugins/platforms/windows/qwindowsfontdatabase.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/plugins/platforms/windows/qwindowsfontdatabase.cpp')

diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
index 334c6a9407..8a2fbe1f6d 100644
--- a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
+++ b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
@@ -1239,11 +1239,13 @@ QT_WARNING_POP
 
         fontFile->Release();
 
-        fontEngine = new QWindowsFontEngineDirectWrite(directWriteFontFace, pixelSize,
+        fontEngine = new QWindowsFontEngineDirectWrite(directWriteFontFace,
+                                                       pixelSize,
                                                        fontEngineData);
 
         // Get font family from font data
         fontEngine->fontDef.family = font.familyName();
+        fontEngine->fontDef.hintingPreference = hintingPreference;
 
         directWriteFontFace->Release();
     }
-- 
cgit v1.2.3