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

small refactors

Browse Source
This commit is contained in:
Akash Mozumdar 2018-11-04 01:34:49 -05:00
parent e598ae731e
commit 5468e44929
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
GUI/host/host.cc
View File

@ -59,7 +59,7 @@ namespace
LOCK(hostMutex); LOCK(hostMutex);
if (textThreadsByParams[tp] == nullptr) if (textThreadsByParams[tp] == nullptr)
{ {
if (textThreadsByParams.size() > MAX_THREAD_COUNT) return Host::AddConsoleOutput(L"too many text threads: can't create more"); if (textThreadsByParams.size() > MAX_THREAD_COUNT) return Host::AddConsoleOutput(L"Textractor: too many text threads: can't create more");
OnCreate(textThreadsByParams[tp] = std::make_shared<TextThread>(tp, Host::GetHookParam(tp), Host::GetHookName(tp))); OnCreate(textThreadsByParams[tp] = std::make_shared<TextThread>(tp, Host::GetHookParam(tp), Host::GetHookName(tp)));
} }
textThreadsByParams[tp]->Push(text, len); textThreadsByParams[tp]->Push(text, len);
@ -91,7 +91,7 @@ namespace
RemoveThreads([&](ThreadParam tp) { return tp.pid == processId; }); RemoveThreads([&](ThreadParam tp) { return tp.pid == processId; });
} }
void StartPipe() void CreatePipe()
{ {
std::thread([] std::thread([]
{ {
@ -108,15 +108,11 @@ namespace
ReadFile(hookPipe, &processId, sizeof(processId), &bytesRead, nullptr); ReadFile(hookPipe, &processId, sizeof(processId), &bytesRead, nullptr);
RegisterProcess(processId, hostPipe); RegisterProcess(processId, hostPipe);
// jichi 9/27/2013: why recursion? CreatePipe();
// Artikash 5/20/2018: Easy way to create a new pipe for another process
StartPipe();
while (ReadFile(hookPipe, buffer, PIPE_BUFFER_SIZE, &bytesRead, nullptr)) while (ReadFile(hookPipe, buffer, PIPE_BUFFER_SIZE, &bytesRead, nullptr))
switch (*(int*)buffer) switch (*(int*)buffer)
{ {
//case HOST_NOTIFICATION_NEWHOOK: // Artikash 7/18/2018: Useless for now, but could be used to implement smth later
//break;
case HOST_NOTIFICATION_RMVHOOK: case HOST_NOTIFICATION_RMVHOOK:
{ {
auto info = *(HookRemovedNotif*)buffer; auto info = *(HookRemovedNotif*)buffer;
@ -139,9 +135,9 @@ namespace
break; break;
} }
UnregisterProcess(processId);
DisconnectNamedPipe(hookPipe); DisconnectNamedPipe(hookPipe);
DisconnectNamedPipe(hostPipe); DisconnectNamedPipe(hostPipe);
UnregisterProcess(processId);
CloseHandle(hookPipe); CloseHandle(hookPipe);
CloseHandle(hostPipe); CloseHandle(hostPipe);
}).detach(); }).detach();
@ -151,7 +147,6 @@ namespace
{ {
std::thread([] std::thread([]
{ {
std::wstring last;
while (true) while (true)
{ {
Sleep(50); Sleep(50);
@ -161,8 +156,8 @@ namespace
{ {
if (wchar_t* clipboardData = (wchar_t*)GlobalLock(clipboardHandle)) if (wchar_t* clipboardData = (wchar_t*)GlobalLock(clipboardHandle))
{ {
if (last != clipboardData) static std::wstring last;
Host::GetThread(CLIPBOARD)->AddSentence(last = clipboardData); if (last != clipboardData) Host::GetThread(CLIPBOARD)->AddSentence(last = clipboardData);
GlobalUnlock(clipboardHandle); GlobalUnlock(clipboardHandle);
} }
} }
@ -182,7 +177,7 @@ namespace Host
OnCreate(textThreadsByParams[CONSOLE] = std::make_shared<TextThread>(CONSOLE, HookParam{}, L"Console")); OnCreate(textThreadsByParams[CONSOLE] = std::make_shared<TextThread>(CONSOLE, HookParam{}, L"Console"));
OnCreate(textThreadsByParams[CLIPBOARD] = std::make_shared<TextThread>(CLIPBOARD, HookParam{}, L"Clipboard")); OnCreate(textThreadsByParams[CLIPBOARD] = std::make_shared<TextThread>(CLIPBOARD, HookParam{}, L"Clipboard"));
StartCapturingClipboard(); StartCapturingClipboard();
StartPipe(); CreatePipe();
} }
void Close() void Close()
@ -202,7 +197,7 @@ namespace Host
CloseHandle(CreateMutexW(nullptr, FALSE, (ITH_HOOKMAN_MUTEX_ + std::to_wstring(processId)).c_str())); CloseHandle(CreateMutexW(nullptr, FALSE, (ITH_HOOKMAN_MUTEX_ + std::to_wstring(processId)).c_str()));
if (GetLastError() == ERROR_ALREADY_EXISTS) if (GetLastError() == ERROR_ALREADY_EXISTS)
{ {
AddConsoleOutput(L"already injected"); AddConsoleOutput(L"Textractor: already injected");
return false; return false;
} }
@ -218,7 +213,7 @@ namespace Host
IsWow64Process(processHandle, &invalidProcess); IsWow64Process(processHandle, &invalidProcess);
if (invalidProcess) if (invalidProcess)
{ {
AddConsoleOutput(L"architecture mismatch: try 32 bit Textractor instead"); AddConsoleOutput(L"Textractor: architecture mismatch: try 32 bit Textractor instead");
CloseHandle(processHandle); CloseHandle(processHandle);
return false; return false;
} }
@ -239,7 +234,7 @@ namespace Host
} }
} }
AddConsoleOutput(L"couldn't inject dll"); AddConsoleOutput(L"Textractor: couldn't inject dll");
return false; return false;
} }