Build fix for WheatyExceptionReport, c++ exceptions must not be thrown in SEH handlers

9 files changed, 38 insertions, 43 deletions

diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp
index 7342a638958..1568e3acf60 100644
--- a/src/server/authserver/Main.cpp
+++ b/src/server/authserver/Main.cpp
@@ -103,7 +103,7 @@ int main(int argc, char** argv)
     sLog->RegisterAppender<AppenderDB>();
     sLog->Initialize(nullptr);
 
-    TC_LOG_INFO("server.authserver", "%s (authserver)", Revision::GetFullVersion().c_str());
+    TC_LOG_INFO("server.authserver", "%s (authserver)", Revision::GetFullVersion());
     TC_LOG_INFO("server.authserver", "<Ctrl-C> to stop.\n");
     TC_LOG_INFO("server.authserver", "Using configuration file %s.", configFile.c_str());
     TC_LOG_INFO("server.authserver", "Using SSL version: %s (library: %s)", OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION));
diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp
index 940e32d22b2..1a6df09018e 100644
--- a/src/server/game/Handlers/CharacterHandler.cpp
+++ b/src/server/game/Handlers/CharacterHandler.cpp
@@ -827,7 +827,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
 
         // send server info
         if (sWorld->getIntConfig(CONFIG_ENABLE_SINFO_LOGIN) == 1)
-            chH.PSendSysMessage(Revision::GetFullVersion().c_str());
+            chH.PSendSysMessage(Revision::GetFullVersion());
 
         TC_LOG_DEBUG("network", "WORLD: Sent server info");
     }
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 057f97e0e2b..a6037a7aafd 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -1534,7 +1534,7 @@ void World::SetInitialWorldSettings()
 
     TC_LOG_INFO("server.loading", "Loading Gameobject Data...");
     sObjectMgr->LoadGameobjects();
-    
+
     TC_LOG_INFO("server.loading", "Loading GameObject Addon Data...");
     sObjectMgr->LoadGameObjectAddons();                          // must be after LoadGameObjectTemplate() and LoadGameobjects()
 
@@ -1789,7 +1789,7 @@ void World::SetInitialWorldSettings()
     m_startTime = m_gameTime;
 
     LoginDatabase.PExecute("INSERT INTO uptime (realmid, starttime, uptime, revision) VALUES(%u, %u, 0, '%s')",
-                            realmID, uint32(m_startTime), Revision::GetFullVersion().c_str());       // One-time query
+                            realmID, uint32(m_startTime), Revision::GetFullVersion());       // One-time query
 
     m_timers[WUPDATE_WEATHERS].SetInterval(1*IN_MILLISECONDS);
     m_timers[WUPDATE_AUCTIONS].SetInterval(MINUTE*IN_MILLISECONDS);
diff --git a/src/server/scripts/Commands/cs_server.cpp b/src/server/scripts/Commands/cs_server.cpp
index 16c5371ffb8..fdc9370c30d 100644
--- a/src/server/scripts/Commands/cs_server.cpp
+++ b/src/server/scripts/Commands/cs_server.cpp
@@ -115,7 +115,7 @@ public:
         std::string uptime          = secsToTimeString(sWorld->GetUptime());
         uint32 updateTime           = sWorld->GetUpdateTime();
 
-        handler->SendSysMessage(Revision::GetFullVersion().c_str());
+        handler->SendSysMessage(Revision::GetFullVersion());
         handler->PSendSysMessage(LANG_CONNECTED_PLAYERS, playersNum, maxPlayersNum);
         handler->PSendSysMessage(LANG_CONNECTED_USERS, activeClientsNum, maxActiveClientsNum, queuedClientsNum, maxQueuedClientsNum);
         handler->PSendSysMessage(LANG_UPTIME, uptime.c_str());
