izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Convert remaining Net Fault Handler enum LexToString's to FOREACH_ENUM_* format.

Browse Source 
#rb trivial

#ROBOMERGE-AUTHOR: john.barrett
#ROBOMERGE-SOURCE: CL 20022655 via CL 20022658 via CL 20022684 via CL 20022691 via CL 20022700
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)

[CL 20023088 by john barrett in ue5-main branch]
This commit is contained in:
john barrett
2022-05-03 06:21:04 -04:00
parent 47180fb543
commit 0d282c2e3f
4 changed files with 44 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
Engine/Plugins/Compression/OodleNetwork/Source/Private/OodleNetworkFaultHandler.cpp
View File

@@ -11,32 +11,27 @@
* EOodleNetResult
*/
const TCHAR* LexToString(EOodleNetResult InResult)
#ifndef CASE_ENUM_TO_TEXT_RET
#define CASE_ENUM_TO_TEXT_RET(txt) case txt: ReturnVal = TEXT(#txt); break;
#endif
const TCHAR* LexToString(EOodleNetResult Enum)
{
switch (InResult)
const TCHAR* ReturnVal = TEXT("::Invalid");
switch (Enum)
{
case EOodleNetResult::Unknown:
return TEXT("Unknown");
case EOodleNetResult::Success:
return TEXT("Success");
case EOodleNetResult::OodleDecodeFailed:
return TEXT("OodleDecodeFailed");
case EOodleNetResult::OodleSerializePayloadFail:
return TEXT("OodleSerializePayloadFail");
case EOodleNetResult::OodleBadDecompressedLength:
return TEXT("OodleBadDecompressedLength");
case EOodleNetResult::OodleNoDictionary:
return TEXT("OodleNoDictionary");
default:
return TEXT("Invalid");
FOREACH_ENUM_EOODLENETRESULT(CASE_ENUM_TO_TEXT_RET)
}
while (*ReturnVal != ':')
{
ReturnVal++;
}
ReturnVal += 2;
return ReturnVal;
}
@@ -104,35 +99,3 @@ UE::Net::EHandleNetResult FOodleNetworkFaultHandler::HandleNetResult(UE::Net::FN
return ReturnVal;
}
#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
#include "Misc/AutomationTest.h"
IMPLEMENT_SIMPLE_AUTOMATION_TEST(FOodleNetResultEnumTest, "System.Core.Networking.EOodleNetResult.EnumTest",
EAutomationTestFlags::ApplicationContextMask | EAutomationTestFlags::SmokeFilter);
bool FOodleNetResultEnumTest::RunTest(const FString& Parameters)
{
const UEnum* OodleResultEnum = StaticEnum<EOodleNetResult>();
if (TestTrue(TEXT("EOodleNetResult must exist"), OodleResultEnum != nullptr) && OodleResultEnum != nullptr)
{
const int64 OodleResultEnumLast = OodleResultEnum->GetMaxEnumValue() - 1;
bool bLexMismatch = false;
for (int64 EnumIdx=0; EnumIdx<=OodleResultEnumLast; EnumIdx++)
{
if (OodleResultEnum->GetNameStringByValue(EnumIdx) != LexToString((EOodleNetResult)EnumIdx))
{
bLexMismatch = true;
break;
}
}
TestFalse(TEXT("EOodleNetResult must not be missing LexToString entries"), bLexMismatch);
}
return true;
}
#endif

5
Engine/Plugins/Compression/OodleNetwork/Source/Public/OodleNetworkFaultHandler.h
View File

