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

refactor

Browse Source
This commit is contained in:
Akash Mozumdar 2018-08-28 17:21:20 -04:00
parent d1007097ad
commit 189691a562
3 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
GUI/host/host.cc
View File

@ -33,7 +33,7 @@ namespace
void DispatchText(ThreadParam tp, const BYTE* text, int len)
{
if (!text || len <= 0) return;
LOCK hostLock(hostMutex);
LOCK(hostMutex);
TextThread *it;
if ((it = textThreadsByParams[tp]) == nullptr)
OnCreate(it = textThreadsByParams[tp] = new TextThread(tp, Host::GetHookParam(tp).type));
@ -42,7 +42,7 @@ namespace
void RemoveThreads(std::function<bool(ThreadParam)> removeIf)
{
LOCK hostLock(hostMutex);
LOCK(hostMutex);
std::vector<ThreadParam> removedThreads;
for (auto i : textThreadsByParams)
if (removeIf(i.first))
@ -56,7 +56,7 @@ namespace
void RegisterProcess(DWORD pid, HANDLE hostPipe)
{
LOCK hostLock(hostMutex);
LOCK(hostMutex);
ProcessRecord record;
record.hostPipe = hostPipe;
record.section = OpenFileMappingW(FILE_MAP_READ, FALSE, (ITH_SECTION_ + std::to_wstring(pid)).c_str());
@ -69,7 +69,7 @@ namespace
void UnregisterProcess(DWORD pid)
{
LOCK hostLock(hostMutex);
LOCK(hostMutex);
ProcessRecord pr = processRecordsByIds[pid];
if (!pr.hostPipe) return;
CloseHandle(pr.sectionMutex);
@ -148,7 +148,7 @@ namespace Host
{
// Artikash 7/25/2018: This is only called when NextHooker is closed, at which point Windows should free everything itself...right?
#ifdef _DEBUG // Check memory leaks
LOCK hostLock(hostMutex);
LOCK(hostMutex);
OnRemove = [](TextThread* textThread) { delete textThread; };
for (auto i : processRecordsByIds) UnregisterProcess(i.first);
delete textThreadsByParams[CONSOLE];
@ -223,7 +223,7 @@ namespace Host
HookParam GetHookParam(DWORD pid, unsigned __int64 addr)
{
LOCK hostLock(hostMutex);
LOCK(hostMutex);
HookParam ret = {};
ProcessRecord pr = processRecordsByIds[pid];
if (pr.sectionMap == nullptr) return ret;
@ -241,7 +241,7 @@ namespace Host
std::wstring GetHookName(DWORD pid, unsigned __int64 addr)
{
if (pid == 0) return L"Console";
LOCK hostLock(hostMutex);
LOCK(hostMutex);
std::string buffer = "";
ProcessRecord pr = processRecordsByIds[pid];
if (pr.sectionMap == nullptr) return L"";
@ -260,14 +260,13 @@ namespace Host
TextThread* GetThread(ThreadParam tp)
{
LOCK hostLock(hostMutex);
LOCK(hostMutex);
return textThreadsByParams[tp];
}
void AddConsoleOutput(std::wstring text)
{
LOCK hostLock(hostMutex);
textThreadsByParams[CONSOLE]->AddSentence(std::wstring(text));
GetThread(CONSOLE)->AddSentence(std::wstring(text));
}
}

16
GUI/host/textthread.cc
View File

@ -16,13 +16,15 @@ TextThread::~TextThread()
std::wstring TextThread::GetStore()
{
LOCK ttLock(ttMutex);
LOCK(ttMutex);
return storage;
}
void TextThread::Flush()
{
LOCK ttLock(ttMutex);
std::wstring sentence;
{
LOCK(ttMutex);
if (buffer.size() < 400 && (timestamp - GetTickCount() < 250 || buffer.size() == 0)) return; // TODO: let user change delay before sentence is flushed
std::wstring sentence;
if (status & USING_UNICODE)
@ -35,23 +37,23 @@ void TextThread::Flush()
sentence = std::wstring(converted, MultiByteToWideChar(status & USING_UTF8 ? CP_UTF8 : 932, 0, buffer.data(), buffer.size(), converted, buffer.size()));
delete[] converted;
}
ttMutex.unlock();
AddSentence(sentence);
ttMutex.lock();
memset(buffer.data(), 0, buffer.size());
buffer.clear();
}
AddSentence(sentence);
}
void TextThread::AddSentence(std::wstring sentence)
{
// Dispatch to extensions occurs here. Don't hold mutex! Extensions might take a while!
if (Output) sentence = Output(this, sentence);
LOCK ttLock(ttMutex);
LOCK(ttMutex);
storage.append(sentence);
}
void TextThread::AddText(const BYTE *con, int len)
{
LOCK ttLock(ttMutex);
LOCK(ttMutex);
// Artikash 8/27/2018: add repetition filter
if (len > 6 && buffer.data() && (strstr(buffer.data(), (const char*)con) || wcsstr((const wchar_t*)buffer.data(), (const wchar_t*)con))) return;
buffer.insert(buffer.end(), con, con + len);

2
include/types.h
View File

@ -68,4 +68,4 @@ struct HookRemovedNotif // From hook
unsigned __int64 address;
};
typedef std::lock_guard<std::recursive_mutex> LOCK;
#define LOCK(mutex) std::lock_guard<std::recursive_mutex> lock(mutex)