Game Update 7.3 support

Author: magicalcookie

libs/anno-api/src/random_game_functions.cc

@@ -81,17 +81,63 @@ bool FindAddresses()
         initialized = true;
 
         ADDRESSES[GET_CONTAINER_BLOCK_INFO] = {[](std::optional<std::string_view> game_file) {
-            auto match = meow_hook::pattern(
-                             "48 89 5C 24 08 48 89 74 24 10 57 48 83 EC 20 48 83 79 78 00 44 89 C6",
-                             game_file)
-                             .count(1)
-                             .get(0)
-                             .as<uintptr_t>();
+            try {
+                auto match =
+                    meow_hook::pattern(
+                        "48 89 5C 24 08 48 89 74 24 10 57 48 83 EC 20 48 83 79 78 00 44 89 C6",
+                        game_file)
+                        .count(1)
+                        .get(0)
+                        .as<uintptr_t>();
+                if (game_file) {
+                    return RebaseFileOffsetToMemoryAddess(
+                        match - reinterpret_cast<intptr_t>(game_file->data()));
+                }
+                return match;
+            } catch (...) {
+            }
+
+            // Game Update 7.3
+            try {
+                auto match = meow_hook::pattern("E8 ? ? ? ? 84 C0 75 7C", game_file)
+                                 .count(1)
+                                 .get(0);
+                if (game_file) {
+                    match = match.adjust(
+                        RebaseFileOffsetToMemoryAddess(
+                            match.as<uintptr_t>() - reinterpret_cast<intptr_t>(game_file->data()))
+                        - match.as<uintptr_t>());
+                }
+                return match.extract_call();
+            } catch (...) { }
+
+             try {
+                auto match =
+                    meow_hook::pattern("E8 ? ? ? ? 84 C0 0F 84 ? ? ? ? F7 85 ? ? ? ? ? ? ? ?", game_file).count(1).get(0);
+                if (game_file) {
+                    match = match.adjust(
+                        RebaseFileOffsetToMemoryAddess(
+                            match.as<uintptr_t>() - reinterpret_cast<intptr_t>(game_file->data()))
+                        - match.as<uintptr_t>());
+                }
+                return match.extract_call();
+            } catch (...) {
+            }
+
+            // If this fails, we dead
+            auto match =
+                meow_hook::pattern(
+                    "48 89 5C 24 08 48 89 74 24 10 57 48 83 EC 20 48 83 79 78 00",
+                    game_file)
+                    .count(1)
+                    .get(0)
+                    .as<uintptr_t>();
             if (game_file) {
                 return RebaseFileOffsetToMemoryAddess(
                     match - reinterpret_cast<intptr_t>(game_file->data()));
             }
             return match;
+
         }}; //
 
         ADDRESSES[READ_FILE_FROM_CONTAINER] = {[](std::optional<std::string_view> game_file) {

libs/python35/src/main.cc

@@ -92,15 +92,16 @@ static std::string GetLatestVersion()
     return data;
 }
 
+static std::once_flag hooking_once_flag;
 static bool   checked_hooking = false;
 HANDLE CreateFileW_S(LPCWSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode,
                      LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition,
                      DWORD dwFlagsAndAttributes, HANDLE hTemplateFile)
 {
     if (!checked_hooking && std::wstring(lpFileName).find(L"maindata/file.db") != std::string::npos) {
         checked_hooking = true;
-        static std::once_flag flag1;
-        std::call_once(flag1, []() { events.DoHooking(); });
+
+        std::call_once(hooking_once_flag, []() { events.DoHooking(); });
     }
     return CreateFileW(lpFileName, dwDesiredAccess, dwShareMode, lpSecurityAttributes,
                        dwCreationDisposition, dwFlagsAndAttributes, hTemplateFile);
@@ -126,7 +127,7 @@ FARPROC GetProcAddress_S(HMODULE hModule, LPCSTR lpProcName)
     // those would have usually been in the import table.
     // This means we are ready to do some hooking
     // But only do hooking once.
- 
+    std::call_once(hooking_once_flag, []() { events.DoHooking(); });
 
     if ((uintptr_t)lpProcName > 0x1000) {
         if (lpProcName == std::string("CreateFileW")) {
@@ -247,6 +248,43 @@ HANDLE GetParentProcess()
     return OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, ProcessEntry.th32ParentProcessID);
 }
 
+static void CheckVersion()
+{
+    // Version Check
+    try {
+        auto        body        = GetLatestVersion();
+        const auto& data        = nlohmann::json::parse(body);
+        const auto& version_str = data["version"].get<std::string>();
+
+        static int32_t current_version[3] = {VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION};
+
+        int32_t latest_version[3] = {0};
+        std::sscanf(version_str.c_str(), "%d.%d.%d", &latest_version[0], &latest_version[1],
+                    &latest_version[2]);
+
+        if (std::lexicographical_compare(current_version, current_version + 3, latest_version,
+                                         latest_version + 3)) {
+            std::string msg = "Verion " + version_str + " of " + VER_FILE_DESCRIPTION_STR
+                              + " is available for download.\n\n";
+            msg.append("Do you want to go to the release page on GitHub?\n(THIS IS "
+                       "HIGHLY RECOMMENDED!!!)");
+
+            if (MessageBoxA(NULL, msg.c_str(), VER_FILE_DESCRIPTION_STR,
+                            MB_ICONQUESTION | MB_YESNO | MB_SYSTEMMODAL)
+                == IDYES) {
+                auto result =
+                    ShellExecuteA(nullptr, "open",
+                                  "https://github.com/xforce/anno1800-mod-loader/releases/latest",
+                                  nullptr, nullptr, SW_SHOWNORMAL);
+                result = result;
+                TerminateProcess(GetCurrentProcess(), 0);
+            }
+        }
+    } catch (...) {
+        // TODO(alexander): Logging
+    }
+}
+
 BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
 {
     switch (ul_reason_for_call) {
@@ -302,8 +340,9 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserv
                 }
             }
 
-            // Version Check
             events.DoHooking.connect([]() {
+                CheckVersion();
+
                 // Let's start loading the list of files we want to have
                 HMODULE module;
                 if (GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS
@@ -343,40 +382,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserv
                     return;
                 }
 
-                try {
-                    auto        body        = GetLatestVersion();
-                    const auto& data        = nlohmann::json::parse(body);
-                    const auto& version_str = data["version"].get<std::string>();
-
-                    static int32_t current_version[3] = {VERSION_MAJOR, VERSION_MINOR,
-                                                         VERSION_REVISION};
-
-                    int32_t latest_version[3] = {0};
-                    std::sscanf(version_str.c_str(), "%d.%d.%d", &latest_version[0],
-                                &latest_version[1], &latest_version[2]);
-
-                    if (std::lexicographical_compare(current_version, current_version + 3,
-                                                     latest_version, latest_version + 3)) {
-                        std::string msg = "Verion " + version_str + " of "
-                                          + VER_FILE_DESCRIPTION_STR
-                                          + " is available for download.\n\n";
-                        msg.append("Do you want to go to the release page on GitHub?\n(THIS IS "
-                                   "HIGHLY RECOMMENDED!!!)");
-
-                        if (MessageBoxA(NULL, msg.c_str(), VER_FILE_DESCRIPTION_STR,
-                                        MB_ICONQUESTION | MB_YESNO | MB_SYSTEMMODAL)
-                            == IDYES) {
-                            auto result = ShellExecuteA(
-                                nullptr, "open",
-                                "https://github.com/xforce/anno1800-mod-loader/releases/latest",
-                                nullptr, nullptr, SW_SHOWNORMAL);
-                            result = result;
-                            TerminateProcess(GetCurrentProcess(), 0);
-                        }
-                    }
-                } catch (...) {
-                    // TODO(alexander): Logging
-                }
+
             });
 
             EnableExtenalFileLoading(events);

libs/python35/src/version.h

@@ -3,7 +3,7 @@
 // clang-format off
 #define VERSION_MAJOR               0
 #define VERSION_MINOR               7
-#define VERSION_REVISION            7
+#define VERSION_REVISION            8
 
 #define STRINGIFY_(s)               #s
 #define STRINGIFY(s)                STRINGIFY_(s)