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

fix crash when saving hooks. refactor other things to compile time

Browse Source
This commit is contained in:
Akash Mozumdar 2018-12-14 23:14:30 -05:00
parent 606a36968b
commit 86b2014a12
6 changed files with 38 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
GUI/extenwindow.cpp
View File

@ -81,8 +81,7 @@ ExtenWindow::ExtenWindow(QWidget* parent) :
{ {
ui->setupUi(this); ui->setupUi(this);
extenList = findChild<QListWidget*>("extenList"); ui->extenList->installEventFilter(this);
extenList->installEventFilter(this);
for (auto extenName : QString(QAutoFile(EXTEN_SAVE_FILE, QIODevice::ReadOnly)->readAll()).split(">")) Load(extenName); for (auto extenName : QString(QAutoFile(EXTEN_SAVE_FILE, QIODevice::ReadOnly)->readAll()).split(">")) Load(extenName);
Sync(); Sync();
@ -95,12 +94,12 @@ ExtenWindow::~ExtenWindow()
void ExtenWindow::Sync() void ExtenWindow::Sync()
{ {
extenList->clear(); ui->extenList->clear();
QAutoFile extenSaveFile(EXTEN_SAVE_FILE, QIODevice::WriteOnly | QIODevice::Truncate); QAutoFile extenSaveFile(EXTEN_SAVE_FILE, QIODevice::WriteOnly | QIODevice::Truncate);
std::shared_lock sharedLock(extenMutex); std::shared_lock sharedLock(extenMutex);
for (auto extenName : extenNames) for (auto extenName : extenNames)
{ {
extenList->addItem(extenName); ui->extenList->addItem(extenName);
extenSaveFile->write((extenName + ">").toUtf8()); extenSaveFile->write((extenName + ">").toUtf8());
} }
} }
@ -119,7 +118,7 @@ bool ExtenWindow::eventFilter(QObject* target, QEvent* event)
if (event->type() == QEvent::ChildRemoved) if (event->type() == QEvent::ChildRemoved)
{ {
QStringList extenNames; QStringList extenNames;
for (int i = 0; i < extenList->count(); ++i) extenNames.push_back(extenList->item(i)->text()); for (int i = 0; i < ui->extenList->count(); ++i) extenNames.push_back(ui->extenList->item(i)->text());
Reorder(extenNames); Reorder(extenNames);
Sync(); Sync();
} }
@ -143,6 +142,6 @@ void ExtenWindow::on_addButton_clicked()
void ExtenWindow::on_rmvButton_clicked() void ExtenWindow::on_rmvButton_clicked()
{ {
if (auto extenName = extenList->currentItem()) Unload(extenName->text()); if (auto extenName = ui->extenList->currentItem()) Unload(extenName->text());
Sync(); Sync();
} }

1
GUI/extenwindow.h
View File

@ -32,5 +32,4 @@ private:
void dropEvent(QDropEvent* event); void dropEvent(QDropEvent* event);
Ui::ExtenWindow* ui; Ui::ExtenWindow* ui;
QListWidget* extenList;
}; };

61
GUI/mainwindow.cpp
View File

