1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows/DirectWrite: Dynamically load GetUserDefaultLocaleName().

Browse Source 
The function is not available on Windows XP.

Task-number: QTBUG-50188
Change-Id: I4ded1a4eb37af84979c3ce1a9af0d95da60b56ac
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
This commit is contained in:
Friedemann Kleint 2016-01-04 12:06:02 +01:00
parent b1dcdc4064
commit e8747d9e9f
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp
View File

@ -50,6 +50,7 @@
#include <QtCore/QtEndian> #include <QtCore/QtEndian>
#include <QtCore/QVarLengthArray> #include <QtCore/QVarLengthArray>
#include <private/qstringiterator_p.h> #include <private/qstringiterator_p.h>
#include <QtCore/private/qsystemlibrary_p.h>
#include <dwrite.h> #include <dwrite.h>
#include <d2d1.h> #include <d2d1.h>
@ -645,6 +646,16 @@ QFontEngine *QWindowsFontEngineDirectWrite::cloneWithSize(qreal pixelSize) const
return fontEngine; return fontEngine;
} }
// Dynamically resolve GetUserDefaultLocaleName, which is available from Windows
// Vista onwards. ### fixme 5.7: Consider reverting to direct linking.
typedef int (WINAPI *GetUserDefaultLocaleNamePtr)(LPWSTR, int);
static inline GetUserDefaultLocaleNamePtr resolveGetUserDefaultLocaleName()
{
QSystemLibrary library(QStringLiteral("kernel32"));
return (GetUserDefaultLocaleNamePtr)library.resolve("GetUserDefaultLocaleName");
}
void QWindowsFontEngineDirectWrite::initFontInfo(const QFontDef &request, void QWindowsFontEngineDirectWrite::initFontInfo(const QFontDef &request,
int dpi, IDWriteFont *font) int dpi, IDWriteFont *font)
{ {
@ -663,7 +674,9 @@ void QWindowsFontEngineDirectWrite::initFontInfo(const QFontDef &request,
BOOL exists = false; BOOL exists = false;
wchar_t localeName[LOCALE_NAME_MAX_LENGTH]; wchar_t localeName[LOCALE_NAME_MAX_LENGTH];
int defaultLocaleSuccess = GetUserDefaultLocaleName(localeName, LOCALE_NAME_MAX_LENGTH); static const GetUserDefaultLocaleNamePtr getUserDefaultLocaleName = resolveGetUserDefaultLocaleName();
const int defaultLocaleSuccess = getUserDefaultLocaleName
? getUserDefaultLocaleName(localeName, LOCALE_NAME_MAX_LENGTH) : 0;
if (defaultLocaleSuccess) if (defaultLocaleSuccess)
hr = familyNames->FindLocaleName(localeName, &index, &exists); hr = familyNames->FindLocaleName(localeName, &index, &exists);