From 7d747f3bb139d2c01aee61b809d0929e8e908a2d Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周六, 23 12月 2023 17:41:00 +0800
Subject: [PATCH] update qmsetup
---
src/core/qwindowkit_windows.h | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/src/core/qwindowkit_windows.h b/src/core/qwindowkit_windows.h
index f5f5daf..8a98124 100644
--- a/src/core/qwindowkit_windows.h
+++ b/src/core/qwindowkit_windows.h
@@ -15,11 +15,11 @@
#endif
#ifndef IsMinimized
-# define IsMinimized(hwnd) (::IsIconic(hwnd) != FALSE)
+# define IsMinimized(hwnd) (::IsIconic(hwnd))
#endif
#ifndef IsMaximized
-# define IsMaximized(hwnd) (::IsZoomed(hwnd) != FALSE)
+# define IsMaximized(hwnd) (::IsZoomed(hwnd))
#endif
#ifndef RECT_WIDTH
@@ -51,10 +51,11 @@
QWK_CORE_EXPORT RTL_OSVERSIONINFOW GetRealOSVersion();
- inline bool IsWindows10OrGreater_Real() {
+ inline bool IsWindows1122H2OrGreater_Real() {
RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
return (rovi.dwMajorVersion > 10) ||
- (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0);
+ (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 &&
+ rovi.dwBuildNumber >= 22621);
}
inline bool IsWindows11OrGreater_Real() {
@@ -64,6 +65,26 @@
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);
--
Gitblit v1.9.1