1 files changed, 34 insertions, 88 deletions

diff --git a/src/corelib/tools/qlocale_win.cpp b/src/corelib/tools/qlocale_win.cpp
index 9d2db61a11..b5f97b5fe8 100644
--- a/src/corelib/tools/qlocale_win.cpp
+++ b/src/corelib/tools/qlocale_win.cpp
@@ -44,9 +44,6 @@
 #include "qstringlist.h"
 #include "qvariant.h"
 #include "qdatetime.h"
-
-#include "private/qsystemlibrary_p.h"
-
 #include "qdebug.h"
 
 #ifdef Q_OS_WIN
@@ -60,20 +57,20 @@
 #include <wrl.h>
 #include <windows.foundation.h>
 #include <windows.foundation.collections.h>
-#include <windows.globalization.h>
+#include <windows.system.userprofile.h>
 #endif // Q_OS_WINRT
 
 QT_BEGIN_NAMESPACE
 
 #ifndef Q_OS_WINRT
 static QByteArray getWinLocaleName(LCID id = LOCALE_USER_DEFAULT);
-static const char *winLangCodeToIsoName(int code);
 static QString winIso639LangName(LCID id = LOCALE_USER_DEFAULT);
 static QString winIso3116CtryName(LCID id = LOCALE_USER_DEFAULT);
 #else // !Q_OS_WINRT
 using namespace Microsoft::WRL;
 using namespace Microsoft::WRL::Wrappers;
 using namespace ABI::Windows::Foundation;
+using namespace ABI::Windows::System::UserProfile;
 
 static QByteArray getWinLocaleName(LPWSTR id = LOCALE_NAME_USER_DEFAULT);
 static const char *winLangCodeToIsoName(int code);
