Skip to content

Commit

Permalink
Update file(s): 2024-08-14
Browse files Browse the repository at this point in the history
  • Loading branch information
horsicq committed Aug 14, 2024
1 parent aab2eed commit 417e8a9
Showing 18 changed files with 35 additions and 24 deletions.
3 changes: 2 additions & 1 deletion Binary/binarywidget.cpp
Original file line number Diff line number Diff line change
@@ -200,9 +200,10 @@ void BinaryWidget::reloadData(bool bSaveSelection)
}
} else if (nType == SBINARY::TYPE_HEX) {
if (!isInitPresent(sInit)) {
XHexView::OPTIONS options = {};
XHexViewWidget::OPTIONS options = {};
options.bMenu_Disasm = true;
options.bMenu_MemoryMap = true;
options.fileType = getFileType();

if (bSaveSelection) {
options.nStartSelectionOffset = -1;
3 changes: 2 additions & 1 deletion DEX/dexwidget.cpp
Original file line number Diff line number Diff line change
@@ -341,9 +341,10 @@ void DEXWidget::reloadData(bool bSaveSelection)
}
} else if (nType == SDEX::TYPE_HEX) {
if (!isInitPresent(sInit)) {
XHexView::OPTIONS options = {};
XHexViewWidget::OPTIONS options = {};
// options.bMenu_Disasm=true; // TODO
options.bMenu_MemoryMap = true;
options.fileType = dex.getFileType();

if (bSaveSelection) {
options.nStartSelectionOffset = -1;
3 changes: 2 additions & 1 deletion ELF/elfwidget.cpp
Original file line number Diff line number Diff line change
@@ -302,9 +302,10 @@ void ELFWidget::reloadData(bool bSaveSelection)
}
} else if (nType == SELF::TYPE_HEX) {
if (!isInitPresent(sInit)) {
XHexView::OPTIONS options = {};
XHexViewWidget::OPTIONS options = {};
options.bMenu_Disasm = true;
options.bMenu_MemoryMap = true;
options.fileType = elf.getFileType();

if (bSaveSelection) {
options.nStartSelectionOffset = -1;
3 changes: 2 additions & 1 deletion LE/lewidget.cpp
Original file line number Diff line number Diff line change
@@ -354,9 +354,10 @@ void LEWidget::reloadData(bool bSaveSelection)
}
} else if (nType == SLE::TYPE_HEX) {
if (!isInitPresent(sInit)) {
XHexView::OPTIONS options = {};
XHexViewWidget::OPTIONS options = {};
options.bMenu_Disasm = true;
options.bMenu_MemoryMap = true;
options.fileType = le.getFileType();

if (bSaveSelection) {
options.nStartSelectionOffset = -1;
2 changes: 1 addition & 1 deletion MACH/machsectionheaderwidget.cpp
Original file line number Diff line number Diff line change
@@ -174,7 +174,7 @@ void MACHSectionHeaderWidget::setGlobal(XShortcuts *pShortcuts, XOptions *pXOpti
XShortcutsWidget::setGlobal(pShortcuts, pXOptions);
}

FormatWidget::SV MACHSectionHeaderWidget::_setValue(QVariant vValue, qint32 nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset)
FormatWidget::SV MACHSectionHeaderWidget::_setValue(QVariant vValue, qint32 nStype, qint32 nNdata, qint32 nVtype, qint32 nPosition, qint64 nOffset)
{
Q_UNUSED(nVtype)
Q_UNUSED(nPosition)
2 changes: 1 addition & 1 deletion MACH/machsectionheaderwidget.h
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ class MACHSectionHeaderWidget : public FormatWidget {
virtual void setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions);

protected:
virtual SV _setValue(QVariant vValue, qint32 nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset);
virtual SV _setValue(QVariant vValue, qint32 nStype, qint32 nNdata, qint32 nVtype, qint32 nPosition, qint64 nOffset);
virtual void setReadonly(bool bState);
virtual void blockSignals(bool bState);
virtual void adjustHeaderTable(qint32 nType, QTableWidget *pTableWidget);
3 changes: 2 additions & 1 deletion MACH/machwidget.cpp
Original file line number Diff line number Diff line change
@@ -1454,9 +1454,10 @@ void MACHWidget::reloadData(bool bSaveSelection)
}
} else if (nType == SMACH::TYPE_HEX) {
if (!isInitPresent(sInit)) {
XHexView::OPTIONS options = {};
XHexViewWidget::OPTIONS options = {};
options.bMenu_Disasm = true;
options.bMenu_MemoryMap = true;
options.fileType = mach.getFileType();

if (bSaveSelection) {
options.nStartSelectionOffset = -1;
5 changes: 3 additions & 2 deletions MSDOS/msdoswidget.cpp
Original file line number Diff line number Diff line change
@@ -107,7 +107,7 @@ void MSDOSWidget::reload()
}
}

FormatWidget::SV MSDOSWidget::_setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset)
FormatWidget::SV MSDOSWidget::_setValue(QVariant vValue, qint32 nStype, qint32 nNdata, qint32 nVtype, qint32 nPosition, qint64 nOffset)
{
Q_UNUSED(nVtype)
Q_UNUSED(nPosition)
@@ -272,9 +272,10 @@ void MSDOSWidget::reloadData(bool bSaveSelection)
}
} else if (nType == SMSDOS::TYPE_HEX) {
if (!isInitPresent(sInit)) {
XHexView::OPTIONS options = {};
XHexViewWidget::OPTIONS options = {};
options.bMenu_Disasm = true;
options.bMenu_MemoryMap = true;
options.fileType = msdos.getFileType();

if (bSaveSelection) {
options.nStartSelectionOffset = -1;
2 changes: 1 addition & 1 deletion MSDOS/msdoswidget.h
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ class MSDOSWidget : public FormatWidget {
virtual void reload();

protected:
virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset);
virtual SV _setValue(QVariant vValue, qint32 nStype, qint32 nNdata, qint32 nVtype, qint32 nPosition, qint64 nOffset);
virtual void setReadonly(bool bState);
virtual void blockSignals(bool bState);
virtual void adjustHeaderTable(qint32 nType, QTableWidget *pTableWidget);
2 changes: 1 addition & 1 deletion NE/nesectionheaderwidget.cpp
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@ void NESectionHeaderWidget::reload()
{
}

FormatWidget::SV NESectionHeaderWidget::_setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset)
FormatWidget::SV NESectionHeaderWidget::_setValue(QVariant vValue, qint32 nStype, qint32 nNdata, qint32 nVtype, qint32 nPosition, qint64 nOffset)
{
Q_UNUSED(vValue)
Q_UNUSED(nStype)
2 changes: 1 addition & 1 deletion NE/nesectionheaderwidget.h
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@ class NESectionHeaderWidget : public FormatWidget {
virtual void reload();

protected:
virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset);
virtual SV _setValue(QVariant vValue, qint32 nStype, qint32 nNdata, qint32 nVtype, qint32 nPosition, qint64 nOffset);
virtual void setReadonly(bool bState);
virtual void blockSignals(bool bState);
virtual void adjustHeaderTable(qint32 nType, QTableWidget *pTableWidget);
3 changes: 2 additions & 1 deletion NE/newidget.cpp
Original file line number Diff line number Diff line change
@@ -366,9 +366,10 @@ void NEWidget::reloadData(bool bSaveSelection)
}
} else if (nType == SNE::TYPE_HEX) {
if (!isInitPresent(sInit)) {
XHexView::OPTIONS options = {};
XHexViewWidget::OPTIONS options = {};
options.bMenu_Disasm = true;
options.bMenu_MemoryMap = true;
options.fileType = ne.getFileType();

if (bSaveSelection) {
options.nStartSelectionOffset = -1;
2 changes: 1 addition & 1 deletion PE/pesectionheaderwidget.cpp
Original file line number Diff line number Diff line change
@@ -136,7 +136,7 @@ void PESectionHeaderWidget::setGlobal(XShortcuts *pShortcuts, XOptions *pXOption
XShortcutsWidget::setGlobal(pShortcuts, pXOptions);
}

FormatWidget::SV PESectionHeaderWidget::_setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset)
FormatWidget::SV PESectionHeaderWidget::_setValue(QVariant vValue, qint32 nStype, qint32 nNdata, qint32 nVtype, qint32 nPosition, qint64 nOffset)
{
Q_UNUSED(nVtype)
Q_UNUSED(nOffset)
2 changes: 1 addition & 1 deletion PE/pesectionheaderwidget.h
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ class PESectionHeaderWidget : public FormatWidget {
virtual void setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions);

protected:
virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset);
virtual SV _setValue(QVariant vValue, qint32 nStype, qint32 nNdata, qint32 nVtype, qint32 nPosition, qint64 nOffset);
virtual void setReadonly(bool bState);
virtual void blockSignals(bool bState);
virtual void adjustHeaderTable(qint32 nType, QTableWidget *pTableWidget);
4 changes: 2 additions & 2 deletions PE/pewidget.cpp
Original file line number Diff line number Diff line change
@@ -264,7 +264,7 @@ void PEWidget::setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions)
FormatWidget::setGlobal(pShortcuts, pXOptions);
}

FormatWidget::SV PEWidget::_setValue(QVariant vValue, qint32 nStype, qint32 nNdata, qint32 nVtype, int nPosition, qint64 nOffset)
FormatWidget::SV PEWidget::_setValue(QVariant vValue, qint32 nStype, qint32 nNdata, qint32 nVtype, qint32 nPosition, qint64 nOffset)
{
Q_UNUSED(nVtype)
Q_UNUSED(nPosition)
@@ -1053,7 +1053,7 @@ void PEWidget::reloadData(bool bSaveSelection)
}
} else if (nType == SPE::TYPE_HEX) {
if (!isInitPresent(sInit)) {
XHexView::OPTIONS options = {};
XHexViewWidget::OPTIONS options = {};
options.bMenu_Disasm = true;
options.bMenu_MemoryMap = true;

2 changes: 1 addition & 1 deletion PE/pewidget.h
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@ class PEWidget : public FormatWidget {
void setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions); // Important

protected:
virtual SV _setValue(QVariant vValue, qint32 nStype, qint32 nNdata, qint32 nVtype, int nPosition, qint64 nOffset);
virtual SV _setValue(QVariant vValue, qint32 nStype, qint32 nNdata, qint32 nVtype, qint32 nPosition, qint64 nOffset);
virtual void setReadonly(bool bState);
virtual void blockSignals(bool bState);
virtual void adjustHeaderTable(qint32 nType, QTableWidget *pTableWidget);
2 changes: 2 additions & 0 deletions dialogsectionheader.cpp
Original file line number Diff line number Diff line change
@@ -69,6 +69,8 @@ void DialogSectionHeader::setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions)
if (g_pWidget) {
g_pWidget->setGlobal(pShortcuts, pXOptions);
}

XShortcutsDialog::setGlobal(pShortcuts, pXOptions);
}

void DialogSectionHeader::adjustView()
14 changes: 8 additions & 6 deletions formatwidget.cpp
Original file line number Diff line number Diff line change
@@ -1233,10 +1233,10 @@ void FormatWidget::valueChangedSlot(QVariant varValue)
{
XLineEditHEX *pLineEdit = qobject_cast<XLineEditHEX *>(sender());

int nStype = pLineEdit->property("STYPE").toInt();
int nNdata = pLineEdit->property("NDATA").toInt();
int nVtype = pLineEdit->property("VTYPE").toInt();
int nPosition = pLineEdit->property("POSITION").toInt();
qint32 nStype = pLineEdit->property("STYPE").toInt();
qint32 nNdata = pLineEdit->property("NDATA").toInt();
qint32 nVtype = pLineEdit->property("VTYPE").toInt();
qint32 nPosition = pLineEdit->property("POSITION").toInt();
qint64 nOffset = pLineEdit->property("OFFSET").toLongLong();

setValue(varValue, nStype, nNdata, nVtype, nPosition, nOffset);
@@ -1280,14 +1280,16 @@ void FormatWidget::allReload(qint64 nDeviceOffset, qint64 nDeviceSize)

void FormatWidget::showHex(qint64 nOffset, qint64 nSize)
{
XHexView::OPTIONS hexOptions = {};
XHexViewWidget::OPTIONS hexOptions = {};

hexOptions.nStartAddress = 0;
hexOptions.nStartSelectionOffset = nOffset;
hexOptions.nSizeOfSelection = nSize;

DialogHexView dialogHexView(this, getDevice(), hexOptions, getXInfoDB());
DialogHexView dialogHexView(this);
dialogHexView.setGlobal(getShortcuts(), getGlobalOptions());
dialogHexView.setData(getDevice(), hexOptions);
dialogHexView.setXInfoDB(getXInfoDB());

connect(&dialogHexView, SIGNAL(editState(bool)), this, SLOT(setEdited(bool)));

0 comments on commit 417e8a9

Please sign in to comment.