Public-Mirror/LunaTranslator
1
0
Fork 0
mirror of https://github.com/HIllya51/LunaTranslator.git synced 2024-12-28 08:04:13 +08:00
Code Issues Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
恍兮惚兮 2024-11-16 22:41:34 +08:00
parent f6ca30acc2
commit 3b3c903f21
3 changed files with 94 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
cpp/LunaHook/LunaHook/engine32/WillPlus.cpp
View File

@ -1666,40 +1666,8 @@ namespace WillPlusEngine
namespace namespace
{ {
static bool InsertWillPlus4() bool InsertWillPlus5()
{ {
// by Blu3train
/*
* Sample games:
* https://vndb.org/r71235
*/
const BYTE bytes[] = {
0x33, 0xC9, // xor ecx,ecx <-- hook
0x8B, 0xC7, // mov eax,edi
0xC7, 0x84, 0x24, XX4, XX4, // mov [esp+000001E0],00000007
0x89, 0x9C, 0x24, XX4 // mov [esp+000001DC],ebx
};
ULONG range = min(processStopAddress - processStartAddress, MAX_REL_ADDR);
ULONG addr = MemDbg::findBytes(bytes, sizeof(bytes), processStartAddress, processStartAddress + range);
if (!addr)
{
ConsoleOutput("WillPlus4: pattern not found");
return false;
}
HookParam hp = {};
hp.address = addr;
hp.offset = get_reg(regs::edi);
hp.type = CODEC_UTF16 | USING_STRING;
hp.filter_fun = WillPlus_extra_filter;
ConsoleOutput("INSERT WillPlus4");
NewHook(hp, "WillPlus4");
return true;
}
static bool InsertWillPlus5()
{
// by Blu3train
/* /*
* Sample games: * Sample games:
* https://vndb.org/v29881 * https://vndb.org/v29881
@ -1728,19 +1696,78 @@ namespace
hp.type = CODEC_UTF16 | USING_STRING | NO_CONTEXT | USING_SPLIT; hp.type = CODEC_UTF16 | USING_STRING | NO_CONTEXT | USING_SPLIT;
hp.filter_fun = WillPlus_extra_filter; hp.filter_fun = WillPlus_extra_filter;
ConsoleOutput("INSERT WillPlus5"); ConsoleOutput("INSERT WillPlus5");
NewHook(hp, "WillPlus5"); return NewHook(hp, "WillPlus5");
return true;
} }
bool _xxx() }
namespace
{
bool h7()
{ {
bool ok = false; /*
ok = InsertWillPlus4() || ok; v20 = *(unsigned __int16 *)v19;
ok = InsertWillPlus5() || ok; sub_43B730((int)v37, a4, v20, &v33);
return ok; if ( v20 - 58942 > 0x119 )
{
if ( v33.gmCellIncX )
{
v24 = v39;
*a8 = v33.gmCellIncX;
a8[1] = v24;
goto LABEL_25;
}
gmCellIncX = v39;
gmCellIncY = v33.gmCellIncY;
}
else
{
sub_43B730((int)v37, a4, 0x8AADu, &v33);
*/
const BYTE bytes[] = {
0x8d, XX, 0xc2, 0x19, 0xff, 0xff, // lea ecx, [edi-0xe63e]
0x81, XX, 0x19, 0x01, 0x00, 0x00, // cmp ecx,0x119
0x77, XX, // ja xx
XX4, // lea edx,[esp+34]
XX, // push edx
XX, 0xad, 0x8a, 0x00, 0x00 // mov edi,0x8aad
};
ULONG addr = MemDbg::findBytes(bytes, sizeof(bytes), processStartAddress, processStopAddress);
if (!addr)
return false;
int offset = 0;
switch ((*(BYTE *)(addr + 1)) & 0x7)
{
case 0x7:
offset = get_reg(regs::edi);
break;
case 0x6:
offset = get_reg(regs::esi);
break;
case 0x5:
offset = get_reg(regs::ebp);
break;
case 0x3:
offset = get_reg(regs::ebx);
break;
case 0x2:
offset = get_reg(regs::edx);
break;
case 0x1:
offset = get_reg(regs::ecx);
break;
case 0x0:
offset = get_reg(regs::eax);
break;
default:
return false;
}
HookParam hp = {};
hp.address = addr;
hp.offset = offset;
hp.type = CODEC_UTF16 | USING_CHAR;
return NewHook(hp, "WillPlus7");
} }
} }
bool WillPlus::attach_function() bool WillPlus::attach_function()
{ {
bool succ = WillPlusEngine::attach(); bool succ = WillPlusEngine::attach();
@ -1749,10 +1776,8 @@ bool WillPlus::attach_function()
succ |= InsertWillPlus5Hook(); succ |= InsertWillPlus5Hook();
succ |= insertwillplus6(); succ |= insertwillplus6();
succ |= willX(); succ |= willX();
succ |= _xxx(); succ |= InsertWillPlus5();
PcHooks::hookGDIFunctions(GetGlyphOutlineA); return succ || h7();
PcHooks::hookGDIFunctions(GetGlyphOutlineW);
return succ;
} }
bool Willold::attach_function() bool Willold::attach_function()

