Win32: Consolidate registry code

Add a RAII class for registry keys and use it throughout
the code base.

Change-Id: I666b2fbb790f83436443101d6bc1e3c0525e78df
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

5 files changed, 99 insertions, 41 deletions

diff --git a/tests/auto/corelib/global/global.pro b/tests/auto/corelib/global/global.pro
index 139e073644..0f77d191ee 100644
--- a/tests/auto/corelib/global/global.pro
+++ b/tests/auto/corelib/global/global.pro
@@ -12,3 +12,6 @@ SUBDIRS=\
     qtendian \
     qglobalstatic \
     qhooks
+
+win32:!winrt: SUBDIRS += \
+    qwinregistry
diff --git a/tests/auto/corelib/global/qwinregistry/qwinregistry.pro b/tests/auto/corelib/global/qwinregistry/qwinregistry.pro
new file mode 100644
index 0000000000..eab5df9dc3
--- /dev/null
+++ b/tests/auto/corelib/global/qwinregistry/qwinregistry.pro
@@ -0,0 +1,8 @@
+CONFIG   += testcase
+QT       += testlib core-private
+QT       -= gui
+
+TARGET = tst_qwinregistry
+CONFIG   += console
+
+SOURCES += tst_qwinregistry.cpp
diff --git a/tests/auto/corelib/global/qwinregistry/tst_qwinregistry.cpp b/tests/auto/corelib/global/qwinregistry/tst_qwinregistry.cpp
new file mode 100644
index 0000000000..ac811de2a1
--- /dev/null
+++ b/tests/auto/corelib/global/qwinregistry/tst_qwinregistry.cpp
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+
+#include <QtCore/qoperatingsystemversion.h>
+
+#include <QtCore/private/qwinregistry_p.h>
+
+class tst_QWinRegistry : public QObject
+{
+    Q_OBJECT
+
+public Q_SLOTS:
+    void initTestCase();
+
+private Q_SLOTS:
+    void values();
+};
+
+void tst_QWinRegistry::initTestCase()
+{
+    if (QOperatingSystemVersion::current() < QOperatingSystemVersion::Windows10)
+        QSKIP("This test requires registry values present in Windows 10");
+}
+
+void tst_QWinRegistry::values()
+{
+    QWinRegistryKey key(HKEY_LOCAL_MACHINE, LR"(SOFTWARE\Microsoft\Windows NT\CurrentVersion)");
+    QVERIFY(key.isValid());
+    QVERIFY(!key.stringValue(L"ProductName").isEmpty());
+    QVERIFY(key.stringValue(L"NonExistingKey").isEmpty());
+    auto majorVersion = key.dwordValue(L"CurrentMajorVersionNumber");
+    QVERIFY(majorVersion.second);
+    QVERIFY(majorVersion.first > 0);
+    auto nonExistingValue = key.dwordValue(L"NonExistingKey");
+    QVERIFY(!nonExistingValue.second);
+    QCOMPARE(nonExistingValue.first, 0u);
+}
+
+QTEST_APPLESS_MAIN(tst_QWinRegistry);
+
+#include "tst_qwinregistry.moc"
diff --git a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
index 16fcafa248..0597a7d521 100644
--- a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
@@ -49,6 +49,7 @@
 #ifdef Q_OS_WIN
 #include <qt_windows.h>
 #if !defined(Q_OS_WINRT)
+#include <private/qwinregistry_p.h>
 #include <lm.h>
 #endif
 #endif
@@ -1243,17 +1244,12 @@ void tst_QFileInfo::fileTimes()
     //In Vista the last-access timestamp is not updated when the file is accessed/touched (by default).
     //To enable this the HKLM\SYSTEM\CurrentControlSet\Control\FileSystem\NtfsDisableLastAccessUpdate
     //is set to 0, in the test machine.
