sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Core/WheatyExceptionReport): for c++20 (#6875)

Browse Source
This commit is contained in:
Kitzunu
2021-07-12 00:47:40 +02:00
committed by GitHub
parent d92a2ce58b
commit 511227fa6b
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/Debugging/WheatyExceptionReport.cpp
+8 -8
View File
@@ -708,7 +708,7 @@ void WheatyExceptionReport::GenerateExceptionReport(
//====================================================================== //======================================================================
LPTSTR WheatyExceptionReport::GetExceptionString(DWORD dwCode) LPTSTR WheatyExceptionReport::GetExceptionString(DWORD dwCode)
{ {
#define EXCEPTION(x) case EXCEPTION_##x: return _T(#x); #define EXCEPTION(x) case EXCEPTION_##x: return LPTSTR(_T(#x));
switch (dwCode) switch (dwCode)
{ {
@@ -1023,7 +1023,7 @@ bool WheatyExceptionReport::FormatSymbolValue(
// Determine if the variable is a user defined type (UDT). IF so, bHandled // Determine if the variable is a user defined type (UDT). IF so, bHandled
// will return true. // will return true.
bool bHandled; bool bHandled;
DumpTypeIndex(pSym->ModBase, pSym->TypeIndex, pVariable, bHandled, pSym->Name, "", false, true); DumpTypeIndex(pSym->ModBase, pSym->TypeIndex, pVariable, bHandled, pSym->Name, (char*)"", false, true);
if (!bHandled) if (!bHandled)
{ {
@@ -1234,7 +1234,7 @@ void WheatyExceptionReport::DumpTypeIndex(
logChildren = false; logChildren = false;
} }
DumpTypeIndex(modBase, innerTypeID, DumpTypeIndex(modBase, innerTypeID,
offset, bHandled, symbolDetails.top().Name.c_str(), "", false, logChildren); offset, bHandled, symbolDetails.top().Name.c_str(), (char*)"", false, logChildren);
break; break;
case SymTagPointerType: case SymTagPointerType:
if (Name != nullptr && Name[0] != '\0') if (Name != nullptr && Name[0] != '\0')
@@ -1242,11 +1242,11 @@ void WheatyExceptionReport::DumpTypeIndex(
symbolDetails.top().Name = Name; symbolDetails.top().Name = Name;
} }
DumpTypeIndex(modBase, innerTypeID, DumpTypeIndex(modBase, innerTypeID,
offset, bHandled, symbolDetails.top().Name.c_str(), "", false, logChildren); offset, bHandled, symbolDetails.top().Name.c_str(), (char*)"", false, logChildren);
break; break;
case SymTagArrayType: case SymTagArrayType:
DumpTypeIndex(modBase, innerTypeID, DumpTypeIndex(modBase, innerTypeID,
offset, bHandled, symbolDetails.top().Name.c_str(), "", false, logChildren); offset, bHandled, symbolDetails.top().Name.c_str(), (char*)"", false, logChildren);
break; break;
default: default:
break; break;
@@ -1260,7 +1260,7 @@ void WheatyExceptionReport::DumpTypeIndex(
BasicType basicType = btNoType; BasicType basicType = btNoType;
DumpTypeIndex(modBase, innerTypeID, DumpTypeIndex(modBase, innerTypeID,
offset, bHandled, Name, "", false, false); offset, bHandled, Name, (char*)"", false, false);
// Set Value back to an empty string since the Array object itself has no value, only its elements have // Set Value back to an empty string since the Array object itself has no value, only its elements have
std::string firstElementValue = symbolDetails.top().Value; std::string firstElementValue = symbolDetails.top().Value;
@@ -1314,7 +1314,7 @@ void WheatyExceptionReport::DumpTypeIndex(
} }
else else
{ {
DumpTypeIndex(modBase, innerTypeID, offset + length * index, elementHandled, "", "", false, false); DumpTypeIndex(modBase, innerTypeID, offset + length * index, elementHandled, "", (char*)"", false, false);
if (!elementHandled) if (!elementHandled)
{ {
FormatOutputValue(buffer, basicType, length, (PVOID)(offset + length * index), sizeof(buffer)); FormatOutputValue(buffer, basicType, length, (PVOID)(offset + length * index), sizeof(buffer));
@@ -1414,7 +1414,7 @@ void WheatyExceptionReport::DumpTypeIndex(
DumpTypeIndex(modBase, DumpTypeIndex(modBase,
children.ChildId[i], children.ChildId[i],
dwFinalOffset, bHandled2, ""/*Name */, "", true, true); dwFinalOffset, bHandled2, ""/*Name */, (char*)"", true, true);
// If the child wasn't a UDT, format it appropriately // If the child wasn't a UDT, format it appropriately
if (!bHandled2) if (!bHandled2)