summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/os/windows/crashlog_win.cpp23
2 files changed, 11 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6cc2f7e2a..fe03b5ae1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -360,6 +360,7 @@ if(WIN32)
-DUNICODE
-D_UNICODE
-DWITH_UNISCRIBE
+ -DPSAPI_VERSION=1
)
target_link_libraries(openttd
@@ -367,6 +368,7 @@ if(WIN32)
winmm
imm32
usp10
+ psapi
)
endif()
diff --git a/src/os/windows/crashlog_win.cpp b/src/os/windows/crashlog_win.cpp
index a7ff8e411..0e1d2f8cc 100644
--- a/src/os/windows/crashlog_win.cpp
+++ b/src/os/windows/crashlog_win.cpp
@@ -22,6 +22,7 @@
#include <windows.h>
#include <mmsystem.h>
#include <signal.h>
+#include <psapi.h>
#include "../../safeguards.h"
@@ -206,25 +207,19 @@ static char *PrintModuleInfo(char *output, const char *last, HMODULE mod)
/* virtual */ char *CrashLogWindows::LogModules(char *output, const char *last) const
{
MakeCRCTable(AllocaM(uint32, 256));
- BOOL (WINAPI *EnumProcessModules)(HANDLE, HMODULE*, DWORD, LPDWORD);
-
output += seprintf(output, last, "Module information:\n");
- if (LoadLibraryList((Function*)&EnumProcessModules, "psapi.dll\0EnumProcessModules\0\0")) {
+ HANDLE proc = OpenProcess(PROCESS_ALL_ACCESS, FALSE, GetCurrentProcessId());
+ if (proc != nullptr) {
HMODULE modules[100];
DWORD needed;
- BOOL res;
-
- HANDLE proc = OpenProcess(PROCESS_ALL_ACCESS, FALSE, GetCurrentProcessId());
- if (proc != nullptr) {
- res = EnumProcessModules(proc, modules, sizeof(modules), &needed);
- CloseHandle(proc);
- if (res) {
- size_t count = std::min<DWORD>(needed / sizeof(HMODULE), lengthof(modules));
+ BOOL res = EnumProcessModules(proc, modules, sizeof(modules), &needed);
+ CloseHandle(proc);
+ if (res) {
+ size_t count = std::min<DWORD>(needed / sizeof(HMODULE), lengthof(modules));
- for (size_t i = 0; i != count; i++) output = PrintModuleInfo(output, last, modules[i]);
- return output + seprintf(output, last, "\n");
- }
+ for (size_t i = 0; i != count; i++) output = PrintModuleInfo(output, last, modules[i]);
+ return output + seprintf(output, last, "\n");
}
}
output = PrintModuleInfo(output, last, nullptr);