Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Waffle3 engine hook #1218

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Waffle3 engine hook #1218

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2f85a1
Waffle3 engine hook
Blu3train Dec 22, 2023
70ee2e3
filter bug fixed
Blu3train Dec 23, 2023
e7a0227
filter fixed
Blu3train Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions texthook/engine/engine.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5890,6 +5890,26 @@ bool InsertShinaHook()
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)
{
ConsoleOutput("WaffleDynamic:triggered");
Expand Down Expand Up @@ -6022,6 +6042,30 @@ bool InsertWaffleHook()
NewHook(hp, "WAFFLE2");
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.");
if (!found) trigger_fun = InsertWaffleDynamicHook;
return found;
Expand Down