aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dep/g3dlite/G3D-v9.0 hotfix13.diff25
-rw-r--r--dep/g3dlite/include/G3D/g3dmath.h1
-rw-r--r--dep/g3dlite/source/debugAssert.cpp2
-rw-r--r--src/common/Debugging/WheatyExceptionReport.cpp6
-rw-r--r--src/common/Debugging/WheatyExceptionReport.h4
-rw-r--r--src/server/game/Warden/WardenMac.cpp10
-rw-r--r--src/server/game/Warden/WardenWin.cpp10
-rw-r--r--src/server/worldserver/Main.cpp4
8 files changed, 44 insertions, 18 deletions
diff --git a/dep/g3dlite/G3D-v9.0 hotfix13.diff b/dep/g3dlite/G3D-v9.0 hotfix13.diff
new file mode 100644
index 00000000000..b02e2242be4
--- /dev/null
+++ b/dep/g3dlite/G3D-v9.0 hotfix13.diff
@@ -0,0 +1,25 @@
+diff --git a/dep/g3dlite/include/G3D/g3dmath.h b/dep/g3dlite/include/G3D/g3dmath.h
+index 54cc6ed370..002cd3858d 100644
+--- a/dep/g3dlite/include/G3D/g3dmath.h
++++ b/dep/g3dlite/include/G3D/g3dmath.h
+@@ -27,6 +27,7 @@
+ #include "G3D/platform.h"
+ #include <ctype.h>
+ #include <float.h>
++#include <algorithm>
+ #include <limits>
+ #include <stdlib.h>
+ #include <stdint.h>
+diff --git a/dep/g3dlite/source/debugAssert.cpp b/dep/g3dlite/source/debugAssert.cpp
+index cfccf9a0cc..3c3e43a0af 100644
+--- a/dep/g3dlite/source/debugAssert.cpp
++++ b/dep/g3dlite/source/debugAssert.cpp
+@@ -99,7 +99,7 @@ static void createErrorMessage(
+ }
+
+ // Make sure the message got translated into something.
+- LPTSTR realLastErr;
++ LPCTSTR realLastErr;
+ if (NULL != formatMsg) {
+ realLastErr = formatMsg;
+ } else {
diff --git a/dep/g3dlite/include/G3D/g3dmath.h b/dep/g3dlite/include/G3D/g3dmath.h
index 54cc6ed3704..002cd3858d8 100644
--- a/dep/g3dlite/include/G3D/g3dmath.h
+++ b/dep/g3dlite/include/G3D/g3dmath.h
@@ -27,6 +27,7 @@
#include "G3D/platform.h"
#include <ctype.h>
#include <float.h>
+#include <algorithm>
#include <limits>
#include <stdlib.h>
#include <stdint.h>
diff --git a/dep/g3dlite/source/debugAssert.cpp b/dep/g3dlite/source/debugAssert.cpp
index cfccf9a0cc5..3c3e43a0af9 100644
--- a/dep/g3dlite/source/debugAssert.cpp
+++ b/dep/g3dlite/source/debugAssert.cpp
@@ -99,7 +99,7 @@ static void createErrorMessage(
}
// Make sure the message got translated into something.
- LPTSTR realLastErr;
+ LPCTSTR realLastErr;
if (NULL != formatMsg) {
realLastErr = formatMsg;
} else {
diff --git a/src/common/Debugging/WheatyExceptionReport.cpp b/src/common/Debugging/WheatyExceptionReport.cpp
index 28f3cf57ded..a5a23d7eb7d 100644
--- a/src/common/Debugging/WheatyExceptionReport.cpp
+++ b/src/common/Debugging/WheatyExceptionReport.cpp
@@ -14,7 +14,7 @@
#pragma warning(disable:4311)
#include <windows.h>
#include <tlhelp32.h>
-#include <stdio.h>
+#include <cstdio>
#include <tchar.h>
#define _NO_CVCONST_H
#include <dbghelp.h>
@@ -613,7 +613,7 @@ PEXCEPTION_POINTERS pExceptionInfo)
// Given an exception code, returns a pointer to a static string with a
// description of the exception
//======================================================================
-LPTSTR WheatyExceptionReport::GetExceptionString(DWORD dwCode)
+LPCTSTR WheatyExceptionReport::GetExceptionString(DWORD dwCode)
{
#define EXCEPTION(x) case EXCEPTION_##x: return _T(#x);
@@ -950,7 +950,7 @@ DWORD dwTypeIndex,
DWORD_PTR offset,
bool & bHandled,
char const* Name,
-char* /*suffix*/,
+char const* /*suffix*/,
bool newSymbol,
bool logChildren)
{
diff --git a/src/common/Debugging/WheatyExceptionReport.h b/src/common/Debugging/WheatyExceptionReport.h
index 54cc836e7b7..a3cb4b2f04c 100644
--- a/src/common/Debugging/WheatyExceptionReport.h
+++ b/src/common/Debugging/WheatyExceptionReport.h
@@ -153,7 +153,7 @@ class WheatyExceptionReport
static BOOL _GetProcessorName(TCHAR* sProcessorName, DWORD maxcount);
// Helper functions
- static LPTSTR GetExceptionString(DWORD dwCode);
+ static LPCTSTR GetExceptionString(DWORD dwCode);
static BOOL GetLogicalAddress(PVOID addr, PTSTR szModule, DWORD len,
DWORD& section, DWORD_PTR& offset);
@@ -163,7 +163,7 @@ class WheatyExceptionReport
static bool FormatSymbolValue(PSYMBOL_INFO, STACKFRAME64 *);
- static void DumpTypeIndex(DWORD64, DWORD, DWORD_PTR, bool &, char const*, char*, bool, bool);
+ static void DumpTypeIndex(DWORD64, DWORD, DWORD_PTR, bool &, char const*, char const*, bool, bool);
static void FormatOutputValue(char * pszCurrBuffer, BasicType basicType, DWORD64 length, PVOID pAddress, size_t bufferSize, size_t countOverride = 0);
diff --git a/src/server/game/Warden/WardenMac.cpp b/src/server/game/Warden/WardenMac.cpp
index 259a16358fc..56c2942cb65 100644
--- a/src/server/game/Warden/WardenMac.cpp
+++ b/src/server/game/Warden/WardenMac.cpp
@@ -55,15 +55,15 @@ void WardenMac::Init(WorldSession* pClient, SessionKey const& K)
_inputCrypto.Init(_inputKey);
_outputCrypto.Init(_outputKey);
TC_LOG_DEBUG("warden", "Server side warden for client %u initializing...", pClient->GetAccountId());
- TC_LOG_DEBUG("warden", "C->S Key: %s", ByteArrayToHexStr(_inputKey, 16).c_str());
- TC_LOG_DEBUG("warden", "S->C Key: %s", ByteArrayToHexStr(_outputKey, 16).c_str());
- TC_LOG_DEBUG("warden", " Seed: %s", ByteArrayToHexStr(_seed, 16).c_str());
+ TC_LOG_DEBUG("warden", "C->S Key: %s", ByteArrayToHexStr(_inputKey).c_str());
+ TC_LOG_DEBUG("warden", "S->C Key: %s", ByteArrayToHexStr(_outputKey).c_str());
+ TC_LOG_DEBUG("warden", " Seed: %s", ByteArrayToHexStr(_seed).c_str());
TC_LOG_DEBUG("warden", "Loading Module...");
_module = GetModuleForClient();
- TC_LOG_DEBUG("warden", "Module Key: %s", ByteArrayToHexStr(_module->Key, 16).c_str());
- TC_LOG_DEBUG("warden", "Module ID: %s", ByteArrayToHexStr(_module->Id, 16).c_str());
+ TC_LOG_DEBUG("warden", "Module Key: %s", ByteArrayToHexStr(_module->Key).c_str());
+ TC_LOG_DEBUG("warden", "Module ID: %s", ByteArrayToHexStr(_module->Id).c_str());
RequestModule();
}
diff --git a/src/server/game/Warden/WardenWin.cpp b/src/server/game/Warden/WardenWin.cpp
index 05aad4be3bc..bec9ee91d2b 100644
--- a/src/server/game/Warden/WardenWin.cpp
+++ b/src/server/game/Warden/WardenWin.cpp
@@ -53,15 +53,15 @@ void WardenWin::Init(WorldSession* session, SessionKey const& K)
_inputCrypto.Init(_inputKey);
_outputCrypto.Init(_outputKey);
TC_LOG_DEBUG("warden", "Server side warden for client %u initializing...", session->GetAccountId());
- TC_LOG_DEBUG("warden", "C->S Key: %s", ByteArrayToHexStr(_inputKey, 16).c_str());
- TC_LOG_DEBUG("warden", "S->C Key: %s", ByteArrayToHexStr(_outputKey, 16).c_str());
- TC_LOG_DEBUG("warden", " Seed: %s", ByteArrayToHexStr(_seed, 16).c_str());
+ TC_LOG_DEBUG("warden", "C->S Key: %s", ByteArrayToHexStr(_inputKey).c_str());
+ TC_LOG_DEBUG("warden", "S->C Key: %s", ByteArrayToHexStr(_outputKey).c_str());
+ TC_LOG_DEBUG("warden", " Seed: %s", ByteArrayToHexStr(_seed).c_str());
TC_LOG_DEBUG("warden", "Loading Module...");
_module = GetModuleForClient();
- TC_LOG_DEBUG("warden", "Module Key: %s", ByteArrayToHexStr(_module->Key, 16).c_str());
- TC_LOG_DEBUG("warden", "Module ID: %s", ByteArrayToHexStr(_module->Id, 16).c_str());
+ TC_LOG_DEBUG("warden", "Module Key: %s", ByteArrayToHexStr(_module->Key).c_str());
+ TC_LOG_DEBUG("warden", "Module ID: %s", ByteArrayToHexStr(_module->Id).c_str());
RequestModule();
}
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 01556d4ef4f..1705aae4f2a 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -425,7 +425,7 @@ void ShutdownCLIThread(std::thread* cliThread)
// if CancelSynchronousIo fails with ERROR_NOT_FOUND then there was nothing to cancel, proceed with shutdown
if (errorCode != ERROR_NOT_FOUND)
{
- LPSTR errorBuffer;
+ LPCSTR errorBuffer;
DWORD numCharsWritten = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_IGNORE_INSERTS,
nullptr, errorCode, 0, (LPTSTR)&errorBuffer, 0, nullptr);
if (!numCharsWritten)
@@ -434,7 +434,7 @@ void ShutdownCLIThread(std::thread* cliThread)
TC_LOG_DEBUG("server.worldserver", "Error cancelling I/O of CliThread, error code %u, detail: %s", uint32(errorCode), errorBuffer);
if (numCharsWritten)
- LocalFree(errorBuffer);
+ LocalFree((LPSTR)errorBuffer);
// send keyboard input to safely unblock the CLI thread
INPUT_RECORD b[4];