smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Remove redundant check in runtime DLL condition

Browse source 
For some reason `&& hModule` was added to the end of the condition, which totally breaks the logic for when the DLL is not found.
This commit is contained in:
Nick Bolton 2025-03-11 11:00:04 +00:00
parent 402baf3bde
commit 4cfeadf0be
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/lib/arch/win32/ArchMiscWindows.cpp
View file

@ -19,22 +19,6 @@
#include <array> #include <array>
// Welcome to DLL hell! :)
//
// Microsoft lets you run a program with an old runtime DLL, as long as the name matches.
// Unfortunately if you compile on VS2022 and then use the VS2019 runtime, which both have the
// same runtime DLL name, the app will randomly crash (e.g. access violation) or break in strange
// and unpredictable ways due to ABI differences.
//
// In Windows, there is no concept of requiring a minimum version of the runtime DLL, so we have
// to check the version ourselves.
//
// Our CI is set up to build with the latest compiler, so in this case we should insist on the
// latest runtime DLL.
//
// As a developer convenience, we also allow builds on older compilers such as the minimum
// requirements for the current Qt version we support.
//
// See table of the compiler versions and the matching runtime DLL versions: // See table of the compiler versions and the matching runtime DLL versions:
// https://dev.to/yumetodo/list-of-mscver-and-mscfullver-8nd // https://dev.to/yumetodo/list-of-mscver-and-mscfullver-8nd
#if _MSC_VER >= 1942 // Visual Studio 2022 Update 12 (v17.12.4) #if _MSC_VER >= 1942 // Visual Studio 2022 Update 12 (v17.12.4)
@ -521,13 +505,25 @@ std::string ArchMiscWindows::getActiveDesktopName()
return name; return name;
} }
// Enforcing minimum MSVC runtime version is quite strict, but we have a good reason.
//
// Microsoft lets you run a program with an older version of the runtime DLL than the one it was
// compiled with. This is because the runtime DLLs are supposedly ABI-compatible when the major
// version is the same, so hypothetically MSVC runtime 14.0 is compatible with 14.42.
// However, we have found that subtle edge cases (such as mutex lock causes access violation).
//
// Our CI is set up to build with the latest compiler, so in this case we should insist on at least
// the runtime DLL that was released at the same time as the compiler.
//
// As a developer convenience, we also allow builds on older compilers such as the minimum
// requirements for the current Qt version we support.
void ArchMiscWindows::guardRuntimeVersion() // NOSONAR - `noreturn` is not available void ArchMiscWindows::guardRuntimeVersion() // NOSONAR - `noreturn` is not available
{ {
const auto kRuntimeDll = "vcruntime140.dll"; const auto kRuntimeDll = "vcruntime140.dll";
HMODULE hModule = nullptr; HMODULE hModule = nullptr;
if (!GetModuleHandleEx(0, kRuntimeDll, &hModule) && hModule) { if (!GetModuleHandleEx(0, kRuntimeDll, &hModule)) {
errorMessageBox("Microsoft Visual C++ Runtime is not installed."); errorMessageBox("Could not find Microsoft Visual C++ Runtime.");
abort(); abort();
} }