diff --git a/Source/Contents/Emblems/EmblemDataDownloadAsyncWork.cpp b/Source/Contents/Emblems/EmblemDataDownloadAsyncWork.cpp index 7b89ccfe8..8213edb72 100644 --- a/Source/Contents/Emblems/EmblemDataDownloadAsyncWork.cpp +++ b/Source/Contents/Emblems/EmblemDataDownloadAsyncWork.cpp @@ -56,8 +56,7 @@ void CEmblemDataDownloadAsyncWork::Bind( this->m_accountName = accountName; this->m_guildId = guildId; this->m_version = version; - AsyncDiagnostic diagnostic = Diagnostic(false, DecryptName<0x93E7A3A1F587CDC5ULL>({0xB0, 0xA3, 0xEC, 0x9B, 0xD6, 0xCC, 0x89, 0x93}), 57); - this->m_diagnostic.MoveFrom(diagnostic); + this->m_diagnostic = AsyncDiagnostic(false, std::string(DecryptName<0x93E7A3A1F587CDC5ULL>({0xB0, 0xA3, 0xEC, 0x9B, 0xD6, 0xCC, 0x89, 0x93})), sourceFile, 57); } // OFFSET: 0x005EA430 @@ -82,10 +81,10 @@ bool CEmblemDataDownloadAsyncWork::Execute() { this->m_responseCode = static_cast(handler.ResponseCode()); this->m_response = handler.Response(); AsyncDiagnostic diagnostic = Diagnostic(true, DecryptName<0x0F0F8B6B8F9D19D1ULL>({0xB6, 0x76, 0xF2, 0xEB, 0x6B}), 96); - this->m_diagnostic.MoveFrom(diagnostic); + this->m_diagnostic = std::move(diagnostic); } else { AsyncDiagnostic diagnostic = Diagnostic(false, DecryptName<0xD3755DD95F47A909ULL>({0x6F, 0xC8, 0x2E, 0x33, 0xD9}), 105); - this->m_diagnostic.MoveFrom(diagnostic); + this->m_diagnostic = std::move(diagnostic); } return false; diff --git a/Source/Contents/Emblems/EmblemDataUploadAsyncWork.cpp b/Source/Contents/Emblems/EmblemDataUploadAsyncWork.cpp index b042ba190..e1da7e7f3 100644 --- a/Source/Contents/Emblems/EmblemDataUploadAsyncWork.cpp +++ b/Source/Contents/Emblems/EmblemDataUploadAsyncWork.cpp @@ -15,13 +15,6 @@ namespace { constexpr char sourceFile[] = "C:\\repositories\\RagnarokClient\\RagnarokClient\\Contents\\Emblem\\CEmblemDataUploadAsyncWork.cpp"; - // INLINED - __forceinline void Report(AsyncDiagnostic& target, bool success, const char* text, std::uint32_t line) { - std::string message = text; - AsyncDiagnostic diagnostic(&success, &message, sourceFile, &line); - target.MoveFrom(diagnostic); - } - // INLINED template const char* DecryptName(const std::uint8_t (&source)[Length]) { @@ -58,8 +51,7 @@ void CEmblemDataUploadAsyncWork::Bind(std::string url, std::uint32_t accountId, this->m_path = path; constexpr std::array diagnosticSourceArray = CRYPT_NAME("unknwon", 0xC52FB5FBB94FF917ULL); const std::uint8_t (&diagnosticSource)[8] = diagnosticSourceArray._Elems; - AsyncDiagnostic diagnostic(false, std::string(DecryptName<0xC52FB5FBB94FF917ULL>(diagnosticSource)), sourceFile, 54); - this->m_diagnostic.MoveFrom(diagnostic); + this->m_diagnostic = AsyncDiagnostic(false, std::string(DecryptName<0xC52FB5FBB94FF917ULL>(diagnosticSource)), sourceFile, 54); } // OFFSET: 0x005EC7C0 @@ -98,10 +90,10 @@ bool CEmblemDataUploadAsyncWork::Execute() { if (handler.Perform() == 0) { this->m_response = g_curlMgr->FromUtf8(handler.Response()); const std::uint8_t good[] = CRYPT_BYTES(5, "good", 0x31D7C1EDA345E36DULL); - Report(this->m_diagnostic, true, DecryptName<0x31D7C1EDA345E36DULL>(good), 100); + this->m_diagnostic = AsyncDiagnostic(true, std::string(DecryptName<0x31D7C1EDA345E36DULL>(good)), sourceFile, 100); } else { const std::uint8_t fail[] = CRYPT_BYTES(5, "fail", 0xD3755DD95F47A909ULL); - Report(this->m_diagnostic, false, DecryptName<0xD3755DD95F47A909ULL>(fail), 109); + this->m_diagnostic = AsyncDiagnostic(false, std::string(DecryptName<0xD3755DD95F47A909ULL>(fail)), sourceFile, 109); } return false; diff --git a/Source/Contents/Party/ChangePartyMasterAsyncWork.cpp b/Source/Contents/Party/ChangePartyMasterAsyncWork.cpp index 6208d473e..a04761dc1 100644 --- a/Source/Contents/Party/ChangePartyMasterAsyncWork.cpp +++ b/Source/Contents/Party/ChangePartyMasterAsyncWork.cpp @@ -14,19 +14,6 @@ namespace { constexpr char sourceFile[] = "C:\\repositories\\RagnarokClient\\RagnarokClient\\Contents\\AdventurerAgency\\CChangePartyMasterAsyncWork.cpp"; - // INLINED - __forceinline AsyncDiagnostic Diagnostic(bool success, const char* text, std::uint32_t line) { - std::string message = text; - return AsyncDiagnostic(&success, &message, sourceFile, &line); - } - - // INLINED - __forceinline void Report(AsyncDiagnostic& target, bool success, const char* text, std::uint32_t line) { - std::string message = text; - AsyncDiagnostic diagnostic(&success, &message, sourceFile, &line); - target.MoveFrom(diagnostic); - } - // INLINED template const char* DecryptName(const std::uint8_t (&source)[Length]) { @@ -67,8 +54,7 @@ void CChangePartyMasterAsyncWork::Bind( this->m_worldName = worldName; this->m_url = url; this->m_token = token; - AsyncDiagnostic diagnostic = Diagnostic(false, DecryptName<0x17359BF953C367B3ULL>({0xC6, 0x09, 0xA8, 0x3D, 0x8E, 0xF4, 0x5B, 0x17}), 55); - this->m_diagnostic.MoveFrom(diagnostic); + this->m_diagnostic = AsyncDiagnostic(false, std::string(DecryptName<0x17359BF953C367B3ULL>({0xC6, 0x09, 0xA8, 0x3D, 0x8E, 0xF4, 0x5B, 0x17})), sourceFile, 55); } // OFFSET: 0x005CE150 @@ -96,10 +82,10 @@ bool CChangePartyMasterAsyncWork::Execute() { handler.AddField(DecryptName<0x0F0F8B6B8F9D19D1ULL>({0x90, 0x6C, 0xE9, 0xE7, 0x3F, 0xE4, 0x64, 0x6A, 0xBF, 0x19}), this->m_token, 4); if (handler.Perform() != 0) { - Report(this->m_diagnostic, false, DecryptName<0x91651D81F559F971ULL>({0x17, 0x98, 0x30, 0x99, 0x81}), 113); + this->m_diagnostic = AsyncDiagnostic(false, std::string(DecryptName<0x91651D81F559F971ULL>({0x17, 0x98, 0x30, 0x99, 0x81})), sourceFile, 113); } else { this->m_response = CCURLMgr::GetInstance()->FromUtf8(handler.Response()); - Report(this->m_diagnostic, true, DecryptName<0x73D1674B61DF7B0BULL>({0x78, 0x0E, 0xBC, 0x02, 0x2E, 0x14, 0xA2, 0x73}), 122); + this->m_diagnostic = AsyncDiagnostic(true, std::string(DecryptName<0x73D1674B61DF7B0BULL>({0x78, 0x0E, 0xBC, 0x02, 0x2E, 0x14, 0xA2, 0x73})), sourceFile, 122); } return false; diff --git a/Source/Contents/Party/LoadMyPartyAsyncWork.cpp b/Source/Contents/Party/LoadMyPartyAsyncWork.cpp index 6fec35254..ba68ab79d 100644 --- a/Source/Contents/Party/LoadMyPartyAsyncWork.cpp +++ b/Source/Contents/Party/LoadMyPartyAsyncWork.cpp @@ -14,19 +14,6 @@ namespace { constexpr char sourceFile[] = "C:\\repositories\\RagnarokClient\\RagnarokClient\\Contents\\AdventurerAgency\\CLoadMyPartyAsyncWork.cpp"; - // INLINED - __forceinline AsyncDiagnostic Diagnostic(bool success, const char* text, std::uint32_t line) { - std::string message = text; - return AsyncDiagnostic(&success, &message, sourceFile, &line); - } - - // INLINED - __forceinline void Report(AsyncDiagnostic& target, bool success, const char* text, std::uint32_t line) { - std::string message = text; - AsyncDiagnostic diagnostic(&success, &message, sourceFile, &line); - target.MoveFrom(diagnostic); - } - // INLINED template const char* DecryptName(const std::uint8_t (&source)[Length]) { @@ -38,7 +25,7 @@ namespace { // OFFSET: 0x005CF1B0 // FUNCTION: fn_03685 CLoadMyPartyAsyncWork::CLoadMyPartyAsyncWork() - : NAsyncWork("MyParty_Load"), m_accountId(0), m_characterId(0), m_diagnostic(Diagnostic(false, DecryptName<0x2FF3C5036D070127ULL>({0x52, 0x6F, 0x6C, 0x03, 0x74, 0xAA, 0x9D, 0x2F}), 28)) { + : NAsyncWork("MyParty_Load"), m_accountId(0), m_characterId(0), m_diagnostic(false, std::string(DecryptName<0x2FF3C5036D070127ULL>({0x52, 0x6F, 0x6C, 0x03, 0x74, 0xAA, 0x9D, 0x2F})), sourceFile, 28) { } // INLINED @@ -59,8 +46,7 @@ void CLoadMyPartyAsyncWork::Bind(std::uint32_t accountId, std::uint32_t characte this->m_world = world; this->m_url = url; this->m_token = token; - AsyncDiagnostic diagnostic = Diagnostic(false, DecryptName<0x17359BF953C367B3ULL>({0xC6, 0x09, 0xA8, 0x3D, 0x8E, 0xF4, 0x5B, 0x17}), 49); - this->m_diagnostic.MoveFrom(diagnostic); + this->m_diagnostic = AsyncDiagnostic(false, std::string(DecryptName<0x17359BF953C367B3ULL>({0xC6, 0x09, 0xA8, 0x3D, 0x8E, 0xF4, 0x5B, 0x17})), sourceFile, 49); } // OFFSET: 0x005CF9B0 @@ -78,10 +64,10 @@ bool CLoadMyPartyAsyncWork::Execute() { handler.AddField(DecryptName<0x812BE72BCD5707B7ULL>({0xF6, 0x72, 0x23, 0xA5, 0x7F, 0x88, 0x40, 0xE4, 0xD9, 0x07}), this->m_token, 4); if (handler.Perform() != 0) { - Report(this->m_diagnostic, false, DecryptName<0xD3755DD95F47A909ULL>({0x6F, 0xC8, 0x2E, 0x33, 0xD9}), 92); + this->m_diagnostic = AsyncDiagnostic(false, std::string(DecryptName<0xD3755DD95F47A909ULL>({0x6F, 0xC8, 0x2E, 0x33, 0xD9})), sourceFile, 92); } else { this->m_response = CCURLMgr::GetInstance()->FromUtf8(handler.Response()); - Report(this->m_diagnostic, true, DecryptName<0x31D7C1EDA345E36DULL>({0x1E, 0x96, 0x26, 0xC0, 0x88, 0xB2, 0xA4, 0x31}), 101); + this->m_diagnostic = AsyncDiagnostic(true, std::string(DecryptName<0x31D7C1EDA345E36DULL>({0x1E, 0x96, 0x26, 0xC0, 0x88, 0xB2, 0xA4, 0x31})), sourceFile, 101); } return false; diff --git a/Source/Contents/Party/LoadPartyInfoAsyncWork.cpp b/Source/Contents/Party/LoadPartyInfoAsyncWork.cpp index ef5cf9c4e..4f5eca7bb 100644 --- a/Source/Contents/Party/LoadPartyInfoAsyncWork.cpp +++ b/Source/Contents/Party/LoadPartyInfoAsyncWork.cpp @@ -14,12 +14,6 @@ namespace { constexpr char sourceFile[] = "C:\\repositories\\RagnarokClient\\RagnarokClient\\Contents\\AdventurerAgency\\CLoadPartyInfoAsyncWork.cpp"; - // INLINED - __forceinline AsyncDiagnostic Diagnostic(bool success, const char* text, std::uint32_t line) { - std::string message = text; - return AsyncDiagnostic(&success, &message, sourceFile, &line); - } - // INLINED template const char* DecryptName(const std::uint8_t (&source)[Length]) { @@ -55,8 +49,7 @@ void CLoadPartyInfoAsyncWork::Bind( this->m_url = url; this->m_token = token; this->m_queryAccountId = queryAccountId; - AsyncDiagnostic diagnostic = Diagnostic(false, DecryptName<0x17359BF953C367B3ULL>({0xC6, 0x09, 0xA8, 0x3D, 0x8E, 0xF4, 0x5B, 0x17}), 52); - this->m_diagnostic.MoveFrom(diagnostic); + this->m_diagnostic = AsyncDiagnostic(false, std::string(DecryptName<0x17359BF953C367B3ULL>({0xC6, 0x09, 0xA8, 0x3D, 0x8E, 0xF4, 0x5B, 0x17})), sourceFile, 52); } // OFFSET: 0x005D0C80 @@ -78,8 +71,7 @@ bool CLoadPartyInfoAsyncWork::Execute() { if (handler.Perform() == 0) { this->m_response = CCURLMgr::GetInstance()->FromUtf8(handler.Response()); - AsyncDiagnostic diagnostic = Diagnostic(true, DecryptName<0x31D7C1EDA345E36DULL>({0x1E, 0x96, 0x26, 0xC0, 0x88, 0xB2, 0xA4, 0x31}), 97); - this->m_diagnostic.MoveFrom(diagnostic); + this->m_diagnostic = AsyncDiagnostic(true, std::string(DecryptName<0x31D7C1EDA345E36DULL>({0x1E, 0x96, 0x26, 0xC0, 0x88, 0xB2, 0xA4, 0x31})), sourceFile, 97); } return false; diff --git a/Source/Contents/Party/LoadPartyListAsyncWork.cpp b/Source/Contents/Party/LoadPartyListAsyncWork.cpp index 7ebc29260..8215902f5 100644 --- a/Source/Contents/Party/LoadPartyListAsyncWork.cpp +++ b/Source/Contents/Party/LoadPartyListAsyncWork.cpp @@ -62,8 +62,7 @@ void CLoadPartyListAsyncWork::Bind( this->m_search = search; constexpr std::array diagnosticSourceArray = CRYPT_NAME("unknwon", 0x936F3D2FFDFD87F5ULL); const std::uint8_t (&diagnosticSource)[8] = diagnosticSourceArray._Elems; - AsyncDiagnostic diagnostic = Diagnostic(false, DecryptName<0x936F3D2FFDFD87F5ULL>(diagnosticSource), 54); - this->m_diagnostic.MoveFrom(diagnostic); + this->m_diagnostic = AsyncDiagnostic(false, std::string(DecryptName<0x936F3D2FFDFD87F5ULL>(diagnosticSource)), sourceFile, 54); this->m_windows = &windows; } @@ -154,7 +153,7 @@ bool CLoadPartyListAsyncWork::Execute() { this->m_response = CCURLMgr::GetInstance()->FromUtf8(handler.Response()); const std::uint8_t success[] = CRYPT_BYTES(8, "success", 0x5B832361BDA77197ULL); AsyncDiagnostic diagnostic = Diagnostic(true, DecryptName<0x5B832361BDA77197ULL>(success), 138); - this->m_diagnostic.MoveFrom(diagnostic); + this->m_diagnostic = std::move(diagnostic); } return false; diff --git a/Source/Contents/Party/RegisterPartyAsyncWork.cpp b/Source/Contents/Party/RegisterPartyAsyncWork.cpp index 1558f445e..a555869dc 100644 --- a/Source/Contents/Party/RegisterPartyAsyncWork.cpp +++ b/Source/Contents/Party/RegisterPartyAsyncWork.cpp @@ -54,8 +54,7 @@ void CRegisterPartyAsyncWork::Bind( this->m_info = info; constexpr std::array diagnosticSourceArray = CRYPT_NAME("unknwon", 0x936F3D2FFDFD87F5ULL); const std::uint8_t (&diagnosticSource)[8] = diagnosticSourceArray._Elems; - AsyncDiagnostic diagnostic(false, std::string(DecryptName<0x936F3D2FFDFD87F5ULL>(diagnosticSource)), sourceFile, 50); - this->m_diagnostic.MoveFrom(diagnostic); + this->m_diagnostic = AsyncDiagnostic(false, std::string(DecryptName<0x936F3D2FFDFD87F5ULL>(diagnosticSource)), sourceFile, 50); } // OFFSET: 0x005D3F50 @@ -102,12 +101,10 @@ bool CRegisterPartyAsyncWork::Execute() { handler.AddField(DecryptName<0xFFBF43D1FFD5FF49ULL>({0x04, 0x9A, 0xB8, 0x90, 0xD1}), memo, 4); if (handler.Perform() != 0) { - AsyncDiagnostic diagnostic(false, std::string(DecryptName<0xEB3D4FAB0FC183DBULL>({0xBD, 0xE2, 0xA8, 0x63, 0xAB})), sourceFile, 118); - this->m_diagnostic.MoveFrom(diagnostic); + this->m_diagnostic = AsyncDiagnostic(false, std::string(DecryptName<0xEB3D4FAB0FC183DBULL>({0xBD, 0xE2, 0xA8, 0x63, 0xAB})), sourceFile, 118); } else { this->m_response = CCURLMgr::GetInstance()->FromUtf8(handler.Response()); - AsyncDiagnostic diagnostic(true, std::string(DecryptName<0x8F3F2FA959977F9FULL>({0xEC, 0x0A, 0xF4, 0x3A, 0xCC, 0x5C, 0x4C, 0x8F})), sourceFile, 127); - this->m_diagnostic.MoveFrom(diagnostic); + this->m_diagnostic = AsyncDiagnostic(true, std::string(DecryptName<0x8F3F2FA959977F9FULL>({0xEC, 0x0A, 0xF4, 0x3A, 0xCC, 0x5C, 0x4C, 0x8F})), sourceFile, 127); } return false; diff --git a/Source/Contents/Party/StopRecruitingAsyncWork.cpp b/Source/Contents/Party/StopRecruitingAsyncWork.cpp index 9d1189df1..e85f5c1f8 100644 --- a/Source/Contents/Party/StopRecruitingAsyncWork.cpp +++ b/Source/Contents/Party/StopRecruitingAsyncWork.cpp @@ -14,19 +14,6 @@ namespace { constexpr char sourceFile[] = "C:\\repositories\\RagnarokClient\\RagnarokClient\\Contents\\AdventurerAgency\\CStopRecruitingAsyncWork.cpp"; - // INLINED - __forceinline AsyncDiagnostic Diagnostic(bool success, const char* text, std::uint32_t line) { - std::string message = text; - return AsyncDiagnostic(&success, &message, sourceFile, &line); - } - - // INLINED - __forceinline void Report(AsyncDiagnostic& target, bool success, const char* text, std::uint32_t line) { - std::string message = text; - AsyncDiagnostic diagnostic(&success, &message, sourceFile, &line); - target.MoveFrom(diagnostic); - } - // INLINED template const char* DecryptName(const std::uint8_t (&source)[Length]) { @@ -60,8 +47,7 @@ void CStopRecruitingAsyncWork::Bind(std::uint32_t accountId, std::string world, this->m_world = world; this->m_url = url; this->m_token = token; - AsyncDiagnostic diagnostic = Diagnostic(false, DecryptName<0xF14F79170939C7F1ULL>({0x84, 0xA9, 0x52, 0x67, 0x60, 0x16, 0x21, 0xF1}), 50); - this->m_diagnostic.MoveFrom(diagnostic); + this->m_diagnostic = AsyncDiagnostic(false, std::string(DecryptName<0xF14F79170939C7F1ULL>({0x84, 0xA9, 0x52, 0x67, 0x60, 0x16, 0x21, 0xF1})), sourceFile, 50); } // OFFSET: 0x005D6570 @@ -79,10 +65,10 @@ bool CStopRecruitingAsyncWork::Execute() { handler.AddField(DecryptName<0x83EFBFBB37EDBDBDULL>({0xF0, 0xDC, 0x9E, 0x43, 0xDE, 0xCD, 0xAE, 0xCA, 0xF9, 0xBD}), master, 4); if (handler.Perform() != 0) { - Report(this->m_diagnostic, false, DecryptName<0x39FF7FB50DEB998FULL>({0xE9, 0xF8, 0x82, 0x61, 0xB5}), 92); + this->m_diagnostic = AsyncDiagnostic(false, std::string(DecryptName<0x39FF7FB50DEB998FULL>({0xE9, 0xF8, 0x82, 0x61, 0xB5})), sourceFile, 92); } else { this->m_response = CCURLMgr::GetInstance()->FromUtf8(handler.Response()); - Report(this->m_diagnostic, true, DecryptName<0x2FE993D1DDE1F197ULL>({0xE4, 0x84, 0x82, 0xBE, 0xB4, 0xE0, 0x9A, 0x2F}), 101); + this->m_diagnostic = AsyncDiagnostic(true, std::string(DecryptName<0x2FE993D1DDE1F197ULL>({0xE4, 0x84, 0x82, 0xBE, 0xB4, 0xE0, 0x9A, 0x2F})), sourceFile, 101); } return false; diff --git a/Source/Contents/Store/MCStoreInfoBackupAsyncWork.cpp b/Source/Contents/Store/MCStoreInfoBackupAsyncWork.cpp index d11f0679a..5f509c03f 100644 --- a/Source/Contents/Store/MCStoreInfoBackupAsyncWork.cpp +++ b/Source/Contents/Store/MCStoreInfoBackupAsyncWork.cpp @@ -71,8 +71,7 @@ void CMCStoreInfoBackupLoadAsyncWork::Bind( this->m_response = ""; constexpr std::array diagnosticSourceArray = CRYPT_NAME("unknwon", 0xD3E5516F89F161D1ULL); const std::uint8_t (&diagnosticSource)[8] = diagnosticSourceArray._Elems; - AsyncDiagnostic diagnostic(false, std::string(DecryptName<0xD3E5516F89F161D1ULL>(diagnosticSource)), loadSource, 55); - this->m_diagnostic.MoveFrom(diagnostic); + this->m_diagnostic = AsyncDiagnostic(false, std::string(DecryptName<0xD3E5516F89F161D1ULL>(diagnosticSource)), loadSource, 55); this->m_type = type; } @@ -103,7 +102,7 @@ bool CMCStoreInfoBackupLoadAsyncWork::Execute() { this->m_response = handler.Response(); constexpr std::array good = CRYPT_NAME("good", 0x6B3301E1A3079125ULL); AsyncDiagnostic diagnostic = Diagnostic(true, DecryptName<0x6B3301E1A3079125ULL>(good), loadSource, 115); - this->m_diagnostic.MoveFrom(diagnostic); + this->m_diagnostic = std::move(diagnostic); } return false; @@ -145,8 +144,7 @@ void CMCStoreInfoBackupSaveAsyncWork::Bind( this->m_data = data; constexpr std::array diagnosticSourceArray = CRYPT_NAME("unknwon", 0x490FFB43A12F0DB9ULL); const std::uint8_t (&diagnosticSource)[8] = diagnosticSourceArray._Elems; - AsyncDiagnostic diagnostic(false, std::string(DecryptName<0x490FFB43A12F0DB9ULL>(diagnosticSource)), saveSource, 57); - this->m_diagnostic.MoveFrom(diagnostic); + this->m_diagnostic = AsyncDiagnostic(false, std::string(DecryptName<0x490FFB43A12F0DB9ULL>(diagnosticSource)), saveSource, 57); this->m_type = type; } @@ -177,13 +175,11 @@ bool CMCStoreInfoBackupSaveAsyncWork::Execute() { if (handler.Perform() != 0) { constexpr std::array fail = CRYPT_NAME("fail", 0x59278F63D79F3DA1ULL); - AsyncDiagnostic diagnostic = Diagnostic(false, DecryptName<0x59278F63D79F3DA1ULL>(fail), saveSource, 112); - this->m_diagnostic.MoveFrom(diagnostic); + this->m_diagnostic = AsyncDiagnostic(false, std::string(DecryptName<0x59278F63D79F3DA1ULL>(fail)), saveSource, 112); this->m_response = handler.Response(); } else { constexpr std::array good = CRYPT_NAME("good", 0x812BE72BCD5707B7ULL); - AsyncDiagnostic diagnostic = Diagnostic(true, DecryptName<0x812BE72BCD5707B7ULL>(good), saveSource, 122); - this->m_diagnostic.MoveFrom(diagnostic); + this->m_diagnostic = AsyncDiagnostic(true, std::string(DecryptName<0x812BE72BCD5707B7ULL>(good)), saveSource, 122); this->m_response = handler.Response(); } diff --git a/Source/Contents/UserData/AccountLinkedUserDataLoadAsyncWork.cpp b/Source/Contents/UserData/AccountLinkedUserDataLoadAsyncWork.cpp index aca929cf2..1217d9483 100644 --- a/Source/Contents/UserData/AccountLinkedUserDataLoadAsyncWork.cpp +++ b/Source/Contents/UserData/AccountLinkedUserDataLoadAsyncWork.cpp @@ -66,8 +66,7 @@ void CAccountLinkedUserDataLoadAsyncWork::Bind(std::uint32_t accountId, std::str constexpr std::array diagnosticSourceArray = CRYPT_NAME("unknwon", 0x812BE72BCD5707B7ULL); const std::uint8_t (&diagnosticSource)[8] = diagnosticSourceArray._Elems; - AsyncDiagnostic diagnostic = Diagnostic(false, DecryptName<0x812BE72BCD5707B7ULL>(diagnosticSource), 50); - this->m_diagnostic.MoveFrom(diagnostic); + this->m_diagnostic = AsyncDiagnostic(false, std::string(DecryptName<0x812BE72BCD5707B7ULL>(diagnosticSource)), sourceFile, 50); } // OFFSET: 0x005BA910 @@ -87,7 +86,7 @@ bool CAccountLinkedUserDataLoadAsyncWork::Execute() { this->m_response = handler.Response(); constexpr std::array good = CRYPT_NAME("good", 0x2FF3C5036D070127ULL); AsyncDiagnostic diagnostic = Diagnostic(true, DecryptName<0x2FF3C5036D070127ULL>(good), 92); - this->m_diagnostic.MoveFrom(diagnostic); + this->m_diagnostic = std::move(diagnostic); } return false; diff --git a/Source/Contents/UserData/AccountLinkedUserDataSaveAsyncWork.cpp b/Source/Contents/UserData/AccountLinkedUserDataSaveAsyncWork.cpp index b0e9d9f88..483a2bbdd 100644 --- a/Source/Contents/UserData/AccountLinkedUserDataSaveAsyncWork.cpp +++ b/Source/Contents/UserData/AccountLinkedUserDataSaveAsyncWork.cpp @@ -17,19 +17,6 @@ namespace { "\\repositories\\RagnarokClient\\RagnarokClient\\Contents\\AccountLinkedUserData\\CAcco" "untLinkedUserDataSaveAsyncWork.cpp"; - // INLINED - __forceinline AsyncDiagnostic Diagnostic(bool success, const char* text, std::uint32_t line) { - std::string message = text; - return AsyncDiagnostic(&success, &message, sourceFile, &line); - } - - // INLINED - __forceinline void Report(AsyncDiagnostic& target, bool success, const char* text, std::uint32_t line) { - std::string message = text; - AsyncDiagnostic diagnostic(&success, &message, sourceFile, &line); - target.MoveFrom(diagnostic); - } - // INLINED template const char* DecryptName(const std::uint8_t (&source)[Length]) { @@ -65,8 +52,7 @@ void CAccountLinkedUserDataSaveAsyncWork::Bind(std::uint32_t accountId, std::str this->m_data = data; constexpr std::array diagnosticSourceArray = CRYPT_NAME("unknwon", 0x812BE72BCD5707B7ULL); const std::uint8_t (&diagnosticSource)[8] = diagnosticSourceArray._Elems; - AsyncDiagnostic diagnostic = Diagnostic(false, DecryptName<0x812BE72BCD5707B7ULL>(diagnosticSource), 54); - this->m_diagnostic.MoveFrom(diagnostic); + this->m_diagnostic = AsyncDiagnostic(false, std::string(DecryptName<0x812BE72BCD5707B7ULL>(diagnosticSource)), sourceFile, 54); } // OFFSET: 0x005BE210 @@ -90,10 +76,10 @@ bool CAccountLinkedUserDataSaveAsyncWork::Execute() { if (handler.Perform() != 0) { constexpr std::array errorArray = CRYPT_NAME("fail", 0x91651D81F559F971ULL); const std::uint8_t (&error)[5] = errorArray._Elems; - Report(this->m_diagnostic, false, DecryptName<0x91651D81F559F971ULL>(error), 102); + this->m_diagnostic = AsyncDiagnostic(false, std::string(DecryptName<0x91651D81F559F971ULL>(error)), sourceFile, 102); } else { const std::uint8_t good[] = CRYPT_BYTES(5, "good", 0x73D1674B61DF7B0BULL); - Report(this->m_diagnostic, true, DecryptName<0x73D1674B61DF7B0BULL>(good), 106); + this->m_diagnostic = AsyncDiagnostic(true, std::string(DecryptName<0x73D1674B61DF7B0BULL>(good)), sourceFile, 106); } return false; diff --git a/Source/Contents/UserData/CharacterLinkedUserDataLoadAsyncWork.cpp b/Source/Contents/UserData/CharacterLinkedUserDataLoadAsyncWork.cpp index f6a4cb28e..ae2153bed 100644 --- a/Source/Contents/UserData/CharacterLinkedUserDataLoadAsyncWork.cpp +++ b/Source/Contents/UserData/CharacterLinkedUserDataLoadAsyncWork.cpp @@ -16,12 +16,6 @@ namespace { "\\repositories\\RagnarokClient\\RagnarokClient\\Contents\\CharacterLinkedUserData\\CCh" "aracterLinkedUserDataLoadAsyncWork.cpp"; - // INLINED - __forceinline AsyncDiagnostic Diagnostic(bool success, const char* text, std::uint32_t line) { - std::string message = text; - return AsyncDiagnostic(&success, &message, sourceFile, &line); - } - // INLINED template const char* DecryptName(const std::uint8_t (&source)[Length]) { @@ -59,8 +53,7 @@ void CCharacterLinkedUserDataLoadAsyncWork::Bind( this->m_token = token; this->m_response = ""; - AsyncDiagnostic diagnostic = Diagnostic(false, DecryptName<0x2FF3C5036D070127ULL>({0x52, 0x6F, 0x6C, 0x03, 0x74, 0xAA, 0x9D, 0x2F}), 55); - this->m_diagnostic.MoveFrom(diagnostic); + this->m_diagnostic = AsyncDiagnostic(false, std::string(DecryptName<0x2FF3C5036D070127ULL>({0x52, 0x6F, 0x6C, 0x03, 0x74, 0xAA, 0x9D, 0x2F})), sourceFile, 55); } // OFFSET: 0x005E5280 @@ -80,8 +73,7 @@ bool CCharacterLinkedUserDataLoadAsyncWork::Execute() { if (handler.Perform() == 0) { this->m_response = CCURLMgr::GetInstance()->FromUtf8(handler.Response()); - AsyncDiagnostic diagnostic = Diagnostic(true, DecryptName<0x31D7C1EDA345E36DULL>({0x0A, 0x8C, 0x2A, 0xC7, 0xED}), 103); - this->m_diagnostic.MoveFrom(diagnostic); + this->m_diagnostic = AsyncDiagnostic(true, std::string(DecryptName<0x31D7C1EDA345E36DULL>({0x0A, 0x8C, 0x2A, 0xC7, 0xED})), sourceFile, 103); } return false; diff --git a/Source/Contents/UserData/CharacterLinkedUserDataSaveAsyncWork.cpp b/Source/Contents/UserData/CharacterLinkedUserDataSaveAsyncWork.cpp index bfb894432..499e2c1f0 100644 --- a/Source/Contents/UserData/CharacterLinkedUserDataSaveAsyncWork.cpp +++ b/Source/Contents/UserData/CharacterLinkedUserDataSaveAsyncWork.cpp @@ -16,19 +16,6 @@ namespace { "\\repositories\\RagnarokClient\\RagnarokClient\\Contents\\CharacterLinkedUserData\\CCh" "aracterLinkedUserDataSaveAsyncWork.cpp"; - // INLINED - __forceinline AsyncDiagnostic Diagnostic(bool success, const char* text, std::uint32_t line) { - std::string message = text; - return AsyncDiagnostic(&success, &message, sourceFile, &line); - } - - // INLINED - __forceinline void Report(AsyncDiagnostic& target, bool success, const char* text, std::uint32_t line) { - std::string message = text; - AsyncDiagnostic diagnostic(&success, &message, sourceFile, &line); - target.MoveFrom(diagnostic); - } - // INLINED template const char* DecryptName(const std::uint8_t (&source)[Length]) { @@ -65,8 +52,7 @@ void CCharacterLinkedUserDataSaveAsyncWork::Bind( this->m_url = url; this->m_token = token; this->m_data = data; - AsyncDiagnostic diagnostic = Diagnostic(false, DecryptName<0x93E7A3A1F587CDC5ULL>({0xB0, 0xA3, 0xEC, 0x9B, 0xD6, 0xCC, 0x89, 0x93}), 54); - this->m_diagnostic.MoveFrom(diagnostic); + this->m_diagnostic = AsyncDiagnostic(false, std::string(DecryptName<0x93E7A3A1F587CDC5ULL>({0xB0, 0xA3, 0xEC, 0x9B, 0xD6, 0xCC, 0x89, 0x93})), sourceFile, 54); } // OFFSET: 0x005E8390 @@ -86,9 +72,9 @@ bool CCharacterLinkedUserDataSaveAsyncWork::Execute() { handler.AddField(DecryptName<0xD98F03A52D35636DULL>({0x09, 0x02, 0x41, 0x4C, 0xA5}), data, 4); if (handler.Perform() != 0) { - Report(this->m_diagnostic, false, DecryptName<0x0F0F8B6B8F9D19D1ULL>({0xB7, 0x78, 0xF4, 0xE3, 0x6B}), 98); + this->m_diagnostic = AsyncDiagnostic(false, std::string(DecryptName<0x0F0F8B6B8F9D19D1ULL>({0xB7, 0x78, 0xF4, 0xE3, 0x6B})), sourceFile, 98); } else { - Report(this->m_diagnostic, true, DecryptName<0xD3755DD95F47A909ULL>({0x6E, 0xC6, 0x28, 0x3B, 0xD9}), 102); + this->m_diagnostic = AsyncDiagnostic(true, std::string(DecryptName<0xD3755DD95F47A909ULL>({0x6E, 0xC6, 0x28, 0x3B, 0xD9})), sourceFile, 102); } return false; diff --git a/Source/Utility/Async/AsyncDiagnostic.cpp b/Source/Utility/Async/AsyncDiagnostic.cpp index 55278d8c1..482148939 100644 --- a/Source/Utility/Async/AsyncDiagnostic.cpp +++ b/Source/Utility/Async/AsyncDiagnostic.cpp @@ -10,7 +10,7 @@ AsyncDiagnostic::AsyncDiagnostic(const bool* success, std::string* message, cons // OFFSET: 0x005B9D90 // FUNCTION: fn_03439 -AsyncDiagnostic& AsyncDiagnostic::MoveFrom(AsyncDiagnostic& other) noexcept { +AsyncDiagnostic& AsyncDiagnostic::operator=(AsyncDiagnostic&& other) noexcept { this->success = other.success; this->message = std::move(other.message); this->file = std::move(other.file); diff --git a/Source/Utility/Async/AsyncDiagnostic.h b/Source/Utility/Async/AsyncDiagnostic.h index 1b00ff9d7..2a088e7c8 100644 --- a/Source/Utility/Async/AsyncDiagnostic.h +++ b/Source/Utility/Async/AsyncDiagnostic.h @@ -11,8 +11,9 @@ struct AsyncDiagnostic { __forceinline AsyncDiagnostic(const bool& success, std::string&& message, const char* file, const std::uint32_t& line) : AsyncDiagnostic(&success, &message, file, &line) { } + AsyncDiagnostic(const AsyncDiagnostic& other) = default; ~AsyncDiagnostic(); - AsyncDiagnostic& MoveFrom(AsyncDiagnostic& other) noexcept; + AsyncDiagnostic& operator=(AsyncDiagnostic&& other) noexcept; /* 0000 */ std::uint32_t line; /* 0004 */ std::string file;