@ -18,9 +18,7 @@ MainWindow::MainWindow(QWidget *parent) :
extenWindow(new ExtenWindow(this)) extenWindow(new ExtenWindow(this))
{ {
ui->setupUi(this); ui->setupUi(this);
QFrame* processFrame = findChild<QFrame*>("processFrame"); for (auto[text, slot] : Array<std::tuple<QString, void(MainWindow::*)()>>{
QVBoxLayout* processLayout = findChild<QVBoxLayout*>("processLayout");
for (auto[text, slot] : std::initializer_list<std::tuple<QString, void(MainWindow::*)()>>{
{ ATTACH, &MainWindow::on_attachButton_clicked }, { ATTACH, &MainWindow::on_attachButton_clicked },
{ DETACH, &MainWindow::on_detachButton_clicked }, { DETACH, &MainWindow::on_detachButton_clicked },
{ ADD_HOOK, &MainWindow::on_hookButton_clicked }, { ADD_HOOK, &MainWindow::on_hookButton_clicked },
@ -29,16 +27,12 @@ MainWindow::MainWindow(QWidget *parent) :
{ EXTENSIONS, &MainWindow::on_extenButton_clicked } { EXTENSIONS, &MainWindow::on_extenButton_clicked }
}) })
{ {
QPushButton* button = new QPushButton(processFrame); QPushButton* button = new QPushButton(ui->processFrame);
connect(button, &QPushButton::clicked, this, slot); connect(button, &QPushButton::clicked, this, slot);
button->setText(text); button->setText(text);
processLayout->addWidget(button); ui->processLayout->addWidget(button);
} }
processLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding)); ui->processLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding));
processCombo = findChild<QComboBox*>("processCombo");
ttCombo = findChild<QComboBox*>("ttCombo");
textOutput = findChild<QPlainTextEdit*>("textOutput");
if (settings.contains(WINDOW)) setGeometry(settings.value(WINDOW).toRect()); if (settings.contains(WINDOW)) setGeometry(settings.value(WINDOW).toRect());
if (settings.contains(FLUSH_DELAY)) TextThread::flushDelay = settings.value(FLUSH_DELAY).toInt(); if (settings.contains(FLUSH_DELAY)) TextThread::flushDelay = settings.value(FLUSH_DELAY).toInt();
@ -97,7 +91,7 @@ void MainWindow::ProcessConnected(DWORD processId)
InvokeOnMainThread([&, processId] InvokeOnMainThread([&, processId]
{ {
QString process = S(Util::GetModuleFileName(processId).value()); QString process = S(Util::GetModuleFileName(processId).value());
processCombo->addItem(QString::number(processId, 16).toUpper() + ": " + QFileInfo(process).fileName()); ui->processCombo->addItem(QString::number(processId, 16).toUpper() + ": " + QFileInfo(process).fileName());
QStringList allProcesses = QString(QAutoFile(HOOK_SAVE_FILE, QIODevice::ReadOnly)->readAll()).split("\r", QString::SkipEmptyParts); QStringList allProcesses = QString(QAutoFile(HOOK_SAVE_FILE, QIODevice::ReadOnly)->readAll()).split("\r", QString::SkipEmptyParts);
// 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
@ -110,13 +104,13 @@ void MainWindow::ProcessConnected(DWORD processId)
void MainWindow::ProcessDisconnected(DWORD processId) void MainWindow::ProcessDisconnected(DWORD processId)
{ {
InvokeOnMainThread([&, processId] { processCombo->removeItem(processCombo->findText(QString::number(processId, 16).toUpper() + ":", Qt::MatchStartsWith)); }); InvokeOnMainThread([&, processId] { ui->processCombo->removeItem(ui->processCombo->findText(QString::number(processId, 16).toUpper() + ":", Qt::MatchStartsWith)); });
} }
void MainWindow::ThreadAdded(TextThread* thread) void MainWindow::ThreadAdded(TextThread* thread)
{ {
QString ttString = TextThreadString(thread) + S(thread->name) + " (" + GenerateCode(thread->hp, thread->tp.processId) + ")"; QString ttString = TextThreadString(thread) + S(thread->name) + " (" + GenerateCode(thread->hp, thread->tp.processId) + ")";
InvokeOnMainThread([&, ttString] { ttCombo->addItem(ttString); }); InvokeOnMainThread([&, ttString] { ui->ttCombo->addItem(ttString); });
} }
void MainWindow::ThreadRemoved(TextThread* thread) void MainWindow::ThreadRemoved(TextThread* thread)
@ -124,13 +118,13 @@ void MainWindow::ThreadRemoved(TextThread* thread)
QString ttString = TextThreadString(thread); QString ttString = TextThreadString(thread);
InvokeOnMainThread([&, ttString] InvokeOnMainThread([&, ttString]
{ {
int threadIndex = ttCombo->findText(ttString, Qt::MatchStartsWith); int threadIndex = ui->ttCombo->findText(ttString, Qt::MatchStartsWith);
if (threadIndex == ttCombo->currentIndex()) if (threadIndex == ui->ttCombo->currentIndex())
{ {
ttCombo->setCurrentIndex(0); ui->ttCombo->setCurrentIndex(0);
on_ttCombo_activated(0); on_ttCombo_activated(0);
} }
ttCombo->removeItem(threadIndex); ui->ttCombo->removeItem(threadIndex);
}); });
} }
@ -142,11 +136,11 @@ bool MainWindow::SentenceReceived(TextThread* thread, std::wstring& sentence)
QString ttString = TextThreadString(thread); QString ttString = TextThreadString(thread);
InvokeOnMainThread([&, ttString, sentence] InvokeOnMainThread([&, ttString, sentence]
{ {
if (ttCombo->currentText().startsWith(ttString)) if (ui->ttCombo->currentText().startsWith(ttString))
{ {
textOutput->moveCursor(QTextCursor::End); ui->textOutput->moveCursor(QTextCursor::End);
textOutput->insertPlainText(S(sentence)); ui->textOutput->insertPlainText(S(sentence));
textOutput->moveCursor(QTextCursor::End); ui->textOutput->moveCursor(QTextCursor::End);
} }
}); });
return true; return true;
@ -174,14 +168,14 @@ ThreadParam MainWindow::ParseTextThreadString(QString ttString)
DWORD MainWindow::GetSelectedProcessId() DWORD MainWindow::GetSelectedProcessId()
{ {
return processCombo->currentText().split(":")[0].toULong(nullptr, 16); return ui->processCombo->currentText().split(":")[0].toULong(nullptr, 16);
} }
std::unordered_map<std::string, int64_t> MainWindow::GetMiscInfo(TextThread* thread) std::unordered_map<std::string, int64_t> MainWindow::GetMiscInfo(TextThread* thread)
{ {
return return
{ {
{ "current select", ttCombo->currentText().startsWith(TextThreadString(thread)) }, { "current select", ui->ttCombo->currentText().startsWith(TextThreadString(thread)) },
{ "text number", thread->handle }, { "text number", thread->handle },
{ "process id", thread->tp.processId }, { "process id", thread->tp.processId },
{ "hook address", thread->tp.addr }, { "hook address", thread->tp.addr },
@ -223,15 +217,18 @@ void MainWindow::on_hookButton_clicked()
void MainWindow::on_saveButton_clicked() void MainWindow::on_saveButton_clicked()
{ {
QHash<uint64_t, QString> hookCodes; if (auto processName = Util::GetModuleFileName(GetSelectedProcessId()))
for (int i = 0; i < ttCombo->count(); ++i)
{ {
ThreadParam tp = ParseTextThreadString(ttCombo->itemText(i)); QHash<uint64_t, QString> hookCodes;
if (tp.processId == GetSelectedProcessId() && !(Host::GetHookParam(tp).type & HOOK_ENGINE)) hookCodes[tp.addr] = GenerateCode(Host::GetHookParam(tp), tp.processId); for (int i = 0; i < ui->ttCombo->count(); ++i)
{
ThreadParam tp = ParseTextThreadString(ui->ttCombo->itemText(i));
if (tp.processId == GetSelectedProcessId() && !(Host::GetHookParam(tp).type & HOOK_ENGINE)) hookCodes[tp.addr] = GenerateCode(Host::GetHookParam(tp), tp.processId);
}
QString hookList = S(processName.value());
for (auto hookCode : hookCodes) hookList += " , " + hookCode;
QAutoFile(HOOK_SAVE_FILE, QIODevice::Append)->write((hookList + "\r\n").toUtf8());
} }
QString hookList = S(Util::GetModuleFileName(GetSelectedProcessId()).value());
for (auto hookCode : hookCodes) hookList += " , " + hookCode;
QAutoFile(HOOK_SAVE_FILE, QIODevice::Append)->write((hookList + "\r\n").toUtf8());
} }
void MainWindow::on_setButton_clicked() void MainWindow::on_setButton_clicked()
@ -247,6 +244,6 @@ void MainWindow::on_extenButton_clicked()
void MainWindow::on_ttCombo_activated(int index) void MainWindow::on_ttCombo_activated(int index)
{ {
textOutput->setPlainText(S(Host::GetThread(ParseTextThreadString(ttCombo->itemText(index)))->GetStorage())); ui->textOutput->setPlainText(S(Host::GetThread(ParseTextThreadString(ui->ttCombo->itemText(index)))->GetStorage()));
textOutput->moveCursor(QTextCursor::End); ui->textOutput->moveCursor(QTextCursor::End);
} }

3
GUI/mainwindow.h
View File

@ -44,8 +44,5 @@ private:
Ui::MainWindow* ui; Ui::MainWindow* ui;
QSettings settings = QSettings(CONFIG_FILE, QSettings::IniFormat); QSettings settings = QSettings(CONFIG_FILE, QSettings::IniFormat);
QComboBox* processCombo;
QComboBox* ttCombo;
QPlainTextEdit* textOutput;
QWidget* extenWindow; QWidget* extenWindow;
}; };

7
GUI/setdialog.cpp
View File

@ -10,10 +10,7 @@ SetDialog::SetDialog(QWidget* parent) :
ui(new Ui::SetDialog) ui(new Ui::SetDialog)
{ {
ui->setupUi(this); ui->setupUi(this);
for (auto[spinBox, value, label] : Array<std::tuple<QSpinBox*&, int, const char*>>{
QFormLayout* layout = findChild<QFormLayout*>("layout");
for (auto[spinBox, value, label] : std::initializer_list<std::tuple<QSpinBox*&, int, const char*>>{
{ flushDelay, TextThread::flushDelay, FLUSH_DELAY }, { flushDelay, TextThread::flushDelay, FLUSH_DELAY },
{ maxBufferSize, TextThread::maxBufferSize, MAX_BUFFER_SIZE }, { maxBufferSize, TextThread::maxBufferSize, MAX_BUFFER_SIZE },
{ defaultCodepage, TextThread::defaultCodepage, DEFAULT_CODEPAGE } { defaultCodepage, TextThread::defaultCodepage, DEFAULT_CODEPAGE }
@ -22,7 +19,7 @@ SetDialog::SetDialog(QWidget* parent) :
spinBox = new QSpinBox(this); spinBox = new QSpinBox(this);
spinBox->setMaximum(INT_MAX); spinBox->setMaximum(INT_MAX);
spinBox->setValue(value); spinBox->setValue(value);
layout->insertRow(0, label, spinBox); ui->layout->insertRow(0, label, spinBox);
} }
} }

2
include/types.h
View File

@ -3,6 +3,8 @@
#include "common.h" #include "common.h"
#include "const.h" #include "const.h"
template <typename T> using Array = T[];
template<typename E, typename M = std::mutex, template<typename...> typename P = std::unique_ptr> template<typename E, typename M = std::mutex, template<typename...> typename P = std::unique_ptr>
class ThreadSafePtr class ThreadSafePtr
{ {