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

big refactor. move extension internals into unnamed namespace. use mainwindow instead of dialog for extension window. and other renames/bugfixes

Browse Source
This commit is contained in:
Akash Mozumdar 2018-11-01 14:07:42 -04:00
parent e48adc14bb
commit ce225fd900
10 changed files with 181 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GUI/CMakeLists.txt
View File

@ -9,7 +9,7 @@ set(gui_SRCS
main.cpp
mainwindow.cpp
misc.cpp
extendialog.cpp
extenwindow.cpp
tests.cpp
host/host.cc
host/textthread.cc

117
GUI/extendialog.cpp
View File

@ -1,117 +0,0 @@
#include "extendialog.h"
#include "ui_extendialog.h"
#include "types.h"
#include <QFileDialog>
ListRearrangeFilter::ListRearrangeFilter(QWidget* parent) : QObject(parent) {}
bool ListRearrangeFilter::eventFilter(QObject*, QEvent* event)
{
if (event->type() == QEvent::ChildRemoved) emit SigRearranged();
return false;
}
ExtenDialog::ExtenDialog(QWidget* parent) :
QDialog(parent),
ui(new Ui::ExtenDialog),
filter(new ListRearrangeFilter(this))
{
ui->setupUi(this);
extenList = findChild<QListWidget*>("extenList");
extenList->installEventFilter(filter);
connect(filter, &ListRearrangeFilter::SigRearranged, this, &ExtenDialog::Rearrange);
if (extensions.empty())
{
extenSaveFile.open(QIODevice::ReadOnly);
for (auto extenName : QString(extenSaveFile.readAll()).split(">")) Load(extenName);
extenSaveFile.close();
}
for (auto extension : extensions)
extenList->addItem(extension.name);
}
ExtenDialog::~ExtenDialog()
{
delete ui;
}
bool ExtenDialog::DispatchSentenceToExtensions(std::wstring& sentence, std::unordered_map<std::string, int64_t> miscInfo)
{
bool success = true;
wchar_t* sentenceBuffer = (wchar_t*)HeapAlloc(GetProcessHeap(), 0, (sentence.size() + 1) * sizeof(wchar_t));
wcscpy_s(sentenceBuffer, sentence.size() + 1, sentence.c_str());
InfoForExtension miscInfoLinkedList{ "", 0, nullptr };
InfoForExtension* miscInfoTraverser = &miscInfoLinkedList;
for (auto& i : miscInfo) miscInfoTraverser = miscInfoTraverser->next = new InfoForExtension{ i.first.c_str(), i.second, nullptr };
std::shared_lock sharedLock(extenMutex);
for (auto extension : extensions)
{
wchar_t* nextBuffer = extension.callback(sentenceBuffer, &miscInfoLinkedList);
if (nextBuffer == nullptr) { success = false; break; }
if (nextBuffer != sentenceBuffer) HeapFree(GetProcessHeap(), 0, sentenceBuffer);
sentenceBuffer = nextBuffer;
}
sentence = std::wstring(sentenceBuffer);
HeapFree(GetProcessHeap(), 0, sentenceBuffer);
return success;
}
void ExtenDialog::Load(QString extenName)
{
// Extension is dll and exports "OnNewSentence"
HMODULE module = GetModuleHandleW(extenName.toStdWString().c_str());
if (!module) module = LoadLibraryW(extenName.toStdWString().c_str());
if (!module) return;
FARPROC callback = GetProcAddress(module, "OnNewSentence");
if (!callback) return;
extensions.push_back({ extenName, (wchar_t*(*)(const wchar_t*, const InfoForExtension*))callback });
}
void ExtenDialog::Unload(QString extenName)
{
extensions.erase(std::remove_if(extensions.begin(), extensions.end(), [&](Extension extension) { return extension.name == extenName; }), extensions.end());
FreeLibrary(GetModuleHandleW(extenName.toStdWString().c_str()));
}
void ExtenDialog::on_addButton_clicked()
{
QString extenFileName = QFileDialog::getOpenFileName(this, "Select Extension", "C:\\", "Extensions (*.dll)");
if (!extenFileName.size()) return;
QString extenName = extenFileName.mid(extenFileName.lastIndexOf("/") + 1);
QFile::copy(extenFileName, extenName);
Load(extenName.left(extenName.lastIndexOf(".dll")));
Sync();
}
void ExtenDialog::on_rmvButton_clicked()
{
for (auto extenName : extenList->selectedItems()) Unload(extenName->text());
Sync();
}
void ExtenDialog::Rearrange()
{
QVector<Extension> newExtensions;
for (int i = 0; i < extenList->count(); ++i)
newExtensions.push_back(*std::find_if(extensions.begin(), extensions.end(), [=](Extension extension) { return extension.name == extenList->item(i)->text(); }));
extensions = newExtensions;
Sync();
}
void ExtenDialog::Sync()
{
extenList->clear();
extenSaveFile.open(QIODevice::WriteOnly | QIODevice::Truncate);
for (auto extension : extensions)
{
extenList->addItem(extension.name);
extenSaveFile.write((extension.name + ">").toUtf8());
}
extenSaveFile.close();
}

70
GUI/extendialog.h
View File

@ -1,70 +0,0 @@
#ifndef EXTENSIONS_H
#define EXTENSIONS_H
#include "qtcommon.h"
#include <shared_mutex>
#include <QDialog>
#include <QListWidget>
#include <QFile>
namespace Ui
{
class ExtenDialog;
}
class ListRearrangeFilter : public QObject
{
Q_OBJECT
public:
explicit ListRearrangeFilter(QWidget* parent = nullptr);
protected:
bool eventFilter(QObject*, QEvent* event);
signals:
void SigRearranged();
};
class ExtenDialog : public QDialog
{
Q_OBJECT
public:
explicit ExtenDialog(QWidget* parent = nullptr);
~ExtenDialog();
static bool DispatchSentenceToExtensions(std::wstring& sentence, std::unordered_map<std::string, int64_t> miscInfo);
private slots:
void on_addButton_clicked();
void on_rmvButton_clicked();
void Rearrange();
private:
struct InfoForExtension
{
const char* name;
int64_t value;
InfoForExtension* next;
~InfoForExtension() { if (next) delete next; };
};
struct Extension
{
QString name;
wchar_t*(*callback)(const wchar_t*, const InfoForExtension*);
};
inline static std::shared_mutex extenMutex;
inline static QVector<Extension> extensions;
static void Load(QString extenName);
static void Unload(QString extenName);
void Sync();
Ui::ExtenDialog* ui;
QFile extenSaveFile = QFile("Extensions.txt");
QListWidget* extenList;
ListRearrangeFilter* filter;
};
#endif // EXTENSIONS_H

130
GUI/extenwindow.cpp Normal file
View File

@ -0,0 +1,130 @@
#include "extenwindow.h"
#include "ui_extenwindow.h"
#include "types.h"
#include <QFileDialog>
namespace
{
struct InfoForExtension
{
const char* name;
int64_t value;
InfoForExtension* next;
~InfoForExtension() { if (next) delete next; };
};
struct Extension
{
QString name;
wchar_t*(*callback)(const wchar_t*, const InfoForExtension*);
};
std::shared_mutex extenMutex;
QVector<Extension> extensions;
void Load(QString extenName)
{
// Extension is dll and exports "OnNewSentence"
HMODULE module = GetModuleHandleW(extenName.toStdWString().c_str());
if (!module) module = LoadLibraryW(extenName.toStdWString().c_str());
if (!module) return;
FARPROC callback = GetProcAddress(module, "OnNewSentence");
if (!callback) return;
extensions.push_back({ extenName, (wchar_t*(*)(const wchar_t*, const InfoForExtension*))callback });
}
void Unload(QString extenName)
{
extensions.erase(std::remove_if(extensions.begin(), extensions.end(), [&](Extension extension) { return extension.name == extenName; }), extensions.end());
FreeLibrary(GetModuleHandleW(extenName.toStdWString().c_str()));
}
}
bool DispatchSentenceToExtensions(std::wstring& sentence, std::unordered_map<std::string, int64_t> miscInfo)
{
bool success = true;
wchar_t* sentenceBuffer = (wchar_t*)HeapAlloc(GetProcessHeap(), 0, (sentence.size() + 1) * sizeof(wchar_t));
wcscpy_s(sentenceBuffer, sentence.size() + 1, sentence.c_str());
InfoForExtension miscInfoLinkedList{ "", 0, nullptr };
InfoForExtension* miscInfoTraverser = &miscInfoLinkedList;
for (auto& i : miscInfo) miscInfoTraverser = miscInfoTraverser->next = new InfoForExtension{ i.first.c_str(), i.second, nullptr };
std::shared_lock sharedLock(extenMutex);
for (auto extension : extensions)
{
wchar_t* nextBuffer = extension.callback(sentenceBuffer, &miscInfoLinkedList);
if (nextBuffer == nullptr) { success = false; break; }
if (nextBuffer != sentenceBuffer) HeapFree(GetProcessHeap(), 0, sentenceBuffer);
sentenceBuffer = nextBuffer;
}
sentence = std::wstring(sentenceBuffer);
HeapFree(GetProcessHeap(), 0, sentenceBuffer);
return success;
}
ExtenWindow::ExtenWindow(QWidget* parent) :
QMainWindow(parent),
ui(new Ui::ExtenWindow)
{
ui->setupUi(this);
extenList = findChild<QListWidget*>("extenList");
extenList->installEventFilter(this);
if (extensions.empty())
{
extenSaveFile.open(QIODevice::ReadOnly);
for (auto extenName : QString(extenSaveFile.readAll()).split(">")) Load(extenName);
extenSaveFile.close();
}
Sync();
}
ExtenWindow::~ExtenWindow()
{
delete ui;
}
void ExtenWindow::on_addButton_clicked()
{
QString extenFileName = QFileDialog::getOpenFileName(this, "Select Extension", "C:\\", "Extensions (*.dll)");
if (!extenFileName.size()) return;
QString extenName = extenFileName.mid(extenFileName.lastIndexOf("/") + 1);
QFile::copy(extenFileName, extenName);
Load(extenName.left(extenName.lastIndexOf(".dll")));
Sync();
}
void ExtenWindow::on_rmvButton_clicked()
{
if (auto extenName = extenList->currentItem()) Unload(extenName->text());
Sync();
}
bool ExtenWindow::eventFilter(QObject* target, QEvent* event)
{
// See https://stackoverflow.com/questions/1224432/how-do-i-respond-to-an-internal-drag-and-drop-operation-using-a-qlistwidget/1528215
if (event->type() == QEvent::ChildRemoved)
{
QVector<Extension> newExtensions;
for (int i = 0; i < extenList->count(); ++i)
newExtensions.push_back(*std::find_if(extensions.begin(), extensions.end(), [=](Extension extension) { return extension.name == extenList->item(i)->text(); }));
extensions = newExtensions;
Sync();
}
return false;
}
void ExtenWindow::Sync()
{
extenList->clear();
extenSaveFile.open(QIODevice::WriteOnly | QIODevice::Truncate);
for (auto extension : extensions)
{
extenList->addItem(extension.name);
extenSaveFile.write((extension.name + ">").toUtf8());
}
extenSaveFile.close();
}

36
GUI/extenwindow.h Normal file
View File

@ -0,0 +1,36 @@
#ifndef EXTENSIONS_H
#define EXTENSIONS_H
#include "qtcommon.h"
#include <shared_mutex>
#include <QListWidget>
namespace Ui
{
class ExtenWindow;
}
bool DispatchSentenceToExtensions(std::wstring& sentence, std::unordered_map<std::string, int64_t> miscInfo);
class ExtenWindow : public QMainWindow
{
Q_OBJECT
public:
explicit ExtenWindow(QWidget* parent = nullptr);
~ExtenWindow();
private slots:
void on_addButton_clicked();
void on_rmvButton_clicked();
private:
bool eventFilter(QObject* target, QEvent* event);
void Sync();
Ui::ExtenWindow* ui;
QFile extenSaveFile = QFile("Extensions.txt");
QListWidget* extenList;
};
#endif // EXTENSIONS_H

21
GUI/extendialog.ui → GUI/extenwindow.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ExtenDialog</class>
<widget class="QDialog" name="ExtenDialog">
<class>ExtenWindow</class>
<widget class="QMainWindow" name="ExtenWindow">
<property name="geometry">
<rect>
<x>0</x>
@ -13,6 +13,7 @@
<property name="windowTitle">
<string>Extensions</string>
</property>
<widget class="QWidget" name="centralWidget">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QListWidget" name="extenList">
@ -22,9 +23,6 @@
<property name="defaultDropAction">
<enum>Qt::MoveAction</enum>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::MultiSelection</enum>
</property>
</widget>
</item>
<item>
@ -34,12 +32,6 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
@ -61,17 +53,12 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
<resources/>
<connections/>

13
GUI/mainwindow.cpp
View File

@ -1,16 +1,14 @@
#include "mainwindow.h"
#include "ui_mainwindow.h"
#include "defs.h"
#include "extendialog.h"
#include "extenwindow.h"
#include "misc.h"
#include <QCoreApplication>
#include <QInputDialog>
#include <QFileDialog>
MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
ui(new Ui::MainWindow),
extenDialog(new ExtenDialog(this))
extenWindow(new ExtenWindow)
{
ui->setupUi(this);
@ -108,7 +106,7 @@ void MainWindow::ThreadOutput(QString threadString, QString output)
bool MainWindow::ProcessThreadOutput(TextThread* thread, std::wstring& output)
{
if (ExtenDialog::DispatchSentenceToExtensions(output, GetInfoForExtensions(thread)))
if (DispatchSentenceToExtensions(output, GetMiscInfo(thread)))
{
output += L"\r\n";
emit SigThreadOutput(TextThreadString(thread), QString::fromStdWString(output));
@ -140,7 +138,7 @@ DWORD MainWindow::GetSelectedProcessId()
return processCombo->currentText().split(":")[0].toULong(nullptr, 16);
}
std::unordered_map<std::string, int64_t> MainWindow::GetInfoForExtensions(TextThread* thread)
std::unordered_map<std::string, int64_t> MainWindow::GetMiscInfo(TextThread* thread)
{
return
{
@ -235,5 +233,6 @@ void MainWindow::on_ttCombo_activated(int index)
void MainWindow::on_addExtenButton_clicked()
{
extenDialog->show();
extenWindow->activateWindow();
extenWindow->showNormal();
}

5
GUI/mainwindow.h
View File

@ -3,7 +3,6 @@
#include "qtcommon.h"
#include "host/host.h"
#include <QMainWindow>
#include <QPlainTextEdit>
#include <QComboBox>
#include <QSettings>
@ -49,7 +48,7 @@ private:
QString TextThreadString(TextThread* thread);
ThreadParam ParseTextThreadString(QString textThreadString);
DWORD GetSelectedProcessId();
std::unordered_map<std::string, int64_t> GetInfoForExtensions(TextThread* thread);
std::unordered_map<std::string, int64_t> GetMiscInfo(TextThread* thread);
QVector<HookParam> GetAllHooks(DWORD processId);
Ui::MainWindow* ui;
@ -58,7 +57,7 @@ private:
QComboBox* ttCombo;
QComboBox* extenCombo;
QPlainTextEdit* textOutput;
QWidget* extenDialog;
QWidget* extenWindow;
};
#endif // MAINWINDOW_H

2
GUI/qtcommon.h
View File

@ -3,4 +3,6 @@
#include "common.h"
#include <QString>
#include <QVector>
#include <QMainWindow>
#include <QFile>
#include <QRegularExpression>

1
GUI/tests.cpp
View File

@ -1,4 +1,3 @@
#include "extendialog.h"
#include "misc.h"
static int TESTS = []