From e95e2bfd29b64d3144515c30fb9cf76adb75c6c3 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 07 5月 2024 21:44:21 +0800
Subject: [PATCH] minor tweaks
---
src/core/qwindowkit_windows.h | 166 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 133 insertions(+), 33 deletions(-)
diff --git a/src/core/qwindowkit_windows.h b/src/core/qwindowkit_windows.h
index 998939f..08dca87 100644
--- a/src/core/qwindowkit_windows.h
+++ b/src/core/qwindowkit_windows.h
@@ -1,8 +1,16 @@
+// Copyright (C) 2023-2024 Stdware Collections (https://www.github.com/stdware)
+// Copyright (C) 2021-2023 wangwenx190 (Yuhang Zhao)
+// SPDX-License-Identifier: Apache-2.0
+
#ifndef QWINDOWKIT_WINDOWS_H
#define QWINDOWKIT_WINDOWS_H
#include <QtCore/qt_windows.h>
#include <QtCore/qglobal.h>
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+# include <QtCore/private/qwinregistry_p.h>
+#endif
#include <QWKCore/qwkglobal.h>
@@ -31,6 +39,8 @@
#endif
// Maybe undocumented Windows messages
+// https://github.com/tinysec/public/blob/master/win32k/MessageTable.md
+// https://ulib.sourceforge.io/doxy/a00239.html
#ifndef WM_UAHDESTROYWINDOW
# define WM_UAHDESTROYWINDOW (0x0090)
#endif
@@ -49,54 +59,144 @@
namespace QWK {
- QWK_CORE_EXPORT RTL_OSVERSIONINFOW GetRealOSVersion();
+ namespace Private {
- inline bool IsWindows1122H2OrGreater_Real() {
- RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
- return (rovi.dwMajorVersion > 10) ||
- (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 &&
- rovi.dwBuildNumber >= 22621);
+ QWK_CORE_EXPORT RTL_OSVERSIONINFOW GetRealOSVersion();
+
+ inline bool IsWindows1122H2OrGreater_Real() {
+ RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
+ return (rovi.dwMajorVersion > 10) ||
+ (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 &&
+ rovi.dwBuildNumber >= 22621);
+ }
+
+ inline bool IsWindows11OrGreater_Real() {
+ RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
+ return (rovi.dwMajorVersion > 10) ||
+ (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 &&
+ rovi.dwBuildNumber >= 22000);
+ }
+
+ inline bool IsWindows101903OrGreater_Real() {
+ RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
+ return (rovi.dwMajorVersion > 10) ||
+ (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 &&
+ rovi.dwBuildNumber >= 18362);
+ }
+
+ inline bool IsWindows101809OrGreater_Real() {
+ RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
+ return (rovi.dwMajorVersion > 10) ||
+ (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 &&
+ rovi.dwBuildNumber >= 17763);
+ }
+
+ inline bool IsWindows10OrGreater_Real() {
+ RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
+ return (rovi.dwMajorVersion > 10) ||
+ (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0);
+ }
+
+ inline bool IsWindows8Point1OrGreater_Real() {
+ RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
+ return (rovi.dwMajorVersion > 6) ||
+ (rovi.dwMajorVersion == 6 && rovi.dwMinorVersion >= 3);
+ }
+
+ inline bool IsWindows8OrGreater_Real() {
+ RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
+ return (rovi.dwMajorVersion > 6) ||
+ (rovi.dwMajorVersion == 6 && rovi.dwMinorVersion >= 2);
+ }
+
+ inline bool IsWindows10Only_Real() {
+ return IsWindows10OrGreater_Real() && !IsWindows11OrGreater_Real();
+ }
+
}
- inline bool IsWindows11OrGreater_Real() {
- RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
- return (rovi.dwMajorVersion > 10) ||
- (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 &&
- rovi.dwBuildNumber >= 22000);
+ //
+ // Registry Helpers
+ //
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
+ class QWK_CORE_EXPORT WindowsRegistryKey {
+ public:
+ WindowsRegistryKey(HKEY parentHandle, QStringView subKey, REGSAM permissions = KEY_READ,
+ REGSAM access = 0);
+
+ ~WindowsRegistryKey();
+
+ inline bool isValid() const;
+
+ void close();
+ QString stringValue(QStringView subKey) const;
+ QPair<DWORD, bool> dwordValue(QStringView subKey) const;
+
+ private:
+ HKEY m_key;
+
+ Q_DISABLE_COPY(WindowsRegistryKey)
+ };
+
+ inline bool WindowsRegistryKey::isValid() const {
+ return m_key != nullptr;
+ }
+#else
+ using WindowsRegistryKey = QWinRegistryKey;
+#endif
+
+ //
+ // Version Helpers
+ //
+
+ static inline bool isWin8OrGreater() {
+ static const bool result = Private::IsWindows8OrGreater_Real();
+ return result;
}
- inline bool IsWindows101903OrGreater_Real() {
- RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
- return (rovi.dwMajorVersion > 10) ||
- (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 &&
- rovi.dwBuildNumber >= 18362);
+ static inline bool isWin8Point1OrGreater() {
+ static const bool result = Private::IsWindows8Point1OrGreater_Real();
+ return result;
}
- inline bool IsWindows101809OrGreater_Real() {
- RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
- return (rovi.dwMajorVersion > 10) ||
- (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 &&
- rovi.dwBuildNumber >= 17763);
+ static inline bool isWin10OrGreater() {
+ static const bool result = Private::IsWindows10OrGreater_Real();
+ return result;
}
- inline bool IsWindows10OrGreater_Real() {
- RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
- return (rovi.dwMajorVersion > 10) ||
- (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0);
+ static inline bool isWin101809OrGreater() {
+ static const bool result = Private::IsWindows101809OrGreater_Real();
+ return result;
}
- inline bool IsWindows8Point1OrGreater_Real() {
- RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
- return (rovi.dwMajorVersion > 6) || (rovi.dwMajorVersion == 6 && rovi.dwMinorVersion >= 3);
+ static inline bool isWin101903OrGreater() {
+ static const bool result = Private::IsWindows101903OrGreater_Real();
+ return result;
}
- inline bool IsWindows8OrGreater_Real() {
- RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
- return (rovi.dwMajorVersion > 6) || (rovi.dwMajorVersion == 6 && rovi.dwMinorVersion >= 2);
+ static inline bool isWin11OrGreater() {
+ static const bool result = Private::IsWindows11OrGreater_Real();
+ return result;
}
- inline bool IsWindows10_Real() {
- return IsWindows10OrGreater_Real() && !IsWindows11OrGreater_Real();
+ static inline bool isWin1122H2OrGreater() {
+ static const bool result = Private::IsWindows1122H2OrGreater_Real();
+ return result;
+ }
+
+ static inline bool isWin10Only() {
+ static const bool result = Private::IsWindows10Only_Real();
+ return result;
+ };
+
+ //
+ // Native Event Helpers
+ //
+
+ inline bool isImmersiveColorSetChange(WPARAM wParam, LPARAM lParam) {
+ return !wParam && lParam &&
+ std::wcscmp(reinterpret_cast<LPCWSTR>(lParam), L"ImmersiveColorSet") == 0;
}
}
--
Gitblit v1.9.1