Merge remote-tracking branch 'Blu3train/Waffle3Hook'

This commit is contained in:
Chenx221 2024-09-05 12:24:30 +08:00
commit dfe7c376d8

View File

@ -7013,6 +7013,26 @@ bool InsertShinaHook()
return false; return false;
} }
bool Waffle3Filter(LPVOID data, DWORD *size, HookParam *, BYTE)
{
auto text = reinterpret_cast<LPSTR>(data);
auto len = reinterpret_cast<size_t *>(size);
static std::string prevText;
if (LPSTR bs=cpp_strnstr(text, "\\", *len))
if (bs > text && !IsSJIS(text)) // garbage text
return false;
if (prevText.find(text, 0, *len) != std::string::npos) // Check if the string is present in the previous one
return false;
prevText.assign(text, *len);
StringCharReplacer(text, len, "\r\n\x81\x40", 4, ' ');
StringCharReplacer(text, len, "\r\n", 2, ' ');
StringCharReplacer(text, len, "\x81\x40", 2, ' ');
return true;
}
bool InsertWaffleDynamicHook(LPVOID addr, DWORD frame, DWORD stack) bool InsertWaffleDynamicHook(LPVOID addr, DWORD frame, DWORD stack)
{ {
ConsoleOutput("WaffleDynamic:triggered"); ConsoleOutput("WaffleDynamic:triggered");
@ -7145,6 +7165,30 @@ bool InsertWaffleHook()
NewHook(hp, "WAFFLE2"); NewHook(hp, "WAFFLE2");
found = true; found = true;
} }
//by Blu3train
/** new waffle3
* test on https://vndb.org/v31003
*/
const BYTE bytes2[] = {
0xCC, // int 3
0x55, // push ebp <- hook here
0x8B, 0xEC, // mov ebp,esp
0x8B, 0x55, 0x0C, // mov edx,[ebp+0C]
0x53 // push ebx
};
ULONG range = min(processStopAddress - processStartAddress, MAX_REL_ADDR);
if (DWORD addr = MemDbg::findBytes(bytes2, sizeof(bytes2), processStartAddress, processStartAddress + range))
{
HookParam hp = {};
hp.address = addr + 1;
hp.offset = pusha_eax_off - 4;
hp.index = 0x00;
hp.filter_fun = Waffle3Filter;
hp.type = USING_STRING;
ConsoleOutput("Textractor: INSERT WAFFLE3");
NewHook(hp, "WAFFLE3");
found = true;
}
//ConsoleOutput("Probably Waffle. Wait for text."); //ConsoleOutput("Probably Waffle. Wait for text.");
if (!found) trigger_fun = InsertWaffleDynamicHook; if (!found) trigger_fun = InsertWaffleDynamicHook;
return found; return found;