Public-Mirror/Textractor
1
0
Fork 1
mirror of https://github.com/Artikash/Textractor.git synced 2024-12-23 17:04:12 +08:00
Code Issues Projects Releases Wiki Activity

remember saved thread and refactor

Browse Source
This commit is contained in:
Akash Mozumdar 2019-02-03 08:49:58 -05:00
parent dcfbeafd44
commit a7a4a80913
3 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
GUI/mainwindow.cpp
View File

@ -90,10 +90,11 @@ void MainWindow::closeEvent(QCloseEvent*)
void MainWindow::ProcessConnected(DWORD processId) void MainWindow::ProcessConnected(DWORD processId)
{ {
if (processId == 0) return; if (processId == 0) return;
QMetaObject::invokeMethod(this, [this, processId]
{
QString process = S(Util::GetModuleFilename(processId).value_or(L"???")); QString process = S(Util::GetModuleFilename(processId).value_or(L"???"));
QMetaObject::invokeMethod(this, [this, process, processId]
{
ui->processCombo->addItem(QString::number(processId, 16).toUpper() + ": " + QFileInfo(process).fileName()); ui->processCombo->addItem(QString::number(processId, 16).toUpper() + ": " + QFileInfo(process).fileName());
});
if (process == "???") return; if (process == "???") return;
QTextFile(GAME_SAVE_FILE, QIODevice::WriteOnly | QIODevice::Append).write((process + "\n").toUtf8()); QTextFile(GAME_SAVE_FILE, QIODevice::WriteOnly | QIODevice::Append).write((process + "\n").toUtf8());
@ -102,9 +103,9 @@ void MainWindow::ProcessConnected(DWORD processId)
// Can't use QFileInfo::absoluteFilePath since hook save file has '\\' as path separator // Can't use QFileInfo::absoluteFilePath since hook save file has '\\' as path separator
auto hookList = std::find_if(allProcesses.rbegin(), allProcesses.rend(), [&](QString hookList) { return hookList.contains(process); }); auto hookList = std::find_if(allProcesses.rbegin(), allProcesses.rend(), [&](QString hookList) { return hookList.contains(process); });
if (hookList != allProcesses.rend()) if (hookList != allProcesses.rend())
for (auto hookCode : hookList->split(" , ")) for (auto hookInfo : hookList->split(" , "))
if (auto hp = Util::ParseCode(S(hookCode))) Host::InsertHook(processId, hp.value()); if (auto hp = Util::ParseCode(S(hookInfo))) QMetaObject::invokeMethod(this, [processId, hp] { Host::InsertHook(processId, hp.value()); });
}); else swscanf_s(S(hookInfo).c_str(), L"|%I64d:%I64d:%[^\n]", &savedThreadCtx.first, &savedThreadCtx.second, savedThreadCode, ARRAYSIZE(savedThreadCode));
} }
void MainWindow::ProcessDisconnected(DWORD processId) void MainWindow::ProcessDisconnected(DWORD processId)
@ -117,10 +118,14 @@ void MainWindow::ProcessDisconnected(DWORD processId)
void MainWindow::ThreadAdded(TextThread* thread) void MainWindow::ThreadAdded(TextThread* thread)
{ {
QString ttString = TextThreadString(thread) + S(thread->name) + " (" + S(Util::GenerateCode(thread->hp, thread->tp.processId)) + ")"; std::wstring threadCode = Util::GenerateCode(thread->hp, thread->tp.processId);
QMetaObject::invokeMethod(this, [this, ttString] QString ttString = TextThreadString(thread) + S(thread->name) + " (" + S(threadCode) + ")";
bool savedMatch = savedThreadCtx.first == thread->tp.ctx && savedThreadCtx.second == thread->tp.ctx2 && savedThreadCode == threadCode;
if (savedMatch) savedThreadCtx.first = savedThreadCtx.second = savedThreadCode[0] = 0;
QMetaObject::invokeMethod(this, [this, ttString, savedMatch]
{ {
ui->ttCombo->addItem(ttString); ui->ttCombo->addItem(ttString);
if (savedMatch) ViewThread(ui->ttCombo->count() - 1);
}); });
} }
@ -130,11 +135,7 @@ void MainWindow::ThreadRemoved(TextThread* thread)
QMetaObject::invokeMethod(this, [this, ttString] QMetaObject::invokeMethod(this, [this, ttString]
{ {
int threadIndex = ui->ttCombo->findText(ttString, Qt::MatchStartsWith); int threadIndex = ui->ttCombo->findText(ttString, Qt::MatchStartsWith);
if (threadIndex == ui->ttCombo->currentIndex()) if (threadIndex == ui->ttCombo->currentIndex()) ViewThread(0);
{
ui->ttCombo->setCurrentIndex(0);
ViewThread(0);
}
ui->ttCombo->removeItem(threadIndex); ui->ttCombo->removeItem(threadIndex);
}, Qt::BlockingQueuedConnection); }, Qt::BlockingQueuedConnection);
} }
@ -161,13 +162,12 @@ bool MainWindow::SentenceReceived(TextThread* thread, std::wstring& sentence)
QString MainWindow::TextThreadString(TextThread* thread) QString MainWindow::TextThreadString(TextThread* thread)
{ {
ThreadParam tp = thread->tp;
return QString("%1:%2:%3:%4:%5: ").arg( return QString("%1:%2:%3:%4:%5: ").arg(
QString::number(thread->handle, 16), QString::number(thread->handle, 16),
QString::number(tp.processId, 16), QString::number(thread->tp.processId, 16),
QString::number(tp.addr, 16), QString::number(thread->tp.addr, 16),
QString::number(tp.ctx, 16), QString::number(thread->tp.ctx, 16),
QString::number(tp.ctx2, 16) QString::number(thread->tp.ctx2, 16)
).toUpper(); ).toUpper();
} }
@ -279,7 +279,11 @@ void MainWindow::SaveHooks()
if (!(hp.type & HOOK_ENGINE)) hookCodes[tp.addr] = S(Util::GenerateCode(hp, tp.processId)); if (!(hp.type & HOOK_ENGINE)) hookCodes[tp.addr] = S(Util::GenerateCode(hp, tp.processId));
} }
} }
QTextFile(HOOK_SAVE_FILE, QIODevice::WriteOnly | QIODevice::Append).write((S(processName.value()) + " , " + QStringList(hookCodes.values()).join(" , ") + "\n").toUtf8()); auto hookInfo = QStringList() << S(processName.value()) << hookCodes.values();
TextThread* current = Host::GetThread(ParseTextThreadString(ui->ttCombo->currentText()));
if (current->tp.processId == GetSelectedProcessId())
hookInfo << QString("|%1:%2:%3").arg(current->tp.ctx).arg(current->tp.ctx2).arg(S(Util::GenerateCode(Host::GetHookParam(current->tp), current->tp.processId)));
QTextFile(HOOK_SAVE_FILE, QIODevice::WriteOnly | QIODevice::Append).write((hookInfo.join(" , ") + "\n").toUtf8());
} }
} }
@ -323,6 +327,7 @@ void MainWindow::Extensions()
void MainWindow::ViewThread(int index) void MainWindow::ViewThread(int index)
{ {
ui->ttCombo->setCurrentIndex(index);
ui->textOutput->setPlainText(S(Host::GetThread(ParseTextThreadString(ui->ttCombo->itemText(index)))->storage->c_str())); ui->textOutput->setPlainText(S(Host::GetThread(ParseTextThreadString(ui->ttCombo->itemText(index)))->storage->c_str()));
ui->textOutput->moveCursor(QTextCursor::End); ui->textOutput->moveCursor(QTextCursor::End);
} }

