From e9999fa61ea0ffa602c69e10e54996b3a636a5e6 Mon Sep 17 00:00:00 2001
From: Yuhang Zhao <2546789017@qq.com>
Date: 周五, 09 5月 2025 16:03:45 +0800
Subject: [PATCH] fix window reopen issue (#179)
---
src/core/qwindowkit_windows.cpp | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/core/qwindowkit_windows.cpp b/src/core/qwindowkit_windows.cpp
index 51a6f33..640528c 100644
--- a/src/core/qwindowkit_windows.cpp
+++ b/src/core/qwindowkit_windows.cpp
@@ -8,9 +8,11 @@
static RTL_OSVERSIONINFOW GetRealOSVersionImpl() {
HMODULE hMod = ::GetModuleHandleW(L"ntdll.dll");
+ Q_ASSERT(hMod);
using RtlGetVersionPtr = NTSTATUS(WINAPI *)(PRTL_OSVERSIONINFOW);
auto pRtlGetVersion =
reinterpret_cast<RtlGetVersionPtr>(::GetProcAddress(hMod, "RtlGetVersion"));
+ Q_ASSERT(pRtlGetVersion);
RTL_OSVERSIONINFOW rovi{};
rovi.dwOSVersionInfoSize = sizeof(rovi);
pRtlGetVersion(&rovi);
@@ -69,22 +71,21 @@
return result;
}
- QPair<DWORD, bool> WindowsRegistryKey::dwordValue(QStringView subKey) const {
+ std::pair<DWORD, bool> WindowsRegistryKey::dwordValue(QStringView subKey) const {
if (!isValid())
- return qMakePair(0, false);
+ return std::make_pair(0, false);
DWORD type;
auto subKeyC = reinterpret_cast<const wchar_t *>(subKey.utf16());
if (::RegQueryValueExW(m_key, subKeyC, nullptr, &type, nullptr, nullptr) != ERROR_SUCCESS ||
type != REG_DWORD) {
- return qMakePair(0, false);
+ return std::make_pair(0, false);
}
DWORD value = 0;
DWORD size = sizeof(value);
const bool ok =
::RegQueryValueExW(m_key, subKeyC, nullptr, nullptr,
reinterpret_cast<unsigned char *>(&value), &size) == ERROR_SUCCESS;
- return qMakePair(value, ok);
+ return std::make_pair(value, ok);
}
#endif
-
}
\ No newline at end of file
--
Gitblit v1.9.1