forked from Public-Mirror/Textractor
fix rcode disconnecting and hcode crashing on removal
This commit is contained in:
parent
54f60f7657
commit
cc543a682c
@ -252,9 +252,13 @@ void TextHook::Read()
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
dataLen = min(HookStrlen((BYTE*)location), TEXT_BUFFER_SIZE);
|
if (int currentLen = HookStrlen((BYTE*)location))
|
||||||
memcpy(buffer, location, dataLen);
|
{
|
||||||
TextOutput({ GetCurrentProcessId(), address, 0, 0 }, buffer, dataLen);
|
dataLen = min(currentLen, TEXT_BUFFER_SIZE);
|
||||||
|
memcpy(buffer, location, dataLen);
|
||||||
|
TextOutput({ GetCurrentProcessId(), address, 0, 0 }, buffer, dataLen);
|
||||||
|
}
|
||||||
|
else changeCount = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
__except (EXCEPTION_EXECUTE_HANDLER)
|
__except (EXCEPTION_EXECUTE_HANDLER)
|
||||||
@ -274,7 +278,7 @@ bool TextHook::InsertReadCode()
|
|||||||
void TextHook::RemoveHookCode()
|
void TextHook::RemoveHookCode()
|
||||||
{
|
{
|
||||||
MH_DisableHook(location);
|
MH_DisableHook(location);
|
||||||
MH_RemoveHook(location);
|
//MH_RemoveHook(location);
|
||||||
}
|
}
|
||||||
|
|
||||||
void TextHook::RemoveReadCode()
|
void TextHook::RemoveReadCode()
|
||||||
@ -287,12 +291,13 @@ void TextHook::RemoveReadCode()
|
|||||||
|
|
||||||
void TextHook::Clear()
|
void TextHook::Clear()
|
||||||
{
|
{
|
||||||
std::scoped_lock lock(viewMutex);
|
|
||||||
if (address == 0) return;
|
if (address == 0) return;
|
||||||
|
NotifyHookRemove(address, hp.name);
|
||||||
|
std::scoped_lock lock(viewMutex);
|
||||||
if (hp.type & DIRECT_READ) RemoveReadCode();
|
if (hp.type & DIRECT_READ) RemoveReadCode();
|
||||||
else RemoveHookCode();
|
else RemoveHookCode();
|
||||||
NotifyHookRemove(address, hp.name);
|
memset(&hp, 0, sizeof(HookParam));
|
||||||
memset(this, 0, sizeof(TextHook)); // jichi 11/30/2013: This is the original code of ITH
|
address = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int TextHook::GetLength(uintptr_t base, uintptr_t in)
|
int TextHook::GetLength(uintptr_t base, uintptr_t in)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user