v2.0.1

README.md

@@ -1,5 +1,5 @@
 ### Games and regions
-- **3rd**: glb v6.7.0
+- **3rd**: glb/sea/cn/tw/kr/jp v6.8.0
 - **SR**: os/cn v1.2.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.

game_payload/include/game.h

@@ -6,6 +6,11 @@ enum game_id {
     GAME_INVALID,
     
     GAME_HI3_GLB,
+    GAME_HI3_SEA,
+    GAME_HI3_CN,
+    GAME_HI3_TW,
+    GAME_HI3_KR,
+    GAME_HI3_JP,
 
     GAME_HSR_OS,
     GAME_HSR_CN
@@ -18,7 +23,7 @@ typedef void (*unityplayer_callback_t)(HMODULE unityModule);
 struct game_data {
     enum game_id id; // Temporary
     const char *name;
-    const char *assembly_path;
+    const char *assembly_name;
     const char *tp6_section_name; // Unused for now
     const char *tvm_section_name;
 

game_payload/meson.build

@@ -15,13 +15,15 @@ sources = [
     'src/msg.c'
 ]
 resources = [
-    'res/hi3/glb/allocations.dat',
+    'res/hi3/glb.dat',
-    'res/hi3/glb/entries.dat',
+    'res/hi3/sea.dat',
+    'res/hi3/cn.dat',
+    'res/hi3/tw.dat',
+    'res/hi3/kr.dat',
+    'res/hi3/jp.dat',
 
-    'res/hsr/os/allocations.dat',
+    'res/hsr/os.dat',
-    'res/hsr/os/entries.dat',
+    'res/hsr/cn.dat'
-    'res/hsr/cn/allocations.dat',
-    'res/hsr/cn/entries.dat'
 ]
 
 # Generate resource files for ./res

game_payload/src/ace.c

@@ -9,83 +9,75 @@ 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];
+    if (wcsicmp(targetModuleName, data->Loaded.BaseDllName->Buffer) != 0) {
-    wcscpy(lwModuleName, data->Loaded.BaseDllName->Buffer);
+        return;
-    _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);
     }
+
+    // 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
+    _create_driver_file("ACE-BASE.sys");
-    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);
-    }
 
     // Just in case
-    HANDLE s32DriverFile = CreateFileA(s32DriverPath, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+    _create_driver_file("C:\\windows\\system32\\drivers\\ACE-BASE.sys");
-    if (!s32DriverFile) {
+}
-        msg_err_a("Could not create driver file: %s", s32DriverPath);
+
+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, name, &cookie);
+
+    HMODULE module = LoadLibraryW(path);
+    if (!module) {
+        msg_err_w(L"Could not load module: %ls", path);
     }
 
-    CloseHandle(wdDriverFile);
+    // LoadLibraryW is synchronous; the notification function has already finished executing
-    CloseHandle(s32DriverFile);
+    LdrUnregisterDllNotification(cookie);
+
+    return module;
 }
 
 HMODULE ace_load_base_module(const char *exeName) {
     wchar_t baseModuleName[MAX_PATH];
-    swprintf(baseModuleName, MAX_PATH, L"%sbase.dll", exeName);
+    swprintf(baseModuleName, MAX_PATH, L"%sBase.dll", exeName);
     wcslwr(baseModuleName);
 
-    void *cookie;
+    return _load_module_patched(baseModuleName);
-    LdrRegisterDllNotification(0, &_dll_notification, baseModuleName, &cookie);
-
-    HMODULE baseModule = LoadLibraryW(baseModuleName);
-    if (!baseModule) {
-        msg_err_w(L"Could not load base module: %ls", baseModuleName);
-    }
-
-    // LoadLibraryA is synchronous; the notification function has already finished executing
-    LdrUnregisterDllNotification(cookie);
-
-    return baseModule;
 }
 
 HMODULE ace_load_driver_module() {
-    const char *driverModulePath = "AntiCheatExpert/InGame/x64/ACE-DRV64.dll";
+    return _load_module_patched(L"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;
 }

game_payload/src/core.md

@@ -12,3 +12,7 @@
 
 ### 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

game_payload/src/hi3.c

@@ -4,7 +4,7 @@
 #include <game.h>
 
 const char *HI3_NAME             = "BH3";
-const char *HI3_ASSEMBLY_PATH    = "BH3_Data/Native/UserAssembly.dll";
+const char *HI3_ASSEMBLY_NAME    = "UserAssembly.dll";
 const char *HI3_TP6_SECTION_NAME = ".bh3";
 const char *HI3_TVM_SECTION_NAME = ".tvm0";
 
@@ -14,10 +14,14 @@ struct crc_id_pair {
 };
 
 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
+    { 0xcb8041ff, GAME_HI3_GLB }, // glb v6.8.0
+    { 0x104cbfc5, GAME_HI3_SEA }, // sea v6.8.0
+    { 0x2efd9099, GAME_HI3_CN },  // cn  v6.8.0
+    { 0x30fa5b0f, GAME_HI3_TW },  // tw  v6.8.0
+    { 0xe47327fb, GAME_HI3_KR },  // kr  v6.8.0
+    { 0x992b6b63, GAME_HI3_JP }   // jp  v6.8.0
 };
 
 void hi3_fill_data(struct game_data *buf) {
@@ -36,7 +40,7 @@ void hi3_fill_data(struct game_data *buf) {
     
     buf->id = id;
     buf->name = HI3_NAME;
-    buf->assembly_path = HI3_ASSEMBLY_PATH;
+    buf->assembly_name = HI3_ASSEMBLY_NAME;
     buf->tp6_section_name = HI3_TP6_SECTION_NAME;
     buf->tvm_section_name = HI3_TVM_SECTION_NAME;
 

game_payload/src/hsr.c

@@ -5,7 +5,7 @@
 #include <game.h>
 
 const char *HSR_NAME             = "StarRail";
-const char *HSR_ASSEMBLY_PATH    = "GameAssembly.dll";
+const char *HSR_ASSEMBLY_NAME    = "GameAssembly.dll";
 const char *HSR_TP6_SECTION_NAME = ".ace";
 const char *HSR_TVM_SECTION_NAME = ".tvm0";
 
@@ -86,7 +86,7 @@ void hsr_fill_data(struct game_data *buf) {
 
     buf->id = id;
     buf->name = HSR_NAME;
-    buf->assembly_path = HSR_ASSEMBLY_PATH;
+    buf->assembly_name = HSR_ASSEMBLY_NAME;
     buf->tp6_section_name = HSR_TP6_SECTION_NAME;
     buf->tvm_section_name = HSR_TVM_SECTION_NAME;
 

meson.build

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

metadata.json

@@ -1,12 +1,32 @@
 {
     "jadeite": {
-        "version": "1.1.13"
+        "version": "2.0.1"
     },
     "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.8.0"
+            },
+            "taiwan": {
+                "status": "verified",
+                "version": "6.8.0"
+            },
+            "korea": {
+                "status": "verified",
+                "version": "6.8.0"
+            },
+            "japan": {
+                "status": "verified",
+                "version": "6.8.0"
             }
         },
         "hsr": {