@@ -600,62 +597,45 @@ QVariant QSystemLocalePrivate::toCurrencyString(const QSystemLocale::CurrencyToS
 
 QVariant QSystemLocalePrivate::uiLanguages()
 {
-    if (QSysInfo::windowsVersion() >= QSysInfo::WV_VISTA) {
-        typedef BOOL (WINAPI *GetUserPreferredUILanguagesFunc) (
-                    DWORD dwFlags,
-                    PULONG pulNumLanguages,
-                    PWSTR pwszLanguagesBuffer,
-                    PULONG pcchLanguagesBuffer);
-        static GetUserPreferredUILanguagesFunc GetUserPreferredUILanguages_ptr = 0;
 #ifndef Q_OS_WINRT
-        if (!GetUserPreferredUILanguages_ptr) {
-            QSystemLibrary lib(QLatin1String("kernel32"));
-            if (lib.load())
-                GetUserPreferredUILanguages_ptr = (GetUserPreferredUILanguagesFunc)lib.resolve("GetUserPreferredUILanguages");
-        }
-#endif // !Q_OS_WINRT
-        if (GetUserPreferredUILanguages_ptr) {
-            unsigned long cnt = 0;
-            QVarLengthArray<wchar_t, 64> buf(64);
-            unsigned long size = buf.size();
-            if (!GetUserPreferredUILanguages_ptr(MUI_LANGUAGE_NAME, &cnt, buf.data(), &size)) {
-                size = 0;
-                if (GetLastError() == ERROR_INSUFFICIENT_BUFFER &&
-                    GetUserPreferredUILanguages_ptr(MUI_LANGUAGE_NAME, &cnt, NULL, &size)) {
-                    buf.resize(size);
-                    if (!GetUserPreferredUILanguages_ptr(MUI_LANGUAGE_NAME, &cnt, buf.data(), &size))
-                        return QStringList();
-                }
-            }
-            QStringList result;
-            result.reserve(cnt);
-            const wchar_t *str = buf.constData();
-            for (; cnt > 0; --cnt) {
-                QString s = QString::fromWCharArray(str);
-                if (s.isEmpty())
-                    break; // something is wrong
-                result.append(s);
-                str += s.size()+1;
-            }
-            return result;
+    unsigned long cnt = 0;
+    QVarLengthArray<wchar_t, 64> buf(64);
+#  if !defined(QT_BOOTSTRAPPED) && !defined(QT_BUILD_QMAKE) // Not present in MinGW 4.9/bootstrap builds.
+    unsigned long size = buf.size();
+    if (!GetUserPreferredUILanguages(MUI_LANGUAGE_NAME, &cnt, buf.data(), &size)) {
+        size = 0;
+        if (GetLastError() == ERROR_INSUFFICIENT_BUFFER &&
+                GetUserPreferredUILanguages(MUI_LANGUAGE_NAME, &cnt, NULL, &size)) {
+            buf.resize(size);
+            if (!GetUserPreferredUILanguages(MUI_LANGUAGE_NAME, &cnt, buf.data(), &size))
+                return QStringList();
         }
     }
-
-#ifndef Q_OS_WINRT
-    // old Windows before Vista
-    return QStringList(QString::fromLatin1(winLangCodeToIsoName(GetUserDefaultUILanguage())));
+#  endif // !QT_BOOTSTRAPPED && !QT_BUILD_QMAKE
+    QStringList result;
+    result.reserve(cnt);
+    const wchar_t *str = buf.constData();
+    for (; cnt > 0; --cnt) {
+        QString s = QString::fromWCharArray(str);
+        if (s.isEmpty())
+            break; // something is wrong
+        result.append(s);
+        str += s.size() + 1;
+    }
+    return result;
 #else // !Q_OS_WINRT
     QStringList result;
-    ComPtr<ABI::Windows::Globalization::IApplicationLanguagesStatics> appLanguagesStatics;
-    if (FAILED(GetActivationFactory(HString::MakeReference(RuntimeClass_Windows_Globalization_ApplicationLanguages).Get(), &appLanguagesStatics))) {
+
+    ComPtr<IGlobalizationPreferencesStatics> preferences;
+    HRESULT hr = GetActivationFactory(HString::MakeReference(RuntimeClass_Windows_System_UserProfile_GlobalizationPreferences).Get(), &preferences);
+    if (FAILED(hr)) {
         qWarning("Could not obtain ApplicationLanguagesStatic");
         return QStringList();
     }
 
     ComPtr<ABI::Windows::Foundation::Collections::IVectorView<HSTRING> > languageList;
-    // Languages is a ranked list of "long names" (e.g. en-US) of preferred languages, which matches
-    // languages from the manifest with languages from the user's system.
-    HRESULT hr = appLanguagesStatics->get_Languages(&languageList);
+    // Languages is a ranked list of "long names" (e.g. en-US) of preferred languages
+    hr = preferences->get_Languages(&languageList);
     Q_ASSERT_SUCCEEDED(hr);
     unsigned int size;
     hr = languageList->get_Size(&size);
@@ -670,36 +650,6 @@ QVariant QSystemLocalePrivate::uiLanguages()
         result << QString::fromWCharArray(rawString, length);
     }
 
-    // ManifestLanguages covers all languages given in the manifest and uses short names (like "en").
-    hr = appLanguagesStatics->get_ManifestLanguages(&languageList);
-    Q_ASSERT_SUCCEEDED(hr);
-    hr = languageList->get_Size(&size);
-    Q_ASSERT_SUCCEEDED(hr);
-    for (unsigned int i = 0; i < size; ++i) {
-        HString language;
-        hr = languageList->GetAt(i, language.GetAddressOf());
-        Q_ASSERT_SUCCEEDED(hr);
-        UINT32 length;
-        PCWSTR rawString = language.GetRawBuffer(&length);
-        const QString qLanguage = QString::fromWCharArray(rawString, length);
-        bool found = false;
-        // Since ApplicationLanguages:::Languages uses long names, we compare the "pre-dash" part of
-        // the language and filter it out, if it is already covered by a more specialized form.
-        for (const QString &lang : qAsConst(result)) {
-            int dashIndex = lang.indexOf('-');
-            // There will not be any long name after the first short name was found, so we can stop.
-            if (dashIndex == -1)
-                break;
-
-            if (lang.leftRef(dashIndex) == qLanguage) {
-                found = true;
-                break;
-            }
-        }
-        if (!found)
-            result << qLanguage;
-    }
-
     return result;
 #endif // Q_OS_WINRT
 }
@@ -1160,19 +1110,16 @@ static QByteArray getWinLocaleName(LPWSTR id)
         }
     }
 
-#if defined(Q_OS_WINCE)
-    result = winLangCodeToIsoName(id != LOCALE_USER_DEFAULT ? id : GetUserDefaultLCID());
-#else // !Q_OS_WINCE
-#  ifndef Q_OS_WINRT
+#ifndef Q_OS_WINRT
     if (id == LOCALE_USER_DEFAULT)
         id = GetUserDefaultLCID();
-#  else // !Q_OS_WINRT
+#else // !Q_OS_WINRT
     WCHAR lcName[LOCALE_NAME_MAX_LENGTH];
     if (QString::fromWCharArray(id) == QString::fromWCharArray(LOCALE_NAME_USER_DEFAULT)) {
         GetUserDefaultLocaleName(lcName, LOCALE_NAME_MAX_LENGTH);
         id = lcName;
     }
-#  endif // Q_OS_WINRT
+#endif // Q_OS_WINRT
     QString resultuage = winIso639LangName(id);
     QString country = winIso3116CtryName(id);
     result = resultuage.toLatin1();
@@ -1180,7 +1127,6 @@ static QByteArray getWinLocaleName(LPWSTR id)
         result += '_';
         result += country.toLatin1();
     }
-#endif // !Q_OS_WINCE
 
     return result;
 }