v3.0.7

.gitignore

@@ -3,7 +3,7 @@
 .directory
 
 # File withheld to make abuse more difficult
-game_payload/src/tp6.c
+game_payload/src/core.c
 
 build
 out

README.md

@@ -1,11 +1,11 @@
 ### Games and regions
-- **3rd**: glb v6.7.0
-- **SR**: os/cn v1.1.0 (unsafe, refer to [configuration](#configuration)) 
+- **3rd**: glb/sea/tw/kr/jp **v6.8.0**, cn **v6.9.0+**
+- **SR**: os/cn **v1.3.0** (potentially unsafe, but no bans were reported since v1.1.0) 
 
-It may be possilbe to completely remove the region and version-specific data in the future. Refer to the source code in `game_payload/src` for details.
+You can expect newer versions to work immediately after release with the same jadeite binary if the version is specified with a + above.
 
 ### Information
-The anticheat the games use is fundamentally incompatible with Wine in multiple ways. This tool launches the game without it (`injector/launcher_payload`) and imitates it's behaviour (`game_payload`).
+The anticheat the games use is fundamentally incompatible with Wine in multiple ways. This tool launches the game without it (`injector`) and imitates it's behaviour (`game_payload`).
 
 **SR-specific**: this tool disables the use of DirectX shared resources in a rather hacky way. It is required, as there is no (and most likely never will be) shared resources support in DirectX translation layers (WineD3D/DXVK). Refer to [configuration](#configuration) if you wish to run the game without the fix.
 
@@ -18,13 +18,13 @@ The anticheat the games use is fundamentally incompatible with Wine in multiple
 
 **Wine 8.0+ is recommended**, as lower versions leak "The Wine project" as the device identifier. Not critical, but taking a precaution never hurt anyone. **DXVK is strongly recommended.**
 
-**3rd-specific**: In some cases, and if you're not using Proton GE, **a fix for Media Foundation may be required to play videos. The Game may crash without it.** You can download it from [here](https://github.com/z0z0z/mf-install). You might need to [limit the number of cores available to the game](https://github.com/z0z0z/mf-install/issues/44) if your CPU has more than 8.
+**3rd-specific**: In some cases, and if you're not using Proton GE, **a fix for Media Foundation may be required to play videos. The Game may crash without it.**  You can download it from [here](https://github.com/z0z0z/mf-install). You might need to [limit the number of cores available to the game](https://github.com/z0z0z/mf-install/issues/44) if your CPU has more than 8. **IMPORTANT: do not run the mfplat fix under Proton GE. Doing so may irreparably damage your game installation!**
 
 Manual usage instructions:
 - Download the game you want to run
-- Download a release from this repository
+- Download the latest release from this repository
 - Extract the archive (**NOT INTO THE GAME DIRECTORY! THIS IS IMPORTANT!**)
-- Block analytics servers in your `hosts` file. You can find the list in SERVERS.txt
+- Run `./block_analytics.sh` from the archive to block the games from accessing analytics servers (you might have to do a `chmod +x block_analytics.sh` first). This will require superuser privileges 
 - Run `wine jadeite.exe 'Z:\wine\path\to\game.exe'`
 
 This tool is capable of starting the games from a different process. This may be useful for spoofing the parent process (SR is known to report it). Use `wine jadeite.exe 'Z:\wine\path\to\game.exe' 'Z:\wine\path\to\launcher.exe'`. `explorer.exe` is used as the default.
@@ -32,20 +32,19 @@ This tool is capable of starting the games from a different process. This may be
 To pass commandline arguments to the game, append them after the launcher path: `wine jadeite.exe 'Z:\wine\path\to\game.exe' 'Z:\wine\path\to\launcher.exe' -arg1 -arg2 -arg3`. To use the default launcher process, use `--`: `wine jadeite.exe 'Z:\wine\path\to\game.exe' -- -arg1 -arg2 -arg3`.
 
 ### Configuration
-These environment variables can be used to configure the behaviour of the tool.
+These environment variables can be used to configure the behaviour of the tool. Any value except empty string counts as set. `1` will be used in all examples.
 
 - `WAIT_BEFORE_RESUME=1` - show a messagebox and wait for user input before resuming the game process. Useful on my side for debugging
 
 **SR-exclusive**:
-- `I_WANT_A_BAN=1` - allows to launch SR. Please only use testing accounts, as there is an extremely high risk of getting banned
-- `SRFIX_DISABLE=1` - disable shared resources fix
+- `SRFIX_DISABLE=1` - disable shared resources fix. Not recommended. Doing so will most likely cause the game to not run at all
 
 ### Internals
-This tool consists of three parts: the main injector (`injector`), the launcher payload (`injector/launcher_payload`) and the game payload (`game_payload`).
+This tool consists of three parts: the main injector (`injector/src/exe.c`), the launcher payload (`injector/src/dll.c`) and the game payload (`game_payload`).
 
 I am very bad at explaining, so just take a look at the source code. Maybe I'll write a detailed explanation in the future.
 
-A part of the source code is witheld (`game_payload/src/tp6.c`). This is a forced measure to make abuse more difficult. 
+A part of the source code is witheld (`game_payload/src/core.c`). This is a forced measure to make abuse more difficult. However, a precompiled blob is provided in the repo. `build.sh` will use it automatically.
 
 ### Guildelines
 1. **Please don't share this project in public.** This might attract unnecessary attention from either the Game Company or the Anticheat Company

SERVERS.txt

@@ -1,12 +0,0 @@
-# Honkai Impact 3rd logging servers:
-0.0.0.0 log-upload-os.hoyoverse.com
-0.0.0.0 sg-public-data-api.hoyoverse.com
-0.0.0.0 dump.gamesafe.qq.com
-
-# Honkai Star Rail logging servers (oversea)
-0.0.0.0 log-upload-os.hoyoverse.com
-0.0.0.0 sg-public-data-api.hoyoverse.com
-
-# Honkai Star Rail logging servers (China)
-0.0.0.0 log-upload.mihoyo.com
-0.0.0.0 public-data-api.mihoyo.com

block_analytics.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+analytics_servers=$(cat <<EOF
+
+# Honkai Impact 3rd analytics servers (glb/sea/tw/kr/jp):
+0.0.0.0 log-upload-os.hoyoverse.com
+0.0.0.0 sg-public-data-api.hoyoverse.com
+0.0.0.0 dump.gamesafe.qq.com
+
+# Honkai Impact 3rd analytics servers (cn):
+0.0.0.0 log-upload.mihoyo.com
+0.0.0.0 public-data-api.mihoyo.com
+0.0.0.0 dump.gamesafe.qq.com
+
+
+# Honkai Star Rail analytics servers (os)
+0.0.0.0 log-upload-os.hoyoverse.com
+0.0.0.0 sg-public-data-api.hoyoverse.com
+
+# Honkai Star Rail analytics servers (cn)
+0.0.0.0 log-upload.mihoyo.com
+0.0.0.0 public-data-api.mihoyo.com
+
+EOF
+)
+
+ if [[ ! `cat /etc/hosts` == *"$analytics_servers"* ]]; then
+    echo "Blocking analytics servers. This will require superuser privileges"
+    echo "$analytics_servers" | pkexec tee -a /etc/hosts 2>&1 >> /dev/null
+    if test $? -ne 0; then
+        echo "Could not block analytics servers. Please add the following lines to your /etc/hosts manually:"
+        echo "$analytics_servers"
+    fi
+else
+    echo "Analytics servers are already blocked"
+fi

build.sh

@@ -1,12 +1,6 @@
 #!/usr/bin/env bash
 set -e
 
-if ! [ "x$1" = "xdo" ]; then
-    echo "A part of the source code is witheld (game_payload/src/tp6.c) to make abuse more difficult. Please download a binary release"
-    exit
-fi
-shift
-
 strip="x86_64-w64-mingw32-strip"
 
 rm -f jadeite.zip
@@ -20,6 +14,7 @@ mkdir out
 cp ./build/injector/jadeite.exe ./out
 cp ./build/injector/launcher_payload.dll ./out
 cp ./build/game_payload/game_payload.dll ./out
+cp ./block_analytics.sh ./out
 cp ./LICENSE.txt ./out
 
 $strip ./out/*.{exe,dll}

game_payload/copy_core.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+
+cp "$1" "$2"
+cp "$1" "$3"

game_payload/include/ace.h

@@ -2,7 +2,9 @@
 
 #include <windows.h>
 
+#include <game.h>
+
 void ace_fake_driver_files();
 
-HMODULE ace_load_base_module(const char *exeName);
+HMODULE ace_load_base_module(struct game_data *game);
 HMODULE ace_load_driver_module();

game_payload/include/config.h.in

@@ -0,0 +1 @@
+#define JADEITE_VERSION "@version@"

game_payload/include/core.h

@@ -0,0 +1,9 @@
+#pragma once
+
+#include <windows.h>
+
+#include <game.h>
+
+void core_setup_patcher(struct game_data *game, HMODULE baseModule, wchar_t *txFile);
+
+void *core_perform_tx(struct game_data *game, size_t *outLength);

game_payload/include/crc32.h

@@ -8,11 +8,13 @@
 /* CRC-32C (iSCSI) polynomial in reversed bit order. */
 #define __POLY 0x82f63b78
 
-static inline uint32_t crc32c(uint32_t crc, const unsigned char *buf, size_t len) {
+static inline uint32_t crc32c(uint32_t crc, const void *buf, size_t len) {
+    const unsigned char *cbuf = (const unsigned char*)buf;
+
     crc = ~crc;
 
     while (len--) {
-        crc ^= *buf++;
+        crc ^= *cbuf++;
         for (int k = 0; k < 8; k++) {
             crc = crc & 1 ? (crc >> 1) ^ __POLY : crc >> 1;
         }

game_payload/include/game.h

@@ -2,24 +2,14 @@
 
 #include <windows.h>
 
-enum game_id {
-    GAME_INVALID,
-    
-    GAME_HI3_GLB,
-
-    GAME_HSR_OS,
-    GAME_HSR_CN
-};
-
 #define INVOKE_CALLBACK(callback, ...) if (callback) { callback(__VA_ARGS__); }
 
 typedef void (*unityplayer_callback_t)(HMODULE unityModule);
 
 struct game_data {
-    enum game_id id; // Temporary
-    const char *name;
+    const char *base_module_name;
     const char *assembly_path;
-    const char *tp6_section_name; // Unused for now
+    const char *txs_section_name;
     const char *tvm_section_name;
 
     unityplayer_callback_t unityplayer_callback;

game_payload/include/main.h

@@ -1,4 +1,8 @@
 #pragma once
 
+#define ISSUE_SUFFIX "Please open an issue on the jadeite repository specifying your game edition/region and version"
+
 void unload_ctr_inc();
 void unload_ctr_dec();
+
+void request_restart();

game_payload/include/pe.h

@@ -2,5 +2,6 @@
 
 #include <windows.h>
 
-void pe_find_section(HMODULE module, const char *section, MEMORY_BASIC_INFORMATION *buf);
+IMAGE_SECTION_HEADER *pe_find_section(const void *module, const char *section);
+
 void *pe_find_entry_point(HMODULE module);

game_payload/include/tp6.h

@@ -1,7 +0,0 @@
-#pragma once
-
-#include <windows.h>
-
-#include <game.h>
-
-void tp6_setup_patcher(struct game_data *game, HMODULE baseModule);

game_payload/include/tx.h

@@ -0,0 +1,3 @@
+#include <game.h>
+
+void tx_table_file(struct game_data *game, wchar_t *buf);

game_payload/include/utils.h

@@ -2,6 +2,13 @@
 
 #include <stdint.h>
 
-uint32_t utils_file_crc32c(const char *filePath);
+#define UTILS_COUNT(arr) (sizeof(arr) / sizeof(*arr))
+
+int utils_path_exists(const wchar_t *filePath);
+uint32_t utils_file_crc32c(const wchar_t *filePath);
+
+void utils_create_parent_dirs(const wchar_t *path);
+
+void utils_save_to_file(const wchar_t *filePath, const void *buf, size_t length);
 
 char utils_env_enabled(const char *env);

game_payload/meson.build

@@ -1,3 +1,7 @@
+fs = import('fs')
+
+include_dir = include_directories('include')
+
 # Input files
 sources = [
     'src/main.c',
@@ -9,32 +13,49 @@ sources = [
     'src/hsr.c',
     'src/utils.c',
     'src/msg.c',
-
-    # File withheld to make abuse more difficult
-    'src/tp6.c'
-]
-resources = [
-    'res/hi3/glb/allocations.dat',
-    'res/hi3/glb/entries.dat',
-
-    'res/hsr/os/allocations.dat',
-    'res/hsr/os/entries.dat',
-    'res/hsr/cn/allocations.dat',
-    'res/hsr/cn/entries.dat'
+    'src/tx.c'
 ]
 
-# Generate resource files for ./res
-res_files = custom_target(
-    'resources.[ho]',
-    output: [ 'resources.o', 'resources.h' ],
-    input: resources,
-    command: [ gen_res, meson.current_source_dir(), '@OUTPUT0@', '@OUTPUT1@', '@INPUT@' ]
-)
+if fs.exists('src/core.c')
+    # Compile the real file first (dirty hack)
+    core_fake_exe = executable(
+        'core.o',
+        'src/core.c',
+        link_args: [ '-r' ], # Output an object file
+        include_directories: include_dir
+    )
+    
+    # another dirty hack
+    copy_core = find_program('copy_core.sh')
+
+    core_target = [custom_target(
+        'copy_core',
+        output: 'core.o',
+        input: core_fake_exe.extract_all_objects(recursive: false),
+        command: [ 
+            copy_core, 
+            '@INPUT0@',
+            '@OUTPUT0@', meson.current_source_dir() / 'blob/core.o' 
+        ]
+    )]
+    core_blob = []
+else
+    message('Using precompiled core blob. Refer to the readme for more details')
+    core_target = []
+    core_blob = [ 'blob/core.o' ]
+endif
+
+conf_data = configuration_data()
+conf_data.set('version', meson.project_version())
+
+conf = configure_file(input: 'include/config.h.in', output: 'config.h', configuration: conf_data)
 
 shared_library(
     'game_payload',
     sources,
-    res_files,
-    include_directories: 'include',
+    core_target,
+    conf,
+    objects: core_blob,
+    include_directories: include_dir,
     name_prefix: ''
 )

game_payload/src/ace.c

@@ -9,83 +9,74 @@ static void _dll_notification(ULONG reason, const PLDR_DLL_NOTIFICATION_DATA dat
         return;
     }
 
-    // context should be set to the target module name, lowercase
+    // context should be set to the target module name
     wchar_t *targetModuleName = (wchar_t*)context;
 
-    wchar_t lwModuleName[MAX_PATH];
-    wcscpy(lwModuleName, data->Loaded.BaseDllName->Buffer);
-    _wcslwr(lwModuleName);
-
-    if (wcscmp(targetModuleName, lwModuleName) == 0) {
-        // Replace entry point with a stub
-        void *entryPoint = pe_find_entry_point(data->Loaded.DllBase);
-
-        const char ENTRY_POINT_STUB[] = {
-            0xB8, 0x01, 0x00, 0x00, 0x00,   // mov eax, 1
-            0xC3                            // ret
-        };
-
-        DWORD oldProtect;
-        VirtualProtect(entryPoint, sizeof(ENTRY_POINT_STUB), PAGE_EXECUTE_READWRITE, &oldProtect);
-
-        memcpy(entryPoint, ENTRY_POINT_STUB, sizeof(ENTRY_POINT_STUB));
-
-        VirtualProtect(entryPoint, sizeof(ENTRY_POINT_STUB), oldProtect, &oldProtect);
+    if (wcsicmp(targetModuleName, data->Loaded.BaseDllName->Buffer) != 0) {
+        return;
     }
+
+    // Replace entry point with a stub
+    void *entryPoint = pe_find_entry_point(data->Loaded.DllBase);
+
+    const char ENTRY_POINT_STUB[] = {
+        0xB8, 0x01, 0x00, 0x00, 0x00,   // mov eax, 1
+        0xC3                            // ret
+    };
+
+    DWORD oldProtect;
+    VirtualProtect(entryPoint, sizeof(ENTRY_POINT_STUB), PAGE_EXECUTE_READWRITE, &oldProtect);
+
+    memcpy(entryPoint, ENTRY_POINT_STUB, sizeof(ENTRY_POINT_STUB));
+
+    VirtualProtect(entryPoint, sizeof(ENTRY_POINT_STUB), oldProtect, &oldProtect);
+    
+}
+
+static void _create_driver_file(const char *path) {
+    // They only report presence
+    HANDLE file = CreateFileA(path, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+
+    if (file == INVALID_HANDLE_VALUE) {
+        msg_err_a("Could not create driver file: %s", path);
+    }
+
+    CloseHandle(file);
 }
 
 void ace_fake_driver_files() {
-    // They only report presence
-    const char *wdDriverPath = "ACE-BASE.sys";
-    const char *s32DriverPath = "C:\\windows\\system32\\drivers\\ACE-BASE.sys";
-
-    HANDLE wdDriverFile = CreateFileA(wdDriverPath, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
-    if (!wdDriverFile) {
-        msg_err_a("Could not create driver file: %s", wdDriverPath);
-    }
+    _create_driver_file("ACE-BASE.sys");
 
     // Just in case
-    HANDLE s32DriverFile = CreateFileA(s32DriverPath, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
-    if (!s32DriverFile) {
-        msg_err_a("Could not create driver file: %s", s32DriverPath);
-    }
-
-    CloseHandle(wdDriverFile);
-    CloseHandle(s32DriverFile);
+    _create_driver_file("C:\\windows\\system32\\drivers\\ACE-BASE.sys");
 }
 
-HMODULE ace_load_base_module(const char *exeName) {
-    wchar_t baseModuleName[MAX_PATH];
-    swprintf(baseModuleName, MAX_PATH, L"%sbase.dll", exeName);
-    wcslwr(baseModuleName);
+static HMODULE _load_module_patched(wchar_t *path) {
+    // Get filename from the path
+    wchar_t *name = wcsrchr(path, '\\');
+    name = name ? name + 1 : path;
 
     void *cookie;
-    LdrRegisterDllNotification(0, &_dll_notification, baseModuleName, &cookie);
+    LdrRegisterDllNotification(0, &_dll_notification, name, &cookie);
 
-    HMODULE baseModule = LoadLibraryW(baseModuleName);
-    if (!baseModule) {
-        msg_err_w(L"Could not load base module: %ls", baseModuleName);
+    HMODULE module = LoadLibraryW(path);
+    if (!module) {
+        msg_err_w(L"Could not load module: %ls", path);
     }
 
-    // LoadLibraryA is synchronous; the notification function has already finished executing
+    // LoadLibraryW is synchronous; the notification function has already finished executing
     LdrUnregisterDllNotification(cookie);
 
-    return baseModule;
+    return module;
+}
+
+HMODULE ace_load_base_module(struct game_data *game) {
+    wchar_t baseModuleName[MAX_PATH];
+    MultiByteToWideChar(CP_UTF8, 0, game->base_module_name, strlen(game->base_module_name) + 1, baseModuleName, MAX_PATH);
+
+    return _load_module_patched(baseModuleName);
 }
 
 HMODULE ace_load_driver_module() {
-    const char *driverModulePath = "AntiCheatExpert/InGame/x64/ACE-DRV64.dll";
-
-    void *cookie;
-    LdrRegisterDllNotification(0, &_dll_notification, L"ace-drv64.dll", &cookie);
-
-    HMODULE driverModule = LoadLibraryA(driverModulePath);
-    if (!driverModule) {
-        msg_err_a("Could not load driver module: %s", driverModulePath);
-    }
-
-    // LoadLibraryA is synchronous; the notification function has already finished executing
-    LdrUnregisterDllNotification(cookie);
-
-    return driverModule;
+    return _load_module_patched(L"AntiCheatExpert\\InGame\\x64\\ACE-DRV64.dll");
 }

game_payload/src/core.md

@@ -0,0 +1,31 @@
+### 1.0.0
+- First version
+
+### 1.1.0
+- HSR support
+
+### 1.1.9
+- Fixed a bug which could cause the game to crash in odd scenarios
+
+### 1.1.10
+- Fixed a subtle bug introduced in 1.1.9
+
+### 1.1.11
+- Fixed an additional issue introduced in 1.1.9
+
+### 2.0.0
+- Almost a full rewrite, functionality unchanged
+- Added support for HI3 sea/cn/tw/jp/kr
+
+### 3.0.0
+- Integrated table extractor
+
+### 3.0.1
+- Fixed a bug that caused HI3 to crash
+
+### 3.0.2
+- Fixed multiple error messageboxes showing invalid characters
+- Added handling for more error conditions 
+
+### 3.0.4
+- Moved LoadLibrary call into core from main

game_payload/src/game.c

@@ -1,32 +1,39 @@
 #include <msg.h>
+#include <utils.h>
 
 #include <game.h>
 
 typedef void (*fill_fn)(struct game_data *buf);
 
 struct name_fn_pair {
-    const char *name;
+    const wchar_t *name;
     fill_fn fill;
 };
 
 const struct name_fn_pair GAMES[] = {
-    { "bh3.exe",      &hi3_fill_data },
-    { "starrail.exe", &hsr_fill_data }
+    { L"BH3",      &hi3_fill_data },
+    { L"StarRail", &hsr_fill_data }
 };
 
 void game_detect(struct game_data *buf) {
-    char exePath[MAX_PATH];
-    GetModuleFileNameA(NULL, exePath, MAX_PATH);
+    wchar_t exePath[MAX_PATH];
+    GetModuleFileNameW(NULL, exePath, MAX_PATH);
 
-    char *exeName = strrchr(exePath, '\\') + 1;
-    strlwr(exeName);
+    // Leave only the basename
+    wchar_t *exeName = wcsrchr(exePath, L'\\') + 1;
 
-    for (size_t i = 0; i < sizeof(GAMES) / sizeof(struct name_fn_pair); i++) {
-        if (strcmp(exeName, GAMES[i].name) == 0) {
+    // Cut off extension (.exe)
+    wchar_t *extensionDot = wcsrchr(exeName, L'.');
+    if (extensionDot != NULL) {
+        *extensionDot = L'\0';
+    }
+
+    for (size_t i = 0; i < UTILS_COUNT(GAMES); i++) {
+        if (wcsicmp(exeName, GAMES[i].name) == 0) {
             GAMES[i].fill(buf);
             return;
         }
     }
 
-    msg_err_a("Unknown game: %s", exeName);
+    msg_err_w(L"Unknown game: %ls", exeName);
 }

game_payload/src/hi3.c

@@ -3,41 +3,28 @@
 
 #include <game.h>
 
-const char *HI3_NAME             = "BH3";
-const char *HI3_ASSEMBLY_PATH    = "BH3_Data/Native/UserAssembly.dll";
-const char *HI3_TP6_SECTION_NAME = ".bh3";
+const char *HI3_TXS_SECTION_NAME_OLD = ".bh3";
+const char *HI3_TXS_SECTION_NAME_NEW = ".ace";
+
+const char *HI3_BASE_MODULE_NAME = "BH3Base.dll";
+const char *HI3_ASSEMBLY_PATH    = "BH3_Data\\Native\\UserAssembly.dll";
 const char *HI3_TVM_SECTION_NAME = ".tvm0";
 
-struct crc_id_pair {
-    uint32_t crc;
-    enum game_id id;
-};
-
-const struct crc_id_pair HI3_REGIONS[] = {
-    // Only glb for now
-    // It may be possible to get rid of region-specific data altogether in the future
-
-    { 0x45221647, GAME_HI3_GLB } // glb v6.7.0
-};
 
 void hi3_fill_data(struct game_data *buf) {
-    uint32_t crc = utils_file_crc32c("UnityPlayer.dll");
-    
-    enum game_id id = GAME_INVALID;
-    for (size_t i = 0; i < sizeof(HI3_REGIONS) / sizeof(struct crc_id_pair); i++) {
-        if (HI3_REGIONS[i].crc == crc) {
-            id = HI3_REGIONS[i].id;
-        }
+    // !!! TEMPORARY WORKAROUND FOR HI3 6.8.0 -> 6.9.0
+    const uint32_t NEW_CHECKSUM = 0x885b4c63;
+
+    uint32_t crc = utils_file_crc32c(L"UnityPlayer.dll");
+
+    if (crc == NEW_CHECKSUM) {
+        buf->txs_section_name = HI3_TXS_SECTION_NAME_NEW;
+    } else {
+        buf->txs_section_name = HI3_TXS_SECTION_NAME_OLD;
     }
-    
-    if (id == GAME_INVALID) {
-        msg_err_a("Invalid UnityPlayer.dll checksum: %x", crc);
-    }
-    
-    buf->id = id;
-    buf->name = HI3_NAME;
+
+    buf->base_module_name = HI3_BASE_MODULE_NAME;
     buf->assembly_path = HI3_ASSEMBLY_PATH;
-    buf->tp6_section_name = HI3_TP6_SECTION_NAME;
     buf->tvm_section_name = HI3_TVM_SECTION_NAME;
 
     buf->unityplayer_callback = NULL;

game_payload/src/hsr.c

@@ -4,27 +4,33 @@
 
 #include <game.h>
 
-const char *HSR_NAME             = "StarRail";
+const char *HSR_BASE_MODULE_NAME = "StarRailBase.dll";
 const char *HSR_ASSEMBLY_PATH    = "GameAssembly.dll";
-const char *HSR_TP6_SECTION_NAME = ".ace";
+const char *HSR_TXS_SECTION_NAME = ".ace";
 const char *HSR_TVM_SECTION_NAME = ".tvm0";
 
-struct crc_id_pair {
-    uint32_t crc;
-    enum game_id id;
+#define HSR_VERSION "1.3.0"
+
+enum hsr_region {
+    HSR_INVALID,
+    HSR_OS,
+    HSR_CN
 };
 
-const struct crc_id_pair HSR_REGIONS[] = {
-    // It may be possible to get rid of region-specific data altogether in the future
+struct crc_region_pair {
+    uint32_t crc;
+    enum hsr_region id;
+};
 
-    { 0x2df53005, GAME_HSR_OS }, // os v1.1.0
-    { 0x3e644d26, GAME_HSR_CN }  // cn v1.1.0
+const struct crc_region_pair HSR_REGIONS[] = {
+    { 0x748c8f9c, HSR_OS }, // os v1.3.0
+    { 0x76e85a40, HSR_CN }  // cn v1.3.0
 };
 
 #define JUMP_SIZE (6 + sizeof(void*))
 
 // Temporarily hardcoded offset
-// v1.1.0, same for os and cn
+// v1.3.0, same for os and cn
 #define WTSUD_PATCH_OFFSET 0x16430
 
 char wtsud_original_bytes[JUMP_SIZE];
@@ -71,29 +77,23 @@ static void _unityplayer_callback(HMODULE unityModule) {
 }
 
 void hsr_fill_data(struct game_data *buf) {
-    if (!utils_env_enabled("I_WANT_A_BAN")) {
-        msg_err_a("Using this tool with HSR is unsafe. Refer to the readme for more details");
-    } else {
-        msg_warn_a("Using this tool with HSR will most likely result in a ban. Please only use testing accounts");
-    }
-
-    uint32_t crc = utils_file_crc32c("UnityPlayer.dll");
+    uint32_t crc = utils_file_crc32c(L"UnityPlayer.dll");
     
-    enum game_id id = GAME_INVALID;
-    for (size_t i = 0; i < sizeof(HSR_REGIONS) / sizeof(struct crc_id_pair); i++) {
+    enum hsr_region id = HSR_INVALID;
+    for (size_t i = 0; i < UTILS_COUNT(HSR_REGIONS); i++) {
         if (HSR_REGIONS[i].crc == crc) {
             id = HSR_REGIONS[i].id;
+            break;
         }
     }
     
-    if (id == GAME_INVALID) {
-        msg_err_a("Invalid UnityPlayer.dll checksum: %x", crc);
+    if (id == HSR_INVALID) {
+        msg_err_a("Invalid UnityPlayer.dll checksum: 0x%08x. This patch is intended to be used with HSR v" HSR_VERSION, crc);
     }
 
-    buf->id = id;
-    buf->name = HSR_NAME;
+    buf->base_module_name = HSR_BASE_MODULE_NAME;
     buf->assembly_path = HSR_ASSEMBLY_PATH;
-    buf->tp6_section_name = HSR_TP6_SECTION_NAME;
+    buf->txs_section_name = HSR_TXS_SECTION_NAME;
     buf->tvm_section_name = HSR_TVM_SECTION_NAME;
 
     buf->unityplayer_callback = &_unityplayer_callback;

game_payload/src/main.c

@@ -3,8 +3,10 @@
 #include <ntdll.h>
 #include <ace.h>
 #include <game.h>
-#include <tp6.h>
+#include <core.h>
 #include <utils.h>
+#include <msg.h>
+#include <tx.h>
 
 #include <main.h>
 
@@ -23,6 +25,48 @@ void unload_ctr_dec() {
     }
 }
 
+void request_restart() {
+    wchar_t restartFlagFile[MAX_PATH];
+    GetTempPathW(MAX_PATH, restartFlagFile);
+    wcscat(restartFlagFile, L"jadeite\\restart_flag");
+
+    HANDLE hRestartFlag = CreateFileW(restartFlagFile, FILE_WRITE_ACCESS, FILE_SHARE_READ, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL);
+    CloseHandle(hRestartFlag);
+}
+
+static void _run_game(struct game_data *game, wchar_t *txFile) {
+    // Create fake ACE driver files
+    ace_fake_driver_files();
+
+    // Load both ACE modules
+    HMODULE baseModule = ace_load_base_module(game);
+    ace_load_driver_module();
+
+    // ...magic
+    core_setup_patcher(game, baseModule, txFile);
+
+    // Load the UnityPlayer module and invoke the callback
+    HMODULE unityModule = LoadLibraryA("UnityPlayer.dll");
+    INVOKE_CALLBACK(game->unityplayer_callback, unityModule);
+}
+
+static void _run_tx(struct game_data *game, wchar_t *txFile) {
+    // ...more magic
+    size_t tableSize;
+    void *table = core_perform_tx(game, &tableSize);
+
+    // Save to file
+    utils_create_parent_dirs(txFile);
+    utils_save_to_file(txFile, table, tableSize);
+
+    // Cleanup
+    free(table);
+
+    // The file should now exist: restart and launch the game
+    request_restart();
+    exit(0);
+}
+
 BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) {
     // Only listen to attach
     if (reason != DLL_PROCESS_ATTACH) {
@@ -38,19 +82,15 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) {
     struct game_data game;
     game_detect(&game);
 
-    // Create fake ACE driver files
-    ace_fake_driver_files();
+    // Get required table file path
+    wchar_t txFile[MAX_PATH];
+    tx_table_file(&game, txFile);
 
-    // Load both ACE modules
-    HMODULE baseModule = ace_load_base_module(game.name);
-    ace_load_driver_module();
-
-    // ...magic
-    tp6_setup_patcher(&game, baseModule);
-
-    // Load the UnityPlayer module and invoke the callback
-    HMODULE unityModule = LoadLibraryA("UnityPlayer.dll");
-    INVOKE_CALLBACK(game.unityplayer_callback, unityModule);
+    if (utils_path_exists(txFile)) {
+        _run_game(&game, txFile);
+    } else {
+        _run_tx(&game, txFile);
+    }
 
     return TRUE;
 }

game_payload/src/msg.c

@@ -1,5 +1,6 @@
 #include <windows.h>
 #include <stdio.h>
+#include <config.h>
 
 #include <msg.h>
 
@@ -21,8 +22,8 @@
         suffix; \
     }
 
-const char    *TITLE_A = "Jadeite Autopatcher";
-const wchar_t *TITLE_W = L"Jadeite Autopatcher";
+const char    *TITLE_A = "v" JADEITE_VERSION " Jadeite Autopatcher";
+const wchar_t *TITLE_W = L"v" JADEITE_VERSION " Jadeite Autopatcher";
 
 // Error
 DEF_MSG_FN(msg_err_a, char, _vsnprintf, MessageBoxA, TITLE_A, MB_OK | MB_ICONERROR, exit(1))

game_payload/src/pe.c

@@ -1,7 +1,7 @@
 #include <pe.h>
 
-void pe_find_section(HMODULE module, const char *section, MEMORY_BASIC_INFORMATION *buf) {
-    char *cModule = (char*)module;
+IMAGE_SECTION_HEADER *pe_find_section(const void *module, const char *section) {
+    const char *cModule = (const char*)module;
 
     IMAGE_DOS_HEADER* dosHeader = (IMAGE_DOS_HEADER*)module;
     IMAGE_NT_HEADERS64* ntHeaders = (IMAGE_NT_HEADERS64*)(cModule + dosHeader->e_lfanew);
@@ -9,17 +9,15 @@ void pe_find_section(HMODULE module, const char *section, MEMORY_BASIC_INFORMATI
     WORD sectionCount = ntHeaders->FileHeader.NumberOfSections;
     IMAGE_SECTION_HEADER* sectionHeader = (IMAGE_SECTION_HEADER*)(ntHeaders + 1);
 
-    void* targetAddress = 0x0;
     for (WORD i = 0; i < sectionCount; i++) {
         if (strncmp((char*)sectionHeader->Name, section, 8) == 0) {
-            targetAddress = (void*)(cModule + sectionHeader->VirtualAddress);
-            break;
+            return sectionHeader;
         }
 
         sectionHeader++;
     }
-    
-    VirtualQuery(targetAddress, buf, sizeof(MEMORY_BASIC_INFORMATION));
+
+    return NULL;
 }
 
 void *pe_find_entry_point(HMODULE module) {

game_payload/src/tp6.md

@@ -1,5 +0,0 @@
-### 1.0.0
-- First version
-
-### 1.1.0
-- HSR support

game_payload/src/tx.c

@@ -0,0 +1,44 @@
+#include <windows.h>
+#include <stdio.h>
+
+#include <crc32.h>
+#include <msg.h>
+#include <pe.h>
+#include <main.h>
+#include <config.h>
+
+#include <tx.h>
+
+void tx_table_file(struct game_data *game, wchar_t *buf) {
+    // Get temp directory path
+    wchar_t tempDir[MAX_PATH];
+    GetTempPathW(MAX_PATH, tempDir);
+
+    // Memorymap the base module
+    HANDLE baseFile = CreateFileA(game->base_module_name, FILE_READ_ACCESS, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+    if (!baseFile) {
+        msg_err_a("Could not open file: %s", game->base_module_name);
+    }
+
+    HANDLE hBaseMap = CreateFileMappingA(baseFile, NULL, PAGE_READONLY, 0, 0, NULL);
+    char *baseMap = MapViewOfFile(hBaseMap, FILE_MAP_READ, 0, 0, 0);
+    if (!baseMap) {
+        msg_err_a("Could not create file mapping for %s", game->base_module_name);
+    }
+
+    // Checksum the TXS section
+    IMAGE_SECTION_HEADER *txsSection = pe_find_section(baseMap, game->txs_section_name);
+    if (!txsSection) {
+        msg_err_a("Could not find %s in %s. " ISSUE_SUFFIX, game->txs_section_name, game->base_module_name);
+    }
+
+    uint32_t txsChecksum = crc32c(0, baseMap + txsSection->PointerToRawData, txsSection->SizeOfRawData);
+
+    // Format the path
+    wsprintfW(buf, L"%sjadeite\\" JADEITE_VERSION "\\%hs.%x.dat", tempDir, game->base_module_name, txsChecksum);
+
+    // Cleanup
+    UnmapViewOfFile(baseMap);
+    CloseHandle(hBaseMap);
+    CloseHandle(baseFile);
+}

game_payload/src/utils.c

@@ -5,10 +5,14 @@
 
 #include <utils.h>
 
-uint32_t utils_file_crc32c(const char *filePath) {
-    HANDLE file = CreateFileA(filePath, FILE_READ_ACCESS, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+int utils_path_exists(const wchar_t *filePath) {
+    return GetFileAttributesW(filePath) != INVALID_FILE_ATTRIBUTES;
+}
+
+uint32_t utils_file_crc32c(const wchar_t *filePath) {
+    HANDLE file = CreateFileW(filePath, FILE_READ_ACCESS, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
     if (!file) {
-        msg_err_a("Could not open file: %s", filePath);
+        msg_err_w(L"Could not open file: %ls", filePath);
     }
 
     LARGE_INTEGER fileSize;
@@ -17,10 +21,10 @@ uint32_t utils_file_crc32c(const char *filePath) {
     HANDLE hMap = CreateFileMappingA(file, NULL, PAGE_READONLY, 0, 0, NULL);
     char *map = MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0);
     if (!map) {
-        msg_err_a("Could not create file mapping for %s", filePath);
+        msg_err_w(L"Could not create file mapping for %ls", filePath);
     }
 
-    uint32_t crc = crc32c(0, (unsigned char*)map, fileSize.QuadPart);
+    uint32_t crc = crc32c(0, map, fileSize.QuadPart);
 
     UnmapViewOfFile(map);
     CloseHandle(hMap);
@@ -29,7 +33,34 @@ uint32_t utils_file_crc32c(const char *filePath) {
     return crc;
 }
 
+// https://stackoverflow.com/a/16719260
+void utils_create_parent_dirs(const wchar_t *path) {
+    wchar_t dir[MAX_PATH];
+    ZeroMemory(dir, sizeof(dir));
+
+    const wchar_t *end = path - 1;
+
+    while((end = wcschr(++end, L'\\')) != NULL) {
+        wcsncpy(dir, path, end - path + 1);
+
+        if (!utils_path_exists(dir) && !CreateDirectoryW(dir, NULL)) {
+            msg_err_w(L"Failed to create directory: %ls", dir);
+        }
+    }
+}
+
+void utils_save_to_file(const wchar_t *filePath, const void *buf, size_t length) {
+    HANDLE file = CreateFileW(filePath, FILE_WRITE_ACCESS, FILE_SHARE_READ, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL);
+    if (!file) {
+        msg_err_w(L"Could not open file: %ls", filePath);
+    }
+
+    WriteFile(file, buf, length, NULL, FALSE);
+
+    CloseHandle(file);
+}
+
 char utils_env_enabled(const char *env) {
     char *envText = getenv(env);
-    return envText && strcmp(envText, "") != 0;
+    return envText && *envText;
 }

gen_resources.sh

@@ -2,19 +2,38 @@
 
 linker="x86_64-w64-mingw32-ld"
 
+# Select output types
+for i in {0..1}
+do
+    case "$1" in
+        --header)
+            gen_header=1
+            shift
+            ;;
+        --object)
+            gen_object=1
+            shift
+            ;;
+    esac 
+done
+
 # Read project directory
 proj_dir=`realpath "$1"`
 shift
 
-# Read output file destinations
-resources_o=`realpath "$1"`
-shift
-resources_h=`realpath "$1"`
-shift
+# Read output file destinations and make sure they don't exist
+if [ "x${gen_object}" = "x1" ]; then
+    resources_o=`realpath "$1"`
+    shift
 
-# Make sure that the header does not exist
-rm -f "${resources_h}"
-rm -f "${resources_o}"
+    rm -f "${resources_h}"
+fi
+if [ "x${gen_header}" = "x1" ]; then
+    resources_h=`realpath "$1"`
+    shift
+
+    rm -f "${resources_o}"
+fi
 
 # Recomupte relative paths to parameters
 idx=0
@@ -26,24 +45,28 @@ do
     idx="$(("${idx}" + 1))"
 done
 
-# Create the object file
-pushd "${proj_dir}" >> /dev/null
-$linker -r -b binary -o "${resources_o}" "${resource_files[@]}"
-popd >> /dev/null
+if [ "x${gen_object}" = "x1" ]; then
+    # Create the object file
+    pushd "${proj_dir}" >> /dev/null
+    $linker -r -b binary -o "${resources_o}" "${resource_files[@]}"
+    popd >> /dev/null
+fi
 
-# Include stddef.h in the resources header (for size_t)
-echo "#include <stddef.h>" >> "${resources_h}"
+if [ "x${gen_header}" = "x1" ]; then
+    # Include stddef.h in the resources header (for size_t)
+    echo "#include <stddef.h>" >> "${resources_h}"
 
-for resource in "${resource_files[@]}"
-do
-    # Use relative path to the resource as the variable name
-    var_name="_binary_${resource}"
+    for resource in "${resource_files[@]}"
+    do
+        # Use relative path to the resource as the variable name
+        var_name="_binary_${resource}"
 
-    # Replace all non-alphanumeric characters with underscores
-    var_name=`printf "${var_name}" | sed "s/[^a-zA-Z0-9]/_/g"`
+        # Replace all non-alphanumeric characters with underscores
+        var_name=`printf "${var_name}" | sed "s/[^a-zA-Z0-9]/_/g"`
 
-    # Define externs in the header
-    echo "extern void *${var_name}_start;" >> "${resources_h}"
-    echo "extern void *${var_name}_size;" >> "${resources_h}"
-    echo "" >> "${resources_h}"
-done
+        # Define externs in the header
+        echo "extern void *${var_name}_start;" >> "${resources_h}"
+        echo "extern void *${var_name}_size;" >> "${resources_h}"
+        echo "" >> "${resources_h}"
+    done
+fi

injector/meson.build

@@ -17,14 +17,14 @@ exe_res_files = custom_target(
     'launcher_p.[oh]',
     output: [ 'launcher_p.o', 'launcher_p.h' ],
     input: [ launcher_payload_bin ],
-    command: [ gen_res, './injector', '@OUTPUT0@', '@OUTPUT1@', '@INPUT@' ]
+    command: [ gen_res, '--header', '--object', './injector', '@OUTPUT0@', '@OUTPUT1@', '@INPUT@' ]
 )
 
 dll_res_files = custom_target(
     'game_p.[oh]',
     output: [ 'game_p.o', 'game_p.h' ],
     input: [ game_payload_bin ],
-    command: [ gen_res, './injector', '@OUTPUT0@', '@OUTPUT1@', '@INPUT@' ]
+    command: [ gen_res, '--header', '--object', './injector', '@OUTPUT0@', '@OUTPUT1@', '@INPUT@' ]
 )
 
 # Main injector exe

injector/src/dll.c

@@ -30,7 +30,7 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) {
     // Compute the working directory path
     wchar_t workdir[MAX_PATH];
     wcscpy(workdir, targetExe);
-    *(wcsrchr(workdir, '\\')) = '\0';
+    *(wcsrchr(workdir, L'\\')) = L'\0';
 
     // SAFETY: verify that the injector is not inside the game directory
     HMODULE kernel32 = GetModuleHandleA("kernel32.dll");
@@ -42,7 +42,7 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) {
 
         char *i = unixInjectDll, *w = unixWorkdir;
         char startsWith = 0;
-        while (*i != '\0' && *w != '\0') {
+        while (*i && *w) {
             startsWith = *i == *w;
             if (!startsWith) break;
 
@@ -61,51 +61,61 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) {
         MessageBoxW(NULL, L"Could not find wine_get_unix_file_name! Wine version too old?", J_MB_TITLE, MB_OK | MB_ICONWARNING);
     }
 
-    // Start the game
-    STARTUPINFOW si;
-    ZeroMemory(&si, sizeof(si));
+    // Get restart flag file path
+    wchar_t restartFlagFile[MAX_PATH];
+    GetTempPathW(MAX_PATH, restartFlagFile);
+    wcscat(restartFlagFile, L"jadeite\\restart_flag");
 
-    PROCESS_INFORMATION pi;
-    si.cb = sizeof(si);
-    ZeroMemory(&pi, sizeof(pi));
+    do {
+        // Start the game
+        STARTUPINFOW si;
+        ZeroMemory(&si, sizeof(si));
+        si.cb = sizeof(si);
 
-    if (!CreateProcessW(
-        NULL,
-        cmdline,
-        NULL,
-        NULL,
-        FALSE,
-        CREATE_SUSPENDED,
-        NULL,
-        workdir,
-        &si,
-        &pi
-    )) {
-        wchar_t message[1024];
-        wsprintfW(message, L"Failed to start game process: %ld", GetLastError());
-        MessageBoxW(NULL, message, J_MB_TITLE, MB_OK | MB_ICONERROR);
+        PROCESS_INFORMATION pi;
+        ZeroMemory(&pi, sizeof(pi));
 
-        exit(1);
-    }
+        if (!CreateProcessW(
+            NULL,
+            cmdline,
+            NULL,
+            NULL,
+            FALSE,
+            CREATE_SUSPENDED,
+            NULL,
+            workdir,
+            &si,
+            &pi
+        )) {
+            wchar_t message[1024];
+            wsprintfW(message, L"Failed to start game process: %ld\nGame executable path: '%ls'", GetLastError(), targetExe);
+            MessageBoxW(NULL, message, J_MB_TITLE, MB_OK | MB_ICONERROR);
 
-    // Inject
-    void *payloadStart = &_binary_game_p_o_p_game_p_bin_start;
-    size_t payloadSize = (size_t)&_binary_game_p_o_p_game_p_bin_size;
-    inject(pi.hProcess, payloadStart, payloadSize, injectDll);
+            exit(1);
+        }
 
-    // Optional: wait for user input before resuming (useful for debugging) 
-    char *waitEnabled = getenv("WAIT_BEFORE_RESUME");
-    if (waitEnabled && strcmp(waitEnabled, "") != 0) {
-        wchar_t message[64];
-        wsprintfW(message, L"PID: %ld. Press OK to continue", pi.dwProcessId);
-        MessageBoxW(NULL, message, J_MB_TITLE, MB_OK | MB_ICONINFORMATION);
-    }
+        // Inject
+        void *payloadStart = &_binary_game_p_o_p_game_p_bin_start;
+        size_t payloadSize = (size_t)&_binary_game_p_o_p_game_p_bin_size;
+        inject(pi.hProcess, payloadStart, payloadSize, injectDll);
 
-    // Resume the process
-    ResumeThread(pi.hThread);
+        // Remove the restart flag file
+        DeleteFileW(restartFlagFile);
 
-    // The launcher process should now hang untill the game terminates
-    WaitForSingleObject(pi.hProcess, INFINITE);
+        // Optional: wait for user input before resuming (useful for debugging) 
+        char *waitEnabled = getenv("WAIT_BEFORE_RESUME");
+        if (waitEnabled && *waitEnabled) {
+            wchar_t message[64];
+            wsprintfW(message, L"PID: %ld. Press OK to continue", pi.dwProcessId);
+            MessageBoxW(NULL, message, J_MB_TITLE, MB_OK | MB_ICONINFORMATION);
+        }
+
+        // Resume the process
+        ResumeThread(pi.hThread);
+
+        // The launcher process should now hang untill the game terminates
+        WaitForSingleObject(pi.hProcess, INFINITE);
+    } while (GetFileAttributesW(restartFlagFile) != INVALID_FILE_ATTRIBUTES);
 
     return TRUE;
 }

injector/src/exe.c

@@ -85,9 +85,9 @@ int wmain(int argc, wchar_t **argv) {
 
     STARTUPINFOW si;
     ZeroMemory(&si, sizeof(si));
+    si.cb = sizeof(si);
 
     PROCESS_INFORMATION pi;
-    si.cb = sizeof(si);
     ZeroMemory(&pi, sizeof(pi));
 
     if (!CreateProcessW(

injector/src/game_p.asm

@@ -1,5 +1,50 @@
 BITS 64
 
+; Macro definitions
+
+; read dst, pSrc, size
+%macro read 3
+
+    mov %1, [%2]
+    add %2, %3
+
+%endmacro
+
+; copy pDst, pSrc, temp, tempSize
+%macro copy 4
+
+    mov %3, [%2]
+    mov [%1], %3
+    add %1, %4
+    add %2, %4
+
+%endmacro
+
+; unprotect addr, size, fn
+%macro unprotect 3
+
+    mov rcx, %1
+    mov rdx, %2
+    mov r8, 40h  ; PAGE_EXECUTE_READWRITE
+    lea r9, [rel oldProtect]
+
+    call %3
+
+%endmacro
+
+; reprotect addr, size, fn
+%macro reprotect 3
+
+    mov rcx, %1
+    mov rdx, %2
+    lea r9, [rel oldProtect]
+    mov r8d, [r9]
+
+    call %3
+
+%endmacro
+
+
 main: ; Replacement entry point
     push rsi
     push rdi
@@ -16,6 +61,14 @@ main: ; Replacement entry point
     mov rdi, rax   ; *GetProcAddress
 
 
+    mov rcx, rsi          ; kernel32.dll
+    lea rdx, [rel s_VirtualProtect]
+    call rdi              ; rax = *VirtualProtect
+    
+    mov rcx, rax
+    call RecoverExecutable
+
+
     mov rcx, rsi          ; kernel32.dll
     lea rdx, [rel s_LoadLibraryW]
     call rdi              ; rax = *LoadLibraryW
@@ -63,10 +116,65 @@ main: ; Replacement entry point
     ret
 
 
+RecoverExecutable:  ; expects *VirtualProtect in rcx
+    push rbx
+    push r12
+    push r13
+    push r14
+    sub rsp, 8
+
+    mov r13, rcx
+
+    ; Find the recovery data structure
+    lea rbx, [rel dllPath]
+
+.search:
+    read ax, rbx, 2
+    test ax, ax
+    jnz .search
+
+    ; Recover entry point bytes (6 + 8 = 14 total)
+    read r12, rbx, 8  ; Address
+    mov r14, r12
+
+    unprotect r14, 14, r13
+    copy r12, rbx, rax, 8
+    copy r12, rbx, eax, 4
+    copy r12, rbx, ax,  2
+    reprotect r14, 14, r13
+
+    ; Recover import descriptor bytes (20 total)
+    read r12, rbx, 8
+    mov r14, r12
+
+    unprotect r14, 20, r13
+    copy r12, rbx, rax, 8
+    copy r12, rbx, rax, 8
+    copy r12, rbx, eax, 4
+    reprotect r14, 20, r13
+
+    ; Recover import data directory entry size bytes (4 total)
+    read r12, rbx, 8
+    mov r14, r12
+
+    unprotect r14, 4, r13
+    copy r12, rbx, eax, 4
+    reprotect r14, 4, r13
+
+    add rsp, 8
+    pop r14
+    pop r13
+    pop r12
+    pop rbx
+    ret
+
+
 %include "gpa.asm"
 
+oldProtect: dd 0
 
 ; Strings
+s_VirtualProtect:    db "VirtualProtect", 0
 s_LoadLibraryW:      db "LoadLibraryW", 0
 s_GetModuleHandleA:  db "GetModuleHandleA", 0
 s_GetCommandLineW:   db "GetCommandLineW", 0

injector/src/inject.c

@@ -1,5 +1,22 @@
 #include <inject.h>
 
+#define JUMP_SIZE (6 + sizeof(void*))
+
+// Original values to recover after the injection
+// Recovery is performed by the assembly payload
+#pragma pack(push, 1)
+struct recovery_data {
+    void *entryPointAddress;
+    char entryPointData[JUMP_SIZE];
+
+    void *importDescriptorAddress;
+    IMAGE_IMPORT_DESCRIPTOR importDescriptorData;
+
+    void *sizeFieldAddress;
+    DWORD sizeFieldData;
+};
+#pragma pack(pop)
+
 static inline void write_protected_process_memory(HANDLE process, void *address, const void *buf, size_t size) {
     DWORD oldProtect;
     VirtualProtectEx(process, address, size, PAGE_EXECUTE_READWRITE, &oldProtect);
@@ -13,13 +30,6 @@ static inline void write_protected_process_memory(HANDLE process, void *address,
 void inject(HANDLE process, const void *payload, size_t payloadSize, const wchar_t *dllPath) {
     size_t _; // Contrary to the docs, {Write,Read}ProcessMemory likes to crash if the last arg is NULL
 
-    // Inject the loader into the module
-    size_t dllPathLen = (wcslen(dllPath) + 1) * sizeof(wchar_t);
-
-    char *remoteAlloc = VirtualAllocEx(process, NULL, payloadSize + dllPathLen, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
-    WriteProcessMemory(process, remoteAlloc, payload, payloadSize, &_);
-    WriteProcessMemory(process, remoteAlloc + payloadSize, dllPath, dllPathLen, &_);
-
     // Find the EXE header in the process
     char exeHeader[1024];
     IMAGE_DOS_HEADER *dosHeader = NULL;
@@ -45,7 +55,7 @@ void inject(HANDLE process, const void *payload, size_t payloadSize, const wchar
         }
 
         // Skip DLLs
-        if ((ntHeaders->FileHeader.Characteristics | IMAGE_FILE_DLL) == IMAGE_FILE_DLL) {
+        if ((ntHeaders->FileHeader.Characteristics & IMAGE_FILE_DLL) == IMAGE_FILE_DLL) {
             goto cont;
         }
 
@@ -64,25 +74,60 @@ void inject(HANDLE process, const void *payload, size_t payloadSize, const wchar
 
     char *exe = (char*)memoryInfo.BaseAddress;
 
+
+    // Inject the loader into the process
+    const unsigned char JUMP_INST[] = { 0xFF, 0x25, 0x00, 0x00, 0x00, 0x00 };
+   
+    size_t dllPathSize = (wcslen(dllPath) + 1) * sizeof(wchar_t);
+
+    size_t allocSize = payloadSize + dllPathSize + sizeof(struct recovery_data);
+    char *remoteAlloc = VirtualAllocEx(process, NULL, allocSize, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
+
+    // Write the assembly payload and dll path
+    WriteProcessMemory(process, remoteAlloc, payload, payloadSize, &_);
+    WriteProcessMemory(process, remoteAlloc + payloadSize, dllPath, dllPathSize, &_);
+
+
+    // Modify the executable to run the assembly payload
+    // Recovery data structure
+    struct recovery_data rd;
+
     // Replace the entry point with a jump to the loader
     char *entryPoint = exe + ntHeaders->OptionalHeader.AddressOfEntryPoint;
 
-    const unsigned char JUMP_INST[] = { 0xFF, 0x25, 0x00, 0x00, 0x00, 0x00 };
+    // Save the original entry point address and bytes
+    rd.entryPointAddress = entryPoint;
+    ReadProcessMemory(process, rd.entryPointAddress, rd.entryPointData, sizeof(rd.entryPointData), &_);
 
+    // Replace the entry point with a jump to the assembly payload
     write_protected_process_memory(process, entryPoint, JUMP_INST, sizeof(JUMP_INST));
     write_protected_process_memory(process, entryPoint + sizeof(JUMP_INST), &remoteAlloc, sizeof(remoteAlloc));
 
+
     // Break the import table to prevent any dlls from being loaded
     // Step 1: break the first import descriptor
     char *importDescriptors = exe + ntHeaders->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress;
+
+    // Save the original descriptor address and bytes
+    rd.importDescriptorAddress = importDescriptors;
+    ReadProcessMemory(process, rd.importDescriptorAddress, &rd.importDescriptorData, sizeof(rd.importDescriptorData), &_);
+
+    // Overwrite with zeroes    
     IMAGE_IMPORT_DESCRIPTOR firstDescriptor;
     ZeroMemory(&firstDescriptor, sizeof(firstDescriptor));
-
     write_protected_process_memory(process, importDescriptors, &firstDescriptor, sizeof(firstDescriptor));
 
     // Step 2: break the image data directory entry
-    size_t ddOffset = ((char*)&(ntHeaders->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].Size)) - exeHeader;
-    DWORD newSize = 0;
+    char* ddAddr = ((char*)&(ntHeaders->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].Size)) - exeHeader + exe;
+    
+    // Save the original value
+    rd.sizeFieldAddress = ddAddr;
+    ReadProcessMemory(process, rd.sizeFieldAddress, &rd.sizeFieldData, sizeof(rd.sizeFieldData), &_);
 
-    write_protected_process_memory(process, exe + ddOffset, &newSize, sizeof(newSize));
+    // Set to 0
+    DWORD newSize = 0;
+    write_protected_process_memory(process, ddAddr, &newSize, sizeof(newSize));
+
+    // Write recovery data to the allocation
+    WriteProcessMemory(process, remoteAlloc + payloadSize + dllPathSize, &rd, sizeof(rd), &_);
 }

meson.build

@@ -1,4 +1,4 @@
-project('jadeite', 'c', version: '1.1.7')
+project('jadeite', 'c', version: '3.0.7')
 
 nasm = find_program('nasm')
 gen_res = find_program('gen_resources.sh')

metadata.json

@@ -1,22 +1,42 @@
 {
     "jadeite": {
-        "version": "1.1.7"
+        "version": "3.0.7"
     },
     "games": {
         "hi3rd": {
             "global": {
                 "status": "verified",
-                "version": "6.7.0"
+                "version": "6.8.0"
+            },
+            "sea": {
+                "status": "verified",
+                "version": "6.8.0"
+            },
+            "china": {
+                "status": "verified",
+                "version": "6.9.0"
+            },
+            "taiwan": {
+                "status": "verified",
+                "version": "6.8.0"
+            },
+            "korea": {
+                "status": "verified",
+                "version": "6.8.0"
+            },
+            "japan": {
+                "status": "verified",
+                "version": "6.8.0"
             }
         },
         "hsr": {
             "global": {
-                "status": "unsafe",
-                "version": "1.1.0"
+                "status": "verified",
+                "version": "1.3.0"
             },
             "china": {
-                "status": "unsafe",
-                "version": "1.1.0"
+                "status": "verified",
+                "version": "1.3.0"
             }
         }
     }