From 245ddfa1f01b4c9fa10337246b8045755e5bcce5 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 19 12月 2023 21:03:58 +0800
Subject: [PATCH] Change back to qScopeGuard
---
src/core/qwindowkit_windows.h | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/src/core/qwindowkit_windows.h b/src/core/qwindowkit_windows.h
index b36f429..17e2387 100644
--- a/src/core/qwindowkit_windows.h
+++ b/src/core/qwindowkit_windows.h
@@ -4,6 +4,8 @@
#include <QtCore/qt_windows.h>
#include <QtCore/qglobal.h>
+#include <QWKCore/qwkglobal.h>
+
#ifndef GET_X_LPARAM
# define GET_X_LPARAM(lp) (static_cast<int>(static_cast<short>(LOWORD(lp))))
#endif
@@ -13,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
@@ -45,4 +47,33 @@
# define WM_NCUAHDRAWFRAME (0x00AF)
#endif
+namespace QWK {
+
+ QWK_CORE_EXPORT RTL_OSVERSIONINFOW GetRealOSVersion();
+
+ inline bool IsWindows10OrGreater_Real() {
+ RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
+ return (rovi.dwMajorVersion > 10) ||
+ (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0);
+ }
+
+ inline bool IsWindows11OrGreater_Real() {
+ RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
+ return (rovi.dwMajorVersion > 10) ||
+ (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 &&
+ rovi.dwBuildNumber >= 22000);
+ }
+
+ 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);
+ }
+
+}
+
#endif // QWINDOWKIT_WINDOWS_H
--
Gitblit v1.9.1