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

fix(win): improve module name retrieval in findLoadedModule function

Browse source
This commit is contained in:
Nick Bolton 2026-07-31 14:54:56 +01:00
parent 87ac7d8a1f
commit 687d3c7ce8
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,6 +15,7 @@
#include <Psapi.h> #include <Psapi.h>
#include <algorithm>
#include <array> #include <array>
#include <filesystem> #include <filesystem>
#include <stdexcept> #include <stdexcept>
@ -409,15 +410,16 @@ HMODULE ArchMiscWindows::findLoadedModule(std::array<const char *, 2> moduleName
abort(); abort();
} }
std::string loadedModuleName; const auto moduleCount = std::min<size_t>(cbNeeded / sizeof(HMODULE), hModules.size());
for (size_t i = 0; i < (cbNeeded / sizeof(HMODULE)); ++i) { std::array<char, MAX_PATH> loadedModuleName;
if (!GetModuleBaseNameA(hProcess, hModules[i], loadedModuleName.data(), sizeof(loadedModuleName))) { for (size_t i = 0; i < moduleCount; ++i) {
if (!GetModuleBaseNameA(hProcess, hModules[i], loadedModuleName.data(), MAX_PATH)) {
LOG_WARN("could not get base name of loaded module %d", i); LOG_WARN("could not get base name of loaded module %d", i);
continue; continue;
} }
for (const auto &moduleName : moduleNames) { for (const auto &moduleName : moduleNames) {
if (_stricmp((loadedModuleName.data()), moduleName) == 0) { if (_stricmp(loadedModuleName.data(), moduleName) == 0) {
return hModules[i]; return hModules[i];
} }
} }