From 84e781b2d554d732650a290fec4615a6444c49db Mon Sep 17 00:00:00 2001 From: Christian Heimlich Date: Thu, 17 Oct 2024 22:12:04 -0400 Subject: [PATCH 1/3] Fix delete of unowned pointer This pointer is part of the security descriptor and is deleted with it. --- app/src/frontend/fe-installfoundation_win.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/frontend/fe-installfoundation_win.cpp b/app/src/frontend/fe-installfoundation_win.cpp index 922c7fa..cc79457 100644 --- a/app/src/frontend/fe-installfoundation_win.cpp +++ b/app/src/frontend/fe-installfoundation_win.cpp @@ -22,7 +22,6 @@ void InstallFoundation::ensureModifiable(const QString& filePath) QScopeGuard cleanup([&]{ LocalFree(pSecurityDescriptor); LocalFree(pNewDACL); - LocalFree(pOwnerId); }); /* NOTE: We do two things here that are technically risky, but should be ok: From 3e684ea0cbd403ed4052600ce16ece4b58219b99 Mon Sep 17 00:00:00 2001 From: Christian Heimlich Date: Fri, 18 Oct 2024 10:03:40 -0400 Subject: [PATCH 2/3] Normalize CLIFp versions --- app/src/clifp.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/clifp.cpp b/app/src/clifp.cpp index 22eae86..056f989 100644 --- a/app/src/clifp.cpp +++ b/app/src/clifp.cpp @@ -20,7 +20,7 @@ //Public: Qx::VersionNumber CLIFp::internalVersion() { - static Qx::VersionNumber v = Qx::VersionNumber::fromString(PROJECT_BUNDLED_CLIFP_VERSION); + static Qx::VersionNumber v = Qx::VersionNumber::fromString(PROJECT_BUNDLED_CLIFP_VERSION).normalized(); return v; } @@ -31,7 +31,7 @@ Qx::VersionNumber CLIFp::installedVersion(const Fp::Install& fpInstall) else { #ifdef _WIN32 - return Qx::FileDetails::readFileDetails(standardCLIFpPath(fpInstall)).fileVersion(); + return Qx::FileDetails::readFileDetails(standardCLIFpPath(fpInstall)).fileVersion().normalized(); #endif /* TODO: For now on Linux we just return a null version so that deployment always * occurs. Eventually, find a good way to grab version info from the installed ELF. From 0caaeb93bed25e2f44fa843c2bada64cff159054 Mon Sep 17 00:00:00 2001 From: Christian Heimlich Date: Fri, 18 Oct 2024 10:09:40 -0400 Subject: [PATCH 3/3] Bump --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 378f81f..43dfe32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.24.0...3.30.0) # Project # NOTE: DON'T USE TRAILING ZEROS IN VERSIONS project(FIL - VERSION 0.7.5.4 + VERSION 0.7.5.5 LANGUAGES CXX DESCRIPTION "Flashpoint Importer for Launchers" )