-    HKEY key;
-    if (ERROR_SUCCESS == RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\FileSystem",
-        0, KEY_READ, &key)) {
-            DWORD disabledAccessTimes = 0;
-            DWORD size = sizeof(DWORD);
-            LONG error = RegQueryValueEx(key, L"NtfsDisableLastAccessUpdate"
-                , NULL, NULL, (LPBYTE)&disabledAccessTimes, &size);
-            if (ERROR_SUCCESS == error && disabledAccessTimes)
-                noAccessTime = true;
-            RegCloseKey(key);
-    }
+    const auto disabledAccessTimes =
+        QWinRegistryKey(HKEY_LOCAL_MACHINE,
+                        LR"(SYSTEM\CurrentControlSet\Control\FileSystem)")
+        .dwordValue(L"NtfsDisableLastAccessUpdate");
+    if (disabledAccessTimes.second && disabledAccessTimes.first != 0)
+        noAccessTime = true;
 #endif
 
     if (noAccessTime)
diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
index 289590a233..0f07ba4bb2 100644
--- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
+++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
@@ -54,6 +54,9 @@
 
 #if defined(Q_OS_WIN)
 #include <QtCore/qt_windows.h>
+#ifndef Q_OS_WINRT
+#  include <private/qwinregistry_p.h>
+#endif
 #else
 #include <unistd.h>
 #endif
@@ -3623,16 +3626,13 @@ void tst_QSettings::recursionBug()
 
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
 
-static DWORD readKeyType(HKEY handle, const QString &rSubKey)
+static DWORD readKeyType(HKEY handle, QStringView rSubKey)
 {
     DWORD dataType;
     DWORD dataSize;
-    LONG res = RegQueryValueEx(handle, reinterpret_cast<const wchar_t *>(rSubKey.utf16()), 0, &dataType, 0, &dataSize);
-
-    if (res == ERROR_SUCCESS)
-        return dataType;
-
-    return 0;
+    LONG res = RegQueryValueEx(handle, reinterpret_cast<const wchar_t *>(rSubKey.utf16()),
+                               nullptr, &dataType, nullptr, &dataSize);
+    return res == ERROR_SUCCESS ? dataType : 0;
 }
 
 // This is a regression test for QTBUG-13249, where QSettings was storing
@@ -3652,29 +3652,12 @@ void tst_QSettings::consistentRegistryStorage()
     QCOMPARE(settings1.value("quint64_value").toULongLong(), (quint64)1024);
     settings1.sync();
 
-    HKEY handle;
-    LONG res;
-    QString keyName = "Software\\software.org\\KillerAPP";
-    res = RegOpenKeyEx(HKEY_CURRENT_USER, reinterpret_cast<const wchar_t *>(keyName.utf16()), 0, KEY_READ, &handle);
-    if (res == ERROR_SUCCESS)
-    {
-        DWORD dataType;
-        dataType = readKeyType(handle, QString("qint32_value"));
-        if (dataType != 0) {
-            QCOMPARE((int)REG_DWORD, (int)dataType);
-        }
-        dataType = readKeyType(handle, QString("quint32_value"));
-        if (dataType != 0) {
-            QCOMPARE((int)REG_DWORD, (int)dataType);
-        }
-        dataType = readKeyType(handle, QString("qint64_value"));
-        if (dataType != 0) {
-            QCOMPARE((int)REG_QWORD, (int)dataType);
-        }
-        dataType = readKeyType(handle, QString("quint64_value"));
-        if (dataType != 0) {
-            QCOMPARE((int)REG_QWORD, (int)dataType);
-        }
+    QWinRegistryKey handle(HKEY_CURRENT_USER, LR"(Software\software.org\KillerAPP)");
+    if (handle.isValid()) {
+        QCOMPARE(readKeyType(handle, L"qint32_value"), DWORD(REG_DWORD));
+        QCOMPARE(readKeyType(handle, L"quint32_value"), DWORD(REG_DWORD));
+        QCOMPARE(readKeyType(handle, L"qint64_value"), DWORD(REG_QWORD));
+        QCOMPARE(readKeyType(handle, L"quint64_value"), DWORD(REG_QWORD));
         RegCloseKey(handle);
     }
 }