From 968a6dcdfca807779a45ab7b27bb2fb75abba776 Mon Sep 17 00:00:00 2001 From: ragnarok-clanker Date: Wed, 28 Oct 2026 22:45:59 +0000 Subject: [PATCH] Decompile fn_18191 (ResourceMgr::ClearExpired) Batch #1832 by ragnarok-clanker: 0 byte-identical, 1 confirmed by peer review. - fn_18191 ResourceMgr::ClearExpired: logic confirmed by peer review Peer-reviewed-by: Yommy Reviewed-by: ragnarok-clanker --- Source/Resource/ResourceMgr.cpp | 39 ++++++++++++++++++++++++++------- Source/Resource/ResourceMgr.h | 4 +++- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/Source/Resource/ResourceMgr.cpp b/Source/Resource/ResourceMgr.cpp index b85c372..93eaaaf 100644 --- a/Source/Resource/ResourceMgr.cpp +++ b/Source/Resource/ResourceMgr.cpp @@ -1,6 +1,8 @@ #include "File/ResourcePath.h" #include "Resource/ResourceFailures.h" #include "Resource/ResourceMgr.h" +#include "Utility/Text/FormatString.h" +#include "Utility/Text/GroupedInteger.h" #include "Utility/Threading/NSyncObject.h" #include @@ -10,6 +12,29 @@ #include #include +// GLOBAL: gl_24581 +unsigned g_resourceReuseDelay = 15000; + +// GLOBAL: gl_24718 +unsigned char g_lowercaseTable[256] = { + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, + 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, + 0x40, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, + 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F, + 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, + 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F, + 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, + 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F, + 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, + 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF, + 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, + 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF, + 0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, + 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, +}; + // OFFSET: 0x00AECEE0 bool ResourceNameLess::operator()(const ResourceName* left, const ResourceName* right) const { if (left->hash != right->hash) { @@ -123,15 +148,13 @@ bool ResourceMgr::Exists(const char* name) { __forceinline CRes* ResourceMgr::LoadNamed(const char* name) { std::optional lock(std::in_place, &this->m_lock); char normalized[260] = {}; - _snprintf_s(normalized, sizeof(normalized), _TRUNCATE, "%s", name); + StringFormat(normalized, sizeof(normalized), _TRUNCATE, "%s", name); - for (unsigned char* byte = reinterpret_cast(normalized); *byte; ++byte) { - if (*byte >= 'A' && *byte <= 'Z') { - *byte += 'a' - 'A'; - } + for (char* c = normalized; *c; ++c) { + *c = g_lowercaseTable[static_cast(*c)]; } - const char* dot = std::strrchr(normalized, '.'); + const char* dot = ReverseFindChar(normalized, '.'); const int type = this->FindType(dot ? dot + 1 : nullptr); if (type < 0) { return nullptr; @@ -273,8 +296,8 @@ void ResourceMgr::ClearUnused() { // OFFSET: 0x00AF0910 // FUNCTION: fn_18191 -void ResourceMgr::ClearExpired(const unsigned& reuseDelay) { - const unsigned threshold = timeGetTime() - reuseDelay; +void ResourceMgr::ClearExpired() { + const unsigned threshold = timeGetTime() - g_resourceReuseDelay; for (auto& resources : this->m_resources) { for (auto entry = resources.begin(); entry != resources.end();) { diff --git a/Source/Resource/ResourceMgr.h b/Source/Resource/ResourceMgr.h index c3c007b..2854099 100644 --- a/Source/Resource/ResourceMgr.h +++ b/Source/Resource/ResourceMgr.h @@ -30,7 +30,7 @@ public: void UnloadAll(); void ClearUnused(const char* extension); void ClearUnused(); - void ClearExpired(const unsigned& reuseDelay); + void ClearExpired(); void UpdateTransient(); ResourceAliases aliases; @@ -48,4 +48,6 @@ private: ResourceMgr& operator=(const ResourceMgr&) = delete; }; +extern unsigned g_resourceReuseDelay; + #endif