x64dbg/x64dbg
x64dbg
/
x64dbg
1
0
Fork 0
Code Releases 4 Activity

DBG+GUI: fixed various warnings + fixed up some gui tabstops and weird things

This commit is contained in:
mrexodia 2015-11-28 19:05:25 +01:00
parent 051ad5a302
commit 0a54341512
14 changed files with 103 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dbg/debugger_commands.cpp
View File

@ -1035,7 +1035,7 @@ CMDRESULT cbDebugDump(int argc, char* argv[])
dprintf("Invalid address \"%s\"!\n", argv[2]);
return STATUS_ERROR;
}
GuiDumpAtN(addr, index);
GuiDumpAtN(addr, int(index));
}
else
GuiDumpAt(addr);

2
src/dbg/function.cpp
View File

@ -5,7 +5,7 @@
std::map<ModuleRange, FUNCTIONSINFO, ModuleRangeCompare> functions;
bool FunctionAdd(duint Start, duint End, bool Manual, int InstructionCount)
bool FunctionAdd(duint Start, duint End, bool Manual, duint InstructionCount)
{
ASSERT_DEBUGGING("Export call");

4
src/dbg/function.h
View File

@ -8,10 +8,10 @@ struct FUNCTIONSINFO
duint start;
duint end;
bool manual;
int instructioncount;
duint instructioncount;
};
bool FunctionAdd(duint Start, duint End, bool Manual, int InstructionCount = 0);
bool FunctionAdd(duint Start, duint End, bool Manual, duint InstructionCount = 0);
bool FunctionGet(duint Address, duint* Start = nullptr, duint* End = nullptr, duint* InstrCount = nullptr);
bool FunctionOverlaps(duint Start, duint End);
bool FunctionDelete(duint Address);

27
src/gui/Src/Gui/AppearanceDialog.ui
View File

@ -30,7 +30,7 @@
</rect>
</property>
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="tabColors">
<attribute name="title">
@ -1712,8 +1712,31 @@
<tabstop>buttonBackgroundFFFF00</tabstop>
<tabstop>editBackgroundColor</tabstop>
<tabstop>buttonBackgroundColor</tabstop>
<tabstop>buttonSave</tabstop>
<tabstop>fontAbstractTables</tabstop>
<tabstop>fontAbstractTablesStyle</tabstop>
<tabstop>fontAbstractTablesSize</tabstop>
<tabstop>fontDisassembly</tabstop>
<tabstop>fontDisassemblyStyle</tabstop>
<tabstop>fontDisassemblySize</tabstop>
<tabstop>fontHexDump</tabstop>
<tabstop>fontHexDumpStyle</tabstop>
<tabstop>fontHexDumpSize</tabstop>
<tabstop>fontStack</tabstop>
<tabstop>fontStackStyle</tabstop>
<tabstop>fontStackSize</tabstop>
<tabstop>fontRegisters</tabstop>
<tabstop>fontRegistersStyle</tabstop>
<tabstop>fontRegistersSize</tabstop>
<tabstop>fontHexEdit</tabstop>
<tabstop>fontHexEditStyle</tabstop>
<tabstop>fontHexEditSize</tabstop>
<tabstop>fontLog</tabstop>
<tabstop>fontLogStyle</tabstop>
<tabstop>fontLogSize</tabstop>
<tabstop>buttonApplicationFont</tabstop>
<tabstop>buttonFontDefaults</tabstop>
<tabstop>buttonCancel</tabstop>
<tabstop>buttonSave</tabstop>
</tabstops>
<resources>
<include location="../../resource.qrc"/>

12
src/gui/Src/Gui/CPUMultiDump.cpp
View File

