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

implement utf8

Browse Source
This commit is contained in:
Akash Mozumdar 2018-08-03 01:48:57 -04:00
parent afe0464b56
commit 6835c339d7
6 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GUI/mainwindow.cpp
View File

@ -180,7 +180,7 @@ void MainWindow::on_hookButton_clicked()
{ {
bool ok; bool ok;
QString hookCode = QInputDialog::getText(this, "Add Hook", QString hookCode = QInputDialog::getText(this, "Add Hook",
"Enter hook code\r\n/H{A|B|W|S|Q}[N]data_offset[*drdo][:sub_offset[*drso]]@addr[:module]", "Enter hook code\r\n/H{A|B|W|S|Q|V}[N]data_offset[*drdo][:sub_offset[*drso]]@addr[:module]",
QLineEdit::Normal, "/H", &ok QLineEdit::Normal, "/H", &ok
); );
if (!ok) return; if (!ok) return;

7
GUI/misc.cpp
View File

@ -65,6 +65,9 @@ HookParam ParseHCode(QString HCode)
hp.type |= USING_UNICODE; hp.type |= USING_UNICODE;
hp.length_offset = 1; hp.length_offset = 1;
break; break;
case L'V':
hp.type |= USING_STRING | USING_UTF8;
break;
default: default:
return {}; return {};
} }
@ -129,7 +132,9 @@ QString GenerateHCode(HookParam hp, DWORD processId)
} }
else else
{ {
if (hp.type & USING_STRING) if (hp.type & USING_UTF8)
code += "V";
else if (hp.type & USING_STRING)
code += "S"; code += "S";
else if (hp.type & BIG_ENDIAN) else if (hp.type & BIG_ENDIAN)
code += "A"; code += "A";

6
texthook/textthread.cc
View File

@ -54,6 +54,12 @@ void TextThread::AddSentence()
{ {
sentence = std::wstring((wchar_t*)sentenceBuffer.data(), sentenceBuffer.size() / 2); sentence = std::wstring((wchar_t*)sentenceBuffer.data(), sentenceBuffer.size() / 2);
} }
else if (status & USING_UTF8)
{
wchar_t* converted = new wchar_t[sentenceBuffer.size()];
sentence = std::wstring(converted, MultiByteToWideChar(CP_UTF8, 0, sentenceBuffer.data(), sentenceBuffer.size(), converted, sentenceBuffer.size()));
delete[] converted;
}
else else
{ {
wchar_t* converted = new wchar_t[sentenceBuffer.size()]; wchar_t* converted = new wchar_t[sentenceBuffer.size()];

4
vnrhook/include/const.h
View File

@ -91,7 +91,6 @@ enum HostNotificationType {
// - 0x100 // - 0x100
enum HookParamType : unsigned long { enum HookParamType : unsigned long {
USING_STRING = 0x1 // type(data) is char* or wchar_t* and has length USING_STRING = 0x1 // type(data) is char* or wchar_t* and has length
, USING_UTF8 = USING_STRING // jichi 10/21/2014: temporarily handled the same way as USING_STRING
, USING_UNICODE = 0x2 // type(data) is wchar_t or wchar_t* , USING_UNICODE = 0x2 // type(data) is wchar_t or wchar_t*
, BIG_ENDIAN = 0x4 // type(data) is char , BIG_ENDIAN = 0x4 // type(data) is char
, DATA_INDIRECT = 0x8 , DATA_INDIRECT = 0x8
@ -99,8 +98,7 @@ enum HookParamType : unsigned long {
, SPLIT_INDIRECT = 0x20 , SPLIT_INDIRECT = 0x20
, MODULE_OFFSET = 0x40 // do hash module, and the address is relative to module , MODULE_OFFSET = 0x40 // do hash module, and the address is relative to module
, FUNCTION_OFFSET = 0x80 // do hash function, and the address is relative to funccion , FUNCTION_OFFSET = 0x80 // do hash function, and the address is relative to funccion
, PRINT_DWORD = 0x100 // jichi 12/7/2014: Removed , USING_UTF8 = 0x100
, NO_ASCII = 0x100 // jichi 1l/22/2015: Skip ascii characters
, STRING_LAST_CHAR = 0x200 , STRING_LAST_CHAR = 0x200
, NO_CONTEXT = 0x400 , NO_CONTEXT = 0x400
, HOOK_EMPTY = 0x800 , HOOK_EMPTY = 0x800

13
vnrhook/src/engine/engine.cc
View File

@ -16464,6 +16464,16 @@ static void SpecialHookMonoString(DWORD esp_base, HookParam *hp, BYTE, DWORD *da
} }
} }
bool NoAsciiFilter(LPVOID data, DWORD *size, HookParam *, BYTE)
{
auto text = reinterpret_cast<LPBYTE>(data);
if (text)
for (size_t i = 0; i < *size; i++)
if (text[i] > 127)
return true;
return false;
}
bool InsertMonoHooks() bool InsertMonoHooks()
{ {
HMODULE h = ::GetModuleHandleA("mono.dll"); HMODULE h = ::GetModuleHandleA("mono.dll");
@ -16481,7 +16491,8 @@ bool InsertMonoHooks()
const auto &it = funcs[i]; const auto &it = funcs[i];
if (FARPROC addr = ::GetProcAddress(h, it.functionName)) { if (FARPROC addr = ::GetProcAddress(h, it.functionName)) {
hp.address = (DWORD)addr; hp.address = (DWORD)addr;
hp.type = it.hookType|NO_ASCII; // 11/27/2015: Disable ascii string hp.type = it.hookType;
hp.filter_fun = NoAsciiFilter;
hp.offset = it.textIndex * 4; hp.offset = it.textIndex * 4;
hp.length_offset = it.lengthIndex * 4; hp.length_offset = it.lengthIndex * 4;
hp.text_fun = (HookParam::text_fun_t)it.text_fun; hp.text_fun = (HookParam::text_fun_t)it.text_fun;

15
vnrhook/src/hijack/texthook.cc
View File

@ -292,17 +292,6 @@ int ProcessHook(DWORD dwDataBase, DWORD dwRetn, TextHook *hook) // Use SEH to en
} }
#endif // 1 #endif // 1
// Return false if all text are ascii
bool NoAsciiFilter(LPVOID data, DWORD *size, HookParam *, BYTE)
{
auto text = reinterpret_cast<LPBYTE>(data);
if (text)
for (size_t i = 0; i < *size; i++)
if (text[i] > 127)
return true;
return false;
}
} // unnamed namespace } // unnamed namespace
// - TextHook methods - // - TextHook methods -
@ -339,11 +328,7 @@ DWORD TextHook::UnsafeSend(DWORD dwDataBase, DWORD dwRetn)
BYTE *pbData, BYTE *pbData,
pbSmallBuff[SMALL_BUFF_SIZE]; pbSmallBuff[SMALL_BUFF_SIZE];
DWORD dwType = hp.type; DWORD dwType = hp.type;
//if ((dwType & NO_CONTEXT) == 0 && HookFilter(dwRetn))
// return 0;
if ((dwType & NO_ASCII) && !hp.filter_fun)
hp.filter_fun = NoAsciiFilter;
// jichi 10/24/2014: Skip GDI functions // jichi 10/24/2014: Skip GDI functions
// Artikash 6/3/2018: ^ why?? // Artikash 6/3/2018: ^ why??