Skip to content

Commit 5f90d68

Browse files
therealdregtherealdreg
committed
Merged mrexodia/x64_dbg into master
2 parents f7602db + 56bfe4a commit 5f90d68

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+145
-666
lines changed

‎x64_dbg_gui/Project/Src/BasicView/AbstractTableView.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "AbstractTableView.h"
2+
#include <QStyleOptionButton>
23
#include "Configuration.h"
34

45
AbstractTableView::AbstractTableView(QWidget* parent) : QAbstractScrollArea(parent)

‎x64_dbg_gui/Project/Src/BasicView/AbstractTableView.h

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
#ifndef ABSTRACTTABLEVIEW_H
22
#define ABSTRACTTABLEVIEW_H
33

4-
#include <QtGui>
4+
#include <QScrollBar>
55
#include <QAbstractScrollArea>
66
#include <QPushButton>
7-
#include <QStyleOptionButton>
8-
#include <QStyle>
9-
#include <QScrollBar>
10-
#include <qdebug.h>
11-
#include <NewTypes.h>
7+
#include <QApplication>
8+
#include <QMouseEvent>
9+
#include <QPainter>
10+
#include "NewTypes.h"
1211

1312
//Hacky class that fixes a really annoying cursor problem
1413
class AbstractTableScrollBar : public QScrollBar

‎x64_dbg_gui/Project/Src/BasicView/Disassembly.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "Disassembly.h"
22
#include "Configuration.h"
3+
#include "Bridge.h"
34