@ -20,14 +20,14 @@ CPUMultiDump::CPUMultiDump(CPUDisassembly* disas, int nbCpuDumpTabs, QWidget* pa
mCurrentCPUDump = (CPUDump*)currentWidget();
connect(this, SIGNAL(currentChanged(int)), this, SLOT(updateCurrentTabSlot(int)));
connect(tabBar(), SIGNAL(OnDoubleClickTabIndex(int)), this, SLOT(openChangeTabTitleDialogSlot(int)));
connect(this, SIGNAL(currentChanged(int)), this, SLOT(updateCurrentTabSlot(int)));
connect(tabBar(), SIGNAL(OnDoubleClickTabIndex(int)), this, SLOT(openChangeTabTitleDialogSlot(int)));
connect(Bridge::getBridge(), SIGNAL(dumpAt(dsint)), this, SLOT(printDumpAtSlot(dsint)));
connect(Bridge::getBridge(), SIGNAL(dumpAtN(duint, int)), this, SLOT(printDumpAtNSlot(duint, int)));
connect(Bridge::getBridge(), SIGNAL(selectionDumpGet(SELECTIONDATA*)), this, SLOT(selectionGetSlot(SELECTIONDATA*)));
connect(Bridge::getBridge(), SIGNAL(dumpAt(dsint)), this, SLOT(printDumpAtSlot(dsint)));
connect(Bridge::getBridge(), SIGNAL(dumpAtN(duint, int)), this, SLOT(printDumpAtNSlot(duint, int)));
connect(Bridge::getBridge(), SIGNAL(selectionDumpGet(SELECTIONDATA*)), this, SLOT(selectionGetSlot(SELECTIONDATA*)));
connect(Bridge::getBridge(), SIGNAL(selectionDumpSet(const SELECTIONDATA*)), this, SLOT(selectionSetSlot(const SELECTIONDATA*)));
connect(Bridge::getBridge(), SIGNAL(dbgStateChanged(DBGSTATE)), this, SLOT(dbgStateChangedSlot(DBGSTATE)));
connect(Bridge::getBridge(), SIGNAL(dbgStateChanged(DBGSTATE)), this, SLOT(dbgStateChangedSlot(DBGSTATE)));
connect(mCurrentCPUDump, SIGNAL(selectionUpdated()), mCurrentCPUDump, SLOT(selectionUpdatedSlot()));
}

1
src/gui/Src/Gui/CalculatorDialog.ui
View File

@ -244,6 +244,7 @@
<tabstop>txtAscii</tabstop>
<tabstop>txtUnicode</tabstop>
<tabstop>btnGoto</tabstop>
<tabstop>btnGotoDump</tabstop>
<tabstop>pushButton</tabstop>
</tabstops>
<resources>

6
src/gui/Src/Gui/ExceptionRangeDialog.ui
View File

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>131</width>
<width>176</width>
<height>106</height>
</rect>
</property>
@ -111,12 +111,12 @@
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QWidget" name="">
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>10</x>
<y>70</y>
<width>111</width>
<width>158</width>
<height>25</height>
</rect>
</property>

2
src/gui/Src/Gui/HexEditDialog.ui
View File

@ -222,8 +222,8 @@
<tabstop>btnAscii2Hex</tabstop>
<tabstop>lineEditUnicode</tabstop>
<tabstop>btnUnicode2Hex</tabstop>
<tabstop>scrollArea</tabstop>
<tabstop>chkKeepSize</tabstop>
<tabstop>chkEntireBlock</tabstop>
<tabstop>btnOk</tabstop>
<tabstop>btnCancel</tabstop>
</tabstops>

18
src/gui/Src/Gui/PageMemoryRights.ui
View File

@ -213,7 +213,7 @@
<string>PAGE GUARD</string>
</property>
</widget>
<zorder>layoutWidget</zorder>
<zorder>paddingLayoutWidget</zorder>
<zorder>layoutWidget</zorder>
<zorder>buttonBox</zorder>
<zorder>LnEdStatus</zorder>
@ -221,6 +221,22 @@
<zorder>label</zorder>
<zorder>chkPageguard</zorder>
</widget>
<tabstops>
<tabstop>pagetableWidget</tabstop>
<tabstop>btnSelectall</tabstop>
<tabstop>btnDeselectall</tabstop>
<tabstop>radioNoaccess</tabstop>
<tabstop>radioReadonly</tabstop>
<tabstop>radioReadwrite</tabstop>
<tabstop>radioExecute</tabstop>
<tabstop>radioExecuteread</tabstop>
<tabstop>radioFullaccess</tabstop>
<tabstop>radioWritecopy</tabstop>
<tabstop>radioExecutewritecopy</tabstop>
<tabstop>btnSetrights</tabstop>
<tabstop>chkPageguard</tabstop>
<tabstop>LnEdStatus</tabstop>
</tabstops>
<resources>
<include location="../../resource.qrc"/>
</resources>

8
src/gui/Src/Gui/PatchDialog.ui
View File

