mirror of
https://github.com/Artikash/Textractor.git
synced 2024-12-23 17:04:12 +08:00
minor fixes
This commit is contained in:
parent
379024afc0
commit
f4980d6eb6
@ -24,6 +24,7 @@ HookManager::HookManager() :
|
||||
attach(nullptr),
|
||||
detach(nullptr),
|
||||
nextThreadNumber(0),
|
||||
splitDelay(250),
|
||||
textThreadsByParams(),
|
||||
processRecordsByIds()
|
||||
{
|
||||
|
@ -103,7 +103,7 @@ DLLEXPORT bool InjectProcessById(DWORD processId, DWORD timeout)
|
||||
{
|
||||
WaitForSingleObject(thread, timeout);
|
||||
CloseHandle(thread);
|
||||
VirtualFreeEx(processHandle, remoteData, textHookerPathSize, MEM_RELEASE);
|
||||
VirtualFreeEx(processHandle, remoteData, 0, MEM_RELEASE);
|
||||
CloseHandle(processHandle);
|
||||
return true;
|
||||
}
|
||||
|
@ -10,16 +10,16 @@
|
||||
|
||||
struct ThreadParameter
|
||||
{
|
||||
DWORD pid; // jichi: 5/11/2014: The process ID
|
||||
DWORD hook; // Artikash 6/6/2018: The start address of the hook
|
||||
DWORD retn; // jichi 5/11/2014: The return address of the hook
|
||||
DWORD spl; // jichi 5/11/2014: the processed split value of the hook paramete
|
||||
DWORD pid; // jichi: 5/11/2014: The process ID
|
||||
DWORD hook; // Artikash 6/6/2018: The start address of the hook
|
||||
DWORD retn; // jichi 5/11/2014: The return address of the hook
|
||||
DWORD spl; // jichi 5/11/2014: the processed split value of the hook paramete
|
||||
|
||||
// Artikash 5/31/2018: required for unordered_map to work with struct key
|
||||
friend bool operator==(const ThreadParameter& one, const ThreadParameter& two)
|
||||
{
|
||||
return one.pid == two.pid && one.hook == two.hook && one.retn == two.retn && one.spl == two.spl;
|
||||
}
|
||||
// Artikash 5/31/2018: required for unordered_map to work with struct key
|
||||
friend bool operator==(const ThreadParameter& one, const ThreadParameter& two)
|
||||
{
|
||||
return one.pid == two.pid && one.hook == two.hook && one.retn == two.retn && one.spl == two.spl;
|
||||
}
|
||||
};
|
||||
|
||||
#define CURRENT_SELECT 0x1000
|
||||
@ -32,31 +32,31 @@ typedef void(*ThreadOutputCallback)(TextThread*, std::wstring data);
|
||||
class TextThread
|
||||
{
|
||||
public:
|
||||
TextThread(ThreadParameter tp, unsigned int threadNumber, unsigned int splitDelay);
|
||||
~TextThread();
|
||||
TextThread(ThreadParameter tp, unsigned int threadNumber, unsigned int splitDelay);
|
||||
~TextThread();
|
||||
|
||||
void Reset();
|
||||
void AddText(const BYTE *con, int len);
|
||||
void AddSentence();
|
||||
void AddSentence(std::wstring sentence);
|
||||
void Reset();
|
||||
void AddText(const BYTE *con, int len);
|
||||
void AddSentence();
|
||||
void AddSentence(std::wstring sentence);
|
||||
|
||||
std::wstring GetStore() { return storage; }
|
||||
DWORD &Status() { return status; }
|
||||
WORD Number() const { return threadNumber; }
|
||||
ThreadParameter GetThreadParameter() { return tp; }
|
||||
std::wstring GetStore() { return storage; }
|
||||
DWORD &Status() { return status; }
|
||||
WORD Number() const { return threadNumber; }
|
||||
ThreadParameter GetThreadParameter() { return tp; }
|
||||
|
||||
void RegisterOutputCallBack(ThreadOutputCallback cb) { output = cb; }
|
||||
void RegisterOutputCallBack(ThreadOutputCallback cb) { output = cb; }
|
||||
|
||||
private:
|
||||
CRITICAL_SECTION ttCs;
|
||||
ThreadOutputCallback output;
|
||||
std::vector<char> sentenceBuffer;
|
||||
std::wstring storage;
|
||||
CRITICAL_SECTION ttCs;
|
||||
ThreadOutputCallback output;
|
||||
std::vector<char> sentenceBuffer;
|
||||
std::wstring storage;
|
||||
|
||||
ThreadParameter tp;
|
||||
unsigned int threadNumber;
|
||||
unsigned int splitDelay;
|
||||
DWORD status;
|
||||
ThreadParameter tp;
|
||||
unsigned int threadNumber;
|
||||
unsigned int splitDelay;
|
||||
DWORD status;
|
||||
};
|
||||
|
||||
// EOF
|
||||
|
Loading…
x
Reference in New Issue
Block a user