2
GUI/mainwindow.h
View File

@ -38,4 +38,6 @@ private:
Ui::MainWindow* ui; Ui::MainWindow* ui;
QWidget* extenWindow; QWidget* extenWindow;
std::pair<uint64_t, uint64_t> savedThreadCtx;
wchar_t savedThreadCode[1000];
}; };

2
GUI/misc.h
View File

@ -2,7 +2,7 @@
#include "qtcommon.h" #include "qtcommon.h"
struct QTextFile : QFile { QTextFile(const QString& name, QIODevice::OpenMode mode) : QFile(name) { open(mode | QIODevice::Text); } }; struct QTextFile : QFile { QTextFile(QString name, QIODevice::OpenMode mode) : QFile(name) { open(mode | QIODevice::Text); } };
inline std::wstring S(const QString& S) { return { S.toStdWString() }; } inline std::wstring S(const QString& S) { return { S.toStdWString() }; }
inline QString S(const std::wstring& S) { return QString::fromStdWString(S); } inline QString S(const std::wstring& S) { return QString::fromStdWString(S); }
inline HMODULE LoadLibraryOnce(std::wstring fileName) { if (HMODULE module = GetModuleHandleW(fileName.c_str())) return module; return LoadLibraryW(fileName.c_str()); } inline HMODULE LoadLibraryOnce(std::wstring fileName) { if (HMODULE module = GetModuleHandleW(fileName.c_str())) return module; return LoadLibraryW(fileName.c_str()); }