diff --git a/src/server/shared/Debugging/WheatyExceptionReport.cpp b/src/server/shared/Debugging/WheatyExceptionReport.cpp
index 80240bb9110..70aa23a8eed 100644
--- a/src/server/shared/Debugging/WheatyExceptionReport.cpp
+++ b/src/server/shared/Debugging/WheatyExceptionReport.cpp
@@ -130,10 +130,10 @@ PEXCEPTION_POINTERS pExceptionInfo)
     SYSTEMTIME systime;
     GetLocalTime(&systime);
     sprintf(m_szDumpFileName, "%s\\%s_%s_[%u-%u_%u-%u-%u].dmp",
-        crash_folder_path, Revision::GetHash().c_str(), pos, systime.wDay, systime.wMonth, systime.wHour, systime.wMinute, systime.wSecond);
+        crash_folder_path, Revision::GetHash(), pos, systime.wDay, systime.wMonth, systime.wHour, systime.wMinute, systime.wSecond);
 
     sprintf(m_szLogFileName, "%s\\%s_%s_[%u-%u_%u-%u-%u].txt",
-        crash_folder_path, Revision::GetHash().c_str(), pos, systime.wDay, systime.wMonth, systime.wHour, systime.wMinute, systime.wSecond);
+        crash_folder_path, Revision::GetHash(), pos, systime.wDay, systime.wMonth, systime.wHour, systime.wMinute, systime.wSecond);
 
     m_hDumpFile = CreateFile(m_szDumpFileName,
         GENERIC_WRITE,
@@ -439,7 +439,7 @@ PEXCEPTION_POINTERS pExceptionInfo)
         GetLocalTime(&systime);
 
         // Start out with a banner
-        _tprintf(_T("Revision: %s\r\n"), Revision::GetFullVersion().c_str());
+        _tprintf(_T("Revision: %s\r\n"), Revision::GetFullVersion());
         _tprintf(_T("Date %u:%u:%u. Time %u:%u \r\n"), systime.wDay, systime.wMonth, systime.wYear, systime.wHour, systime.wMinute);
         PEXCEPTION_RECORD pExceptionRecord = pExceptionInfo->ExceptionRecord;
 
diff --git a/src/server/shared/Logging/Appender.h b/src/server/shared/Logging/Appender.h
index 17bc8d4e039..7c5aa41924d 100644
--- a/src/server/shared/Logging/Appender.h
+++ b/src/server/shared/Logging/Appender.h
@@ -107,7 +107,6 @@ class Appender
 
         uint8 id;
         std::string name;
-        AppenderType type;
         LogLevel level;
         AppenderFlags flags;
 };
diff --git a/src/server/shared/Revision.cpp b/src/server/shared/Revision.cpp
index 84142316db5..22afb866165 100644
--- a/src/server/shared/Revision.cpp
+++ b/src/server/shared/Revision.cpp
@@ -2,70 +2,67 @@
 #include "CompilerDefs.h"
 #include "revision_data.h"
 
-std::string Revision::GetPackageName()
-{
-    return "TrinityCore";
-}
-
-std::string Revision::GetHash()
+char const* Revision::GetHash()
 {
     return _HASH;
 }
 
-std::string Revision::GetDate()
+char const* Revision::GetDate()
 {
     return _DATE;
 }
 
-std::string Revision::GetBranch()
+char const* Revision::GetBranch()
 {
     return _BRANCH;
 }
 
-std::string Revision::GetSourceDirectory()
+char const* Revision::GetSourceDirectory()
 {
     return _SOURCE_DIRECTORY;
 }
 
-std::string Revision::GetMySQLExecutable()
+char const* Revision::GetMySQLExecutable()
 {
     return _MYSQL_EXECUTABLE;
 }
 
-std::string Revision::GetFullDatabase()
+char const* Revision::GetFullDatabase()
 {
     return _FULL_DATABASE;
 }
 
-std::string Revision::GetFullVersion()
+#define _PACKAGENAME "TrinityCore"
+
+char const* Revision::GetFullVersion()
 {
 #if PLATFORM == PLATFORM_WINDOWS
 # ifdef _WIN64
-    return GetPackageName() + " rev. " + VER_PRODUCTVERSION_STR + " (Win64, " + _BUILD_DIRECTIVE + ")";
+    return _PACKAGENAME " rev. " VER_PRODUCTVERSION_STR " (Win64, " _BUILD_DIRECTIVE ")";
 # else
-    return GetPackageName() + " rev. " + VER_PRODUCTVERSION_STR + " (Win32, " + _BUILD_DIRECTIVE + ")";
+    return _PACKAGENAME " rev. " VER_PRODUCTVERSION_STR " (Win32, " _BUILD_DIRECTIVE ")";
 # endif
 #else
-    return GetPackageName() + " rev. " + VER_PRODUCTVERSION_STR + " (Unix, " + _BUILD_DIRECTIVE + ")";
+    return _PACKAGENAME " rev. " VER_PRODUCTVERSION_STR " (Unix, " _BUILD_DIRECTIVE ")";
 #endif
 }
 
