diff options
| author | Rachel Bryk <RachelBryk@gmail.com> | 2013-08-15 09:00:04 -0400 |
|---|---|---|
| committer | Rachel Bryk <RachelBryk@gmail.com> | 2013-08-15 09:00:04 -0400 |
| commit | 6d67ea2fdabab5b4daff88409dcb746fab52b483 (patch) | |
| tree | bec0234d1b07915570ca3296b109ab4eb2fd2868 /Source/Core/Common/Src/ExtendedTrace.cpp | |
| parent | f51cb0b7eb9c0f261abd3f5d68707ba1f93e3888 (diff) | |
| parent | d16f089e88f63931d792cb4b2fca05747ed8c90a (diff) | |
Merge remote-tracking branch 'origin/master' into wiimote-netplay
Diffstat (limited to 'Source/Core/Common/Src/ExtendedTrace.cpp')
| -rw-r--r-- | Source/Core/Common/Src/ExtendedTrace.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/Common/Src/ExtendedTrace.cpp b/Source/Core/Common/Src/ExtendedTrace.cpp index 85057639a5..08740c3c95 100644 --- a/Source/Core/Common/Src/ExtendedTrace.cpp +++ b/Source/Core/Common/Src/ExtendedTrace.cpp @@ -136,7 +136,6 @@ static BOOL GetModuleNameFromAddress( UINT address, LPTSTR lpszModule ) static BOOL GetFunctionInfoFromAddresses( ULONG fnAddress, ULONG stackAddress, LPTSTR lpszSymbol ) { BOOL ret = FALSE; - DWORD dwDisp = 0; DWORD dwSymSize = 10000; TCHAR lpszUnDSymbol[BUFFERSIZE]=_T("?"); CHAR lpszNonUnicodeUnDSymbol[BUFFERSIZE]="?"; @@ -153,9 +152,11 @@ static BOOL GetFunctionInfoFromAddresses( ULONG fnAddress, ULONG stackAddress, L // Get symbol info for IP #ifndef _M_X64 + DWORD dwDisp = 0; if ( SymGetSymFromAddr( GetCurrentProcess(), (ULONG)fnAddress, &dwDisp, pSym ) ) #else //makes it compile but hell im not sure if this works... + DWORD64 dwDisp = 0; if ( SymGetSymFromAddr( GetCurrentProcess(), (ULONG)fnAddress, (PDWORD64)&dwDisp, pSym ) ) #endif { |