45
Disassembly::Disassembly(QWidget* parent) : AbstractTableView(parent)
56
{

‎x64_dbg_gui/Project/Src/BasicView/Disassembly.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
#ifndef DISASSEMBLY_H
22
#define DISASSEMBLY_H
33

4-
#include <QtGui>
5-
#include <QtDebug>
6-
#include "NewTypes.h"
7-
#include "Bridge.h"
84
#include "AbstractTableView.h"
95
#include "QBeaEngine.h"
10-
#include "RichTextPainter.h"
11-
#include "BeaTokenizer.h"
126
#include "MemoryPage.h"
137

148
class Disassembly : public AbstractTableView

‎x64_dbg_gui/Project/Src/BasicView/HexDump.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#include "HexDump.h"
2+
#include <sstream>
23
#include "Configuration.h"
4+
#include "Bridge.h"
35

46
HexDump::HexDump(QWidget* parent) : AbstractTableView(parent)
57
{

‎x64_dbg_gui/Project/Src/BasicView/HexDump.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
#ifndef _HEXDUMP_H
22
#define _HEXDUMP_H
33

4-
#include <QtGui>
5-
#include <QtDebug>
6-
#include "NewTypes.h"
74
#include "AbstractTableView.h"
8-
#include "MemoryPage.h"
9-
#include "QBeaEngine.h"
10-
#include "Bridge.h"
11-
#include <sstream>
125
#include "RichTextPainter.h"
6+
#include "MemoryPage.h"
137

148
class HexDump : public AbstractTableView
159
{

‎x64_dbg_gui/Project/Src/BasicView/HistoryLineEdit.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include "HistoryLineEdit.h"
2-
#include "Bridge.h"
32

43
HistoryLineEdit::HistoryLineEdit(QWidget* parent) : QLineEdit(parent)
54
{

‎x64_dbg_gui/Project/Src/BasicView/HistoryLineEdit.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#ifndef HISTORYLINEEDIT_H
22
#define HISTORYLINEEDIT_H
33

4-
#include <QtGui>
54
#include <QLineEdit>
5+
#include <QKeyEvent>
66

77
class HistoryLineEdit : public QLineEdit
88
{

‎x64_dbg_gui/Project/Src/BasicView/ReferenceView.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#include "ReferenceView.h"
2+
#include <QMessageBox>
23
#include "Configuration.h"
4+
#include "Bridge.h"
35

46
ReferenceView::ReferenceView()
57
{

‎x64_dbg_gui/Project/Src/BasicView/ReferenceView.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
#define REFERENCEVIEW_H
33

44
#include <QProgressBar>
5-
#include <QAction>
6-
#include <QMenu>
75
#include "SearchListView.h"
8-
#include "Bridge.h"
96

107
class ReferenceView : public SearchListView
118
{

‎x64_dbg_gui/Project/Src/BasicView/SearchListView.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#define SEARCHLISTVIEW_H
33

44
#include <QWidget>
5+
#include <QMenu>
56
#include <QVBoxLayout>
67
#include <QLineEdit>
78
#include "SearchListViewTable.h"

‎x64_dbg_gui/Project/Src/BasicView/SearchListViewTable.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "SearchListViewTable.h"
22
#include "Configuration.h"
3+
#include "RichTextPainter.h"
34

45
SearchListViewTable::SearchListViewTable(StdTable* parent) : StdTable(parent)
56
{

‎x64_dbg_gui/Project/Src/BasicView/ShortcutEdit.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include "ShortcutEdit.h"
2-
#include <QKeyEvent>
32

43
ShortcutEdit::ShortcutEdit(QWidget* parent) : QLineEdit(parent)
54
{
@@ -57,7 +56,7 @@ void ShortcutEdit::keyPressEvent(QKeyEvent* event)
5756
QString KeyText = QKeySequence(keyInt).toString(QKeySequence::NativeText) ;
5857
for(int i = 0; i < KeyText.length(); i++)
5958
{
60-
if(KeyText[i].toAscii() == 0)
59+
if(KeyText[i].toLatin1() == 0)
6160
{
6261
setText("");
6362
keyInt = -1;

‎x64_dbg_gui/Project/Src/BasicView/ShortcutEdit.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
#define SHORTCUTEDIT_H
33

44
#include <QLineEdit>
5+
#include <QKeySequence>
6+
#include <QKeyEvent>
57

68
class ShortcutEdit : public QLineEdit
79
{

‎x64_dbg_gui/Project/Src/BasicView/StdTable.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
#ifndef STDTABLE_H
22
#define STDTABLE_H
33

4-
#include <QtGui>
5-
#include <QMenu>
6-
#include "NewTypes.h"
74
#include "AbstractTableView.h"
85

96
class StdTable : public AbstractTableView

‎x64_dbg_gui/Project/Src/Bridge/Bridge.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
#include "Bridge.h"
2+
#include <QClipboard>
3+
#include "QBeaEngine.h"
4+
#include "main.h"
5+
#include "Exports.h"
26

37
/************************************************************************************
48
Global Variables

‎x64_dbg_gui/Project/Src/Bridge/Bridge.h

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,10 @@
22
#define BRIDGE_H
33

44
#include <QObject>
5-
#include <QtGui>
6-
#include "NewTypes.h"
7-
#include "ReferenceView.h"
8-
#include "BeaTokenizer.h"
9-
#include "QBeaEngine.h"
10-
11-
#include "main.h"
12-
13-
#include "Exports.h"
5+
#include <QMutex>
146
#include "Imports.h"
7+
#include "NewTypes.h"
8+
#include "SearchListView.h"
159

1610
class Bridge : public QObject
1711
{

‎x64_dbg_gui/Project/Src/Disassembler/BeaTokenizer.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
#ifndef BEATOKENIZER_H
22
#define BEATOKENIZER_H
33

4-
#include <QList>
5-
#include <QRect>
6-
#include <QString>
7-
#include <QStringList>
84
#include <QMap>
5+
#include <QSet>
6+
#include "RichTextPainter.h"
97
#include "BeaEngine.h"
108
#include "NewTypes.h"
11-
#include "RichTextPainter.h"
129

1310
class BeaTokenizer : RichTextPainter
1411
{

‎x64_dbg_gui/Project/Src/Disassembler/QBeaEngine.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
#include "QBeaEngine.h"
22

3-
43
QBeaEngine::QBeaEngine()
54
{
65
// Reset the Disasm structure
76
memset(&mDisasmStruct, 0, sizeof(DISASM));
87
BeaTokenizer::Init();
98
}
109

11-
1210
/**
1311
* @brief Return the address of the nth instruction before the instruction pointed by ip. @n
1412
* This function has been grabbed from OllyDbg ("Disassembleback" in asmserv.c)
@@ -88,7 +86,6 @@ ulong QBeaEngine::DisassembleBack(byte_t* data, uint_t base, uint_t size, uint_t
8886
return abuf[(i - n + max_instructions) % max_instructions];
8987
}
9088

91-
9289
/**
9390
* @brief Return the address of the nth instruction after the instruction pointed by ip. @n
9491
* This function has been grabbed from OllyDbg ("Disassembleforward" in asmserv.c)
@@ -144,7 +141,6 @@ ulong QBeaEngine::DisassembleNext(byte_t* data, uint_t base, uint_t size, uint_t
144141
return ip;
145142
}
146143

147-
148144
/**
149145
* @brief Disassemble the instruction at the given ip RVA.
150146
*
@@ -190,6 +186,3 @@ Instruction_t QBeaEngine::DisassembleAt(byte_t* data, uint_t size, uint_t instIn
190186

191187
return wInst;
192188
}
193-
194-
195-

‎x64_dbg_gui/Project/Src/Disassembler/QBeaEngine.h

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
#ifndef QBEAENGINE_H
22
#define QBEAENGINE_H
33

4-
#include <QtGui>
5-
6-
#include "BeaEngine.h"
4+
#include <QString>
75
#include "NewTypes.h"
86
#include "BeaTokenizer.h"
97

@@ -19,21 +17,14 @@ typedef struct _Instruction_t
1917

2018
class QBeaEngine
2119
{
22-
2320
public:
2421
explicit QBeaEngine();
25-
2622
ulong DisassembleBack(byte_t* data, uint_t base, uint_t size, uint_t ip, int n);
2723
ulong DisassembleNext(byte_t* data, uint_t base, uint_t size, uint_t ip, int n);
2824
Instruction_t DisassembleAt(byte_t* data, uint_t size, uint_t instIndex, uint_t origBase, uint_t origInstRVA);
29-
signals:
30-
31-
public slots:
32-
3325

3426
private:
3527
DISASM mDisasmStruct;
36-
3728
};
3829

3930
#endif // QBEAENGINE_H

‎x64_dbg_gui/Project/Src/Gui/AppearanceDialog.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#include "AppearanceDialog.h"
22
#include "ui_AppearanceDialog.h"
3-
#include "Bridge.h"
4-
#include "Configuration.h"
3+
#include <QColorDialog>
54
#include <QFontDialog>
5+
#include <QMessageBox>
6+
#include "Configuration.h"
67

78
AppearanceDialog::AppearanceDialog(QWidget* parent) : QDialog(parent), ui(new Ui::AppearanceDialog)
89
{

‎x64_dbg_gui/Project/Src/Gui/AppearanceDialog.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
#define APPEARANCEDIALOG_H
33

44
#include <QDialog>
5-
#include <QColorDialog>
6-
#include <QMessageBox>
75
#include <QMap>
86

97
namespace Ui

‎x64_dbg_gui/Project/Src/Gui/AttachDialog.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "AttachDialog.h"
22
#include "ui_AttachDialog.h"
3+
#include <QMenu>
34

45
AttachDialog::AttachDialog(QWidget* parent) : QDialog(parent), ui(new Ui::AttachDialog)
56
{

‎x64_dbg_gui/Project/Src/Gui/BreakpointsView.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#include "BreakpointsView.h"
22
#include "Configuration.h"
3+
#include "Bridge.h"
4+
#include "Breakpoints.h"
35

46
BreakpointsView::BreakpointsView(QWidget* parent) : QWidget(parent)
57
{

‎x64_dbg_gui/Project/Src/Gui/BreakpointsView.h

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
#ifndef BREAKPOINTSVIEW_H
22
#define BREAKPOINTSVIEW_H
33

4-
#include <QtGui>
5-
#include "StdTable.h"
6-
#include "Bridge.h"
7-
#include "Breakpoints.h"
8-
#include <QSplitter>
9-
#include <QMenu>
4+
#include <QWidget>
105
#include <QVBoxLayout>
6+
#include <QSplitter>
7+
#include "StdTable.h"
118

129
class BreakpointsView : public QWidget
1310
{

‎x64_dbg_gui/Project/Src/Gui/CPUDisassembly.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
#include "CPUDisassembly.h"
2+
#include <QMessageBox>
3+
#include <QClipboard>
24
#include "Configuration.h"
5+
#include "Bridge.h"
6+
#include "LineEditDialog.h"
7+
#include "WordEditDialog.h"
38
#include "HexEditDialog.h"
49

510
CPUDisassembly::CPUDisassembly(QWidget* parent) : Disassembly(parent)
@@ -477,6 +482,7 @@ void CPUDisassembly::setupRightClickContextMenu()
477482
mSearchCommand->setShortcutContext(Qt::WidgetShortcut);
478483
this->addAction(mSearchCommand);
479484
connect(mSearchCommand, SIGNAL(triggered()), this, SLOT(findCommand()));
485+
mSearchMenu->addAction(mSearchCommand);
480486

481487
// Constant
482488
mSearchConstant = new QAction("&Constant", this);

‎x64_dbg_gui/Project/Src/Gui/CPUDisassembly.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
#ifndef CPUDISASSEMBLY_H
22
#define CPUDISASSEMBLY_H
33

4-
#include <QtGui>
5-
#include <QtDebug>
6-
#include "NewTypes.h"
74
#include "Disassembly.h"
8-
#include "Bridge.h"
9-
#include "LineEditDialog.h"
10-
#include "QBeaEngine.h"
115
#include "GotoDialog.h"
12-
#include <QAction>
13-
#include <QMessageBox>
14-
#include <QMenu>
15-
#include "WordEditDialog.h"
166

177
class CPUDisassembly : public Disassembly
188
{

‎x64_dbg_gui/Project/Src/Gui/CPUDump.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
#include "CPUDump.h"
2+
#include <QMessageBox>
3+
#include <QClipboard>
24
#include "Configuration.h"
5+
#include "Bridge.h"
6+
#include "LineEditDialog.h"
37
#include "HexEditDialog.h"
48

59
CPUDump::CPUDump(QWidget* parent) : HexDump(parent)

‎x64_dbg_gui/Project/Src/Gui/CPUDump.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
#ifndef CPUDUMP_H
22
#define CPUDUMP_H
33

4-
#include <QtGui>
5-
#include <QtDebug>
6-
#include <QAction>
7-
#include <QMenu>
8-
#include <QMessageBox>
9-
#include "NewTypes.h"
10-
#include "LineEditDialog.h"
114
#include "HexDump.h"
12-
#include "Bridge.h"
135
#include "GotoDialog.h"
146

157
class CPUDump : public HexDump

‎x64_dbg_gui/Project/Src/Gui/CPUInfoBox.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "CPUInfoBox.h"
2+
#include "Bridge.h"
23

34
CPUInfoBox::CPUInfoBox(StdTable* parent) : StdTable(parent)
45
{

0 commit comments

Comments
 (0)