v1.1.4

Closes #4

.gitignore

@@ -8,3 +8,4 @@ game_payload/src/tp6.c
 build
 out
 jadeite.zip
+v*.zip

README.md

@@ -1,28 +1,44 @@
-# PROOF OF CONCEPT. DO NOT USE IF YOU DON'T KNOW WHAT YOU'RE DOING
-
 ### Games and regions
-This project is in the proof-of-concept stage. Currently, only **3rd glb v6.6.0** is supported. 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.
+- **3rd**: glb v6.6.0
+- **SR**: os/cn v1.1.0 (unsafe, refer to [configuration](#configuration)) 
+
+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.
 
 ### Information
-The anticheat the games use is fundamentally incompatible with Wine in multiple ways. This tool launches the game without it (`inject/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/launcher_payload`) and imitates it's behaviour (`game_payload`).
 
-Does not work on Windows.
+**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.
+
+**Using third-party software (such as this tool) with the games violates their Terms of Service**. Therefore, **you may receive a ban**. No bans were ever reported with 3rd, however the legacy patch for SR did cause many. **Use at your own risk and only if you understand all the possible consequences**.
+
+**This is not a cheating tool**. Using it with Windows is not possible, and Windows support is not planned or intended in any way. However, as it does not perform any on-disk file modifications, you may reuse the same game install for Windows if you have a dual-boot setup.
 
 ### Usage
-**Refer to [Third-party launchers](#third-party-launchers) (will be written later)** for convenient usage. If you don't want to (or can't) use third-party launchers, continue reading the section below.
+**Refer to [third-party launchers](#third-party-launchers) (will be written later)** for convenient usage. If you don't want to (or can't) use third-party launchers, continue reading the section below.
 
 **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.
 
 Manual usage instructions:
 - Download the game you want to run
 - Download a 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 `wine jadeite.exe "Z:\\wine\\path\\to\\game.exe"`
+- 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.
+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.
+
+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.
+
+- `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
 
 ### Internals
 This tool consists of three parts: the main injector (`injector`), the launcher payload (`injector/launcher_payload`) and the game payload (`game_payload`).

SERVERS.txt

@@ -2,3 +2,11 @@
 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

build.sh

@@ -1,9 +1,11 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
+
+strip="x86_64-w64-mingw32-strip"
 
 rm -f jadeite.zip
 rm -rf out
 
-sh setup.sh
+sh setup.sh --buildtype=release
 ninja -C build
 
 mkdir out
@@ -13,6 +15,8 @@ cp ./build/injector/launcher_payload/launcher_payload.dll ./out
 cp ./build/game_payload/game_payload.dll ./out
 cp ./LICENSE.txt ./out
 
+$strip ./out/*.{exe,dll}
+
 if [ "x$1" = "xrelease" ]; then
     cd out
     zip ../jadeite.zip *

game_payload/include/err.h

@@ -1,6 +0,0 @@
-#pragma once
-
-#include <wchar.h>
-
-void err_mb_a(const char *format, ...);
-void err_mb_w(const wchar_t *format, ...);

game_payload/include/game.h

@@ -5,16 +5,27 @@
 enum game_id {
     GAME_INVALID,
     
-    GAME_HI3_GLB
+    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 *assembly_path;
-    const wchar_t *assembly_name_lwr;
     const char *tp6_section_name; // Unused for now
     const char *tvm_section_name;
+
+    unityplayer_callback_t unityplayer_callback;
 };
 
 void game_detect(struct game_data *buf);
+
+void hi3_fill_data(struct game_data *buf);
+void hsr_fill_data(struct game_data *buf);

game_payload/include/hi3.h

@@ -1,5 +0,0 @@
-#pragma once
-
-#include <game.h>
-
-void hi3_fill_data(struct game_data *buf);

game_payload/include/main.h

@@ -0,0 +1,4 @@
+#pragma once
+
+void unload_ctr_inc();
+void unload_ctr_dec();

game_payload/include/msg.h

@@ -0,0 +1,12 @@
+#pragma once
+
+#include <wchar.h>
+
+void msg_err_a(const char *format, ...);
+void msg_err_w(const wchar_t *format, ...);
+
+void msg_warn_a(const char *format, ...);
+void msg_warn_w(const wchar_t *format, ...);
+
+void msg_info_a(const char *format, ...);
+void msg_info_w(const wchar_t *format, ...);

game_payload/include/tp6.h

@@ -4,4 +4,4 @@
 
 #include <game.h>
 
-void tp6_setup_patcher(struct game_data *game, HMODULE thisModule, HMODULE baseModule);
+void tp6_setup_patcher(struct game_data *game, HMODULE baseModule);

game_payload/include/utils.h

@@ -3,3 +3,5 @@
 #include <stdint.h>
 
 uint32_t utils_file_crc32c(const char *filePath);
+
+char utils_env_enabled(const char *env);

game_payload/meson.build

@@ -6,15 +6,21 @@ sources = [
     'src/pe.c',
     'src/game.c',
     'src/hi3.c',
+    'src/hsr.c',
     'src/utils.c',
-    'src/err.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/hi3/glb/entries.dat',
+
+    'res/hsr/os/allocations.dat',
+    'res/hsr/os/entries.dat',
+    'res/hsr/cn/allocations.dat',
+    'res/hsr/cn/entries.dat'
 ]
 
 # Generate resource files for ./res

game_payload/src/ace.c

@@ -1,6 +1,6 @@
 #include <ntdll.h>
 #include <pe.h>
-#include <err.h>
+#include <msg.h>
 
 #include <ace.h>
 
@@ -41,13 +41,13 @@ void ace_fake_driver_files() {
 
     HANDLE wdDriverFile = CreateFileA(wdDriverPath, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
     if (!wdDriverFile) {
-        err_mb_a("Could not create driver file: %s", wdDriverPath);
+        msg_err_a("Could not create driver file: %s", wdDriverPath);
     }
 
     // Just in case
     HANDLE s32DriverFile = CreateFileA(s32DriverPath, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
     if (!s32DriverFile) {
-        err_mb_a("Could not create driver file: %s", s32DriverPath);
+        msg_err_a("Could not create driver file: %s", s32DriverPath);
     }
 
     CloseHandle(wdDriverFile);
@@ -64,7 +64,7 @@ HMODULE ace_load_base_module(const char *exeName) {
 
     HMODULE baseModule = LoadLibraryW(baseModuleName);
     if (!baseModule) {
-        err_mb_w(L"Could not load base module: %ls", baseModuleName);
+        msg_err_w(L"Could not load base module: %ls", baseModuleName);
     }
 
     // LoadLibraryA is synchronous; the notification function has already finished executing
@@ -81,7 +81,7 @@ HMODULE ace_load_driver_module() {
 
     HMODULE driverModule = LoadLibraryA(driverModulePath);
     if (!driverModule) {
-        err_mb_a("Could not load driver module: %s", driverModulePath);
+        msg_err_a("Could not load driver module: %s", driverModulePath);
     }
 
     // LoadLibraryA is synchronous; the notification function has already finished executing

game_payload/src/err.c

@@ -1,26 +0,0 @@
-#include <windows.h>
-#include <stdio.h>
-
-#include <err.h>
-
-#define DEF_ERROR_FN(name, type, printfn, mbfn, projname) \
-    void name(const type *format, ...) { \
-        va_list args; \
-        va_start(args, format); \
-        \
-        int count = printfn(NULL, 0, format, args) + 1; \
-        \
-        type *buf = malloc(count * sizeof(type)); \
-        printfn(buf, count, format, args); \
-        \
-        mbfn(NULL, buf, projname, MB_OK | MB_ICONERROR); \
-        \
-        va_end(args); \
-        \
-        free(buf); \
-        exit(1); \
-    }
-
-
-DEF_ERROR_FN(err_mb_a, char, _vsnprintf, MessageBoxA, "Jadeite Autopatcher")
-DEF_ERROR_FN(err_mb_w, wchar_t, _vsnwprintf, MessageBoxW, L"Jadeite Autopatcher")

game_payload/src/game.c

@@ -1,19 +1,32 @@
-#include <err.h>
-#include <hi3.h>
+#include <msg.h>
 
 #include <game.h>
 
+typedef void (*fill_fn)(struct game_data *buf);
+
+struct name_fn_pair {
+    const char *name;
+    fill_fn fill;
+};
+
+const struct name_fn_pair GAMES[] = {
+    { "bh3.exe",      &hi3_fill_data },
+    { "starrail.exe", &hsr_fill_data }
+};
+
 void game_detect(struct game_data *buf) {
-    wchar_t exePath[MAX_PATH];
-    GetModuleFileNameW(NULL, exePath, MAX_PATH);
+    char exePath[MAX_PATH];
+    GetModuleFileNameA(NULL, exePath, MAX_PATH);
 
-    wchar_t *exeName = wcsrchr(exePath, L'\\') + 1;
-    wcslwr(exeName);
+    char *exeName = strrchr(exePath, '\\') + 1;
+    strlwr(exeName);
 
-    // Only HI3 is supported for now
-    if (wcscmp(exeName, L"bh3.exe") == 0) {
-        hi3_fill_data(buf);
-    } else {
-        err_mb_w(L"Unknown game: %ls", exeName);
+    for (size_t i = 0; i < sizeof(GAMES) / sizeof(struct name_fn_pair); i++) {
+        if (strcmp(exeName, GAMES[i].name) == 0) {
+            GAMES[i].fill(buf);
+            return;
+        }
     }
+
+    msg_err_a("Unknown game: %s", exeName);
 }

game_payload/src/hi3.c

@@ -1,13 +1,12 @@
 #include <utils.h>
-#include <err.h>
+#include <msg.h>
 
-#include <hi3.h>
+#include <game.h>
 
-const char    *HI3_NAME              = "BH3";
-const char    *HI3_ASSEMBLY_PATH     = "BH3_Data/Native/UserAssembly.dll";
-const wchar_t *HI3_ASSEMBLY_NAME_LWR = L"userassembly.dll";
-const char    *HI3_TP6_SECTION_NAME  = ".bh3";
-const char    *HI3_TVM_SECTION_NAME  = ".tvm0";
+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_TVM_SECTION_NAME = ".tvm0";
 
 struct crc_id_pair {
     uint32_t crc;
@@ -32,13 +31,14 @@ void hi3_fill_data(struct game_data *buf) {
     }
     
     if (id == GAME_INVALID) {
-        err_mb_a("Invalid UnityPlayer.dll checksum: %d", crc);
+        msg_err_a("Invalid UnityPlayer.dll checksum: %d", crc);
     }
     
     buf->id = id;
     buf->name = HI3_NAME;
     buf->assembly_path = HI3_ASSEMBLY_PATH;
-    buf->assembly_name_lwr = HI3_ASSEMBLY_NAME_LWR;
     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

@@ -0,0 +1,103 @@
+#include <utils.h>
+#include <msg.h>
+#include <main.h>
+
+#include <crc32.h>
+#include <pe.h>
+
+#include <game.h>
+
+const char *HSR_NAME             = "StarRail";
+const char *HSR_ASSEMBLY_PATH    = "GameAssembly.dll";
+const char *HSR_TP6_SECTION_NAME = ".ace";
+const char *HSR_TVM_SECTION_NAME = ".tvm0";
+
+struct crc_id_pair {
+    uint32_t crc;
+    enum game_id id;
+};
+
+const struct crc_id_pair HSR_REGIONS[] = {
+    // It may be possible to get rid of region-specific data altogether in the future
+
+    { 0x2df53005, GAME_HSR_OS }, // os v1.1.0
+    { 0x3e644d26, GAME_HSR_CN }  // cn v1.1.0
+};
+
+#define JUMP_SIZE (6 + sizeof(void*))
+
+// Temporarily hardcoded offset
+// v1.1.0, same for os and cn
+#define WTSUD_PATCH_OFFSET 0x16430
+
+char wtsud_original_bytes[JUMP_SIZE];
+char *wtsud_patch_addr;
+
+static void _wtsud_stub() {
+    // Recover original bytes
+    DWORD oldProtect;
+    VirtualProtect(wtsud_patch_addr, JUMP_SIZE, PAGE_EXECUTE_READWRITE, &oldProtect);
+
+    memcpy(wtsud_patch_addr, wtsud_original_bytes, JUMP_SIZE);
+
+    VirtualProtect(wtsud_patch_addr, JUMP_SIZE, oldProtect, &oldProtect);
+    
+    unload_ctr_dec();
+}
+
+static void _unityplayer_callback(HMODULE unityModule) {
+    if (utils_env_enabled("SRFIX_DISABLE")) {
+        msg_info_a("Shared resources fix disabled. The game may not work");
+        return;
+    }
+
+    // Remove dependency on shared resources by patching WriteTextureStatisticUserData
+    unload_ctr_inc();
+
+    wtsud_patch_addr = ((char*)unityModule) + 0x16430;
+
+    DWORD oldProtect;
+    VirtualProtect(wtsud_patch_addr, JUMP_SIZE, PAGE_EXECUTE_READWRITE, &oldProtect);
+
+    // Save original bytes
+    memcpy(wtsud_original_bytes, wtsud_patch_addr, JUMP_SIZE);
+
+    // Write jump
+    const char JUMP_INST[] = { 0xFF, 0x25, 0x00, 0x00, 0x00, 0x00 }; // jmp [$ + 6]
+    memcpy(wtsud_patch_addr, JUMP_INST, sizeof(JUMP_INST));
+
+    // Write destination address
+    void *destAddr = &_wtsud_stub;
+    memcpy(wtsud_patch_addr + sizeof(JUMP_INST), &destAddr, sizeof(destAddr));
+
+    VirtualProtect(wtsud_patch_addr, JUMP_SIZE, oldProtect, &oldProtect);
+}
+
+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");
+    
+    enum game_id id = GAME_INVALID;
+    for (size_t i = 0; i < sizeof(HSR_REGIONS) / sizeof(struct crc_id_pair); i++) {
+        if (HSR_REGIONS[i].crc == crc) {
+            id = HSR_REGIONS[i].id;
+        }
+    }
+    
+    if (id == GAME_INVALID) {
+        msg_err_a("Invalid UnityPlayer.dll checksum: %d", crc);
+    }
+
+    buf->id = id;
+    buf->name = HSR_NAME;
+    buf->assembly_path = HSR_ASSEMBLY_PATH;
+    buf->tp6_section_name = HSR_TP6_SECTION_NAME;
+    buf->tvm_section_name = HSR_TVM_SECTION_NAME;
+
+    buf->unityplayer_callback = &_unityplayer_callback;
+}

game_payload/src/main.c

@@ -6,12 +6,31 @@
 #include <tp6.h>
 #include <utils.h>
 
+#include <main.h>
+
+HMODULE this_module;
+size_t unload_ctr = 0;
+
+void unload_ctr_inc() {
+    unload_ctr++;
+}
+
+void unload_ctr_dec() {
+    unload_ctr--;
+    if (unload_ctr == 0) {
+        void *pFreeLibrary = GetProcAddress(GetModuleHandleA("kernel32.dll"), "FreeLibrary");
+        CreateThread(NULL, 0, pFreeLibrary, this_module, 0, NULL);
+    }
+}
+
 BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) {
     // Only listen to attach
     if (reason != DLL_PROCESS_ATTACH) {
         return TRUE;
     }
 
+    this_module = instance;
+
     // Dynamically link functions from ntdll
     ntdll_link();
 
@@ -27,7 +46,11 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) {
     ace_load_driver_module();
 
     // ...magic
-    tp6_setup_patcher(&game, instance, baseModule);
+    tp6_setup_patcher(&game, baseModule);
+
+    // Load the UnityPlayer module and invoke the callback
+    HMODULE unityModule = LoadLibraryA("UnityPlayer.dll");
+    INVOKE_CALLBACK(game.unityplayer_callback, unityModule);
 
     return TRUE;
 }

game_payload/src/msg.c

@@ -0,0 +1,37 @@
+#include <windows.h>
+#include <stdio.h>
+
+#include <msg.h>
+
+#define DEF_MSG_FN(name, type, printfn, mbfn, projname, flags, suffix) \
+    void name(const type *format, ...) { \
+        va_list args; \
+        va_start(args, format); \
+        \
+        int count = printfn(NULL, 0, format, args) + 1; \
+        \
+        type *buf = malloc(count * sizeof(type)); \
+        printfn(buf, count, format, args); \
+        \
+        mbfn(NULL, buf, projname, flags); \
+        \
+        va_end(args); \
+        \
+        free(buf); \
+        suffix; \
+    }
+
+const char    *TITLE_A = "Jadeite Autopatcher";
+const wchar_t *TITLE_W = L"Jadeite Autopatcher";
+
+// Error
+DEF_MSG_FN(msg_err_a, char, _vsnprintf, MessageBoxA, TITLE_A, MB_OK | MB_ICONERROR, exit(1))
+DEF_MSG_FN(msg_err_w, wchar_t, _vsnwprintf, MessageBoxW, TITLE_W, MB_OK | MB_ICONERROR, exit(1))
+
+// Warn
+DEF_MSG_FN(msg_warn_a, char, _vsnprintf, MessageBoxA, TITLE_A, MB_OK | MB_ICONEXCLAMATION,)
+DEF_MSG_FN(msg_warn_w, wchar_t, _vsnwprintf, MessageBoxW, TITLE_W, MB_OK | MB_ICONEXCLAMATION,)
+
+// Info
+DEF_MSG_FN(msg_info_a, char, _vsnprintf, MessageBoxA, TITLE_A, MB_OK | MB_ICONINFORMATION,)
+DEF_MSG_FN(msg_info_w, wchar_t, _vsnwprintf, MessageBoxW, TITLE_W, MB_OK | MB_ICONINFORMATION,)

game_payload/src/tp6.md

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

game_payload/src/utils.c

@@ -1,14 +1,14 @@
 #include <windows.h>
 
 #include <crc32.h>
-#include <err.h>
+#include <msg.h>
 
 #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);
     if (!file) {
-        err_mb_a("Could not open file: %s", filePath);
+        msg_err_a("Could not open file: %s", filePath);
     }
 
     LARGE_INTEGER fileSize;
@@ -17,7 +17,7 @@ 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) {
-        err_mb_a("Could not create file mapping for %s", filePath);
+        msg_err_a("Could not create file mapping for %s", filePath);
     }
 
     uint32_t crc = crc32c(0, (unsigned char*)map, fileSize.QuadPart);
@@ -28,3 +28,8 @@ uint32_t utils_file_crc32c(const char *filePath) {
 
     return crc;
 }
+
+char utils_env_enabled(const char *env) {
+    char *envText = getenv(env);
+    return envText && strcmp(envText, "") != 0;
+}

injector/include/injshared.h

@@ -1,5 +1,11 @@
 #include <windows.h>
 
+#define EPFX "__JADEITE_"
+
+const char ENV_EXE_PATH[] = EPFX"TARGET_EXE_PATH";
+const char ENV_DLL_PATH[] = EPFX"INJECT_DLL_PATH";
+const char ENV_PROC_CMD[] = EPFX"PROCESS_COMMAND";
+
 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);
@@ -22,8 +28,8 @@ static inline void inject(HANDLE process, const void *payload, size_t payloadSiz
 
     // Find the EXE header in the process
     char exeHeader[1024];
-    IMAGE_DOS_HEADER *dosHeader;
-    IMAGE_NT_HEADERS64 *ntHeaders;
+    IMAGE_DOS_HEADER *dosHeader = NULL;
+    IMAGE_NT_HEADERS64 *ntHeaders = NULL;
 
     MEMORY_BASIC_INFORMATION memoryInfo;
     char *currentAddress = 0x0;

injector/launcher_payload/src/dll.c

@@ -1,15 +1,9 @@
+#include <stdio.h>
+
 #include <injshared.h>
 
 #include <lpayload.h>
 
-const char EXE_ENV[] = "JADEITE_TARGET_EXE_PATH";
-const char INJECT_DLL_ENV[] = "JADEITE_INJECT_DLL_PATH";
-
-static inline void read_env(const char *env, char *dest, size_t size) {
-    GetEnvironmentVariableA(env, dest, size);
-    SetEnvironmentVariableA(env, "");
-}
-
 BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) {
     // Only listen for attach
     if (reason != DLL_PROCESS_ATTACH) {
@@ -17,12 +11,13 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) {
     }
 
     // Get target EXE path
-    char targetExe[MAX_PATH];
-    read_env(EXE_ENV, targetExe, sizeof(targetExe));
+    char *targetExe = getenv(ENV_EXE_PATH);
     
     // Get the path of the DLL to inject
-    char injectDll[MAX_PATH];
-    read_env(INJECT_DLL_ENV, injectDll, sizeof(injectDll));
+    char *injectDll = getenv(ENV_DLL_PATH);
+
+    // Get game commandline
+    char *cmdline = getenv(ENV_PROC_CMD);
 
     // Compute the working directory path
     char workdir[MAX_PATH];
@@ -38,8 +33,8 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) {
     ZeroMemory(&pi, sizeof(pi));
 
     if (!CreateProcessA(
-        targetExe,
         NULL,
+        cmdline,
         NULL,
         NULL,
         FALSE,
@@ -49,6 +44,10 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) {
         &si,
         &pi
     )) {
+        char message[64];
+        sprintf(message, "Failed to start game process: %ld", GetLastError());
+        MessageBoxA(NULL, message, "Jadeite Launcher Payload", MB_OK | MB_ICONERROR);
+
         exit(1);
     }
 
@@ -57,6 +56,14 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) {
     size_t payloadSize = (size_t)&_binary_lpayload_o_p_payload_bin_size;
     inject(pi.hProcess, payloadStart, payloadSize, injectDll);
 
+    // Optional: wait for user input before resuming (useful for debugging) 
+    char *waitEnabled = getenv("WAIT_BEFORE_RESUME");
+    if (waitEnabled && strcmp(waitEnabled, "") != 0) {
+        char message[64];
+        sprintf(message, "PID: %ld. Press OK to continue", pi.dwProcessId);
+        MessageBoxA(NULL, message, "Jadeite Launcher Payload", MB_OK | MB_ICONINFORMATION);
+    }
+
     // Resume the process
     ResumeThread(pi.hThread);
 

injector/launcher_payload/src/payload.asm

@@ -18,7 +18,6 @@ main: ; Replacement entry point
     lea rdx, [rel s_LoadLibraryA]
     mov rax, [rbp - 10h]  ; *GetProcAddress
     call rax              ; rax = *LoadLibraryA
-    mov [rbp - 18h], rax
 
     lea rcx, [rel dllPath]
     call rax              ; LoadLibraryA(dllPath)    
@@ -28,6 +27,7 @@ main: ; Replacement entry point
     lea rdx, [rel s_GetModuleHandleA]
     mov rax, [rbp - 10h]  ; *GetProcAddress
     call rax              ; rax = *GetModuleHandle
+    mov [rbp - 18h], rax
 
     mov rcx, 0
     call rax              ; rax = .exe base address
@@ -43,7 +43,7 @@ main: ; Replacement entry point
 
 
     lea rcx, [rel s_UnityPlayer.dll]
-    mov rax, [rbp - 18h]  ; *LoadLibraryA
+    mov rax, [rbp - 18h]  ; *GetModuleHandleA
     call rax              ; rax = UnityPlayer.dll
 
     mov rcx, rax

injector/src/injector.c

@@ -4,35 +4,54 @@
 
 #include <ipayload.h>
 
-const char EXE_ENV[] = "JADEITE_TARGET_EXE_PATH";
-const char INJECT_DLL_ENV[] = "JADEITE_INJECT_DLL_PATH";
-
 const char LAUNCHER_INJECT_DLL[] = "launcher_payload.dll";
 const char GAME_INJECT_DLL[] = "game_payload.dll";
 
+#define SHIFT(argc, argv) argc--, argv++
+
 int main(int argc, char **argv) {
     // Read arguments
     char *gamePath = NULL;
     char *launcherPath = NULL;
 
+    // Skip executable
+    SHIFT(argc, argv);
+    
     switch (argc) {
-        case 1:
+        case 0:
             printf("Usage: wine jadeite.exe [game path] <launcher path>\n");
             return 0;
-        case 2:
-            printf("No launcher process specified! Using explorer.exe\n");
-            gamePath = argv[1];
-            launcherPath = "C:\\Windows\\explorer.exe";
-            break;
-        case 3:
-            gamePath = argv[1];
-            launcherPath = argv[2];
+        case 1:
+            gamePath = argv[0];
+            SHIFT(argc, argv);
+
+            launcherPath = "--";
+
             break;
         default:
-            fprintf(stderr, "Too many arguments! (%d)\n", argc);
-            return 1;
+            gamePath = argv[0];
+            SHIFT(argc, argv);
+
+            launcherPath = argv[0];
+            SHIFT(argc, argv);
+
+            break;
     }
 
+    // Default launcher path
+    if (strcmp(launcherPath, "--") == 0) {
+        printf("No launcher process specified! Using explorer.exe\n");
+        launcherPath = "C:\\Windows\\explorer.exe";
+    } 
+
+    // cd into the injector directory
+    char injectorPath[MAX_PATH];
+    GetModuleFileNameA(GetModuleHandleA(NULL), injectorPath, sizeof(injectorPath));
+
+    *(strrchr(injectorPath, '\\')) = '\0';
+    
+    SetCurrentDirectoryA(injectorPath);
+
     // Compute absolute paths
     char gameExePath[MAX_PATH];
     GetFullPathNameA(gamePath, sizeof(gameExePath), gameExePath, NULL);
@@ -43,13 +62,26 @@ int main(int argc, char **argv) {
     char launcherPayloadPath[MAX_PATH];
     GetFullPathNameA(LAUNCHER_INJECT_DLL, sizeof(launcherPayloadPath), launcherPayloadPath, NULL);
 
-    printf("Starting \"%s\" via \"%s\"\n", gameExePath, launcherPath);
+    // Construct commandline for the game process
+    char cmdline[8192];
+    sprintf(cmdline, "\"%s\"", gameExePath);
+
+    while (argc) {
+        char arg[8192];
+        sprintf(arg, " \"%s\"", argv[0]);
+        strcat(cmdline, arg);
+
+        SHIFT(argc, argv);
+    }
 
     // Set envvars
-    SetEnvironmentVariableA(EXE_ENV, gameExePath);
-    SetEnvironmentVariableA(INJECT_DLL_ENV, gamePayloadPath);
+    SetEnvironmentVariableA(ENV_EXE_PATH, gameExePath);
+    SetEnvironmentVariableA(ENV_DLL_PATH, gamePayloadPath);
+    SetEnvironmentVariableA(ENV_PROC_CMD, cmdline);
 
     // Start the launcher
+    printf("Starting '%s' via '%s'\n", gameExePath, launcherPath);
+
     STARTUPINFO si;
     ZeroMemory(&si, sizeof(si));
 

meson.build

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

metadata.json

@@ -0,0 +1,23 @@
+{
+    "jadeite": {
+        "version": "1.1.4"
+    },
+    "games": {
+        "hi3rd": {
+            "global": {
+                "status": "verified",
+                "version": "6.6.0"
+            }
+        },
+        "hsr": {
+            "global": {
+                "status": "unsafe",
+                "version": "1.1.0"
+            },
+            "china": {
+                "status": "unsafe",
+                "version": "1.1.0"
+            }
+        }
+    }
+}

setup.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 
 rm -rf build
-meson setup --cross-file mingw_cross.txt build
+meson setup --cross-file mingw_cross.txt $* build