chenx221/Textractor_test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

simplify (and maybe break) wolf2 hook and fix display error

Browse Source
This commit is contained in:
Akash Mozumdar 2019-01-10 02:00:39 -05:00
parent 24d9244ad4
commit cdfbd77d21
2 changed files with 7 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GUI/host/host.cpp
View File

@ -88,7 +88,7 @@ namespace
BYTE buffer[PIPE_BUFFER_SIZE] = {}; BYTE buffer[PIPE_BUFFER_SIZE] = {};
DWORD bytesRead, processId; DWORD bytesRead, processId;
ReadFile(hookPipe, &processId, sizeof(processId), &bytesRead, nullptr); ReadFile(hookPipe, &processId, sizeof(processId), &bytesRead, nullptr);
processRecordsByIds->emplace(processId, processId, hostPipe); processRecordsByIds->try_emplace(processId, processId, hostPipe);
CreatePipe(); CreatePipe();
@ -141,7 +141,7 @@ namespace Host
TextThread::OnCreate = OnCreate; TextThread::OnCreate = OnCreate;
TextThread::OnDestroy = OnDestroy; TextThread::OnDestroy = OnDestroy;
TextThread::Output = Output; TextThread::Output = Output;
processRecordsByIds->emplace(console.processId, console.processId, INVALID_HANDLE_VALUE); processRecordsByIds->try_emplace(console.processId, console.processId, INVALID_HANDLE_VALUE);
textThreadsByParams->insert({ console, std::make_unique<TextThread>(console, HookParam{}, CONSOLE) }); textThreadsByParams->insert({ console, std::make_unique<TextThread>(console, HookParam{}, CONSOLE) });
textThreadsByParams->insert({ Host::clipboard, std::make_unique<TextThread>(Host::clipboard, HookParam{}, CLIPBOARD) }); textThreadsByParams->insert({ Host::clipboard, std::make_unique<TextThread>(Host::clipboard, HookParam{}, CLIPBOARD) });
StartCapturingClipboard(); StartCapturingClipboard();

38
vnrhook/engine/engine.cc
View File

@ -8750,37 +8750,9 @@ bool InsertOldWolfHook()
return false; return false;
} }
struct TextListElement // ecx, this structure saved a list of element
{
DWORD flag1; // should be zero when text is valid
LPSTR text;
DWORD flag2;
DWORD flag3;
DWORD flag4;
int size,
capacity; // 0xe8, capacity of the data including \0
bool isValid() const
{
// Artikash 11/18/2018: I'm not sure why those checks were ever there, but they prevented this hook from working on RJ232953
return /*flag1 == 0 && flag2 == 0 && flag3 == 0 && flag4 == 0
&& */size > 0 && size < capacity
&& !::IsBadReadPtr(text, capacity) /*&& size == ::strlen(text)*/;
//&& (quint8)*text > 127;
}
};
void SpecialHookWolf2(DWORD esp_base, HookParam *, BYTE, DWORD *data, DWORD *split, DWORD *len)
{
auto self = (TextListElement *)regof(ecx, esp_base); // ecx is actually a list of element
if (self && self->isValid()) {
*data = (DWORD)self->text;
*len = self->size;
}
}
#if 1
// jichi 6/11/2015: See embed translation source code // jichi 6/11/2015: See embed translation source code
// Artikash 1/10/2019: RJ232953 hooked with HS-8*4@494480
// CharNextA is called in the middle of target function, and at the start of it ecx points to struct with text at offset 4
bool InsertWolf2Hook() bool InsertWolf2Hook()
{ {
ULONG addr = MemDbg::findCallerAddressAfterInt3((ULONG)::CharNextA, processStartAddress, processStopAddress); ULONG addr = MemDbg::findCallerAddressAfterInt3((ULONG)::CharNextA, processStartAddress, processStopAddress);
@ -8791,13 +8763,13 @@ bool InsertWolf2Hook()
HookParam hp = {}; HookParam hp = {};
hp.address = addr; hp.address = addr;
hp.text_fun = SpecialHookWolf2; hp.type = USING_STRING | DATA_INDIRECT;
hp.type = USING_STRING; hp.offset = pusha_ecx_off - 4;
hp.index = 4;
ConsoleOutput("vnreng: INSERT WolfRPG2"); ConsoleOutput("vnreng: INSERT WolfRPG2");
NewHook(hp, "WolfRPG2"); NewHook(hp, "WolfRPG2");
return true; return true;
} }
#endif // 0
} // WolfRPG namespace } // WolfRPG namespace