1 files changed, 43 insertions, 73 deletions

diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
index 9e037723fe..d5708e4f9c 100644
--- a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
+++ b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
@@ -1682,101 +1682,71 @@ QFontEngine *QWindowsFontDatabase::createEngine(const QFontDef &request,
                                                 int dpi,
                                                 const QSharedPointer<QWindowsFontEngineData> &data)
 {
-#if !defined(QT_NO_DIRECTWRITE)
-    bool useDirectWrite = (request.hintingPreference == QFont::PreferNoHinting)
-                       || (request.hintingPreference == QFont::PreferVerticalHinting);
-    IDWriteFont *directWriteFont = 0;
-#else
-    bool useDirectWrite = false;
-#endif
+    QFontEngine *fe = 0;
 
     LOGFONT lf = fontDefToLOGFONT(request);
     const bool preferClearTypeAA = lf.lfQuality == CLEARTYPE_QUALITY;
 
-    HFONT hfont = 0;
-    hfont = CreateFontIndirect(&lf);
-    if (!hfont) {
-        qErrnoWarning("%s: CreateFontIndirect failed", __FUNCTION__);
-        hfont = QWindowsFontDatabase::systemFont();
-    }
-
-    bool ttf = false;
-    int avWidth = 0;
-    BOOL res;
-    HGDIOBJ oldObj = SelectObject(data->hdc, hfont);
+    if (request.stretch != 100) {
+        HFONT hfont = CreateFontIndirect(&lf);
+        if (!hfont) {
+            qErrnoWarning("%s: CreateFontIndirect failed", __FUNCTION__);
+            hfont = QWindowsFontDatabase::systemFont();
+        }
 
-    TEXTMETRIC tm;
-    res = GetTextMetrics(data->hdc, &tm);
-    avWidth = tm.tmAveCharWidth;
-    ttf = tm.tmPitchAndFamily & TMPF_TRUETYPE;
-    SelectObject(data->hdc, oldObj);
+        HGDIOBJ oldObj = SelectObject(data->hdc, hfont);
+        TEXTMETRIC tm;
+        if (!GetTextMetrics(data->hdc, &tm))
+            qErrnoWarning("%s: GetTextMetrics failed", __FUNCTION__);
+        else
+            lf.lfWidth = tm.tmAveCharWidth * request.stretch / 100;
+        SelectObject(data->hdc, oldObj);
 
-    if (!useDirectWrite) {
-        if (!ttf || request.stretch != 100) {
-            DeleteObject(hfont);
-            if (!res)
-                qErrnoWarning("%s: GetTextMetrics failed", __FUNCTION__);
-            lf.lfWidth = avWidth * request.stretch/100;
-            hfont = CreateFontIndirect(&lf);
-            if (!hfont) {
-                qErrnoWarning("%s: CreateFontIndirect with stretch failed", __FUNCTION__);
-                hfont = QWindowsFontDatabase::systemFont();
-            }
-        }
+        DeleteObject(hfont);
     }
 
 #if !defined(QT_NO_DIRECTWRITE)
-    else {
-        // Default to false for DirectWrite (and re-enable once/if everything turns out okay)
-        useDirectWrite = false;
-        if (initDirectWrite(data.data())) {
-            const QString fam = QString::fromWCharArray(lf.lfFaceName);
-            const QString nameSubstitute = QWindowsFontEngineDirectWrite::fontNameSubstitute(fam);
-            if (nameSubstitute != fam) {
-                const int nameSubstituteLength = qMin(nameSubstitute.length(), LF_FACESIZE - 1);
-                memcpy(lf.lfFaceName, nameSubstitute.utf16(), nameSubstituteLength * sizeof(wchar_t));
-                lf.lfFaceName[nameSubstituteLength] = 0;
-            }
+    bool useDirectWrite = (request.hintingPreference == QFont::PreferNoHinting)
+                       || (request.hintingPreference == QFont::PreferVerticalHinting);
+    if (useDirectWrite && initDirectWrite(data.data())) {
+        const QString fam = QString::fromWCharArray(lf.lfFaceName);
+        const QString nameSubstitute = QWindowsFontEngineDirectWrite::fontNameSubstitute(fam);
+        if (nameSubstitute != fam) {
+            const int nameSubstituteLength = qMin(nameSubstitute.length(), LF_FACESIZE - 1);
+            memcpy(lf.lfFaceName, nameSubstitute.utf16(), nameSubstituteLength * sizeof(wchar_t));
+            lf.lfFaceName[nameSubstituteLength] = 0;
+        }
 
-            HRESULT hr = data->directWriteGdiInterop->CreateFontFromLOGFONT(&lf, &directWriteFont);
+        IDWriteFont *directWriteFont = 0;
+        HRESULT hr = data->directWriteGdiInterop->CreateFontFromLOGFONT(&lf, &directWriteFont);
+        if (FAILED(hr)) {
+            qErrnoWarning("%s: CreateFontFromLOGFONT failed", __FUNCTION__);
+        } else {
+            IDWriteFontFace *directWriteFontFace = NULL;
+            hr = directWriteFont->CreateFontFace(&directWriteFontFace);
             if (FAILED(hr)) {
-                qErrnoWarning("%s: CreateFontFromLOGFONT failed", __FUNCTION__);
+                qErrnoWarning("%s: CreateFontFace failed", __FUNCTION__);
             } else {
-                DeleteObject(hfont);
-                useDirectWrite = true;
+                QWindowsFontEngineDirectWrite *fedw = new QWindowsFontEngineDirectWrite(directWriteFontFace,
+                                                                                        request.pixelSize,
+                                                                                        data);
+                fedw->initFontInfo(request, dpi, directWriteFont);
+                fe = fedw;
             }
+
+            directWriteFont->Release();
         }
     }
-#endif
+#endif // QT_NO_DIRECTWRITE
 
-    QFontEngine *fe = 0;
-    if (!useDirectWrite) {
-        QWindowsFontEngine *few = new QWindowsFontEngine(request.family, hfont, lf, data);
+    if (!fe) {
+        QWindowsFontEngine *few = new QWindowsFontEngine(request.family, lf, data);
         if (preferClearTypeAA)
             few->glyphFormat = QFontEngine::Format_A32;
         few->initFontInfo(request, dpi);
         fe = few;
     }
 
-#if !defined(QT_NO_DIRECTWRITE)
-    else {
-        IDWriteFontFace *directWriteFontFace = NULL;
-        HRESULT hr = directWriteFont->CreateFontFace(&directWriteFontFace);
-        if (SUCCEEDED(hr)) {
-            QWindowsFontEngineDirectWrite *fedw = new QWindowsFontEngineDirectWrite(directWriteFontFace,
-                                                                                    request.pixelSize,
-                                                                                    data);
-            fedw->initFontInfo(request, dpi, directWriteFont);
-            fe = fedw;
-        } else {
-            qErrnoWarning("%s: CreateFontFace failed", __FUNCTION__);
-        }
-
-        directWriteFont->Release();
-    }
-
-#endif
-
     return fe;
 }