mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-22 14:44:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Windows header poisoning should be avoided only in headers.

Browse Source 
This fixes cygwin.
This commit is contained in:
Bartosz Taudul 2018-06-20 21:01:25 +02:00
parent 45cec65eef
commit b4b08a0b29
1 changed files with 3 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
client/TracyCallstack.cpp
View File

@ -3,42 +3,8 @@
#ifdef TRACY_HAS_CALLSTACK #ifdef TRACY_HAS_CALLSTACK
#if defined _WIN32 || defined __CYGWIN__ #if defined _WIN32 || defined __CYGWIN__
# ifndef MAXLONG # include <windows.h>
enum { SYMOPT_LOAD_LINES = 0x00000010 }; # include <dbghelp.h>
typedef struct _SYMBOL_INFO
{
unsigned long SizeOfStruct;
unsigned long TypeIndex;
unsigned long long Reserved[2];
unsigned long Index;
unsigned long Size;
unsigned long long ModBase;
unsigned long Flags;
unsigned long long Value;
unsigned long long Address;
unsigned long Register;
unsigned long Scope;
unsigned long Tag;
unsigned long NameLen;
unsigned long MaxNameLen;
char Name[1];
} SYMBOL_INFO;
typedef struct _IMAGEHLP_LINE64
{
unsigned long SizeOfStruct;
void* Key;
unsigned LineNumber;
char* FileName;
unsigned long long Address;
} IMAGEHLP_LINE64;
extern "C" __declspec(dllimport) void* __stdcall GetCurrentProcess();
extern "C" __declspec(dllimport) int __stdcall SymInitialize( void*, const char*, int );
extern "C" __declspec(dllimport) unsigned long __stdcall SymSetOptions( unsigned long );
extern "C" __declspec(dllimport) int __stdcall SymFromAddr( void*, unsigned long long, unsigned long long*, SYMBOL_INFO* );
extern "C" __declspec(dllimport) int __stdcall SymGetLineFromAddr64( void*, unsigned long long, unsigned long*, IMAGEHLP_LINE64* );
# else
# include <dbghelp.h>
# endif
#endif #endif
namespace tracy namespace tracy
@ -75,7 +41,7 @@ CallstackEntry DecodeCallstackPtr( uint64_t ptr )
const char* filename; const char* filename;
IMAGEHLP_LINE64 line; IMAGEHLP_LINE64 line;
unsigned long displacement = 0; DWORD displacement = 0;
line.SizeOfStruct = sizeof( IMAGEHLP_LINE64 ); line.SizeOfStruct = sizeof( IMAGEHLP_LINE64 );
if( SymGetLineFromAddr64( proc, ptr, &displacement, &line ) == 0 ) if( SymGetLineFromAddr64( proc, ptr, &displacement, &line ) == 0 )
{ {