@@ -5,6 +5,9 @@
// Includes
#include "Net/Core/Connection/NetResultManager.h"
#include "OodleNetworkFaultHandler.generated.h"
// Forward declarations
namespace UE
{
@@ -39,7 +42,7 @@ enum class EOodleNetResult : uint8
DECLARE_NETRESULT_ENUM(EOodleNetResult);
OODLENETWORKHANDLERCOMPONENT_API const TCHAR* LexToString(EOodleNetResult InResult);
OODLENETWORKHANDLERCOMPONENT_API const TCHAR* LexToString(EOodleNetResult Enum);
/**

76
Engine/Plugins/Runtime/PacketHandlers/AESGCMHandlerComponent/Source/Private/AESGCMFaultHandler.cpp
View File

@@ -10,35 +10,27 @@
* EAESGCMNetResult
*/
const TCHAR* LexToString(EAESGCMNetResult InResult)
#ifndef CASE_ENUM_TO_TEXT_RET
#define CASE_ENUM_TO_TEXT_RET(txt) case txt: ReturnVal = TEXT(#txt); break;
#endif
const TCHAR* LexToString(EAESGCMNetResult Enum)
{
switch (InResult)
const TCHAR* ReturnVal = TEXT("::Invalid");
switch (Enum)
{
case EAESGCMNetResult::Unknown:
return TEXT("Unknown");
case EAESGCMNetResult::Success:
return TEXT("Success");
case EAESGCMNetResult::AESMissingIV:
return TEXT("AESMissingIV");
case EAESGCMNetResult::AESMissingAuthTag:
return TEXT("AESMissingAuthTag");
case EAESGCMNetResult::AESMissingPayload:
return TEXT("AESMissingPayload");
case EAESGCMNetResult::AESDecryptionFailed:
return TEXT("AESDecryptionFailed");
case EAESGCMNetResult::AESZeroLastByte:
return TEXT("AESZeroLastByte");
default:
return TEXT("Invalid");
FOREACH_ENUM_EAESGCMNETRESULT(CASE_ENUM_TO_TEXT_RET)
}
while (*ReturnVal != ':')
{
ReturnVal++;
}
ReturnVal += 2;
return ReturnVal;
}
@@ -108,35 +100,3 @@ UE::Net::EHandleNetResult FAESGCMFaultHandler::HandleNetResult(UE::Net::FNetResu
return ReturnVal;
}
#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
#include "Misc/AutomationTest.h"
IMPLEMENT_SIMPLE_AUTOMATION_TEST(FAESGCMNetResultEnumTest, "System.Core.Networking.EAESGCMNetResult.EnumTest",
EAutomationTestFlags::ApplicationContextMask | EAutomationTestFlags::SmokeFilter);
bool FAESGCMNetResultEnumTest::RunTest(const FString& Parameters)
{
const UEnum* AESGCMResultEnum = StaticEnum<EAESGCMNetResult>();
if (TestTrue(TEXT("EAESGCMNetResult must exist"), AESGCMResultEnum != nullptr) && AESGCMResultEnum != nullptr)
{
const int64 AESGCMResultEnumLast = AESGCMResultEnum->GetMaxEnumValue() - 1;
bool bLexMismatch = false;
for (int64 EnumIdx=0; EnumIdx<=AESGCMResultEnumLast; EnumIdx++)
{
if (AESGCMResultEnum->GetNameStringByValue(EnumIdx) != LexToString((EAESGCMNetResult)EnumIdx))
{
bLexMismatch = true;
break;
}
}
TestFalse(TEXT("EAESGCMNetResult must not be missing LexToString entries"), bLexMismatch);
}
return true;
}
#endif

5
Engine/Plugins/Runtime/PacketHandlers/AESGCMHandlerComponent/Source/Public/AESGCMFaultHandler.h
View File

@@ -5,6 +5,9 @@
// Includes
#include "Net/Core/Connection/NetResultManager.h"
#include "AESGCMFaultHandler.generated.h"
// Forward declarations
namespace UE
{
@@ -41,7 +44,7 @@ enum class EAESGCMNetResult : uint8
DECLARE_NETRESULT_ENUM(EAESGCMNetResult);
AESGCMHANDLERCOMPONENT_API const TCHAR* LexToString(EAESGCMNetResult InResult);
AESGCMHANDLERCOMPONENT_API const TCHAR* LexToString(EAESGCMNetResult Enum);