From 444eee172bcfbb9dfa45ae03ec0e0ea42dc82658 Mon Sep 17 00:00:00 2001 From: Daniel Lehman Date: Fri, 6 Jan 2012 15:53:09 -0800 Subject: dbghelp: use CDECL calling convention for __unDName and callbacks on x64 CDECL implies ms_abi attribute which is needed for calls into __unDName to work without crashing --- dlls/dbghelp/symbol.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index d9227ea..6c5aebf 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1843,8 +1843,8 @@ BOOL WINAPI SymUnDName64(PIMAGEHLP_SYMBOL64 sym, PSTR UnDecName, DWORD UnDecName UNDNAME_COMPLETE) != 0; } -static void* und_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); } -static void und_free (void* ptr) { HeapFree(GetProcessHeap(), 0, ptr); } +static void * CDECL und_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); } +static void CDECL und_free (void* ptr) { HeapFree(GetProcessHeap(), 0, ptr); } /*********************************************************************** * UnDecorateSymbolName (DBGHELP.@) @@ -1853,7 +1853,7 @@ DWORD WINAPI UnDecorateSymbolName(PCSTR DecoratedName, PSTR UnDecoratedName, DWORD UndecoratedLength, DWORD Flags) { /* undocumented from msvcrt */ - static char* (*p_undname)(char*, const char*, int, void* (*)(size_t), void (*)(void*), unsigned short); + static char* (* CDECL p_undname)(char*, const char*, int, void* (* CDECL)(size_t), void (* CDECL)(void*), unsigned short); static const WCHAR szMsvcrt[] = {'m','s','v','c','r','t','.','d','l','l',0}; TRACE("(%s, %p, %d, 0x%08x)\n", -- 1.6.0.4