@ -134,7 +134,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="">
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>7</x>
@ -163,7 +163,13 @@
</widget>
<tabstops>
<tabstop>listModules</tabstop>
<tabstop>btnImport</tabstop>
<tabstop>btnExport</tabstop>
<tabstop>listPatches</tabstop>
<tabstop>btnSelectAll</tabstop>
<tabstop>btnDeselectAll</tabstop>
<tabstop>btnRestoreSelected</tabstop>
<tabstop>btnPickGroups</tabstop>
<tabstop>btnPatchFile</tabstop>
</tabstops>
<resources>

6
src/gui/Src/Gui/PatchDialogGroupSelector.ui
View File

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>191</width>
<width>261</width>
<height>71</height>
</rect>
</property>
@ -17,12 +17,12 @@
<iconset resource="../../resource.qrc">
<normaloff>:/icons/images/patch.png</normaloff>:/icons/images/patch.png</iconset>
</property>
<widget class="QWidget" name="">
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>171</width>
<width>241</width>
<height>51</height>
</rect>
</property>

3
src/gui/Src/Gui/SettingsDialog.cpp
View File

@ -12,8 +12,9 @@ SettingsDialog::SettingsDialog(QWidget* parent) :
ui->setupUi(this);
//set window flags
#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
setWindowFlags(Qt::Dialog | Qt::WindowSystemMenuHint | Qt::WindowTitleHint);
setWindowFlags(Qt::Dialog | Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::MSWindowsFixedSizeDialogHint);
#endif
setFixedSize(this->size()); //fixed size
setModal(true);
LoadSettings(); //load settings from file
connect(Bridge::getBridge(), SIGNAL(setLastException(uint)), this, SLOT(setLastException(uint)));

29
src/gui/Src/Gui/SettingsDialog.ui
View File

@ -33,7 +33,7 @@
<bool>true</bool>
</property>
<property name="currentIndex">
<number>0</number>
<number>4</number>
</property>
<widget class="QWidget" name="tabEvents">
<attribute name="title">
@ -549,6 +549,18 @@
</layout>
</widget>
<tabstops>
<tabstop>tabWidget</tabstop>
<tabstop>chkSystemBreakpoint</tabstop>
<tabstop>chkDllLoad</tabstop>
<tabstop>chkTlsCallbacks</tabstop>
<tabstop>chkDllUnload</tabstop>
<tabstop>chkEntryBreakpoint</tabstop>
<tabstop>chkThreadStart</tabstop>
<tabstop>chkDllEntry</tabstop>
<tabstop>chkThreadEnd</tabstop>
<tabstop>chkAttachBreakpoint</tabstop>
<tabstop>chkDebugStrings</tabstop>
<tabstop>chkThreadEntry</tabstop>
<tabstop>radioSigned</tabstop>
<tabstop>radioUnsigned</tabstop>
<tabstop>radioInt3Short</tabstop>
@ -556,10 +568,25 @@
<tabstop>radioUd2</tabstop>
<tabstop>chkUndecorateSymbolNames</tabstop>
<tabstop>chkEnableDebugPrivilege</tabstop>
<tabstop>chkEnableSourceDebugging</tabstop>
<tabstop>chkDisableDatabaseCompression</tabstop>
<tabstop>chkSaveDatabaseInProgramDirectory</tabstop>
<tabstop>listExceptions</tabstop>
<tabstop>btnAddRange</tabstop>
<tabstop>btnDeleteRange</tabstop>
<tabstop>btnAddLast</tabstop>
<tabstop>chkArgumentSpaces</tabstop>
<tabstop>chkTabBetweenMnemonicAndArguments</tabstop>
<tabstop>chkMemorySpaces</tabstop>
<tabstop>chkUppercase</tabstop>
<tabstop>chkOnlyCipAutoComments</tabstop>
<tabstop>editSymbolStore</tabstop>
<tabstop>editSymbolCache</tabstop>
<tabstop>chkSetJIT</tabstop>
<tabstop>editJIT</tabstop>
<tabstop>chkConfirmBeforeAtt</tabstop>
<tabstop>btnSave</tabstop>
<tabstop>btnCancel</tabstop>
</tabstops>
<resources>
<include location="../../resource.qrc"/>

6
src/gui/Src/Gui/WordEditDialog.ui
View File

@ -212,6 +212,12 @@
</property>
</widget>
</widget>
<tabstops>
<tabstop>expressionLineEdit</tabstop>
<tabstop>hexLineEdit</tabstop>
<tabstop>signedLineEdit</tabstop>
<tabstop>unsignedLineEdit</tabstop>
</tabstops>
<resources>
<include location="../../resource.qrc"/>
</resources>