1 files changed, 66 insertions, 15 deletions

diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index 35b3ed4e3d..db4612ae33 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -78,6 +78,17 @@
 #ifdef Q_OS_WIN // for homedirpath reading from registry
 #  include <private/qsystemlibrary_p.h>
 #  include <qt_windows.h>
+#  include <shlobj.h>
+#endif
+
+#ifdef Q_OS_WINRT
+#include <wrl.h>
+#include <windows.foundation.h>
+#include <windows.storage.h>
+using namespace Microsoft::WRL;
+using namespace Microsoft::WRL::Wrappers;
+using namespace ABI::Windows::Foundation;
+using namespace ABI::Windows::Storage;
 #endif
 
 #ifndef CSIDL_COMMON_APPDATA
@@ -365,7 +376,7 @@ after_loop:
 
 // see also qsettings_win.cpp and qsettings_mac.cpp
 
-#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
+#if defined(Q_OS_WINRT) || (!defined(Q_OS_WIN) && !defined(Q_OS_MAC))
 QSettingsPrivate *QSettingsPrivate::create(QSettings::Format format, QSettings::Scope scope,
                                            const QString &organization, const QString &application)
 {
@@ -373,7 +384,7 @@ QSettingsPrivate *QSettingsPrivate::create(QSettings::Format format, QSettings::
 }
 #endif
 
-#if !defined(Q_OS_WIN)
+#if defined(Q_OS_WINRT) || !defined(Q_OS_WIN)
 QSettingsPrivate *QSettingsPrivate::create(const QString &fileName, QSettings::Format format)
 {
     return new QConfFileSettingsPrivate(fileName, format);
@@ -1021,23 +1032,14 @@ void QConfFileSettingsPrivate::initAccess()
     sync();       // loads the files the first time
 }
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
 static QString windowsConfigPath(int type)
 {
     QString result;
 
-#ifndef Q_OS_WINCE
-    QSystemLibrary library(QLatin1String("shell32"));
-#else
-    QSystemLibrary library(QLatin1String("coredll"));
-#endif // Q_OS_WINCE
-    typedef BOOL (WINAPI*GetSpecialFolderPath)(HWND, LPWSTR, int, BOOL);
-    GetSpecialFolderPath SHGetSpecialFolderPath = (GetSpecialFolderPath)library.resolve("SHGetSpecialFolderPathW");
-    if (SHGetSpecialFolderPath) {
-        wchar_t path[MAX_PATH];
-        SHGetSpecialFolderPath(0, path, type, false);
+    wchar_t path[MAX_PATH];
+    if (SHGetSpecialFolderPath(0, path, type, false))
         result = QString::fromWCharArray(path);
-    }
 
     if (result.isEmpty()) {
         switch (type) {
@@ -1063,7 +1065,40 @@ static QString windowsConfigPath(int type)
 
     return result;
 }
-#endif // Q_OS_WIN
+#elif defined(Q_OS_WINRT) // Q_OS_WIN && !Q_OS_WINRT
+static QString windowsConfigPath(int type)
+{
+    static QString result;
+    while (result.isEmpty()) {
+        ComPtr<IApplicationDataStatics> applicationDataStatics;
+        if (FAILED(GetActivationFactory(HString::MakeReference(RuntimeClass_Windows_Storage_ApplicationData).Get(), &applicationDataStatics)))
+            return result;
+        ComPtr<IApplicationData> applicationData;
+        if (FAILED(applicationDataStatics->get_Current(&applicationData)))
+            return result;
+        ComPtr<IStorageFolder> localFolder;
+        if (FAILED(applicationData->get_LocalFolder(&localFolder)))
+            return result;
+        ComPtr<IStorageItem> localFolderItem;
+        if (FAILED(localFolder.As(&localFolderItem)))
+            return result;
+        HSTRING path;
+        if (FAILED(localFolderItem->get_Path(&path)))
+            return result;
+        result = QString::fromWCharArray(WindowsGetStringRawBuffer(path, nullptr));
+    }
+
+    switch (type) {
+    case CSIDL_COMMON_APPDATA:
+        return result + QLatin1String("\\qt-common");
+    case CSIDL_APPDATA:
+        return result + QLatin1String("\\qt-user");
+    default:
+        break;
+    }
+    return result;
+}
+#endif // Q_OS_WINRT
 
 static inline int pathHashKey(QSettings::Format format, QSettings::Scope scope)
 {
@@ -1449,10 +1484,18 @@ void QConfFileSettingsPrivate::syncConfFile(int confFileNo)
             QString writeSemName = QLatin1String("QSettingsWriteSem ");
             writeSemName.append(file.fileName());
 
+#ifndef Q_OS_WINRT
             writeSemaphore = CreateSemaphore(0, 1, 1, reinterpret_cast<const wchar_t *>(writeSemName.utf16()));
+#else
+            writeSemaphore = CreateSemaphoreEx(0, 1, 1, reinterpret_cast<const wchar_t *>(writeSemName.utf16()), 0, SEMAPHORE_ALL_ACCESS);
+#endif
 
             if (writeSemaphore) {
+#ifndef Q_OS_WINRT
                 WaitForSingleObject(writeSemaphore, INFINITE);
+#else
+                WaitForSingleObjectEx(writeSemaphore, INFINITE, FALSE);
+#endif
             } else {
                 setStatus(QSettings::AccessError);
                 return;
@@ -1465,11 +1508,19 @@ void QConfFileSettingsPrivate::syncConfFile(int confFileNo)
         QString readSemName(QLatin1String("QSettingsReadSem "));
         readSemName.append(file.fileName());
 
+#ifndef Q_OS_WINRT
         readSemaphore = CreateSemaphore(0, FileLockSemMax, FileLockSemMax, reinterpret_cast<const wchar_t *>(readSemName.utf16()));
+#else
+        readSemaphore = CreateSemaphoreEx(0, FileLockSemMax, FileLockSemMax, reinterpret_cast<const wchar_t *>(readSemName.utf16()), 0, SEMAPHORE_ALL_ACCESS);
+#endif
 
         if (readSemaphore) {
             for (int i = 0; i < numReadLocks; ++i)
+#ifndef Q_OS_WINRT
                 WaitForSingleObject(readSemaphore, INFINITE);
+#else
+                WaitForSingleObjectEx(readSemaphore, INFINITE, FALSE);
+#endif
         } else {
             setStatus(QSettings::AccessError);
             if (writeSemaphore != 0) {