gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SDL_test: always use symbols with 64-suffix from DbgHelp

Browse Source
This commit is contained in:
Anonymous Maarten
2024-06-30 13:11:07 +02:00
parent 1f0bc4b808
commit 9601d98e7f
1 changed files with 30 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/test/SDL_test_memory.c
View File

@@ -29,19 +29,12 @@
#include <windows.h> #include <windows.h>
#include <dbghelp.h> #include <dbghelp.h>
static void *s_dbghelp; static struct {
HMODULE module;
typedef BOOL (__stdcall *dbghelp_SymInitialize_fn)(HANDLE hProcess, PCSTR UserSearchPath, BOOL fInvadeProcess); BOOL (WINAPI *pSymInitialize)(HANDLE hProcess, PCSTR UserSearchPath, BOOL fInvadeProcess);
BOOL (WINAPI *pSymFromAddr)(HANDLE hProcess, DWORD64 Address, PDWORD64 Displacement, PSYMBOL_INFO Symbol);
typedef BOOL (__stdcall *dbghelp_SymFromAddr_fn)(HANDLE hProcess, DWORD64 Address, PDWORD64 Displacement, PSYMBOL_INFO Symbol); BOOL (WINAPI *pSymGetLineFromAddr64)(HANDLE hProcess, DWORD64 qwAddr, PDWORD pdwDisplacement, PIMAGEHLP_LINE64 Line);
static dbghelp_SymFromAddr_fn dbghelp_SymFromAddr; } dyn_dbghelp;
#ifdef _WIN64
typedef BOOL (__stdcall *dbghelp_SymGetLineFromAddr_fn)(HANDLE hProcess, DWORD64 qwAddr, PDWORD pdwDisplacement, PIMAGEHLP_LINE64 Line);
#else
typedef BOOL (__stdcall *dbghelp_SymGetLineFromAddr_fn)(HANDLE hProcess, DWORD qwAddr, PDWORD pdwDisplacement, PIMAGEHLP_LINE Line);
#endif
static dbghelp_SymGetLineFromAddr_fn dbghelp_SymGetLineFromAddr;
/* older SDKs might not have this: */ /* older SDKs might not have this: */
__declspec(dllimport) USHORT WINAPI RtlCaptureStackBackTrace(ULONG FramesToSkip, ULONG FramesToCapture, PVOID* BackTrace, PULONG BackTraceHash); __declspec(dllimport) USHORT WINAPI RtlCaptureStackBackTrace(ULONG FramesToSkip, ULONG FramesToCapture, PVOID* BackTrace, PULONG BackTraceHash);
@@ -169,16 +162,16 @@ static void SDL_TrackAllocation(void *mem, size_t size)
DWORD lineColumn = 0; DWORD lineColumn = 0;
pSymbol->SizeOfStruct = sizeof(SYMBOL_INFO); pSymbol->SizeOfStruct = sizeof(SYMBOL_INFO);
pSymbol->MaxNameLen = MAX_SYM_NAME; pSymbol->MaxNameLen = MAX_SYM_NAME;
IMAGEHLP_LINE line; IMAGEHLP_LINE64 line;
line.SizeOfStruct = sizeof(line); line.SizeOfStruct = sizeof(line);
entry->stack[i] = (Uint64)(uintptr_t)frames[i]; entry->stack[i] = (Uint64)(uintptr_t)frames[i];
if (s_dbghelp) { if (dyn_dbghelp.module) {
if (!dbghelp_SymFromAddr(GetCurrentProcess(), (DWORD64)(uintptr_t)frames[i], &dwDisplacement, pSymbol)) { if (!dyn_dbghelp.pSymFromAddr(GetCurrentProcess(), (DWORD64)(uintptr_t)frames[i], &dwDisplacement, pSymbol)) {
SDL_strlcpy(pSymbol->Name, "???", MAX_SYM_NAME); SDL_strlcpy(pSymbol->Name, "???", MAX_SYM_NAME);
dwDisplacement = 0; dwDisplacement = 0;
} }
if (!dbghelp_SymGetLineFromAddr(GetCurrentProcess(), (DWORD64)(uintptr_t)frames[i], &lineColumn, &line)) { if (!dyn_dbghelp.pSymGetLineFromAddr64(GetCurrentProcess(), (DWORD64)(uintptr_t)frames[i], &lineColumn, &line)) {
line.FileName = ""; line.FileName = "";
line.LineNumber = 0; line.LineNumber = 0;
} }
@@ -296,28 +289,27 @@ void SDLTest_TrackAllocations(void)
SDL_Log("SDLTest_TrackAllocations(): There are %d previous allocations, disabling free() validation", s_previous_allocations); SDL_Log("SDLTest_TrackAllocations(): There are %d previous allocations, disabling free() validation", s_previous_allocations);
} }
#ifdef SDL_PLATFORM_WIN32 #ifdef SDL_PLATFORM_WIN32
{ do {
s_dbghelp = SDL_LoadObject("dbghelp.dll"); dyn_dbghelp.module = SDL_LoadObject("dbghelp.dll");
if (s_dbghelp) { if (!dyn_dbghelp.module) {
dbghelp_SymInitialize_fn dbghelp_SymInitialize; goto dbghelp_failed;
dbghelp_SymInitialize = (dbghelp_SymInitialize_fn)SDL_LoadFunction(s_dbghelp, "SymInitialize");
dbghelp_SymFromAddr = (dbghelp_SymFromAddr_fn)SDL_LoadFunction(s_dbghelp, "SymFromAddr");
#ifdef _WIN64
dbghelp_SymGetLineFromAddr = (dbghelp_SymGetLineFromAddr_fn)SDL_LoadFunction(s_dbghelp, "SymGetLineFromAddr64");
#else
dbghelp_SymGetLineFromAddr = (dbghelp_SymGetLineFromAddr_fn)SDL_LoadFunction(s_dbghelp, "SymGetLineFromAddr");
#endif
if (!dbghelp_SymInitialize || !dbghelp_SymFromAddr || !dbghelp_SymGetLineFromAddr) {
SDL_UnloadObject(s_dbghelp);
s_dbghelp = NULL;
} else {
if (!dbghelp_SymInitialize(GetCurrentProcess(), NULL, TRUE)) {
SDL_UnloadObject(s_dbghelp);
s_dbghelp = NULL;
}
}
} }
} dyn_dbghelp.pSymInitialize = (void *)SDL_LoadFunction(dyn_dbghelp.module, "SymInitialize");
dyn_dbghelp.pSymFromAddr = (void *)SDL_LoadFunction(dyn_dbghelp.module, "SymFromAddr");
dyn_dbghelp.pSymGetLineFromAddr64 = (void *)SDL_LoadFunction(dyn_dbghelp.module, "SymGetLineFromAddr64");
if (!dyn_dbghelp.pSymInitialize || !dyn_dbghelp.pSymFromAddr || !dyn_dbghelp.pSymGetLineFromAddr64) {
goto dbghelp_failed;
}
if (!dyn_dbghelp.pSymInitialize(GetCurrentProcess(), NULL, TRUE)) {
goto dbghelp_failed;
}
break;
dbghelp_failed:
if (dyn_dbghelp.module) {
SDL_UnloadObject(dyn_dbghelp.module);
dyn_dbghelp.module = NULL;
}
} while (0);
#endif #endif
SDL_GetMemoryFunctions(&SDL_malloc_orig, SDL_GetMemoryFunctions(&SDL_malloc_orig,