diff options
| author | 2014-11-19 08:49:13 +0000 | |
|---|---|---|
| committer | 2014-11-19 09:03:07 +0000 | |
| commit | f5d38649c7ad6fedf9db95044e3ad91ce393b8df (patch) | |
| tree | 57cd232d34d8f889315331a84f0812e705d2ea88 /src/common/extended_trace.cpp | |
| parent | Merge pull request #212 from archshift/idea (diff) | |
| download | yuzu-f5d38649c7ad6fedf9db95044e3ad91ce393b8df.tar.gz yuzu-f5d38649c7ad6fedf9db95044e3ad91ce393b8df.tar.xz yuzu-f5d38649c7ad6fedf9db95044e3ad91ce393b8df.zip | |
Remove trailing spaces in every file but the ones imported from SkyEye, AOSP or generated
Diffstat (limited to 'src/common/extended_trace.cpp')
| -rw-r--r-- | src/common/extended_trace.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/common/extended_trace.cpp b/src/common/extended_trace.cpp index 9cd0398ed..bf61ac1d1 100644 --- a/src/common/extended_trace.cpp +++ b/src/common/extended_trace.cpp | |||
| @@ -29,7 +29,7 @@ using namespace std; | |||
| 29 | void PCSTR2LPTSTR( PCSTR lpszIn, LPTSTR lpszOut ) | 29 | void PCSTR2LPTSTR( PCSTR lpszIn, LPTSTR lpszOut ) |
| 30 | { | 30 | { |
| 31 | #if defined(UNICODE)||defined(_UNICODE) | 31 | #if defined(UNICODE)||defined(_UNICODE) |
| 32 | ULONG index = 0; | 32 | ULONG index = 0; |
| 33 | PCSTR lpAct = lpszIn; | 33 | PCSTR lpAct = lpszIn; |
| 34 | 34 | ||
| 35 | for( ; ; lpAct++ ) | 35 | for( ; ; lpAct++ ) |
| @@ -37,7 +37,7 @@ void PCSTR2LPTSTR( PCSTR lpszIn, LPTSTR lpszOut ) | |||
| 37 | lpszOut[index++] = (TCHAR)(*lpAct); | 37 | lpszOut[index++] = (TCHAR)(*lpAct); |
| 38 | if ( *lpAct == 0 ) | 38 | if ( *lpAct == 0 ) |
| 39 | break; | 39 | break; |
| 40 | } | 40 | } |
| 41 | #else | 41 | #else |
| 42 | // This is trivial :) | 42 | // This is trivial :) |
| 43 | strcpy( lpszOut, lpszIn ); | 43 | strcpy( lpszOut, lpszIn ); |
| @@ -101,7 +101,7 @@ BOOL InitSymInfo( PCSTR lpszInitialSymbolPath ) | |||
| 101 | CHAR lpszSymbolPath[BUFFERSIZE]; | 101 | CHAR lpszSymbolPath[BUFFERSIZE]; |
| 102 | DWORD symOptions = SymGetOptions(); | 102 | DWORD symOptions = SymGetOptions(); |
| 103 | 103 | ||
| 104 | symOptions |= SYMOPT_LOAD_LINES; | 104 | symOptions |= SYMOPT_LOAD_LINES; |
| 105 | symOptions &= ~SYMOPT_UNDNAME; | 105 | symOptions &= ~SYMOPT_UNDNAME; |
| 106 | SymSetOptions( symOptions ); | 106 | SymSetOptions( symOptions ); |
| 107 | InitSymbolPath( lpszSymbolPath, lpszInitialSymbolPath ); | 107 | InitSymbolPath( lpszSymbolPath, lpszInitialSymbolPath ); |
| @@ -153,15 +153,15 @@ static BOOL GetFunctionInfoFromAddresses( ULONG fnAddress, ULONG stackAddress, L | |||
| 153 | #ifndef _M_X64 | 153 | #ifndef _M_X64 |
| 154 | DWORD dwDisp = 0; | 154 | DWORD dwDisp = 0; |
| 155 | if ( SymGetSymFromAddr( GetCurrentProcess(), (ULONG)fnAddress, &dwDisp, pSym ) ) | 155 | if ( SymGetSymFromAddr( GetCurrentProcess(), (ULONG)fnAddress, &dwDisp, pSym ) ) |
| 156 | #else | 156 | #else |
| 157 | //makes it compile but hell im not sure if this works... | 157 | //makes it compile but hell im not sure if this works... |
| 158 | DWORD64 dwDisp = 0; | 158 | DWORD64 dwDisp = 0; |
| 159 | if ( SymGetSymFromAddr( GetCurrentProcess(), (ULONG)fnAddress, (PDWORD64)&dwDisp, pSym ) ) | 159 | if ( SymGetSymFromAddr( GetCurrentProcess(), (ULONG)fnAddress, (PDWORD64)&dwDisp, pSym ) ) |
| 160 | #endif | 160 | #endif |
| 161 | { | 161 | { |
| 162 | // Make the symbol readable for humans | 162 | // Make the symbol readable for humans |
| 163 | UnDecorateSymbolName( pSym->Name, lpszNonUnicodeUnDSymbol, BUFFERSIZE, | 163 | UnDecorateSymbolName( pSym->Name, lpszNonUnicodeUnDSymbol, BUFFERSIZE, |
| 164 | UNDNAME_COMPLETE | | 164 | UNDNAME_COMPLETE | |
| 165 | UNDNAME_NO_THISTYPE | | 165 | UNDNAME_NO_THISTYPE | |
| 166 | UNDNAME_NO_SPECIAL_SYMS | | 166 | UNDNAME_NO_SPECIAL_SYMS | |
| 167 | UNDNAME_NO_MEMBER_TYPE | | 167 | UNDNAME_NO_MEMBER_TYPE | |
| @@ -219,7 +219,7 @@ static BOOL GetFunctionInfoFromAddresses( ULONG fnAddress, ULONG stackAddress, L | |||
| 219 | _tcscat( lpszSymbol, lpszParsed ); | 219 | _tcscat( lpszSymbol, lpszParsed ); |
| 220 | 220 | ||
| 221 | ret = TRUE; | 221 | ret = TRUE; |
| 222 | } | 222 | } |
| 223 | GlobalFree( pSym ); | 223 | GlobalFree( pSym ); |
| 224 | 224 | ||
| 225 | return ret; | 225 | return ret; |
| @@ -325,14 +325,14 @@ void StackTrace( HANDLE hThread, const char* lpszMessage, FILE *file ) | |||
| 325 | 325 | ||
| 326 | PrintFunctionAndSourceInfo(file, callStack); | 326 | PrintFunctionAndSourceInfo(file, callStack); |
| 327 | 327 | ||
| 328 | for( ULONG index = 0; ; index++ ) | 328 | for( ULONG index = 0; ; index++ ) |
| 329 | { | 329 | { |
| 330 | bResult = StackWalk( | 330 | bResult = StackWalk( |
| 331 | IMAGE_FILE_MACHINE_I386, | 331 | IMAGE_FILE_MACHINE_I386, |
| 332 | hProcess, | 332 | hProcess, |
| 333 | hThread, | 333 | hThread, |
| 334 | &callStack, | 334 | &callStack, |
| 335 | NULL, | 335 | NULL, |
| 336 | NULL, | 336 | NULL, |
| 337 | SymFunctionTableAccess, | 337 | SymFunctionTableAccess, |
| 338 | SymGetModuleBase, | 338 | SymGetModuleBase, |
| @@ -341,7 +341,7 @@ void StackTrace( HANDLE hThread, const char* lpszMessage, FILE *file ) | |||
| 341 | if ( index == 0 ) | 341 | if ( index == 0 ) |
| 342 | continue; | 342 | continue; |
| 343 | 343 | ||
| 344 | if( !bResult || callStack.AddrFrame.Offset == 0 ) | 344 | if( !bResult || callStack.AddrFrame.Offset == 0 ) |
| 345 | break; | 345 | break; |
| 346 | 346 | ||
| 347 | PrintFunctionAndSourceInfo(file, callStack); | 347 | PrintFunctionAndSourceInfo(file, callStack); |
| @@ -382,14 +382,14 @@ void StackTrace(HANDLE hThread, const char* lpszMessage, FILE *file, DWORD eip, | |||
| 382 | 382 | ||
| 383 | PrintFunctionAndSourceInfo(file, callStack); | 383 | PrintFunctionAndSourceInfo(file, callStack); |
| 384 | 384 | ||
| 385 | for( ULONG index = 0; ; index++ ) | 385 | for( ULONG index = 0; ; index++ ) |
| 386 | { | 386 | { |
| 387 | bResult = StackWalk( | 387 | bResult = StackWalk( |
| 388 | IMAGE_FILE_MACHINE_I386, | 388 | IMAGE_FILE_MACHINE_I386, |
| 389 | hProcess, | 389 | hProcess, |
| 390 | hThread, | 390 | hThread, |
| 391 | &callStack, | 391 | &callStack, |
| 392 | NULL, | 392 | NULL, |
| 393 | NULL, | 393 | NULL, |
| 394 | SymFunctionTableAccess, | 394 | SymFunctionTableAccess, |
| 395 | SymGetModuleBase, | 395 | SymGetModuleBase, |
| @@ -398,7 +398,7 @@ void StackTrace(HANDLE hThread, const char* lpszMessage, FILE *file, DWORD eip, | |||
| 398 | if ( index == 0 ) | 398 | if ( index == 0 ) |
| 399 | continue; | 399 | continue; |
| 400 | 400 | ||
| 401 | if( !bResult || callStack.AddrFrame.Offset == 0 ) | 401 | if( !bResult || callStack.AddrFrame.Offset == 0 ) |
| 402 | break; | 402 | break; |
| 403 | 403 | ||
| 404 | PrintFunctionAndSourceInfo(file, callStack); | 404 | PrintFunctionAndSourceInfo(file, callStack); |