From 1dccbfbae50e665347276a6219cf82d7081984a3 Mon Sep 17 00:00:00 2001 From: ragnarok-clanker Date: Mon, 26 Oct 2026 18:25:54 +0000 Subject: [PATCH] Maintenance: Annotate globals on their definitions only; drop annotations from header externs Batch #904 by ragnarok-clanker: no function's compiled code changes; checked with 3 compiled unit(s), including every includer of Source/Contents/MessageTable.h, Source/Contents/Async/AsyncWorkMgr.h, Source/Contents/Emblems/EmblemDataMgr.h, Source/Contents/Hotkeys/UserHotkeyMgr.h, Source/Contents/Messenger/WhisperBlockMgr.h, Source/Contents/Party/AdventurerAgencyMgr.h, Source/Contents/UserData/AccountLinkedUserDataMgr.h, Source/Contents/UserData/CharacterLinkedUserDataMgr.h, Source/Network/TextEncoding.h, Source/Network/Http/CURLMgr.h, Source/Render/Textures/Texture.h, Source/UI/Layout/SnapMgr.h, Source/UI/Party/UIRequestJoinPartyMgr.h, Source/UI/Window/FrameFocus.h, Source/UI/Window/UIWindow.h, Source/Utility/Async/NMessageMgr.h. --- Source/Contents/Async/AsyncWorkMgr.h | 2 -- Source/Contents/Emblems/EmblemDataMgr.h | 2 -- Source/Contents/Hotkeys/UserHotkeyMgr.h | 2 -- Source/Contents/MessageTable.h | 2 -- Source/Contents/Messenger/WhisperBlockMgr.h | 2 -- Source/Contents/Party/AdventurerAgencyMgr.h | 2 -- Source/Contents/UserData/AccountLinkedUserDataMgr.h | 2 -- Source/Contents/UserData/CharacterLinkedUserDataMgr.h | 2 -- Source/Network/Connection/ConnectionRuntime.cpp | 5 ++++- Source/Network/Http/CURLMgr.h | 2 -- Source/Network/TextEncoding.h | 2 -- Source/Render/Textures/Texture.h | 2 -- Source/UI/Layout/SnapMgr.h | 4 ---- Source/UI/Party/UIRequestJoinPartyMgr.h | 2 -- Source/UI/Window/FrameFocus.h | 2 -- Source/UI/Window/UIWindow.h | 2 -- Source/Utility/Async/NMessageMgr.h | 2 -- 17 files changed, 4 insertions(+), 35 deletions(-) diff --git a/Source/Contents/Async/AsyncWorkMgr.h b/Source/Contents/Async/AsyncWorkMgr.h index 01451cb1..b03b3790 100644 --- a/Source/Contents/Async/AsyncWorkMgr.h +++ b/Source/Contents/Async/AsyncWorkMgr.h @@ -73,8 +73,6 @@ private: /* 0024 */ CAsyncWorkRecycleObjectPoolMgr* m_pools; }; -// STATIC: 0x0138968C -// GLOBAL: gl_24349 extern CAsyncWorkMgr* g_asyncWorkMgr; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/Contents/Emblems/EmblemDataMgr.h b/Source/Contents/Emblems/EmblemDataMgr.h index baa0c958..404c9897 100644 --- a/Source/Contents/Emblems/EmblemDataMgr.h +++ b/Source/Contents/Emblems/EmblemDataMgr.h @@ -34,8 +34,6 @@ protected: /* 0038 */ bool m_uploading; }; -// STATIC: 0x013898D4 -// GLOBAL: gl_24355 extern CEmblemDataMgr* g_emblemDataMgr; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/Contents/Hotkeys/UserHotkeyMgr.h b/Source/Contents/Hotkeys/UserHotkeyMgr.h index 9ede92b4..c663cb1e 100644 --- a/Source/Contents/Hotkeys/UserHotkeyMgr.h +++ b/Source/Contents/Hotkeys/UserHotkeyMgr.h @@ -36,8 +36,6 @@ protected: /* 0010 */ std::list m_original; }; -// STATIC: 0x013898E4 -// GLOBAL: gl_24356 extern CUserHotkeyMgr* g_userHotkeyMgr; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/Contents/MessageTable.h b/Source/Contents/MessageTable.h index bf887d78..63ebb6df 100644 --- a/Source/Contents/MessageTable.h +++ b/Source/Contents/MessageTable.h @@ -10,8 +10,6 @@ enum MessageId : int { MSI_FAILED_ADD_TAB = 1578 }; -// STATIC: 0x016D5780 -// GLOBAL: gl_24382 extern std::unordered_map g_messageStrings; const char* LookupMessage(int id, bool languagePrefix, int serviceType, WORD language); diff --git a/Source/Contents/Messenger/WhisperBlockMgr.h b/Source/Contents/Messenger/WhisperBlockMgr.h index d53961de..4a907893 100644 --- a/Source/Contents/Messenger/WhisperBlockMgr.h +++ b/Source/Contents/Messenger/WhisperBlockMgr.h @@ -28,8 +28,6 @@ protected: /* 0018 */ std::set m_names; }; -// STATIC: 0x01389940 -// GLOBAL: gl_24357 extern CWhisperBlockMgr* g_whisperBlockMgr; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/Contents/Party/AdventurerAgencyMgr.h b/Source/Contents/Party/AdventurerAgencyMgr.h index ce7d719e..a8ade6a8 100644 --- a/Source/Contents/Party/AdventurerAgencyMgr.h +++ b/Source/Contents/Party/AdventurerAgencyMgr.h @@ -47,8 +47,6 @@ private: static std::uint32_t Id(double value); }; -// STATIC: 0x01389848 -// GLOBAL: gl_24352 extern CAdventurerAgencyMgr* g_adventurerAgencyMgr; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/Contents/UserData/AccountLinkedUserDataMgr.h b/Source/Contents/UserData/AccountLinkedUserDataMgr.h index 5a1f5cb1..490fb466 100644 --- a/Source/Contents/UserData/AccountLinkedUserDataMgr.h +++ b/Source/Contents/UserData/AccountLinkedUserDataMgr.h @@ -43,8 +43,6 @@ protected: /* 0044 */ std::string m_loadUrl; }; -// STATIC: 0x01389760 -// GLOBAL: gl_24351 extern CAccountLinkedUserDataMgr* g_accountLinkedUserDataMgr; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/Contents/UserData/CharacterLinkedUserDataMgr.h b/Source/Contents/UserData/CharacterLinkedUserDataMgr.h index ae9af9de..a9ace729 100644 --- a/Source/Contents/UserData/CharacterLinkedUserDataMgr.h +++ b/Source/Contents/UserData/CharacterLinkedUserDataMgr.h @@ -40,8 +40,6 @@ protected: /* 0048 */ std::string m_loadUrl; }; -// STATIC: 0x013898BC -// GLOBAL: gl_24353 extern CCharacterLinkedUserDataMgr* g_characterLinkedUserDataMgr; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/Network/Connection/ConnectionRuntime.cpp b/Source/Network/Connection/ConnectionRuntime.cpp index f9c377b3..bc85a21f 100644 --- a/Source/Network/Connection/ConnectionRuntime.cpp +++ b/Source/Network/Connection/ConnectionRuntime.cpp @@ -8,8 +8,11 @@ namespace { HMODULE module; } // STATIC: 0x016FDC8C -// STATIC: 0x016FDC90 +// GLOBAL: gl_24391 int(WSAAPI* g_connectionSend)(SOCKET, const char*, int, int); + +// STATIC: 0x016FDC90 +// GLOBAL: gl_24392 int(WSAAPI* g_connectionReceive)(SOCKET, char*, int, int); // OFFSET: 0x00C7C400 diff --git a/Source/Network/Http/CURLMgr.h b/Source/Network/Http/CURLMgr.h index 8a257c4a..61f87027 100644 --- a/Source/Network/Http/CURLMgr.h +++ b/Source/Network/Http/CURLMgr.h @@ -28,8 +28,6 @@ public: HMODULE m_module; }; -// STATIC: 0x013898CC -// GLOBAL: gl_24354 extern CCURLMgr* g_curlMgr; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/Network/TextEncoding.h b/Source/Network/TextEncoding.h index 85cac7bc..2e1e7505 100644 --- a/Source/Network/TextEncoding.h +++ b/Source/Network/TextEncoding.h @@ -4,8 +4,6 @@ #include #include -// STATIC: 0x016D3A78 -// GLOBAL: gl_24375 extern UINT g_textCodePage; std::string ToUtf8(std::string text); diff --git a/Source/Render/Textures/Texture.h b/Source/Render/Textures/Texture.h index 0c52816c..0fbf6f72 100644 --- a/Source/Render/Textures/Texture.h +++ b/Source/Render/Textures/Texture.h @@ -9,8 +9,6 @@ struct SpriteRleImage; enum TextureFormat : std::int32_t { UnknownTextureFormat = -1, A1R5G5B5 = 0, A4R4G4B4 = 1, R5G6B5 = 2, X1R5G5B5 = 3, A8R8G8B8 = 4 }; -// STATIC: 0x01312DE0 -// STATIC: 0x01312DE4 extern float g_textureOffsetX; extern float g_textureOffsetY; diff --git a/Source/UI/Layout/SnapMgr.h b/Source/UI/Layout/SnapMgr.h index c7ed749b..e03d8a07 100644 --- a/Source/UI/Layout/SnapMgr.h +++ b/Source/UI/Layout/SnapMgr.h @@ -37,13 +37,9 @@ private: CSnapMgr& operator=(const CSnapMgr&) = delete; }; -// STATIC: 0x01334698 extern const int g_snapOppositeSide[4]; -// STATIC: 0x013346A8 extern bool g_snapEnabled; -// STATIC: 0x013346A4 extern int g_snapDirection; -// STATIC: 0x013346B0 extern SnapObject* g_snapBoundary; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/UI/Party/UIRequestJoinPartyMgr.h b/Source/UI/Party/UIRequestJoinPartyMgr.h index 759abe8d..ed81b622 100644 --- a/Source/UI/Party/UIRequestJoinPartyMgr.h +++ b/Source/UI/Party/UIRequestJoinPartyMgr.h @@ -32,8 +32,6 @@ private: WindowManagerWindows* m_windows; }; -// STATIC: 0x01450CEC -// GLOBAL: gl_24363 extern UIRequestJoinPartyMgr* g_requestJoinPartyMgr; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/UI/Window/FrameFocus.h b/Source/UI/Window/FrameFocus.h index 2d10e5dd..5ebe9353 100644 --- a/Source/UI/Window/FrameFocus.h +++ b/Source/UI/Window/FrameFocus.h @@ -21,8 +21,6 @@ struct FrameFocus { UIWindow* Get() const; }; -// STATIC: 0x014576A0 -// GLOBAL: gl_24367 extern int g_dragWindowId; #endif diff --git a/Source/UI/Window/UIWindow.h b/Source/UI/Window/UIWindow.h index 6c8c15fc..3313a87e 100644 --- a/Source/UI/Window/UIWindow.h +++ b/Source/UI/Window/UIWindow.h @@ -156,8 +156,6 @@ private: UIWindow& operator=(const UIWindow&) = delete; }; -// STATIC: 0x0145723C -// GLOBAL: gl_24364 extern std::uint32_t g_windowUid; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/Utility/Async/NMessageMgr.h b/Source/Utility/Async/NMessageMgr.h index 0f365509..8a86a48a 100644 --- a/Source/Utility/Async/NMessageMgr.h +++ b/Source/Utility/Async/NMessageMgr.h @@ -28,8 +28,6 @@ protected: /* 0020 */ std::map m_objects; }; -// STATIC: 0x0138D3EC -// GLOBAL: gl_24361 extern NMessageMgr* g_messageMgr; #if defined(_WIN32) && !defined(_WIN64)