50.07 offsets & patching improvment

shevernitskiy · shevernitskiy · commit de1782301ca2 · 2023-02-08T20:33:25.000+03:00
diff --git a/config/dfint_config.toml b/config/dfint_config.toml
@@ -9,5 +9,6 @@ crash_report = true
 crash_report_dir = "./dfint_data/crash_reports/"
 enable_search = true
 enable_translation = true
+enable_patches = false
 dictionary = "./dfint_data/dfint_dictionary.csv"
 watchdog = true
diff --git a/config/offsets/50.04_steam_win64.toml b/config/offsets/50.04_steam_win64.toml
@@ -15,7 +15,6 @@ addst = 0x784C60
 addst_top = 0x784DB0
 addcoloredst = 0x784890
 addst_flag = 0x784970
-addst_template = 0x96E710
 # search
 standardstringentry = 0x87ED50
 simplify_string = 0x35C7A0
@@ -36,3 +35,5 @@ loading_world_new_game_loop = 0x9FD2E0
 loading_world_continuing_game_loop = 0x566F40
 loading_world_start_new_game_loop = 0x5652C0
 menu_interface_loop = 0x1678A0
+# keybinding shift
+keybinding = 357
diff --git a/config/offsets/50.05_itchio_win64.toml b/config/offsets/50.05_itchio_win64.toml
@@ -15,7 +15,6 @@ addst = 0x782190
 addst_top = 0x7822E0
 addcoloredst = 0x781DC0
 addst_flag = 0x781EA0
-addst_template = 0x96BB90
 # search
 standardstringentry = 0x87C1D0
 simplify_string = 0x359F70
@@ -36,3 +35,5 @@ loading_world_new_game_loop = 0x9F8A60
 loading_world_continuing_game_loop = 0x5645B0
 loading_world_start_new_game_loop = 0x562930
 menu_interface_loop = 0x167490
+# keybinding shift
+keybinding = 357
diff --git a/config/offsets/50.05_steam_win64.toml b/config/offsets/50.05_steam_win64.toml
@@ -15,7 +15,6 @@ addst = 0x784C50
 addst_top = 0x784DA0
 addcoloredst = 0x784880
 addst_flag = 0x784960
-addst_template = 0x96E700
 # search
 standardstringentry = 0x87ED40
 simplify_string = 0x35C790
@@ -36,3 +35,5 @@ loading_world_new_game_loop = 0x9FD2D0
 loading_world_continuing_game_loop = 0x566F30
 loading_world_start_new_game_loop = 0x5652B0
 menu_interface_loop = 0x167890
