From cc65c4da6ad762e8648b2ab6a801e07c50922d3d Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周二, 04 2月 2025 21:58:21 +0800
Subject: [PATCH] fix compilation error
---
src/core/qwindowkit_windows.h | 115 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 71 insertions(+), 44 deletions(-)
diff --git a/src/core/qwindowkit_windows.h b/src/core/qwindowkit_windows.h
index 20f24ef..d6c0afe 100644
--- a/src/core/qwindowkit_windows.h
+++ b/src/core/qwindowkit_windows.h
@@ -30,6 +30,10 @@
# define RECT_HEIGHT(rect) ((rect).bottom - (rect).top)
#endif
+#ifndef USER_DEFAULT_SCREEN_DPI
+# define USER_DEFAULT_SCREEN_DPI (96)
+#endif
+
// Maybe undocumented Windows messages
// https://github.com/tinysec/public/blob/master/win32k/MessageTable.md
// https://ulib.sourceforge.io/doxy/a00239.html
@@ -58,35 +62,53 @@
inline bool IsWindows1122H2OrGreater_Real() {
RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
return (rovi.dwMajorVersion > 10) ||
- (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 &&
- rovi.dwBuildNumber >= 22621);
+ (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);
+ (rovi.dwMajorVersion == 10 &&
+ (rovi.dwMinorVersion > 0 || rovi.dwBuildNumber >= 22000));
+ }
+
+ inline bool IsWindows1020H1OrGreater_Real() {
+ RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
+ return (rovi.dwMajorVersion > 10) ||
+ (rovi.dwMajorVersion == 10 &&
+ (rovi.dwMinorVersion > 0 || rovi.dwBuildNumber >= 19041));
+ }
+
+ inline bool IsWindows102004OrGreater_Real() {
+ return IsWindows1020H1OrGreater_Real();
}
inline bool IsWindows101903OrGreater_Real() {
RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
return (rovi.dwMajorVersion > 10) ||
- (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 &&
- rovi.dwBuildNumber >= 18362);
+ (rovi.dwMajorVersion == 10 &&
+ (rovi.dwMinorVersion > 0 || rovi.dwBuildNumber >= 18362));
+ }
+
+ inline bool IsWindows1019H1OrGreater_Real() {
+ return IsWindows101903OrGreater_Real();
}
inline bool IsWindows101809OrGreater_Real() {
RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
return (rovi.dwMajorVersion > 10) ||
- (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 &&
- rovi.dwBuildNumber >= 17763);
+ (rovi.dwMajorVersion == 10 &&
+ (rovi.dwMinorVersion > 0 || rovi.dwBuildNumber >= 17763));
+ }
+
+ inline bool IsWindows10RS5OrGreater_Real() {
+ return IsWindows101809OrGreater_Real();
}
inline bool IsWindows10OrGreater_Real() {
RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
- return (rovi.dwMajorVersion > 10) ||
- (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0);
+ return rovi.dwMajorVersion >= 10;
}
inline bool IsWindows8Point1OrGreater_Real() {
@@ -110,7 +132,7 @@
//
// Registry Helpers
//
-
+
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
class QWK_CORE_EXPORT WindowsRegistryKey {
public:
@@ -119,14 +141,11 @@
~WindowsRegistryKey();
- inline bool isValid() const;
+ bool isValid() const;
void close();
QString stringValue(QStringView subKey) const;
QPair<DWORD, bool> dwordValue(QStringView subKey) const;
-
- template<typename T>
- std::optional<T> value(QStringView subKey) const;
private:
HKEY m_key;
@@ -137,77 +156,85 @@
inline bool WindowsRegistryKey::isValid() const {
return m_key != nullptr;
}
-
- template<>
- inline std::optional<DWORD> WindowsRegistryKey::value(QStringView subKey) const {
- const auto dv = dwordValue(subKey);
- if (!dv.second) {
- return {};
- }
- return dv.first;
- }
#elif QT_VERSION < QT_VERSION_CHECK(6, 8, 1)
+ using WindowsRegistryKey = QWinRegistryKey;
+#else
class WindowsRegistryKey : public QWinRegistryKey {
public:
+ WindowsRegistryKey(HKEY parentHandle, QStringView subKey, REGSAM permissions = KEY_READ,
+ REGSAM access = 0)
+ : QWinRegistryKey(parentHandle, subKey, permissions, access) {
+ }
- explicit WindowsRegistryKey(HKEY parentHandle, QStringView subKey, REGSAM permissions = KEY_READ, REGSAM access = 0);
-
- template<typename T>
- inline std::optional<T> value(QStringView subKey) const;
+ inline QPair<DWORD, bool> dwordValue(QStringView subKey) const;
};
- template<>
- inline std::optional<DWORD> WindowsRegistryKey::value(QStringView subKey) const {
- const auto dv = dwordValue(subKey);
- if (!dv.second) {
- return {};
+ inline QPair<DWORD, bool> WindowsRegistryKey::dwordValue(QStringView subKey) const {
+ const auto val = value<DWORD>(subKey);
+ if (!val) {
+ return {0, false};
}
- return dv.first;
+ return {val.value(), true};
}
-#else
- using WindowsRegistryKey = QWinRegistryKey;
#endif
//
// Version Helpers
//
- static inline bool isWin8OrGreater() {
+ inline bool isWin8OrGreater() {
static const bool result = Private::IsWindows8OrGreater_Real();
return result;
}
- static inline bool isWin8Point1OrGreater() {
+ inline bool isWin8Point1OrGreater() {
static const bool result = Private::IsWindows8Point1OrGreater_Real();
return result;
}
- static inline bool isWin10OrGreater() {
+ inline bool isWin10OrGreater() {
static const bool result = Private::IsWindows10OrGreater_Real();
return result;
}
- static inline bool isWin101809OrGreater() {
+ inline bool isWin101809OrGreater() {
static const bool result = Private::IsWindows101809OrGreater_Real();
return result;
}
- static inline bool isWin101903OrGreater() {
+ inline bool isWin10RS5OrGreater() {
+ return isWin101809OrGreater();
+ }
+
+ inline bool isWin101903OrGreater() {
static const bool result = Private::IsWindows101903OrGreater_Real();
return result;
}
- static inline bool isWin11OrGreater() {
+ inline bool isWin1019H1OrGreater() {
+ return isWin101903OrGreater();
+ }
+
+ inline bool isWin1020H1OrGreater() {
+ static const bool result = Private::IsWindows1020H1OrGreater_Real();
+ return result;
+ }
+
+ inline bool isWin102004OrGreater() {
+ return isWin1020H1OrGreater();
+ }
+
+ inline bool isWin11OrGreater() {
static const bool result = Private::IsWindows11OrGreater_Real();
return result;
}
- static inline bool isWin1122H2OrGreater() {
+ inline bool isWin1122H2OrGreater() {
static const bool result = Private::IsWindows1122H2OrGreater_Real();
return result;
}
- static inline bool isWin10Only() {
+ inline bool isWin10Only() {
static const bool result = Private::IsWindows10Only_Real();
return result;
};
--
Gitblit v1.9.1