4
cpp/LunaHook/LunaHook/enginecontrol.cpp
View File

@ -86,8 +86,8 @@ bool checkengine()
bool matched = safematch(m); bool matched = safematch(m);
bool attached = matched && safeattach(m); bool attached = matched && safeattach(m);
// ConsoleOutput("Progress %d/%d, checked engine %s, %s",current,total,m->getenginename(),infomations[matched+attached]); //ConsoleOutput("Progress %d/%d, checked engine %s, %s",current,engines.size(),m->getenginename(),infomations[matched+attached]);
// ConsoleOutput("Progress %d/%d, %s",current,total,infomations[matched+attached]); //ConsoleOutput("Progress %d/%d, %s",current,engines.size(),infomations[matched+attached]);
if (matched == false) if (matched == false)
continue; continue;
ConsoleOutput(MatchedEngine, m->getenginename()); ConsoleOutput(MatchedEngine, m->getenginename());

35
cpp/LunaHook/LunaHook/engines/pchooks/pchooks.cpp
View File

@ -12,7 +12,8 @@
// #define LPASTE(s) L##s // #define LPASTE(s) L##s
// #define L(s) LPASTE(s) // #define L(s) LPASTE(s)
Synchronized<std::set<void *>> hookonce; std::set<void *> hookonce;
std::mutex hookoncelock;
#define NEW_HOOK(ptr, _dll, _fun, _data, _data_ind, _split_off, _split_ind, _type, _len_off) \ #define NEW_HOOK(ptr, _dll, _fun, _data, _data_ind, _split_off, _split_ind, _type, _len_off) \
{ \ { \
HookParam hp; \ HookParam hp; \
@ -25,15 +26,19 @@ Synchronized<std::set<void *>> hookonce;
hp.type = _type | MODULE_OFFSET | FUNCTION_OFFSET; \ hp.type = _type | MODULE_OFFSET | FUNCTION_OFFSET; \
hp.length_offset = _len_off; \ hp.length_offset = _len_off; \
auto currptr = GetModuleHandle(hp.module) ? GetProcAddress(GetModuleHandle(hp.module), hp.function) : nullptr; \ auto currptr = GetModuleHandle(hp.module) ? GetProcAddress(GetModuleHandle(hp.module), hp.function) : nullptr; \
bool dohook = false; \ if (currptr) \
if (ptr) \
dohook = currptr == ptr; \
else if (currptr) \
dohook = hookonce->find(currptr) == hookonce->end(); \
if (dohook) \
{ \ { \
NewHook(hp, #_fun); \ bool dohook = false; \
hookonce->insert(currptr); \ std::lock_guard _(hookoncelock); \
if (ptr) \
dohook = currptr == ptr; \
else \
dohook = hookonce.find(currptr) == hookonce.end(); \
if (dohook) \
{ \
NewHook(hp, #_fun); \
hookonce.insert(currptr); \
} \
} \ } \
} }
@ -51,11 +56,15 @@ Synchronized<std::set<void *>> hookonce;
hp.type = _type | MODULE_OFFSET | FUNCTION_OFFSET; \ hp.type = _type | MODULE_OFFSET | FUNCTION_OFFSET; \
hp.length_offset = _len_off; \ hp.length_offset = _len_off; \
auto currptr = GetProcAddress(_module, hp.function); \ auto currptr = GetProcAddress(_module, hp.function); \
auto dohook = currptr ? hookonce->find(currptr) == hookonce->end() : false; \ if (currptr) \
if (dohook) \
{ \ { \
NewHook(hp, #_fun); \ std::lock_guard _(hookoncelock); \
hookonce->insert(currptr); \ auto dohook = currptr ? hookonce.find(currptr) == hookonce.end() : false; \
if (dohook) \
{ \
NewHook(hp, #_fun); \
hookonce.insert(currptr); \
} \
} \ } \
} }