+# keybinding shift
+keybinding = 357
diff --git a/config/offsets/50.07_itchio_win64.toml b/config/offsets/50.07_itchio_win64.toml
@@ -0,0 +1,39 @@
+[metadata]
+name = "dfint localization hook offsets"
+version = "50.07 itch.io win64"
+checksum = 0x63e2a0d6
+
+[offsets]
+# translation
+string_copy = 0xB7D0
+string_copy_n = 0xB7F0
+string_append = 0xB590
+string_append_0 = 0xB5B0
+string_append_n = 0xB930
+convert_ulong_to_string = 0x390740
+addst = 0x7C0E90
+addst_top = 0x7C0F70
+addcoloredst = 0x7C0B40
+addst_flag = 0x7C0C20
+# search
+standardstringentry = 0x8BBDA0
+simplify_string = 0x3910E0
+upper_case_string = 0x391420
+lower_case_string = 0x391280
+capitalize_string_words = 0x3915C0
+capitalize_string_first_word = 0x391840
+# ttf
+addchar = 0x56180
+addchar_top = 0xF3CD0
+add_texture = 0xECC540
+gps_allocate = 0x5FB800
+cleanup_arrays = 0x5FB620
+screen_to_texid = 0x5F3890
+screen_to_texid_top = 0x5F3A80
+# game state
+loading_world_new_game_loop = 0xA3DC10
+loading_world_continuing_game_loop = 0x59E520
+loading_world_start_new_game_loop = 0x59C170
+menu_interface_loop = 0x172D10
+# keybinding shift
+keybinding = 370
diff --git a/config/offsets/50.07_steam_win64.toml b/config/offsets/50.07_steam_win64.toml
@@ -0,0 +1,39 @@
+[metadata]
+name = "dfint localization hook offsets"
+version = "50.07 steam win64"
+checksum = 0x63e29e0c
+
+[offsets]
+# translation
+string_copy = 0xB850
+string_copy_n = 0xB870
+string_append = 0xB610
+string_append_0 = 0xB630
+string_append_n = 0xB9B0
+convert_ulong_to_string = 0x392C70
+addst = 0x7C3810
+addst_top = 0x7C38F0
+addcoloredst = 0x7C34C0
+addst_flag = 0x7C35A0
+# search
+standardstringentry = 0x8BE7D0
+simplify_string = 0x3937B0
+upper_case_string = 0x393AF0
+lower_case_string = 0x393950
+capitalize_string_words = 0x393C90
+capitalize_string_first_word = 0x393F10
+# ttf
+addchar = 0x56200
+addchar_top = 0xF3D60
+add_texture = 0xED0C70
+gps_allocate = 0x5FE030
+cleanup_arrays = 0x5FDE50
+screen_to_texid = 0x5F60C0
+screen_to_texid_top = 0x5F62B0
+# game state
+loading_world_new_game_loop = 0xA42340
+loading_world_continuing_game_loop = 0x5A0D50
+loading_world_start_new_game_loop = 0x59E9A0
+menu_interface_loop = 0x173150
+# keybinding shift
+keybinding = 370
diff --git a/src/hook/config.h b/src/hook/config.h
@@ -44,9 +44,8 @@ namespace Config {
 
   inline std::vector<uintptr_t> GetStringsOffsetArray()
   {
-    auto strings_patches_nodes = Config::offsets["offsets"]["strings_patches"]
-                                   ? Config::offsets["offsets"]["strings_patches"].as_array()
-                                   : nullptr;
+    auto strings_patches_nodes =
+      Config::offsets["offsets"]["string_patches"] ? Config::offsets["offsets"]["string_patches"].as_array() : nullptr;
     std::vector<uintptr_t> strings_patches{};
     if (strings_patches_nodes) {
       for (toml::node& item : *strings_patches_nodes) {
@@ -75,7 +74,8 @@ namespace Config {
     inline auto log_file = Config::config["settings"]["log_file"].value_or<std::string>("./dfint_data/dfint_log.log");
     inline auto crash_report = Config::config["settings"]["crash_report"].value_or<bool>(true);
     inline auto enable_search = Config::config["settings"]["enable_search"].value_or<bool>(true);
-    inline bool enable_translation = Config::config["settings"]["enable_translation"].value_or<bool>(true);
+    inline auto enable_translation = Config::config["settings"]["enable_translation"].value_or<bool>(true);
+    inline auto enable_patches = Config::config["settings"]["enable_patches"].value_or<bool>(true);
     inline auto dictionary =
       Config::config["settings"]["dictionary"].value_or<std::string>("./dfint_data/dfint_dictionary.csv");
     inline auto crash_report_dir =
@@ -84,6 +84,12 @@ namespace Config {
 
   } // namespace Setting
 
+  namespace Keybinding {
+
+    inline auto shift = Config::offsets["offsets"]["keybinding"].value_or<uint32_t>(0);
+
+  } // namespace Keybinding
+
   namespace Offset {
 
     inline auto string_copy = Config::offsets["offsets"]["string_copy"].value_or<uintptr_t>(0);
@@ -122,9 +128,10 @@ namespace Config {
       Config::offsets["offsets"]["loading_world_start_new_game_loop"].value_or<uintptr_t>(0);
     inline auto menu_interface_loop = Config::offsets["offsets"]["menu_interface_loop"].value_or<uintptr_t>(0);
 
-    inline auto strings_patches = Config::GetStringsOffsetArray();
+    inline auto string_patches = Config::GetStringsOffsetArray();
 
   } // namespace Offset
+
 } // namespace Config
 
 #endif
diff --git a/src/hook/hooks.cpp b/src/hook/hooks.cpp
@@ -283,13 +283,6 @@ namespace Hooks {
     ORIGINAL(addst_flag)(gps, str, a3, a4, some_flag);
   }
 
-  // // dynamic template string
-  SETUP_ORIG_FUNC(addst_template);
-  void __fastcall HOOK(addst_template)(renderer_2d_base_* renderer, std::string& str)
-  {
-    ORIGINAL(addst_template)(renderer, str);
-  }
-
   // loading_data_new_game_loop interface loop
   SETUP_ORIG_FUNC(loading_world_new_game_loop);
   void __fastcall HOOK(loading_world_new_game_loop)(void* a1)
@@ -388,51 +381,52 @@ namespace Hooks {
                                            std::set<InterfaceKey>& events)
   {
     char entry = char(1);
+    const auto shift = Config::Keybinding::shift;
 
     if (flag & STRINGENTRY_SYMBOLS) {
-      for (short int item = INTERFACEKEY_STRING_A000; item <= INTERFACEKEY_STRING_A255; item++) {
+      for (short int item = INTERFACEKEY_STRING_A000 + shift; item <= INTERFACEKEY_STRING_A255 + shift; item++) {
         if (events.count(item)) {
-          entry = char(item - 357);
+          entry = char(item - shift);
           break;
         }
       }
     }
     if (flag & STRINGENTRY_LETTERS) {
       // latin capitals
-      for (short int item = INTERFACEKEY_STRING_A065; item <= INTERFACEKEY_STRING_A090; item++) {
+      for (short int item = INTERFACEKEY_STRING_A065 + shift; item <= INTERFACEKEY_STRING_A090 + shift; item++) {
         if (events.count(item)) {
-          entry = char(item - 357);
+          entry = char(item - shift);
           break;
         }
       }
       // latin small
-      for (short int item = INTERFACEKEY_STRING_A097; item <= INTERFACEKEY_STRING_A122; item++) {
+      for (short int item = INTERFACEKEY_STRING_A097 + shift; item <= INTERFACEKEY_STRING_A122 + shift; item++) {
         if (events.count(item)) {
-          entry = char(item - 357);
+          entry = char(item - shift);
           break;
         }
       }
       // cyrillic
-      for (short int item = INTERFACEKEY_STRING_A192; item <= INTERFACEKEY_STRING_A255; item++) {
+      for (short int item = INTERFACEKEY_STRING_A192 + shift; item <= INTERFACEKEY_STRING_A255 + shift; item++) {
         if (events.count(item)) {
-          entry = char(item - 356);
+          entry = char(item - shift + 1);
           break;
         }
       }
     }
     if (flag & STRINGENTRY_SPACE) {
-      if (events.count(INTERFACEKEY_STRING_A032)) {
+      if (events.count(INTERFACEKEY_STRING_A032 + shift)) {
         entry = ' ';
       }
     }
-    if (events.count(INTERFACEKEY_STRING_A000)) {
+    if (events.count(INTERFACEKEY_STRING_A000 + shift)) {
       entry = char(0);
     }
     if (flag & STRINGENTRY_NUMBERS) {
       // numbers
-      for (short int item = INTERFACEKEY_STRING_A048; item <= INTERFACEKEY_STRING_A057; item++) {
+      for (short int item = INTERFACEKEY_STRING_A048 + shift; item <= INTERFACEKEY_STRING_A057 + shift; item++) {
         if (events.count(item)) {
-          entry = char(item - 357);
+          entry = char(item - shift);
           break;
         }
       }
@@ -770,7 +764,6 @@ namespace Hooks {
     ATTACH(addst_top);
     ATTACH(addst_flag);
     ATTACH(addcoloredst);
-    // ATTACH(addst_template);
 
     // search handling
     if (Config::Setting::enable_search) {
@@ -796,7 +789,6 @@ namespace Hooks {
     DETACH(addst_top);
     DETACH(addst_flag);
     DETACH(addcoloredst);
-    // DETACH(addst_template);
 
     // search handling
     if (Config::Setting::enable_search) {
diff --git a/src/hook/hooks.h b/src/hook/hooks.h
@@ -166,7 +166,6 @@ namespace Hooks {
   typedef void(__fastcall* addst_top)(graphicst_* gps, std::string& str, __int64 a3);
   typedef void(__fastcall* addcoloredst)(graphicst_* gps, const char* str, __int64 a3);
   typedef void(__fastcall* addst_flag)(graphicst_* a1, std::string& str, __int64 a3, __int64 a4, int a5);
-  typedef void(__fastcall* addst_template)(renderer_2d_base_* renderer, std::string& str);
 
   // search
   typedef int(__fastcall* standardstringentry)(std::string& str, int maxlen, unsigned int flag,
diff --git a/src/hook/keybindings.h b/src/hook/keybindings.h
@@ -9,7 +9,7 @@
 typedef long InterfaceKey;
 enum InterfaceKeyType
 {
-  INTERFACEKEY_STRING_A000 = 357,
+  INTERFACEKEY_STRING_A000,
   INTERFACEKEY_STRING_A001,
   INTERFACEKEY_STRING_A002,
   INTERFACEKEY_STRING_A003,
@@ -136,6 +136,7 @@ enum InterfaceKeyType
   INTERFACEKEY_STRING_A124,
   INTERFACEKEY_STRING_A125,
   INTERFACEKEY_STRING_A126,
+  INTERFACEKEY_STRING_A127,
   INTERFACEKEY_STRING_A128,
   INTERFACEKEY_STRING_A129,
   INTERFACEKEY_STRING_A130,
diff --git a/src/hook/main.cpp b/src/hook/main.cpp
@@ -43,7 +43,9 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserv
       // Hooks::InstallTTFInjection();
       // Hooks::InstallStateManager();
 
-      // Patches::Install();
+      if (Config::Setting::enable_patches) {
+        Patches::Install();
+      }
 
       DetourTransactionCommit();
       logger::info("hooks installed");
diff --git a/src/hook/patches.cpp b/src/hook/patches.cpp
@@ -9,7 +9,7 @@ namespace Patches {
     return reinterpret_cast<void*>(module_handle + offset);
   }
 
-  size_t Align(size_t n, size_t edge = 8)
+  size_t Align(size_t n, size_t edge = 4)
   {
     return (n + edge - 1) & (-edge);
   }
@@ -44,13 +44,16 @@ namespace Patches {
     }
   }
 
-  void Install()
+  void BatchStringPatching()
   {
-    TranslateStringByOffset(0x10C1D40);
-    TranslateStringByOffset(0x10C1D90);
-    TranslateStringByOffset(0x10C1D98);
-    // TranslateStringByOffset(0x11BCC0C); // s]
+    for (auto& offset : Config::Offset::string_patches) {
+      TranslateStringByOffset(offset);
+    }
+  }
 
+  void Install()
+  {
+    BatchStringPatching();
     logger::info("patches installed");
   }
 
diff --git a/src/pe_parser/main.cpp b/src/pe_parser/main.cpp
@@ -27,8 +27,10 @@ int main(int argc, char* argv[])
     auto res = parser->FindString(line);
     if (res) {
       output << std::format("0x{:x}", res.value()).data() << "\n";
+      std::cout << std::format("0x{:x}", res.value()).data() << " >> " << line << "\n";
     } else {
-      output << "0x0";
+      output << "0x0\n";
+      std::cout << "nothing found >> " << line << "\n";
     }
   }
 
diff --git a/src/pe_parser/pe_parser.hpp b/src/pe_parser/pe_parser.hpp
@@ -12,13 +12,13 @@ class PEParser
     return &singleton;
   }
 
-  void OpenFile(const char* filename)
+  void OpenFile(const std::string& filename)
   {
     this->filename = filename;
     if (this->file != NULL) {
       fclose(this->file);
     }
-    this->file = fopen(filename, "rb");
+    this->file = fopen(filename.c_str(), "rb");
 
     if (this->file == NULL) {
       std::cerr << "unbale to open file\n";
@@ -64,7 +64,7 @@ class PEParser
       if (buf == target) {
         return this->rdata_offset + it + this->rdata_virtual_shift;
       }
-      it += 8;
+      it += 4;
     }
     return std::nullopt;
   }
@@ -83,7 +83,7 @@ class PEParser
   PEParser(PEParser&&) = delete;
 
   FILE* file;
-  const char* filename;
+  std::string filename;
   IMAGE_DOS_HEADER* dos_header = new IMAGE_DOS_HEADER;
   IMAGE_NT_HEADERS64* nt_headers = new IMAGE_NT_HEADERS64;
   uintptr_t rdata_offset;
diff --git a/tools/fn_byte_patterns.ffsess b/tools/fn_byte_patterns.ffsess

Original file line number	Diff line number	Diff line change
`@@ -283,13 +283,6 @@ namespace Hooks {`
`283`	`283`	`ORIGINAL(addst_flag)(gps, str, a3, a4, some_flag);`
`284`	`284`	`}`
`285`	`285`
`286`		`- // // dynamic template string`
`287`		`- SETUP_ORIG_FUNC(addst_template);`
`288`		`- void __fastcall HOOK(addst_template)(renderer_2d_base_* renderer, std::string& str)`
`289`		`- {`
`290`		`- ORIGINAL(addst_template)(renderer, str);`
`291`		`- }`
`292`		`-`
`293`	`286`	`// loading_data_new_game_loop interface loop`
`294`	`287`	`SETUP_ORIG_FUNC(loading_world_new_game_loop);`
`295`	`288`	`void __fastcall HOOK(loading_world_new_game_loop)(void* a1)`
`@@ -388,51 +381,52 @@ namespace Hooks {`
`388`	`381`	`std::set<InterfaceKey>& events)`
`389`	`382`	`{`
`390`	`383`	`char entry = char(1);`
	`384`	`+ const auto shift = Config::Keybinding::shift;`
`391`	`385`
`392`	`386`	`if (flag & STRINGENTRY_SYMBOLS) {`
`393`		`- for (short int item = INTERFACEKEY_STRING_A000; item <= INTERFACEKEY_STRING_A255; item++) {`
	`387`	`+ for (short int item = INTERFACEKEY_STRING_A000 + shift; item <= INTERFACEKEY_STRING_A255 + shift; item++) {`
`394`	`388`	`if (events.count(item)) {`
`395`		`- entry = char(item - 357);`
	`389`	`+ entry = char(item - shift);`
`396`	`390`	`break;`
`397`	`391`	`}`
`398`	`392`	`}`
`399`	`393`	`}`
`400`	`394`	`if (flag & STRINGENTRY_LETTERS) {`
`401`	`395`	`// latin capitals`
`402`		`- for (short int item = INTERFACEKEY_STRING_A065; item <= INTERFACEKEY_STRING_A090; item++) {`
	`396`	`+ for (short int item = INTERFACEKEY_STRING_A065 + shift; item <= INTERFACEKEY_STRING_A090 + shift; item++) {`
`403`	`397`	`if (events.count(item)) {`
`404`		`- entry = char(item - 357);`
	`398`	`+ entry = char(item - shift);`
`405`	`399`	`break;`
`406`	`400`	`}`
`407`	`401`	`}`
`408`	`402`	`// latin small`
`409`		`- for (short int item = INTERFACEKEY_STRING_A097; item <= INTERFACEKEY_STRING_A122; item++) {`
	`403`	`+ for (short int item = INTERFACEKEY_STRING_A097 + shift; item <= INTERFACEKEY_STRING_A122 + shift; item++) {`
`410`	`404`	`if (events.count(item)) {`
`411`		`- entry = char(item - 357);`
	`405`	`+ entry = char(item - shift);`
`412`	`406`	`break;`
`413`	`407`	`}`
`414`	`408`	`}`
`415`	`409`	`// cyrillic`
`416`		`- for (short int item = INTERFACEKEY_STRING_A192; item <= INTERFACEKEY_STRING_A255; item++) {`
	`410`	`+ for (short int item = INTERFACEKEY_STRING_A192 + shift; item <= INTERFACEKEY_STRING_A255 + shift; item++) {`
`417`	`411`	`if (events.count(item)) {`
`418`		`- entry = char(item - 356);`
	`412`	`+ entry = char(item - shift + 1);`
`419`	`413`	`break;`
`420`	`414`	`}`
`421`	`415`	`}`
`422`	`416`	`}`
`423`	`417`	`if (flag & STRINGENTRY_SPACE) {`
`424`		`- if (events.count(INTERFACEKEY_STRING_A032)) {`
	`418`	`+ if (events.count(INTERFACEKEY_STRING_A032 + shift)) {`
`425`	`419`	`entry = ' ';`
`426`	`420`	`}`
`427`	`421`	`}`
`428`		`- if (events.count(INTERFACEKEY_STRING_A000)) {`
	`422`	`+ if (events.count(INTERFACEKEY_STRING_A000 + shift)) {`
`429`	`423`	`entry = char(0);`
`430`	`424`	`}`
`431`	`425`	`if (flag & STRINGENTRY_NUMBERS) {`
`432`	`426`	`// numbers`
`433`		`- for (short int item = INTERFACEKEY_STRING_A048; item <= INTERFACEKEY_STRING_A057; item++) {`
	`427`	`+ for (short int item = INTERFACEKEY_STRING_A048 + shift; item <= INTERFACEKEY_STRING_A057 + shift; item++) {`
`434`	`428`	`if (events.count(item)) {`
`435`		`- entry = char(item - 357);`
	`429`	`+ entry = char(item - shift);`
`436`	`430`	`break;`
`437`	`431`	`}`
`438`	`432`	`}`
`@@ -770,7 +764,6 @@ namespace Hooks {`
`770`	`764`	`ATTACH(addst_top);`
`771`	`765`	`ATTACH(addst_flag);`
`772`	`766`	`ATTACH(addcoloredst);`
`773`		`- // ATTACH(addst_template);`
`774`	`767`
`775`	`768`	`// search handling`
`776`	`769`	`if (Config::Setting::enable_search) {`
`@@ -796,7 +789,6 @@ namespace Hooks {`
`796`	`789`	`DETACH(addst_top);`
`797`	`790`	`DETACH(addst_flag);`
`798`	`791`	`DETACH(addcoloredst);`
`799`		`- // DETACH(addst_template);`
`800`	`792`
`801`	`793`	`// search handling`
`802`	`794`	`if (Config::Setting::enable_search) {`