chenx221/Textractor
1
0
Fork 0
forked from Public-Mirror/Textractor
Code Pull Requests Activity

fix code generation

Browse Source
This commit is contained in:
Akash Mozumdar 2019-01-31 12:47:56 -05:00
parent c864425c36
commit 84bf8c659f
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
GUI/host/util.cpp
View File

@ -169,9 +169,15 @@ namespace
return hp; return hp;
} }
std::wstring HexString(int64_t num) // only needed for signed nums
{
return (std::wstringstream() << std::uppercase << std::hex << (num < 0 ? "-" : "") << abs(num)).str();
}
std::wstring GenerateRCode(HookParam hp) std::wstring GenerateRCode(HookParam hp)
{ {
std::wstringstream RCode(L"R"); std::wstringstream RCode;
RCode << "R";
if (hp.type & USING_UNICODE) if (hp.type & USING_UNICODE)
{ {
@ -185,7 +191,7 @@ namespace
RCode << std::uppercase << std::hex; RCode << std::uppercase << std::hex;
if (hp.type & DATA_INDIRECT) RCode << "*" << hp.index; if (hp.type & DATA_INDIRECT) RCode << "*" << HexString(hp.index);
RCode << "@" << hp.address; RCode << "@" << hp.address;
@ -194,7 +200,8 @@ namespace
std::wstring GenerateHCode(HookParam hp, DWORD processId) std::wstring GenerateHCode(HookParam hp, DWORD processId)
{ {
std::wstringstream HCode(L"H"); std::wstringstream HCode;
HCode << "H";
if (hp.type & USING_UNICODE) if (hp.type & USING_UNICODE)
{ {
@ -217,10 +224,10 @@ namespace
if (hp.offset < 0) hp.offset += 4; if (hp.offset < 0) hp.offset += 4;
if (hp.split < 0) hp.split += 4; if (hp.split < 0) hp.split += 4;
HCode << hp.offset; HCode << HexString(hp.offset);
if (hp.type & DATA_INDIRECT) HCode << "*" << hp.index; if (hp.type & DATA_INDIRECT) HCode << "*" << HexString(hp.index);
if (hp.type & USING_SPLIT) HCode << ":" << hp.split; if (hp.type & USING_SPLIT) HCode << ":" << HexString(hp.split);
if (hp.type & SPLIT_INDIRECT) HCode << "*" << hp.split_index; if (hp.type & SPLIT_INDIRECT) HCode << "*" << HexString(hp.split_index);
// Attempt to make the address relative // Attempt to make the address relative
if (!(hp.type & MODULE_OFFSET)) if (!(hp.type & MODULE_OFFSET))