From 57da656da534a7582506e51ca8e83d99f25b5294 Mon Sep 17 00:00:00 2001 From: Mars Date: Sat, 1 Mar 2025 20:19:51 -0500 Subject: [PATCH] suckl --- src/os/windows.cpp | 11 +++++++++-- subprojects/sdbus-c++ | 1 - subprojects/sqlite3.wrap | 2 -- 3 files changed, 9 insertions(+), 5 deletions(-) delete mode 160000 subprojects/sdbus-c++ delete mode 100644 subprojects/sqlite3.wrap diff --git a/src/os/windows.cpp b/src/os/windows.cpp index 449c1e5..4fa534a 100644 --- a/src/os/windows.cpp +++ b/src/os/windows.cpp @@ -1,7 +1,9 @@ #ifdef __WIN32__ #include +#define WIN32_LEAN_AND_MEAN #include +#include #include #include #include @@ -39,6 +41,7 @@ namespace { } RegCloseKey(key); + // Remove null terminator if present if (!value.empty() && value.back() == '\0') value.pop_back(); @@ -50,6 +53,7 @@ namespace { fn GetRunningProcesses() -> std::vector { std::vector processes; HANDLE hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); + if (hSnapshot == INVALID_HANDLE_VALUE) return processes; @@ -61,7 +65,7 @@ namespace { return processes; } - while (Process32Next(hSnapshot, &pe32)) { processes.emplace_back(pe32.szExeFile); } + while (Process32Next(hSnapshot, &pe32)) processes.emplace_back(pe32.szExeFile); CloseHandle(hSnapshot); return processes; @@ -158,8 +162,10 @@ fn GetKernelVersion() -> string { if (ntdllHandle) { auto rtlGetVersion = std::bit_cast(GetProcAddress(ntdllHandle, "RtlGetVersion")); if (rtlGetVersion) { - RTL_OSVERSIONINFOW osInfo = {}; + RTL_OSVERSIONINFOW osInfo = {}; + osInfo.dwOSVersionInfoSize = sizeof(osInfo); + if (rtlGetVersion(&osInfo) == 0) versionStream << osInfo.dwMajorVersion << "." << osInfo.dwMinorVersion << "." << osInfo.dwBuildNumber << "." << osInfo.dwPlatformId; @@ -225,6 +231,7 @@ fn GetDesktopEnvironment() -> optional { if (build >= 9600) return "Metro (Windows 8.1)"; + return "Metro (Windows 8)"; } diff --git a/subprojects/sdbus-c++ b/subprojects/sdbus-c++ deleted file mode 160000 index 48ea775..0000000 --- a/subprojects/sdbus-c++ +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 48ea775531523ac290abec91107c628f00156543 diff --git a/subprojects/sqlite3.wrap b/subprojects/sqlite3.wrap deleted file mode 100644 index 8fe9601..0000000 --- a/subprojects/sqlite3.wrap +++ /dev/null @@ -1,2 +0,0 @@ -[wrap-redirect] -filename = SQLiteCpp-3.3.2/subprojects/sqlite3.wrap