diff options
| author | Martin Willi <martin@revosec.ch> | 2014-06-05 13:12:38 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2014-06-06 16:28:28 +0200 |
| commit | 8c2c63e09d03192bda83227946a64a2bba791573 (patch) | |
| tree | 72f0d105c7a16f4e793a4f7ab7ad27fa40094270 | |
| parent | cab59c73fc616c23bf510dd875363da08ce1850c (diff) | |
| download | strongswan-8c2c63e09d03192bda83227946a64a2bba791573.tar.bz2 strongswan-8c2c63e09d03192bda83227946a64a2bba791573.tar.xz | |
backtrace: Use GetModuleInformation/GetModuleFileNameEx directly on Win32
The K32 variants are actually needed on 64-bit only.
| -rw-r--r-- | src/libstrongswan/utils/backtrace.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/libstrongswan/utils/backtrace.c b/src/libstrongswan/utils/backtrace.c index 3bb163545..65e74160b 100644 --- a/src/libstrongswan/utils/backtrace.c +++ b/src/libstrongswan/utils/backtrace.c @@ -33,10 +33,18 @@ #ifdef WIN32 # include <psapi.h> /* missing in MinGW */ +#ifdef WIN64 +#ifndef GetModuleInformation WINBOOL K32GetModuleInformation(HANDLE hProcess, HMODULE hModule, LPMODULEINFO lpmodinfo, DWORD cb); +#define GetModuleInformation K32GetModuleInformation +#endif /* !GetModuleInformation */ +#ifndef GetModuleFileNameEx DWORD K32GetModuleFileNameExA(HANDLE hProcess, HMODULE hModule, LPTSTR lpFilename, DWORD nSize); +#define GetModuleFileNameEx K32GetModuleFileNameExA +#endif /* !GetModuleFileNameEx */ +#endif /* WIN64 */ #endif typedef struct private_backtrace_t private_backtrace_t; @@ -525,9 +533,9 @@ METHOD(backtrace_t, log_, void, if (GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, this->frames[i], &module) && - K32GetModuleInformation(GetCurrentProcess(), module, + GetModuleInformation(GetCurrentProcess(), module, &info, sizeof(info)) && - K32GetModuleFileNameExA(GetCurrentProcess(), module, + GetModuleFileNameEx(GetCurrentProcess(), module, filename, sizeof(filename))) { println(file, " %s%s%s @ %p [%p]", |