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

refactor HANDLE out param

Browse Source
This commit is contained in:
Akash Mozumdar 2018-12-03 18:29:30 -05:00
parent f409ee78ce
commit 74383ee0d8
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
GUI/host/textthread.cpp
View File

@ -8,12 +8,9 @@ TextThread::TextThread(ThreadParam tp, HookParam hp, std::optional<std::wstring>
handle(threadCounter++), handle(threadCounter++),
name(name.value_or(Util::StringToWideString(hp.name).value())), name(name.value_or(Util::StringToWideString(hp.name).value())),
tp(tp), tp(tp),
hp(hp), hp(hp)
timer(NULL)
{ {
HANDLE newTimer; CreateTimerQueueTimer(timer, NULL, Flush, this, 25, 25, WT_EXECUTELONGFUNCTION);
CreateTimerQueueTimer(&newTimer, NULL, Flush, this, 25, 25, WT_EXECUTELONGFUNCTION);
timer = newTimer;
OnCreate(this); OnCreate(this);
} }

2
GUI/host/textthread.h
View File

@ -36,6 +36,6 @@ private:
std::wstring buffer; std::wstring buffer;
std::unordered_set<wchar_t> repeatingChars; std::unordered_set<wchar_t> repeatingChars;
std::mutex bufferMutex; std::mutex bufferMutex;
AutoHandle<TimerDeleter> timer;
DWORD lastPushTime; DWORD lastPushTime;
AutoHandle<TimerDeleter> timer = NULL; // this needs to be last so it's destructed first
}; };

1
include/types.h
View File

@ -31,6 +31,7 @@ class AutoHandle
public: public:
AutoHandle(HANDLE h) : h(h) {} AutoHandle(HANDLE h) : h(h) {}
operator HANDLE() { return h.get(); } operator HANDLE() { return h.get(); }
operator PHANDLE() { return &h._Myptr(); }
operator bool() { return h.get() != NULL && h.get() != INVALID_HANDLE_VALUE; } operator bool() { return h.get() != NULL && h.get() != INVALID_HANDLE_VALUE; }
private: private: