From 8a11cc9949db1aebc7fbe4c3625caa911975f788 Mon Sep 17 00:00:00 2001 From: Akash Mozumdar Date: Mon, 16 Jul 2018 14:04:21 -0400 Subject: [PATCH] add tyranobuilder hook. performance optimization. improve airnovel hook --- vnr/vnrhook/src/engine/engine.cc | 102 +++++++++++++++++++++++++------ vnr/vnrhook/src/engine/engine.h | 3 +- vnr/vnrhook/src/engine/match.cc | 7 +++ vnr/vnrhook/src/pipe.cc | 2 +- 4 files changed, 93 insertions(+), 21 deletions(-) diff --git a/vnr/vnrhook/src/engine/engine.cc b/vnr/vnrhook/src/engine/engine.cc index d934d80..175bb66 100644 --- a/vnr/vnrhook/src/engine/engine.cc +++ b/vnr/vnrhook/src/engine/engine.cc @@ -10175,6 +10175,65 @@ bool InsertNexton1Hook() return true; } +/** +* Artikash 7/15/2018: Insert Tyranobuilder hook +* Sample game: https://vndb.org/v22252: /HWN-8:-1C@233A54:yuika_t.exe + Issue with hook: many garbage text threads. Maybe use another split? + + yuika_t.v8::Locker::IsLocked+2B57 - 56 - push esi + yuika_t.v8::Locker::IsLocked+2B58 - 8B F3 - mov esi,ebx + yuika_t.v8::Locker::IsLocked+2B5A - 33 C0 - xor eax,eax + yuika_t.v8::Locker::IsLocked+2B5C - 2B F7 - sub esi,edi + yuika_t.v8::Locker::IsLocked+2B5E - 33 D2 - xor edx,edx + yuika_t.v8::Locker::IsLocked+2B60 - 46 - inc esi + yuika_t.v8::Locker::IsLocked+2B61 - D1 EE - shr esi,1 + yuika_t.v8::Locker::IsLocked+2B63 - 3B FB - cmp edi,ebx + yuika_t.v8::Locker::IsLocked+2B65 - 0F47 F0 - cmova esi,eax + yuika_t.v8::Locker::IsLocked+2B68 - 85 F6 - test esi,esi + yuika_t.v8::Locker::IsLocked+2B6A - 74 15 - je yuika_t.v8::Locker::IsLocked+2B81 + yuika_t.v8::Locker::IsLocked+2B6C - 8B 45 0C - mov eax,[ebp+0C] + yuika_t.v8::Locker::IsLocked+2B6F - 2B F8 - sub edi,eax + yuika_t.v8::Locker::IsLocked+2B71 - 66 8B 08 - mov cx,[eax]; Moves a wchar into ecx. + yuika_t.v8::Locker::IsLocked+2B74 - 8D 40 02 - lea eax,[eax+02]; Hook here! + yuika_t.v8::Locker::IsLocked+2B77 - 42 - inc edx + yuika_t.v8::Locker::IsLocked+2B78 - 66 89 4C 07 FE - mov [edi+eax-02],cx + yuika_t.v8::Locker::IsLocked+2B7D - 3B D6 - cmp edx,esi; esi holds string length. best split I can find but not ideal... + yuika_t.v8::Locker::IsLocked+2B7F - 72 F0 - jb yuika_t.v8::Locker::IsLocked+2B71 + yuika_t.v8::Locker::IsLocked+2B81 - 5E - pop esi + yuika_t.v8::Locker::IsLocked+2B82 - 5F - pop edi + yuika_t.v8::Locker::IsLocked+2B83 - 5B - pop ebx + yuika_t.v8::Locker::IsLocked+2B84 - 5D - pop ebp + yuika_t.v8::Locker::IsLocked+2B85 - C3 - ret + + +*/ +bool InsertTyranobuilderHook() +{ + const BYTE bytes[] = + { + 0x2b, 0xf8, // sub edi,edx + 0x66, 0x8b, 0x08, // mov cx,[eax] + 0x8d, 0x40, 0x02 // lea eax,[eax + 02]; Hook here! + }; + DWORD addr = MemDbg::findBytes(bytes, sizeof(bytes), processStartAddress, processStopAddress); + if (!addr) + { + ConsoleOutput("NextHooker: Tyranobuilder: pattern not found"); + return false; + } + HookParam hp = {}; + hp.address = addr + 5; + hp.type = USING_UNICODE | NO_CONTEXT | USING_SPLIT; + hp.length_offset = 1; + hp.offset = pusha_ecx_off - 4; + hp.split = pusha_esi_off - 4; + hp.index = 0x8; + + ConsoleOutput("NextHooker: INSERT Tyranobuilder"); + NewHook(hp, "Tyranobuilder"); + return true; +} + /** * jichi 9/16/2013: a-unicorn / gesen18 * See (CaoNiMaGeBi): http://tieba.baidu.com/p/2586681823 @@ -15969,8 +16028,9 @@ bool InsertAdobeAirHook() /** * Artikash 7/15/2018: Insert AIRNovel hook -* Sample game: -* https://vndb.org/v22252: /HQ-C@130380:Adobe AIR.dll <- produces a lot of garbage along with text, should be filtered +* Sample game: https://vndb.org/v22252: /HQ-8*8:-8*14@130380:Adobe AIR.dll +* When entering this function, ecx points to a struct containing a pointer to the text along with info about the type of text +* ecx+8 is the (w)char(_t)* we want, ecx+14 is the int* that tells apart text types. Adobe AIR.dll+130300 - 55 - push ebp Adobe AIR.dll+130301 - 8B EC - mov ebp,esp @@ -15987,7 +16047,7 @@ Adobe AIR.dll+130325 - F3 0FE6 C0 - cvtdq2pd xmm0,xmm0 Adobe AIR.dll+130329 - 66 0F2F C8 - comisd xmm1,xmm0 Adobe AIR.dll+13032D - 73 21 - jae "Adobe AIR.dll"+130350 { ->Adobe AIR.dll+130350 } Adobe AIR.dll+13032F - F2 0F11 4D F4 - movsd [ebp-0C],xmm1 -Adobe AIR.dll+130334 - 33 D2 - xor edx,edx +Adobe AIR.dll+130334 - 33 D2 - xor edx,edx; Safe to hook here! Adobe AIR.dll+130336 - 8B 45 F8 - mov eax,[ebp-08] Adobe AIR.dll+130339 - 25 FFFFFF7F - and eax,7FFFFFFF { 2147483647 } Adobe AIR.dll+13033E - 3D 0000F07F - cmp eax,7FF00000 { 2146435072 } @@ -16010,11 +16070,11 @@ Adobe AIR.dll+13036B - C1 E8 02 - shr eax,02 { 2 } Adobe AIR.dll+13036E - A8 01 - test al,01 { 1 } Adobe AIR.dll+130370 - 75 05 - jne "Adobe AIR.dll"+130377 { ->Adobe AIR.dll+130377 } Adobe AIR.dll+130372 - 8B 51 08 - mov edx,[ecx+08] // Address of text moved into edx here -Adobe AIR.dll+130375 - EB 09 - jmp "Adobe AIR.dll"+130380 { ->Adobe AIR.dll+130380 } // Unconditional jump to hook location +Adobe AIR.dll+130375 - EB 09 - jmp "Adobe AIR.dll"+130380 { ->Adobe AIR.dll+130380 }; Unconditional jump to hook location Adobe AIR.dll+130377 - 8B 41 0C - mov eax,[ecx+0C] Adobe AIR.dll+13037A - 8B 50 08 - mov edx,[eax+08] Adobe AIR.dll+13037D - 03 51 08 - add edx,[ecx+08] -Adobe AIR.dll+130380 - F6 41 14 01 - test byte ptr [ecx+14],01 { 1 } // Hook here! +Adobe AIR.dll+130380 - F6 41 14 01 - test byte ptr [ecx+14],01 { 1 }; Hook here also works Adobe AIR.dll+130384 - 8B 45 FC - mov eax,[ebp-04] Adobe AIR.dll+130387 - 75 06 - jne "Adobe AIR.dll"+13038F { ->Adobe AIR.dll+13038F } Adobe AIR.dll+130389 - 0FB6 04 10 - movzx eax,byte ptr [eax+edx] @@ -16038,7 +16098,8 @@ bool InsertAIRNovelHook() { const BYTE bytes[] = { - 0xf6, 0x41, 0x14, 0x01 // test byte ptr [ecx+14], 01 + 0x33, 0xD2, //- xor edx,edx + 0x8B, 0x45, 0xF8, //- mov eax,[ebp - 08] }; DWORD addr = MemDbg::findBytes(bytes, sizeof(bytes), base, base + 0x200000); // Artikash 7/14/2018: Probably big enough if (!addr) @@ -16048,20 +16109,23 @@ bool InsertAIRNovelHook() } HookParam hp = {}; hp.address = addr; + hp.type = USING_UNICODE|USING_STRING|USING_SPLIT|SPLIT_INDIRECT|DATA_INDIRECT; hp.length_offset = 0; - hp.type = USING_UNICODE|USING_STRING; - hp.offset = pusha_edx_off - 4; - hp.filter_fun = [](void* str, DWORD* len, HookParam* hp, BYTE index) - { - return *len < 4 && - *(char*)str != '[' && - *(char*)str != ';' && - *(char*)str != '&' && - *(char*)str != '*' && - *(char*)str != '\n' && - *(char*)str != '\t' && - memcmp((char*)str, "app:/", 5); - }; + hp.offset = pusha_ecx_off - 4; + hp.split = pusha_ecx_off - 4; + hp.index = 0x8; + hp.split_index = 0x14; + //hp.filter_fun = [](void* str, DWORD* len, HookParam* hp, BYTE index) // removes some of the garbage threads + //{ + // return *len < 4 && + // *(char*)str != '[' && + // *(char*)str != ';' && + // *(char*)str != '&' && + // *(char*)str != '*' && + // *(char*)str != '\n' && + // *(char*)str != '\t' && + // memcmp((char*)str, "app:/", 5); + //}; ConsoleOutput("NextHooker: INSERT AIRNovel"); NewHook(hp, "AIRNovel"); diff --git a/vnr/vnrhook/src/engine/engine.h b/vnr/vnrhook/src/engine/engine.h index 30aea3a..67560cf 100644 --- a/vnr/vnrhook/src/engine/engine.h +++ b/vnr/vnrhook/src/engine/engine.h @@ -81,7 +81,7 @@ bool Insert5pbHook(); // 5pb.jp, PSP/PS3 games ported to PC bool InsertAB2TryHook(); // Yane@AkabeiSoft2Try: YaneSDK.dll. bool InsertAbelHook(); // Abel bool InsertAdobeAirHook(); // Adobe AIR -bool InsertAIRNovelHook(); +bool InsertAIRNovelHook(); // AIRNovel: *.swf bool InsertAdobeFlash10Hook(); // Adobe Flash Player 10 bool InsertAliceHook(); // System40@AliceSoft; do not work for latest alice games //bool InsertAmuseCraftHook(); // AMUSE CRAFT: *.pac @@ -148,6 +148,7 @@ bool InsertTanukiHook(); // Tanuki: *.tak bool InsertTaskforce2Hook(); // Taskforce2.exe bool InsertTencoHook(); // Tenco: Check.mdx bool InsertTriangleHook(); // Triangle: Execle.exe +bool InsertTyranobuilderHook(); // Tyranobuilder: has libuv bool InsertUnicornHook(); // Gsen18: *.szs|Data/*.szs bool InsertWillPlusHook(); // WillPlus: Rio.arc bool InsertWolfHook(); // Wolf: Data.wolf diff --git a/vnr/vnrhook/src/engine/match.cc b/vnr/vnrhook/src/engine/match.cc index 7e93b4c..e0bb7cf 100644 --- a/vnr/vnrhook/src/engine/match.cc +++ b/vnr/vnrhook/src/engine/match.cc @@ -547,6 +547,13 @@ bool DetermineEngineOther() return true; } + // Artikash 7/16/2018: Uses libuv: likely Tyranobuilder - sample game https://vndb.org/v22975 + if (GetProcAddress(GetModuleHandleW(nullptr), "uv_uptime")) + { + InsertTyranobuilderHook(); + return true; + } + // jichi 8/24/2013: Move into functions // Artikash 6/15/2018: Removed this detection for Abel Software games. IthGetFileInfo no longer works correctly //static BYTE static_file_info[0x1000]; diff --git a/vnr/vnrhook/src/pipe.cc b/vnr/vnrhook/src/pipe.cc index 9b1f125..4152a65 100644 --- a/vnr/vnrhook/src/pipe.cc +++ b/vnr/vnrhook/src/pipe.cc @@ -21,7 +21,7 @@ extern HMODULE currentModule; DWORD WINAPI PipeManager(LPVOID unused) { - enum { STANDARD_WAIT = 1000 }; + enum { STANDARD_WAIT = 50 }; while (::running) { DWORD count;