forked from Public-Mirror/Textractor
refactor
This commit is contained in:
parent
69e01dab7c
commit
8e45b35ebe
@ -44,12 +44,12 @@ namespace
|
||||
{
|
||||
LOCK(hostMutex);
|
||||
std::vector<ThreadParam> removedThreads;
|
||||
for (auto i : textThreadsByParams)
|
||||
if (removeIf(i.first))
|
||||
for (auto[tp, thread] : textThreadsByParams)
|
||||
if (removeIf(tp))
|
||||
{
|
||||
OnRemove(i.second);
|
||||
OnRemove(thread);
|
||||
//delete i.second; // Artikash 7/24/2018: FIXME: Qt GUI updates on another thread, so I can't delete this yet.
|
||||
removedThreads.push_back(i.first);
|
||||
removedThreads.push_back(tp);
|
||||
}
|
||||
for (auto thread : removedThreads) textThreadsByParams.erase(thread);
|
||||
}
|
||||
@ -153,7 +153,7 @@ namespace Host
|
||||
#ifdef _DEBUG // Check memory leaks
|
||||
LOCK(hostMutex);
|
||||
OnRemove = [](TextThread* textThread) { delete textThread; };
|
||||
for (auto i : processRecordsByIds) UnregisterProcess(i.first);
|
||||
for (auto[pid, pr] : processRecordsByIds) UnregisterProcess(pid);
|
||||
delete textThreadsByParams[CONSOLE];
|
||||
#endif
|
||||
}
|
||||
|
11
GUI/main.cpp
11
GUI/main.cpp
@ -2,16 +2,18 @@
|
||||
#include <sstream>
|
||||
#include <QApplication>
|
||||
|
||||
char* GetCppExceptionInfo(EXCEPTION_POINTERS* exception)
|
||||
namespace
|
||||
{
|
||||
char* GetCppExceptionInfo(EXCEPTION_POINTERS* exception)
|
||||
{
|
||||
// See https://blogs.msdn.microsoft.com/oldnewthing/20100730-00/?p=13273
|
||||
// Not very reliable so use __try
|
||||
__try { return ((char****)exception->ExceptionRecord->ExceptionInformation[2])[3][1][1] + 8; }
|
||||
__except (EXCEPTION_EXECUTE_HANDLER) { return "Could not find"; }
|
||||
}
|
||||
}
|
||||
|
||||
LONG WINAPI ExceptionHandler(EXCEPTION_POINTERS* exception)
|
||||
{
|
||||
LONG WINAPI ExceptionHandler(EXCEPTION_POINTERS* exception)
|
||||
{
|
||||
MEMORY_BASIC_INFORMATION info = {};
|
||||
VirtualQuery(exception->ExceptionRecord->ExceptionAddress, &info, sizeof(info));
|
||||
wchar_t moduleName[MAX_PATH] = {};
|
||||
@ -32,6 +34,7 @@ LONG WINAPI ExceptionHandler(EXCEPTION_POINTERS* exception)
|
||||
MessageBoxW(NULL, errorMsg.str().c_str(), L"Textractor ERROR", MB_ICONERROR);
|
||||
|
||||
return EXCEPTION_CONTINUE_SEARCH;
|
||||
}
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
|
@ -6,8 +6,8 @@ bool RemoveRepeatedChars(std::wstring& sentence)
|
||||
{
|
||||
int repeatNumber = 0;
|
||||
wchar_t prevChar = sentence[0];
|
||||
for (auto i : sentence)
|
||||
if (i == prevChar) repeatNumber++;
|
||||
for (auto c : sentence)
|
||||
if (c == prevChar) repeatNumber++;
|
||||
else break;
|
||||
if (repeatNumber == 1) return false;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user