-std::string GetCompanyNameStr()
+char const* GetCompanyNameStr()
 {
     return VER_COMPANYNAME_STR;
 }
 
-std::string GetLegalCopyrightStr()
+char const* GetLegalCopyrightStr()
 {
     return VER_LEGALCOPYRIGHT_STR;
 }
 
-std::string GetFileVersionStr()
+char const* GetFileVersionStr()
 {
     return VER_FILEVERSION_STR;
 }
 
-std::string GetProductVersionStr()
+char const* GetProductVersionStr()
 {
     return VER_PRODUCTVERSION_STR;
 }
diff --git a/src/server/shared/Revision.h b/src/server/shared/Revision.h
index 6b80eb2ca46..f3a04540d76 100644
--- a/src/server/shared/Revision.h
+++ b/src/server/shared/Revision.h
@@ -22,18 +22,17 @@
 
 namespace Revision
 {
-    std::string GetPackageName();
-    std::string GetHash();
-    std::string GetDate();
-    std::string GetBranch();
-    std::string GetSourceDirectory();
-    std::string GetMySQLExecutable();
-    std::string GetFullDatabase();
-    std::string GetFullVersion();
-    std::string GetCompanyNameStr();
-    std::string GetLegalCopyrightStr();
-    std::string GetFileVersionStr();
-    std::string GetProductVersionStr();
+    char const* GetHash();
+    char const* GetDate();
+    char const* GetBranch();
+    char const* GetSourceDirectory();
+    char const* GetMySQLExecutable();
+    char const* GetFullDatabase();
+    char const* GetFullVersion();
+    char const* GetCompanyNameStr();
+    char const* GetLegalCopyrightStr();
+    char const* GetFileVersionStr();
+    char const* GetProductVersionStr();
 }
 
 #endif
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 7d102e4606c..03c0b3f5933 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -125,7 +125,7 @@ extern int main(int argc, char** argv)
     // If logs are supposed to be handled async then we need to pass the io_service into the Log singleton
     sLog->Initialize(sConfigMgr->GetBoolDefault("Log.Async.Enable", false) ? &_ioService : nullptr);
 
-    TC_LOG_INFO("server.worldserver", "%s (worldserver-daemon)", Revision::GetFullVersion().c_str());
+    TC_LOG_INFO("server.worldserver", "%s (worldserver-daemon)", Revision::GetFullVersion());
     TC_LOG_INFO("server.worldserver", "<Ctrl-C> to stop.\n");
     TC_LOG_INFO("server.worldserver", " ______                       __");
     TC_LOG_INFO("server.worldserver", "/\\__  _\\       __          __/\\ \\__");
@@ -234,7 +234,7 @@ extern int main(int argc, char** argv)
         TC_LOG_INFO("server.worldserver", "Starting up anti-freeze thread (%u seconds max stuck time)...", coreStuckTime);
     }
 
-    TC_LOG_INFO("server.worldserver", "%s (worldserver-daemon) ready...", Revision::GetFullVersion().c_str());
+    TC_LOG_INFO("server.worldserver", "%s (worldserver-daemon) ready...", Revision::GetFullVersion());
 
     sScriptMgr->OnStartup();
 
@@ -470,7 +470,7 @@ bool StartDB()
     ClearOnlineAccounts();
 
     ///- Insert version info into DB
-    WorldDatabase.PExecute("UPDATE version SET core_version = '%s', core_revision = '%s'", Revision::GetFullVersion().c_str(), Revision::GetHash().c_str());        // One-time query
+    WorldDatabase.PExecute("UPDATE version SET core_version = '%s', core_revision = '%s'", Revision::GetFullVersion(), Revision::GetHash());        // One-time query
 
     sWorld->LoadDBVersion();