mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-19 13:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[12074] Improve OS detection for windows crash reporting

Browse source
This commit is contained in:
stfx 2012-08-02 09:54:45 +02:00
parent 10f55eab70
commit 8ebcfae37c
2 changed files with 50 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

182
src/shared/WheatyExceptionReport.cpp
View file

@ -16,7 +16,7 @@
#include "WheatyExceptionReport.h" #include "WheatyExceptionReport.h"
#include "revision.h" #include "revision.h"
#include "revision_nr.h" #include "revision_nr.h"
#define CrashFolder _T("Crashs") #define CrashFolder _T("Crashes")
//#pragma comment(linker, "/defaultlib:dbghelp.lib") //#pragma comment(linker, "/defaultlib:dbghelp.lib")
inline LPTSTR ErrorMessage(DWORD dw) inline LPTSTR ErrorMessage(DWORD dw)
@ -89,8 +89,7 @@ LONG WINAPI WheatyExceptionReport::WheatyUnhandledExceptionFilter(
SYSTEMTIME systime; SYSTEMTIME systime;
GetLocalTime(&systime); GetLocalTime(&systime);
sprintf(m_szLogFileName, "%s\\%s_[%u-%u_%u-%u-%u].txt", sprintf(m_szLogFileName, "%s\\%s_[%u-%u_%u-%u-%u].txt",
crash_folder_path, pos, systime.wDay, systime.wMonth, systime.wHour, systime.wMinute, systime.wSecond crash_folder_path, pos, systime.wDay, systime.wMonth, systime.wHour, systime.wMinute, systime.wSecond);
);
m_hReportFile = CreateFile(m_szLogFileName, m_hReportFile = CreateFile(m_szLogFileName,
GENERIC_WRITE, GENERIC_WRITE,
@ -159,149 +158,62 @@ BOOL WheatyExceptionReport::_GetWindowsVersion(TCHAR* szVersion, DWORD cntMax)
} }
*szVersion = _T('\0'); *szVersion = _T('\0');
TCHAR wszTmp[128]; TCHAR wszTmp[128];
switch (osvi.dwPlatformId)
{
// Windows NT product family.
case VER_PLATFORM_WIN32_NT:
// Test for the specific product family.
if (osvi.dwMajorVersion == 6)
_tcsncat(szVersion, _T("Windows Vista or Windows Server 2008 "), cntMax);
if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2)
_tcsncat(szVersion, _T("Microsoft Windows Server 2003 "), cntMax);
if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1)
_tcsncat(szVersion, _T("Microsoft Windows XP "), cntMax);
if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0)
_tcsncat(szVersion, _T("Microsoft Windows 2000 "), cntMax);
if (osvi.dwMajorVersion <= 4)
_tcsncat(szVersion, _T("Microsoft Windows NT "), cntMax);
// Test for specific product on Windows NT 4.0 SP6 and later. // print version
if (bOsVersionInfoEx) switch (osvi.dwMajorVersion)
{ {
// Test for the workstation type. case 6:
#if WINVER < 0x0500 switch (osvi.dwMinorVersion)
if (osvi.wReserved[1] == VER_NT_WORKSTATION) {
#else default: // 2
if (osvi.wProductType == VER_NT_WORKSTATION) if (osvi.wProductType == VER_NT_WORKSTATION)
#endif // WINVER < 0x0500 _tcsncat(szVersion, _T("Windows 8 "), cntMax);
{
if (osvi.dwMajorVersion == 4)
_tcsncat(szVersion, _T("Workstation 4.0 "), cntMax);
#if WINVER < 0x0500
else if (osvi.wReserved[0] & VER_SUITE_PERSONAL)
#else
else if (osvi.wSuiteMask & VER_SUITE_PERSONAL)
#endif // WINVER < 0x0500
_tcsncat(szVersion, _T("Home Edition "), cntMax);
#if WINVER < 0x0500
else if (osvi.wReserved[0] & VER_SUITE_EMBEDDEDNT)
#else
else if (osvi.wSuiteMask & VER_SUITE_EMBEDDEDNT)
#endif // WINVER < 0x0500
_tcsncat(szVersion, _T("Embedded "), cntMax);
else else
_tcsncat(szVersion, _T("Professional "), cntMax); _tcsncat(szVersion, _T("Windows Server 2012 "), cntMax);
} break;
// Test for the server type. case 1:
#if WINVER < 0x0500 if (osvi.wProductType == VER_NT_WORKSTATION)
else if (osvi.wReserved[1] == VER_NT_SERVER) _tcsncat(szVersion, _T("Windows 7 "), cntMax);
#else
else if (osvi.wProductType == VER_NT_SERVER)
#endif // WINVER < 0x0500
{
if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2)
{
#if WINVER < 0x0500
if (osvi.wReserved[0] & VER_SUITE_DATACENTER)
#else
if (osvi.wSuiteMask & VER_SUITE_DATACENTER)
#endif // WINVER < 0x0500
_tcsncat(szVersion, _T("Datacenter Edition "), cntMax);
#if WINVER < 0x0500
else if (osvi.wReserved[0] & VER_SUITE_ENTERPRISE)
#else
else if (osvi.wSuiteMask & VER_SUITE_ENTERPRISE)
#endif // WINVER < 0x0500
_tcsncat(szVersion, _T("Enterprise Edition "), cntMax);
#if WINVER < 0x0500
else if (osvi.wReserved[0] == VER_SUITE_BLADE)
#else
else if (osvi.wSuiteMask == VER_SUITE_BLADE)
#endif // WINVER < 0x0500
_tcsncat(szVersion, _T("Web Edition "), cntMax);
else else
_tcsncat(szVersion, _T("Standard Edition "), cntMax); _tcsncat(szVersion, _T("Windows Server 2008 R2 "), cntMax);
} break;
else if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0) case 0:
{ if (osvi.wProductType == VER_NT_WORKSTATION)
#if WINVER < 0x0500 _tcsncat(szVersion, _T("Windows Vista "), cntMax);
if (osvi.wReserved[0] & VER_SUITE_DATACENTER)
#else
if (osvi.wSuiteMask & VER_SUITE_DATACENTER)
#endif // WINVER < 0x0500
_tcsncat(szVersion, _T("Datacenter Server "), cntMax);
#if WINVER < 0x0500
else if (osvi.wReserved[0] & VER_SUITE_ENTERPRISE)
#else
else if (osvi.wSuiteMask & VER_SUITE_ENTERPRISE)
#endif // WINVER < 0x0500
_tcsncat(szVersion, _T("Advanced Server "), cntMax);
else else
_tcsncat(szVersion, _T("Server "), cntMax); _tcsncat(szVersion, _T("Windows Server 2008 "), cntMax);
break;
} }
else // Windows NT 4.0 break;
case 5:
switch (osvi.dwMinorVersion)
{ {
#if WINVER < 0x0500 default: // 2
if (osvi.wReserved[0] & VER_SUITE_ENTERPRISE) _tcsncat(szVersion, _T("Windows Server 2003 "), cntMax);
#else break;
if (osvi.wSuiteMask & VER_SUITE_ENTERPRISE) case 1:
#endif // WINVER < 0x0500 _tcsncat(szVersion, _T("Windows XP "), cntMax);
_tcsncat(szVersion, _T("Server 4.0, Enterprise Edition "), cntMax); break;
else case 0:
_tcsncat(szVersion, _T("Server 4.0 "), cntMax); _tcsncat(szVersion, _T("Windows 2000 "), cntMax);
} break;
}
}
// Display service pack (if any) and build number.
if (osvi.dwMajorVersion == 4 && _tcsicmp(osvi.szCSDVersion, _T("Service Pack 6")) == 0)
{
HKEY hKey;
LONG lRet;
// Test for SP6 versus SP6a.
lRet = ::RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Hotfix\\Q246009"), 0, KEY_QUERY_VALUE, &hKey);
if (lRet == ERROR_SUCCESS)
{
_stprintf(wszTmp, _T("Service Pack 6a (Version %d.%d, Build %d)"),
osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.dwBuildNumber & 0xFFFF);
_tcsncat(szVersion, wszTmp, cntMax);
}
else // Windows NT 4.0 prior to SP6a
{
_stprintf(wszTmp, _T("%s (Version %d.%d, Build %d)"),
osvi.szCSDVersion, osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.dwBuildNumber & 0xFFFF);
_tcsncat(szVersion, wszTmp, cntMax);
}
::RegCloseKey(hKey);
}
else // Windows NT 3.51 and earlier or Windows 2000 and later
{
if (!_tcslen(osvi.szCSDVersion))
_stprintf(wszTmp, _T("(Version %d.%d, Build %d)"),
osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.dwBuildNumber & 0xFFFF);
else
_stprintf(wszTmp, _T("%s (Version %d.%d, Build %d)"),
osvi.szCSDVersion, osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.dwBuildNumber & 0xFFFF);
_tcsncat(szVersion, wszTmp, cntMax);
} }
break; break;
default: default:
_stprintf(wszTmp, _T("%s (Version %d.%d, Build %d)"), _tcsncat(szVersion, _T("Windows NT or lower "), cntMax);
osvi.szCSDVersion, osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.dwBuildNumber & 0xFFFF);
_tcsncat(szVersion, wszTmp, cntMax);
break; break;
} }
// print service pack if one is installed
if (_tcslen(osvi.szCSDVersion))
_stprintf(wszTmp, _T("%s (Version %d.%d, Build %d)"),
osvi.szCSDVersion, osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.dwBuildNumber & 0xFFFF);
else
_stprintf(wszTmp, _T("(Version %d.%d, Build %d)"),
osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.dwBuildNumber & 0xFFFF);
_tcsncat(szVersion, wszTmp, cntMax);
return TRUE; return TRUE;
} }
@ -369,8 +281,7 @@ void WheatyExceptionReport::printTracesForAllThreads()
} }
CloseHandle(threadHandle); CloseHandle(threadHandle);
} }
} } while (Thread32Next(hThreadSnap, &te32));
while (Thread32Next(hThreadSnap, &te32));
// Don't forget to clean up the snapshot object. // Don't forget to clean up the snapshot object.
CloseHandle(hThreadSnap); CloseHandle(hThreadSnap);
@ -668,8 +579,7 @@ void WheatyExceptionReport::WriteStackDetails(
m_hProcess, // Process handle of the current process m_hProcess, // Process handle of the current process
sf.AddrPC.Offset, // Symbol address sf.AddrPC.Offset, // Symbol address
&symDisplacement, // Address of the variable that will receive the displacement &symDisplacement, // Address of the variable that will receive the displacement
&sip.si // Address of the SYMBOL_INFO structure (inside "sip" object) &sip.si)) // Address of the SYMBOL_INFO structure (inside "sip" object)
))
{ {
_tprintf(_T("%hs+%I64X"), sip.si.Name, symDisplacement); _tprintf(_T("%hs+%I64X"), sip.si.Name, symDisplacement);

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "12073" #define REVISION_NR "12074"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__