Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/CrashHandler: #ifdef cleanup to make VS not choke when parsing, fixed file being all red in editor

Browse Source 
(cherry picked from commit 39c5e03b74)
This commit is contained in:
Shauren
2020-08-07 16:35:42 +02:00
parent 7893ac94a0
commit 473f3db0ab
9 changed files with 18 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/common/Debugging/WheatyExceptionReport.cpp
View File

@@ -3,30 +3,16 @@
// MSDN Magazine, 2002
// FILE: WheatyExceptionReport.CPP
//==========================================
#include "CompilerDefs.h"
#if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS && !defined(__MINGW32__)
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#pragma warning(disable:4996)
#pragma warning(disable:4312)
#pragma warning(disable:4311)
#include <windows.h>
#include <tlhelp32.h>
#include <cstdio>
#include <tchar.h>
#define _NO_CVCONST_H
#include <dbghelp.h>
#include "WheatyExceptionReport.h"
#include "Common.h"
#include "Errors.h"
#include "GitRevision.h"
#include <algorithm>
#include <ehdata.h>
#include <rttidata.h>
#include <cstdio>
#include <tlhelp32.h>
#include <tchar.h>
#define CrashFolder _T("Crashes")
#pragma comment(linker, "/DEFAULTLIB:dbghelp.lib")
@@ -437,14 +423,14 @@ void WheatyExceptionReport::PrintSystemInfo()
::GlobalMemoryStatus(&MemoryStatus);
TCHAR sString[1024];
Log(_T("//=====================================================\r\n"));
if (_GetProcessorName(sString, countof(sString)))
if (_GetProcessorName(sString, std::size(sString)))
Log(_T("*** Hardware ***\r\nProcessor: %s\r\nNumber Of Processors: %d\r\nPhysical Memory: %d KB (Available: %d KB)\r\nCommit Charge Limit: %d KB\r\n"),
sString, SystemInfo.dwNumberOfProcessors, MemoryStatus.dwTotalPhys/0x400, MemoryStatus.dwAvailPhys/0x400, MemoryStatus.dwTotalPageFile/0x400);
else
Log(_T("*** Hardware ***\r\nProcessor: <unknown>\r\nNumber Of Processors: %d\r\nPhysical Memory: %d KB (Available: %d KB)\r\nCommit Charge Limit: %d KB\r\n"),
SystemInfo.dwNumberOfProcessors, MemoryStatus.dwTotalPhys/0x400, MemoryStatus.dwAvailPhys/0x400, MemoryStatus.dwTotalPageFile/0x400);
if (_GetWindowsVersion(sString, countof(sString)))
if (_GetWindowsVersion(sString, std::size(sString)))
Log(_T("\r\n*** Operation System ***\r\n%s\r\n"), sString);
else
Log(_T("\r\n*** Operation System:\r\n<unknown>\r\n"));
@@ -1588,5 +1574,3 @@ std::string SymbolDetail::ToString()
}
return formatted;
}
#endif // _WIN32

7
src/common/Debugging/WheatyExceptionReport.h
View File

@@ -1,16 +1,16 @@
#ifndef _WHEATYEXCEPTIONREPORT_
#define _WHEATYEXCEPTIONREPORT_
#if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS && !defined(__MINGW32__)
#define _NO_CVCONST_H
#include <windows.h>
#include <winnt.h>
#include <winternl.h>
#include <dbghelp.h>
#include <set>
#include <stdlib.h>
#include <cstdlib>
#include <stack>
#include <mutex>
#define countof _countof
#define WER_MAX_ARRAY_ELEMENTS_COUNT 10
#define WER_MAX_NESTING_LEVEL 4
@@ -200,5 +200,4 @@ class WheatyExceptionReport
};
extern WheatyExceptionReport g_WheatyExceptionReport; // global instance of class
#endif // _WIN32
#endif // _WHEATYEXCEPTIONREPORT_