From 6a5b7131c1d2b7664ae0276c42fff9126602a4ee Mon Sep 17 00:00:00 2001 From: horsicq Date: Thu, 10 Nov 2022 18:53:22 +0100 Subject: [PATCH] Fix: 2022-11-10 --- Binary/binarywidget.cpp | 78 +- Binary/binarywidget.h | 17 +- Binary/dialogbinary.cpp | 7 +- Binary/dialogbinary.h | 4 +- DEX/dex_defs.cpp | 95 +- DEX/dex_defs.h | 12 +- DEX/dexprocessdata.cpp | 395 +- DEX/dexprocessdata.h | 7 +- DEX/dexsectionheaderwidget.cpp | 27 +- DEX/dexsectionheaderwidget.h | 19 +- DEX/dexwidget.cpp | 532 +-- DEX/dexwidget.h | 46 +- DEX/dialogdex.cpp | 7 +- DEX/dialogdex.h | 4 +- ELF/dialogelf.cpp | 7 +- ELF/dialogelf.h | 4 +- ELF/elf_defs.cpp | 308 +- ELF/elf_defs.h | 58 +- ELF/elfprocessdata.cpp | 930 +--- ELF/elfprocessdata.h | 9 +- ELF/elfsectionheaderwidget.cpp | 545 +-- ELF/elfsectionheaderwidget.h | 19 +- ELF/elfwidget.cpp | 908 ++-- ELF/elfwidget.h | 43 +- LE/dialogle.cpp | 7 +- LE/dialogle.h | 4 +- LE/le_defs.cpp | 285 +- LE/le_defs.h | 10 +- LE/leprocessdata.cpp | 68 +- LE/leprocessdata.h | 7 +- LE/lesectionheaderwidget.cpp | 40 +- LE/lesectionheaderwidget.h | 20 +- LE/lewidget.cpp | 482 +-- LE/lewidget.h | 38 +- MACH/dialogmach.cpp | 7 +- MACH/dialogmach.h | 4 +- MACH/mach_defs.cpp | 1166 ++--- MACH/mach_defs.h | 212 +- MACH/machprocessdata.cpp | 1277 ++---- MACH/machprocessdata.h | 7 +- MACH/machsectionheaderwidget.cpp | 853 ++-- MACH/machsectionheaderwidget.h | 19 +- MACH/machwidget.cpp | 3483 +++++---------- MACH/machwidget.h | 226 +- MACHOFAT/dialogmachofat.cpp | 7 +- MACHOFAT/dialogmachofat.h | 4 +- MACHOFAT/machofatwidget.cpp | 32 +- MACHOFAT/machofatwidget.h | 11 +- MSDOS/dialogmsdos.cpp | 7 +- MSDOS/dialogmsdos.h | 4 +- MSDOS/msdos_defs.cpp | 46 +- MSDOS/msdos_defs.h | 18 +- MSDOS/msdoswidget.cpp | 175 +- MSDOS/msdoswidget.h | 22 +- MultiSearch/dialogmultisearchprocess.cpp | 37 +- MultiSearch/dialogmultisearchprocess.h | 12 +- MultiSearch/multisearch.cpp | 109 +- MultiSearch/multisearch.h | 25 +- NE/dialogne.cpp | 7 +- NE/dialogne.h | 4 +- NE/ne_defs.cpp | 213 +- NE/ne_defs.h | 8 +- NE/neprocessdata.cpp | 39 +- NE/neprocessdata.h | 7 +- NE/nesectionheaderwidget.cpp | 40 +- NE/nesectionheaderwidget.h | 20 +- NE/newidget.cpp | 540 +-- NE/newidget.h | 39 +- PDF/dialogpdf.cpp | 7 +- PDF/dialogpdf.h | 4 +- PDF/pdf_defs.h | 13 +- PDF/pdfwidget.cpp | 79 +- PDF/pdfwidget.h | 17 +- PE/dialogpe.cpp | 7 +- PE/dialogpe.h | 4 +- PE/pe_defs.cpp | 1254 ++---- PE/pe_defs.h | 70 +- PE/peprocessdata.cpp | 1117 ++--- PE/peprocessdata.h | 8 +- PE/pesectionheaderwidget.cpp | 575 +-- PE/pesectionheaderwidget.h | 19 +- PE/pewidget.cpp | 3845 +++++------------ PE/pewidget.h | 127 +- SearchSignatures/dialogsearchsignatures.cpp | 25 +- SearchSignatures/dialogsearchsignatures.h | 11 +- .../searchsignaturesoptionswidget.cpp | 20 +- .../searchsignaturesoptionswidget.h | 8 +- SearchSignatures/searchsignatureswidget.cpp | 137 +- SearchSignatures/searchsignatureswidget.h | 22 +- SearchStrings/dialogsearchstrings.cpp | 21 +- SearchStrings/dialogsearchstrings.h | 11 +- SearchStrings/searchstringswidget.cpp | 195 +- SearchStrings/searchstringswidget.h | 23 +- dialogmodelinfo.cpp | 21 +- dialogmodelinfo.h | 9 +- dialogprocessdata.cpp | 10 +- dialogprocessdata.h | 4 +- dialogsectionheader.cpp | 18 +- dialogsectionheader.h | 9 +- formatswidget.cpp | 202 +- formatswidget.h | 8 +- formatwidget.cpp | 515 +-- formatwidget.h | 147 +- invwidget.cpp | 24 +- invwidget.h | 16 +- processdata.cpp | 10 +- processdata.h | 14 +- toolswidget.cpp | 36 +- toolswidget.h | 13 +- 109 files changed, 6750 insertions(+), 15647 deletions(-) diff --git a/Binary/binarywidget.cpp b/Binary/binarywidget.cpp index 6ae6d00d..ca098609 100644 --- a/Binary/binarywidget.cpp +++ b/Binary/binarywidget.cpp @@ -22,23 +22,22 @@ #include "ui_binarywidget.h" -BinaryWidget::BinaryWidget(QWidget *pParent) - : FormatWidget(pParent), ui(new Ui::BinaryWidget) { +BinaryWidget::BinaryWidget(QWidget *pParent) : FormatWidget(pParent), ui(new Ui::BinaryWidget) { ui->setupUi(this); initWidget(); } -BinaryWidget::BinaryWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, - QWidget *pParent) - : BinaryWidget(pParent) { +BinaryWidget::BinaryWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, QWidget *pParent) : BinaryWidget(pParent) { ui->setupUi(this); BinaryWidget::setData(pDevice, options, 0, 0, 0); BinaryWidget::reload(); } -BinaryWidget::~BinaryWidget() { delete ui; } +BinaryWidget::~BinaryWidget() { + delete ui; +} void BinaryWidget::clear() { setTreeItem(ui->treeWidgetNavi, 0); @@ -52,7 +51,8 @@ void BinaryWidget::clear() { ui->treeWidgetNavi->clear(); } -void BinaryWidget::cleanup() {} +void BinaryWidget::cleanup() { +} void BinaryWidget::reload() { // TODO Hex @@ -65,26 +65,16 @@ void BinaryWidget::reload() { if (binary.isValid()) { setFileType(binary.getFileType()); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SBINARY::TYPE_INFO, tr("Info"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SBINARY::TYPE_VIRUSTOTAL, "VirusTotal")); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SBINARY::TYPE_HEX, tr("Hex"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SBINARY::TYPE_DISASM, tr("Disasm"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SBINARY::TYPE_HASH, tr("Hash"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SBINARY::TYPE_STRINGS, tr("Strings"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SBINARY::TYPE_SIGNATURES, tr("Signatures"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SBINARY::TYPE_MEMORYMAP, tr("Memory map"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SBINARY::TYPE_ENTROPY, tr("Entropy"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SBINARY::TYPE_HEURISTICSCAN, tr("Heuristic scan"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SBINARY::TYPE_INFO, tr("Info"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SBINARY::TYPE_VIRUSTOTAL, "VirusTotal")); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SBINARY::TYPE_HEX, tr("Hex"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SBINARY::TYPE_DISASM, tr("Disasm"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SBINARY::TYPE_HASH, tr("Hash"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SBINARY::TYPE_STRINGS, tr("Strings"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SBINARY::TYPE_SIGNATURES, tr("Signatures"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SBINARY::TYPE_MEMORYMAP, tr("Memory map"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SBINARY::TYPE_ENTROPY, tr("Entropy"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SBINARY::TYPE_HEURISTICSCAN, tr("Heuristic scan"))); ui->treeWidgetNavi->expandAll(); @@ -94,9 +84,7 @@ void BinaryWidget::reload() { } } -FormatWidget::SV BinaryWidget::_setValue(QVariant vValue, int nStype, - int nNdata, int nVtype, int nPosition, - qint64 nOffset) { +FormatWidget::SV BinaryWidget::_setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset) { Q_UNUSED(vValue) Q_UNUSED(nStype) Q_UNUSED(nNdata) @@ -124,7 +112,9 @@ void BinaryWidget::setReadonly(bool bState) { ui->widgetStrings->setReadonly(bState); } -void BinaryWidget::blockSignals(bool bState) { Q_UNUSED(bState) } +void BinaryWidget::blockSignals(bool bState) { + Q_UNUSED(bState) +} void BinaryWidget::adjustHeaderTable(int nType, QTableWidget *pTableWidget) { Q_UNUSED(nType) @@ -153,9 +143,7 @@ void BinaryWidget::_showInHexWindow(qint64 nOffset, qint64 nSize) { } void BinaryWidget::reloadData() { - qint32 nType = ui->treeWidgetNavi->currentItem() - ->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_TYPE) - .toInt(); + qint32 nType = ui->treeWidgetNavi->currentItem()->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_TYPE).toInt(); QString sInit = getInitString(ui->treeWidgetNavi->currentItem()); @@ -166,8 +154,7 @@ void BinaryWidget::reloadData() { if (binary.isValid()) { if (nType == SBINARY::TYPE_INFO) { if (!isInitPresent(sInit)) { - ui->widgetInfo->setData(getDevice(), binary.getFileType(), - "Info", true); + ui->widgetInfo->setData(getDevice(), binary.getFileType(), "Info", true); } } else if (nType == SBINARY::TYPE_VIRUSTOTAL) { if (!isInitPresent(sInit)) { @@ -200,8 +187,7 @@ void BinaryWidget::reloadData() { } } else if (nType == SBINARY::TYPE_HASH) { if (!isInitPresent(sInit)) { - ui->widgetHash->setData(getDevice(), binary.getFileType(), 0, - -1, true); + ui->widgetHash->setData(getDevice(), binary.getFileType(), 0, -1, true); } } else if (nType == SBINARY::TYPE_STRINGS) { if (!isInitPresent(sInit)) { @@ -220,8 +206,7 @@ void BinaryWidget::reloadData() { SearchSignaturesWidget::OPTIONS signaturesOptions = {}; signaturesOptions.bMenu_Hex = true; - ui->widgetSignatures->setData(getDevice(), binary.getFileType(), - signaturesOptions, false); + ui->widgetSignatures->setData(getDevice(), binary.getFileType(), signaturesOptions, false); } } else if (nType == SBINARY::TYPE_MEMORYMAP) { if (!isInitPresent(sInit)) { @@ -229,13 +214,11 @@ void BinaryWidget::reloadData() { } } else if (nType == SBINARY::TYPE_ENTROPY) { if (!isInitPresent(sInit)) { - ui->widgetEntropy->setData(getDevice(), 0, getDevice()->size(), - binary.getFileType(), true); + ui->widgetEntropy->setData(getDevice(), 0, getDevice()->size(), binary.getFileType(), true); } } else if (nType == SBINARY::TYPE_HEURISTICSCAN) { if (!isInitPresent(sInit)) { - ui->widgetHeuristicScan->setData(getDevice(), true, - binary.getFileType()); + ui->widgetHeuristicScan->setData(getDevice(), true, binary.getFileType()); } } @@ -263,7 +246,9 @@ void BinaryWidget::on_pushButtonReload_clicked() { QTimer::singleShot(1000, this, SLOT(enableButton())); } -void BinaryWidget::enableButton() { ui->pushButtonReload->setEnabled(true); } +void BinaryWidget::enableButton() { + ui->pushButtonReload->setEnabled(true); +} void BinaryWidget::on_toolButtonPrev_clicked() { setAddPageEnabled(false); @@ -301,8 +286,7 @@ void BinaryWidget::on_pushButtonMemoryMap_clicked() { setTreeItem(ui->treeWidgetNavi, SBINARY::TYPE_MEMORYMAP); } -void BinaryWidget::on_treeWidgetNavi_currentItemChanged( - QTreeWidgetItem *pItemCurrent, QTreeWidgetItem *pItemPrevious) { +void BinaryWidget::on_treeWidgetNavi_currentItemChanged(QTreeWidgetItem *pItemCurrent, QTreeWidgetItem *pItemPrevious) { Q_UNUSED(pItemPrevious) if (pItemCurrent) { diff --git a/Binary/binarywidget.h b/Binary/binarywidget.h index 0b89887f..992f1f2e 100644 --- a/Binary/binarywidget.h +++ b/Binary/binarywidget.h @@ -31,19 +31,17 @@ class BinaryWidget; class BinaryWidget : public FormatWidget { Q_OBJECT - public: +public: BinaryWidget(QWidget *pParent = nullptr); - BinaryWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, - QWidget *pParent = nullptr); + BinaryWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, QWidget *pParent = nullptr); ~BinaryWidget(); virtual void clear(); virtual void cleanup(); virtual void reload(); - protected: - virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, - int nPosition, qint64 nOffset); +protected: + virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset); virtual void setReadonly(bool bState); virtual void blockSignals(bool bState); virtual void adjustHeaderTable(int nType, QTableWidget *pTableWidget); @@ -52,7 +50,7 @@ class BinaryWidget : public FormatWidget { virtual void _showInMemoryMapWindowOffset(qint64 nOffset); virtual void _showInHexWindow(qint64 nOffset, qint64 nSize); - private slots: +private slots: virtual void reloadData(); void widgetValueChanged(quint64 nValue); void on_checkBoxReadonly_toggled(bool bChecked); @@ -66,10 +64,9 @@ class BinaryWidget : public FormatWidget { void on_pushButtonEntropy_clicked(); void on_pushButtonHeuristicScan_clicked(); void on_pushButtonMemoryMap_clicked(); - void on_treeWidgetNavi_currentItemChanged(QTreeWidgetItem *pItemCurrent, - QTreeWidgetItem *pItemPrevious); + void on_treeWidgetNavi_currentItemChanged(QTreeWidgetItem *pItemCurrent, QTreeWidgetItem *pItemPrevious); - private: +private: Ui::BinaryWidget *ui; }; diff --git a/Binary/dialogbinary.cpp b/Binary/dialogbinary.cpp index 6a1ec1e6..5585acd1 100644 --- a/Binary/dialogbinary.cpp +++ b/Binary/dialogbinary.cpp @@ -22,14 +22,15 @@ #include "ui_dialogbinary.h" -DialogBinary::DialogBinary(QWidget *pParent) - : XShortcutsDialog(pParent), ui(new Ui::DialogBinary) { +DialogBinary::DialogBinary(QWidget *pParent) : XShortcutsDialog(pParent), ui(new Ui::DialogBinary) { ui->setupUi(this); setWindowFlags(Qt::Window); } -DialogBinary::~DialogBinary() { delete ui; } +DialogBinary::~DialogBinary() { + delete ui; +} void DialogBinary::setData(QIODevice *pDevice, FW_DEF::OPTIONS options) { ui->widget->setData(pDevice, options, 0, 0, 0); diff --git a/Binary/dialogbinary.h b/Binary/dialogbinary.h index c4b10411..a5db8e9a 100644 --- a/Binary/dialogbinary.h +++ b/Binary/dialogbinary.h @@ -32,14 +32,14 @@ class DialogBinary; class DialogBinary : public XShortcutsDialog { Q_OBJECT - public: +public: explicit DialogBinary(QWidget *pParent = nullptr); ~DialogBinary(); void setData(QIODevice *pDevice, FW_DEF::OPTIONS options); void setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions); - private: +private: Ui::DialogBinary *ui; }; diff --git a/DEX/dex_defs.cpp b/DEX/dex_defs.cpp index 1771dd35..e4db1ae3 100644 --- a/DEX/dex_defs.cpp +++ b/DEX/dex_defs.cpp @@ -22,73 +22,38 @@ namespace N_DEX_HEADER { const FW_DEF::HEADER_RECORD records[] = { - {magic, "magic", offsetof(XDEX_DEF::HEADER, magic), 4, "uint32 LE", - FW_DEF::VAL_TYPE_DATA}, - {version, "version", offsetof(XDEX_DEF::HEADER, version), 4, "uint32 LE", - FW_DEF::VAL_TYPE_DATA}, - {checksum, "checksum", offsetof(XDEX_DEF::HEADER, checksum), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {signature, "signature", offsetof(XDEX_DEF::HEADER, signature), 20, "array", - FW_DEF::VAL_TYPE_DATA}, - {file_size, "file_size", offsetof(XDEX_DEF::HEADER, file_size), 4, "uint32", - FW_DEF::VAL_TYPE_SIZE}, - {header_size, "header_size", offsetof(XDEX_DEF::HEADER, header_size), 4, - "uint32", FW_DEF::VAL_TYPE_SIZE}, - {endian_tag, "endian_tag", offsetof(XDEX_DEF::HEADER, endian_tag), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {link_size, "link_size", offsetof(XDEX_DEF::HEADER, link_size), 4, "uint32", - FW_DEF::VAL_TYPE_SIZE}, - {link_off, "link_off", offsetof(XDEX_DEF::HEADER, link_off), 4, "uint32", - FW_DEF::VAL_TYPE_OFFSET}, - {map_off, "map_off", offsetof(XDEX_DEF::HEADER, map_off), 4, "uint32", - FW_DEF::VAL_TYPE_OFFSET}, - {string_ids_size, "string_ids_size", - offsetof(XDEX_DEF::HEADER, string_ids_size), 4, "uint32", - FW_DEF::VAL_TYPE_SIZE}, - {string_ids_off, "string_ids_off", - offsetof(XDEX_DEF::HEADER, string_ids_off), 4, "uint32", - FW_DEF::VAL_TYPE_OFFSET}, - {type_ids_size, "type_ids_size", offsetof(XDEX_DEF::HEADER, type_ids_size), - 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, - {type_ids_off, "type_ids_off", offsetof(XDEX_DEF::HEADER, type_ids_off), 4, - "uint32", FW_DEF::VAL_TYPE_OFFSET}, - {proto_ids_size, "proto_ids_size", - offsetof(XDEX_DEF::HEADER, proto_ids_size), 4, "uint32", - FW_DEF::VAL_TYPE_SIZE}, - {proto_ids_off, "proto_ids_off", offsetof(XDEX_DEF::HEADER, proto_ids_off), - 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, - {field_ids_size, "field_ids_size", - offsetof(XDEX_DEF::HEADER, field_ids_size), 4, "uint32", - FW_DEF::VAL_TYPE_SIZE}, - {field_ids_off, "field_ids_off", offsetof(XDEX_DEF::HEADER, field_ids_off), - 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, - {method_ids_size, "method_ids_size", - offsetof(XDEX_DEF::HEADER, method_ids_size), 4, "uint32", - FW_DEF::VAL_TYPE_SIZE}, - {method_ids_off, "method_ids_off", - offsetof(XDEX_DEF::HEADER, method_ids_off), 4, "uint32", - FW_DEF::VAL_TYPE_OFFSET}, - {class_defs_size, "class_defs_size", - offsetof(XDEX_DEF::HEADER, class_defs_size), 4, "uint32", - FW_DEF::VAL_TYPE_SIZE}, - {class_defs_off, "class_defs_off", - offsetof(XDEX_DEF::HEADER, class_defs_off), 4, "uint32", - FW_DEF::VAL_TYPE_OFFSET}, - {data_size, "data_size", offsetof(XDEX_DEF::HEADER, data_size), 4, "uint32", - FW_DEF::VAL_TYPE_SIZE}, - {data_off, "data_off", offsetof(XDEX_DEF::HEADER, data_off), 4, "uint32", - FW_DEF::VAL_TYPE_OFFSET}, + {magic, "magic", offsetof(XDEX_DEF::HEADER, magic), 4, "uint32 LE", FW_DEF::VAL_TYPE_DATA}, + {version, "version", offsetof(XDEX_DEF::HEADER, version), 4, "uint32 LE", FW_DEF::VAL_TYPE_DATA}, + {checksum, "checksum", offsetof(XDEX_DEF::HEADER, checksum), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {signature, "signature", offsetof(XDEX_DEF::HEADER, signature), 20, "array", FW_DEF::VAL_TYPE_DATA}, + {file_size, "file_size", offsetof(XDEX_DEF::HEADER, file_size), 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, + {header_size, "header_size", offsetof(XDEX_DEF::HEADER, header_size), 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, + {endian_tag, "endian_tag", offsetof(XDEX_DEF::HEADER, endian_tag), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {link_size, "link_size", offsetof(XDEX_DEF::HEADER, link_size), 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, + {link_off, "link_off", offsetof(XDEX_DEF::HEADER, link_off), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {map_off, "map_off", offsetof(XDEX_DEF::HEADER, map_off), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {string_ids_size, "string_ids_size", offsetof(XDEX_DEF::HEADER, string_ids_size), 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, + {string_ids_off, "string_ids_off", offsetof(XDEX_DEF::HEADER, string_ids_off), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {type_ids_size, "type_ids_size", offsetof(XDEX_DEF::HEADER, type_ids_size), 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, + {type_ids_off, "type_ids_off", offsetof(XDEX_DEF::HEADER, type_ids_off), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {proto_ids_size, "proto_ids_size", offsetof(XDEX_DEF::HEADER, proto_ids_size), 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, + {proto_ids_off, "proto_ids_off", offsetof(XDEX_DEF::HEADER, proto_ids_off), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {field_ids_size, "field_ids_size", offsetof(XDEX_DEF::HEADER, field_ids_size), 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, + {field_ids_off, "field_ids_off", offsetof(XDEX_DEF::HEADER, field_ids_off), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {method_ids_size, "method_ids_size", offsetof(XDEX_DEF::HEADER, method_ids_size), 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, + {method_ids_off, "method_ids_off", offsetof(XDEX_DEF::HEADER, method_ids_off), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {class_defs_size, "class_defs_size", offsetof(XDEX_DEF::HEADER, class_defs_size), 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, + {class_defs_off, "class_defs_off", offsetof(XDEX_DEF::HEADER, class_defs_off), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {data_size, "data_size", offsetof(XDEX_DEF::HEADER, data_size), 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, + {data_off, "data_off", offsetof(XDEX_DEF::HEADER, data_off), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, }; } namespace N_DEX_MAP_ITEM { const FW_DEF::HEADER_RECORD records[] = { - {type, QObject::tr("Type"), offsetof(XDEX_DEF::MAP_ITEM, nType), 2, - "uint16", FW_DEF::VAL_TYPE_DATA}, - {count, QObject::tr("Count"), offsetof(XDEX_DEF::MAP_ITEM, nCount), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {offset, QObject::tr("Offset"), offsetof(XDEX_DEF::MAP_ITEM, nOffset), 4, - "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {type, QObject::tr("Type"), offsetof(XDEX_DEF::MAP_ITEM, nType), 2, "uint16", FW_DEF::VAL_TYPE_DATA}, + {count, QObject::tr("Count"), offsetof(XDEX_DEF::MAP_ITEM, nCount), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {offset, QObject::tr("Offset"), offsetof(XDEX_DEF::MAP_ITEM, nOffset), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, }; } @@ -141,10 +106,8 @@ const FW_DEF::HEADER_RECORD records[] = { {superclass_idx, "superclass_idx", 0, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, {interfaces_off, "interfaces_off", 0, 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, {source_file_idx, "source_file_idx", 0, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, - {annotations_off, "annotations_off", 0, 4, "uint32", - FW_DEF::VAL_TYPE_OFFSET}, + {annotations_off, "annotations_off", 0, 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, {class_data_off, "class_data_off", 0, 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, - {static_values_off, "static_values_off", 0, 4, "uint32", - FW_DEF::VAL_TYPE_OFFSET}, + {static_values_off, "static_values_off", 0, 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, }; } diff --git a/DEX/dex_defs.h b/DEX/dex_defs.h index 3f3e7736..2e04f420 100644 --- a/DEX/dex_defs.h +++ b/DEX/dex_defs.h @@ -121,17 +121,7 @@ extern const FW_DEF::HEADER_RECORD records[__data_size]; } // namespace N_DEX_METHOD_ID namespace N_DEX_CLASS_ITEM_DEF { -enum DATA { - class_idx = 0, - access_flags, - superclass_idx, - interfaces_off, - source_file_idx, - annotations_off, - class_data_off, - static_values_off, - __data_size -}; +enum DATA { class_idx = 0, access_flags, superclass_idx, interfaces_off, source_file_idx, annotations_off, class_data_off, static_values_off, __data_size }; extern const FW_DEF::HEADER_RECORD records[__data_size]; } // namespace N_DEX_CLASS_ITEM_DEF diff --git a/DEX/dexprocessdata.cpp b/DEX/dexprocessdata.cpp index 64cf81a3..3272f116 100644 --- a/DEX/dexprocessdata.cpp +++ b/DEX/dexprocessdata.cpp @@ -20,9 +20,7 @@ */ #include "dexprocessdata.h" -DEXProcessData::DEXProcessData(int nType, QStandardItemModel **ppModel, - XDEX *pDEX, qint64 nOffset, qint64 nSize) - : ProcessData() { +DEXProcessData::DEXProcessData(int nType, QStandardItemModel **ppModel, XDEX *pDEX, qint64 nOffset, qint64 nSize) : ProcessData() { this->g_nType = nType; this->g_ppModel = ppModel; this->g_pDEX = pDEX; @@ -36,15 +34,13 @@ void DEXProcessData::_process() { listLabels.append(""); listLabels.append(""); - listLabels.append(getStructList(N_DEX_MAP_ITEM::records, - N_DEX_MAP_ITEM::__data_size)); + listLabels.append(getStructList(N_DEX_MAP_ITEM::records, N_DEX_MAP_ITEM::__data_size)); QList listMapItems = g_pDEX->getMapItems(); qint32 nNumberOfMapItems = listMapItems.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfMapItems, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfMapItems, listLabels.count()); setMaximum(nNumberOfMapItems); @@ -59,23 +55,12 @@ void DEXProcessData::_process() { // pItem->setData(nStringTableSize,Qt::UserRole+FW_DEF::SECTION_DATA_STRINGTABLESIZE); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, 1, - new QStandardItem( - XBinary::valueToHex(listMapItems.at(i).nType))); + (*g_ppModel)->setItem(i, 1, new QStandardItem(XBinary::valueToHex(listMapItems.at(i).nType))); (*g_ppModel) ->setItem(i, N_DEX_MAP_ITEM::type + 2, - new QStandardItem(mapTypes.value( - listMapItems.at(i).nType, - XBinary::valueToHex(listMapItems.at(i).nType)))); - (*g_ppModel) - ->setItem(i, N_DEX_MAP_ITEM::count + 2, - new QStandardItem( - XBinary::valueToHex(listMapItems.at(i).nCount))); - (*g_ppModel) - ->setItem(i, N_DEX_MAP_ITEM::offset + 2, - new QStandardItem( - XBinary::valueToHex(listMapItems.at(i).nOffset))); + new QStandardItem(mapTypes.value(listMapItems.at(i).nType, XBinary::valueToHex(listMapItems.at(i).nType)))); + (*g_ppModel)->setItem(i, N_DEX_MAP_ITEM::count + 2, new QStandardItem(XBinary::valueToHex(listMapItems.at(i).nCount))); + (*g_ppModel)->setItem(i, N_DEX_MAP_ITEM::offset + 2, new QStandardItem(XBinary::valueToHex(listMapItems.at(i).nOffset))); incValue(); } @@ -83,12 +68,10 @@ void DEXProcessData::_process() { QList listLabels; listLabels.append(""); listLabels.append(""); - listLabels.append(getStructList(N_DEX_STRING_ID::records, - N_DEX_STRING_ID::__data_size)); + listLabels.append(getStructList(N_DEX_STRING_ID::records, N_DEX_STRING_ID::__data_size)); listLabels.append(""); - QList listStringItemIds = - g_pDEX->getList_STRING_ITEM_ID(); + QList listStringItemIds = g_pDEX->getList_STRING_ITEM_ID(); qint64 nDataOffset = g_pDEX->getHeader_data_off(); qint64 nDataSize = g_pDEX->getHeader_data_size(); QByteArray baData = g_pDEX->read_array(nDataOffset, nDataSize); @@ -104,19 +87,12 @@ void DEXProcessData::_process() { for (qint32 i = 0; (i < nNumberOfIds) && (isRun()); i++) { QStandardItem *pItem = new QStandardItem(QString::number(i)); - QString sString = g_pDEX->getStringItemIdString( - listStringItemIds.at(i), baData.data(), nDataSize, nDataOffset); + QString sString = g_pDEX->getStringItemIdString(listStringItemIds.at(i), baData.data(), nDataSize, nDataOffset); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, 1, new QStandardItem(XBinary::valueToHex(i))); - (*g_ppModel) - ->setItem(i, N_DEX_STRING_ID::string_data_off + 2, - new QStandardItem(XBinary::valueToHex( - listStringItemIds.at(i).string_data_off))); - (*g_ppModel) - ->setItem(i, N_DEX_STRING_ID::string_data_off + 3, - new QStandardItem(sString)); + (*g_ppModel)->setItem(i, 1, new QStandardItem(XBinary::valueToHex(i))); + (*g_ppModel)->setItem(i, N_DEX_STRING_ID::string_data_off + 2, new QStandardItem(XBinary::valueToHex(listStringItemIds.at(i).string_data_off))); + (*g_ppModel)->setItem(i, N_DEX_STRING_ID::string_data_off + 3, new QStandardItem(sString)); incValue(); } @@ -124,8 +100,7 @@ void DEXProcessData::_process() { QList listLabels; listLabels.append(""); listLabels.append(""); - listLabels.append( - getStructList(N_DEX_TYPE_ID::records, N_DEX_TYPE_ID::__data_size)); + listLabels.append(getStructList(N_DEX_TYPE_ID::records, N_DEX_TYPE_ID::__data_size)); listLabels.append(""); QList listMapItems = g_pDEX->getMapItems(); @@ -133,11 +108,9 @@ void DEXProcessData::_process() { qint64 nDataSize = g_pDEX->getHeader_data_size(); QByteArray baData = g_pDEX->read_array(nDataOffset, nDataSize); - QList listTypeItemIds = - g_pDEX->getList_TYPE_ITEM_ID(&listMapItems); + QList listTypeItemIds = g_pDEX->getList_TYPE_ITEM_ID(&listMapItems); - XDEX_DEF::MAP_ITEM mapItemStrings = - g_pDEX->getMapItem(XDEX_DEF::TYPE_STRING_ID_ITEM, &listMapItems); + XDEX_DEF::MAP_ITEM mapItemStrings = g_pDEX->getMapItem(XDEX_DEF::TYPE_STRING_ID_ITEM, &listMapItems); qint32 nNumberOfIds = listTypeItemIds.count(); @@ -148,22 +121,14 @@ void DEXProcessData::_process() { setHeader(*g_ppModel, &listLabels); for (qint32 i = 0; (i < nNumberOfIds) && (isRun()); i++) { - QString sString = g_pDEX->getTypeItemIdString( - listTypeItemIds.at(i), &mapItemStrings, baData.data(), - nDataSize, nDataOffset); + QString sString = g_pDEX->getTypeItemIdString(listTypeItemIds.at(i), &mapItemStrings, baData.data(), nDataSize, nDataOffset); QStandardItem *pItem = new QStandardItem(QString::number(i)); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, 1, new QStandardItem(XBinary::valueToHex(i))); - (*g_ppModel) - ->setItem(i, N_DEX_TYPE_ID::descriptor_idx + 2, - new QStandardItem(XBinary::valueToHex( - listTypeItemIds.at(i).descriptor_idx))); - (*g_ppModel) - ->setItem(i, N_DEX_TYPE_ID::descriptor_idx + 3, - new QStandardItem(sString)); + (*g_ppModel)->setItem(i, 1, new QStandardItem(XBinary::valueToHex(i))); + (*g_ppModel)->setItem(i, N_DEX_TYPE_ID::descriptor_idx + 2, new QStandardItem(XBinary::valueToHex(listTypeItemIds.at(i).descriptor_idx))); + (*g_ppModel)->setItem(i, N_DEX_TYPE_ID::descriptor_idx + 3, new QStandardItem(sString)); incValue(); } @@ -171,26 +136,21 @@ void DEXProcessData::_process() { QList listLabels; listLabels.append(""); listLabels.append(""); - listLabels.append(getStructList(N_DEX_PROTO_ID::records, - N_DEX_PROTO_ID::__data_size)); + listLabels.append(getStructList(N_DEX_PROTO_ID::records, N_DEX_PROTO_ID::__data_size)); listLabels.append("shorty"); listLabels.append("return_type"); QList listMapItems = g_pDEX->getMapItems(); - XDEX_DEF::MAP_ITEM mapItemString = - g_pDEX->getMapItem(XDEX_DEF::TYPE_STRING_ID_ITEM, &listMapItems); + XDEX_DEF::MAP_ITEM mapItemString = g_pDEX->getMapItem(XDEX_DEF::TYPE_STRING_ID_ITEM, &listMapItems); - QList listStringID = - g_pDEX->getList_STRING_ITEM_ID(&listMapItems); - QList listItemID = - g_pDEX->getList_TYPE_ITEM_ID(&listMapItems); + QList listStringID = g_pDEX->getList_STRING_ITEM_ID(&listMapItems); + QList listItemID = g_pDEX->getList_TYPE_ITEM_ID(&listMapItems); qint64 nDataOffset = g_pDEX->getHeader_data_off(); qint64 nDataSize = g_pDEX->getHeader_data_size(); QByteArray baData = g_pDEX->read_array(nDataOffset, nDataSize); - QList listProtoIDs = - g_pDEX->getList_PROTO_ITEM_ID(&listMapItems); + QList listProtoIDs = g_pDEX->getList_PROTO_ITEM_ID(&listMapItems); qint32 nNumberOfIds = listProtoIDs.count(); @@ -207,34 +167,17 @@ void DEXProcessData::_process() { QStandardItem *pItem = new QStandardItem(QString::number(i)); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, 1, new QStandardItem(XBinary::valueToHex(i))); - (*g_ppModel) - ->setItem(i, N_DEX_PROTO_ID::shorty_idx + 2, - new QStandardItem(XBinary::valueToHex( - listProtoIDs.at(i).shorty_idx))); - (*g_ppModel) - ->setItem(i, N_DEX_PROTO_ID::return_type_idx + 2, - new QStandardItem(XBinary::valueToHex( - listProtoIDs.at(i).return_type_idx))); - (*g_ppModel) - ->setItem(i, N_DEX_PROTO_ID::parameters_off + 2, - new QStandardItem(XBinary::valueToHex( - listProtoIDs.at(i).parameters_off))); + (*g_ppModel)->setItem(i, 1, new QStandardItem(XBinary::valueToHex(i))); + (*g_ppModel)->setItem(i, N_DEX_PROTO_ID::shorty_idx + 2, new QStandardItem(XBinary::valueToHex(listProtoIDs.at(i).shorty_idx))); + (*g_ppModel)->setItem(i, N_DEX_PROTO_ID::return_type_idx + 2, new QStandardItem(XBinary::valueToHex(listProtoIDs.at(i).return_type_idx))); + (*g_ppModel)->setItem(i, N_DEX_PROTO_ID::parameters_off + 2, new QStandardItem(XBinary::valueToHex(listProtoIDs.at(i).parameters_off))); - QString sShorty = g_pDEX->getStringItemIdString( - &listStringID, listProtoIDs.at(i).shorty_idx, baData.data(), - nDataSize, nDataOffset); - QString sReturnType = g_pDEX->getTypeItemIdString( - &listItemID, listProtoIDs.at(i).return_type_idx, &mapItemString, - baData.data(), nDataSize, nDataOffset); + QString sShorty = g_pDEX->getStringItemIdString(&listStringID, listProtoIDs.at(i).shorty_idx, baData.data(), nDataSize, nDataOffset); + QString sReturnType = + g_pDEX->getTypeItemIdString(&listItemID, listProtoIDs.at(i).return_type_idx, &mapItemString, baData.data(), nDataSize, nDataOffset); - (*g_ppModel) - ->setItem(i, N_DEX_PROTO_ID::parameters_off + 3, - new QStandardItem(sShorty)); - (*g_ppModel) - ->setItem(i, N_DEX_PROTO_ID::parameters_off + 4, - new QStandardItem(sReturnType)); + (*g_ppModel)->setItem(i, N_DEX_PROTO_ID::parameters_off + 3, new QStandardItem(sShorty)); + (*g_ppModel)->setItem(i, N_DEX_PROTO_ID::parameters_off + 4, new QStandardItem(sReturnType)); incValue(); } @@ -242,22 +185,19 @@ void DEXProcessData::_process() { QList listLabels; listLabels.append(""); listLabels.append(""); - listLabels.append(getStructList(N_DEX_FIELD_ID::records, - N_DEX_FIELD_ID::__data_size)); + listLabels.append(getStructList(N_DEX_FIELD_ID::records, N_DEX_FIELD_ID::__data_size)); // TODO type listLabels.append("name"); QList listMapItems = g_pDEX->getMapItems(); - QList listStringID = - g_pDEX->getList_STRING_ITEM_ID(&listMapItems); + QList listStringID = g_pDEX->getList_STRING_ITEM_ID(&listMapItems); qint64 nDataOffset = g_pDEX->getHeader_data_off(); qint64 nDataSize = g_pDEX->getHeader_data_size(); QByteArray baData = g_pDEX->read_array(nDataOffset, nDataSize); - QList listFieldIDs = - g_pDEX->getList_FIELD_ITEM_ID(&listMapItems); + QList listFieldIDs = g_pDEX->getList_FIELD_ITEM_ID(&listMapItems); qint32 nNumberOfIds = listFieldIDs.count(); @@ -271,28 +211,14 @@ void DEXProcessData::_process() { QStandardItem *pItem = new QStandardItem(QString::number(i)); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, 1, new QStandardItem(XBinary::valueToHex(i))); - (*g_ppModel) - ->setItem(i, N_DEX_FIELD_ID::class_idx + 2, - new QStandardItem(XBinary::valueToHex( - listFieldIDs.at(i).class_idx))); - (*g_ppModel) - ->setItem(i, N_DEX_FIELD_ID::type_idx + 2, - new QStandardItem(XBinary::valueToHex( - listFieldIDs.at(i).type_idx))); - (*g_ppModel) - ->setItem(i, N_DEX_FIELD_ID::name_idx + 2, - new QStandardItem(XBinary::valueToHex( - listFieldIDs.at(i).name_idx))); + (*g_ppModel)->setItem(i, 1, new QStandardItem(XBinary::valueToHex(i))); + (*g_ppModel)->setItem(i, N_DEX_FIELD_ID::class_idx + 2, new QStandardItem(XBinary::valueToHex(listFieldIDs.at(i).class_idx))); + (*g_ppModel)->setItem(i, N_DEX_FIELD_ID::type_idx + 2, new QStandardItem(XBinary::valueToHex(listFieldIDs.at(i).type_idx))); + (*g_ppModel)->setItem(i, N_DEX_FIELD_ID::name_idx + 2, new QStandardItem(XBinary::valueToHex(listFieldIDs.at(i).name_idx))); - QString sName = g_pDEX->getStringItemIdString( - &listStringID, listFieldIDs.at(i).name_idx, baData.data(), - nDataSize, nDataOffset); + QString sName = g_pDEX->getStringItemIdString(&listStringID, listFieldIDs.at(i).name_idx, baData.data(), nDataSize, nDataOffset); - (*g_ppModel) - ->setItem(i, N_DEX_FIELD_ID::name_idx + 3, - new QStandardItem(sName)); + (*g_ppModel)->setItem(i, N_DEX_FIELD_ID::name_idx + 3, new QStandardItem(sName)); incValue(); } @@ -300,21 +226,18 @@ void DEXProcessData::_process() { QList listLabels; listLabels.append(""); listLabels.append(""); - listLabels.append(getStructList(N_DEX_METHOD_ID::records, - N_DEX_METHOD_ID::__data_size)); + listLabels.append(getStructList(N_DEX_METHOD_ID::records, N_DEX_METHOD_ID::__data_size)); listLabels.append("name"); QList listMapItems = g_pDEX->getMapItems(); - QList listStringID = - g_pDEX->getList_STRING_ITEM_ID(&listMapItems); + QList listStringID = g_pDEX->getList_STRING_ITEM_ID(&listMapItems); qint64 nDataOffset = g_pDEX->getHeader_data_off(); qint64 nDataSize = g_pDEX->getHeader_data_size(); QByteArray baData = g_pDEX->read_array(nDataOffset, nDataSize); - QList listMethodIDs = - g_pDEX->getList_METHOD_ITEM_ID(&listMapItems); + QList listMethodIDs = g_pDEX->getList_METHOD_ITEM_ID(&listMapItems); qint32 nNumberOfIds = listMethodIDs.count(); @@ -328,28 +251,14 @@ void DEXProcessData::_process() { QStandardItem *pItem = new QStandardItem(QString::number(i)); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, 1, new QStandardItem(XBinary::valueToHex(i))); - (*g_ppModel) - ->setItem(i, N_DEX_METHOD_ID::class_idx + 2, - new QStandardItem(XBinary::valueToHex( - listMethodIDs.at(i).class_idx))); - (*g_ppModel) - ->setItem(i, N_DEX_METHOD_ID::proto_idx + 2, - new QStandardItem(XBinary::valueToHex( - listMethodIDs.at(i).proto_idx))); - (*g_ppModel) - ->setItem(i, N_DEX_METHOD_ID::name_idx + 2, - new QStandardItem(XBinary::valueToHex( - listMethodIDs.at(i).name_idx))); + (*g_ppModel)->setItem(i, 1, new QStandardItem(XBinary::valueToHex(i))); + (*g_ppModel)->setItem(i, N_DEX_METHOD_ID::class_idx + 2, new QStandardItem(XBinary::valueToHex(listMethodIDs.at(i).class_idx))); + (*g_ppModel)->setItem(i, N_DEX_METHOD_ID::proto_idx + 2, new QStandardItem(XBinary::valueToHex(listMethodIDs.at(i).proto_idx))); + (*g_ppModel)->setItem(i, N_DEX_METHOD_ID::name_idx + 2, new QStandardItem(XBinary::valueToHex(listMethodIDs.at(i).name_idx))); - QString sName = g_pDEX->getStringItemIdString( - &listStringID, listMethodIDs.at(i).name_idx, baData.data(), - nDataSize, nDataOffset); + QString sName = g_pDEX->getStringItemIdString(&listStringID, listMethodIDs.at(i).name_idx, baData.data(), nDataSize, nDataOffset); - (*g_ppModel) - ->setItem(i, N_DEX_METHOD_ID::name_idx + 3, - new QStandardItem(sName)); + (*g_ppModel)->setItem(i, N_DEX_METHOD_ID::name_idx + 3, new QStandardItem(sName)); incValue(); } @@ -357,13 +266,11 @@ void DEXProcessData::_process() { QList listLabels; listLabels.append(""); listLabels.append(""); - listLabels.append(getStructList(N_DEX_CLASS_ITEM_DEF::records, - N_DEX_CLASS_ITEM_DEF::__data_size)); + listLabels.append(getStructList(N_DEX_CLASS_ITEM_DEF::records, N_DEX_CLASS_ITEM_DEF::__data_size)); QList listMapItems = g_pDEX->getMapItems(); - QList listClassDefss = - g_pDEX->getList_CLASS_ITEM_DEF(&listMapItems); + QList listClassDefss = g_pDEX->getList_CLASS_ITEM_DEF(&listMapItems); qint32 nNumberOfDefs = listClassDefss.count(); @@ -377,40 +284,16 @@ void DEXProcessData::_process() { QStandardItem *pItem = new QStandardItem(QString::number(i)); (*g_ppModel)->setItem(i, 0, pItem); + (*g_ppModel)->setItem(i, 1, new QStandardItem(XBinary::valueToHex(i))); + (*g_ppModel)->setItem(i, N_DEX_CLASS_ITEM_DEF::class_idx + 2, new QStandardItem(XBinary::valueToHex(listClassDefss.at(i).class_idx))); + (*g_ppModel)->setItem(i, N_DEX_CLASS_ITEM_DEF::access_flags + 2, new QStandardItem(XBinary::valueToHex(listClassDefss.at(i).access_flags))); + (*g_ppModel)->setItem(i, N_DEX_CLASS_ITEM_DEF::superclass_idx + 2, new QStandardItem(XBinary::valueToHex(listClassDefss.at(i).superclass_idx))); + (*g_ppModel)->setItem(i, N_DEX_CLASS_ITEM_DEF::interfaces_off + 2, new QStandardItem(XBinary::valueToHex(listClassDefss.at(i).interfaces_off))); + (*g_ppModel)->setItem(i, N_DEX_CLASS_ITEM_DEF::source_file_idx + 2, new QStandardItem(XBinary::valueToHex(listClassDefss.at(i).source_file_idx))); + (*g_ppModel)->setItem(i, N_DEX_CLASS_ITEM_DEF::annotations_off + 2, new QStandardItem(XBinary::valueToHex(listClassDefss.at(i).annotations_off))); + (*g_ppModel)->setItem(i, N_DEX_CLASS_ITEM_DEF::class_data_off + 2, new QStandardItem(XBinary::valueToHex(listClassDefss.at(i).class_data_off))); (*g_ppModel) - ->setItem(i, 1, new QStandardItem(XBinary::valueToHex(i))); - (*g_ppModel) - ->setItem(i, N_DEX_CLASS_ITEM_DEF::class_idx + 2, - new QStandardItem(XBinary::valueToHex( - listClassDefss.at(i).class_idx))); - (*g_ppModel) - ->setItem(i, N_DEX_CLASS_ITEM_DEF::access_flags + 2, - new QStandardItem(XBinary::valueToHex( - listClassDefss.at(i).access_flags))); - (*g_ppModel) - ->setItem(i, N_DEX_CLASS_ITEM_DEF::superclass_idx + 2, - new QStandardItem(XBinary::valueToHex( - listClassDefss.at(i).superclass_idx))); - (*g_ppModel) - ->setItem(i, N_DEX_CLASS_ITEM_DEF::interfaces_off + 2, - new QStandardItem(XBinary::valueToHex( - listClassDefss.at(i).interfaces_off))); - (*g_ppModel) - ->setItem(i, N_DEX_CLASS_ITEM_DEF::source_file_idx + 2, - new QStandardItem(XBinary::valueToHex( - listClassDefss.at(i).source_file_idx))); - (*g_ppModel) - ->setItem(i, N_DEX_CLASS_ITEM_DEF::annotations_off + 2, - new QStandardItem(XBinary::valueToHex( - listClassDefss.at(i).annotations_off))); - (*g_ppModel) - ->setItem(i, N_DEX_CLASS_ITEM_DEF::class_data_off + 2, - new QStandardItem(XBinary::valueToHex( - listClassDefss.at(i).class_data_off))); - (*g_ppModel) - ->setItem(i, N_DEX_CLASS_ITEM_DEF::static_values_off + 2, - new QStandardItem(XBinary::valueToHex( - listClassDefss.at(i).static_values_off))); + ->setItem(i, N_DEX_CLASS_ITEM_DEF::static_values_off + 2, new QStandardItem(XBinary::valueToHex(listClassDefss.at(i).static_values_off))); incValue(); } @@ -421,125 +304,49 @@ void DEXProcessData::ajustTableView(QWidget *pWidget, QTableView *pTableView) { XBinary::MODE mode = g_pDEX->getMode(); if (g_nType == SDEX::TYPE_MAPITEMS) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGMID, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGMID, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); } else if (g_nType == SDEX::TYPE_STRING_ID_ITEM) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, - FormatWidget::CW_STRINGLONG, mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGLONG, mode)); } else if (g_nType == SDEX::TYPE_TYPE_ID_ITEM) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, - FormatWidget::CW_STRINGLONG, mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGLONG, mode)); } else if (g_nType == SDEX::TYPE_PROTO_ID_ITEM) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); } else if (g_nType == SDEX::TYPE_FIELD_ID_ITEM) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); } else if (g_nType == SDEX::TYPE_METHOD_ID_ITEM) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); } else if (g_nType == SDEX::TYPE_CLASS_DEF_ITEM) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 7, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 8, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 9, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(7, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(8, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(9, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); } } diff --git a/DEX/dexprocessdata.h b/DEX/dexprocessdata.h index 0eab732b..1ee66229 100644 --- a/DEX/dexprocessdata.h +++ b/DEX/dexprocessdata.h @@ -27,14 +27,13 @@ class DEXProcessData : public ProcessData { Q_OBJECT - public: - explicit DEXProcessData(int nType, QStandardItemModel **ppModel, XDEX *pDEX, - qint64 nOffset, qint64 nSize); +public: + explicit DEXProcessData(int nType, QStandardItemModel **ppModel, XDEX *pDEX, qint64 nOffset, qint64 nSize); virtual void _process(); virtual void ajustTableView(QWidget *pWidget, QTableView *pTableView); - private: +private: int g_nType; XDEX *g_pDEX; QStandardItemModel **g_ppModel; diff --git a/DEX/dexsectionheaderwidget.cpp b/DEX/dexsectionheaderwidget.cpp index d0454deb..734d8ef6 100644 --- a/DEX/dexsectionheaderwidget.cpp +++ b/DEX/dexsectionheaderwidget.cpp @@ -22,15 +22,11 @@ #include "ui_dexsectionheaderwidget.h" -DEXSectionHeaderWidget::DEXSectionHeaderWidget(QWidget *pParent) - : FormatWidget(pParent), ui(new Ui::DEXSectionHeaderWidget) { +DEXSectionHeaderWidget::DEXSectionHeaderWidget(QWidget *pParent) : FormatWidget(pParent), ui(new Ui::DEXSectionHeaderWidget) { ui->setupUi(this); } -DEXSectionHeaderWidget::DEXSectionHeaderWidget(QIODevice *pDevice, - FW_DEF::OPTIONS options, - quint32 nNumber, qint64 nOffset, - qint32 nType, QWidget *pParent) +DEXSectionHeaderWidget::DEXSectionHeaderWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, quint32 nNumber, qint64 nOffset, qint32 nType, QWidget *pParent) : DEXSectionHeaderWidget(pParent) { DEXSectionHeaderWidget::setData(pDevice, options, nNumber, nOffset, nType); @@ -82,7 +78,9 @@ void DEXSectionHeaderWidget::clear() { ui->checkBoxReadonly->setChecked(true); } -void DEXSectionHeaderWidget::cleanup() { DEXSectionHeaderWidget::clear(); } +void DEXSectionHeaderWidget::cleanup() { + DEXSectionHeaderWidget::clear(); +} void DEXSectionHeaderWidget::reload() { DEXSectionHeaderWidget::clear(); @@ -92,16 +90,12 @@ void DEXSectionHeaderWidget::reload() { reloadData(); } -void DEXSectionHeaderWidget::setStringTable(qint64 nStringTableOffset, - qint64 nStringTableSize) { +void DEXSectionHeaderWidget::setStringTable(qint64 nStringTableOffset, qint64 nStringTableSize) { this->g_nStringTableOffset = nStringTableOffset; this->g_nStringTableSize = nStringTableSize; } -FormatWidget::SV DEXSectionHeaderWidget::_setValue(QVariant vValue, int nStype, - int nNdata, int nVtype, - int nPosition, - qint64 nOffset) { +FormatWidget::SV DEXSectionHeaderWidget::_setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset) { Q_UNUSED(vValue) Q_UNUSED(nStype) Q_UNUSED(nNdata) @@ -139,8 +133,7 @@ void DEXSectionHeaderWidget::blockSignals(bool bState) { _blockSignals((QObject **)g_ppComboBox, g_nComboBoxSize, bState); } -void DEXSectionHeaderWidget::adjustHeaderTable(int nType, - QTableWidget *pTableWidget) { +void DEXSectionHeaderWidget::adjustHeaderTable(int nType, QTableWidget *pTableWidget) { Q_UNUSED(nType) Q_UNUSED(pTableWidget) } @@ -175,9 +168,7 @@ void DEXSectionHeaderWidget::widgetValueChanged(quint64 nValue) { } } -void DEXSectionHeaderWidget::on_tableWidget_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void DEXSectionHeaderWidget::on_tableWidget_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow) Q_UNUSED(nCurrentColumn) Q_UNUSED(nPreviousRow) diff --git a/DEX/dexsectionheaderwidget.h b/DEX/dexsectionheaderwidget.h index 921042ce..8ffeb86c 100644 --- a/DEX/dexsectionheaderwidget.h +++ b/DEX/dexsectionheaderwidget.h @@ -31,11 +31,9 @@ class DEXSectionHeaderWidget; class DEXSectionHeaderWidget : public FormatWidget { Q_OBJECT - public: +public: DEXSectionHeaderWidget(QWidget *pParent = nullptr); - DEXSectionHeaderWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, - quint32 nNumber, qint64 nOffset, qint32 nType, - QWidget *pParent = nullptr); + DEXSectionHeaderWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, quint32 nNumber, qint64 nOffset, qint32 nType, QWidget *pParent = nullptr); ~DEXSectionHeaderWidget(); virtual void clear(); @@ -43,23 +41,20 @@ class DEXSectionHeaderWidget : public FormatWidget { virtual void reload(); void setStringTable(qint64 nStringTableOffset, qint64 nStringTableSize); - protected: - virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, - int nPosition, qint64 nOffset); +protected: + virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset); virtual void setReadonly(bool bState); virtual void blockSignals(bool bState); virtual void adjustHeaderTable(int nType, QTableWidget *pTableWidget); - private slots: +private slots: void on_checkBoxReadonly_toggled(bool bChecked); void reloadData(); void widgetValueChanged(quint64 nValue); - void on_tableWidget_currentCellChanged(int nCurrentRow, int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); + void on_tableWidget_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); - private: +private: Ui::DEXSectionHeaderWidget *ui; XLineEditHEX **g_ppLinedEdit; int g_nLineEditSize; diff --git a/DEX/dexwidget.cpp b/DEX/dexwidget.cpp index 11766a1f..03140417 100644 --- a/DEX/dexwidget.cpp +++ b/DEX/dexwidget.cpp @@ -22,8 +22,7 @@ #include "ui_dexwidget.h" -DEXWidget::DEXWidget(QWidget *pParent) - : FormatWidget(pParent), ui(new Ui::DEXWidget) { +DEXWidget::DEXWidget(QWidget *pParent) : FormatWidget(pParent), ui(new Ui::DEXWidget) { ui->setupUi(this); memset(g_subDevice, 0, sizeof g_subDevice); @@ -34,14 +33,14 @@ DEXWidget::DEXWidget(QWidget *pParent) initWidget(); } -DEXWidget::DEXWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, - QWidget *pParent) - : DEXWidget(pParent) { +DEXWidget::DEXWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, QWidget *pParent) : DEXWidget(pParent) { DEXWidget::setData(pDevice, options, 0, 0, 0); DEXWidget::reload(); } -DEXWidget::~DEXWidget() { delete ui; } +DEXWidget::~DEXWidget() { + delete ui; +} void DEXWidget::clear() { DEXWidget::reset(); @@ -51,8 +50,7 @@ void DEXWidget::clear() { memset(g_invWidget, 0, sizeof g_invWidget); memset(g_tvModel, 0, sizeof g_tvModel); - _deleteSubdevices(g_subDevice, - (sizeof g_subDevice) / (sizeof(SubDevice *))); + _deleteSubdevices(g_subDevice, (sizeof g_subDevice) / (sizeof(SubDevice *))); resetWidget(); @@ -61,7 +59,9 @@ void DEXWidget::clear() { ui->treeWidgetNavi->clear(); } -void DEXWidget::cleanup() { DEXWidget::clear(); } +void DEXWidget::cleanup() { + DEXWidget::clear(); +} void DEXWidget::reload() { DEXWidget::clear(); @@ -73,67 +73,45 @@ void DEXWidget::reload() { if (dex.isValid()) { setFileType(dex.getFileType()); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SDEX::TYPE_INFO, tr("Info"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SDEX::TYPE_VIRUSTOTAL, "VirusTotal")); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SDEX::TYPE_HEX, tr("Hex"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SDEX::TYPE_HASH, tr("Hash"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SDEX::TYPE_STRINGS, tr("Strings"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SDEX::TYPE_MEMORYMAP, tr("Memory map"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SDEX::TYPE_ENTROPY, tr("Entropy"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SDEX::TYPE_HEURISTICSCAN, tr("Heuristic scan"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SDEX::TYPE_HEADER, "Header")); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SDEX::TYPE_INFO, tr("Info"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SDEX::TYPE_VIRUSTOTAL, "VirusTotal")); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SDEX::TYPE_HEX, tr("Hex"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SDEX::TYPE_HASH, tr("Hash"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SDEX::TYPE_STRINGS, tr("Strings"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SDEX::TYPE_MEMORYMAP, tr("Memory map"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SDEX::TYPE_ENTROPY, tr("Entropy"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SDEX::TYPE_HEURISTICSCAN, tr("Heuristic scan"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SDEX::TYPE_HEADER, "Header")); QList listMapItems = dex.getMapItems(); if (listMapItems.count()) { - QTreeWidgetItem *pItemMapItems = - createNewItem(SDEX::TYPE_MAPITEMS, "Map items"); + QTreeWidgetItem *pItemMapItems = createNewItem(SDEX::TYPE_MAPITEMS, "Map items"); ui->treeWidgetNavi->addTopLevelItem(pItemMapItems); - if (dex.isMapItemPresent(XDEX_DEF::TYPE_STRING_ID_ITEM, - &listMapItems)) { - pItemMapItems->addChild( - createNewItem(SDEX::TYPE_STRING_ID_ITEM, "STRING_ID_ITEM")); + if (dex.isMapItemPresent(XDEX_DEF::TYPE_STRING_ID_ITEM, &listMapItems)) { + pItemMapItems->addChild(createNewItem(SDEX::TYPE_STRING_ID_ITEM, "STRING_ID_ITEM")); } - if (dex.isMapItemPresent(XDEX_DEF::TYPE_TYPE_ID_ITEM, - &listMapItems)) { - pItemMapItems->addChild( - createNewItem(SDEX::TYPE_TYPE_ID_ITEM, "TYPE_ID_ITEM")); + if (dex.isMapItemPresent(XDEX_DEF::TYPE_TYPE_ID_ITEM, &listMapItems)) { + pItemMapItems->addChild(createNewItem(SDEX::TYPE_TYPE_ID_ITEM, "TYPE_ID_ITEM")); } - if (dex.isMapItemPresent(XDEX_DEF::TYPE_PROTO_ID_ITEM, - &listMapItems)) { - pItemMapItems->addChild( - createNewItem(SDEX::TYPE_PROTO_ID_ITEM, "PROTO_ID_ITEM")); + if (dex.isMapItemPresent(XDEX_DEF::TYPE_PROTO_ID_ITEM, &listMapItems)) { + pItemMapItems->addChild(createNewItem(SDEX::TYPE_PROTO_ID_ITEM, "PROTO_ID_ITEM")); } - if (dex.isMapItemPresent(XDEX_DEF::TYPE_FIELD_ID_ITEM, - &listMapItems)) { - pItemMapItems->addChild(createNewItem(SDEX::TYPE_FIELD_ID_ITEM, - "TYPE_FIELD_ID_ITEM")); + if (dex.isMapItemPresent(XDEX_DEF::TYPE_FIELD_ID_ITEM, &listMapItems)) { + pItemMapItems->addChild(createNewItem(SDEX::TYPE_FIELD_ID_ITEM, "TYPE_FIELD_ID_ITEM")); } - if (dex.isMapItemPresent(XDEX_DEF::TYPE_METHOD_ID_ITEM, - &listMapItems)) { - pItemMapItems->addChild(createNewItem(SDEX::TYPE_METHOD_ID_ITEM, - "TYPE_METHOD_ID_ITEM")); + if (dex.isMapItemPresent(XDEX_DEF::TYPE_METHOD_ID_ITEM, &listMapItems)) { + pItemMapItems->addChild(createNewItem(SDEX::TYPE_METHOD_ID_ITEM, "TYPE_METHOD_ID_ITEM")); } - if (dex.isMapItemPresent(XDEX_DEF::TYPE_CLASS_DEF_ITEM, - &listMapItems)) { - pItemMapItems->addChild(createNewItem(SDEX::TYPE_CLASS_DEF_ITEM, - "TYPE_CLASS_DEF_ITEM")); + if (dex.isMapItemPresent(XDEX_DEF::TYPE_CLASS_DEF_ITEM, &listMapItems)) { + pItemMapItems->addChild(createNewItem(SDEX::TYPE_CLASS_DEF_ITEM, "TYPE_CLASS_DEF_ITEM")); } } @@ -143,9 +121,7 @@ void DEXWidget::reload() { } } -FormatWidget::SV DEXWidget::_setValue(QVariant vValue, int nStype, int nNdata, - int nVtype, int nPosition, - qint64 nOffset) { +FormatWidget::SV DEXWidget::_setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset) { Q_UNUSED(nVtype) Q_UNUSED(nPosition) Q_UNUSED(nOffset) @@ -171,104 +147,68 @@ FormatWidget::SV DEXWidget::_setValue(QVariant vValue, int nStype, int nNdata, g_comboBox[CB_Dex_Header_version]->setValue(nValue); break; case N_DEX_HEADER::endian_tag: - g_comboBox[CB_Dex_Header_endian_tag]->setValue( - nValue); + g_comboBox[CB_Dex_Header_endian_tag]->setValue(nValue); break; case N_DEX_HEADER::link_size: - g_invWidget[INV_link]->setOffsetAndSize( - &dex, dex.getHeader_link_off(), - (quint32)nValue); + g_invWidget[INV_link]->setOffsetAndSize(&dex, dex.getHeader_link_off(), (quint32)nValue); break; case N_DEX_HEADER::link_off: - g_invWidget[INV_link]->setOffsetAndSize( - &dex, (quint32)nValue, - dex.getHeader_link_size()); + g_invWidget[INV_link]->setOffsetAndSize(&dex, (quint32)nValue, dex.getHeader_link_size()); break; case N_DEX_HEADER::map_off: - g_invWidget[INV_map]->setOffsetAndSize( - &dex, (quint32)nValue, 0); + g_invWidget[INV_map]->setOffsetAndSize(&dex, (quint32)nValue, 0); break; case N_DEX_HEADER::string_ids_size: - g_invWidget[INV_string_ids]->setOffsetAndSize( - &dex, dex.getHeader_string_ids_off(), - (quint32)nValue * - sizeof(XDEX_DEF::STRING_ITEM_ID)); + g_invWidget[INV_string_ids]->setOffsetAndSize(&dex, dex.getHeader_string_ids_off(), + (quint32)nValue * sizeof(XDEX_DEF::STRING_ITEM_ID)); break; case N_DEX_HEADER::string_ids_off: - g_invWidget[INV_string_ids]->setOffsetAndSize( - &dex, (quint32)nValue, - dex.getHeader_string_ids_size() * - sizeof(XDEX_DEF::STRING_ITEM_ID)); + g_invWidget[INV_string_ids]->setOffsetAndSize(&dex, (quint32)nValue, + dex.getHeader_string_ids_size() * sizeof(XDEX_DEF::STRING_ITEM_ID)); break; case N_DEX_HEADER::type_ids_size: - g_invWidget[INV_type_ids]->setOffsetAndSize( - &dex, dex.getHeader_type_ids_off(), - (quint32)nValue * - sizeof(XDEX_DEF::TYPE_ITEM_ID)); + g_invWidget[INV_type_ids]->setOffsetAndSize(&dex, dex.getHeader_type_ids_off(), (quint32)nValue * sizeof(XDEX_DEF::TYPE_ITEM_ID)); break; case N_DEX_HEADER::type_ids_off: - g_invWidget[INV_type_ids]->setOffsetAndSize( - &dex, (quint32)nValue, - dex.getHeader_type_ids_size() * - sizeof(XDEX_DEF::TYPE_ITEM_ID)); + g_invWidget[INV_type_ids]->setOffsetAndSize(&dex, (quint32)nValue, dex.getHeader_type_ids_size() * sizeof(XDEX_DEF::TYPE_ITEM_ID)); break; case N_DEX_HEADER::proto_ids_size: - g_invWidget[INV_proto_ids]->setOffsetAndSize( - &dex, dex.getHeader_proto_ids_off(), - (quint32)nValue * - sizeof(XDEX_DEF::PROTO_ITEM_ID)); + g_invWidget[INV_proto_ids]->setOffsetAndSize(&dex, dex.getHeader_proto_ids_off(), + (quint32)nValue * sizeof(XDEX_DEF::PROTO_ITEM_ID)); break; case N_DEX_HEADER::proto_ids_off: - g_invWidget[INV_proto_ids]->setOffsetAndSize( - &dex, (quint32)nValue, - dex.getHeader_proto_ids_size() * - sizeof(XDEX_DEF::PROTO_ITEM_ID)); + g_invWidget[INV_proto_ids]->setOffsetAndSize(&dex, (quint32)nValue, + dex.getHeader_proto_ids_size() * sizeof(XDEX_DEF::PROTO_ITEM_ID)); break; case N_DEX_HEADER::field_ids_size: - g_invWidget[INV_field_ids]->setOffsetAndSize( - &dex, dex.getHeader_field_ids_off(), - (quint32)nValue * - sizeof(XDEX_DEF::FIELD_ITEM_ID)); + g_invWidget[INV_field_ids]->setOffsetAndSize(&dex, dex.getHeader_field_ids_off(), + (quint32)nValue * sizeof(XDEX_DEF::FIELD_ITEM_ID)); break; case N_DEX_HEADER::field_ids_off: - g_invWidget[INV_field_ids]->setOffsetAndSize( - &dex, (quint32)nValue, - dex.getHeader_field_ids_size() * - sizeof(XDEX_DEF::FIELD_ITEM_ID)); + g_invWidget[INV_field_ids]->setOffsetAndSize(&dex, (quint32)nValue, + dex.getHeader_field_ids_size() * sizeof(XDEX_DEF::FIELD_ITEM_ID)); break; case N_DEX_HEADER::method_ids_size: - g_invWidget[INV_method_ids]->setOffsetAndSize( - &dex, dex.getHeader_method_ids_off(), - (quint32)nValue * - sizeof(XDEX_DEF::METHOD_ITEM_ID)); + g_invWidget[INV_method_ids]->setOffsetAndSize(&dex, dex.getHeader_method_ids_off(), + (quint32)nValue * sizeof(XDEX_DEF::METHOD_ITEM_ID)); break; case N_DEX_HEADER::method_ids_off: - g_invWidget[INV_method_ids]->setOffsetAndSize( - &dex, (quint32)nValue, - dex.getHeader_method_ids_size() * - sizeof(XDEX_DEF::METHOD_ITEM_ID)); + g_invWidget[INV_method_ids]->setOffsetAndSize(&dex, (quint32)nValue, + dex.getHeader_method_ids_size() * sizeof(XDEX_DEF::METHOD_ITEM_ID)); break; case N_DEX_HEADER::class_defs_size: - g_invWidget[INV_class_defs]->setOffsetAndSize( - &dex, dex.getHeader_class_defs_off(), - (quint32)nValue * - sizeof(XDEX_DEF::CLASS_ITEM_DEF)); + g_invWidget[INV_class_defs]->setOffsetAndSize(&dex, dex.getHeader_class_defs_off(), + (quint32)nValue * sizeof(XDEX_DEF::CLASS_ITEM_DEF)); break; case N_DEX_HEADER::class_defs_off: - g_invWidget[INV_class_defs]->setOffsetAndSize( - &dex, (quint32)nValue, - dex.getHeader_class_defs_size() * - sizeof(XDEX_DEF::CLASS_ITEM_DEF)); + g_invWidget[INV_class_defs]->setOffsetAndSize(&dex, (quint32)nValue, + dex.getHeader_class_defs_size() * sizeof(XDEX_DEF::CLASS_ITEM_DEF)); break; case N_DEX_HEADER::data_size: - g_invWidget[INV_data]->setOffsetAndSize( - &dex, dex.getHeader_data_off(), - (quint32)nValue); + g_invWidget[INV_data]->setOffsetAndSize(&dex, dex.getHeader_data_off(), (quint32)nValue); break; case N_DEX_HEADER::data_off: - g_invWidget[INV_data]->setOffsetAndSize( - &dex, (quint32)nValue, - dex.getHeader_data_size()); + g_invWidget[INV_data]->setOffsetAndSize(&dex, (quint32)nValue, dex.getHeader_data_size()); break; } @@ -372,28 +312,21 @@ void DEXWidget::setReadonly(bool bState) { } void DEXWidget::blockSignals(bool bState) { - _blockSignals((QObject **)g_lineEdit_HEADER, N_DEX_HEADER::__data_size, - bState); + _blockSignals((QObject **)g_lineEdit_HEADER, N_DEX_HEADER::__data_size, bState); _blockSignals((QObject **)g_comboBox, __CB_size, bState); } void DEXWidget::adjustHeaderTable(int nType, QTableWidget *pTableWidget) { XBinary::MODE mode = XDEX::getMode(getDevice()); - pTableWidget->setColumnWidth(HEADER_COLUMN_OFFSET, - getColumnWidth(this, CW_UINT16, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_TYPE, - getColumnWidth(this, CW_TYPE, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_OFFSET, getColumnWidth(this, CW_UINT16, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_TYPE, getColumnWidth(this, CW_TYPE, mode)); switch (nType) { case SDEX::TYPE_HEADER: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, - getColumnWidth(this, CW_STRINGSHORT2, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT2, mode)); break; } } @@ -415,16 +348,9 @@ void DEXWidget::_showInHexWindow(qint64 nOffset, qint64 nSize) { } void DEXWidget::reloadData() { - qint32 nType = ui->treeWidgetNavi->currentItem() - ->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_TYPE) - .toInt(); - qint64 nDataOffset = - ui->treeWidgetNavi->currentItem() - ->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET) - .toLongLong(); - qint64 nDataSize = ui->treeWidgetNavi->currentItem() - ->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE) - .toLongLong(); + qint32 nType = ui->treeWidgetNavi->currentItem()->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_TYPE).toInt(); + qint64 nDataOffset = ui->treeWidgetNavi->currentItem()->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET).toLongLong(); + qint64 nDataSize = ui->treeWidgetNavi->currentItem()->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE).toLongLong(); // qint64 // nDataExtraOffset=ui->treeWidgetNavi->currentItem()->data(0,Qt::UserRole+FW_DEF::SECTION_DATA_EXTRAOFFSET).toLongLong(); // qint64 @@ -439,8 +365,7 @@ void DEXWidget::reloadData() { if (dex.isValid()) { if (nType == SDEX::TYPE_INFO) { if (!isInitPresent(sInit)) { - ui->widgetInfo->setData(getDevice(), dex.getFileType(), "Info", - true); + ui->widgetInfo->setData(getDevice(), dex.getFileType(), "Info", true); } } else if (nType == SDEX::TYPE_VIRUSTOTAL) { if (!isInitPresent(sInit)) { @@ -460,8 +385,7 @@ void DEXWidget::reloadData() { } } else if (nType == SDEX::TYPE_HASH) { if (!isInitPresent(sInit)) { - ui->widgetHash->setData(getDevice(), dex.getFileType(), 0, -1, - true); + ui->widgetHash->setData(getDevice(), dex.getFileType(), 0, -1, true); } } else if (nType == SDEX::TYPE_STRINGS) { if (!isInitPresent(sInit)) { @@ -481,257 +405,150 @@ void DEXWidget::reloadData() { } } else if (nType == SDEX::TYPE_ENTROPY) { if (!isInitPresent(sInit)) { - ui->widgetEntropy->setData(getDevice(), 0, getDevice()->size(), - dex.getFileType(), true); + ui->widgetEntropy->setData(getDevice(), 0, getDevice()->size(), dex.getFileType(), true); } } else if (nType == SDEX::TYPE_HEURISTICSCAN) { if (!isInitPresent(sInit)) { - ui->widgetHeuristicScan->setData(getDevice(), true, - XBinary::FT_DEX); + ui->widgetHeuristicScan->setData(getDevice(), true, XBinary::FT_DEX); } } else if (nType == SDEX::TYPE_HEADER) { if (!isInitPresent(sInit)) { - createHeaderTable(SDEX::TYPE_HEADER, ui->tableWidget_Header, - N_DEX_HEADER::records, g_lineEdit_HEADER, - N_DEX_HEADER::__data_size, 0); - - g_comboBox[CB_Dex_Header_magic] = createComboBox( - ui->tableWidget_Header, XDEX::getHeaderMagics(), - SDEX::TYPE_HEADER, N_DEX_HEADER::magic, - XComboBoxEx::CBTYPE_LIST); - g_comboBox[CB_Dex_Header_version] = createComboBox( - ui->tableWidget_Header, XDEX::getHeaderVersions(), - SDEX::TYPE_HEADER, N_DEX_HEADER::version, - XComboBoxEx::CBTYPE_LIST); - g_comboBox[CB_Dex_Header_endian_tag] = createComboBox( - ui->tableWidget_Header, XDEX::getHeaderEndianTags(), - SDEX::TYPE_HEADER, N_DEX_HEADER::endian_tag, - XComboBoxEx::CBTYPE_LIST); - - g_invWidget[INV_link] = createInvWidget( - ui->tableWidget_Header, SDEX::TYPE_HEADER, - N_DEX_HEADER::link_off, InvWidget::TYPE_HEX); - g_invWidget[INV_map] = - createInvWidget(ui->tableWidget_Header, SDEX::TYPE_HEADER, - N_DEX_HEADER::map_off, InvWidget::TYPE_HEX); - g_invWidget[INV_string_ids] = createInvWidget( - ui->tableWidget_Header, SDEX::TYPE_HEADER, - N_DEX_HEADER::string_ids_off, InvWidget::TYPE_HEX); - g_invWidget[INV_type_ids] = createInvWidget( - ui->tableWidget_Header, SDEX::TYPE_HEADER, - N_DEX_HEADER::type_ids_off, InvWidget::TYPE_HEX); - g_invWidget[INV_proto_ids] = createInvWidget( - ui->tableWidget_Header, SDEX::TYPE_HEADER, - N_DEX_HEADER::proto_ids_off, InvWidget::TYPE_HEX); - g_invWidget[INV_field_ids] = createInvWidget( - ui->tableWidget_Header, SDEX::TYPE_HEADER, - N_DEX_HEADER::field_ids_off, InvWidget::TYPE_HEX); - g_invWidget[INV_method_ids] = createInvWidget( - ui->tableWidget_Header, SDEX::TYPE_HEADER, - N_DEX_HEADER::method_ids_off, InvWidget::TYPE_HEX); - g_invWidget[INV_class_defs] = createInvWidget( - ui->tableWidget_Header, SDEX::TYPE_HEADER, - N_DEX_HEADER::class_defs_off, InvWidget::TYPE_HEX); - g_invWidget[INV_data] = createInvWidget( - ui->tableWidget_Header, SDEX::TYPE_HEADER, - N_DEX_HEADER::data_off, InvWidget::TYPE_HEX); + createHeaderTable(SDEX::TYPE_HEADER, ui->tableWidget_Header, N_DEX_HEADER::records, g_lineEdit_HEADER, N_DEX_HEADER::__data_size, 0); + + g_comboBox[CB_Dex_Header_magic] = + createComboBox(ui->tableWidget_Header, XDEX::getHeaderMagics(), SDEX::TYPE_HEADER, N_DEX_HEADER::magic, XComboBoxEx::CBTYPE_LIST); + g_comboBox[CB_Dex_Header_version] = + createComboBox(ui->tableWidget_Header, XDEX::getHeaderVersions(), SDEX::TYPE_HEADER, N_DEX_HEADER::version, XComboBoxEx::CBTYPE_LIST); + g_comboBox[CB_Dex_Header_endian_tag] = + createComboBox(ui->tableWidget_Header, XDEX::getHeaderEndianTags(), SDEX::TYPE_HEADER, N_DEX_HEADER::endian_tag, XComboBoxEx::CBTYPE_LIST); + + g_invWidget[INV_link] = createInvWidget(ui->tableWidget_Header, SDEX::TYPE_HEADER, N_DEX_HEADER::link_off, InvWidget::TYPE_HEX); + g_invWidget[INV_map] = createInvWidget(ui->tableWidget_Header, SDEX::TYPE_HEADER, N_DEX_HEADER::map_off, InvWidget::TYPE_HEX); + g_invWidget[INV_string_ids] = createInvWidget(ui->tableWidget_Header, SDEX::TYPE_HEADER, N_DEX_HEADER::string_ids_off, InvWidget::TYPE_HEX); + g_invWidget[INV_type_ids] = createInvWidget(ui->tableWidget_Header, SDEX::TYPE_HEADER, N_DEX_HEADER::type_ids_off, InvWidget::TYPE_HEX); + g_invWidget[INV_proto_ids] = createInvWidget(ui->tableWidget_Header, SDEX::TYPE_HEADER, N_DEX_HEADER::proto_ids_off, InvWidget::TYPE_HEX); + g_invWidget[INV_field_ids] = createInvWidget(ui->tableWidget_Header, SDEX::TYPE_HEADER, N_DEX_HEADER::field_ids_off, InvWidget::TYPE_HEX); + g_invWidget[INV_method_ids] = createInvWidget(ui->tableWidget_Header, SDEX::TYPE_HEADER, N_DEX_HEADER::method_ids_off, InvWidget::TYPE_HEX); + g_invWidget[INV_class_defs] = createInvWidget(ui->tableWidget_Header, SDEX::TYPE_HEADER, N_DEX_HEADER::class_defs_off, InvWidget::TYPE_HEX); + g_invWidget[INV_data] = createInvWidget(ui->tableWidget_Header, SDEX::TYPE_HEADER, N_DEX_HEADER::data_off, InvWidget::TYPE_HEX); blockSignals(true); XDEX_DEF::HEADER header = dex.getHeader(); g_lineEdit_HEADER[N_DEX_HEADER::magic]->setValue(header.magic); - g_lineEdit_HEADER[N_DEX_HEADER::version]->setValue( - header.version); - g_lineEdit_HEADER[N_DEX_HEADER::checksum]->setValue( - header.checksum); - - g_lineEdit_HEADER[N_DEX_HEADER::file_size]->setValue( - header.file_size); - g_lineEdit_HEADER[N_DEX_HEADER::header_size]->setValue( - header.header_size); - g_lineEdit_HEADER[N_DEX_HEADER::endian_tag]->setValue( - header.endian_tag); - g_lineEdit_HEADER[N_DEX_HEADER::link_size]->setValue( - header.link_size); - g_lineEdit_HEADER[N_DEX_HEADER::link_off]->setValue( - header.link_off); - g_lineEdit_HEADER[N_DEX_HEADER::map_off]->setValue( - header.map_off); - g_lineEdit_HEADER[N_DEX_HEADER::string_ids_size]->setValue( - header.string_ids_size); - g_lineEdit_HEADER[N_DEX_HEADER::string_ids_off]->setValue( - header.string_ids_off); - g_lineEdit_HEADER[N_DEX_HEADER::type_ids_size]->setValue( - header.type_ids_size); - g_lineEdit_HEADER[N_DEX_HEADER::type_ids_off]->setValue( - header.type_ids_off); - g_lineEdit_HEADER[N_DEX_HEADER::proto_ids_size]->setValue( - header.proto_ids_size); - g_lineEdit_HEADER[N_DEX_HEADER::proto_ids_off]->setValue( - header.proto_ids_off); - g_lineEdit_HEADER[N_DEX_HEADER::field_ids_size]->setValue( - header.field_ids_size); - g_lineEdit_HEADER[N_DEX_HEADER::field_ids_off]->setValue( - header.field_ids_off); - g_lineEdit_HEADER[N_DEX_HEADER::method_ids_size]->setValue( - header.method_ids_size); - g_lineEdit_HEADER[N_DEX_HEADER::method_ids_off]->setValue( - header.method_ids_off); - g_lineEdit_HEADER[N_DEX_HEADER::class_defs_size]->setValue( - header.class_defs_size); - g_lineEdit_HEADER[N_DEX_HEADER::class_defs_off]->setValue( - header.class_defs_off); - g_lineEdit_HEADER[N_DEX_HEADER::data_size]->setValue( - header.data_size); - g_lineEdit_HEADER[N_DEX_HEADER::data_off]->setValue( - header.data_off); + g_lineEdit_HEADER[N_DEX_HEADER::version]->setValue(header.version); + g_lineEdit_HEADER[N_DEX_HEADER::checksum]->setValue(header.checksum); + + g_lineEdit_HEADER[N_DEX_HEADER::file_size]->setValue(header.file_size); + g_lineEdit_HEADER[N_DEX_HEADER::header_size]->setValue(header.header_size); + g_lineEdit_HEADER[N_DEX_HEADER::endian_tag]->setValue(header.endian_tag); + g_lineEdit_HEADER[N_DEX_HEADER::link_size]->setValue(header.link_size); + g_lineEdit_HEADER[N_DEX_HEADER::link_off]->setValue(header.link_off); + g_lineEdit_HEADER[N_DEX_HEADER::map_off]->setValue(header.map_off); + g_lineEdit_HEADER[N_DEX_HEADER::string_ids_size]->setValue(header.string_ids_size); + g_lineEdit_HEADER[N_DEX_HEADER::string_ids_off]->setValue(header.string_ids_off); + g_lineEdit_HEADER[N_DEX_HEADER::type_ids_size]->setValue(header.type_ids_size); + g_lineEdit_HEADER[N_DEX_HEADER::type_ids_off]->setValue(header.type_ids_off); + g_lineEdit_HEADER[N_DEX_HEADER::proto_ids_size]->setValue(header.proto_ids_size); + g_lineEdit_HEADER[N_DEX_HEADER::proto_ids_off]->setValue(header.proto_ids_off); + g_lineEdit_HEADER[N_DEX_HEADER::field_ids_size]->setValue(header.field_ids_size); + g_lineEdit_HEADER[N_DEX_HEADER::field_ids_off]->setValue(header.field_ids_off); + g_lineEdit_HEADER[N_DEX_HEADER::method_ids_size]->setValue(header.method_ids_size); + g_lineEdit_HEADER[N_DEX_HEADER::method_ids_off]->setValue(header.method_ids_off); + g_lineEdit_HEADER[N_DEX_HEADER::class_defs_size]->setValue(header.class_defs_size); + g_lineEdit_HEADER[N_DEX_HEADER::class_defs_off]->setValue(header.class_defs_off); + g_lineEdit_HEADER[N_DEX_HEADER::data_size]->setValue(header.data_size); + g_lineEdit_HEADER[N_DEX_HEADER::data_off]->setValue(header.data_off); g_comboBox[CB_Dex_Header_magic]->setValue(header.magic); g_comboBox[CB_Dex_Header_version]->setValue(header.version); - g_comboBox[CB_Dex_Header_endian_tag]->setValue( - header.endian_tag); + g_comboBox[CB_Dex_Header_endian_tag]->setValue(header.endian_tag); - g_invWidget[INV_link]->setOffsetAndSize(&dex, header.link_off, - header.link_size); + g_invWidget[INV_link]->setOffsetAndSize(&dex, header.link_off, header.link_size); g_invWidget[INV_map]->setOffsetAndSize(&dex, header.map_off, 0); - g_invWidget[INV_string_ids]->setOffsetAndSize( - &dex, header.string_ids_off, - header.string_ids_size * sizeof(XDEX_DEF::STRING_ITEM_ID)); - g_invWidget[INV_type_ids]->setOffsetAndSize( - &dex, header.type_ids_off, - header.type_ids_size * sizeof(XDEX_DEF::TYPE_ITEM_ID)); - g_invWidget[INV_proto_ids]->setOffsetAndSize( - &dex, header.proto_ids_off, - header.proto_ids_size * sizeof(XDEX_DEF::PROTO_ITEM_ID)); - g_invWidget[INV_field_ids]->setOffsetAndSize( - &dex, header.field_ids_off, - header.field_ids_size * sizeof(XDEX_DEF::FIELD_ITEM_ID)); - g_invWidget[INV_method_ids]->setOffsetAndSize( - &dex, header.method_ids_off, - header.method_ids_size * sizeof(XDEX_DEF::METHOD_ITEM_ID)); - g_invWidget[INV_class_defs]->setOffsetAndSize( - &dex, header.class_defs_off, - header.class_defs_size * sizeof(XDEX_DEF::CLASS_ITEM_DEF)); - g_invWidget[INV_data]->setOffsetAndSize(&dex, header.data_off, - header.data_size); + g_invWidget[INV_string_ids]->setOffsetAndSize(&dex, header.string_ids_off, header.string_ids_size * sizeof(XDEX_DEF::STRING_ITEM_ID)); + g_invWidget[INV_type_ids]->setOffsetAndSize(&dex, header.type_ids_off, header.type_ids_size * sizeof(XDEX_DEF::TYPE_ITEM_ID)); + g_invWidget[INV_proto_ids]->setOffsetAndSize(&dex, header.proto_ids_off, header.proto_ids_size * sizeof(XDEX_DEF::PROTO_ITEM_ID)); + g_invWidget[INV_field_ids]->setOffsetAndSize(&dex, header.field_ids_off, header.field_ids_size * sizeof(XDEX_DEF::FIELD_ITEM_ID)); + g_invWidget[INV_method_ids]->setOffsetAndSize(&dex, header.method_ids_off, header.method_ids_size * sizeof(XDEX_DEF::METHOD_ITEM_ID)); + g_invWidget[INV_class_defs]->setOffsetAndSize(&dex, header.class_defs_off, header.class_defs_size * sizeof(XDEX_DEF::CLASS_ITEM_DEF)); + g_invWidget[INV_data]->setOffsetAndSize(&dex, header.data_off, header.data_size); quint32 nHeaderSize = dex.getHeaderSize(); - loadHexSubdevice(0, nHeaderSize, 0, - &g_subDevice[SDEX::TYPE_HEADER], - ui->widgetHex_Header, false, false); + loadHexSubdevice(0, nHeaderSize, 0, &g_subDevice[SDEX::TYPE_HEADER], ui->widgetHex_Header, false, false); blockSignals(false); } } else if (nType == SDEX::TYPE_MAPITEMS) { if (!isInitPresent(sInit)) { - DEXProcessData dexProcessData(SDEX::TYPE_MAPITEMS, - &g_tvModel[SDEX::TYPE_MAPITEMS], - &dex, nDataOffset, nDataSize); + DEXProcessData dexProcessData(SDEX::TYPE_MAPITEMS, &g_tvModel[SDEX::TYPE_MAPITEMS], &dex, nDataOffset, nDataSize); - ajustTableView(&dexProcessData, &g_tvModel[SDEX::TYPE_MAPITEMS], - ui->tableView_MapItems); + ajustTableView(&dexProcessData, &g_tvModel[SDEX::TYPE_MAPITEMS], ui->tableView_MapItems); if (g_tvModel[SDEX::TYPE_MAPITEMS]->rowCount()) { - ui->tableView_MapItems->setCurrentIndex( - ui->tableView_MapItems->model()->index(0, 0)); + ui->tableView_MapItems->setCurrentIndex(ui->tableView_MapItems->model()->index(0, 0)); } } } else if (nType == SDEX::TYPE_STRING_ID_ITEM) { if (!isInitPresent(sInit)) { - DEXProcessData dexProcessData( - SDEX::TYPE_STRING_ID_ITEM, - &g_tvModel[SDEX::TYPE_STRING_ID_ITEM], &dex, nDataOffset, - nDataSize); + DEXProcessData dexProcessData(SDEX::TYPE_STRING_ID_ITEM, &g_tvModel[SDEX::TYPE_STRING_ID_ITEM], &dex, nDataOffset, nDataSize); - ajustTableView(&dexProcessData, - &g_tvModel[SDEX::TYPE_STRING_ID_ITEM], - ui->tableView_STRING_ID_ITEM, g_pFilterStrings); + ajustTableView(&dexProcessData, &g_tvModel[SDEX::TYPE_STRING_ID_ITEM], ui->tableView_STRING_ID_ITEM, g_pFilterStrings); if (g_tvModel[SDEX::TYPE_STRING_ID_ITEM]->rowCount()) { - ui->tableView_STRING_ID_ITEM->setCurrentIndex( - ui->tableView_STRING_ID_ITEM->model()->index(0, 0)); + ui->tableView_STRING_ID_ITEM->setCurrentIndex(ui->tableView_STRING_ID_ITEM->model()->index(0, 0)); } } } else if (nType == SDEX::TYPE_TYPE_ID_ITEM) { if (!isInitPresent(sInit)) { - DEXProcessData dexProcessData( - SDEX::TYPE_TYPE_ID_ITEM, - &g_tvModel[SDEX::TYPE_TYPE_ID_ITEM], &dex, nDataOffset, - nDataSize); + DEXProcessData dexProcessData(SDEX::TYPE_TYPE_ID_ITEM, &g_tvModel[SDEX::TYPE_TYPE_ID_ITEM], &dex, nDataOffset, nDataSize); - ajustTableView(&dexProcessData, - &g_tvModel[SDEX::TYPE_TYPE_ID_ITEM], - ui->tableView_TYPE_ID_ITEM, g_pFilterTypes); + ajustTableView(&dexProcessData, &g_tvModel[SDEX::TYPE_TYPE_ID_ITEM], ui->tableView_TYPE_ID_ITEM, g_pFilterTypes); if (g_tvModel[SDEX::TYPE_TYPE_ID_ITEM]->rowCount()) { - ui->tableView_TYPE_ID_ITEM->setCurrentIndex( - ui->tableView_TYPE_ID_ITEM->model()->index(0, 0)); + ui->tableView_TYPE_ID_ITEM->setCurrentIndex(ui->tableView_TYPE_ID_ITEM->model()->index(0, 0)); } } } else if (nType == SDEX::TYPE_PROTO_ID_ITEM) { if (!isInitPresent(sInit)) { - DEXProcessData dexProcessData( - SDEX::TYPE_PROTO_ID_ITEM, - &g_tvModel[SDEX::TYPE_PROTO_ID_ITEM], &dex, nDataOffset, - nDataSize); + DEXProcessData dexProcessData(SDEX::TYPE_PROTO_ID_ITEM, &g_tvModel[SDEX::TYPE_PROTO_ID_ITEM], &dex, nDataOffset, nDataSize); - ajustTableView(&dexProcessData, - &g_tvModel[SDEX::TYPE_PROTO_ID_ITEM], - ui->tableView_PROTO_ID_ITEM); + ajustTableView(&dexProcessData, &g_tvModel[SDEX::TYPE_PROTO_ID_ITEM], ui->tableView_PROTO_ID_ITEM); if (g_tvModel[SDEX::TYPE_PROTO_ID_ITEM]->rowCount()) { - ui->tableView_PROTO_ID_ITEM->setCurrentIndex( - ui->tableView_PROTO_ID_ITEM->model()->index(0, 0)); + ui->tableView_PROTO_ID_ITEM->setCurrentIndex(ui->tableView_PROTO_ID_ITEM->model()->index(0, 0)); } } } else if (nType == SDEX::TYPE_FIELD_ID_ITEM) { if (!isInitPresent(sInit)) { - DEXProcessData dexProcessData( - SDEX::TYPE_FIELD_ID_ITEM, - &g_tvModel[SDEX::TYPE_FIELD_ID_ITEM], &dex, nDataOffset, - nDataSize); + DEXProcessData dexProcessData(SDEX::TYPE_FIELD_ID_ITEM, &g_tvModel[SDEX::TYPE_FIELD_ID_ITEM], &dex, nDataOffset, nDataSize); - ajustTableView(&dexProcessData, - &g_tvModel[SDEX::TYPE_FIELD_ID_ITEM], - ui->tableView_FIELD_ID_ITEM); + ajustTableView(&dexProcessData, &g_tvModel[SDEX::TYPE_FIELD_ID_ITEM], ui->tableView_FIELD_ID_ITEM); if (g_tvModel[SDEX::TYPE_FIELD_ID_ITEM]->rowCount()) { - ui->tableView_FIELD_ID_ITEM->setCurrentIndex( - ui->tableView_FIELD_ID_ITEM->model()->index(0, 0)); + ui->tableView_FIELD_ID_ITEM->setCurrentIndex(ui->tableView_FIELD_ID_ITEM->model()->index(0, 0)); } } } else if (nType == SDEX::TYPE_METHOD_ID_ITEM) { if (!isInitPresent(sInit)) { - DEXProcessData dexProcessData( - SDEX::TYPE_METHOD_ID_ITEM, - &g_tvModel[SDEX::TYPE_METHOD_ID_ITEM], &dex, nDataOffset, - nDataSize); + DEXProcessData dexProcessData(SDEX::TYPE_METHOD_ID_ITEM, &g_tvModel[SDEX::TYPE_METHOD_ID_ITEM], &dex, nDataOffset, nDataSize); - ajustTableView(&dexProcessData, - &g_tvModel[SDEX::TYPE_METHOD_ID_ITEM], - ui->tableView_METHOD_ID_ITEM); + ajustTableView(&dexProcessData, &g_tvModel[SDEX::TYPE_METHOD_ID_ITEM], ui->tableView_METHOD_ID_ITEM); if (g_tvModel[SDEX::TYPE_METHOD_ID_ITEM]->rowCount()) { - ui->tableView_METHOD_ID_ITEM->setCurrentIndex( - ui->tableView_METHOD_ID_ITEM->model()->index(0, 0)); + ui->tableView_METHOD_ID_ITEM->setCurrentIndex(ui->tableView_METHOD_ID_ITEM->model()->index(0, 0)); } } } else if (nType == SDEX::TYPE_CLASS_DEF_ITEM) { if (!isInitPresent(sInit)) { - DEXProcessData dexProcessData( - SDEX::TYPE_CLASS_DEF_ITEM, - &g_tvModel[SDEX::TYPE_CLASS_DEF_ITEM], &dex, nDataOffset, - nDataSize); + DEXProcessData dexProcessData(SDEX::TYPE_CLASS_DEF_ITEM, &g_tvModel[SDEX::TYPE_CLASS_DEF_ITEM], &dex, nDataOffset, nDataSize); - ajustTableView(&dexProcessData, - &g_tvModel[SDEX::TYPE_CLASS_DEF_ITEM], - ui->tableView_CLASS_DEF_ITEM, nullptr, false); + ajustTableView(&dexProcessData, &g_tvModel[SDEX::TYPE_CLASS_DEF_ITEM], ui->tableView_CLASS_DEF_ITEM, nullptr, false); if (g_tvModel[SDEX::TYPE_CLASS_DEF_ITEM]->rowCount()) { - ui->tableView_CLASS_DEF_ITEM->setCurrentIndex( - ui->tableView_CLASS_DEF_ITEM->model()->index(0, 0)); + ui->tableView_CLASS_DEF_ITEM->setCurrentIndex(ui->tableView_CLASS_DEF_ITEM->model()->index(0, 0)); } } } @@ -742,9 +559,7 @@ void DEXWidget::reloadData() { addInit(sInit); } -bool DEXWidget::createSectionTable(int nType, QTableWidget *pTableWidget, - const FW_DEF::HEADER_RECORD *pHeaderRecord, - int nNumberOfRecords) { +bool DEXWidget::createSectionTable(int nType, QTableWidget *pTableWidget, const FW_DEF::HEADER_RECORD *pHeaderRecord, int nNumberOfRecords) { Q_UNUSED(nType) QStringList slHeader; @@ -770,8 +585,7 @@ void DEXWidget::widgetValueChanged(quint64 nValue) { case SDEX::TYPE_HEADER: switch (nNdata) { case N_DEX_HEADER::magic: - g_lineEdit_HEADER[N_DEX_HEADER::magic]->setValue( - (quint32)nValue); + g_lineEdit_HEADER[N_DEX_HEADER::magic]->setValue((quint32)nValue); break; } @@ -779,8 +593,7 @@ void DEXWidget::widgetValueChanged(quint64 nValue) { } } -void DEXWidget::on_treeWidgetNavi_currentItemChanged( - QTreeWidgetItem *pItemCurrent, QTreeWidgetItem *pItemPrevious) { +void DEXWidget::on_treeWidgetNavi_currentItemChanged(QTreeWidgetItem *pItemCurrent, QTreeWidgetItem *pItemPrevious) { Q_UNUSED(pItemPrevious) if (pItemCurrent) { @@ -802,12 +615,11 @@ void DEXWidget::on_pushButtonReload_clicked() { QTimer::singleShot(1000, this, SLOT(enableButton())); } -void DEXWidget::enableButton() { ui->pushButtonReload->setEnabled(true); } +void DEXWidget::enableButton() { + ui->pushButtonReload->setEnabled(true); +} -void DEXWidget::on_tableWidget_Header_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn) { +void DEXWidget::on_tableWidget_Header_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow); Q_UNUSED(nCurrentColumn); Q_UNUSED(nPreviousRow); @@ -850,60 +662,40 @@ void DEXWidget::on_toolButtonNext_clicked() { void DEXWidget::on_pushButtonSave_STRING_ID_ITEM_clicked() { if (g_pFilterStrings) { - XShortcutsWidget::saveModel( - g_pFilterStrings, - XBinary::getResultFileName( - getBackupDevice(), - QString("%1.txt").arg(QString("STRING_ID_ITEM")))); + XShortcutsWidget::saveModel(g_pFilterStrings, XBinary::getResultFileName(getBackupDevice(), QString("%1.txt").arg(QString("STRING_ID_ITEM")))); } } void DEXWidget::on_pushButtonSave_TYPE_ID_ITEM_clicked() { if (g_pFilterTypes) { - XShortcutsWidget::saveModel( - g_pFilterTypes, - XBinary::getResultFileName( - getBackupDevice(), - QString("%1.txt").arg(QString("TYPE_ID_ITEM")))); + XShortcutsWidget::saveModel(g_pFilterTypes, XBinary::getResultFileName(getBackupDevice(), QString("%1.txt").arg(QString("TYPE_ID_ITEM")))); } } void DEXWidget::on_pushButtonSave_PROTO_ID_ITEM_clicked() { if (g_pFilterTypes) { - XShortcutsWidget::saveModel( - ui->tableView_PROTO_ID_ITEM->model(), - XBinary::getResultFileName( - getBackupDevice(), - QString("%1.txt").arg(QString("PROTO_ID_ITEM")))); + XShortcutsWidget::saveModel(ui->tableView_PROTO_ID_ITEM->model(), + XBinary::getResultFileName(getBackupDevice(), QString("%1.txt").arg(QString("PROTO_ID_ITEM")))); } } void DEXWidget::on_pushButtonSave_FIELD_ID_ITEM_clicked() { if (g_pFilterTypes) { - XShortcutsWidget::saveModel( - ui->tableView_FIELD_ID_ITEM->model(), - XBinary::getResultFileName( - getBackupDevice(), - QString("%1.txt").arg(QString("FIELD_ID_ITEM")))); + XShortcutsWidget::saveModel(ui->tableView_FIELD_ID_ITEM->model(), + XBinary::getResultFileName(getBackupDevice(), QString("%1.txt").arg(QString("FIELD_ID_ITEM")))); } } void DEXWidget::on_pushButtonSave_CLASS_DEF_ITEM_clicked() { if (g_pFilterTypes) { - XShortcutsWidget::saveModel( - ui->tableView_CLASS_DEF_ITEM->model(), - XBinary::getResultFileName( - getBackupDevice(), - QString("%1.txt").arg(QString("CLASS_DEF_ITEM")))); + XShortcutsWidget::saveModel(ui->tableView_CLASS_DEF_ITEM->model(), + XBinary::getResultFileName(getBackupDevice(), QString("%1.txt").arg(QString("CLASS_DEF_ITEM")))); } } void DEXWidget::on_pushButtonSave_METHOD_ID_ITEM_clicked() { if (g_pFilterTypes) { - XShortcutsWidget::saveModel( - ui->tableView_METHOD_ID_ITEM->model(), - XBinary::getResultFileName( - getBackupDevice(), - QString("%1.txt").arg(QString("METHOD_ID_ITEM")))); + XShortcutsWidget::saveModel(ui->tableView_METHOD_ID_ITEM->model(), + XBinary::getResultFileName(getBackupDevice(), QString("%1.txt").arg(QString("METHOD_ID_ITEM")))); } } diff --git a/DEX/dexwidget.h b/DEX/dexwidget.h index 6a7ae5df..a5df4912 100644 --- a/DEX/dexwidget.h +++ b/DEX/dexwidget.h @@ -34,19 +34,17 @@ class DEXWidget; class DEXWidget : public FormatWidget { Q_OBJECT - public: +public: DEXWidget(QWidget *pParent = nullptr); - DEXWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, - QWidget *pParent = nullptr); + DEXWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, QWidget *pParent = nullptr); ~DEXWidget(); virtual void clear(); virtual void cleanup(); virtual void reload(); - protected: - virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, - int nPosition, qint64 nOffset); +protected: + virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset); virtual void setReadonly(bool bState); virtual void blockSignals(bool bState); virtual void adjustHeaderTable(int nType, QTableWidget *pTableWidget); @@ -54,21 +52,15 @@ class DEXWidget : public FormatWidget { virtual void _showInMemoryMapWindowOffset(qint64 nOffset); virtual void _showInHexWindow(qint64 nOffset, qint64 nSize); - private slots: +private slots: virtual void reloadData(); void widgetValueChanged(quint64 nValue); - void on_treeWidgetNavi_currentItemChanged(QTreeWidgetItem *pItemCurrent, - QTreeWidgetItem *pItemPrevious); + void on_treeWidgetNavi_currentItemChanged(QTreeWidgetItem *pItemCurrent, QTreeWidgetItem *pItemPrevious); void on_checkBoxReadonly_toggled(bool bChecked); - bool createSectionTable(int nType, QTableWidget *pTableWidget, - const FW_DEF::HEADER_RECORD *pHeaderRecord, - int nNumberOfRecords); + bool createSectionTable(int nType, QTableWidget *pTableWidget, const FW_DEF::HEADER_RECORD *pHeaderRecord, int nNumberOfRecords); void on_pushButtonReload_clicked(); void enableButton(); - void on_tableWidget_Header_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); + void on_tableWidget_Header_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); void on_lineEditFilterStrings_textChanged(const QString &sString); void on_lineEditFilterTypes_textChanged(const QString &sString); void on_toolButtonPrev_clicked(); @@ -80,27 +72,11 @@ class DEXWidget : public FormatWidget { void on_pushButtonSave_CLASS_DEF_ITEM_clicked(); void on_pushButtonSave_METHOD_ID_ITEM_clicked(); - private: +private: // TODO rename - enum CB { - CB_Dex_Header_magic = 0, - CB_Dex_Header_version, - CB_Dex_Header_endian_tag, - __CB_size - }; + enum CB { CB_Dex_Header_magic = 0, CB_Dex_Header_version, CB_Dex_Header_endian_tag, __CB_size }; - enum INV { - INV_link = 0, - INV_map, - INV_string_ids, - INV_type_ids, - INV_proto_ids, - INV_field_ids, - INV_method_ids, - INV_class_defs, - INV_data, - __INV_size - }; + enum INV { INV_link = 0, INV_map, INV_string_ids, INV_type_ids, INV_proto_ids, INV_field_ids, INV_method_ids, INV_class_defs, INV_data, __INV_size }; Ui::DEXWidget *ui; diff --git a/DEX/dialogdex.cpp b/DEX/dialogdex.cpp index 4560eb78..a1822663 100644 --- a/DEX/dialogdex.cpp +++ b/DEX/dialogdex.cpp @@ -22,14 +22,15 @@ #include "ui_dialogdex.h" -DialogDEX::DialogDEX(QWidget *pParent) - : XShortcutsDialog(pParent), ui(new Ui::DialogDEX) { +DialogDEX::DialogDEX(QWidget *pParent) : XShortcutsDialog(pParent), ui(new Ui::DialogDEX) { ui->setupUi(this); setWindowFlags(Qt::Window); } -DialogDEX::~DialogDEX() { delete ui; } +DialogDEX::~DialogDEX() { + delete ui; +} void DialogDEX::setData(QIODevice *pDevice, FW_DEF::OPTIONS options) { if (options.sTitle != "") { diff --git a/DEX/dialogdex.h b/DEX/dialogdex.h index ca28d725..24983c74 100644 --- a/DEX/dialogdex.h +++ b/DEX/dialogdex.h @@ -32,14 +32,14 @@ class DialogDEX; class DialogDEX : public XShortcutsDialog { Q_OBJECT - public: +public: explicit DialogDEX(QWidget *pParent = nullptr); ~DialogDEX(); void setData(QIODevice *pDevice, FW_DEF::OPTIONS options); void setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions); - private: +private: Ui::DialogDEX *ui; }; diff --git a/ELF/dialogelf.cpp b/ELF/dialogelf.cpp index 1508315f..bf622a15 100644 --- a/ELF/dialogelf.cpp +++ b/ELF/dialogelf.cpp @@ -22,14 +22,15 @@ #include "ui_dialogelf.h" -DialogELF::DialogELF(QWidget *pParent) - : XShortcutsDialog(pParent), ui(new Ui::DialogELF) { +DialogELF::DialogELF(QWidget *pParent) : XShortcutsDialog(pParent), ui(new Ui::DialogELF) { ui->setupUi(this); setWindowFlags(Qt::Window); } -DialogELF::~DialogELF() { delete ui; } +DialogELF::~DialogELF() { + delete ui; +} void DialogELF::setData(QIODevice *pDevice, FW_DEF::OPTIONS options) { if (options.sTitle != "") { diff --git a/ELF/dialogelf.h b/ELF/dialogelf.h index b46e1479..6ccf9bd2 100644 --- a/ELF/dialogelf.h +++ b/ELF/dialogelf.h @@ -32,13 +32,13 @@ class DialogELF; class DialogELF : public XShortcutsDialog { Q_OBJECT - public: +public: explicit DialogELF(QWidget *pParent = nullptr); ~DialogELF(); void setData(QIODevice *pDevice, FW_DEF::OPTIONS options); void setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions); - private: +private: Ui::DialogELF *ui; }; diff --git a/ELF/elf_defs.cpp b/ELF/elf_defs.cpp index f15ab963..056dc4d3 100644 --- a/ELF/elf_defs.cpp +++ b/ELF/elf_defs.cpp @@ -22,203 +22,113 @@ namespace N_Elf_Ehdr { const FW_DEF::HEADER_RECORD records32[] = { - {ei_mag, "ei_mag", offsetof(XELF_DEF::Elf32_Ehdr, e_ident) + 0, 4, - "uint32 LE", FW_DEF::VAL_TYPE_DATA}, - {ei_class, "ei_class", offsetof(XELF_DEF::Elf32_Ehdr, e_ident) + 4, 1, - "unsigned char", FW_DEF::VAL_TYPE_DATA}, - {ei_data, "ei_data", offsetof(XELF_DEF::Elf32_Ehdr, e_ident) + 5, 1, - "unsigned char", FW_DEF::VAL_TYPE_DATA}, - {ei_version, "ei_version", offsetof(XELF_DEF::Elf32_Ehdr, e_ident) + 6, 1, - "unsigned char", FW_DEF::VAL_TYPE_DATA}, - {ei_osabi, "ei_osabi", offsetof(XELF_DEF::Elf32_Ehdr, e_ident) + 7, 1, - "unsigned char", FW_DEF::VAL_TYPE_DATA}, - {ei_abiversion, "ei_abiversion", - offsetof(XELF_DEF::Elf32_Ehdr, e_ident) + 8, 1, "unsigned char", - FW_DEF::VAL_TYPE_DATA}, - {ei_pad_0, "ei_pad_0", offsetof(XELF_DEF::Elf32_Ehdr, e_ident) + 9, 1, - "unsigned char", FW_DEF::VAL_TYPE_DATA}, - {ei_pad_1, "ei_pad_1", offsetof(XELF_DEF::Elf32_Ehdr, e_ident) + 10, 1, - "unsigned char", FW_DEF::VAL_TYPE_DATA}, - {ei_pad_2, "ei_pad_2", offsetof(XELF_DEF::Elf32_Ehdr, e_ident) + 11, 1, - "unsigned char", FW_DEF::VAL_TYPE_DATA}, - {ei_pad_3, "ei_pad_3", offsetof(XELF_DEF::Elf32_Ehdr, e_ident) + 12, 1, - "unsigned char", FW_DEF::VAL_TYPE_DATA}, - {ei_pad_4, "ei_pad_4", offsetof(XELF_DEF::Elf32_Ehdr, e_ident) + 13, 1, - "unsigned char", FW_DEF::VAL_TYPE_DATA}, - {ei_pad_5, "ei_pad_5", offsetof(XELF_DEF::Elf32_Ehdr, e_ident) + 14, 1, - "unsigned char", FW_DEF::VAL_TYPE_DATA}, - {ei_pad_6, "ei_pad_6", offsetof(XELF_DEF::Elf32_Ehdr, e_ident) + 15, 1, - "unsigned char", FW_DEF::VAL_TYPE_DATA}, - {e_type, "e_type", offsetof(XELF_DEF::Elf32_Ehdr, e_type), 2, "Elf32_Half", - FW_DEF::VAL_TYPE_DATA}, - {e_machine, "e_machine", offsetof(XELF_DEF::Elf32_Ehdr, e_machine), 2, - "Elf32_Half", FW_DEF::VAL_TYPE_DATA}, - {e_version, "e_version", offsetof(XELF_DEF::Elf32_Ehdr, e_version), 4, - "Elf32_Word", FW_DEF::VAL_TYPE_DATA}, - {e_entry, "e_entry", offsetof(XELF_DEF::Elf32_Ehdr, e_entry), 4, - "Elf32_Addr", FW_DEF::VAL_TYPE_ADDRESS}, - {e_phoff, "e_phoff", offsetof(XELF_DEF::Elf32_Ehdr, e_phoff), 4, - "Elf32_Off", FW_DEF::VAL_TYPE_RELADDRESS}, - {e_shoff, "e_shoff", offsetof(XELF_DEF::Elf32_Ehdr, e_shoff), 4, - "Elf32_Off", FW_DEF::VAL_TYPE_RELADDRESS}, - {e_flags, "e_flags", offsetof(XELF_DEF::Elf32_Ehdr, e_flags), 4, - "Elf32_Word", FW_DEF::VAL_TYPE_DATA}, - {e_ehsize, "e_ehsize", offsetof(XELF_DEF::Elf32_Ehdr, e_ehsize), 2, - "Elf32_Half", FW_DEF::VAL_TYPE_DATA}, - {e_phentsize, "e_phentsize", offsetof(XELF_DEF::Elf32_Ehdr, e_phentsize), 2, - "Elf32_Half", FW_DEF::VAL_TYPE_DATA}, - {e_phnum, "e_phnum", offsetof(XELF_DEF::Elf32_Ehdr, e_phnum), 2, - "Elf32_Half", FW_DEF::VAL_TYPE_DATA}, - {e_shentsize, "e_shentsize", offsetof(XELF_DEF::Elf32_Ehdr, e_shentsize), 2, - "Elf32_Half", FW_DEF::VAL_TYPE_DATA}, - {e_shnum, "e_shnum", offsetof(XELF_DEF::Elf32_Ehdr, e_shnum), 2, - "Elf32_Half", FW_DEF::VAL_TYPE_DATA}, - {e_shstrndx, "e_shstrndx", offsetof(XELF_DEF::Elf32_Ehdr, e_shstrndx), 2, - "Elf32_Half", FW_DEF::VAL_TYPE_DATA}, + {ei_mag, "ei_mag", offsetof(XELF_DEF::Elf32_Ehdr, e_ident) + 0, 4, "uint32 LE", FW_DEF::VAL_TYPE_DATA}, + {ei_class, "ei_class", offsetof(XELF_DEF::Elf32_Ehdr, e_ident) + 4, 1, "unsigned char", FW_DEF::VAL_TYPE_DATA}, + {ei_data, "ei_data", offsetof(XELF_DEF::Elf32_Ehdr, e_ident) + 5, 1, "unsigned char", FW_DEF::VAL_TYPE_DATA}, + {ei_version, "ei_version", offsetof(XELF_DEF::Elf32_Ehdr, e_ident) + 6, 1, "unsigned char", FW_DEF::VAL_TYPE_DATA}, + {ei_osabi, "ei_osabi", offsetof(XELF_DEF::Elf32_Ehdr, e_ident) + 7, 1, "unsigned char", FW_DEF::VAL_TYPE_DATA}, + {ei_abiversion, "ei_abiversion", offsetof(XELF_DEF::Elf32_Ehdr, e_ident) + 8, 1, "unsigned char", FW_DEF::VAL_TYPE_DATA}, + {ei_pad_0, "ei_pad_0", offsetof(XELF_DEF::Elf32_Ehdr, e_ident) + 9, 1, "unsigned char", FW_DEF::VAL_TYPE_DATA}, + {ei_pad_1, "ei_pad_1", offsetof(XELF_DEF::Elf32_Ehdr, e_ident) + 10, 1, "unsigned char", FW_DEF::VAL_TYPE_DATA}, + {ei_pad_2, "ei_pad_2", offsetof(XELF_DEF::Elf32_Ehdr, e_ident) + 11, 1, "unsigned char", FW_DEF::VAL_TYPE_DATA}, + {ei_pad_3, "ei_pad_3", offsetof(XELF_DEF::Elf32_Ehdr, e_ident) + 12, 1, "unsigned char", FW_DEF::VAL_TYPE_DATA}, + {ei_pad_4, "ei_pad_4", offsetof(XELF_DEF::Elf32_Ehdr, e_ident) + 13, 1, "unsigned char", FW_DEF::VAL_TYPE_DATA}, + {ei_pad_5, "ei_pad_5", offsetof(XELF_DEF::Elf32_Ehdr, e_ident) + 14, 1, "unsigned char", FW_DEF::VAL_TYPE_DATA}, + {ei_pad_6, "ei_pad_6", offsetof(XELF_DEF::Elf32_Ehdr, e_ident) + 15, 1, "unsigned char", FW_DEF::VAL_TYPE_DATA}, + {e_type, "e_type", offsetof(XELF_DEF::Elf32_Ehdr, e_type), 2, "Elf32_Half", FW_DEF::VAL_TYPE_DATA}, + {e_machine, "e_machine", offsetof(XELF_DEF::Elf32_Ehdr, e_machine), 2, "Elf32_Half", FW_DEF::VAL_TYPE_DATA}, + {e_version, "e_version", offsetof(XELF_DEF::Elf32_Ehdr, e_version), 4, "Elf32_Word", FW_DEF::VAL_TYPE_DATA}, + {e_entry, "e_entry", offsetof(XELF_DEF::Elf32_Ehdr, e_entry), 4, "Elf32_Addr", FW_DEF::VAL_TYPE_ADDRESS}, + {e_phoff, "e_phoff", offsetof(XELF_DEF::Elf32_Ehdr, e_phoff), 4, "Elf32_Off", FW_DEF::VAL_TYPE_RELADDRESS}, + {e_shoff, "e_shoff", offsetof(XELF_DEF::Elf32_Ehdr, e_shoff), 4, "Elf32_Off", FW_DEF::VAL_TYPE_RELADDRESS}, + {e_flags, "e_flags", offsetof(XELF_DEF::Elf32_Ehdr, e_flags), 4, "Elf32_Word", FW_DEF::VAL_TYPE_DATA}, + {e_ehsize, "e_ehsize", offsetof(XELF_DEF::Elf32_Ehdr, e_ehsize), 2, "Elf32_Half", FW_DEF::VAL_TYPE_DATA}, + {e_phentsize, "e_phentsize", offsetof(XELF_DEF::Elf32_Ehdr, e_phentsize), 2, "Elf32_Half", FW_DEF::VAL_TYPE_DATA}, + {e_phnum, "e_phnum", offsetof(XELF_DEF::Elf32_Ehdr, e_phnum), 2, "Elf32_Half", FW_DEF::VAL_TYPE_DATA}, + {e_shentsize, "e_shentsize", offsetof(XELF_DEF::Elf32_Ehdr, e_shentsize), 2, "Elf32_Half", FW_DEF::VAL_TYPE_DATA}, + {e_shnum, "e_shnum", offsetof(XELF_DEF::Elf32_Ehdr, e_shnum), 2, "Elf32_Half", FW_DEF::VAL_TYPE_DATA}, + {e_shstrndx, "e_shstrndx", offsetof(XELF_DEF::Elf32_Ehdr, e_shstrndx), 2, "Elf32_Half", FW_DEF::VAL_TYPE_DATA}, }; const FW_DEF::HEADER_RECORD records64[] = { - {ei_mag, "ei_mag", offsetof(XELF_DEF::Elf64_Ehdr, e_ident) + 0, 4, - "uint32 LE", FW_DEF::VAL_TYPE_DATA}, - {ei_class, "ei_class", offsetof(XELF_DEF::Elf64_Ehdr, e_ident) + 4, 1, - "unsigned char", FW_DEF::VAL_TYPE_DATA}, - {ei_data, "ei_data", offsetof(XELF_DEF::Elf64_Ehdr, e_ident) + 5, 1, - "unsigned char", FW_DEF::VAL_TYPE_DATA}, - {ei_version, "ei_version", offsetof(XELF_DEF::Elf64_Ehdr, e_ident) + 6, 1, - "unsigned char", FW_DEF::VAL_TYPE_DATA}, - {ei_osabi, "ei_osabi", offsetof(XELF_DEF::Elf64_Ehdr, e_ident) + 7, 1, - "unsigned char", FW_DEF::VAL_TYPE_DATA}, - {ei_abiversion, "ei_abiversion", - offsetof(XELF_DEF::Elf64_Ehdr, e_ident) + 8, 1, "unsigned char", - FW_DEF::VAL_TYPE_DATA}, - {ei_pad_0, "ei_pad_0", offsetof(XELF_DEF::Elf64_Ehdr, e_ident) + 9, 1, - "unsigned char", FW_DEF::VAL_TYPE_DATA}, - {ei_pad_1, "ei_pad_1", offsetof(XELF_DEF::Elf64_Ehdr, e_ident) + 10, 1, - "unsigned char", FW_DEF::VAL_TYPE_DATA}, - {ei_pad_2, "ei_pad_2", offsetof(XELF_DEF::Elf64_Ehdr, e_ident) + 11, 1, - "unsigned char", FW_DEF::VAL_TYPE_DATA}, - {ei_pad_3, "ei_pad_3", offsetof(XELF_DEF::Elf64_Ehdr, e_ident) + 12, 1, - "unsigned char", FW_DEF::VAL_TYPE_DATA}, - {ei_pad_4, "ei_pad_4", offsetof(XELF_DEF::Elf64_Ehdr, e_ident) + 13, 1, - "unsigned char", FW_DEF::VAL_TYPE_DATA}, - {ei_pad_5, "ei_pad_5", offsetof(XELF_DEF::Elf64_Ehdr, e_ident) + 14, 1, - "unsigned char", FW_DEF::VAL_TYPE_DATA}, - {ei_pad_6, "ei_pad_6", offsetof(XELF_DEF::Elf64_Ehdr, e_ident) + 15, 1, - "unsigned char", FW_DEF::VAL_TYPE_DATA}, - {e_type, "e_type", offsetof(XELF_DEF::Elf64_Ehdr, e_type), 2, "Elf64_Half", - FW_DEF::VAL_TYPE_DATA}, - {e_machine, "e_machine", offsetof(XELF_DEF::Elf64_Ehdr, e_machine), 2, - "Elf64_Half", FW_DEF::VAL_TYPE_DATA}, - {e_version, "e_version", offsetof(XELF_DEF::Elf64_Ehdr, e_version), 4, - "Elf64_Word", FW_DEF::VAL_TYPE_DATA}, - {e_entry, "e_entry", offsetof(XELF_DEF::Elf64_Ehdr, e_entry), 8, - "Elf64_Addr", FW_DEF::VAL_TYPE_ADDRESS}, - {e_phoff, "e_phoff", offsetof(XELF_DEF::Elf64_Ehdr, e_phoff), 8, - "Elf64_Off", FW_DEF::VAL_TYPE_RELADDRESS}, - {e_shoff, "e_shoff", offsetof(XELF_DEF::Elf64_Ehdr, e_shoff), 8, - "Elf64_Off", FW_DEF::VAL_TYPE_RELADDRESS}, - {e_flags, "e_flags", offsetof(XELF_DEF::Elf64_Ehdr, e_flags), 4, - "Elf64_Word", FW_DEF::VAL_TYPE_DATA}, - {e_ehsize, "e_ehsize", offsetof(XELF_DEF::Elf64_Ehdr, e_ehsize), 2, - "Elf64_Half", FW_DEF::VAL_TYPE_DATA}, - {e_phentsize, "e_phentsize", offsetof(XELF_DEF::Elf64_Ehdr, e_phentsize), 2, - "Elf64_Half", FW_DEF::VAL_TYPE_DATA}, - {e_phnum, "e_phnum", offsetof(XELF_DEF::Elf64_Ehdr, e_phnum), 2, - "Elf64_Half", FW_DEF::VAL_TYPE_DATA}, - {e_shentsize, "e_shentsize", offsetof(XELF_DEF::Elf64_Ehdr, e_shentsize), 2, - "Elf64_Half", FW_DEF::VAL_TYPE_DATA}, - {e_shnum, "e_shnum", offsetof(XELF_DEF::Elf64_Ehdr, e_shnum), 2, - "Elf64_Half", FW_DEF::VAL_TYPE_DATA}, - {e_shstrndx, "e_shstrndx", offsetof(XELF_DEF::Elf64_Ehdr, e_shstrndx), 2, - "Elf64_Half", FW_DEF::VAL_TYPE_DATA}, + {ei_mag, "ei_mag", offsetof(XELF_DEF::Elf64_Ehdr, e_ident) + 0, 4, "uint32 LE", FW_DEF::VAL_TYPE_DATA}, + {ei_class, "ei_class", offsetof(XELF_DEF::Elf64_Ehdr, e_ident) + 4, 1, "unsigned char", FW_DEF::VAL_TYPE_DATA}, + {ei_data, "ei_data", offsetof(XELF_DEF::Elf64_Ehdr, e_ident) + 5, 1, "unsigned char", FW_DEF::VAL_TYPE_DATA}, + {ei_version, "ei_version", offsetof(XELF_DEF::Elf64_Ehdr, e_ident) + 6, 1, "unsigned char", FW_DEF::VAL_TYPE_DATA}, + {ei_osabi, "ei_osabi", offsetof(XELF_DEF::Elf64_Ehdr, e_ident) + 7, 1, "unsigned char", FW_DEF::VAL_TYPE_DATA}, + {ei_abiversion, "ei_abiversion", offsetof(XELF_DEF::Elf64_Ehdr, e_ident) + 8, 1, "unsigned char", FW_DEF::VAL_TYPE_DATA}, + {ei_pad_0, "ei_pad_0", offsetof(XELF_DEF::Elf64_Ehdr, e_ident) + 9, 1, "unsigned char", FW_DEF::VAL_TYPE_DATA}, + {ei_pad_1, "ei_pad_1", offsetof(XELF_DEF::Elf64_Ehdr, e_ident) + 10, 1, "unsigned char", FW_DEF::VAL_TYPE_DATA}, + {ei_pad_2, "ei_pad_2", offsetof(XELF_DEF::Elf64_Ehdr, e_ident) + 11, 1, "unsigned char", FW_DEF::VAL_TYPE_DATA}, + {ei_pad_3, "ei_pad_3", offsetof(XELF_DEF::Elf64_Ehdr, e_ident) + 12, 1, "unsigned char", FW_DEF::VAL_TYPE_DATA}, + {ei_pad_4, "ei_pad_4", offsetof(XELF_DEF::Elf64_Ehdr, e_ident) + 13, 1, "unsigned char", FW_DEF::VAL_TYPE_DATA}, + {ei_pad_5, "ei_pad_5", offsetof(XELF_DEF::Elf64_Ehdr, e_ident) + 14, 1, "unsigned char", FW_DEF::VAL_TYPE_DATA}, + {ei_pad_6, "ei_pad_6", offsetof(XELF_DEF::Elf64_Ehdr, e_ident) + 15, 1, "unsigned char", FW_DEF::VAL_TYPE_DATA}, + {e_type, "e_type", offsetof(XELF_DEF::Elf64_Ehdr, e_type), 2, "Elf64_Half", FW_DEF::VAL_TYPE_DATA}, + {e_machine, "e_machine", offsetof(XELF_DEF::Elf64_Ehdr, e_machine), 2, "Elf64_Half", FW_DEF::VAL_TYPE_DATA}, + {e_version, "e_version", offsetof(XELF_DEF::Elf64_Ehdr, e_version), 4, "Elf64_Word", FW_DEF::VAL_TYPE_DATA}, + {e_entry, "e_entry", offsetof(XELF_DEF::Elf64_Ehdr, e_entry), 8, "Elf64_Addr", FW_DEF::VAL_TYPE_ADDRESS}, + {e_phoff, "e_phoff", offsetof(XELF_DEF::Elf64_Ehdr, e_phoff), 8, "Elf64_Off", FW_DEF::VAL_TYPE_RELADDRESS}, + {e_shoff, "e_shoff", offsetof(XELF_DEF::Elf64_Ehdr, e_shoff), 8, "Elf64_Off", FW_DEF::VAL_TYPE_RELADDRESS}, + {e_flags, "e_flags", offsetof(XELF_DEF::Elf64_Ehdr, e_flags), 4, "Elf64_Word", FW_DEF::VAL_TYPE_DATA}, + {e_ehsize, "e_ehsize", offsetof(XELF_DEF::Elf64_Ehdr, e_ehsize), 2, "Elf64_Half", FW_DEF::VAL_TYPE_DATA}, + {e_phentsize, "e_phentsize", offsetof(XELF_DEF::Elf64_Ehdr, e_phentsize), 2, "Elf64_Half", FW_DEF::VAL_TYPE_DATA}, + {e_phnum, "e_phnum", offsetof(XELF_DEF::Elf64_Ehdr, e_phnum), 2, "Elf64_Half", FW_DEF::VAL_TYPE_DATA}, + {e_shentsize, "e_shentsize", offsetof(XELF_DEF::Elf64_Ehdr, e_shentsize), 2, "Elf64_Half", FW_DEF::VAL_TYPE_DATA}, + {e_shnum, "e_shnum", offsetof(XELF_DEF::Elf64_Ehdr, e_shnum), 2, "Elf64_Half", FW_DEF::VAL_TYPE_DATA}, + {e_shstrndx, "e_shstrndx", offsetof(XELF_DEF::Elf64_Ehdr, e_shstrndx), 2, "Elf64_Half", FW_DEF::VAL_TYPE_DATA}, }; } // namespace N_Elf_Ehdr namespace N_Elf_Shdr { const FW_DEF::HEADER_RECORD records32[] = { - {sh_name, "sh_name", offsetof(XELF_DEF::Elf32_Shdr, sh_name), 4, - "Elf32_Word", FW_DEF::VAL_TYPE_DATA}, - {sh_type, "sh_type", offsetof(XELF_DEF::Elf32_Shdr, sh_type), 4, - "Elf32_Word", FW_DEF::VAL_TYPE_DATA}, - {sh_flags, "sh_flags", offsetof(XELF_DEF::Elf32_Shdr, sh_flags), 4, - "Elf32_Word", FW_DEF::VAL_TYPE_DATA}, - {sh_addr, "sh_addr", offsetof(XELF_DEF::Elf32_Shdr, sh_addr), 4, - "Elf32_Addr", FW_DEF::VAL_TYPE_ADDRESS}, - {sh_offset, "sh_offset", offsetof(XELF_DEF::Elf32_Shdr, sh_offset), 4, - "Elf32_Off", FW_DEF::VAL_TYPE_OFFSET}, - {sh_size, "sh_size", offsetof(XELF_DEF::Elf32_Shdr, sh_size), 4, - "Elf32_Word", FW_DEF::VAL_TYPE_SIZE}, - {sh_link, "sh_link", offsetof(XELF_DEF::Elf32_Shdr, sh_link), 4, - "Elf32_Word", FW_DEF::VAL_TYPE_DATA}, - {sh_info, "sh_info", offsetof(XELF_DEF::Elf32_Shdr, sh_info), 4, - "Elf32_Word", FW_DEF::VAL_TYPE_DATA}, - {sh_addralign, "sh_addralign", offsetof(XELF_DEF::Elf32_Shdr, sh_addralign), - 4, "Elf32_Word", FW_DEF::VAL_TYPE_DATA}, - {sh_entsize, "sh_entsize", offsetof(XELF_DEF::Elf32_Shdr, sh_entsize), 4, - "Elf32_Word", FW_DEF::VAL_TYPE_SIZE}, + {sh_name, "sh_name", offsetof(XELF_DEF::Elf32_Shdr, sh_name), 4, "Elf32_Word", FW_DEF::VAL_TYPE_DATA}, + {sh_type, "sh_type", offsetof(XELF_DEF::Elf32_Shdr, sh_type), 4, "Elf32_Word", FW_DEF::VAL_TYPE_DATA}, + {sh_flags, "sh_flags", offsetof(XELF_DEF::Elf32_Shdr, sh_flags), 4, "Elf32_Word", FW_DEF::VAL_TYPE_DATA}, + {sh_addr, "sh_addr", offsetof(XELF_DEF::Elf32_Shdr, sh_addr), 4, "Elf32_Addr", FW_DEF::VAL_TYPE_ADDRESS}, + {sh_offset, "sh_offset", offsetof(XELF_DEF::Elf32_Shdr, sh_offset), 4, "Elf32_Off", FW_DEF::VAL_TYPE_OFFSET}, + {sh_size, "sh_size", offsetof(XELF_DEF::Elf32_Shdr, sh_size), 4, "Elf32_Word", FW_DEF::VAL_TYPE_SIZE}, + {sh_link, "sh_link", offsetof(XELF_DEF::Elf32_Shdr, sh_link), 4, "Elf32_Word", FW_DEF::VAL_TYPE_DATA}, + {sh_info, "sh_info", offsetof(XELF_DEF::Elf32_Shdr, sh_info), 4, "Elf32_Word", FW_DEF::VAL_TYPE_DATA}, + {sh_addralign, "sh_addralign", offsetof(XELF_DEF::Elf32_Shdr, sh_addralign), 4, "Elf32_Word", FW_DEF::VAL_TYPE_DATA}, + {sh_entsize, "sh_entsize", offsetof(XELF_DEF::Elf32_Shdr, sh_entsize), 4, "Elf32_Word", FW_DEF::VAL_TYPE_SIZE}, }; const FW_DEF::HEADER_RECORD records64[] = { - {sh_name, "sh_name", offsetof(XELF_DEF::Elf64_Shdr, sh_name), 4, - "Elf64_Word", FW_DEF::VAL_TYPE_DATA}, - {sh_type, "sh_type", offsetof(XELF_DEF::Elf64_Shdr, sh_type), 4, - "Elf64_Word", FW_DEF::VAL_TYPE_DATA}, - {sh_flags, "sh_flags", offsetof(XELF_DEF::Elf64_Shdr, sh_flags), 8, - "Elf64_Xword", FW_DEF::VAL_TYPE_DATA}, - {sh_addr, "sh_addr", offsetof(XELF_DEF::Elf64_Shdr, sh_addr), 8, - "Elf64_Addr", FW_DEF::VAL_TYPE_ADDRESS}, - {sh_offset, "sh_offset", offsetof(XELF_DEF::Elf64_Shdr, sh_offset), 8, - "Elf64_Off", FW_DEF::VAL_TYPE_OFFSET}, - {sh_size, "sh_size", offsetof(XELF_DEF::Elf64_Shdr, sh_size), 8, - "Elf64_Xword", FW_DEF::VAL_TYPE_SIZE}, - {sh_link, "sh_link", offsetof(XELF_DEF::Elf64_Shdr, sh_link), 4, - "Elf64_Word", FW_DEF::VAL_TYPE_DATA}, - {sh_info, "sh_info", offsetof(XELF_DEF::Elf64_Shdr, sh_info), 4, - "Elf64_Word", FW_DEF::VAL_TYPE_DATA}, - {sh_addralign, "sh_addralign", offsetof(XELF_DEF::Elf64_Shdr, sh_addralign), - 8, "Elf64_Xword", FW_DEF::VAL_TYPE_DATA}, - {sh_entsize, "sh_entsize", offsetof(XELF_DEF::Elf64_Shdr, sh_entsize), 8, - "Elf64_Xword", FW_DEF::VAL_TYPE_SIZE}, + {sh_name, "sh_name", offsetof(XELF_DEF::Elf64_Shdr, sh_name), 4, "Elf64_Word", FW_DEF::VAL_TYPE_DATA}, + {sh_type, "sh_type", offsetof(XELF_DEF::Elf64_Shdr, sh_type), 4, "Elf64_Word", FW_DEF::VAL_TYPE_DATA}, + {sh_flags, "sh_flags", offsetof(XELF_DEF::Elf64_Shdr, sh_flags), 8, "Elf64_Xword", FW_DEF::VAL_TYPE_DATA}, + {sh_addr, "sh_addr", offsetof(XELF_DEF::Elf64_Shdr, sh_addr), 8, "Elf64_Addr", FW_DEF::VAL_TYPE_ADDRESS}, + {sh_offset, "sh_offset", offsetof(XELF_DEF::Elf64_Shdr, sh_offset), 8, "Elf64_Off", FW_DEF::VAL_TYPE_OFFSET}, + {sh_size, "sh_size", offsetof(XELF_DEF::Elf64_Shdr, sh_size), 8, "Elf64_Xword", FW_DEF::VAL_TYPE_SIZE}, + {sh_link, "sh_link", offsetof(XELF_DEF::Elf64_Shdr, sh_link), 4, "Elf64_Word", FW_DEF::VAL_TYPE_DATA}, + {sh_info, "sh_info", offsetof(XELF_DEF::Elf64_Shdr, sh_info), 4, "Elf64_Word", FW_DEF::VAL_TYPE_DATA}, + {sh_addralign, "sh_addralign", offsetof(XELF_DEF::Elf64_Shdr, sh_addralign), 8, "Elf64_Xword", FW_DEF::VAL_TYPE_DATA}, + {sh_entsize, "sh_entsize", offsetof(XELF_DEF::Elf64_Shdr, sh_entsize), 8, "Elf64_Xword", FW_DEF::VAL_TYPE_SIZE}, }; } // namespace N_Elf_Shdr namespace N_Elf_Phdr32 { const FW_DEF::HEADER_RECORD records[] = { - {p_type, "p_type", offsetof(XELF_DEF::Elf32_Phdr, p_type), 4, "Elf32_Word", - FW_DEF::VAL_TYPE_DATA}, - {p_offset, "p_offset", offsetof(XELF_DEF::Elf32_Phdr, p_offset), 4, - "Elf32_Off", FW_DEF::VAL_TYPE_OFFSET}, - {p_vaddr, "p_vaddr", offsetof(XELF_DEF::Elf32_Phdr, p_vaddr), 4, - "Elf32_Addr", FW_DEF::VAL_TYPE_ADDRESS}, - {p_paddr, "p_paddr", offsetof(XELF_DEF::Elf32_Phdr, p_paddr), 4, - "Elf32_Addr", FW_DEF::VAL_TYPE_ADDRESS}, - {p_filesz, "p_filesz", offsetof(XELF_DEF::Elf32_Phdr, p_filesz), 4, - "Elf32_Word", FW_DEF::VAL_TYPE_SIZE}, - {p_memsz, "p_memsz", offsetof(XELF_DEF::Elf32_Phdr, p_memsz), 4, - "Elf32_Word", FW_DEF::VAL_TYPE_SIZE}, - {p_flags, "p_flags", offsetof(XELF_DEF::Elf32_Phdr, p_flags), 4, - "Elf32_Word", FW_DEF::VAL_TYPE_DATA}, - {p_align, "p_align", offsetof(XELF_DEF::Elf32_Phdr, p_align), 4, - "Elf32_Word", FW_DEF::VAL_TYPE_DATA}, + {p_type, "p_type", offsetof(XELF_DEF::Elf32_Phdr, p_type), 4, "Elf32_Word", FW_DEF::VAL_TYPE_DATA}, + {p_offset, "p_offset", offsetof(XELF_DEF::Elf32_Phdr, p_offset), 4, "Elf32_Off", FW_DEF::VAL_TYPE_OFFSET}, + {p_vaddr, "p_vaddr", offsetof(XELF_DEF::Elf32_Phdr, p_vaddr), 4, "Elf32_Addr", FW_DEF::VAL_TYPE_ADDRESS}, + {p_paddr, "p_paddr", offsetof(XELF_DEF::Elf32_Phdr, p_paddr), 4, "Elf32_Addr", FW_DEF::VAL_TYPE_ADDRESS}, + {p_filesz, "p_filesz", offsetof(XELF_DEF::Elf32_Phdr, p_filesz), 4, "Elf32_Word", FW_DEF::VAL_TYPE_SIZE}, + {p_memsz, "p_memsz", offsetof(XELF_DEF::Elf32_Phdr, p_memsz), 4, "Elf32_Word", FW_DEF::VAL_TYPE_SIZE}, + {p_flags, "p_flags", offsetof(XELF_DEF::Elf32_Phdr, p_flags), 4, "Elf32_Word", FW_DEF::VAL_TYPE_DATA}, + {p_align, "p_align", offsetof(XELF_DEF::Elf32_Phdr, p_align), 4, "Elf32_Word", FW_DEF::VAL_TYPE_DATA}, }; } namespace N_Elf_Phdr64 { const FW_DEF::HEADER_RECORD records[] = { - {p_type, "p_type", offsetof(XELF_DEF::Elf64_Phdr, p_type), 4, "Elf32_Word", - FW_DEF::VAL_TYPE_DATA}, - {p_flags, "p_flags", offsetof(XELF_DEF::Elf64_Phdr, p_flags), 4, - "Elf32_Word", FW_DEF::VAL_TYPE_DATA}, - {p_offset, "p_offset", offsetof(XELF_DEF::Elf64_Phdr, p_offset), 8, - "Elf64_Off", FW_DEF::VAL_TYPE_OFFSET}, - {p_vaddr, "p_vaddr", offsetof(XELF_DEF::Elf64_Phdr, p_vaddr), 8, - "Elf64_Addr", FW_DEF::VAL_TYPE_ADDRESS}, - {p_paddr, "p_paddr", offsetof(XELF_DEF::Elf64_Phdr, p_paddr), 8, - "Elf64_Addr", FW_DEF::VAL_TYPE_ADDRESS}, - {p_filesz, "p_filesz", offsetof(XELF_DEF::Elf64_Phdr, p_filesz), 8, - "Elf64_Xword", FW_DEF::VAL_TYPE_SIZE}, - {p_memsz, "p_memsz", offsetof(XELF_DEF::Elf64_Phdr, p_memsz), 8, - "Elf64_Xword", FW_DEF::VAL_TYPE_SIZE}, - {p_align, "p_align", offsetof(XELF_DEF::Elf64_Phdr, p_align), 8, - "Elf64_Xword", FW_DEF::VAL_TYPE_DATA}, + {p_type, "p_type", offsetof(XELF_DEF::Elf64_Phdr, p_type), 4, "Elf32_Word", FW_DEF::VAL_TYPE_DATA}, + {p_flags, "p_flags", offsetof(XELF_DEF::Elf64_Phdr, p_flags), 4, "Elf32_Word", FW_DEF::VAL_TYPE_DATA}, + {p_offset, "p_offset", offsetof(XELF_DEF::Elf64_Phdr, p_offset), 8, "Elf64_Off", FW_DEF::VAL_TYPE_OFFSET}, + {p_vaddr, "p_vaddr", offsetof(XELF_DEF::Elf64_Phdr, p_vaddr), 8, "Elf64_Addr", FW_DEF::VAL_TYPE_ADDRESS}, + {p_paddr, "p_paddr", offsetof(XELF_DEF::Elf64_Phdr, p_paddr), 8, "Elf64_Addr", FW_DEF::VAL_TYPE_ADDRESS}, + {p_filesz, "p_filesz", offsetof(XELF_DEF::Elf64_Phdr, p_filesz), 8, "Elf64_Xword", FW_DEF::VAL_TYPE_SIZE}, + {p_memsz, "p_memsz", offsetof(XELF_DEF::Elf64_Phdr, p_memsz), 8, "Elf64_Xword", FW_DEF::VAL_TYPE_SIZE}, + {p_align, "p_align", offsetof(XELF_DEF::Elf64_Phdr, p_align), 8, "Elf64_Xword", FW_DEF::VAL_TYPE_DATA}, }; } @@ -235,15 +145,13 @@ const FW_DEF::HEADER_RECORD records64[] = { namespace N_ELF_LIBRARIES { const FW_DEF::HEADER_RECORD records[] = { - {library_name, QObject::tr("Library name"), 0, 0, "", - FW_DEF::VAL_TYPE_DATA}, + {library_name, QObject::tr("Library name"), 0, 0, "", FW_DEF::VAL_TYPE_DATA}, }; } namespace N_ELF_INTERPRETER { const FW_DEF::HEADER_RECORD records[] = { - {interpreter, QObject::tr("Interpreter"), 0, -1, "Ansi string", - FW_DEF::VAL_TYPE_TEXT}, + {interpreter, QObject::tr("Interpreter"), 0, -1, "Ansi string", FW_DEF::VAL_TYPE_TEXT}, }; } @@ -262,35 +170,23 @@ const FW_DEF::HEADER_RECORD records[] = { namespace N_Elf32_Sym { const FW_DEF::HEADER_RECORD records[] = { - {st_name, "st_name", offsetof(XELF_DEF::Elf32_Sym, st_name), 4, - "Elf32_Word", FW_DEF::VAL_TYPE_DATA}, - {st_value, "st_value", offsetof(XELF_DEF::Elf32_Sym, st_value), 4, - "Elf32_Addr", FW_DEF::VAL_TYPE_DATA}, - {st_size, "st_size", offsetof(XELF_DEF::Elf32_Sym, st_size), 4, - "Elf32_Word", FW_DEF::VAL_TYPE_SIZE}, - {st_info, "st_info", offsetof(XELF_DEF::Elf32_Sym, st_info), 1, - "unsigned char", FW_DEF::VAL_TYPE_DATA}, - {st_other, "st_other", offsetof(XELF_DEF::Elf32_Sym, st_other), 1, - "unsigned char", FW_DEF::VAL_TYPE_DATA}, - {st_shndx, "st_shndx", offsetof(XELF_DEF::Elf32_Sym, st_shndx), 2, - "Elf32_Half", FW_DEF::VAL_TYPE_DATA}, + {st_name, "st_name", offsetof(XELF_DEF::Elf32_Sym, st_name), 4, "Elf32_Word", FW_DEF::VAL_TYPE_DATA}, + {st_value, "st_value", offsetof(XELF_DEF::Elf32_Sym, st_value), 4, "Elf32_Addr", FW_DEF::VAL_TYPE_DATA}, + {st_size, "st_size", offsetof(XELF_DEF::Elf32_Sym, st_size), 4, "Elf32_Word", FW_DEF::VAL_TYPE_SIZE}, + {st_info, "st_info", offsetof(XELF_DEF::Elf32_Sym, st_info), 1, "unsigned char", FW_DEF::VAL_TYPE_DATA}, + {st_other, "st_other", offsetof(XELF_DEF::Elf32_Sym, st_other), 1, "unsigned char", FW_DEF::VAL_TYPE_DATA}, + {st_shndx, "st_shndx", offsetof(XELF_DEF::Elf32_Sym, st_shndx), 2, "Elf32_Half", FW_DEF::VAL_TYPE_DATA}, }; } namespace N_Elf64_Sym { const FW_DEF::HEADER_RECORD records[] = { - {st_name, "st_name", offsetof(XELF_DEF::Elf64_Sym, st_name), 4, - "Elf64_Word", FW_DEF::VAL_TYPE_DATA}, - {st_info, "st_info", offsetof(XELF_DEF::Elf64_Sym, st_info), 1, - "unsigned char", FW_DEF::VAL_TYPE_DATA}, - {st_other, "st_other", offsetof(XELF_DEF::Elf64_Sym, st_other), 1, - "unsigned char", FW_DEF::VAL_TYPE_DATA}, - {st_shndx, "st_shndx", offsetof(XELF_DEF::Elf64_Sym, st_shndx), 2, - "Elf64_Half", FW_DEF::VAL_TYPE_DATA}, - {st_value, "st_value", offsetof(XELF_DEF::Elf64_Sym, st_value), 8, - "Elf64_Addr", FW_DEF::VAL_TYPE_DATA}, - {st_size, "st_size", offsetof(XELF_DEF::Elf64_Sym, st_size), 8, - "Elf64_Xword", FW_DEF::VAL_TYPE_SIZE}, + {st_name, "st_name", offsetof(XELF_DEF::Elf64_Sym, st_name), 4, "Elf64_Word", FW_DEF::VAL_TYPE_DATA}, + {st_info, "st_info", offsetof(XELF_DEF::Elf64_Sym, st_info), 1, "unsigned char", FW_DEF::VAL_TYPE_DATA}, + {st_other, "st_other", offsetof(XELF_DEF::Elf64_Sym, st_other), 1, "unsigned char", FW_DEF::VAL_TYPE_DATA}, + {st_shndx, "st_shndx", offsetof(XELF_DEF::Elf64_Sym, st_shndx), 2, "Elf64_Half", FW_DEF::VAL_TYPE_DATA}, + {st_value, "st_value", offsetof(XELF_DEF::Elf64_Sym, st_value), 8, "Elf64_Addr", FW_DEF::VAL_TYPE_DATA}, + {st_size, "st_size", offsetof(XELF_DEF::Elf64_Sym, st_size), 8, "Elf64_Xword", FW_DEF::VAL_TYPE_SIZE}, }; } diff --git a/ELF/elf_defs.h b/ELF/elf_defs.h index b62bf326..61c2fc47 100644 --- a/ELF/elf_defs.h +++ b/ELF/elf_defs.h @@ -88,19 +88,7 @@ extern const FW_DEF::HEADER_RECORD records64[__data_size]; } // namespace N_Elf_Ehdr namespace N_Elf_Shdr { -enum DATA { - sh_name = 0, - sh_type, - sh_flags, - sh_addr, - sh_offset, - sh_size, - sh_link, - sh_info, - sh_addralign, - sh_entsize, - __data_size -}; +enum DATA { sh_name = 0, sh_type, sh_flags, sh_addr, sh_offset, sh_size, sh_link, sh_info, sh_addralign, sh_entsize, __data_size }; extern const FW_DEF::HEADER_RECORD records32[__data_size]; extern const FW_DEF::HEADER_RECORD records64[__data_size]; @@ -111,17 +99,7 @@ enum INV { INV_VirtualAddress, INV_PointerToRawData, __INV_size }; } // namespace N_Elf_Shdr namespace N_Elf_Phdr32 { -enum DATA { - p_type = 0, - p_offset, - p_vaddr, - p_paddr, - p_filesz, - p_memsz, - p_flags, - p_align, - __data_size -}; +enum DATA { p_type = 0, p_offset, p_vaddr, p_paddr, p_filesz, p_memsz, p_flags, p_align, __data_size }; extern const FW_DEF::HEADER_RECORD records[__data_size]; @@ -131,17 +109,7 @@ enum INV { INV_VirtualAddress, INV_PointerToRawData, __INV_size }; } // namespace N_Elf_Phdr32 namespace N_Elf_Phdr64 { -enum DATA { - p_type = 0, - p_flags, - p_offset, - p_vaddr, - p_paddr, - p_filesz, - p_memsz, - p_align, - __data_size -}; +enum DATA { p_type = 0, p_flags, p_offset, p_vaddr, p_paddr, p_filesz, p_memsz, p_align, __data_size }; extern const FW_DEF::HEADER_RECORD records[__data_size]; @@ -184,15 +152,7 @@ extern const FW_DEF::HEADER_RECORD records[__data_size]; } // namespace N_ELF_RUNPATH namespace N_Elf32_Sym { -enum DATA { - st_name = 0, - st_value, - st_size, - st_info, - st_other, - st_shndx, - __data_size -}; +enum DATA { st_name = 0, st_value, st_size, st_info, st_other, st_shndx, __data_size }; extern const FW_DEF::HEADER_RECORD records[__data_size]; @@ -202,15 +162,7 @@ enum INV { __INV_size }; } // namespace N_Elf32_Sym namespace N_Elf64_Sym { -enum DATA { - st_name, - st_info, - st_other, - st_shndx, - st_value, - st_size, - __data_size -}; +enum DATA { st_name, st_info, st_other, st_shndx, st_value, st_size, __data_size }; extern const FW_DEF::HEADER_RECORD records[__data_size]; } // namespace N_Elf64_Sym diff --git a/ELF/elfprocessdata.cpp b/ELF/elfprocessdata.cpp index e8dcfbcf..eae33b1d 100755 --- a/ELF/elfprocessdata.cpp +++ b/ELF/elfprocessdata.cpp @@ -20,9 +20,7 @@ */ #include "elfprocessdata.h" -ELFProcessData::ELFProcessData(int nType, QStandardItemModel **ppModel, - XELF *pELF, qint64 nOffset, qint64 nSize, - qint64 nStringTableOffset, +ELFProcessData::ELFProcessData(int nType, QStandardItemModel **ppModel, XELF *pELF, qint64 nOffset, qint64 nSize, qint64 nStringTableOffset, qint64 nStringTableSize) : ProcessData() { this->g_nType = nType; @@ -42,11 +40,9 @@ void ELFProcessData::_process() { listLabels.append(""); if (bIs64) { - listLabels.append( - getStructList(N_Elf_Shdr::records64, N_Elf_Shdr::__data_size)); + listLabels.append(getStructList(N_Elf_Shdr::records64, N_Elf_Shdr::__data_size)); } else { - listLabels.append( - getStructList(N_Elf_Shdr::records32, N_Elf_Shdr::__data_size)); + listLabels.append(getStructList(N_Elf_Shdr::records32, N_Elf_Shdr::__data_size)); } listLabels.append(tr("Name")); @@ -67,8 +63,7 @@ void ELFProcessData::_process() { nNumberOfSections = listSectionHeaders32.count(); } - *g_ppModel = - new QStandardItemModel(nNumberOfSections, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfSections, listLabels.count()); setMaximum(nNumberOfSections); @@ -76,156 +71,69 @@ void ELFProcessData::_process() { quint32 nMainStringSection = g_pELF->getSectionStringTable(); - XBinary::OFFSETSIZE osStringTable = - g_pELF->getSectionOffsetSize(nMainStringSection); + XBinary::OFFSETSIZE osStringTable = g_pELF->getSectionOffsetSize(nMainStringSection); for (qint32 i = 0; (i < nNumberOfSections) && (isRun()); i++) { if (bIs64) { QStandardItem *pItem = new QStandardItem(QString::number(i)); if (g_pELF->isImage()) { - pItem->setData(listSectionHeaders64.at(i).sh_addr, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(listSectionHeaders64.at(i).sh_addr, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); } else { - pItem->setData(listSectionHeaders64.at(i).sh_offset, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(listSectionHeaders64.at(i).sh_offset, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); } - pItem->setData(listSectionHeaders64.at(i).sh_size, - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); - pItem->setData(listSectionHeaders64.at(i).sh_addr, - Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); + pItem->setData(listSectionHeaders64.at(i).sh_size, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); + pItem->setData(listSectionHeaders64.at(i).sh_addr, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); - pItem->setData( - osStringTable.nOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_STRINGTABLEOFFSET); - pItem->setData( - osStringTable.nSize, - Qt::UserRole + FW_DEF::SECTION_DATA_STRINGTABLESIZE); + pItem->setData(osStringTable.nOffset, Qt::UserRole + FW_DEF::SECTION_DATA_STRINGTABLEOFFSET); + pItem->setData(osStringTable.nSize, Qt::UserRole + FW_DEF::SECTION_DATA_STRINGTABLESIZE); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, N_Elf_Shdr::sh_name + 1, - new QStandardItem(XBinary::valueToHex( - listSectionHeaders64.at(i).sh_name))); - (*g_ppModel) - ->setItem(i, N_Elf_Shdr::sh_type + 1, - new QStandardItem(XBinary::valueToHex( - listSectionHeaders64.at(i).sh_type))); - (*g_ppModel) - ->setItem(i, N_Elf_Shdr::sh_flags + 1, - new QStandardItem(XBinary::valueToHex( - listSectionHeaders64.at(i).sh_flags))); - (*g_ppModel) - ->setItem(i, N_Elf_Shdr::sh_addr + 1, - new QStandardItem(XBinary::valueToHex( - listSectionHeaders64.at(i).sh_addr))); - (*g_ppModel) - ->setItem(i, N_Elf_Shdr::sh_offset + 1, - new QStandardItem(XBinary::valueToHex( - listSectionHeaders64.at(i).sh_offset))); - (*g_ppModel) - ->setItem(i, N_Elf_Shdr::sh_size + 1, - new QStandardItem(XBinary::valueToHex( - listSectionHeaders64.at(i).sh_size))); - (*g_ppModel) - ->setItem(i, N_Elf_Shdr::sh_link + 1, - new QStandardItem(XBinary::valueToHex( - listSectionHeaders64.at(i).sh_link))); - (*g_ppModel) - ->setItem(i, N_Elf_Shdr::sh_info + 1, - new QStandardItem(XBinary::valueToHex( - listSectionHeaders64.at(i).sh_info))); - (*g_ppModel) - ->setItem(i, N_Elf_Shdr::sh_addralign + 1, - new QStandardItem(XBinary::valueToHex( - listSectionHeaders64.at(i).sh_addralign))); - (*g_ppModel) - ->setItem(i, N_Elf_Shdr::sh_entsize + 1, - new QStandardItem(XBinary::valueToHex( - listSectionHeaders64.at(i).sh_entsize))); + (*g_ppModel)->setItem(i, N_Elf_Shdr::sh_name + 1, new QStandardItem(XBinary::valueToHex(listSectionHeaders64.at(i).sh_name))); + (*g_ppModel)->setItem(i, N_Elf_Shdr::sh_type + 1, new QStandardItem(XBinary::valueToHex(listSectionHeaders64.at(i).sh_type))); + (*g_ppModel)->setItem(i, N_Elf_Shdr::sh_flags + 1, new QStandardItem(XBinary::valueToHex(listSectionHeaders64.at(i).sh_flags))); + (*g_ppModel)->setItem(i, N_Elf_Shdr::sh_addr + 1, new QStandardItem(XBinary::valueToHex(listSectionHeaders64.at(i).sh_addr))); + (*g_ppModel)->setItem(i, N_Elf_Shdr::sh_offset + 1, new QStandardItem(XBinary::valueToHex(listSectionHeaders64.at(i).sh_offset))); + (*g_ppModel)->setItem(i, N_Elf_Shdr::sh_size + 1, new QStandardItem(XBinary::valueToHex(listSectionHeaders64.at(i).sh_size))); + (*g_ppModel)->setItem(i, N_Elf_Shdr::sh_link + 1, new QStandardItem(XBinary::valueToHex(listSectionHeaders64.at(i).sh_link))); + (*g_ppModel)->setItem(i, N_Elf_Shdr::sh_info + 1, new QStandardItem(XBinary::valueToHex(listSectionHeaders64.at(i).sh_info))); + (*g_ppModel)->setItem(i, N_Elf_Shdr::sh_addralign + 1, new QStandardItem(XBinary::valueToHex(listSectionHeaders64.at(i).sh_addralign))); + (*g_ppModel)->setItem(i, N_Elf_Shdr::sh_entsize + 1, new QStandardItem(XBinary::valueToHex(listSectionHeaders64.at(i).sh_entsize))); (*g_ppModel) ->setItem(i, N_Elf_Shdr::sh_entsize + 2, - new QStandardItem(g_pELF->getStringFromIndex( - osStringTable.nOffset, osStringTable.nSize, - listSectionHeaders64.at(i).sh_name))); - (*g_ppModel) - ->setItem(i, N_Elf_Shdr::sh_entsize + 3, - new QStandardItem(mapTypes.value( - listSectionHeaders64.at(i).sh_type))); + new QStandardItem(g_pELF->getStringFromIndex(osStringTable.nOffset, osStringTable.nSize, listSectionHeaders64.at(i).sh_name))); + (*g_ppModel)->setItem(i, N_Elf_Shdr::sh_entsize + 3, new QStandardItem(mapTypes.value(listSectionHeaders64.at(i).sh_type))); } else { QStandardItem *pItem = new QStandardItem(QString::number(i)); if (g_pELF->isImage()) { - pItem->setData(listSectionHeaders32.at(i).sh_addr, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(listSectionHeaders32.at(i).sh_addr, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); } else { - pItem->setData(listSectionHeaders32.at(i).sh_offset, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(listSectionHeaders32.at(i).sh_offset, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); } - pItem->setData(listSectionHeaders32.at(i).sh_size, - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); - pItem->setData(listSectionHeaders32.at(i).sh_addr, - Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); + pItem->setData(listSectionHeaders32.at(i).sh_size, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); + pItem->setData(listSectionHeaders32.at(i).sh_addr, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); - pItem->setData( - g_nStringTableOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_STRINGTABLEOFFSET); - pItem->setData( - g_nStringTableSize, - Qt::UserRole + FW_DEF::SECTION_DATA_STRINGTABLESIZE); + pItem->setData(g_nStringTableOffset, Qt::UserRole + FW_DEF::SECTION_DATA_STRINGTABLEOFFSET); + pItem->setData(g_nStringTableSize, Qt::UserRole + FW_DEF::SECTION_DATA_STRINGTABLESIZE); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, N_Elf_Shdr::sh_name + 1, - new QStandardItem(XBinary::valueToHex( - listSectionHeaders32.at(i).sh_name))); - (*g_ppModel) - ->setItem(i, N_Elf_Shdr::sh_type + 1, - new QStandardItem(XBinary::valueToHex( - listSectionHeaders32.at(i).sh_type))); - (*g_ppModel) - ->setItem(i, N_Elf_Shdr::sh_flags + 1, - new QStandardItem(XBinary::valueToHex( - listSectionHeaders32.at(i).sh_flags))); - (*g_ppModel) - ->setItem(i, N_Elf_Shdr::sh_addr + 1, - new QStandardItem(XBinary::valueToHex( - listSectionHeaders32.at(i).sh_addr))); - (*g_ppModel) - ->setItem(i, N_Elf_Shdr::sh_offset + 1, - new QStandardItem(XBinary::valueToHex( - listSectionHeaders32.at(i).sh_offset))); - (*g_ppModel) - ->setItem(i, N_Elf_Shdr::sh_size + 1, - new QStandardItem(XBinary::valueToHex( - listSectionHeaders32.at(i).sh_size))); - (*g_ppModel) - ->setItem(i, N_Elf_Shdr::sh_link + 1, - new QStandardItem(XBinary::valueToHex( - listSectionHeaders32.at(i).sh_link))); - (*g_ppModel) - ->setItem(i, N_Elf_Shdr::sh_info + 1, - new QStandardItem(XBinary::valueToHex( - listSectionHeaders32.at(i).sh_info))); - (*g_ppModel) - ->setItem(i, N_Elf_Shdr::sh_addralign + 1, - new QStandardItem(XBinary::valueToHex( - listSectionHeaders32.at(i).sh_addralign))); - (*g_ppModel) - ->setItem(i, N_Elf_Shdr::sh_entsize + 1, - new QStandardItem(XBinary::valueToHex( - listSectionHeaders32.at(i).sh_entsize))); + (*g_ppModel)->setItem(i, N_Elf_Shdr::sh_name + 1, new QStandardItem(XBinary::valueToHex(listSectionHeaders32.at(i).sh_name))); + (*g_ppModel)->setItem(i, N_Elf_Shdr::sh_type + 1, new QStandardItem(XBinary::valueToHex(listSectionHeaders32.at(i).sh_type))); + (*g_ppModel)->setItem(i, N_Elf_Shdr::sh_flags + 1, new QStandardItem(XBinary::valueToHex(listSectionHeaders32.at(i).sh_flags))); + (*g_ppModel)->setItem(i, N_Elf_Shdr::sh_addr + 1, new QStandardItem(XBinary::valueToHex(listSectionHeaders32.at(i).sh_addr))); + (*g_ppModel)->setItem(i, N_Elf_Shdr::sh_offset + 1, new QStandardItem(XBinary::valueToHex(listSectionHeaders32.at(i).sh_offset))); + (*g_ppModel)->setItem(i, N_Elf_Shdr::sh_size + 1, new QStandardItem(XBinary::valueToHex(listSectionHeaders32.at(i).sh_size))); + (*g_ppModel)->setItem(i, N_Elf_Shdr::sh_link + 1, new QStandardItem(XBinary::valueToHex(listSectionHeaders32.at(i).sh_link))); + (*g_ppModel)->setItem(i, N_Elf_Shdr::sh_info + 1, new QStandardItem(XBinary::valueToHex(listSectionHeaders32.at(i).sh_info))); + (*g_ppModel)->setItem(i, N_Elf_Shdr::sh_addralign + 1, new QStandardItem(XBinary::valueToHex(listSectionHeaders32.at(i).sh_addralign))); + (*g_ppModel)->setItem(i, N_Elf_Shdr::sh_entsize + 1, new QStandardItem(XBinary::valueToHex(listSectionHeaders32.at(i).sh_entsize))); (*g_ppModel) ->setItem(i, N_Elf_Shdr::sh_entsize + 2, - new QStandardItem(g_pELF->getStringFromIndex( - osStringTable.nOffset, osStringTable.nSize, - listSectionHeaders32.at(i).sh_name))); - (*g_ppModel) - ->setItem(i, N_Elf_Shdr::sh_entsize + 3, - new QStandardItem(mapTypes.value( - listSectionHeaders32.at(i).sh_type))); + new QStandardItem(g_pELF->getStringFromIndex(osStringTable.nOffset, osStringTable.nSize, listSectionHeaders32.at(i).sh_name))); + (*g_ppModel)->setItem(i, N_Elf_Shdr::sh_entsize + 3, new QStandardItem(mapTypes.value(listSectionHeaders32.at(i).sh_type))); } incValue(); @@ -237,11 +145,9 @@ void ELFProcessData::_process() { listLabels.append(""); if (bIs64) { - listLabels.append(getStructList(N_Elf_Phdr64::records, - N_Elf_Phdr64::__data_size)); + listLabels.append(getStructList(N_Elf_Phdr64::records, N_Elf_Phdr64::__data_size)); } else { - listLabels.append(getStructList(N_Elf_Phdr32::records, - N_Elf_Phdr32::__data_size)); + listLabels.append(getStructList(N_Elf_Phdr32::records, N_Elf_Phdr32::__data_size)); } listLabels.append(tr("Type")); @@ -261,8 +167,7 @@ void ELFProcessData::_process() { nNumberOfPrograms = listPrograms32.count(); } - *g_ppModel = - new QStandardItemModel(nNumberOfPrograms, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfPrograms, listLabels.count()); setMaximum(nNumberOfPrograms); @@ -273,112 +178,48 @@ void ELFProcessData::_process() { QStandardItem *pItem = new QStandardItem(QString::number(i)); if (g_pELF->isImage()) { - pItem->setData(listPrograms64.at(i).p_memsz, - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); - pItem->setData(listPrograms64.at(i).p_vaddr, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(listPrograms64.at(i).p_memsz, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); + pItem->setData(listPrograms64.at(i).p_vaddr, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); } else { - pItem->setData(listPrograms64.at(i).p_filesz, - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); - pItem->setData(listPrograms64.at(i).p_offset, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(listPrograms64.at(i).p_filesz, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); + pItem->setData(listPrograms64.at(i).p_offset, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); } - pItem->setData(listPrograms64.at(i).p_vaddr, - Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); + pItem->setData(listPrograms64.at(i).p_vaddr, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, N_Elf_Phdr64::p_type + 1, - new QStandardItem(XBinary::valueToHex( - listPrograms64.at(i).p_type))); - (*g_ppModel) - ->setItem(i, N_Elf_Phdr64::p_flags + 1, - new QStandardItem(XBinary::valueToHex( - listPrograms64.at(i).p_flags))); - (*g_ppModel) - ->setItem(i, N_Elf_Phdr64::p_offset + 1, - new QStandardItem(XBinary::valueToHex( - listPrograms64.at(i).p_offset))); - (*g_ppModel) - ->setItem(i, N_Elf_Phdr64::p_vaddr + 1, - new QStandardItem(XBinary::valueToHex( - listPrograms64.at(i).p_vaddr))); - (*g_ppModel) - ->setItem(i, N_Elf_Phdr64::p_paddr + 1, - new QStandardItem(XBinary::valueToHex( - listPrograms64.at(i).p_paddr))); - (*g_ppModel) - ->setItem(i, N_Elf_Phdr64::p_filesz + 1, - new QStandardItem(XBinary::valueToHex( - listPrograms64.at(i).p_filesz))); - (*g_ppModel) - ->setItem(i, N_Elf_Phdr64::p_memsz + 1, - new QStandardItem(XBinary::valueToHex( - listPrograms64.at(i).p_memsz))); - (*g_ppModel) - ->setItem(i, N_Elf_Phdr64::p_align + 1, - new QStandardItem(XBinary::valueToHex( - listPrograms64.at(i).p_align))); - (*g_ppModel) - ->setItem(i, N_Elf_Phdr64::p_align + 2, - new QStandardItem(mapProgramTypes.value( - listPrograms64.at(i).p_type))); + (*g_ppModel)->setItem(i, N_Elf_Phdr64::p_type + 1, new QStandardItem(XBinary::valueToHex(listPrograms64.at(i).p_type))); + (*g_ppModel)->setItem(i, N_Elf_Phdr64::p_flags + 1, new QStandardItem(XBinary::valueToHex(listPrograms64.at(i).p_flags))); + (*g_ppModel)->setItem(i, N_Elf_Phdr64::p_offset + 1, new QStandardItem(XBinary::valueToHex(listPrograms64.at(i).p_offset))); + (*g_ppModel)->setItem(i, N_Elf_Phdr64::p_vaddr + 1, new QStandardItem(XBinary::valueToHex(listPrograms64.at(i).p_vaddr))); + (*g_ppModel)->setItem(i, N_Elf_Phdr64::p_paddr + 1, new QStandardItem(XBinary::valueToHex(listPrograms64.at(i).p_paddr))); + (*g_ppModel)->setItem(i, N_Elf_Phdr64::p_filesz + 1, new QStandardItem(XBinary::valueToHex(listPrograms64.at(i).p_filesz))); + (*g_ppModel)->setItem(i, N_Elf_Phdr64::p_memsz + 1, new QStandardItem(XBinary::valueToHex(listPrograms64.at(i).p_memsz))); + (*g_ppModel)->setItem(i, N_Elf_Phdr64::p_align + 1, new QStandardItem(XBinary::valueToHex(listPrograms64.at(i).p_align))); + (*g_ppModel)->setItem(i, N_Elf_Phdr64::p_align + 2, new QStandardItem(mapProgramTypes.value(listPrograms64.at(i).p_type))); } else { QStandardItem *pItem = new QStandardItem(QString::number(i)); if (g_pELF->isImage()) { - pItem->setData(listPrograms32.at(i).p_memsz, - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); - pItem->setData(listPrograms32.at(i).p_vaddr, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(listPrograms32.at(i).p_memsz, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); + pItem->setData(listPrograms32.at(i).p_vaddr, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); } else { - pItem->setData(listPrograms32.at(i).p_filesz, - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); - pItem->setData(listPrograms32.at(i).p_offset, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(listPrograms32.at(i).p_filesz, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); + pItem->setData(listPrograms32.at(i).p_offset, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); } - pItem->setData(listPrograms32.at(i).p_vaddr, - Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); + pItem->setData(listPrograms32.at(i).p_vaddr, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, N_Elf_Phdr32::p_type + 1, - new QStandardItem(XBinary::valueToHex( - listPrograms32.at(i).p_type))); - (*g_ppModel) - ->setItem(i, N_Elf_Phdr32::p_offset + 1, - new QStandardItem(XBinary::valueToHex( - listPrograms32.at(i).p_offset))); - (*g_ppModel) - ->setItem(i, N_Elf_Phdr32::p_vaddr + 1, - new QStandardItem(XBinary::valueToHex( - listPrograms32.at(i).p_vaddr))); - (*g_ppModel) - ->setItem(i, N_Elf_Phdr32::p_paddr + 1, - new QStandardItem(XBinary::valueToHex( - listPrograms32.at(i).p_paddr))); - (*g_ppModel) - ->setItem(i, N_Elf_Phdr32::p_filesz + 1, - new QStandardItem(XBinary::valueToHex( - listPrograms32.at(i).p_filesz))); - (*g_ppModel) - ->setItem(i, N_Elf_Phdr32::p_memsz + 1, - new QStandardItem(XBinary::valueToHex( - listPrograms32.at(i).p_memsz))); - (*g_ppModel) - ->setItem(i, N_Elf_Phdr32::p_flags + 1, - new QStandardItem(XBinary::valueToHex( - listPrograms32.at(i).p_flags))); - (*g_ppModel) - ->setItem(i, N_Elf_Phdr32::p_align + 1, - new QStandardItem(XBinary::valueToHex( - listPrograms32.at(i).p_align))); - (*g_ppModel) - ->setItem(i, N_Elf_Phdr32::p_align + 2, - new QStandardItem(mapProgramTypes.value( - listPrograms32.at(i).p_type))); + (*g_ppModel)->setItem(i, N_Elf_Phdr32::p_type + 1, new QStandardItem(XBinary::valueToHex(listPrograms32.at(i).p_type))); + (*g_ppModel)->setItem(i, N_Elf_Phdr32::p_offset + 1, new QStandardItem(XBinary::valueToHex(listPrograms32.at(i).p_offset))); + (*g_ppModel)->setItem(i, N_Elf_Phdr32::p_vaddr + 1, new QStandardItem(XBinary::valueToHex(listPrograms32.at(i).p_vaddr))); + (*g_ppModel)->setItem(i, N_Elf_Phdr32::p_paddr + 1, new QStandardItem(XBinary::valueToHex(listPrograms32.at(i).p_paddr))); + (*g_ppModel)->setItem(i, N_Elf_Phdr32::p_filesz + 1, new QStandardItem(XBinary::valueToHex(listPrograms32.at(i).p_filesz))); + (*g_ppModel)->setItem(i, N_Elf_Phdr32::p_memsz + 1, new QStandardItem(XBinary::valueToHex(listPrograms32.at(i).p_memsz))); + (*g_ppModel)->setItem(i, N_Elf_Phdr32::p_flags + 1, new QStandardItem(XBinary::valueToHex(listPrograms32.at(i).p_flags))); + (*g_ppModel)->setItem(i, N_Elf_Phdr32::p_align + 1, new QStandardItem(XBinary::valueToHex(listPrograms32.at(i).p_align))); + (*g_ppModel)->setItem(i, N_Elf_Phdr32::p_align + 2, new QStandardItem(mapProgramTypes.value(listPrograms32.at(i).p_type))); } } } else if (g_nType == SELF::TYPE_SYMBOLTABLE) { @@ -388,19 +229,16 @@ void ELFProcessData::_process() { if (g_pELF->is64()) { QList listLabels; listLabels.append(""); - listLabels.append( - getStructList(N_Elf64_Sym::records, N_Elf64_Sym::__data_size)); + listLabels.append(getStructList(N_Elf64_Sym::records, N_Elf64_Sym::__data_size)); listLabels.append(tr("Name")); listLabels.append(tr("Bind")); listLabels.append(tr("Type")); - QList listSymbols = - g_pELF->getElf64_SymList(g_nOffset, g_nSize); + QList listSymbols = g_pELF->getElf64_SymList(g_nOffset, g_nSize); qint32 nNumberOfSymbols = listSymbols.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfSymbols, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfSymbols, listLabels.count()); setMaximum(nNumberOfSymbols); @@ -411,79 +249,41 @@ void ELFProcessData::_process() { pItem->setText(QString::number(i)); pItem->setTextAlignment(Qt::AlignRight); - pItem->setData(g_nOffset + i * sizeof(XELF_DEF::Elf64_Sym), - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); - pItem->setData( - g_nOffset + i * sizeof(XELF_DEF::Elf64_Sym), - Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); + pItem->setData(g_nOffset + i * sizeof(XELF_DEF::Elf64_Sym), Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(g_nOffset + i * sizeof(XELF_DEF::Elf64_Sym), Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); - pItem->setData( - g_nStringTableOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_STRINGTABLEOFFSET); - pItem->setData( - g_nStringTableSize, - Qt::UserRole + FW_DEF::SECTION_DATA_STRINGTABLESIZE); + pItem->setData(g_nStringTableOffset, Qt::UserRole + FW_DEF::SECTION_DATA_STRINGTABLEOFFSET); + pItem->setData(g_nStringTableSize, Qt::UserRole + FW_DEF::SECTION_DATA_STRINGTABLESIZE); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, N_Elf64_Sym::st_name + 1, - new QStandardItem(XBinary::valueToHex( - listSymbols.at(i).st_name))); - (*g_ppModel) - ->setItem(i, N_Elf64_Sym::st_info + 1, - new QStandardItem(XBinary::valueToHex( - listSymbols.at(i).st_info))); - (*g_ppModel) - ->setItem(i, N_Elf64_Sym::st_other + 1, - new QStandardItem(XBinary::valueToHex( - listSymbols.at(i).st_other))); - (*g_ppModel) - ->setItem(i, N_Elf64_Sym::st_shndx + 1, - new QStandardItem(XBinary::valueToHex( - listSymbols.at(i).st_shndx))); - (*g_ppModel) - ->setItem(i, N_Elf64_Sym::st_value + 1, - new QStandardItem(XBinary::valueToHex( - listSymbols.at(i).st_value))); - (*g_ppModel) - ->setItem(i, N_Elf64_Sym::st_size + 1, - new QStandardItem(XBinary::valueToHex( - listSymbols.at(i).st_size))); + (*g_ppModel)->setItem(i, N_Elf64_Sym::st_name + 1, new QStandardItem(XBinary::valueToHex(listSymbols.at(i).st_name))); + (*g_ppModel)->setItem(i, N_Elf64_Sym::st_info + 1, new QStandardItem(XBinary::valueToHex(listSymbols.at(i).st_info))); + (*g_ppModel)->setItem(i, N_Elf64_Sym::st_other + 1, new QStandardItem(XBinary::valueToHex(listSymbols.at(i).st_other))); + (*g_ppModel)->setItem(i, N_Elf64_Sym::st_shndx + 1, new QStandardItem(XBinary::valueToHex(listSymbols.at(i).st_shndx))); + (*g_ppModel)->setItem(i, N_Elf64_Sym::st_value + 1, new QStandardItem(XBinary::valueToHex(listSymbols.at(i).st_value))); + (*g_ppModel)->setItem(i, N_Elf64_Sym::st_size + 1, new QStandardItem(XBinary::valueToHex(listSymbols.at(i).st_size))); - QString sName = g_pELF->getStringFromIndex( - g_nStringTableOffset, g_nStringTableSize, - listSymbols.at(i).st_name); + QString sName = g_pELF->getStringFromIndex(g_nStringTableOffset, g_nStringTableSize, listSymbols.at(i).st_name); - (*g_ppModel) - ->setItem(i, N_Elf64_Sym::st_size + 2, - new QStandardItem(sName)); - (*g_ppModel) - ->setItem(i, N_Elf64_Sym::st_size + 3, - new QStandardItem(mapBinds.value( - S_ELF64_ST_BIND(listSymbols.at(i).st_info)))); - (*g_ppModel) - ->setItem(i, N_Elf64_Sym::st_size + 4, - new QStandardItem(mapTypes.value( - S_ELF64_ST_TYPE(listSymbols.at(i).st_info)))); + (*g_ppModel)->setItem(i, N_Elf64_Sym::st_size + 2, new QStandardItem(sName)); + (*g_ppModel)->setItem(i, N_Elf64_Sym::st_size + 3, new QStandardItem(mapBinds.value(S_ELF64_ST_BIND(listSymbols.at(i).st_info)))); + (*g_ppModel)->setItem(i, N_Elf64_Sym::st_size + 4, new QStandardItem(mapTypes.value(S_ELF64_ST_TYPE(listSymbols.at(i).st_info)))); incValue(); } } else { QList listLabels; listLabels.append(""); - listLabels.append( - getStructList(N_Elf32_Sym::records, N_Elf32_Sym::__data_size)); + listLabels.append(getStructList(N_Elf32_Sym::records, N_Elf32_Sym::__data_size)); listLabels.append(tr("Name")); listLabels.append(tr("Bind")); listLabels.append(tr("Type")); - QList listSymbols = - g_pELF->getElf32_SymList(g_nOffset, g_nSize); + QList listSymbols = g_pELF->getElf32_SymList(g_nOffset, g_nSize); qint32 nNumberOfSymbols = listSymbols.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfSymbols, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfSymbols, listLabels.count()); setMaximum(nNumberOfSymbols); @@ -494,60 +294,25 @@ void ELFProcessData::_process() { pItem->setText(QString::number(i)); pItem->setTextAlignment(Qt::AlignRight); - pItem->setData(g_nOffset + i * sizeof(XELF_DEF::Elf32_Sym), - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); - pItem->setData( - g_nOffset + i * sizeof(XELF_DEF::Elf32_Sym), - Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); + pItem->setData(g_nOffset + i * sizeof(XELF_DEF::Elf32_Sym), Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(g_nOffset + i * sizeof(XELF_DEF::Elf32_Sym), Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); - pItem->setData( - g_nStringTableOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_STRINGTABLEOFFSET); - pItem->setData( - g_nStringTableSize, - Qt::UserRole + FW_DEF::SECTION_DATA_STRINGTABLESIZE); + pItem->setData(g_nStringTableOffset, Qt::UserRole + FW_DEF::SECTION_DATA_STRINGTABLEOFFSET); + pItem->setData(g_nStringTableSize, Qt::UserRole + FW_DEF::SECTION_DATA_STRINGTABLESIZE); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, N_Elf32_Sym::st_name + 1, - new QStandardItem(XBinary::valueToHex( - listSymbols.at(i).st_name))); - (*g_ppModel) - ->setItem(i, N_Elf32_Sym::st_value + 1, - new QStandardItem(XBinary::valueToHex( - listSymbols.at(i).st_value))); - (*g_ppModel) - ->setItem(i, N_Elf32_Sym::st_size + 1, - new QStandardItem(XBinary::valueToHex( - listSymbols.at(i).st_size))); - (*g_ppModel) - ->setItem(i, N_Elf32_Sym::st_info + 1, - new QStandardItem(XBinary::valueToHex( - listSymbols.at(i).st_info))); - (*g_ppModel) - ->setItem(i, N_Elf32_Sym::st_other + 1, - new QStandardItem(XBinary::valueToHex( - listSymbols.at(i).st_other))); - (*g_ppModel) - ->setItem(i, N_Elf32_Sym::st_shndx + 1, - new QStandardItem(XBinary::valueToHex( - listSymbols.at(i).st_shndx))); + (*g_ppModel)->setItem(i, N_Elf32_Sym::st_name + 1, new QStandardItem(XBinary::valueToHex(listSymbols.at(i).st_name))); + (*g_ppModel)->setItem(i, N_Elf32_Sym::st_value + 1, new QStandardItem(XBinary::valueToHex(listSymbols.at(i).st_value))); + (*g_ppModel)->setItem(i, N_Elf32_Sym::st_size + 1, new QStandardItem(XBinary::valueToHex(listSymbols.at(i).st_size))); + (*g_ppModel)->setItem(i, N_Elf32_Sym::st_info + 1, new QStandardItem(XBinary::valueToHex(listSymbols.at(i).st_info))); + (*g_ppModel)->setItem(i, N_Elf32_Sym::st_other + 1, new QStandardItem(XBinary::valueToHex(listSymbols.at(i).st_other))); + (*g_ppModel)->setItem(i, N_Elf32_Sym::st_shndx + 1, new QStandardItem(XBinary::valueToHex(listSymbols.at(i).st_shndx))); - QString sName = g_pELF->getStringFromIndex( - g_nStringTableOffset, g_nStringTableSize, - listSymbols.at(i).st_name); + QString sName = g_pELF->getStringFromIndex(g_nStringTableOffset, g_nStringTableSize, listSymbols.at(i).st_name); - (*g_ppModel) - ->setItem(i, N_Elf32_Sym::st_shndx + 2, - new QStandardItem(sName)); - (*g_ppModel) - ->setItem(i, N_Elf64_Sym::st_size + 3, - new QStandardItem(mapBinds.value( - S_ELF32_ST_BIND(listSymbols.at(i).st_info)))); - (*g_ppModel) - ->setItem(i, N_Elf64_Sym::st_size + 4, - new QStandardItem(mapTypes.value( - S_ELF32_ST_TYPE(listSymbols.at(i).st_info)))); + (*g_ppModel)->setItem(i, N_Elf32_Sym::st_shndx + 2, new QStandardItem(sName)); + (*g_ppModel)->setItem(i, N_Elf64_Sym::st_size + 3, new QStandardItem(mapBinds.value(S_ELF32_ST_BIND(listSymbols.at(i).st_info)))); + (*g_ppModel)->setItem(i, N_Elf64_Sym::st_size + 4, new QStandardItem(mapTypes.value(S_ELF32_ST_TYPE(listSymbols.at(i).st_info)))); incValue(); } @@ -559,19 +324,14 @@ void ELFProcessData::_process() { listLabels.append(""); if (bIs64) { - listLabels.append( - getStructList(N_Elf_DynamicArrayTags::records64, - N_Elf_DynamicArrayTags::__data_size)); + listLabels.append(getStructList(N_Elf_DynamicArrayTags::records64, N_Elf_DynamicArrayTags::__data_size)); } else { - listLabels.append( - getStructList(N_Elf_DynamicArrayTags::records32, - N_Elf_DynamicArrayTags::__data_size)); + listLabels.append(getStructList(N_Elf_DynamicArrayTags::records32, N_Elf_DynamicArrayTags::__data_size)); } listLabels.append(tr("Type")); - QList listTagStructs = g_pELF->_getTagStructs( - g_nOffset, g_nSize, bIs64, g_pELF->isBigEndian()); + QList listTagStructs = g_pELF->_getTagStructs(g_nOffset, g_nSize, bIs64, g_pELF->isBigEndian()); qint32 nNumberOfTags = listTagStructs.count(); @@ -586,43 +346,23 @@ void ELFProcessData::_process() { for (qint32 i = 0; (i < nNumberOfTags) && (isRun()); i++) { QStandardItem *pItem = new QStandardItem(QString::number(i)); - pItem->setData(listTagStructs.at(i).nOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); - pItem->setData(listTagStructs.at(i).nOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); + pItem->setData(listTagStructs.at(i).nOffset, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(listTagStructs.at(i).nOffset, Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); - pItem->setData( - g_nStringTableOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_STRINGTABLEOFFSET); - pItem->setData(g_nStringTableSize, - Qt::UserRole + FW_DEF::SECTION_DATA_STRINGTABLESIZE); + pItem->setData(g_nStringTableOffset, Qt::UserRole + FW_DEF::SECTION_DATA_STRINGTABLEOFFSET); + pItem->setData(g_nStringTableSize, Qt::UserRole + FW_DEF::SECTION_DATA_STRINGTABLESIZE); (*g_ppModel)->setItem(i, 0, pItem); if (bIs64) { - (*g_ppModel) - ->setItem(i, N_Elf_DynamicArrayTags::d_tag + 1, - new QStandardItem(XBinary::valueToHex( - (quint64)listTagStructs.at(i).nTag))); - (*g_ppModel) - ->setItem(i, N_Elf_DynamicArrayTags::d_value + 1, - new QStandardItem(XBinary::valueToHex( - (quint64)listTagStructs.at(i).nValue))); + (*g_ppModel)->setItem(i, N_Elf_DynamicArrayTags::d_tag + 1, new QStandardItem(XBinary::valueToHex((quint64)listTagStructs.at(i).nTag))); + (*g_ppModel)->setItem(i, N_Elf_DynamicArrayTags::d_value + 1, new QStandardItem(XBinary::valueToHex((quint64)listTagStructs.at(i).nValue))); } else { - (*g_ppModel) - ->setItem(i, N_Elf_DynamicArrayTags::d_tag + 1, - new QStandardItem(XBinary::valueToHex( - (quint32)listTagStructs.at(i).nTag))); - (*g_ppModel) - ->setItem(i, N_Elf_DynamicArrayTags::d_value + 1, - new QStandardItem(XBinary::valueToHex( - (quint32)listTagStructs.at(i).nValue))); + (*g_ppModel)->setItem(i, N_Elf_DynamicArrayTags::d_tag + 1, new QStandardItem(XBinary::valueToHex((quint32)listTagStructs.at(i).nTag))); + (*g_ppModel)->setItem(i, N_Elf_DynamicArrayTags::d_value + 1, new QStandardItem(XBinary::valueToHex((quint32)listTagStructs.at(i).nValue))); } - (*g_ppModel) - ->setItem(i, N_Elf_DynamicArrayTags::d_value + 2, - new QStandardItem( - mapTags.value(listTagStructs.at(i).nTag))); + (*g_ppModel)->setItem(i, N_Elf_DynamicArrayTags::d_value + 2, new QStandardItem(mapTags.value(listTagStructs.at(i).nTag))); incValue(); } @@ -630,11 +370,9 @@ void ELFProcessData::_process() { QList listLabels; listLabels.append(""); - listLabels.append( - getStructList(N_ELF_NOTES::records, N_ELF_NOTES::__data_size)); + listLabels.append(getStructList(N_ELF_NOTES::records, N_ELF_NOTES::__data_size)); - QList listNotes = - g_pELF->_getNotes(g_nOffset, g_nSize, g_pELF->isBigEndian()); + QList listNotes = g_pELF->_getNotes(g_nOffset, g_nSize, g_pELF->isBigEndian()); qint32 nNumberOfNotes = listNotes.count(); @@ -647,23 +385,14 @@ void ELFProcessData::_process() { for (qint32 i = 0; (i < nNumberOfNotes) && (isRun()); i++) { QStandardItem *pItem = new QStandardItem(QString::number(i)); - pItem->setData(listNotes.at(i).nOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); - pItem->setData(listNotes.at(i).nOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); - pItem->setData(listNotes.at(i).nOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); - pItem->setData(listNotes.at(i).nSize, - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); + pItem->setData(listNotes.at(i).nOffset, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(listNotes.at(i).nOffset, Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); + pItem->setData(listNotes.at(i).nOffset, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); + pItem->setData(listNotes.at(i).nSize, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, N_ELF_NOTES::type + 1, - new QStandardItem(XBinary::valueToHex( - (quint32)listNotes.at(i).nType))); - (*g_ppModel) - ->setItem(i, N_ELF_NOTES::name + 1, - new QStandardItem(listNotes.at(i).sName)); + (*g_ppModel)->setItem(i, N_ELF_NOTES::type + 1, new QStandardItem(XBinary::valueToHex((quint32)listNotes.at(i).nType))); + (*g_ppModel)->setItem(i, N_ELF_NOTES::name + 1, new QStandardItem(listNotes.at(i).sName)); incValue(); } @@ -671,15 +400,13 @@ void ELFProcessData::_process() { QList listLabels; listLabels.append(""); - listLabels.append(getStructList(N_ELF_LIBRARIES::records, - N_ELF_LIBRARIES::__data_size)); + listLabels.append(getStructList(N_ELF_LIBRARIES::records, N_ELF_LIBRARIES::__data_size)); QList listLibraries = g_pELF->getLibraries(); qint32 nNumberOfLibraries = listLibraries.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfLibraries, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfLibraries, listLabels.count()); setMaximum(nNumberOfLibraries); @@ -688,16 +415,11 @@ void ELFProcessData::_process() { for (qint32 i = 0; (i < nNumberOfLibraries) && (isRun()); i++) { QStandardItem *pItem = new QStandardItem(QString::number(i)); - pItem->setData( - g_nStringTableOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_STRINGTABLEOFFSET); - pItem->setData(g_nStringTableSize, - Qt::UserRole + FW_DEF::SECTION_DATA_STRINGTABLESIZE); + pItem->setData(g_nStringTableOffset, Qt::UserRole + FW_DEF::SECTION_DATA_STRINGTABLEOFFSET); + pItem->setData(g_nStringTableSize, Qt::UserRole + FW_DEF::SECTION_DATA_STRINGTABLESIZE); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, N_ELF_LIBRARIES::library_name + 1, - new QStandardItem(listLibraries.at(i))); + (*g_ppModel)->setItem(i, N_ELF_LIBRARIES::library_name + 1, new QStandardItem(listLibraries.at(i))); incValue(); } @@ -708,11 +430,9 @@ void ELFProcessData::_process() { listLabels.append(""); if (bIs64) { - listLabels.append( - getStructList(N_Elf_Rela::records64, N_Elf_Rela::__data_size)); + listLabels.append(getStructList(N_Elf_Rela::records64, N_Elf_Rela::__data_size)); } else { - listLabels.append( - getStructList(N_Elf_Rela::records32, N_Elf_Rela::__data_size)); + listLabels.append(getStructList(N_Elf_Rela::records32, N_Elf_Rela::__data_size)); } listLabels.append("Sym"); @@ -742,8 +462,7 @@ void ELFProcessData::_process() { QString sArch = g_pELF->getArch(); // TODO More Check! - if ((sArch == "SPARC") || (sArch == "SPARC32PLUS") || - (sArch == "SPARCV9")) // TODO Check! + if ((sArch == "SPARC") || (sArch == "SPARC32PLUS") || (sArch == "SPARCV9")) // TODO Check! { mapTypes = g_pELF->getRelTypesS_SPARC(); } else if (sArch == "386") { @@ -756,65 +475,27 @@ void ELFProcessData::_process() { if (bIs64) { QStandardItem *pItem = new QStandardItem(QString::number(i)); - pItem->setData(g_nOffset + i * sizeof(XELF_DEF::Elf64_Rela), - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); - pItem->setData( - g_nOffset + i * sizeof(XELF_DEF::Elf64_Rela), - Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); + pItem->setData(g_nOffset + i * sizeof(XELF_DEF::Elf64_Rela), Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(g_nOffset + i * sizeof(XELF_DEF::Elf64_Rela), Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, N_Elf_Rela::r_offset + 1, - new QStandardItem(XBinary::valueToHex( - listRela64.at(i).r_offset))); - (*g_ppModel) - ->setItem(i, N_Elf_Rela::r_info + 1, - new QStandardItem(XBinary::valueToHex( - listRela64.at(i).r_info))); - (*g_ppModel) - ->setItem(i, N_Elf_Rela::r_addend + 1, - new QStandardItem(XBinary::valueToHex( - listRela64.at(i).r_addend))); - (*g_ppModel) - ->setItem( - i, N_Elf_Rela::r_addend + 2, - new QStandardItem(XBinary::valueToHex( - (quint32)S_ELF64_R_SYM(listRela64.at(i).r_info)))); - (*g_ppModel) - ->setItem(i, N_Elf_Rela::r_addend + 3, - new QStandardItem(mapTypes.value( - S_ELF64_R_TYPE(listRela64.at(i).r_info)))); + (*g_ppModel)->setItem(i, N_Elf_Rela::r_offset + 1, new QStandardItem(XBinary::valueToHex(listRela64.at(i).r_offset))); + (*g_ppModel)->setItem(i, N_Elf_Rela::r_info + 1, new QStandardItem(XBinary::valueToHex(listRela64.at(i).r_info))); + (*g_ppModel)->setItem(i, N_Elf_Rela::r_addend + 1, new QStandardItem(XBinary::valueToHex(listRela64.at(i).r_addend))); + (*g_ppModel)->setItem(i, N_Elf_Rela::r_addend + 2, new QStandardItem(XBinary::valueToHex((quint32)S_ELF64_R_SYM(listRela64.at(i).r_info)))); + (*g_ppModel)->setItem(i, N_Elf_Rela::r_addend + 3, new QStandardItem(mapTypes.value(S_ELF64_R_TYPE(listRela64.at(i).r_info)))); } else { QStandardItem *pItem = new QStandardItem(QString::number(i)); - pItem->setData(g_nOffset + i * sizeof(XELF_DEF::Elf32_Rela), - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); - pItem->setData( - g_nOffset + i * sizeof(XELF_DEF::Elf32_Rela), - Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); + pItem->setData(g_nOffset + i * sizeof(XELF_DEF::Elf32_Rela), Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(g_nOffset + i * sizeof(XELF_DEF::Elf32_Rela), Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, N_Elf_Rela::r_offset + 1, - new QStandardItem(XBinary::valueToHex( - listRela32.at(i).r_offset))); - (*g_ppModel) - ->setItem(i, N_Elf_Rela::r_info + 1, - new QStandardItem(XBinary::valueToHex( - listRela32.at(i).r_info))); - (*g_ppModel) - ->setItem(i, N_Elf_Rela::r_addend + 1, - new QStandardItem(XBinary::valueToHex( - listRela32.at(i).r_addend))); - (*g_ppModel) - ->setItem( - i, N_Elf_Rela::r_addend + 2, - new QStandardItem(XBinary::valueToHex( - (quint32)S_ELF32_R_SYM(listRela32.at(i).r_info)))); - (*g_ppModel) - ->setItem(i, N_Elf_Rela::r_addend + 3, - new QStandardItem(mapTypes.value( - S_ELF32_R_TYPE(listRela32.at(i).r_info)))); + (*g_ppModel)->setItem(i, N_Elf_Rela::r_offset + 1, new QStandardItem(XBinary::valueToHex(listRela32.at(i).r_offset))); + (*g_ppModel)->setItem(i, N_Elf_Rela::r_info + 1, new QStandardItem(XBinary::valueToHex(listRela32.at(i).r_info))); + (*g_ppModel)->setItem(i, N_Elf_Rela::r_addend + 1, new QStandardItem(XBinary::valueToHex(listRela32.at(i).r_addend))); + (*g_ppModel)->setItem(i, N_Elf_Rela::r_addend + 2, new QStandardItem(XBinary::valueToHex((quint32)S_ELF32_R_SYM(listRela32.at(i).r_info)))); + (*g_ppModel)->setItem(i, N_Elf_Rela::r_addend + 3, new QStandardItem(mapTypes.value(S_ELF32_R_TYPE(listRela32.at(i).r_info)))); } incValue(); @@ -826,11 +507,9 @@ void ELFProcessData::_process() { listLabels.append(""); if (bIs64) { - listLabels.append( - getStructList(N_Elf_Rel::records64, N_Elf_Rel::__data_size)); + listLabels.append(getStructList(N_Elf_Rel::records64, N_Elf_Rel::__data_size)); } else { - listLabels.append( - getStructList(N_Elf_Rel::records32, N_Elf_Rel::__data_size)); + listLabels.append(getStructList(N_Elf_Rel::records32, N_Elf_Rel::__data_size)); } listLabels.append("Sym"); @@ -859,8 +538,7 @@ void ELFProcessData::_process() { QString sArch = g_pELF->getArch(); - if ((sArch == "SPARC") || (sArch == "SPARC32PLUS") || - (sArch == "SPARCV9")) { + if ((sArch == "SPARC") || (sArch == "SPARC32PLUS") || (sArch == "SPARCV9")) { mapTypes = g_pELF->getRelTypesS_SPARC(); } else if (sArch == "386") { mapTypes = g_pELF->getRelTypesS_x86(); @@ -872,57 +550,25 @@ void ELFProcessData::_process() { if (bIs64) { QStandardItem *pItem = new QStandardItem(QString::number(i)); - pItem->setData(g_nOffset + i * sizeof(XELF_DEF::Elf64_Rel), - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); - pItem->setData( - g_nOffset + i * sizeof(XELF_DEF::Elf64_Rel), - Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); + pItem->setData(g_nOffset + i * sizeof(XELF_DEF::Elf64_Rel), Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(g_nOffset + i * sizeof(XELF_DEF::Elf64_Rel), Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, N_Elf_Rel::r_offset + 1, - new QStandardItem(XBinary::valueToHex( - listRel64.at(i).r_offset))); - (*g_ppModel) - ->setItem(i, N_Elf_Rel::r_info + 1, - new QStandardItem( - XBinary::valueToHex(listRel64.at(i).r_info))); - (*g_ppModel) - ->setItem( - i, N_Elf_Rel::r_info + 2, - new QStandardItem(XBinary::valueToHex( - (quint32)S_ELF64_R_SYM(listRel64.at(i).r_info)))); - (*g_ppModel) - ->setItem(i, N_Elf_Rel::r_info + 3, - new QStandardItem(mapTypes.value( - S_ELF64_R_TYPE(listRel64.at(i).r_info)))); + (*g_ppModel)->setItem(i, N_Elf_Rel::r_offset + 1, new QStandardItem(XBinary::valueToHex(listRel64.at(i).r_offset))); + (*g_ppModel)->setItem(i, N_Elf_Rel::r_info + 1, new QStandardItem(XBinary::valueToHex(listRel64.at(i).r_info))); + (*g_ppModel)->setItem(i, N_Elf_Rel::r_info + 2, new QStandardItem(XBinary::valueToHex((quint32)S_ELF64_R_SYM(listRel64.at(i).r_info)))); + (*g_ppModel)->setItem(i, N_Elf_Rel::r_info + 3, new QStandardItem(mapTypes.value(S_ELF64_R_TYPE(listRel64.at(i).r_info)))); } else { QStandardItem *pItem = new QStandardItem(QString::number(i)); - pItem->setData(g_nOffset + i * sizeof(XELF_DEF::Elf32_Rel), - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); - pItem->setData( - g_nOffset + i * sizeof(XELF_DEF::Elf32_Rel), - Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); + pItem->setData(g_nOffset + i * sizeof(XELF_DEF::Elf32_Rel), Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(g_nOffset + i * sizeof(XELF_DEF::Elf32_Rel), Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, N_Elf_Rel::r_offset + 1, - new QStandardItem(XBinary::valueToHex( - listRel32.at(i).r_offset))); - (*g_ppModel) - ->setItem(i, N_Elf_Rel::r_info + 1, - new QStandardItem( - XBinary::valueToHex(listRel32.at(i).r_info))); - (*g_ppModel) - ->setItem( - i, N_Elf_Rel::r_info + 2, - new QStandardItem(XBinary::valueToHex( - (quint32)S_ELF32_R_SYM(listRel32.at(i).r_info)))); - (*g_ppModel) - ->setItem(i, N_Elf_Rel::r_info + 3, - new QStandardItem(mapTypes.value( - S_ELF32_R_TYPE(listRel32.at(i).r_info)))); + (*g_ppModel)->setItem(i, N_Elf_Rel::r_offset + 1, new QStandardItem(XBinary::valueToHex(listRel32.at(i).r_offset))); + (*g_ppModel)->setItem(i, N_Elf_Rel::r_info + 1, new QStandardItem(XBinary::valueToHex(listRel32.at(i).r_info))); + (*g_ppModel)->setItem(i, N_Elf_Rel::r_info + 2, new QStandardItem(XBinary::valueToHex((quint32)S_ELF32_R_SYM(listRel32.at(i).r_info)))); + (*g_ppModel)->setItem(i, N_Elf_Rel::r_info + 3, new QStandardItem(mapTypes.value(S_ELF32_R_TYPE(listRel32.at(i).r_info)))); } incValue(); @@ -935,205 +581,73 @@ void ELFProcessData::ajustTableView(QWidget *pWidget, QTableView *pTableView) { if (g_nType == SELF::TYPE_SYMBOLTABLE) { if (g_pELF->is64()) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, - FormatWidget::CW_UINT16, mode)); - pTableView->setColumnWidth( - N_Elf64_Sym::st_name + 1, - FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - N_Elf64_Sym::st_info + 1, - FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT8, - mode)); - pTableView->setColumnWidth( - N_Elf64_Sym::st_other + 1, - FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT8, - mode)); - pTableView->setColumnWidth( - N_Elf64_Sym::st_shndx + 1, - FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - N_Elf64_Sym::st_value + 1, - FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - N_Elf64_Sym::st_size + 1, - FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - N_Elf64_Sym::st_size + 2, - FormatWidget::getColumnWidth( - pWidget, FormatWidget::CW_STRINGLONG, mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(N_Elf64_Sym::st_name + 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(N_Elf64_Sym::st_info + 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT8, mode)); + pTableView->setColumnWidth(N_Elf64_Sym::st_other + 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT8, mode)); + pTableView->setColumnWidth(N_Elf64_Sym::st_shndx + 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(N_Elf64_Sym::st_value + 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(N_Elf64_Sym::st_size + 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(N_Elf64_Sym::st_size + 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGLONG, mode)); } else { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, - FormatWidget::CW_UINT16, mode)); - pTableView->setColumnWidth( - N_Elf32_Sym::st_name + 1, - FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - N_Elf32_Sym::st_value + 1, - FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - N_Elf32_Sym::st_size + 1, - FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - N_Elf32_Sym::st_info + 1, - FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT8, - mode)); - pTableView->setColumnWidth( - N_Elf32_Sym::st_other + 1, - FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT8, - mode)); - pTableView->setColumnWidth( - N_Elf32_Sym::st_shndx + 1, - FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - N_Elf32_Sym::st_shndx + 2, - FormatWidget::getColumnWidth( - pWidget, FormatWidget::CW_STRINGLONG, mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(N_Elf32_Sym::st_name + 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(N_Elf32_Sym::st_value + 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(N_Elf32_Sym::st_size + 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(N_Elf32_Sym::st_info + 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT8, mode)); + pTableView->setColumnWidth(N_Elf32_Sym::st_other + 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT8, mode)); + pTableView->setColumnWidth(N_Elf32_Sym::st_shndx + 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(N_Elf32_Sym::st_shndx + 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGLONG, mode)); } } else if (g_nType == SELF::TYPE_Elf_Shdr) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 7, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 8, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 9, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 10, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 11, FormatWidget::getColumnWidth(pWidget, - FormatWidget::CW_STRINGMID, mode)); - pTableView->setColumnWidth( - 12, FormatWidget::getColumnWidth( - pWidget, FormatWidget::CW_STRINGSHORT, mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(7, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(8, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(9, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(10, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(11, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGMID, mode)); + pTableView->setColumnWidth(12, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGSHORT, mode)); } else if (g_nType == SELF::TYPE_Elf_Phdr) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 7, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 8, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 9, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(7, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(8, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(9, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); } else if (g_nType == SELF::TYPE_Elf_DynamicArrayTags) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGMID, - mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGMID, mode)); } else if (g_nType == SELF::TYPE_NOTES) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, - FormatWidget::CW_STRINGLONG, mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGLONG, mode)); } else if (g_nType == SELF::TYPE_LIBRARIES) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, - FormatWidget::CW_STRINGLONG, mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGLONG, mode)); } else if (g_nType == SELF::TYPE_Elf_Rela) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGMID, - mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGMID, mode)); } else if (g_nType == SELF::TYPE_Elf_Rel) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGMID, - mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGMID, mode)); } } diff --git a/ELF/elfprocessdata.h b/ELF/elfprocessdata.h index 99a3d33a..b7f5f5cd 100755 --- a/ELF/elfprocessdata.h +++ b/ELF/elfprocessdata.h @@ -27,15 +27,14 @@ class ELFProcessData : public ProcessData { Q_OBJECT - public: - explicit ELFProcessData(int nType, QStandardItemModel **ppModel, XELF *pELF, - qint64 nOffset, qint64 nSize, - qint64 nStringTableOffset, qint64 nStringTableSize); +public: + explicit ELFProcessData(int nType, QStandardItemModel **ppModel, XELF *pELF, qint64 nOffset, qint64 nSize, qint64 nStringTableOffset, + qint64 nStringTableSize); virtual void _process(); virtual void ajustTableView(QWidget *pWidget, QTableView *pTableView); - private: +private: int g_nType; XELF *g_pELF; QStandardItemModel **g_ppModel; diff --git a/ELF/elfsectionheaderwidget.cpp b/ELF/elfsectionheaderwidget.cpp index 5aaddda3..7100e68d 100644 --- a/ELF/elfsectionheaderwidget.cpp +++ b/ELF/elfsectionheaderwidget.cpp @@ -22,15 +22,11 @@ #include "ui_elfsectionheaderwidget.h" -ELFSectionHeaderWidget::ELFSectionHeaderWidget(QWidget *pParent) - : FormatWidget(pParent), ui(new Ui::ELFSectionHeaderWidget) { +ELFSectionHeaderWidget::ELFSectionHeaderWidget(QWidget *pParent) : FormatWidget(pParent), ui(new Ui::ELFSectionHeaderWidget) { ui->setupUi(this); } -ELFSectionHeaderWidget::ELFSectionHeaderWidget(QIODevice *pDevice, - FW_DEF::OPTIONS options, - quint32 nNumber, qint64 nOffset, - qint32 nType, QWidget *pParent) +ELFSectionHeaderWidget::ELFSectionHeaderWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, quint32 nNumber, qint64 nOffset, qint32 nType, QWidget *pParent) : ELFSectionHeaderWidget(pParent) { setData(pDevice, options, nNumber, nOffset, nType); @@ -107,7 +103,9 @@ void ELFSectionHeaderWidget::clear() { ui->checkBoxReadonly->setChecked(true); } -void ELFSectionHeaderWidget::cleanup() { ELFSectionHeaderWidget::clear(); } +void ELFSectionHeaderWidget::cleanup() { + ELFSectionHeaderWidget::clear(); +} void ELFSectionHeaderWidget::reload() { ELFSectionHeaderWidget::clear(); @@ -117,22 +115,17 @@ void ELFSectionHeaderWidget::reload() { reloadData(); } -void ELFSectionHeaderWidget::setGlobal(XShortcuts *pShortcuts, - XOptions *pXOptions) { +void ELFSectionHeaderWidget::setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions) { ui->widgetHex->setGlobal(pShortcuts, pXOptions); XShortcutsWidget::setGlobal(pShortcuts, pXOptions); } -void ELFSectionHeaderWidget::setStringTable(qint64 nStringTableOffset, - qint64 nStringTableSize) { +void ELFSectionHeaderWidget::setStringTable(qint64 nStringTableOffset, qint64 nStringTableSize) { this->g_nStringTableOffset = nStringTableOffset; this->g_nStringTableSize = nStringTableSize; } -FormatWidget::SV ELFSectionHeaderWidget::_setValue(QVariant vValue, int nStype, - int nNdata, int nVtype, - int nPosition, - qint64 nOffset) { +FormatWidget::SV ELFSectionHeaderWidget::_setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset) { Q_UNUSED(nVtype) SV result = SV_NONE; @@ -148,37 +141,27 @@ FormatWidget::SV ELFSectionHeaderWidget::_setValue(QVariant vValue, int nStype, if (elf.is64()) { switch (nNdata) { case N_Elf_Shdr::sh_name: - addComment(ui->tableWidget, N_Elf_Shdr::sh_name, - HEADER_COLUMN_COMMENT, - elf.getStringFromIndex( - g_nStringTableOffset, - g_nStringTableSize, nValue)); + addComment(ui->tableWidget, N_Elf_Shdr::sh_name, HEADER_COLUMN_COMMENT, + elf.getStringFromIndex(g_nStringTableOffset, g_nStringTableSize, nValue)); break; case N_Elf_Shdr::sh_type: - g_ppComboBox[N_Elf_Shdr::CB_TYPE]->setValue( - nValue); + g_ppComboBox[N_Elf_Shdr::CB_TYPE]->setValue(nValue); break; case N_Elf_Shdr::sh_flags: - g_ppComboBox[N_Elf_Shdr::CB_FLAGS]->setValue( - nValue); + g_ppComboBox[N_Elf_Shdr::CB_FLAGS]->setValue(nValue); break; } } else { switch (nNdata) { case N_Elf_Shdr::sh_name: - addComment(ui->tableWidget, N_Elf_Shdr::sh_name, - HEADER_COLUMN_COMMENT, - elf.getStringFromIndex( - g_nStringTableOffset, - g_nStringTableSize, nValue)); + addComment(ui->tableWidget, N_Elf_Shdr::sh_name, HEADER_COLUMN_COMMENT, + elf.getStringFromIndex(g_nStringTableOffset, g_nStringTableSize, nValue)); break; case N_Elf_Shdr::sh_type: - g_ppComboBox[N_Elf_Shdr::CB_TYPE]->setValue( - nValue); + g_ppComboBox[N_Elf_Shdr::CB_TYPE]->setValue(nValue); break; case N_Elf_Shdr::sh_flags: - g_ppComboBox[N_Elf_Shdr::CB_FLAGS]->setValue( - nValue); + g_ppComboBox[N_Elf_Shdr::CB_FLAGS]->setValue(nValue); break; } } @@ -189,23 +172,19 @@ FormatWidget::SV ELFSectionHeaderWidget::_setValue(QVariant vValue, int nStype, if (elf.is64()) { switch (nNdata) { case N_Elf_Phdr64::p_type: - g_ppComboBox[N_Elf_Phdr64::CB_TYPE]->setValue( - nValue); + g_ppComboBox[N_Elf_Phdr64::CB_TYPE]->setValue(nValue); break; case N_Elf_Phdr64::p_flags: - g_ppComboBox[N_Elf_Phdr64::CB_FLAGS]->setValue( - nValue); + g_ppComboBox[N_Elf_Phdr64::CB_FLAGS]->setValue(nValue); break; } } else { switch (nNdata) { case N_Elf_Phdr32::p_type: - g_ppComboBox[N_Elf_Phdr32::CB_TYPE]->setValue( - nValue); + g_ppComboBox[N_Elf_Phdr32::CB_TYPE]->setValue(nValue); break; case N_Elf_Phdr32::p_flags: - g_ppComboBox[N_Elf_Phdr32::CB_FLAGS]->setValue( - nValue); + g_ppComboBox[N_Elf_Phdr32::CB_FLAGS]->setValue(nValue); break; } } @@ -215,8 +194,7 @@ FormatWidget::SV ELFSectionHeaderWidget::_setValue(QVariant vValue, int nStype, case SELF::TYPE_Elf_DynamicArrayTags: switch (nNdata) { case N_Elf_DynamicArrayTags::d_tag: - g_ppComboBox[N_Elf_DynamicArrayTags::CB_TAG] - ->setValue(nValue); + g_ppComboBox[N_Elf_DynamicArrayTags::CB_TAG]->setValue(nValue); break; } @@ -226,23 +204,15 @@ FormatWidget::SV ELFSectionHeaderWidget::_setValue(QVariant vValue, int nStype, if (elf.is64()) { switch (nNdata) { case N_Elf64_Sym::st_name: - addComment( - ui->tableWidget, N_Elf64_Sym::st_name, - HEADER_COLUMN_COMMENT, - elf.getStringFromIndex(g_nStringTableOffset, - g_nStringTableSize, - nValue)); + addComment(ui->tableWidget, N_Elf64_Sym::st_name, HEADER_COLUMN_COMMENT, + elf.getStringFromIndex(g_nStringTableOffset, g_nStringTableSize, nValue)); break; } } else { switch (nNdata) { case N_Elf32_Sym::st_name: - addComment( - ui->tableWidget, N_Elf32_Sym::st_name, - HEADER_COLUMN_COMMENT, - elf.getStringFromIndex(g_nStringTableOffset, - g_nStringTableSize, - nValue)); + addComment(ui->tableWidget, N_Elf32_Sym::st_name, HEADER_COLUMN_COMMENT, + elf.getStringFromIndex(g_nStringTableOffset, g_nStringTableSize, nValue)); break; } } @@ -255,87 +225,67 @@ FormatWidget::SV ELFSectionHeaderWidget::_setValue(QVariant vValue, int nStype, if (elf.is64()) { switch (nNdata) { case N_Elf_Shdr::sh_name: - elf.setElf64_Shdr_name((quint32)nPosition, - (quint32)nValue); + elf.setElf64_Shdr_name((quint32)nPosition, (quint32)nValue); break; case N_Elf_Shdr::sh_type: - elf.setElf64_Shdr_type((quint32)nPosition, - (quint32)nValue); + elf.setElf64_Shdr_type((quint32)nPosition, (quint32)nValue); break; case N_Elf_Shdr::sh_flags: - elf.setElf64_Shdr_flags((quint64)nPosition, - (quint32)nValue); + elf.setElf64_Shdr_flags((quint64)nPosition, (quint32)nValue); break; case N_Elf_Shdr::sh_addr: - elf.setElf64_Shdr_addr((quint64)nPosition, - (quint32)nValue); + elf.setElf64_Shdr_addr((quint64)nPosition, (quint32)nValue); break; case N_Elf_Shdr::sh_offset: - elf.setElf64_Shdr_offset((quint64)nPosition, - (quint32)nValue); + elf.setElf64_Shdr_offset((quint64)nPosition, (quint32)nValue); break; case N_Elf_Shdr::sh_size: - elf.setElf64_Shdr_size((quint64)nPosition, - (quint32)nValue); + elf.setElf64_Shdr_size((quint64)nPosition, (quint32)nValue); break; case N_Elf_Shdr::sh_link: - elf.setElf64_Shdr_link((quint32)nPosition, - (quint32)nValue); + elf.setElf64_Shdr_link((quint32)nPosition, (quint32)nValue); break; case N_Elf_Shdr::sh_info: - elf.setElf64_Shdr_info((quint32)nPosition, - (quint32)nValue); + elf.setElf64_Shdr_info((quint32)nPosition, (quint32)nValue); break; case N_Elf_Shdr::sh_addralign: - elf.setElf64_Shdr_addralign((quint64)nPosition, - (quint32)nValue); + elf.setElf64_Shdr_addralign((quint64)nPosition, (quint32)nValue); break; case N_Elf_Shdr::sh_entsize: - elf.setElf64_Shdr_entsize((quint64)nPosition, - (quint32)nValue); + elf.setElf64_Shdr_entsize((quint64)nPosition, (quint32)nValue); break; } } else { switch (nNdata) { case N_Elf_Shdr::sh_name: - elf.setElf32_Shdr_name((quint32)nPosition, - (quint32)nValue); + elf.setElf32_Shdr_name((quint32)nPosition, (quint32)nValue); break; case N_Elf_Shdr::sh_type: - elf.setElf32_Shdr_type((quint32)nPosition, - (quint32)nValue); + elf.setElf32_Shdr_type((quint32)nPosition, (quint32)nValue); break; case N_Elf_Shdr::sh_flags: - elf.setElf32_Shdr_flags((quint32)nPosition, - (quint32)nValue); + elf.setElf32_Shdr_flags((quint32)nPosition, (quint32)nValue); break; case N_Elf_Shdr::sh_addr: - elf.setElf32_Shdr_addr((quint32)nPosition, - (quint32)nValue); + elf.setElf32_Shdr_addr((quint32)nPosition, (quint32)nValue); break; case N_Elf_Shdr::sh_offset: - elf.setElf32_Shdr_offset((quint32)nPosition, - (quint32)nValue); + elf.setElf32_Shdr_offset((quint32)nPosition, (quint32)nValue); break; case N_Elf_Shdr::sh_size: - elf.setElf32_Shdr_size((quint32)nPosition, - (quint32)nValue); + elf.setElf32_Shdr_size((quint32)nPosition, (quint32)nValue); break; case N_Elf_Shdr::sh_link: - elf.setElf32_Shdr_link((quint32)nPosition, - (quint32)nValue); + elf.setElf32_Shdr_link((quint32)nPosition, (quint32)nValue); break; case N_Elf_Shdr::sh_info: - elf.setElf32_Shdr_info((quint32)nPosition, - (quint32)nValue); + elf.setElf32_Shdr_info((quint32)nPosition, (quint32)nValue); break; case N_Elf_Shdr::sh_addralign: - elf.setElf32_Shdr_addralign((quint32)nPosition, - (quint32)nValue); + elf.setElf32_Shdr_addralign((quint32)nPosition, (quint32)nValue); break; case N_Elf_Shdr::sh_entsize: - elf.setElf32_Shdr_entsize((quint32)nPosition, - (quint32)nValue); + elf.setElf32_Shdr_entsize((quint32)nPosition, (quint32)nValue); break; } } @@ -346,71 +296,55 @@ FormatWidget::SV ELFSectionHeaderWidget::_setValue(QVariant vValue, int nStype, if (elf.is64()) { switch (nNdata) { case N_Elf_Phdr64::p_type: - elf.setElf64_Phdr_type((quint32)nPosition, - (quint32)nValue); + elf.setElf64_Phdr_type((quint32)nPosition, (quint32)nValue); break; case N_Elf_Phdr64::p_flags: - elf.setElf64_Phdr_flags((quint32)nPosition, - (quint32)nValue); + elf.setElf64_Phdr_flags((quint32)nPosition, (quint32)nValue); break; case N_Elf_Phdr64::p_offset: - elf.setElf64_Phdr_offset((quint64)nPosition, - (quint32)nValue); + elf.setElf64_Phdr_offset((quint64)nPosition, (quint32)nValue); break; case N_Elf_Phdr64::p_vaddr: - elf.setElf64_Phdr_vaddr((quint64)nPosition, - (quint32)nValue); + elf.setElf64_Phdr_vaddr((quint64)nPosition, (quint32)nValue); break; case N_Elf_Phdr64::p_paddr: - elf.setElf64_Phdr_paddr((quint64)nPosition, - (quint32)nValue); + elf.setElf64_Phdr_paddr((quint64)nPosition, (quint32)nValue); break; case N_Elf_Phdr64::p_filesz: - elf.setElf64_Phdr_filesz((quint64)nPosition, - (quint32)nValue); + elf.setElf64_Phdr_filesz((quint64)nPosition, (quint32)nValue); break; case N_Elf_Phdr64::p_memsz: - elf.setElf64_Phdr_memsz((quint64)nPosition, - (quint32)nValue); + elf.setElf64_Phdr_memsz((quint64)nPosition, (quint32)nValue); break; case N_Elf_Phdr64::p_align: - elf.setElf64_Phdr_align((quint64)nPosition, - (quint32)nValue); + elf.setElf64_Phdr_align((quint64)nPosition, (quint32)nValue); break; } } else { switch (nNdata) { case N_Elf_Phdr32::p_type: - elf.setElf32_Phdr_type((quint32)nPosition, - (quint32)nValue); + elf.setElf32_Phdr_type((quint32)nPosition, (quint32)nValue); break; case N_Elf_Phdr32::p_offset: - elf.setElf32_Phdr_offset((quint32)nPosition, - (quint32)nValue); + elf.setElf32_Phdr_offset((quint32)nPosition, (quint32)nValue); break; case N_Elf_Phdr32::p_vaddr: - elf.setElf32_Phdr_vaddr((quint32)nPosition, - (quint32)nValue); + elf.setElf32_Phdr_vaddr((quint32)nPosition, (quint32)nValue); break; case N_Elf_Phdr32::p_paddr: - elf.setElf32_Phdr_paddr((quint32)nPosition, - (quint32)nValue); + elf.setElf32_Phdr_paddr((quint32)nPosition, (quint32)nValue); break; case N_Elf_Phdr32::p_filesz: - elf.setElf32_Phdr_filesz((quint32)nPosition, - (quint32)nValue); + elf.setElf32_Phdr_filesz((quint32)nPosition, (quint32)nValue); break; case N_Elf_Phdr32::p_memsz: - elf.setElf32_Phdr_memsz((quint32)nPosition, - (quint32)nValue); + elf.setElf32_Phdr_memsz((quint32)nPosition, (quint32)nValue); break; case N_Elf_Phdr32::p_flags: - elf.setElf32_Phdr_flags((quint32)nPosition, - (quint32)nValue); + elf.setElf32_Phdr_flags((quint32)nPosition, (quint32)nValue); break; case N_Elf_Phdr32::p_align: - elf.setElf32_Phdr_align((quint32)nPosition, - (quint32)nValue); + elf.setElf32_Phdr_align((quint32)nPosition, (quint32)nValue); break; } } @@ -433,63 +367,43 @@ FormatWidget::SV ELFSectionHeaderWidget::_setValue(QVariant vValue, int nStype, if (elf.is64()) { switch (nNdata) { case N_Elf64_Sym::st_name: - elf.setElf64_Sym_st_name(nOffset, - (quint32)nValue, - elf.isBigEndian()); + elf.setElf64_Sym_st_name(nOffset, (quint32)nValue, elf.isBigEndian()); break; case N_Elf64_Sym::st_info: - elf.setElf64_Sym_st_info(nOffset, - (quint8)nValue); + elf.setElf64_Sym_st_info(nOffset, (quint8)nValue); break; case N_Elf64_Sym::st_other: - elf.setElf64_Sym_st_other(nOffset, - (quint8)nValue); + elf.setElf64_Sym_st_other(nOffset, (quint8)nValue); break; case N_Elf64_Sym::st_shndx: - elf.setElf64_Sym_st_shndx(nOffset, - (quint16)nValue, - elf.isBigEndian()); + elf.setElf64_Sym_st_shndx(nOffset, (quint16)nValue, elf.isBigEndian()); break; case N_Elf64_Sym::st_value: - elf.setElf64_Sym_st_value(nOffset, - (quint64)nValue, - elf.isBigEndian()); + elf.setElf64_Sym_st_value(nOffset, (quint64)nValue, elf.isBigEndian()); break; case N_Elf64_Sym::st_size: - elf.setElf64_Sym_st_size(nOffset, - (quint64)nValue, - elf.isBigEndian()); + elf.setElf64_Sym_st_size(nOffset, (quint64)nValue, elf.isBigEndian()); break; } } else { switch (nNdata) { case N_Elf32_Sym::st_name: - elf.setElf32_Sym_st_name(nOffset, - (quint32)nValue, - elf.isBigEndian()); + elf.setElf32_Sym_st_name(nOffset, (quint32)nValue, elf.isBigEndian()); break; case N_Elf32_Sym::st_value: - elf.setElf32_Sym_st_value(nOffset, - (quint32)nValue, - elf.isBigEndian()); + elf.setElf32_Sym_st_value(nOffset, (quint32)nValue, elf.isBigEndian()); break; case N_Elf32_Sym::st_size: - elf.setElf32_Sym_st_size(nOffset, - (quint32)nValue, - elf.isBigEndian()); + elf.setElf32_Sym_st_size(nOffset, (quint32)nValue, elf.isBigEndian()); break; case N_Elf32_Sym::st_info: - elf.setElf32_Sym_st_info(nOffset, - (quint8)nValue); + elf.setElf32_Sym_st_info(nOffset, (quint8)nValue); break; case N_Elf32_Sym::st_other: - elf.setElf32_Sym_st_other(nOffset, - (quint8)nValue); + elf.setElf32_Sym_st_other(nOffset, (quint8)nValue); break; case N_Elf32_Sym::st_shndx: - elf.setElf32_Sym_st_shndx(nOffset, - (quint16)nValue, - elf.isBigEndian()); + elf.setElf32_Sym_st_shndx(nOffset, (quint16)nValue, elf.isBigEndian()); break; } } @@ -500,37 +414,25 @@ FormatWidget::SV ELFSectionHeaderWidget::_setValue(QVariant vValue, int nStype, if (elf.is64()) { switch (nNdata) { case N_Elf_Rela::r_offset: - elf.setElf64_Rela_r_offset(nOffset, - (quint32)nValue, - elf.isBigEndian()); + elf.setElf64_Rela_r_offset(nOffset, (quint32)nValue, elf.isBigEndian()); break; case N_Elf_Rela::r_info: - elf.setElf64_Rela_r_info(nOffset, - (quint32)nValue, - elf.isBigEndian()); + elf.setElf64_Rela_r_info(nOffset, (quint32)nValue, elf.isBigEndian()); break; case N_Elf_Rela::r_addend: - elf.setElf64_Rela_r_addend(nOffset, - (quint32)nValue, - elf.isBigEndian()); + elf.setElf64_Rela_r_addend(nOffset, (quint32)nValue, elf.isBigEndian()); break; } } else { switch (nNdata) { case N_Elf_Rela::r_offset: - elf.setElf32_Rela_r_offset(nOffset, - (quint64)nValue, - elf.isBigEndian()); + elf.setElf32_Rela_r_offset(nOffset, (quint64)nValue, elf.isBigEndian()); break; case N_Elf_Rela::r_info: - elf.setElf32_Rela_r_info(nOffset, - (quint64)nValue, - elf.isBigEndian()); + elf.setElf32_Rela_r_info(nOffset, (quint64)nValue, elf.isBigEndian()); break; case N_Elf_Rela::r_addend: - elf.setElf32_Rela_r_addend(nOffset, - (quint64)nValue, - elf.isBigEndian()); + elf.setElf32_Rela_r_addend(nOffset, (quint64)nValue, elf.isBigEndian()); break; } } @@ -541,27 +443,19 @@ FormatWidget::SV ELFSectionHeaderWidget::_setValue(QVariant vValue, int nStype, if (elf.is64()) { switch (nNdata) { case N_Elf_Rel::r_offset: - elf.setElf64_Rel_r_offset(nOffset, - (quint32)nValue, - elf.isBigEndian()); + elf.setElf64_Rel_r_offset(nOffset, (quint32)nValue, elf.isBigEndian()); break; case N_Elf_Rel::r_info: - elf.setElf64_Rel_r_info(nOffset, - (quint32)nValue, - elf.isBigEndian()); + elf.setElf64_Rel_r_info(nOffset, (quint32)nValue, elf.isBigEndian()); break; } } else { switch (nNdata) { case N_Elf_Rel::r_offset: - elf.setElf32_Rel_r_offset(nOffset, - (quint64)nValue, - elf.isBigEndian()); + elf.setElf32_Rel_r_offset(nOffset, (quint64)nValue, elf.isBigEndian()); break; case N_Elf_Rel::r_info: - elf.setElf32_Rel_r_info(nOffset, - (quint64)nValue, - elf.isBigEndian()); + elf.setElf32_Rel_r_info(nOffset, (quint64)nValue, elf.isBigEndian()); break; } } @@ -587,69 +481,47 @@ void ELFSectionHeaderWidget::blockSignals(bool bState) { _blockSignals((QObject **)g_ppComboBox, g_nComboBoxSize, bState); } -void ELFSectionHeaderWidget::adjustHeaderTable(int nType, - QTableWidget *pTableWidget) { - XBinary::MODE mode = XELF::getMode(getDevice(), getOptions().bIsImage, - getOptions().nImageBase); +void ELFSectionHeaderWidget::adjustHeaderTable(int nType, QTableWidget *pTableWidget) { + XBinary::MODE mode = XELF::getMode(getDevice(), getOptions().bIsImage, getOptions().nImageBase); - pTableWidget->setColumnWidth(HEADER_COLUMN_OFFSET, - getColumnWidth(this, CW_UINT16, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_TYPE, - getColumnWidth(this, CW_TYPE, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_OFFSET, getColumnWidth(this, CW_UINT16, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_TYPE, getColumnWidth(this, CW_TYPE, mode)); switch (nType) { case SELF::TYPE_Elf_Shdr: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); break; case SELF::TYPE_Elf_Phdr: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); break; case SELF::TYPE_Elf_DynamicArrayTags: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); break; case SELF::TYPE_SYMBOLTABLE: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); break; case SELF::TYPE_Elf_Rela: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); break; case SELF::TYPE_Elf_Rel: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); break; } } @@ -667,16 +539,12 @@ void ELFSectionHeaderWidget::reloadData() { bool bIs64 = elf.is64(); if (nType == SELF::TYPE_Elf_Shdr) { - createHeaderTable( - SELF::TYPE_Elf_Shdr, ui->tableWidget, - bIs64 ? (N_Elf_Shdr::records64) : (N_Elf_Shdr::records32), - g_ppLinedEdit, N_Elf_Shdr::__data_size, getNumber()); - g_ppComboBox[N_Elf_Shdr::CB_TYPE] = createComboBox( - ui->tableWidget, XELF::getSectionTypesS(), SELF::TYPE_Elf_Shdr, - N_Elf_Shdr::sh_type, XComboBoxEx::CBTYPE_LIST); - g_ppComboBox[N_Elf_Shdr::CB_FLAGS] = createComboBox( - ui->tableWidget, XELF::getSectionFlagsS(), SELF::TYPE_Elf_Shdr, - N_Elf_Shdr::sh_flags, XComboBoxEx::CBTYPE_FLAGS); + createHeaderTable(SELF::TYPE_Elf_Shdr, ui->tableWidget, bIs64 ? (N_Elf_Shdr::records64) : (N_Elf_Shdr::records32), g_ppLinedEdit, + N_Elf_Shdr::__data_size, getNumber()); + g_ppComboBox[N_Elf_Shdr::CB_TYPE] = + createComboBox(ui->tableWidget, XELF::getSectionTypesS(), SELF::TYPE_Elf_Shdr, N_Elf_Shdr::sh_type, XComboBoxEx::CBTYPE_LIST); + g_ppComboBox[N_Elf_Shdr::CB_FLAGS] = + createComboBox(ui->tableWidget, XELF::getSectionFlagsS(), SELF::TYPE_Elf_Shdr, N_Elf_Shdr::sh_flags, XComboBoxEx::CBTYPE_FLAGS); blockSignals(true); @@ -687,23 +555,18 @@ void ELFSectionHeaderWidget::reloadData() { g_ppLinedEdit[N_Elf_Shdr::sh_type]->setValue(shdr64.sh_type); g_ppLinedEdit[N_Elf_Shdr::sh_flags]->setValue(shdr64.sh_flags); g_ppLinedEdit[N_Elf_Shdr::sh_addr]->setValue(shdr64.sh_addr); - g_ppLinedEdit[N_Elf_Shdr::sh_offset]->setValue( - shdr64.sh_offset); + g_ppLinedEdit[N_Elf_Shdr::sh_offset]->setValue(shdr64.sh_offset); g_ppLinedEdit[N_Elf_Shdr::sh_size]->setValue(shdr64.sh_size); g_ppLinedEdit[N_Elf_Shdr::sh_link]->setValue(shdr64.sh_link); g_ppLinedEdit[N_Elf_Shdr::sh_info]->setValue(shdr64.sh_info); - g_ppLinedEdit[N_Elf_Shdr::sh_addralign]->setValue( - shdr64.sh_addralign); - g_ppLinedEdit[N_Elf_Shdr::sh_entsize]->setValue( - shdr64.sh_entsize); + g_ppLinedEdit[N_Elf_Shdr::sh_addralign]->setValue(shdr64.sh_addralign); + g_ppLinedEdit[N_Elf_Shdr::sh_entsize]->setValue(shdr64.sh_entsize); g_ppComboBox[N_Elf_Shdr::CB_TYPE]->setValue(shdr64.sh_type); g_ppComboBox[N_Elf_Shdr::CB_FLAGS]->setValue(shdr64.sh_flags); - addComment( - ui->tableWidget, N_Elf_Shdr::sh_name, HEADER_COLUMN_COMMENT, - elf.getStringFromIndex(g_nStringTableOffset, - g_nStringTableSize, shdr64.sh_name)); + addComment(ui->tableWidget, N_Elf_Shdr::sh_name, HEADER_COLUMN_COMMENT, + elf.getStringFromIndex(g_nStringTableOffset, g_nStringTableSize, shdr64.sh_name)); } else { XELF_DEF::Elf32_Shdr shdr32 = elf.getElf32_Shdr(getNumber()); @@ -711,58 +574,40 @@ void ELFSectionHeaderWidget::reloadData() { g_ppLinedEdit[N_Elf_Shdr::sh_type]->setValue(shdr32.sh_type); g_ppLinedEdit[N_Elf_Shdr::sh_flags]->setValue(shdr32.sh_flags); g_ppLinedEdit[N_Elf_Shdr::sh_addr]->setValue(shdr32.sh_addr); - g_ppLinedEdit[N_Elf_Shdr::sh_offset]->setValue( - shdr32.sh_offset); + g_ppLinedEdit[N_Elf_Shdr::sh_offset]->setValue(shdr32.sh_offset); g_ppLinedEdit[N_Elf_Shdr::sh_size]->setValue(shdr32.sh_size); g_ppLinedEdit[N_Elf_Shdr::sh_link]->setValue(shdr32.sh_link); g_ppLinedEdit[N_Elf_Shdr::sh_info]->setValue(shdr32.sh_info); - g_ppLinedEdit[N_Elf_Shdr::sh_addralign]->setValue( - shdr32.sh_addralign); - g_ppLinedEdit[N_Elf_Shdr::sh_entsize]->setValue( - shdr32.sh_entsize); + g_ppLinedEdit[N_Elf_Shdr::sh_addralign]->setValue(shdr32.sh_addralign); + g_ppLinedEdit[N_Elf_Shdr::sh_entsize]->setValue(shdr32.sh_entsize); g_ppComboBox[N_Elf_Shdr::CB_TYPE]->setValue(shdr32.sh_type); g_ppComboBox[N_Elf_Shdr::CB_FLAGS]->setValue(shdr32.sh_flags); - addComment( - ui->tableWidget, N_Elf_Shdr::sh_name, HEADER_COLUMN_COMMENT, - elf.getStringFromIndex(g_nStringTableOffset, - g_nStringTableSize, shdr32.sh_name)); + addComment(ui->tableWidget, N_Elf_Shdr::sh_name, HEADER_COLUMN_COMMENT, + elf.getStringFromIndex(g_nStringTableOffset, g_nStringTableSize, shdr32.sh_name)); } qint64 nOffset = elf.getShdrOffset(getNumber()); qint64 nSize = elf.getShdrSize(); qint64 nAddress = elf.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, - ui->widgetHex); + loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, ui->widgetHex); blockSignals(false); } else if (nType == SELF::TYPE_Elf_Phdr) { if (bIs64) { - createHeaderTable(SELF::TYPE_Elf_Phdr, ui->tableWidget, - N_Elf_Phdr64::records, g_ppLinedEdit, - N_Elf_Phdr64::__data_size, getNumber()); + createHeaderTable(SELF::TYPE_Elf_Phdr, ui->tableWidget, N_Elf_Phdr64::records, g_ppLinedEdit, N_Elf_Phdr64::__data_size, getNumber()); g_ppComboBox[N_Elf_Phdr64::CB_TYPE] = - createComboBox(ui->tableWidget, XELF::getProgramTypesS(), - SELF::TYPE_Elf_Phdr, N_Elf_Phdr64::p_type, - XComboBoxEx::CBTYPE_LIST); + createComboBox(ui->tableWidget, XELF::getProgramTypesS(), SELF::TYPE_Elf_Phdr, N_Elf_Phdr64::p_type, XComboBoxEx::CBTYPE_LIST); g_ppComboBox[N_Elf_Phdr64::CB_FLAGS] = - createComboBox(ui->tableWidget, XELF::getProgramFlagsS(), - SELF::TYPE_Elf_Phdr, N_Elf_Phdr64::p_flags, - XComboBoxEx::CBTYPE_FLAGS); + createComboBox(ui->tableWidget, XELF::getProgramFlagsS(), SELF::TYPE_Elf_Phdr, N_Elf_Phdr64::p_flags, XComboBoxEx::CBTYPE_FLAGS); } else { - createHeaderTable(SELF::TYPE_Elf_Phdr, ui->tableWidget, - N_Elf_Phdr32::records, g_ppLinedEdit, - N_Elf_Phdr32::__data_size, getNumber()); + createHeaderTable(SELF::TYPE_Elf_Phdr, ui->tableWidget, N_Elf_Phdr32::records, g_ppLinedEdit, N_Elf_Phdr32::__data_size, getNumber()); g_ppComboBox[N_Elf_Phdr32::CB_TYPE] = - createComboBox(ui->tableWidget, XELF::getProgramTypesS(), - SELF::TYPE_Elf_Phdr, N_Elf_Phdr32::p_type, - XComboBoxEx::CBTYPE_LIST); + createComboBox(ui->tableWidget, XELF::getProgramTypesS(), SELF::TYPE_Elf_Phdr, N_Elf_Phdr32::p_type, XComboBoxEx::CBTYPE_LIST); g_ppComboBox[N_Elf_Phdr32::CB_FLAGS] = - createComboBox(ui->tableWidget, XELF::getProgramFlagsS(), - SELF::TYPE_Elf_Phdr, N_Elf_Phdr32::p_flags, - XComboBoxEx::CBTYPE_FLAGS); + createComboBox(ui->tableWidget, XELF::getProgramFlagsS(), SELF::TYPE_Elf_Phdr, N_Elf_Phdr32::p_flags, XComboBoxEx::CBTYPE_FLAGS); } blockSignals(true); @@ -772,12 +617,10 @@ void ELFSectionHeaderWidget::reloadData() { g_ppLinedEdit[N_Elf_Phdr64::p_type]->setValue(phdr64.p_type); g_ppLinedEdit[N_Elf_Phdr64::p_flags]->setValue(phdr64.p_flags); - g_ppLinedEdit[N_Elf_Phdr64::p_offset]->setValue( - phdr64.p_offset); + g_ppLinedEdit[N_Elf_Phdr64::p_offset]->setValue(phdr64.p_offset); g_ppLinedEdit[N_Elf_Phdr64::p_vaddr]->setValue(phdr64.p_vaddr); g_ppLinedEdit[N_Elf_Phdr64::p_paddr]->setValue(phdr64.p_paddr); - g_ppLinedEdit[N_Elf_Phdr64::p_filesz]->setValue( - phdr64.p_filesz); + g_ppLinedEdit[N_Elf_Phdr64::p_filesz]->setValue(phdr64.p_filesz); g_ppLinedEdit[N_Elf_Phdr64::p_memsz]->setValue(phdr64.p_memsz); g_ppLinedEdit[N_Elf_Phdr64::p_align]->setValue(phdr64.p_align); @@ -787,12 +630,10 @@ void ELFSectionHeaderWidget::reloadData() { XELF_DEF::Elf32_Phdr phdr32 = elf.getElf32_Phdr(getNumber()); g_ppLinedEdit[N_Elf_Phdr32::p_type]->setValue(phdr32.p_type); - g_ppLinedEdit[N_Elf_Phdr32::p_offset]->setValue( - phdr32.p_offset); + g_ppLinedEdit[N_Elf_Phdr32::p_offset]->setValue(phdr32.p_offset); g_ppLinedEdit[N_Elf_Phdr32::p_vaddr]->setValue(phdr32.p_vaddr); g_ppLinedEdit[N_Elf_Phdr32::p_paddr]->setValue(phdr32.p_paddr); - g_ppLinedEdit[N_Elf_Phdr32::p_filesz]->setValue( - phdr32.p_filesz); + g_ppLinedEdit[N_Elf_Phdr32::p_filesz]->setValue(phdr32.p_filesz); g_ppLinedEdit[N_Elf_Phdr32::p_memsz]->setValue(phdr32.p_memsz); g_ppLinedEdit[N_Elf_Phdr32::p_flags]->setValue(phdr32.p_flags); g_ppLinedEdit[N_Elf_Phdr32::p_align]->setValue(phdr32.p_align); @@ -805,21 +646,15 @@ void ELFSectionHeaderWidget::reloadData() { qint64 nSize = elf.getPhdrSize(); qint64 nAddress = elf.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, - ui->widgetHex); + loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, ui->widgetHex); blockSignals(false); } else if (nType == SELF::TYPE_Elf_DynamicArrayTags) { createHeaderTable(SELF::TYPE_Elf_DynamicArrayTags, ui->tableWidget, - bIs64 ? (N_Elf_DynamicArrayTags::records64) - : (N_Elf_DynamicArrayTags::records32), - g_ppLinedEdit, - N_Elf_DynamicArrayTags::__data_size, getNumber(), - getOffset()); - g_ppComboBox[N_Elf_DynamicArrayTags::CB_TAG] = createComboBox( - ui->tableWidget, XELF::getDynamicTagsS(), - SELF::TYPE_Elf_DynamicArrayTags, N_Elf_DynamicArrayTags::d_tag, - XComboBoxEx::CBTYPE_LIST); + bIs64 ? (N_Elf_DynamicArrayTags::records64) : (N_Elf_DynamicArrayTags::records32), g_ppLinedEdit, + N_Elf_DynamicArrayTags::__data_size, getNumber(), getOffset()); + g_ppComboBox[N_Elf_DynamicArrayTags::CB_TAG] = createComboBox(ui->tableWidget, XELF::getDynamicTagsS(), SELF::TYPE_Elf_DynamicArrayTags, + N_Elf_DynamicArrayTags::d_tag, XComboBoxEx::CBTYPE_LIST); blockSignals(true); @@ -828,26 +663,20 @@ void ELFSectionHeaderWidget::reloadData() { qint64 nTag = elf.getDynamicArrayTag(nOffset); qint64 nValue = elf.getDynamicArrayValue(nOffset); - g_ppLinedEdit[N_Elf_DynamicArrayTags::d_tag]->setValue( - bIs64 ? ((qint64)nTag) : ((qint32)nTag)); - g_ppLinedEdit[N_Elf_DynamicArrayTags::d_value]->setValue( - bIs64 ? ((qint64)nValue) : ((qint32)nValue)); + g_ppLinedEdit[N_Elf_DynamicArrayTags::d_tag]->setValue(bIs64 ? ((qint64)nTag) : ((qint32)nTag)); + g_ppLinedEdit[N_Elf_DynamicArrayTags::d_value]->setValue(bIs64 ? ((qint64)nValue) : ((qint32)nValue)); g_ppComboBox[N_Elf_DynamicArrayTags::CB_TAG]->setValue(nTag); qint64 nSize = elf.getDynamicArraySize(); qint64 nAddress = elf.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, - ui->widgetHex); + loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, ui->widgetHex); blockSignals(false); } else if (nType == SELF::TYPE_SYMBOLTABLE) { - createHeaderTable( - SELF::TYPE_SYMBOLTABLE, ui->tableWidget, - bIs64 ? (N_Elf64_Sym::records) : (N_Elf32_Sym::records), - g_ppLinedEdit, N_Elf32_Sym::__data_size, getNumber(), - getOffset()); + createHeaderTable(SELF::TYPE_SYMBOLTABLE, ui->tableWidget, bIs64 ? (N_Elf64_Sym::records) : (N_Elf32_Sym::records), g_ppLinedEdit, + N_Elf32_Sym::__data_size, getNumber(), getOffset()); blockSignals(true); @@ -856,8 +685,7 @@ void ELFSectionHeaderWidget::reloadData() { bool bIsBigEndian = elf.isBigEndian(); if (bIs64) { - XELF_DEF::Elf64_Sym sym64 = - elf._readElf64_Sym(nOffset, bIsBigEndian); + XELF_DEF::Elf64_Sym sym64 = elf._readElf64_Sym(nOffset, bIsBigEndian); g_ppLinedEdit[N_Elf64_Sym::st_name]->setValue(sym64.st_name); g_ppLinedEdit[N_Elf64_Sym::st_info]->setValue(sym64.st_info); @@ -866,14 +694,10 @@ void ELFSectionHeaderWidget::reloadData() { g_ppLinedEdit[N_Elf64_Sym::st_value]->setValue(sym64.st_value); g_ppLinedEdit[N_Elf64_Sym::st_size]->setValue(sym64.st_size); - addComment( - ui->tableWidget, N_Elf64_Sym::st_name, - HEADER_COLUMN_COMMENT, - elf.getStringFromIndex(g_nStringTableOffset, - g_nStringTableSize, sym64.st_name)); + addComment(ui->tableWidget, N_Elf64_Sym::st_name, HEADER_COLUMN_COMMENT, + elf.getStringFromIndex(g_nStringTableOffset, g_nStringTableSize, sym64.st_name)); } else { - XELF_DEF::Elf32_Sym sym32 = - elf._readElf32_Sym(nOffset, bIsBigEndian); + XELF_DEF::Elf32_Sym sym32 = elf._readElf32_Sym(nOffset, bIsBigEndian); g_ppLinedEdit[N_Elf32_Sym::st_name]->setValue(sym32.st_name); g_ppLinedEdit[N_Elf32_Sym::st_value]->setValue(sym32.st_value); @@ -882,26 +706,19 @@ void ELFSectionHeaderWidget::reloadData() { g_ppLinedEdit[N_Elf32_Sym::st_other]->setValue(sym32.st_other); g_ppLinedEdit[N_Elf32_Sym::st_shndx]->setValue(sym32.st_shndx); - addComment( - ui->tableWidget, N_Elf32_Sym::st_name, - HEADER_COLUMN_COMMENT, - elf.getStringFromIndex(g_nStringTableOffset, - g_nStringTableSize, sym32.st_name)); + addComment(ui->tableWidget, N_Elf32_Sym::st_name, HEADER_COLUMN_COMMENT, + elf.getStringFromIndex(g_nStringTableOffset, g_nStringTableSize, sym32.st_name)); } qint64 nSize = elf.getSymSize(); qint64 nAddress = elf.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, - ui->widgetHex); + loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, ui->widgetHex); blockSignals(false); } else if (nType == SELF::TYPE_Elf_Rela) { - createHeaderTable( - SELF::TYPE_Elf_Rela, ui->tableWidget, - bIs64 ? (N_Elf_Rela::records64) : (N_Elf_Rela::records32), - g_ppLinedEdit, N_Elf_Rela::__data_size, getNumber(), - getOffset()); + createHeaderTable(SELF::TYPE_Elf_Rela, ui->tableWidget, bIs64 ? (N_Elf_Rela::records64) : (N_Elf_Rela::records32), g_ppLinedEdit, + N_Elf_Rela::__data_size, getNumber(), getOffset()); blockSignals(true); @@ -910,15 +727,13 @@ void ELFSectionHeaderWidget::reloadData() { bool bIsBigEndian = elf.isBigEndian(); if (bIs64) { - XELF_DEF::Elf64_Rela rela64 = - elf._readElf64_Rela(nOffset, bIsBigEndian); + XELF_DEF::Elf64_Rela rela64 = elf._readElf64_Rela(nOffset, bIsBigEndian); g_ppLinedEdit[N_Elf_Rela::r_offset]->setValue(rela64.r_offset); g_ppLinedEdit[N_Elf_Rela::r_info]->setValue(rela64.r_info); g_ppLinedEdit[N_Elf_Rela::r_addend]->setValue(rela64.r_addend); } else { - XELF_DEF::Elf32_Rela rela32 = - elf._readElf32_Rela(nOffset, bIsBigEndian); + XELF_DEF::Elf32_Rela rela32 = elf._readElf32_Rela(nOffset, bIsBigEndian); g_ppLinedEdit[N_Elf_Rela::r_offset]->setValue(rela32.r_offset); g_ppLinedEdit[N_Elf_Rela::r_info]->setValue(rela32.r_info); @@ -928,16 +743,12 @@ void ELFSectionHeaderWidget::reloadData() { qint64 nSize = elf.getSymSize(); qint64 nAddress = elf.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, - ui->widgetHex); + loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, ui->widgetHex); blockSignals(false); } else if (nType == SELF::TYPE_Elf_Rel) { - createHeaderTable( - SELF::TYPE_Elf_Rel, ui->tableWidget, - bIs64 ? (N_Elf_Rel::records64) : (N_Elf_Rel::records32), - g_ppLinedEdit, N_Elf_Rel::__data_size, getNumber(), - getOffset()); + createHeaderTable(SELF::TYPE_Elf_Rel, ui->tableWidget, bIs64 ? (N_Elf_Rel::records64) : (N_Elf_Rel::records32), g_ppLinedEdit, + N_Elf_Rel::__data_size, getNumber(), getOffset()); blockSignals(true); @@ -946,14 +757,12 @@ void ELFSectionHeaderWidget::reloadData() { bool bIsBigEndian = elf.isBigEndian(); if (bIs64) { - XELF_DEF::Elf64_Rel rel64 = - elf._readElf64_Rel(nOffset, bIsBigEndian); + XELF_DEF::Elf64_Rel rel64 = elf._readElf64_Rel(nOffset, bIsBigEndian); g_ppLinedEdit[N_Elf_Rel::r_offset]->setValue(rel64.r_offset); g_ppLinedEdit[N_Elf_Rel::r_info]->setValue(rel64.r_info); } else { - XELF_DEF::Elf32_Rel rel32 = - elf._readElf32_Rel(nOffset, bIsBigEndian); + XELF_DEF::Elf32_Rel rel32 = elf._readElf32_Rel(nOffset, bIsBigEndian); g_ppLinedEdit[N_Elf_Rel::r_offset]->setValue(rel32.r_offset); g_ppLinedEdit[N_Elf_Rel::r_info]->setValue(rel32.r_info); @@ -962,8 +771,7 @@ void ELFSectionHeaderWidget::reloadData() { qint64 nSize = elf.getSymSize(); qint64 nAddress = elf.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, - ui->widgetHex); + loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, ui->widgetHex); blockSignals(false); } @@ -987,23 +795,19 @@ void ELFSectionHeaderWidget::widgetValueChanged(quint64 nValue) { if (bIs64) { switch (nNdata) { case N_Elf_Shdr::sh_type: - g_ppLinedEdit[N_Elf_Shdr::sh_type]->setValue( - (quint32)nValue); + g_ppLinedEdit[N_Elf_Shdr::sh_type]->setValue((quint32)nValue); break; case N_Elf_Shdr::sh_flags: - g_ppLinedEdit[N_Elf_Shdr::sh_flags]->setValue( - (quint64)nValue); + g_ppLinedEdit[N_Elf_Shdr::sh_flags]->setValue((quint64)nValue); break; } } else { switch (nNdata) { case N_Elf_Shdr::sh_type: - g_ppLinedEdit[N_Elf_Shdr::sh_type]->setValue( - (quint32)nValue); + g_ppLinedEdit[N_Elf_Shdr::sh_type]->setValue((quint32)nValue); break; case N_Elf_Shdr::sh_flags: - g_ppLinedEdit[N_Elf_Shdr::sh_flags]->setValue( - (quint32)nValue); + g_ppLinedEdit[N_Elf_Shdr::sh_flags]->setValue((quint32)nValue); break; } } @@ -1013,23 +817,19 @@ void ELFSectionHeaderWidget::widgetValueChanged(quint64 nValue) { if (bIs64) { switch (nNdata) { case N_Elf_Phdr64::p_type: - g_ppLinedEdit[N_Elf_Phdr64::p_type]->setValue( - (quint32)nValue); + g_ppLinedEdit[N_Elf_Phdr64::p_type]->setValue((quint32)nValue); break; case N_Elf_Phdr64::p_flags: - g_ppLinedEdit[N_Elf_Phdr64::p_flags]->setValue( - (quint32)nValue); + g_ppLinedEdit[N_Elf_Phdr64::p_flags]->setValue((quint32)nValue); break; } } else { switch (nNdata) { case N_Elf_Phdr32::p_type: - g_ppLinedEdit[N_Elf_Phdr32::p_type]->setValue( - (quint32)nValue); + g_ppLinedEdit[N_Elf_Phdr32::p_type]->setValue((quint32)nValue); break; case N_Elf_Phdr32::p_flags: - g_ppLinedEdit[N_Elf_Phdr32::p_flags]->setValue( - (quint32)nValue); + g_ppLinedEdit[N_Elf_Phdr32::p_flags]->setValue((quint32)nValue); break; } } @@ -1040,8 +840,7 @@ void ELFSectionHeaderWidget::widgetValueChanged(quint64 nValue) { switch (nNdata) { case N_Elf_DynamicArrayTags::d_tag: - g_ppLinedEdit[N_Elf_DynamicArrayTags::d_tag]->setValue( - bIs64 ? ((qint64)nValue) : ((qint32)nValue)); + g_ppLinedEdit[N_Elf_DynamicArrayTags::d_tag]->setValue(bIs64 ? ((qint64)nValue) : ((qint32)nValue)); break; } @@ -1050,9 +849,7 @@ void ELFSectionHeaderWidget::widgetValueChanged(quint64 nValue) { } } -void ELFSectionHeaderWidget::on_tableWidget_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void ELFSectionHeaderWidget::on_tableWidget_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow) Q_UNUSED(nCurrentColumn) Q_UNUSED(nPreviousRow) @@ -1062,7 +859,5 @@ void ELFSectionHeaderWidget::on_tableWidget_currentCellChanged( } void ELFSectionHeaderWidget::on_pushButtonSaveHeader_clicked() { - saveHeaderTable(ui->tableWidget, - XBinary::getResultFileName( - getDevice(), QString("%1.txt").arg(tr("Header")))); + saveHeaderTable(ui->tableWidget, XBinary::getResultFileName(getDevice(), QString("%1.txt").arg(tr("Header")))); } diff --git a/ELF/elfsectionheaderwidget.h b/ELF/elfsectionheaderwidget.h index ef3c08ba..e4a40356 100644 --- a/ELF/elfsectionheaderwidget.h +++ b/ELF/elfsectionheaderwidget.h @@ -31,11 +31,9 @@ class ELFSectionHeaderWidget; class ELFSectionHeaderWidget : public FormatWidget { Q_OBJECT - public: +public: ELFSectionHeaderWidget(QWidget *pParent = nullptr); - ELFSectionHeaderWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, - quint32 nNumber, qint64 nOffset, qint32 nType, - QWidget *pParent = nullptr); + ELFSectionHeaderWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, quint32 nNumber, qint64 nOffset, qint32 nType, QWidget *pParent = nullptr); ~ELFSectionHeaderWidget(); virtual void clear(); virtual void cleanup(); @@ -43,23 +41,20 @@ class ELFSectionHeaderWidget : public FormatWidget { virtual void setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions); void setStringTable(qint64 nStringTableOffset, qint64 nStringTableSize); - protected: - virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, - int nPosition, qint64 nOffset); +protected: + virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset); virtual void setReadonly(bool bState); virtual void blockSignals(bool bState); virtual void adjustHeaderTable(int nType, QTableWidget *pTableWidget); - private slots: +private slots: void on_checkBoxReadonly_toggled(bool bChecked); void reloadData(); void widgetValueChanged(quint64 nValue); - void on_tableWidget_currentCellChanged(int nCurrentRow, int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); + void on_tableWidget_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); void on_pushButtonSaveHeader_clicked(); - private: +private: Ui::ELFSectionHeaderWidget *ui; XLineEditHEX **g_ppLinedEdit; int g_nLineEditSize; diff --git a/ELF/elfwidget.cpp b/ELF/elfwidget.cpp index c301e628..5a5f1945 100644 --- a/ELF/elfwidget.cpp +++ b/ELF/elfwidget.cpp @@ -22,8 +22,7 @@ #include "ui_elfwidget.h" -ELFWidget::ELFWidget(QWidget *pParent) - : FormatWidget(pParent), ui(new Ui::ELFWidget) { +ELFWidget::ELFWidget(QWidget *pParent) : FormatWidget(pParent), ui(new Ui::ELFWidget) { ui->setupUi(this); memset(g_subDevice, 0, sizeof g_subDevice); @@ -31,14 +30,14 @@ ELFWidget::ELFWidget(QWidget *pParent) initWidget(); } -ELFWidget::ELFWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, - QWidget *pParent) - : ELFWidget(pParent) { +ELFWidget::ELFWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, QWidget *pParent) : ELFWidget(pParent) { ELFWidget::setData(pDevice, options, 0, 0, 0); ELFWidget::reload(); } -ELFWidget::~ELFWidget() { delete ui; } +ELFWidget::~ELFWidget() { + delete ui; +} void ELFWidget::clear() { setTreeItem(ui->treeWidgetNavi, 0); @@ -52,8 +51,7 @@ void ELFWidget::clear() { memset(g_invWidget, 0, sizeof g_invWidget); memset(g_tvModel, 0, sizeof g_tvModel); - _deleteSubdevices(g_subDevice, - (sizeof g_subDevice) / (sizeof(SubDevice *))); + _deleteSubdevices(g_subDevice, (sizeof g_subDevice) / (sizeof(SubDevice *))); resetWidget(); @@ -62,7 +60,8 @@ void ELFWidget::clear() { ui->treeWidgetNavi->clear(); } -void ELFWidget::cleanup() {} +void ELFWidget::cleanup() { +} void ELFWidget::reload() { ELFWidget::clear(); @@ -74,39 +73,26 @@ void ELFWidget::reload() { if (elf.isValid()) { setFileType(elf.getFileType()); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SELF::TYPE_INFO, tr("Info"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SELF::TYPE_VIRUSTOTAL, "VirusTotal")); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SELF::TYPE_HEX, tr("Hex"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SELF::TYPE_DISASM, tr("Disasm"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SELF::TYPE_HASH, tr("Hash"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SELF::TYPE_STRINGS, tr("Strings"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SELF::TYPE_SIGNATURES, tr("Signatures"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SELF::TYPE_MEMORYMAP, tr("Memory map"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SELF::TYPE_ENTROPY, tr("Entropy"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SELF::TYPE_HEURISTICSCAN, tr("Heuristic scan"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SELF::TYPE_Elf_Ehdr, "Elf_Ehdr")); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SELF::TYPE_INFO, tr("Info"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SELF::TYPE_VIRUSTOTAL, "VirusTotal")); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SELF::TYPE_HEX, tr("Hex"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SELF::TYPE_DISASM, tr("Disasm"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SELF::TYPE_HASH, tr("Hash"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SELF::TYPE_STRINGS, tr("Strings"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SELF::TYPE_SIGNATURES, tr("Signatures"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SELF::TYPE_MEMORYMAP, tr("Memory map"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SELF::TYPE_ENTROPY, tr("Entropy"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SELF::TYPE_HEURISTICSCAN, tr("Heuristic scan"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SELF::TYPE_Elf_Ehdr, "Elf_Ehdr")); QList listSectionHeaders = elf.getElf_ShdrList(); if (listSectionHeaders.count()) { - QTreeWidgetItem *pItemSections = - createNewItem(SELF::TYPE_Elf_Shdr, tr("Sections")); + QTreeWidgetItem *pItemSections = createNewItem(SELF::TYPE_Elf_Shdr, tr("Sections")); ui->treeWidgetNavi->addTopLevelItem(pItemSections); - QList listDataSets = - elf.getDatasetsFromSections(&listSectionHeaders); + QList listDataSets = elf.getDatasetsFromSections(&listSectionHeaders); addDatasets(&elf, pItemSections, &listDataSets); } @@ -114,13 +100,11 @@ void ELFWidget::reload() { QList listProgramHeaders = elf.getElf_PhdrList(); if (listProgramHeaders.count()) { - QTreeWidgetItem *pItemPrograms = - createNewItem(SELF::TYPE_Elf_Phdr, "Programs"); + QTreeWidgetItem *pItemPrograms = createNewItem(SELF::TYPE_Elf_Phdr, "Programs"); ui->treeWidgetNavi->addTopLevelItem(pItemPrograms); - QList listDataSets = - elf.getDatasetsFromPrograms(&listProgramHeaders); + QList listDataSets = elf.getDatasetsFromPrograms(&listProgramHeaders); addDatasets(&elf, pItemPrograms, &listDataSets); } @@ -133,9 +117,7 @@ void ELFWidget::reload() { } } -FormatWidget::SV ELFWidget::_setValue(QVariant vValue, int nStype, int nNdata, - int nVtype, int nPosition, - qint64 nOffset) { +FormatWidget::SV ELFWidget::_setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset) { Q_UNUSED(nVtype) Q_UNUSED(nPosition) @@ -174,25 +156,13 @@ FormatWidget::SV ELFWidget::_setValue(QVariant vValue, int nStype, int nNdata, g_comboBox[CB_Elf_Ehdr_machine]->setValue(nValue); break; case N_Elf_Ehdr::e_entry: - g_invWidget[INV_Elf_e_entry]->setAddressAndSize( - &elf, - elf.is64() ? ((quint64)nValue) - : ((quint32)nValue), - 0); + g_invWidget[INV_Elf_e_entry]->setAddressAndSize(&elf, elf.is64() ? ((quint64)nValue) : ((quint32)nValue), 0); break; case N_Elf_Ehdr::e_phoff: - g_invWidget[INV_Elf_e_phoff]->setOffsetAndSize( - &elf, - elf.is64() ? ((quint64)nValue) - : ((quint32)nValue), - 0); + g_invWidget[INV_Elf_e_phoff]->setOffsetAndSize(&elf, elf.is64() ? ((quint64)nValue) : ((quint32)nValue), 0); break; case N_Elf_Ehdr::e_shoff: - g_invWidget[INV_Elf_e_shoff]->setOffsetAndSize( - &elf, - elf.is64() ? ((quint64)nValue) - : ((quint32)nValue), - 0); + g_invWidget[INV_Elf_e_shoff]->setOffsetAndSize(&elf, elf.is64() ? ((quint64)nValue) : ((quint32)nValue), 0); break; } break; @@ -241,56 +211,43 @@ FormatWidget::SV ELFWidget::_setValue(QVariant vValue, int nStype, int nNdata, elf.setIdent_pad((quint8)nValue, 6); break; case N_Elf_Ehdr::e_type: - (bIs64 ? (elf.setHdr64_type((quint16)nValue)) - : (elf.setHdr32_type((quint16)nValue))); + (bIs64 ? (elf.setHdr64_type((quint16)nValue)) : (elf.setHdr32_type((quint16)nValue))); break; case N_Elf_Ehdr::e_machine: - (bIs64 ? (elf.setHdr64_machine((quint16)nValue)) - : (elf.setHdr32_machine((quint16)nValue))); + (bIs64 ? (elf.setHdr64_machine((quint16)nValue)) : (elf.setHdr32_machine((quint16)nValue))); break; case N_Elf_Ehdr::e_version: - (bIs64 ? (elf.setHdr64_version((quint32)nValue)) - : (elf.setHdr32_version((quint32)nValue))); + (bIs64 ? (elf.setHdr64_version((quint32)nValue)) : (elf.setHdr32_version((quint32)nValue))); break; case N_Elf_Ehdr::e_entry: - (bIs64 ? (elf.setHdr64_entry((quint64)nValue)) - : (elf.setHdr32_entry((quint32)nValue))); + (bIs64 ? (elf.setHdr64_entry((quint64)nValue)) : (elf.setHdr32_entry((quint32)nValue))); break; case N_Elf_Ehdr::e_phoff: - (bIs64 ? (elf.setHdr64_phoff((quint64)nValue)) - : (elf.setHdr32_phoff((quint32)nValue))); + (bIs64 ? (elf.setHdr64_phoff((quint64)nValue)) : (elf.setHdr32_phoff((quint32)nValue))); break; case N_Elf_Ehdr::e_shoff: - (bIs64 ? (elf.setHdr64_shoff((quint64)nValue)) - : (elf.setHdr32_shoff((quint32)nValue))); + (bIs64 ? (elf.setHdr64_shoff((quint64)nValue)) : (elf.setHdr32_shoff((quint32)nValue))); break; case N_Elf_Ehdr::e_flags: - (bIs64 ? (elf.setHdr64_flags((quint32)nValue)) - : (elf.setHdr32_flags((quint32)nValue))); + (bIs64 ? (elf.setHdr64_flags((quint32)nValue)) : (elf.setHdr32_flags((quint32)nValue))); break; case N_Elf_Ehdr::e_ehsize: - (bIs64 ? (elf.setHdr64_ehsize((quint16)nValue)) - : (elf.setHdr32_ehsize((quint16)nValue))); + (bIs64 ? (elf.setHdr64_ehsize((quint16)nValue)) : (elf.setHdr32_ehsize((quint16)nValue))); break; case N_Elf_Ehdr::e_phentsize: - (bIs64 ? (elf.setHdr64_phentsize((quint16)nValue)) - : (elf.setHdr32_phentsize((quint16)nValue))); + (bIs64 ? (elf.setHdr64_phentsize((quint16)nValue)) : (elf.setHdr32_phentsize((quint16)nValue))); break; case N_Elf_Ehdr::e_phnum: - (bIs64 ? (elf.setHdr64_phnum((quint16)nValue)) - : (elf.setHdr32_phnum((quint16)nValue))); + (bIs64 ? (elf.setHdr64_phnum((quint16)nValue)) : (elf.setHdr32_phnum((quint16)nValue))); break; case N_Elf_Ehdr::e_shentsize: - (bIs64 ? (elf.setHdr64_shentsize((quint16)nValue)) - : (elf.setHdr32_shentsize((quint16)nValue))); + (bIs64 ? (elf.setHdr64_shentsize((quint16)nValue)) : (elf.setHdr32_shentsize((quint16)nValue))); break; case N_Elf_Ehdr::e_shnum: - (bIs64 ? (elf.setHdr64_shnum((quint16)nValue)) - : (elf.setHdr32_shnum((quint16)nValue))); + (bIs64 ? (elf.setHdr64_shnum((quint16)nValue)) : (elf.setHdr32_shnum((quint16)nValue))); break; case N_Elf_Ehdr::e_shstrndx: - (bIs64 ? (elf.setHdr64_shstrndx((quint16)nValue)) - : (elf.setHdr32_shstrndx((quint16)nValue))); + (bIs64 ? (elf.setHdr64_shstrndx((quint16)nValue)) : (elf.setHdr32_shstrndx((quint16)nValue))); break; } @@ -328,10 +285,8 @@ FormatWidget::SV ELFWidget::_setValue(QVariant vValue, int nStype, int nNdata, void ELFWidget::setReadonly(bool bState) { setLineEditsReadOnly(g_lineEdit_Elf_Ehdr, N_Elf_Ehdr::__data_size, bState); - setLineEditsReadOnly(g_lineEdit_Elf_Interpreter, - N_ELF_INTERPRETER::__data_size, bState); - setLineEditsReadOnly(g_lineEdit_Elf_RunPath, N_ELF_RUNPATH::__data_size, - bState); + setLineEditsReadOnly(g_lineEdit_Elf_Interpreter, N_ELF_INTERPRETER::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_Elf_RunPath, N_ELF_RUNPATH::__data_size, bState); setComboBoxesReadOnly(g_comboBox, __CB_size, bState); @@ -346,56 +301,34 @@ void ELFWidget::setReadonly(bool bState) { } void ELFWidget::blockSignals(bool bState) { - _blockSignals((QObject **)g_lineEdit_Elf_Ehdr, N_Elf_Ehdr::__data_size, - bState); - _blockSignals((QObject **)g_lineEdit_Elf_Interpreter, - N_ELF_INTERPRETER::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_Elf_RunPath, - N_ELF_RUNPATH::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_Elf_Ehdr, N_Elf_Ehdr::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_Elf_Interpreter, N_ELF_INTERPRETER::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_Elf_RunPath, N_ELF_RUNPATH::__data_size, bState); _blockSignals((QObject **)g_comboBox, __CB_size, bState); } void ELFWidget::adjustHeaderTable(int nType, QTableWidget *pTableWidget) { - XBinary::MODE mode = XELF::getMode(getDevice(), getOptions().bIsImage, - getOptions().nImageBase); + XBinary::MODE mode = XELF::getMode(getDevice(), getOptions().bIsImage, getOptions().nImageBase); - pTableWidget->setColumnWidth(HEADER_COLUMN_OFFSET, - getColumnWidth(this, CW_UINT16, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_TYPE, - getColumnWidth(this, CW_TYPE, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_OFFSET, getColumnWidth(this, CW_UINT16, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_TYPE, getColumnWidth(this, CW_TYPE, mode)); switch (nType) { case SELF::TYPE_Elf_Ehdr: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); break; } } void ELFWidget::reloadData() { - qint32 nType = ui->treeWidgetNavi->currentItem() - ->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_TYPE) - .toInt(); - qint64 nDataOffset = - ui->treeWidgetNavi->currentItem() - ->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET) - .toLongLong(); - qint64 nDataSize = ui->treeWidgetNavi->currentItem() - ->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE) - .toLongLong(); - qint64 nDataExtraOffset = - ui->treeWidgetNavi->currentItem() - ->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_EXTRAOFFSET) - .toLongLong(); - qint64 nDataExtraSize = - ui->treeWidgetNavi->currentItem() - ->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_EXTRASIZE) - .toLongLong(); + qint32 nType = ui->treeWidgetNavi->currentItem()->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_TYPE).toInt(); + qint64 nDataOffset = ui->treeWidgetNavi->currentItem()->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET).toLongLong(); + qint64 nDataSize = ui->treeWidgetNavi->currentItem()->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE).toLongLong(); + qint64 nDataExtraOffset = ui->treeWidgetNavi->currentItem()->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_EXTRAOFFSET).toLongLong(); + qint64 nDataExtraSize = ui->treeWidgetNavi->currentItem()->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_EXTRASIZE).toLongLong(); QString sInit = getInitString(ui->treeWidgetNavi->currentItem()); @@ -406,8 +339,7 @@ void ELFWidget::reloadData() { if (elf.isValid()) { if (nType == SELF::TYPE_INFO) { if (!isInitPresent(sInit)) { - ui->widgetInfo->setData(getDevice(), elf.getFileType(), "Info", - true); + ui->widgetInfo->setData(getDevice(), elf.getFileType(), "Info", true); } } else if (nType == SELF::TYPE_VIRUSTOTAL) { if (!isInitPresent(sInit)) { @@ -440,8 +372,7 @@ void ELFWidget::reloadData() { } } else if (nType == SELF::TYPE_HASH) { if (!isInitPresent(sInit)) { - ui->widgetHash->setData(getDevice(), elf.getFileType(), 0, -1, - true); + ui->widgetHash->setData(getDevice(), elf.getFileType(), 0, -1, true); } } else if (nType == SELF::TYPE_STRINGS) { if (!isInitPresent(sInit)) { @@ -460,8 +391,7 @@ void ELFWidget::reloadData() { SearchSignaturesWidget::OPTIONS signaturesOptions = {}; signaturesOptions.bMenu_Hex = true; - ui->widgetSignatures->setData(getDevice(), elf.getFileType(), - signaturesOptions, false); + ui->widgetSignatures->setData(getDevice(), elf.getFileType(), signaturesOptions, false); } } else if (nType == SELF::TYPE_MEMORYMAP) { if (!isInitPresent(sInit)) { @@ -469,179 +399,103 @@ void ELFWidget::reloadData() { } } else if (nType == SELF::TYPE_ENTROPY) { if (!isInitPresent(sInit)) { - ui->widgetEntropy->setData(getDevice(), 0, getDevice()->size(), - elf.getFileType(), true); + ui->widgetEntropy->setData(getDevice(), 0, getDevice()->size(), elf.getFileType(), true); } } else if (nType == SELF::TYPE_HEURISTICSCAN) { if (!isInitPresent(sInit)) { - ui->widgetHeuristicScan->setData(getDevice(), true, - elf.getFileType()); + ui->widgetHeuristicScan->setData(getDevice(), true, elf.getFileType()); } } else if (nType == SELF::TYPE_Elf_Ehdr) { if (!isInitPresent(sInit)) { if (elf.is64()) { - createHeaderTable( - SELF::TYPE_Elf_Ehdr, ui->tableWidget_Elf_Ehdr, - N_Elf_Ehdr::records64, g_lineEdit_Elf_Ehdr, - N_Elf_Ehdr::__data_size, 0); + createHeaderTable(SELF::TYPE_Elf_Ehdr, ui->tableWidget_Elf_Ehdr, N_Elf_Ehdr::records64, g_lineEdit_Elf_Ehdr, N_Elf_Ehdr::__data_size, 0); } else { - createHeaderTable( - SELF::TYPE_Elf_Ehdr, ui->tableWidget_Elf_Ehdr, - N_Elf_Ehdr::records32, g_lineEdit_Elf_Ehdr, - N_Elf_Ehdr::__data_size, 0); + createHeaderTable(SELF::TYPE_Elf_Ehdr, ui->tableWidget_Elf_Ehdr, N_Elf_Ehdr::records32, g_lineEdit_Elf_Ehdr, N_Elf_Ehdr::__data_size, 0); } - g_comboBox[CB_Elf_Ehdr_mag] = createComboBox( - ui->tableWidget_Elf_Ehdr, XELF::getIndentMagS(), - SELF::TYPE_Elf_Ehdr, N_Elf_Ehdr::ei_mag, - XComboBoxEx::CBTYPE_LIST); - g_comboBox[CB_Elf_Ehdr_iclass] = createComboBox( - ui->tableWidget_Elf_Ehdr, XELF::getIndentClassesS(), - SELF::TYPE_Elf_Ehdr, N_Elf_Ehdr::ei_class, - XComboBoxEx::CBTYPE_LIST); - g_comboBox[CB_Elf_Ehdr_idata] = createComboBox( - ui->tableWidget_Elf_Ehdr, XELF::getIndentDatasS(), - SELF::TYPE_Elf_Ehdr, N_Elf_Ehdr::ei_data, - XComboBoxEx::CBTYPE_LIST); - g_comboBox[CB_Elf_Ehdr_iversion] = createComboBox( - ui->tableWidget_Elf_Ehdr, XELF::getIndentVersionsS(), - SELF::TYPE_Elf_Ehdr, N_Elf_Ehdr::ei_version, - XComboBoxEx::CBTYPE_LIST); - g_comboBox[CB_Elf_Ehdr_iosabi] = createComboBox( - ui->tableWidget_Elf_Ehdr, XELF::getIndentOsabisS(), - SELF::TYPE_Elf_Ehdr, N_Elf_Ehdr::ei_osabi, - XComboBoxEx::CBTYPE_LIST); + g_comboBox[CB_Elf_Ehdr_mag] = + createComboBox(ui->tableWidget_Elf_Ehdr, XELF::getIndentMagS(), SELF::TYPE_Elf_Ehdr, N_Elf_Ehdr::ei_mag, XComboBoxEx::CBTYPE_LIST); + g_comboBox[CB_Elf_Ehdr_iclass] = + createComboBox(ui->tableWidget_Elf_Ehdr, XELF::getIndentClassesS(), SELF::TYPE_Elf_Ehdr, N_Elf_Ehdr::ei_class, XComboBoxEx::CBTYPE_LIST); + g_comboBox[CB_Elf_Ehdr_idata] = + createComboBox(ui->tableWidget_Elf_Ehdr, XELF::getIndentDatasS(), SELF::TYPE_Elf_Ehdr, N_Elf_Ehdr::ei_data, XComboBoxEx::CBTYPE_LIST); + g_comboBox[CB_Elf_Ehdr_iversion] = + createComboBox(ui->tableWidget_Elf_Ehdr, XELF::getIndentVersionsS(), SELF::TYPE_Elf_Ehdr, N_Elf_Ehdr::ei_version, XComboBoxEx::CBTYPE_LIST); + g_comboBox[CB_Elf_Ehdr_iosabi] = + createComboBox(ui->tableWidget_Elf_Ehdr, XELF::getIndentOsabisS(), SELF::TYPE_Elf_Ehdr, N_Elf_Ehdr::ei_osabi, XComboBoxEx::CBTYPE_LIST); g_comboBox[CB_Elf_Ehdr_type] = - createComboBox(ui->tableWidget_Elf_Ehdr, XELF::getTypesS(), - SELF::TYPE_Elf_Ehdr, N_Elf_Ehdr::e_type, - XComboBoxEx::CBTYPE_LIST); - g_comboBox[CB_Elf_Ehdr_machine] = createComboBox( - ui->tableWidget_Elf_Ehdr, XELF::getMachinesS(), - SELF::TYPE_Elf_Ehdr, N_Elf_Ehdr::e_machine, - XComboBoxEx::CBTYPE_LIST); - - g_invWidget[INV_Elf_e_entry] = createInvWidget( - ui->tableWidget_Elf_Ehdr, SELF::TYPE_Elf_Ehdr, - N_Elf_Ehdr::e_entry, InvWidget::TYPE_HEX); - g_invWidget[INV_Elf_e_phoff] = createInvWidget( - ui->tableWidget_Elf_Ehdr, SELF::TYPE_Elf_Ehdr, - N_Elf_Ehdr::e_phoff, InvWidget::TYPE_HEX); - g_invWidget[INV_Elf_e_shoff] = createInvWidget( - ui->tableWidget_Elf_Ehdr, SELF::TYPE_Elf_Ehdr, - N_Elf_Ehdr::e_shoff, InvWidget::TYPE_HEX); + createComboBox(ui->tableWidget_Elf_Ehdr, XELF::getTypesS(), SELF::TYPE_Elf_Ehdr, N_Elf_Ehdr::e_type, XComboBoxEx::CBTYPE_LIST); + g_comboBox[CB_Elf_Ehdr_machine] = + createComboBox(ui->tableWidget_Elf_Ehdr, XELF::getMachinesS(), SELF::TYPE_Elf_Ehdr, N_Elf_Ehdr::e_machine, XComboBoxEx::CBTYPE_LIST); + + g_invWidget[INV_Elf_e_entry] = createInvWidget(ui->tableWidget_Elf_Ehdr, SELF::TYPE_Elf_Ehdr, N_Elf_Ehdr::e_entry, InvWidget::TYPE_HEX); + g_invWidget[INV_Elf_e_phoff] = createInvWidget(ui->tableWidget_Elf_Ehdr, SELF::TYPE_Elf_Ehdr, N_Elf_Ehdr::e_phoff, InvWidget::TYPE_HEX); + g_invWidget[INV_Elf_e_shoff] = createInvWidget(ui->tableWidget_Elf_Ehdr, SELF::TYPE_Elf_Ehdr, N_Elf_Ehdr::e_shoff, InvWidget::TYPE_HEX); blockSignals(true); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_mag]->setValue( - elf.getIdent_mag_LE()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_class]->setValue( - elf.getIdent_class()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_data]->setValue( - elf.getIdent_data()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_version]->setValue( - elf.getIdent_version()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_osabi]->setValue( - elf.getIdent_osabi()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_abiversion]->setValue( - elf.getIdent_abiversion()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_pad_0]->setValue( - elf.getIdent_pad(0)); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_pad_1]->setValue( - elf.getIdent_pad(1)); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_pad_2]->setValue( - elf.getIdent_pad(2)); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_pad_3]->setValue( - elf.getIdent_pad(3)); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_pad_4]->setValue( - elf.getIdent_pad(4)); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_pad_5]->setValue( - elf.getIdent_pad(5)); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_pad_6]->setValue( - elf.getIdent_pad(6)); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_mag]->setValue(elf.getIdent_mag_LE()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_class]->setValue(elf.getIdent_class()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_data]->setValue(elf.getIdent_data()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_version]->setValue(elf.getIdent_version()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_osabi]->setValue(elf.getIdent_osabi()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_abiversion]->setValue(elf.getIdent_abiversion()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_pad_0]->setValue(elf.getIdent_pad(0)); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_pad_1]->setValue(elf.getIdent_pad(1)); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_pad_2]->setValue(elf.getIdent_pad(2)); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_pad_3]->setValue(elf.getIdent_pad(3)); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_pad_4]->setValue(elf.getIdent_pad(4)); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_pad_5]->setValue(elf.getIdent_pad(5)); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_pad_6]->setValue(elf.getIdent_pad(6)); if (elf.is64()) { - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_type]->setValue( - elf.getHdr64_type()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_machine]->setValue( - elf.getHdr64_machine()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_version]->setValue( - elf.getHdr64_version()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_entry]->setValue( - elf.getHdr64_entry()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_phoff]->setValue( - elf.getHdr64_phoff()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_shoff]->setValue( - elf.getHdr64_shoff()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_flags]->setValue( - elf.getHdr64_flags()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_ehsize]->setValue( - elf.getHdr64_ehsize()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_phentsize]->setValue( - elf.getHdr64_phentsize()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_phnum]->setValue( - elf.getHdr64_phnum()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_shentsize]->setValue( - elf.getHdr64_shentsize()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_shnum]->setValue( - elf.getHdr64_shnum()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_shstrndx]->setValue( - elf.getHdr64_shstrndx()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_type]->setValue(elf.getHdr64_type()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_machine]->setValue(elf.getHdr64_machine()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_version]->setValue(elf.getHdr64_version()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_entry]->setValue(elf.getHdr64_entry()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_phoff]->setValue(elf.getHdr64_phoff()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_shoff]->setValue(elf.getHdr64_shoff()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_flags]->setValue(elf.getHdr64_flags()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_ehsize]->setValue(elf.getHdr64_ehsize()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_phentsize]->setValue(elf.getHdr64_phentsize()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_phnum]->setValue(elf.getHdr64_phnum()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_shentsize]->setValue(elf.getHdr64_shentsize()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_shnum]->setValue(elf.getHdr64_shnum()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_shstrndx]->setValue(elf.getHdr64_shstrndx()); g_comboBox[CB_Elf_Ehdr_type]->setValue(elf.getHdr64_type()); - g_comboBox[CB_Elf_Ehdr_machine]->setValue( - elf.getHdr64_machine()); - - g_invWidget[INV_Elf_e_entry]->setAddressAndSize( - &elf, elf.getHdr64_entry(), 0); - g_invWidget[INV_Elf_e_phoff]->setOffsetAndSize( - &elf, elf.getHdr64_phoff(), 0); // TODO Size - g_invWidget[INV_Elf_e_shoff]->setOffsetAndSize( - &elf, elf.getHdr64_shoff(), 0); // TODO Size + g_comboBox[CB_Elf_Ehdr_machine]->setValue(elf.getHdr64_machine()); + + g_invWidget[INV_Elf_e_entry]->setAddressAndSize(&elf, elf.getHdr64_entry(), 0); + g_invWidget[INV_Elf_e_phoff]->setOffsetAndSize(&elf, elf.getHdr64_phoff(), 0); // TODO Size + g_invWidget[INV_Elf_e_shoff]->setOffsetAndSize(&elf, elf.getHdr64_shoff(), 0); // TODO Size } else { - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_type]->setValue( - elf.getHdr32_type()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_machine]->setValue( - elf.getHdr32_machine()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_version]->setValue( - elf.getHdr32_version()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_entry]->setValue( - elf.getHdr32_entry()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_phoff]->setValue( - elf.getHdr32_phoff()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_shoff]->setValue( - elf.getHdr32_shoff()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_flags]->setValue( - elf.getHdr32_flags()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_ehsize]->setValue( - elf.getHdr32_ehsize()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_phentsize]->setValue( - elf.getHdr32_phentsize()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_phnum]->setValue( - elf.getHdr32_phnum()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_shentsize]->setValue( - elf.getHdr32_shentsize()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_shnum]->setValue( - elf.getHdr32_shnum()); - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_shstrndx]->setValue( - elf.getHdr32_shstrndx()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_type]->setValue(elf.getHdr32_type()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_machine]->setValue(elf.getHdr32_machine()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_version]->setValue(elf.getHdr32_version()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_entry]->setValue(elf.getHdr32_entry()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_phoff]->setValue(elf.getHdr32_phoff()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_shoff]->setValue(elf.getHdr32_shoff()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_flags]->setValue(elf.getHdr32_flags()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_ehsize]->setValue(elf.getHdr32_ehsize()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_phentsize]->setValue(elf.getHdr32_phentsize()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_phnum]->setValue(elf.getHdr32_phnum()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_shentsize]->setValue(elf.getHdr32_shentsize()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_shnum]->setValue(elf.getHdr32_shnum()); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_shstrndx]->setValue(elf.getHdr32_shstrndx()); g_comboBox[CB_Elf_Ehdr_type]->setValue(elf.getHdr32_type()); - g_comboBox[CB_Elf_Ehdr_machine]->setValue( - elf.getHdr32_machine()); - - g_invWidget[INV_Elf_e_entry]->setAddressAndSize( - &elf, elf.getHdr32_entry(), 0); - g_invWidget[INV_Elf_e_phoff]->setOffsetAndSize( - &elf, elf.getHdr32_phoff(), 0); // TODO Size - g_invWidget[INV_Elf_e_shoff]->setOffsetAndSize( - &elf, elf.getHdr32_shoff(), 0); // TODO Size + g_comboBox[CB_Elf_Ehdr_machine]->setValue(elf.getHdr32_machine()); + + g_invWidget[INV_Elf_e_entry]->setAddressAndSize(&elf, elf.getHdr32_entry(), 0); + g_invWidget[INV_Elf_e_phoff]->setOffsetAndSize(&elf, elf.getHdr32_phoff(), 0); // TODO Size + g_invWidget[INV_Elf_e_shoff]->setOffsetAndSize(&elf, elf.getHdr32_shoff(), 0); // TODO Size } g_comboBox[CB_Elf_Ehdr_mag]->setValue(elf.getIdent_mag_LE()); g_comboBox[CB_Elf_Ehdr_iclass]->setValue(elf.getIdent_class()); g_comboBox[CB_Elf_Ehdr_idata]->setValue(elf.getIdent_data()); - g_comboBox[CB_Elf_Ehdr_iversion]->setValue( - elf.getIdent_version()); + g_comboBox[CB_Elf_Ehdr_iversion]->setValue(elf.getIdent_version()); g_comboBox[CB_Elf_Ehdr_iosabi]->setValue(elf.getIdent_osabi()); qint64 nOffset = elf.getEhdrOffset(); @@ -653,186 +507,128 @@ void ELFWidget::reloadData() { nSize = elf.getEhdr32Size(); } - loadHexSubdevice(nOffset, nSize, nOffset, - &g_subDevice[SELF::TYPE_Elf_Ehdr], - ui->widgetHex_Elf_Ehdr); + loadHexSubdevice(nOffset, nSize, nOffset, &g_subDevice[SELF::TYPE_Elf_Ehdr], ui->widgetHex_Elf_Ehdr); blockSignals(false); } } else if (nType == SELF::TYPE_Elf_Shdr) { if (!isInitPresent(sInit)) { - ELFProcessData elfProcessData( - SELF::TYPE_Elf_Shdr, &g_tvModel[SELF::TYPE_Elf_Shdr], &elf, - nDataOffset, nDataSize, nDataExtraOffset, nDataExtraSize); + ELFProcessData elfProcessData(SELF::TYPE_Elf_Shdr, &g_tvModel[SELF::TYPE_Elf_Shdr], &elf, nDataOffset, nDataSize, nDataExtraOffset, + nDataExtraSize); - ajustTableView(&elfProcessData, &g_tvModel[SELF::TYPE_Elf_Shdr], - ui->tableView_Elf_Shdr, nullptr, false); + ajustTableView(&elfProcessData, &g_tvModel[SELF::TYPE_Elf_Shdr], ui->tableView_Elf_Shdr, nullptr, false); - connect(ui->tableView_Elf_Shdr->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTableView_Elf_Shdr_currentRowChanged( - QModelIndex, QModelIndex))); + connect(ui->tableView_Elf_Shdr->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTableView_Elf_Shdr_currentRowChanged(QModelIndex, QModelIndex))); if (g_tvModel[SELF::TYPE_Elf_Shdr]->rowCount()) { - ui->tableView_Elf_Shdr->setCurrentIndex( - ui->tableView_Elf_Shdr->model()->index(0, 0)); + ui->tableView_Elf_Shdr->setCurrentIndex(ui->tableView_Elf_Shdr->model()->index(0, 0)); } } } else if (nType == SELF::TYPE_Elf_Phdr) { if (!isInitPresent(sInit)) { - ELFProcessData elfProcessData( - SELF::TYPE_Elf_Phdr, &g_tvModel[SELF::TYPE_Elf_Phdr], &elf, - nDataOffset, nDataSize, nDataExtraOffset, nDataExtraSize); + ELFProcessData elfProcessData(SELF::TYPE_Elf_Phdr, &g_tvModel[SELF::TYPE_Elf_Phdr], &elf, nDataOffset, nDataSize, nDataExtraOffset, + nDataExtraSize); - ajustTableView(&elfProcessData, &g_tvModel[SELF::TYPE_Elf_Phdr], - ui->tableView_Elf_Phdr, nullptr, false); + ajustTableView(&elfProcessData, &g_tvModel[SELF::TYPE_Elf_Phdr], ui->tableView_Elf_Phdr, nullptr, false); - connect(ui->tableView_Elf_Phdr->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTableView_Elf_Phdr_currentRowChanged( - QModelIndex, QModelIndex))); + connect(ui->tableView_Elf_Phdr->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTableView_Elf_Phdr_currentRowChanged(QModelIndex, QModelIndex))); if (g_tvModel[SELF::TYPE_Elf_Phdr]->rowCount()) { - ui->tableView_Elf_Phdr->setCurrentIndex( - ui->tableView_Elf_Phdr->model()->index(0, 0)); + ui->tableView_Elf_Phdr->setCurrentIndex(ui->tableView_Elf_Phdr->model()->index(0, 0)); } } } else if (nType == SELF::TYPE_Elf_DynamicArrayTags) { if (!isInitPresent(sInit)) { - ELFProcessData elfProcessData( - SELF::TYPE_Elf_DynamicArrayTags, - &g_tvModel[SELF::TYPE_Elf_DynamicArrayTags], &elf, - nDataOffset, nDataSize, nDataExtraOffset, nDataExtraSize); + ELFProcessData elfProcessData(SELF::TYPE_Elf_DynamicArrayTags, &g_tvModel[SELF::TYPE_Elf_DynamicArrayTags], &elf, nDataOffset, nDataSize, + nDataExtraOffset, nDataExtraSize); - ajustTableView(&elfProcessData, - &g_tvModel[SELF::TYPE_Elf_DynamicArrayTags], - ui->tableView_DynamicArrayTags); + ajustTableView(&elfProcessData, &g_tvModel[SELF::TYPE_Elf_DynamicArrayTags], ui->tableView_DynamicArrayTags); - connect(ui->tableView_DynamicArrayTags->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTableView_DynamicArrayTags_currentRowChanged( - QModelIndex, QModelIndex))); + connect(ui->tableView_DynamicArrayTags->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTableView_DynamicArrayTags_currentRowChanged(QModelIndex, QModelIndex))); if (g_tvModel[SELF::TYPE_Elf_DynamicArrayTags]->rowCount()) { - ui->tableView_DynamicArrayTags->setCurrentIndex( - ui->tableView_DynamicArrayTags->model()->index(0, 0)); + ui->tableView_DynamicArrayTags->setCurrentIndex(ui->tableView_DynamicArrayTags->model()->index(0, 0)); } } } else if (nType == SELF::TYPE_LIBRARIES) { if (!isInitPresent(sInit)) { - ELFProcessData elfProcessData(SELF::TYPE_LIBRARIES, - &g_tvModel[SELF::TYPE_LIBRARIES], - &elf, nDataOffset, nDataSize, - nDataExtraOffset, nDataExtraSize); + ELFProcessData elfProcessData(SELF::TYPE_LIBRARIES, &g_tvModel[SELF::TYPE_LIBRARIES], &elf, nDataOffset, nDataSize, nDataExtraOffset, + nDataExtraSize); - ajustTableView(&elfProcessData, - &g_tvModel[SELF::TYPE_LIBRARIES], - ui->tableView_Libraries); + ajustTableView(&elfProcessData, &g_tvModel[SELF::TYPE_LIBRARIES], ui->tableView_Libraries); - connect(ui->tableView_Libraries->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTableView_Libraries_currentRowChanged( - QModelIndex, QModelIndex))); + connect(ui->tableView_Libraries->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTableView_Libraries_currentRowChanged(QModelIndex, QModelIndex))); if (g_tvModel[SELF::TYPE_LIBRARIES]->rowCount()) { - ui->tableView_Libraries->setCurrentIndex( - ui->tableView_Libraries->model()->index(0, 0)); + ui->tableView_Libraries->setCurrentIndex(ui->tableView_Libraries->model()->index(0, 0)); } } } else if (nType == SELF::TYPE_INTERPRETER) { if (!isInitPresent(sInit)) { - createListTable( - SELF::TYPE_INTERPRETER, ui->tableWidget_Interpreter, - N_ELF_INTERPRETER::records, g_lineEdit_Elf_Interpreter, - N_ELF_INTERPRETER::__data_size); + createListTable(SELF::TYPE_INTERPRETER, ui->tableWidget_Interpreter, N_ELF_INTERPRETER::records, g_lineEdit_Elf_Interpreter, + N_ELF_INTERPRETER::__data_size); blockSignals(true); - XBinary::OS_STRING osAnsiString = - elf.getOsAnsiString(nDataOffset, nDataSize); + XBinary::OS_STRING osAnsiString = elf.getOsAnsiString(nDataOffset, nDataSize); - setLineEdit( - g_lineEdit_Elf_Interpreter[N_ELF_INTERPRETER::interpreter], - osAnsiString.nSize, osAnsiString.sString, - osAnsiString.nOffset); + setLineEdit(g_lineEdit_Elf_Interpreter[N_ELF_INTERPRETER::interpreter], osAnsiString.nSize, osAnsiString.sString, osAnsiString.nOffset); blockSignals(false); } } else if (nType == SELF::TYPE_NOTES) { if (!isInitPresent(sInit)) { - ELFProcessData elfProcessData( - SELF::TYPE_NOTES, &g_tvModel[SELF::TYPE_NOTES], &elf, - nDataOffset, nDataSize, nDataExtraOffset, nDataExtraSize); + ELFProcessData elfProcessData(SELF::TYPE_NOTES, &g_tvModel[SELF::TYPE_NOTES], &elf, nDataOffset, nDataSize, nDataExtraOffset, nDataExtraSize); - ajustTableView(&elfProcessData, &g_tvModel[SELF::TYPE_NOTES], - ui->tableView_Notes); + ajustTableView(&elfProcessData, &g_tvModel[SELF::TYPE_NOTES], ui->tableView_Notes); - connect(ui->tableView_Notes->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTableView_Notes_currentRowChanged(QModelIndex, - QModelIndex))); + connect(ui->tableView_Notes->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTableView_Notes_currentRowChanged(QModelIndex, QModelIndex))); if (g_tvModel[SELF::TYPE_NOTES]->rowCount()) { - ui->tableView_Notes->setCurrentIndex( - ui->tableView_Notes->model()->index(0, 0)); + ui->tableView_Notes->setCurrentIndex(ui->tableView_Notes->model()->index(0, 0)); } } } else if (nType == SELF::TYPE_RUNPATH) { if (!isInitPresent(sInit)) { - createListTable(SELF::TYPE_RUNPATH, ui->tableWidget_RunPath, - N_ELF_RUNPATH::records, g_lineEdit_Elf_RunPath, - N_ELF_RUNPATH::__data_size); + createListTable(SELF::TYPE_RUNPATH, ui->tableWidget_RunPath, N_ELF_RUNPATH::records, g_lineEdit_Elf_RunPath, N_ELF_RUNPATH::__data_size); blockSignals(true); - XBinary::OS_STRING osAnsiString = - elf.getOsAnsiString(nDataOffset, nDataSize); + XBinary::OS_STRING osAnsiString = elf.getOsAnsiString(nDataOffset, nDataSize); - setLineEdit(g_lineEdit_Elf_RunPath[N_ELF_RUNPATH::runpath], - osAnsiString.nSize, osAnsiString.sString, - osAnsiString.nOffset); + setLineEdit(g_lineEdit_Elf_RunPath[N_ELF_RUNPATH::runpath], osAnsiString.nSize, osAnsiString.sString, osAnsiString.nOffset); blockSignals(false); } } else if (nType == SELF::TYPE_STRINGTABLE) { if (!isInitPresent(sInit)) { - loadHexSubdevice(nDataOffset, nDataSize, 0, - &g_subDevice[SELF::TYPE_STRINGTABLE], - ui->widgetHex_StringTable); + loadHexSubdevice(nDataOffset, nDataSize, 0, &g_subDevice[SELF::TYPE_STRINGTABLE], ui->widgetHex_StringTable); } } else if (nType == SELF::TYPE_SYMBOLTABLE) { if (!isInitPresent(sInit)) { - ELFProcessData elfProcessData( - SELF::TYPE_SYMBOLTABLE, &g_tvModel[SELF::TYPE_SYMBOLTABLE], - &elf, nDataOffset, nDataSize, nDataExtraOffset, - nDataExtraSize); - - ajustTableView(&elfProcessData, - &g_tvModel[SELF::TYPE_SYMBOLTABLE], - ui->tableView_SymbolTable, nullptr, false); + ELFProcessData elfProcessData(SELF::TYPE_SYMBOLTABLE, &g_tvModel[SELF::TYPE_SYMBOLTABLE], &elf, nDataOffset, nDataSize, nDataExtraOffset, + nDataExtraSize); + + ajustTableView(&elfProcessData, &g_tvModel[SELF::TYPE_SYMBOLTABLE], ui->tableView_SymbolTable, nullptr, false); } } else if (nType == SELF::TYPE_Elf_Rela) { if (!isInitPresent(sInit)) { - ELFProcessData elfProcessData( - SELF::TYPE_Elf_Rela, &g_tvModel[SELF::TYPE_Elf_Rela], &elf, - nDataOffset, nDataSize, nDataExtraOffset, nDataExtraSize); + ELFProcessData elfProcessData(SELF::TYPE_Elf_Rela, &g_tvModel[SELF::TYPE_Elf_Rela], &elf, nDataOffset, nDataSize, nDataExtraOffset, + nDataExtraSize); - ajustTableView(&elfProcessData, &g_tvModel[SELF::TYPE_Elf_Rela], - ui->tableView_Rela, nullptr, false); + ajustTableView(&elfProcessData, &g_tvModel[SELF::TYPE_Elf_Rela], ui->tableView_Rela, nullptr, false); } } else if (nType == SELF::TYPE_Elf_Rel) { if (!isInitPresent(sInit)) { - ELFProcessData elfProcessData( - SELF::TYPE_Elf_Rel, &g_tvModel[SELF::TYPE_Elf_Rel], &elf, - nDataOffset, nDataSize, nDataExtraOffset, nDataExtraSize); + ELFProcessData elfProcessData(SELF::TYPE_Elf_Rel, &g_tvModel[SELF::TYPE_Elf_Rel], &elf, nDataOffset, nDataSize, nDataExtraOffset, + nDataExtraSize); - ajustTableView(&elfProcessData, &g_tvModel[SELF::TYPE_Elf_Rel], - ui->tableView_Rel, nullptr, false); + ajustTableView(&elfProcessData, &g_tvModel[SELF::TYPE_Elf_Rel], ui->tableView_Rel, nullptr, false); } } @@ -842,76 +638,47 @@ void ELFWidget::reloadData() { addInit(sInit); } -void ELFWidget::addDatasets(XELF *pElf, QTreeWidgetItem *pParent, - QList *pListDataSets) { +void ELFWidget::addDatasets(XELF *pElf, QTreeWidgetItem *pParent, QList *pListDataSets) { qint32 nNumberOfRecords = pListDataSets->count(); for (qint32 i = 0; i < nNumberOfRecords; i++) { if (pListDataSets->at(i).nType == XELF::DS_INTERPRETER) { - pParent->addChild(createNewItem( - SELF::TYPE_INTERPRETER, pListDataSets->at(i).sName, - pListDataSets->at(i).nOffset, pListDataSets->at(i).nSize, - pListDataSets->at(i).nStringTableOffset, - pListDataSets->at(i).nStringTableSize)); + pParent->addChild(createNewItem(SELF::TYPE_INTERPRETER, pListDataSets->at(i).sName, pListDataSets->at(i).nOffset, pListDataSets->at(i).nSize, + pListDataSets->at(i).nStringTableOffset, pListDataSets->at(i).nStringTableSize)); } else if (pListDataSets->at(i).nType == XELF::DS_LIBRARIES) { - pParent->addChild(createNewItem( - SELF::TYPE_LIBRARIES, pListDataSets->at(i).sName, - pListDataSets->at(i).nOffset, pListDataSets->at(i).nSize, - pListDataSets->at(i).nStringTableOffset, - pListDataSets->at(i).nStringTableSize)); + pParent->addChild(createNewItem(SELF::TYPE_LIBRARIES, pListDataSets->at(i).sName, pListDataSets->at(i).nOffset, pListDataSets->at(i).nSize, + pListDataSets->at(i).nStringTableOffset, pListDataSets->at(i).nStringTableSize)); } else if (pListDataSets->at(i).nType == XELF::DS_STRINGTABLE) { - pParent->addChild(createNewItem( - SELF::TYPE_STRINGTABLE, pListDataSets->at(i).sName, - pListDataSets->at(i).nOffset, pListDataSets->at(i).nSize, - pListDataSets->at(i).nStringTableOffset, - pListDataSets->at(i).nStringTableSize)); + pParent->addChild(createNewItem(SELF::TYPE_STRINGTABLE, pListDataSets->at(i).sName, pListDataSets->at(i).nOffset, pListDataSets->at(i).nSize, + pListDataSets->at(i).nStringTableOffset, pListDataSets->at(i).nStringTableSize)); } else if (pListDataSets->at(i).nType == XELF::DS_SYMBOLTABLE) { - pParent->addChild(createNewItem( - SELF::TYPE_SYMBOLTABLE, pListDataSets->at(i).sName, - pListDataSets->at(i).nOffset, pListDataSets->at(i).nSize, - pListDataSets->at(i).nStringTableOffset, - pListDataSets->at(i).nStringTableSize)); + pParent->addChild(createNewItem(SELF::TYPE_SYMBOLTABLE, pListDataSets->at(i).sName, pListDataSets->at(i).nOffset, pListDataSets->at(i).nSize, + pListDataSets->at(i).nStringTableOffset, pListDataSets->at(i).nStringTableSize)); } else if (pListDataSets->at(i).nType == XELF::DS_RUNPATH) { - pParent->addChild(createNewItem( - SELF::TYPE_RUNPATH, pListDataSets->at(i).sName, - pListDataSets->at(i).nOffset, pListDataSets->at(i).nSize, - pListDataSets->at(i).nStringTableOffset, - pListDataSets->at(i).nStringTableSize)); + pParent->addChild(createNewItem(SELF::TYPE_RUNPATH, pListDataSets->at(i).sName, pListDataSets->at(i).nOffset, pListDataSets->at(i).nSize, + pListDataSets->at(i).nStringTableOffset, pListDataSets->at(i).nStringTableSize)); } else if (pListDataSets->at(i).nType == XELF::DS_NOTES) { - pParent->addChild(createNewItem( - SELF::TYPE_NOTES, pListDataSets->at(i).sName, - pListDataSets->at(i).nOffset, pListDataSets->at(i).nSize, - pListDataSets->at(i).nStringTableOffset, - pListDataSets->at(i).nStringTableSize)); + pParent->addChild(createNewItem(SELF::TYPE_NOTES, pListDataSets->at(i).sName, pListDataSets->at(i).nOffset, pListDataSets->at(i).nSize, + pListDataSets->at(i).nStringTableOffset, pListDataSets->at(i).nStringTableSize)); } else if (pListDataSets->at(i).nType == XELF::DS_RELA) { - pParent->addChild(createNewItem( - SELF::TYPE_Elf_Rela, pListDataSets->at(i).sName, - pListDataSets->at(i).nOffset, pListDataSets->at(i).nSize, - pListDataSets->at(i).nStringTableOffset, - pListDataSets->at(i).nStringTableSize)); + pParent->addChild(createNewItem(SELF::TYPE_Elf_Rela, pListDataSets->at(i).sName, pListDataSets->at(i).nOffset, pListDataSets->at(i).nSize, + pListDataSets->at(i).nStringTableOffset, pListDataSets->at(i).nStringTableSize)); } else if (pListDataSets->at(i).nType == XELF::DS_REL) { - pParent->addChild(createNewItem( - SELF::TYPE_Elf_Rel, pListDataSets->at(i).sName, - pListDataSets->at(i).nOffset, pListDataSets->at(i).nSize, - pListDataSets->at(i).nStringTableOffset, - pListDataSets->at(i).nStringTableSize)); + pParent->addChild(createNewItem(SELF::TYPE_Elf_Rel, pListDataSets->at(i).sName, pListDataSets->at(i).nOffset, pListDataSets->at(i).nSize, + pListDataSets->at(i).nStringTableOffset, pListDataSets->at(i).nStringTableSize)); } else if (pListDataSets->at(i).nType == XELF::DS_DYNAMICTAGS) { - QTreeWidgetItem *pDynamicTags = createNewItem( - SELF::TYPE_Elf_DynamicArrayTags, pListDataSets->at(i).sName, - pListDataSets->at(i).nOffset, pListDataSets->at(i).nSize, - pListDataSets->at(i).nStringTableOffset, - pListDataSets->at(i).nStringTableSize); + QTreeWidgetItem *pDynamicTags = + createNewItem(SELF::TYPE_Elf_DynamicArrayTags, pListDataSets->at(i).sName, pListDataSets->at(i).nOffset, pListDataSets->at(i).nSize, + pListDataSets->at(i).nStringTableOffset, pListDataSets->at(i).nStringTableSize); pParent->addChild(pDynamicTags); - QList listTagStructs = pElf->_getTagStructs( - pListDataSets->at(i).nOffset, pListDataSets->at(i).nSize, - pElf->is64(), pElf->isBigEndian()); + QList listTagStructs = + pElf->_getTagStructs(pListDataSets->at(i).nOffset, pListDataSets->at(i).nSize, pElf->is64(), pElf->isBigEndian()); XBinary::_MEMORY_MAP memoryMap = pElf->getMemoryMap(); - QList listDatasets = - pElf->getDatasetsFromTagStructs(&memoryMap, &listTagStructs); + QList listDatasets = pElf->getDatasetsFromTagStructs(&memoryMap, &listTagStructs); addDatasets(pElf, pDynamicTags, &listDatasets); } @@ -927,28 +694,22 @@ void ELFWidget::widgetValueChanged(quint64 nValue) { case SELF::TYPE_Elf_Ehdr: switch (nNdata) { case N_Elf_Ehdr::ei_class: - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_class]->setValue( - (quint8)nValue); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_class]->setValue((quint8)nValue); break; case N_Elf_Ehdr::ei_data: - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_data]->setValue( - (quint8)nValue); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_data]->setValue((quint8)nValue); break; case N_Elf_Ehdr::ei_version: - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_version]->setValue( - (quint8)nValue); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_version]->setValue((quint8)nValue); break; case N_Elf_Ehdr::ei_osabi: - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_osabi]->setValue( - (quint8)nValue); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::ei_osabi]->setValue((quint8)nValue); break; case N_Elf_Ehdr::e_type: - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_type]->setValue( - (quint16)nValue); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_type]->setValue((quint16)nValue); break; case N_Elf_Ehdr::e_machine: - g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_machine]->setValue( - (quint16)nValue); + g_lineEdit_Elf_Ehdr[N_Elf_Ehdr::e_machine]->setValue((quint16)nValue); break; } @@ -956,8 +717,7 @@ void ELFWidget::widgetValueChanged(quint64 nValue) { } } -void ELFWidget::on_treeWidgetNavi_currentItemChanged( - QTreeWidgetItem *pItemCurrent, QTreeWidgetItem *pItemPrevious) { +void ELFWidget::on_treeWidgetNavi_currentItemChanged(QTreeWidgetItem *pItemCurrent, QTreeWidgetItem *pItemPrevious) { Q_UNUSED(pItemPrevious) if (pItemCurrent) { @@ -979,28 +739,19 @@ void ELFWidget::on_pushButtonReload_clicked() { QTimer::singleShot(1000, this, SLOT(enableButton())); } -void ELFWidget::enableButton() { ui->pushButtonReload->setEnabled(true); } +void ELFWidget::enableButton() { + ui->pushButtonReload->setEnabled(true); +} void ELFWidget::loadShdr(int nRow) { if (nRow != -1) { QModelIndex index = ui->tableView_Elf_Shdr->model()->index(nRow, 0); - qint64 nOffset = - ui->tableView_Elf_Shdr->model() - ->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET) - .toLongLong(); - qint64 nSize = - ui->tableView_Elf_Shdr->model() - ->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE) - .toLongLong(); - qint64 nAddress = - ui->tableView_Elf_Shdr->model() - ->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS) - .toLongLong(); - - loadHexSubdevice(nOffset, nSize, nAddress, - &g_subDevice[SELF::TYPE_Elf_Shdr], - ui->widgetHex_Elf_Shdr); + qint64 nOffset = ui->tableView_Elf_Shdr->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET).toLongLong(); + qint64 nSize = ui->tableView_Elf_Shdr->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE).toLongLong(); + qint64 nAddress = ui->tableView_Elf_Shdr->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS).toLongLong(); + + loadHexSubdevice(nOffset, nSize, nAddress, &g_subDevice[SELF::TYPE_Elf_Shdr], ui->widgetHex_Elf_Shdr); } } @@ -1008,22 +759,11 @@ void ELFWidget::loadPhdr(int nRow) { if (nRow != -1) { QModelIndex index = ui->tableView_Elf_Phdr->model()->index(nRow, 0); - qint64 nOffset = - ui->tableView_Elf_Phdr->model() - ->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET) - .toLongLong(); - qint64 nSize = - ui->tableView_Elf_Phdr->model() - ->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE) - .toLongLong(); - qint64 nAddress = - ui->tableView_Elf_Phdr->model() - ->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS) - .toLongLong(); - - loadHexSubdevice(nOffset, nSize, nAddress, - &g_subDevice[SELF::TYPE_Elf_Phdr], - ui->widgetHex_Elf_Phdr); + qint64 nOffset = ui->tableView_Elf_Phdr->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET).toLongLong(); + qint64 nSize = ui->tableView_Elf_Phdr->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE).toLongLong(); + qint64 nAddress = ui->tableView_Elf_Phdr->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS).toLongLong(); + + loadHexSubdevice(nOffset, nSize, nAddress, &g_subDevice[SELF::TYPE_Elf_Phdr], ui->widgetHex_Elf_Phdr); } } @@ -1031,27 +771,15 @@ void ELFWidget::loadNote(int nRow) { if (nRow != -1) { QModelIndex index = ui->tableView_Notes->model()->index(nRow, 0); - qint64 nOffset = - ui->tableView_Notes->model() - ->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET) - .toLongLong(); - qint64 nSize = - ui->tableView_Notes->model() - ->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE) - .toLongLong(); - qint64 nAddress = - ui->tableView_Notes->model() - ->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS) - .toLongLong(); - - loadHexSubdevice(nOffset, nSize, nAddress, - &g_subDevice[SELF::TYPE_NOTES], ui->widgetHex_Notes); + qint64 nOffset = ui->tableView_Notes->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET).toLongLong(); + qint64 nSize = ui->tableView_Notes->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE).toLongLong(); + qint64 nAddress = ui->tableView_Notes->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS).toLongLong(); + + loadHexSubdevice(nOffset, nSize, nAddress, &g_subDevice[SELF::TYPE_NOTES], ui->widgetHex_Notes); } } -void ELFWidget::on_tableWidget_Elf_Ehdr_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void ELFWidget::on_tableWidget_Elf_Ehdr_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow); Q_UNUSED(nCurrentColumn); Q_UNUSED(nPreviousRow); @@ -1064,51 +792,62 @@ void ELFWidget::editSectionHeader() { showSectionHeader(SELF::TYPE_Elf_Shdr, ui->tableView_Elf_Shdr); } -void ELFWidget::sectionHex() { showSectionHex(ui->tableView_Elf_Shdr); } +void ELFWidget::sectionHex() { + showSectionHex(ui->tableView_Elf_Shdr); +} -void ELFWidget::sectionDisasm() { showSectionDisasm(ui->tableView_Elf_Shdr); } +void ELFWidget::sectionDisasm() { + showSectionDisasm(ui->tableView_Elf_Shdr); +} -void ELFWidget::sectionEntropy() { showSectionEntropy(ui->tableView_Elf_Shdr); } +void ELFWidget::sectionEntropy() { + showSectionEntropy(ui->tableView_Elf_Shdr); +} -void ELFWidget::sectionDump() { dumpSection(ui->tableView_Elf_Shdr); } +void ELFWidget::sectionDump() { + dumpSection(ui->tableView_Elf_Shdr); +} void ELFWidget::editProgramHeader() { showSectionHeader(SELF::TYPE_Elf_Phdr, ui->tableView_Elf_Phdr); } -void ELFWidget::programHex() { showSectionHex(ui->tableView_Elf_Phdr); } +void ELFWidget::programHex() { + showSectionHex(ui->tableView_Elf_Phdr); +} -void ELFWidget::programDisasm() { showSectionDisasm(ui->tableView_Elf_Phdr); } +void ELFWidget::programDisasm() { + showSectionDisasm(ui->tableView_Elf_Phdr); +} -void ELFWidget::programEntropy() { showSectionEntropy(ui->tableView_Elf_Phdr); } +void ELFWidget::programEntropy() { + showSectionEntropy(ui->tableView_Elf_Phdr); +} -void ELFWidget::programDump() { dumpSection(ui->tableView_Elf_Phdr); } +void ELFWidget::programDump() { + dumpSection(ui->tableView_Elf_Phdr); +} void ELFWidget::editDynamicArrayTag() { - showSectionHeader(SELF::TYPE_Elf_DynamicArrayTags, - ui->tableView_DynamicArrayTags); + showSectionHeader(SELF::TYPE_Elf_DynamicArrayTags, ui->tableView_DynamicArrayTags); } -void ELFWidget::on_tableView_SymbolTable_customContextMenuRequested( - const QPoint &pos) { +void ELFWidget::on_tableView_SymbolTable_customContextMenuRequested(const QPoint &pos) { qint32 nRow = ui->tableView_SymbolTable->currentIndex().row(); if (nRow != -1) { QMenu contextMenu(this); QAction actionEdit(tr("Edit"), this); - connect(&actionEdit, SIGNAL(triggered()), this, - SLOT(editSymbolHeader())); + connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editSymbolHeader())); QAction actionDemangle(tr("Demangle"), this); - connect(&actionDemangle, SIGNAL(triggered()), this, - SLOT(symbolDemangle())); + connect(&actionDemangle, SIGNAL(triggered()), this, SLOT(symbolDemangle())); contextMenu.addAction(&actionEdit); contextMenu.addAction(&actionDemangle); - contextMenu.exec( - ui->tableView_SymbolTable->viewport()->mapToGlobal(pos)); + contextMenu.exec(ui->tableView_SymbolTable->viewport()->mapToGlobal(pos)); } } @@ -1124,31 +863,16 @@ void ELFWidget::showSectionHeader(int nType, QTableView *pTableView) { qint32 nRow = pTableView->currentIndex().row(); if (nRow != -1) { - QModelIndex index = - pTableView->selectionModel()->selectedIndexes().at(0); - - qint64 nOffset = - pTableView->model() - ->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET) - .toLongLong(); - - qint64 nStringTableOffset = - pTableView->model() - ->data(index, - Qt::UserRole + FW_DEF::SECTION_DATA_STRINGTABLEOFFSET) - .toLongLong(); - qint64 nStringTableSize = - pTableView->model() - ->data(index, - Qt::UserRole + FW_DEF::SECTION_DATA_STRINGTABLESIZE) - .toLongLong(); - - ELFSectionHeaderWidget *pSectionHeaderWidget = - new ELFSectionHeaderWidget(getDevice(), getOptions(), (quint32)nRow, - nOffset, nType, this); - - pSectionHeaderWidget->setStringTable(nStringTableOffset, - nStringTableSize); + QModelIndex index = pTableView->selectionModel()->selectedIndexes().at(0); + + qint64 nOffset = pTableView->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET).toLongLong(); + + qint64 nStringTableOffset = pTableView->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_STRINGTABLEOFFSET).toLongLong(); + qint64 nStringTableSize = pTableView->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_STRINGTABLESIZE).toLongLong(); + + ELFSectionHeaderWidget *pSectionHeaderWidget = new ELFSectionHeaderWidget(getDevice(), getOptions(), (quint32)nRow, nOffset, nType, this); + + pSectionHeaderWidget->setStringTable(nStringTableOffset, nStringTableSize); DialogSectionHeader dsh(this); dsh.setWidget(pSectionHeaderWidget); @@ -1218,8 +942,7 @@ void ELFWidget::on_tableView_Elf_Shdr_doubleClicked(const QModelIndex &index) { editSectionHeader(); } -void ELFWidget::on_tableView_Elf_Shdr_customContextMenuRequested( - const QPoint &pos) { +void ELFWidget::on_tableView_Elf_Shdr_customContextMenuRequested(const QPoint &pos) { qint32 nRow = ui->tableView_Elf_Shdr->currentIndex().row(); if (nRow != -1) { @@ -1228,8 +951,7 @@ void ELFWidget::on_tableView_Elf_Shdr_customContextMenuRequested( QMenu contextMenu(this); QAction actionEdit(tr("Edit"), this); - connect(&actionEdit, SIGNAL(triggered()), this, - SLOT(editSectionHeader())); + connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editSectionHeader())); contextMenu.addAction(&actionEdit); QAction actionHex(QString("Hex"), this); @@ -1238,14 +960,12 @@ void ELFWidget::on_tableView_Elf_Shdr_customContextMenuRequested( contextMenu.addAction(&actionHex); QAction actionDisasm(tr("Disasm"), this); - connect(&actionDisasm, SIGNAL(triggered()), this, - SLOT(sectionDisasm())); + connect(&actionDisasm, SIGNAL(triggered()), this, SLOT(sectionDisasm())); actionDisasm.setEnabled(bIsEnable); contextMenu.addAction(&actionDisasm); QAction actionEntropy(tr("Entropy"), this); - connect(&actionEntropy, SIGNAL(triggered()), this, - SLOT(sectionEntropy())); + connect(&actionEntropy, SIGNAL(triggered()), this, SLOT(sectionEntropy())); actionEntropy.setEnabled(bIsEnable); contextMenu.addAction(&actionEntropy); @@ -1258,53 +978,41 @@ void ELFWidget::on_tableView_Elf_Shdr_customContextMenuRequested( } } -void ELFWidget::on_tableView_SymbolTable_doubleClicked( - const QModelIndex &index) { +void ELFWidget::on_tableView_SymbolTable_doubleClicked(const QModelIndex &index) { Q_UNUSED(index) editSymbolHeader(); } -void ELFWidget::onTableView_Elf_Shdr_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void ELFWidget::onTableView_Elf_Shdr_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(current) Q_UNUSED(previous) - loadHexSubdeviceByTableView(current.row(), SELF::TYPE_Elf_Shdr, - ui->widgetHex_Elf_Shdr, ui->tableView_Elf_Shdr, - &g_subDevice[SELF::TYPE_Elf_Shdr]); + loadHexSubdeviceByTableView(current.row(), SELF::TYPE_Elf_Shdr, ui->widgetHex_Elf_Shdr, ui->tableView_Elf_Shdr, &g_subDevice[SELF::TYPE_Elf_Shdr]); } -void ELFWidget::onTableView_Elf_Phdr_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void ELFWidget::onTableView_Elf_Phdr_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(current) Q_UNUSED(previous) - loadHexSubdeviceByTableView(current.row(), SELF::TYPE_Elf_Phdr, - ui->widgetHex_Elf_Phdr, ui->tableView_Elf_Phdr, - &g_subDevice[SELF::TYPE_Elf_Phdr]); + loadHexSubdeviceByTableView(current.row(), SELF::TYPE_Elf_Phdr, ui->widgetHex_Elf_Phdr, ui->tableView_Elf_Phdr, &g_subDevice[SELF::TYPE_Elf_Phdr]); } -void ELFWidget::onTableView_DynamicArrayTags_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void ELFWidget::onTableView_DynamicArrayTags_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(current) Q_UNUSED(previous) // TODO } -void ELFWidget::onTableView_Notes_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void ELFWidget::onTableView_Notes_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(current) Q_UNUSED(previous) - loadHexSubdeviceByTableView(current.row(), SELF::TYPE_NOTES, - ui->widgetHex_Notes, ui->tableView_Notes, - &g_subDevice[SELF::TYPE_NOTES]); + loadHexSubdeviceByTableView(current.row(), SELF::TYPE_NOTES, ui->widgetHex_Notes, ui->tableView_Notes, &g_subDevice[SELF::TYPE_NOTES]); } -void ELFWidget::onTableView_Libraries_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void ELFWidget::onTableView_Libraries_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(current) Q_UNUSED(previous) @@ -1317,8 +1025,7 @@ void ELFWidget::on_tableView_Elf_Phdr_doubleClicked(const QModelIndex &index) { editProgramHeader(); } -void ELFWidget::on_tableView_Elf_Phdr_customContextMenuRequested( - const QPoint &pos) { +void ELFWidget::on_tableView_Elf_Phdr_customContextMenuRequested(const QPoint &pos) { qint32 nRow = ui->tableView_Elf_Phdr->currentIndex().row(); if (nRow != -1) { @@ -1327,8 +1034,7 @@ void ELFWidget::on_tableView_Elf_Phdr_customContextMenuRequested( QMenu contextMenu(this); QAction actionEdit(tr("Edit"), this); - connect(&actionEdit, SIGNAL(triggered()), this, - SLOT(editProgramHeader())); + connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editProgramHeader())); contextMenu.addAction(&actionEdit); QAction actionHex(QString("Hex"), this); @@ -1337,14 +1043,12 @@ void ELFWidget::on_tableView_Elf_Phdr_customContextMenuRequested( contextMenu.addAction(&actionHex); QAction actionDisasm(tr("Disasm"), this); - connect(&actionDisasm, SIGNAL(triggered()), this, - SLOT(programDisasm())); + connect(&actionDisasm, SIGNAL(triggered()), this, SLOT(programDisasm())); actionDisasm.setEnabled(bIsEnable); contextMenu.addAction(&actionDisasm); QAction actionEntropy(tr("Entropy"), this); - connect(&actionEntropy, SIGNAL(triggered()), this, - SLOT(programEntropy())); + connect(&actionEntropy, SIGNAL(triggered()), this, SLOT(programEntropy())); actionEntropy.setEnabled(bIsEnable); contextMenu.addAction(&actionEntropy); @@ -1357,27 +1061,23 @@ void ELFWidget::on_tableView_Elf_Phdr_customContextMenuRequested( } } -void ELFWidget::on_tableView_DynamicArrayTags_doubleClicked( - const QModelIndex &index) { +void ELFWidget::on_tableView_DynamicArrayTags_doubleClicked(const QModelIndex &index) { Q_UNUSED(index) editDynamicArrayTag(); } -void ELFWidget::on_tableView_DynamicArrayTags_customContextMenuRequested( - const QPoint &pos) { +void ELFWidget::on_tableView_DynamicArrayTags_customContextMenuRequested(const QPoint &pos) { qint32 nRow = ui->tableView_DynamicArrayTags->currentIndex().row(); if (nRow != -1) { QMenu contextMenu(this); QAction actionEdit(tr("Edit"), this); - connect(&actionEdit, SIGNAL(triggered()), this, - SLOT(editDynamicArrayTag())); + connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editDynamicArrayTag())); contextMenu.addAction(&actionEdit); - contextMenu.exec( - ui->tableView_DynamicArrayTags->viewport()->mapToGlobal(pos)); + contextMenu.exec(ui->tableView_DynamicArrayTags->viewport()->mapToGlobal(pos)); } } @@ -1392,16 +1092,14 @@ void ELFWidget::on_tableView_Rela_doubleClicked(const QModelIndex &index) { editRelaHeaderTag(); } -void ELFWidget::on_tableView_Rela_customContextMenuRequested( - const QPoint &pos) { +void ELFWidget::on_tableView_Rela_customContextMenuRequested(const QPoint &pos) { qint32 nRow = ui->tableView_Rela->currentIndex().row(); if (nRow != -1) { QMenu contextMenu(this); QAction actionEdit(tr("Edit"), this); - connect(&actionEdit, SIGNAL(triggered()), this, - SLOT(editRelaHeaderTag())); + connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editRelaHeaderTag())); contextMenu.addAction(&actionEdit); contextMenu.exec(ui->tableView_Rela->viewport()->mapToGlobal(pos)); @@ -1429,8 +1127,7 @@ void ELFWidget::on_tableView_Rel_customContextMenuRequested(const QPoint &pos) { QMenu contextMenu(this); QAction actionEdit(tr("Edit"), this); - connect(&actionEdit, SIGNAL(triggered()), this, - SLOT(editRelHeaderTag())); + connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editRelHeaderTag())); contextMenu.addAction(&actionEdit); contextMenu.exec(ui->tableView_Rel->viewport()->mapToGlobal(pos)); @@ -1474,36 +1171,21 @@ void ELFWidget::on_toolButtonNext_clicked() { } void ELFWidget::on_pushButtonSaveSections_clicked() { - XShortcutsWidget::saveModel( - ui->tableView_Elf_Shdr->model(), - XBinary::getResultFileName(getDevice(), - QString("%1.txt").arg(tr("Sections")))); + XShortcutsWidget::saveModel(ui->tableView_Elf_Shdr->model(), XBinary::getResultFileName(getDevice(), QString("%1.txt").arg(tr("Sections")))); } void ELFWidget::on_pushButtonSavePrograms_clicked() { - XShortcutsWidget::saveModel( - ui->tableView_Elf_Phdr->model(), - XBinary::getResultFileName(getDevice(), - QString("%1.txt").arg(QString("Programs")))); + XShortcutsWidget::saveModel(ui->tableView_Elf_Phdr->model(), XBinary::getResultFileName(getDevice(), QString("%1.txt").arg(QString("Programs")))); } void ELFWidget::on_pushButtonSave_Rela_clicked() { - XShortcutsWidget::saveModel( - ui->tableView_Rela->model(), - XBinary::getResultFileName(getDevice(), - QString("%1.txt").arg(QString("Rela")))); + XShortcutsWidget::saveModel(ui->tableView_Rela->model(), XBinary::getResultFileName(getDevice(), QString("%1.txt").arg(QString("Rela")))); } void ELFWidget::on_pushButtonSave_Rel_clicked() { - XShortcutsWidget::saveModel( - ui->tableView_Rel->model(), - XBinary::getResultFileName(getDevice(), - QString("%1.txt").arg(QString("Rel")))); + XShortcutsWidget::saveModel(ui->tableView_Rel->model(), XBinary::getResultFileName(getDevice(), QString("%1.txt").arg(QString("Rel")))); } void ELFWidget::on_pushButtonSave_Elf_Ehdr_clicked() { - saveHeaderTable( - ui->tableWidget_Elf_Ehdr, - XBinary::getResultFileName(getDevice(), - QString("%1.txt").arg(QString("Elf_Ehdr")))); + saveHeaderTable(ui->tableWidget_Elf_Ehdr, XBinary::getResultFileName(getDevice(), QString("%1.txt").arg(QString("Elf_Ehdr")))); } diff --git a/ELF/elfwidget.h b/ELF/elfwidget.h index 51afdaa8..c99b12be 100644 --- a/ELF/elfwidget.h +++ b/ELF/elfwidget.h @@ -34,19 +34,17 @@ class ELFWidget; class ELFWidget : public FormatWidget { Q_OBJECT - public: +public: ELFWidget(QWidget *pParent = nullptr); - ELFWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, - QWidget *pParent = nullptr); + ELFWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, QWidget *pParent = nullptr); ~ELFWidget(); virtual void clear(); virtual void cleanup(); virtual void reload(); - protected: - virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, - int nPosition, qint64 nOffset); +protected: + virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset); virtual void setReadonly(bool bState); virtual void blockSignals(bool bState); virtual void adjustHeaderTable(int nType, QTableWidget *pTableWidget); @@ -56,23 +54,18 @@ class ELFWidget : public FormatWidget { virtual void _showInMemoryMapWindowOffset(qint64 nOffset); virtual void _showInHexWindow(qint64 nOffset, qint64 nSize); - private slots: +private slots: virtual void reloadData(); - void addDatasets(XELF *pElf, QTreeWidgetItem *pParent, - QList *pListDataSets); + void addDatasets(XELF *pElf, QTreeWidgetItem *pParent, QList *pListDataSets); void widgetValueChanged(quint64 nValue); - void on_treeWidgetNavi_currentItemChanged(QTreeWidgetItem *pItemCurrent, - QTreeWidgetItem *pItemPrevious); + void on_treeWidgetNavi_currentItemChanged(QTreeWidgetItem *pItemCurrent, QTreeWidgetItem *pItemPrevious); void on_checkBoxReadonly_toggled(bool bChecked); void on_pushButtonReload_clicked(); void enableButton(); void loadShdr(int nRow); void loadPhdr(int nRow); void loadNote(int nRow); - void on_tableWidget_Elf_Ehdr_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); + void on_tableWidget_Elf_Ehdr_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); void editSectionHeader(); void sectionHex(); void sectionDisasm(); @@ -91,21 +84,15 @@ class ELFWidget : public FormatWidget { void on_tableView_Elf_Shdr_doubleClicked(const QModelIndex &index); void on_tableView_Elf_Shdr_customContextMenuRequested(const QPoint &pos); void on_tableView_SymbolTable_doubleClicked(const QModelIndex &index); - void onTableView_Elf_Shdr_currentRowChanged(const QModelIndex ¤t, - const QModelIndex &previous); - void onTableView_Elf_Phdr_currentRowChanged(const QModelIndex ¤t, - const QModelIndex &previous); - void onTableView_DynamicArrayTags_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous); - void onTableView_Notes_currentRowChanged(const QModelIndex ¤t, - const QModelIndex &previous); - void onTableView_Libraries_currentRowChanged(const QModelIndex ¤t, - const QModelIndex &previous); + void onTableView_Elf_Shdr_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); + void onTableView_Elf_Phdr_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); + void onTableView_DynamicArrayTags_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); + void onTableView_Notes_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); + void onTableView_Libraries_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); void on_tableView_Elf_Phdr_doubleClicked(const QModelIndex &index); void on_tableView_Elf_Phdr_customContextMenuRequested(const QPoint &pos); void on_tableView_DynamicArrayTags_doubleClicked(const QModelIndex &index); - void on_tableView_DynamicArrayTags_customContextMenuRequested( - const QPoint &pos); + void on_tableView_DynamicArrayTags_customContextMenuRequested(const QPoint &pos); void on_tableView_Notes_doubleClicked(const QModelIndex &index); void on_tableView_Rela_doubleClicked(const QModelIndex &index); void on_tableView_Rel_doubleClicked(const QModelIndex &index); @@ -130,7 +117,7 @@ class ELFWidget : public FormatWidget { void on_pushButtonSave_Rel_clicked(); void on_pushButtonSave_Elf_Ehdr_clicked(); - private: +private: // TODO rename enum CB { CB_Elf_Ehdr_mag = 0, diff --git a/LE/dialogle.cpp b/LE/dialogle.cpp index 4138e269..e34f18c8 100755 --- a/LE/dialogle.cpp +++ b/LE/dialogle.cpp @@ -22,14 +22,15 @@ #include "ui_dialogle.h" -DialogLE::DialogLE(QWidget *pParent) - : XShortcutsDialog(pParent), ui(new Ui::DialogLE) { +DialogLE::DialogLE(QWidget *pParent) : XShortcutsDialog(pParent), ui(new Ui::DialogLE) { ui->setupUi(this); setWindowFlags(Qt::Window); } -DialogLE::~DialogLE() { delete ui; } +DialogLE::~DialogLE() { + delete ui; +} void DialogLE::setData(QIODevice *pDevice, FW_DEF::OPTIONS options) { if (options.sTitle != "") { diff --git a/LE/dialogle.h b/LE/dialogle.h index 18c16587..977e29f6 100755 --- a/LE/dialogle.h +++ b/LE/dialogle.h @@ -32,14 +32,14 @@ class DialogLE; class DialogLE : public XShortcutsDialog { Q_OBJECT - public: +public: explicit DialogLE(QWidget *pParent = nullptr); ~DialogLE(); void setData(QIODevice *pDevice, FW_DEF::OPTIONS options); void setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions); - private: +private: Ui::DialogLE *ui; }; diff --git a/LE/le_defs.cpp b/LE/le_defs.cpp index b769c839..a81d3bf7 100755 --- a/LE/le_defs.cpp +++ b/LE/le_defs.cpp @@ -21,217 +21,98 @@ #include "le_defs.h" namespace N_LE_DOS_HEADER { -const FW_DEF::HEADER_RECORD records[] = { - {e_magic, "e_magic", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_magic), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_cblp, "e_cblp", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cblp), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_cp, "e_cp", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cp), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_crlc, "e_crlc", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_crlc), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_cparhdr, "e_cparhdr", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cparhdr), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_minalloc, "e_minalloc", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_minalloc), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_maxalloc, "e_maxalloc", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_maxalloc), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_ss, "e_ss", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_ss), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_sp, "e_sp", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_sp), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_csum, "e_csum", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_csum), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_ip, "e_ip", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_ip), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_cs, "e_cs", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cs), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_lfarlc, "e_lfarlc", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_lfarlc), - 2, "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_ovno, "e_ovno", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_ovno), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_res_0, "e_res_0", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res) + 0, 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_res_1, "e_res_1", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res) + 2, 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_res_2, "e_res_2", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res) + 4, 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_res_3, "e_res_3", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res) + 6, 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_oemid, "e_oemid", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_oemid), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_oeminfo, "e_oeminfo", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_oeminfo), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_res2_0, "e_res2_0", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 0, - 2, "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_res2_1, "e_res2_1", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 2, - 2, "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_res2_2, "e_res2_2", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 4, - 2, "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_res2_3, "e_res2_3", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 6, - 2, "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_res2_4, "e_res2_4", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 8, - 2, "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_res2_5, "e_res2_5", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 10, 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_res2_6, "e_res2_6", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 12, 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_res2_7, "e_res2_7", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 14, 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_res2_8, "e_res2_8", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 16, 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_res2_9, "e_res2_9", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 18, 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_lfanew, "e_lfanew", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_lfanew), - 4, "LONG", FW_DEF::VAL_TYPE_OFFSET}}; +const FW_DEF::HEADER_RECORD records[] = {{e_magic, "e_magic", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_magic), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_cblp, "e_cblp", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cblp), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_cp, "e_cp", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cp), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_crlc, "e_crlc", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_crlc), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_cparhdr, "e_cparhdr", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cparhdr), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_minalloc, "e_minalloc", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_minalloc), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_maxalloc, "e_maxalloc", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_maxalloc), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_ss, "e_ss", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_ss), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_sp, "e_sp", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_sp), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_csum, "e_csum", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_csum), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_ip, "e_ip", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_ip), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_cs, "e_cs", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cs), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_lfarlc, "e_lfarlc", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_lfarlc), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_ovno, "e_ovno", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_ovno), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res_0, "e_res_0", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res) + 0, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res_1, "e_res_1", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res) + 2, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res_2, "e_res_2", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res) + 4, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res_3, "e_res_3", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res) + 6, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_oemid, "e_oemid", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_oemid), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_oeminfo, "e_oeminfo", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_oeminfo), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_0, "e_res2_0", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 0, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_1, "e_res2_1", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 2, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_2, "e_res2_2", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 4, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_3, "e_res2_3", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 6, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_4, "e_res2_4", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 8, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_5, "e_res2_5", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 10, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_6, "e_res2_6", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 12, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_7, "e_res2_7", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 14, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_8, "e_res2_8", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 16, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_9, "e_res2_9", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 18, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_lfanew, "e_lfanew", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_lfanew), 4, "LONG", FW_DEF::VAL_TYPE_OFFSET}}; } namespace N_VXD_HEADER { const FW_DEF::HEADER_RECORD records[] = { - {e32_magic, "e32_magic", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_magic), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e32_border, "e32_border", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_border), - 1, "BYTE", FW_DEF::VAL_TYPE_DATA}, - {e32_worder, "e32_worder", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_worder), - 1, "BYTE", FW_DEF::VAL_TYPE_DATA}, - {e32_level, "e32_level", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_level), 4, - "DWORD", FW_DEF::VAL_TYPE_DATA}, - {e32_cpu, "e32_cpu", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_cpu), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e32_os, "e32_os", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_os), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e32_ver, "e32_ver", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_ver), 4, - "DWORD", FW_DEF::VAL_TYPE_DATA}, - {e32_mflags, "e32_mflags", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_mflags), - 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {e32_mpages, "e32_mpages", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_mpages), - 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {e32_startobj, "e32_startobj", - offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_startobj), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {e32_eip, "e32_eip", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_eip), 4, - "DWORD", FW_DEF::VAL_TYPE_DATA}, - {e32_stackobj, "e32_stackobj", - offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_stackobj), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {e32_esp, "e32_esp", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_esp), 4, - "DWORD", FW_DEF::VAL_TYPE_DATA}, - {e32_pagesize, "e32_pagesize", - offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_pagesize), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {e32_lastpagesize, "e32_lastpagesize", - offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_lastpagesize), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {e32_fixupsize, "e32_fixupsize", - offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_fixupsize), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {e32_fixupsum, "e32_fixupsum", - offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_fixupsum), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {e32_ldrsize, "e32_ldrsize", - offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_ldrsize), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {e32_ldrsum, "e32_ldrsum", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_ldrsum), - 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {e32_objtab, "e32_objtab", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_objtab), - 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {e32_objcnt, "e32_objcnt", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_objcnt), - 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {e32_objmap, "e32_objmap", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_objmap), - 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {e32_itermap, "e32_itermap", - offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_itermap), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {e32_rsrctab, "e32_rsrctab", - offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_rsrctab), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {e32_rsrccnt, "e32_rsrccnt", - offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_rsrccnt), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {e32_restab, "e32_restab", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_restab), - 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {e32_enttab, "e32_enttab", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_enttab), - 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {e32_dirtab, "e32_dirtab", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_dirtab), - 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {e32_dircnt, "e32_dircnt", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_dircnt), - 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {e32_fpagetab, "e32_fpagetab", - offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_fpagetab), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {e32_frectab, "e32_frectab", - offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_frectab), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {e32_impmod, "e32_impmod", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_impmod), - 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {e32_impmodcnt, "e32_impmodcnt", - offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_impmodcnt), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {e32_impproc, "e32_impproc", - offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_impproc), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {e32_pagesum, "e32_pagesum", - offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_pagesum), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {e32_datapage, "e32_datapage", - offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_datapage), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {e32_preload, "e32_preload", - offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_preload), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {e32_nrestab, "e32_nrestab", - offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_nrestab), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {e32_cbnrestab, "e32_cbnrestab", - offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_cbnrestab), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {e32_nressum, "e32_nressum", - offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_nressum), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {e32_autodata, "e32_autodata", - offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_autodata), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {e32_debuginfo, "e32_debuginfo", - offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_debuginfo), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {e32_debuglen, "e32_debuglen", - offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_debuglen), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {e32_instpreload, "e32_instpreload", - offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_instpreload), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {e32_instdemand, "e32_instdemand", - offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_instdemand), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {e32_heapsize, "e32_heapsize", - offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_heapsize), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, + {e32_magic, "e32_magic", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_magic), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e32_border, "e32_border", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_border), 1, "BYTE", FW_DEF::VAL_TYPE_DATA}, + {e32_worder, "e32_worder", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_worder), 1, "BYTE", FW_DEF::VAL_TYPE_DATA}, + {e32_level, "e32_level", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_level), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_cpu, "e32_cpu", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_cpu), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e32_os, "e32_os", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_os), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e32_ver, "e32_ver", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_ver), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_mflags, "e32_mflags", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_mflags), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_mpages, "e32_mpages", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_mpages), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_startobj, "e32_startobj", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_startobj), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_eip, "e32_eip", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_eip), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_stackobj, "e32_stackobj", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_stackobj), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_esp, "e32_esp", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_esp), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_pagesize, "e32_pagesize", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_pagesize), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_lastpagesize, "e32_lastpagesize", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_lastpagesize), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_fixupsize, "e32_fixupsize", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_fixupsize), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_fixupsum, "e32_fixupsum", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_fixupsum), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_ldrsize, "e32_ldrsize", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_ldrsize), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_ldrsum, "e32_ldrsum", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_ldrsum), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_objtab, "e32_objtab", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_objtab), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_objcnt, "e32_objcnt", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_objcnt), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_objmap, "e32_objmap", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_objmap), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_itermap, "e32_itermap", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_itermap), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_rsrctab, "e32_rsrctab", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_rsrctab), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_rsrccnt, "e32_rsrccnt", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_rsrccnt), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_restab, "e32_restab", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_restab), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_enttab, "e32_enttab", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_enttab), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_dirtab, "e32_dirtab", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_dirtab), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_dircnt, "e32_dircnt", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_dircnt), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_fpagetab, "e32_fpagetab", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_fpagetab), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_frectab, "e32_frectab", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_frectab), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_impmod, "e32_impmod", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_impmod), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_impmodcnt, "e32_impmodcnt", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_impmodcnt), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_impproc, "e32_impproc", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_impproc), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_pagesum, "e32_pagesum", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_pagesum), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_datapage, "e32_datapage", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_datapage), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_preload, "e32_preload", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_preload), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_nrestab, "e32_nrestab", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_nrestab), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_cbnrestab, "e32_cbnrestab", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_cbnrestab), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_nressum, "e32_nressum", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_nressum), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_autodata, "e32_autodata", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_autodata), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_debuginfo, "e32_debuginfo", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_debuginfo), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_debuglen, "e32_debuglen", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_debuglen), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_instpreload, "e32_instpreload", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_instpreload), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_instdemand, "e32_instdemand", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_instdemand), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {e32_heapsize, "e32_heapsize", offsetof(XLE_DEF::IMAGE_VXD_HEADER, e32_heapsize), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, }; } namespace N_O32_OBJ { const FW_DEF::HEADER_RECORD records[] = { - {o32_size, "o32_size", offsetof(XLE_DEF::o32_obj, o32_size), 4, "DWORD", - FW_DEF::VAL_TYPE_SIZE}, - {o32_base, "o32_base", offsetof(XLE_DEF::o32_obj, o32_base), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {o32_flags, "o32_flags", offsetof(XLE_DEF::o32_obj, o32_flags), 4, "DWORD", - FW_DEF::VAL_TYPE_FLAGS}, - {o32_pagemap, "o32_pagemap", offsetof(XLE_DEF::o32_obj, o32_pagemap), 4, - "DWORD", FW_DEF::VAL_TYPE_DATA}, - {o32_mapsize, "o32_mapsize", offsetof(XLE_DEF::o32_obj, o32_mapsize), 4, - "DWORD", FW_DEF::VAL_TYPE_SIZE}, - {o32_reserved, "o32_reserved", offsetof(XLE_DEF::o32_obj, o32_reserved), 4, - "DWORD", FW_DEF::VAL_TYPE_DATA}, + {o32_size, "o32_size", offsetof(XLE_DEF::o32_obj, o32_size), 4, "DWORD", FW_DEF::VAL_TYPE_SIZE}, + {o32_base, "o32_base", offsetof(XLE_DEF::o32_obj, o32_base), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {o32_flags, "o32_flags", offsetof(XLE_DEF::o32_obj, o32_flags), 4, "DWORD", FW_DEF::VAL_TYPE_FLAGS}, + {o32_pagemap, "o32_pagemap", offsetof(XLE_DEF::o32_obj, o32_pagemap), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {o32_mapsize, "o32_mapsize", offsetof(XLE_DEF::o32_obj, o32_mapsize), 4, "DWORD", FW_DEF::VAL_TYPE_SIZE}, + {o32_reserved, "o32_reserved", offsetof(XLE_DEF::o32_obj, o32_reserved), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, }; extern const FW_DEF::HEADER_RECORD records[__data_size]; diff --git a/LE/le_defs.h b/LE/le_defs.h index 3767969f..f0d74e7a 100755 --- a/LE/le_defs.h +++ b/LE/le_defs.h @@ -138,15 +138,7 @@ extern const FW_DEF::HEADER_RECORD records[__data_size]; } // namespace N_VXD_HEADER namespace N_O32_OBJ { -enum DATA { - o32_size = 0, - o32_base, - o32_flags, - o32_pagemap, - o32_mapsize, - o32_reserved, - __data_size -}; +enum DATA { o32_size = 0, o32_base, o32_flags, o32_pagemap, o32_mapsize, o32_reserved, __data_size }; extern const FW_DEF::HEADER_RECORD records[__data_size]; } // namespace N_O32_OBJ diff --git a/LE/leprocessdata.cpp b/LE/leprocessdata.cpp index 4e35ede6..3c211a7d 100755 --- a/LE/leprocessdata.cpp +++ b/LE/leprocessdata.cpp @@ -20,9 +20,7 @@ */ #include "leprocessdata.h" -LEProcessData::LEProcessData(int nType, QStandardItemModel **ppModel, XLE *pLE, - qint64 nOffset, qint64 nSize) - : ProcessData() { +LEProcessData::LEProcessData(int nType, QStandardItemModel **ppModel, XLE *pLE, qint64 nOffset, qint64 nSize) : ProcessData() { this->g_nType = nType; this->g_ppModel = ppModel; this->g_pLE = pLE; @@ -34,15 +32,13 @@ void LEProcessData::_process() { if (g_nType == SLE::TYPE_OBJECTS) { QList listLabels; listLabels.append(""); - listLabels.append( - getStructList(N_O32_OBJ::records, N_O32_OBJ::__data_size)); + listLabels.append(getStructList(N_O32_OBJ::records, N_O32_OBJ::__data_size)); QList listObjects = g_pLE->getObjects(); qint32 nNumberOfObjects = listObjects.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfObjects, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfObjects, listLabels.count()); setMaximum(nNumberOfObjects); @@ -54,30 +50,12 @@ void LEProcessData::_process() { (*g_ppModel)->setItem(i, 0, pItemNumber); - (*g_ppModel) - ->setItem(i, N_O32_OBJ::o32_size + 1, - new QStandardItem( - XBinary::valueToHex(listObjects.at(i).o32_size))); - (*g_ppModel) - ->setItem(i, N_O32_OBJ::o32_base + 1, - new QStandardItem( - XBinary::valueToHex(listObjects.at(i).o32_base))); - (*g_ppModel) - ->setItem(i, N_O32_OBJ::o32_flags + 1, - new QStandardItem(XBinary::valueToHex( - listObjects.at(i).o32_flags))); - (*g_ppModel) - ->setItem(i, N_O32_OBJ::o32_pagemap + 1, - new QStandardItem(XBinary::valueToHex( - listObjects.at(i).o32_pagemap))); - (*g_ppModel) - ->setItem(i, N_O32_OBJ::o32_mapsize + 1, - new QStandardItem(XBinary::valueToHex( - listObjects.at(i).o32_mapsize))); - (*g_ppModel) - ->setItem(i, N_O32_OBJ::o32_reserved + 1, - new QStandardItem(XBinary::valueToHex( - listObjects.at(i).o32_reserved))); + (*g_ppModel)->setItem(i, N_O32_OBJ::o32_size + 1, new QStandardItem(XBinary::valueToHex(listObjects.at(i).o32_size))); + (*g_ppModel)->setItem(i, N_O32_OBJ::o32_base + 1, new QStandardItem(XBinary::valueToHex(listObjects.at(i).o32_base))); + (*g_ppModel)->setItem(i, N_O32_OBJ::o32_flags + 1, new QStandardItem(XBinary::valueToHex(listObjects.at(i).o32_flags))); + (*g_ppModel)->setItem(i, N_O32_OBJ::o32_pagemap + 1, new QStandardItem(XBinary::valueToHex(listObjects.at(i).o32_pagemap))); + (*g_ppModel)->setItem(i, N_O32_OBJ::o32_mapsize + 1, new QStandardItem(XBinary::valueToHex(listObjects.at(i).o32_mapsize))); + (*g_ppModel)->setItem(i, N_O32_OBJ::o32_reserved + 1, new QStandardItem(XBinary::valueToHex(listObjects.at(i).o32_reserved))); incValue(); } @@ -89,26 +67,12 @@ void LEProcessData::ajustTableView(QWidget *pWidget, QTableView *pTableView) { XBinary::MODE mode = g_pLE->getMode(); if (g_nType == SLE::TYPE_OBJECTS) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); } } diff --git a/LE/leprocessdata.h b/LE/leprocessdata.h index b0f90c39..555c800c 100755 --- a/LE/leprocessdata.h +++ b/LE/leprocessdata.h @@ -27,13 +27,12 @@ class LEProcessData : public ProcessData { Q_OBJECT - public: - explicit LEProcessData(int nType, QStandardItemModel **ppModel, XLE *pLE, - qint64 nOffset, qint64 nSize); +public: + explicit LEProcessData(int nType, QStandardItemModel **ppModel, XLE *pLE, qint64 nOffset, qint64 nSize); virtual void _process(); virtual void ajustTableView(QWidget *pWidget, QTableView *pTableView); - private: +private: int g_nType; XLE *g_pLE; QStandardItemModel **g_ppModel; diff --git a/LE/lesectionheaderwidget.cpp b/LE/lesectionheaderwidget.cpp index 19652126..0a5ef8d6 100644 --- a/LE/lesectionheaderwidget.cpp +++ b/LE/lesectionheaderwidget.cpp @@ -22,29 +22,25 @@ #include "ui_lesectionheaderwidget.h" -LESectionHeaderWidget::LESectionHeaderWidget(QWidget *pParent) - : FormatWidget(pParent), ui(new Ui::LESectionHeaderWidget) { +LESectionHeaderWidget::LESectionHeaderWidget(QWidget *pParent) : FormatWidget(pParent), ui(new Ui::LESectionHeaderWidget) { ui->setupUi(this); } -LESectionHeaderWidget::LESectionHeaderWidget(QIODevice *pDevice, - FW_DEF::OPTIONS options, - quint32 nNumber, qint64 nOffset, - qint32 nType, QWidget *pParent) +LESectionHeaderWidget::LESectionHeaderWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, quint32 nNumber, qint64 nOffset, qint32 nType, QWidget *pParent) : LESectionHeaderWidget(pParent) { LESectionHeaderWidget::setData(pDevice, options, nNumber, nOffset, nType); } -LESectionHeaderWidget::~LESectionHeaderWidget() {} +LESectionHeaderWidget::~LESectionHeaderWidget() { +} -void LESectionHeaderWidget::clear() {} +void LESectionHeaderWidget::clear() { +} -void LESectionHeaderWidget::reload() {} +void LESectionHeaderWidget::reload() { +} -FormatWidget::SV LESectionHeaderWidget::_setValue(QVariant vValue, int nStype, - int nNdata, int nVtype, - int nPosition, - qint64 nOffset) { +FormatWidget::SV LESectionHeaderWidget::_setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset) { Q_UNUSED(vValue) Q_UNUSED(nStype) Q_UNUSED(nNdata) @@ -55,12 +51,15 @@ FormatWidget::SV LESectionHeaderWidget::_setValue(QVariant vValue, int nStype, return SV_NONE; } -void LESectionHeaderWidget::setReadonly(bool bState) { Q_UNUSED(bState) } +void LESectionHeaderWidget::setReadonly(bool bState) { + Q_UNUSED(bState) +} -void LESectionHeaderWidget::blockSignals(bool bState) { Q_UNUSED(bState) } +void LESectionHeaderWidget::blockSignals(bool bState) { + Q_UNUSED(bState) +} -void LESectionHeaderWidget::adjustHeaderTable(int nType, - QTableWidget *pTableWidget) { +void LESectionHeaderWidget::adjustHeaderTable(int nType, QTableWidget *pTableWidget) { Q_UNUSED(nType) Q_UNUSED(pTableWidget) } @@ -69,11 +68,10 @@ void LESectionHeaderWidget::on_checkBoxReadonly_toggled(bool bChecked) { Q_UNUSED(bChecked) } -void LESectionHeaderWidget::reloadData() {} +void LESectionHeaderWidget::reloadData() { +} -void LESectionHeaderWidget::on_tableWidget_Section_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void LESectionHeaderWidget::on_tableWidget_Section_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow) Q_UNUSED(nCurrentColumn) Q_UNUSED(nPreviousRow) diff --git a/LE/lesectionheaderwidget.h b/LE/lesectionheaderwidget.h index 487a0e04..0e39f3af 100644 --- a/LE/lesectionheaderwidget.h +++ b/LE/lesectionheaderwidget.h @@ -31,33 +31,27 @@ class LESectionHeaderWidget; class LESectionHeaderWidget : public FormatWidget { Q_OBJECT - public: +public: enum CB { CB_CHARACTERISTICS = 0, CB_ALIGH, __CB_size }; LESectionHeaderWidget(QWidget *pParent = nullptr); - LESectionHeaderWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, - quint32 nNumber, qint64 nOffset, qint32 nType, - QWidget *pParent = nullptr); + LESectionHeaderWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, quint32 nNumber, qint64 nOffset, qint32 nType, QWidget *pParent = nullptr); ~LESectionHeaderWidget(); virtual void clear(); virtual void reload(); - protected: - virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, - int nPosition, qint64 nOffset); +protected: + virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset); virtual void setReadonly(bool bState); virtual void blockSignals(bool bState); virtual void adjustHeaderTable(int nType, QTableWidget *pTableWidget); - private slots: +private slots: void on_checkBoxReadonly_toggled(bool bChecked); void reloadData(); - void on_tableWidget_Section_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); + void on_tableWidget_Section_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); - private: +private: enum INV { INV_OriginalFirstThunk, INV_Name, INV_FirstThunk, __INV_size }; Ui::LESectionHeaderWidget *ui; diff --git a/LE/lewidget.cpp b/LE/lewidget.cpp index 108bd305..dc126951 100755 --- a/LE/lewidget.cpp +++ b/LE/lewidget.cpp @@ -22,8 +22,7 @@ #include "ui_lewidget.h" -LEWidget::LEWidget(QWidget *pParent) - : FormatWidget(pParent), ui(new Ui::LEWidget) { +LEWidget::LEWidget(QWidget *pParent) : FormatWidget(pParent), ui(new Ui::LEWidget) { ui->setupUi(this); memset(g_subDevice, 0, sizeof g_subDevice); @@ -31,14 +30,14 @@ LEWidget::LEWidget(QWidget *pParent) initWidget(); } -LEWidget::LEWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, - QWidget *pParent) - : LEWidget(pParent) { +LEWidget::LEWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, QWidget *pParent) : LEWidget(pParent) { LEWidget::setData(pDevice, options, 0, 0, 0); LEWidget::reload(); } -LEWidget::~LEWidget() { delete ui; } +LEWidget::~LEWidget() { + delete ui; +} void LEWidget::clear() { LEWidget::reset(); @@ -48,8 +47,7 @@ void LEWidget::clear() { memset(g_comboBox, 0, sizeof g_comboBox); memset(g_invWidget, 0, sizeof g_invWidget); - _deleteSubdevices(g_subDevice, - (sizeof g_subDevice) / (sizeof(SubDevice *))); + _deleteSubdevices(g_subDevice, (sizeof g_subDevice) / (sizeof(SubDevice *))); resetWidget(); @@ -58,7 +56,9 @@ void LEWidget::clear() { ui->treeWidgetNavi->clear(); } -void LEWidget::cleanup() { LEWidget::clear(); } +void LEWidget::cleanup() { + LEWidget::clear(); +} void LEWidget::reload() { LEWidget::clear(); @@ -70,36 +70,22 @@ void LEWidget::reload() { if (le.isValid()) { setFileType(le.getFileType()); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SLE::TYPE_INFO, tr("Info"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SLE::TYPE_VIRUSTOTAL, "VirusTotal")); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SLE::TYPE_HEX, tr("Hex"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SLE::TYPE_DISASM, tr("Disasm"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SLE::TYPE_HASH, tr("Hash"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SLE::TYPE_STRINGS, tr("Strings"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SLE::TYPE_SIGNATURES, tr("Signatures"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SLE::TYPE_MEMORYMAP, tr("Memory map"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SLE::TYPE_ENTROPY, tr("Entropy"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SLE::TYPE_HEURISTICSCAN, tr("Heuristic scan"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SLE::TYPE_DOS_HEADER, "DOS_HEADER")); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SLE::TYPE_VXD_HEADER, "VXD_HEADER")); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SLE::TYPE_OBJECTS, "Objects")); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SLE::TYPE_INFO, tr("Info"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SLE::TYPE_VIRUSTOTAL, "VirusTotal")); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SLE::TYPE_HEX, tr("Hex"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SLE::TYPE_DISASM, tr("Disasm"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SLE::TYPE_HASH, tr("Hash"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SLE::TYPE_STRINGS, tr("Strings"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SLE::TYPE_SIGNATURES, tr("Signatures"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SLE::TYPE_MEMORYMAP, tr("Memory map"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SLE::TYPE_ENTROPY, tr("Entropy"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SLE::TYPE_HEURISTICSCAN, tr("Heuristic scan"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SLE::TYPE_DOS_HEADER, "DOS_HEADER")); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SLE::TYPE_VXD_HEADER, "VXD_HEADER")); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SLE::TYPE_OBJECTS, "Objects")); if (le.isOverlayPresent()) { - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SLE::TYPE_OVERLAY, tr("Overlay"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SLE::TYPE_OVERLAY, tr("Overlay"))); } ui->treeWidgetNavi->expandAll(); @@ -110,9 +96,7 @@ void LEWidget::reload() { } } -FormatWidget::SV LEWidget::_setValue(QVariant vValue, int nStype, int nNdata, - int nVtype, int nPosition, - qint64 nOffset) { +FormatWidget::SV LEWidget::_setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset) { Q_UNUSED(nVtype) Q_UNUSED(nPosition) Q_UNUSED(nOffset) @@ -134,16 +118,14 @@ FormatWidget::SV LEWidget::_setValue(QVariant vValue, int nStype, int nNdata, g_comboBox[CB_DOS_HEADER_e_magic]->setValue(nValue); break; case N_LE_DOS_HEADER::e_lfanew: - g_invWidget[INV_DOS_HEADER_e_lfanew] - ->setOffsetAndSize(&le, (quint32)nValue, 0); + g_invWidget[INV_DOS_HEADER_e_lfanew]->setOffsetAndSize(&le, (quint32)nValue, 0); break; } break; case SLE::TYPE_VXD_HEADER: switch (nNdata) { case N_VXD_HEADER::e32_magic: - g_comboBox[CB_VXD_HEADER_e32_magic]->setValue( - nValue); + g_comboBox[CB_VXD_HEADER_e32_magic]->setValue(nValue); break; case N_VXD_HEADER::e32_cpu: g_comboBox[CB_VXD_HEADER_e32_cpu]->setValue(nValue); @@ -414,10 +396,8 @@ FormatWidget::SV LEWidget::_setValue(QVariant vValue, int nStype, int nNdata, } void LEWidget::setReadonly(bool bState) { - setLineEditsReadOnly(g_lineEdit_DOS_HEADER, N_LE_DOS_HEADER::__data_size, - bState); - setLineEditsReadOnly(g_lineEdit_VXD_HEADER, N_VXD_HEADER::__data_size, - bState); + setLineEditsReadOnly(g_lineEdit_DOS_HEADER, N_LE_DOS_HEADER::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_VXD_HEADER, N_VXD_HEADER::__data_size, bState); setComboBoxesReadOnly(g_comboBox, __CB_size, bState); @@ -427,10 +407,8 @@ void LEWidget::setReadonly(bool bState) { } void LEWidget::blockSignals(bool bState) { - _blockSignals((QObject **)g_lineEdit_DOS_HEADER, - N_LE_DOS_HEADER::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_VXD_HEADER, N_VXD_HEADER::__data_size, - bState); + _blockSignals((QObject **)g_lineEdit_DOS_HEADER, N_LE_DOS_HEADER::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_VXD_HEADER, N_VXD_HEADER::__data_size, bState); _blockSignals((QObject **)g_comboBox, __CB_size, bState); } @@ -441,12 +419,9 @@ void LEWidget::adjustHeaderTable(int nType, QTableWidget *pTableWidget) { qint32 nSymbolWidth = XLineEditHEX::getSymbolWidth(this); - pTableWidget->horizontalHeader()->setSectionResizeMode( - HEADER_COLUMN_NAME, QHeaderView::ResizeToContents); - pTableWidget->horizontalHeader()->setSectionResizeMode( - HEADER_COLUMN_OFFSET, QHeaderView::ResizeToContents); - pTableWidget->horizontalHeader()->setSectionResizeMode( - HEADER_COLUMN_TYPE, QHeaderView::ResizeToContents); + pTableWidget->horizontalHeader()->setSectionResizeMode(HEADER_COLUMN_NAME, QHeaderView::ResizeToContents); + pTableWidget->horizontalHeader()->setSectionResizeMode(HEADER_COLUMN_OFFSET, QHeaderView::ResizeToContents); + pTableWidget->horizontalHeader()->setSectionResizeMode(HEADER_COLUMN_TYPE, QHeaderView::ResizeToContents); pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, nSymbolWidth * 12); pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, nSymbolWidth * 15); } @@ -482,16 +457,9 @@ void LEWidget::_showInHexWindow(qint64 nOffset, qint64 nSize) { } void LEWidget::reloadData() { - qint32 nType = ui->treeWidgetNavi->currentItem() - ->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_TYPE) - .toInt(); - qint64 nDataOffset = - ui->treeWidgetNavi->currentItem() - ->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET) - .toLongLong(); - qint64 nDataSize = ui->treeWidgetNavi->currentItem() - ->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE) - .toLongLong(); + qint32 nType = ui->treeWidgetNavi->currentItem()->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_TYPE).toInt(); + qint64 nDataOffset = ui->treeWidgetNavi->currentItem()->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET).toLongLong(); + qint64 nDataSize = ui->treeWidgetNavi->currentItem()->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE).toLongLong(); QString sInit = getInitString(ui->treeWidgetNavi->currentItem()); @@ -502,8 +470,7 @@ void LEWidget::reloadData() { if (le.isValid()) { if (nType == SLE::TYPE_INFO) { if (!isInitPresent(sInit)) { - ui->widgetInfo->setData(getDevice(), le.getFileType(), "Info", - true); + ui->widgetInfo->setData(getDevice(), le.getFileType(), "Info", true); } } else if (nType == SLE::TYPE_VIRUSTOTAL) { if (!isInitPresent(sInit)) { @@ -535,8 +502,7 @@ void LEWidget::reloadData() { } } else if (nType == SLE::TYPE_HASH) { if (!isInitPresent(sInit)) { - ui->widgetHash->setData(getDevice(), le.getFileType(), 0, -1, - true); + ui->widgetHash->setData(getDevice(), le.getFileType(), 0, -1, true); } } else if (nType == SLE::TYPE_STRINGS) { if (!isInitPresent(sInit)) { @@ -555,8 +521,7 @@ void LEWidget::reloadData() { SearchSignaturesWidget::OPTIONS signaturesOptions = {}; signaturesOptions.bMenu_Hex = true; - ui->widgetSignatures->setData(getDevice(), le.getFileType(), - signaturesOptions, false); + ui->widgetSignatures->setData(getDevice(), le.getFileType(), signaturesOptions, false); } } else if (nType == SLE::TYPE_MEMORYMAP) { if (!isInitPresent(sInit)) { @@ -564,267 +529,157 @@ void LEWidget::reloadData() { } } else if (nType == SLE::TYPE_ENTROPY) { if (!isInitPresent(sInit)) { - ui->widgetEntropy->setData(getDevice(), 0, getDevice()->size(), - le.getFileType(), true); + ui->widgetEntropy->setData(getDevice(), 0, getDevice()->size(), le.getFileType(), true); } } else if (nType == SLE::TYPE_HEURISTICSCAN) { if (!isInitPresent(sInit)) { - ui->widgetHeuristicScan->setData(getDevice(), true, - le.getFileType()); + ui->widgetHeuristicScan->setData(getDevice(), true, le.getFileType()); } } else if (nType == SLE::TYPE_DOS_HEADER) { if (!isInitPresent(sInit)) { - createHeaderTable( - SLE::TYPE_DOS_HEADER, ui->tableWidget_DOS_HEADER, - N_LE_DOS_HEADER::records, g_lineEdit_DOS_HEADER, - N_LE_DOS_HEADER::__data_size, 0); - g_comboBox[CB_DOS_HEADER_e_magic] = createComboBox( - ui->tableWidget_DOS_HEADER, XMSDOS::getImageMagicsS(), - SLE::TYPE_DOS_HEADER, N_LE_DOS_HEADER::e_magic, - XComboBoxEx::CBTYPE_LIST); - g_invWidget[INV_DOS_HEADER_e_lfanew] = createInvWidget( - ui->tableWidget_DOS_HEADER, SLE::TYPE_DOS_HEADER, - N_LE_DOS_HEADER::e_lfanew, InvWidget::TYPE_HEX); + createHeaderTable(SLE::TYPE_DOS_HEADER, ui->tableWidget_DOS_HEADER, N_LE_DOS_HEADER::records, g_lineEdit_DOS_HEADER, + N_LE_DOS_HEADER::__data_size, 0); + g_comboBox[CB_DOS_HEADER_e_magic] = createComboBox(ui->tableWidget_DOS_HEADER, XMSDOS::getImageMagicsS(), SLE::TYPE_DOS_HEADER, + N_LE_DOS_HEADER::e_magic, XComboBoxEx::CBTYPE_LIST); + g_invWidget[INV_DOS_HEADER_e_lfanew] = + createInvWidget(ui->tableWidget_DOS_HEADER, SLE::TYPE_DOS_HEADER, N_LE_DOS_HEADER::e_lfanew, InvWidget::TYPE_HEX); blockSignals(true); - XMSDOS_DEF::IMAGE_DOS_HEADEREX msdosheaderex = - le.getDosHeaderEx(); - - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_magic]->setValue( - msdosheaderex.e_magic); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_cblp]->setValue( - msdosheaderex.e_cblp); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_cp]->setValue( - msdosheaderex.e_cp); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_crlc]->setValue( - msdosheaderex.e_crlc); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_cparhdr]->setValue( - msdosheaderex.e_cparhdr); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_minalloc]->setValue( - msdosheaderex.e_minalloc); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_maxalloc]->setValue( - msdosheaderex.e_maxalloc); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_ss]->setValue( - msdosheaderex.e_ss); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_sp]->setValue( - msdosheaderex.e_sp); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_csum]->setValue( - msdosheaderex.e_csum); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_ip]->setValue( - msdosheaderex.e_ip); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_cs]->setValue( - msdosheaderex.e_cs); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_lfarlc]->setValue( - msdosheaderex.e_lfarlc); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_ovno]->setValue( - msdosheaderex.e_ovno); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_res_0]->setValue( - msdosheaderex.e_res[0]); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_res_1]->setValue( - msdosheaderex.e_res[1]); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_res_2]->setValue( - msdosheaderex.e_res[2]); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_res_3]->setValue( - msdosheaderex.e_res[3]); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_oemid]->setValue( - msdosheaderex.e_oemid); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_oeminfo]->setValue( - msdosheaderex.e_oeminfo); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_res2_0]->setValue( - msdosheaderex.e_res2[0]); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_res2_1]->setValue( - msdosheaderex.e_res2[1]); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_res2_2]->setValue( - msdosheaderex.e_res2[2]); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_res2_3]->setValue( - msdosheaderex.e_res2[3]); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_res2_4]->setValue( - msdosheaderex.e_res2[4]); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_res2_5]->setValue( - msdosheaderex.e_res2[5]); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_res2_6]->setValue( - msdosheaderex.e_res2[6]); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_res2_7]->setValue( - msdosheaderex.e_res2[7]); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_res2_8]->setValue( - msdosheaderex.e_res2[8]); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_res2_9]->setValue( - msdosheaderex.e_res2[9]); - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_lfanew]->setValue( - msdosheaderex.e_lfanew); - - g_comboBox[CB_DOS_HEADER_e_magic]->setValue( - msdosheaderex.e_magic); - - g_invWidget[INV_DOS_HEADER_e_lfanew]->setOffsetAndSize( - &le, msdosheaderex.e_lfanew, 0); + XMSDOS_DEF::IMAGE_DOS_HEADEREX msdosheaderex = le.getDosHeaderEx(); + + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_magic]->setValue(msdosheaderex.e_magic); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_cblp]->setValue(msdosheaderex.e_cblp); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_cp]->setValue(msdosheaderex.e_cp); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_crlc]->setValue(msdosheaderex.e_crlc); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_cparhdr]->setValue(msdosheaderex.e_cparhdr); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_minalloc]->setValue(msdosheaderex.e_minalloc); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_maxalloc]->setValue(msdosheaderex.e_maxalloc); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_ss]->setValue(msdosheaderex.e_ss); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_sp]->setValue(msdosheaderex.e_sp); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_csum]->setValue(msdosheaderex.e_csum); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_ip]->setValue(msdosheaderex.e_ip); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_cs]->setValue(msdosheaderex.e_cs); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_lfarlc]->setValue(msdosheaderex.e_lfarlc); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_ovno]->setValue(msdosheaderex.e_ovno); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_res_0]->setValue(msdosheaderex.e_res[0]); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_res_1]->setValue(msdosheaderex.e_res[1]); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_res_2]->setValue(msdosheaderex.e_res[2]); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_res_3]->setValue(msdosheaderex.e_res[3]); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_oemid]->setValue(msdosheaderex.e_oemid); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_oeminfo]->setValue(msdosheaderex.e_oeminfo); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_res2_0]->setValue(msdosheaderex.e_res2[0]); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_res2_1]->setValue(msdosheaderex.e_res2[1]); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_res2_2]->setValue(msdosheaderex.e_res2[2]); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_res2_3]->setValue(msdosheaderex.e_res2[3]); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_res2_4]->setValue(msdosheaderex.e_res2[4]); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_res2_5]->setValue(msdosheaderex.e_res2[5]); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_res2_6]->setValue(msdosheaderex.e_res2[6]); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_res2_7]->setValue(msdosheaderex.e_res2[7]); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_res2_8]->setValue(msdosheaderex.e_res2[8]); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_res2_9]->setValue(msdosheaderex.e_res2[9]); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_lfanew]->setValue(msdosheaderex.e_lfanew); + + g_comboBox[CB_DOS_HEADER_e_magic]->setValue(msdosheaderex.e_magic); + + g_invWidget[INV_DOS_HEADER_e_lfanew]->setOffsetAndSize(&le, msdosheaderex.e_lfanew, 0); qint64 nOffset = le.getDosHeaderExOffset(); qint64 nSize = le.getDosHeaderExSize(); - loadHexSubdevice(nOffset, nSize, nOffset, - &g_subDevice[SLE::TYPE_DOS_HEADER], - ui->widgetHex_DOS_HEADER); + loadHexSubdevice(nOffset, nSize, nOffset, &g_subDevice[SLE::TYPE_DOS_HEADER], ui->widgetHex_DOS_HEADER); blockSignals(false); } } else if (nType == SLE::TYPE_VXD_HEADER) { if (!isInitPresent(sInit)) { - createHeaderTable(SLE::TYPE_VXD_HEADER, - ui->tableWidget_VXD_HEADER, - N_VXD_HEADER::records, g_lineEdit_VXD_HEADER, - N_VXD_HEADER::__data_size, 0); - g_comboBox[CB_VXD_HEADER_e32_magic] = createComboBox( - ui->tableWidget_VXD_HEADER, XLE::getImageLEMagicsS(), - SLE::TYPE_VXD_HEADER, N_VXD_HEADER::e32_magic, - XComboBoxEx::CBTYPE_LIST); - g_comboBox[CB_VXD_HEADER_e32_cpu] = createComboBox( - ui->tableWidget_VXD_HEADER, XLE::getImageLECpusS(), - SLE::TYPE_VXD_HEADER, N_VXD_HEADER::e32_cpu, - XComboBoxEx::CBTYPE_LIST); - g_comboBox[CB_VXD_HEADER_e32_os] = createComboBox( - ui->tableWidget_VXD_HEADER, XLE::getImageLEOssS(), - SLE::TYPE_VXD_HEADER, N_VXD_HEADER::e32_os, - XComboBoxEx::CBTYPE_LIST); + createHeaderTable(SLE::TYPE_VXD_HEADER, ui->tableWidget_VXD_HEADER, N_VXD_HEADER::records, g_lineEdit_VXD_HEADER, N_VXD_HEADER::__data_size, 0); + g_comboBox[CB_VXD_HEADER_e32_magic] = createComboBox(ui->tableWidget_VXD_HEADER, XLE::getImageLEMagicsS(), SLE::TYPE_VXD_HEADER, + N_VXD_HEADER::e32_magic, XComboBoxEx::CBTYPE_LIST); + g_comboBox[CB_VXD_HEADER_e32_cpu] = + createComboBox(ui->tableWidget_VXD_HEADER, XLE::getImageLECpusS(), SLE::TYPE_VXD_HEADER, N_VXD_HEADER::e32_cpu, XComboBoxEx::CBTYPE_LIST); + g_comboBox[CB_VXD_HEADER_e32_os] = + createComboBox(ui->tableWidget_VXD_HEADER, XLE::getImageLEOssS(), SLE::TYPE_VXD_HEADER, N_VXD_HEADER::e32_os, XComboBoxEx::CBTYPE_LIST); blockSignals(true); XLE_DEF::IMAGE_VXD_HEADER vxdheader = le.getImageVxdHeader(); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_magic]->setValue( - vxdheader.e32_magic); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_border]->setValue( - vxdheader.e32_border); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_worder]->setValue( - vxdheader.e32_worder); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_level]->setValue( - vxdheader.e32_level); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_cpu]->setValue( - vxdheader.e32_cpu); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_os]->setValue( - vxdheader.e32_os); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_ver]->setValue( - vxdheader.e32_ver); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_mflags]->setValue( - vxdheader.e32_mflags); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_mpages]->setValue( - vxdheader.e32_mpages); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_startobj]->setValue( - vxdheader.e32_startobj); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_eip]->setValue( - vxdheader.e32_eip); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_stackobj]->setValue( - vxdheader.e32_stackobj); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_esp]->setValue( - vxdheader.e32_esp); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_pagesize]->setValue( - vxdheader.e32_pagesize); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_lastpagesize]->setValue( - vxdheader.e32_lastpagesize); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_fixupsize]->setValue( - vxdheader.e32_fixupsize); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_fixupsum]->setValue( - vxdheader.e32_fixupsum); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_ldrsize]->setValue( - vxdheader.e32_ldrsize); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_ldrsum]->setValue( - vxdheader.e32_ldrsum); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_objtab]->setValue( - vxdheader.e32_objtab); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_objcnt]->setValue( - vxdheader.e32_objcnt); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_objmap]->setValue( - vxdheader.e32_objmap); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_itermap]->setValue( - vxdheader.e32_itermap); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_rsrctab]->setValue( - vxdheader.e32_rsrctab); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_rsrccnt]->setValue( - vxdheader.e32_rsrccnt); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_restab]->setValue( - vxdheader.e32_restab); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_enttab]->setValue( - vxdheader.e32_enttab); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_dirtab]->setValue( - vxdheader.e32_dirtab); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_dircnt]->setValue( - vxdheader.e32_dircnt); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_fpagetab]->setValue( - vxdheader.e32_fpagetab); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_frectab]->setValue( - vxdheader.e32_frectab); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_impmod]->setValue( - vxdheader.e32_impmod); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_impmodcnt]->setValue( - vxdheader.e32_impmodcnt); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_impproc]->setValue( - vxdheader.e32_impproc); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_pagesum]->setValue( - vxdheader.e32_pagesum); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_datapage]->setValue( - vxdheader.e32_datapage); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_preload]->setValue( - vxdheader.e32_preload); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_nrestab]->setValue( - vxdheader.e32_nrestab); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_cbnrestab]->setValue( - vxdheader.e32_cbnrestab); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_nressum]->setValue( - vxdheader.e32_nressum); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_autodata]->setValue( - vxdheader.e32_autodata); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_debuginfo]->setValue( - vxdheader.e32_debuginfo); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_debuglen]->setValue( - vxdheader.e32_debuglen); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_instpreload]->setValue( - vxdheader.e32_instpreload); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_instdemand]->setValue( - vxdheader.e32_instdemand); - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_heapsize]->setValue( - vxdheader.e32_heapsize); - - g_comboBox[CB_VXD_HEADER_e32_magic]->setValue( - vxdheader.e32_magic); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_magic]->setValue(vxdheader.e32_magic); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_border]->setValue(vxdheader.e32_border); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_worder]->setValue(vxdheader.e32_worder); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_level]->setValue(vxdheader.e32_level); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_cpu]->setValue(vxdheader.e32_cpu); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_os]->setValue(vxdheader.e32_os); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_ver]->setValue(vxdheader.e32_ver); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_mflags]->setValue(vxdheader.e32_mflags); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_mpages]->setValue(vxdheader.e32_mpages); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_startobj]->setValue(vxdheader.e32_startobj); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_eip]->setValue(vxdheader.e32_eip); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_stackobj]->setValue(vxdheader.e32_stackobj); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_esp]->setValue(vxdheader.e32_esp); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_pagesize]->setValue(vxdheader.e32_pagesize); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_lastpagesize]->setValue(vxdheader.e32_lastpagesize); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_fixupsize]->setValue(vxdheader.e32_fixupsize); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_fixupsum]->setValue(vxdheader.e32_fixupsum); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_ldrsize]->setValue(vxdheader.e32_ldrsize); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_ldrsum]->setValue(vxdheader.e32_ldrsum); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_objtab]->setValue(vxdheader.e32_objtab); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_objcnt]->setValue(vxdheader.e32_objcnt); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_objmap]->setValue(vxdheader.e32_objmap); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_itermap]->setValue(vxdheader.e32_itermap); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_rsrctab]->setValue(vxdheader.e32_rsrctab); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_rsrccnt]->setValue(vxdheader.e32_rsrccnt); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_restab]->setValue(vxdheader.e32_restab); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_enttab]->setValue(vxdheader.e32_enttab); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_dirtab]->setValue(vxdheader.e32_dirtab); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_dircnt]->setValue(vxdheader.e32_dircnt); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_fpagetab]->setValue(vxdheader.e32_fpagetab); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_frectab]->setValue(vxdheader.e32_frectab); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_impmod]->setValue(vxdheader.e32_impmod); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_impmodcnt]->setValue(vxdheader.e32_impmodcnt); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_impproc]->setValue(vxdheader.e32_impproc); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_pagesum]->setValue(vxdheader.e32_pagesum); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_datapage]->setValue(vxdheader.e32_datapage); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_preload]->setValue(vxdheader.e32_preload); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_nrestab]->setValue(vxdheader.e32_nrestab); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_cbnrestab]->setValue(vxdheader.e32_cbnrestab); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_nressum]->setValue(vxdheader.e32_nressum); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_autodata]->setValue(vxdheader.e32_autodata); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_debuginfo]->setValue(vxdheader.e32_debuginfo); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_debuglen]->setValue(vxdheader.e32_debuglen); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_instpreload]->setValue(vxdheader.e32_instpreload); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_instdemand]->setValue(vxdheader.e32_instdemand); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_heapsize]->setValue(vxdheader.e32_heapsize); + + g_comboBox[CB_VXD_HEADER_e32_magic]->setValue(vxdheader.e32_magic); g_comboBox[CB_VXD_HEADER_e32_cpu]->setValue(vxdheader.e32_cpu); g_comboBox[CB_VXD_HEADER_e32_os]->setValue(vxdheader.e32_os); qint64 nOffset = le.getImageVxdHeaderOffset(); qint64 nSize = le.getImageVxdHeaderSize(); - loadHexSubdevice(nOffset, nSize, nOffset, - &g_subDevice[SLE::TYPE_VXD_HEADER], - ui->widgetHex_VXD_HEADER); + loadHexSubdevice(nOffset, nSize, nOffset, &g_subDevice[SLE::TYPE_VXD_HEADER], ui->widgetHex_VXD_HEADER); blockSignals(false); } } else if (nType == SLE::TYPE_OBJECTS) { if (!isInitPresent(sInit)) { - LEProcessData leProcessData(SLE::TYPE_OBJECTS, - &g_tvModel[SLE::TYPE_OBJECTS], &le, - nDataOffset, nDataSize); + LEProcessData leProcessData(SLE::TYPE_OBJECTS, &g_tvModel[SLE::TYPE_OBJECTS], &le, nDataOffset, nDataSize); - ajustTableView(&leProcessData, &g_tvModel[SLE::TYPE_OBJECTS], - ui->tableView_Objects, nullptr, false); + ajustTableView(&leProcessData, &g_tvModel[SLE::TYPE_OBJECTS], ui->tableView_Objects, nullptr, false); - connect(ui->tableView_Objects->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTableView_Objects_currentRowChanged( - QModelIndex, QModelIndex))); + connect(ui->tableView_Objects->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTableView_Objects_currentRowChanged(QModelIndex, QModelIndex))); if (g_tvModel[SLE::TYPE_OBJECTS]->rowCount()) { - ui->tableView_Objects->setCurrentIndex( - ui->tableView_Objects->model()->index(0, 0)); + ui->tableView_Objects->setCurrentIndex(ui->tableView_Objects->model()->index(0, 0)); } } } else if (nType == SLE::TYPE_OVERLAY) { qint64 nOverLayOffset = le.getOverlayOffset(); qint64 nOverlaySize = le.getOverlaySize(); - loadHexSubdevice(nOverLayOffset, nOverlaySize, nOverLayOffset, - &g_subDevice[SLE::TYPE_OVERLAY], - ui->widgetHex_OVERLAY); + loadHexSubdevice(nOverLayOffset, nOverlaySize, nOverLayOffset, &g_subDevice[SLE::TYPE_OVERLAY], ui->widgetHex_OVERLAY); } setReadonly(ui->checkBoxReadonly->isChecked()); @@ -842,32 +697,27 @@ void LEWidget::widgetValueChanged(quint64 nValue) { case SLE::TYPE_DOS_HEADER: switch (nNdata) { case N_LE_DOS_HEADER::e_magic: - g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_magic]->setValue( - (quint16)nValue); + g_lineEdit_DOS_HEADER[N_LE_DOS_HEADER::e_magic]->setValue((quint16)nValue); break; } break; case SLE::TYPE_VXD_HEADER: switch (nNdata) { case N_VXD_HEADER::e32_magic: - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_magic]->setValue( - (quint16)nValue); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_magic]->setValue((quint16)nValue); break; case N_VXD_HEADER::e32_cpu: - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_cpu]->setValue( - (quint16)nValue); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_cpu]->setValue((quint16)nValue); break; case N_VXD_HEADER::e32_os: - g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_os]->setValue( - (quint16)nValue); + g_lineEdit_VXD_HEADER[N_VXD_HEADER::e32_os]->setValue((quint16)nValue); break; } break; } } -void LEWidget::on_treeWidgetNavi_currentItemChanged( - QTreeWidgetItem *pCurrent, QTreeWidgetItem *pPrevious) { +void LEWidget::on_treeWidgetNavi_currentItemChanged(QTreeWidgetItem *pCurrent, QTreeWidgetItem *pPrevious) { Q_UNUSED(pPrevious) if (pCurrent) { @@ -889,34 +739,29 @@ void LEWidget::on_pushButtonReload_clicked() { QTimer::singleShot(1000, this, SLOT(enableButton())); // TODO const } -void LEWidget::enableButton() { ui->pushButtonReload->setEnabled(true); } +void LEWidget::enableButton() { + ui->pushButtonReload->setEnabled(true); +} -void LEWidget::on_tableWidget_DOS_HEADER_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void LEWidget::on_tableWidget_DOS_HEADER_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow) Q_UNUSED(nCurrentColumn) Q_UNUSED(nPreviousRow) Q_UNUSED(nPreviousColumn) - setHeaderTableSelection(ui->widgetHex_DOS_HEADER, - ui->tableWidget_DOS_HEADER); + setHeaderTableSelection(ui->widgetHex_DOS_HEADER, ui->tableWidget_DOS_HEADER); } -void LEWidget::on_tableWidget_VXD_HEADER_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void LEWidget::on_tableWidget_VXD_HEADER_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow) Q_UNUSED(nCurrentColumn) Q_UNUSED(nPreviousRow) Q_UNUSED(nPreviousColumn) - setHeaderTableSelection(ui->widgetHex_VXD_HEADER, - ui->tableWidget_VXD_HEADER); + setHeaderTableSelection(ui->widgetHex_VXD_HEADER, ui->tableWidget_VXD_HEADER); } -void LEWidget::on_tableView_Objects_customContextMenuRequested( - const QPoint &pos) { +void LEWidget::on_tableView_Objects_customContextMenuRequested(const QPoint &pos) { qint32 nRow = ui->tableView_Objects->currentIndex().row(); if (nRow != -1) { @@ -948,14 +793,11 @@ void LEWidget::on_tableView_Objects_doubleClicked(const QModelIndex &index) { // editSectionHeader(); } -void LEWidget::onTableView_Objects_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void LEWidget::onTableView_Objects_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(current) Q_UNUSED(previous) - loadHexSubdeviceByTableView(current.row(), SLE::TYPE_OBJECTS, - ui->widgetHex_Object, ui->tableView_Objects, - &g_subDevice[SLE::TYPE_OBJECTS]); + loadHexSubdeviceByTableView(current.row(), SLE::TYPE_OBJECTS, ui->widgetHex_Object, ui->tableView_Objects, &g_subDevice[SLE::TYPE_OBJECTS]); } void LEWidget::on_toolButtonPrev_clicked() { diff --git a/LE/lewidget.h b/LE/lewidget.h index d9689626..80db4620 100755 --- a/LE/lewidget.h +++ b/LE/lewidget.h @@ -33,19 +33,17 @@ class LEWidget; class LEWidget : public FormatWidget { Q_OBJECT - public: +public: LEWidget(QWidget *pParent = nullptr); - LEWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, - QWidget *pParent = nullptr); + LEWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, QWidget *pParent = nullptr); ~LEWidget(); virtual void clear(); virtual void cleanup(); virtual void reload(); - protected: - virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, - int nPosition, qint64 nOffset); +protected: + virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset); virtual void setReadonly(bool bState); virtual void blockSignals(bool bState); virtual void adjustHeaderTable(int nType, QTableWidget *pTableWidget); @@ -55,26 +53,18 @@ class LEWidget : public FormatWidget { virtual void _showInMemoryMapWindowOffset(qint64 nOffset); virtual void _showInHexWindow(qint64 nOffset, qint64 nSize); - private slots: +private slots: virtual void reloadData(); void widgetValueChanged(quint64 nValue); - void on_treeWidgetNavi_currentItemChanged(QTreeWidgetItem *pCurrent, - QTreeWidgetItem *pPrevious); + void on_treeWidgetNavi_currentItemChanged(QTreeWidgetItem *pCurrent, QTreeWidgetItem *pPrevious); void on_checkBoxReadonly_toggled(bool bChecked); void on_pushButtonReload_clicked(); void enableButton(); - void on_tableWidget_DOS_HEADER_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); - void on_tableWidget_VXD_HEADER_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); + void on_tableWidget_DOS_HEADER_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); + void on_tableWidget_VXD_HEADER_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); void on_tableView_Objects_customContextMenuRequested(const QPoint &pos); void on_tableView_Objects_doubleClicked(const QModelIndex &index); - void onTableView_Objects_currentRowChanged(const QModelIndex ¤t, - const QModelIndex &previous); + void onTableView_Objects_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); void on_toolButtonPrev_clicked(); void on_toolButtonNext_clicked(); void on_pushButtonHex_clicked(); @@ -84,14 +74,8 @@ class LEWidget : public FormatWidget { void on_pushButtonEntropy_clicked(); void on_pushButtonHeuristicScan_clicked(); - private: - enum CB { - CB_DOS_HEADER_e_magic = 0, - CB_VXD_HEADER_e32_magic, - CB_VXD_HEADER_e32_cpu, - CB_VXD_HEADER_e32_os, - __CB_size - }; +private: + enum CB { CB_DOS_HEADER_e_magic = 0, CB_VXD_HEADER_e32_magic, CB_VXD_HEADER_e32_cpu, CB_VXD_HEADER_e32_os, __CB_size }; enum INV { INV_DOS_HEADER_e_lfanew, __INV_size }; diff --git a/MACH/dialogmach.cpp b/MACH/dialogmach.cpp index 4c6ffafe..a3c7cdf0 100644 --- a/MACH/dialogmach.cpp +++ b/MACH/dialogmach.cpp @@ -22,14 +22,15 @@ #include "ui_dialogmach.h" -DialogMACH::DialogMACH(QWidget *pParent) - : XShortcutsDialog(pParent), ui(new Ui::DialogMACH) { +DialogMACH::DialogMACH(QWidget *pParent) : XShortcutsDialog(pParent), ui(new Ui::DialogMACH) { ui->setupUi(this); setWindowFlags(Qt::Window); } -DialogMACH::~DialogMACH() { delete ui; } +DialogMACH::~DialogMACH() { + delete ui; +} void DialogMACH::setData(QIODevice *pDevice, FW_DEF::OPTIONS options) { if (options.sTitle != "") { diff --git a/MACH/dialogmach.h b/MACH/dialogmach.h index 32428dd1..5072f285 100644 --- a/MACH/dialogmach.h +++ b/MACH/dialogmach.h @@ -32,14 +32,14 @@ class DialogMACH; class DialogMACH : public XShortcutsDialog { Q_OBJECT - public: +public: explicit DialogMACH(QWidget *pParent = nullptr); ~DialogMACH(); void setData(QIODevice *pDevice, FW_DEF::OPTIONS options); void setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions); - private: +private: Ui::DialogMACH *ui; }; diff --git a/MACH/mach_defs.cpp b/MACH/mach_defs.cpp index 32e357d0..872c6a1c 100644 --- a/MACH/mach_defs.cpp +++ b/MACH/mach_defs.cpp @@ -22,799 +22,422 @@ namespace N_mach_header { const FW_DEF::HEADER_RECORD records32[] = { - {magic, "magic", offsetof(XMACH_DEF::mach_header, magic), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {cputype, "cputype", offsetof(XMACH_DEF::mach_header, cputype), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {cpusubtype, "cpusubtype", offsetof(XMACH_DEF::mach_header, cpusubtype), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {filetype, "filetype", offsetof(XMACH_DEF::mach_header, filetype), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {ncmds, "ncmds", offsetof(XMACH_DEF::mach_header, ncmds), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {sizeofcmds, "sizeofcmds", offsetof(XMACH_DEF::mach_header, sizeofcmds), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {flags, "flags", offsetof(XMACH_DEF::mach_header, flags), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, + {magic, "magic", offsetof(XMACH_DEF::mach_header, magic), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {cputype, "cputype", offsetof(XMACH_DEF::mach_header, cputype), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {cpusubtype, "cpusubtype", offsetof(XMACH_DEF::mach_header, cpusubtype), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {filetype, "filetype", offsetof(XMACH_DEF::mach_header, filetype), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {ncmds, "ncmds", offsetof(XMACH_DEF::mach_header, ncmds), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {sizeofcmds, "sizeofcmds", offsetof(XMACH_DEF::mach_header, sizeofcmds), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {flags, "flags", offsetof(XMACH_DEF::mach_header, flags), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, }; const FW_DEF::HEADER_RECORD records64[] = { - {magic, "magic", offsetof(XMACH_DEF::mach_header_64, magic), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {cputype, "cputype", offsetof(XMACH_DEF::mach_header_64, cputype), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {cpusubtype, "cpusubtype", offsetof(XMACH_DEF::mach_header_64, cpusubtype), - 4, "uint32", FW_DEF::VAL_TYPE_DATA}, - {filetype, "filetype", offsetof(XMACH_DEF::mach_header_64, filetype), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {ncmds, "ncmds", offsetof(XMACH_DEF::mach_header_64, ncmds), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {sizeofcmds, "sizeofcmds", offsetof(XMACH_DEF::mach_header_64, sizeofcmds), - 4, "uint32", FW_DEF::VAL_TYPE_DATA}, - {flags, "flags", offsetof(XMACH_DEF::mach_header_64, flags), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {reserved, "reserved", offsetof(XMACH_DEF::mach_header_64, reserved), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, + {magic, "magic", offsetof(XMACH_DEF::mach_header_64, magic), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {cputype, "cputype", offsetof(XMACH_DEF::mach_header_64, cputype), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {cpusubtype, "cpusubtype", offsetof(XMACH_DEF::mach_header_64, cpusubtype), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {filetype, "filetype", offsetof(XMACH_DEF::mach_header_64, filetype), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {ncmds, "ncmds", offsetof(XMACH_DEF::mach_header_64, ncmds), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {sizeofcmds, "sizeofcmds", offsetof(XMACH_DEF::mach_header_64, sizeofcmds), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {flags, "flags", offsetof(XMACH_DEF::mach_header_64, flags), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {reserved, "reserved", offsetof(XMACH_DEF::mach_header_64, reserved), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, }; } // namespace N_mach_header namespace N_mach_commands { const FW_DEF::HEADER_RECORD records[] = { - {cmd, "cmd", offsetof(XMACH_DEF::load_command, cmd), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {cmdsize, "cmdsize", offsetof(XMACH_DEF::load_command, cmdsize), 4, - "uint32", FW_DEF::VAL_TYPE_SIZE}, + {cmd, "cmd", offsetof(XMACH_DEF::load_command, cmd), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {cmdsize, "cmdsize", offsetof(XMACH_DEF::load_command, cmdsize), 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, }; } namespace N_mach_segments { const FW_DEF::HEADER_RECORD records32[] = { - {segname, "segname", offsetof(XMACH_DEF::segment_command, segname), 16, - "char[16]", FW_DEF::VAL_TYPE_TEXT}, - {vmaddr, "vmaddr", offsetof(XMACH_DEF::segment_command, vmaddr), 4, - "uint32", FW_DEF::VAL_TYPE_ADDRESS}, - {vmsize, "vmsize", offsetof(XMACH_DEF::segment_command, vmsize), 4, - "uint32", FW_DEF::VAL_TYPE_SIZE}, - {fileoff, "fileoff", offsetof(XMACH_DEF::segment_command, fileoff), 4, - "uint32", FW_DEF::VAL_TYPE_OFFSET}, - {filesize, "filesize", offsetof(XMACH_DEF::segment_command, filesize), 4, - "uint32", FW_DEF::VAL_TYPE_SIZE}, - {maxprot, "maxprot", offsetof(XMACH_DEF::segment_command, maxprot), 4, - "int32", FW_DEF::VAL_TYPE_DATA}, - {initprot, "initprot", offsetof(XMACH_DEF::segment_command, initprot), 4, - "int32", FW_DEF::VAL_TYPE_DATA}, - {nsects, "nsects", offsetof(XMACH_DEF::segment_command, nsects), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {flags, "flags", offsetof(XMACH_DEF::segment_command, flags), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, + {segname, "segname", offsetof(XMACH_DEF::segment_command, segname), 16, "char[16]", FW_DEF::VAL_TYPE_TEXT}, + {vmaddr, "vmaddr", offsetof(XMACH_DEF::segment_command, vmaddr), 4, "uint32", FW_DEF::VAL_TYPE_ADDRESS}, + {vmsize, "vmsize", offsetof(XMACH_DEF::segment_command, vmsize), 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, + {fileoff, "fileoff", offsetof(XMACH_DEF::segment_command, fileoff), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {filesize, "filesize", offsetof(XMACH_DEF::segment_command, filesize), 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, + {maxprot, "maxprot", offsetof(XMACH_DEF::segment_command, maxprot), 4, "int32", FW_DEF::VAL_TYPE_DATA}, + {initprot, "initprot", offsetof(XMACH_DEF::segment_command, initprot), 4, "int32", FW_DEF::VAL_TYPE_DATA}, + {nsects, "nsects", offsetof(XMACH_DEF::segment_command, nsects), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {flags, "flags", offsetof(XMACH_DEF::segment_command, flags), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, }; const FW_DEF::HEADER_RECORD records64[] = { - {segname, "segname", offsetof(XMACH_DEF::segment_command_64, segname), 16, - "char[16]", FW_DEF::VAL_TYPE_TEXT}, - {vmaddr, "vmaddr", offsetof(XMACH_DEF::segment_command_64, vmaddr), 8, - "uint64", FW_DEF::VAL_TYPE_ADDRESS}, - {vmsize, "vmsize", offsetof(XMACH_DEF::segment_command_64, vmsize), 8, - "uint64", FW_DEF::VAL_TYPE_SIZE}, - {fileoff, "fileoff", offsetof(XMACH_DEF::segment_command_64, fileoff), 8, - "uint64", FW_DEF::VAL_TYPE_OFFSET}, - {filesize, "filesize", offsetof(XMACH_DEF::segment_command_64, filesize), 8, - "uint64", FW_DEF::VAL_TYPE_SIZE}, - {maxprot, "maxprot", offsetof(XMACH_DEF::segment_command_64, maxprot), 4, - "int32", FW_DEF::VAL_TYPE_DATA}, - {initprot, "initprot", offsetof(XMACH_DEF::segment_command_64, initprot), 4, - "int32", FW_DEF::VAL_TYPE_DATA}, - {nsects, "nsects", offsetof(XMACH_DEF::segment_command_64, nsects), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {flags, "flags", offsetof(XMACH_DEF::segment_command_64, flags), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, + {segname, "segname", offsetof(XMACH_DEF::segment_command_64, segname), 16, "char[16]", FW_DEF::VAL_TYPE_TEXT}, + {vmaddr, "vmaddr", offsetof(XMACH_DEF::segment_command_64, vmaddr), 8, "uint64", FW_DEF::VAL_TYPE_ADDRESS}, + {vmsize, "vmsize", offsetof(XMACH_DEF::segment_command_64, vmsize), 8, "uint64", FW_DEF::VAL_TYPE_SIZE}, + {fileoff, "fileoff", offsetof(XMACH_DEF::segment_command_64, fileoff), 8, "uint64", FW_DEF::VAL_TYPE_OFFSET}, + {filesize, "filesize", offsetof(XMACH_DEF::segment_command_64, filesize), 8, "uint64", FW_DEF::VAL_TYPE_SIZE}, + {maxprot, "maxprot", offsetof(XMACH_DEF::segment_command_64, maxprot), 4, "int32", FW_DEF::VAL_TYPE_DATA}, + {initprot, "initprot", offsetof(XMACH_DEF::segment_command_64, initprot), 4, "int32", FW_DEF::VAL_TYPE_DATA}, + {nsects, "nsects", offsetof(XMACH_DEF::segment_command_64, nsects), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {flags, "flags", offsetof(XMACH_DEF::segment_command_64, flags), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, }; } // namespace N_mach_segments namespace N_mach_sections32 { const FW_DEF::HEADER_RECORD records[] = { - {sectname, "sectname", offsetof(XMACH_DEF::section, sectname), 16, - "char[16]", FW_DEF::VAL_TYPE_TEXT}, - {segname, "segname", offsetof(XMACH_DEF::section, segname), 16, "char[16]", - FW_DEF::VAL_TYPE_TEXT}, - {addr, "addr", offsetof(XMACH_DEF::section, addr), 4, "uint32", - FW_DEF::VAL_TYPE_ADDRESS}, - {size, "size", offsetof(XMACH_DEF::section, size), 4, "uint32", - FW_DEF::VAL_TYPE_SIZE}, - {offset, "offset", offsetof(XMACH_DEF::section, offset), 4, "uint32", - FW_DEF::VAL_TYPE_OFFSET}, - {align, "align", offsetof(XMACH_DEF::section, align), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {reloff, "reloff", offsetof(XMACH_DEF::section, reloff), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {nreloc, "nreloc", offsetof(XMACH_DEF::section, nreloc), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {flags, "flags", offsetof(XMACH_DEF::section, flags), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {reserved1, "reserved1", offsetof(XMACH_DEF::section, reserved1), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {reserved2, "reserved2", offsetof(XMACH_DEF::section, reserved2), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, + {sectname, "sectname", offsetof(XMACH_DEF::section, sectname), 16, "char[16]", FW_DEF::VAL_TYPE_TEXT}, + {segname, "segname", offsetof(XMACH_DEF::section, segname), 16, "char[16]", FW_DEF::VAL_TYPE_TEXT}, + {addr, "addr", offsetof(XMACH_DEF::section, addr), 4, "uint32", FW_DEF::VAL_TYPE_ADDRESS}, + {size, "size", offsetof(XMACH_DEF::section, size), 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, + {offset, "offset", offsetof(XMACH_DEF::section, offset), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {align, "align", offsetof(XMACH_DEF::section, align), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {reloff, "reloff", offsetof(XMACH_DEF::section, reloff), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {nreloc, "nreloc", offsetof(XMACH_DEF::section, nreloc), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {flags, "flags", offsetof(XMACH_DEF::section, flags), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {reserved1, "reserved1", offsetof(XMACH_DEF::section, reserved1), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {reserved2, "reserved2", offsetof(XMACH_DEF::section, reserved2), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, }; } namespace N_mach_sections32_E { const FW_DEF::HEADER_RECORD records[] = { - {sectname, "sectname", offsetof(XMACH_DEF::section, sectname), 16, - "char[16]", FW_DEF::VAL_TYPE_TEXT}, - {segname, "segname", offsetof(XMACH_DEF::section, segname), 16, "char[16]", - FW_DEF::VAL_TYPE_TEXT}, - {addr, "addr", offsetof(XMACH_DEF::section, addr), 4, "uint32", - FW_DEF::VAL_TYPE_ADDRESS}, - {size, "size", offsetof(XMACH_DEF::section, size), 4, "uint32", - FW_DEF::VAL_TYPE_SIZE}, - {offset, "offset", offsetof(XMACH_DEF::section, offset), 4, "uint32", - FW_DEF::VAL_TYPE_OFFSET}, - {align, "align", offsetof(XMACH_DEF::section, align), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {reloff, "reloff", offsetof(XMACH_DEF::section, reloff), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {nreloc, "nreloc", offsetof(XMACH_DEF::section, nreloc), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {flags_0, "flags", offsetof(XMACH_DEF::section, flags), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, + {sectname, "sectname", offsetof(XMACH_DEF::section, sectname), 16, "char[16]", FW_DEF::VAL_TYPE_TEXT}, + {segname, "segname", offsetof(XMACH_DEF::section, segname), 16, "char[16]", FW_DEF::VAL_TYPE_TEXT}, + {addr, "addr", offsetof(XMACH_DEF::section, addr), 4, "uint32", FW_DEF::VAL_TYPE_ADDRESS}, + {size, "size", offsetof(XMACH_DEF::section, size), 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, + {offset, "offset", offsetof(XMACH_DEF::section, offset), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {align, "align", offsetof(XMACH_DEF::section, align), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {reloff, "reloff", offsetof(XMACH_DEF::section, reloff), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {nreloc, "nreloc", offsetof(XMACH_DEF::section, nreloc), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {flags_0, "flags", offsetof(XMACH_DEF::section, flags), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, {flags_1, "", -1, 0, "", FW_DEF::VAL_TYPE_UNKNOWN}, {flags_2, "", -1, 0, "", FW_DEF::VAL_TYPE_UNKNOWN}, - {reserved1, "reserved1", offsetof(XMACH_DEF::section, reserved1), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {reserved2, "reserved2", offsetof(XMACH_DEF::section, reserved2), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, + {reserved1, "reserved1", offsetof(XMACH_DEF::section, reserved1), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {reserved2, "reserved2", offsetof(XMACH_DEF::section, reserved2), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, }; } namespace N_mach_sections64 { const FW_DEF::HEADER_RECORD records[] = { - {sectname, "sectname", offsetof(XMACH_DEF::section_64, sectname), 16, - "char[16]", FW_DEF::VAL_TYPE_TEXT}, - {segname, "segname", offsetof(XMACH_DEF::section_64, segname), 16, - "char[16]", FW_DEF::VAL_TYPE_TEXT}, - {addr, "addr", offsetof(XMACH_DEF::section_64, addr), 8, "uint64", - FW_DEF::VAL_TYPE_ADDRESS}, - {size, "size", offsetof(XMACH_DEF::section_64, size), 8, "uint64", - FW_DEF::VAL_TYPE_SIZE}, - {offset, "offset", offsetof(XMACH_DEF::section_64, offset), 4, "uint32", - FW_DEF::VAL_TYPE_OFFSET}, - {align, "align", offsetof(XMACH_DEF::section_64, align), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {reloff, "reloff", offsetof(XMACH_DEF::section_64, reloff), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {nreloc, "nreloc", offsetof(XMACH_DEF::section_64, nreloc), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {flags, "flags", offsetof(XMACH_DEF::section_64, flags), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {reserved1, "reserved1", offsetof(XMACH_DEF::section_64, reserved1), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {reserved2, "reserved2", offsetof(XMACH_DEF::section_64, reserved2), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {reserved3, "reserved3", offsetof(XMACH_DEF::section_64, reserved3), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, + {sectname, "sectname", offsetof(XMACH_DEF::section_64, sectname), 16, "char[16]", FW_DEF::VAL_TYPE_TEXT}, + {segname, "segname", offsetof(XMACH_DEF::section_64, segname), 16, "char[16]", FW_DEF::VAL_TYPE_TEXT}, + {addr, "addr", offsetof(XMACH_DEF::section_64, addr), 8, "uint64", FW_DEF::VAL_TYPE_ADDRESS}, + {size, "size", offsetof(XMACH_DEF::section_64, size), 8, "uint64", FW_DEF::VAL_TYPE_SIZE}, + {offset, "offset", offsetof(XMACH_DEF::section_64, offset), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {align, "align", offsetof(XMACH_DEF::section_64, align), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {reloff, "reloff", offsetof(XMACH_DEF::section_64, reloff), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {nreloc, "nreloc", offsetof(XMACH_DEF::section_64, nreloc), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {flags, "flags", offsetof(XMACH_DEF::section_64, flags), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {reserved1, "reserved1", offsetof(XMACH_DEF::section_64, reserved1), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {reserved2, "reserved2", offsetof(XMACH_DEF::section_64, reserved2), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {reserved3, "reserved3", offsetof(XMACH_DEF::section_64, reserved3), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, }; } namespace N_mach_sections64_E { const FW_DEF::HEADER_RECORD records[] = { - {sectname, "sectname", offsetof(XMACH_DEF::section_64, sectname), 16, - "char[16]", FW_DEF::VAL_TYPE_TEXT}, - {segname, "segname", offsetof(XMACH_DEF::section_64, segname), 16, - "char[16]", FW_DEF::VAL_TYPE_TEXT}, - {addr, "addr", offsetof(XMACH_DEF::section_64, addr), 8, "uint64", - FW_DEF::VAL_TYPE_ADDRESS}, - {size, "size", offsetof(XMACH_DEF::section_64, size), 8, "uint64", - FW_DEF::VAL_TYPE_SIZE}, - {offset, "offset", offsetof(XMACH_DEF::section_64, offset), 4, "uint32", - FW_DEF::VAL_TYPE_OFFSET}, - {align, "align", offsetof(XMACH_DEF::section_64, align), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {reloff, "reloff", offsetof(XMACH_DEF::section_64, reloff), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {nreloc, "nreloc", offsetof(XMACH_DEF::section_64, nreloc), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {flags_0, "flags", offsetof(XMACH_DEF::section_64, flags), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, + {sectname, "sectname", offsetof(XMACH_DEF::section_64, sectname), 16, "char[16]", FW_DEF::VAL_TYPE_TEXT}, + {segname, "segname", offsetof(XMACH_DEF::section_64, segname), 16, "char[16]", FW_DEF::VAL_TYPE_TEXT}, + {addr, "addr", offsetof(XMACH_DEF::section_64, addr), 8, "uint64", FW_DEF::VAL_TYPE_ADDRESS}, + {size, "size", offsetof(XMACH_DEF::section_64, size), 8, "uint64", FW_DEF::VAL_TYPE_SIZE}, + {offset, "offset", offsetof(XMACH_DEF::section_64, offset), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {align, "align", offsetof(XMACH_DEF::section_64, align), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {reloff, "reloff", offsetof(XMACH_DEF::section_64, reloff), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {nreloc, "nreloc", offsetof(XMACH_DEF::section_64, nreloc), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {flags_0, "flags", offsetof(XMACH_DEF::section_64, flags), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, {flags_1, "", -1, 0, "", FW_DEF::VAL_TYPE_UNKNOWN}, {flags_2, "", -1, 0, "", FW_DEF::VAL_TYPE_UNKNOWN}, - {reserved1, "reserved1", offsetof(XMACH_DEF::section_64, reserved1), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {reserved2, "reserved2", offsetof(XMACH_DEF::section_64, reserved2), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {reserved3, "reserved3", offsetof(XMACH_DEF::section_64, reserved3), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, + {reserved1, "reserved1", offsetof(XMACH_DEF::section_64, reserved1), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {reserved2, "reserved2", offsetof(XMACH_DEF::section_64, reserved2), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {reserved3, "reserved3", offsetof(XMACH_DEF::section_64, reserved3), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, }; } namespace N_mach_library { const FW_DEF::HEADER_RECORD records[] = { - {timestamp, "timestamp", - sizeof(XMACH_DEF::load_command) + offsetof(XMACH_DEF::dylib, timestamp), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {current_version, "current_version", - sizeof(XMACH_DEF::load_command) + - offsetof(XMACH_DEF::dylib, current_version), - 4, "uint32", FW_DEF::VAL_TYPE_DATA}, - {compatibility_version, "compatibility_version", - sizeof(XMACH_DEF::load_command) + - offsetof(XMACH_DEF::dylib, compatibility_version), - 4, "uint32", FW_DEF::VAL_TYPE_DATA}, - {name, QObject::tr("Name"), - sizeof(XMACH_DEF::load_command) + sizeof(XMACH_DEF::dylib), -1, - "Ansi string", FW_DEF::VAL_TYPE_TEXT}, + {timestamp, "timestamp", sizeof(XMACH_DEF::load_command) + offsetof(XMACH_DEF::dylib, timestamp), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {current_version, "current_version", sizeof(XMACH_DEF::load_command) + offsetof(XMACH_DEF::dylib, current_version), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {compatibility_version, "compatibility_version", sizeof(XMACH_DEF::load_command) + offsetof(XMACH_DEF::dylib, compatibility_version), 4, "uint32", + FW_DEF::VAL_TYPE_DATA}, + {name, QObject::tr("Name"), sizeof(XMACH_DEF::load_command) + sizeof(XMACH_DEF::dylib), -1, "Ansi string", FW_DEF::VAL_TYPE_TEXT}, }; } namespace N_mach_fmv_library { const FW_DEF::HEADER_RECORD records[] = { - {minor_version, "minor_version", - sizeof(XMACH_DEF::load_command) + - offsetof(XMACH_DEF::fvmlib, minor_version), - 4, "uint32", FW_DEF::VAL_TYPE_DATA}, - {header_addr, "header_addr", - sizeof(XMACH_DEF::load_command) + offsetof(XMACH_DEF::fvmlib, header_addr), - 4, "uint32", FW_DEF::VAL_TYPE_DATA}, - {name, QObject::tr("Name"), - sizeof(XMACH_DEF::load_command) + sizeof(XMACH_DEF::fvmlib), -1, - "Ansi string", FW_DEF::VAL_TYPE_TEXT}, + {minor_version, "minor_version", sizeof(XMACH_DEF::load_command) + offsetof(XMACH_DEF::fvmlib, minor_version), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {header_addr, "header_addr", sizeof(XMACH_DEF::load_command) + offsetof(XMACH_DEF::fvmlib, header_addr), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {name, QObject::tr("Name"), sizeof(XMACH_DEF::load_command) + sizeof(XMACH_DEF::fvmlib), -1, "Ansi string", FW_DEF::VAL_TYPE_TEXT}, }; } namespace N_mach_dyld_info { const FW_DEF::HEADER_RECORD records[] = { - {rebase_off, "rebase_off", - offsetof(XMACH_DEF::dyld_info_command, rebase_off), 4, "uint32", - FW_DEF::VAL_TYPE_OFFSET}, - {rebase_size, "rebase_size", - offsetof(XMACH_DEF::dyld_info_command, rebase_size), 4, "uint32", - FW_DEF::VAL_TYPE_SIZE}, - {bind_off, "bind_off", offsetof(XMACH_DEF::dyld_info_command, bind_off), 4, - "uint32", FW_DEF::VAL_TYPE_OFFSET}, - {bind_size, "bind_size", offsetof(XMACH_DEF::dyld_info_command, bind_size), - 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, - {weak_bind_off, "weak_bind_off", - offsetof(XMACH_DEF::dyld_info_command, weak_bind_off), 4, "uint32", - FW_DEF::VAL_TYPE_OFFSET}, - {weak_bind_size, "weak_bind_size", - offsetof(XMACH_DEF::dyld_info_command, weak_bind_size), 4, "uint32", - FW_DEF::VAL_TYPE_SIZE}, - {lazy_bind_off, "lazy_bind_off", - offsetof(XMACH_DEF::dyld_info_command, lazy_bind_off), 4, "uint32", - FW_DEF::VAL_TYPE_OFFSET}, - {lazy_bind_size, "lazy_bind_size", - offsetof(XMACH_DEF::dyld_info_command, lazy_bind_size), 4, "uint32", - FW_DEF::VAL_TYPE_SIZE}, - {export_off, "export_off", - offsetof(XMACH_DEF::dyld_info_command, export_off), 4, "uint32", - FW_DEF::VAL_TYPE_OFFSET}, - {export_size, "export_size", - offsetof(XMACH_DEF::dyld_info_command, export_size), 4, "uint32", - FW_DEF::VAL_TYPE_SIZE}, + {rebase_off, "rebase_off", offsetof(XMACH_DEF::dyld_info_command, rebase_off), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {rebase_size, "rebase_size", offsetof(XMACH_DEF::dyld_info_command, rebase_size), 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, + {bind_off, "bind_off", offsetof(XMACH_DEF::dyld_info_command, bind_off), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {bind_size, "bind_size", offsetof(XMACH_DEF::dyld_info_command, bind_size), 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, + {weak_bind_off, "weak_bind_off", offsetof(XMACH_DEF::dyld_info_command, weak_bind_off), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {weak_bind_size, "weak_bind_size", offsetof(XMACH_DEF::dyld_info_command, weak_bind_size), 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, + {lazy_bind_off, "lazy_bind_off", offsetof(XMACH_DEF::dyld_info_command, lazy_bind_off), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {lazy_bind_size, "lazy_bind_size", offsetof(XMACH_DEF::dyld_info_command, lazy_bind_size), 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, + {export_off, "export_off", offsetof(XMACH_DEF::dyld_info_command, export_off), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {export_size, "export_size", offsetof(XMACH_DEF::dyld_info_command, export_size), 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, }; } namespace N_mach_uuid { const FW_DEF::HEADER_RECORD records[] = { - {uuid, "uuid", sizeof(XMACH_DEF::load_command), 16, "bytes", - FW_DEF::VAL_TYPE_UUID}, + {uuid, "uuid", sizeof(XMACH_DEF::load_command), 16, "bytes", FW_DEF::VAL_TYPE_UUID}, }; } namespace N_mach_dylinker { const FW_DEF::HEADER_RECORD records[] = { - {dylinker, "dylinker", sizeof(XMACH_DEF::load_command), -1, "Ansi string", - FW_DEF::VAL_TYPE_TEXT}, + {dylinker, "dylinker", sizeof(XMACH_DEF::load_command), -1, "Ansi string", FW_DEF::VAL_TYPE_TEXT}, }; } namespace N_mach_rpath { const FW_DEF::HEADER_RECORD records[] = { - {path, "path", sizeof(XMACH_DEF::load_command), -1, "Ansi string", - FW_DEF::VAL_TYPE_TEXT}, + {path, "path", sizeof(XMACH_DEF::load_command), -1, "Ansi string", FW_DEF::VAL_TYPE_TEXT}, }; } namespace N_mach_symtab { const FW_DEF::HEADER_RECORD records[] = { - {symoff, "symoff", offsetof(XMACH_DEF::symtab_command, symoff), 4, "uint32", - FW_DEF::VAL_TYPE_OFFSET}, - {nsyms, "nsyms", offsetof(XMACH_DEF::symtab_command, nsyms), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {stroff, "stroff", offsetof(XMACH_DEF::symtab_command, stroff), 4, "uint32", - FW_DEF::VAL_TYPE_OFFSET}, - {strsize, "strsize", offsetof(XMACH_DEF::symtab_command, strsize), 4, - "uint32", FW_DEF::VAL_TYPE_SIZE}, + {symoff, "symoff", offsetof(XMACH_DEF::symtab_command, symoff), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {nsyms, "nsyms", offsetof(XMACH_DEF::symtab_command, nsyms), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {stroff, "stroff", offsetof(XMACH_DEF::symtab_command, stroff), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {strsize, "strsize", offsetof(XMACH_DEF::symtab_command, strsize), 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, }; } namespace N_mach_dysymtab { const FW_DEF::HEADER_RECORD records[] = { - {ilocalsym, "ilocalsym", offsetof(XMACH_DEF::dysymtab_command, ilocalsym), - 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, - {nlocalsym, "nlocalsym", offsetof(XMACH_DEF::dysymtab_command, nlocalsym), - 4, "uint32", FW_DEF::VAL_TYPE_DATA}, - {iextdefsym, "iextdefsym", - offsetof(XMACH_DEF::dysymtab_command, iextdefsym), 4, "uint32", - FW_DEF::VAL_TYPE_OFFSET}, - {nextdefsym, "nextdefsym", - offsetof(XMACH_DEF::dysymtab_command, nextdefsym), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {iundefsym, "iundefsym", offsetof(XMACH_DEF::dysymtab_command, iundefsym), - 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, - {nundefsym, "nundefsym", offsetof(XMACH_DEF::dysymtab_command, nundefsym), - 4, "uint32", FW_DEF::VAL_TYPE_DATA}, - {tocoff, "tocoff", offsetof(XMACH_DEF::dysymtab_command, tocoff), 4, - "uint32", FW_DEF::VAL_TYPE_OFFSET}, - {ntoc, "ntoc", offsetof(XMACH_DEF::dysymtab_command, ntoc), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {modtaboff, "modtaboff", offsetof(XMACH_DEF::dysymtab_command, modtaboff), - 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, - {nmodtab, "nmodtab", offsetof(XMACH_DEF::dysymtab_command, nmodtab), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {extrefsymoff, "extrefsymoff", - offsetof(XMACH_DEF::dysymtab_command, extrefsymoff), 4, "uint32", - FW_DEF::VAL_TYPE_OFFSET}, - {nextrefsyms, "nextrefsyms", - offsetof(XMACH_DEF::dysymtab_command, nextrefsyms), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {indirectsymoff, "indirectsymoff", - offsetof(XMACH_DEF::dysymtab_command, indirectsymoff), 4, "uint32", - FW_DEF::VAL_TYPE_OFFSET}, - {nindirectsyms, "nindirectsyms", - offsetof(XMACH_DEF::dysymtab_command, nindirectsyms), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {extreloff, "extreloff", offsetof(XMACH_DEF::dysymtab_command, extreloff), - 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, - {nextrel, "nextrel", offsetof(XMACH_DEF::dysymtab_command, nextrel), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {locreloff, "locreloff", offsetof(XMACH_DEF::dysymtab_command, locreloff), - 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, - {nlocrel, "nlocrel", offsetof(XMACH_DEF::dysymtab_command, nlocrel), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, + {ilocalsym, "ilocalsym", offsetof(XMACH_DEF::dysymtab_command, ilocalsym), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {nlocalsym, "nlocalsym", offsetof(XMACH_DEF::dysymtab_command, nlocalsym), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {iextdefsym, "iextdefsym", offsetof(XMACH_DEF::dysymtab_command, iextdefsym), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {nextdefsym, "nextdefsym", offsetof(XMACH_DEF::dysymtab_command, nextdefsym), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {iundefsym, "iundefsym", offsetof(XMACH_DEF::dysymtab_command, iundefsym), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {nundefsym, "nundefsym", offsetof(XMACH_DEF::dysymtab_command, nundefsym), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {tocoff, "tocoff", offsetof(XMACH_DEF::dysymtab_command, tocoff), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {ntoc, "ntoc", offsetof(XMACH_DEF::dysymtab_command, ntoc), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {modtaboff, "modtaboff", offsetof(XMACH_DEF::dysymtab_command, modtaboff), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {nmodtab, "nmodtab", offsetof(XMACH_DEF::dysymtab_command, nmodtab), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {extrefsymoff, "extrefsymoff", offsetof(XMACH_DEF::dysymtab_command, extrefsymoff), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {nextrefsyms, "nextrefsyms", offsetof(XMACH_DEF::dysymtab_command, nextrefsyms), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {indirectsymoff, "indirectsymoff", offsetof(XMACH_DEF::dysymtab_command, indirectsymoff), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {nindirectsyms, "nindirectsyms", offsetof(XMACH_DEF::dysymtab_command, nindirectsyms), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {extreloff, "extreloff", offsetof(XMACH_DEF::dysymtab_command, extreloff), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {nextrel, "nextrel", offsetof(XMACH_DEF::dysymtab_command, nextrel), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {locreloff, "locreloff", offsetof(XMACH_DEF::dysymtab_command, locreloff), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {nlocrel, "nlocrel", offsetof(XMACH_DEF::dysymtab_command, nlocrel), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, }; } namespace N_mach_version_min { const FW_DEF::HEADER_RECORD records[] = { - {version, QObject::tr("Version"), - offsetof(XMACH_DEF::version_min_command, version), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {sdk, "sdk", offsetof(XMACH_DEF::version_min_command, sdk), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, + {version, QObject::tr("Version"), offsetof(XMACH_DEF::version_min_command, version), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {sdk, "sdk", offsetof(XMACH_DEF::version_min_command, sdk), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, }; } namespace N_mach_build_version { const FW_DEF::HEADER_RECORD records[] = { - {platform, "platform", offsetof(XMACH_DEF::build_version_command, platform), - 4, "uint32", FW_DEF::VAL_TYPE_DATA}, - {minos, "minos", offsetof(XMACH_DEF::build_version_command, minos), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {sdk, "sdk", offsetof(XMACH_DEF::build_version_command, sdk), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {ntools, "ntools", offsetof(XMACH_DEF::build_version_command, ntools), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, + {platform, "platform", offsetof(XMACH_DEF::build_version_command, platform), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {minos, "minos", offsetof(XMACH_DEF::build_version_command, minos), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {sdk, "sdk", offsetof(XMACH_DEF::build_version_command, sdk), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {ntools, "ntools", offsetof(XMACH_DEF::build_version_command, ntools), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, }; } namespace N_mach_source_version { const FW_DEF::HEADER_RECORD records[] = { - {version, QObject::tr("Version"), - offsetof(XMACH_DEF::source_version_command, version), 8, "uint64", - FW_DEF::VAL_TYPE_DATA}, + {version, QObject::tr("Version"), offsetof(XMACH_DEF::source_version_command, version), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, }; } namespace N_mach_encryption_info { const FW_DEF::HEADER_RECORD records32[] = { - {cryptoff, "cryptoff", - offsetof(XMACH_DEF::encryption_info_command, cryptoff), 4, "uint32", - FW_DEF::VAL_TYPE_OFFSET}, - {cryptsize, "cryptsize", - offsetof(XMACH_DEF::encryption_info_command, cryptsize), 4, "uint32", - FW_DEF::VAL_TYPE_SIZE}, - {cryptid, "cryptid", offsetof(XMACH_DEF::encryption_info_command, cryptid), - 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {cryptoff, "cryptoff", offsetof(XMACH_DEF::encryption_info_command, cryptoff), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {cryptsize, "cryptsize", offsetof(XMACH_DEF::encryption_info_command, cryptsize), 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, + {cryptid, "cryptid", offsetof(XMACH_DEF::encryption_info_command, cryptid), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, }; const FW_DEF::HEADER_RECORD records64[] = { - {cryptoff, "cryptoff", - offsetof(XMACH_DEF::encryption_info_command_64, cryptoff), 4, "uint32", - FW_DEF::VAL_TYPE_OFFSET}, - {cryptsize, "cryptsize", - offsetof(XMACH_DEF::encryption_info_command_64, cryptsize), 4, "uint32", - FW_DEF::VAL_TYPE_SIZE}, - {cryptid, "cryptid", - offsetof(XMACH_DEF::encryption_info_command_64, cryptid), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {pad, "pad", offsetof(XMACH_DEF::encryption_info_command_64, pad), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, + {cryptoff, "cryptoff", offsetof(XMACH_DEF::encryption_info_command_64, cryptoff), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {cryptsize, "cryptsize", offsetof(XMACH_DEF::encryption_info_command_64, cryptsize), 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, + {cryptid, "cryptid", offsetof(XMACH_DEF::encryption_info_command_64, cryptid), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {pad, "pad", offsetof(XMACH_DEF::encryption_info_command_64, pad), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, }; } // namespace N_mach_encryption_info namespace N_mach_linkedit_data { const FW_DEF::HEADER_RECORD records[] = { - {dataoff, "dataoff", offsetof(XMACH_DEF::linkedit_data_command, dataoff), 4, - "uint32", FW_DEF::VAL_TYPE_OFFSET}, - {datasize, "datasize", offsetof(XMACH_DEF::linkedit_data_command, datasize), - 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, + {dataoff, "dataoff", offsetof(XMACH_DEF::linkedit_data_command, dataoff), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {datasize, "datasize", offsetof(XMACH_DEF::linkedit_data_command, datasize), 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, }; } namespace N_mach_main { const FW_DEF::HEADER_RECORD records[] = { - {entryoff, "entryoff", offsetof(XMACH_DEF::entry_point_command, entryoff), - 8, "uint64", FW_DEF::VAL_TYPE_ADDRESS}, - {stacksize, "stacksize", - offsetof(XMACH_DEF::entry_point_command, stacksize), 8, "uint64", - FW_DEF::VAL_TYPE_SIZE}, + {entryoff, "entryoff", offsetof(XMACH_DEF::entry_point_command, entryoff), 8, "uint64", FW_DEF::VAL_TYPE_ADDRESS}, + {stacksize, "stacksize", offsetof(XMACH_DEF::entry_point_command, stacksize), 8, "uint64", FW_DEF::VAL_TYPE_SIZE}, }; } namespace N_mach_unix_thread { const FW_DEF::HEADER_RECORD records[] = { - {flavor, "flavor", offsetof(XMACH_DEF::unix_thread_command, flavor), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {count, "count", offsetof(XMACH_DEF::unix_thread_command, count), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, + {flavor, "flavor", offsetof(XMACH_DEF::unix_thread_command, flavor), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {count, "count", offsetof(XMACH_DEF::unix_thread_command, count), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, }; } namespace N_mach_unix_thread_x86_32 { const FW_DEF::HEADER_RECORD records[] = { - {eax, "eax", offsetof(XMACH_DEF::x86_thread_state32_t, eax), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {ebx, "ebx", offsetof(XMACH_DEF::x86_thread_state32_t, ebx), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {ecx, "ecx", offsetof(XMACH_DEF::x86_thread_state32_t, ecx), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {edx, "edx", offsetof(XMACH_DEF::x86_thread_state32_t, edx), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {edi, "edi", offsetof(XMACH_DEF::x86_thread_state32_t, edi), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {esi, "esi", offsetof(XMACH_DEF::x86_thread_state32_t, esi), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {ebp, "ebp", offsetof(XMACH_DEF::x86_thread_state32_t, ebp), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {esp, "esp", offsetof(XMACH_DEF::x86_thread_state32_t, esp), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {ss, "ss", offsetof(XMACH_DEF::x86_thread_state32_t, ss), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {eflags, "eflags", offsetof(XMACH_DEF::x86_thread_state32_t, eflags), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {eip, "eip", offsetof(XMACH_DEF::x86_thread_state32_t, eip), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {cs, "cs", offsetof(XMACH_DEF::x86_thread_state32_t, cs), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {ds, "ds", offsetof(XMACH_DEF::x86_thread_state32_t, ds), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {es, "es", offsetof(XMACH_DEF::x86_thread_state32_t, es), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {fs, "fs", offsetof(XMACH_DEF::x86_thread_state32_t, fs), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {gs, "gs", offsetof(XMACH_DEF::x86_thread_state32_t, gs), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, + {eax, "eax", offsetof(XMACH_DEF::x86_thread_state32_t, eax), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {ebx, "ebx", offsetof(XMACH_DEF::x86_thread_state32_t, ebx), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {ecx, "ecx", offsetof(XMACH_DEF::x86_thread_state32_t, ecx), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {edx, "edx", offsetof(XMACH_DEF::x86_thread_state32_t, edx), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {edi, "edi", offsetof(XMACH_DEF::x86_thread_state32_t, edi), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {esi, "esi", offsetof(XMACH_DEF::x86_thread_state32_t, esi), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {ebp, "ebp", offsetof(XMACH_DEF::x86_thread_state32_t, ebp), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {esp, "esp", offsetof(XMACH_DEF::x86_thread_state32_t, esp), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {ss, "ss", offsetof(XMACH_DEF::x86_thread_state32_t, ss), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {eflags, "eflags", offsetof(XMACH_DEF::x86_thread_state32_t, eflags), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {eip, "eip", offsetof(XMACH_DEF::x86_thread_state32_t, eip), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {cs, "cs", offsetof(XMACH_DEF::x86_thread_state32_t, cs), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {ds, "ds", offsetof(XMACH_DEF::x86_thread_state32_t, ds), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {es, "es", offsetof(XMACH_DEF::x86_thread_state32_t, es), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {fs, "fs", offsetof(XMACH_DEF::x86_thread_state32_t, fs), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {gs, "gs", offsetof(XMACH_DEF::x86_thread_state32_t, gs), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, }; } namespace N_mach_unix_thread_x86_64 { const FW_DEF::HEADER_RECORD records[] = { - {rax, "rax", offsetof(XMACH_DEF::x86_thread_state64_t, rax), 8, "uint64", - FW_DEF::VAL_TYPE_DATA}, - {rbx, "rbx", offsetof(XMACH_DEF::x86_thread_state64_t, rbx), 8, "uint64", - FW_DEF::VAL_TYPE_DATA}, - {rcx, "rcx", offsetof(XMACH_DEF::x86_thread_state64_t, rcx), 8, "uint64", - FW_DEF::VAL_TYPE_DATA}, - {rdx, "rdx", offsetof(XMACH_DEF::x86_thread_state64_t, rdx), 8, "uint64", - FW_DEF::VAL_TYPE_DATA}, - {rdi, "rdi", offsetof(XMACH_DEF::x86_thread_state64_t, rdi), 8, "uint64", - FW_DEF::VAL_TYPE_DATA}, - {rsi, "rsi", offsetof(XMACH_DEF::x86_thread_state64_t, rsi), 8, "uint64", - FW_DEF::VAL_TYPE_DATA}, - {rbp, "rbp", offsetof(XMACH_DEF::x86_thread_state64_t, rbp), 8, "uint64", - FW_DEF::VAL_TYPE_DATA}, - {rsp, "esp", offsetof(XMACH_DEF::x86_thread_state64_t, rsp), 8, "uint64", - FW_DEF::VAL_TYPE_DATA}, - {r8, "r8", offsetof(XMACH_DEF::x86_thread_state64_t, r8), 8, "uint64", - FW_DEF::VAL_TYPE_DATA}, - {r9, "r9", offsetof(XMACH_DEF::x86_thread_state64_t, r9), 8, "uint64", - FW_DEF::VAL_TYPE_DATA}, - {r10, "r10", offsetof(XMACH_DEF::x86_thread_state64_t, r10), 8, "uint64", - FW_DEF::VAL_TYPE_DATA}, - {r11, "r11", offsetof(XMACH_DEF::x86_thread_state64_t, r11), 8, "uint64", - FW_DEF::VAL_TYPE_DATA}, - {r12, "r12", offsetof(XMACH_DEF::x86_thread_state64_t, r12), 8, "uint64", - FW_DEF::VAL_TYPE_DATA}, - {r13, "r13", offsetof(XMACH_DEF::x86_thread_state64_t, r13), 8, "uint64", - FW_DEF::VAL_TYPE_DATA}, - {r14, "r14", offsetof(XMACH_DEF::x86_thread_state64_t, r14), 8, "uint64", - FW_DEF::VAL_TYPE_DATA}, - {r15, "r15", offsetof(XMACH_DEF::x86_thread_state64_t, r15), 8, "uint64", - FW_DEF::VAL_TYPE_DATA}, - {rip, "rip", offsetof(XMACH_DEF::x86_thread_state64_t, rip), 8, "uint64", - FW_DEF::VAL_TYPE_DATA}, - {rflags, "rflags", offsetof(XMACH_DEF::x86_thread_state64_t, rflags), 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {cs, "cs", offsetof(XMACH_DEF::x86_thread_state64_t, cs), 8, "uint64", - FW_DEF::VAL_TYPE_DATA}, - {fs, "fs", offsetof(XMACH_DEF::x86_thread_state64_t, fs), 8, "uint64", - FW_DEF::VAL_TYPE_DATA}, - {gs, "gs", offsetof(XMACH_DEF::x86_thread_state64_t, gs), 8, "uint64", - FW_DEF::VAL_TYPE_DATA}, + {rax, "rax", offsetof(XMACH_DEF::x86_thread_state64_t, rax), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {rbx, "rbx", offsetof(XMACH_DEF::x86_thread_state64_t, rbx), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {rcx, "rcx", offsetof(XMACH_DEF::x86_thread_state64_t, rcx), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {rdx, "rdx", offsetof(XMACH_DEF::x86_thread_state64_t, rdx), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {rdi, "rdi", offsetof(XMACH_DEF::x86_thread_state64_t, rdi), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {rsi, "rsi", offsetof(XMACH_DEF::x86_thread_state64_t, rsi), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {rbp, "rbp", offsetof(XMACH_DEF::x86_thread_state64_t, rbp), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {rsp, "esp", offsetof(XMACH_DEF::x86_thread_state64_t, rsp), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {r8, "r8", offsetof(XMACH_DEF::x86_thread_state64_t, r8), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {r9, "r9", offsetof(XMACH_DEF::x86_thread_state64_t, r9), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {r10, "r10", offsetof(XMACH_DEF::x86_thread_state64_t, r10), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {r11, "r11", offsetof(XMACH_DEF::x86_thread_state64_t, r11), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {r12, "r12", offsetof(XMACH_DEF::x86_thread_state64_t, r12), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {r13, "r13", offsetof(XMACH_DEF::x86_thread_state64_t, r13), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {r14, "r14", offsetof(XMACH_DEF::x86_thread_state64_t, r14), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {r15, "r15", offsetof(XMACH_DEF::x86_thread_state64_t, r15), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {rip, "rip", offsetof(XMACH_DEF::x86_thread_state64_t, rip), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {rflags, "rflags", offsetof(XMACH_DEF::x86_thread_state64_t, rflags), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {cs, "cs", offsetof(XMACH_DEF::x86_thread_state64_t, cs), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {fs, "fs", offsetof(XMACH_DEF::x86_thread_state64_t, fs), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {gs, "gs", offsetof(XMACH_DEF::x86_thread_state64_t, gs), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, }; } namespace N_mach_unix_thread_arm_32 { const FW_DEF::HEADER_RECORD records[] = { - {r0, "r0", - offsetof(XMACH_DEF::arm_thread_state32_t, r) + sizeof(quint32) * 0, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r1, "r1", - offsetof(XMACH_DEF::arm_thread_state32_t, r) + sizeof(quint32) * 1, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r2, "r2", - offsetof(XMACH_DEF::arm_thread_state32_t, r) + sizeof(quint32) * 2, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r3, "r3", - offsetof(XMACH_DEF::arm_thread_state32_t, r) + sizeof(quint32) * 3, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r4, "r4", - offsetof(XMACH_DEF::arm_thread_state32_t, r) + sizeof(quint32) * 4, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r5, "r5", - offsetof(XMACH_DEF::arm_thread_state32_t, r) + sizeof(quint32) * 5, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r6, "r6", - offsetof(XMACH_DEF::arm_thread_state32_t, r) + sizeof(quint32) * 6, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r7, "r7", - offsetof(XMACH_DEF::arm_thread_state32_t, r) + sizeof(quint32) * 7, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r8, "r8", - offsetof(XMACH_DEF::arm_thread_state32_t, r) + sizeof(quint32) * 8, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r9, "r9", - offsetof(XMACH_DEF::arm_thread_state32_t, r) + sizeof(quint32) * 9, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r10, "r10", - offsetof(XMACH_DEF::arm_thread_state32_t, r) + sizeof(quint32) * 10, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r11, "r11", - offsetof(XMACH_DEF::arm_thread_state32_t, r) + sizeof(quint32) * 11, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r12, "r12", - offsetof(XMACH_DEF::arm_thread_state32_t, r) + sizeof(quint32) * 12, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {sp, "sp", offsetof(XMACH_DEF::arm_thread_state32_t, sp), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {lr, "lr", offsetof(XMACH_DEF::arm_thread_state32_t, lr), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {pc, "pc", offsetof(XMACH_DEF::arm_thread_state32_t, pc), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {cpsr, "cpsr", offsetof(XMACH_DEF::arm_thread_state32_t, cpsr), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, + {r0, "r0", offsetof(XMACH_DEF::arm_thread_state32_t, r) + sizeof(quint32) * 0, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r1, "r1", offsetof(XMACH_DEF::arm_thread_state32_t, r) + sizeof(quint32) * 1, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r2, "r2", offsetof(XMACH_DEF::arm_thread_state32_t, r) + sizeof(quint32) * 2, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r3, "r3", offsetof(XMACH_DEF::arm_thread_state32_t, r) + sizeof(quint32) * 3, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r4, "r4", offsetof(XMACH_DEF::arm_thread_state32_t, r) + sizeof(quint32) * 4, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r5, "r5", offsetof(XMACH_DEF::arm_thread_state32_t, r) + sizeof(quint32) * 5, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r6, "r6", offsetof(XMACH_DEF::arm_thread_state32_t, r) + sizeof(quint32) * 6, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r7, "r7", offsetof(XMACH_DEF::arm_thread_state32_t, r) + sizeof(quint32) * 7, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r8, "r8", offsetof(XMACH_DEF::arm_thread_state32_t, r) + sizeof(quint32) * 8, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r9, "r9", offsetof(XMACH_DEF::arm_thread_state32_t, r) + sizeof(quint32) * 9, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r10, "r10", offsetof(XMACH_DEF::arm_thread_state32_t, r) + sizeof(quint32) * 10, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r11, "r11", offsetof(XMACH_DEF::arm_thread_state32_t, r) + sizeof(quint32) * 11, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r12, "r12", offsetof(XMACH_DEF::arm_thread_state32_t, r) + sizeof(quint32) * 12, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {sp, "sp", offsetof(XMACH_DEF::arm_thread_state32_t, sp), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {lr, "lr", offsetof(XMACH_DEF::arm_thread_state32_t, lr), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {pc, "pc", offsetof(XMACH_DEF::arm_thread_state32_t, pc), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {cpsr, "cpsr", offsetof(XMACH_DEF::arm_thread_state32_t, cpsr), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, }; } namespace N_mach_unix_thread_arm_64 { const FW_DEF::HEADER_RECORD records[] = { - {x0, "x0", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 0, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {x1, "x1", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 1, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {x2, "x2", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 2, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {x3, "x3", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 3, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {x4, "x4", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 4, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {x5, "x5", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 5, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {x6, "x6", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 6, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {x7, "x7", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 7, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {x8, "x8", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 8, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {x9, "x9", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 9, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {x10, "x10", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 10, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {x11, "x11", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 11, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {x12, "x12", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 12, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {x13, "x13", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 13, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {x14, "x14", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 14, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {x15, "x15", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 15, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {x16, "x16", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 16, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {x17, "x17", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 17, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {x18, "x18", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 18, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {x19, "x19", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 19, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {x20, "x20", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 20, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {x21, "x21", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 21, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {x22, "x22", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 22, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {x23, "x23", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 23, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {x24, "x24", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 24, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {x25, "x25", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 25, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {x26, "x26", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 26, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {x27, "x27", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 27, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {x28, "x28", - offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 28, 8, - "uint64", FW_DEF::VAL_TYPE_DATA}, - {fp, "fp", offsetof(XMACH_DEF::arm_thread_state64_t, fp), 8, "uint64", - FW_DEF::VAL_TYPE_DATA}, - {lr, "lr", offsetof(XMACH_DEF::arm_thread_state64_t, lr), 8, "uint64", - FW_DEF::VAL_TYPE_DATA}, - {sp, "sp", offsetof(XMACH_DEF::arm_thread_state64_t, sp), 8, "uint64", - FW_DEF::VAL_TYPE_DATA}, - {pc, "pc", offsetof(XMACH_DEF::arm_thread_state64_t, pc), 8, "uint64", - FW_DEF::VAL_TYPE_DATA}, - {cpsr, "cpsr", offsetof(XMACH_DEF::arm_thread_state64_t, cpsr), 8, "uint64", - FW_DEF::VAL_TYPE_DATA}, - {pad, "pad", offsetof(XMACH_DEF::arm_thread_state64_t, pad), 8, "uint64", - FW_DEF::VAL_TYPE_DATA}, + {x0, "x0", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 0, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {x1, "x1", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 1, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {x2, "x2", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 2, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {x3, "x3", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 3, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {x4, "x4", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 4, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {x5, "x5", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 5, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {x6, "x6", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 6, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {x7, "x7", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 7, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {x8, "x8", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 8, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {x9, "x9", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 9, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {x10, "x10", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 10, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {x11, "x11", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 11, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {x12, "x12", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 12, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {x13, "x13", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 13, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {x14, "x14", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 14, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {x15, "x15", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 15, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {x16, "x16", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 16, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {x17, "x17", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 17, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {x18, "x18", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 18, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {x19, "x19", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 19, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {x20, "x20", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 20, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {x21, "x21", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 21, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {x22, "x22", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 22, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {x23, "x23", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 23, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {x24, "x24", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 24, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {x25, "x25", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 25, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {x26, "x26", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 26, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {x27, "x27", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 27, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {x28, "x28", offsetof(XMACH_DEF::arm_thread_state64_t, x) + sizeof(quint64) * 28, 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {fp, "fp", offsetof(XMACH_DEF::arm_thread_state64_t, fp), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {lr, "lr", offsetof(XMACH_DEF::arm_thread_state64_t, lr), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {sp, "sp", offsetof(XMACH_DEF::arm_thread_state64_t, sp), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {pc, "pc", offsetof(XMACH_DEF::arm_thread_state64_t, pc), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {cpsr, "cpsr", offsetof(XMACH_DEF::arm_thread_state64_t, cpsr), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, + {pad, "pad", offsetof(XMACH_DEF::arm_thread_state64_t, pad), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, }; } namespace N_mach_unix_thread_ppc_32 { const FW_DEF::HEADER_RECORD records[] = { - {srr0, "srr0", offsetof(XMACH_DEF::ppc_thread_state32_t, srr0), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {srr1, "srr1", offsetof(XMACH_DEF::ppc_thread_state32_t, srr1), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {r0, "r0", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 0, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r1, "r1", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 1, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r2, "r2", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 2, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r3, "r3", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 3, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r4, "r4", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 4, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r5, "r5", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 5, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r6, "r6", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 6, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r7, "r7", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 7, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r8, "r8", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 8, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r9, "r9", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 9, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r10, "r10", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 10, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r11, "r11", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 11, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r12, "r12", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 12, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r13, "r13", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 13, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r14, "r14", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 14, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r15, "r15", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 15, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r16, "r16", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 16, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r17, "r17", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 17, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r18, "r18", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 18, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r19, "r19", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 19, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r10, "r20", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 20, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r21, "r21", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 21, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r22, "r22", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 22, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r23, "r23", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 23, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r24, "r24", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 24, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r25, "r25", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 25, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r26, "r26", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 26, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r27, "r27", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 27, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r28, "r28", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 28, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r29, "r29", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 29, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r30, "r30", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 30, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r31, "r31", - offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 31, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {ct, "ct", offsetof(XMACH_DEF::ppc_thread_state32_t, ct), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {xer, "xer", offsetof(XMACH_DEF::ppc_thread_state32_t, xer), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {lr, "lr", offsetof(XMACH_DEF::ppc_thread_state32_t, lr), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {ctr, "ctr", offsetof(XMACH_DEF::ppc_thread_state32_t, ctr), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {mq, "mq", offsetof(XMACH_DEF::ppc_thread_state32_t, mq), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {vrsave, "vrsave", offsetof(XMACH_DEF::ppc_thread_state32_t, vrsave), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, + {srr0, "srr0", offsetof(XMACH_DEF::ppc_thread_state32_t, srr0), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {srr1, "srr1", offsetof(XMACH_DEF::ppc_thread_state32_t, srr1), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r0, "r0", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 0, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r1, "r1", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 1, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r2, "r2", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 2, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r3, "r3", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 3, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r4, "r4", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 4, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r5, "r5", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 5, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r6, "r6", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 6, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r7, "r7", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 7, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r8, "r8", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 8, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r9, "r9", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 9, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r10, "r10", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 10, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r11, "r11", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 11, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r12, "r12", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 12, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r13, "r13", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 13, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r14, "r14", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 14, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r15, "r15", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 15, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r16, "r16", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 16, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r17, "r17", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 17, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r18, "r18", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 18, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r19, "r19", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 19, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r10, "r20", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 20, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r21, "r21", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 21, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r22, "r22", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 22, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r23, "r23", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 23, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r24, "r24", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 24, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r25, "r25", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 25, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r26, "r26", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 26, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r27, "r27", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 27, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r28, "r28", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 28, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r29, "r29", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 29, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r30, "r30", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 30, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r31, "r31", offsetof(XMACH_DEF::ppc_thread_state32_t, r) + sizeof(quint32) * 31, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {ct, "ct", offsetof(XMACH_DEF::ppc_thread_state32_t, ct), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {xer, "xer", offsetof(XMACH_DEF::ppc_thread_state32_t, xer), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {lr, "lr", offsetof(XMACH_DEF::ppc_thread_state32_t, lr), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {ctr, "ctr", offsetof(XMACH_DEF::ppc_thread_state32_t, ctr), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {mq, "mq", offsetof(XMACH_DEF::ppc_thread_state32_t, mq), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {vrsave, "vrsave", offsetof(XMACH_DEF::ppc_thread_state32_t, vrsave), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, }; extern const FW_DEF::HEADER_RECORD records[__data_size]; @@ -822,60 +445,25 @@ extern const FW_DEF::HEADER_RECORD records[__data_size]; namespace N_mach_unix_thread_m68k_32 { const FW_DEF::HEADER_RECORD records[] = { - {dreg0, "dreg0", - offsetof(XMACH_DEF::m68k_thread_state32_t, dreg) + sizeof(quint32) * 0, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {dreg1, "dreg1", - offsetof(XMACH_DEF::m68k_thread_state32_t, dreg) + sizeof(quint32) * 1, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {dreg2, "dreg2", - offsetof(XMACH_DEF::m68k_thread_state32_t, dreg) + sizeof(quint32) * 2, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {dreg3, "dreg3", - offsetof(XMACH_DEF::m68k_thread_state32_t, dreg) + sizeof(quint32) * 3, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {dreg4, "dreg4", - offsetof(XMACH_DEF::m68k_thread_state32_t, dreg) + sizeof(quint32) * 4, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {dreg5, "dreg5", - offsetof(XMACH_DEF::m68k_thread_state32_t, dreg) + sizeof(quint32) * 5, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {dreg6, "dreg6", - offsetof(XMACH_DEF::m68k_thread_state32_t, dreg) + sizeof(quint32) * 6, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {dreg7, "dreg7", - offsetof(XMACH_DEF::m68k_thread_state32_t, dreg) + sizeof(quint32) * 7, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {areg0, "areg0", - offsetof(XMACH_DEF::m68k_thread_state32_t, areg) + sizeof(quint32) * 0, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {areg1, "areg1", - offsetof(XMACH_DEF::m68k_thread_state32_t, areg) + sizeof(quint32) * 1, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {areg2, "areg2", - offsetof(XMACH_DEF::m68k_thread_state32_t, areg) + sizeof(quint32) * 2, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {areg3, "areg3", - offsetof(XMACH_DEF::m68k_thread_state32_t, areg) + sizeof(quint32) * 3, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {areg4, "areg4", - offsetof(XMACH_DEF::m68k_thread_state32_t, areg) + sizeof(quint32) * 4, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {areg5, "areg5", - offsetof(XMACH_DEF::m68k_thread_state32_t, areg) + sizeof(quint32) * 5, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {areg6, "areg6", - offsetof(XMACH_DEF::m68k_thread_state32_t, areg) + sizeof(quint32) * 6, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {areg7, "areg7", - offsetof(XMACH_DEF::m68k_thread_state32_t, areg) + sizeof(quint32) * 7, 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {pad0, "pad0", offsetof(XMACH_DEF::m68k_thread_state32_t, pad0), 2, - "uint16", FW_DEF::VAL_TYPE_DATA}, - {sr, "sr", offsetof(XMACH_DEF::m68k_thread_state32_t, sr), 2, "uint16", - FW_DEF::VAL_TYPE_DATA}, - {pc, "pc", offsetof(XMACH_DEF::m68k_thread_state32_t, pc), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, + {dreg0, "dreg0", offsetof(XMACH_DEF::m68k_thread_state32_t, dreg) + sizeof(quint32) * 0, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {dreg1, "dreg1", offsetof(XMACH_DEF::m68k_thread_state32_t, dreg) + sizeof(quint32) * 1, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {dreg2, "dreg2", offsetof(XMACH_DEF::m68k_thread_state32_t, dreg) + sizeof(quint32) * 2, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {dreg3, "dreg3", offsetof(XMACH_DEF::m68k_thread_state32_t, dreg) + sizeof(quint32) * 3, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {dreg4, "dreg4", offsetof(XMACH_DEF::m68k_thread_state32_t, dreg) + sizeof(quint32) * 4, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {dreg5, "dreg5", offsetof(XMACH_DEF::m68k_thread_state32_t, dreg) + sizeof(quint32) * 5, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {dreg6, "dreg6", offsetof(XMACH_DEF::m68k_thread_state32_t, dreg) + sizeof(quint32) * 6, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {dreg7, "dreg7", offsetof(XMACH_DEF::m68k_thread_state32_t, dreg) + sizeof(quint32) * 7, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {areg0, "areg0", offsetof(XMACH_DEF::m68k_thread_state32_t, areg) + sizeof(quint32) * 0, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {areg1, "areg1", offsetof(XMACH_DEF::m68k_thread_state32_t, areg) + sizeof(quint32) * 1, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {areg2, "areg2", offsetof(XMACH_DEF::m68k_thread_state32_t, areg) + sizeof(quint32) * 2, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {areg3, "areg3", offsetof(XMACH_DEF::m68k_thread_state32_t, areg) + sizeof(quint32) * 3, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {areg4, "areg4", offsetof(XMACH_DEF::m68k_thread_state32_t, areg) + sizeof(quint32) * 4, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {areg5, "areg5", offsetof(XMACH_DEF::m68k_thread_state32_t, areg) + sizeof(quint32) * 5, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {areg6, "areg6", offsetof(XMACH_DEF::m68k_thread_state32_t, areg) + sizeof(quint32) * 6, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {areg7, "areg7", offsetof(XMACH_DEF::m68k_thread_state32_t, areg) + sizeof(quint32) * 7, 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {pad0, "pad0", offsetof(XMACH_DEF::m68k_thread_state32_t, pad0), 2, "uint16", FW_DEF::VAL_TYPE_DATA}, + {sr, "sr", offsetof(XMACH_DEF::m68k_thread_state32_t, sr), 2, "uint16", FW_DEF::VAL_TYPE_DATA}, + {pc, "pc", offsetof(XMACH_DEF::m68k_thread_state32_t, pc), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, }; extern const FW_DEF::HEADER_RECORD records[__data_size]; @@ -883,145 +471,88 @@ extern const FW_DEF::HEADER_RECORD records[__data_size]; namespace N_mach_nlist { const FW_DEF::HEADER_RECORD records32[] = { - {n_strx, "n_strx", offsetof(XMACH_DEF::nlist, n_strx), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {n_type, "n_type", offsetof(XMACH_DEF::nlist, n_type), 1, "uint8", - FW_DEF::VAL_TYPE_DATA}, - {n_sect, "n_sect", offsetof(XMACH_DEF::nlist, n_sect), 1, "uint8", - FW_DEF::VAL_TYPE_DATA}, - {n_desc, "n_desc", offsetof(XMACH_DEF::nlist, n_desc), 2, "uint16", - FW_DEF::VAL_TYPE_DATA}, - {n_value, "n_value", offsetof(XMACH_DEF::nlist, n_value), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, + {n_strx, "n_strx", offsetof(XMACH_DEF::nlist, n_strx), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {n_type, "n_type", offsetof(XMACH_DEF::nlist, n_type), 1, "uint8", FW_DEF::VAL_TYPE_DATA}, + {n_sect, "n_sect", offsetof(XMACH_DEF::nlist, n_sect), 1, "uint8", FW_DEF::VAL_TYPE_DATA}, + {n_desc, "n_desc", offsetof(XMACH_DEF::nlist, n_desc), 2, "uint16", FW_DEF::VAL_TYPE_DATA}, + {n_value, "n_value", offsetof(XMACH_DEF::nlist, n_value), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, }; const FW_DEF::HEADER_RECORD records64[] = { - {n_strx, "n_strx", offsetof(XMACH_DEF::nlist_64, n_strx), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {n_type, "n_type", offsetof(XMACH_DEF::nlist_64, n_type), 1, "uint8", - FW_DEF::VAL_TYPE_DATA}, - {n_sect, "n_sect", offsetof(XMACH_DEF::nlist_64, n_sect), 1, "uint8", - FW_DEF::VAL_TYPE_DATA}, - {n_desc, "n_desc", offsetof(XMACH_DEF::nlist_64, n_desc), 2, "uint16", - FW_DEF::VAL_TYPE_DATA}, - {n_value, "n_value", offsetof(XMACH_DEF::nlist_64, n_value), 8, "uint64", - FW_DEF::VAL_TYPE_DATA}, + {n_strx, "n_strx", offsetof(XMACH_DEF::nlist_64, n_strx), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {n_type, "n_type", offsetof(XMACH_DEF::nlist_64, n_type), 1, "uint8", FW_DEF::VAL_TYPE_DATA}, + {n_sect, "n_sect", offsetof(XMACH_DEF::nlist_64, n_sect), 1, "uint8", FW_DEF::VAL_TYPE_DATA}, + {n_desc, "n_desc", offsetof(XMACH_DEF::nlist_64, n_desc), 2, "uint16", FW_DEF::VAL_TYPE_DATA}, + {n_value, "n_value", offsetof(XMACH_DEF::nlist_64, n_value), 8, "uint64", FW_DEF::VAL_TYPE_DATA}, }; } // namespace N_mach_nlist namespace N_mach_data_in_code_entry { const FW_DEF::HEADER_RECORD records[] = { - {offset, QObject::tr("Offset"), - offsetof(XMACH_DEF::data_in_code_entry, offset), 4, "uint32", - FW_DEF::VAL_TYPE_OFFSET}, - {length, QObject::tr("Length"), - offsetof(XMACH_DEF::data_in_code_entry, length), 1, "uint8", - FW_DEF::VAL_TYPE_SIZE}, - {kind, "kind", offsetof(XMACH_DEF::data_in_code_entry, kind), 1, "uint8", - FW_DEF::VAL_TYPE_DATA}, + {offset, QObject::tr("Offset"), offsetof(XMACH_DEF::data_in_code_entry, offset), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, + {length, QObject::tr("Length"), offsetof(XMACH_DEF::data_in_code_entry, length), 1, "uint8", FW_DEF::VAL_TYPE_SIZE}, + {kind, "kind", offsetof(XMACH_DEF::data_in_code_entry, kind), 1, "uint8", FW_DEF::VAL_TYPE_DATA}, }; } namespace N_mach_modtab32 { const FW_DEF::HEADER_RECORD records[] = { - {module_name, "module_name", offsetof(XMACH_DEF::dylib_module, module_name), - 4, "uint32", FW_DEF::VAL_TYPE_DATA}, - {iextdefsym, "iextdefsym", offsetof(XMACH_DEF::dylib_module, iextdefsym), 4, - "uint32", FW_DEF::VAL_TYPE_SIZE}, - {nextdefsym, "nextdefsym", offsetof(XMACH_DEF::dylib_module, nextdefsym), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {irefsym, "irefsym", offsetof(XMACH_DEF::dylib_module, irefsym), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {nrefsym, "nrefsym", offsetof(XMACH_DEF::dylib_module, nrefsym), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {ilocalsym, "ilocalsym", offsetof(XMACH_DEF::dylib_module, ilocalsym), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {nlocalsym, "flags", offsetof(XMACH_DEF::dylib_module, nlocalsym), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {iextrel, "iextrel", offsetof(XMACH_DEF::dylib_module, iextrel), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {nextrel, "nextrel", offsetof(XMACH_DEF::dylib_module, nextrel), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {iinit_iterm, "iinit_iterm", offsetof(XMACH_DEF::dylib_module, iinit_iterm), - 4, "uint32", FW_DEF::VAL_TYPE_DATA}, - {ninit_nterm, "ninit_nterm", offsetof(XMACH_DEF::dylib_module, ninit_nterm), - 4, "uint32", FW_DEF::VAL_TYPE_DATA}, - {objc_module_info_addr, "objc_module_info_addr", - offsetof(XMACH_DEF::dylib_module, objc_module_info_addr), 4, "uint32", - FW_DEF::VAL_TYPE_ADDRESS}, - {objc_module_info_size, "objc_module_info_size", - offsetof(XMACH_DEF::dylib_module, objc_module_info_size), 4, "uint32", - FW_DEF::VAL_TYPE_SIZE}, + {module_name, "module_name", offsetof(XMACH_DEF::dylib_module, module_name), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {iextdefsym, "iextdefsym", offsetof(XMACH_DEF::dylib_module, iextdefsym), 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, + {nextdefsym, "nextdefsym", offsetof(XMACH_DEF::dylib_module, nextdefsym), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {irefsym, "irefsym", offsetof(XMACH_DEF::dylib_module, irefsym), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {nrefsym, "nrefsym", offsetof(XMACH_DEF::dylib_module, nrefsym), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {ilocalsym, "ilocalsym", offsetof(XMACH_DEF::dylib_module, ilocalsym), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {nlocalsym, "flags", offsetof(XMACH_DEF::dylib_module, nlocalsym), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {iextrel, "iextrel", offsetof(XMACH_DEF::dylib_module, iextrel), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {nextrel, "nextrel", offsetof(XMACH_DEF::dylib_module, nextrel), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {iinit_iterm, "iinit_iterm", offsetof(XMACH_DEF::dylib_module, iinit_iterm), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {ninit_nterm, "ninit_nterm", offsetof(XMACH_DEF::dylib_module, ninit_nterm), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {objc_module_info_addr, "objc_module_info_addr", offsetof(XMACH_DEF::dylib_module, objc_module_info_addr), 4, "uint32", FW_DEF::VAL_TYPE_ADDRESS}, + {objc_module_info_size, "objc_module_info_size", offsetof(XMACH_DEF::dylib_module, objc_module_info_size), 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, }; } namespace N_mach_modtab64 { const FW_DEF::HEADER_RECORD records[] = { - {module_name, "module_name", offsetof(XMACH_DEF::dylib_module, module_name), - 4, "uint32", FW_DEF::VAL_TYPE_DATA}, - {iextdefsym, "iextdefsym", offsetof(XMACH_DEF::dylib_module, iextdefsym), 4, - "uint32", FW_DEF::VAL_TYPE_SIZE}, - {nextdefsym, "nextdefsym", offsetof(XMACH_DEF::dylib_module, nextdefsym), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {irefsym, "irefsym", offsetof(XMACH_DEF::dylib_module, irefsym), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {nrefsym, "nrefsym", offsetof(XMACH_DEF::dylib_module, nrefsym), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {ilocalsym, "ilocalsym", offsetof(XMACH_DEF::dylib_module, ilocalsym), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {nlocalsym, "flags", offsetof(XMACH_DEF::dylib_module, nlocalsym), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {iextrel, "iextrel", offsetof(XMACH_DEF::dylib_module, iextrel), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {nextrel, "nextrel", offsetof(XMACH_DEF::dylib_module, nextrel), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {iinit_iterm, "iinit_iterm", offsetof(XMACH_DEF::dylib_module, iinit_iterm), - 4, "uint32", FW_DEF::VAL_TYPE_DATA}, - {ninit_nterm, "ninit_nterm", offsetof(XMACH_DEF::dylib_module, ninit_nterm), - 4, "uint32", FW_DEF::VAL_TYPE_DATA}, - {objc_module_info_addr, "objc_module_info_addr", - offsetof(XMACH_DEF::dylib_module, objc_module_info_addr), 4, "uint32", - FW_DEF::VAL_TYPE_ADDRESS}, - {objc_module_info_size, "objc_module_info_size", - offsetof(XMACH_DEF::dylib_module, objc_module_info_size), 8, "uint64", - FW_DEF::VAL_TYPE_SIZE}, + {module_name, "module_name", offsetof(XMACH_DEF::dylib_module, module_name), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {iextdefsym, "iextdefsym", offsetof(XMACH_DEF::dylib_module, iextdefsym), 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, + {nextdefsym, "nextdefsym", offsetof(XMACH_DEF::dylib_module, nextdefsym), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {irefsym, "irefsym", offsetof(XMACH_DEF::dylib_module, irefsym), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {nrefsym, "nrefsym", offsetof(XMACH_DEF::dylib_module, nrefsym), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {ilocalsym, "ilocalsym", offsetof(XMACH_DEF::dylib_module, ilocalsym), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {nlocalsym, "flags", offsetof(XMACH_DEF::dylib_module, nlocalsym), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {iextrel, "iextrel", offsetof(XMACH_DEF::dylib_module, iextrel), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {nextrel, "nextrel", offsetof(XMACH_DEF::dylib_module, nextrel), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {iinit_iterm, "iinit_iterm", offsetof(XMACH_DEF::dylib_module, iinit_iterm), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {ninit_nterm, "ninit_nterm", offsetof(XMACH_DEF::dylib_module, ninit_nterm), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {objc_module_info_addr, "objc_module_info_addr", offsetof(XMACH_DEF::dylib_module, objc_module_info_addr), 4, "uint32", FW_DEF::VAL_TYPE_ADDRESS}, + {objc_module_info_size, "objc_module_info_size", offsetof(XMACH_DEF::dylib_module, objc_module_info_size), 8, "uint64", FW_DEF::VAL_TYPE_SIZE}, }; } namespace N_mach_table_of_contents { const FW_DEF::HEADER_RECORD records[] = { - {symbol_index, "symbol_index", - offsetof(XMACH_DEF::dylib_table_of_contents, symbol_index), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {module_index, "module_index", - offsetof(XMACH_DEF::dylib_table_of_contents, module_index), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, + {symbol_index, "symbol_index", offsetof(XMACH_DEF::dylib_table_of_contents, symbol_index), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {module_index, "module_index", offsetof(XMACH_DEF::dylib_table_of_contents, module_index), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, }; } namespace N_mach_relocs { const FW_DEF::HEADER_RECORD records[] = { - {r_address, "r_address", offsetof(XMACH_DEF::relocation_info, r_address), 4, - "uint32", FW_DEF::VAL_TYPE_ADDRESS}, - {value, QObject::tr("Value"), offsetof(XMACH_DEF::relocation_info, s), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, + {r_address, "r_address", offsetof(XMACH_DEF::relocation_info, r_address), 4, "uint32", FW_DEF::VAL_TYPE_ADDRESS}, + {value, QObject::tr("Value"), offsetof(XMACH_DEF::relocation_info, s), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, }; } namespace N_mach_relocs_E { const FW_DEF::HEADER_RECORD records[] = { - {r_address, "r_address", offsetof(XMACH_DEF::relocation_info, r_address), 4, - "uint32", FW_DEF::VAL_TYPE_ADDRESS}, - {r_symbolnum, "r_symbolnum", offsetof(XMACH_DEF::relocation_info, s), 4, - "uint32", FW_DEF::VAL_TYPE_DATA}, - {r_pcrel, "r_pcrel", offsetof(XMACH_DEF::relocation_info, s), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {r_length, "r_length", offsetof(XMACH_DEF::relocation_info, s), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {r_extern, "r_extern", offsetof(XMACH_DEF::relocation_info, s), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {r_type, "r_type", offsetof(XMACH_DEF::relocation_info, s), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, + {r_address, "r_address", offsetof(XMACH_DEF::relocation_info, r_address), 4, "uint32", FW_DEF::VAL_TYPE_ADDRESS}, + {r_symbolnum, "r_symbolnum", offsetof(XMACH_DEF::relocation_info, s), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r_pcrel, "r_pcrel", offsetof(XMACH_DEF::relocation_info, s), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r_length, "r_length", offsetof(XMACH_DEF::relocation_info, s), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r_extern, "r_extern", offsetof(XMACH_DEF::relocation_info, s), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {r_type, "r_type", offsetof(XMACH_DEF::relocation_info, s), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, }; } @@ -1040,20 +571,15 @@ const FW_DEF::HEADER_RECORD records[] = { namespace N_mach_SuperBlob { const FW_DEF::HEADER_RECORD records[] = { - {magic, "magic", offsetof(XMACH_DEF::__SC_SuperBlob, magic), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {length, "length", offsetof(XMACH_DEF::__SC_SuperBlob, length), 4, "uint32", - FW_DEF::VAL_TYPE_SIZE}, - {count, "count", offsetof(XMACH_DEF::__SC_SuperBlob, count), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, + {magic, "magic", offsetof(XMACH_DEF::__SC_SuperBlob, magic), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {length, "length", offsetof(XMACH_DEF::__SC_SuperBlob, length), 4, "uint32", FW_DEF::VAL_TYPE_SIZE}, + {count, "count", offsetof(XMACH_DEF::__SC_SuperBlob, count), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, }; } namespace N_mach_BlobIndex { const FW_DEF::HEADER_RECORD records[] = { - {type, "type", offsetof(XMACH_DEF::__BlobIndex, type), 4, "uint32", - FW_DEF::VAL_TYPE_DATA}, - {offset, "offset", offsetof(XMACH_DEF::__BlobIndex, offset), 4, "uint32", - FW_DEF::VAL_TYPE_OFFSET}, + {type, "type", offsetof(XMACH_DEF::__BlobIndex, type), 4, "uint32", FW_DEF::VAL_TYPE_DATA}, + {offset, "offset", offsetof(XMACH_DEF::__BlobIndex, offset), 4, "uint32", FW_DEF::VAL_TYPE_OFFSET}, }; } diff --git a/MACH/mach_defs.h b/MACH/mach_defs.h index cad9e7a5..ebb75e87 100644 --- a/MACH/mach_defs.h +++ b/MACH/mach_defs.h @@ -87,17 +87,7 @@ enum TYPE { } namespace N_mach_header { -enum DATA { - magic = 0, - cputype, - cpusubtype, - filetype, - ncmds, - sizeofcmds, - flags, - reserved, - __data_size -}; +enum DATA { magic = 0, cputype, cpusubtype, filetype, ncmds, sizeofcmds, flags, reserved, __data_size }; extern const FW_DEF::HEADER_RECORD records32[__data_size - 1]; extern const FW_DEF::HEADER_RECORD records64[__data_size]; @@ -114,18 +104,7 @@ enum INV { __INV_size }; } // namespace N_mach_commands namespace N_mach_segments { -enum DATA { - segname = 0, - vmaddr, - vmsize, - fileoff, - filesize, - maxprot, - initprot, - nsects, - flags, - __data_size -}; +enum DATA { segname = 0, vmaddr, vmsize, fileoff, filesize, maxprot, initprot, nsects, flags, __data_size }; extern const FW_DEF::HEADER_RECORD records32[__data_size]; extern const FW_DEF::HEADER_RECORD records64[__data_size]; @@ -136,20 +115,7 @@ enum INV { __INV_size }; } // namespace N_mach_segments namespace N_mach_sections32 { -enum DATA { - sectname = 0, - segname, - addr, - size, - offset, - align, - reloff, - nreloc, - flags, - reserved1, - reserved2, - __data_size -}; +enum DATA { sectname = 0, segname, addr, size, offset, align, reloff, nreloc, flags, reserved1, reserved2, __data_size }; extern const FW_DEF::HEADER_RECORD records[__data_size]; @@ -159,22 +125,7 @@ enum INV { __INV_size }; } // namespace N_mach_sections32 namespace N_mach_sections32_E { -enum DATA { - sectname = 0, - segname, - addr, - size, - offset, - align, - reloff, - nreloc, - flags_0, - flags_1, - flags_2, - reserved1, - reserved2, - __data_size -}; +enum DATA { sectname = 0, segname, addr, size, offset, align, reloff, nreloc, flags_0, flags_1, flags_2, reserved1, reserved2, __data_size }; extern const FW_DEF::HEADER_RECORD records[__data_size]; @@ -184,21 +135,7 @@ enum INV { __INV_size }; } // namespace N_mach_sections32_E namespace N_mach_sections64 { -enum DATA { - sectname = 0, - segname, - addr, - size, - offset, - align, - reloff, - nreloc, - flags, - reserved1, - reserved2, - reserved3, - __data_size -}; +enum DATA { sectname = 0, segname, addr, size, offset, align, reloff, nreloc, flags, reserved1, reserved2, reserved3, __data_size }; extern const FW_DEF::HEADER_RECORD records[__data_size]; @@ -208,23 +145,7 @@ enum INV { __INV_size }; } // namespace N_mach_sections64 namespace N_mach_sections64_E { -enum DATA { - sectname = 0, - segname, - addr, - size, - offset, - align, - reloff, - nreloc, - flags_0, - flags_1, - flags_2, - reserved1, - reserved2, - reserved3, - __data_size -}; +enum DATA { sectname = 0, segname, addr, size, offset, align, reloff, nreloc, flags_0, flags_1, flags_2, reserved1, reserved2, reserved3, __data_size }; extern const FW_DEF::HEADER_RECORD records[__data_size]; @@ -234,13 +155,7 @@ enum INV { __INV_size }; } // namespace N_mach_sections64_E namespace N_mach_library { -enum DATA { - timestamp, - current_version, - compatibility_version, - name, - __data_size -}; +enum DATA { timestamp, current_version, compatibility_version, name, __data_size }; extern const FW_DEF::HEADER_RECORD records[__data_size]; @@ -260,19 +175,7 @@ enum INV { __INV_size }; } // namespace N_mach_fmv_library namespace N_mach_dyld_info { -enum DATA { - rebase_off, - rebase_size, - bind_off, - bind_size, - weak_bind_off, - weak_bind_size, - lazy_bind_off, - lazy_bind_size, - export_off, - export_size, - __data_size -}; +enum DATA { rebase_off, rebase_size, bind_off, bind_size, weak_bind_off, weak_bind_size, lazy_bind_off, lazy_bind_size, export_off, export_size, __data_size }; extern const FW_DEF::HEADER_RECORD records[__data_size]; @@ -375,79 +278,19 @@ extern const FW_DEF::HEADER_RECORD records[__data_size]; } // namespace N_mach_unix_thread namespace N_mach_unix_thread_x86_32 { -enum DATA { - eax, - ebx, - ecx, - edx, - edi, - esi, - ebp, - esp, - ss, - eflags, - eip, - cs, - ds, - es, - fs, - gs, - __data_size -}; +enum DATA { eax, ebx, ecx, edx, edi, esi, ebp, esp, ss, eflags, eip, cs, ds, es, fs, gs, __data_size }; extern const FW_DEF::HEADER_RECORD records[__data_size]; } // namespace N_mach_unix_thread_x86_32 namespace N_mach_unix_thread_x86_64 { -enum DATA { - rax, - rbx, - rcx, - rdx, - rdi, - rsi, - rbp, - rsp, - r8, - r9, - r10, - r11, - r12, - r13, - r14, - r15, - rip, - rflags, - cs, - fs, - gs, - __data_size -}; +enum DATA { rax, rbx, rcx, rdx, rdi, rsi, rbp, rsp, r8, r9, r10, r11, r12, r13, r14, r15, rip, rflags, cs, fs, gs, __data_size }; extern const FW_DEF::HEADER_RECORD records[__data_size]; } // namespace N_mach_unix_thread_x86_64 namespace N_mach_unix_thread_arm_32 { -enum DATA { - r0, - r1, - r2, - r3, - r4, - r5, - r6, - r7, - r8, - r9, - r10, - r11, - r12, - sp, - lr, - pc, - cpsr, - __data_size -}; +enum DATA { r0, r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11, r12, sp, lr, pc, cpsr, __data_size }; extern const FW_DEF::HEADER_RECORD records[__data_size]; } // namespace N_mach_unix_thread_arm_32 @@ -544,28 +387,7 @@ extern const FW_DEF::HEADER_RECORD records[__data_size]; } // namespace N_mach_unix_thread_ppc_32 namespace N_mach_unix_thread_m68k_32 { -enum DATA { - dreg0, - dreg1, - dreg2, - dreg3, - dreg4, - dreg5, - dreg6, - dreg7, - areg0, - areg1, - areg2, - areg3, - areg4, - areg5, - areg6, - areg7, - pad0, - sr, - pc, - __data_size -}; +enum DATA { dreg0, dreg1, dreg2, dreg3, dreg4, dreg5, dreg6, dreg7, areg0, areg1, areg2, areg3, areg4, areg5, areg6, areg7, pad0, sr, pc, __data_size }; extern const FW_DEF::HEADER_RECORD records[__data_size]; } // namespace N_mach_unix_thread_m68k_32 @@ -661,15 +483,7 @@ enum INV { __INV_size }; } // namespace N_mach_relocs namespace N_mach_relocs_E { -enum DATA { - r_address, - r_symbolnum, - r_pcrel, - r_length, - r_extern, - r_type, - __data_size -}; +enum DATA { r_address, r_symbolnum, r_pcrel, r_length, r_extern, r_type, __data_size }; extern const FW_DEF::HEADER_RECORD records[__data_size]; diff --git a/MACH/machprocessdata.cpp b/MACH/machprocessdata.cpp index 01c28f24..85410c72 100755 --- a/MACH/machprocessdata.cpp +++ b/MACH/machprocessdata.cpp @@ -20,9 +20,7 @@ */ #include "machprocessdata.h" -MACHProcessData::MACHProcessData(int nType, QStandardItemModel **ppModel, - XMACH *pXMACH, qint64 nOffset, qint64 nSize) - : ProcessData() { +MACHProcessData::MACHProcessData(int nType, QStandardItemModel **ppModel, XMACH *pXMACH, qint64 nOffset, qint64 nSize) : ProcessData() { this->g_nType = nType; this->g_ppModel = ppModel; this->g_pXMACH = pXMACH; @@ -36,18 +34,15 @@ void MACHProcessData::_process() { if (g_nType == SMACH::TYPE_mach_commands) { QList listLabels; listLabels.append(""); - listLabels.append(getStructList(N_mach_commands::records, - N_mach_commands::__data_size)); + listLabels.append(getStructList(N_mach_commands::records, N_mach_commands::__data_size)); listLabels.append(""); - QList listCommandRecords = - g_pXMACH->getCommandRecords(); + QList listCommandRecords = g_pXMACH->getCommandRecords(); QMap mapLC = g_pXMACH->getLoadCommandTypesS(); qint32 nNumberOfRecords = listCommandRecords.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfRecords, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfRecords, listLabels.count()); setMaximum(nNumberOfRecords); @@ -57,38 +52,22 @@ void MACHProcessData::_process() { QStandardItem *pItem = new QStandardItem; pItem->setData(i, Qt::DisplayRole); - pItem->setData(listCommandRecords.at(i).nStructOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); - pItem->setData(listCommandRecords.at(i).nStructOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); - pItem->setData(listCommandRecords.at(i).nSize, - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); - pItem->setData(listCommandRecords.at(i).nStructOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); + pItem->setData(listCommandRecords.at(i).nStructOffset, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(listCommandRecords.at(i).nStructOffset, Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); + pItem->setData(listCommandRecords.at(i).nSize, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); + pItem->setData(listCommandRecords.at(i).nStructOffset, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, N_mach_commands::cmd + 1, - new QStandardItem(XBinary::valueToHex( - (quint32)listCommandRecords.at(i).nType))); - (*g_ppModel) - ->setItem(i, N_mach_commands::cmdsize + 1, - new QStandardItem(XBinary::valueToHex( - (quint32)listCommandRecords.at(i).nSize))); - (*g_ppModel) - ->setItem(i, N_mach_commands::cmdsize + 2, - new QStandardItem( - mapLC.value(listCommandRecords.at(i).nType))); + (*g_ppModel)->setItem(i, N_mach_commands::cmd + 1, new QStandardItem(XBinary::valueToHex((quint32)listCommandRecords.at(i).nType))); + (*g_ppModel)->setItem(i, N_mach_commands::cmdsize + 1, new QStandardItem(XBinary::valueToHex((quint32)listCommandRecords.at(i).nSize))); + (*g_ppModel)->setItem(i, N_mach_commands::cmdsize + 2, new QStandardItem(mapLC.value(listCommandRecords.at(i).nType))); incValue(); } - } else if ((g_nType == SMACH::TYPE_mach_libraries) || - (g_nType == SMACH::TYPE_mach_weak_libraries) || - (g_nType == SMACH::TYPE_mach_id_library)) { + } else if ((g_nType == SMACH::TYPE_mach_libraries) || (g_nType == SMACH::TYPE_mach_weak_libraries) || (g_nType == SMACH::TYPE_mach_id_library)) { QList listLabels; listLabels.append(""); - listLabels.append(getStructList(N_mach_library::records, - N_mach_library::__data_size)); + listLabels.append(getStructList(N_mach_library::records, N_mach_library::__data_size)); qint32 nType = XMACH_DEF::S_LC_LOAD_DYLIB; @@ -98,13 +77,11 @@ void MACHProcessData::_process() { nType = XMACH_DEF::S_LC_ID_DYLIB; } - QList listLibraries = - g_pXMACH->getLibraryRecords(nType); + QList listLibraries = g_pXMACH->getLibraryRecords(nType); qint32 nNumberOfRecords = listLibraries.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfRecords, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfRecords, listLabels.count()); setMaximum(nNumberOfRecords); @@ -114,40 +91,24 @@ void MACHProcessData::_process() { QStandardItem *pItem = new QStandardItem; pItem->setData(i, Qt::DisplayRole); - pItem->setData(listLibraries.at(i).nStructOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); - pItem->setData(listLibraries.at(i).nStructOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); - pItem->setData(listLibraries.at(i).nStructSize, - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); - pItem->setData(listLibraries.at(i).nStructOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); + pItem->setData(listLibraries.at(i).nStructOffset, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(listLibraries.at(i).nStructOffset, Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); + pItem->setData(listLibraries.at(i).nStructSize, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); + pItem->setData(listLibraries.at(i).nStructOffset, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); (*g_ppModel)->setItem(i, 0, pItem); + (*g_ppModel)->setItem(i, N_mach_library::timestamp + 1, new QStandardItem(XBinary::valueToHex(listLibraries.at(i).timestamp))); + (*g_ppModel)->setItem(i, N_mach_library::current_version + 1, new QStandardItem(XBinary::valueToHex(listLibraries.at(i).current_version))); (*g_ppModel) - ->setItem(i, N_mach_library::timestamp + 1, - new QStandardItem(XBinary::valueToHex( - listLibraries.at(i).timestamp))); - (*g_ppModel) - ->setItem(i, N_mach_library::current_version + 1, - new QStandardItem(XBinary::valueToHex( - listLibraries.at(i).current_version))); - (*g_ppModel) - ->setItem(i, N_mach_library::compatibility_version + 1, - new QStandardItem(XBinary::valueToHex( - listLibraries.at(i).compatibility_version))); - (*g_ppModel) - ->setItem(i, N_mach_library::name + 1, - new QStandardItem(listLibraries.at(i).sFullName)); + ->setItem(i, N_mach_library::compatibility_version + 1, new QStandardItem(XBinary::valueToHex(listLibraries.at(i).compatibility_version))); + (*g_ppModel)->setItem(i, N_mach_library::name + 1, new QStandardItem(listLibraries.at(i).sFullName)); incValue(); } - } else if ((g_nType == SMACH::TYPE_mach_IDFVMLIB) || - (g_nType == SMACH::TYPE_mach_LOADFVMLIB)) { + } else if ((g_nType == SMACH::TYPE_mach_IDFVMLIB) || (g_nType == SMACH::TYPE_mach_LOADFVMLIB)) { QList listLabels; listLabels.append(""); - listLabels.append(getStructList(N_mach_fmv_library::records, - N_mach_fmv_library::__data_size)); + listLabels.append(getStructList(N_mach_fmv_library::records, N_mach_fmv_library::__data_size)); int nType = XMACH_DEF::S_LC_LOADFVMLIB; @@ -155,13 +116,11 @@ void MACHProcessData::_process() { nType = XMACH_DEF::S_LC_IDFVMLIB; } - QList listLibraries = - g_pXMACH->getFvmLibraryRecords(nType); + QList listLibraries = g_pXMACH->getFvmLibraryRecords(nType); qint32 nNumberOfRecords = listLibraries.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfRecords, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfRecords, listLabels.count()); setMaximum(nNumberOfRecords); @@ -171,27 +130,15 @@ void MACHProcessData::_process() { QStandardItem *pItem = new QStandardItem; pItem->setData(i, Qt::DisplayRole); - pItem->setData(listLibraries.at(i).nStructOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); - pItem->setData(listLibraries.at(i).nStructOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); - pItem->setData(listLibraries.at(i).nStructSize, - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); - pItem->setData(listLibraries.at(i).nStructOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); + pItem->setData(listLibraries.at(i).nStructOffset, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(listLibraries.at(i).nStructOffset, Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); + pItem->setData(listLibraries.at(i).nStructSize, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); + pItem->setData(listLibraries.at(i).nStructOffset, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, N_mach_fmv_library::minor_version + 1, - new QStandardItem(XBinary::valueToHex( - listLibraries.at(i).minor_version))); - (*g_ppModel) - ->setItem(i, N_mach_fmv_library::header_addr + 1, - new QStandardItem(XBinary::valueToHex( - listLibraries.at(i).header_addr))); - (*g_ppModel) - ->setItem(i, N_mach_fmv_library::name + 1, - new QStandardItem(listLibraries.at(i).sFullName)); + (*g_ppModel)->setItem(i, N_mach_fmv_library::minor_version + 1, new QStandardItem(XBinary::valueToHex(listLibraries.at(i).minor_version))); + (*g_ppModel)->setItem(i, N_mach_fmv_library::header_addr + 1, new QStandardItem(XBinary::valueToHex(listLibraries.at(i).header_addr))); + (*g_ppModel)->setItem(i, N_mach_fmv_library::name + 1, new QStandardItem(listLibraries.at(i).sFullName)); incValue(); } @@ -200,20 +147,16 @@ void MACHProcessData::_process() { listLabels.append(""); if (bIs64) { - listLabels.append(getStructList(N_mach_segments::records64, - N_mach_segments::__data_size)); + listLabels.append(getStructList(N_mach_segments::records64, N_mach_segments::__data_size)); } else { - listLabels.append(getStructList(N_mach_segments::records32, - N_mach_segments::__data_size)); + listLabels.append(getStructList(N_mach_segments::records32, N_mach_segments::__data_size)); } - QList listSegmentRecords = - g_pXMACH->getSegmentRecords(); + QList listSegmentRecords = g_pXMACH->getSegmentRecords(); qint32 nNumberOfRecords = listSegmentRecords.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfRecords, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfRecords, listLabels.count()); setMaximum(nNumberOfRecords); @@ -222,135 +165,52 @@ void MACHProcessData::_process() { for (qint32 i = 0; (i < nNumberOfRecords) && (isRun()); i++) { QStandardItem *pItem = new QStandardItem; pItem->setData(i, Qt::DisplayRole); - pItem->setData(listSegmentRecords.at(i).nStructOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); + pItem->setData(listSegmentRecords.at(i).nStructOffset, Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); if (bIs64) { if (g_pXMACH->isImage()) { - pItem->setData(listSegmentRecords.at(i).s.segment64.vmaddr, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); - pItem->setData(listSegmentRecords.at(i).s.segment64.vmsize, - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); + pItem->setData(listSegmentRecords.at(i).s.segment64.vmaddr, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(listSegmentRecords.at(i).s.segment64.vmsize, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); } else { - pItem->setData(listSegmentRecords.at(i).s.segment64.fileoff, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); - pItem->setData( - listSegmentRecords.at(i).s.segment64.filesize, - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); + pItem->setData(listSegmentRecords.at(i).s.segment64.fileoff, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(listSegmentRecords.at(i).s.segment64.filesize, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); } - pItem->setData(listSegmentRecords.at(i).s.segment64.vmaddr, - Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); + pItem->setData(listSegmentRecords.at(i).s.segment64.vmaddr, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem( - i, N_mach_segments::segname + 1, - new QStandardItem( - listSegmentRecords.at(i).s.segment64.segname)); - - (*g_ppModel) - ->setItem( - i, N_mach_segments::vmaddr + 1, - new QStandardItem(XBinary::valueToHex( - listSegmentRecords.at(i).s.segment64.vmaddr))); - (*g_ppModel) - ->setItem( - i, N_mach_segments::vmsize + 1, - new QStandardItem(XBinary::valueToHex( - listSegmentRecords.at(i).s.segment64.vmsize))); - (*g_ppModel) - ->setItem( - i, N_mach_segments::fileoff + 1, - new QStandardItem(XBinary::valueToHex( - listSegmentRecords.at(i).s.segment64.fileoff))); - (*g_ppModel) - ->setItem( - i, N_mach_segments::filesize + 1, - new QStandardItem(XBinary::valueToHex( - listSegmentRecords.at(i).s.segment64.filesize))); - (*g_ppModel) - ->setItem( - i, N_mach_segments::maxprot + 1, - new QStandardItem(XBinary::valueToHex( - listSegmentRecords.at(i).s.segment64.maxprot))); - (*g_ppModel) - ->setItem( - i, N_mach_segments::initprot + 1, - new QStandardItem(XBinary::valueToHex( - listSegmentRecords.at(i).s.segment64.initprot))); - (*g_ppModel) - ->setItem( - i, N_mach_segments::nsects + 1, - new QStandardItem(XBinary::valueToHex( - listSegmentRecords.at(i).s.segment64.nsects))); - (*g_ppModel) - ->setItem(i, N_mach_segments::flags + 1, - new QStandardItem(XBinary::valueToHex( - listSegmentRecords.at(i).s.segment64.flags))); + (*g_ppModel)->setItem(i, N_mach_segments::segname + 1, new QStandardItem(listSegmentRecords.at(i).s.segment64.segname)); + + (*g_ppModel)->setItem(i, N_mach_segments::vmaddr + 1, new QStandardItem(XBinary::valueToHex(listSegmentRecords.at(i).s.segment64.vmaddr))); + (*g_ppModel)->setItem(i, N_mach_segments::vmsize + 1, new QStandardItem(XBinary::valueToHex(listSegmentRecords.at(i).s.segment64.vmsize))); + (*g_ppModel)->setItem(i, N_mach_segments::fileoff + 1, new QStandardItem(XBinary::valueToHex(listSegmentRecords.at(i).s.segment64.fileoff))); + (*g_ppModel)->setItem(i, N_mach_segments::filesize + 1, new QStandardItem(XBinary::valueToHex(listSegmentRecords.at(i).s.segment64.filesize))); + (*g_ppModel)->setItem(i, N_mach_segments::maxprot + 1, new QStandardItem(XBinary::valueToHex(listSegmentRecords.at(i).s.segment64.maxprot))); + (*g_ppModel)->setItem(i, N_mach_segments::initprot + 1, new QStandardItem(XBinary::valueToHex(listSegmentRecords.at(i).s.segment64.initprot))); + (*g_ppModel)->setItem(i, N_mach_segments::nsects + 1, new QStandardItem(XBinary::valueToHex(listSegmentRecords.at(i).s.segment64.nsects))); + (*g_ppModel)->setItem(i, N_mach_segments::flags + 1, new QStandardItem(XBinary::valueToHex(listSegmentRecords.at(i).s.segment64.flags))); } else { if (g_pXMACH->isImage()) { - pItem->setData(listSegmentRecords.at(i).s.segment32.vmaddr, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); - pItem->setData(listSegmentRecords.at(i).s.segment32.vmsize, - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); + pItem->setData(listSegmentRecords.at(i).s.segment32.vmaddr, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(listSegmentRecords.at(i).s.segment32.vmsize, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); } else { - pItem->setData(listSegmentRecords.at(i).s.segment32.fileoff, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); - pItem->setData( - listSegmentRecords.at(i).s.segment32.filesize, - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); + pItem->setData(listSegmentRecords.at(i).s.segment32.fileoff, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(listSegmentRecords.at(i).s.segment32.filesize, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); } - pItem->setData(listSegmentRecords.at(i).s.segment32.vmaddr, - Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); + pItem->setData(listSegmentRecords.at(i).s.segment32.vmaddr, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem( - i, N_mach_segments::segname + 1, - new QStandardItem( - listSegmentRecords.at(i).s.segment32.segname)); - - (*g_ppModel) - ->setItem( - i, N_mach_segments::vmaddr + 1, - new QStandardItem(XBinary::valueToHex( - listSegmentRecords.at(i).s.segment32.vmaddr))); - (*g_ppModel) - ->setItem( - i, N_mach_segments::vmsize + 1, - new QStandardItem(XBinary::valueToHex( - listSegmentRecords.at(i).s.segment32.vmsize))); - (*g_ppModel) - ->setItem( - i, N_mach_segments::fileoff + 1, - new QStandardItem(XBinary::valueToHex( - listSegmentRecords.at(i).s.segment32.fileoff))); - (*g_ppModel) - ->setItem( - i, N_mach_segments::filesize + 1, - new QStandardItem(XBinary::valueToHex( - listSegmentRecords.at(i).s.segment32.filesize))); - (*g_ppModel) - ->setItem( - i, N_mach_segments::maxprot + 1, - new QStandardItem(XBinary::valueToHex( - listSegmentRecords.at(i).s.segment32.maxprot))); - (*g_ppModel) - ->setItem( - i, N_mach_segments::initprot + 1, - new QStandardItem(XBinary::valueToHex( - listSegmentRecords.at(i).s.segment32.initprot))); - (*g_ppModel) - ->setItem( - i, N_mach_segments::nsects + 1, - new QStandardItem(XBinary::valueToHex( - listSegmentRecords.at(i).s.segment32.nsects))); - (*g_ppModel) - ->setItem(i, N_mach_segments::flags + 1, - new QStandardItem(XBinary::valueToHex( - listSegmentRecords.at(i).s.segment32.flags))); + (*g_ppModel)->setItem(i, N_mach_segments::segname + 1, new QStandardItem(listSegmentRecords.at(i).s.segment32.segname)); + + (*g_ppModel)->setItem(i, N_mach_segments::vmaddr + 1, new QStandardItem(XBinary::valueToHex(listSegmentRecords.at(i).s.segment32.vmaddr))); + (*g_ppModel)->setItem(i, N_mach_segments::vmsize + 1, new QStandardItem(XBinary::valueToHex(listSegmentRecords.at(i).s.segment32.vmsize))); + (*g_ppModel)->setItem(i, N_mach_segments::fileoff + 1, new QStandardItem(XBinary::valueToHex(listSegmentRecords.at(i).s.segment32.fileoff))); + (*g_ppModel)->setItem(i, N_mach_segments::filesize + 1, new QStandardItem(XBinary::valueToHex(listSegmentRecords.at(i).s.segment32.filesize))); + (*g_ppModel)->setItem(i, N_mach_segments::maxprot + 1, new QStandardItem(XBinary::valueToHex(listSegmentRecords.at(i).s.segment32.maxprot))); + (*g_ppModel)->setItem(i, N_mach_segments::initprot + 1, new QStandardItem(XBinary::valueToHex(listSegmentRecords.at(i).s.segment32.initprot))); + (*g_ppModel)->setItem(i, N_mach_segments::nsects + 1, new QStandardItem(XBinary::valueToHex(listSegmentRecords.at(i).s.segment32.nsects))); + (*g_ppModel)->setItem(i, N_mach_segments::flags + 1, new QStandardItem(XBinary::valueToHex(listSegmentRecords.at(i).s.segment32.flags))); } incValue(); @@ -360,20 +220,16 @@ void MACHProcessData::_process() { listLabels.append(""); if (bIs64) { - listLabels.append(getStructList(N_mach_sections64::records, - N_mach_sections64::__data_size)); + listLabels.append(getStructList(N_mach_sections64::records, N_mach_sections64::__data_size)); } else { - listLabels.append(getStructList(N_mach_sections32::records, - N_mach_sections32::__data_size)); + listLabels.append(getStructList(N_mach_sections32::records, N_mach_sections32::__data_size)); } - QList listSectionRecords = - g_pXMACH->getSectionRecords(); + QList listSectionRecords = g_pXMACH->getSectionRecords(); qint32 nNumberOfRecords = listSectionRecords.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfRecords, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfRecords, listLabels.count()); setMaximum(nNumberOfRecords); @@ -382,148 +238,60 @@ void MACHProcessData::_process() { for (qint32 i = 0; (i < nNumberOfRecords) && (isRun()); i++) { QStandardItem *pItem = new QStandardItem; pItem->setData(i, Qt::DisplayRole); - pItem->setData(listSectionRecords.at(i).nStructOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); + pItem->setData(listSectionRecords.at(i).nStructOffset, Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); if (bIs64) { if (g_pXMACH->isImage()) { - pItem->setData(listSectionRecords.at(i).s.section64.addr, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(listSectionRecords.at(i).s.section64.addr, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); } else { - pItem->setData(listSectionRecords.at(i).s.section64.offset, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(listSectionRecords.at(i).s.section64.offset, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); } - pItem->setData(listSectionRecords.at(i).s.section64.size, - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); - pItem->setData(listSectionRecords.at(i).s.section64.addr, - Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); + pItem->setData(listSectionRecords.at(i).s.section64.size, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); + pItem->setData(listSectionRecords.at(i).s.section64.addr, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); (*g_ppModel)->setItem(i, 0, pItem); + (*g_ppModel)->setItem(i, N_mach_sections64::segname + 1, new QStandardItem(listSectionRecords.at(i).s.section64.segname)); + (*g_ppModel)->setItem(i, N_mach_sections64::sectname + 1, new QStandardItem(listSectionRecords.at(i).s.section64.sectname)); + (*g_ppModel)->setItem(i, N_mach_sections64::addr + 1, new QStandardItem(XBinary::valueToHex(listSectionRecords.at(i).s.section64.addr))); + (*g_ppModel)->setItem(i, N_mach_sections64::size + 1, new QStandardItem(XBinary::valueToHex(listSectionRecords.at(i).s.section64.size))); + (*g_ppModel)->setItem(i, N_mach_sections64::offset + 1, new QStandardItem(XBinary::valueToHex(listSectionRecords.at(i).s.section64.offset))); + (*g_ppModel)->setItem(i, N_mach_sections64::align + 1, new QStandardItem(XBinary::valueToHex(listSectionRecords.at(i).s.section64.align))); + (*g_ppModel)->setItem(i, N_mach_sections64::reloff + 1, new QStandardItem(XBinary::valueToHex(listSectionRecords.at(i).s.section64.reloff))); + (*g_ppModel)->setItem(i, N_mach_sections64::nreloc + 1, new QStandardItem(XBinary::valueToHex(listSectionRecords.at(i).s.section64.nreloc))); + (*g_ppModel)->setItem(i, N_mach_sections64::flags + 1, new QStandardItem(XBinary::valueToHex(listSectionRecords.at(i).s.section64.flags))); (*g_ppModel) - ->setItem( - i, N_mach_sections64::segname + 1, - new QStandardItem( - listSectionRecords.at(i).s.section64.segname)); - (*g_ppModel) - ->setItem( - i, N_mach_sections64::sectname + 1, - new QStandardItem( - listSectionRecords.at(i).s.section64.sectname)); - (*g_ppModel) - ->setItem(i, N_mach_sections64::addr + 1, - new QStandardItem(XBinary::valueToHex( - listSectionRecords.at(i).s.section64.addr))); - (*g_ppModel) - ->setItem(i, N_mach_sections64::size + 1, - new QStandardItem(XBinary::valueToHex( - listSectionRecords.at(i).s.section64.size))); - (*g_ppModel) - ->setItem( - i, N_mach_sections64::offset + 1, - new QStandardItem(XBinary::valueToHex( - listSectionRecords.at(i).s.section64.offset))); - (*g_ppModel) - ->setItem(i, N_mach_sections64::align + 1, - new QStandardItem(XBinary::valueToHex( - listSectionRecords.at(i).s.section64.align))); - (*g_ppModel) - ->setItem( - i, N_mach_sections64::reloff + 1, - new QStandardItem(XBinary::valueToHex( - listSectionRecords.at(i).s.section64.reloff))); - (*g_ppModel) - ->setItem( - i, N_mach_sections64::nreloc + 1, - new QStandardItem(XBinary::valueToHex( - listSectionRecords.at(i).s.section64.nreloc))); - (*g_ppModel) - ->setItem(i, N_mach_sections64::flags + 1, - new QStandardItem(XBinary::valueToHex( - listSectionRecords.at(i).s.section64.flags))); - (*g_ppModel) - ->setItem( - i, N_mach_sections64::reserved1 + 1, - new QStandardItem(XBinary::valueToHex( - listSectionRecords.at(i).s.section64.reserved1))); + ->setItem(i, N_mach_sections64::reserved1 + 1, new QStandardItem(XBinary::valueToHex(listSectionRecords.at(i).s.section64.reserved1))); (*g_ppModel) - ->setItem( - i, N_mach_sections64::reserved2 + 1, - new QStandardItem(XBinary::valueToHex( - listSectionRecords.at(i).s.section64.reserved2))); + ->setItem(i, N_mach_sections64::reserved2 + 1, new QStandardItem(XBinary::valueToHex(listSectionRecords.at(i).s.section64.reserved2))); (*g_ppModel) - ->setItem( - i, N_mach_sections64::reserved3 + 1, - new QStandardItem(XBinary::valueToHex( - listSectionRecords.at(i).s.section64.reserved3))); + ->setItem(i, N_mach_sections64::reserved3 + 1, new QStandardItem(XBinary::valueToHex(listSectionRecords.at(i).s.section64.reserved3))); } else { if (g_pXMACH->isImage()) { - pItem->setData(listSectionRecords.at(i).s.section32.addr, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(listSectionRecords.at(i).s.section32.addr, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); } else { - pItem->setData(listSectionRecords.at(i).s.section32.offset, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(listSectionRecords.at(i).s.section32.offset, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); } - pItem->setData(listSectionRecords.at(i).s.section32.size, - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); - pItem->setData(listSectionRecords.at(i).s.section32.addr, - Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); + pItem->setData(listSectionRecords.at(i).s.section32.size, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); + pItem->setData(listSectionRecords.at(i).s.section32.addr, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); (*g_ppModel)->setItem(i, 0, pItem); + (*g_ppModel)->setItem(i, N_mach_sections32::segname + 1, new QStandardItem(listSectionRecords.at(i).s.section32.segname)); + (*g_ppModel)->setItem(i, N_mach_sections32::sectname + 1, new QStandardItem(listSectionRecords.at(i).s.section32.sectname)); + (*g_ppModel)->setItem(i, N_mach_sections32::addr + 1, new QStandardItem(XBinary::valueToHex(listSectionRecords.at(i).s.section32.addr))); + (*g_ppModel)->setItem(i, N_mach_sections32::size + 1, new QStandardItem(XBinary::valueToHex(listSectionRecords.at(i).s.section32.size))); + (*g_ppModel)->setItem(i, N_mach_sections32::offset + 1, new QStandardItem(XBinary::valueToHex(listSectionRecords.at(i).s.section32.offset))); + (*g_ppModel)->setItem(i, N_mach_sections32::align + 1, new QStandardItem(XBinary::valueToHex(listSectionRecords.at(i).s.section32.align))); + (*g_ppModel)->setItem(i, N_mach_sections32::reloff + 1, new QStandardItem(XBinary::valueToHex(listSectionRecords.at(i).s.section32.reloff))); + (*g_ppModel)->setItem(i, N_mach_sections32::nreloc + 1, new QStandardItem(XBinary::valueToHex(listSectionRecords.at(i).s.section32.nreloc))); + (*g_ppModel)->setItem(i, N_mach_sections32::flags + 1, new QStandardItem(XBinary::valueToHex(listSectionRecords.at(i).s.section32.flags))); (*g_ppModel) - ->setItem( - i, N_mach_sections32::segname + 1, - new QStandardItem( - listSectionRecords.at(i).s.section32.segname)); + ->setItem(i, N_mach_sections32::reserved1 + 1, new QStandardItem(XBinary::valueToHex(listSectionRecords.at(i).s.section32.reserved1))); (*g_ppModel) - ->setItem( - i, N_mach_sections32::sectname + 1, - new QStandardItem( - listSectionRecords.at(i).s.section32.sectname)); - (*g_ppModel) - ->setItem(i, N_mach_sections32::addr + 1, - new QStandardItem(XBinary::valueToHex( - listSectionRecords.at(i).s.section32.addr))); - (*g_ppModel) - ->setItem(i, N_mach_sections32::size + 1, - new QStandardItem(XBinary::valueToHex( - listSectionRecords.at(i).s.section32.size))); - (*g_ppModel) - ->setItem( - i, N_mach_sections32::offset + 1, - new QStandardItem(XBinary::valueToHex( - listSectionRecords.at(i).s.section32.offset))); - (*g_ppModel) - ->setItem(i, N_mach_sections32::align + 1, - new QStandardItem(XBinary::valueToHex( - listSectionRecords.at(i).s.section32.align))); - (*g_ppModel) - ->setItem( - i, N_mach_sections32::reloff + 1, - new QStandardItem(XBinary::valueToHex( - listSectionRecords.at(i).s.section32.reloff))); - (*g_ppModel) - ->setItem( - i, N_mach_sections32::nreloc + 1, - new QStandardItem(XBinary::valueToHex( - listSectionRecords.at(i).s.section32.nreloc))); - (*g_ppModel) - ->setItem(i, N_mach_sections32::flags + 1, - new QStandardItem(XBinary::valueToHex( - listSectionRecords.at(i).s.section32.flags))); - (*g_ppModel) - ->setItem( - i, N_mach_sections32::reserved1 + 1, - new QStandardItem(XBinary::valueToHex( - listSectionRecords.at(i).s.section32.reserved1))); - (*g_ppModel) - ->setItem( - i, N_mach_sections32::reserved2 + 1, - new QStandardItem(XBinary::valueToHex( - listSectionRecords.at(i).s.section32.reserved2))); + ->setItem(i, N_mach_sections32::reserved2 + 1, new QStandardItem(XBinary::valueToHex(listSectionRecords.at(i).s.section32.reserved2))); } incValue(); @@ -533,24 +301,20 @@ void MACHProcessData::_process() { listLabels.append(""); if (bIs64) { - listLabels.append(getStructList(N_mach_nlist::records64, - N_mach_nlist::__data_size)); + listLabels.append(getStructList(N_mach_nlist::records64, N_mach_nlist::__data_size)); } else { - listLabels.append(getStructList(N_mach_nlist::records32, - N_mach_nlist::__data_size)); + listLabels.append(getStructList(N_mach_nlist::records32, N_mach_nlist::__data_size)); } listLabels.append(tr("Name")); - XBinary::OFFSETSIZE osStringTable = - g_pXMACH->getStringTableOffsetSize(); + XBinary::OFFSETSIZE osStringTable = g_pXMACH->getStringTableOffsetSize(); QList listRecords = g_pXMACH->getNlistRecords(); qint32 nNumberOfRecords = listRecords.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfRecords, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfRecords, listLabels.count()); setMaximum(nNumberOfRecords); @@ -559,69 +323,30 @@ void MACHProcessData::_process() { for (qint32 i = 0; (i < nNumberOfRecords) && (isRun()); i++) { QStandardItem *pItem = new QStandardItem; pItem->setData(i, Qt::DisplayRole); - pItem->setData(listRecords.at(i).nStructOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); + pItem->setData(listRecords.at(i).nStructOffset, Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); (*g_ppModel)->setItem(i, 0, pItem); if (listRecords.at(i).bIs64) { - (*g_ppModel) - ->setItem(i, N_mach_nlist::n_strx + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.nlist64.n_strx))); - (*g_ppModel) - ->setItem(i, N_mach_nlist::n_type + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.nlist64.n_type))); - (*g_ppModel) - ->setItem(i, N_mach_nlist::n_sect + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.nlist64.n_sect))); - (*g_ppModel) - ->setItem(i, N_mach_nlist::n_desc + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.nlist64.n_desc))); - (*g_ppModel) - ->setItem(i, N_mach_nlist::n_value + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.nlist64.n_value))); + (*g_ppModel)->setItem(i, N_mach_nlist::n_strx + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.nlist64.n_strx))); + (*g_ppModel)->setItem(i, N_mach_nlist::n_type + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.nlist64.n_type))); + (*g_ppModel)->setItem(i, N_mach_nlist::n_sect + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.nlist64.n_sect))); + (*g_ppModel)->setItem(i, N_mach_nlist::n_desc + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.nlist64.n_desc))); + (*g_ppModel)->setItem(i, N_mach_nlist::n_value + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.nlist64.n_value))); - QString sName = g_pXMACH->getStringFromIndex( - osStringTable.nOffset, osStringTable.nSize, - listRecords.at(i).s.nlist64.n_strx); + QString sName = g_pXMACH->getStringFromIndex(osStringTable.nOffset, osStringTable.nSize, listRecords.at(i).s.nlist64.n_strx); - (*g_ppModel) - ->setItem(i, N_mach_nlist::n_value + 2, - new QStandardItem(sName)); + (*g_ppModel)->setItem(i, N_mach_nlist::n_value + 2, new QStandardItem(sName)); } else { - (*g_ppModel) - ->setItem(i, N_mach_nlist::n_strx + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.nlist32.n_strx))); - (*g_ppModel) - ->setItem(i, N_mach_nlist::n_type + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.nlist32.n_type))); - (*g_ppModel) - ->setItem(i, N_mach_nlist::n_sect + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.nlist32.n_sect))); - (*g_ppModel) - ->setItem(i, N_mach_nlist::n_desc + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.nlist32.n_desc))); - (*g_ppModel) - ->setItem(i, N_mach_nlist::n_value + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.nlist32.n_value))); + (*g_ppModel)->setItem(i, N_mach_nlist::n_strx + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.nlist32.n_strx))); + (*g_ppModel)->setItem(i, N_mach_nlist::n_type + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.nlist32.n_type))); + (*g_ppModel)->setItem(i, N_mach_nlist::n_sect + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.nlist32.n_sect))); + (*g_ppModel)->setItem(i, N_mach_nlist::n_desc + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.nlist32.n_desc))); + (*g_ppModel)->setItem(i, N_mach_nlist::n_value + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.nlist32.n_value))); - QString sName = g_pXMACH->getStringFromIndex( - osStringTable.nOffset, osStringTable.nSize, - listRecords.at(i).s.nlist32.n_strx); + QString sName = g_pXMACH->getStringFromIndex(osStringTable.nOffset, osStringTable.nSize, listRecords.at(i).s.nlist32.n_strx); - (*g_ppModel) - ->setItem(i, N_mach_nlist::n_value + 2, - new QStandardItem(sName)); + (*g_ppModel)->setItem(i, N_mach_nlist::n_value + 2, new QStandardItem(sName)); } incValue(); @@ -633,17 +358,13 @@ void MACHProcessData::_process() { listLabels.append(tr("Address")); listLabels.append(tr("Name")); - QList listRecords = - g_pXMACH->getFunctionRecords(g_nOffset, g_nSize); - QList listNlistRecords = - g_pXMACH->getNlistRecords(); - XBinary::OFFSETSIZE osStringTable = - g_pXMACH->getStringTableOffsetSize(); + QList listRecords = g_pXMACH->getFunctionRecords(g_nOffset, g_nSize); + QList listNlistRecords = g_pXMACH->getNlistRecords(); + XBinary::OFFSETSIZE osStringTable = g_pXMACH->getStringTableOffsetSize(); qint32 nNumberOfRecords = listRecords.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfRecords, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfRecords, listLabels.count()); setMaximum(nNumberOfRecords); @@ -653,48 +374,26 @@ void MACHProcessData::_process() { QStandardItem *pItem = new QStandardItem; pItem->setData(i, Qt::DisplayRole); - pItem->setData(listRecords.at(i).nDataOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); - pItem->setData(listRecords.at(i).nFunctionOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(listRecords.at(i).nDataOffset, Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); + pItem->setData(listRecords.at(i).nFunctionOffset, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); pItem->setData(0, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); - pItem->setData(listRecords.at(i).nFunctionAddress, - Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); + pItem->setData(listRecords.at(i).nFunctionAddress, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); (*g_ppModel)->setItem(i, 0, pItem); - XMACH::NLIST_RECORD nlist = XMACH::searchNlistRecordByValue( - &listNlistRecords, listRecords.at(i).nFunctionAddress, true); + XMACH::NLIST_RECORD nlist = XMACH::searchNlistRecordByValue(&listNlistRecords, listRecords.at(i).nFunctionAddress, true); if (bIs64) { - QString sName = g_pXMACH->getStringFromIndex( - osStringTable.nOffset, osStringTable.nSize, - nlist.s.nlist64.n_strx); + QString sName = g_pXMACH->getStringFromIndex(osStringTable.nOffset, osStringTable.nSize, nlist.s.nlist64.n_strx); - (*g_ppModel) - ->setItem(i, 1, - new QStandardItem(XBinary::valueToHex( - (quint64)listRecords.at(i).nFunctionOffset))); - (*g_ppModel) - ->setItem( - i, 2, - new QStandardItem(XBinary::valueToHex( - (quint64)listRecords.at(i).nFunctionAddress))); + (*g_ppModel)->setItem(i, 1, new QStandardItem(XBinary::valueToHex((quint64)listRecords.at(i).nFunctionOffset))); + (*g_ppModel)->setItem(i, 2, new QStandardItem(XBinary::valueToHex((quint64)listRecords.at(i).nFunctionAddress))); (*g_ppModel)->setItem(i, 3, new QStandardItem(sName)); } else { - QString sName = g_pXMACH->getStringFromIndex( - osStringTable.nOffset, osStringTable.nSize, - nlist.s.nlist32.n_strx); + QString sName = g_pXMACH->getStringFromIndex(osStringTable.nOffset, osStringTable.nSize, nlist.s.nlist32.n_strx); - (*g_ppModel) - ->setItem(i, 1, - new QStandardItem(XBinary::valueToHex( - (quint32)listRecords.at(i).nFunctionOffset))); - (*g_ppModel) - ->setItem( - i, 2, - new QStandardItem(XBinary::valueToHex( - (quint32)listRecords.at(i).nFunctionAddress))); + (*g_ppModel)->setItem(i, 1, new QStandardItem(XBinary::valueToHex((quint32)listRecords.at(i).nFunctionOffset))); + (*g_ppModel)->setItem(i, 2, new QStandardItem(XBinary::valueToHex((quint32)listRecords.at(i).nFunctionAddress))); (*g_ppModel)->setItem(i, 3, new QStandardItem(sName)); } @@ -703,17 +402,13 @@ void MACHProcessData::_process() { } else if (g_nType == SMACH::TYPE_DICE) { QList listLabels; listLabels.append(""); - listLabels.append( - getStructList(N_mach_data_in_code_entry::records, - N_mach_data_in_code_entry::__data_size)); + listLabels.append(getStructList(N_mach_data_in_code_entry::records, N_mach_data_in_code_entry::__data_size)); - QList listRecords = - g_pXMACH->getDiceRecords(g_nOffset, g_nSize); + QList listRecords = g_pXMACH->getDiceRecords(g_nOffset, g_nSize); int nNumberOfRecords = listRecords.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfRecords, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfRecords, listLabels.count()); setMaximum(nNumberOfRecords); @@ -722,33 +417,18 @@ void MACHProcessData::_process() { for (qint32 i = 0; (i < nNumberOfRecords) && (isRun()); i++) { QStandardItem *pItem = new QStandardItem; pItem->setData(i, Qt::DisplayRole); - pItem->setData(listRecords.at(i).nStructOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); - pItem->setData(listRecords.at(i).dice.offset, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); - pItem->setData(listRecords.at(i).dice.length, - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); + pItem->setData(listRecords.at(i).nStructOffset, Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); + pItem->setData(listRecords.at(i).dice.offset, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(listRecords.at(i).dice.length, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, N_mach_data_in_code_entry::offset + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).dice.offset))); - (*g_ppModel) - ->setItem(i, N_mach_data_in_code_entry::length + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).dice.length))); - (*g_ppModel) - ->setItem(i, N_mach_data_in_code_entry::kind + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).dice.kind))); + (*g_ppModel)->setItem(i, N_mach_data_in_code_entry::offset + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).dice.offset))); + (*g_ppModel)->setItem(i, N_mach_data_in_code_entry::length + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).dice.length))); + (*g_ppModel)->setItem(i, N_mach_data_in_code_entry::kind + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).dice.kind))); incValue(); } - } else if ((g_nType == SMACH::TYPE_DYLD_INFO_rebase) || - (g_nType == SMACH::TYPE_DYLD_INFO_bind) || - (g_nType == SMACH::TYPE_DYLD_INFO_export) || - (g_nType == SMACH::TYPE_DYLD_INFO_lazy_bind) || - (g_nType == SMACH::TYPE_DYLD_INFO_weak_bind)) { + } else if ((g_nType == SMACH::TYPE_DYLD_INFO_rebase) || (g_nType == SMACH::TYPE_DYLD_INFO_bind) || (g_nType == SMACH::TYPE_DYLD_INFO_export) || + (g_nType == SMACH::TYPE_DYLD_INFO_lazy_bind) || (g_nType == SMACH::TYPE_DYLD_INFO_weak_bind)) { QList listLabels; listLabels.append(""); listLabels.append(tr("Offset")); @@ -767,13 +447,11 @@ void MACHProcessData::_process() { else if (g_nType == SMACH::TYPE_DYLD_INFO_weak_bind) opcodeType = XMACH::OPCODE_TYPE_WEAK_BIND; - QList listRecords = - g_pXMACH->getOpcodes(g_nOffset, g_nOffset, g_nSize, opcodeType); + QList listRecords = g_pXMACH->getOpcodes(g_nOffset, g_nOffset, g_nSize, opcodeType); int nNumberOfRecords = listRecords.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfRecords, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfRecords, listLabels.count()); setMaximum(nNumberOfRecords); @@ -782,39 +460,28 @@ void MACHProcessData::_process() { for (qint32 i = 0; (i < nNumberOfRecords) && (isRun()); i++) { QStandardItem *pItem = new QStandardItem; pItem->setData(i, Qt::DisplayRole); - pItem->setData(listRecords.at(i).nAddress - g_nOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); - pItem->setData(listRecords.at(i).nAddress - g_nOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); - pItem->setData(listRecords.at(i).nSize, - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); + pItem->setData(listRecords.at(i).nAddress - g_nOffset, Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); + pItem->setData(listRecords.at(i).nAddress - g_nOffset, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(listRecords.at(i).nSize, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, 1, - new QStandardItem(XBinary::valueToHex( - (qint32)listRecords.at(i).nAddress))); - (*g_ppModel) - ->setItem(i, 2, new QStandardItem(listRecords.at(i).sName)); + (*g_ppModel)->setItem(i, 1, new QStandardItem(XBinary::valueToHex((qint32)listRecords.at(i).nAddress))); + (*g_ppModel)->setItem(i, 2, new QStandardItem(listRecords.at(i).sName)); incValue(); } } else if (g_nType == SMACH::TYPE_DYSYMTAB_toc) { QList listLabels; listLabels.append(""); - listLabels.append(getStructList(N_mach_table_of_contents::records, - N_mach_table_of_contents::__data_size)); + listLabels.append(getStructList(N_mach_table_of_contents::records, N_mach_table_of_contents::__data_size)); listLabels.append(tr("Name")); QList listRecords = g_pXMACH->get_toc_list(); - QList listNlistRecords = - g_pXMACH->getNlistRecords(); - XBinary::OFFSETSIZE osStringTable = - g_pXMACH->getStringTableOffsetSize(); + QList listNlistRecords = g_pXMACH->getNlistRecords(); + XBinary::OFFSETSIZE osStringTable = g_pXMACH->getStringTableOffsetSize(); int nNumberOfRecords = listRecords.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfRecords, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfRecords, listLabels.count()); setMaximum(nNumberOfRecords); @@ -823,23 +490,14 @@ void MACHProcessData::_process() { for (qint32 i = 0; (i < nNumberOfRecords) && (isRun()); i++) { QStandardItem *pItem = new QStandardItem; pItem->setData(i, Qt::DisplayRole); - pItem->setData(listRecords.at(i).nStructOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); + pItem->setData(listRecords.at(i).nStructOffset, Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); (*g_ppModel)->setItem(i, 0, pItem); + (*g_ppModel)->setItem(i, N_mach_table_of_contents::symbol_index + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).toc.symbol_index))); + (*g_ppModel)->setItem(i, N_mach_table_of_contents::module_index + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).toc.module_index))); (*g_ppModel) - ->setItem(i, N_mach_table_of_contents::symbol_index + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).toc.symbol_index))); - (*g_ppModel) - ->setItem(i, N_mach_table_of_contents::module_index + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).toc.module_index))); - (*g_ppModel) - ->setItem( - i, N_mach_table_of_contents::module_index + 2, - new QStandardItem(g_pXMACH->getIndexSymbolName( - listRecords.at(i).toc.symbol_index, &listNlistRecords, - osStringTable.nOffset, osStringTable.nSize))); + ->setItem(i, N_mach_table_of_contents::module_index + 2, + new QStandardItem( + g_pXMACH->getIndexSymbolName(listRecords.at(i).toc.symbol_index, &listNlistRecords, osStringTable.nOffset, osStringTable.nSize))); incValue(); } @@ -848,19 +506,16 @@ void MACHProcessData::_process() { listLabels.append(""); if (bIs64) { - listLabels.append(getStructList(N_mach_modtab64::records, - N_mach_modtab64::__data_size)); + listLabels.append(getStructList(N_mach_modtab64::records, N_mach_modtab64::__data_size)); } else { - listLabels.append(getStructList(N_mach_modtab32::records, - N_mach_modtab64::__data_size)); + listLabels.append(getStructList(N_mach_modtab32::records, N_mach_modtab64::__data_size)); } QList listRecords = g_pXMACH->get_modtab_list(); int nNumberOfRecords = listRecords.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfRecords, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfRecords, listLabels.count()); setMaximum(nNumberOfRecords); @@ -869,120 +524,45 @@ void MACHProcessData::_process() { for (qint32 i = 0; (i < nNumberOfRecords) && (isRun()); i++) { QStandardItem *pItem = new QStandardItem; pItem->setData(i, Qt::DisplayRole); - pItem->setData(listRecords.at(i).nStructOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); + pItem->setData(listRecords.at(i).nStructOffset, Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); (*g_ppModel)->setItem(i, 0, pItem); if (listRecords.at(i).bIs64) { - (*g_ppModel) - ->setItem(i, N_mach_modtab64::module_name + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.module64.module_name))); - (*g_ppModel) - ->setItem(i, N_mach_modtab64::iextdefsym + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.module64.iextdefsym))); - (*g_ppModel) - ->setItem(i, N_mach_modtab64::nextdefsym + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.module64.nextdefsym))); - (*g_ppModel) - ->setItem(i, N_mach_modtab64::irefsym + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.module64.irefsym))); - (*g_ppModel) - ->setItem(i, N_mach_modtab64::nrefsym + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.module64.nrefsym))); - (*g_ppModel) - ->setItem(i, N_mach_modtab64::ilocalsym + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.module64.ilocalsym))); - (*g_ppModel) - ->setItem(i, N_mach_modtab64::nlocalsym + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.module64.nlocalsym))); - (*g_ppModel) - ->setItem(i, N_mach_modtab64::iextrel + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.module64.iextrel))); - (*g_ppModel) - ->setItem(i, N_mach_modtab64::nextrel + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.module64.nextrel))); - (*g_ppModel) - ->setItem(i, N_mach_modtab64::iinit_iterm + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.module64.iinit_iterm))); - (*g_ppModel) - ->setItem(i, N_mach_modtab64::ninit_nterm + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.module64.ninit_nterm))); + (*g_ppModel)->setItem(i, N_mach_modtab64::module_name + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.module64.module_name))); + (*g_ppModel)->setItem(i, N_mach_modtab64::iextdefsym + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.module64.iextdefsym))); + (*g_ppModel)->setItem(i, N_mach_modtab64::nextdefsym + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.module64.nextdefsym))); + (*g_ppModel)->setItem(i, N_mach_modtab64::irefsym + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.module64.irefsym))); + (*g_ppModel)->setItem(i, N_mach_modtab64::nrefsym + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.module64.nrefsym))); + (*g_ppModel)->setItem(i, N_mach_modtab64::ilocalsym + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.module64.ilocalsym))); + (*g_ppModel)->setItem(i, N_mach_modtab64::nlocalsym + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.module64.nlocalsym))); + (*g_ppModel)->setItem(i, N_mach_modtab64::iextrel + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.module64.iextrel))); + (*g_ppModel)->setItem(i, N_mach_modtab64::nextrel + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.module64.nextrel))); + (*g_ppModel)->setItem(i, N_mach_modtab64::iinit_iterm + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.module64.iinit_iterm))); + (*g_ppModel)->setItem(i, N_mach_modtab64::ninit_nterm + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.module64.ninit_nterm))); (*g_ppModel) ->setItem(i, N_mach_modtab64::objc_module_info_size + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i) - .s.module64.objc_module_info_size))); + new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.module64.objc_module_info_size))); (*g_ppModel) ->setItem(i, N_mach_modtab64::objc_module_info_addr + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i) - .s.module64.objc_module_info_addr))); + new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.module64.objc_module_info_addr))); } else { - (*g_ppModel) - ->setItem(i, N_mach_modtab32::module_name + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.module32.module_name))); - (*g_ppModel) - ->setItem(i, N_mach_modtab32::iextdefsym + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.module32.iextdefsym))); - (*g_ppModel) - ->setItem(i, N_mach_modtab32::nextdefsym + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.module32.nextdefsym))); - (*g_ppModel) - ->setItem(i, N_mach_modtab32::irefsym + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.module32.irefsym))); - (*g_ppModel) - ->setItem(i, N_mach_modtab32::nrefsym + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.module32.nrefsym))); - (*g_ppModel) - ->setItem(i, N_mach_modtab32::ilocalsym + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.module32.ilocalsym))); - (*g_ppModel) - ->setItem(i, N_mach_modtab32::nlocalsym + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.module32.nlocalsym))); - (*g_ppModel) - ->setItem(i, N_mach_modtab32::iextrel + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.module32.iextrel))); - (*g_ppModel) - ->setItem(i, N_mach_modtab32::nextrel + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.module32.nextrel))); - (*g_ppModel) - ->setItem(i, N_mach_modtab32::iinit_iterm + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.module32.iinit_iterm))); - (*g_ppModel) - ->setItem(i, N_mach_modtab32::ninit_nterm + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).s.module32.ninit_nterm))); + (*g_ppModel)->setItem(i, N_mach_modtab32::module_name + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.module32.module_name))); + (*g_ppModel)->setItem(i, N_mach_modtab32::iextdefsym + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.module32.iextdefsym))); + (*g_ppModel)->setItem(i, N_mach_modtab32::nextdefsym + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.module32.nextdefsym))); + (*g_ppModel)->setItem(i, N_mach_modtab32::irefsym + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.module32.irefsym))); + (*g_ppModel)->setItem(i, N_mach_modtab32::nrefsym + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.module32.nrefsym))); + (*g_ppModel)->setItem(i, N_mach_modtab32::ilocalsym + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.module32.ilocalsym))); + (*g_ppModel)->setItem(i, N_mach_modtab32::nlocalsym + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.module32.nlocalsym))); + (*g_ppModel)->setItem(i, N_mach_modtab32::iextrel + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.module32.iextrel))); + (*g_ppModel)->setItem(i, N_mach_modtab32::nextrel + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.module32.nextrel))); + (*g_ppModel)->setItem(i, N_mach_modtab32::iinit_iterm + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.module32.iinit_iterm))); + (*g_ppModel)->setItem(i, N_mach_modtab32::ninit_nterm + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.module32.ninit_nterm))); (*g_ppModel) ->setItem(i, N_mach_modtab32::objc_module_info_addr + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i) - .s.module32.objc_module_info_addr))); + new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.module32.objc_module_info_addr))); (*g_ppModel) ->setItem(i, N_mach_modtab32::objc_module_info_size + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i) - .s.module32.objc_module_info_size))); + new QStandardItem(XBinary::valueToHex(listRecords.at(i).s.module32.objc_module_info_size))); } incValue(); @@ -990,21 +570,16 @@ void MACHProcessData::_process() { } else if (g_nType == SMACH::TYPE_DYSYMTAB_extrefsyms) { QList listLabels; listLabels.append(""); - listLabels.append(getStructList(N_mach_refsyms::records, - N_mach_refsyms::__data_size)); + listLabels.append(getStructList(N_mach_refsyms::records, N_mach_refsyms::__data_size)); listLabels.append(tr("Name")); - QList listRecords = - g_pXMACH->get_extrefsyms_list(); - QList listNlistRecords = - g_pXMACH->getNlistRecords(); - XBinary::OFFSETSIZE osStringTable = - g_pXMACH->getStringTableOffsetSize(); + QList listRecords = g_pXMACH->get_extrefsyms_list(); + QList listNlistRecords = g_pXMACH->getNlistRecords(); + XBinary::OFFSETSIZE osStringTable = g_pXMACH->getStringTableOffsetSize(); int nNumberOfRecords = listRecords.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfRecords, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfRecords, listLabels.count()); setMaximum(nNumberOfRecords); @@ -1013,22 +588,13 @@ void MACHProcessData::_process() { for (qint32 i = 0; (i < nNumberOfRecords) && (isRun()); i++) { QStandardItem *pItem = new QStandardItem; pItem->setData(i, Qt::DisplayRole); - pItem->setData(listRecords.at(i).nStructOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); + pItem->setData(listRecords.at(i).nStructOffset, Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, N_mach_refsyms::isym + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).reference.s._value.isym))); - (*g_ppModel) - ->setItem( - i, N_mach_refsyms::flags + 1, - new QStandardItem(XBinary::valueToHex( - (quint8)listRecords.at(i).reference.s._value.flags))); + (*g_ppModel)->setItem(i, N_mach_refsyms::isym + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).reference.s._value.isym))); + (*g_ppModel)->setItem(i, N_mach_refsyms::flags + 1, new QStandardItem(XBinary::valueToHex((quint8)listRecords.at(i).reference.s._value.flags))); - QString sName = g_pXMACH->getIndexSymbolName( - listRecords.at(i).reference.s._value.isym, &listNlistRecords, - osStringTable.nOffset, osStringTable.nSize); + QString sName = + g_pXMACH->getIndexSymbolName(listRecords.at(i).reference.s._value.isym, &listNlistRecords, osStringTable.nOffset, osStringTable.nSize); (*g_ppModel)->setItem(i, 3, new QStandardItem(sName)); @@ -1040,17 +606,13 @@ void MACHProcessData::_process() { listLabels.append(tr("Value")); listLabels.append(tr("Name")); - QList listRecords = - g_pXMACH->get_indirectsyms_list(); - QList listNlistRecords = - g_pXMACH->getNlistRecords(); - XBinary::OFFSETSIZE osStringTable = - g_pXMACH->getStringTableOffsetSize(); + QList listRecords = g_pXMACH->get_indirectsyms_list(); + QList listNlistRecords = g_pXMACH->getNlistRecords(); + XBinary::OFFSETSIZE osStringTable = g_pXMACH->getStringTableOffsetSize(); int nNumberOfRecords = listRecords.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfRecords, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfRecords, listLabels.count()); setMaximum(nNumberOfRecords); @@ -1059,28 +621,20 @@ void MACHProcessData::_process() { for (qint32 i = 0; (i < nNumberOfRecords) && (isRun()); i++) { QStandardItem *pItem = new QStandardItem; pItem->setData(i, Qt::DisplayRole); - pItem->setData(listRecords.at(i).nStructOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); + pItem->setData(listRecords.at(i).nStructOffset, Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, 1, - new QStandardItem( - XBinary::valueToHex(listRecords.at(i).nValue))); + (*g_ppModel)->setItem(i, 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).nValue))); - QString sName = g_pXMACH->getIndexSymbolName( - listRecords.at(i).nValue, &listNlistRecords, - osStringTable.nOffset, osStringTable.nSize); + QString sName = g_pXMACH->getIndexSymbolName(listRecords.at(i).nValue, &listNlistRecords, osStringTable.nOffset, osStringTable.nSize); (*g_ppModel)->setItem(i, 2, new QStandardItem(sName)); incValue(); } - } else if ((g_nType == SMACH::TYPE_DYSYMTAB_extrel) || - (g_nType == SMACH::TYPE_DYSYMTAB_locrel)) { + } else if ((g_nType == SMACH::TYPE_DYSYMTAB_extrel) || (g_nType == SMACH::TYPE_DYSYMTAB_locrel)) { QList listLabels; listLabels.append(""); - listLabels.append(getStructList(N_mach_relocs_E::records, - N_mach_relocs_E::__data_size)); + listLabels.append(getStructList(N_mach_relocs_E::records, N_mach_relocs_E::__data_size)); QList listRecords; @@ -1092,8 +646,7 @@ void MACHProcessData::_process() { int nNumberOfRecords = listRecords.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfRecords, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfRecords, listLabels.count()); setMaximum(nNumberOfRecords); @@ -1102,37 +655,14 @@ void MACHProcessData::_process() { for (qint32 i = 0; (i < nNumberOfRecords) && (isRun()); i++) { QStandardItem *pItem = new QStandardItem; pItem->setData(i, Qt::DisplayRole); - pItem->setData(listRecords.at(i).nStructOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); + pItem->setData(listRecords.at(i).nStructOffset, Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, N_mach_relocs_E::r_address + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).reloc.r_address))); - (*g_ppModel) - ->setItem(i, N_mach_relocs_E::r_symbolnum + 1, - new QStandardItem(XBinary::valueToHex( - listRecords.at(i).reloc.s._value.r_symbolnum))); - (*g_ppModel) - ->setItem( - i, N_mach_relocs_E::r_pcrel + 1, - new QStandardItem(XBinary::valueToHex( - (quint8)listRecords.at(i).reloc.s._value.r_pcrel))); - (*g_ppModel) - ->setItem( - i, N_mach_relocs_E::r_length + 1, - new QStandardItem(XBinary::valueToHex( - (quint8)listRecords.at(i).reloc.s._value.r_length))); - (*g_ppModel) - ->setItem( - i, N_mach_relocs_E::r_extern + 1, - new QStandardItem(XBinary::valueToHex( - (quint8)listRecords.at(i).reloc.s._value.r_extern))); - (*g_ppModel) - ->setItem( - i, N_mach_relocs_E::r_type + 1, - new QStandardItem(XBinary::valueToHex( - (quint8)listRecords.at(i).reloc.s._value.r_type))); + (*g_ppModel)->setItem(i, N_mach_relocs_E::r_address + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).reloc.r_address))); + (*g_ppModel)->setItem(i, N_mach_relocs_E::r_symbolnum + 1, new QStandardItem(XBinary::valueToHex(listRecords.at(i).reloc.s._value.r_symbolnum))); + (*g_ppModel)->setItem(i, N_mach_relocs_E::r_pcrel + 1, new QStandardItem(XBinary::valueToHex((quint8)listRecords.at(i).reloc.s._value.r_pcrel))); + (*g_ppModel)->setItem(i, N_mach_relocs_E::r_length + 1, new QStandardItem(XBinary::valueToHex((quint8)listRecords.at(i).reloc.s._value.r_length))); + (*g_ppModel)->setItem(i, N_mach_relocs_E::r_extern + 1, new QStandardItem(XBinary::valueToHex((quint8)listRecords.at(i).reloc.s._value.r_extern))); + (*g_ppModel)->setItem(i, N_mach_relocs_E::r_type + 1, new QStandardItem(XBinary::valueToHex((quint8)listRecords.at(i).reloc.s._value.r_type))); incValue(); } @@ -1143,284 +673,105 @@ void MACHProcessData::ajustTableView(QWidget *pWidget, QTableView *pTableView) { XBinary::MODE mode = g_pXMACH->getMode(); if (g_nType == SMACH::TYPE_mach_commands) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGMID, - mode)); - } else if ((g_nType == SMACH::TYPE_mach_id_library) || - (g_nType == SMACH::TYPE_mach_weak_libraries) || - (g_nType == SMACH::TYPE_mach_libraries)) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 4, FormatWidget::getColumnWidth(pWidget, - FormatWidget::CW_STRINGLONG, mode)); - } else if ((g_nType == SMACH::TYPE_mach_LOADFVMLIB) || - (g_nType == SMACH::TYPE_mach_IDFVMLIB)) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, - FormatWidget::CW_STRINGLONG, mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGMID, mode)); + } else if ((g_nType == SMACH::TYPE_mach_id_library) || (g_nType == SMACH::TYPE_mach_weak_libraries) || (g_nType == SMACH::TYPE_mach_libraries)) { + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGLONG, mode)); + } else if ((g_nType == SMACH::TYPE_mach_LOADFVMLIB) || (g_nType == SMACH::TYPE_mach_IDFVMLIB)) { + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGLONG, mode)); } else if (g_nType == SMACH::TYPE_mach_segments) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth( - pWidget, FormatWidget::CW_STRINGSHORT, mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 7, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 8, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 9, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGSHORT, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(7, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(8, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(9, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); } else if (g_nType == SMACH::TYPE_mach_sections) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth( - pWidget, FormatWidget::CW_STRINGSHORT, mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth( - pWidget, FormatWidget::CW_STRINGSHORT, mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 7, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 8, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 9, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 10, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 11, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 12, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGSHORT, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGSHORT, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(7, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(8, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(9, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(10, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(11, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(12, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); } else if (g_nType == SMACH::TYPE_SYMBOLTABLE) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 6, FormatWidget::getColumnWidth(pWidget, - FormatWidget::CW_STRINGLONG, mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGLONG, mode)); } else if (g_nType == SMACH::TYPE_FUNCTIONS) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, - FormatWidget::CW_STRINGLONG, mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGLONG, mode)); } else if (g_nType == SMACH::TYPE_DICE) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - } else if ((g_nType == SMACH::TYPE_DYLD_INFO_bind) || - (g_nType == SMACH::TYPE_DYLD_INFO_export) || - (g_nType == SMACH::TYPE_DYLD_INFO_lazy_bind) || - (g_nType == SMACH::TYPE_DYLD_INFO_rebase) || - (g_nType == SMACH::TYPE_DYLD_INFO_weak_bind)) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, - FormatWidget::CW_STRINGLONG, mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + } else if ((g_nType == SMACH::TYPE_DYLD_INFO_bind) || (g_nType == SMACH::TYPE_DYLD_INFO_export) || (g_nType == SMACH::TYPE_DYLD_INFO_lazy_bind) || + (g_nType == SMACH::TYPE_DYLD_INFO_rebase) || (g_nType == SMACH::TYPE_DYLD_INFO_weak_bind)) { + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGLONG, mode)); } else if (g_nType == SMACH::TYPE_DYSYMTAB_toc) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, - FormatWidget::CW_STRINGLONG, mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGLONG, mode)); } else if (g_nType == SMACH::TYPE_DYSYMTAB_modtab) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 7, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 8, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 9, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 10, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 11, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 12, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 13, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(7, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(8, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(9, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(10, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(11, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(12, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(13, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); } else if (g_nType == SMACH::TYPE_DYSYMTAB_extrefsyms) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT8, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, - FormatWidget::CW_STRINGLONG, mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT8, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGLONG, mode)); } else if (g_nType == SMACH::TYPE_DYSYMTAB_indirectsyms) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, - FormatWidget::CW_STRINGLONG, mode)); - } else if ((g_nType == SMACH::TYPE_DYSYMTAB_extrel) || - (g_nType == SMACH::TYPE_DYSYMTAB_locrel)) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT8, - mode)); - pTableView->setColumnWidth( - 4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT8, - mode)); - pTableView->setColumnWidth( - 5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT8, - mode)); - pTableView->setColumnWidth( - 6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT8, - mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGLONG, mode)); + } else if ((g_nType == SMACH::TYPE_DYSYMTAB_extrel) || (g_nType == SMACH::TYPE_DYSYMTAB_locrel)) { + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT8, mode)); + pTableView->setColumnWidth(4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT8, mode)); + pTableView->setColumnWidth(5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT8, mode)); + pTableView->setColumnWidth(6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT8, mode)); } } diff --git a/MACH/machprocessdata.h b/MACH/machprocessdata.h index 6eaa493d..005a6c44 100755 --- a/MACH/machprocessdata.h +++ b/MACH/machprocessdata.h @@ -27,13 +27,12 @@ class MACHProcessData : public ProcessData { Q_OBJECT - public: - explicit MACHProcessData(int nType, QStandardItemModel **ppModel, - XMACH *pXMACH, qint64 nOffset, qint64 nSize); +public: + explicit MACHProcessData(int nType, QStandardItemModel **ppModel, XMACH *pXMACH, qint64 nOffset, qint64 nSize); virtual void _process(); virtual void ajustTableView(QWidget *pWidget, QTableView *pTableView); - private: +private: int g_nType; XMACH *g_pXMACH; QStandardItemModel **g_ppModel; diff --git a/MACH/machsectionheaderwidget.cpp b/MACH/machsectionheaderwidget.cpp index ca52cf18..39af1b64 100644 --- a/MACH/machsectionheaderwidget.cpp +++ b/MACH/machsectionheaderwidget.cpp @@ -22,16 +22,11 @@ #include "ui_machsectionheaderwidget.h" -MACHSectionHeaderWidget::MACHSectionHeaderWidget(QWidget *pParent) - : FormatWidget(pParent), ui(new Ui::MACHSectionHeaderWidget) { +MACHSectionHeaderWidget::MACHSectionHeaderWidget(QWidget *pParent) : FormatWidget(pParent), ui(new Ui::MACHSectionHeaderWidget) { ui->setupUi(this); } -MACHSectionHeaderWidget::MACHSectionHeaderWidget(QIODevice *pDevice, - FW_DEF::OPTIONS options, - quint32 nNumber, - qint64 nOffset, qint32 nType, - QWidget *pParent) +MACHSectionHeaderWidget::MACHSectionHeaderWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, quint32 nNumber, qint64 nOffset, qint32 nType, QWidget *pParent) : MACHSectionHeaderWidget(pParent) { MACHSectionHeaderWidget::setData(pDevice, options, nNumber, nOffset, nType); @@ -51,15 +46,12 @@ MACHSectionHeaderWidget::MACHSectionHeaderWidget(QIODevice *pDevice, g_nComboBoxSize = N_mach_commands::__CB_size; g_nInvWidgetSize = N_mach_commands::__INV_size; } - if ((nType == SMACH::TYPE_mach_libraries) || - (nType == SMACH::TYPE_mach_weak_libraries) || - (nType == SMACH::TYPE_mach_id_library)) { + if ((nType == SMACH::TYPE_mach_libraries) || (nType == SMACH::TYPE_mach_weak_libraries) || (nType == SMACH::TYPE_mach_id_library)) { g_nLineEditSize = N_mach_library::__data_size; g_nComboBoxSize = N_mach_library::__CB_size; g_nInvWidgetSize = N_mach_library::__INV_size; } - if ((nType == SMACH::TYPE_mach_LOADFVMLIB) || - (nType == SMACH::TYPE_mach_IDFVMLIB)) { + if ((nType == SMACH::TYPE_mach_LOADFVMLIB) || (nType == SMACH::TYPE_mach_IDFVMLIB)) { g_nLineEditSize = N_mach_fmv_library::__data_size; g_nComboBoxSize = N_mach_fmv_library::__CB_size; g_nInvWidgetSize = N_mach_fmv_library::__INV_size; @@ -158,7 +150,9 @@ void MACHSectionHeaderWidget::clear() { ui->checkBoxReadonly->setChecked(true); } -void MACHSectionHeaderWidget::cleanup() { MACHSectionHeaderWidget::clear(); } +void MACHSectionHeaderWidget::cleanup() { + MACHSectionHeaderWidget::clear(); +} void MACHSectionHeaderWidget::reload() { MACHSectionHeaderWidget::clear(); @@ -168,16 +162,12 @@ void MACHSectionHeaderWidget::reload() { reloadData(); } -void MACHSectionHeaderWidget::setGlobal(XShortcuts *pShortcuts, - XOptions *pXOptions) { +void MACHSectionHeaderWidget::setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions) { ui->widgetHex->setGlobal(pShortcuts, pXOptions); XShortcutsWidget::setGlobal(pShortcuts, pXOptions); } -FormatWidget::SV MACHSectionHeaderWidget::_setValue(QVariant vValue, int nStype, - int nNdata, int nVtype, - int nPosition, - qint64 nOffset) { +FormatWidget::SV MACHSectionHeaderWidget::_setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset) { Q_UNUSED(nVtype) Q_UNUSED(nPosition) @@ -194,8 +184,7 @@ FormatWidget::SV MACHSectionHeaderWidget::_setValue(QVariant vValue, int nStype, case SMACH::TYPE_mach_commands: switch (nNdata) { case N_mach_commands::cmd: - g_ppComboBox[N_mach_commands::CB_CMD]->setValue( - nValue); + g_ppComboBox[N_mach_commands::CB_CMD]->setValue(nValue); break; } @@ -204,12 +193,10 @@ FormatWidget::SV MACHSectionHeaderWidget::_setValue(QVariant vValue, int nStype, case SMACH::TYPE_mach_segments: switch (nNdata) { case N_mach_segments::initprot: - g_ppComboBox[N_mach_segments::CB_initprot] - ->setValue(nValue); + g_ppComboBox[N_mach_segments::CB_initprot]->setValue(nValue); break; case N_mach_segments::maxprot: - g_ppComboBox[N_mach_segments::CB_maxprot]->setValue( - nValue); + g_ppComboBox[N_mach_segments::CB_maxprot]->setValue(nValue); break; } @@ -218,8 +205,7 @@ FormatWidget::SV MACHSectionHeaderWidget::_setValue(QVariant vValue, int nStype, case SMACH::TYPE_DICE: switch (nNdata) { case N_mach_data_in_code_entry::kind: - g_ppComboBox[N_mach_data_in_code_entry::CB_kind] - ->setValue(nValue); + g_ppComboBox[N_mach_data_in_code_entry::CB_kind]->setValue(nValue); break; } @@ -228,13 +214,9 @@ FormatWidget::SV MACHSectionHeaderWidget::_setValue(QVariant vValue, int nStype, case SMACH::TYPE_SYMBOLTABLE: switch (nNdata) { case N_mach_nlist::n_strx: - XBinary::OFFSETSIZE osStringTable = - mach.getStringTableOffsetSize(); - addComment(ui->tableWidget, N_mach_nlist::n_strx, - HEADER_COLUMN_COMMENT, - mach.getStringFromIndex( - osStringTable.nOffset, - osStringTable.nSize, nValue)); + XBinary::OFFSETSIZE osStringTable = mach.getStringTableOffsetSize(); + addComment(ui->tableWidget, N_mach_nlist::n_strx, HEADER_COLUMN_COMMENT, + mach.getStringFromIndex(osStringTable.nOffset, osStringTable.nSize, nValue)); break; } @@ -243,9 +225,7 @@ FormatWidget::SV MACHSectionHeaderWidget::_setValue(QVariant vValue, int nStype, case SMACH::TYPE_DYSYMTAB_indirectsyms: switch (nNdata) { case N_mach_value::value: - addComment(ui->tableWidget, N_mach_value::value, - HEADER_COLUMN_COMMENT, - mach.getIndexSymbolName(nValue)); + addComment(ui->tableWidget, N_mach_value::value, HEADER_COLUMN_COMMENT, mach.getIndexSymbolName(nValue)); break; } @@ -254,10 +234,7 @@ FormatWidget::SV MACHSectionHeaderWidget::_setValue(QVariant vValue, int nStype, case SMACH::TYPE_DYSYMTAB_toc: switch (nNdata) { case N_mach_table_of_contents::symbol_index: - addComment(ui->tableWidget, - N_mach_table_of_contents::symbol_index, - HEADER_COLUMN_COMMENT, - mach.getIndexSymbolName(nValue)); + addComment(ui->tableWidget, N_mach_table_of_contents::symbol_index, HEADER_COLUMN_COMMENT, mach.getIndexSymbolName(nValue)); break; } @@ -285,12 +262,10 @@ FormatWidget::SV MACHSectionHeaderWidget::_setValue(QVariant vValue, int nStype, mach._setLibraryRecord_timestamp(nOffset, nValue); break; case N_mach_library::current_version: - mach._setLibraryRecord_current_version(nOffset, - nValue); + mach._setLibraryRecord_current_version(nOffset, nValue); break; case N_mach_library::compatibility_version: - mach._setLibraryRecord_compatibility_version( - nOffset, nValue); + mach._setLibraryRecord_compatibility_version(nOffset, nValue); break; case N_mach_library::name: mach._setLibraryRecord_name(nOffset, sValue); @@ -303,12 +278,10 @@ FormatWidget::SV MACHSectionHeaderWidget::_setValue(QVariant vValue, int nStype, case SMACH::TYPE_mach_IDFVMLIB: switch (nNdata) { case N_mach_fmv_library::minor_version: - mach._setFvmLibraryRecord_minor_version(nOffset, - nValue); + mach._setFvmLibraryRecord_minor_version(nOffset, nValue); break; case N_mach_fmv_library::header_addr: - mach._setFvmLibraryRecord_header_addr(nOffset, - nValue); + mach._setFvmLibraryRecord_header_addr(nOffset, nValue); break; case N_mach_fmv_library::name: mach._setLibraryRecord_name(nOffset, sValue); @@ -506,12 +479,10 @@ FormatWidget::SV MACHSectionHeaderWidget::_setValue(QVariant vValue, int nStype, case SMACH::TYPE_DICE: switch (nNdata) { case N_mach_data_in_code_entry::offset: - mach._set_data_in_code_entry_offset(nOffset, - nValue); + mach._set_data_in_code_entry_offset(nOffset, nValue); break; case N_mach_data_in_code_entry::length: - mach._set_data_in_code_entry_length(nOffset, - nValue); + mach._set_data_in_code_entry_length(nOffset, nValue); break; case N_mach_data_in_code_entry::kind: mach._set_data_in_code_entry_kind(nOffset, nValue); @@ -524,71 +495,55 @@ FormatWidget::SV MACHSectionHeaderWidget::_setValue(QVariant vValue, int nStype, if (mach.is64()) { switch (nNdata) { case N_mach_modtab64::module_name: - mach._set_dylib_module_64_module_name(nOffset, - nValue); + mach._set_dylib_module_64_module_name(nOffset, nValue); break; case N_mach_modtab64::iextdefsym: - mach._set_dylib_module_64_iextdefsym(nOffset, - nValue); + mach._set_dylib_module_64_iextdefsym(nOffset, nValue); break; case N_mach_modtab64::nextdefsym: - mach._set_dylib_module_64_nextdefsym(nOffset, - nValue); + mach._set_dylib_module_64_nextdefsym(nOffset, nValue); break; case N_mach_modtab64::irefsym: - mach._set_dylib_module_64_irefsym(nOffset, - nValue); + mach._set_dylib_module_64_irefsym(nOffset, nValue); break; case N_mach_modtab64::nrefsym: - mach._set_dylib_module_64_nrefsym(nOffset, - nValue); + mach._set_dylib_module_64_nrefsym(nOffset, nValue); break; case N_mach_modtab64::ilocalsym: - mach._set_dylib_module_64_ilocalsym(nOffset, - nValue); + mach._set_dylib_module_64_ilocalsym(nOffset, nValue); break; case N_mach_modtab64::nlocalsym: - mach._set_dylib_module_64_nlocalsym(nOffset, - nValue); + mach._set_dylib_module_64_nlocalsym(nOffset, nValue); break; case N_mach_modtab64::iextrel: - mach._set_dylib_module_64_iextrel(nOffset, - nValue); + mach._set_dylib_module_64_iextrel(nOffset, nValue); break; case N_mach_modtab64::nextrel: - mach._set_dylib_module_64_nextrel(nOffset, - nValue); + mach._set_dylib_module_64_nextrel(nOffset, nValue); break; case N_mach_modtab64::iinit_iterm: - mach._set_dylib_module_64_iinit_iterm(nOffset, - nValue); + mach._set_dylib_module_64_iinit_iterm(nOffset, nValue); break; case N_mach_modtab64::ninit_nterm: - mach._set_dylib_module_64_ninit_nterm(nOffset, - nValue); + mach._set_dylib_module_64_ninit_nterm(nOffset, nValue); break; case N_mach_modtab64::objc_module_info_size: - mach._set_dylib_module_64_objc_module_info_size( - nOffset, nValue); + mach._set_dylib_module_64_objc_module_info_size(nOffset, nValue); break; case N_mach_modtab64::objc_module_info_addr: - mach._set_dylib_module_64_objc_module_info_addr( - nOffset, nValue); + mach._set_dylib_module_64_objc_module_info_addr(nOffset, nValue); break; } } else { switch (nNdata) { case N_mach_modtab32::module_name: - mach._set_dylib_module_module_name(nOffset, - nValue); + mach._set_dylib_module_module_name(nOffset, nValue); break; case N_mach_modtab32::iextdefsym: - mach._set_dylib_module_iextdefsym(nOffset, - nValue); + mach._set_dylib_module_iextdefsym(nOffset, nValue); break; case N_mach_modtab32::nextdefsym: - mach._set_dylib_module_nextdefsym(nOffset, - nValue); + mach._set_dylib_module_nextdefsym(nOffset, nValue); break; case N_mach_modtab32::irefsym: mach._set_dylib_module_irefsym(nOffset, nValue); @@ -597,12 +552,10 @@ FormatWidget::SV MACHSectionHeaderWidget::_setValue(QVariant vValue, int nStype, mach._set_dylib_module_nrefsym(nOffset, nValue); break; case N_mach_modtab32::ilocalsym: - mach._set_dylib_module_ilocalsym(nOffset, - nValue); + mach._set_dylib_module_ilocalsym(nOffset, nValue); break; case N_mach_modtab32::nlocalsym: - mach._set_dylib_module_nlocalsym(nOffset, - nValue); + mach._set_dylib_module_nlocalsym(nOffset, nValue); break; case N_mach_modtab32::iextrel: mach._set_dylib_module_iextrel(nOffset, nValue); @@ -611,20 +564,16 @@ FormatWidget::SV MACHSectionHeaderWidget::_setValue(QVariant vValue, int nStype, mach._set_dylib_module_nextrel(nOffset, nValue); break; case N_mach_modtab32::iinit_iterm: - mach._set_dylib_module_iinit_iterm(nOffset, - nValue); + mach._set_dylib_module_iinit_iterm(nOffset, nValue); break; case N_mach_modtab32::ninit_nterm: - mach._set_dylib_module_ninit_nterm(nOffset, - nValue); + mach._set_dylib_module_ninit_nterm(nOffset, nValue); break; case N_mach_modtab32::objc_module_info_addr: - mach._set_dylib_module_objc_module_info_addr( - nOffset, nValue); + mach._set_dylib_module_objc_module_info_addr(nOffset, nValue); break; case N_mach_modtab32::objc_module_info_size: - mach._set_dylib_module_objc_module_info_size( - nOffset, nValue); + mach._set_dylib_module_objc_module_info_size(nOffset, nValue); break; } } @@ -634,12 +583,10 @@ FormatWidget::SV MACHSectionHeaderWidget::_setValue(QVariant vValue, int nStype, case SMACH::TYPE_DYSYMTAB_toc: switch (nNdata) { case N_mach_table_of_contents::symbol_index: - mach._set_dylib_table_of_contents_symbol_index( - nOffset, nValue); + mach._set_dylib_table_of_contents_symbol_index(nOffset, nValue); break; case N_mach_table_of_contents::module_index: - mach._set_dylib_table_of_contents_module_index( - nOffset, nValue); + mach._set_dylib_table_of_contents_module_index(nOffset, nValue); break; } @@ -649,8 +596,7 @@ FormatWidget::SV MACHSectionHeaderWidget::_setValue(QVariant vValue, int nStype, case SMACH::TYPE_DYSYMTAB_locrel: switch (nNdata) { case N_mach_relocs::r_address: - mach._set_relocation_info_r_address(nOffset, - nValue); + mach._set_relocation_info_r_address(nOffset, nValue); break; case N_mach_relocs::value: mach._set_relocation_info_value(nOffset, nValue); @@ -663,8 +609,7 @@ FormatWidget::SV MACHSectionHeaderWidget::_setValue(QVariant vValue, int nStype, case SMACH::TYPE_DYSYMTAB_extrefsyms: switch (nNdata) { case N_mach_value::value: - mach.write_uint32(nOffset, nValue, - mach.isBigEndian()); + mach.write_uint32(nOffset, nValue, mach.isBigEndian()); break; } @@ -690,119 +635,82 @@ void MACHSectionHeaderWidget::blockSignals(bool bState) { _blockSignals((QObject **)g_ppComboBox, g_nComboBoxSize, bState); } -void MACHSectionHeaderWidget::adjustHeaderTable(int nType, - QTableWidget *pTableWidget) { - XBinary::MODE mode = XMACH::getMode(getDevice(), getOptions().bIsImage, - getOptions().nImageBase); +void MACHSectionHeaderWidget::adjustHeaderTable(int nType, QTableWidget *pTableWidget) { + XBinary::MODE mode = XMACH::getMode(getDevice(), getOptions().bIsImage, getOptions().nImageBase); - pTableWidget->setColumnWidth(HEADER_COLUMN_OFFSET, - getColumnWidth(this, CW_UINT16, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_TYPE, - getColumnWidth(this, CW_TYPE, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_OFFSET, getColumnWidth(this, CW_UINT16, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_TYPE, getColumnWidth(this, CW_TYPE, mode)); switch (nType) { case SMACH::TYPE_mach_commands: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); break; case SMACH::TYPE_mach_libraries: case SMACH::TYPE_mach_weak_libraries: case SMACH::TYPE_mach_id_library: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_VALUE, getColumnWidth(this, CW_STRINGMID, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); break; case SMACH::TYPE_mach_LOADFVMLIB: case SMACH::TYPE_mach_IDFVMLIB: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_VALUE, getColumnWidth(this, CW_STRINGMID, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); break; case SMACH::TYPE_mach_segments: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); break; case SMACH::TYPE_mach_sections: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); break; case SMACH::TYPE_SYMBOLTABLE: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); break; case SMACH::TYPE_DICE: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); break; case SMACH::TYPE_DYSYMTAB_modtab: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); break; case SMACH::TYPE_DYSYMTAB_toc: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); break; case SMACH::TYPE_DYSYMTAB_extrel: case SMACH::TYPE_DYSYMTAB_locrel: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); break; case SMACH::TYPE_DYSYMTAB_indirectsyms: case SMACH::TYPE_DYSYMTAB_extrefsyms: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); break; } } @@ -821,25 +729,19 @@ void MACHSectionHeaderWidget::reloadData() { bool bIsBigEndian = mach.isBigEndian(); if (nType == SMACH::TYPE_mach_commands) { - createHeaderTable(SMACH::TYPE_mach_commands, ui->tableWidget, - N_mach_commands::records, g_ppLinedEdit, - N_mach_commands::__data_size, getNumber(), + createHeaderTable(SMACH::TYPE_mach_commands, ui->tableWidget, N_mach_commands::records, g_ppLinedEdit, N_mach_commands::__data_size, getNumber(), getOffset()); g_ppComboBox[N_mach_commands::CB_CMD] = - createComboBox(ui->tableWidget, XMACH::getLoadCommandTypesS(), - SMACH::TYPE_mach_commands, N_mach_commands::cmd, - XComboBoxEx::CBTYPE_LIST); + createComboBox(ui->tableWidget, XMACH::getLoadCommandTypesS(), SMACH::TYPE_mach_commands, N_mach_commands::cmd, XComboBoxEx::CBTYPE_LIST); blockSignals(true); qint64 nHeaderOffset = getOffset(); - XMACH::COMMAND_RECORD cr = - mach._readLoadCommand(nHeaderOffset, bIsBigEndian); + XMACH::COMMAND_RECORD cr = mach._readLoadCommand(nHeaderOffset, bIsBigEndian); g_ppLinedEdit[N_mach_commands::cmd]->setValue((quint32)cr.nType); - g_ppLinedEdit[N_mach_commands::cmdsize]->setValue( - (quint32)cr.nSize); + g_ppLinedEdit[N_mach_commands::cmdsize]->setValue((quint32)cr.nSize); g_ppComboBox[N_mach_commands::CB_CMD]->setValue(cr.nType); @@ -847,42 +749,29 @@ void MACHSectionHeaderWidget::reloadData() { qint64 nSize = mach.getCommandHeaderSize(); qint64 nAddress = mach.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, - ui->widgetHex); + loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, ui->widgetHex); blockSignals(false); - } else if ((nType == SMACH::TYPE_mach_libraries) || - (nType == SMACH::TYPE_mach_weak_libraries) || - (nType == SMACH::TYPE_mach_id_library)) { - createHeaderTable(nType, ui->tableWidget, N_mach_library::records, - g_ppLinedEdit, N_mach_library::__data_size, - getNumber(), getOffset()); + } else if ((nType == SMACH::TYPE_mach_libraries) || (nType == SMACH::TYPE_mach_weak_libraries) || (nType == SMACH::TYPE_mach_id_library)) { + createHeaderTable(nType, ui->tableWidget, N_mach_library::records, g_ppLinedEdit, N_mach_library::__data_size, getNumber(), getOffset()); blockSignals(true); qint64 nHeaderOffset = getOffset(); - XMACH::LIBRARY_RECORD lr = - mach._readLibraryRecord(nHeaderOffset, bIsBigEndian); - XMACH::COMMAND_RECORD cr = - mach._readLoadCommand(nHeaderOffset, bIsBigEndian); + XMACH::LIBRARY_RECORD lr = mach._readLibraryRecord(nHeaderOffset, bIsBigEndian); + XMACH::COMMAND_RECORD cr = mach._readLoadCommand(nHeaderOffset, bIsBigEndian); - g_ppLinedEdit[N_mach_library::timestamp]->setValue( - (quint32)lr.timestamp); - g_ppLinedEdit[N_mach_library::current_version]->setValue( - (quint32)lr.current_version); - g_ppLinedEdit[N_mach_library::compatibility_version]->setValue( - (quint32)lr.compatibility_version); - g_ppLinedEdit[N_mach_library::name]->setStringValue( - lr.sFullName, lr.nMaxStringSize); + g_ppLinedEdit[N_mach_library::timestamp]->setValue((quint32)lr.timestamp); + g_ppLinedEdit[N_mach_library::current_version]->setValue((quint32)lr.current_version); + g_ppLinedEdit[N_mach_library::compatibility_version]->setValue((quint32)lr.compatibility_version); + g_ppLinedEdit[N_mach_library::name]->setStringValue(lr.sFullName, lr.nMaxStringSize); if (lr.nMaxStringSize) { - QTableWidgetItem *pItem = - ui->tableWidget->item(N_mach_library::name, 0); + QTableWidgetItem *pItem = ui->tableWidget->item(N_mach_library::name, 0); if (pItem) { - pItem->setData(Qt::UserRole + HEADER_DATA_SIZE, - lr.nMaxStringSize); + pItem->setData(Qt::UserRole + HEADER_DATA_SIZE, lr.nMaxStringSize); } } @@ -890,40 +779,28 @@ void MACHSectionHeaderWidget::reloadData() { qint64 nSize = cr.nSize; qint64 nAddress = mach.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, - ui->widgetHex); + loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, ui->widgetHex); blockSignals(false); - } else if ((nType == SMACH::TYPE_mach_LOADFVMLIB) || - (nType == SMACH::TYPE_mach_IDFVMLIB)) { - createHeaderTable(nType, ui->tableWidget, - N_mach_fmv_library::records, g_ppLinedEdit, - N_mach_fmv_library::__data_size, getNumber(), - getOffset()); + } else if ((nType == SMACH::TYPE_mach_LOADFVMLIB) || (nType == SMACH::TYPE_mach_IDFVMLIB)) { + createHeaderTable(nType, ui->tableWidget, N_mach_fmv_library::records, g_ppLinedEdit, N_mach_fmv_library::__data_size, getNumber(), getOffset()); blockSignals(true); qint64 nHeaderOffset = getOffset(); - XMACH::FVM_LIBRARY_RECORD lr = - mach._readFvmLibraryRecord(nHeaderOffset, bIsBigEndian); - XMACH::COMMAND_RECORD cr = - mach._readLoadCommand(nHeaderOffset, bIsBigEndian); + XMACH::FVM_LIBRARY_RECORD lr = mach._readFvmLibraryRecord(nHeaderOffset, bIsBigEndian); + XMACH::COMMAND_RECORD cr = mach._readLoadCommand(nHeaderOffset, bIsBigEndian); - g_ppLinedEdit[N_mach_fmv_library::minor_version]->setValue( - (quint32)lr.minor_version); - g_ppLinedEdit[N_mach_fmv_library::header_addr]->setValue( - (quint32)lr.header_addr); - g_ppLinedEdit[N_mach_fmv_library::name]->setStringValue( - lr.sFullName, lr.nMaxStringSize); + g_ppLinedEdit[N_mach_fmv_library::minor_version]->setValue((quint32)lr.minor_version); + g_ppLinedEdit[N_mach_fmv_library::header_addr]->setValue((quint32)lr.header_addr); + g_ppLinedEdit[N_mach_fmv_library::name]->setStringValue(lr.sFullName, lr.nMaxStringSize); if (lr.nMaxStringSize) { - QTableWidgetItem *pItem = - ui->tableWidget->item(N_mach_fmv_library::name, 0); + QTableWidgetItem *pItem = ui->tableWidget->item(N_mach_fmv_library::name, 0); if (pItem) { - pItem->setData(Qt::UserRole + HEADER_DATA_SIZE, - lr.nMaxStringSize); + pItem->setData(Qt::UserRole + HEADER_DATA_SIZE, lr.nMaxStringSize); } } @@ -931,102 +808,67 @@ void MACHSectionHeaderWidget::reloadData() { qint64 nSize = cr.nSize; qint64 nAddress = mach.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, - ui->widgetHex); + loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, ui->widgetHex); blockSignals(false); } else if (nType == SMACH::TYPE_mach_segments) { - createHeaderTable(SMACH::TYPE_mach_segments, ui->tableWidget, - bIs64 ? (N_mach_segments::records64) - : (N_mach_segments::records32), - g_ppLinedEdit, N_mach_segments::__data_size, - getNumber(), getOffset()); - g_ppComboBox[N_mach_segments::CB_initprot] = createComboBox( - ui->tableWidget, XMACH::getVMProtectionsS(), - SMACH::TYPE_mach_segments, N_mach_segments::initprot, - XComboBoxEx::CBTYPE_FLAGS); - g_ppComboBox[N_mach_segments::CB_maxprot] = createComboBox( - ui->tableWidget, XMACH::getVMProtectionsS(), - SMACH::TYPE_mach_segments, N_mach_segments::maxprot, - XComboBoxEx::CBTYPE_FLAGS); + createHeaderTable(SMACH::TYPE_mach_segments, ui->tableWidget, bIs64 ? (N_mach_segments::records64) : (N_mach_segments::records32), g_ppLinedEdit, + N_mach_segments::__data_size, getNumber(), getOffset()); + g_ppComboBox[N_mach_segments::CB_initprot] = + createComboBox(ui->tableWidget, XMACH::getVMProtectionsS(), SMACH::TYPE_mach_segments, N_mach_segments::initprot, XComboBoxEx::CBTYPE_FLAGS); + g_ppComboBox[N_mach_segments::CB_maxprot] = + createComboBox(ui->tableWidget, XMACH::getVMProtectionsS(), SMACH::TYPE_mach_segments, N_mach_segments::maxprot, XComboBoxEx::CBTYPE_FLAGS); blockSignals(true); qint64 nHeaderOffset = getOffset(); if (bIs64) { - XMACH_DEF::segment_command_64 segment = - mach._read_segment_command_64(nHeaderOffset, bIsBigEndian); - - g_ppLinedEdit[N_mach_segments::segname]->setStringValue( - segment.segname); - g_ppLinedEdit[N_mach_segments::vmaddr]->setValue( - segment.vmaddr); - g_ppLinedEdit[N_mach_segments::vmsize]->setValue( - segment.vmsize); - g_ppLinedEdit[N_mach_segments::fileoff]->setValue( - segment.fileoff); - g_ppLinedEdit[N_mach_segments::filesize]->setValue( - segment.filesize); - g_ppLinedEdit[N_mach_segments::maxprot]->setValue( - segment.maxprot); - g_ppLinedEdit[N_mach_segments::initprot]->setValue( - segment.initprot); - g_ppLinedEdit[N_mach_segments::nsects]->setValue( - segment.nsects); + XMACH_DEF::segment_command_64 segment = mach._read_segment_command_64(nHeaderOffset, bIsBigEndian); + + g_ppLinedEdit[N_mach_segments::segname]->setStringValue(segment.segname); + g_ppLinedEdit[N_mach_segments::vmaddr]->setValue(segment.vmaddr); + g_ppLinedEdit[N_mach_segments::vmsize]->setValue(segment.vmsize); + g_ppLinedEdit[N_mach_segments::fileoff]->setValue(segment.fileoff); + g_ppLinedEdit[N_mach_segments::filesize]->setValue(segment.filesize); + g_ppLinedEdit[N_mach_segments::maxprot]->setValue(segment.maxprot); + g_ppLinedEdit[N_mach_segments::initprot]->setValue(segment.initprot); + g_ppLinedEdit[N_mach_segments::nsects]->setValue(segment.nsects); g_ppLinedEdit[N_mach_segments::flags]->setValue(segment.flags); - g_ppComboBox[N_mach_segments::CB_initprot]->setValue( - segment.initprot); - g_ppComboBox[N_mach_segments::CB_maxprot]->setValue( - segment.maxprot); + g_ppComboBox[N_mach_segments::CB_initprot]->setValue(segment.initprot); + g_ppComboBox[N_mach_segments::CB_maxprot]->setValue(segment.maxprot); } else { - XMACH_DEF::segment_command segment = - mach._read_segment_command(nHeaderOffset, bIsBigEndian); - - g_ppLinedEdit[N_mach_segments::segname]->setStringValue( - segment.segname); - g_ppLinedEdit[N_mach_segments::vmaddr]->setValue( - segment.vmaddr); - g_ppLinedEdit[N_mach_segments::vmsize]->setValue( - segment.vmsize); - g_ppLinedEdit[N_mach_segments::fileoff]->setValue( - segment.fileoff); - g_ppLinedEdit[N_mach_segments::filesize]->setValue( - segment.filesize); - g_ppLinedEdit[N_mach_segments::maxprot]->setValue( - segment.maxprot); - g_ppLinedEdit[N_mach_segments::initprot]->setValue( - segment.initprot); - g_ppLinedEdit[N_mach_segments::nsects]->setValue( - segment.nsects); + XMACH_DEF::segment_command segment = mach._read_segment_command(nHeaderOffset, bIsBigEndian); + + g_ppLinedEdit[N_mach_segments::segname]->setStringValue(segment.segname); + g_ppLinedEdit[N_mach_segments::vmaddr]->setValue(segment.vmaddr); + g_ppLinedEdit[N_mach_segments::vmsize]->setValue(segment.vmsize); + g_ppLinedEdit[N_mach_segments::fileoff]->setValue(segment.fileoff); + g_ppLinedEdit[N_mach_segments::filesize]->setValue(segment.filesize); + g_ppLinedEdit[N_mach_segments::maxprot]->setValue(segment.maxprot); + g_ppLinedEdit[N_mach_segments::initprot]->setValue(segment.initprot); + g_ppLinedEdit[N_mach_segments::nsects]->setValue(segment.nsects); g_ppLinedEdit[N_mach_segments::flags]->setValue(segment.flags); - g_ppComboBox[N_mach_segments::CB_initprot]->setValue( - segment.initprot); - g_ppComboBox[N_mach_segments::CB_maxprot]->setValue( - segment.maxprot); + g_ppComboBox[N_mach_segments::CB_initprot]->setValue(segment.initprot); + g_ppComboBox[N_mach_segments::CB_maxprot]->setValue(segment.maxprot); } qint64 nOffset = nHeaderOffset; qint64 nSize = mach.getSegmentHeaderSize(); qint64 nAddress = mach.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, - ui->widgetHex); + loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, ui->widgetHex); blockSignals(false); } else if (nType == SMACH::TYPE_mach_sections) { if (bIs64) { - createHeaderTable(SMACH::TYPE_mach_sections, ui->tableWidget, - N_mach_sections64_E::records, g_ppLinedEdit, - N_mach_sections64_E::__data_size, getNumber(), - getOffset()); + createHeaderTable(SMACH::TYPE_mach_sections, ui->tableWidget, N_mach_sections64_E::records, g_ppLinedEdit, N_mach_sections64_E::__data_size, + getNumber(), getOffset()); } else { - createHeaderTable(SMACH::TYPE_mach_sections, ui->tableWidget, - N_mach_sections32_E::records, g_ppLinedEdit, - N_mach_sections32_E::__data_size, getNumber(), - getOffset()); + createHeaderTable(SMACH::TYPE_mach_sections, ui->tableWidget, N_mach_sections32_E::records, g_ppLinedEdit, N_mach_sections32_E::__data_size, + getNumber(), getOffset()); } blockSignals(true); @@ -1034,119 +876,74 @@ void MACHSectionHeaderWidget::reloadData() { qint64 nHeaderOffset = getOffset(); if (bIs64) { - g_ppComboBox[N_mach_sections64_E::CB_flag0] = createComboBox( - ui->tableWidget, XMACH::getSectionFlagsTypesS(), - SMACH::TYPE_mach_sections, N_mach_sections64_E::flags_0, - XComboBoxEx::CBTYPE_ELIST, XMACH_DEF::S_SECTION_TYPE); - g_ppComboBox[N_mach_sections64_E::CB_flag1] = createComboBox( - ui->tableWidget, XMACH::getSectionAttributesSysS(), - SMACH::TYPE_mach_sections, N_mach_sections64_E::flags_1, - XComboBoxEx::CBTYPE_ELIST, - XMACH_DEF::S_SECTION_ATTRIBUTES_SYS); - g_ppComboBox[N_mach_sections64_E::CB_flag2] = createComboBox( - ui->tableWidget, XMACH::getSectionAttributesUsrS(), - SMACH::TYPE_mach_sections, N_mach_sections64_E::flags_2, - XComboBoxEx::CBTYPE_ELIST, - XMACH_DEF::S_SECTION_ATTRIBUTES_USR); - - XMACH_DEF::section_64 section = - mach._read_section_64(nHeaderOffset, bIsBigEndian); - - g_ppLinedEdit[N_mach_sections64_E::sectname]->setStringValue( - section.sectname); - g_ppLinedEdit[N_mach_sections64_E::segname]->setStringValue( - section.segname); - g_ppLinedEdit[N_mach_sections64_E::addr]->setValue( - section.addr); - g_ppLinedEdit[N_mach_sections64_E::size]->setValue( - section.size); - g_ppLinedEdit[N_mach_sections64_E::offset]->setValue( - section.offset); - g_ppLinedEdit[N_mach_sections64_E::align]->setValue( - section.align); - g_ppLinedEdit[N_mach_sections64_E::reloff]->setValue( - section.reloff); - g_ppLinedEdit[N_mach_sections64_E::nreloc]->setValue( - section.nreloc); - g_ppLinedEdit[N_mach_sections64_E::flags_0]->setValue( - section.flags); - g_ppLinedEdit[N_mach_sections64_E::reserved1]->setValue( - section.reserved1); - g_ppLinedEdit[N_mach_sections64_E::reserved2]->setValue( - section.reserved2); - g_ppLinedEdit[N_mach_sections64_E::reserved3]->setValue( - section.reserved3); - - g_ppComboBox[N_mach_sections64_E::CB_flag0]->setValue( - section.flags); - g_ppComboBox[N_mach_sections64_E::CB_flag1]->setValue( - section.flags); - g_ppComboBox[N_mach_sections64_E::CB_flag2]->setValue( - section.flags); + g_ppComboBox[N_mach_sections64_E::CB_flag0] = + createComboBox(ui->tableWidget, XMACH::getSectionFlagsTypesS(), SMACH::TYPE_mach_sections, N_mach_sections64_E::flags_0, + XComboBoxEx::CBTYPE_ELIST, XMACH_DEF::S_SECTION_TYPE); + g_ppComboBox[N_mach_sections64_E::CB_flag1] = + createComboBox(ui->tableWidget, XMACH::getSectionAttributesSysS(), SMACH::TYPE_mach_sections, N_mach_sections64_E::flags_1, + XComboBoxEx::CBTYPE_ELIST, XMACH_DEF::S_SECTION_ATTRIBUTES_SYS); + g_ppComboBox[N_mach_sections64_E::CB_flag2] = + createComboBox(ui->tableWidget, XMACH::getSectionAttributesUsrS(), SMACH::TYPE_mach_sections, N_mach_sections64_E::flags_2, + XComboBoxEx::CBTYPE_ELIST, XMACH_DEF::S_SECTION_ATTRIBUTES_USR); + + XMACH_DEF::section_64 section = mach._read_section_64(nHeaderOffset, bIsBigEndian); + + g_ppLinedEdit[N_mach_sections64_E::sectname]->setStringValue(section.sectname); + g_ppLinedEdit[N_mach_sections64_E::segname]->setStringValue(section.segname); + g_ppLinedEdit[N_mach_sections64_E::addr]->setValue(section.addr); + g_ppLinedEdit[N_mach_sections64_E::size]->setValue(section.size); + g_ppLinedEdit[N_mach_sections64_E::offset]->setValue(section.offset); + g_ppLinedEdit[N_mach_sections64_E::align]->setValue(section.align); + g_ppLinedEdit[N_mach_sections64_E::reloff]->setValue(section.reloff); + g_ppLinedEdit[N_mach_sections64_E::nreloc]->setValue(section.nreloc); + g_ppLinedEdit[N_mach_sections64_E::flags_0]->setValue(section.flags); + g_ppLinedEdit[N_mach_sections64_E::reserved1]->setValue(section.reserved1); + g_ppLinedEdit[N_mach_sections64_E::reserved2]->setValue(section.reserved2); + g_ppLinedEdit[N_mach_sections64_E::reserved3]->setValue(section.reserved3); + + g_ppComboBox[N_mach_sections64_E::CB_flag0]->setValue(section.flags); + g_ppComboBox[N_mach_sections64_E::CB_flag1]->setValue(section.flags); + g_ppComboBox[N_mach_sections64_E::CB_flag2]->setValue(section.flags); } else { - g_ppComboBox[N_mach_sections32_E::CB_flag0] = createComboBox( - ui->tableWidget, XMACH::getSectionFlagsTypesS(), - SMACH::TYPE_mach_sections, N_mach_sections32_E::flags_0, - XComboBoxEx::CBTYPE_ELIST, XMACH_DEF::S_SECTION_TYPE); - g_ppComboBox[N_mach_sections32_E::CB_flag1] = createComboBox( - ui->tableWidget, XMACH::getSectionAttributesSysS(), - SMACH::TYPE_mach_sections, N_mach_sections32_E::flags_1, - XComboBoxEx::CBTYPE_ELIST, - XMACH_DEF::S_SECTION_ATTRIBUTES_SYS); - g_ppComboBox[N_mach_sections32_E::CB_flag2] = createComboBox( - ui->tableWidget, XMACH::getSectionAttributesUsrS(), - SMACH::TYPE_mach_sections, N_mach_sections32_E::flags_2, - XComboBoxEx::CBTYPE_ELIST, - XMACH_DEF::S_SECTION_ATTRIBUTES_USR); - - XMACH_DEF::section section = - mach._read_section(nHeaderOffset, bIsBigEndian); - - g_ppLinedEdit[N_mach_sections32_E::sectname]->setStringValue( - section.sectname); - g_ppLinedEdit[N_mach_sections32_E::segname]->setStringValue( - section.segname); - g_ppLinedEdit[N_mach_sections32_E::addr]->setValue( - section.addr); - g_ppLinedEdit[N_mach_sections32_E::size]->setValue( - section.size); - g_ppLinedEdit[N_mach_sections32_E::offset]->setValue( - section.offset); - g_ppLinedEdit[N_mach_sections32_E::align]->setValue( - section.align); - g_ppLinedEdit[N_mach_sections32_E::reloff]->setValue( - section.reloff); - g_ppLinedEdit[N_mach_sections32_E::nreloc]->setValue( - section.nreloc); - g_ppLinedEdit[N_mach_sections32_E::flags_0]->setValue( - section.flags); - g_ppLinedEdit[N_mach_sections32_E::reserved1]->setValue( - section.reserved1); - g_ppLinedEdit[N_mach_sections32_E::reserved2]->setValue( - section.reserved2); - - g_ppComboBox[N_mach_sections32_E::CB_flag0]->setValue( - section.flags); - g_ppComboBox[N_mach_sections32_E::CB_flag1]->setValue( - section.flags); - g_ppComboBox[N_mach_sections32_E::CB_flag2]->setValue( - section.flags); + g_ppComboBox[N_mach_sections32_E::CB_flag0] = + createComboBox(ui->tableWidget, XMACH::getSectionFlagsTypesS(), SMACH::TYPE_mach_sections, N_mach_sections32_E::flags_0, + XComboBoxEx::CBTYPE_ELIST, XMACH_DEF::S_SECTION_TYPE); + g_ppComboBox[N_mach_sections32_E::CB_flag1] = + createComboBox(ui->tableWidget, XMACH::getSectionAttributesSysS(), SMACH::TYPE_mach_sections, N_mach_sections32_E::flags_1, + XComboBoxEx::CBTYPE_ELIST, XMACH_DEF::S_SECTION_ATTRIBUTES_SYS); + g_ppComboBox[N_mach_sections32_E::CB_flag2] = + createComboBox(ui->tableWidget, XMACH::getSectionAttributesUsrS(), SMACH::TYPE_mach_sections, N_mach_sections32_E::flags_2, + XComboBoxEx::CBTYPE_ELIST, XMACH_DEF::S_SECTION_ATTRIBUTES_USR); + + XMACH_DEF::section section = mach._read_section(nHeaderOffset, bIsBigEndian); + + g_ppLinedEdit[N_mach_sections32_E::sectname]->setStringValue(section.sectname); + g_ppLinedEdit[N_mach_sections32_E::segname]->setStringValue(section.segname); + g_ppLinedEdit[N_mach_sections32_E::addr]->setValue(section.addr); + g_ppLinedEdit[N_mach_sections32_E::size]->setValue(section.size); + g_ppLinedEdit[N_mach_sections32_E::offset]->setValue(section.offset); + g_ppLinedEdit[N_mach_sections32_E::align]->setValue(section.align); + g_ppLinedEdit[N_mach_sections32_E::reloff]->setValue(section.reloff); + g_ppLinedEdit[N_mach_sections32_E::nreloc]->setValue(section.nreloc); + g_ppLinedEdit[N_mach_sections32_E::flags_0]->setValue(section.flags); + g_ppLinedEdit[N_mach_sections32_E::reserved1]->setValue(section.reserved1); + g_ppLinedEdit[N_mach_sections32_E::reserved2]->setValue(section.reserved2); + + g_ppComboBox[N_mach_sections32_E::CB_flag0]->setValue(section.flags); + g_ppComboBox[N_mach_sections32_E::CB_flag1]->setValue(section.flags); + g_ppComboBox[N_mach_sections32_E::CB_flag2]->setValue(section.flags); } qint64 nOffset = nHeaderOffset; qint64 nSize = mach.getSectionHeaderSize(); qint64 nAddress = mach.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, - ui->widgetHex); + loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, ui->widgetHex); blockSignals(false); } else if (nType == SMACH::TYPE_SYMBOLTABLE) { - createHeaderTable( - SMACH::TYPE_SYMBOLTABLE, ui->tableWidget, - bIs64 ? (N_mach_nlist::records64) : (N_mach_nlist::records32), - g_ppLinedEdit, N_mach_nlist::__data_size, getNumber(), - getOffset()); + createHeaderTable(SMACH::TYPE_SYMBOLTABLE, ui->tableWidget, bIs64 ? (N_mach_nlist::records64) : (N_mach_nlist::records32), g_ppLinedEdit, + N_mach_nlist::__data_size, getNumber(), getOffset()); blockSignals(true); @@ -1163,11 +960,8 @@ void MACHSectionHeaderWidget::reloadData() { g_ppLinedEdit[N_mach_nlist::n_desc]->setValue(nlist.n_desc); g_ppLinedEdit[N_mach_nlist::n_value]->setValue(nlist.n_value); - addComment( - ui->tableWidget, N_mach_nlist::n_strx, - HEADER_COLUMN_COMMENT, - mach.getStringFromIndex(osStringTable.nOffset, - osStringTable.nSize, nlist.n_strx)); + addComment(ui->tableWidget, N_mach_nlist::n_strx, HEADER_COLUMN_COMMENT, + mach.getStringFromIndex(osStringTable.nOffset, osStringTable.nSize, nlist.n_strx)); } else { XMACH_DEF::nlist nlist = mach._read_nlist(nHeaderOffset); @@ -1177,11 +971,8 @@ void MACHSectionHeaderWidget::reloadData() { g_ppLinedEdit[N_mach_nlist::n_desc]->setValue(nlist.n_desc); g_ppLinedEdit[N_mach_nlist::n_value]->setValue(nlist.n_value); - addComment( - ui->tableWidget, N_mach_nlist::n_strx, - HEADER_COLUMN_COMMENT, - mach.getStringFromIndex(osStringTable.nOffset, - osStringTable.nSize, nlist.n_strx)); + addComment(ui->tableWidget, N_mach_nlist::n_strx, HEADER_COLUMN_COMMENT, + mach.getStringFromIndex(osStringTable.nOffset, osStringTable.nSize, nlist.n_strx)); } qint64 nOffset = nHeaderOffset; @@ -1195,54 +986,41 @@ void MACHSectionHeaderWidget::reloadData() { qint64 nAddress = mach.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, - ui->widgetHex); + loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, ui->widgetHex); blockSignals(false); } else if (nType == SMACH::TYPE_DICE) { - createHeaderTable(SMACH::TYPE_DICE, ui->tableWidget, - N_mach_data_in_code_entry::records, g_ppLinedEdit, - N_mach_data_in_code_entry::__data_size, + createHeaderTable(SMACH::TYPE_DICE, ui->tableWidget, N_mach_data_in_code_entry::records, g_ppLinedEdit, N_mach_data_in_code_entry::__data_size, getNumber(), getOffset()); - g_ppComboBox[N_mach_data_in_code_entry::CB_kind] = createComboBox( - ui->tableWidget, XMACH::getDICEKindsS(), SMACH::TYPE_DICE, - N_mach_data_in_code_entry::kind, XComboBoxEx::CBTYPE_LIST); + g_ppComboBox[N_mach_data_in_code_entry::CB_kind] = + createComboBox(ui->tableWidget, XMACH::getDICEKindsS(), SMACH::TYPE_DICE, N_mach_data_in_code_entry::kind, XComboBoxEx::CBTYPE_LIST); blockSignals(true); qint64 nHeaderOffset = getOffset(); - XMACH_DEF::data_in_code_entry dice = - mach._read_data_in_code_entry(nHeaderOffset); + XMACH_DEF::data_in_code_entry dice = mach._read_data_in_code_entry(nHeaderOffset); - g_ppLinedEdit[N_mach_data_in_code_entry::offset]->setValue( - dice.offset); - g_ppLinedEdit[N_mach_data_in_code_entry::length]->setValue( - dice.length); + g_ppLinedEdit[N_mach_data_in_code_entry::offset]->setValue(dice.offset); + g_ppLinedEdit[N_mach_data_in_code_entry::length]->setValue(dice.length); g_ppLinedEdit[N_mach_data_in_code_entry::kind]->setValue(dice.kind); - g_ppComboBox[N_mach_data_in_code_entry::CB_kind]->setValue( - dice.kind); + g_ppComboBox[N_mach_data_in_code_entry::CB_kind]->setValue(dice.kind); qint64 nOffset = nHeaderOffset; qint64 nSize = mach.get_data_in_code_entry_size(); qint64 nAddress = mach.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, - ui->widgetHex); + loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, ui->widgetHex); blockSignals(false); } else if (nType == SMACH::TYPE_DYSYMTAB_modtab) { if (bIs64) { - createHeaderTable(SMACH::TYPE_DYSYMTAB_modtab, ui->tableWidget, - N_mach_modtab64::records, g_ppLinedEdit, - N_mach_modtab64::__data_size, getNumber(), - getOffset()); + createHeaderTable(SMACH::TYPE_DYSYMTAB_modtab, ui->tableWidget, N_mach_modtab64::records, g_ppLinedEdit, N_mach_modtab64::__data_size, + getNumber(), getOffset()); } else { - createHeaderTable(SMACH::TYPE_DYSYMTAB_modtab, ui->tableWidget, - N_mach_modtab32::records, g_ppLinedEdit, - N_mach_modtab32::__data_size, getNumber(), - getOffset()); + createHeaderTable(SMACH::TYPE_DYSYMTAB_modtab, ui->tableWidget, N_mach_modtab32::records, g_ppLinedEdit, N_mach_modtab32::__data_size, + getNumber(), getOffset()); } blockSignals(true); @@ -1250,65 +1028,37 @@ void MACHSectionHeaderWidget::reloadData() { qint64 nHeaderOffset = getOffset(); if (bIs64) { - XMACH_DEF::dylib_module_64 record = - mach._read_dylib_module_64(nHeaderOffset); - - g_ppLinedEdit[N_mach_modtab64::module_name]->setValue( - record.module_name); - g_ppLinedEdit[N_mach_modtab64::iextdefsym]->setValue( - record.iextdefsym); - g_ppLinedEdit[N_mach_modtab64::nextdefsym]->setValue( - record.nextdefsym); - g_ppLinedEdit[N_mach_modtab64::irefsym]->setValue( - record.irefsym); - g_ppLinedEdit[N_mach_modtab64::nrefsym]->setValue( - record.nrefsym); - g_ppLinedEdit[N_mach_modtab64::ilocalsym]->setValue( - record.ilocalsym); - g_ppLinedEdit[N_mach_modtab64::nlocalsym]->setValue( - record.nlocalsym); - g_ppLinedEdit[N_mach_modtab64::iextrel]->setValue( - record.iextrel); - g_ppLinedEdit[N_mach_modtab64::nextrel]->setValue( - record.nextrel); - g_ppLinedEdit[N_mach_modtab64::iinit_iterm]->setValue( - record.iinit_iterm); - g_ppLinedEdit[N_mach_modtab64::ninit_nterm]->setValue( - record.ninit_nterm); - g_ppLinedEdit[N_mach_modtab64::objc_module_info_size]->setValue( - record.objc_module_info_size); - g_ppLinedEdit[N_mach_modtab64::objc_module_info_addr]->setValue( - record.objc_module_info_addr); + XMACH_DEF::dylib_module_64 record = mach._read_dylib_module_64(nHeaderOffset); + + g_ppLinedEdit[N_mach_modtab64::module_name]->setValue(record.module_name); + g_ppLinedEdit[N_mach_modtab64::iextdefsym]->setValue(record.iextdefsym); + g_ppLinedEdit[N_mach_modtab64::nextdefsym]->setValue(record.nextdefsym); + g_ppLinedEdit[N_mach_modtab64::irefsym]->setValue(record.irefsym); + g_ppLinedEdit[N_mach_modtab64::nrefsym]->setValue(record.nrefsym); + g_ppLinedEdit[N_mach_modtab64::ilocalsym]->setValue(record.ilocalsym); + g_ppLinedEdit[N_mach_modtab64::nlocalsym]->setValue(record.nlocalsym); + g_ppLinedEdit[N_mach_modtab64::iextrel]->setValue(record.iextrel); + g_ppLinedEdit[N_mach_modtab64::nextrel]->setValue(record.nextrel); + g_ppLinedEdit[N_mach_modtab64::iinit_iterm]->setValue(record.iinit_iterm); + g_ppLinedEdit[N_mach_modtab64::ninit_nterm]->setValue(record.ninit_nterm); + g_ppLinedEdit[N_mach_modtab64::objc_module_info_size]->setValue(record.objc_module_info_size); + g_ppLinedEdit[N_mach_modtab64::objc_module_info_addr]->setValue(record.objc_module_info_addr); } else { - XMACH_DEF::dylib_module record = - mach._read_dylib_module(nHeaderOffset); - - g_ppLinedEdit[N_mach_modtab32::module_name]->setValue( - record.module_name); - g_ppLinedEdit[N_mach_modtab32::iextdefsym]->setValue( - record.iextdefsym); - g_ppLinedEdit[N_mach_modtab32::nextdefsym]->setValue( - record.nextdefsym); - g_ppLinedEdit[N_mach_modtab32::irefsym]->setValue( - record.irefsym); - g_ppLinedEdit[N_mach_modtab32::nrefsym]->setValue( - record.nrefsym); - g_ppLinedEdit[N_mach_modtab32::ilocalsym]->setValue( - record.ilocalsym); - g_ppLinedEdit[N_mach_modtab32::nlocalsym]->setValue( - record.nlocalsym); - g_ppLinedEdit[N_mach_modtab32::iextrel]->setValue( - record.iextrel); - g_ppLinedEdit[N_mach_modtab32::nextrel]->setValue( - record.nextrel); - g_ppLinedEdit[N_mach_modtab32::iinit_iterm]->setValue( - record.iinit_iterm); - g_ppLinedEdit[N_mach_modtab32::ninit_nterm]->setValue( - record.ninit_nterm); - g_ppLinedEdit[N_mach_modtab32::objc_module_info_addr]->setValue( - record.objc_module_info_addr); - g_ppLinedEdit[N_mach_modtab32::objc_module_info_size]->setValue( - record.objc_module_info_size); + XMACH_DEF::dylib_module record = mach._read_dylib_module(nHeaderOffset); + + g_ppLinedEdit[N_mach_modtab32::module_name]->setValue(record.module_name); + g_ppLinedEdit[N_mach_modtab32::iextdefsym]->setValue(record.iextdefsym); + g_ppLinedEdit[N_mach_modtab32::nextdefsym]->setValue(record.nextdefsym); + g_ppLinedEdit[N_mach_modtab32::irefsym]->setValue(record.irefsym); + g_ppLinedEdit[N_mach_modtab32::nrefsym]->setValue(record.nrefsym); + g_ppLinedEdit[N_mach_modtab32::ilocalsym]->setValue(record.ilocalsym); + g_ppLinedEdit[N_mach_modtab32::nlocalsym]->setValue(record.nlocalsym); + g_ppLinedEdit[N_mach_modtab32::iextrel]->setValue(record.iextrel); + g_ppLinedEdit[N_mach_modtab32::nextrel]->setValue(record.nextrel); + g_ppLinedEdit[N_mach_modtab32::iinit_iterm]->setValue(record.iinit_iterm); + g_ppLinedEdit[N_mach_modtab32::ninit_nterm]->setValue(record.ninit_nterm); + g_ppLinedEdit[N_mach_modtab32::objc_module_info_addr]->setValue(record.objc_module_info_addr); + g_ppLinedEdit[N_mach_modtab32::objc_module_info_size]->setValue(record.objc_module_info_size); } qint64 nOffset = nHeaderOffset; @@ -1322,52 +1072,39 @@ void MACHSectionHeaderWidget::reloadData() { qint64 nAddress = mach.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, - ui->widgetHex); + loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, ui->widgetHex); blockSignals(false); } else if (nType == SMACH::TYPE_DYSYMTAB_toc) { - createHeaderTable(SMACH::TYPE_DYSYMTAB_toc, ui->tableWidget, - N_mach_table_of_contents::records, g_ppLinedEdit, - N_mach_table_of_contents::__data_size, - getNumber(), getOffset()); + createHeaderTable(SMACH::TYPE_DYSYMTAB_toc, ui->tableWidget, N_mach_table_of_contents::records, g_ppLinedEdit, + N_mach_table_of_contents::__data_size, getNumber(), getOffset()); blockSignals(true); qint64 nHeaderOffset = getOffset(); - XMACH_DEF::dylib_table_of_contents toc = - mach._read_dylib_table_of_contents(nHeaderOffset); + XMACH_DEF::dylib_table_of_contents toc = mach._read_dylib_table_of_contents(nHeaderOffset); - g_ppLinedEdit[N_mach_table_of_contents::symbol_index]->setValue( - toc.symbol_index); - g_ppLinedEdit[N_mach_table_of_contents::module_index]->setValue( - toc.module_index); + g_ppLinedEdit[N_mach_table_of_contents::symbol_index]->setValue(toc.symbol_index); + g_ppLinedEdit[N_mach_table_of_contents::module_index]->setValue(toc.module_index); - addComment(ui->tableWidget, N_mach_table_of_contents::symbol_index, - HEADER_COLUMN_COMMENT, - mach.getIndexSymbolName(toc.symbol_index)); + addComment(ui->tableWidget, N_mach_table_of_contents::symbol_index, HEADER_COLUMN_COMMENT, mach.getIndexSymbolName(toc.symbol_index)); qint64 nOffset = nHeaderOffset; qint64 nSize = mach.get_dylib_table_of_contents_size(); qint64 nAddress = mach.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, - ui->widgetHex); + loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, ui->widgetHex); blockSignals(false); - } else if ((nType == SMACH::TYPE_DYSYMTAB_extrel) || - (nType == SMACH::TYPE_DYSYMTAB_locrel)) { - createHeaderTable(nType, ui->tableWidget, N_mach_relocs::records, - g_ppLinedEdit, N_mach_relocs::__data_size, - getNumber(), getOffset()); + } else if ((nType == SMACH::TYPE_DYSYMTAB_extrel) || (nType == SMACH::TYPE_DYSYMTAB_locrel)) { + createHeaderTable(nType, ui->tableWidget, N_mach_relocs::records, g_ppLinedEdit, N_mach_relocs::__data_size, getNumber(), getOffset()); blockSignals(true); qint64 nHeaderOffset = getOffset(); - XMACH_DEF::relocation_info reloc = - mach._read_relocation_info(nHeaderOffset); + XMACH_DEF::relocation_info reloc = mach._read_relocation_info(nHeaderOffset); g_ppLinedEdit[N_mach_relocs::r_address]->setValue(reloc.r_address); g_ppLinedEdit[N_mach_relocs::value]->setValue(reloc.s.value); @@ -1376,38 +1113,30 @@ void MACHSectionHeaderWidget::reloadData() { qint64 nSize = mach.get_relocation_info_size(); qint64 nAddress = mach.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, - ui->widgetHex); + loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, ui->widgetHex); blockSignals(false); - } else if ((nType == SMACH::TYPE_DYSYMTAB_indirectsyms) || - (nType == SMACH::TYPE_DYSYMTAB_extrefsyms)) { - createHeaderTable(SMACH::TYPE_DYSYMTAB_indirectsyms, - ui->tableWidget, N_mach_value::records, - g_ppLinedEdit, N_mach_value::__data_size, - getNumber(), getOffset()); + } else if ((nType == SMACH::TYPE_DYSYMTAB_indirectsyms) || (nType == SMACH::TYPE_DYSYMTAB_extrefsyms)) { + createHeaderTable(SMACH::TYPE_DYSYMTAB_indirectsyms, ui->tableWidget, N_mach_value::records, g_ppLinedEdit, N_mach_value::__data_size, getNumber(), + getOffset()); blockSignals(true); qint64 nHeaderOffset = getOffset(); - quint32 nValue = - mach.read_uint32(nHeaderOffset, mach.isBigEndian()); + quint32 nValue = mach.read_uint32(nHeaderOffset, mach.isBigEndian()); g_ppLinedEdit[N_mach_value::value]->setValue(nValue); if (nType == SMACH::TYPE_DYSYMTAB_indirectsyms) { - addComment(ui->tableWidget, N_mach_value::value, - HEADER_COLUMN_COMMENT, - mach.getIndexSymbolName(nValue)); + addComment(ui->tableWidget, N_mach_value::value, HEADER_COLUMN_COMMENT, mach.getIndexSymbolName(nValue)); } qint64 nOffset = nHeaderOffset; qint64 nSize = mach.get_value32_size(); qint64 nAddress = mach.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, - ui->widgetHex); + loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, ui->widgetHex); blockSignals(false); } @@ -1428,8 +1157,7 @@ void MACHSectionHeaderWidget::widgetValueChanged(quint64 nValue) { case SMACH::TYPE_mach_commands: switch (nNdata) { case N_mach_commands::cmd: - g_ppLinedEdit[N_mach_commands::cmd]->setValue( - (quint32)nValue); + g_ppLinedEdit[N_mach_commands::cmd]->setValue((quint32)nValue); break; } break; @@ -1437,12 +1165,10 @@ void MACHSectionHeaderWidget::widgetValueChanged(quint64 nValue) { case SMACH::TYPE_mach_segments: switch (nNdata) { case N_mach_segments::initprot: - g_ppLinedEdit[N_mach_segments::initprot]->setValue( - (quint32)nValue); + g_ppLinedEdit[N_mach_segments::initprot]->setValue((quint32)nValue); break; case N_mach_segments::maxprot: - g_ppLinedEdit[N_mach_segments::maxprot]->setValue( - (quint32)nValue); + g_ppLinedEdit[N_mach_segments::maxprot]->setValue((quint32)nValue); break; } break; @@ -1450,8 +1176,7 @@ void MACHSectionHeaderWidget::widgetValueChanged(quint64 nValue) { case SMACH::TYPE_DICE: switch (nNdata) { case N_mach_data_in_code_entry::kind: - g_ppLinedEdit[N_mach_data_in_code_entry::kind] - ->setValue(nValue); + g_ppLinedEdit[N_mach_data_in_code_entry::kind]->setValue(nValue); break; } @@ -1464,14 +1189,10 @@ void MACHSectionHeaderWidget::widgetValueChanged(quint64 nValue) { case N_mach_sections64_E::flags_0: case N_mach_sections64_E::flags_1: case N_mach_sections64_E::flags_2: - g_ppLinedEdit[N_mach_sections64_E::flags_0] - ->setValue((quint32)nValue); - g_ppComboBox[N_mach_sections64_E::CB_flag0] - ->setValue(nValue); - g_ppComboBox[N_mach_sections64_E::CB_flag1] - ->setValue(nValue); - g_ppComboBox[N_mach_sections64_E::CB_flag2] - ->setValue(nValue); + g_ppLinedEdit[N_mach_sections64_E::flags_0]->setValue((quint32)nValue); + g_ppComboBox[N_mach_sections64_E::CB_flag0]->setValue(nValue); + g_ppComboBox[N_mach_sections64_E::CB_flag1]->setValue(nValue); + g_ppComboBox[N_mach_sections64_E::CB_flag2]->setValue(nValue); break; } } else { @@ -1479,14 +1200,10 @@ void MACHSectionHeaderWidget::widgetValueChanged(quint64 nValue) { case N_mach_sections32_E::flags_0: case N_mach_sections32_E::flags_1: case N_mach_sections32_E::flags_2: - g_ppLinedEdit[N_mach_sections32_E::flags_0] - ->setValue((quint32)nValue); - g_ppComboBox[N_mach_sections32_E::CB_flag0] - ->setValue(nValue); - g_ppComboBox[N_mach_sections32_E::CB_flag1] - ->setValue(nValue); - g_ppComboBox[N_mach_sections32_E::CB_flag2] - ->setValue(nValue); + g_ppLinedEdit[N_mach_sections32_E::flags_0]->setValue((quint32)nValue); + g_ppComboBox[N_mach_sections32_E::CB_flag0]->setValue(nValue); + g_ppComboBox[N_mach_sections32_E::CB_flag1]->setValue(nValue); + g_ppComboBox[N_mach_sections32_E::CB_flag2]->setValue(nValue); break; } } @@ -1496,9 +1213,7 @@ void MACHSectionHeaderWidget::widgetValueChanged(quint64 nValue) { } } -void MACHSectionHeaderWidget::on_tableWidget_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void MACHSectionHeaderWidget::on_tableWidget_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow) Q_UNUSED(nCurrentColumn) Q_UNUSED(nPreviousRow) diff --git a/MACH/machsectionheaderwidget.h b/MACH/machsectionheaderwidget.h index 6e974b37..478d84b6 100644 --- a/MACH/machsectionheaderwidget.h +++ b/MACH/machsectionheaderwidget.h @@ -31,33 +31,28 @@ class MACHSectionHeaderWidget; class MACHSectionHeaderWidget : public FormatWidget { Q_OBJECT - public: +public: MACHSectionHeaderWidget(QWidget *pParent = nullptr); - MACHSectionHeaderWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, - quint32 nNumber, qint64 nOffset, qint32 nType, - QWidget *pParent = nullptr); + MACHSectionHeaderWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, quint32 nNumber, qint64 nOffset, qint32 nType, QWidget *pParent = nullptr); ~MACHSectionHeaderWidget(); virtual void clear(); virtual void cleanup(); virtual void reload(); virtual void setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions); - protected: - virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, - int nPosition, qint64 nOffset); +protected: + virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset); virtual void setReadonly(bool bState); virtual void blockSignals(bool bState); virtual void adjustHeaderTable(int nType, QTableWidget *pTableWidget); - private slots: +private slots: void on_checkBoxReadonly_toggled(bool bChecked); void reloadData(); void widgetValueChanged(quint64 nValue); - void on_tableWidget_currentCellChanged(int nCurrentRow, int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); + void on_tableWidget_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); - private: +private: Ui::MACHSectionHeaderWidget *ui; XLineEditHEX **g_ppLinedEdit; int g_nLineEditSize; diff --git a/MACH/machwidget.cpp b/MACH/machwidget.cpp index e0dac7f5..95e15858 100644 --- a/MACH/machwidget.cpp +++ b/MACH/machwidget.cpp @@ -22,8 +22,7 @@ #include "ui_machwidget.h" -MACHWidget::MACHWidget(QWidget *pParent) - : FormatWidget(pParent), ui(new Ui::MACHWidget) { +MACHWidget::MACHWidget(QWidget *pParent) : FormatWidget(pParent), ui(new Ui::MACHWidget) { ui->setupUi(this); memset(g_subDevice, 0, sizeof g_subDevice); @@ -31,60 +30,46 @@ MACHWidget::MACHWidget(QWidget *pParent) initWidget(); } -MACHWidget::MACHWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, - QWidget *pParent) - : MACHWidget(pParent) { +MACHWidget::MACHWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, QWidget *pParent) : MACHWidget(pParent) { MACHWidget::setData(pDevice, options, 0, 0, 0); MACHWidget::reload(); } -MACHWidget::~MACHWidget() { delete ui; } +MACHWidget::~MACHWidget() { + delete ui; +} void MACHWidget::clear() { MACHWidget::reset(); memset(g_lineEdit_mach_header, 0, sizeof g_lineEdit_mach_header); - memset(g_lineEdit_mach_dyld_info_only, 0, - sizeof g_lineEdit_mach_dyld_info_only); + memset(g_lineEdit_mach_dyld_info_only, 0, sizeof g_lineEdit_mach_dyld_info_only); memset(g_lineEdit_mach_uuid, 0, sizeof g_lineEdit_mach_uuid); memset(g_lineEdit_mach_dylinker, 0, sizeof g_lineEdit_mach_dylinker); memset(g_lineEdit_mach_rpath, 0, sizeof g_lineEdit_mach_rpath); memset(g_lineEdit_mach_symtab, 0, sizeof g_lineEdit_mach_symtab); memset(g_lineEdit_mach_dysymtab, 0, sizeof g_lineEdit_mach_dysymtab); memset(g_lineEdit_mach_version_min, 0, sizeof g_lineEdit_mach_version_min); - memset(g_lineEdit_mach_build_version, 0, - sizeof g_lineEdit_mach_build_version); - memset(g_lineEdit_mach_source_version, 0, - sizeof g_lineEdit_mach_source_version); - memset(g_lineEdit_mach_encryption_info, 0, - sizeof g_lineEdit_mach_encryption_info); - memset(g_lineEdit_mach_function_starts, 0, - sizeof g_lineEdit_mach_function_starts); - memset(g_lineEdit_mach_data_in_code, 0, - sizeof g_lineEdit_mach_data_in_code); - memset(g_lineEdit_mach_code_signature, 0, - sizeof g_lineEdit_mach_code_signature); + memset(g_lineEdit_mach_build_version, 0, sizeof g_lineEdit_mach_build_version); + memset(g_lineEdit_mach_source_version, 0, sizeof g_lineEdit_mach_source_version); + memset(g_lineEdit_mach_encryption_info, 0, sizeof g_lineEdit_mach_encryption_info); + memset(g_lineEdit_mach_function_starts, 0, sizeof g_lineEdit_mach_function_starts); + memset(g_lineEdit_mach_data_in_code, 0, sizeof g_lineEdit_mach_data_in_code); + memset(g_lineEdit_mach_code_signature, 0, sizeof g_lineEdit_mach_code_signature); memset(g_lineEdit_mach_SuperBlob, 0, sizeof g_lineEdit_mach_SuperBlob); memset(g_lineEdit_mach_main, 0, sizeof g_lineEdit_mach_main); memset(g_lineEdit_mach_unix_thread, 0, sizeof g_lineEdit_mach_unix_thread); - memset(g_lineEdit_mach_unix_thread_x86_32, 0, - sizeof g_lineEdit_mach_unix_thread_x86_32); - memset(g_lineEdit_mach_unix_thread_x86_64, 0, - sizeof g_lineEdit_mach_unix_thread_x86_64); - memset(g_lineEdit_mach_unix_thread_arm_32, 0, - sizeof g_lineEdit_mach_unix_thread_arm_32); - memset(g_lineEdit_mach_unix_thread_arm_64, 0, - sizeof g_lineEdit_mach_unix_thread_arm_64); - memset(g_lineEdit_mach_unix_thread_m68k_32, 0, - sizeof g_lineEdit_mach_unix_thread_m68k_32); - memset(g_lineEdit_mach_unix_thread_ppc_32, 0, - sizeof g_lineEdit_mach_unix_thread_ppc_32); + memset(g_lineEdit_mach_unix_thread_x86_32, 0, sizeof g_lineEdit_mach_unix_thread_x86_32); + memset(g_lineEdit_mach_unix_thread_x86_64, 0, sizeof g_lineEdit_mach_unix_thread_x86_64); + memset(g_lineEdit_mach_unix_thread_arm_32, 0, sizeof g_lineEdit_mach_unix_thread_arm_32); + memset(g_lineEdit_mach_unix_thread_arm_64, 0, sizeof g_lineEdit_mach_unix_thread_arm_64); + memset(g_lineEdit_mach_unix_thread_m68k_32, 0, sizeof g_lineEdit_mach_unix_thread_m68k_32); + memset(g_lineEdit_mach_unix_thread_ppc_32, 0, sizeof g_lineEdit_mach_unix_thread_ppc_32); memset(g_comboBox, 0, sizeof g_comboBox); memset(g_invWidget, 0, sizeof g_invWidget); - _deleteSubdevices(g_subDevice, - (sizeof g_subDevice) / (sizeof(SubDevice *))); + _deleteSubdevices(g_subDevice, (sizeof g_subDevice) / (sizeof(SubDevice *))); resetWidget(); @@ -93,7 +78,9 @@ void MACHWidget::clear() { ui->treeWidgetNavi->clear(); } -void MACHWidget::cleanup() { MACHWidget::clear(); } +void MACHWidget::cleanup() { + MACHWidget::clear(); +} void MACHWidget::reload() { MACHWidget::clear(); @@ -105,486 +92,338 @@ void MACHWidget::reload() { if (mach.isValid()) { setFileType(mach.getFileType()); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SMACH::TYPE_INFO, tr("Info"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SMACH::TYPE_VIRUSTOTAL, "VirusTotal")); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SMACH::TYPE_HEX, tr("Hex"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SMACH::TYPE_DISASM, tr("Disasm"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SMACH::TYPE_HASH, tr("Hash"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SMACH::TYPE_STRINGS, tr("Strings"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SMACH::TYPE_SIGNATURES, tr("Signatures"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SMACH::TYPE_MEMORYMAP, tr("Memory map"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SMACH::TYPE_ENTROPY, tr("Entropy"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SMACH::TYPE_HEURISTICSCAN, tr("Heuristic scan"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SMACH::TYPE_mach_header, - mach.is64() ? ("mach_header_64") : ("mach_header"))); - - QList listCommandRecords = - mach.getCommandRecords(); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SMACH::TYPE_INFO, tr("Info"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SMACH::TYPE_VIRUSTOTAL, "VirusTotal")); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SMACH::TYPE_HEX, tr("Hex"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SMACH::TYPE_DISASM, tr("Disasm"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SMACH::TYPE_HASH, tr("Hash"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SMACH::TYPE_STRINGS, tr("Strings"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SMACH::TYPE_SIGNATURES, tr("Signatures"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SMACH::TYPE_MEMORYMAP, tr("Memory map"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SMACH::TYPE_ENTROPY, tr("Entropy"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SMACH::TYPE_HEURISTICSCAN, tr("Heuristic scan"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SMACH::TYPE_mach_header, mach.is64() ? ("mach_header_64") : ("mach_header"))); + + QList listCommandRecords = mach.getCommandRecords(); if (listCommandRecords.count()) { - QTreeWidgetItem *pItemCommands = - createNewItem(SMACH::TYPE_mach_commands, tr("Commands")); + QTreeWidgetItem *pItemCommands = createNewItem(SMACH::TYPE_mach_commands, tr("Commands")); ui->treeWidgetNavi->addTopLevelItem(pItemCommands); - QList listSegmentRecords = - mach.getSegmentRecords(&listCommandRecords); + QList listSegmentRecords = mach.getSegmentRecords(&listCommandRecords); if (listSegmentRecords.count()) { - QTreeWidgetItem *pItemSegments = createNewItem( - SMACH::TYPE_mach_segments, tr("Segments")); // TODO rename + QTreeWidgetItem *pItemSegments = createNewItem(SMACH::TYPE_mach_segments, tr("Segments")); // TODO rename pItemCommands->addChild(pItemSegments); - QList listSectionRecords = - mach.getSectionRecords(&listCommandRecords); + QList listSectionRecords = mach.getSectionRecords(&listCommandRecords); if (listSectionRecords.count()) { - QTreeWidgetItem *pItemSections = - createNewItem(SMACH::TYPE_mach_sections, - tr("Sections")); // TODO rename + QTreeWidgetItem *pItemSections = createNewItem(SMACH::TYPE_mach_sections, + tr("Sections")); // TODO rename pItemSegments->addChild(pItemSections); } } - if (mach.isCommandPresent(XMACH_DEF::S_LC_ID_DYLIB, - &listCommandRecords)) { - QTreeWidgetItem *pItemIdDylib = createNewItem( - SMACH::TYPE_mach_id_library, QString("LC_ID_DYLIB")); + if (mach.isCommandPresent(XMACH_DEF::S_LC_ID_DYLIB, &listCommandRecords)) { + QTreeWidgetItem *pItemIdDylib = createNewItem(SMACH::TYPE_mach_id_library, QString("LC_ID_DYLIB")); pItemCommands->addChild(pItemIdDylib); } - if (mach.isCommandPresent(XMACH_DEF::S_LC_LOAD_DYLIB, - &listCommandRecords)) { - QTreeWidgetItem *pItemLoadDylib = createNewItem( - SMACH::TYPE_mach_libraries, QString("LC_LOAD_DYLIB")); + if (mach.isCommandPresent(XMACH_DEF::S_LC_LOAD_DYLIB, &listCommandRecords)) { + QTreeWidgetItem *pItemLoadDylib = createNewItem(SMACH::TYPE_mach_libraries, QString("LC_LOAD_DYLIB")); pItemCommands->addChild(pItemLoadDylib); } - if (mach.isCommandPresent(XMACH_DEF::S_LC_LOADFVMLIB, - &listCommandRecords)) { - QTreeWidgetItem *pLoadFVMLib = createNewItem( - SMACH::TYPE_mach_LOADFVMLIB, QString("LC_LOADFVMLIB")); + if (mach.isCommandPresent(XMACH_DEF::S_LC_LOADFVMLIB, &listCommandRecords)) { + QTreeWidgetItem *pLoadFVMLib = createNewItem(SMACH::TYPE_mach_LOADFVMLIB, QString("LC_LOADFVMLIB")); pItemCommands->addChild(pLoadFVMLib); } - if (mach.isCommandPresent(XMACH_DEF::S_LC_IDFVMLIB, - &listCommandRecords)) { - QTreeWidgetItem *pIdFMVLib = createNewItem( - SMACH::TYPE_mach_IDFVMLIB, QString("LC_IDFVMLIB")); + if (mach.isCommandPresent(XMACH_DEF::S_LC_IDFVMLIB, &listCommandRecords)) { + QTreeWidgetItem *pIdFMVLib = createNewItem(SMACH::TYPE_mach_IDFVMLIB, QString("LC_IDFVMLIB")); pItemCommands->addChild(pIdFMVLib); } - if (mach.isCommandPresent(XMACH_DEF::S_LC_LOAD_WEAK_DYLIB, - &listCommandRecords)) { - QTreeWidgetItem *pItemLibraries = - createNewItem(SMACH::TYPE_mach_weak_libraries, - QString("LC_LOAD_WEAK_DYLIB")); + if (mach.isCommandPresent(XMACH_DEF::S_LC_LOAD_WEAK_DYLIB, &listCommandRecords)) { + QTreeWidgetItem *pItemLibraries = createNewItem(SMACH::TYPE_mach_weak_libraries, QString("LC_LOAD_WEAK_DYLIB")); pItemCommands->addChild(pItemLibraries); } - if (mach.isCommandPresent(XMACH_DEF::S_LC_DYLD_INFO_ONLY, - &listCommandRecords)) { - qint64 _nOffset = mach.getCommandRecordOffset( - XMACH_DEF::S_LC_DYLD_INFO_ONLY, 0, &listCommandRecords); + if (mach.isCommandPresent(XMACH_DEF::S_LC_DYLD_INFO_ONLY, &listCommandRecords)) { + qint64 _nOffset = mach.getCommandRecordOffset(XMACH_DEF::S_LC_DYLD_INFO_ONLY, 0, &listCommandRecords); - QTreeWidgetItem *pItemDyldInfo = createNewItem( - SMACH::TYPE_mach_dyld_info_only, - QString("LC_DYLD_INFO_ONLY"), _nOffset); // TODO rename + QTreeWidgetItem *pItemDyldInfo = createNewItem(SMACH::TYPE_mach_dyld_info_only, QString("LC_DYLD_INFO_ONLY"), _nOffset); // TODO rename pItemCommands->addChild(pItemDyldInfo); - XMACH_DEF::dyld_info_command dyld_info = - mach._read_dyld_info_command(_nOffset); + XMACH_DEF::dyld_info_command dyld_info = mach._read_dyld_info_command(_nOffset); - if (mach.isOffsetValid(dyld_info.rebase_off) && - (dyld_info.rebase_size)) { - QTreeWidgetItem *pItem = - createNewItem(SMACH::TYPE_DYLD_INFO_rebase, - tr("Rebase"), dyld_info.rebase_off, - dyld_info.rebase_size); // TODO rename + if (mach.isOffsetValid(dyld_info.rebase_off) && (dyld_info.rebase_size)) { + QTreeWidgetItem *pItem = createNewItem(SMACH::TYPE_DYLD_INFO_rebase, tr("Rebase"), dyld_info.rebase_off, + dyld_info.rebase_size); // TODO rename pItemDyldInfo->addChild(pItem); } - if (mach.isOffsetValid(dyld_info.bind_off) && - (dyld_info.bind_size)) { - QTreeWidgetItem *pItem = - createNewItem(SMACH::TYPE_DYLD_INFO_bind, tr("Binding"), - dyld_info.bind_off, - dyld_info.bind_size); // TODO rename + if (mach.isOffsetValid(dyld_info.bind_off) && (dyld_info.bind_size)) { + QTreeWidgetItem *pItem = createNewItem(SMACH::TYPE_DYLD_INFO_bind, tr("Binding"), dyld_info.bind_off, + dyld_info.bind_size); // TODO rename pItemDyldInfo->addChild(pItem); } - if (mach.isOffsetValid(dyld_info.weak_bind_off) && - (dyld_info.weak_bind_size)) { - QTreeWidgetItem *pItem = createNewItem( - SMACH::TYPE_DYLD_INFO_weak_bind, tr("Weak binding"), - dyld_info.weak_bind_off, - dyld_info.weak_bind_size); // TODO rename + if (mach.isOffsetValid(dyld_info.weak_bind_off) && (dyld_info.weak_bind_size)) { + QTreeWidgetItem *pItem = createNewItem(SMACH::TYPE_DYLD_INFO_weak_bind, tr("Weak binding"), dyld_info.weak_bind_off, + dyld_info.weak_bind_size); // TODO rename pItemDyldInfo->addChild(pItem); } - if (mach.isOffsetValid(dyld_info.lazy_bind_off) && - (dyld_info.lazy_bind_size)) { - QTreeWidgetItem *pItem = createNewItem( - SMACH::TYPE_DYLD_INFO_lazy_bind, tr("Lazy binding"), - dyld_info.lazy_bind_off, - dyld_info.lazy_bind_size); // TODO rename + if (mach.isOffsetValid(dyld_info.lazy_bind_off) && (dyld_info.lazy_bind_size)) { + QTreeWidgetItem *pItem = createNewItem(SMACH::TYPE_DYLD_INFO_lazy_bind, tr("Lazy binding"), dyld_info.lazy_bind_off, + dyld_info.lazy_bind_size); // TODO rename pItemDyldInfo->addChild(pItem); } - if (mach.isOffsetValid(dyld_info.export_off) && - (dyld_info.export_size)) { - QTreeWidgetItem *pItem = - createNewItem(SMACH::TYPE_DYLD_INFO_export, - tr("Export"), dyld_info.export_off, - dyld_info.export_size); // TODO rename + if (mach.isOffsetValid(dyld_info.export_off) && (dyld_info.export_size)) { + QTreeWidgetItem *pItem = createNewItem(SMACH::TYPE_DYLD_INFO_export, tr("Export"), dyld_info.export_off, + dyld_info.export_size); // TODO rename pItemDyldInfo->addChild(pItem); } } - if (mach.isCommandPresent(XMACH_DEF::S_LC_UUID, - &listCommandRecords)) { - QTreeWidgetItem *pItemUuid = - createNewItem(SMACH::TYPE_mach_uuid, QString("LC_UUID"), - mach.getCommandRecordOffset( - XMACH_DEF::S_LC_UUID, 0, - &listCommandRecords)); // TODO rename + if (mach.isCommandPresent(XMACH_DEF::S_LC_UUID, &listCommandRecords)) { + QTreeWidgetItem *pItemUuid = createNewItem(SMACH::TYPE_mach_uuid, QString("LC_UUID"), + mach.getCommandRecordOffset(XMACH_DEF::S_LC_UUID, 0, + &listCommandRecords)); // TODO rename pItemCommands->addChild(pItemUuid); } - if (mach.isCommandPresent(XMACH_DEF::S_LC_SYMTAB, - &listCommandRecords)) { - qint64 _nOffset = mach.getCommandRecordOffset( - XMACH_DEF::S_LC_SYMTAB, 0, &listCommandRecords); + if (mach.isCommandPresent(XMACH_DEF::S_LC_SYMTAB, &listCommandRecords)) { + qint64 _nOffset = mach.getCommandRecordOffset(XMACH_DEF::S_LC_SYMTAB, 0, &listCommandRecords); - QTreeWidgetItem *pItemSymtab = - createNewItem(SMACH::TYPE_mach_symtab, QString("LC_SYMTAB"), - _nOffset); // TODO rename + QTreeWidgetItem *pItemSymtab = createNewItem(SMACH::TYPE_mach_symtab, QString("LC_SYMTAB"), + _nOffset); // TODO rename pItemCommands->addChild(pItemSymtab); - XMACH_DEF::symtab_command symtab = - mach._read_symtab_command(_nOffset); + XMACH_DEF::symtab_command symtab = mach._read_symtab_command(_nOffset); if (mach.isOffsetValid(symtab.stroff) && (symtab.strsize)) { - QTreeWidgetItem *pItem = createNewItem( - SMACH::TYPE_STRINGTABLE, tr("String table"), - symtab.stroff, symtab.strsize); // TODO rename + QTreeWidgetItem *pItem = createNewItem(SMACH::TYPE_STRINGTABLE, tr("String table"), symtab.stroff, symtab.strsize); // TODO rename pItemSymtab->addChild(pItem); } if (mach.isOffsetValid(symtab.symoff) && (symtab.nsyms)) { - QTreeWidgetItem *pItem = createNewItem( - SMACH::TYPE_SYMBOLTABLE, tr("Symbol table"), - symtab.symoff, symtab.nsyms); // TODO rename + QTreeWidgetItem *pItem = createNewItem(SMACH::TYPE_SYMBOLTABLE, tr("Symbol table"), symtab.symoff, symtab.nsyms); // TODO rename pItemSymtab->addChild(pItem); } } - if (mach.isCommandPresent(XMACH_DEF::S_LC_DYSYMTAB, - &listCommandRecords)) { - qint64 _nOffset = mach.getCommandRecordOffset( - XMACH_DEF::S_LC_DYSYMTAB, 0, &listCommandRecords); + if (mach.isCommandPresent(XMACH_DEF::S_LC_DYSYMTAB, &listCommandRecords)) { + qint64 _nOffset = mach.getCommandRecordOffset(XMACH_DEF::S_LC_DYSYMTAB, 0, &listCommandRecords); - QTreeWidgetItem *pItemDysymtab = createNewItem( - SMACH::TYPE_mach_dysymtab, QString("LC_DYSYMTAB"), - _nOffset); // TODO rename + QTreeWidgetItem *pItemDysymtab = createNewItem(SMACH::TYPE_mach_dysymtab, QString("LC_DYSYMTAB"), + _nOffset); // TODO rename pItemCommands->addChild(pItemDysymtab); - XMACH_DEF::dysymtab_command dysymtab = - mach._read_dysymtab_command(_nOffset); + XMACH_DEF::dysymtab_command dysymtab = mach._read_dysymtab_command(_nOffset); if (mach.isOffsetValid(dysymtab.tocoff) && (dysymtab.ntoc)) { - QTreeWidgetItem *pItem = createNewItem( - SMACH::TYPE_DYSYMTAB_toc, tr("Table of contents"), - dysymtab.tocoff, dysymtab.ntoc); // TODO rename + QTreeWidgetItem *pItem = createNewItem(SMACH::TYPE_DYSYMTAB_toc, tr("Table of contents"), dysymtab.tocoff, dysymtab.ntoc); // TODO rename pItemDysymtab->addChild(pItem); } - if (mach.isOffsetValid(dysymtab.modtaboff) && - (dysymtab.nmodtab)) { - QTreeWidgetItem *pItem = createNewItem( - SMACH::TYPE_DYSYMTAB_modtab, tr("Modules"), - dysymtab.modtaboff, dysymtab.nmodtab); // TODO rename + if (mach.isOffsetValid(dysymtab.modtaboff) && (dysymtab.nmodtab)) { + QTreeWidgetItem *pItem = createNewItem(SMACH::TYPE_DYSYMTAB_modtab, tr("Modules"), dysymtab.modtaboff, dysymtab.nmodtab); // TODO rename pItemDysymtab->addChild(pItem); } - if (mach.isOffsetValid(dysymtab.extrefsymoff) && - (dysymtab.nextrefsyms)) { - QTreeWidgetItem *pItem = createNewItem( - SMACH::TYPE_DYSYMTAB_extrefsyms, - tr("External references"), dysymtab.extrefsymoff, - dysymtab.nextrefsyms); // TODO rename + if (mach.isOffsetValid(dysymtab.extrefsymoff) && (dysymtab.nextrefsyms)) { + QTreeWidgetItem *pItem = createNewItem(SMACH::TYPE_DYSYMTAB_extrefsyms, tr("External references"), dysymtab.extrefsymoff, + dysymtab.nextrefsyms); // TODO rename pItemDysymtab->addChild(pItem); } - if (mach.isOffsetValid(dysymtab.indirectsymoff) && - (dysymtab.nindirectsyms)) { - QTreeWidgetItem *pItem = createNewItem( - SMACH::TYPE_DYSYMTAB_indirectsyms, - tr("Indirect symbols"), dysymtab.indirectsymoff, - dysymtab.nindirectsyms); // TODO rename + if (mach.isOffsetValid(dysymtab.indirectsymoff) && (dysymtab.nindirectsyms)) { + QTreeWidgetItem *pItem = createNewItem(SMACH::TYPE_DYSYMTAB_indirectsyms, tr("Indirect symbols"), dysymtab.indirectsymoff, + dysymtab.nindirectsyms); // TODO rename pItemDysymtab->addChild(pItem); } - if (mach.isOffsetValid(dysymtab.extreloff) && - (dysymtab.nextrel)) { - QTreeWidgetItem *pItem = createNewItem( - SMACH::TYPE_DYSYMTAB_extrel, - QString("External relocation"), dysymtab.extreloff, - dysymtab.nextrel); // TODO rename + if (mach.isOffsetValid(dysymtab.extreloff) && (dysymtab.nextrel)) { + QTreeWidgetItem *pItem = createNewItem(SMACH::TYPE_DYSYMTAB_extrel, QString("External relocation"), dysymtab.extreloff, + dysymtab.nextrel); // TODO rename pItemDysymtab->addChild(pItem); } - if (mach.isOffsetValid(dysymtab.locreloff) && - (dysymtab.nlocrel)) { - QTreeWidgetItem *pItem = createNewItem( - SMACH::TYPE_DYSYMTAB_locrel, tr("Local relocation"), - dysymtab.locreloff, dysymtab.nlocrel); // TODO rename + if (mach.isOffsetValid(dysymtab.locreloff) && (dysymtab.nlocrel)) { + QTreeWidgetItem *pItem = + createNewItem(SMACH::TYPE_DYSYMTAB_locrel, tr("Local relocation"), dysymtab.locreloff, dysymtab.nlocrel); // TODO rename pItemDysymtab->addChild(pItem); } } - if (mach.isCommandPresent(XMACH_DEF::S_LC_VERSION_MIN_MACOSX, - &listCommandRecords)) { - QTreeWidgetItem *pItemVersionMin = - createNewItem(SMACH::TYPE_mach_version_min, - QString("LC_VERSION_MIN_MACOSX"), - mach.getCommandRecordOffset( - XMACH_DEF::S_LC_VERSION_MIN_MACOSX, 0, - &listCommandRecords)); // TODO rename + if (mach.isCommandPresent(XMACH_DEF::S_LC_VERSION_MIN_MACOSX, &listCommandRecords)) { + QTreeWidgetItem *pItemVersionMin = createNewItem(SMACH::TYPE_mach_version_min, QString("LC_VERSION_MIN_MACOSX"), + mach.getCommandRecordOffset(XMACH_DEF::S_LC_VERSION_MIN_MACOSX, 0, + &listCommandRecords)); // TODO rename pItemCommands->addChild(pItemVersionMin); - } else if (mach.isCommandPresent( - XMACH_DEF::S_LC_VERSION_MIN_IPHONEOS, - &listCommandRecords)) { - QTreeWidgetItem *pItemVersionMin = - createNewItem(SMACH::TYPE_mach_version_min, - QString("LC_VERSION_MIN_IPHONEOS"), - mach.getCommandRecordOffset( - XMACH_DEF::S_LC_VERSION_MIN_IPHONEOS, 0, - &listCommandRecords)); // TODO rename + } else if (mach.isCommandPresent(XMACH_DEF::S_LC_VERSION_MIN_IPHONEOS, &listCommandRecords)) { + QTreeWidgetItem *pItemVersionMin = createNewItem(SMACH::TYPE_mach_version_min, QString("LC_VERSION_MIN_IPHONEOS"), + mach.getCommandRecordOffset(XMACH_DEF::S_LC_VERSION_MIN_IPHONEOS, 0, + &listCommandRecords)); // TODO rename pItemCommands->addChild(pItemVersionMin); - } else if (mach.isCommandPresent(XMACH_DEF::S_LC_VERSION_MIN_TVOS, - &listCommandRecords)) { - QTreeWidgetItem *pItemVersionMin = - createNewItem(SMACH::TYPE_mach_version_min, - QString("LC_VERSION_MIN_TVOS"), - mach.getCommandRecordOffset( - XMACH_DEF::S_LC_VERSION_MIN_TVOS, 0, - &listCommandRecords)); // TODO rename + } else if (mach.isCommandPresent(XMACH_DEF::S_LC_VERSION_MIN_TVOS, &listCommandRecords)) { + QTreeWidgetItem *pItemVersionMin = createNewItem(SMACH::TYPE_mach_version_min, QString("LC_VERSION_MIN_TVOS"), + mach.getCommandRecordOffset(XMACH_DEF::S_LC_VERSION_MIN_TVOS, 0, + &listCommandRecords)); // TODO rename pItemCommands->addChild(pItemVersionMin); - } else if (mach.isCommandPresent( - XMACH_DEF::S_LC_VERSION_MIN_WATCHOS, - &listCommandRecords)) { - QTreeWidgetItem *pItemVersionMin = - createNewItem(SMACH::TYPE_mach_version_min, - QString("LC_VERSION_MIN_WATCHOS"), - mach.getCommandRecordOffset( - XMACH_DEF::S_LC_VERSION_MIN_WATCHOS, 0, - &listCommandRecords)); // TODO rename + } else if (mach.isCommandPresent(XMACH_DEF::S_LC_VERSION_MIN_WATCHOS, &listCommandRecords)) { + QTreeWidgetItem *pItemVersionMin = createNewItem(SMACH::TYPE_mach_version_min, QString("LC_VERSION_MIN_WATCHOS"), + mach.getCommandRecordOffset(XMACH_DEF::S_LC_VERSION_MIN_WATCHOS, 0, + &listCommandRecords)); // TODO rename pItemCommands->addChild(pItemVersionMin); } - if (mach.isCommandPresent(XMACH_DEF::S_LC_BUILD_VERSION, - &listCommandRecords)) { - QTreeWidgetItem *pItemBuildVersion = createNewItem( - SMACH::TYPE_mach_build_version, QString("LC_BUILD_VERSION"), - mach.getCommandRecordOffset( - XMACH_DEF::S_LC_BUILD_VERSION, 0, - &listCommandRecords)); // TODO rename + if (mach.isCommandPresent(XMACH_DEF::S_LC_BUILD_VERSION, &listCommandRecords)) { + QTreeWidgetItem *pItemBuildVersion = createNewItem(SMACH::TYPE_mach_build_version, QString("LC_BUILD_VERSION"), + mach.getCommandRecordOffset(XMACH_DEF::S_LC_BUILD_VERSION, 0, + &listCommandRecords)); // TODO rename pItemCommands->addChild(pItemBuildVersion); } - if (mach.isCommandPresent(XMACH_DEF::S_LC_LOAD_DYLINKER, - &listCommandRecords)) { - QTreeWidgetItem *pItemDylinker = createNewItem( - SMACH::TYPE_mach_dylinker, QString("LC_LOAD_DYLINKER"), - mach.getCommandRecordOffset( - XMACH_DEF::S_LC_LOAD_DYLINKER, 0, - &listCommandRecords)); // TODO rename + if (mach.isCommandPresent(XMACH_DEF::S_LC_LOAD_DYLINKER, &listCommandRecords)) { + QTreeWidgetItem *pItemDylinker = createNewItem(SMACH::TYPE_mach_dylinker, QString("LC_LOAD_DYLINKER"), + mach.getCommandRecordOffset(XMACH_DEF::S_LC_LOAD_DYLINKER, 0, + &listCommandRecords)); // TODO rename pItemCommands->addChild(pItemDylinker); } - if (mach.isCommandPresent(XMACH_DEF::S_LC_RPATH, - &listCommandRecords)) { - QTreeWidgetItem *pItemRPath = - createNewItem(SMACH::TYPE_mach_rpath, QString("LC_RPATH"), - mach.getCommandRecordOffset( - XMACH_DEF::S_LC_RPATH, 0, - &listCommandRecords)); // TODO rename + if (mach.isCommandPresent(XMACH_DEF::S_LC_RPATH, &listCommandRecords)) { + QTreeWidgetItem *pItemRPath = createNewItem(SMACH::TYPE_mach_rpath, QString("LC_RPATH"), + mach.getCommandRecordOffset(XMACH_DEF::S_LC_RPATH, 0, + &listCommandRecords)); // TODO rename pItemCommands->addChild(pItemRPath); } - if (mach.isCommandPresent(XMACH_DEF::S_LC_SOURCE_VERSION, - &listCommandRecords)) { - QTreeWidgetItem *pItemSourceVersion = - createNewItem(SMACH::TYPE_mach_source_version, - QString("LC_SOURCE_VERSION"), - mach.getCommandRecordOffset( - XMACH_DEF::S_LC_SOURCE_VERSION, 0, - &listCommandRecords)); // TODO rename + if (mach.isCommandPresent(XMACH_DEF::S_LC_SOURCE_VERSION, &listCommandRecords)) { + QTreeWidgetItem *pItemSourceVersion = createNewItem(SMACH::TYPE_mach_source_version, QString("LC_SOURCE_VERSION"), + mach.getCommandRecordOffset(XMACH_DEF::S_LC_SOURCE_VERSION, 0, + &listCommandRecords)); // TODO rename pItemCommands->addChild(pItemSourceVersion); } - if (mach.isCommandPresent(XMACH_DEF::S_LC_ENCRYPTION_INFO, - &listCommandRecords)) { - QTreeWidgetItem *pItemEncryptionInfo = createNewItem( - SMACH::TYPE_mach_encryption_info, - QString("LC_ENCRYPTION_INFO"), - mach.getCommandRecordOffset(XMACH_DEF::S_LC_ENCRYPTION_INFO, - 0, &listCommandRecords), - mach.get_encryption_info_command_size()); // TODO rename + if (mach.isCommandPresent(XMACH_DEF::S_LC_ENCRYPTION_INFO, &listCommandRecords)) { + QTreeWidgetItem *pItemEncryptionInfo = createNewItem(SMACH::TYPE_mach_encryption_info, QString("LC_ENCRYPTION_INFO"), + mach.getCommandRecordOffset(XMACH_DEF::S_LC_ENCRYPTION_INFO, 0, &listCommandRecords), + mach.get_encryption_info_command_size()); // TODO rename pItemCommands->addChild(pItemEncryptionInfo); } - if (mach.isCommandPresent(XMACH_DEF::S_LC_ENCRYPTION_INFO_64, - &listCommandRecords)) { - QTreeWidgetItem *pItemEncryptionInfo = createNewItem( - SMACH::TYPE_mach_encryption_info, - QString("LC_ENCRYPTION_INFO_64"), - mach.getCommandRecordOffset( - XMACH_DEF::S_LC_ENCRYPTION_INFO_64, 0, - &listCommandRecords), - mach.get_encryption_info_command_64_size()); // TODO rename + if (mach.isCommandPresent(XMACH_DEF::S_LC_ENCRYPTION_INFO_64, &listCommandRecords)) { + QTreeWidgetItem *pItemEncryptionInfo = createNewItem(SMACH::TYPE_mach_encryption_info, QString("LC_ENCRYPTION_INFO_64"), + mach.getCommandRecordOffset(XMACH_DEF::S_LC_ENCRYPTION_INFO_64, 0, &listCommandRecords), + mach.get_encryption_info_command_64_size()); // TODO rename pItemCommands->addChild(pItemEncryptionInfo); } - if (mach.isCommandPresent(XMACH_DEF::S_LC_FUNCTION_STARTS, - &listCommandRecords)) { - qint64 _nOffset = mach.getCommandRecordOffset( - XMACH_DEF::S_LC_FUNCTION_STARTS, 0, &listCommandRecords); + if (mach.isCommandPresent(XMACH_DEF::S_LC_FUNCTION_STARTS, &listCommandRecords)) { + qint64 _nOffset = mach.getCommandRecordOffset(XMACH_DEF::S_LC_FUNCTION_STARTS, 0, &listCommandRecords); - QTreeWidgetItem *pItemFunctionStarts = createNewItem( - SMACH::TYPE_mach_function_starts, - QString("LC_FUNCTION_STARTS"), _nOffset); // TODO rename + QTreeWidgetItem *pItemFunctionStarts = createNewItem(SMACH::TYPE_mach_function_starts, QString("LC_FUNCTION_STARTS"), _nOffset); // TODO rename pItemCommands->addChild(pItemFunctionStarts); - XMACH_DEF::linkedit_data_command linkedit_data = - mach._read_linkedit_data_command(_nOffset); + XMACH_DEF::linkedit_data_command linkedit_data = mach._read_linkedit_data_command(_nOffset); - if (mach.isOffsetValid(linkedit_data.dataoff) && - (linkedit_data.datasize)) { - QTreeWidgetItem *pItem = - createNewItem(SMACH::TYPE_FUNCTIONS, tr("Functions"), - linkedit_data.dataoff, - linkedit_data.datasize); // TODO rename + if (mach.isOffsetValid(linkedit_data.dataoff) && (linkedit_data.datasize)) { + QTreeWidgetItem *pItem = createNewItem(SMACH::TYPE_FUNCTIONS, tr("Functions"), linkedit_data.dataoff, + linkedit_data.datasize); // TODO rename pItemFunctionStarts->addChild(pItem); } } - if (mach.isCommandPresent(XMACH_DEF::S_LC_DATA_IN_CODE, - &listCommandRecords)) { - qint64 _nOffset = mach.getCommandRecordOffset( - XMACH_DEF::S_LC_DATA_IN_CODE, 0, &listCommandRecords); + if (mach.isCommandPresent(XMACH_DEF::S_LC_DATA_IN_CODE, &listCommandRecords)) { + qint64 _nOffset = mach.getCommandRecordOffset(XMACH_DEF::S_LC_DATA_IN_CODE, 0, &listCommandRecords); - QTreeWidgetItem *pItemDataInCode = createNewItem( - SMACH::TYPE_mach_data_in_code, QString("LC_DATA_IN_CODE"), - _nOffset); // TODO rename + QTreeWidgetItem *pItemDataInCode = createNewItem(SMACH::TYPE_mach_data_in_code, QString("LC_DATA_IN_CODE"), + _nOffset); // TODO rename pItemCommands->addChild(pItemDataInCode); - XMACH_DEF::linkedit_data_command linkedit_data = - mach._read_linkedit_data_command(_nOffset); + XMACH_DEF::linkedit_data_command linkedit_data = mach._read_linkedit_data_command(_nOffset); - if (mach.isOffsetValid(linkedit_data.dataoff) && - (linkedit_data.datasize)) { - QTreeWidgetItem *pItem = - createNewItem(SMACH::TYPE_DICE, tr("Data in code"), - linkedit_data.dataoff, - linkedit_data.datasize); // TODO rename + if (mach.isOffsetValid(linkedit_data.dataoff) && (linkedit_data.datasize)) { + QTreeWidgetItem *pItem = createNewItem(SMACH::TYPE_DICE, tr("Data in code"), linkedit_data.dataoff, + linkedit_data.datasize); // TODO rename pItemDataInCode->addChild(pItem); } } - if (mach.isCommandPresent(XMACH_DEF::S_LC_CODE_SIGNATURE, - &listCommandRecords)) { - qint64 _nOffset = mach.getCommandRecordOffset( - XMACH_DEF::S_LC_CODE_SIGNATURE, 0, &listCommandRecords); + if (mach.isCommandPresent(XMACH_DEF::S_LC_CODE_SIGNATURE, &listCommandRecords)) { + qint64 _nOffset = mach.getCommandRecordOffset(XMACH_DEF::S_LC_CODE_SIGNATURE, 0, &listCommandRecords); - QTreeWidgetItem *pItemCodeSignature = createNewItem( - SMACH::TYPE_mach_code_signature, - QString("LC_CODE_SIGNATURE"), _nOffset); // TODO rename + QTreeWidgetItem *pItemCodeSignature = createNewItem(SMACH::TYPE_mach_code_signature, QString("LC_CODE_SIGNATURE"), _nOffset); // TODO rename pItemCommands->addChild(pItemCodeSignature); - XMACH_DEF::linkedit_data_command linkedit_data = - mach._read_linkedit_data_command(_nOffset); + XMACH_DEF::linkedit_data_command linkedit_data = mach._read_linkedit_data_command(_nOffset); - if (mach.isOffsetValid(linkedit_data.dataoff) && - (linkedit_data.datasize)) { - QTreeWidgetItem *pItemSuperBlob = createNewItem( - SMACH::TYPE_mach_SuperBlob, QString("__SC_SuperBlob"), - linkedit_data.dataoff); // TODO rename + if (mach.isOffsetValid(linkedit_data.dataoff) && (linkedit_data.datasize)) { + QTreeWidgetItem *pItemSuperBlob = createNewItem(SMACH::TYPE_mach_SuperBlob, QString("__SC_SuperBlob"), + linkedit_data.dataoff); // TODO rename pItemCodeSignature->addChild(pItemSuperBlob); } } - if (mach.isCommandPresent(XMACH_DEF::S_LC_MAIN, - &listCommandRecords)) { - QTreeWidgetItem *pItemMain = - createNewItem(SMACH::TYPE_mach_main, QString("LC_MAIN"), - mach.getCommandRecordOffset( - XMACH_DEF::S_LC_MAIN, 0, - &listCommandRecords)); // TODO rename + if (mach.isCommandPresent(XMACH_DEF::S_LC_MAIN, &listCommandRecords)) { + QTreeWidgetItem *pItemMain = createNewItem(SMACH::TYPE_mach_main, QString("LC_MAIN"), + mach.getCommandRecordOffset(XMACH_DEF::S_LC_MAIN, 0, + &listCommandRecords)); // TODO rename pItemCommands->addChild(pItemMain); } - if (mach.isCommandPresent(XMACH_DEF::S_LC_UNIXTHREAD, - &listCommandRecords)) { - qint64 _nOffset = mach.getCommandRecordOffset( - XMACH_DEF::S_LC_UNIXTHREAD, 0, &listCommandRecords); + if (mach.isCommandPresent(XMACH_DEF::S_LC_UNIXTHREAD, &listCommandRecords)) { + qint64 _nOffset = mach.getCommandRecordOffset(XMACH_DEF::S_LC_UNIXTHREAD, 0, &listCommandRecords); - QTreeWidgetItem *pItemUnixThread = createNewItem( - SMACH::TYPE_mach_unix_thread, QString("LC_UNIXTHREAD"), - _nOffset); // TODO rename + QTreeWidgetItem *pItemUnixThread = createNewItem(SMACH::TYPE_mach_unix_thread, QString("LC_UNIXTHREAD"), + _nOffset); // TODO rename pItemCommands->addChild(pItemUnixThread); @@ -596,45 +435,33 @@ void MACHWidget::reload() { _nOffset += sizeof(XMACH_DEF::unix_thread_command); if (nMachine == XMACH_DEF::S_CPU_TYPE_I386) { - QTreeWidgetItem *pItem = - createNewItem(SMACH::TYPE_mach_unix_thread_x86_32, - QString("x86_thread_state32_t"), - _nOffset); // TODO rename + QTreeWidgetItem *pItem = createNewItem(SMACH::TYPE_mach_unix_thread_x86_32, QString("x86_thread_state32_t"), + _nOffset); // TODO rename pItemUnixThread->addChild(pItem); } else if (nMachine == XMACH_DEF::S_CPU_TYPE_X86_64) { - QTreeWidgetItem *pItem = - createNewItem(SMACH::TYPE_mach_unix_thread_x86_64, - QString("x86_thread_state64_t"), - _nOffset); // TODO rename + QTreeWidgetItem *pItem = createNewItem(SMACH::TYPE_mach_unix_thread_x86_64, QString("x86_thread_state64_t"), + _nOffset); // TODO rename pItemUnixThread->addChild(pItem); } else if (nMachine == XMACH_DEF::S_CPU_TYPE_ARM) { - QTreeWidgetItem *pItem = - createNewItem(SMACH::TYPE_mach_unix_thread_arm_32, - QString("arm_thread_state32_t"), - _nOffset); // TODO rename + QTreeWidgetItem *pItem = createNewItem(SMACH::TYPE_mach_unix_thread_arm_32, QString("arm_thread_state32_t"), + _nOffset); // TODO rename pItemUnixThread->addChild(pItem); } else if (nMachine == XMACH_DEF::S_CPU_TYPE_ARM64) { - QTreeWidgetItem *pItem = - createNewItem(SMACH::TYPE_mach_unix_thread_arm_64, - QString("arm_thread_state64_t"), - _nOffset); // TODO rename + QTreeWidgetItem *pItem = createNewItem(SMACH::TYPE_mach_unix_thread_arm_64, QString("arm_thread_state64_t"), + _nOffset); // TODO rename pItemUnixThread->addChild(pItem); } else if (nMachine == XMACH_DEF::S_CPU_TYPE_MC680x0) { - QTreeWidgetItem *pItem = - createNewItem(SMACH::TYPE_mach_unix_thread_m68k_32, - QString("m68k_thread_state32_t"), - _nOffset); // TODO rename + QTreeWidgetItem *pItem = createNewItem(SMACH::TYPE_mach_unix_thread_m68k_32, QString("m68k_thread_state32_t"), + _nOffset); // TODO rename pItemUnixThread->addChild(pItem); } else if (nMachine == XMACH_DEF::S_CPU_TYPE_POWERPC) { - QTreeWidgetItem *pItem = - createNewItem(SMACH::TYPE_mach_unix_thread_ppc_32, - QString("ppc_thread_state32_t"), - _nOffset); // TODO rename + QTreeWidgetItem *pItem = createNewItem(SMACH::TYPE_mach_unix_thread_ppc_32, QString("ppc_thread_state32_t"), + _nOffset); // TODO rename pItemUnixThread->addChild(pItem); } @@ -649,9 +476,7 @@ void MACHWidget::reload() { } } -FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, - int nVtype, int nPosition, - qint64 nOffset) { +FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset) { Q_UNUSED(nVtype) Q_UNUSED(nPosition) @@ -673,16 +498,13 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, g_comboBox[CB_mach_header_magic]->setValue(nValue); break; case N_mach_header::cputype: - g_comboBox[CB_mach_header_cputype]->setValue( - nValue); + g_comboBox[CB_mach_header_cputype]->setValue(nValue); break; case N_mach_header::cpusubtype: - g_comboBox[CB_mach_header_cpusubtype]->setValue( - nValue); + g_comboBox[CB_mach_header_cpusubtype]->setValue(nValue); break; case N_mach_header::filetype: - g_comboBox[CB_mach_header_filetype]->setValue( - nValue); + g_comboBox[CB_mach_header_filetype]->setValue(nValue); break; case N_mach_header::flags: g_comboBox[CB_mach_header_flags]->setValue(nValue); @@ -693,54 +515,34 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SMACH::TYPE_mach_dyld_info_only: switch (nNdata) { case N_mach_dyld_info::rebase_off: - g_invWidget[INV_rebase_off]->setOffsetAndSize( - &mach, nValue, mach.get_dyld_info().rebase_size, - true); + g_invWidget[INV_rebase_off]->setOffsetAndSize(&mach, nValue, mach.get_dyld_info().rebase_size, true); break; case N_mach_dyld_info::rebase_size: - g_invWidget[INV_rebase_off]->setOffsetAndSize( - &mach, mach.get_dyld_info().rebase_off, nValue, - true); + g_invWidget[INV_rebase_off]->setOffsetAndSize(&mach, mach.get_dyld_info().rebase_off, nValue, true); break; case N_mach_dyld_info::bind_off: - g_invWidget[INV_bind_off]->setOffsetAndSize( - &mach, nValue, mach.get_dyld_info().bind_size, - true); + g_invWidget[INV_bind_off]->setOffsetAndSize(&mach, nValue, mach.get_dyld_info().bind_size, true); break; case N_mach_dyld_info::bind_size: - g_invWidget[INV_bind_off]->setOffsetAndSize( - &mach, mach.get_dyld_info().bind_off, nValue, - true); + g_invWidget[INV_bind_off]->setOffsetAndSize(&mach, mach.get_dyld_info().bind_off, nValue, true); break; case N_mach_dyld_info::weak_bind_off: - g_invWidget[INV_weak_bind_off]->setOffsetAndSize( - &mach, nValue, - mach.get_dyld_info().weak_bind_size, true); + g_invWidget[INV_weak_bind_off]->setOffsetAndSize(&mach, nValue, mach.get_dyld_info().weak_bind_size, true); break; case N_mach_dyld_info::weak_bind_size: - g_invWidget[INV_weak_bind_off]->setOffsetAndSize( - &mach, mach.get_dyld_info().weak_bind_off, - nValue, true); + g_invWidget[INV_weak_bind_off]->setOffsetAndSize(&mach, mach.get_dyld_info().weak_bind_off, nValue, true); break; case N_mach_dyld_info::lazy_bind_off: - g_invWidget[INV_lazy_bind_off]->setOffsetAndSize( - &mach, nValue, - mach.get_dyld_info().lazy_bind_size, true); + g_invWidget[INV_lazy_bind_off]->setOffsetAndSize(&mach, nValue, mach.get_dyld_info().lazy_bind_size, true); break; case N_mach_dyld_info::lazy_bind_size: - g_invWidget[INV_lazy_bind_off]->setOffsetAndSize( - &mach, mach.get_dyld_info().lazy_bind_off, - nValue, true); + g_invWidget[INV_lazy_bind_off]->setOffsetAndSize(&mach, mach.get_dyld_info().lazy_bind_off, nValue, true); break; case N_mach_dyld_info::export_off: - g_invWidget[INV_export_off]->setOffsetAndSize( - &mach, nValue, mach.get_dyld_info().export_size, - true); + g_invWidget[INV_export_off]->setOffsetAndSize(&mach, nValue, mach.get_dyld_info().export_size, true); break; case N_mach_dyld_info::export_size: - g_invWidget[INV_export_off]->setOffsetAndSize( - &mach, mach.get_dyld_info().export_off, nValue, - true); + g_invWidget[INV_export_off]->setOffsetAndSize(&mach, mach.get_dyld_info().export_off, nValue, true); break; } break; @@ -748,24 +550,16 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SMACH::TYPE_mach_symtab: switch (nNdata) { case N_mach_symtab::symoff: - g_invWidget[INV_symoff]->setOffsetAndSize( - &mach, nValue, - mach.get_symtab().nsyms * - mach.get_nlist_MODE_size(), - true); + g_invWidget[INV_symoff]->setOffsetAndSize(&mach, nValue, mach.get_symtab().nsyms * mach.get_nlist_MODE_size(), true); break; case N_mach_symtab::nsyms: - g_invWidget[INV_symoff]->setOffsetAndSize( - &mach, mach.get_symtab().symoff, - nValue * mach.get_nlist_MODE_size(), true); + g_invWidget[INV_symoff]->setOffsetAndSize(&mach, mach.get_symtab().symoff, nValue * mach.get_nlist_MODE_size(), true); break; case N_mach_symtab::stroff: - g_invWidget[INV_stroff]->setOffsetAndSize( - &mach, nValue, mach.get_symtab().strsize, true); + g_invWidget[INV_stroff]->setOffsetAndSize(&mach, nValue, mach.get_symtab().strsize, true); break; case N_mach_symtab::strsize: - g_invWidget[INV_stroff]->setOffsetAndSize( - &mach, mach.get_symtab().stroff, nValue, true); + g_invWidget[INV_stroff]->setOffsetAndSize(&mach, mach.get_symtab().stroff, nValue, true); break; } break; @@ -773,28 +567,22 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SMACH::TYPE_mach_dysymtab: switch (nNdata) { case N_mach_dysymtab::tocoff: - g_invWidget[INV_tocoff]->setOffsetAndSize( - &mach, nValue, 0, true); + g_invWidget[INV_tocoff]->setOffsetAndSize(&mach, nValue, 0, true); break; // TODO Size case N_mach_dysymtab::modtaboff: - g_invWidget[INV_modtaboff]->setOffsetAndSize( - &mach, nValue, 0, true); + g_invWidget[INV_modtaboff]->setOffsetAndSize(&mach, nValue, 0, true); break; // TODO Size case N_mach_dysymtab::extrefsymoff: - g_invWidget[INV_extrefsymoff]->setOffsetAndSize( - &mach, nValue, 0, true); + g_invWidget[INV_extrefsymoff]->setOffsetAndSize(&mach, nValue, 0, true); break; // TODO Size case N_mach_dysymtab::indirectsymoff: - g_invWidget[INV_indirectsymoff]->setOffsetAndSize( - &mach, nValue, 0, true); + g_invWidget[INV_indirectsymoff]->setOffsetAndSize(&mach, nValue, 0, true); break; // TODO Size case N_mach_dysymtab::extreloff: - g_invWidget[INV_extreloff]->setOffsetAndSize( - &mach, nValue, 0, true); + g_invWidget[INV_extreloff]->setOffsetAndSize(&mach, nValue, 0, true); break; // TODO Size case N_mach_dysymtab::locreloff: - g_invWidget[INV_locreloff]->setOffsetAndSize( - &mach, nValue, 0, true); + g_invWidget[INV_locreloff]->setOffsetAndSize(&mach, nValue, 0, true); break; // TODO Size } break; @@ -803,29 +591,19 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, if (mach.is64()) { switch (nNdata) { case N_mach_encryption_info::cryptoff: - g_invWidget[INV_cryptoff]->setOffsetAndSize( - &mach, nValue, - mach.get_encryption_info_64().cryptsize, - true); + g_invWidget[INV_cryptoff]->setOffsetAndSize(&mach, nValue, mach.get_encryption_info_64().cryptsize, true); break; case N_mach_encryption_info::cryptsize: - g_invWidget[INV_cryptoff]->setOffsetAndSize( - &mach, - mach.get_encryption_info_64().cryptoff, - nValue, true); + g_invWidget[INV_cryptoff]->setOffsetAndSize(&mach, mach.get_encryption_info_64().cryptoff, nValue, true); break; } } else { switch (nNdata) { case N_mach_encryption_info::cryptoff: - g_invWidget[INV_cryptoff]->setOffsetAndSize( - &mach, nValue, - mach.get_encryption_info().cryptsize, true); + g_invWidget[INV_cryptoff]->setOffsetAndSize(&mach, nValue, mach.get_encryption_info().cryptsize, true); break; case N_mach_encryption_info::cryptsize: - g_invWidget[INV_cryptoff]->setOffsetAndSize( - &mach, mach.get_encryption_info().cryptoff, - nValue, true); + g_invWidget[INV_cryptoff]->setOffsetAndSize(&mach, mach.get_encryption_info().cryptoff, nValue, true); break; } } @@ -835,22 +613,12 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SMACH::TYPE_mach_data_in_code: switch (nNdata) { case N_mach_linkedit_data::dataoff: - g_invWidget[INV_DATA_IN_CODE_dataoff] - ->setOffsetAndSize( - &mach, nValue, - mach.get_linkedit_data( - XMACH_DEF::S_LC_DATA_IN_CODE) - .datasize, - true); + g_invWidget[INV_DATA_IN_CODE_dataoff]->setOffsetAndSize(&mach, nValue, + mach.get_linkedit_data(XMACH_DEF::S_LC_DATA_IN_CODE).datasize, true); break; case N_mach_linkedit_data::datasize: - g_invWidget[INV_DATA_IN_CODE_dataoff] - ->setOffsetAndSize( - &mach, - mach.get_linkedit_data( - XMACH_DEF::S_LC_DATA_IN_CODE) - .dataoff, - nValue, true); + g_invWidget[INV_DATA_IN_CODE_dataoff]->setOffsetAndSize(&mach, mach.get_linkedit_data(XMACH_DEF::S_LC_DATA_IN_CODE).dataoff, nValue, + true); break; } break; @@ -858,22 +626,12 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SMACH::TYPE_mach_function_starts: switch (nNdata) { case N_mach_linkedit_data::dataoff: - g_invWidget[INV_FUNCTION_STARTS_dataoff] - ->setOffsetAndSize( - &mach, nValue, - mach.get_linkedit_data( - XMACH_DEF::S_LC_FUNCTION_STARTS) - .datasize, - true); + g_invWidget[INV_FUNCTION_STARTS_dataoff]->setOffsetAndSize(&mach, nValue, + mach.get_linkedit_data(XMACH_DEF::S_LC_FUNCTION_STARTS).datasize, true); break; case N_mach_linkedit_data::datasize: - g_invWidget[INV_FUNCTION_STARTS_dataoff] - ->setOffsetAndSize( - &mach, - mach.get_linkedit_data( - XMACH_DEF::S_LC_FUNCTION_STARTS) - .dataoff, - nValue, true); + g_invWidget[INV_FUNCTION_STARTS_dataoff]->setOffsetAndSize(&mach, mach.get_linkedit_data(XMACH_DEF::S_LC_FUNCTION_STARTS).dataoff, + nValue, true); break; } break; @@ -881,22 +639,12 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SMACH::TYPE_mach_code_signature: switch (nNdata) { case N_mach_linkedit_data::dataoff: - g_invWidget[INV_CODE_SIGNATURE_dataoff] - ->setOffsetAndSize( - &mach, nValue, - mach.get_linkedit_data( - XMACH_DEF::S_LC_CODE_SIGNATURE) - .datasize, - true); + g_invWidget[INV_CODE_SIGNATURE_dataoff]->setOffsetAndSize(&mach, nValue, + mach.get_linkedit_data(XMACH_DEF::S_LC_CODE_SIGNATURE).datasize, true); break; case N_mach_linkedit_data::datasize: - g_invWidget[INV_CODE_SIGNATURE_dataoff] - ->setOffsetAndSize( - &mach, - mach.get_linkedit_data( - XMACH_DEF::S_LC_CODE_SIGNATURE) - .dataoff, - nValue, true); + g_invWidget[INV_CODE_SIGNATURE_dataoff]->setOffsetAndSize(&mach, mach.get_linkedit_data(XMACH_DEF::S_LC_CODE_SIGNATURE).dataoff, + nValue, true); break; } break; @@ -904,8 +652,7 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SMACH::TYPE_mach_main: switch (nNdata) { case N_mach_main::entryoff: - g_invWidget[INV_MAIN_entryoff]->setOffsetAndSize( - &mach, nValue, 0, true); + g_invWidget[INV_MAIN_entryoff]->setOffsetAndSize(&mach, nValue, 0, true); break; } break; @@ -947,44 +694,34 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SMACH::TYPE_mach_dyld_info_only: switch (nNdata) { case N_mach_dyld_info::rebase_off: - mach._set_dyld_info_command_rebase_off(nOffset, - nValue); + mach._set_dyld_info_command_rebase_off(nOffset, nValue); break; case N_mach_dyld_info::rebase_size: - mach._set_dyld_info_command_rebase_size(nOffset, - nValue); + mach._set_dyld_info_command_rebase_size(nOffset, nValue); break; case N_mach_dyld_info::bind_off: - mach._set_dyld_info_command_bind_off(nOffset, - nValue); + mach._set_dyld_info_command_bind_off(nOffset, nValue); break; case N_mach_dyld_info::bind_size: - mach._set_dyld_info_command_bind_size(nOffset, - nValue); + mach._set_dyld_info_command_bind_size(nOffset, nValue); break; case N_mach_dyld_info::weak_bind_off: - mach._set_dyld_info_command_weak_bind_off(nOffset, - nValue); + mach._set_dyld_info_command_weak_bind_off(nOffset, nValue); break; case N_mach_dyld_info::weak_bind_size: - mach._set_dyld_info_command_weak_bind_size(nOffset, - nValue); + mach._set_dyld_info_command_weak_bind_size(nOffset, nValue); break; case N_mach_dyld_info::lazy_bind_off: - mach._set_dyld_info_command_lazy_bind_off(nOffset, - nValue); + mach._set_dyld_info_command_lazy_bind_off(nOffset, nValue); break; case N_mach_dyld_info::lazy_bind_size: - mach._set_dyld_info_command_lazy_bind_size(nOffset, - nValue); + mach._set_dyld_info_command_lazy_bind_size(nOffset, nValue); break; case N_mach_dyld_info::export_off: - mach._set_dyld_info_command_export_off(nOffset, - nValue); + mach._set_dyld_info_command_export_off(nOffset, nValue); break; case N_mach_dyld_info::export_size: - mach._set_dyld_info_command_export_size(nOffset, - nValue); + mach._set_dyld_info_command_export_size(nOffset, nValue); break; } @@ -1053,28 +790,22 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SMACH::TYPE_mach_dysymtab: switch (nNdata) { case N_mach_dysymtab::ilocalsym: - mach._set_dysymtab_command_ilocalsym(nOffset, - nValue); + mach._set_dysymtab_command_ilocalsym(nOffset, nValue); break; case N_mach_dysymtab::nlocalsym: - mach._set_dysymtab_command_nlocalsym(nOffset, - nValue); + mach._set_dysymtab_command_nlocalsym(nOffset, nValue); break; case N_mach_dysymtab::iextdefsym: - mach._set_dysymtab_command_iextdefsym(nOffset, - nValue); + mach._set_dysymtab_command_iextdefsym(nOffset, nValue); break; case N_mach_dysymtab::nextdefsym: - mach._set_dysymtab_command_nextdefsym(nOffset, - nValue); + mach._set_dysymtab_command_nextdefsym(nOffset, nValue); break; case N_mach_dysymtab::iundefsym: - mach._set_dysymtab_command_iundefsym(nOffset, - nValue); + mach._set_dysymtab_command_iundefsym(nOffset, nValue); break; case N_mach_dysymtab::nundefsym: - mach._set_dysymtab_command_nundefsym(nOffset, - nValue); + mach._set_dysymtab_command_nundefsym(nOffset, nValue); break; case N_mach_dysymtab::tocoff: mach._set_dysymtab_command_tocoff(nOffset, nValue); @@ -1083,38 +814,31 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, mach._set_dysymtab_command_ntoc(nOffset, nValue); break; case N_mach_dysymtab::modtaboff: - mach._set_dysymtab_command_modtaboff(nOffset, - nValue); + mach._set_dysymtab_command_modtaboff(nOffset, nValue); break; case N_mach_dysymtab::nmodtab: mach._set_dysymtab_command_nmodtab(nOffset, nValue); break; case N_mach_dysymtab::extrefsymoff: - mach._set_dysymtab_command_extrefsymoff(nOffset, - nValue); + mach._set_dysymtab_command_extrefsymoff(nOffset, nValue); break; case N_mach_dysymtab::nextrefsyms: - mach._set_dysymtab_command_nextrefsyms(nOffset, - nValue); + mach._set_dysymtab_command_nextrefsyms(nOffset, nValue); break; case N_mach_dysymtab::indirectsymoff: - mach._set_dysymtab_command_indirectsymoff(nOffset, - nValue); + mach._set_dysymtab_command_indirectsymoff(nOffset, nValue); break; case N_mach_dysymtab::nindirectsyms: - mach._set_dysymtab_command_nindirectsyms(nOffset, - nValue); + mach._set_dysymtab_command_nindirectsyms(nOffset, nValue); break; case N_mach_dysymtab::extreloff: - mach._set_dysymtab_command_extreloff(nOffset, - nValue); + mach._set_dysymtab_command_extreloff(nOffset, nValue); break; case N_mach_dysymtab::nextrel: mach._set_dysymtab_command_nextrel(nOffset, nValue); break; case N_mach_dysymtab::locreloff: - mach._set_dysymtab_command_locreloff(nOffset, - nValue); + mach._set_dysymtab_command_locreloff(nOffset, nValue); break; case N_mach_dysymtab::nlocrel: mach._set_dysymtab_command_nlocrel(nOffset, nValue); @@ -1128,8 +852,7 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SMACH::TYPE_mach_version_min: switch (nNdata) { case N_mach_version_min::version: - mach._set_version_min_command_version(nOffset, - nValue); + mach._set_version_min_command_version(nOffset, nValue); break; case N_mach_version_min::sdk: mach._set_version_min_command_sdk(nOffset, nValue); @@ -1143,20 +866,16 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SMACH::TYPE_mach_build_version: switch (nNdata) { case N_mach_build_version::platform: - mach._set_build_version_command_platform(nOffset, - nValue); + mach._set_build_version_command_platform(nOffset, nValue); break; case N_mach_build_version::minos: - mach._set_build_version_command_minos(nOffset, - nValue); + mach._set_build_version_command_minos(nOffset, nValue); break; case N_mach_build_version::sdk: - mach._set_build_version_command_sdk(nOffset, - nValue); + mach._set_build_version_command_sdk(nOffset, nValue); break; case N_mach_build_version::ntools: - mach._set_build_version_command_ntools(nOffset, - nValue); + mach._set_build_version_command_ntools(nOffset, nValue); break; } @@ -1167,20 +886,16 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SMACH::TYPE_mach_encryption_info: switch (nNdata) { case N_mach_encryption_info::cryptoff: - mach._set_encryption_info_command_64_cryptoff( - nOffset, nValue); + mach._set_encryption_info_command_64_cryptoff(nOffset, nValue); break; case N_mach_encryption_info::cryptsize: - mach._set_encryption_info_command_64_cryptsize( - nOffset, nValue); + mach._set_encryption_info_command_64_cryptsize(nOffset, nValue); break; case N_mach_encryption_info::cryptid: - mach._set_encryption_info_command_64_cryptid( - nOffset, nValue); + mach._set_encryption_info_command_64_cryptid(nOffset, nValue); break; case N_mach_encryption_info::pad: - mach._set_encryption_info_command_64_pad(nOffset, - nValue); + mach._set_encryption_info_command_64_pad(nOffset, nValue); break; } @@ -1191,12 +906,10 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SMACH::TYPE_mach_function_starts: switch (nNdata) { case N_mach_linkedit_data::dataoff: - mach._set_linkedit_data_command_dataoff(nOffset, - nValue); + mach._set_linkedit_data_command_dataoff(nOffset, nValue); break; case N_mach_linkedit_data::datasize: - mach._set_linkedit_data_command_datasize(nOffset, - nValue); + mach._set_linkedit_data_command_datasize(nOffset, nValue); break; } @@ -1207,12 +920,10 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SMACH::TYPE_mach_data_in_code: switch (nNdata) { case N_mach_linkedit_data::dataoff: - mach._set_linkedit_data_command_dataoff(nOffset, - nValue); + mach._set_linkedit_data_command_dataoff(nOffset, nValue); break; case N_mach_linkedit_data::datasize: - mach._set_linkedit_data_command_datasize(nOffset, - nValue); + mach._set_linkedit_data_command_datasize(nOffset, nValue); break; } @@ -1223,12 +934,10 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SMACH::TYPE_mach_code_signature: switch (nNdata) { case N_mach_linkedit_data::dataoff: - mach._set_linkedit_data_command_dataoff(nOffset, - nValue); + mach._set_linkedit_data_command_dataoff(nOffset, nValue); break; case N_mach_linkedit_data::datasize: - mach._set_linkedit_data_command_datasize(nOffset, - nValue); + mach._set_linkedit_data_command_datasize(nOffset, nValue); break; } @@ -1256,12 +965,10 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SMACH::TYPE_mach_main: switch (nNdata) { case N_mach_main::entryoff: - mach._set_entry_point_command_entryoff(nOffset, - nValue); + mach._set_entry_point_command_entryoff(nOffset, nValue); break; case N_mach_main::stacksize: - mach._set_entry_point_command_stacksize(nOffset, - nValue); + mach._set_entry_point_command_stacksize(nOffset, nValue); break; } @@ -1272,12 +979,10 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SMACH::TYPE_mach_unix_thread: switch (nNdata) { case N_mach_unix_thread::flavor: - mach._set_unix_thread_command_flavor(nOffset, - nValue); + mach._set_unix_thread_command_flavor(nOffset, nValue); break; case N_mach_unix_thread::count: - mach._set_unix_thread_command_count(nOffset, - nValue); + mach._set_unix_thread_command_count(nOffset, nValue); break; } @@ -1315,8 +1020,7 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, mach._set_x86_thread_state32_t_ss(nOffset, nValue); break; case N_mach_unix_thread_x86_32::eflags: - mach._set_x86_thread_state32_t_eflags(nOffset, - nValue); + mach._set_x86_thread_state32_t_eflags(nOffset, nValue); break; case N_mach_unix_thread_x86_32::eip: mach._set_x86_thread_state32_t_eip(nOffset, nValue); @@ -1396,8 +1100,7 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, mach._set_x86_thread_state64_t_rip(nOffset, nValue); break; case N_mach_unix_thread_x86_64::rflags: - mach._set_x86_thread_state64_t_rflags(nOffset, - nValue); + mach._set_x86_thread_state64_t_rflags(nOffset, nValue); break; case N_mach_unix_thread_x86_64::cs: mach._set_x86_thread_state64_t_cs(nOffset, nValue); @@ -1429,9 +1132,7 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, case N_mach_unix_thread_arm_32::r10: case N_mach_unix_thread_arm_32::r11: case N_mach_unix_thread_arm_32::r12: - mach._set_arm_thread_state32_t_r( - nOffset, nValue, - nNdata - N_mach_unix_thread_arm_32::r0); + mach._set_arm_thread_state32_t_r(nOffset, nValue, nNdata - N_mach_unix_thread_arm_32::r0); break; case N_mach_unix_thread_arm_32::sp: mach._set_arm_thread_state32_t_sp(nOffset, nValue); @@ -1443,8 +1144,7 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, mach._set_arm_thread_state32_t_pc(nOffset, nValue); break; case N_mach_unix_thread_arm_32::cpsr: - mach._set_arm_thread_state32_t_cpsr(nOffset, - nValue); + mach._set_arm_thread_state32_t_cpsr(nOffset, nValue); break; } @@ -1483,9 +1183,7 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, case N_mach_unix_thread_arm_64::x26: case N_mach_unix_thread_arm_64::x27: case N_mach_unix_thread_arm_64::x28: - mach._set_arm_thread_state64_t_x( - nOffset, nValue, - nNdata - N_mach_unix_thread_arm_64::x0); + mach._set_arm_thread_state64_t_x(nOffset, nValue, nNdata - N_mach_unix_thread_arm_64::x0); break; case N_mach_unix_thread_arm_64::fp: mach._set_arm_thread_state64_t_fp(nOffset, nValue); @@ -1500,8 +1198,7 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, mach._set_arm_thread_state64_t_pc(nOffset, nValue); break; case N_mach_unix_thread_arm_64::cpsr: - mach._set_arm_thread_state64_t_cpsr(nOffset, - nValue); + mach._set_arm_thread_state64_t_cpsr(nOffset, nValue); break; case N_mach_unix_thread_arm_64::pad: mach._set_arm_thread_state64_t_pad(nOffset, nValue); @@ -1522,9 +1219,7 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, case N_mach_unix_thread_m68k_32::dreg5: case N_mach_unix_thread_m68k_32::dreg6: case N_mach_unix_thread_m68k_32::dreg7: - mach._set_m68k_thread_state32_t_dreg( - nOffset, nValue, - nNdata - N_mach_unix_thread_m68k_32::dreg0); + mach._set_m68k_thread_state32_t_dreg(nOffset, nValue, nNdata - N_mach_unix_thread_m68k_32::dreg0); break; case N_mach_unix_thread_m68k_32::areg0: case N_mach_unix_thread_m68k_32::areg1: @@ -1534,13 +1229,10 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, case N_mach_unix_thread_m68k_32::areg5: case N_mach_unix_thread_m68k_32::areg6: case N_mach_unix_thread_m68k_32::areg7: - mach._set_m68k_thread_state32_t_areg( - nOffset, nValue, - nNdata - N_mach_unix_thread_m68k_32::areg0); + mach._set_m68k_thread_state32_t_areg(nOffset, nValue, nNdata - N_mach_unix_thread_m68k_32::areg0); break; case N_mach_unix_thread_m68k_32::pad0: - mach._set_m68k_thread_state32_t_pad0(nOffset, - nValue); + mach._set_m68k_thread_state32_t_pad0(nOffset, nValue); break; case N_mach_unix_thread_m68k_32::sr: mach._set_m68k_thread_state32_t_sr(nOffset, nValue); @@ -1557,12 +1249,10 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SMACH::TYPE_mach_unix_thread_ppc_32: switch (nNdata) { case N_mach_unix_thread_ppc_32::srr0: - mach._set_ppc_thread_state32_t_srr0(nOffset, - nValue); + mach._set_ppc_thread_state32_t_srr0(nOffset, nValue); break; case N_mach_unix_thread_ppc_32::srr1: - mach._set_ppc_thread_state32_t_srr1(nOffset, - nValue); + mach._set_ppc_thread_state32_t_srr1(nOffset, nValue); break; case N_mach_unix_thread_ppc_32::r0: case N_mach_unix_thread_ppc_32::r1: @@ -1596,9 +1286,7 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, case N_mach_unix_thread_ppc_32::r29: case N_mach_unix_thread_ppc_32::r30: case N_mach_unix_thread_ppc_32::r31: - mach._set_ppc_thread_state32_t_r( - nOffset, nValue, - nNdata - N_mach_unix_thread_ppc_32::r0); + mach._set_ppc_thread_state32_t_r(nOffset, nValue, nNdata - N_mach_unix_thread_ppc_32::r0); break; case N_mach_unix_thread_ppc_32::ct: mach._set_ppc_thread_state32_t_ct(nOffset, nValue); @@ -1616,8 +1304,7 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, mach._set_ppc_thread_state32_t_mq(nOffset, nValue); break; case N_mach_unix_thread_ppc_32::vrsave: - mach._set_ppc_thread_state32_t_vrsave(nOffset, - nValue); + mach._set_ppc_thread_state32_t_vrsave(nOffset, nValue); break; } @@ -1630,18 +1317,12 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SMACH::TYPE_mach_version_min: switch (nNdata) { case N_mach_version_min::version: - addComment(ui->tableWidget_version_min, - N_mach_version_min::version, - HEADER_COLUMN_COMMENT, - XBinary::fullVersionDwordToString( - (quint32)nValue)); + addComment(ui->tableWidget_version_min, N_mach_version_min::version, HEADER_COLUMN_COMMENT, + XBinary::fullVersionDwordToString((quint32)nValue)); break; case N_mach_version_min::sdk: - addComment(ui->tableWidget_version_min, - N_mach_version_min::sdk, - HEADER_COLUMN_COMMENT, - XBinary::fullVersionDwordToString( - (quint32)nValue)); + addComment(ui->tableWidget_version_min, N_mach_version_min::sdk, HEADER_COLUMN_COMMENT, + XBinary::fullVersionDwordToString((quint32)nValue)); break; } @@ -1650,18 +1331,12 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SMACH::TYPE_mach_build_version: switch (nNdata) { case N_mach_build_version::minos: - addComment(ui->tableWidget_build_version, - N_mach_build_version::minos, - HEADER_COLUMN_COMMENT, - XBinary::fullVersionDwordToString( - (quint32)nValue)); + addComment(ui->tableWidget_build_version, N_mach_build_version::minos, HEADER_COLUMN_COMMENT, + XBinary::fullVersionDwordToString((quint32)nValue)); break; case N_mach_build_version::sdk: - addComment(ui->tableWidget_build_version, - N_mach_build_version::sdk, - HEADER_COLUMN_COMMENT, - XBinary::fullVersionDwordToString( - (quint32)nValue)); + addComment(ui->tableWidget_build_version, N_mach_build_version::sdk, HEADER_COLUMN_COMMENT, + XBinary::fullVersionDwordToString((quint32)nValue)); break; } @@ -1692,52 +1367,29 @@ FormatWidget::SV MACHWidget::_setValue(QVariant vValue, int nStype, int nNdata, } void MACHWidget::setReadonly(bool bState) { - setLineEditsReadOnly(g_lineEdit_mach_header, N_mach_header::__data_size, - bState); - setLineEditsReadOnly(g_lineEdit_mach_dyld_info_only, - N_mach_dyld_info::__data_size, bState); - setLineEditsReadOnly(g_lineEdit_mach_uuid, N_mach_uuid::__data_size, - bState); - setLineEditsReadOnly(g_lineEdit_mach_dylinker, N_mach_dylinker::__data_size, - bState); - setLineEditsReadOnly(g_lineEdit_mach_rpath, N_mach_rpath::__data_size, - bState); - setLineEditsReadOnly(g_lineEdit_mach_symtab, N_mach_symtab::__data_size, - bState); - setLineEditsReadOnly(g_lineEdit_mach_dysymtab, N_mach_dysymtab::__data_size, - bState); - setLineEditsReadOnly(g_lineEdit_mach_version_min, - N_mach_version_min::__data_size, bState); - setLineEditsReadOnly(g_lineEdit_mach_build_version, - N_mach_build_version::__data_size, bState); - setLineEditsReadOnly(g_lineEdit_mach_source_version, - N_mach_source_version::__data_size, bState); - setLineEditsReadOnly(g_lineEdit_mach_encryption_info, - N_mach_encryption_info::__data_size, bState); - setLineEditsReadOnly(g_lineEdit_mach_function_starts, - N_mach_linkedit_data::__data_size, bState); - setLineEditsReadOnly(g_lineEdit_mach_data_in_code, - N_mach_linkedit_data::__data_size, bState); - setLineEditsReadOnly(g_lineEdit_mach_code_signature, - N_mach_linkedit_data::__data_size, bState); - setLineEditsReadOnly(g_lineEdit_mach_SuperBlob, - N_mach_SuperBlob::__data_size, bState); - setLineEditsReadOnly(g_lineEdit_mach_main, N_mach_main::__data_size, - bState); - setLineEditsReadOnly(g_lineEdit_mach_unix_thread, - N_mach_unix_thread::__data_size, bState); - setLineEditsReadOnly(g_lineEdit_mach_unix_thread_x86_32, - N_mach_unix_thread_x86_32::__data_size, bState); - setLineEditsReadOnly(g_lineEdit_mach_unix_thread_x86_64, - N_mach_unix_thread_x86_64::__data_size, bState); - setLineEditsReadOnly(g_lineEdit_mach_unix_thread_arm_32, - N_mach_unix_thread_arm_32::__data_size, bState); - setLineEditsReadOnly(g_lineEdit_mach_unix_thread_arm_64, - N_mach_unix_thread_arm_64::__data_size, bState); - setLineEditsReadOnly(g_lineEdit_mach_unix_thread_m68k_32, - N_mach_unix_thread_m68k_32::__data_size, bState); - setLineEditsReadOnly(g_lineEdit_mach_unix_thread_ppc_32, - N_mach_unix_thread_ppc_32::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_mach_header, N_mach_header::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_mach_dyld_info_only, N_mach_dyld_info::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_mach_uuid, N_mach_uuid::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_mach_dylinker, N_mach_dylinker::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_mach_rpath, N_mach_rpath::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_mach_symtab, N_mach_symtab::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_mach_dysymtab, N_mach_dysymtab::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_mach_version_min, N_mach_version_min::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_mach_build_version, N_mach_build_version::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_mach_source_version, N_mach_source_version::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_mach_encryption_info, N_mach_encryption_info::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_mach_function_starts, N_mach_linkedit_data::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_mach_data_in_code, N_mach_linkedit_data::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_mach_code_signature, N_mach_linkedit_data::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_mach_SuperBlob, N_mach_SuperBlob::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_mach_main, N_mach_main::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_mach_unix_thread, N_mach_unix_thread::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_mach_unix_thread_x86_32, N_mach_unix_thread_x86_32::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_mach_unix_thread_x86_64, N_mach_unix_thread_x86_64::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_mach_unix_thread_arm_32, N_mach_unix_thread_arm_32::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_mach_unix_thread_arm_64, N_mach_unix_thread_arm_64::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_mach_unix_thread_m68k_32, N_mach_unix_thread_m68k_32::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_mach_unix_thread_ppc_32, N_mach_unix_thread_ppc_32::__data_size, bState); setComboBoxesReadOnly(g_comboBox, __CB_size, bState); ui->widgetHex->setReadonly(bState); @@ -1780,208 +1432,128 @@ void MACHWidget::setReadonly(bool bState) { } void MACHWidget::blockSignals(bool bState) { - _blockSignals((QObject **)g_lineEdit_mach_header, - N_mach_header::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_mach_dyld_info_only, - N_mach_dyld_info::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_mach_uuid, N_mach_uuid::__data_size, - bState); - _blockSignals((QObject **)g_lineEdit_mach_dylinker, - N_mach_dylinker::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_mach_rpath, N_mach_rpath::__data_size, - bState); - _blockSignals((QObject **)g_lineEdit_mach_symtab, - N_mach_symtab::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_mach_dysymtab, - N_mach_dysymtab::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_mach_version_min, - N_mach_version_min::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_mach_build_version, - N_mach_build_version::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_mach_source_version, - N_mach_source_version::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_mach_encryption_info, - N_mach_encryption_info::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_mach_function_starts, - N_mach_linkedit_data::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_mach_data_in_code, - N_mach_linkedit_data::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_mach_code_signature, - N_mach_linkedit_data::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_mach_SuperBlob, - N_mach_SuperBlob::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_mach_main, N_mach_main::__data_size, - bState); - _blockSignals((QObject **)g_lineEdit_mach_unix_thread, - N_mach_unix_thread::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_mach_unix_thread_x86_32, - N_mach_unix_thread_x86_32::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_mach_unix_thread_x86_64, - N_mach_unix_thread_x86_64::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_mach_unix_thread_arm_32, - N_mach_unix_thread_arm_32::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_mach_unix_thread_arm_64, - N_mach_unix_thread_arm_64::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_mach_unix_thread_m68k_32, - N_mach_unix_thread_m68k_32::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_mach_unix_thread_ppc_32, - N_mach_unix_thread_ppc_32::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_mach_header, N_mach_header::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_mach_dyld_info_only, N_mach_dyld_info::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_mach_uuid, N_mach_uuid::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_mach_dylinker, N_mach_dylinker::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_mach_rpath, N_mach_rpath::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_mach_symtab, N_mach_symtab::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_mach_dysymtab, N_mach_dysymtab::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_mach_version_min, N_mach_version_min::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_mach_build_version, N_mach_build_version::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_mach_source_version, N_mach_source_version::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_mach_encryption_info, N_mach_encryption_info::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_mach_function_starts, N_mach_linkedit_data::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_mach_data_in_code, N_mach_linkedit_data::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_mach_code_signature, N_mach_linkedit_data::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_mach_SuperBlob, N_mach_SuperBlob::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_mach_main, N_mach_main::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_mach_unix_thread, N_mach_unix_thread::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_mach_unix_thread_x86_32, N_mach_unix_thread_x86_32::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_mach_unix_thread_x86_64, N_mach_unix_thread_x86_64::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_mach_unix_thread_arm_32, N_mach_unix_thread_arm_32::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_mach_unix_thread_arm_64, N_mach_unix_thread_arm_64::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_mach_unix_thread_m68k_32, N_mach_unix_thread_m68k_32::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_mach_unix_thread_ppc_32, N_mach_unix_thread_ppc_32::__data_size, bState); _blockSignals((QObject **)g_comboBox, __CB_size, bState); } void MACHWidget::adjustHeaderTable(int nType, QTableWidget *pTableWidget) { - XBinary::MODE mode = XMACH::getMode(getDevice(), getOptions().bIsImage, - getOptions().nImageBase); + XBinary::MODE mode = XMACH::getMode(getDevice(), getOptions().bIsImage, getOptions().nImageBase); - pTableWidget->setColumnWidth(HEADER_COLUMN_OFFSET, - getColumnWidth(this, CW_UINT16, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_TYPE, - getColumnWidth(this, CW_TYPE, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_OFFSET, getColumnWidth(this, CW_UINT16, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_TYPE, getColumnWidth(this, CW_TYPE, mode)); switch (nType) { case SMACH::TYPE_mach_header: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); break; case SMACH::TYPE_mach_dyld_info_only: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); break; case SMACH::TYPE_mach_source_version: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT64, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT64, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); break; case SMACH::TYPE_mach_symtab: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); break; case SMACH::TYPE_mach_dysymtab: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); break; case SMACH::TYPE_mach_version_min: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); break; case SMACH::TYPE_mach_encryption_info: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); break; case SMACH::TYPE_mach_function_starts: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); break; case SMACH::TYPE_mach_data_in_code: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); break; case SMACH::TYPE_mach_code_signature: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); break; case SMACH::TYPE_mach_main: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT64, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT64, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); break; case SMACH::TYPE_mach_unix_thread: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); break; case SMACH::TYPE_mach_unix_thread_x86_32: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); break; case SMACH::TYPE_mach_unix_thread_x86_64: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT64, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT64, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); break; case SMACH::TYPE_mach_unix_thread_arm_32: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); break; case SMACH::TYPE_mach_unix_thread_arm_64: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT64, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT64, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); break; case SMACH::TYPE_mach_unix_thread_m68k_32: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); break; case SMACH::TYPE_mach_unix_thread_ppc_32: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGSHORT, mode)); break; } } @@ -2061,16 +1633,9 @@ void MACHWidget::_showInHexWindow(qint64 nOffset, qint64 nSize) { } void MACHWidget::reloadData() { - qint32 nType = ui->treeWidgetNavi->currentItem() - ->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_TYPE) - .toInt(); - qint64 nDataOffset = - ui->treeWidgetNavi->currentItem() - ->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET) - .toLongLong(); - qint64 nDataSize = ui->treeWidgetNavi->currentItem() - ->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE) - .toLongLong(); + qint32 nType = ui->treeWidgetNavi->currentItem()->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_TYPE).toInt(); + qint64 nDataOffset = ui->treeWidgetNavi->currentItem()->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET).toLongLong(); + qint64 nDataSize = ui->treeWidgetNavi->currentItem()->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE).toLongLong(); QString sInit = getInitString(ui->treeWidgetNavi->currentItem()); @@ -2081,8 +1646,7 @@ void MACHWidget::reloadData() { if (mach.isValid()) { if (nType == SMACH::TYPE_INFO) { if (!isInitPresent(sInit)) { - ui->widgetInfo->setData(getDevice(), mach.getFileType(), "Info", - true); + ui->widgetInfo->setData(getDevice(), mach.getFileType(), "Info", true); } } else if (nType == SMACH::TYPE_VIRUSTOTAL) { if (!isInitPresent(sInit)) { @@ -2111,8 +1675,7 @@ void MACHWidget::reloadData() { } } else if (nType == SMACH::TYPE_HASH) { if (!isInitPresent(sInit)) { - ui->widgetHash->setData(getDevice(), mach.getFileType(), 0, -1, - true); + ui->widgetHash->setData(getDevice(), mach.getFileType(), 0, -1, true); } } else if (nType == SMACH::TYPE_STRINGS) { if (!isInitPresent(sInit)) { @@ -2131,8 +1694,7 @@ void MACHWidget::reloadData() { SearchSignaturesWidget::OPTIONS signaturesOptions = {}; signaturesOptions.bMenu_Hex = true; - ui->widgetSignatures->setData(getDevice(), mach.getFileType(), - signaturesOptions, false); + ui->widgetSignatures->setData(getDevice(), mach.getFileType(), signaturesOptions, false); } } else if (nType == SMACH::TYPE_MEMORYMAP) { if (!isInitPresent(sInit)) { @@ -2140,1681 +1702,927 @@ void MACHWidget::reloadData() { } } else if (nType == SMACH::TYPE_ENTROPY) { if (!isInitPresent(sInit)) { - ui->widgetEntropy->setData(getDevice(), 0, getDevice()->size(), - mach.getFileType(), true); + ui->widgetEntropy->setData(getDevice(), 0, getDevice()->size(), mach.getFileType(), true); } } else if (nType == SMACH::TYPE_HEURISTICSCAN) { if (!isInitPresent(sInit)) { - ui->widgetHeuristicScan->setData(getDevice(), true, - mach.getFileType()); + ui->widgetHeuristicScan->setData(getDevice(), true, mach.getFileType()); } } else if (nType == SMACH::TYPE_mach_header) { if (!isInitPresent(sInit)) { if (!mach.is64()) { - createHeaderTable( - SMACH::TYPE_mach_header, ui->tableWidget_mach_header, - N_mach_header::records32, g_lineEdit_mach_header, - N_mach_header::__data_size - 1, 0); + createHeaderTable(SMACH::TYPE_mach_header, ui->tableWidget_mach_header, N_mach_header::records32, g_lineEdit_mach_header, + N_mach_header::__data_size - 1, 0); } else { - createHeaderTable( - SMACH::TYPE_mach_header, ui->tableWidget_mach_header, - N_mach_header::records64, g_lineEdit_mach_header, - N_mach_header::__data_size, 0); + createHeaderTable(SMACH::TYPE_mach_header, ui->tableWidget_mach_header, N_mach_header::records64, g_lineEdit_mach_header, + N_mach_header::__data_size, 0); } - g_comboBox[CB_mach_header_magic] = createComboBox( - ui->tableWidget_mach_header, XMACH::getHeaderMagicsS(), - SMACH::TYPE_mach_header, N_mach_header::magic, - XComboBoxEx::CBTYPE_LIST); - g_comboBox[CB_mach_header_cputype] = createComboBox( - ui->tableWidget_mach_header, XMACH::getHeaderCpuTypesS(), - SMACH::TYPE_mach_header, N_mach_header::cputype, - XComboBoxEx::CBTYPE_LIST); - g_comboBox[CB_mach_header_cpusubtype] = createComboBox( - ui->tableWidget_mach_header, - XMACH::getHeaderCpuSubTypesS(mach.getHeader_cputype()), - SMACH::TYPE_mach_header, N_mach_header::cpusubtype, - XComboBoxEx::CBTYPE_LIST); - g_comboBox[CB_mach_header_filetype] = createComboBox( - ui->tableWidget_mach_header, XMACH::getHeaderFileTypesS(), - SMACH::TYPE_mach_header, N_mach_header::filetype, - XComboBoxEx::CBTYPE_LIST); - g_comboBox[CB_mach_header_flags] = createComboBox( - ui->tableWidget_mach_header, XMACH::getHeaderFlagsS(), - SMACH::TYPE_mach_header, N_mach_header::flags, - XComboBoxEx::CBTYPE_FLAGS); + g_comboBox[CB_mach_header_magic] = createComboBox(ui->tableWidget_mach_header, XMACH::getHeaderMagicsS(), SMACH::TYPE_mach_header, + N_mach_header::magic, XComboBoxEx::CBTYPE_LIST); + g_comboBox[CB_mach_header_cputype] = createComboBox(ui->tableWidget_mach_header, XMACH::getHeaderCpuTypesS(), SMACH::TYPE_mach_header, + N_mach_header::cputype, XComboBoxEx::CBTYPE_LIST); + g_comboBox[CB_mach_header_cpusubtype] = createComboBox(ui->tableWidget_mach_header, XMACH::getHeaderCpuSubTypesS(mach.getHeader_cputype()), + SMACH::TYPE_mach_header, N_mach_header::cpusubtype, XComboBoxEx::CBTYPE_LIST); + g_comboBox[CB_mach_header_filetype] = createComboBox(ui->tableWidget_mach_header, XMACH::getHeaderFileTypesS(), SMACH::TYPE_mach_header, + N_mach_header::filetype, XComboBoxEx::CBTYPE_LIST); + g_comboBox[CB_mach_header_flags] = createComboBox(ui->tableWidget_mach_header, XMACH::getHeaderFlagsS(), SMACH::TYPE_mach_header, + N_mach_header::flags, XComboBoxEx::CBTYPE_FLAGS); blockSignals(true); - g_lineEdit_mach_header[N_mach_header::magic]->setValue( - mach.getHeader_magic()); - g_lineEdit_mach_header[N_mach_header::cputype]->setValue( - mach.getHeader_cputype()); - g_lineEdit_mach_header[N_mach_header::cpusubtype]->setValue( - mach.getHeader_cpusubtype()); - g_lineEdit_mach_header[N_mach_header::filetype]->setValue( - mach.getHeader_filetype()); - g_lineEdit_mach_header[N_mach_header::ncmds]->setValue( - mach.getHeader_ncmds()); - g_lineEdit_mach_header[N_mach_header::sizeofcmds]->setValue( - mach.getHeader_sizeofcmds()); - g_lineEdit_mach_header[N_mach_header::flags]->setValue( - mach.getHeader_flags()); + g_lineEdit_mach_header[N_mach_header::magic]->setValue(mach.getHeader_magic()); + g_lineEdit_mach_header[N_mach_header::cputype]->setValue(mach.getHeader_cputype()); + g_lineEdit_mach_header[N_mach_header::cpusubtype]->setValue(mach.getHeader_cpusubtype()); + g_lineEdit_mach_header[N_mach_header::filetype]->setValue(mach.getHeader_filetype()); + g_lineEdit_mach_header[N_mach_header::ncmds]->setValue(mach.getHeader_ncmds()); + g_lineEdit_mach_header[N_mach_header::sizeofcmds]->setValue(mach.getHeader_sizeofcmds()); + g_lineEdit_mach_header[N_mach_header::flags]->setValue(mach.getHeader_flags()); if (mach.is64()) { - g_lineEdit_mach_header[N_mach_header::reserved]->setValue( - mach.getHeader_reserved()); + g_lineEdit_mach_header[N_mach_header::reserved]->setValue(mach.getHeader_reserved()); } - g_comboBox[CB_mach_header_magic]->setValue( - mach.getHeader_magic()); - g_comboBox[CB_mach_header_cputype]->setValue( - (quint32)mach.getHeader_cputype()); - g_comboBox[CB_mach_header_cpusubtype]->setValue( - (quint32)mach.getHeader_cpusubtype()); - g_comboBox[CB_mach_header_filetype]->setValue( - (quint32)mach.getHeader_filetype()); - g_comboBox[CB_mach_header_flags]->setValue( - (quint32)mach.getHeader_flags()); + g_comboBox[CB_mach_header_magic]->setValue(mach.getHeader_magic()); + g_comboBox[CB_mach_header_cputype]->setValue((quint32)mach.getHeader_cputype()); + g_comboBox[CB_mach_header_cpusubtype]->setValue((quint32)mach.getHeader_cpusubtype()); + g_comboBox[CB_mach_header_filetype]->setValue((quint32)mach.getHeader_filetype()); + g_comboBox[CB_mach_header_flags]->setValue((quint32)mach.getHeader_flags()); qint64 nOffset = mach.getHeaderOffset(); qint64 nSize = mach.getHeaderSize(); - loadHexSubdevice(nOffset, nSize, nOffset, - &g_subDevice[SMACH::TYPE_mach_header], - ui->widgetHex_mach_header); + loadHexSubdevice(nOffset, nSize, nOffset, &g_subDevice[SMACH::TYPE_mach_header], ui->widgetHex_mach_header); blockSignals(false); } } else if (nType == SMACH::TYPE_mach_commands) { if (!isInitPresent(sInit)) { - MACHProcessData machProcessData( - SMACH::TYPE_mach_commands, - &tvModel[SMACH::TYPE_mach_commands], &mach, 0, 0); + MACHProcessData machProcessData(SMACH::TYPE_mach_commands, &tvModel[SMACH::TYPE_mach_commands], &mach, 0, 0); - ajustTableView(&machProcessData, - &tvModel[SMACH::TYPE_mach_commands], - ui->tableView_commands, nullptr, true); + ajustTableView(&machProcessData, &tvModel[SMACH::TYPE_mach_commands], ui->tableView_commands, nullptr, true); - connect(ui->tableView_commands->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTableView_commands_currentRowChanged( - QModelIndex, QModelIndex))); + connect(ui->tableView_commands->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTableView_commands_currentRowChanged(QModelIndex, QModelIndex))); if (tvModel[SMACH::TYPE_mach_commands]->rowCount()) { - ui->tableView_commands->setCurrentIndex( - ui->tableView_commands->model()->index(0, 0)); + ui->tableView_commands->setCurrentIndex(ui->tableView_commands->model()->index(0, 0)); } } } else if (nType == SMACH::TYPE_mach_segments) { if (!isInitPresent(sInit)) { - MACHProcessData machProcessData( - SMACH::TYPE_mach_segments, - &tvModel[SMACH::TYPE_mach_segments], &mach, 0, 0); + MACHProcessData machProcessData(SMACH::TYPE_mach_segments, &tvModel[SMACH::TYPE_mach_segments], &mach, 0, 0); - ajustTableView(&machProcessData, - &tvModel[SMACH::TYPE_mach_segments], - ui->tableView_segments, nullptr, false); + ajustTableView(&machProcessData, &tvModel[SMACH::TYPE_mach_segments], ui->tableView_segments, nullptr, false); - connect(ui->tableView_segments->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTableView_segments_currentRowChanged( - QModelIndex, QModelIndex))); + connect(ui->tableView_segments->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTableView_segments_currentRowChanged(QModelIndex, QModelIndex))); if (tvModel[SMACH::TYPE_mach_segments]->rowCount()) { - ui->tableView_segments->setCurrentIndex( - ui->tableView_segments->model()->index(0, 0)); + ui->tableView_segments->setCurrentIndex(ui->tableView_segments->model()->index(0, 0)); } } } else if (nType == SMACH::TYPE_mach_sections) { if (!isInitPresent(sInit)) { - MACHProcessData machProcessData( - SMACH::TYPE_mach_sections, - &tvModel[SMACH::TYPE_mach_sections], &mach, 0, 0); + MACHProcessData machProcessData(SMACH::TYPE_mach_sections, &tvModel[SMACH::TYPE_mach_sections], &mach, 0, 0); - ajustTableView(&machProcessData, - &tvModel[SMACH::TYPE_mach_sections], - ui->tableView_sections, nullptr, false); + ajustTableView(&machProcessData, &tvModel[SMACH::TYPE_mach_sections], ui->tableView_sections, nullptr, false); - connect(ui->tableView_sections->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTableView_sections_currentRowChanged( - QModelIndex, QModelIndex))); + connect(ui->tableView_sections->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTableView_sections_currentRowChanged(QModelIndex, QModelIndex))); if (tvModel[SMACH::TYPE_mach_sections]->rowCount()) { - ui->tableView_sections->setCurrentIndex( - ui->tableView_sections->model()->index(0, 0)); + ui->tableView_sections->setCurrentIndex(ui->tableView_sections->model()->index(0, 0)); } } } else if (nType == SMACH::TYPE_mach_libraries) { if (!isInitPresent(sInit)) { - MACHProcessData machProcessData( - SMACH::TYPE_mach_libraries, - &tvModel[SMACH::TYPE_mach_libraries], &mach, 0, 0); + MACHProcessData machProcessData(SMACH::TYPE_mach_libraries, &tvModel[SMACH::TYPE_mach_libraries], &mach, 0, 0); - ajustTableView(&machProcessData, - &tvModel[SMACH::TYPE_mach_libraries], - ui->tableView_libraries, nullptr, true); + ajustTableView(&machProcessData, &tvModel[SMACH::TYPE_mach_libraries], ui->tableView_libraries, nullptr, true); - connect(ui->tableView_libraries->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTableView_libraries_currentRowChanged( - QModelIndex, QModelIndex))); + connect(ui->tableView_libraries->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTableView_libraries_currentRowChanged(QModelIndex, QModelIndex))); if (tvModel[SMACH::TYPE_mach_libraries]->rowCount()) { - ui->tableView_libraries->setCurrentIndex( - ui->tableView_libraries->model()->index(0, 0)); + ui->tableView_libraries->setCurrentIndex(ui->tableView_libraries->model()->index(0, 0)); } } } else if (nType == SMACH::TYPE_mach_weak_libraries) { if (!isInitPresent(sInit)) { - MACHProcessData machProcessData( - SMACH::TYPE_mach_weak_libraries, - &tvModel[SMACH::TYPE_mach_weak_libraries], &mach, 0, 0); + MACHProcessData machProcessData(SMACH::TYPE_mach_weak_libraries, &tvModel[SMACH::TYPE_mach_weak_libraries], &mach, 0, 0); - ajustTableView(&machProcessData, - &tvModel[SMACH::TYPE_mach_weak_libraries], - ui->tableView_weak_libraries, nullptr, true); + ajustTableView(&machProcessData, &tvModel[SMACH::TYPE_mach_weak_libraries], ui->tableView_weak_libraries, nullptr, true); - connect(ui->tableView_weak_libraries->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTableView_weak_libraries_currentRowChanged( - QModelIndex, QModelIndex))); + connect(ui->tableView_weak_libraries->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTableView_weak_libraries_currentRowChanged(QModelIndex, QModelIndex))); if (tvModel[SMACH::TYPE_mach_weak_libraries]->rowCount()) { - ui->tableView_weak_libraries->setCurrentIndex( - ui->tableView_weak_libraries->model()->index(0, 0)); + ui->tableView_weak_libraries->setCurrentIndex(ui->tableView_weak_libraries->model()->index(0, 0)); } } } else if (nType == SMACH::TYPE_mach_id_library) { if (!isInitPresent(sInit)) { - MACHProcessData machProcessData( - SMACH::TYPE_mach_id_library, - &tvModel[SMACH::TYPE_mach_id_library], &mach, 0, 0); + MACHProcessData machProcessData(SMACH::TYPE_mach_id_library, &tvModel[SMACH::TYPE_mach_id_library], &mach, 0, 0); - ajustTableView(&machProcessData, - &tvModel[SMACH::TYPE_mach_id_library], - ui->tableView_id_library, nullptr, true); + ajustTableView(&machProcessData, &tvModel[SMACH::TYPE_mach_id_library], ui->tableView_id_library, nullptr, true); - connect(ui->tableView_id_library->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTableView_id_library_currentRowChanged( - QModelIndex, QModelIndex))); + connect(ui->tableView_id_library->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTableView_id_library_currentRowChanged(QModelIndex, QModelIndex))); if (tvModel[SMACH::TYPE_mach_id_library]->rowCount()) { - ui->tableView_id_library->setCurrentIndex( - ui->tableView_id_library->model()->index(0, 0)); + ui->tableView_id_library->setCurrentIndex(ui->tableView_id_library->model()->index(0, 0)); } } } else if (nType == SMACH::TYPE_mach_LOADFVMLIB) { if (!isInitPresent(sInit)) { - MACHProcessData machProcessData( - SMACH::TYPE_mach_LOADFVMLIB, - &tvModel[SMACH::TYPE_mach_LOADFVMLIB], &mach, 0, 0); + MACHProcessData machProcessData(SMACH::TYPE_mach_LOADFVMLIB, &tvModel[SMACH::TYPE_mach_LOADFVMLIB], &mach, 0, 0); - ajustTableView(&machProcessData, - &tvModel[SMACH::TYPE_mach_LOADFVMLIB], - ui->tableView_LOADFVMLIB, nullptr, true); + ajustTableView(&machProcessData, &tvModel[SMACH::TYPE_mach_LOADFVMLIB], ui->tableView_LOADFVMLIB, nullptr, true); - connect(ui->tableView_LOADFVMLIB->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTableView_LOADFVMLIB_currentRowChanged( - QModelIndex, QModelIndex))); + connect(ui->tableView_LOADFVMLIB->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTableView_LOADFVMLIB_currentRowChanged(QModelIndex, QModelIndex))); if (tvModel[SMACH::TYPE_mach_LOADFVMLIB]->rowCount()) { - ui->tableView_LOADFVMLIB->setCurrentIndex( - ui->tableView_LOADFVMLIB->model()->index(0, 0)); + ui->tableView_LOADFVMLIB->setCurrentIndex(ui->tableView_LOADFVMLIB->model()->index(0, 0)); } } } else if (nType == SMACH::TYPE_mach_IDFVMLIB) { if (!isInitPresent(sInit)) { - MACHProcessData machProcessData( - SMACH::TYPE_mach_IDFVMLIB, - &tvModel[SMACH::TYPE_mach_IDFVMLIB], &mach, 0, 0); + MACHProcessData machProcessData(SMACH::TYPE_mach_IDFVMLIB, &tvModel[SMACH::TYPE_mach_IDFVMLIB], &mach, 0, 0); - ajustTableView(&machProcessData, - &tvModel[SMACH::TYPE_mach_IDFVMLIB], - ui->tableView_IDFVMLIB, nullptr, true); + ajustTableView(&machProcessData, &tvModel[SMACH::TYPE_mach_IDFVMLIB], ui->tableView_IDFVMLIB, nullptr, true); - connect(ui->tableView_IDFVMLIB->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTableView_IDFVMLIB_currentRowChanged( - QModelIndex, QModelIndex))); + connect(ui->tableView_IDFVMLIB->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTableView_IDFVMLIB_currentRowChanged(QModelIndex, QModelIndex))); if (tvModel[SMACH::TYPE_mach_IDFVMLIB]->rowCount()) { - ui->tableView_IDFVMLIB->setCurrentIndex( - ui->tableView_IDFVMLIB->model()->index(0, 0)); + ui->tableView_IDFVMLIB->setCurrentIndex(ui->tableView_IDFVMLIB->model()->index(0, 0)); } } } else if (nType == SMACH::TYPE_mach_dyld_info_only) { if (!isInitPresent(sInit)) { - createHeaderTable( - SMACH::TYPE_mach_dyld_info_only, - ui->tableWidget_dyld_info_only, N_mach_dyld_info::records, - g_lineEdit_mach_dyld_info_only, - N_mach_dyld_info::__data_size, 0, nDataOffset); - - g_invWidget[INV_rebase_off] = createInvWidget( - ui->tableWidget_dyld_info_only, - SMACH::TYPE_mach_dyld_info_only, - N_mach_dyld_info::rebase_off, InvWidget::TYPE_HEX); - g_invWidget[INV_bind_off] = createInvWidget( - ui->tableWidget_dyld_info_only, - SMACH::TYPE_mach_dyld_info_only, N_mach_dyld_info::bind_off, - InvWidget::TYPE_HEX); - g_invWidget[INV_weak_bind_off] = createInvWidget( - ui->tableWidget_dyld_info_only, - SMACH::TYPE_mach_dyld_info_only, - N_mach_dyld_info::weak_bind_off, InvWidget::TYPE_HEX); - g_invWidget[INV_lazy_bind_off] = createInvWidget( - ui->tableWidget_dyld_info_only, - SMACH::TYPE_mach_dyld_info_only, - N_mach_dyld_info::lazy_bind_off, InvWidget::TYPE_HEX); - g_invWidget[INV_export_off] = createInvWidget( - ui->tableWidget_dyld_info_only, - SMACH::TYPE_mach_dyld_info_only, - N_mach_dyld_info::export_off, InvWidget::TYPE_HEX); + createHeaderTable(SMACH::TYPE_mach_dyld_info_only, ui->tableWidget_dyld_info_only, N_mach_dyld_info::records, g_lineEdit_mach_dyld_info_only, + N_mach_dyld_info::__data_size, 0, nDataOffset); + + g_invWidget[INV_rebase_off] = + createInvWidget(ui->tableWidget_dyld_info_only, SMACH::TYPE_mach_dyld_info_only, N_mach_dyld_info::rebase_off, InvWidget::TYPE_HEX); + g_invWidget[INV_bind_off] = + createInvWidget(ui->tableWidget_dyld_info_only, SMACH::TYPE_mach_dyld_info_only, N_mach_dyld_info::bind_off, InvWidget::TYPE_HEX); + g_invWidget[INV_weak_bind_off] = + createInvWidget(ui->tableWidget_dyld_info_only, SMACH::TYPE_mach_dyld_info_only, N_mach_dyld_info::weak_bind_off, InvWidget::TYPE_HEX); + g_invWidget[INV_lazy_bind_off] = + createInvWidget(ui->tableWidget_dyld_info_only, SMACH::TYPE_mach_dyld_info_only, N_mach_dyld_info::lazy_bind_off, InvWidget::TYPE_HEX); + g_invWidget[INV_export_off] = + createInvWidget(ui->tableWidget_dyld_info_only, SMACH::TYPE_mach_dyld_info_only, N_mach_dyld_info::export_off, InvWidget::TYPE_HEX); blockSignals(true); - XMACH_DEF::dyld_info_command dyld_info = - mach._read_dyld_info_command(nDataOffset); - - g_lineEdit_mach_dyld_info_only[N_mach_dyld_info::rebase_off] - ->setValue(dyld_info.rebase_off); - g_lineEdit_mach_dyld_info_only[N_mach_dyld_info::rebase_size] - ->setValue(dyld_info.rebase_size); - g_lineEdit_mach_dyld_info_only[N_mach_dyld_info::bind_off] - ->setValue(dyld_info.bind_off); - g_lineEdit_mach_dyld_info_only[N_mach_dyld_info::bind_size] - ->setValue(dyld_info.bind_size); - g_lineEdit_mach_dyld_info_only[N_mach_dyld_info::weak_bind_off] - ->setValue(dyld_info.weak_bind_off); - g_lineEdit_mach_dyld_info_only[N_mach_dyld_info::weak_bind_size] - ->setValue(dyld_info.weak_bind_size); - g_lineEdit_mach_dyld_info_only[N_mach_dyld_info::lazy_bind_off] - ->setValue(dyld_info.lazy_bind_off); - g_lineEdit_mach_dyld_info_only[N_mach_dyld_info::lazy_bind_size] - ->setValue(dyld_info.lazy_bind_size); - g_lineEdit_mach_dyld_info_only[N_mach_dyld_info::export_off] - ->setValue(dyld_info.export_off); - g_lineEdit_mach_dyld_info_only[N_mach_dyld_info::export_size] - ->setValue(dyld_info.export_size); - - g_invWidget[INV_rebase_off]->setOffsetAndSize( - &mach, dyld_info.rebase_off, dyld_info.rebase_size, true); - g_invWidget[INV_bind_off]->setOffsetAndSize( - &mach, dyld_info.bind_off, dyld_info.bind_size, true); - g_invWidget[INV_weak_bind_off]->setOffsetAndSize( - &mach, dyld_info.weak_bind_off, dyld_info.weak_bind_size, - true); - g_invWidget[INV_lazy_bind_off]->setOffsetAndSize( - &mach, dyld_info.lazy_bind_off, dyld_info.lazy_bind_size, - true); - g_invWidget[INV_export_off]->setOffsetAndSize( - &mach, dyld_info.export_off, dyld_info.export_size, true); + XMACH_DEF::dyld_info_command dyld_info = mach._read_dyld_info_command(nDataOffset); + + g_lineEdit_mach_dyld_info_only[N_mach_dyld_info::rebase_off]->setValue(dyld_info.rebase_off); + g_lineEdit_mach_dyld_info_only[N_mach_dyld_info::rebase_size]->setValue(dyld_info.rebase_size); + g_lineEdit_mach_dyld_info_only[N_mach_dyld_info::bind_off]->setValue(dyld_info.bind_off); + g_lineEdit_mach_dyld_info_only[N_mach_dyld_info::bind_size]->setValue(dyld_info.bind_size); + g_lineEdit_mach_dyld_info_only[N_mach_dyld_info::weak_bind_off]->setValue(dyld_info.weak_bind_off); + g_lineEdit_mach_dyld_info_only[N_mach_dyld_info::weak_bind_size]->setValue(dyld_info.weak_bind_size); + g_lineEdit_mach_dyld_info_only[N_mach_dyld_info::lazy_bind_off]->setValue(dyld_info.lazy_bind_off); + g_lineEdit_mach_dyld_info_only[N_mach_dyld_info::lazy_bind_size]->setValue(dyld_info.lazy_bind_size); + g_lineEdit_mach_dyld_info_only[N_mach_dyld_info::export_off]->setValue(dyld_info.export_off); + g_lineEdit_mach_dyld_info_only[N_mach_dyld_info::export_size]->setValue(dyld_info.export_size); + + g_invWidget[INV_rebase_off]->setOffsetAndSize(&mach, dyld_info.rebase_off, dyld_info.rebase_size, true); + g_invWidget[INV_bind_off]->setOffsetAndSize(&mach, dyld_info.bind_off, dyld_info.bind_size, true); + g_invWidget[INV_weak_bind_off]->setOffsetAndSize(&mach, dyld_info.weak_bind_off, dyld_info.weak_bind_size, true); + g_invWidget[INV_lazy_bind_off]->setOffsetAndSize(&mach, dyld_info.lazy_bind_off, dyld_info.lazy_bind_size, true); + g_invWidget[INV_export_off]->setOffsetAndSize(&mach, dyld_info.export_off, dyld_info.export_size, true); qint64 nOffset = nDataOffset; qint64 nSize = mach.get_dyld_info_command_size(); - loadHexSubdevice(nOffset, nSize, nOffset, - &g_subDevice[SMACH::TYPE_mach_dyld_info_only], - ui->widgetHex_dyld_info_only); + loadHexSubdevice(nOffset, nSize, nOffset, &g_subDevice[SMACH::TYPE_mach_dyld_info_only], ui->widgetHex_dyld_info_only); blockSignals(false); } } else if (nType == SMACH::TYPE_mach_uuid) { if (!isInitPresent(sInit)) { - createListTable(SMACH::TYPE_mach_uuid, ui->tableWidget_uuid, - N_mach_uuid::records, g_lineEdit_mach_uuid, - N_mach_uuid::__data_size); + createListTable(SMACH::TYPE_mach_uuid, ui->tableWidget_uuid, N_mach_uuid::records, g_lineEdit_mach_uuid, N_mach_uuid::__data_size); blockSignals(true); - g_lineEdit_mach_uuid[N_mach_uuid::uuid]->setUUID( - mach.getModuleUUID()); + g_lineEdit_mach_uuid[N_mach_uuid::uuid]->setUUID(mach.getModuleUUID()); blockSignals(false); } } else if (nType == SMACH::TYPE_mach_dylinker) { if (!isInitPresent(sInit)) { - createListTable( - SMACH::TYPE_mach_dylinker, ui->tableWidget_dylinker, - N_mach_dylinker::records, g_lineEdit_mach_dylinker, - N_mach_dylinker::__data_size); + createListTable(SMACH::TYPE_mach_dylinker, ui->tableWidget_dylinker, N_mach_dylinker::records, g_lineEdit_mach_dylinker, + N_mach_dylinker::__data_size); blockSignals(true); - g_lineEdit_mach_dylinker[N_mach_dylinker::dylinker] - ->setStringValue( - mach.getLoadDylinker()); // TODO Max Size!!! + g_lineEdit_mach_dylinker[N_mach_dylinker::dylinker]->setStringValue(mach.getLoadDylinker()); // TODO Max Size!!! blockSignals(false); } } else if (nType == SMACH::TYPE_mach_rpath) { if (!isInitPresent(sInit)) { - createListTable(SMACH::TYPE_mach_rpath, ui->tableWidget_rpath, - N_mach_rpath::records, g_lineEdit_mach_rpath, - N_mach_rpath::__data_size); + createListTable(SMACH::TYPE_mach_rpath, ui->tableWidget_rpath, N_mach_rpath::records, g_lineEdit_mach_rpath, N_mach_rpath::__data_size); blockSignals(true); - g_lineEdit_mach_rpath[N_mach_rpath::path]->setStringValue( - mach.getRPath()); // TODO Max Size!!! + g_lineEdit_mach_rpath[N_mach_rpath::path]->setStringValue(mach.getRPath()); // TODO Max Size!!! blockSignals(false); } } else if (nType == SMACH::TYPE_mach_symtab) { if (!isInitPresent(sInit)) { - createHeaderTable( - SMACH::TYPE_mach_symtab, ui->tableWidget_symtab, - N_mach_symtab::records, g_lineEdit_mach_symtab, - N_mach_symtab::__data_size, 0, nDataOffset); - - g_invWidget[INV_symoff] = createInvWidget( - ui->tableWidget_symtab, SMACH::TYPE_mach_symtab, - N_mach_symtab::symoff, InvWidget::TYPE_HEX); - g_invWidget[INV_stroff] = createInvWidget( - ui->tableWidget_symtab, SMACH::TYPE_mach_symtab, - N_mach_symtab::stroff, InvWidget::TYPE_HEX); + createHeaderTable(SMACH::TYPE_mach_symtab, ui->tableWidget_symtab, N_mach_symtab::records, g_lineEdit_mach_symtab, N_mach_symtab::__data_size, + 0, nDataOffset); + + g_invWidget[INV_symoff] = createInvWidget(ui->tableWidget_symtab, SMACH::TYPE_mach_symtab, N_mach_symtab::symoff, InvWidget::TYPE_HEX); + g_invWidget[INV_stroff] = createInvWidget(ui->tableWidget_symtab, SMACH::TYPE_mach_symtab, N_mach_symtab::stroff, InvWidget::TYPE_HEX); blockSignals(true); - XMACH_DEF::symtab_command symtab = - mach._read_symtab_command(nDataOffset); + XMACH_DEF::symtab_command symtab = mach._read_symtab_command(nDataOffset); - g_lineEdit_mach_symtab[N_mach_symtab::symoff]->setValue( - symtab.symoff); - g_lineEdit_mach_symtab[N_mach_symtab::nsyms]->setValue( - symtab.nsyms); - g_lineEdit_mach_symtab[N_mach_symtab::stroff]->setValue( - symtab.stroff); - g_lineEdit_mach_symtab[N_mach_symtab::strsize]->setValue( - symtab.strsize); + g_lineEdit_mach_symtab[N_mach_symtab::symoff]->setValue(symtab.symoff); + g_lineEdit_mach_symtab[N_mach_symtab::nsyms]->setValue(symtab.nsyms); + g_lineEdit_mach_symtab[N_mach_symtab::stroff]->setValue(symtab.stroff); + g_lineEdit_mach_symtab[N_mach_symtab::strsize]->setValue(symtab.strsize); - g_invWidget[INV_symoff]->setOffsetAndSize( - &mach, symtab.symoff, - symtab.nsyms * mach.get_nlist_MODE_size(), true); - g_invWidget[INV_stroff]->setOffsetAndSize(&mach, symtab.stroff, - symtab.strsize, true); + g_invWidget[INV_symoff]->setOffsetAndSize(&mach, symtab.symoff, symtab.nsyms * mach.get_nlist_MODE_size(), true); + g_invWidget[INV_stroff]->setOffsetAndSize(&mach, symtab.stroff, symtab.strsize, true); qint64 nOffset = nDataOffset; qint64 nSize = mach.get_symtab_command_size(); - loadHexSubdevice(nOffset, nSize, nOffset, - &g_subDevice[SMACH::TYPE_mach_symtab], - ui->widgetHex_symtab); + loadHexSubdevice(nOffset, nSize, nOffset, &g_subDevice[SMACH::TYPE_mach_symtab], ui->widgetHex_symtab); blockSignals(false); } } else if (nType == SMACH::TYPE_mach_dysymtab) { if (!isInitPresent(sInit)) { - createHeaderTable( - SMACH::TYPE_mach_dysymtab, ui->tableWidget_dysymtab, - N_mach_dysymtab::records, g_lineEdit_mach_dysymtab, - N_mach_dysymtab::__data_size, 0, nDataOffset); - - g_invWidget[INV_tocoff] = createInvWidget( - ui->tableWidget_dysymtab, SMACH::TYPE_mach_dysymtab, - N_mach_dysymtab::tocoff, InvWidget::TYPE_HEX); - g_invWidget[INV_modtaboff] = createInvWidget( - ui->tableWidget_dysymtab, SMACH::TYPE_mach_dysymtab, - N_mach_dysymtab::modtaboff, InvWidget::TYPE_HEX); - g_invWidget[INV_extrefsymoff] = createInvWidget( - ui->tableWidget_dysymtab, SMACH::TYPE_mach_dysymtab, - N_mach_dysymtab::extrefsymoff, InvWidget::TYPE_HEX); - g_invWidget[INV_indirectsymoff] = createInvWidget( - ui->tableWidget_dysymtab, SMACH::TYPE_mach_dysymtab, - N_mach_dysymtab::indirectsymoff, InvWidget::TYPE_HEX); - g_invWidget[INV_extreloff] = createInvWidget( - ui->tableWidget_dysymtab, SMACH::TYPE_mach_dysymtab, - N_mach_dysymtab::extreloff, InvWidget::TYPE_HEX); - g_invWidget[INV_locreloff] = createInvWidget( - ui->tableWidget_dysymtab, SMACH::TYPE_mach_dysymtab, - N_mach_dysymtab::locreloff, InvWidget::TYPE_HEX); + createHeaderTable(SMACH::TYPE_mach_dysymtab, ui->tableWidget_dysymtab, N_mach_dysymtab::records, g_lineEdit_mach_dysymtab, + N_mach_dysymtab::__data_size, 0, nDataOffset); + + g_invWidget[INV_tocoff] = createInvWidget(ui->tableWidget_dysymtab, SMACH::TYPE_mach_dysymtab, N_mach_dysymtab::tocoff, InvWidget::TYPE_HEX); + g_invWidget[INV_modtaboff] = + createInvWidget(ui->tableWidget_dysymtab, SMACH::TYPE_mach_dysymtab, N_mach_dysymtab::modtaboff, InvWidget::TYPE_HEX); + g_invWidget[INV_extrefsymoff] = + createInvWidget(ui->tableWidget_dysymtab, SMACH::TYPE_mach_dysymtab, N_mach_dysymtab::extrefsymoff, InvWidget::TYPE_HEX); + g_invWidget[INV_indirectsymoff] = + createInvWidget(ui->tableWidget_dysymtab, SMACH::TYPE_mach_dysymtab, N_mach_dysymtab::indirectsymoff, InvWidget::TYPE_HEX); + g_invWidget[INV_extreloff] = + createInvWidget(ui->tableWidget_dysymtab, SMACH::TYPE_mach_dysymtab, N_mach_dysymtab::extreloff, InvWidget::TYPE_HEX); + g_invWidget[INV_locreloff] = + createInvWidget(ui->tableWidget_dysymtab, SMACH::TYPE_mach_dysymtab, N_mach_dysymtab::locreloff, InvWidget::TYPE_HEX); blockSignals(true); - XMACH_DEF::dysymtab_command dysymtab = - mach._read_dysymtab_command(nDataOffset); - - g_lineEdit_mach_dysymtab[N_mach_dysymtab::ilocalsym]->setValue( - dysymtab.ilocalsym); - g_lineEdit_mach_dysymtab[N_mach_dysymtab::nlocalsym]->setValue( - dysymtab.nlocalsym); - g_lineEdit_mach_dysymtab[N_mach_dysymtab::iextdefsym]->setValue( - dysymtab.iextdefsym); - g_lineEdit_mach_dysymtab[N_mach_dysymtab::nextdefsym]->setValue( - dysymtab.nextdefsym); - g_lineEdit_mach_dysymtab[N_mach_dysymtab::iundefsym]->setValue( - dysymtab.iundefsym); - g_lineEdit_mach_dysymtab[N_mach_dysymtab::nundefsym]->setValue( - dysymtab.nundefsym); - g_lineEdit_mach_dysymtab[N_mach_dysymtab::tocoff]->setValue( - dysymtab.tocoff); - g_lineEdit_mach_dysymtab[N_mach_dysymtab::ntoc]->setValue( - dysymtab.ntoc); - g_lineEdit_mach_dysymtab[N_mach_dysymtab::modtaboff]->setValue( - dysymtab.modtaboff); - g_lineEdit_mach_dysymtab[N_mach_dysymtab::nmodtab]->setValue( - dysymtab.nmodtab); - g_lineEdit_mach_dysymtab[N_mach_dysymtab::extrefsymoff] - ->setValue(dysymtab.extrefsymoff); - g_lineEdit_mach_dysymtab[N_mach_dysymtab::nextrefsyms] - ->setValue(dysymtab.nextrefsyms); - g_lineEdit_mach_dysymtab[N_mach_dysymtab::indirectsymoff] - ->setValue(dysymtab.indirectsymoff); - g_lineEdit_mach_dysymtab[N_mach_dysymtab::nindirectsyms] - ->setValue(dysymtab.nindirectsyms); - g_lineEdit_mach_dysymtab[N_mach_dysymtab::extreloff]->setValue( - dysymtab.extreloff); - g_lineEdit_mach_dysymtab[N_mach_dysymtab::nextrel]->setValue( - dysymtab.nextrel); - g_lineEdit_mach_dysymtab[N_mach_dysymtab::locreloff]->setValue( - dysymtab.locreloff); - g_lineEdit_mach_dysymtab[N_mach_dysymtab::nlocrel]->setValue( - dysymtab.nlocrel); - - g_invWidget[INV_tocoff]->setOffsetAndSize( - &mach, dysymtab.tocoff, 0, true); - g_invWidget[INV_modtaboff]->setOffsetAndSize( - &mach, dysymtab.modtaboff, 0, true); - g_invWidget[INV_extrefsymoff]->setOffsetAndSize( - &mach, dysymtab.extrefsymoff, 0, true); - g_invWidget[INV_indirectsymoff]->setOffsetAndSize( - &mach, dysymtab.indirectsymoff, 0, true); - g_invWidget[INV_extreloff]->setOffsetAndSize( - &mach, dysymtab.extreloff, 0, true); - g_invWidget[INV_locreloff]->setOffsetAndSize( - &mach, dysymtab.locreloff, 0, true); + XMACH_DEF::dysymtab_command dysymtab = mach._read_dysymtab_command(nDataOffset); + + g_lineEdit_mach_dysymtab[N_mach_dysymtab::ilocalsym]->setValue(dysymtab.ilocalsym); + g_lineEdit_mach_dysymtab[N_mach_dysymtab::nlocalsym]->setValue(dysymtab.nlocalsym); + g_lineEdit_mach_dysymtab[N_mach_dysymtab::iextdefsym]->setValue(dysymtab.iextdefsym); + g_lineEdit_mach_dysymtab[N_mach_dysymtab::nextdefsym]->setValue(dysymtab.nextdefsym); + g_lineEdit_mach_dysymtab[N_mach_dysymtab::iundefsym]->setValue(dysymtab.iundefsym); + g_lineEdit_mach_dysymtab[N_mach_dysymtab::nundefsym]->setValue(dysymtab.nundefsym); + g_lineEdit_mach_dysymtab[N_mach_dysymtab::tocoff]->setValue(dysymtab.tocoff); + g_lineEdit_mach_dysymtab[N_mach_dysymtab::ntoc]->setValue(dysymtab.ntoc); + g_lineEdit_mach_dysymtab[N_mach_dysymtab::modtaboff]->setValue(dysymtab.modtaboff); + g_lineEdit_mach_dysymtab[N_mach_dysymtab::nmodtab]->setValue(dysymtab.nmodtab); + g_lineEdit_mach_dysymtab[N_mach_dysymtab::extrefsymoff]->setValue(dysymtab.extrefsymoff); + g_lineEdit_mach_dysymtab[N_mach_dysymtab::nextrefsyms]->setValue(dysymtab.nextrefsyms); + g_lineEdit_mach_dysymtab[N_mach_dysymtab::indirectsymoff]->setValue(dysymtab.indirectsymoff); + g_lineEdit_mach_dysymtab[N_mach_dysymtab::nindirectsyms]->setValue(dysymtab.nindirectsyms); + g_lineEdit_mach_dysymtab[N_mach_dysymtab::extreloff]->setValue(dysymtab.extreloff); + g_lineEdit_mach_dysymtab[N_mach_dysymtab::nextrel]->setValue(dysymtab.nextrel); + g_lineEdit_mach_dysymtab[N_mach_dysymtab::locreloff]->setValue(dysymtab.locreloff); + g_lineEdit_mach_dysymtab[N_mach_dysymtab::nlocrel]->setValue(dysymtab.nlocrel); + + g_invWidget[INV_tocoff]->setOffsetAndSize(&mach, dysymtab.tocoff, 0, true); + g_invWidget[INV_modtaboff]->setOffsetAndSize(&mach, dysymtab.modtaboff, 0, true); + g_invWidget[INV_extrefsymoff]->setOffsetAndSize(&mach, dysymtab.extrefsymoff, 0, true); + g_invWidget[INV_indirectsymoff]->setOffsetAndSize(&mach, dysymtab.indirectsymoff, 0, true); + g_invWidget[INV_extreloff]->setOffsetAndSize(&mach, dysymtab.extreloff, 0, true); + g_invWidget[INV_locreloff]->setOffsetAndSize(&mach, dysymtab.locreloff, 0, true); qint64 nOffset = nDataOffset; qint64 nSize = mach.get_dysymtab_command_size(); - loadHexSubdevice(nOffset, nSize, nOffset, - &g_subDevice[SMACH::TYPE_mach_dysymtab], - ui->widgetHex_dysymtab); + loadHexSubdevice(nOffset, nSize, nOffset, &g_subDevice[SMACH::TYPE_mach_dysymtab], ui->widgetHex_dysymtab); blockSignals(false); } } else if (nType == SMACH::TYPE_mach_version_min) { if (!isInitPresent(sInit)) { - createHeaderTable( - SMACH::TYPE_mach_version_min, ui->tableWidget_version_min, - N_mach_version_min::records, g_lineEdit_mach_version_min, - N_mach_version_min::__data_size, 0, nDataOffset); + createHeaderTable(SMACH::TYPE_mach_version_min, ui->tableWidget_version_min, N_mach_version_min::records, g_lineEdit_mach_version_min, + N_mach_version_min::__data_size, 0, nDataOffset); blockSignals(true); - XMACH_DEF::version_min_command version_min = - mach._read_version_min_command(nDataOffset); + XMACH_DEF::version_min_command version_min = mach._read_version_min_command(nDataOffset); - g_lineEdit_mach_version_min[N_mach_version_min::version] - ->setValue(version_min.version); - g_lineEdit_mach_version_min[N_mach_version_min::sdk]->setValue( - version_min.sdk); + g_lineEdit_mach_version_min[N_mach_version_min::version]->setValue(version_min.version); + g_lineEdit_mach_version_min[N_mach_version_min::sdk]->setValue(version_min.sdk); - addComment( - ui->tableWidget_version_min, N_mach_version_min::version, - HEADER_COLUMN_COMMENT, - XBinary::fullVersionDwordToString(version_min.version)); - addComment(ui->tableWidget_version_min, N_mach_version_min::sdk, - HEADER_COLUMN_COMMENT, - XBinary::fullVersionDwordToString(version_min.sdk)); + addComment(ui->tableWidget_version_min, N_mach_version_min::version, HEADER_COLUMN_COMMENT, + XBinary::fullVersionDwordToString(version_min.version)); + addComment(ui->tableWidget_version_min, N_mach_version_min::sdk, HEADER_COLUMN_COMMENT, XBinary::fullVersionDwordToString(version_min.sdk)); qint64 nOffset = nDataOffset; qint64 nSize = mach.get_version_min_command_size(); - loadHexSubdevice(nOffset, nSize, nOffset, - &g_subDevice[SMACH::TYPE_mach_version_min], - ui->widgetHex_version_min); + loadHexSubdevice(nOffset, nSize, nOffset, &g_subDevice[SMACH::TYPE_mach_version_min], ui->widgetHex_version_min); blockSignals(false); } } else if (nType == SMACH::TYPE_mach_build_version) { if (!isInitPresent(sInit)) { - createHeaderTable(SMACH::TYPE_mach_build_version, - ui->tableWidget_build_version, - N_mach_build_version::records, - g_lineEdit_mach_build_version, - N_mach_build_version::__data_size, 0, - nDataOffset); + createHeaderTable(SMACH::TYPE_mach_build_version, ui->tableWidget_build_version, N_mach_build_version::records, g_lineEdit_mach_build_version, + N_mach_build_version::__data_size, 0, nDataOffset); blockSignals(true); - XMACH_DEF::build_version_command build_version = - mach._read_build_version_command(nDataOffset); - - g_lineEdit_mach_build_version[N_mach_build_version::platform] - ->setValue(build_version.platform); - g_lineEdit_mach_build_version[N_mach_build_version::minos] - ->setValue(build_version.minos); - g_lineEdit_mach_build_version[N_mach_build_version::sdk] - ->setValue(build_version.sdk); - g_lineEdit_mach_build_version[N_mach_build_version::ntools] - ->setValue(build_version.ntools); - - addComment( - ui->tableWidget_build_version, N_mach_build_version::minos, - HEADER_COLUMN_COMMENT, - XBinary::fullVersionDwordToString(build_version.minos)); - addComment( - ui->tableWidget_build_version, N_mach_build_version::sdk, - HEADER_COLUMN_COMMENT, - XBinary::fullVersionDwordToString(build_version.sdk)); + XMACH_DEF::build_version_command build_version = mach._read_build_version_command(nDataOffset); + + g_lineEdit_mach_build_version[N_mach_build_version::platform]->setValue(build_version.platform); + g_lineEdit_mach_build_version[N_mach_build_version::minos]->setValue(build_version.minos); + g_lineEdit_mach_build_version[N_mach_build_version::sdk]->setValue(build_version.sdk); + g_lineEdit_mach_build_version[N_mach_build_version::ntools]->setValue(build_version.ntools); + + addComment(ui->tableWidget_build_version, N_mach_build_version::minos, HEADER_COLUMN_COMMENT, + XBinary::fullVersionDwordToString(build_version.minos)); + addComment(ui->tableWidget_build_version, N_mach_build_version::sdk, HEADER_COLUMN_COMMENT, + XBinary::fullVersionDwordToString(build_version.sdk)); qint64 nOffset = nDataOffset; qint64 nSize = mach.get_build_version_command_size(); - loadHexSubdevice(nOffset, nSize, nOffset, - &g_subDevice[SMACH::TYPE_mach_build_version], - ui->widgetHex_build_version); + loadHexSubdevice(nOffset, nSize, nOffset, &g_subDevice[SMACH::TYPE_mach_build_version], ui->widgetHex_build_version); blockSignals(false); } } else if (nType == SMACH::TYPE_mach_source_version) { if (!isInitPresent(sInit)) { - createHeaderTable(SMACH::TYPE_mach_source_version, - ui->tableWidget_source_version, - N_mach_source_version::records, - g_lineEdit_mach_source_version, - N_mach_source_version::__data_size, 0, - nDataOffset); + createHeaderTable(SMACH::TYPE_mach_source_version, ui->tableWidget_source_version, N_mach_source_version::records, + g_lineEdit_mach_source_version, N_mach_source_version::__data_size, 0, nDataOffset); blockSignals(true); - XMACH_DEF::source_version_command source_version = - mach._read_source_version_command(nDataOffset); + XMACH_DEF::source_version_command source_version = mach._read_source_version_command(nDataOffset); - g_lineEdit_mach_source_version[N_mach_source_version::version] - ->setValue(source_version.version); + g_lineEdit_mach_source_version[N_mach_source_version::version]->setValue(source_version.version); qint64 nOffset = nDataOffset; qint64 nSize = mach.get_source_version_command_size(); - loadHexSubdevice(nOffset, nSize, nOffset, - &g_subDevice[SMACH::TYPE_mach_source_version], - ui->widgetHex_source_version); + loadHexSubdevice(nOffset, nSize, nOffset, &g_subDevice[SMACH::TYPE_mach_source_version], ui->widgetHex_source_version); blockSignals(false); } } else if (nType == SMACH::TYPE_mach_encryption_info) { if (!isInitPresent(sInit)) { if (nDataSize == mach.get_encryption_info_command_64_size()) { - createHeaderTable(SMACH::TYPE_mach_encryption_info, - ui->tableWidget_encryption_info, - N_mach_encryption_info::records64, - g_lineEdit_mach_encryption_info, - N_mach_encryption_info::__data_size, 0, - nDataOffset); - - g_invWidget[INV_cryptoff] = createInvWidget( - ui->tableWidget_encryption_info, - SMACH::TYPE_mach_encryption_info, - N_mach_encryption_info::cryptoff, InvWidget::TYPE_HEX); + createHeaderTable(SMACH::TYPE_mach_encryption_info, ui->tableWidget_encryption_info, N_mach_encryption_info::records64, + g_lineEdit_mach_encryption_info, N_mach_encryption_info::__data_size, 0, nDataOffset); + + g_invWidget[INV_cryptoff] = createInvWidget(ui->tableWidget_encryption_info, SMACH::TYPE_mach_encryption_info, + N_mach_encryption_info::cryptoff, InvWidget::TYPE_HEX); blockSignals(true); - XMACH_DEF::encryption_info_command_64 encryption_info = - mach._read_encryption_info_command_64(nDataOffset); - - g_lineEdit_mach_encryption_info - [N_mach_encryption_info::cryptoff] - ->setValue(encryption_info.cryptoff); - g_lineEdit_mach_encryption_info - [N_mach_encryption_info::cryptsize] - ->setValue(encryption_info.cryptsize); - g_lineEdit_mach_encryption_info - [N_mach_encryption_info::cryptid] - ->setValue(encryption_info.cryptid); - g_lineEdit_mach_encryption_info[N_mach_encryption_info::pad] - ->setValue(encryption_info.pad); - - g_invWidget[INV_cryptoff]->setOffsetAndSize( - &mach, encryption_info.cryptoff, - encryption_info.cryptsize, true); + XMACH_DEF::encryption_info_command_64 encryption_info = mach._read_encryption_info_command_64(nDataOffset); + + g_lineEdit_mach_encryption_info[N_mach_encryption_info::cryptoff]->setValue(encryption_info.cryptoff); + g_lineEdit_mach_encryption_info[N_mach_encryption_info::cryptsize]->setValue(encryption_info.cryptsize); + g_lineEdit_mach_encryption_info[N_mach_encryption_info::cryptid]->setValue(encryption_info.cryptid); + g_lineEdit_mach_encryption_info[N_mach_encryption_info::pad]->setValue(encryption_info.pad); + + g_invWidget[INV_cryptoff]->setOffsetAndSize(&mach, encryption_info.cryptoff, encryption_info.cryptsize, true); } else { - createHeaderTable(SMACH::TYPE_mach_encryption_info, - ui->tableWidget_encryption_info, - N_mach_encryption_info::records32, - g_lineEdit_mach_encryption_info, - N_mach_encryption_info::__data_size - 1, - 0, nDataOffset); - - g_invWidget[INV_cryptoff] = createInvWidget( - ui->tableWidget_encryption_info, - SMACH::TYPE_mach_encryption_info, - N_mach_encryption_info::cryptoff, InvWidget::TYPE_HEX); + createHeaderTable(SMACH::TYPE_mach_encryption_info, ui->tableWidget_encryption_info, N_mach_encryption_info::records32, + g_lineEdit_mach_encryption_info, N_mach_encryption_info::__data_size - 1, 0, nDataOffset); + + g_invWidget[INV_cryptoff] = createInvWidget(ui->tableWidget_encryption_info, SMACH::TYPE_mach_encryption_info, + N_mach_encryption_info::cryptoff, InvWidget::TYPE_HEX); blockSignals(true); - XMACH_DEF::encryption_info_command encryption_info = - mach._read_encryption_info_command(nDataOffset); - - g_lineEdit_mach_encryption_info - [N_mach_encryption_info::cryptoff] - ->setValue(encryption_info.cryptoff); - g_lineEdit_mach_encryption_info - [N_mach_encryption_info::cryptsize] - ->setValue(encryption_info.cryptsize); - g_lineEdit_mach_encryption_info - [N_mach_encryption_info::cryptid] - ->setValue(encryption_info.cryptid); - - g_invWidget[INV_cryptoff]->setOffsetAndSize( - &mach, encryption_info.cryptoff, - encryption_info.cryptsize, true); + XMACH_DEF::encryption_info_command encryption_info = mach._read_encryption_info_command(nDataOffset); + + g_lineEdit_mach_encryption_info[N_mach_encryption_info::cryptoff]->setValue(encryption_info.cryptoff); + g_lineEdit_mach_encryption_info[N_mach_encryption_info::cryptsize]->setValue(encryption_info.cryptsize); + g_lineEdit_mach_encryption_info[N_mach_encryption_info::cryptid]->setValue(encryption_info.cryptid); + + g_invWidget[INV_cryptoff]->setOffsetAndSize(&mach, encryption_info.cryptoff, encryption_info.cryptsize, true); } qint64 nOffset = nDataOffset; qint64 nSize = nDataSize; - loadHexSubdevice(nOffset, nSize, nOffset, - &g_subDevice[SMACH::TYPE_mach_encryption_info], - ui->widgetHex_encryption_info); + loadHexSubdevice(nOffset, nSize, nOffset, &g_subDevice[SMACH::TYPE_mach_encryption_info], ui->widgetHex_encryption_info); blockSignals(false); } } else if (nType == SMACH::TYPE_mach_function_starts) { if (!isInitPresent(sInit)) { - createHeaderTable(SMACH::TYPE_mach_function_starts, - ui->tableWidget_function_starts, - N_mach_linkedit_data::records, - g_lineEdit_mach_function_starts, - N_mach_linkedit_data::__data_size, 0, - nDataOffset); + createHeaderTable(SMACH::TYPE_mach_function_starts, ui->tableWidget_function_starts, N_mach_linkedit_data::records, + g_lineEdit_mach_function_starts, N_mach_linkedit_data::__data_size, 0, nDataOffset); - g_invWidget[INV_FUNCTION_STARTS_dataoff] = createInvWidget( - ui->tableWidget_function_starts, - SMACH::TYPE_mach_function_starts, - N_mach_linkedit_data::dataoff, InvWidget::TYPE_HEX); + g_invWidget[INV_FUNCTION_STARTS_dataoff] = + createInvWidget(ui->tableWidget_function_starts, SMACH::TYPE_mach_function_starts, N_mach_linkedit_data::dataoff, InvWidget::TYPE_HEX); blockSignals(true); - XMACH_DEF::linkedit_data_command linkedit_data = - mach._read_linkedit_data_command(nDataOffset); + XMACH_DEF::linkedit_data_command linkedit_data = mach._read_linkedit_data_command(nDataOffset); - g_lineEdit_mach_function_starts[N_mach_linkedit_data::dataoff] - ->setValue(linkedit_data.dataoff); - g_lineEdit_mach_function_starts[N_mach_linkedit_data::datasize] - ->setValue(linkedit_data.datasize); + g_lineEdit_mach_function_starts[N_mach_linkedit_data::dataoff]->setValue(linkedit_data.dataoff); + g_lineEdit_mach_function_starts[N_mach_linkedit_data::datasize]->setValue(linkedit_data.datasize); - g_invWidget[INV_FUNCTION_STARTS_dataoff]->setOffsetAndSize( - &mach, linkedit_data.dataoff, linkedit_data.datasize, true); + g_invWidget[INV_FUNCTION_STARTS_dataoff]->setOffsetAndSize(&mach, linkedit_data.dataoff, linkedit_data.datasize, true); qint64 nOffset = nDataOffset; qint64 nSize = mach.get_linkedit_data_command_size(); - loadHexSubdevice(nOffset, nSize, nOffset, - &g_subDevice[SMACH::TYPE_mach_function_starts], - ui->widgetHex_function_starts); + loadHexSubdevice(nOffset, nSize, nOffset, &g_subDevice[SMACH::TYPE_mach_function_starts], ui->widgetHex_function_starts); blockSignals(false); } } else if (nType == SMACH::TYPE_mach_data_in_code) { if (!isInitPresent(sInit)) { - createHeaderTable( - SMACH::TYPE_mach_data_in_code, ui->tableWidget_data_in_code, - N_mach_linkedit_data::records, g_lineEdit_mach_data_in_code, - N_mach_linkedit_data::__data_size, 0, nDataOffset); + createHeaderTable(SMACH::TYPE_mach_data_in_code, ui->tableWidget_data_in_code, N_mach_linkedit_data::records, g_lineEdit_mach_data_in_code, + N_mach_linkedit_data::__data_size, 0, nDataOffset); - g_invWidget[INV_DATA_IN_CODE_dataoff] = createInvWidget( - ui->tableWidget_data_in_code, SMACH::TYPE_mach_data_in_code, - N_mach_linkedit_data::dataoff, InvWidget::TYPE_HEX); + g_invWidget[INV_DATA_IN_CODE_dataoff] = + createInvWidget(ui->tableWidget_data_in_code, SMACH::TYPE_mach_data_in_code, N_mach_linkedit_data::dataoff, InvWidget::TYPE_HEX); blockSignals(true); - XMACH_DEF::linkedit_data_command linkedit_data = - mach._read_linkedit_data_command(nDataOffset); + XMACH_DEF::linkedit_data_command linkedit_data = mach._read_linkedit_data_command(nDataOffset); - g_lineEdit_mach_data_in_code[N_mach_linkedit_data::dataoff] - ->setValue(linkedit_data.dataoff); - g_lineEdit_mach_data_in_code[N_mach_linkedit_data::datasize] - ->setValue(linkedit_data.datasize); + g_lineEdit_mach_data_in_code[N_mach_linkedit_data::dataoff]->setValue(linkedit_data.dataoff); + g_lineEdit_mach_data_in_code[N_mach_linkedit_data::datasize]->setValue(linkedit_data.datasize); - g_invWidget[INV_DATA_IN_CODE_dataoff]->setOffsetAndSize( - &mach, linkedit_data.dataoff, linkedit_data.datasize, true); + g_invWidget[INV_DATA_IN_CODE_dataoff]->setOffsetAndSize(&mach, linkedit_data.dataoff, linkedit_data.datasize, true); qint64 nOffset = nDataOffset; qint64 nSize = mach.get_linkedit_data_command_size(); - loadHexSubdevice(nOffset, nSize, nOffset, - &g_subDevice[SMACH::TYPE_mach_data_in_code], - ui->widgetHex_data_in_code); + loadHexSubdevice(nOffset, nSize, nOffset, &g_subDevice[SMACH::TYPE_mach_data_in_code], ui->widgetHex_data_in_code); blockSignals(false); } } else if (nType == SMACH::TYPE_mach_code_signature) { if (!isInitPresent(sInit)) { - createHeaderTable(SMACH::TYPE_mach_code_signature, - ui->tableWidget_code_signature, - N_mach_linkedit_data::records, - g_lineEdit_mach_code_signature, - N_mach_linkedit_data::__data_size, 0, - nDataOffset); + createHeaderTable(SMACH::TYPE_mach_code_signature, ui->tableWidget_code_signature, N_mach_linkedit_data::records, + g_lineEdit_mach_code_signature, N_mach_linkedit_data::__data_size, 0, nDataOffset); - g_invWidget[INV_CODE_SIGNATURE_dataoff] = createInvWidget( - ui->tableWidget_code_signature, - SMACH::TYPE_mach_code_signature, - N_mach_linkedit_data::dataoff, InvWidget::TYPE_HEX); + g_invWidget[INV_CODE_SIGNATURE_dataoff] = + createInvWidget(ui->tableWidget_code_signature, SMACH::TYPE_mach_code_signature, N_mach_linkedit_data::dataoff, InvWidget::TYPE_HEX); blockSignals(true); - XMACH_DEF::linkedit_data_command linkedit_data = - mach._read_linkedit_data_command(nDataOffset); + XMACH_DEF::linkedit_data_command linkedit_data = mach._read_linkedit_data_command(nDataOffset); - g_lineEdit_mach_code_signature[N_mach_linkedit_data::dataoff] - ->setValue(linkedit_data.dataoff); - g_lineEdit_mach_code_signature[N_mach_linkedit_data::datasize] - ->setValue(linkedit_data.datasize); + g_lineEdit_mach_code_signature[N_mach_linkedit_data::dataoff]->setValue(linkedit_data.dataoff); + g_lineEdit_mach_code_signature[N_mach_linkedit_data::datasize]->setValue(linkedit_data.datasize); - g_invWidget[INV_CODE_SIGNATURE_dataoff]->setOffsetAndSize( - &mach, linkedit_data.dataoff, linkedit_data.datasize, true); + g_invWidget[INV_CODE_SIGNATURE_dataoff]->setOffsetAndSize(&mach, linkedit_data.dataoff, linkedit_data.datasize, true); qint64 nOffset = nDataOffset; qint64 nSize = mach.get_linkedit_data_command_size(); - loadHexSubdevice(nOffset, nSize, nOffset, - &g_subDevice[SMACH::TYPE_mach_code_signature], - ui->widgetHex_code_signature); + loadHexSubdevice(nOffset, nSize, nOffset, &g_subDevice[SMACH::TYPE_mach_code_signature], ui->widgetHex_code_signature); blockSignals(false); } } else if (nType == SMACH::TYPE_mach_SuperBlob) { if (!isInitPresent(sInit)) { - createHeaderTable( - SMACH::TYPE_mach_SuperBlob, ui->tableWidget_SuperBlob, - N_mach_SuperBlob::records, g_lineEdit_mach_SuperBlob, - N_mach_SuperBlob::__data_size, 0, nDataOffset); + createHeaderTable(SMACH::TYPE_mach_SuperBlob, ui->tableWidget_SuperBlob, N_mach_SuperBlob::records, g_lineEdit_mach_SuperBlob, + N_mach_SuperBlob::__data_size, 0, nDataOffset); blockSignals(true); - XMACH_DEF::__SC_SuperBlob super_blob = - mach._read_SC_SuperBlob(nDataOffset); + XMACH_DEF::__SC_SuperBlob super_blob = mach._read_SC_SuperBlob(nDataOffset); - g_lineEdit_mach_SuperBlob[N_mach_SuperBlob::magic]->setValue( - super_blob.magic); - g_lineEdit_mach_SuperBlob[N_mach_SuperBlob::length]->setValue( - super_blob.length); - g_lineEdit_mach_SuperBlob[N_mach_SuperBlob::count]->setValue( - super_blob.count); + g_lineEdit_mach_SuperBlob[N_mach_SuperBlob::magic]->setValue(super_blob.magic); + g_lineEdit_mach_SuperBlob[N_mach_SuperBlob::length]->setValue(super_blob.length); + g_lineEdit_mach_SuperBlob[N_mach_SuperBlob::count]->setValue(super_blob.count); qint64 nOffset = nDataOffset; qint64 nSize = super_blob.length; - loadHexSubdevice(nOffset, nSize, nOffset, - &g_subDevice[SMACH::TYPE_mach_SuperBlob], - ui->widgetHex_SuperBlob); + loadHexSubdevice(nOffset, nSize, nOffset, &g_subDevice[SMACH::TYPE_mach_SuperBlob], ui->widgetHex_SuperBlob); blockSignals(false); } } else if (nType == SMACH::TYPE_mach_main) { if (!isInitPresent(sInit)) { - createHeaderTable(SMACH::TYPE_mach_main, ui->tableWidget_main, - N_mach_main::records, g_lineEdit_mach_main, - N_mach_main::__data_size, 0, nDataOffset); + createHeaderTable(SMACH::TYPE_mach_main, ui->tableWidget_main, N_mach_main::records, g_lineEdit_mach_main, N_mach_main::__data_size, 0, + nDataOffset); - g_invWidget[INV_MAIN_entryoff] = createInvWidget( - ui->tableWidget_main, SMACH::TYPE_mach_main, - N_mach_main::entryoff, InvWidget::TYPE_DISASM); + g_invWidget[INV_MAIN_entryoff] = createInvWidget(ui->tableWidget_main, SMACH::TYPE_mach_main, N_mach_main::entryoff, InvWidget::TYPE_DISASM); blockSignals(true); - XMACH_DEF::entry_point_command entry_point = - mach._read_entry_point_command(nDataOffset); + XMACH_DEF::entry_point_command entry_point = mach._read_entry_point_command(nDataOffset); - g_lineEdit_mach_main[N_mach_main::entryoff]->setValue( - entry_point.entryoff); - g_lineEdit_mach_main[N_mach_main::stacksize]->setValue( - entry_point.stacksize); + g_lineEdit_mach_main[N_mach_main::entryoff]->setValue(entry_point.entryoff); + g_lineEdit_mach_main[N_mach_main::stacksize]->setValue(entry_point.stacksize); - g_invWidget[INV_MAIN_entryoff]->setOffsetAndSize( - &mach, entry_point.entryoff, 0, true); + g_invWidget[INV_MAIN_entryoff]->setOffsetAndSize(&mach, entry_point.entryoff, 0, true); qint64 nOffset = nDataOffset; qint64 nSize = mach.get_entry_point_command_size(); - loadHexSubdevice(nOffset, nSize, nOffset, - &g_subDevice[SMACH::TYPE_mach_main], - ui->widgetHex_main); + loadHexSubdevice(nOffset, nSize, nOffset, &g_subDevice[SMACH::TYPE_mach_main], ui->widgetHex_main); blockSignals(false); } } else if (nType == SMACH::TYPE_mach_unix_thread) { if (!isInitPresent(sInit)) { - createHeaderTable( - SMACH::TYPE_mach_unix_thread, ui->tableWidget_unix_thread, - N_mach_unix_thread::records, g_lineEdit_mach_unix_thread, - N_mach_unix_thread::__data_size, 0, nDataOffset); + createHeaderTable(SMACH::TYPE_mach_unix_thread, ui->tableWidget_unix_thread, N_mach_unix_thread::records, g_lineEdit_mach_unix_thread, + N_mach_unix_thread::__data_size, 0, nDataOffset); blockSignals(true); - XMACH_DEF::unix_thread_command unix_thread = - mach._read_unix_thread_command(nDataOffset); + XMACH_DEF::unix_thread_command unix_thread = mach._read_unix_thread_command(nDataOffset); - g_lineEdit_mach_unix_thread[N_mach_unix_thread::flavor] - ->setValue(unix_thread.flavor); - g_lineEdit_mach_unix_thread[N_mach_unix_thread::count] - ->setValue(unix_thread.count); + g_lineEdit_mach_unix_thread[N_mach_unix_thread::flavor]->setValue(unix_thread.flavor); + g_lineEdit_mach_unix_thread[N_mach_unix_thread::count]->setValue(unix_thread.count); qint64 nOffset = nDataOffset; qint64 nSize = mach.get_unix_thread_command_size(); - loadHexSubdevice(nOffset, nSize, nOffset, - &g_subDevice[SMACH::TYPE_mach_unix_thread], - ui->widgetHex_unix_thread); + loadHexSubdevice(nOffset, nSize, nOffset, &g_subDevice[SMACH::TYPE_mach_unix_thread], ui->widgetHex_unix_thread); blockSignals(false); } } else if (nType == SMACH::TYPE_mach_unix_thread_x86_32) { if (!isInitPresent(sInit)) { - createHeaderTable(SMACH::TYPE_mach_unix_thread_x86_32, - ui->tableWidget_unix_thread_x86_32, - N_mach_unix_thread_x86_32::records, - g_lineEdit_mach_unix_thread_x86_32, - N_mach_unix_thread_x86_32::__data_size, 0, - nDataOffset); + createHeaderTable(SMACH::TYPE_mach_unix_thread_x86_32, ui->tableWidget_unix_thread_x86_32, N_mach_unix_thread_x86_32::records, + g_lineEdit_mach_unix_thread_x86_32, N_mach_unix_thread_x86_32::__data_size, 0, nDataOffset); blockSignals(true); - XMACH_DEF::x86_thread_state32_t state = - mach._read_x86_thread_state32_t(nDataOffset); - - g_lineEdit_mach_unix_thread_x86_32 - [N_mach_unix_thread_x86_32::eax] - ->setValue(state.eax); - g_lineEdit_mach_unix_thread_x86_32 - [N_mach_unix_thread_x86_32::ebx] - ->setValue(state.ebx); - g_lineEdit_mach_unix_thread_x86_32 - [N_mach_unix_thread_x86_32::ecx] - ->setValue(state.ecx); - g_lineEdit_mach_unix_thread_x86_32 - [N_mach_unix_thread_x86_32::edx] - ->setValue(state.edx); - g_lineEdit_mach_unix_thread_x86_32 - [N_mach_unix_thread_x86_32::edi] - ->setValue(state.edi); - g_lineEdit_mach_unix_thread_x86_32 - [N_mach_unix_thread_x86_32::esi] - ->setValue(state.esi); - g_lineEdit_mach_unix_thread_x86_32 - [N_mach_unix_thread_x86_32::ebp] - ->setValue(state.ebp); - g_lineEdit_mach_unix_thread_x86_32 - [N_mach_unix_thread_x86_32::esp] - ->setValue(state.esp); - g_lineEdit_mach_unix_thread_x86_32 - [N_mach_unix_thread_x86_32::ss] - ->setValue(state.ss); - g_lineEdit_mach_unix_thread_x86_32 - [N_mach_unix_thread_x86_32::eflags] - ->setValue(state.eflags); - g_lineEdit_mach_unix_thread_x86_32 - [N_mach_unix_thread_x86_32::eip] - ->setValue(state.eip); - g_lineEdit_mach_unix_thread_x86_32 - [N_mach_unix_thread_x86_32::cs] - ->setValue(state.cs); - g_lineEdit_mach_unix_thread_x86_32 - [N_mach_unix_thread_x86_32::ds] - ->setValue(state.ds); - g_lineEdit_mach_unix_thread_x86_32 - [N_mach_unix_thread_x86_32::es] - ->setValue(state.es); - g_lineEdit_mach_unix_thread_x86_32 - [N_mach_unix_thread_x86_32::fs] - ->setValue(state.fs); - g_lineEdit_mach_unix_thread_x86_32 - [N_mach_unix_thread_x86_32::gs] - ->setValue(state.gs); + XMACH_DEF::x86_thread_state32_t state = mach._read_x86_thread_state32_t(nDataOffset); + + g_lineEdit_mach_unix_thread_x86_32[N_mach_unix_thread_x86_32::eax]->setValue(state.eax); + g_lineEdit_mach_unix_thread_x86_32[N_mach_unix_thread_x86_32::ebx]->setValue(state.ebx); + g_lineEdit_mach_unix_thread_x86_32[N_mach_unix_thread_x86_32::ecx]->setValue(state.ecx); + g_lineEdit_mach_unix_thread_x86_32[N_mach_unix_thread_x86_32::edx]->setValue(state.edx); + g_lineEdit_mach_unix_thread_x86_32[N_mach_unix_thread_x86_32::edi]->setValue(state.edi); + g_lineEdit_mach_unix_thread_x86_32[N_mach_unix_thread_x86_32::esi]->setValue(state.esi); + g_lineEdit_mach_unix_thread_x86_32[N_mach_unix_thread_x86_32::ebp]->setValue(state.ebp); + g_lineEdit_mach_unix_thread_x86_32[N_mach_unix_thread_x86_32::esp]->setValue(state.esp); + g_lineEdit_mach_unix_thread_x86_32[N_mach_unix_thread_x86_32::ss]->setValue(state.ss); + g_lineEdit_mach_unix_thread_x86_32[N_mach_unix_thread_x86_32::eflags]->setValue(state.eflags); + g_lineEdit_mach_unix_thread_x86_32[N_mach_unix_thread_x86_32::eip]->setValue(state.eip); + g_lineEdit_mach_unix_thread_x86_32[N_mach_unix_thread_x86_32::cs]->setValue(state.cs); + g_lineEdit_mach_unix_thread_x86_32[N_mach_unix_thread_x86_32::ds]->setValue(state.ds); + g_lineEdit_mach_unix_thread_x86_32[N_mach_unix_thread_x86_32::es]->setValue(state.es); + g_lineEdit_mach_unix_thread_x86_32[N_mach_unix_thread_x86_32::fs]->setValue(state.fs); + g_lineEdit_mach_unix_thread_x86_32[N_mach_unix_thread_x86_32::gs]->setValue(state.gs); qint64 nOffset = nDataOffset; qint64 nSize = mach.get_x86_thread_state32_t_size(); - loadHexSubdevice( - nOffset, nSize, nOffset, - &g_subDevice[SMACH::TYPE_mach_unix_thread_x86_32], - ui->widgetHex_unix_thread_x86_32); + loadHexSubdevice(nOffset, nSize, nOffset, &g_subDevice[SMACH::TYPE_mach_unix_thread_x86_32], ui->widgetHex_unix_thread_x86_32); blockSignals(false); } } else if (nType == SMACH::TYPE_mach_unix_thread_x86_64) { if (!isInitPresent(sInit)) { - createHeaderTable(SMACH::TYPE_mach_unix_thread_x86_64, - ui->tableWidget_unix_thread_x86_64, - N_mach_unix_thread_x86_64::records, - g_lineEdit_mach_unix_thread_x86_64, - N_mach_unix_thread_x86_64::__data_size, 0, - nDataOffset); + createHeaderTable(SMACH::TYPE_mach_unix_thread_x86_64, ui->tableWidget_unix_thread_x86_64, N_mach_unix_thread_x86_64::records, + g_lineEdit_mach_unix_thread_x86_64, N_mach_unix_thread_x86_64::__data_size, 0, nDataOffset); blockSignals(true); - XMACH_DEF::x86_thread_state64_t state = - mach._read_x86_thread_state64_t(nDataOffset); - - g_lineEdit_mach_unix_thread_x86_64 - [N_mach_unix_thread_x86_64::rax] - ->setValue(state.rax); - g_lineEdit_mach_unix_thread_x86_64 - [N_mach_unix_thread_x86_64::rbx] - ->setValue(state.rbx); - g_lineEdit_mach_unix_thread_x86_64 - [N_mach_unix_thread_x86_64::rcx] - ->setValue(state.rcx); - g_lineEdit_mach_unix_thread_x86_64 - [N_mach_unix_thread_x86_64::rdx] - ->setValue(state.rdx); - g_lineEdit_mach_unix_thread_x86_64 - [N_mach_unix_thread_x86_64::rdi] - ->setValue(state.rdi); - g_lineEdit_mach_unix_thread_x86_64 - [N_mach_unix_thread_x86_64::rsi] - ->setValue(state.rsi); - g_lineEdit_mach_unix_thread_x86_64 - [N_mach_unix_thread_x86_64::rbp] - ->setValue(state.rbp); - g_lineEdit_mach_unix_thread_x86_64 - [N_mach_unix_thread_x86_64::rsp] - ->setValue(state.rsp); - g_lineEdit_mach_unix_thread_x86_64 - [N_mach_unix_thread_x86_64::r8] - ->setValue(state.r8); - g_lineEdit_mach_unix_thread_x86_64 - [N_mach_unix_thread_x86_64::r9] - ->setValue(state.r9); - g_lineEdit_mach_unix_thread_x86_64 - [N_mach_unix_thread_x86_64::r10] - ->setValue(state.r10); - g_lineEdit_mach_unix_thread_x86_64 - [N_mach_unix_thread_x86_64::r11] - ->setValue(state.r11); - g_lineEdit_mach_unix_thread_x86_64 - [N_mach_unix_thread_x86_64::r12] - ->setValue(state.r12); - g_lineEdit_mach_unix_thread_x86_64 - [N_mach_unix_thread_x86_64::r13] - ->setValue(state.r13); - g_lineEdit_mach_unix_thread_x86_64 - [N_mach_unix_thread_x86_64::r14] - ->setValue(state.r14); - g_lineEdit_mach_unix_thread_x86_64 - [N_mach_unix_thread_x86_64::r15] - ->setValue(state.r15); - g_lineEdit_mach_unix_thread_x86_64 - [N_mach_unix_thread_x86_64::rip] - ->setValue(state.rip); - g_lineEdit_mach_unix_thread_x86_64 - [N_mach_unix_thread_x86_64::rflags] - ->setValue(state.rflags); - g_lineEdit_mach_unix_thread_x86_64 - [N_mach_unix_thread_x86_64::cs] - ->setValue(state.cs); - g_lineEdit_mach_unix_thread_x86_64 - [N_mach_unix_thread_x86_64::fs] - ->setValue(state.fs); - g_lineEdit_mach_unix_thread_x86_64 - [N_mach_unix_thread_x86_64::gs] - ->setValue(state.gs); + XMACH_DEF::x86_thread_state64_t state = mach._read_x86_thread_state64_t(nDataOffset); + + g_lineEdit_mach_unix_thread_x86_64[N_mach_unix_thread_x86_64::rax]->setValue(state.rax); + g_lineEdit_mach_unix_thread_x86_64[N_mach_unix_thread_x86_64::rbx]->setValue(state.rbx); + g_lineEdit_mach_unix_thread_x86_64[N_mach_unix_thread_x86_64::rcx]->setValue(state.rcx); + g_lineEdit_mach_unix_thread_x86_64[N_mach_unix_thread_x86_64::rdx]->setValue(state.rdx); + g_lineEdit_mach_unix_thread_x86_64[N_mach_unix_thread_x86_64::rdi]->setValue(state.rdi); + g_lineEdit_mach_unix_thread_x86_64[N_mach_unix_thread_x86_64::rsi]->setValue(state.rsi); + g_lineEdit_mach_unix_thread_x86_64[N_mach_unix_thread_x86_64::rbp]->setValue(state.rbp); + g_lineEdit_mach_unix_thread_x86_64[N_mach_unix_thread_x86_64::rsp]->setValue(state.rsp); + g_lineEdit_mach_unix_thread_x86_64[N_mach_unix_thread_x86_64::r8]->setValue(state.r8); + g_lineEdit_mach_unix_thread_x86_64[N_mach_unix_thread_x86_64::r9]->setValue(state.r9); + g_lineEdit_mach_unix_thread_x86_64[N_mach_unix_thread_x86_64::r10]->setValue(state.r10); + g_lineEdit_mach_unix_thread_x86_64[N_mach_unix_thread_x86_64::r11]->setValue(state.r11); + g_lineEdit_mach_unix_thread_x86_64[N_mach_unix_thread_x86_64::r12]->setValue(state.r12); + g_lineEdit_mach_unix_thread_x86_64[N_mach_unix_thread_x86_64::r13]->setValue(state.r13); + g_lineEdit_mach_unix_thread_x86_64[N_mach_unix_thread_x86_64::r14]->setValue(state.r14); + g_lineEdit_mach_unix_thread_x86_64[N_mach_unix_thread_x86_64::r15]->setValue(state.r15); + g_lineEdit_mach_unix_thread_x86_64[N_mach_unix_thread_x86_64::rip]->setValue(state.rip); + g_lineEdit_mach_unix_thread_x86_64[N_mach_unix_thread_x86_64::rflags]->setValue(state.rflags); + g_lineEdit_mach_unix_thread_x86_64[N_mach_unix_thread_x86_64::cs]->setValue(state.cs); + g_lineEdit_mach_unix_thread_x86_64[N_mach_unix_thread_x86_64::fs]->setValue(state.fs); + g_lineEdit_mach_unix_thread_x86_64[N_mach_unix_thread_x86_64::gs]->setValue(state.gs); qint64 nOffset = nDataOffset; qint64 nSize = mach.get_x86_thread_state64_t_size(); - loadHexSubdevice( - nOffset, nSize, nOffset, - &g_subDevice[SMACH::TYPE_mach_unix_thread_x86_64], - ui->widgetHex_unix_thread_x86_64); + loadHexSubdevice(nOffset, nSize, nOffset, &g_subDevice[SMACH::TYPE_mach_unix_thread_x86_64], ui->widgetHex_unix_thread_x86_64); blockSignals(false); } } else if (nType == SMACH::TYPE_mach_unix_thread_arm_32) { if (!isInitPresent(sInit)) { - createHeaderTable(SMACH::TYPE_mach_unix_thread_arm_32, - ui->tableWidget_unix_thread_arm_32, - N_mach_unix_thread_arm_32::records, - g_lineEdit_mach_unix_thread_arm_32, - N_mach_unix_thread_arm_32::__data_size, 0, - nDataOffset); + createHeaderTable(SMACH::TYPE_mach_unix_thread_arm_32, ui->tableWidget_unix_thread_arm_32, N_mach_unix_thread_arm_32::records, + g_lineEdit_mach_unix_thread_arm_32, N_mach_unix_thread_arm_32::__data_size, 0, nDataOffset); blockSignals(true); - XMACH_DEF::arm_thread_state32_t state = - mach._read_arm_thread_state32_t(nDataOffset); - - g_lineEdit_mach_unix_thread_arm_32 - [N_mach_unix_thread_arm_32::r0] - ->setValue(state.r[0]); - g_lineEdit_mach_unix_thread_arm_32 - [N_mach_unix_thread_arm_32::r1] - ->setValue(state.r[1]); - g_lineEdit_mach_unix_thread_arm_32 - [N_mach_unix_thread_arm_32::r2] - ->setValue(state.r[2]); - g_lineEdit_mach_unix_thread_arm_32 - [N_mach_unix_thread_arm_32::r3] - ->setValue(state.r[3]); - g_lineEdit_mach_unix_thread_arm_32 - [N_mach_unix_thread_arm_32::r4] - ->setValue(state.r[4]); - g_lineEdit_mach_unix_thread_arm_32 - [N_mach_unix_thread_arm_32::r5] - ->setValue(state.r[5]); - g_lineEdit_mach_unix_thread_arm_32 - [N_mach_unix_thread_arm_32::r6] - ->setValue(state.r[6]); - g_lineEdit_mach_unix_thread_arm_32 - [N_mach_unix_thread_arm_32::r7] - ->setValue(state.r[7]); - g_lineEdit_mach_unix_thread_arm_32 - [N_mach_unix_thread_arm_32::r8] - ->setValue(state.r[8]); - g_lineEdit_mach_unix_thread_arm_32 - [N_mach_unix_thread_arm_32::r9] - ->setValue(state.r[9]); - g_lineEdit_mach_unix_thread_arm_32 - [N_mach_unix_thread_arm_32::r10] - ->setValue(state.r[10]); - g_lineEdit_mach_unix_thread_arm_32 - [N_mach_unix_thread_arm_32::r11] - ->setValue(state.r[11]); - g_lineEdit_mach_unix_thread_arm_32 - [N_mach_unix_thread_arm_32::r12] - ->setValue(state.r[12]); - g_lineEdit_mach_unix_thread_arm_32 - [N_mach_unix_thread_arm_32::sp] - ->setValue(state.sp); - g_lineEdit_mach_unix_thread_arm_32 - [N_mach_unix_thread_arm_32::lr] - ->setValue(state.lr); - g_lineEdit_mach_unix_thread_arm_32 - [N_mach_unix_thread_arm_32::pc] - ->setValue(state.pc); - g_lineEdit_mach_unix_thread_arm_32 - [N_mach_unix_thread_arm_32::cpsr] - ->setValue(state.cpsr); + XMACH_DEF::arm_thread_state32_t state = mach._read_arm_thread_state32_t(nDataOffset); + + g_lineEdit_mach_unix_thread_arm_32[N_mach_unix_thread_arm_32::r0]->setValue(state.r[0]); + g_lineEdit_mach_unix_thread_arm_32[N_mach_unix_thread_arm_32::r1]->setValue(state.r[1]); + g_lineEdit_mach_unix_thread_arm_32[N_mach_unix_thread_arm_32::r2]->setValue(state.r[2]); + g_lineEdit_mach_unix_thread_arm_32[N_mach_unix_thread_arm_32::r3]->setValue(state.r[3]); + g_lineEdit_mach_unix_thread_arm_32[N_mach_unix_thread_arm_32::r4]->setValue(state.r[4]); + g_lineEdit_mach_unix_thread_arm_32[N_mach_unix_thread_arm_32::r5]->setValue(state.r[5]); + g_lineEdit_mach_unix_thread_arm_32[N_mach_unix_thread_arm_32::r6]->setValue(state.r[6]); + g_lineEdit_mach_unix_thread_arm_32[N_mach_unix_thread_arm_32::r7]->setValue(state.r[7]); + g_lineEdit_mach_unix_thread_arm_32[N_mach_unix_thread_arm_32::r8]->setValue(state.r[8]); + g_lineEdit_mach_unix_thread_arm_32[N_mach_unix_thread_arm_32::r9]->setValue(state.r[9]); + g_lineEdit_mach_unix_thread_arm_32[N_mach_unix_thread_arm_32::r10]->setValue(state.r[10]); + g_lineEdit_mach_unix_thread_arm_32[N_mach_unix_thread_arm_32::r11]->setValue(state.r[11]); + g_lineEdit_mach_unix_thread_arm_32[N_mach_unix_thread_arm_32::r12]->setValue(state.r[12]); + g_lineEdit_mach_unix_thread_arm_32[N_mach_unix_thread_arm_32::sp]->setValue(state.sp); + g_lineEdit_mach_unix_thread_arm_32[N_mach_unix_thread_arm_32::lr]->setValue(state.lr); + g_lineEdit_mach_unix_thread_arm_32[N_mach_unix_thread_arm_32::pc]->setValue(state.pc); + g_lineEdit_mach_unix_thread_arm_32[N_mach_unix_thread_arm_32::cpsr]->setValue(state.cpsr); qint64 nOffset = nDataOffset; qint64 nSize = mach.get_arm_thread_state32_t_size(); - loadHexSubdevice( - nOffset, nSize, nOffset, - &g_subDevice[SMACH::TYPE_mach_unix_thread_arm_32], - ui->widgetHex_unix_thread_arm_32); + loadHexSubdevice(nOffset, nSize, nOffset, &g_subDevice[SMACH::TYPE_mach_unix_thread_arm_32], ui->widgetHex_unix_thread_arm_32); blockSignals(false); } } else if (nType == SMACH::TYPE_mach_unix_thread_arm_64) { if (!isInitPresent(sInit)) { - createHeaderTable(SMACH::TYPE_mach_unix_thread_arm_64, - ui->tableWidget_unix_thread_arm_64, - N_mach_unix_thread_arm_64::records, - g_lineEdit_mach_unix_thread_arm_64, - N_mach_unix_thread_arm_64::__data_size, 0, - nDataOffset); + createHeaderTable(SMACH::TYPE_mach_unix_thread_arm_64, ui->tableWidget_unix_thread_arm_64, N_mach_unix_thread_arm_64::records, + g_lineEdit_mach_unix_thread_arm_64, N_mach_unix_thread_arm_64::__data_size, 0, nDataOffset); blockSignals(true); - XMACH_DEF::arm_thread_state64_t state = - mach._read_arm_thread_state64_t(nDataOffset); - - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x0] - ->setValue(state.x[0]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x1] - ->setValue(state.x[1]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x2] - ->setValue(state.x[2]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x3] - ->setValue(state.x[3]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x4] - ->setValue(state.x[4]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x5] - ->setValue(state.x[5]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x6] - ->setValue(state.x[6]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x7] - ->setValue(state.x[7]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x8] - ->setValue(state.x[8]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x9] - ->setValue(state.x[9]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x10] - ->setValue(state.x[10]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x11] - ->setValue(state.x[11]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x12] - ->setValue(state.x[12]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x13] - ->setValue(state.x[13]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x14] - ->setValue(state.x[14]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x15] - ->setValue(state.x[15]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x16] - ->setValue(state.x[16]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x17] - ->setValue(state.x[17]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x18] - ->setValue(state.x[18]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x19] - ->setValue(state.x[19]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x20] - ->setValue(state.x[20]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x21] - ->setValue(state.x[21]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x22] - ->setValue(state.x[22]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x23] - ->setValue(state.x[23]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x24] - ->setValue(state.x[24]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x25] - ->setValue(state.x[25]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x26] - ->setValue(state.x[26]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x27] - ->setValue(state.x[27]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::x28] - ->setValue(state.x[28]); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::fp] - ->setValue(state.fp); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::lr] - ->setValue(state.lr); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::sp] - ->setValue(state.sp); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::pc] - ->setValue(state.pc); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::cpsr] - ->setValue(state.cpsr); - g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::pad] - ->setValue(state.pad); + XMACH_DEF::arm_thread_state64_t state = mach._read_arm_thread_state64_t(nDataOffset); + + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x0]->setValue(state.x[0]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x1]->setValue(state.x[1]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x2]->setValue(state.x[2]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x3]->setValue(state.x[3]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x4]->setValue(state.x[4]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x5]->setValue(state.x[5]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x6]->setValue(state.x[6]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x7]->setValue(state.x[7]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x8]->setValue(state.x[8]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x9]->setValue(state.x[9]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x10]->setValue(state.x[10]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x11]->setValue(state.x[11]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x12]->setValue(state.x[12]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x13]->setValue(state.x[13]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x14]->setValue(state.x[14]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x15]->setValue(state.x[15]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x16]->setValue(state.x[16]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x17]->setValue(state.x[17]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x18]->setValue(state.x[18]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x19]->setValue(state.x[19]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x20]->setValue(state.x[20]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x21]->setValue(state.x[21]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x22]->setValue(state.x[22]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x23]->setValue(state.x[23]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x24]->setValue(state.x[24]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x25]->setValue(state.x[25]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x26]->setValue(state.x[26]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x27]->setValue(state.x[27]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::x28]->setValue(state.x[28]); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::fp]->setValue(state.fp); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::lr]->setValue(state.lr); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::sp]->setValue(state.sp); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::pc]->setValue(state.pc); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::cpsr]->setValue(state.cpsr); + g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::pad]->setValue(state.pad); qint64 nOffset = nDataOffset; qint64 nSize = mach.get_arm_thread_state64_t_size(); - loadHexSubdevice( - nOffset, nSize, nOffset, - &g_subDevice[SMACH::TYPE_mach_unix_thread_arm_64], - ui->widgetHex_unix_thread_arm_64); + loadHexSubdevice(nOffset, nSize, nOffset, &g_subDevice[SMACH::TYPE_mach_unix_thread_arm_64], ui->widgetHex_unix_thread_arm_64); blockSignals(false); } } else if (nType == SMACH::TYPE_mach_unix_thread_m68k_32) { if (!isInitPresent(sInit)) { - createHeaderTable(SMACH::TYPE_mach_unix_thread_m68k_32, - ui->tableWidget_unix_thread_m68k_32, - N_mach_unix_thread_m68k_32::records, - g_lineEdit_mach_unix_thread_m68k_32, - N_mach_unix_thread_m68k_32::__data_size, 0, - nDataOffset); + createHeaderTable(SMACH::TYPE_mach_unix_thread_m68k_32, ui->tableWidget_unix_thread_m68k_32, N_mach_unix_thread_m68k_32::records, + g_lineEdit_mach_unix_thread_m68k_32, N_mach_unix_thread_m68k_32::__data_size, 0, nDataOffset); blockSignals(true); - XMACH_DEF::m68k_thread_state32_t state = - mach._read_m68k_thread_state32_t(nDataOffset); - - g_lineEdit_mach_unix_thread_m68k_32 - [N_mach_unix_thread_m68k_32::dreg0] - ->setValue(state.dreg[0]); - g_lineEdit_mach_unix_thread_m68k_32 - [N_mach_unix_thread_m68k_32::dreg1] - ->setValue(state.dreg[1]); - g_lineEdit_mach_unix_thread_m68k_32 - [N_mach_unix_thread_m68k_32::dreg2] - ->setValue(state.dreg[2]); - g_lineEdit_mach_unix_thread_m68k_32 - [N_mach_unix_thread_m68k_32::dreg3] - ->setValue(state.dreg[3]); - g_lineEdit_mach_unix_thread_m68k_32 - [N_mach_unix_thread_m68k_32::dreg4] - ->setValue(state.dreg[4]); - g_lineEdit_mach_unix_thread_m68k_32 - [N_mach_unix_thread_m68k_32::dreg5] - ->setValue(state.dreg[5]); - g_lineEdit_mach_unix_thread_m68k_32 - [N_mach_unix_thread_m68k_32::dreg6] - ->setValue(state.dreg[6]); - g_lineEdit_mach_unix_thread_m68k_32 - [N_mach_unix_thread_m68k_32::dreg7] - ->setValue(state.dreg[7]); - g_lineEdit_mach_unix_thread_m68k_32 - [N_mach_unix_thread_m68k_32::areg0] - ->setValue(state.areg[0]); - g_lineEdit_mach_unix_thread_m68k_32 - [N_mach_unix_thread_m68k_32::areg1] - ->setValue(state.areg[1]); - g_lineEdit_mach_unix_thread_m68k_32 - [N_mach_unix_thread_m68k_32::areg2] - ->setValue(state.areg[2]); - g_lineEdit_mach_unix_thread_m68k_32 - [N_mach_unix_thread_m68k_32::areg3] - ->setValue(state.areg[3]); - g_lineEdit_mach_unix_thread_m68k_32 - [N_mach_unix_thread_m68k_32::areg4] - ->setValue(state.areg[4]); - g_lineEdit_mach_unix_thread_m68k_32 - [N_mach_unix_thread_m68k_32::areg5] - ->setValue(state.areg[5]); - g_lineEdit_mach_unix_thread_m68k_32 - [N_mach_unix_thread_m68k_32::areg6] - ->setValue(state.areg[6]); - g_lineEdit_mach_unix_thread_m68k_32 - [N_mach_unix_thread_m68k_32::areg7] - ->setValue(state.areg[7]); - g_lineEdit_mach_unix_thread_m68k_32 - [N_mach_unix_thread_m68k_32::pad0] - ->setValue(state.pad0); - g_lineEdit_mach_unix_thread_m68k_32 - [N_mach_unix_thread_m68k_32::sr] - ->setValue(state.sr); - g_lineEdit_mach_unix_thread_m68k_32 - [N_mach_unix_thread_m68k_32::pc] - ->setValue(state.pc); + XMACH_DEF::m68k_thread_state32_t state = mach._read_m68k_thread_state32_t(nDataOffset); + + g_lineEdit_mach_unix_thread_m68k_32[N_mach_unix_thread_m68k_32::dreg0]->setValue(state.dreg[0]); + g_lineEdit_mach_unix_thread_m68k_32[N_mach_unix_thread_m68k_32::dreg1]->setValue(state.dreg[1]); + g_lineEdit_mach_unix_thread_m68k_32[N_mach_unix_thread_m68k_32::dreg2]->setValue(state.dreg[2]); + g_lineEdit_mach_unix_thread_m68k_32[N_mach_unix_thread_m68k_32::dreg3]->setValue(state.dreg[3]); + g_lineEdit_mach_unix_thread_m68k_32[N_mach_unix_thread_m68k_32::dreg4]->setValue(state.dreg[4]); + g_lineEdit_mach_unix_thread_m68k_32[N_mach_unix_thread_m68k_32::dreg5]->setValue(state.dreg[5]); + g_lineEdit_mach_unix_thread_m68k_32[N_mach_unix_thread_m68k_32::dreg6]->setValue(state.dreg[6]); + g_lineEdit_mach_unix_thread_m68k_32[N_mach_unix_thread_m68k_32::dreg7]->setValue(state.dreg[7]); + g_lineEdit_mach_unix_thread_m68k_32[N_mach_unix_thread_m68k_32::areg0]->setValue(state.areg[0]); + g_lineEdit_mach_unix_thread_m68k_32[N_mach_unix_thread_m68k_32::areg1]->setValue(state.areg[1]); + g_lineEdit_mach_unix_thread_m68k_32[N_mach_unix_thread_m68k_32::areg2]->setValue(state.areg[2]); + g_lineEdit_mach_unix_thread_m68k_32[N_mach_unix_thread_m68k_32::areg3]->setValue(state.areg[3]); + g_lineEdit_mach_unix_thread_m68k_32[N_mach_unix_thread_m68k_32::areg4]->setValue(state.areg[4]); + g_lineEdit_mach_unix_thread_m68k_32[N_mach_unix_thread_m68k_32::areg5]->setValue(state.areg[5]); + g_lineEdit_mach_unix_thread_m68k_32[N_mach_unix_thread_m68k_32::areg6]->setValue(state.areg[6]); + g_lineEdit_mach_unix_thread_m68k_32[N_mach_unix_thread_m68k_32::areg7]->setValue(state.areg[7]); + g_lineEdit_mach_unix_thread_m68k_32[N_mach_unix_thread_m68k_32::pad0]->setValue(state.pad0); + g_lineEdit_mach_unix_thread_m68k_32[N_mach_unix_thread_m68k_32::sr]->setValue(state.sr); + g_lineEdit_mach_unix_thread_m68k_32[N_mach_unix_thread_m68k_32::pc]->setValue(state.pc); qint64 nOffset = nDataOffset; qint64 nSize = mach.get_m68k_thread_state32_t_size(); - loadHexSubdevice( - nOffset, nSize, nOffset, - &g_subDevice[SMACH::TYPE_mach_unix_thread_m68k_32], - ui->widgetHex_unix_thread_m68k_32); + loadHexSubdevice(nOffset, nSize, nOffset, &g_subDevice[SMACH::TYPE_mach_unix_thread_m68k_32], ui->widgetHex_unix_thread_m68k_32); blockSignals(false); } } else if (nType == SMACH::TYPE_mach_unix_thread_ppc_32) { if (!isInitPresent(sInit)) { - createHeaderTable(SMACH::TYPE_mach_unix_thread_ppc_32, - ui->tableWidget_unix_thread_ppc_32, - N_mach_unix_thread_ppc_32::records, - g_lineEdit_mach_unix_thread_ppc_32, - N_mach_unix_thread_ppc_32::__data_size, 0, - nDataOffset); + createHeaderTable(SMACH::TYPE_mach_unix_thread_ppc_32, ui->tableWidget_unix_thread_ppc_32, N_mach_unix_thread_ppc_32::records, + g_lineEdit_mach_unix_thread_ppc_32, N_mach_unix_thread_ppc_32::__data_size, 0, nDataOffset); blockSignals(true); - XMACH_DEF::ppc_thread_state32_t state = - mach._read_ppc_thread_state32_t(nDataOffset); - - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::srr0] - ->setValue(state.srr0); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::srr1] - ->setValue(state.srr1); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r0] - ->setValue(state.r[0]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r1] - ->setValue(state.r[1]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r2] - ->setValue(state.r[2]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r3] - ->setValue(state.r[3]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r4] - ->setValue(state.r[4]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r5] - ->setValue(state.r[5]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r6] - ->setValue(state.r[6]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r7] - ->setValue(state.r[7]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r8] - ->setValue(state.r[8]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r9] - ->setValue(state.r[9]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r10] - ->setValue(state.r[10]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r11] - ->setValue(state.r[11]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r12] - ->setValue(state.r[12]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r13] - ->setValue(state.r[13]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r14] - ->setValue(state.r[14]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r15] - ->setValue(state.r[15]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r16] - ->setValue(state.r[16]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r17] - ->setValue(state.r[17]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r18] - ->setValue(state.r[18]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r19] - ->setValue(state.r[19]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r20] - ->setValue(state.r[20]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r21] - ->setValue(state.r[21]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r22] - ->setValue(state.r[22]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r23] - ->setValue(state.r[23]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r24] - ->setValue(state.r[24]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r25] - ->setValue(state.r[25]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r26] - ->setValue(state.r[26]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r27] - ->setValue(state.r[27]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r28] - ->setValue(state.r[28]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r29] - ->setValue(state.r[29]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r30] - ->setValue(state.r[30]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::r31] - ->setValue(state.r[31]); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::ct] - ->setValue(state.ct); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::xer] - ->setValue(state.xer); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::lr] - ->setValue(state.lr); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::ctr] - ->setValue(state.ctr); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::mq] - ->setValue(state.mq); - g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::vrsave] - ->setValue(state.vrsave); + XMACH_DEF::ppc_thread_state32_t state = mach._read_ppc_thread_state32_t(nDataOffset); + + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::srr0]->setValue(state.srr0); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::srr1]->setValue(state.srr1); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r0]->setValue(state.r[0]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r1]->setValue(state.r[1]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r2]->setValue(state.r[2]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r3]->setValue(state.r[3]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r4]->setValue(state.r[4]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r5]->setValue(state.r[5]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r6]->setValue(state.r[6]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r7]->setValue(state.r[7]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r8]->setValue(state.r[8]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r9]->setValue(state.r[9]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r10]->setValue(state.r[10]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r11]->setValue(state.r[11]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r12]->setValue(state.r[12]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r13]->setValue(state.r[13]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r14]->setValue(state.r[14]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r15]->setValue(state.r[15]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r16]->setValue(state.r[16]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r17]->setValue(state.r[17]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r18]->setValue(state.r[18]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r19]->setValue(state.r[19]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r20]->setValue(state.r[20]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r21]->setValue(state.r[21]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r22]->setValue(state.r[22]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r23]->setValue(state.r[23]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r24]->setValue(state.r[24]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r25]->setValue(state.r[25]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r26]->setValue(state.r[26]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r27]->setValue(state.r[27]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r28]->setValue(state.r[28]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r29]->setValue(state.r[29]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r30]->setValue(state.r[30]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::r31]->setValue(state.r[31]); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::ct]->setValue(state.ct); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::xer]->setValue(state.xer); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::lr]->setValue(state.lr); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::ctr]->setValue(state.ctr); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::mq]->setValue(state.mq); + g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::vrsave]->setValue(state.vrsave); qint64 nOffset = nDataOffset; qint64 nSize = mach.get_ppc_thread_state32_t_size(); - loadHexSubdevice( - nOffset, nSize, nOffset, - &g_subDevice[SMACH::TYPE_mach_unix_thread_arm_32], - ui->widgetHex_unix_thread_arm_32); + loadHexSubdevice(nOffset, nSize, nOffset, &g_subDevice[SMACH::TYPE_mach_unix_thread_arm_32], ui->widgetHex_unix_thread_arm_32); blockSignals(false); } } else if (nType == SMACH::TYPE_STRINGTABLE) { if (!isInitPresent(sInit)) { - loadHexSubdevice(nDataOffset, nDataSize, nDataOffset, - &g_subDevice[SMACH::TYPE_STRINGTABLE], - ui->widgetHex_StringTable); + loadHexSubdevice(nDataOffset, nDataSize, nDataOffset, &g_subDevice[SMACH::TYPE_STRINGTABLE], ui->widgetHex_StringTable); } } else if (nType == SMACH::TYPE_SYMBOLTABLE) { if (!isInitPresent(sInit)) { - MACHProcessData machProcessData( - SMACH::TYPE_SYMBOLTABLE, &tvModel[SMACH::TYPE_SYMBOLTABLE], - &mach, nDataOffset, nDataSize); + MACHProcessData machProcessData(SMACH::TYPE_SYMBOLTABLE, &tvModel[SMACH::TYPE_SYMBOLTABLE], &mach, nDataOffset, nDataSize); - ajustTableView(&machProcessData, - &tvModel[SMACH::TYPE_SYMBOLTABLE], - ui->tableView_SymbolTable, nullptr, true); + ajustTableView(&machProcessData, &tvModel[SMACH::TYPE_SYMBOLTABLE], ui->tableView_SymbolTable, nullptr, true); } } else if (nType == SMACH::TYPE_FUNCTIONS) { if (!isInitPresent(sInit)) { - MACHProcessData machProcessData(SMACH::TYPE_FUNCTIONS, - &tvModel[SMACH::TYPE_FUNCTIONS], - &mach, nDataOffset, nDataSize); + MACHProcessData machProcessData(SMACH::TYPE_FUNCTIONS, &tvModel[SMACH::TYPE_FUNCTIONS], &mach, nDataOffset, nDataSize); - ajustTableView(&machProcessData, - &tvModel[SMACH::TYPE_FUNCTIONS], - ui->tableView_Functions, nullptr, false); + ajustTableView(&machProcessData, &tvModel[SMACH::TYPE_FUNCTIONS], ui->tableView_Functions, nullptr, false); } } else if (nType == SMACH::TYPE_DICE) { if (!isInitPresent(sInit)) { - MACHProcessData machProcessData(SMACH::TYPE_DICE, - &tvModel[SMACH::TYPE_DICE], - &mach, nDataOffset, nDataSize); + MACHProcessData machProcessData(SMACH::TYPE_DICE, &tvModel[SMACH::TYPE_DICE], &mach, nDataOffset, nDataSize); - ajustTableView(&machProcessData, &tvModel[SMACH::TYPE_DICE], - ui->tableView_data_in_code_entry, nullptr, - false); + ajustTableView(&machProcessData, &tvModel[SMACH::TYPE_DICE], ui->tableView_data_in_code_entry, nullptr, false); } } else if (nType == SMACH::TYPE_DYLD_INFO_rebase) { if (!isInitPresent(sInit)) { - MACHProcessData machProcessData( - SMACH::TYPE_DYLD_INFO_rebase, - &tvModel[SMACH::TYPE_DYLD_INFO_rebase], &mach, nDataOffset, - nDataSize); - - ajustTableView(&machProcessData, - &tvModel[SMACH::TYPE_DYLD_INFO_rebase], - ui->tableView_DYLD_INFO_rebase, nullptr, true); - - connect(ui->tableView_DYLD_INFO_rebase->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTableView_DYLD_INFO_rebase_currentRowChanged( - QModelIndex, QModelIndex))); - - loadHexSubdevice(nDataOffset, nDataSize, nDataOffset, - &g_subDevice[SMACH::TYPE_DYLD_INFO_rebase], - ui->widgetHex_DYLD_INFO_rebase); + MACHProcessData machProcessData(SMACH::TYPE_DYLD_INFO_rebase, &tvModel[SMACH::TYPE_DYLD_INFO_rebase], &mach, nDataOffset, nDataSize); + + ajustTableView(&machProcessData, &tvModel[SMACH::TYPE_DYLD_INFO_rebase], ui->tableView_DYLD_INFO_rebase, nullptr, true); + + connect(ui->tableView_DYLD_INFO_rebase->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTableView_DYLD_INFO_rebase_currentRowChanged(QModelIndex, QModelIndex))); + + loadHexSubdevice(nDataOffset, nDataSize, nDataOffset, &g_subDevice[SMACH::TYPE_DYLD_INFO_rebase], ui->widgetHex_DYLD_INFO_rebase); } } else if (nType == SMACH::TYPE_DYLD_INFO_bind) { if (!isInitPresent(sInit)) { - MACHProcessData machProcessData( - SMACH::TYPE_DYLD_INFO_bind, - &tvModel[SMACH::TYPE_DYLD_INFO_bind], &mach, nDataOffset, - nDataSize); - - ajustTableView(&machProcessData, - &tvModel[SMACH::TYPE_DYLD_INFO_bind], - ui->tableView_DYLD_INFO_bind, nullptr, true); - - connect(ui->tableView_DYLD_INFO_bind->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTableView_DYLD_INFO_bind_currentRowChanged( - QModelIndex, QModelIndex))); - - loadHexSubdevice(nDataOffset, nDataSize, nDataOffset, - &g_subDevice[SMACH::TYPE_DYLD_INFO_bind], - ui->widgetHex_DYLD_INFO_bind); + MACHProcessData machProcessData(SMACH::TYPE_DYLD_INFO_bind, &tvModel[SMACH::TYPE_DYLD_INFO_bind], &mach, nDataOffset, nDataSize); + + ajustTableView(&machProcessData, &tvModel[SMACH::TYPE_DYLD_INFO_bind], ui->tableView_DYLD_INFO_bind, nullptr, true); + + connect(ui->tableView_DYLD_INFO_bind->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTableView_DYLD_INFO_bind_currentRowChanged(QModelIndex, QModelIndex))); + + loadHexSubdevice(nDataOffset, nDataSize, nDataOffset, &g_subDevice[SMACH::TYPE_DYLD_INFO_bind], ui->widgetHex_DYLD_INFO_bind); } } else if (nType == SMACH::TYPE_DYLD_INFO_weak_bind) { if (!isInitPresent(sInit)) { - MACHProcessData machProcessData( - SMACH::TYPE_DYLD_INFO_weak_bind, - &tvModel[SMACH::TYPE_DYLD_INFO_weak_bind], &mach, - nDataOffset, nDataSize); - - ajustTableView( - &machProcessData, &tvModel[SMACH::TYPE_DYLD_INFO_weak_bind], - ui->tableView_DYLD_INFO_weak_bind, nullptr, true); - - connect(ui->tableView_DYLD_INFO_weak_bind->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTableView_DYLD_INFO_weak_bind_currentRowChanged( - QModelIndex, QModelIndex))); - - loadHexSubdevice(nDataOffset, nDataSize, nDataOffset, - &g_subDevice[SMACH::TYPE_DYLD_INFO_weak_bind], - ui->widgetHex_DYLD_INFO_weak_bind); + MACHProcessData machProcessData(SMACH::TYPE_DYLD_INFO_weak_bind, &tvModel[SMACH::TYPE_DYLD_INFO_weak_bind], &mach, nDataOffset, nDataSize); + + ajustTableView(&machProcessData, &tvModel[SMACH::TYPE_DYLD_INFO_weak_bind], ui->tableView_DYLD_INFO_weak_bind, nullptr, true); + + connect(ui->tableView_DYLD_INFO_weak_bind->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTableView_DYLD_INFO_weak_bind_currentRowChanged(QModelIndex, QModelIndex))); + + loadHexSubdevice(nDataOffset, nDataSize, nDataOffset, &g_subDevice[SMACH::TYPE_DYLD_INFO_weak_bind], ui->widgetHex_DYLD_INFO_weak_bind); } } else if (nType == SMACH::TYPE_DYLD_INFO_lazy_bind) { if (!isInitPresent(sInit)) { - MACHProcessData machProcessData( - SMACH::TYPE_DYLD_INFO_lazy_bind, - &tvModel[SMACH::TYPE_DYLD_INFO_lazy_bind], &mach, - nDataOffset, nDataSize); - - ajustTableView( - &machProcessData, &tvModel[SMACH::TYPE_DYLD_INFO_lazy_bind], - ui->tableView_DYLD_INFO_lazy_bind, nullptr, true); - - connect(ui->tableView_DYLD_INFO_lazy_bind->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTableView_DYLD_INFO_lazy_bind_currentRowChanged( - QModelIndex, QModelIndex))); - - loadHexSubdevice(nDataOffset, nDataSize, nDataOffset, - &g_subDevice[SMACH::TYPE_DYLD_INFO_lazy_bind], - ui->widgetHex_DYLD_INFO_lazy_bind); + MACHProcessData machProcessData(SMACH::TYPE_DYLD_INFO_lazy_bind, &tvModel[SMACH::TYPE_DYLD_INFO_lazy_bind], &mach, nDataOffset, nDataSize); + + ajustTableView(&machProcessData, &tvModel[SMACH::TYPE_DYLD_INFO_lazy_bind], ui->tableView_DYLD_INFO_lazy_bind, nullptr, true); + + connect(ui->tableView_DYLD_INFO_lazy_bind->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTableView_DYLD_INFO_lazy_bind_currentRowChanged(QModelIndex, QModelIndex))); + + loadHexSubdevice(nDataOffset, nDataSize, nDataOffset, &g_subDevice[SMACH::TYPE_DYLD_INFO_lazy_bind], ui->widgetHex_DYLD_INFO_lazy_bind); } } else if (nType == SMACH::TYPE_DYLD_INFO_export) { if (!isInitPresent(sInit)) { - MACHProcessData machProcessData( - SMACH::TYPE_DYLD_INFO_export, - &tvModel[SMACH::TYPE_DYLD_INFO_export], &mach, nDataOffset, - nDataSize); - - ajustTableView(&machProcessData, - &tvModel[SMACH::TYPE_DYLD_INFO_export], - ui->tableView_DYLD_INFO_export, nullptr, true); - - connect(ui->tableView_DYLD_INFO_export->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTableView_DYLD_INFO_export_currentRowChanged( - QModelIndex, QModelIndex))); - - loadHexSubdevice(nDataOffset, nDataSize, nDataOffset, - &g_subDevice[SMACH::TYPE_DYLD_INFO_export], - ui->widgetHex_DYLD_INFO_export); + MACHProcessData machProcessData(SMACH::TYPE_DYLD_INFO_export, &tvModel[SMACH::TYPE_DYLD_INFO_export], &mach, nDataOffset, nDataSize); + + ajustTableView(&machProcessData, &tvModel[SMACH::TYPE_DYLD_INFO_export], ui->tableView_DYLD_INFO_export, nullptr, true); + + connect(ui->tableView_DYLD_INFO_export->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTableView_DYLD_INFO_export_currentRowChanged(QModelIndex, QModelIndex))); + + loadHexSubdevice(nDataOffset, nDataSize, nDataOffset, &g_subDevice[SMACH::TYPE_DYLD_INFO_export], ui->widgetHex_DYLD_INFO_export); } } else if (nType == SMACH::TYPE_DYSYMTAB_toc) { if (!isInitPresent(sInit)) { - MACHProcessData machProcessData( - SMACH::TYPE_DYSYMTAB_toc, - &tvModel[SMACH::TYPE_DYSYMTAB_toc], &mach, nDataOffset, - nDataSize); - - ajustTableView(&machProcessData, - &tvModel[SMACH::TYPE_DYSYMTAB_toc], - ui->tableView_DYSYMTAB_toc, nullptr, false); + MACHProcessData machProcessData(SMACH::TYPE_DYSYMTAB_toc, &tvModel[SMACH::TYPE_DYSYMTAB_toc], &mach, nDataOffset, nDataSize); + + ajustTableView(&machProcessData, &tvModel[SMACH::TYPE_DYSYMTAB_toc], ui->tableView_DYSYMTAB_toc, nullptr, false); } } else if (nType == SMACH::TYPE_DYSYMTAB_modtab) { if (!isInitPresent(sInit)) { - MACHProcessData machProcessData( - SMACH::TYPE_DYSYMTAB_modtab, - &tvModel[SMACH::TYPE_DYSYMTAB_modtab], &mach, nDataOffset, - nDataSize); - - ajustTableView(&machProcessData, - &tvModel[SMACH::TYPE_DYSYMTAB_modtab], - ui->tableView_DYSYMTAB_modtab, nullptr, false); + MACHProcessData machProcessData(SMACH::TYPE_DYSYMTAB_modtab, &tvModel[SMACH::TYPE_DYSYMTAB_modtab], &mach, nDataOffset, nDataSize); + + ajustTableView(&machProcessData, &tvModel[SMACH::TYPE_DYSYMTAB_modtab], ui->tableView_DYSYMTAB_modtab, nullptr, false); } } else if (nType == SMACH::TYPE_DYSYMTAB_extrefsyms) { if (!isInitPresent(sInit)) { - MACHProcessData machProcessData( - SMACH::TYPE_DYSYMTAB_extrefsyms, - &tvModel[SMACH::TYPE_DYSYMTAB_extrefsyms], &mach, - nDataOffset, nDataSize); - - ajustTableView( - &machProcessData, &tvModel[SMACH::TYPE_DYSYMTAB_extrefsyms], - ui->tableView_DYSYMTAB_extrefsyms, nullptr, false); + MACHProcessData machProcessData(SMACH::TYPE_DYSYMTAB_extrefsyms, &tvModel[SMACH::TYPE_DYSYMTAB_extrefsyms], &mach, nDataOffset, nDataSize); + + ajustTableView(&machProcessData, &tvModel[SMACH::TYPE_DYSYMTAB_extrefsyms], ui->tableView_DYSYMTAB_extrefsyms, nullptr, false); } } else if (nType == SMACH::TYPE_DYSYMTAB_indirectsyms) { if (!isInitPresent(sInit)) { - MACHProcessData machProcessData( - SMACH::TYPE_DYSYMTAB_indirectsyms, - &tvModel[SMACH::TYPE_DYSYMTAB_indirectsyms], &mach, - nDataOffset, nDataSize); - - ajustTableView(&machProcessData, - &tvModel[SMACH::TYPE_DYSYMTAB_indirectsyms], - ui->tableView_DYSYMTAB_indirectsyms, nullptr, - true); + MACHProcessData machProcessData(SMACH::TYPE_DYSYMTAB_indirectsyms, &tvModel[SMACH::TYPE_DYSYMTAB_indirectsyms], &mach, nDataOffset, nDataSize); + + ajustTableView(&machProcessData, &tvModel[SMACH::TYPE_DYSYMTAB_indirectsyms], ui->tableView_DYSYMTAB_indirectsyms, nullptr, true); } } else if (nType == SMACH::TYPE_DYSYMTAB_extrel) { if (!isInitPresent(sInit)) { - MACHProcessData machProcessData( - SMACH::TYPE_DYSYMTAB_extrel, - &tvModel[SMACH::TYPE_DYSYMTAB_extrel], &mach, nDataOffset, - nDataSize); - - ajustTableView(&machProcessData, - &tvModel[SMACH::TYPE_DYSYMTAB_extrel], - ui->tableView_DYSYMTAB_extrel, nullptr, false); + MACHProcessData machProcessData(SMACH::TYPE_DYSYMTAB_extrel, &tvModel[SMACH::TYPE_DYSYMTAB_extrel], &mach, nDataOffset, nDataSize); + + ajustTableView(&machProcessData, &tvModel[SMACH::TYPE_DYSYMTAB_extrel], ui->tableView_DYSYMTAB_extrel, nullptr, false); } } else if (nType == SMACH::TYPE_DYSYMTAB_locrel) { if (!isInitPresent(sInit)) { - MACHProcessData machProcessData( - SMACH::TYPE_DYSYMTAB_locrel, - &tvModel[SMACH::TYPE_DYSYMTAB_locrel], &mach, nDataOffset, - nDataSize); - - ajustTableView(&machProcessData, - &tvModel[SMACH::TYPE_DYSYMTAB_locrel], - ui->tableView_DYSYMTAB_locrel, nullptr, false); + MACHProcessData machProcessData(SMACH::TYPE_DYSYMTAB_locrel, &tvModel[SMACH::TYPE_DYSYMTAB_locrel], &mach, nDataOffset, nDataSize); + + ajustTableView(&machProcessData, &tvModel[SMACH::TYPE_DYSYMTAB_locrel], ui->tableView_DYSYMTAB_locrel, nullptr, false); } } @@ -3833,20 +2641,16 @@ void MACHWidget::widgetValueChanged(quint64 nValue) { case SMACH::TYPE_mach_header: switch (nNdata) { case N_mach_header::magic: - g_lineEdit_mach_header[N_mach_header::magic]->setValue( - (quint32)nValue); + g_lineEdit_mach_header[N_mach_header::magic]->setValue((quint32)nValue); break; case N_mach_header::cputype: - g_lineEdit_mach_header[N_mach_header::cputype]->setValue( - (quint32)nValue); + g_lineEdit_mach_header[N_mach_header::cputype]->setValue((quint32)nValue); break; case N_mach_header::filetype: - g_lineEdit_mach_header[N_mach_header::filetype]->setValue( - (quint32)nValue); + g_lineEdit_mach_header[N_mach_header::filetype]->setValue((quint32)nValue); break; case N_mach_header::flags: - g_lineEdit_mach_header[N_mach_header::flags]->setValue( - (quint32)nValue); + g_lineEdit_mach_header[N_mach_header::flags]->setValue((quint32)nValue); break; } @@ -3854,8 +2658,7 @@ void MACHWidget::widgetValueChanged(quint64 nValue) { } } -void MACHWidget::on_treeWidgetNavi_currentItemChanged( - QTreeWidgetItem *pItemCurrent, QTreeWidgetItem *pItemPrevious) { +void MACHWidget::on_treeWidgetNavi_currentItemChanged(QTreeWidgetItem *pItemCurrent, QTreeWidgetItem *pItemPrevious) { Q_UNUSED(pItemPrevious) if (pItemCurrent) { @@ -3877,36 +2680,29 @@ void MACHWidget::on_pushButtonReload_clicked() { QTimer::singleShot(1000, this, SLOT(enableButton())); } -void MACHWidget::enableButton() { ui->pushButtonReload->setEnabled(true); } +void MACHWidget::enableButton() { + ui->pushButtonReload->setEnabled(true); +} -void MACHWidget::on_tableWidget_mach_header_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void MACHWidget::on_tableWidget_mach_header_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow); Q_UNUSED(nCurrentColumn); Q_UNUSED(nPreviousRow); Q_UNUSED(nPreviousColumn); - setHeaderTableSelection(ui->widgetHex_mach_header, - ui->tableWidget_mach_header); + setHeaderTableSelection(ui->widgetHex_mach_header, ui->tableWidget_mach_header); } -void MACHWidget::on_tableWidget_dyld_info_only_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void MACHWidget::on_tableWidget_dyld_info_only_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow); Q_UNUSED(nCurrentColumn); Q_UNUSED(nPreviousRow); Q_UNUSED(nPreviousColumn); - setHeaderTableSelection(ui->widgetHex_dyld_info_only, - ui->tableWidget_dyld_info_only); + setHeaderTableSelection(ui->widgetHex_dyld_info_only, ui->tableWidget_dyld_info_only); } -void MACHWidget::on_tableWidget_symtab_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn) { +void MACHWidget::on_tableWidget_symtab_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow); Q_UNUSED(nCurrentColumn); Q_UNUSED(nPreviousRow); @@ -3915,9 +2711,7 @@ void MACHWidget::on_tableWidget_symtab_currentCellChanged(int nCurrentRow, setHeaderTableSelection(ui->widgetHex_symtab, ui->tableWidget_symtab); } -void MACHWidget::on_tableWidget_dysymtab_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void MACHWidget::on_tableWidget_dysymtab_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow); Q_UNUSED(nCurrentColumn); Q_UNUSED(nPreviousRow); @@ -3926,93 +2720,70 @@ void MACHWidget::on_tableWidget_dysymtab_currentCellChanged( setHeaderTableSelection(ui->widgetHex_dysymtab, ui->tableWidget_dysymtab); } -void MACHWidget::on_tableWidget_version_min_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void MACHWidget::on_tableWidget_version_min_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow); Q_UNUSED(nCurrentColumn); Q_UNUSED(nPreviousRow); Q_UNUSED(nPreviousColumn); - setHeaderTableSelection(ui->widgetHex_version_min, - ui->tableWidget_version_min); + setHeaderTableSelection(ui->widgetHex_version_min, ui->tableWidget_version_min); } -void MACHWidget::on_tableWidget_build_version_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void MACHWidget::on_tableWidget_build_version_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow); Q_UNUSED(nCurrentColumn); Q_UNUSED(nPreviousRow); Q_UNUSED(nPreviousColumn); - setHeaderTableSelection(ui->widgetHex_build_version, - ui->tableWidget_build_version); + setHeaderTableSelection(ui->widgetHex_build_version, ui->tableWidget_build_version); } -void MACHWidget::on_tableWidget_source_version_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void MACHWidget::on_tableWidget_source_version_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow); Q_UNUSED(nCurrentColumn); Q_UNUSED(nPreviousRow); Q_UNUSED(nPreviousColumn); - setHeaderTableSelection(ui->widgetHex_source_version, - ui->tableWidget_source_version); + setHeaderTableSelection(ui->widgetHex_source_version, ui->tableWidget_source_version); } -void MACHWidget::on_tableWidget_encryption_info_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void MACHWidget::on_tableWidget_encryption_info_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow); Q_UNUSED(nCurrentColumn); Q_UNUSED(nPreviousRow); Q_UNUSED(nPreviousColumn); - setHeaderTableSelection(ui->widgetHex_encryption_info, - ui->tableWidget_encryption_info); + setHeaderTableSelection(ui->widgetHex_encryption_info, ui->tableWidget_encryption_info); } -void MACHWidget::on_tableWidget_function_starts_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void MACHWidget::on_tableWidget_function_starts_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow); Q_UNUSED(nCurrentColumn); Q_UNUSED(nPreviousRow); Q_UNUSED(nPreviousColumn); - setHeaderTableSelection(ui->widgetHex_function_starts, - ui->tableWidget_function_starts); + setHeaderTableSelection(ui->widgetHex_function_starts, ui->tableWidget_function_starts); } -void MACHWidget::on_tableWidget_data_in_code_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void MACHWidget::on_tableWidget_data_in_code_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow); Q_UNUSED(nCurrentColumn); Q_UNUSED(nPreviousRow); Q_UNUSED(nPreviousColumn); - setHeaderTableSelection(ui->widgetHex_data_in_code, - ui->tableWidget_data_in_code); + setHeaderTableSelection(ui->widgetHex_data_in_code, ui->tableWidget_data_in_code); } -void MACHWidget::on_tableWidget_code_signature_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void MACHWidget::on_tableWidget_code_signature_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow); Q_UNUSED(nCurrentColumn); Q_UNUSED(nPreviousRow); Q_UNUSED(nPreviousColumn); - setHeaderTableSelection(ui->widgetHex_code_signature, - ui->tableWidget_code_signature); + setHeaderTableSelection(ui->widgetHex_code_signature, ui->tableWidget_code_signature); } -void MACHWidget::on_tableWidget_SuperBlob_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void MACHWidget::on_tableWidget_SuperBlob_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow); Q_UNUSED(nCurrentColumn); Q_UNUSED(nPreviousRow); @@ -4021,10 +2792,7 @@ void MACHWidget::on_tableWidget_SuperBlob_currentCellChanged( setHeaderTableSelection(ui->widgetHex_SuperBlob, ui->tableWidget_SuperBlob); } -void MACHWidget::on_tableWidget_main_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn) { +void MACHWidget::on_tableWidget_main_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow); Q_UNUSED(nCurrentColumn); Q_UNUSED(nPreviousRow); @@ -4033,76 +2801,58 @@ void MACHWidget::on_tableWidget_main_currentCellChanged(int nCurrentRow, setHeaderTableSelection(ui->widgetHex_main, ui->tableWidget_main); } -void MACHWidget::on_tableWidget_unix_thread_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void MACHWidget::on_tableWidget_unix_thread_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow); Q_UNUSED(nCurrentColumn); Q_UNUSED(nPreviousRow); Q_UNUSED(nPreviousColumn); - setHeaderTableSelection(ui->widgetHex_unix_thread, - ui->tableWidget_unix_thread); + setHeaderTableSelection(ui->widgetHex_unix_thread, ui->tableWidget_unix_thread); } -void MACHWidget::on_tableWidget_unix_thread_x86_32_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void MACHWidget::on_tableWidget_unix_thread_x86_32_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow); Q_UNUSED(nCurrentColumn); Q_UNUSED(nPreviousRow); Q_UNUSED(nPreviousColumn); - setHeaderTableSelection(ui->widgetHex_unix_thread_x86_32, - ui->tableWidget_unix_thread_x86_32); + setHeaderTableSelection(ui->widgetHex_unix_thread_x86_32, ui->tableWidget_unix_thread_x86_32); } -void MACHWidget::on_tableWidget_unix_thread_x86_64_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void MACHWidget::on_tableWidget_unix_thread_x86_64_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow); Q_UNUSED(nCurrentColumn); Q_UNUSED(nPreviousRow); Q_UNUSED(nPreviousColumn); - setHeaderTableSelection(ui->widgetHex_unix_thread_x86_64, - ui->tableWidget_unix_thread_x86_64); + setHeaderTableSelection(ui->widgetHex_unix_thread_x86_64, ui->tableWidget_unix_thread_x86_64); } -void MACHWidget::on_tableWidget_unix_thread_arm_32_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void MACHWidget::on_tableWidget_unix_thread_arm_32_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow); Q_UNUSED(nCurrentColumn); Q_UNUSED(nPreviousRow); Q_UNUSED(nPreviousColumn); - setHeaderTableSelection(ui->widgetHex_unix_thread_arm_32, - ui->tableWidget_unix_thread_arm_32); + setHeaderTableSelection(ui->widgetHex_unix_thread_arm_32, ui->tableWidget_unix_thread_arm_32); } -void MACHWidget::on_tableWidget_unix_thread_arm_64_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void MACHWidget::on_tableWidget_unix_thread_arm_64_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow); Q_UNUSED(nCurrentColumn); Q_UNUSED(nPreviousRow); Q_UNUSED(nPreviousColumn); - setHeaderTableSelection(ui->widgetHex_unix_thread_arm_64, - ui->tableWidget_unix_thread_arm_64); + setHeaderTableSelection(ui->widgetHex_unix_thread_arm_64, ui->tableWidget_unix_thread_arm_64); } -void MACHWidget::on_tableWidget_unix_thread_ppc_32_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void MACHWidget::on_tableWidget_unix_thread_ppc_32_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow); Q_UNUSED(nCurrentColumn); Q_UNUSED(nPreviousRow); Q_UNUSED(nPreviousColumn); - setHeaderTableSelection(ui->widgetHex_unix_thread_ppc_32, - ui->tableWidget_unix_thread_ppc_32); + setHeaderTableSelection(ui->widgetHex_unix_thread_ppc_32, ui->tableWidget_unix_thread_ppc_32); } void MACHWidget::on_toolButtonPrev_clicked() { @@ -4117,84 +2867,67 @@ void MACHWidget::on_toolButtonNext_clicked() { setAddPageEnabled(true); } -void MACHWidget::onTableView_commands_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void MACHWidget::onTableView_commands_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(current) Q_UNUSED(previous) - loadHexSubdeviceByTableView(current.row(), SMACH::TYPE_mach_commands, - ui->widgetHex_commands, ui->tableView_commands, + loadHexSubdeviceByTableView(current.row(), SMACH::TYPE_mach_commands, ui->widgetHex_commands, ui->tableView_commands, &g_subDevice[SMACH::TYPE_mach_commands]); } -void MACHWidget::onTableView_segments_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void MACHWidget::onTableView_segments_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(current) Q_UNUSED(previous) - loadHexSubdeviceByTableView(current.row(), SMACH::TYPE_mach_segments, - ui->widgetHex_segments, ui->tableView_segments, + loadHexSubdeviceByTableView(current.row(), SMACH::TYPE_mach_segments, ui->widgetHex_segments, ui->tableView_segments, &g_subDevice[SMACH::TYPE_mach_segments]); } -void MACHWidget::onTableView_sections_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void MACHWidget::onTableView_sections_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(current) Q_UNUSED(previous) - loadHexSubdeviceByTableView(current.row(), SMACH::TYPE_mach_sections, - ui->widgetHex_sections, ui->tableView_sections, + loadHexSubdeviceByTableView(current.row(), SMACH::TYPE_mach_sections, ui->widgetHex_sections, ui->tableView_sections, &g_subDevice[SMACH::TYPE_mach_sections]); } -void MACHWidget::onTableView_libraries_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void MACHWidget::onTableView_libraries_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(current) Q_UNUSED(previous) - loadHexSubdeviceByTableView( - current.row(), SMACH::TYPE_mach_libraries, ui->widgetHex_libraries, - ui->tableView_libraries, &g_subDevice[SMACH::TYPE_mach_libraries]); + loadHexSubdeviceByTableView(current.row(), SMACH::TYPE_mach_libraries, ui->widgetHex_libraries, ui->tableView_libraries, + &g_subDevice[SMACH::TYPE_mach_libraries]); } -void MACHWidget::onTableView_weak_libraries_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void MACHWidget::onTableView_weak_libraries_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(current) Q_UNUSED(previous) - loadHexSubdeviceByTableView(current.row(), SMACH::TYPE_mach_weak_libraries, - ui->widgetHex_weak_libraries, - ui->tableView_weak_libraries, + loadHexSubdeviceByTableView(current.row(), SMACH::TYPE_mach_weak_libraries, ui->widgetHex_weak_libraries, ui->tableView_weak_libraries, &g_subDevice[SMACH::TYPE_mach_weak_libraries]); } -void MACHWidget::onTableView_id_library_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void MACHWidget::onTableView_id_library_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(current) Q_UNUSED(previous) - loadHexSubdeviceByTableView( - current.row(), SMACH::TYPE_mach_id_library, ui->widgetHex_id_library, - ui->tableView_id_library, &g_subDevice[SMACH::TYPE_mach_id_library]); + loadHexSubdeviceByTableView(current.row(), SMACH::TYPE_mach_id_library, ui->widgetHex_id_library, ui->tableView_id_library, + &g_subDevice[SMACH::TYPE_mach_id_library]); } -void MACHWidget::onTableView_LOADFVMLIB_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void MACHWidget::onTableView_LOADFVMLIB_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(current) Q_UNUSED(previous) - loadHexSubdeviceByTableView( - current.row(), SMACH::TYPE_mach_LOADFVMLIB, ui->widgetHex_LOADFVMLIB, - ui->tableView_LOADFVMLIB, &g_subDevice[SMACH::TYPE_mach_LOADFVMLIB]); + loadHexSubdeviceByTableView(current.row(), SMACH::TYPE_mach_LOADFVMLIB, ui->widgetHex_LOADFVMLIB, ui->tableView_LOADFVMLIB, + &g_subDevice[SMACH::TYPE_mach_LOADFVMLIB]); } -void MACHWidget::onTableView_IDFVMLIB_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void MACHWidget::onTableView_IDFVMLIB_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(current) Q_UNUSED(previous) - loadHexSubdeviceByTableView(current.row(), SMACH::TYPE_mach_IDFVMLIB, - ui->widgetHex_IDFVMLIB, ui->tableView_IDFVMLIB, + loadHexSubdeviceByTableView(current.row(), SMACH::TYPE_mach_IDFVMLIB, ui->widgetHex_IDFVMLIB, ui->tableView_IDFVMLIB, &g_subDevice[SMACH::TYPE_mach_IDFVMLIB]); } @@ -4203,16 +2936,14 @@ void MACHWidget::on_tableView_commands_doubleClicked(const QModelIndex &index) { editCommandHeader(); } -void MACHWidget::on_tableView_commands_customContextMenuRequested( - const QPoint &pos) { +void MACHWidget::on_tableView_commands_customContextMenuRequested(const QPoint &pos) { qint32 nRow = ui->tableView_commands->currentIndex().row(); if (nRow != -1) { QMenu contextMenu(this); QAction actionEdit(tr("Edit"), this); - connect(&actionEdit, SIGNAL(triggered()), this, - SLOT(editCommandHeader())); + connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editCommandHeader())); contextMenu.addAction(&actionEdit); contextMenu.exec(ui->tableView_commands->viewport()->mapToGlobal(pos)); @@ -4224,8 +2955,7 @@ void MACHWidget::on_tableView_segments_doubleClicked(const QModelIndex &index) { editSegmentHeader(); } -void MACHWidget::on_tableView_segments_customContextMenuRequested( - const QPoint &pos) { +void MACHWidget::on_tableView_segments_customContextMenuRequested(const QPoint &pos) { qint32 nRow = ui->tableView_segments->currentIndex().row(); if (nRow != -1) { @@ -4234,8 +2964,7 @@ void MACHWidget::on_tableView_segments_customContextMenuRequested( QMenu contextMenu(this); QAction actionEdit(tr("Edit"), this); - connect(&actionEdit, SIGNAL(triggered()), this, - SLOT(editSegmentHeader())); + connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editSegmentHeader())); contextMenu.addAction(&actionEdit); QAction actionHex(tr("Hex"), this); @@ -4244,14 +2973,12 @@ void MACHWidget::on_tableView_segments_customContextMenuRequested( contextMenu.addAction(&actionHex); QAction actionDisasm(tr("Disasm"), this); - connect(&actionDisasm, SIGNAL(triggered()), this, - SLOT(segmentDisasm())); + connect(&actionDisasm, SIGNAL(triggered()), this, SLOT(segmentDisasm())); actionDisasm.setEnabled(bIsEnable); contextMenu.addAction(&actionDisasm); QAction actionEntropy(tr("Entropy"), this); - connect(&actionEntropy, SIGNAL(triggered()), this, - SLOT(segmentEntropy())); + connect(&actionEntropy, SIGNAL(triggered()), this, SLOT(segmentEntropy())); actionEntropy.setEnabled(bIsEnable); contextMenu.addAction(&actionEntropy); @@ -4264,8 +2991,7 @@ void MACHWidget::on_tableView_sections_doubleClicked(const QModelIndex &index) { editSectionHeader(); } -void MACHWidget::on_tableView_sections_customContextMenuRequested( - const QPoint &pos) { +void MACHWidget::on_tableView_sections_customContextMenuRequested(const QPoint &pos) { qint32 nRow = ui->tableView_sections->currentIndex().row(); if (nRow != -1) { @@ -4274,8 +3000,7 @@ void MACHWidget::on_tableView_sections_customContextMenuRequested( QMenu contextMenu(this); QAction actionEdit(tr("Edit"), this); - connect(&actionEdit, SIGNAL(triggered()), this, - SLOT(editSectionHeader())); + connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editSectionHeader())); contextMenu.addAction(&actionEdit); QAction actionHex(tr("Hex"), this); @@ -4284,14 +3009,12 @@ void MACHWidget::on_tableView_sections_customContextMenuRequested( contextMenu.addAction(&actionHex); QAction actionDisasm(tr("Disasm"), this); - connect(&actionDisasm, SIGNAL(triggered()), this, - SLOT(sectionDisasm())); + connect(&actionDisasm, SIGNAL(triggered()), this, SLOT(sectionDisasm())); actionDisasm.setEnabled(bIsEnable); contextMenu.addAction(&actionDisasm); QAction actionEntropy(tr("Entropy"), this); - connect(&actionEntropy, SIGNAL(triggered()), this, - SLOT(sectionEntropy())); + connect(&actionEntropy, SIGNAL(triggered()), this, SLOT(sectionEntropy())); actionEntropy.setEnabled(bIsEnable); contextMenu.addAction(&actionEntropy); @@ -4299,94 +3022,79 @@ void MACHWidget::on_tableView_sections_customContextMenuRequested( } } -void MACHWidget::on_tableView_libraries_doubleClicked( - const QModelIndex &index) { +void MACHWidget::on_tableView_libraries_doubleClicked(const QModelIndex &index) { Q_UNUSED(index) editLibraryHeader(); } -void MACHWidget::on_tableView_libraries_customContextMenuRequested( - const QPoint &pos) { +void MACHWidget::on_tableView_libraries_customContextMenuRequested(const QPoint &pos) { qint32 nRow = ui->tableView_libraries->currentIndex().row(); if (nRow != -1) { QMenu contextMenu(this); QAction actionEdit(tr("Edit"), this); - connect(&actionEdit, SIGNAL(triggered()), this, - SLOT(editLibraryHeader())); + connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editLibraryHeader())); contextMenu.addAction(&actionEdit); contextMenu.exec(ui->tableView_libraries->viewport()->mapToGlobal(pos)); } } -void MACHWidget::on_tableView_weak_libraries_doubleClicked( - const QModelIndex &index) { +void MACHWidget::on_tableView_weak_libraries_doubleClicked(const QModelIndex &index) { Q_UNUSED(index) editWeakLibraryHeader(); } -void MACHWidget::on_tableView_weak_libraries_customContextMenuRequested( - const QPoint &pos) { +void MACHWidget::on_tableView_weak_libraries_customContextMenuRequested(const QPoint &pos) { qint32 nRow = ui->tableView_weak_libraries->currentIndex().row(); if (nRow != -1) { QMenu contextMenu(this); QAction actionEdit(tr("Edit"), this); - connect(&actionEdit, SIGNAL(triggered()), this, - SLOT(editWeakLibraryHeader())); + connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editWeakLibraryHeader())); contextMenu.addAction(&actionEdit); - contextMenu.exec( - ui->tableView_weak_libraries->viewport()->mapToGlobal(pos)); + contextMenu.exec(ui->tableView_weak_libraries->viewport()->mapToGlobal(pos)); } } -void MACHWidget::on_tableView_id_library_doubleClicked( - const QModelIndex &index) { +void MACHWidget::on_tableView_id_library_doubleClicked(const QModelIndex &index) { Q_UNUSED(index) editIdLibraryHeader(); } -void MACHWidget::on_tableView_id_library_customContextMenuRequested( - const QPoint &pos) { +void MACHWidget::on_tableView_id_library_customContextMenuRequested(const QPoint &pos) { qint32 nRow = ui->tableView_id_library->currentIndex().row(); if (nRow != -1) { QMenu contextMenu(this); QAction actionEdit(tr("Edit"), this); - connect(&actionEdit, SIGNAL(triggered()), this, - SLOT(editIdLibraryHeader())); + connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editIdLibraryHeader())); contextMenu.addAction(&actionEdit); - contextMenu.exec( - ui->tableView_id_library->viewport()->mapToGlobal(pos)); + contextMenu.exec(ui->tableView_id_library->viewport()->mapToGlobal(pos)); } } -void MACHWidget::on_tableView_LOADFVMLIB_doubleClicked( - const QModelIndex &index) { +void MACHWidget::on_tableView_LOADFVMLIB_doubleClicked(const QModelIndex &index) { Q_UNUSED(index) editLOADFVMLIBHeader(); } -void MACHWidget::on_tableView_LOADFVMLIB_customContextMenuRequested( - const QPoint &pos) { +void MACHWidget::on_tableView_LOADFVMLIB_customContextMenuRequested(const QPoint &pos) { qint32 nRow = ui->tableView_LOADFVMLIB->currentIndex().row(); if (nRow != -1) { QMenu contextMenu(this); QAction actionEdit(tr("Edit"), this); - connect(&actionEdit, SIGNAL(triggered()), this, - SLOT(editLOADFVMLIBHeader())); + connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editLOADFVMLIBHeader())); contextMenu.addAction(&actionEdit); - contextMenu.exec( - ui->tableView_LOADFVMLIB->viewport()->mapToGlobal(pos)); + contextMenu.exec(ui->tableView_LOADFVMLIB->viewport()->mapToGlobal(pos)); } } @@ -4395,59 +3103,50 @@ void MACHWidget::on_tableView_IDFVMLIB_doubleClicked(const QModelIndex &index) { editIDFVMLIBHeader(); } -void MACHWidget::on_tableView_IDFVMLIB_customContextMenuRequested( - const QPoint &pos) { +void MACHWidget::on_tableView_IDFVMLIB_customContextMenuRequested(const QPoint &pos) { qint32 nRow = ui->tableView_IDFVMLIB->currentIndex().row(); if (nRow != -1) { QMenu contextMenu(this); QAction actionEdit(tr("Edit"), this); - connect(&actionEdit, SIGNAL(triggered()), this, - SLOT(editIDFVMLIBHeader())); + connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editIDFVMLIBHeader())); contextMenu.addAction(&actionEdit); contextMenu.exec(ui->tableView_IDFVMLIB->viewport()->mapToGlobal(pos)); } } -void MACHWidget::on_tableView_SymbolTable_doubleClicked( - const QModelIndex &index) { +void MACHWidget::on_tableView_SymbolTable_doubleClicked(const QModelIndex &index) { Q_UNUSED(index) editSymbolHeader(); } -void MACHWidget::on_tableView_SymbolTable_customContextMenuRequested( - const QPoint &pos) { +void MACHWidget::on_tableView_SymbolTable_customContextMenuRequested(const QPoint &pos) { qint32 nRow = ui->tableView_SymbolTable->currentIndex().row(); if (nRow != -1) { QMenu contextMenu(this); QAction actionEdit(tr("Edit"), this); - connect(&actionEdit, SIGNAL(triggered()), this, - SLOT(editSymbolHeader())); + connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editSymbolHeader())); QAction actionDemangle(tr("Demangle"), this); - connect(&actionDemangle, SIGNAL(triggered()), this, - SLOT(symbolDemangle())); + connect(&actionDemangle, SIGNAL(triggered()), this, SLOT(symbolDemangle())); contextMenu.addAction(&actionEdit); contextMenu.addAction(&actionDemangle); - contextMenu.exec( - ui->tableView_SymbolTable->viewport()->mapToGlobal(pos)); + contextMenu.exec(ui->tableView_SymbolTable->viewport()->mapToGlobal(pos)); } } -void MACHWidget::on_tableView_Functions_doubleClicked( - const QModelIndex &index) { +void MACHWidget::on_tableView_Functions_doubleClicked(const QModelIndex &index) { Q_UNUSED(index) functionDisasm(); } -void MACHWidget::on_tableView_Functions_customContextMenuRequested( - const QPoint &pos) { +void MACHWidget::on_tableView_Functions_customContextMenuRequested(const QPoint &pos) { qint32 nRow = ui->tableView_Functions->currentIndex().row(); if (nRow != -1) { @@ -4457,12 +3156,10 @@ void MACHWidget::on_tableView_Functions_customContextMenuRequested( connect(&actionHex, SIGNAL(triggered()), this, SLOT(functionHex())); QAction actionDisasm(tr("Disasm"), this); - connect(&actionDisasm, SIGNAL(triggered()), this, - SLOT(functionDisasm())); + connect(&actionDisasm, SIGNAL(triggered()), this, SLOT(functionDisasm())); QAction actionDemangle(tr("Demangle"), this); - connect(&actionDemangle, SIGNAL(triggered()), this, - SLOT(functionDemangle())); + connect(&actionDemangle, SIGNAL(triggered()), this, SLOT(functionDemangle())); contextMenu.addAction(&actionHex); contextMenu.addAction(&actionDisasm); @@ -4472,14 +3169,12 @@ void MACHWidget::on_tableView_Functions_customContextMenuRequested( } } -void MACHWidget::on_tableView_data_in_code_entry_doubleClicked( - const QModelIndex &index) { +void MACHWidget::on_tableView_data_in_code_entry_doubleClicked(const QModelIndex &index) { Q_UNUSED(index) editDiceHeader(); } -void MACHWidget::on_tableView_data_in_code_entry_customContextMenuRequested( - const QPoint &pos) { +void MACHWidget::on_tableView_data_in_code_entry_customContextMenuRequested(const QPoint &pos) { qint32 nRow = ui->tableView_data_in_code_entry->currentIndex().row(); if (nRow != -1) { @@ -4494,43 +3189,36 @@ void MACHWidget::on_tableView_data_in_code_entry_customContextMenuRequested( contextMenu.addAction(&actionEdit); contextMenu.addAction(&actionHex); - contextMenu.exec( - ui->tableView_data_in_code_entry->viewport()->mapToGlobal(pos)); + contextMenu.exec(ui->tableView_data_in_code_entry->viewport()->mapToGlobal(pos)); } } -void MACHWidget::on_tableView_DYSYMTAB_modtab_doubleClicked( - const QModelIndex &index) { +void MACHWidget::on_tableView_DYSYMTAB_modtab_doubleClicked(const QModelIndex &index) { Q_UNUSED(index) editModTabHeader(); } -void MACHWidget::on_tableView_DYSYMTAB_modtab_customContextMenuRequested( - const QPoint &pos) { +void MACHWidget::on_tableView_DYSYMTAB_modtab_customContextMenuRequested(const QPoint &pos) { qint32 nRow = ui->tableView_DYSYMTAB_modtab->currentIndex().row(); if (nRow != -1) { QMenu contextMenu(this); QAction actionEdit(tr("Edit"), this); - connect(&actionEdit, SIGNAL(triggered()), this, - SLOT(editModTabHeader())); + connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editModTabHeader())); contextMenu.addAction(&actionEdit); - contextMenu.exec( - ui->tableView_DYSYMTAB_modtab->viewport()->mapToGlobal(pos)); + contextMenu.exec(ui->tableView_DYSYMTAB_modtab->viewport()->mapToGlobal(pos)); } } -void MACHWidget::on_tableView_DYSYMTAB_toc_doubleClicked( - const QModelIndex &index) { +void MACHWidget::on_tableView_DYSYMTAB_toc_doubleClicked(const QModelIndex &index) { Q_UNUSED(index) editTocHeader(); } -void MACHWidget::on_tableView_DYSYMTAB_toc_customContextMenuRequested( - const QPoint &pos) { +void MACHWidget::on_tableView_DYSYMTAB_toc_customContextMenuRequested(const QPoint &pos) { qint32 nRow = ui->tableView_DYSYMTAB_toc->currentIndex().row(); if (nRow != -1) { @@ -4540,171 +3228,136 @@ void MACHWidget::on_tableView_DYSYMTAB_toc_customContextMenuRequested( connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editTocHeader())); QAction actionDemangle(tr("Demangle"), this); - connect(&actionDemangle, SIGNAL(triggered()), this, - SLOT(tocDemangle())); + connect(&actionDemangle, SIGNAL(triggered()), this, SLOT(tocDemangle())); contextMenu.addAction(&actionEdit); contextMenu.addAction(&actionDemangle); - contextMenu.exec( - ui->tableView_DYSYMTAB_toc->viewport()->mapToGlobal(pos)); + contextMenu.exec(ui->tableView_DYSYMTAB_toc->viewport()->mapToGlobal(pos)); } } -void MACHWidget::on_tableView_DYSYMTAB_extrel_doubleClicked( - const QModelIndex &index) { +void MACHWidget::on_tableView_DYSYMTAB_extrel_doubleClicked(const QModelIndex &index) { Q_UNUSED(index) editExtrelHeader(); } -void MACHWidget::on_tableView_DYSYMTAB_extrel_customContextMenuRequested( - const QPoint &pos) { +void MACHWidget::on_tableView_DYSYMTAB_extrel_customContextMenuRequested(const QPoint &pos) { qint32 nRow = ui->tableView_DYSYMTAB_extrel->currentIndex().row(); if (nRow != -1) { QMenu contextMenu(this); QAction actionEdit(tr("Edit"), this); - connect(&actionEdit, SIGNAL(triggered()), this, - SLOT(editExtrelHeader())); + connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editExtrelHeader())); contextMenu.addAction(&actionEdit); - contextMenu.exec( - ui->tableView_DYSYMTAB_extrel->viewport()->mapToGlobal(pos)); + contextMenu.exec(ui->tableView_DYSYMTAB_extrel->viewport()->mapToGlobal(pos)); } } -void MACHWidget::on_tableView_DYSYMTAB_locrel_doubleClicked( - const QModelIndex &index) { +void MACHWidget::on_tableView_DYSYMTAB_locrel_doubleClicked(const QModelIndex &index) { Q_UNUSED(index) editLocrelHeader(); } -void MACHWidget::on_tableView_DYSYMTAB_locrel_customContextMenuRequested( - const QPoint &pos) { +void MACHWidget::on_tableView_DYSYMTAB_locrel_customContextMenuRequested(const QPoint &pos) { qint32 nRow = ui->tableView_DYSYMTAB_locrel->currentIndex().row(); if (nRow != -1) { QMenu contextMenu(this); QAction actionEdit(tr("Edit"), this); - connect(&actionEdit, SIGNAL(triggered()), this, - SLOT(editLocrelHeader())); + connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editLocrelHeader())); contextMenu.addAction(&actionEdit); - contextMenu.exec( - ui->tableView_DYSYMTAB_locrel->viewport()->mapToGlobal(pos)); + contextMenu.exec(ui->tableView_DYSYMTAB_locrel->viewport()->mapToGlobal(pos)); } } -void MACHWidget::on_tableView_DYSYMTAB_indirectsyms_doubleClicked( - const QModelIndex &index) { +void MACHWidget::on_tableView_DYSYMTAB_indirectsyms_doubleClicked(const QModelIndex &index) { Q_UNUSED(index) editIndirectSymbolHeader(); } -void MACHWidget::on_tableView_DYSYMTAB_indirectsyms_customContextMenuRequested( - const QPoint &pos) { +void MACHWidget::on_tableView_DYSYMTAB_indirectsyms_customContextMenuRequested(const QPoint &pos) { qint32 nRow = ui->tableView_DYSYMTAB_indirectsyms->currentIndex().row(); if (nRow != -1) { QMenu contextMenu(this); QAction actionEdit(tr("Edit"), this); - connect(&actionEdit, SIGNAL(triggered()), this, - SLOT(editIndirectSymbolHeader())); + connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editIndirectSymbolHeader())); QAction actionDemangle(tr("Demangle"), this); - connect(&actionDemangle, SIGNAL(triggered()), this, - SLOT(indirectsymsDemangle())); + connect(&actionDemangle, SIGNAL(triggered()), this, SLOT(indirectsymsDemangle())); contextMenu.addAction(&actionEdit); contextMenu.addAction(&actionDemangle); - contextMenu.exec( - ui->tableView_DYSYMTAB_indirectsyms->viewport()->mapToGlobal(pos)); + contextMenu.exec(ui->tableView_DYSYMTAB_indirectsyms->viewport()->mapToGlobal(pos)); } } -void MACHWidget::on_tableView_DYSYMTAB_extrefsyms_doubleClicked( - const QModelIndex &index) { +void MACHWidget::on_tableView_DYSYMTAB_extrefsyms_doubleClicked(const QModelIndex &index) { Q_UNUSED(index) editExtRefSymbolHeader(); } -void MACHWidget::on_tableView_DYSYMTAB_extrefsyms_customContextMenuRequested( - const QPoint &pos) { +void MACHWidget::on_tableView_DYSYMTAB_extrefsyms_customContextMenuRequested(const QPoint &pos) { qint32 nRow = ui->tableView_DYSYMTAB_extrefsyms->currentIndex().row(); if (nRow != -1) { QMenu contextMenu(this); QAction actionEdit(tr("Edit"), this); - connect(&actionEdit, SIGNAL(triggered()), this, - SLOT(editExtRefSymbolHeader())); + connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editExtRefSymbolHeader())); QAction actionDemangle(tr("Demangle"), this); - connect(&actionDemangle, SIGNAL(triggered()), this, - SLOT(extrefsymsDemangle())); + connect(&actionDemangle, SIGNAL(triggered()), this, SLOT(extrefsymsDemangle())); contextMenu.addAction(&actionEdit); contextMenu.addAction(&actionDemangle); - contextMenu.exec( - ui->tableView_DYSYMTAB_extrefsyms->viewport()->mapToGlobal(pos)); + contextMenu.exec(ui->tableView_DYSYMTAB_extrefsyms->viewport()->mapToGlobal(pos)); } } -void MACHWidget::onTableView_DYLD_INFO_rebase_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void MACHWidget::onTableView_DYLD_INFO_rebase_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(current) Q_UNUSED(previous) - setHexSubdeviceByTableView(current.row(), SMACH::TYPE_DYLD_INFO_rebase, - ui->widgetHex_DYLD_INFO_rebase, - ui->tableView_DYLD_INFO_rebase); + setHexSubdeviceByTableView(current.row(), SMACH::TYPE_DYLD_INFO_rebase, ui->widgetHex_DYLD_INFO_rebase, ui->tableView_DYLD_INFO_rebase); } -void MACHWidget::onTableView_DYLD_INFO_bind_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void MACHWidget::onTableView_DYLD_INFO_bind_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(current) Q_UNUSED(previous) - setHexSubdeviceByTableView(current.row(), SMACH::TYPE_DYLD_INFO_bind, - ui->widgetHex_DYLD_INFO_bind, - ui->tableView_DYLD_INFO_bind); + setHexSubdeviceByTableView(current.row(), SMACH::TYPE_DYLD_INFO_bind, ui->widgetHex_DYLD_INFO_bind, ui->tableView_DYLD_INFO_bind); } -void MACHWidget::onTableView_DYLD_INFO_weak_bind_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void MACHWidget::onTableView_DYLD_INFO_weak_bind_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(current) Q_UNUSED(previous) - setHexSubdeviceByTableView(current.row(), SMACH::TYPE_DYLD_INFO_weak_bind, - ui->widgetHex_DYLD_INFO_weak_bind, - ui->tableView_DYLD_INFO_weak_bind); + setHexSubdeviceByTableView(current.row(), SMACH::TYPE_DYLD_INFO_weak_bind, ui->widgetHex_DYLD_INFO_weak_bind, ui->tableView_DYLD_INFO_weak_bind); } -void MACHWidget::onTableView_DYLD_INFO_lazy_bind_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void MACHWidget::onTableView_DYLD_INFO_lazy_bind_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(current) Q_UNUSED(previous) - setHexSubdeviceByTableView(current.row(), SMACH::TYPE_DYLD_INFO_lazy_bind, - ui->widgetHex_DYLD_INFO_lazy_bind, - ui->tableView_DYLD_INFO_lazy_bind); + setHexSubdeviceByTableView(current.row(), SMACH::TYPE_DYLD_INFO_lazy_bind, ui->widgetHex_DYLD_INFO_lazy_bind, ui->tableView_DYLD_INFO_lazy_bind); } -void MACHWidget::onTableView_DYLD_INFO_export_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void MACHWidget::onTableView_DYLD_INFO_export_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(current) Q_UNUSED(previous) - setHexSubdeviceByTableView(current.row(), SMACH::TYPE_DYLD_INFO_export, - ui->widgetHex_DYLD_INFO_export, - ui->tableView_DYLD_INFO_export); + setHexSubdeviceByTableView(current.row(), SMACH::TYPE_DYLD_INFO_export, ui->widgetHex_DYLD_INFO_export, ui->tableView_DYLD_INFO_export); } void MACHWidget::editCommandHeader() { @@ -4715,9 +3368,13 @@ void MACHWidget::editSegmentHeader() { showSectionHeader(SMACH::TYPE_mach_segments, ui->tableView_segments); } -void MACHWidget::segmentHex() { showSectionHex(ui->tableView_segments); } +void MACHWidget::segmentHex() { + showSectionHex(ui->tableView_segments); +} -void MACHWidget::segmentDisasm() { showSectionDisasm(ui->tableView_segments); } +void MACHWidget::segmentDisasm() { + showSectionDisasm(ui->tableView_segments); +} void MACHWidget::segmentEntropy() { showSectionEntropy(ui->tableView_segments); @@ -4727,9 +3384,13 @@ void MACHWidget::editSectionHeader() { showSectionHeader(SMACH::TYPE_mach_sections, ui->tableView_sections); } -void MACHWidget::sectionHex() { showSectionHex(ui->tableView_sections); } +void MACHWidget::sectionHex() { + showSectionHex(ui->tableView_sections); +} -void MACHWidget::sectionDisasm() { showSectionDisasm(ui->tableView_sections); } +void MACHWidget::sectionDisasm() { + showSectionDisasm(ui->tableView_sections); +} void MACHWidget::sectionEntropy() { showSectionEntropy(ui->tableView_sections); @@ -4740,8 +3401,7 @@ void MACHWidget::editLibraryHeader() { } void MACHWidget::editWeakLibraryHeader() { - showSectionHeader(SMACH::TYPE_mach_weak_libraries, - ui->tableView_weak_libraries); + showSectionHeader(SMACH::TYPE_mach_weak_libraries, ui->tableView_weak_libraries); } void MACHWidget::editIdLibraryHeader() { @@ -4760,7 +3420,9 @@ void MACHWidget::editSymbolHeader() { showSectionHeader(SMACH::TYPE_SYMBOLTABLE, ui->tableView_SymbolTable); } -void MACHWidget::functionHex() { showSectionHex(ui->tableView_Functions); } +void MACHWidget::functionHex() { + showSectionHex(ui->tableView_Functions); +} void MACHWidget::functionDisasm() { showSectionDisasm(ui->tableView_Functions); @@ -4775,8 +3437,7 @@ void MACHWidget::editDiceHeader() { } void MACHWidget::editModTabHeader() { - showSectionHeader(SMACH::TYPE_DYSYMTAB_modtab, - ui->tableView_DYSYMTAB_modtab); + showSectionHeader(SMACH::TYPE_DYSYMTAB_modtab, ui->tableView_DYSYMTAB_modtab); } void MACHWidget::editTocHeader() { @@ -4784,42 +3445,34 @@ void MACHWidget::editTocHeader() { } void MACHWidget::editExtrelHeader() { - showSectionHeader(SMACH::TYPE_DYSYMTAB_extrel, - ui->tableView_DYSYMTAB_extrel); + showSectionHeader(SMACH::TYPE_DYSYMTAB_extrel, ui->tableView_DYSYMTAB_extrel); } void MACHWidget::editLocrelHeader() { - showSectionHeader(SMACH::TYPE_DYSYMTAB_locrel, - ui->tableView_DYSYMTAB_locrel); + showSectionHeader(SMACH::TYPE_DYSYMTAB_locrel, ui->tableView_DYSYMTAB_locrel); } void MACHWidget::editIndirectSymbolHeader() { - showSectionHeader(SMACH::TYPE_DYSYMTAB_indirectsyms, - ui->tableView_DYSYMTAB_indirectsyms); + showSectionHeader(SMACH::TYPE_DYSYMTAB_indirectsyms, ui->tableView_DYSYMTAB_indirectsyms); } void MACHWidget::editExtRefSymbolHeader() { - showSectionHeader(SMACH::TYPE_DYSYMTAB_extrefsyms, - ui->tableView_DYSYMTAB_extrefsyms); + showSectionHeader(SMACH::TYPE_DYSYMTAB_extrefsyms, ui->tableView_DYSYMTAB_extrefsyms); } -void MACHWidget::diceHex() { showSectionHex(ui->tableView_data_in_code_entry); } +void MACHWidget::diceHex() { + showSectionHex(ui->tableView_data_in_code_entry); +} void MACHWidget::showSectionHeader(int nType, QTableView *pTableView) { qint32 nRow = pTableView->currentIndex().row(); if (nRow != -1) { - QModelIndex index = - pTableView->selectionModel()->selectedIndexes().at(0); + QModelIndex index = pTableView->selectionModel()->selectedIndexes().at(0); - qint64 nOffset = - pTableView->model() - ->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET) - .toLongLong(); + qint64 nOffset = pTableView->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET).toLongLong(); - MACHSectionHeaderWidget *pSectionHeaderWidget = - new MACHSectionHeaderWidget(getDevice(), getOptions(), - (quint32)nRow, nOffset, nType, this); + MACHSectionHeaderWidget *pSectionHeaderWidget = new MACHSectionHeaderWidget(getDevice(), getOptions(), (quint32)nRow, nOffset, nType, this); DialogSectionHeader dsh(this); dsh.setWidget(pSectionHeaderWidget); diff --git a/MACH/machwidget.h b/MACH/machwidget.h index ca382029..3af61507 100644 --- a/MACH/machwidget.h +++ b/MACH/machwidget.h @@ -34,19 +34,17 @@ class MACHWidget; class MACHWidget : public FormatWidget { Q_OBJECT - public: +public: MACHWidget(QWidget *pParent = nullptr); - MACHWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, - QWidget *pParent = nullptr); + MACHWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, QWidget *pParent = nullptr); ~MACHWidget(); virtual void clear(); virtual void cleanup(); virtual void reload(); - protected: - virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, - int nPosition, qint64 nOffset); +protected: + virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset); virtual void setReadonly(bool bState); virtual void blockSignals(bool bState); virtual void adjustHeaderTable(int nType, QTableWidget *pTableWidget); @@ -56,105 +54,44 @@ class MACHWidget : public FormatWidget { virtual void _showInMemoryMapWindowOffset(qint64 nOffset); virtual void _showInHexWindow(qint64 nOffset, qint64 nSize); - private slots: +private slots: virtual void reloadData(); void widgetValueChanged(quint64 nValue); - void on_treeWidgetNavi_currentItemChanged(QTreeWidgetItem *pItemCurrent, - QTreeWidgetItem *pItemPrevious); + void on_treeWidgetNavi_currentItemChanged(QTreeWidgetItem *pItemCurrent, QTreeWidgetItem *pItemPrevious); void on_checkBoxReadonly_toggled(bool bChecked); void on_pushButtonReload_clicked(); void enableButton(); - void on_tableWidget_mach_header_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); - void on_tableWidget_dyld_info_only_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); - void on_tableWidget_symtab_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); - void on_tableWidget_dysymtab_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); - void on_tableWidget_version_min_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); - void on_tableWidget_build_version_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); - void on_tableWidget_source_version_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); - void on_tableWidget_encryption_info_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); - void on_tableWidget_function_starts_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); - void on_tableWidget_data_in_code_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); - void on_tableWidget_code_signature_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); - void on_tableWidget_SuperBlob_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); - void on_tableWidget_main_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); - void on_tableWidget_unix_thread_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); - - void on_tableWidget_unix_thread_x86_32_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn); - void on_tableWidget_unix_thread_x86_64_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn); - void on_tableWidget_unix_thread_arm_32_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn); - void on_tableWidget_unix_thread_arm_64_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn); - void on_tableWidget_unix_thread_ppc_32_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn); + void on_tableWidget_mach_header_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); + void on_tableWidget_dyld_info_only_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); + void on_tableWidget_symtab_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); + void on_tableWidget_dysymtab_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); + void on_tableWidget_version_min_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); + void on_tableWidget_build_version_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); + void on_tableWidget_source_version_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); + void on_tableWidget_encryption_info_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); + void on_tableWidget_function_starts_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); + void on_tableWidget_data_in_code_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); + void on_tableWidget_code_signature_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); + void on_tableWidget_SuperBlob_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); + void on_tableWidget_main_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); + void on_tableWidget_unix_thread_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); + + void on_tableWidget_unix_thread_x86_32_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); + void on_tableWidget_unix_thread_x86_64_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); + void on_tableWidget_unix_thread_arm_32_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); + void on_tableWidget_unix_thread_arm_64_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); + void on_tableWidget_unix_thread_ppc_32_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); void on_toolButtonPrev_clicked(); void on_toolButtonNext_clicked(); - void onTableView_commands_currentRowChanged(const QModelIndex ¤t, - const QModelIndex &previous); - void onTableView_segments_currentRowChanged(const QModelIndex ¤t, - const QModelIndex &previous); - void onTableView_sections_currentRowChanged(const QModelIndex ¤t, - const QModelIndex &previous); - void onTableView_libraries_currentRowChanged(const QModelIndex ¤t, - const QModelIndex &previous); - void onTableView_weak_libraries_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous); - void onTableView_id_library_currentRowChanged(const QModelIndex ¤t, - const QModelIndex &previous); - void onTableView_LOADFVMLIB_currentRowChanged(const QModelIndex ¤t, - const QModelIndex &previous); - void onTableView_IDFVMLIB_currentRowChanged(const QModelIndex ¤t, - const QModelIndex &previous); + void onTableView_commands_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); + void onTableView_segments_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); + void onTableView_sections_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); + void onTableView_libraries_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); + void onTableView_weak_libraries_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); + void onTableView_id_library_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); + void onTableView_LOADFVMLIB_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); + void onTableView_IDFVMLIB_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); void on_tableView_commands_doubleClicked(const QModelIndex &index); void on_tableView_commands_customContextMenuRequested(const QPoint &pos); void on_tableView_segments_doubleClicked(const QModelIndex &index); @@ -164,8 +101,7 @@ class MACHWidget : public FormatWidget { void on_tableView_libraries_doubleClicked(const QModelIndex &index); void on_tableView_libraries_customContextMenuRequested(const QPoint &pos); void on_tableView_weak_libraries_doubleClicked(const QModelIndex &index); - void on_tableView_weak_libraries_customContextMenuRequested( - const QPoint &pos); + void on_tableView_weak_libraries_customContextMenuRequested(const QPoint &pos); void on_tableView_id_library_doubleClicked(const QModelIndex &index); void on_tableView_id_library_customContextMenuRequested(const QPoint &pos); void on_tableView_LOADFVMLIB_doubleClicked(const QModelIndex &index); @@ -176,40 +112,25 @@ class MACHWidget : public FormatWidget { void on_tableView_SymbolTable_customContextMenuRequested(const QPoint &pos); void on_tableView_Functions_doubleClicked(const QModelIndex &index); void on_tableView_Functions_customContextMenuRequested(const QPoint &pos); - void on_tableView_data_in_code_entry_doubleClicked( - const QModelIndex &index); - void on_tableView_data_in_code_entry_customContextMenuRequested( - const QPoint &pos); + void on_tableView_data_in_code_entry_doubleClicked(const QModelIndex &index); + void on_tableView_data_in_code_entry_customContextMenuRequested(const QPoint &pos); void on_tableView_DYSYMTAB_modtab_doubleClicked(const QModelIndex &index); - void on_tableView_DYSYMTAB_modtab_customContextMenuRequested( - const QPoint &pos); + void on_tableView_DYSYMTAB_modtab_customContextMenuRequested(const QPoint &pos); void on_tableView_DYSYMTAB_toc_doubleClicked(const QModelIndex &index); - void on_tableView_DYSYMTAB_toc_customContextMenuRequested( - const QPoint &pos); + void on_tableView_DYSYMTAB_toc_customContextMenuRequested(const QPoint &pos); void on_tableView_DYSYMTAB_extrel_doubleClicked(const QModelIndex &index); - void on_tableView_DYSYMTAB_extrel_customContextMenuRequested( - const QPoint &pos); + void on_tableView_DYSYMTAB_extrel_customContextMenuRequested(const QPoint &pos); void on_tableView_DYSYMTAB_locrel_doubleClicked(const QModelIndex &index); - void on_tableView_DYSYMTAB_locrel_customContextMenuRequested( - const QPoint &pos); - void on_tableView_DYSYMTAB_indirectsyms_doubleClicked( - const QModelIndex &index); - void on_tableView_DYSYMTAB_indirectsyms_customContextMenuRequested( - const QPoint &pos); - void on_tableView_DYSYMTAB_extrefsyms_doubleClicked( - const QModelIndex &index); - void on_tableView_DYSYMTAB_extrefsyms_customContextMenuRequested( - const QPoint &pos); - void onTableView_DYLD_INFO_rebase_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous); - void onTableView_DYLD_INFO_bind_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous); - void onTableView_DYLD_INFO_weak_bind_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous); - void onTableView_DYLD_INFO_lazy_bind_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous); - void onTableView_DYLD_INFO_export_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous); + void on_tableView_DYSYMTAB_locrel_customContextMenuRequested(const QPoint &pos); + void on_tableView_DYSYMTAB_indirectsyms_doubleClicked(const QModelIndex &index); + void on_tableView_DYSYMTAB_indirectsyms_customContextMenuRequested(const QPoint &pos); + void on_tableView_DYSYMTAB_extrefsyms_doubleClicked(const QModelIndex &index); + void on_tableView_DYSYMTAB_extrefsyms_customContextMenuRequested(const QPoint &pos); + void onTableView_DYLD_INFO_rebase_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); + void onTableView_DYLD_INFO_bind_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); + void onTableView_DYLD_INFO_weak_bind_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); + void onTableView_DYLD_INFO_lazy_bind_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); + void onTableView_DYLD_INFO_export_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); void editCommandHeader(); void editSegmentHeader(); void segmentHex(); @@ -250,15 +171,8 @@ class MACHWidget : public FormatWidget { void on_pushButtonEntropy_clicked(); void on_pushButtonHeuristicScan_clicked(); - private: - enum CB { - CB_mach_header_magic = 0, - CB_mach_header_cputype, - CB_mach_header_cpusubtype, - CB_mach_header_filetype, - CB_mach_header_flags, - __CB_size - }; +private: + enum CB { CB_mach_header_magic = 0, CB_mach_header_cputype, CB_mach_header_cpusubtype, CB_mach_header_filetype, CB_mach_header_flags, __CB_size }; enum INV { INV_rebase_off, @@ -292,33 +206,21 @@ class MACHWidget : public FormatWidget { XLineEditHEX *g_lineEdit_mach_symtab[N_mach_symtab::__data_size]; XLineEditHEX *g_lineEdit_mach_dysymtab[N_mach_dysymtab::__data_size]; XLineEditHEX *g_lineEdit_mach_version_min[N_mach_version_min::__data_size]; - XLineEditHEX - *g_lineEdit_mach_build_version[N_mach_build_version::__data_size]; - XLineEditHEX - *g_lineEdit_mach_source_version[N_mach_source_version::__data_size]; - XLineEditHEX - *g_lineEdit_mach_encryption_info[N_mach_encryption_info::__data_size]; - XLineEditHEX - *g_lineEdit_mach_function_starts[N_mach_linkedit_data::__data_size]; - XLineEditHEX - *g_lineEdit_mach_data_in_code[N_mach_linkedit_data::__data_size]; - XLineEditHEX - *g_lineEdit_mach_code_signature[N_mach_linkedit_data::__data_size]; + XLineEditHEX *g_lineEdit_mach_build_version[N_mach_build_version::__data_size]; + XLineEditHEX *g_lineEdit_mach_source_version[N_mach_source_version::__data_size]; + XLineEditHEX *g_lineEdit_mach_encryption_info[N_mach_encryption_info::__data_size]; + XLineEditHEX *g_lineEdit_mach_function_starts[N_mach_linkedit_data::__data_size]; + XLineEditHEX *g_lineEdit_mach_data_in_code[N_mach_linkedit_data::__data_size]; + XLineEditHEX *g_lineEdit_mach_code_signature[N_mach_linkedit_data::__data_size]; XLineEditHEX *g_lineEdit_mach_SuperBlob[N_mach_SuperBlob::__data_size]; XLineEditHEX *g_lineEdit_mach_main[N_mach_main::__data_size]; XLineEditHEX *g_lineEdit_mach_unix_thread[N_mach_unix_thread::__data_size]; - XLineEditHEX *g_lineEdit_mach_unix_thread_x86_32 - [N_mach_unix_thread_x86_32::__data_size]; - XLineEditHEX *g_lineEdit_mach_unix_thread_x86_64 - [N_mach_unix_thread_x86_64::__data_size]; - XLineEditHEX *g_lineEdit_mach_unix_thread_arm_32 - [N_mach_unix_thread_arm_32::__data_size]; - XLineEditHEX *g_lineEdit_mach_unix_thread_arm_64 - [N_mach_unix_thread_arm_64::__data_size]; - XLineEditHEX *g_lineEdit_mach_unix_thread_m68k_32 - [N_mach_unix_thread_m68k_32::__data_size]; - XLineEditHEX *g_lineEdit_mach_unix_thread_ppc_32 - [N_mach_unix_thread_ppc_32::__data_size]; + XLineEditHEX *g_lineEdit_mach_unix_thread_x86_32[N_mach_unix_thread_x86_32::__data_size]; + XLineEditHEX *g_lineEdit_mach_unix_thread_x86_64[N_mach_unix_thread_x86_64::__data_size]; + XLineEditHEX *g_lineEdit_mach_unix_thread_arm_32[N_mach_unix_thread_arm_32::__data_size]; + XLineEditHEX *g_lineEdit_mach_unix_thread_arm_64[N_mach_unix_thread_arm_64::__data_size]; + XLineEditHEX *g_lineEdit_mach_unix_thread_m68k_32[N_mach_unix_thread_m68k_32::__data_size]; + XLineEditHEX *g_lineEdit_mach_unix_thread_ppc_32[N_mach_unix_thread_ppc_32::__data_size]; XComboBoxEx *g_comboBox[__CB_size]; InvWidget *g_invWidget[__INV_size]; diff --git a/MACHOFAT/dialogmachofat.cpp b/MACHOFAT/dialogmachofat.cpp index b95fa9a0..579f72c6 100644 --- a/MACHOFAT/dialogmachofat.cpp +++ b/MACHOFAT/dialogmachofat.cpp @@ -22,14 +22,15 @@ #include "ui_dialogmachofat.h" -DialogMACHOFAT::DialogMACHOFAT(QWidget *pParent) - : XShortcutsDialog(pParent), ui(new Ui::DialogMACHOFAT) { +DialogMACHOFAT::DialogMACHOFAT(QWidget *pParent) : XShortcutsDialog(pParent), ui(new Ui::DialogMACHOFAT) { ui->setupUi(this); setWindowFlags(Qt::Window); } -DialogMACHOFAT::~DialogMACHOFAT() { delete ui; } +DialogMACHOFAT::~DialogMACHOFAT() { + delete ui; +} void DialogMACHOFAT::setData(QIODevice *pDevice, FW_DEF::OPTIONS options) { if (options.sTitle != "") { diff --git a/MACHOFAT/dialogmachofat.h b/MACHOFAT/dialogmachofat.h index e49e449e..06b53f6e 100644 --- a/MACHOFAT/dialogmachofat.h +++ b/MACHOFAT/dialogmachofat.h @@ -32,14 +32,14 @@ class DialogMACHOFAT; class DialogMACHOFAT : public XShortcutsDialog { Q_OBJECT - public: +public: explicit DialogMACHOFAT(QWidget *pParent = nullptr); ~DialogMACHOFAT(); void setData(QIODevice *pDevice, FW_DEF::OPTIONS options); void setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions); - private: +private: Ui::DialogMACHOFAT *ui; }; diff --git a/MACHOFAT/machofatwidget.cpp b/MACHOFAT/machofatwidget.cpp index d8547ee1..8b952ecd 100644 --- a/MACHOFAT/machofatwidget.cpp +++ b/MACHOFAT/machofatwidget.cpp @@ -22,12 +22,13 @@ #include "ui_machofatwidget.h" -MACHOFATWidget::MACHOFATWidget(QWidget *pParent) - : FormatWidget(pParent), ui(new Ui::MACHOFATWidget) { +MACHOFATWidget::MACHOFATWidget(QWidget *pParent) : FormatWidget(pParent), ui(new Ui::MACHOFATWidget) { ui->setupUi(this); } -MACHOFATWidget::~MACHOFATWidget() { delete ui; } +MACHOFATWidget::~MACHOFATWidget() { + delete ui; +} void MACHOFATWidget::clear() { ui->comboBoxFilePart->clear(); @@ -52,7 +53,9 @@ void MACHOFATWidget::clear() { g_listDevices.clear(); } -void MACHOFATWidget::cleanup() { MACHOFATWidget::clear(); } +void MACHOFATWidget::cleanup() { + MACHOFATWidget::clear(); +} void MACHOFATWidget::reload() { // Q_UNUSED(ui->comboBoxFilePart); @@ -66,21 +69,17 @@ void MACHOFATWidget::reload() { if (machofat.isValid()) { XBinary::PDSTRUCT pdStruct = {}; - QList listRecords = - machofat.getRecords(-1, &pdStruct); + QList listRecords = machofat.getRecords(-1, &pdStruct); int nNumberOfRecords = listRecords.count(); for (qint32 i = 0; i < nNumberOfRecords; i++) { - SubDevice *pSubDevice = - new SubDevice(getDevice(), listRecords.at(i).nDataOffset, - listRecords.at(i).nUncompressedSize); + SubDevice *pSubDevice = new SubDevice(getDevice(), listRecords.at(i).nDataOffset, listRecords.at(i).nUncompressedSize); if (pSubDevice->open(getDevice()->openMode())) { ui->comboBoxFilePart->addItem(listRecords.at(i).sFileName); - MACHWidget *pMachWidget = - new MACHWidget(pSubDevice, getOptions(), this); + MACHWidget *pMachWidget = new MACHWidget(pSubDevice, getOptions(), this); pMachWidget->setGlobal(getShortcuts(), getGlobalOptions()); @@ -94,9 +93,7 @@ void MACHOFATWidget::reload() { } } -FormatWidget::SV MACHOFATWidget::_setValue(QVariant vValue, int nStype, - int nNdata, int nVtype, - int nPosition, qint64 nOffset) { +FormatWidget::SV MACHOFATWidget::_setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset) { Q_UNUSED(vValue) Q_UNUSED(nStype) Q_UNUSED(nNdata) @@ -121,9 +118,12 @@ void MACHOFATWidget::setReadonly(bool bState) { // } } -void MACHOFATWidget::blockSignals(bool bState) { Q_UNUSED(bState) } +void MACHOFATWidget::blockSignals(bool bState) { + Q_UNUSED(bState) +} -void MACHOFATWidget::reloadData() {} +void MACHOFATWidget::reloadData() { +} void MACHOFATWidget::on_comboBoxFilePart_currentIndexChanged(int nIndex) { ui->stackedWidget->setCurrentIndex(nIndex); diff --git a/MACHOFAT/machofatwidget.h b/MACHOFAT/machofatwidget.h index 73158295..8bbb61a2 100644 --- a/MACHOFAT/machofatwidget.h +++ b/MACHOFAT/machofatwidget.h @@ -30,7 +30,7 @@ class MACHOFATWidget; class MACHOFATWidget : public FormatWidget { Q_OBJECT - public: +public: explicit MACHOFATWidget(QWidget *pParent = nullptr); ~MACHOFATWidget(); @@ -38,17 +38,16 @@ class MACHOFATWidget : public FormatWidget { virtual void cleanup(); virtual void reload(); - protected: - virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, - int nPosition, qint64 nOffset); +protected: + virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset); virtual void setReadonly(bool bState); virtual void blockSignals(bool bState); - private slots: +private slots: void reloadData(); void on_comboBoxFilePart_currentIndexChanged(int nIndex); - private: +private: Ui::MACHOFATWidget *ui; QList g_listDevices; }; diff --git a/MSDOS/dialogmsdos.cpp b/MSDOS/dialogmsdos.cpp index 6c7c5231..e11828a6 100644 --- a/MSDOS/dialogmsdos.cpp +++ b/MSDOS/dialogmsdos.cpp @@ -22,14 +22,15 @@ #include "ui_dialogmsdos.h" -DialogMSDOS::DialogMSDOS(QWidget *pParent) - : XShortcutsDialog(pParent), ui(new Ui::DialogMSDOS) { +DialogMSDOS::DialogMSDOS(QWidget *pParent) : XShortcutsDialog(pParent), ui(new Ui::DialogMSDOS) { ui->setupUi(this); setWindowFlags(Qt::Window); } -DialogMSDOS::~DialogMSDOS() { delete ui; } +DialogMSDOS::~DialogMSDOS() { + delete ui; +} void DialogMSDOS::setData(QIODevice *pDevice, FW_DEF::OPTIONS options) { if (options.sTitle != "") { diff --git a/MSDOS/dialogmsdos.h b/MSDOS/dialogmsdos.h index 173d494b..5e4549b8 100644 --- a/MSDOS/dialogmsdos.h +++ b/MSDOS/dialogmsdos.h @@ -32,14 +32,14 @@ class DialogMSDOS; class DialogMSDOS : public XShortcutsDialog { Q_OBJECT - public: +public: explicit DialogMSDOS(QWidget *pParent = nullptr); ~DialogMSDOS(); void setData(QIODevice *pDevice, FW_DEF::OPTIONS options); void setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions); - private: +private: Ui::DialogMSDOS *ui; }; diff --git a/MSDOS/msdos_defs.cpp b/MSDOS/msdos_defs.cpp index 19779f08..80e507f4 100644 --- a/MSDOS/msdos_defs.cpp +++ b/MSDOS/msdos_defs.cpp @@ -21,36 +21,18 @@ #include "msdos_defs.h" namespace N_DOS_HEADER { -const FW_DEF::HEADER_RECORD records[] = { - {e_magic, "e_magic", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_magic), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_cblp, "e_cblp", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cblp), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_cp, "e_cp", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cp), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_crlc, "e_crlc", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_crlc), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_cparhdr, "e_cparhdr", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cparhdr), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_minalloc, "e_minalloc", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_minalloc), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_maxalloc, "e_maxalloc", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_maxalloc), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_ss, "e_ss", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_ss), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_sp, "e_sp", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_sp), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_csum, "e_csum", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_csum), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_ip, "e_ip", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_ip), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_cs, "e_cs", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cs), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_lfarlc, "e_lfarlc", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_lfarlc), - 2, "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_ovno, "e_ovno", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_ovno), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}}; +const FW_DEF::HEADER_RECORD records[] = {{e_magic, "e_magic", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_magic), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_cblp, "e_cblp", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cblp), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_cp, "e_cp", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cp), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_crlc, "e_crlc", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_crlc), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_cparhdr, "e_cparhdr", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cparhdr), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_minalloc, "e_minalloc", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_minalloc), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_maxalloc, "e_maxalloc", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_maxalloc), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_ss, "e_ss", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_ss), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_sp, "e_sp", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_sp), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_csum, "e_csum", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_csum), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_ip, "e_ip", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_ip), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_cs, "e_cs", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cs), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_lfarlc, "e_lfarlc", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_lfarlc), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_ovno, "e_ovno", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_ovno), 2, "WORD", FW_DEF::VAL_TYPE_DATA}}; } diff --git a/MSDOS/msdos_defs.h b/MSDOS/msdos_defs.h index 7f98547c..f0e50271 100644 --- a/MSDOS/msdos_defs.h +++ b/MSDOS/msdos_defs.h @@ -43,23 +43,7 @@ enum TYPE { } namespace N_DOS_HEADER { -enum DATA { - e_magic = 0, - e_cblp, - e_cp, - e_crlc, - e_cparhdr, - e_minalloc, - e_maxalloc, - e_ss, - e_sp, - e_csum, - e_ip, - e_cs, - e_lfarlc, - e_ovno, - __data_size -}; +enum DATA { e_magic = 0, e_cblp, e_cp, e_crlc, e_cparhdr, e_minalloc, e_maxalloc, e_ss, e_sp, e_csum, e_ip, e_cs, e_lfarlc, e_ovno, __data_size }; extern const FW_DEF::HEADER_RECORD records[__data_size]; } // namespace N_DOS_HEADER diff --git a/MSDOS/msdoswidget.cpp b/MSDOS/msdoswidget.cpp index 49b37531..1b9a80ca 100644 --- a/MSDOS/msdoswidget.cpp +++ b/MSDOS/msdoswidget.cpp @@ -22,8 +22,7 @@ #include "ui_msdoswidget.h" -MSDOSWidget::MSDOSWidget(QWidget *pParent) - : FormatWidget(pParent), ui(new Ui::MSDOSWidget) { +MSDOSWidget::MSDOSWidget(QWidget *pParent) : FormatWidget(pParent), ui(new Ui::MSDOSWidget) { ui->setupUi(this); memset(g_subDevice, 0, sizeof g_subDevice); @@ -31,14 +30,14 @@ MSDOSWidget::MSDOSWidget(QWidget *pParent) initWidget(); } -MSDOSWidget::MSDOSWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, - QWidget *pParent) - : MSDOSWidget(pParent) { +MSDOSWidget::MSDOSWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, QWidget *pParent) : MSDOSWidget(pParent) { MSDOSWidget::setData(pDevice, options, 0, 0, 0); MSDOSWidget::reload(); } -MSDOSWidget::~MSDOSWidget() { delete ui; } +MSDOSWidget::~MSDOSWidget() { + delete ui; +} void MSDOSWidget::clear() { MSDOSWidget::reset(); @@ -46,8 +45,7 @@ void MSDOSWidget::clear() { memset(g_lineEdit_DOS_HEADER, 0, sizeof g_lineEdit_DOS_HEADER); memset(g_comboBox, 0, sizeof g_comboBox); - _deleteSubdevices(g_subDevice, - (sizeof g_subDevice) / (sizeof(SubDevice *))); + _deleteSubdevices(g_subDevice, (sizeof g_subDevice) / (sizeof(SubDevice *))); resetWidget(); @@ -56,7 +54,9 @@ void MSDOSWidget::clear() { ui->treeWidgetNavi->clear(); } -void MSDOSWidget::cleanup() { MSDOSWidget::clear(); } +void MSDOSWidget::cleanup() { + MSDOSWidget::clear(); +} void MSDOSWidget::reload() { MSDOSWidget::clear(); @@ -68,32 +68,20 @@ void MSDOSWidget::reload() { if (msdos.isValid()) { setFileType(msdos.getFileType()); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SMSDOS::TYPE_INFO, tr("Info"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SMSDOS::TYPE_VIRUSTOTAL, "VirusTotal")); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SMSDOS::TYPE_HEX, tr("Hex"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SMSDOS::TYPE_DISASM, tr("Disasm"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SMSDOS::TYPE_HASH, tr("Hash"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SMSDOS::TYPE_STRINGS, tr("Strings"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SMSDOS::TYPE_SIGNATURES, tr("Signatures"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SMSDOS::TYPE_MEMORYMAP, tr("Memory map"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SMSDOS::TYPE_ENTROPY, tr("Entropy"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SMSDOS::TYPE_HEURISTICSCAN, tr("Heuristic scan"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SMSDOS::TYPE_DOS_HEADER, "DOS_HEADER")); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SMSDOS::TYPE_INFO, tr("Info"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SMSDOS::TYPE_VIRUSTOTAL, "VirusTotal")); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SMSDOS::TYPE_HEX, tr("Hex"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SMSDOS::TYPE_DISASM, tr("Disasm"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SMSDOS::TYPE_HASH, tr("Hash"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SMSDOS::TYPE_STRINGS, tr("Strings"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SMSDOS::TYPE_SIGNATURES, tr("Signatures"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SMSDOS::TYPE_MEMORYMAP, tr("Memory map"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SMSDOS::TYPE_ENTROPY, tr("Entropy"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SMSDOS::TYPE_HEURISTICSCAN, tr("Heuristic scan"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SMSDOS::TYPE_DOS_HEADER, "DOS_HEADER")); if (msdos.isOverlayPresent()) { - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SMSDOS::TYPE_OVERLAY, tr("Overlay"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SMSDOS::TYPE_OVERLAY, tr("Overlay"))); } ui->treeWidgetNavi->expandAll(); @@ -104,9 +92,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, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset) { Q_UNUSED(nVtype) Q_UNUSED(nPosition) Q_UNUSED(nOffset) @@ -118,8 +104,7 @@ FormatWidget::SV MSDOSWidget::_setValue(QVariant vValue, int nStype, int nNdata, quint64 nValue = vValue.toULongLong(); if (getDevice()->isWritable()) { - XMSDOS msdos(getDevice(), getOptions().bIsImage, - getOptions().nImageBase); + XMSDOS msdos(getDevice(), getOptions().bIsImage, getOptions().nImageBase); if (msdos.isValid()) { switch (nStype) { @@ -194,8 +179,7 @@ FormatWidget::SV MSDOSWidget::_setValue(QVariant vValue, int nStype, int nNdata, } void MSDOSWidget::setReadonly(bool bState) { - setLineEditsReadOnly(g_lineEdit_DOS_HEADER, N_DOS_HEADER::__data_size, - bState); + setLineEditsReadOnly(g_lineEdit_DOS_HEADER, N_DOS_HEADER::__data_size, bState); setComboBoxesReadOnly(g_comboBox, __CB_size, bState); @@ -205,8 +189,7 @@ void MSDOSWidget::setReadonly(bool bState) { } void MSDOSWidget::blockSignals(bool bState) { - _blockSignals((QObject **)g_lineEdit_DOS_HEADER, N_DOS_HEADER::__data_size, - bState); + _blockSignals((QObject **)g_lineEdit_DOS_HEADER, N_DOS_HEADER::__data_size, bState); _blockSignals((QObject **)g_comboBox, __CB_size, bState); } @@ -255,9 +238,7 @@ void MSDOSWidget::_showInHexWindow(qint64 nOffset, qint64 nSize) { } void MSDOSWidget::reloadData() { - int nType = ui->treeWidgetNavi->currentItem() - ->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_TYPE) - .toInt(); + int nType = ui->treeWidgetNavi->currentItem()->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_TYPE).toInt(); // qint64 // nDataOffset=ui->treeWidgetNavi->currentItem()->data(0,Qt::UserRole+FW_DEF::SECTION_DATA_OFFSET).toLongLong(); // qint64 @@ -272,8 +253,7 @@ void MSDOSWidget::reloadData() { if (msdos.isValid()) { if (nType == SMSDOS::TYPE_INFO) { if (!isInitPresent(sInit)) { - ui->widgetInfo->setData(getDevice(), msdos.getFileType(), - "Info", true); + ui->widgetInfo->setData(getDevice(), msdos.getFileType(), "Info", true); } } else if (nType == SMSDOS::TYPE_VIRUSTOTAL) { if (!isInitPresent(sInit)) { @@ -303,8 +283,7 @@ void MSDOSWidget::reloadData() { } } else if (nType == SMSDOS::TYPE_HASH) { if (!isInitPresent(sInit)) { - ui->widgetHash->setData(getDevice(), msdos.getFileType(), 0, -1, - true); + ui->widgetHash->setData(getDevice(), msdos.getFileType(), 0, -1, true); } } else if (nType == SMSDOS::TYPE_STRINGS) { if (!isInitPresent(sInit)) { @@ -323,8 +302,7 @@ void MSDOSWidget::reloadData() { SearchSignaturesWidget::OPTIONS signaturesOptions = {}; signaturesOptions.bMenu_Hex = true; - ui->widgetSignatures->setData(getDevice(), msdos.getFileType(), - signaturesOptions, false); + ui->widgetSignatures->setData(getDevice(), msdos.getFileType(), signaturesOptions, false); } } else if (nType == SMSDOS::TYPE_MEMORYMAP) { if (!isInitPresent(sInit)) { @@ -332,68 +310,44 @@ void MSDOSWidget::reloadData() { } } else if (nType == SMSDOS::TYPE_ENTROPY) { if (!isInitPresent(sInit)) { - ui->widgetEntropy->setData(getDevice(), 0, getDevice()->size(), - msdos.getFileType(), true); + ui->widgetEntropy->setData(getDevice(), 0, getDevice()->size(), msdos.getFileType(), true); } } else if (nType == SMSDOS::TYPE_HEURISTICSCAN) { if (!isInitPresent(sInit)) { - ui->widgetHeuristicScan->setData(getDevice(), true, - msdos.getFileType()); + ui->widgetHeuristicScan->setData(getDevice(), true, msdos.getFileType()); } } else if (nType == SMSDOS::TYPE_DOS_HEADER) { if (!isInitPresent(sInit)) { - createHeaderTable(SMSDOS::TYPE_DOS_HEADER, - ui->tableWidget_DOS_HEADER, - N_DOS_HEADER::records, g_lineEdit_DOS_HEADER, - N_DOS_HEADER::__data_size, 0); - g_comboBox[CB_DOS_HEADER_e_magic] = createComboBox( - ui->tableWidget_DOS_HEADER, XMSDOS::getImageMagicsS(), - SMSDOS::TYPE_DOS_HEADER, N_DOS_HEADER::e_magic, - XComboBoxEx::CBTYPE_LIST); + createHeaderTable(SMSDOS::TYPE_DOS_HEADER, ui->tableWidget_DOS_HEADER, N_DOS_HEADER::records, g_lineEdit_DOS_HEADER, N_DOS_HEADER::__data_size, + 0); + g_comboBox[CB_DOS_HEADER_e_magic] = createComboBox(ui->tableWidget_DOS_HEADER, XMSDOS::getImageMagicsS(), SMSDOS::TYPE_DOS_HEADER, + N_DOS_HEADER::e_magic, XComboBoxEx::CBTYPE_LIST); blockSignals(true); - XMSDOS_DEF::IMAGE_DOS_HEADEREX msdosheaderex = - msdos.getDosHeaderEx(); - - g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_magic]->setValue( - msdosheaderex.e_magic); - g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_cblp]->setValue( - msdosheaderex.e_cblp); - g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_cp]->setValue( - msdosheaderex.e_cp); - g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_crlc]->setValue( - msdosheaderex.e_crlc); - g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_cparhdr]->setValue( - msdosheaderex.e_cparhdr); - g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_minalloc]->setValue( - msdosheaderex.e_minalloc); - g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_maxalloc]->setValue( - msdosheaderex.e_maxalloc); - g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_ss]->setValue( - msdosheaderex.e_ss); - g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_sp]->setValue( - msdosheaderex.e_sp); - g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_csum]->setValue( - msdosheaderex.e_csum); - g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_ip]->setValue( - msdosheaderex.e_ip); - g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_cs]->setValue( - msdosheaderex.e_cs); - g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_lfarlc]->setValue( - msdosheaderex.e_lfarlc); - g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_ovno]->setValue( - msdosheaderex.e_ovno); - - g_comboBox[CB_DOS_HEADER_e_magic]->setValue( - msdosheaderex.e_magic); + XMSDOS_DEF::IMAGE_DOS_HEADEREX msdosheaderex = msdos.getDosHeaderEx(); + + g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_magic]->setValue(msdosheaderex.e_magic); + g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_cblp]->setValue(msdosheaderex.e_cblp); + g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_cp]->setValue(msdosheaderex.e_cp); + g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_crlc]->setValue(msdosheaderex.e_crlc); + g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_cparhdr]->setValue(msdosheaderex.e_cparhdr); + g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_minalloc]->setValue(msdosheaderex.e_minalloc); + g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_maxalloc]->setValue(msdosheaderex.e_maxalloc); + g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_ss]->setValue(msdosheaderex.e_ss); + g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_sp]->setValue(msdosheaderex.e_sp); + g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_csum]->setValue(msdosheaderex.e_csum); + g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_ip]->setValue(msdosheaderex.e_ip); + g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_cs]->setValue(msdosheaderex.e_cs); + g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_lfarlc]->setValue(msdosheaderex.e_lfarlc); + g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_ovno]->setValue(msdosheaderex.e_ovno); + + g_comboBox[CB_DOS_HEADER_e_magic]->setValue(msdosheaderex.e_magic); qint64 nOffset = msdos.getDosHeaderExOffset(); // Ex! qint64 nSize = msdos.getDosHeaderExSize(); - loadHexSubdevice(nOffset, nSize, nOffset, - &g_subDevice[SMSDOS::TYPE_DOS_HEADER], - ui->widgetHex_DOS_HEADER); + loadHexSubdevice(nOffset, nSize, nOffset, &g_subDevice[SMSDOS::TYPE_DOS_HEADER], ui->widgetHex_DOS_HEADER); blockSignals(false); } @@ -402,9 +356,7 @@ void MSDOSWidget::reloadData() { qint64 nOverLayOffset = msdos.getOverlayOffset(); qint64 nOverlaySize = msdos.getOverlaySize(); - loadHexSubdevice(nOverLayOffset, nOverlaySize, nOverLayOffset, - &g_subDevice[SMSDOS::TYPE_OVERLAY], - ui->widgetHex_OVERLAY); + loadHexSubdevice(nOverLayOffset, nOverlaySize, nOverLayOffset, &g_subDevice[SMSDOS::TYPE_OVERLAY], ui->widgetHex_OVERLAY); } } @@ -423,8 +375,7 @@ void MSDOSWidget::widgetValueChanged(quint64 nValue) { case SMSDOS::TYPE_DOS_HEADER: switch (nNdata) { case N_DOS_HEADER::e_magic: - g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_magic]->setValue( - (quint16)nValue); + g_lineEdit_DOS_HEADER[N_DOS_HEADER::e_magic]->setValue((quint16)nValue); break; } @@ -432,8 +383,7 @@ void MSDOSWidget::widgetValueChanged(quint64 nValue) { } } -void MSDOSWidget::on_treeWidgetNavi_currentItemChanged( - QTreeWidgetItem *pItemCurrent, QTreeWidgetItem *pItemPrevious) { +void MSDOSWidget::on_treeWidgetNavi_currentItemChanged(QTreeWidgetItem *pItemCurrent, QTreeWidgetItem *pItemPrevious) { Q_UNUSED(pItemPrevious) if (pItemCurrent) { @@ -455,18 +405,17 @@ void MSDOSWidget::on_pushButtonReload_clicked() { QTimer::singleShot(1000, this, SLOT(enableButton())); } -void MSDOSWidget::enableButton() { ui->pushButtonReload->setEnabled(true); } +void MSDOSWidget::enableButton() { + ui->pushButtonReload->setEnabled(true); +} -void MSDOSWidget::on_tableWidget_DOS_HEADER_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void MSDOSWidget::on_tableWidget_DOS_HEADER_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow); Q_UNUSED(nCurrentColumn); Q_UNUSED(nPreviousRow); Q_UNUSED(nPreviousColumn); - setHeaderTableSelection(ui->widgetHex_DOS_HEADER, - ui->tableWidget_DOS_HEADER); + setHeaderTableSelection(ui->widgetHex_DOS_HEADER, ui->tableWidget_DOS_HEADER); } void MSDOSWidget::on_toolButtonPrev_clicked() { diff --git a/MSDOS/msdoswidget.h b/MSDOS/msdoswidget.h index 01523e0b..7f3acdff 100644 --- a/MSDOS/msdoswidget.h +++ b/MSDOS/msdoswidget.h @@ -31,19 +31,17 @@ class MSDOSWidget; class MSDOSWidget : public FormatWidget { Q_OBJECT - public: +public: MSDOSWidget(QWidget *pParent = nullptr); - MSDOSWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, - QWidget *pParent = nullptr); + MSDOSWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, QWidget *pParent = nullptr); ~MSDOSWidget(); virtual void clear(); virtual void cleanup(); virtual void reload(); - protected: - virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, - int nPosition, qint64 nOffset); +protected: + virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset); virtual void setReadonly(bool bState); virtual void blockSignals(bool bState); virtual void adjustHeaderTable(int nType, QTableWidget *pTableWidget); @@ -53,18 +51,14 @@ class MSDOSWidget : public FormatWidget { virtual void _showInMemoryMapWindowOffset(qint64 nOffset); virtual void _showInHexWindow(qint64 nOffset, qint64 nSize); - private slots: +private slots: virtual void reloadData(); void widgetValueChanged(quint64 nValue); - void on_treeWidgetNavi_currentItemChanged(QTreeWidgetItem *pItemCurrent, - QTreeWidgetItem *pItemPrevious); + void on_treeWidgetNavi_currentItemChanged(QTreeWidgetItem *pItemCurrent, QTreeWidgetItem *pItemPrevious); void on_checkBoxReadonly_toggled(bool bChecked); void on_pushButtonReload_clicked(); void enableButton(); - void on_tableWidget_DOS_HEADER_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); + void on_tableWidget_DOS_HEADER_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); void on_toolButtonPrev_clicked(); void on_toolButtonNext_clicked(); void on_pushButtonHex_clicked(); @@ -74,7 +68,7 @@ class MSDOSWidget : public FormatWidget { void on_pushButtonEntropy_clicked(); void on_pushButtonHeuristicScan_clicked(); - private: +private: enum CB { CB_DOS_HEADER_e_magic = 0, __CB_size }; Ui::MSDOSWidget *ui; diff --git a/MultiSearch/dialogmultisearchprocess.cpp b/MultiSearch/dialogmultisearchprocess.cpp index 3e220e86..d611de53 100644 --- a/MultiSearch/dialogmultisearchprocess.cpp +++ b/MultiSearch/dialogmultisearchprocess.cpp @@ -20,8 +20,7 @@ */ #include "dialogmultisearchprocess.h" -DialogMultiSearchProcess::DialogMultiSearchProcess(QWidget *pParent) - : XDialogProcess(pParent) { +DialogMultiSearchProcess::DialogMultiSearchProcess(QWidget *pParent) : XDialogProcess(pParent) { g_type = MultiSearch::TYPE_STRINGS; g_pHandleSearch = new MultiSearch; @@ -32,19 +31,13 @@ DialogMultiSearchProcess::DialogMultiSearchProcess(QWidget *pParent) g_pHandleSearch->moveToThread(g_pThreadSearch); g_pHandleModel->moveToThread(g_pThreadModel); - connect(g_pThreadSearch, SIGNAL(started()), g_pHandleSearch, - SLOT(processSearch())); - connect(g_pHandleSearch, SIGNAL(completed(qint64)), this, - SLOT(onCompleted(qint64))); - connect(g_pHandleSearch, SIGNAL(errorMessage(QString)), this, - SLOT(errorMessage(QString))); + connect(g_pThreadSearch, SIGNAL(started()), g_pHandleSearch, SLOT(processSearch())); + connect(g_pHandleSearch, SIGNAL(completed(qint64)), this, SLOT(onCompleted(qint64))); + connect(g_pHandleSearch, SIGNAL(errorMessage(QString)), this, SLOT(errorMessage(QString))); - connect(g_pThreadModel, SIGNAL(started()), g_pHandleModel, - SLOT(processModel())); - connect(g_pHandleModel, SIGNAL(completed(qint64)), this, - SLOT(onCompleted(qint64))); - connect(g_pHandleModel, SIGNAL(errorMessage(QString)), this, - SLOT(errorMessage(QString))); + connect(g_pThreadModel, SIGNAL(started()), g_pHandleModel, SLOT(processModel())); + connect(g_pHandleModel, SIGNAL(completed(qint64)), this, SLOT(onCompleted(qint64))); + connect(g_pHandleModel, SIGNAL(errorMessage(QString)), this, SLOT(errorMessage(QString))); } DialogMultiSearchProcess::~DialogMultiSearchProcess() { @@ -63,9 +56,8 @@ DialogMultiSearchProcess::~DialogMultiSearchProcess() { delete g_pHandleModel; } -void DialogMultiSearchProcess::processSearch( - QIODevice *pDevice, QList *pListRecords, - MultiSearch::OPTIONS options, MultiSearch::TYPE type) { +void DialogMultiSearchProcess::processSearch(QIODevice *pDevice, QList *pListRecords, MultiSearch::OPTIONS options, + MultiSearch::TYPE type) { g_type = type; if (type == MultiSearch::TYPE_STRINGS) { @@ -74,17 +66,14 @@ void DialogMultiSearchProcess::processSearch( setWindowTitle(tr("Search signatures")); } - g_pHandleSearch->setSearchData(pDevice, pListRecords, options, type, - getPdStruct()); + g_pHandleSearch->setSearchData(pDevice, pListRecords, options, type, getPdStruct()); g_pThreadSearch->start(); } -void DialogMultiSearchProcess::processModel( - QList *pListRecords, QStandardItemModel **ppModel, - MultiSearch::OPTIONS options, MultiSearch::TYPE type) { +void DialogMultiSearchProcess::processModel(QList *pListRecords, QStandardItemModel **ppModel, MultiSearch::OPTIONS options, + MultiSearch::TYPE type) { setWindowTitle(tr("Create view model")); - g_pHandleModel->setModelData(pListRecords, ppModel, options, type, - getPdStruct()); + g_pHandleModel->setModelData(pListRecords, ppModel, options, type, getPdStruct()); g_pThreadModel->start(); } diff --git a/MultiSearch/dialogmultisearchprocess.h b/MultiSearch/dialogmultisearchprocess.h index fa94dfb7..67f27672 100644 --- a/MultiSearch/dialogmultisearchprocess.h +++ b/MultiSearch/dialogmultisearchprocess.h @@ -33,18 +33,14 @@ class DialogMultiSearchProcess : public XDialogProcess { Q_OBJECT - public: +public: explicit DialogMultiSearchProcess(QWidget *pParent = nullptr); ~DialogMultiSearchProcess(); - void processSearch(QIODevice *pDevice, - QList *pListRecords, - MultiSearch::OPTIONS options, MultiSearch::TYPE type); - void processModel(QList *pListRecords, - QStandardItemModel **ppModel, - MultiSearch::OPTIONS options, MultiSearch::TYPE type); + void processSearch(QIODevice *pDevice, QList *pListRecords, MultiSearch::OPTIONS options, MultiSearch::TYPE type); + void processModel(QList *pListRecords, QStandardItemModel **ppModel, MultiSearch::OPTIONS options, MultiSearch::TYPE type); - private: +private: MultiSearch *g_pHandleSearch; MultiSearch *g_pHandleModel; QThread *g_pThreadSearch; diff --git a/MultiSearch/multisearch.cpp b/MultiSearch/multisearch.cpp index 283a84db..7357c165 100644 --- a/MultiSearch/multisearch.cpp +++ b/MultiSearch/multisearch.cpp @@ -28,12 +28,11 @@ MultiSearch::MultiSearch(QObject *pParent) : QObject(pParent) { g_pSemaphore = new QSemaphore(N_MAXNUMBEROFTHREADS); } -MultiSearch::~MultiSearch() { delete g_pSemaphore; } +MultiSearch::~MultiSearch() { + delete g_pSemaphore; +} -void MultiSearch::setSearchData(QIODevice *pDevice, - QList *pListRecords, - OPTIONS options, TYPE type, - XBinary::PDSTRUCT *pPdStruct) { +void MultiSearch::setSearchData(QIODevice *pDevice, QList *pListRecords, OPTIONS options, TYPE type, XBinary::PDSTRUCT *pPdStruct) { this->g_pDevice = pDevice; this->g_pListRecords = pListRecords; @@ -42,9 +41,8 @@ void MultiSearch::setSearchData(QIODevice *pDevice, g_pPdStruct = pPdStruct; } -void MultiSearch::setModelData(QList *pListRecords, - QStandardItemModel **ppModel, OPTIONS options, - TYPE type, XBinary::PDSTRUCT *pPdStruct) { +void MultiSearch::setModelData(QList *pListRecords, QStandardItemModel **ppModel, OPTIONS options, TYPE type, + XBinary::PDSTRUCT *pPdStruct) { this->g_pListRecords = pListRecords; this->g_ppModel = ppModel; @@ -53,8 +51,7 @@ void MultiSearch::setModelData(QList *pListRecords, g_pPdStruct = pPdStruct; } -QList MultiSearch::loadSignaturesFromFile( - QString sFileName) { +QList MultiSearch::loadSignaturesFromFile(QString sFileName) { QList listResult; QFile file; @@ -87,8 +84,7 @@ QList MultiSearch::loadSignaturesFromFile( return listResult; } -MultiSearch::SIGNATURE_RECORD MultiSearch::createSignature(QString sName, - QString sSignature) { +MultiSearch::SIGNATURE_RECORD MultiSearch::createSignature(QString sName, QString sSignature) { MultiSearch::SIGNATURE_RECORD result = {}; result.bIsBigEndian = false; @@ -100,8 +96,7 @@ MultiSearch::SIGNATURE_RECORD MultiSearch::createSignature(QString sName, return result; } -void MultiSearch::processSignature( - MultiSearch::SIGNATURE_RECORD signatureRecord) { +void MultiSearch::processSignature(MultiSearch::SIGNATURE_RECORD signatureRecord) { //#ifdef QT_DEBUG // QElapsedTimer timer; // timer.start(); @@ -113,16 +108,13 @@ void MultiSearch::processSignature( binary.setReadWriteMutex(&g_mutex); binary.setDevice(g_pDevice); - QList listResult = binary.multiSearch_signature( - &(g_options.memoryMap), 0, binary.getSize(), N_MAX, - signatureRecord.sSignature, signatureRecord.sName, g_pPdStruct); + QList listResult = + binary.multiSearch_signature(&(g_options.memoryMap), 0, binary.getSize(), N_MAX, signatureRecord.sSignature, signatureRecord.sName, g_pPdStruct); g_pListRecords->append(listResult); - XBinary::setPdStructStatus(g_pPdStruct, g_nFreeIndex, - signatureRecord.sName); - XBinary::setPdStructCurrent(g_pPdStruct, g_nFreeIndex, - signatureRecord.nNumber); + XBinary::setPdStructStatus(g_pPdStruct, g_nFreeIndex, signatureRecord.sName); + XBinary::setPdStructCurrent(g_pPdStruct, g_nFreeIndex, signatureRecord.nNumber); g_pSemaphore->release(); //#ifdef QT_DEBUG @@ -141,8 +133,7 @@ void MultiSearch::processSearch() { if (g_type == TYPE_STRINGS) { XBinary binary(g_pDevice); - connect(&binary, SIGNAL(errorMessage(QString)), this, - SIGNAL(errorMessage(QString))); + connect(&binary, SIGNAL(errorMessage(QString)), this, SIGNAL(errorMessage(QString))); XBinary::STRINGSEARCH_OPTIONS ssOptions = {}; ssOptions.nLimit = N_MAX; @@ -155,8 +146,7 @@ void MultiSearch::processSearch() { ssOptions.sANSICodec = g_options.sANSICodec; ssOptions.bLinks = g_options.bLinks; - *g_pListRecords = binary.multiSearch_allStrings(0, g_pDevice->size(), - ssOptions, g_pPdStruct); + *g_pListRecords = binary.multiSearch_allStrings(0, g_pDevice->size(), ssOptions, g_pPdStruct); } else if (g_type == TYPE_SIGNATURES) { #ifdef QT_DEBUG QElapsedTimer timer; @@ -166,23 +156,18 @@ void MultiSearch::processSearch() { qint32 nNumberOfSignatures = g_options.pListSignatureRecords->count(); - XBinary::setPdStructTotal(g_pPdStruct, g_nFreeIndex, - nNumberOfSignatures); + XBinary::setPdStructTotal(g_pPdStruct, g_nFreeIndex, nNumberOfSignatures); - for (qint32 i = 0; - (i < nNumberOfSignatures) && (!(g_pPdStruct->bIsStop)); i++) { - SIGNATURE_RECORD signatureRecord = - g_options.pListSignatureRecords->at(i); + for (qint32 i = 0; (i < nNumberOfSignatures) && (!(g_pPdStruct->bIsStop)); i++) { + SIGNATURE_RECORD signatureRecord = g_options.pListSignatureRecords->at(i); bool bSuccess = false; if ((signatureRecord.bIsBigEndian) && (g_options.bIsBigEndian)) { bSuccess = true; - } else if ((signatureRecord.bIsLittleEndian) && - (!g_options.bIsBigEndian)) { + } else if ((signatureRecord.bIsLittleEndian) && (!g_options.bIsBigEndian)) { bSuccess = true; - } else if ((!signatureRecord.bIsLittleEndian) && - (!signatureRecord.bIsBigEndian)) { + } else if ((!signatureRecord.bIsLittleEndian) && (!signatureRecord.bIsBigEndian)) { bSuccess = true; } @@ -191,12 +176,10 @@ void MultiSearch::processSearch() { // future=QtConcurrent::run(this,&MultiSearch::processSignature,signatureRecord); #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) - QFuture future = - QtConcurrent::run(&MultiSearch::processSignature, this, - signatureRecord); // mb TODO return + QFuture future = QtConcurrent::run(&MultiSearch::processSignature, this, + signatureRecord); // mb TODO return #else - QtConcurrent::run(this, &MultiSearch::processSignature, - signatureRecord); + QtConcurrent::run(this, &MultiSearch::processSignature, signatureRecord); #endif QThread::msleep(5); // wait till run started TODO rewrite! @@ -243,35 +226,27 @@ void MultiSearch::processModel() { if (g_type == TYPE_STRINGS) { qint32 nNumberOfRecords = g_pListRecords->count(); - *g_ppModel = - new QStandardItemModel(nNumberOfRecords, 4); // TODO Check maximum + *g_ppModel = new QStandardItemModel(nNumberOfRecords, 4); // TODO Check maximum XADDR nBaseAddress = g_options.memoryMap.nModuleAddress; - XBinary::MODE modeAddress = XBinary::getWidthModeFromSize( - nBaseAddress + g_options.memoryMap.nRawSize); + XBinary::MODE modeAddress = XBinary::getWidthModeFromSize(nBaseAddress + g_options.memoryMap.nRawSize); XBinary::setPdStructTotal(g_pPdStruct, g_nFreeIndex, nNumberOfRecords); - (*g_ppModel) - ->setHeaderData(0, Qt::Horizontal, - nBaseAddress ? (tr("Address")) : (tr("Offset"))); + (*g_ppModel)->setHeaderData(0, Qt::Horizontal, nBaseAddress ? (tr("Address")) : (tr("Offset"))); (*g_ppModel)->setHeaderData(1, Qt::Horizontal, tr("Size")); (*g_ppModel)->setHeaderData(2, Qt::Horizontal, tr("Type")); (*g_ppModel)->setHeaderData(3, Qt::Horizontal, tr("String")); - for (qint32 i = 0; (i < nNumberOfRecords) && (!(g_pPdStruct->bIsStop)); - i++) { + for (qint32 i = 0; (i < nNumberOfRecords) && (!(g_pPdStruct->bIsStop)); i++) { XBinary::MS_RECORD record = g_pListRecords->at(i); QStandardItem *pTypeAddress = new QStandardItem; - pTypeAddress->setText(XBinary::valueToHex( - modeAddress, record.nOffset + nBaseAddress)); - pTypeAddress->setData(record.nOffset, - Qt::UserRole + USERROLE_OFFSET); + pTypeAddress->setText(XBinary::valueToHex(modeAddress, record.nOffset + nBaseAddress)); + pTypeAddress->setData(record.nOffset, Qt::UserRole + USERROLE_OFFSET); pTypeAddress->setData(record.nSize, Qt::UserRole + USERROLE_SIZE); - pTypeAddress->setData(record.recordType, - Qt::UserRole + USERROLE_TYPE); + pTypeAddress->setData(record.recordType, Qt::UserRole + USERROLE_TYPE); pTypeAddress->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter); (*g_ppModel)->setItem(i, 0, pTypeAddress); @@ -282,8 +257,7 @@ void MultiSearch::processModel() { QStandardItem *pTypeItem = new QStandardItem; - pTypeItem->setText( - XBinary::msRecordTypeIdToString(record.recordType)); + pTypeItem->setText(XBinary::msRecordTypeIdToString(record.recordType)); pTypeItem->setTextAlignment(Qt::AlignLeft); (*g_ppModel)->setItem(i, 2, pTypeItem); @@ -293,11 +267,9 @@ void MultiSearch::processModel() { } } else if (g_type == TYPE_SIGNATURES) { qint32 nNumberOfRecords = g_pListRecords->count(); - *g_ppModel = - new QStandardItemModel(nNumberOfRecords, 3); // TODO Check maximum + *g_ppModel = new QStandardItemModel(nNumberOfRecords, 3); // TODO Check maximum - XBinary::MODE modeAddress = - XBinary::getWidthModeFromMemoryMap(&(g_options.memoryMap)); + XBinary::MODE modeAddress = XBinary::getWidthModeFromMemoryMap(&(g_options.memoryMap)); XBinary::setPdStructTotal(g_pPdStruct, g_nFreeIndex, nNumberOfRecords); @@ -305,28 +277,23 @@ void MultiSearch::processModel() { (*g_ppModel)->setHeaderData(1, Qt::Horizontal, tr("Offset")); (*g_ppModel)->setHeaderData(2, Qt::Horizontal, tr("Name")); - for (qint32 i = 0; (i < nNumberOfRecords) && (!(g_pPdStruct->bIsStop)); - i++) { + for (qint32 i = 0; (i < nNumberOfRecords) && (!(g_pPdStruct->bIsStop)); i++) { XBinary::MS_RECORD record = g_pListRecords->at(i); - XADDR nAddress = XBinary::offsetToAddress(&(g_options.memoryMap), - record.nOffset); + XADDR nAddress = XBinary::offsetToAddress(&(g_options.memoryMap), record.nOffset); QStandardItem *pTypeAddress = new QStandardItem; pTypeAddress->setText(XBinary::valueToHex(modeAddress, nAddress)); - pTypeAddress->setData(record.nOffset, - Qt::UserRole + USERROLE_OFFSET); + pTypeAddress->setData(record.nOffset, Qt::UserRole + USERROLE_OFFSET); pTypeAddress->setData(record.nSize, Qt::UserRole + USERROLE_SIZE); - pTypeAddress->setData(record.sString, - Qt::UserRole + USERROLE_STRING); + pTypeAddress->setData(record.sString, Qt::UserRole + USERROLE_STRING); pTypeAddress->setData(record.sInfo, Qt::UserRole + USERROLE_INFO); pTypeAddress->setData(nAddress, Qt::UserRole + USERROLE_ADDRESS); pTypeAddress->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter); (*g_ppModel)->setItem(i, 0, pTypeAddress); QStandardItem *pTypeOffset = new QStandardItem; - pTypeOffset->setText( - (XBinary::valueToHex(modeAddress, record.nOffset))); + pTypeOffset->setText((XBinary::valueToHex(modeAddress, record.nOffset))); pTypeOffset->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter); (*g_ppModel)->setItem(i, 1, pTypeOffset); diff --git a/MultiSearch/multisearch.h b/MultiSearch/multisearch.h index 7bd31ddc..692c070c 100644 --- a/MultiSearch/multisearch.h +++ b/MultiSearch/multisearch.h @@ -34,17 +34,10 @@ class MultiSearch : public QObject { Q_OBJECT - public: +public: enum TYPE { TYPE_STRINGS = 0, TYPE_SIGNATURES }; - enum USERROLE { - USERROLE_SIZE = 0, - USERROLE_OFFSET, - USERROLE_ADDRESS, - USERROLE_STRING, - USERROLE_INFO, - USERROLE_TYPE - }; + enum USERROLE { USERROLE_SIZE = 0, USERROLE_OFFSET, USERROLE_ADDRESS, USERROLE_STRING, USERROLE_INFO, USERROLE_TYPE }; struct SIGNATURE_RECORD { qint32 nNumber; @@ -74,26 +67,22 @@ class MultiSearch : public QObject { explicit MultiSearch(QObject *pParent = nullptr); ~MultiSearch(); - void setSearchData(QIODevice *pDevice, - QList *pListRecords, OPTIONS options, - TYPE type, XBinary::PDSTRUCT *pPdStruct); - void setModelData(QList *pListRecords, - QStandardItemModel **ppModel, OPTIONS options, TYPE type, - XBinary::PDSTRUCT *pPdStruct); + void setSearchData(QIODevice *pDevice, QList *pListRecords, OPTIONS options, TYPE type, XBinary::PDSTRUCT *pPdStruct); + void setModelData(QList *pListRecords, QStandardItemModel **ppModel, OPTIONS options, TYPE type, XBinary::PDSTRUCT *pPdStruct); static QList loadSignaturesFromFile(QString sFileName); static SIGNATURE_RECORD createSignature(QString sName, QString sSignature); void processSignature(SIGNATURE_RECORD signatureRecord); - signals: +signals: void errorMessage(QString sText); void completed(qint64 nElapsed); - public slots: +public slots: void processSearch(); void processModel(); - private: +private: QIODevice *g_pDevice; QList *g_pListRecords; OPTIONS g_options; diff --git a/NE/dialogne.cpp b/NE/dialogne.cpp index 062fdfe0..f7abbc40 100644 --- a/NE/dialogne.cpp +++ b/NE/dialogne.cpp @@ -22,14 +22,15 @@ #include "ui_dialogne.h" -DialogNE::DialogNE(QWidget *pParent) - : XShortcutsDialog(pParent), ui(new Ui::DialogNE) { +DialogNE::DialogNE(QWidget *pParent) : XShortcutsDialog(pParent), ui(new Ui::DialogNE) { ui->setupUi(this); setWindowFlags(Qt::Window); } -DialogNE::~DialogNE() { delete ui; } +DialogNE::~DialogNE() { + delete ui; +} void DialogNE::setData(QIODevice *pDevice, FW_DEF::OPTIONS options) { if (options.sTitle != "") { diff --git a/NE/dialogne.h b/NE/dialogne.h index 51efa5b6..0f4955bd 100644 --- a/NE/dialogne.h +++ b/NE/dialogne.h @@ -32,14 +32,14 @@ class DialogNE; class DialogNE : public XShortcutsDialog { Q_OBJECT - public: +public: explicit DialogNE(QWidget *pParent = nullptr); ~DialogNE(); void setData(QIODevice *pDevice, FW_DEF::OPTIONS options); void setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions); - private: +private: Ui::DialogNE *ui; }; diff --git a/NE/ne_defs.cpp b/NE/ne_defs.cpp index db13236c..2f42db52 100644 --- a/NE/ne_defs.cpp +++ b/NE/ne_defs.cpp @@ -21,162 +21,79 @@ #include "ne_defs.h" namespace N_NE_DOS_HEADER { -const FW_DEF::HEADER_RECORD records[] = { - {e_magic, "e_magic", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_magic), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_cblp, "e_cblp", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cblp), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_cp, "e_cp", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cp), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_crlc, "e_crlc", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_crlc), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_cparhdr, "e_cparhdr", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cparhdr), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_minalloc, "e_minalloc", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_minalloc), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_maxalloc, "e_maxalloc", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_maxalloc), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_ss, "e_ss", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_ss), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_sp, "e_sp", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_sp), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_csum, "e_csum", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_csum), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_ip, "e_ip", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_ip), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_cs, "e_cs", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cs), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_lfarlc, "e_lfarlc", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_lfarlc), - 2, "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_ovno, "e_ovno", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_ovno), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_res_0, "e_res_0", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res) + 0, 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_res_1, "e_res_1", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res) + 2, 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_res_2, "e_res_2", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res) + 4, 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_res_3, "e_res_3", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res) + 6, 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_oemid, "e_oemid", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_oemid), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_oeminfo, "e_oeminfo", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_oeminfo), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_res2_0, "e_res2_0", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 0, - 2, "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_res2_1, "e_res2_1", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 2, - 2, "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_res2_2, "e_res2_2", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 4, - 2, "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_res2_3, "e_res2_3", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 6, - 2, "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_res2_4, "e_res2_4", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 8, - 2, "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_res2_5, "e_res2_5", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 10, 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_res2_6, "e_res2_6", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 12, 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_res2_7, "e_res2_7", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 14, 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_res2_8, "e_res2_8", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 16, 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_res2_9, "e_res2_9", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 18, 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_lfanew, "e_lfanew", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_lfanew), - 4, "LONG", FW_DEF::VAL_TYPE_OFFSET}}; +const FW_DEF::HEADER_RECORD records[] = {{e_magic, "e_magic", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_magic), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_cblp, "e_cblp", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cblp), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_cp, "e_cp", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cp), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_crlc, "e_crlc", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_crlc), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_cparhdr, "e_cparhdr", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cparhdr), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_minalloc, "e_minalloc", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_minalloc), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_maxalloc, "e_maxalloc", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_maxalloc), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_ss, "e_ss", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_ss), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_sp, "e_sp", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_sp), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_csum, "e_csum", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_csum), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_ip, "e_ip", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_ip), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_cs, "e_cs", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cs), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_lfarlc, "e_lfarlc", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_lfarlc), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_ovno, "e_ovno", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_ovno), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res_0, "e_res_0", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res) + 0, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res_1, "e_res_1", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res) + 2, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res_2, "e_res_2", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res) + 4, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res_3, "e_res_3", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res) + 6, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_oemid, "e_oemid", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_oemid), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_oeminfo, "e_oeminfo", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_oeminfo), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_0, "e_res2_0", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 0, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_1, "e_res2_1", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 2, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_2, "e_res2_2", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 4, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_3, "e_res2_3", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 6, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_4, "e_res2_4", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 8, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_5, "e_res2_5", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 10, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_6, "e_res2_6", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 12, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_7, "e_res2_7", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 14, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_8, "e_res2_8", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 16, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_9, "e_res2_9", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 18, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_lfanew, "e_lfanew", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_lfanew), 4, "LONG", FW_DEF::VAL_TYPE_OFFSET}}; } namespace N_OS2_HEADER { const FW_DEF::HEADER_RECORD records[] = { - {ne_magic, "ne_magic", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_magic), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {ne_ver, "ne_ver", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_ver), 1, "CHAR", - FW_DEF::VAL_TYPE_DATA}, - {ne_rev, "ne_rev", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_rev), 1, "CHAR", - FW_DEF::VAL_TYPE_DATA}, - {ne_enttab, "ne_enttab", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_enttab), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {ne_cbenttab, "ne_cbenttab", - offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_cbenttab), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {ne_crc, "ne_crc", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_crc), 4, "LONG", - FW_DEF::VAL_TYPE_DATA}, - {ne_flags, "ne_flags", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_flags), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {ne_autodata, "ne_autodata", - offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_autodata), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {ne_heap, "ne_heap", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_heap), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {ne_stack, "ne_stack", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_stack), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {ne_csip, "ne_csip", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_csip), 4, - "LONG", FW_DEF::VAL_TYPE_DATA}, - {ne_sssp, "ne_sssp", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_sssp), 4, - "LONG", FW_DEF::VAL_TYPE_DATA}, - {ne_cseg, "ne_cseg", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_cseg), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {ne_cmod, "ne_cmod", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_cmod), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {ne_cbnrestab, "ne_cbnrestab", - offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_cbnrestab), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {ne_segtab, "ne_segtab", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_segtab), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {ne_rsrctab, "ne_rsrctab", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_rsrctab), - 2, "WORD", FW_DEF::VAL_TYPE_DATA}, - {ne_restab, "ne_restab", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_restab), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {ne_modtab, "ne_modtab", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_modtab), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {ne_imptab, "ne_imptab", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_imptab), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {ne_nrestab, "ne_nrestab", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_nrestab), - 4, "LONG", FW_DEF::VAL_TYPE_DATA}, - {ne_cmovent, "ne_cmovent", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_cmovent), - 2, "WORD", FW_DEF::VAL_TYPE_DATA}, - {ne_align, "ne_align", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_align), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {ne_cres, "ne_cres", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_cres), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {ne_exetyp, "ne_exetyp", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_exetyp), 1, - "BYTE", FW_DEF::VAL_TYPE_DATA}, - {ne_flagsothers, "ne_flagsothers", - offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_flagsothers), 1, "BYTE", - FW_DEF::VAL_TYPE_DATA}, - {ne_pretthunks, "ne_pretthunks", - offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_pretthunks), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {ne_psegrefbytes, "ne_psegrefbytes", - offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_psegrefbytes), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {ne_swaparea, "ne_swaparea", - offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_swaparea), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {ne_expver, "ne_expver", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_expver), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, + {ne_magic, "ne_magic", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_magic), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {ne_ver, "ne_ver", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_ver), 1, "CHAR", FW_DEF::VAL_TYPE_DATA}, + {ne_rev, "ne_rev", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_rev), 1, "CHAR", FW_DEF::VAL_TYPE_DATA}, + {ne_enttab, "ne_enttab", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_enttab), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {ne_cbenttab, "ne_cbenttab", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_cbenttab), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {ne_crc, "ne_crc", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_crc), 4, "LONG", FW_DEF::VAL_TYPE_DATA}, + {ne_flags, "ne_flags", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_flags), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {ne_autodata, "ne_autodata", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_autodata), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {ne_heap, "ne_heap", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_heap), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {ne_stack, "ne_stack", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_stack), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {ne_csip, "ne_csip", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_csip), 4, "LONG", FW_DEF::VAL_TYPE_DATA}, + {ne_sssp, "ne_sssp", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_sssp), 4, "LONG", FW_DEF::VAL_TYPE_DATA}, + {ne_cseg, "ne_cseg", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_cseg), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {ne_cmod, "ne_cmod", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_cmod), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {ne_cbnrestab, "ne_cbnrestab", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_cbnrestab), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {ne_segtab, "ne_segtab", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_segtab), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {ne_rsrctab, "ne_rsrctab", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_rsrctab), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {ne_restab, "ne_restab", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_restab), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {ne_modtab, "ne_modtab", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_modtab), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {ne_imptab, "ne_imptab", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_imptab), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {ne_nrestab, "ne_nrestab", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_nrestab), 4, "LONG", FW_DEF::VAL_TYPE_DATA}, + {ne_cmovent, "ne_cmovent", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_cmovent), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {ne_align, "ne_align", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_align), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {ne_cres, "ne_cres", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_cres), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {ne_exetyp, "ne_exetyp", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_exetyp), 1, "BYTE", FW_DEF::VAL_TYPE_DATA}, + {ne_flagsothers, "ne_flagsothers", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_flagsothers), 1, "BYTE", FW_DEF::VAL_TYPE_DATA}, + {ne_pretthunks, "ne_pretthunks", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_pretthunks), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {ne_psegrefbytes, "ne_psegrefbytes", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_psegrefbytes), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {ne_swaparea, "ne_swaparea", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_swaparea), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {ne_expver, "ne_expver", offsetof(XNE_DEF::IMAGE_OS2_HEADER, ne_expver), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, }; } namespace N_NE_SEGMENT { const FW_DEF::HEADER_RECORD records[] = { - {dwFileOffset, "dwFileOffset", offsetof(XNE_DEF::NE_SEGMENT, dwFileOffset), - 2, "WORD", FW_DEF::VAL_TYPE_OFFSET}, - {dwFileSize, "dwFileSize", offsetof(XNE_DEF::NE_SEGMENT, dwFileSize), 2, - "WORD", FW_DEF::VAL_TYPE_SIZE}, - {dwFlags, "dwFlags", offsetof(XNE_DEF::NE_SEGMENT, dwFlags), 2, "WORD", - FW_DEF::VAL_TYPE_FLAGS}, - {dwMinAllocSize, "dwMinAllocSize", - offsetof(XNE_DEF::NE_SEGMENT, dwMinAllocSize), 2, "WORD", - FW_DEF::VAL_TYPE_SIZE}, + {dwFileOffset, "dwFileOffset", offsetof(XNE_DEF::NE_SEGMENT, dwFileOffset), 2, "WORD", FW_DEF::VAL_TYPE_OFFSET}, + {dwFileSize, "dwFileSize", offsetof(XNE_DEF::NE_SEGMENT, dwFileSize), 2, "WORD", FW_DEF::VAL_TYPE_SIZE}, + {dwFlags, "dwFlags", offsetof(XNE_DEF::NE_SEGMENT, dwFlags), 2, "WORD", FW_DEF::VAL_TYPE_FLAGS}, + {dwMinAllocSize, "dwMinAllocSize", offsetof(XNE_DEF::NE_SEGMENT, dwMinAllocSize), 2, "WORD", FW_DEF::VAL_TYPE_SIZE}, }; } diff --git a/NE/ne_defs.h b/NE/ne_defs.h index a47f9b49..40bd08fe 100644 --- a/NE/ne_defs.h +++ b/NE/ne_defs.h @@ -122,13 +122,7 @@ extern const FW_DEF::HEADER_RECORD records[__data_size]; } // namespace N_OS2_HEADER namespace N_NE_SEGMENT { -enum DATA { - dwFileOffset = 0, - dwFileSize, - dwFlags, - dwMinAllocSize, - __data_size -}; +enum DATA { dwFileOffset = 0, dwFileSize, dwFlags, dwMinAllocSize, __data_size }; extern const FW_DEF::HEADER_RECORD records[__data_size]; } // namespace N_NE_SEGMENT diff --git a/NE/neprocessdata.cpp b/NE/neprocessdata.cpp index d5878627..7a37f564 100755 --- a/NE/neprocessdata.cpp +++ b/NE/neprocessdata.cpp @@ -20,9 +20,7 @@ */ #include "neprocessdata.h" -NEProcessData::NEProcessData(int nType, QStandardItemModel **ppModel, XNE *pNE, - qint64 nOffset, qint64 nSize) - : ProcessData() { +NEProcessData::NEProcessData(int nType, QStandardItemModel **ppModel, XNE *pNE, qint64 nOffset, qint64 nSize) : ProcessData() { this->g_nType = nType; this->g_ppModel = ppModel; this->g_pNE = pNE; @@ -35,8 +33,7 @@ void NEProcessData::_process() { QList listLabels; listLabels.append(""); - listLabels.append( - getStructList(N_NE_SEGMENT::records, N_NE_SEGMENT::__data_size)); + listLabels.append(getStructList(N_NE_SEGMENT::records, N_NE_SEGMENT::__data_size)); QList listSegments = g_pNE->getSegmentList(); @@ -44,8 +41,7 @@ void NEProcessData::_process() { qint32 nNumberOfSegments = listSegments.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfSegments, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfSegments, listLabels.count()); setMaximum(nNumberOfSegments); @@ -54,31 +50,16 @@ void NEProcessData::_process() { for (qint32 i = 0; (i < nNumberOfSegments) && (isRun()); i++) { QStandardItem *pItem = new QStandardItem(QString::number(i)); - pItem->setData((listSegments.at(i).dwFileOffset << nShift), - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData((listSegments.at(i).dwFileOffset << nShift), Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); // pItem->setData(listSegments.at(i).dwFileOffset,Qt::UserRole+FW_DEF::SECTION_DATA_HEADEROFFSET); - pItem->setData((i + 1) * 0x10000, - Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); - pItem->setData(listSegments.at(i).dwFileSize, - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); + pItem->setData((i + 1) * 0x10000, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); + pItem->setData(listSegments.at(i).dwFileSize, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, N_NE_SEGMENT::dwFileOffset + 1, - new QStandardItem(XBinary::valueToHex( - listSegments.at(i).dwFileOffset))); - (*g_ppModel) - ->setItem(i, N_NE_SEGMENT::dwFileSize + 1, - new QStandardItem(XBinary::valueToHex( - listSegments.at(i).dwFileSize))); - (*g_ppModel) - ->setItem(i, N_NE_SEGMENT::dwFlags + 1, - new QStandardItem( - XBinary::valueToHex(listSegments.at(i).dwFlags))); - (*g_ppModel) - ->setItem(i, N_NE_SEGMENT::dwMinAllocSize + 1, - new QStandardItem(XBinary::valueToHex( - listSegments.at(i).dwMinAllocSize))); + (*g_ppModel)->setItem(i, N_NE_SEGMENT::dwFileOffset + 1, new QStandardItem(XBinary::valueToHex(listSegments.at(i).dwFileOffset))); + (*g_ppModel)->setItem(i, N_NE_SEGMENT::dwFileSize + 1, new QStandardItem(XBinary::valueToHex(listSegments.at(i).dwFileSize))); + (*g_ppModel)->setItem(i, N_NE_SEGMENT::dwFlags + 1, new QStandardItem(XBinary::valueToHex(listSegments.at(i).dwFlags))); + (*g_ppModel)->setItem(i, N_NE_SEGMENT::dwMinAllocSize + 1, new QStandardItem(XBinary::valueToHex(listSegments.at(i).dwMinAllocSize))); incValue(); } diff --git a/NE/neprocessdata.h b/NE/neprocessdata.h index 6762c26b..59b244a7 100755 --- a/NE/neprocessdata.h +++ b/NE/neprocessdata.h @@ -27,13 +27,12 @@ class NEProcessData : public ProcessData { Q_OBJECT - public: - explicit NEProcessData(int nType, QStandardItemModel **ppModel, XNE *pNE, - qint64 nOffset, qint64 nSize); +public: + explicit NEProcessData(int nType, QStandardItemModel **ppModel, XNE *pNE, qint64 nOffset, qint64 nSize); virtual void _process(); virtual void ajustTableView(QWidget *pWidget, QTableView *pTableView); - private: +private: int g_nType; XNE *g_pNE; QStandardItemModel **g_ppModel; diff --git a/NE/nesectionheaderwidget.cpp b/NE/nesectionheaderwidget.cpp index f30dfdb6..16c73853 100644 --- a/NE/nesectionheaderwidget.cpp +++ b/NE/nesectionheaderwidget.cpp @@ -22,29 +22,25 @@ #include "ui_nesectionheaderwidget.h" -NESectionHeaderWidget::NESectionHeaderWidget(QWidget *pParent) - : FormatWidget(pParent), ui(new Ui::NESectionHeaderWidget) { +NESectionHeaderWidget::NESectionHeaderWidget(QWidget *pParent) : FormatWidget(pParent), ui(new Ui::NESectionHeaderWidget) { ui->setupUi(this); } -NESectionHeaderWidget::NESectionHeaderWidget(QIODevice *pDevice, - FW_DEF::OPTIONS options, - quint32 nNumber, qint64 nOffset, - qint32 nType, QWidget *pParent) +NESectionHeaderWidget::NESectionHeaderWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, quint32 nNumber, qint64 nOffset, qint32 nType, QWidget *pParent) : NESectionHeaderWidget(pParent) { NESectionHeaderWidget::setData(pDevice, options, nNumber, nOffset, nType); } -NESectionHeaderWidget::~NESectionHeaderWidget() {} +NESectionHeaderWidget::~NESectionHeaderWidget() { +} -void NESectionHeaderWidget::clear() {} +void NESectionHeaderWidget::clear() { +} -void NESectionHeaderWidget::reload() {} +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, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset) { Q_UNUSED(vValue) Q_UNUSED(nStype) Q_UNUSED(nNdata) @@ -55,12 +51,15 @@ FormatWidget::SV NESectionHeaderWidget::_setValue(QVariant vValue, int nStype, return SV_NONE; } -void NESectionHeaderWidget::setReadonly(bool bState) { Q_UNUSED(bState) } +void NESectionHeaderWidget::setReadonly(bool bState) { + Q_UNUSED(bState) +} -void NESectionHeaderWidget::blockSignals(bool bState) { Q_UNUSED(bState) } +void NESectionHeaderWidget::blockSignals(bool bState) { + Q_UNUSED(bState) +} -void NESectionHeaderWidget::adjustHeaderTable(int nType, - QTableWidget *pTableWidget) { +void NESectionHeaderWidget::adjustHeaderTable(int nType, QTableWidget *pTableWidget) { Q_UNUSED(nType) Q_UNUSED(pTableWidget) } @@ -69,11 +68,10 @@ void NESectionHeaderWidget::on_checkBoxReadonly_toggled(bool bChecked) { Q_UNUSED(bChecked) } -void NESectionHeaderWidget::reloadData() {} +void NESectionHeaderWidget::reloadData() { +} -void NESectionHeaderWidget::on_tableWidget_Section_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void NESectionHeaderWidget::on_tableWidget_Section_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow) Q_UNUSED(nCurrentColumn) Q_UNUSED(nPreviousRow) diff --git a/NE/nesectionheaderwidget.h b/NE/nesectionheaderwidget.h index 134c9cde..6742d602 100644 --- a/NE/nesectionheaderwidget.h +++ b/NE/nesectionheaderwidget.h @@ -31,33 +31,27 @@ class NESectionHeaderWidget; class NESectionHeaderWidget : public FormatWidget { Q_OBJECT - public: +public: enum CB { CB_CHARACTERISTICS = 0, CB_ALIGH, __CB_size }; NESectionHeaderWidget(QWidget *pParent = nullptr); - NESectionHeaderWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, - quint32 nNumber, qint64 nOffset, qint32 nType, - QWidget *pParent = nullptr); + NESectionHeaderWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, quint32 nNumber, qint64 nOffset, qint32 nType, QWidget *pParent = nullptr); ~NESectionHeaderWidget(); virtual void clear(); virtual void reload(); - protected: - virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, - int nPosition, qint64 nOffset); +protected: + virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset); virtual void setReadonly(bool bState); virtual void blockSignals(bool bState); virtual void adjustHeaderTable(int nType, QTableWidget *pTableWidget); - private slots: +private slots: void on_checkBoxReadonly_toggled(bool bChecked); void reloadData(); - void on_tableWidget_Section_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); + void on_tableWidget_Section_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); - private: +private: enum INV { INV_OriginalFirstThunk, INV_Name, INV_FirstThunk, __INV_size }; Ui::NESectionHeaderWidget *ui; diff --git a/NE/newidget.cpp b/NE/newidget.cpp index 8fd81e46..83857e67 100644 --- a/NE/newidget.cpp +++ b/NE/newidget.cpp @@ -22,8 +22,7 @@ #include "ui_newidget.h" -NEWidget::NEWidget(QWidget *pParent) - : FormatWidget(pParent), ui(new Ui::NEWidget) { +NEWidget::NEWidget(QWidget *pParent) : FormatWidget(pParent), ui(new Ui::NEWidget) { ui->setupUi(this); memset(g_subDevice, 0, sizeof g_subDevice); @@ -31,14 +30,14 @@ NEWidget::NEWidget(QWidget *pParent) initWidget(); } -NEWidget::NEWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, - QWidget *pParent) - : NEWidget(pParent) { +NEWidget::NEWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, QWidget *pParent) : NEWidget(pParent) { NEWidget::setData(pDevice, options, 0, 0, 0); NEWidget::reload(); } -NEWidget::~NEWidget() { delete ui; } +NEWidget::~NEWidget() { + delete ui; +} void NEWidget::clear() { NEWidget::reset(); @@ -50,8 +49,7 @@ void NEWidget::clear() { memset(g_tvModel, 0, sizeof g_tvModel); - _deleteSubdevices(g_subDevice, - (sizeof g_subDevice) / (sizeof(SubDevice *))); + _deleteSubdevices(g_subDevice, (sizeof g_subDevice) / (sizeof(SubDevice *))); resetWidget(); @@ -60,7 +58,9 @@ void NEWidget::clear() { ui->treeWidgetNavi->clear(); } -void NEWidget::cleanup() { NEWidget::clear(); } +void NEWidget::cleanup() { + NEWidget::clear(); +} void NEWidget::reload() { NEWidget::clear(); @@ -72,41 +72,27 @@ void NEWidget::reload() { if (ne.isValid()) { setFileType(ne.getFileType()); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SNE::TYPE_INFO, tr("Info"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SNE::TYPE_VIRUSTOTAL, "VirusTotal")); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SNE::TYPE_HEX, tr("Hex"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SNE::TYPE_DISASM, tr("Disasm"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SNE::TYPE_HASH, tr("Hash"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SNE::TYPE_STRINGS, tr("Strings"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SNE::TYPE_SIGNATURES, tr("Signatures"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SNE::TYPE_MEMORYMAP, tr("Memory map"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SNE::TYPE_ENTROPY, tr("Entropy"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SNE::TYPE_HEURISTICSCAN, tr("Heuristic scan"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SNE::TYPE_DOS_HEADER, "DOS_HEADER")); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SNE::TYPE_OS2_HEADER, "OS2_HEADER")); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SNE::TYPE_INFO, tr("Info"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SNE::TYPE_VIRUSTOTAL, "VirusTotal")); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SNE::TYPE_HEX, tr("Hex"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SNE::TYPE_DISASM, tr("Disasm"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SNE::TYPE_HASH, tr("Hash"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SNE::TYPE_STRINGS, tr("Strings"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SNE::TYPE_SIGNATURES, tr("Signatures"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SNE::TYPE_MEMORYMAP, tr("Memory map"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SNE::TYPE_ENTROPY, tr("Entropy"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SNE::TYPE_HEURISTICSCAN, tr("Heuristic scan"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SNE::TYPE_DOS_HEADER, "DOS_HEADER")); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SNE::TYPE_OS2_HEADER, "OS2_HEADER")); QList listSegments = ne.getSegmentList(); if (listSegments.count()) { - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SNE::TYPE_SEGMENTS, tr("Segments"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SNE::TYPE_SEGMENTS, tr("Segments"))); } if (ne.isOverlayPresent()) { - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SNE::TYPE_OVERLAY, tr("Overlay"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SNE::TYPE_OVERLAY, tr("Overlay"))); } ui->treeWidgetNavi->expandAll(); @@ -117,9 +103,7 @@ void NEWidget::reload() { } } -FormatWidget::SV NEWidget::_setValue(QVariant vValue, int nStype, int nNdata, - int nVtype, int nPosition, - qint64 nOffset) { +FormatWidget::SV NEWidget::_setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset) { Q_UNUSED(nVtype) Q_UNUSED(nPosition) Q_UNUSED(nOffset) @@ -141,8 +125,7 @@ FormatWidget::SV NEWidget::_setValue(QVariant vValue, int nStype, int nNdata, g_comboBox[CB_DOS_HEADER_e_magic]->setValue(nValue); break; case N_NE_DOS_HEADER::e_lfanew: - g_invWidget[INV_IMAGE_DOS_HEADER_e_lfanew] - ->setOffsetAndSize(&ne, (quint32)nValue, 0); + g_invWidget[INV_IMAGE_DOS_HEADER_e_lfanew]->setOffsetAndSize(&ne, (quint32)nValue, 0); break; } break; @@ -150,60 +133,37 @@ FormatWidget::SV NEWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SNE::TYPE_OS2_HEADER: switch (nNdata) { case N_OS2_HEADER::ne_magic: - g_comboBox[CB_OS2_HEADER_ne_magic]->setValue( - nValue); + g_comboBox[CB_OS2_HEADER_ne_magic]->setValue(nValue); break; case N_OS2_HEADER::ne_flags: - g_comboBox[CB_OS2_HEADER_ne_flags]->setValue( - nValue); + g_comboBox[CB_OS2_HEADER_ne_flags]->setValue(nValue); break; case N_OS2_HEADER::ne_exetyp: - g_comboBox[CB_OS2_HEADER_ne_exetype]->setValue( - nValue); + g_comboBox[CB_OS2_HEADER_ne_exetype]->setValue(nValue); break; case N_OS2_HEADER::ne_flagsothers: - g_comboBox[CB_OS2_HEADER_ne_flagsothers]->setValue( - nValue); + g_comboBox[CB_OS2_HEADER_ne_flagsothers]->setValue(nValue); break; case N_OS2_HEADER::ne_enttab: - g_invWidget[CB_OS2_HEADER_ne_enttab] - ->setOffsetAndSize( - &ne, ne.getImageOS2HeaderOffset() + nValue, - 0); + g_invWidget[CB_OS2_HEADER_ne_enttab]->setOffsetAndSize(&ne, ne.getImageOS2HeaderOffset() + nValue, 0); break; case N_OS2_HEADER::ne_segtab: - g_invWidget[CB_OS2_HEADER_ne_segtab] - ->setOffsetAndSize( - &ne, ne.getImageOS2HeaderOffset() + nValue, - 0); + g_invWidget[CB_OS2_HEADER_ne_segtab]->setOffsetAndSize(&ne, ne.getImageOS2HeaderOffset() + nValue, 0); break; case N_OS2_HEADER::ne_rsrctab: - g_invWidget[CB_OS2_HEADER_ne_rsrctab] - ->setOffsetAndSize( - &ne, ne.getImageOS2HeaderOffset() + nValue, - 0); + g_invWidget[CB_OS2_HEADER_ne_rsrctab]->setOffsetAndSize(&ne, ne.getImageOS2HeaderOffset() + nValue, 0); break; case N_OS2_HEADER::ne_restab: - g_invWidget[CB_OS2_HEADER_ne_restab] - ->setOffsetAndSize( - &ne, ne.getImageOS2HeaderOffset() + nValue, - 0); + g_invWidget[CB_OS2_HEADER_ne_restab]->setOffsetAndSize(&ne, ne.getImageOS2HeaderOffset() + nValue, 0); break; case N_OS2_HEADER::ne_modtab: - g_invWidget[CB_OS2_HEADER_ne_modtab] - ->setOffsetAndSize( - &ne, ne.getImageOS2HeaderOffset() + nValue, - 0); + g_invWidget[CB_OS2_HEADER_ne_modtab]->setOffsetAndSize(&ne, ne.getImageOS2HeaderOffset() + nValue, 0); break; case N_OS2_HEADER::ne_imptab: - g_invWidget[CB_OS2_HEADER_ne_imptab] - ->setOffsetAndSize( - &ne, ne.getImageOS2HeaderOffset() + nValue, - 0); + g_invWidget[CB_OS2_HEADER_ne_imptab]->setOffsetAndSize(&ne, ne.getImageOS2HeaderOffset() + nValue, 0); break; case N_OS2_HEADER::ne_nrestab: - g_invWidget[CB_OS2_HEADER_ne_nrestab] - ->setOffsetAndSize(&ne, nValue, 0); + g_invWidget[CB_OS2_HEADER_ne_nrestab]->setOffsetAndSize(&ne, nValue, 0); break; } break; @@ -420,10 +380,8 @@ FormatWidget::SV NEWidget::_setValue(QVariant vValue, int nStype, int nNdata, } void NEWidget::setReadonly(bool bState) { - setLineEditsReadOnly(g_lineEdit_DOS_HEADER, N_NE_DOS_HEADER::__data_size, - bState); - setLineEditsReadOnly(g_lineEdit_OS2_HEADER, N_OS2_HEADER::__data_size, - bState); + setLineEditsReadOnly(g_lineEdit_DOS_HEADER, N_NE_DOS_HEADER::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_OS2_HEADER, N_OS2_HEADER::__data_size, bState); setComboBoxesReadOnly(g_comboBox, __CB_size, bState); @@ -433,10 +391,8 @@ void NEWidget::setReadonly(bool bState) { } void NEWidget::blockSignals(bool bState) { - _blockSignals((QObject **)g_lineEdit_DOS_HEADER, - N_NE_DOS_HEADER::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_OS2_HEADER, N_OS2_HEADER::__data_size, - bState); + _blockSignals((QObject **)g_lineEdit_DOS_HEADER, N_NE_DOS_HEADER::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_OS2_HEADER, N_OS2_HEADER::__data_size, bState); _blockSignals((QObject **)g_comboBox, __CB_size, bState); } @@ -447,12 +403,9 @@ void NEWidget::adjustHeaderTable(int nType, QTableWidget *pTableWidget) { qint32 nSymbolWidth = XLineEditHEX::getSymbolWidth(this); - pTableWidget->horizontalHeader()->setSectionResizeMode( - HEADER_COLUMN_NAME, QHeaderView::ResizeToContents); - pTableWidget->horizontalHeader()->setSectionResizeMode( - HEADER_COLUMN_OFFSET, QHeaderView::ResizeToContents); - pTableWidget->horizontalHeader()->setSectionResizeMode( - HEADER_COLUMN_TYPE, QHeaderView::ResizeToContents); + pTableWidget->horizontalHeader()->setSectionResizeMode(HEADER_COLUMN_NAME, QHeaderView::ResizeToContents); + pTableWidget->horizontalHeader()->setSectionResizeMode(HEADER_COLUMN_OFFSET, QHeaderView::ResizeToContents); + pTableWidget->horizontalHeader()->setSectionResizeMode(HEADER_COLUMN_TYPE, QHeaderView::ResizeToContents); pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, nSymbolWidth * 12); switch (nType) { @@ -497,9 +450,7 @@ void NEWidget::_showInHexWindow(qint64 nOffset, qint64 nSize) { } void NEWidget::reloadData() { - int nType = ui->treeWidgetNavi->currentItem() - ->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_TYPE) - .toInt(); + int nType = ui->treeWidgetNavi->currentItem()->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_TYPE).toInt(); // qint64 // nDataOffset=ui->treeWidgetNavi->currentItem()->data(0,Qt::UserRole+FW_DEF::SECTION_DATA_OFFSET).toLongLong(); // qint64 @@ -514,8 +465,7 @@ void NEWidget::reloadData() { if (ne.isValid()) { if (nType == SNE::TYPE_INFO) { if (!isInitPresent(sInit)) { - ui->widgetInfo->setData(getDevice(), ne.getFileType(), "Info", - true); + ui->widgetInfo->setData(getDevice(), ne.getFileType(), "Info", true); } } else if (nType == SNE::TYPE_VIRUSTOTAL) { if (!isInitPresent(sInit)) { @@ -546,8 +496,7 @@ void NEWidget::reloadData() { } } else if (nType == SNE::TYPE_HASH) { if (!isInitPresent(sInit)) { - ui->widgetHash->setData(getDevice(), ne.getFileType(), 0, -1, - true); + ui->widgetHash->setData(getDevice(), ne.getFileType(), 0, -1, true); } } else if (nType == SNE::TYPE_STRINGS) { if (!isInitPresent(sInit)) { @@ -566,8 +515,7 @@ void NEWidget::reloadData() { SearchSignaturesWidget::OPTIONS signaturesOptions = {}; signaturesOptions.bMenu_Hex = true; - ui->widgetSignatures->setData(getDevice(), ne.getFileType(), - signaturesOptions, false); + ui->widgetSignatures->setData(getDevice(), ne.getFileType(), signaturesOptions, false); } } else if (nType == SNE::TYPE_MEMORYMAP) { if (!isInitPresent(sInit)) { @@ -575,273 +523,162 @@ void NEWidget::reloadData() { } } else if (nType == SNE::TYPE_ENTROPY) { if (!isInitPresent(sInit)) { - ui->widgetEntropy->setData(getDevice(), 0, getDevice()->size(), - ne.getFileType(), true); + ui->widgetEntropy->setData(getDevice(), 0, getDevice()->size(), ne.getFileType(), true); } } else if (nType == SNE::TYPE_HEURISTICSCAN) { if (!isInitPresent(sInit)) { - ui->widgetHeuristicScan->setData(getDevice(), true, - ne.getFileType()); + ui->widgetHeuristicScan->setData(getDevice(), true, ne.getFileType()); } } else if (nType == SNE::TYPE_DOS_HEADER) { if (!isInitPresent(sInit)) { - createHeaderTable( - SNE::TYPE_DOS_HEADER, ui->tableWidget_DOS_HEADER, - N_NE_DOS_HEADER::records, g_lineEdit_DOS_HEADER, - N_NE_DOS_HEADER::__data_size, 0); - g_comboBox[CB_DOS_HEADER_e_magic] = createComboBox( - ui->tableWidget_DOS_HEADER, XMSDOS::getImageMagicsS(), - SNE::TYPE_DOS_HEADER, N_NE_DOS_HEADER::e_magic, - XComboBoxEx::CBTYPE_LIST); - g_invWidget[INV_IMAGE_DOS_HEADER_e_lfanew] = createInvWidget( - ui->tableWidget_DOS_HEADER, SNE::TYPE_DOS_HEADER, - N_NE_DOS_HEADER::e_lfanew, InvWidget::TYPE_HEX); + createHeaderTable(SNE::TYPE_DOS_HEADER, ui->tableWidget_DOS_HEADER, N_NE_DOS_HEADER::records, g_lineEdit_DOS_HEADER, + N_NE_DOS_HEADER::__data_size, 0); + g_comboBox[CB_DOS_HEADER_e_magic] = createComboBox(ui->tableWidget_DOS_HEADER, XMSDOS::getImageMagicsS(), SNE::TYPE_DOS_HEADER, + N_NE_DOS_HEADER::e_magic, XComboBoxEx::CBTYPE_LIST); + g_invWidget[INV_IMAGE_DOS_HEADER_e_lfanew] = + createInvWidget(ui->tableWidget_DOS_HEADER, SNE::TYPE_DOS_HEADER, N_NE_DOS_HEADER::e_lfanew, InvWidget::TYPE_HEX); blockSignals(true); - XMSDOS_DEF::IMAGE_DOS_HEADEREX msdosheaderex = - ne.getDosHeaderEx(); - - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_magic]->setValue( - msdosheaderex.e_magic); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_cblp]->setValue( - msdosheaderex.e_cblp); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_cp]->setValue( - msdosheaderex.e_cp); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_crlc]->setValue( - msdosheaderex.e_crlc); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_cparhdr]->setValue( - msdosheaderex.e_cparhdr); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_minalloc]->setValue( - msdosheaderex.e_minalloc); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_maxalloc]->setValue( - msdosheaderex.e_maxalloc); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_ss]->setValue( - msdosheaderex.e_ss); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_sp]->setValue( - msdosheaderex.e_sp); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_csum]->setValue( - msdosheaderex.e_csum); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_ip]->setValue( - msdosheaderex.e_ip); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_cs]->setValue( - msdosheaderex.e_cs); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_lfarlc]->setValue( - msdosheaderex.e_lfarlc); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_ovno]->setValue( - msdosheaderex.e_ovno); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_res_0]->setValue( - msdosheaderex.e_res[0]); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_res_1]->setValue( - msdosheaderex.e_res[1]); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_res_2]->setValue( - msdosheaderex.e_res[2]); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_res_3]->setValue( - msdosheaderex.e_res[3]); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_oemid]->setValue( - msdosheaderex.e_oemid); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_oeminfo]->setValue( - msdosheaderex.e_oeminfo); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_res2_0]->setValue( - msdosheaderex.e_res2[0]); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_res2_1]->setValue( - msdosheaderex.e_res2[1]); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_res2_2]->setValue( - msdosheaderex.e_res2[2]); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_res2_3]->setValue( - msdosheaderex.e_res2[3]); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_res2_4]->setValue( - msdosheaderex.e_res2[4]); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_res2_5]->setValue( - msdosheaderex.e_res2[5]); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_res2_6]->setValue( - msdosheaderex.e_res2[6]); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_res2_7]->setValue( - msdosheaderex.e_res2[7]); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_res2_8]->setValue( - msdosheaderex.e_res2[8]); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_res2_9]->setValue( - msdosheaderex.e_res2[9]); - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_lfanew]->setValue( - msdosheaderex.e_lfanew); - - g_comboBox[CB_DOS_HEADER_e_magic]->setValue( - msdosheaderex.e_magic); - - g_invWidget[INV_IMAGE_DOS_HEADER_e_lfanew]->setOffsetAndSize( - &ne, msdosheaderex.e_lfanew, 0); + XMSDOS_DEF::IMAGE_DOS_HEADEREX msdosheaderex = ne.getDosHeaderEx(); + + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_magic]->setValue(msdosheaderex.e_magic); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_cblp]->setValue(msdosheaderex.e_cblp); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_cp]->setValue(msdosheaderex.e_cp); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_crlc]->setValue(msdosheaderex.e_crlc); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_cparhdr]->setValue(msdosheaderex.e_cparhdr); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_minalloc]->setValue(msdosheaderex.e_minalloc); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_maxalloc]->setValue(msdosheaderex.e_maxalloc); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_ss]->setValue(msdosheaderex.e_ss); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_sp]->setValue(msdosheaderex.e_sp); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_csum]->setValue(msdosheaderex.e_csum); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_ip]->setValue(msdosheaderex.e_ip); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_cs]->setValue(msdosheaderex.e_cs); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_lfarlc]->setValue(msdosheaderex.e_lfarlc); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_ovno]->setValue(msdosheaderex.e_ovno); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_res_0]->setValue(msdosheaderex.e_res[0]); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_res_1]->setValue(msdosheaderex.e_res[1]); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_res_2]->setValue(msdosheaderex.e_res[2]); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_res_3]->setValue(msdosheaderex.e_res[3]); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_oemid]->setValue(msdosheaderex.e_oemid); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_oeminfo]->setValue(msdosheaderex.e_oeminfo); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_res2_0]->setValue(msdosheaderex.e_res2[0]); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_res2_1]->setValue(msdosheaderex.e_res2[1]); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_res2_2]->setValue(msdosheaderex.e_res2[2]); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_res2_3]->setValue(msdosheaderex.e_res2[3]); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_res2_4]->setValue(msdosheaderex.e_res2[4]); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_res2_5]->setValue(msdosheaderex.e_res2[5]); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_res2_6]->setValue(msdosheaderex.e_res2[6]); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_res2_7]->setValue(msdosheaderex.e_res2[7]); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_res2_8]->setValue(msdosheaderex.e_res2[8]); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_res2_9]->setValue(msdosheaderex.e_res2[9]); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_lfanew]->setValue(msdosheaderex.e_lfanew); + + g_comboBox[CB_DOS_HEADER_e_magic]->setValue(msdosheaderex.e_magic); + + g_invWidget[INV_IMAGE_DOS_HEADER_e_lfanew]->setOffsetAndSize(&ne, msdosheaderex.e_lfanew, 0); qint64 nOffset = ne.getDosHeaderExOffset(); qint64 nSize = ne.getDosHeaderExSize(); - loadHexSubdevice(nOffset, nSize, nOffset, - &g_subDevice[SNE::TYPE_DOS_HEADER], - ui->widgetHex_DOS_HEADER); + loadHexSubdevice(nOffset, nSize, nOffset, &g_subDevice[SNE::TYPE_DOS_HEADER], ui->widgetHex_DOS_HEADER); blockSignals(false); } } else if (nType == SNE::TYPE_OS2_HEADER) { if (!isInitPresent(sInit)) { - createHeaderTable(SNE::TYPE_OS2_HEADER, - ui->tableWidget_OS2_HEADER, - N_OS2_HEADER::records, g_lineEdit_OS2_HEADER, - N_OS2_HEADER::__data_size, 0); - g_comboBox[CB_OS2_HEADER_ne_magic] = createComboBox( - ui->tableWidget_OS2_HEADER, XNE::getImageNEMagicsS(), - SNE::TYPE_OS2_HEADER, N_OS2_HEADER::ne_magic, - XComboBoxEx::CBTYPE_LIST); - g_comboBox[CB_OS2_HEADER_ne_flags] = createComboBox( - ui->tableWidget_OS2_HEADER, XNE::getImageNEFlagsS(), - SNE::TYPE_OS2_HEADER, N_OS2_HEADER::ne_flags, - XComboBoxEx::CBTYPE_FLAGS); - g_comboBox[CB_OS2_HEADER_ne_exetype] = createComboBox( - ui->tableWidget_OS2_HEADER, XNE::getImageNEExetypesS(), - SNE::TYPE_OS2_HEADER, N_OS2_HEADER::ne_exetyp, - XComboBoxEx::CBTYPE_LIST); - g_comboBox[CB_OS2_HEADER_ne_flagsothers] = createComboBox( - ui->tableWidget_OS2_HEADER, XNE::getImageNEFlagsothersS(), - SNE::TYPE_OS2_HEADER, N_OS2_HEADER::ne_flagsothers, - XComboBoxEx::CBTYPE_FLAGS); - - g_invWidget[CB_OS2_HEADER_ne_enttab] = createInvWidget( - ui->tableWidget_OS2_HEADER, SNE::TYPE_OS2_HEADER, - N_OS2_HEADER::ne_enttab, InvWidget::TYPE_HEX); - g_invWidget[CB_OS2_HEADER_ne_segtab] = createInvWidget( - ui->tableWidget_OS2_HEADER, SNE::TYPE_OS2_HEADER, - N_OS2_HEADER::ne_segtab, InvWidget::TYPE_HEX); - g_invWidget[CB_OS2_HEADER_ne_rsrctab] = createInvWidget( - ui->tableWidget_OS2_HEADER, SNE::TYPE_OS2_HEADER, - N_OS2_HEADER::ne_rsrctab, InvWidget::TYPE_HEX); - g_invWidget[CB_OS2_HEADER_ne_restab] = createInvWidget( - ui->tableWidget_OS2_HEADER, SNE::TYPE_OS2_HEADER, - N_OS2_HEADER::ne_restab, InvWidget::TYPE_HEX); - g_invWidget[CB_OS2_HEADER_ne_modtab] = createInvWidget( - ui->tableWidget_OS2_HEADER, SNE::TYPE_OS2_HEADER, - N_OS2_HEADER::ne_modtab, InvWidget::TYPE_HEX); - g_invWidget[CB_OS2_HEADER_ne_imptab] = createInvWidget( - ui->tableWidget_OS2_HEADER, SNE::TYPE_OS2_HEADER, - N_OS2_HEADER::ne_imptab, InvWidget::TYPE_HEX); - g_invWidget[CB_OS2_HEADER_ne_nrestab] = createInvWidget( - ui->tableWidget_OS2_HEADER, SNE::TYPE_OS2_HEADER, - N_OS2_HEADER::ne_nrestab, InvWidget::TYPE_HEX); + createHeaderTable(SNE::TYPE_OS2_HEADER, ui->tableWidget_OS2_HEADER, N_OS2_HEADER::records, g_lineEdit_OS2_HEADER, N_OS2_HEADER::__data_size, 0); + g_comboBox[CB_OS2_HEADER_ne_magic] = createComboBox(ui->tableWidget_OS2_HEADER, XNE::getImageNEMagicsS(), SNE::TYPE_OS2_HEADER, + N_OS2_HEADER::ne_magic, XComboBoxEx::CBTYPE_LIST); + g_comboBox[CB_OS2_HEADER_ne_flags] = createComboBox(ui->tableWidget_OS2_HEADER, XNE::getImageNEFlagsS(), SNE::TYPE_OS2_HEADER, + N_OS2_HEADER::ne_flags, XComboBoxEx::CBTYPE_FLAGS); + g_comboBox[CB_OS2_HEADER_ne_exetype] = createComboBox(ui->tableWidget_OS2_HEADER, XNE::getImageNEExetypesS(), SNE::TYPE_OS2_HEADER, + N_OS2_HEADER::ne_exetyp, XComboBoxEx::CBTYPE_LIST); + g_comboBox[CB_OS2_HEADER_ne_flagsothers] = createComboBox(ui->tableWidget_OS2_HEADER, XNE::getImageNEFlagsothersS(), SNE::TYPE_OS2_HEADER, + N_OS2_HEADER::ne_flagsothers, XComboBoxEx::CBTYPE_FLAGS); + + g_invWidget[CB_OS2_HEADER_ne_enttab] = + createInvWidget(ui->tableWidget_OS2_HEADER, SNE::TYPE_OS2_HEADER, N_OS2_HEADER::ne_enttab, InvWidget::TYPE_HEX); + g_invWidget[CB_OS2_HEADER_ne_segtab] = + createInvWidget(ui->tableWidget_OS2_HEADER, SNE::TYPE_OS2_HEADER, N_OS2_HEADER::ne_segtab, InvWidget::TYPE_HEX); + g_invWidget[CB_OS2_HEADER_ne_rsrctab] = + createInvWidget(ui->tableWidget_OS2_HEADER, SNE::TYPE_OS2_HEADER, N_OS2_HEADER::ne_rsrctab, InvWidget::TYPE_HEX); + g_invWidget[CB_OS2_HEADER_ne_restab] = + createInvWidget(ui->tableWidget_OS2_HEADER, SNE::TYPE_OS2_HEADER, N_OS2_HEADER::ne_restab, InvWidget::TYPE_HEX); + g_invWidget[CB_OS2_HEADER_ne_modtab] = + createInvWidget(ui->tableWidget_OS2_HEADER, SNE::TYPE_OS2_HEADER, N_OS2_HEADER::ne_modtab, InvWidget::TYPE_HEX); + g_invWidget[CB_OS2_HEADER_ne_imptab] = + createInvWidget(ui->tableWidget_OS2_HEADER, SNE::TYPE_OS2_HEADER, N_OS2_HEADER::ne_imptab, InvWidget::TYPE_HEX); + g_invWidget[CB_OS2_HEADER_ne_nrestab] = + createInvWidget(ui->tableWidget_OS2_HEADER, SNE::TYPE_OS2_HEADER, N_OS2_HEADER::ne_nrestab, InvWidget::TYPE_HEX); blockSignals(true); XNE_DEF::IMAGE_OS2_HEADER os2header = ne.getImageOS2Header(); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_magic]->setValue( - os2header.ne_magic); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_ver]->setValue( - os2header.ne_ver); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_rev]->setValue( - os2header.ne_rev); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_enttab]->setValue( - os2header.ne_enttab); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_cbenttab]->setValue( - os2header.ne_cbenttab); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_crc]->setValue( - os2header.ne_crc); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_flags]->setValue( - os2header.ne_flags); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_autodata]->setValue( - os2header.ne_autodata); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_heap]->setValue( - os2header.ne_heap); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_stack]->setValue( - os2header.ne_stack); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_csip]->setValue( - os2header.ne_csip); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_sssp]->setValue( - os2header.ne_sssp); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_cseg]->setValue( - os2header.ne_cseg); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_cmod]->setValue( - os2header.ne_cmod); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_cbnrestab]->setValue( - os2header.ne_cbnrestab); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_segtab]->setValue( - os2header.ne_segtab); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_rsrctab]->setValue( - os2header.ne_rsrctab); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_restab]->setValue( - os2header.ne_restab); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_modtab]->setValue( - os2header.ne_modtab); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_imptab]->setValue( - os2header.ne_imptab); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_nrestab]->setValue( - os2header.ne_nrestab); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_cmovent]->setValue( - os2header.ne_cmovent); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_align]->setValue( - os2header.ne_align); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_cres]->setValue( - os2header.ne_cres); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_exetyp]->setValue( - os2header.ne_exetyp); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_flagsothers]->setValue( - os2header.ne_flagsothers); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_pretthunks]->setValue( - os2header.ne_pretthunks); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_psegrefbytes]->setValue( - os2header.ne_psegrefbytes); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_swaparea]->setValue( - os2header.ne_swaparea); - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_expver]->setValue( - os2header.ne_expver); - - g_comboBox[CB_OS2_HEADER_ne_magic]->setValue( - os2header.ne_magic); - g_comboBox[CB_OS2_HEADER_ne_flags]->setValue( - os2header.ne_flags); - g_comboBox[CB_OS2_HEADER_ne_exetype]->setValue( - os2header.ne_exetyp); - g_comboBox[CB_OS2_HEADER_ne_flagsothers]->setValue( - os2header.ne_flagsothers); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_magic]->setValue(os2header.ne_magic); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_ver]->setValue(os2header.ne_ver); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_rev]->setValue(os2header.ne_rev); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_enttab]->setValue(os2header.ne_enttab); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_cbenttab]->setValue(os2header.ne_cbenttab); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_crc]->setValue(os2header.ne_crc); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_flags]->setValue(os2header.ne_flags); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_autodata]->setValue(os2header.ne_autodata); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_heap]->setValue(os2header.ne_heap); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_stack]->setValue(os2header.ne_stack); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_csip]->setValue(os2header.ne_csip); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_sssp]->setValue(os2header.ne_sssp); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_cseg]->setValue(os2header.ne_cseg); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_cmod]->setValue(os2header.ne_cmod); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_cbnrestab]->setValue(os2header.ne_cbnrestab); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_segtab]->setValue(os2header.ne_segtab); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_rsrctab]->setValue(os2header.ne_rsrctab); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_restab]->setValue(os2header.ne_restab); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_modtab]->setValue(os2header.ne_modtab); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_imptab]->setValue(os2header.ne_imptab); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_nrestab]->setValue(os2header.ne_nrestab); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_cmovent]->setValue(os2header.ne_cmovent); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_align]->setValue(os2header.ne_align); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_cres]->setValue(os2header.ne_cres); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_exetyp]->setValue(os2header.ne_exetyp); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_flagsothers]->setValue(os2header.ne_flagsothers); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_pretthunks]->setValue(os2header.ne_pretthunks); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_psegrefbytes]->setValue(os2header.ne_psegrefbytes); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_swaparea]->setValue(os2header.ne_swaparea); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_expver]->setValue(os2header.ne_expver); + + g_comboBox[CB_OS2_HEADER_ne_magic]->setValue(os2header.ne_magic); + g_comboBox[CB_OS2_HEADER_ne_flags]->setValue(os2header.ne_flags); + g_comboBox[CB_OS2_HEADER_ne_exetype]->setValue(os2header.ne_exetyp); + g_comboBox[CB_OS2_HEADER_ne_flagsothers]->setValue(os2header.ne_flagsothers); qint64 nOffset = ne.getImageOS2HeaderOffset(); - g_invWidget[CB_OS2_HEADER_ne_enttab]->setOffsetAndSize( - &ne, nOffset + os2header.ne_enttab, 0); - g_invWidget[CB_OS2_HEADER_ne_segtab]->setOffsetAndSize( - &ne, nOffset + os2header.ne_segtab, 0); - g_invWidget[CB_OS2_HEADER_ne_rsrctab]->setOffsetAndSize( - &ne, nOffset + os2header.ne_rsrctab, 0); - g_invWidget[CB_OS2_HEADER_ne_restab]->setOffsetAndSize( - &ne, nOffset + os2header.ne_restab, 0); - g_invWidget[CB_OS2_HEADER_ne_modtab]->setOffsetAndSize( - &ne, nOffset + os2header.ne_modtab, 0); - g_invWidget[CB_OS2_HEADER_ne_imptab]->setOffsetAndSize( - &ne, nOffset + os2header.ne_imptab, 0); - g_invWidget[CB_OS2_HEADER_ne_nrestab]->setOffsetAndSize( - &ne, os2header.ne_nrestab, 0); + g_invWidget[CB_OS2_HEADER_ne_enttab]->setOffsetAndSize(&ne, nOffset + os2header.ne_enttab, 0); + g_invWidget[CB_OS2_HEADER_ne_segtab]->setOffsetAndSize(&ne, nOffset + os2header.ne_segtab, 0); + g_invWidget[CB_OS2_HEADER_ne_rsrctab]->setOffsetAndSize(&ne, nOffset + os2header.ne_rsrctab, 0); + g_invWidget[CB_OS2_HEADER_ne_restab]->setOffsetAndSize(&ne, nOffset + os2header.ne_restab, 0); + g_invWidget[CB_OS2_HEADER_ne_modtab]->setOffsetAndSize(&ne, nOffset + os2header.ne_modtab, 0); + g_invWidget[CB_OS2_HEADER_ne_imptab]->setOffsetAndSize(&ne, nOffset + os2header.ne_imptab, 0); + g_invWidget[CB_OS2_HEADER_ne_nrestab]->setOffsetAndSize(&ne, os2header.ne_nrestab, 0); qint64 nSize = ne.getImageOS2HeaderSize(); - loadHexSubdevice(nOffset, nSize, nOffset, - &g_subDevice[SNE::TYPE_OS2_HEADER], - ui->widgetHex_OS2_HEADER); + loadHexSubdevice(nOffset, nSize, nOffset, &g_subDevice[SNE::TYPE_OS2_HEADER], ui->widgetHex_OS2_HEADER); blockSignals(false); } } else if (nType == SNE::TYPE_SEGMENTS) { if (!isInitPresent(sInit)) { - NEProcessData neProcessData(SNE::TYPE_SEGMENTS, - &g_tvModel[SNE::TYPE_SEGMENTS], &ne, - 0, 0); + NEProcessData neProcessData(SNE::TYPE_SEGMENTS, &g_tvModel[SNE::TYPE_SEGMENTS], &ne, 0, 0); - ajustTableView(&neProcessData, &g_tvModel[SNE::TYPE_SEGMENTS], - ui->tableView_SEGMENTS, nullptr, false); + ajustTableView(&neProcessData, &g_tvModel[SNE::TYPE_SEGMENTS], ui->tableView_SEGMENTS, nullptr, false); - connect(ui->tableView_SEGMENTS->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTableView_SEGMENTS_currentRowChanged( - QModelIndex, QModelIndex))); + connect(ui->tableView_SEGMENTS->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTableView_SEGMENTS_currentRowChanged(QModelIndex, QModelIndex))); if (g_tvModel[SNE::TYPE_SEGMENTS]->rowCount()) { - ui->tableView_SEGMENTS->setCurrentIndex( - ui->tableView_SEGMENTS->model()->index(0, 0)); + ui->tableView_SEGMENTS->setCurrentIndex(ui->tableView_SEGMENTS->model()->index(0, 0)); } } } else if (nType == SNE::TYPE_OVERLAY) // TODO Check @@ -849,9 +686,7 @@ void NEWidget::reloadData() { qint64 nOverLayOffset = ne.getOverlayOffset(); qint64 nOverlaySize = ne.getOverlaySize(); - loadHexSubdevice(nOverLayOffset, nOverlaySize, nOverLayOffset, - &g_subDevice[SNE::TYPE_OVERLAY], - ui->widgetHex_OVERLAY); + loadHexSubdevice(nOverLayOffset, nOverlaySize, nOverLayOffset, &g_subDevice[SNE::TYPE_OVERLAY], ui->widgetHex_OVERLAY); } setReadonly(ui->checkBoxReadonly->isChecked()); @@ -869,8 +704,7 @@ void NEWidget::widgetValueChanged(quint64 nValue) { case SNE::TYPE_DOS_HEADER: switch (nNdata) { case N_NE_DOS_HEADER::e_magic: - g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_magic]->setValue( - (quint16)nValue); + g_lineEdit_DOS_HEADER[N_NE_DOS_HEADER::e_magic]->setValue((quint16)nValue); break; } @@ -878,20 +712,16 @@ void NEWidget::widgetValueChanged(quint64 nValue) { case SNE::TYPE_OS2_HEADER: switch (nNdata) { case N_OS2_HEADER::ne_magic: - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_magic]->setValue( - (quint16)nValue); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_magic]->setValue((quint16)nValue); break; case N_OS2_HEADER::ne_flags: - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_flags]->setValue( - (quint16)nValue); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_flags]->setValue((quint16)nValue); break; case N_OS2_HEADER::ne_exetyp: - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_exetyp]->setValue( - (quint16)nValue); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_exetyp]->setValue((quint16)nValue); break; case N_OS2_HEADER::ne_flagsothers: - g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_flagsothers] - ->setValue((quint16)nValue); + g_lineEdit_OS2_HEADER[N_OS2_HEADER::ne_flagsothers]->setValue((quint16)nValue); break; } @@ -899,8 +729,7 @@ void NEWidget::widgetValueChanged(quint64 nValue) { } } -void NEWidget::on_treeWidgetNavi_currentItemChanged( - QTreeWidgetItem *pItemCurrent, QTreeWidgetItem *pItemPrevious) { +void NEWidget::on_treeWidgetNavi_currentItemChanged(QTreeWidgetItem *pItemCurrent, QTreeWidgetItem *pItemPrevious) { Q_UNUSED(pItemPrevious) if (pItemCurrent) { @@ -922,30 +751,26 @@ void NEWidget::on_pushButtonReload_clicked() { QTimer::singleShot(1000, this, SLOT(enableButton())); } -void NEWidget::enableButton() { ui->pushButtonReload->setEnabled(true); } +void NEWidget::enableButton() { + ui->pushButtonReload->setEnabled(true); +} -void NEWidget::on_tableWidget_DOS_HEADER_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void NEWidget::on_tableWidget_DOS_HEADER_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow); Q_UNUSED(nCurrentColumn); Q_UNUSED(nPreviousRow); Q_UNUSED(nPreviousColumn); - setHeaderTableSelection(ui->widgetHex_DOS_HEADER, - ui->tableWidget_DOS_HEADER); + setHeaderTableSelection(ui->widgetHex_DOS_HEADER, ui->tableWidget_DOS_HEADER); } -void NEWidget::on_tableWidget_OS2_HEADER_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void NEWidget::on_tableWidget_OS2_HEADER_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow); Q_UNUSED(nCurrentColumn); Q_UNUSED(nPreviousRow); Q_UNUSED(nPreviousColumn); - setHeaderTableSelection(ui->widgetHex_OS2_HEADER, - ui->tableWidget_OS2_HEADER); + setHeaderTableSelection(ui->widgetHex_OS2_HEADER, ui->tableWidget_OS2_HEADER); } void NEWidget::on_toolButtonPrev_clicked() { @@ -984,12 +809,9 @@ void NEWidget::on_pushButtonHeuristicScan_clicked() { setTreeItem(ui->treeWidgetNavi, SNE::TYPE_HEURISTICSCAN); } -void NEWidget::onTableView_SEGMENTS_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void NEWidget::onTableView_SEGMENTS_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(current) Q_UNUSED(previous) - loadHexSubdeviceByTableView(current.row(), SNE::TYPE_SEGMENTS, - ui->widgetHex_SEGMENTS, ui->tableView_SEGMENTS, - &g_subDevice[SNE::TYPE_SEGMENTS]); + loadHexSubdeviceByTableView(current.row(), SNE::TYPE_SEGMENTS, ui->widgetHex_SEGMENTS, ui->tableView_SEGMENTS, &g_subDevice[SNE::TYPE_SEGMENTS]); } diff --git a/NE/newidget.h b/NE/newidget.h index de109492..2ed0fbfe 100644 --- a/NE/newidget.h +++ b/NE/newidget.h @@ -33,19 +33,17 @@ class NEWidget; class NEWidget : public FormatWidget { Q_OBJECT - public: +public: NEWidget(QWidget *pParent = nullptr); - NEWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, - QWidget *pParent = nullptr); + NEWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, QWidget *pParent = nullptr); ~NEWidget(); virtual void clear(); virtual void cleanup(); virtual void reload(); - protected: - virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, - int nPosition, qint64 nOffset); +protected: + virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset); virtual void setReadonly(bool bState); virtual void blockSignals(bool bState); virtual void adjustHeaderTable(int nType, QTableWidget *pTableWidget); @@ -55,22 +53,15 @@ class NEWidget : public FormatWidget { virtual void _showInMemoryMapWindowOffset(qint64 nOffset); virtual void _showInHexWindow(qint64 nOffset, qint64 nSize); - private slots: +private slots: virtual void reloadData(); void widgetValueChanged(quint64 nValue); - void on_treeWidgetNavi_currentItemChanged(QTreeWidgetItem *pItemCurrent, - QTreeWidgetItem *pItemPrevious); + void on_treeWidgetNavi_currentItemChanged(QTreeWidgetItem *pItemCurrent, QTreeWidgetItem *pItemPrevious); void on_checkBoxReadonly_toggled(bool bChecked); void on_pushButtonReload_clicked(); void enableButton(); - void on_tableWidget_DOS_HEADER_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); - void on_tableWidget_OS2_HEADER_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); + void on_tableWidget_DOS_HEADER_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); + void on_tableWidget_OS2_HEADER_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); void on_toolButtonPrev_clicked(); void on_toolButtonNext_clicked(); void on_pushButtonHex_clicked(); @@ -79,18 +70,10 @@ class NEWidget : public FormatWidget { void on_pushButtonMemoryMap_clicked(); void on_pushButtonEntropy_clicked(); void on_pushButtonHeuristicScan_clicked(); - void onTableView_SEGMENTS_currentRowChanged(const QModelIndex ¤t, - const QModelIndex &previous); + void onTableView_SEGMENTS_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); - private: - enum CB { - CB_DOS_HEADER_e_magic = 0, - CB_OS2_HEADER_ne_magic, - CB_OS2_HEADER_ne_flags, - CB_OS2_HEADER_ne_exetype, - CB_OS2_HEADER_ne_flagsothers, - __CB_size - }; +private: + enum CB { CB_DOS_HEADER_e_magic = 0, CB_OS2_HEADER_ne_magic, CB_OS2_HEADER_ne_flags, CB_OS2_HEADER_ne_exetype, CB_OS2_HEADER_ne_flagsothers, __CB_size }; enum INV { INV_IMAGE_DOS_HEADER_e_lfanew, diff --git a/PDF/dialogpdf.cpp b/PDF/dialogpdf.cpp index 4a3e1452..9ad590be 100644 --- a/PDF/dialogpdf.cpp +++ b/PDF/dialogpdf.cpp @@ -22,14 +22,15 @@ #include "ui_dialogpdf.h" -DialogPDF::DialogPDF(QWidget *pParent) - : XShortcutsDialog(pParent), ui(new Ui::DialogPDF) { +DialogPDF::DialogPDF(QWidget *pParent) : XShortcutsDialog(pParent), ui(new Ui::DialogPDF) { ui->setupUi(this); setWindowFlags(Qt::Window); } -DialogPDF::~DialogPDF() { delete ui; } +DialogPDF::~DialogPDF() { + delete ui; +} void DialogPDF::setData(QIODevice *pDevice, FW_DEF::OPTIONS options) { if (options.sTitle != "") { diff --git a/PDF/dialogpdf.h b/PDF/dialogpdf.h index a7be6383..88c91da2 100644 --- a/PDF/dialogpdf.h +++ b/PDF/dialogpdf.h @@ -32,14 +32,14 @@ class DialogPDF; class DialogPDF : public XShortcutsDialog { Q_OBJECT - public: +public: explicit DialogPDF(QWidget *pParent = nullptr); ~DialogPDF(); void setData(QIODevice *pDevice, FW_DEF::OPTIONS options); void setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions); - private: +private: Ui::DialogPDF *ui; }; diff --git a/PDF/pdf_defs.h b/PDF/pdf_defs.h index eea702c2..36c143c3 100644 --- a/PDF/pdf_defs.h +++ b/PDF/pdf_defs.h @@ -25,18 +25,7 @@ #include "xpdf.h" namespace SPDF { -enum TYPE { - TYPE_INFO = 0, - TYPE_VIRUSTOTAL, - TYPE_HEX, - TYPE_HASH, - TYPE_STRINGS, - TYPE_SIGNATURES, - TYPE_MEMORYMAP, - TYPE_ENTROPY, - TYPE_HEURISTICSCAN, - __TYPE_size -}; +enum TYPE { TYPE_INFO = 0, TYPE_VIRUSTOTAL, TYPE_HEX, TYPE_HASH, TYPE_STRINGS, TYPE_SIGNATURES, TYPE_MEMORYMAP, TYPE_ENTROPY, TYPE_HEURISTICSCAN, __TYPE_size }; } #endif // PDF_DEFS_H diff --git a/PDF/pdfwidget.cpp b/PDF/pdfwidget.cpp index 2b287d2d..ba456a4b 100644 --- a/PDF/pdfwidget.cpp +++ b/PDF/pdfwidget.cpp @@ -22,21 +22,20 @@ #include "ui_pdfwidget.h" -PDFWidget::PDFWidget(QWidget *pParent) - : FormatWidget(pParent), ui(new Ui::PDFWidget) { +PDFWidget::PDFWidget(QWidget *pParent) : FormatWidget(pParent), ui(new Ui::PDFWidget) { ui->setupUi(this); initWidget(); } -PDFWidget::PDFWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, - QWidget *pParent) - : PDFWidget(pParent) { +PDFWidget::PDFWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, QWidget *pParent) : PDFWidget(pParent) { PDFWidget::setData(pDevice, options, 0, 0, 0); PDFWidget::reload(); } -PDFWidget::~PDFWidget() { delete ui; } +PDFWidget::~PDFWidget() { + delete ui; +} void PDFWidget::clear() { reset(); @@ -46,7 +45,8 @@ void PDFWidget::clear() { ui->treeWidgetNavi->clear(); } -void PDFWidget::cleanup() {} +void PDFWidget::cleanup() { +} void PDFWidget::reload() { clear(); @@ -60,24 +60,15 @@ void PDFWidget::reload() { setFileType(pdf.getFileType()); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPDF::TYPE_INFO, tr("Info"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPDF::TYPE_VIRUSTOTAL, "VirusTotal")); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPDF::TYPE_HEX, tr("Hex"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPDF::TYPE_HASH, tr("Hash"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPDF::TYPE_STRINGS, tr("Strings"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPDF::TYPE_SIGNATURES, tr("Signatures"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPDF::TYPE_MEMORYMAP, tr("Memory map"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPDF::TYPE_ENTROPY, tr("Entropy"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPDF::TYPE_HEURISTICSCAN, tr("Heuristic scan"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPDF::TYPE_INFO, tr("Info"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPDF::TYPE_VIRUSTOTAL, "VirusTotal")); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPDF::TYPE_HEX, tr("Hex"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPDF::TYPE_HASH, tr("Hash"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPDF::TYPE_STRINGS, tr("Strings"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPDF::TYPE_SIGNATURES, tr("Signatures"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPDF::TYPE_MEMORYMAP, tr("Memory map"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPDF::TYPE_ENTROPY, tr("Entropy"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPDF::TYPE_HEURISTICSCAN, tr("Heuristic scan"))); pdf.getInfo(); @@ -87,9 +78,7 @@ void PDFWidget::reload() { } } -FormatWidget::SV PDFWidget::_setValue(QVariant vValue, int nStype, int nNdata, - int nVtype, int nPosition, - qint64 nOffset) { +FormatWidget::SV PDFWidget::_setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset) { return SV_NONE; } @@ -98,19 +87,13 @@ void PDFWidget::setReadonly(bool bState) { ui->widgetStrings->setReadonly(bState); } -void PDFWidget::blockSignals(bool bState) {} +void PDFWidget::blockSignals(bool bState) { +} void PDFWidget::reloadData() { - int nType = ui->treeWidgetNavi->currentItem() - ->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_TYPE) - .toInt(); - qint64 nDataOffset = - ui->treeWidgetNavi->currentItem() - ->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET) - .toLongLong(); - qint64 nDataSize = ui->treeWidgetNavi->currentItem() - ->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE) - .toLongLong(); + int nType = ui->treeWidgetNavi->currentItem()->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_TYPE).toInt(); + qint64 nDataOffset = ui->treeWidgetNavi->currentItem()->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET).toLongLong(); + qint64 nDataSize = ui->treeWidgetNavi->currentItem()->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE).toLongLong(); QString sInit = getInitString(ui->treeWidgetNavi->currentItem()); @@ -121,8 +104,7 @@ void PDFWidget::reloadData() { if (pdf.isValid()) { if (nType == SPDF::TYPE_INFO) { if (!isInitPresent(sInit)) { - ui->widgetInfo->setData(getDevice(), pdf.getFileType(), "Info", - true); + ui->widgetInfo->setData(getDevice(), pdf.getFileType(), "Info", true); } } else if (nType == SPDF::TYPE_VIRUSTOTAL) { if (!isInitPresent(sInit)) { @@ -141,8 +123,7 @@ void PDFWidget::reloadData() { } } else if (nType == SPDF::TYPE_HASH) { if (!isInitPresent(sInit)) { - ui->widgetHash->setData(getDevice(), pdf.getFileType(), 0, -1, - true); + ui->widgetHash->setData(getDevice(), pdf.getFileType(), 0, -1, true); } } else if (nType == SPDF::TYPE_STRINGS) { if (!isInitPresent(sInit)) { @@ -161,8 +142,7 @@ void PDFWidget::reloadData() { SearchSignaturesWidget::OPTIONS signaturesOptions = {}; signaturesOptions.bMenu_Hex = true; - ui->widgetSignatures->setData(getDevice(), pdf.getFileType(), - signaturesOptions, false); + ui->widgetSignatures->setData(getDevice(), pdf.getFileType(), signaturesOptions, false); } } else if (nType == SPDF::TYPE_MEMORYMAP) { if (!isInitPresent(sInit)) { @@ -170,14 +150,12 @@ void PDFWidget::reloadData() { } } else if (nType == SPDF::TYPE_ENTROPY) { if (!isInitPresent(sInit)) { - ui->widgetEntropy->setData(getDevice(), 0, getDevice()->size(), - pdf.getFileType(), + ui->widgetEntropy->setData(getDevice(), 0, getDevice()->size(), pdf.getFileType(), true); // TODO save last directory } } else if (nType == SPDF::TYPE_HEURISTICSCAN) { if (!isInitPresent(sInit)) { - ui->widgetHeuristicScan->setData(getDevice(), true, - pdf.getFileType()); + ui->widgetHeuristicScan->setData(getDevice(), true, pdf.getFileType()); } } @@ -191,8 +169,7 @@ void PDFWidget::on_checkBoxReadonly_toggled(bool bChecked) { setReadonly(bChecked); } -void PDFWidget::on_treeWidgetNavi_currentItemChanged( - QTreeWidgetItem *pCurrent, QTreeWidgetItem *pPrevious) { +void PDFWidget::on_treeWidgetNavi_currentItemChanged(QTreeWidgetItem *pCurrent, QTreeWidgetItem *pPrevious) { Q_UNUSED(pPrevious) if (pCurrent) { diff --git a/PDF/pdfwidget.h b/PDF/pdfwidget.h index 1c3c9827..778a3f39 100644 --- a/PDF/pdfwidget.h +++ b/PDF/pdfwidget.h @@ -31,30 +31,27 @@ class PDFWidget; class PDFWidget : public FormatWidget { Q_OBJECT - public: +public: PDFWidget(QWidget *pParent = nullptr); - PDFWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, - QWidget *pParent = nullptr); + PDFWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, QWidget *pParent = nullptr); ~PDFWidget(); virtual void clear(); virtual void cleanup(); virtual void reload(); - protected: - virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, - int nPosition, qint64 nOffset); +protected: + virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset); virtual void setReadonly(bool bState); virtual void blockSignals(bool bState); virtual void reloadData(); - private slots: +private slots: void on_checkBoxReadonly_toggled(bool bChecked); - void on_treeWidgetNavi_currentItemChanged(QTreeWidgetItem *pCurrent, - QTreeWidgetItem *pPrevious); + void on_treeWidgetNavi_currentItemChanged(QTreeWidgetItem *pCurrent, QTreeWidgetItem *pPrevious); - private: +private: Ui::PDFWidget *ui; }; diff --git a/PE/dialogpe.cpp b/PE/dialogpe.cpp index 225c360b..03b0d8c4 100755 --- a/PE/dialogpe.cpp +++ b/PE/dialogpe.cpp @@ -22,14 +22,15 @@ #include "ui_dialogpe.h" -DialogPE::DialogPE(QWidget *pParent) - : XShortcutsDialog(pParent), ui(new Ui::DialogPE) { +DialogPE::DialogPE(QWidget *pParent) : XShortcutsDialog(pParent), ui(new Ui::DialogPE) { ui->setupUi(this); setWindowFlags(Qt::Window); } -DialogPE::~DialogPE() { delete ui; } +DialogPE::~DialogPE() { + delete ui; +} void DialogPE::setData(QIODevice *pDevice, FW_DEF::OPTIONS options) { if (options.sTitle != "") { diff --git a/PE/dialogpe.h b/PE/dialogpe.h index 2119fa1e..5c483330 100755 --- a/PE/dialogpe.h +++ b/PE/dialogpe.h @@ -32,13 +32,13 @@ class DialogPE; class DialogPE : public XShortcutsDialog { Q_OBJECT - public: +public: explicit DialogPE(QWidget *pParent = nullptr); ~DialogPE(); void setData(QIODevice *pDevice, FW_DEF::OPTIONS options); void setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions); - private: +private: Ui::DialogPE *ui; }; diff --git a/PE/pe_defs.cpp b/PE/pe_defs.cpp index 929ed47d..18fe7f40 100755 --- a/PE/pe_defs.cpp +++ b/PE/pe_defs.cpp @@ -21,730 +21,332 @@ #include "pe_defs.h" namespace N_IMAGE_DOS_HEADER { -const FW_DEF::HEADER_RECORD records[] = { - {e_magic, "e_magic", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_magic), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_cblp, "e_cblp", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cblp), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_cp, "e_cp", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cp), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_crlc, "e_crlc", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_crlc), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_cparhdr, "e_cparhdr", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cparhdr), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_minalloc, "e_minalloc", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_minalloc), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_maxalloc, "e_maxalloc", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_maxalloc), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_ss, "e_ss", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_ss), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_sp, "e_sp", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_sp), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_csum, "e_csum", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_csum), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_ip, "e_ip", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_ip), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_cs, "e_cs", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cs), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_lfarlc, "e_lfarlc", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_lfarlc), - 2, "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_ovno, "e_ovno", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_ovno), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_res_0, "e_res_0", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res) + 0, 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_res_1, "e_res_1", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res) + 2, 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_res_2, "e_res_2", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res) + 4, 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_res_3, "e_res_3", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res) + 6, 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_oemid, "e_oemid", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_oemid), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_oeminfo, "e_oeminfo", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_oeminfo), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_res2_0, "e_res2_0", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 0, - 2, "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_res2_1, "e_res2_1", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 2, - 2, "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_res2_2, "e_res2_2", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 4, - 2, "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_res2_3, "e_res2_3", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 6, - 2, "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_res2_4, "e_res2_4", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 8, - 2, "WORD", FW_DEF::VAL_TYPE_DATA}, - {e_res2_5, "e_res2_5", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 10, 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_res2_6, "e_res2_6", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 12, 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_res2_7, "e_res2_7", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 14, 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_res2_8, "e_res2_8", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 16, 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_res2_9, "e_res2_9", - offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 18, 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {e_lfanew, "e_lfanew", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_lfanew), - 4, "LONG", FW_DEF::VAL_TYPE_OFFSET}}; +const FW_DEF::HEADER_RECORD records[] = {{e_magic, "e_magic", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_magic), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_cblp, "e_cblp", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cblp), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_cp, "e_cp", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cp), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_crlc, "e_crlc", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_crlc), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_cparhdr, "e_cparhdr", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cparhdr), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_minalloc, "e_minalloc", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_minalloc), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_maxalloc, "e_maxalloc", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_maxalloc), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_ss, "e_ss", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_ss), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_sp, "e_sp", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_sp), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_csum, "e_csum", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_csum), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_ip, "e_ip", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_ip), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_cs, "e_cs", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_cs), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_lfarlc, "e_lfarlc", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_lfarlc), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_ovno, "e_ovno", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_ovno), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res_0, "e_res_0", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res) + 0, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res_1, "e_res_1", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res) + 2, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res_2, "e_res_2", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res) + 4, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res_3, "e_res_3", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res) + 6, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_oemid, "e_oemid", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_oemid), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_oeminfo, "e_oeminfo", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_oeminfo), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_0, "e_res2_0", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 0, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_1, "e_res2_1", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 2, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_2, "e_res2_2", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 4, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_3, "e_res2_3", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 6, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_4, "e_res2_4", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 8, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_5, "e_res2_5", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 10, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_6, "e_res2_6", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 12, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_7, "e_res2_7", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 14, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_8, "e_res2_8", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 16, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_res2_9, "e_res2_9", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_res2) + 18, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {e_lfanew, "e_lfanew", offsetof(XMSDOS_DEF::IMAGE_DOS_HEADEREX, e_lfanew), 4, "LONG", FW_DEF::VAL_TYPE_OFFSET}}; } namespace N_IMAGE_NT_HEADERS { -const FW_DEF::HEADER_RECORD records[] = { - {Signature, "Signature", offsetof(XPE_DEF::IMAGE_NT_HEADERS32, Signature), - 4, "DWORD", FW_DEF::VAL_TYPE_DATA}}; +const FW_DEF::HEADER_RECORD records[] = {{Signature, "Signature", offsetof(XPE_DEF::IMAGE_NT_HEADERS32, Signature), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}}; } namespace N_IMAGE_FILE_HEADER { const FW_DEF::HEADER_RECORD records[] = { - {Machine, "Machine", offsetof(XPE_DEF::IMAGE_FILE_HEADER, Machine), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {NumberOfSections, "NumberOfSections", - offsetof(XPE_DEF::IMAGE_FILE_HEADER, NumberOfSections), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {TimeDateStamp, "TimeDateStamp", - offsetof(XPE_DEF::IMAGE_FILE_HEADER, TimeDateStamp), 4, "DWORD", - FW_DEF::VAL_TYPE_UNIXTIME}, - {PointerToSymbolTable, "PointerToSymbolTable", - offsetof(XPE_DEF::IMAGE_FILE_HEADER, PointerToSymbolTable), 4, "DWORD", - FW_DEF::VAL_TYPE_OFFSET}, - {NumberOfSymbols, "NumberOfSymbols", - offsetof(XPE_DEF::IMAGE_FILE_HEADER, NumberOfSymbols), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {SizeOfOptionalHeader, "SizeOfOptionalHeader", - offsetof(XPE_DEF::IMAGE_FILE_HEADER, SizeOfOptionalHeader), 2, "WORD", - FW_DEF::VAL_TYPE_SIZE}, - {Characteristics, "Characteristics", - offsetof(XPE_DEF::IMAGE_FILE_HEADER, Characteristics), 2, "WORD", - FW_DEF::VAL_TYPE_FLAGS}}; + {Machine, "Machine", offsetof(XPE_DEF::IMAGE_FILE_HEADER, Machine), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {NumberOfSections, "NumberOfSections", offsetof(XPE_DEF::IMAGE_FILE_HEADER, NumberOfSections), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {TimeDateStamp, "TimeDateStamp", offsetof(XPE_DEF::IMAGE_FILE_HEADER, TimeDateStamp), 4, "DWORD", FW_DEF::VAL_TYPE_UNIXTIME}, + {PointerToSymbolTable, "PointerToSymbolTable", offsetof(XPE_DEF::IMAGE_FILE_HEADER, PointerToSymbolTable), 4, "DWORD", FW_DEF::VAL_TYPE_OFFSET}, + {NumberOfSymbols, "NumberOfSymbols", offsetof(XPE_DEF::IMAGE_FILE_HEADER, NumberOfSymbols), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {SizeOfOptionalHeader, "SizeOfOptionalHeader", offsetof(XPE_DEF::IMAGE_FILE_HEADER, SizeOfOptionalHeader), 2, "WORD", FW_DEF::VAL_TYPE_SIZE}, + {Characteristics, "Characteristics", offsetof(XPE_DEF::IMAGE_FILE_HEADER, Characteristics), 2, "WORD", FW_DEF::VAL_TYPE_FLAGS}}; } namespace N_IMAGE_OPTIONAL_HEADER { const FW_DEF::HEADER_RECORD records32[] = { - {Magic, "Magic", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, Magic), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {MajorLinkerVersion, "MajorLinkerVersion", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, MajorLinkerVersion), 1, "BYTE", - FW_DEF::VAL_TYPE_DATA}, - {MinorLinkerVersion, "MinorLinkerVersion", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, MinorLinkerVersion), 1, "BYTE", - FW_DEF::VAL_TYPE_DATA}, - {SizeOfCode, "SizeOfCode", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, SizeOfCode), 4, "DWORD", + {Magic, "Magic", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, Magic), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {MajorLinkerVersion, "MajorLinkerVersion", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, MajorLinkerVersion), 1, "BYTE", FW_DEF::VAL_TYPE_DATA}, + {MinorLinkerVersion, "MinorLinkerVersion", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, MinorLinkerVersion), 1, "BYTE", FW_DEF::VAL_TYPE_DATA}, + {SizeOfCode, "SizeOfCode", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, SizeOfCode), 4, "DWORD", FW_DEF::VAL_TYPE_SIZE}, + {SizeOfInitializedData, "SizeOfInitializedData", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, SizeOfInitializedData), 4, "DWORD", FW_DEF::VAL_TYPE_SIZE}, + {SizeOfUninitializedData, "SizeOfUninitializedData", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, SizeOfUninitializedData), 4, "DWORD", FW_DEF::VAL_TYPE_SIZE}, - {SizeOfInitializedData, "SizeOfInitializedData", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, SizeOfInitializedData), 4, - "DWORD", FW_DEF::VAL_TYPE_SIZE}, - {SizeOfUninitializedData, "SizeOfUninitializedData", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, SizeOfUninitializedData), 4, - "DWORD", FW_DEF::VAL_TYPE_SIZE}, - {AddressOfEntryPoint, "AddressOfEntryPoint", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, AddressOfEntryPoint), 4, - "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, - {BaseOfCode, "BaseOfCode", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, BaseOfCode), 4, "DWORD", - FW_DEF::VAL_TYPE_RELADDRESS}, - {BaseOfData, "BaseOfData", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, BaseOfData), 4, "DWORD", - FW_DEF::VAL_TYPE_RELADDRESS}, - {ImageBase, "ImageBase", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, ImageBase), 4, "DWORD", - FW_DEF::VAL_TYPE_ADDRESS}, - {SectionAlignment, "SectionAlignment", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, SectionAlignment), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {FileAlignment, "FileAlignment", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, FileAlignment), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {MajorOperatingSystemVersion, "MajorOperatingSystemVersion", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, MajorOperatingSystemVersion), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {MinorOperatingSystemVersion, "MinorOperatingSystemVersion", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, MinorOperatingSystemVersion), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {MajorImageVersion, "MajorImageVersion", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, MajorImageVersion), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {MinorImageVersion, "MinorImageVersion", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, MinorImageVersion), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {MajorSubsystemVersion, "MajorSubsystemVersion", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, MajorSubsystemVersion), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {MinorSubsystemVersion, "MinorSubsystemVersion", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, MinorSubsystemVersion), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {Win32VersionValue, "Win32VersionValue", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, Win32VersionValue), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {SizeOfImage, "SizeOfImage", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, SizeOfImage), 4, "DWORD", - FW_DEF::VAL_TYPE_SIZE}, - {SizeOfHeaders, "SizeOfHeaders", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, SizeOfHeaders), 4, "DWORD", - FW_DEF::VAL_TYPE_SIZE}, - {CheckSum, "CheckSum", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, CheckSum), - 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {Subsystem, "Subsystem", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, Subsystem), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {DllCharacteristics, "DllCharacteristics", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, DllCharacteristics), 2, "WORD", - FW_DEF::VAL_TYPE_FLAGS}, - {SizeOfStackReserve, "SizeOfStackReserve", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, SizeOfStackReserve), 4, "DWORD", - FW_DEF::VAL_TYPE_SIZE}, - {SizeOfStackCommit, "SizeOfStackCommit", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, SizeOfStackCommit), 4, "DWORD", - FW_DEF::VAL_TYPE_SIZE}, - {SizeOfHeapReserve, "SizeOfHeapReserve", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, SizeOfHeapReserve), 4, "DWORD", - FW_DEF::VAL_TYPE_SIZE}, - {SizeOfHeapCommit, "SizeOfHeapCommit", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, SizeOfHeapCommit), 4, "DWORD", - FW_DEF::VAL_TYPE_SIZE}, - {LoaderFlags, "LoaderFlags", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, LoaderFlags), 4, "DWORD", - FW_DEF::VAL_TYPE_FLAGS}, - {NumberOfRvaAndSizes, "NumberOfRvaAndSizes", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, NumberOfRvaAndSizes), 4, - "DWORD", FW_DEF::VAL_TYPE_DATA}}; + {AddressOfEntryPoint, "AddressOfEntryPoint", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, AddressOfEntryPoint), 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {BaseOfCode, "BaseOfCode", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, BaseOfCode), 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {BaseOfData, "BaseOfData", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, BaseOfData), 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {ImageBase, "ImageBase", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, ImageBase), 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, + {SectionAlignment, "SectionAlignment", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, SectionAlignment), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {FileAlignment, "FileAlignment", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, FileAlignment), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {MajorOperatingSystemVersion, "MajorOperatingSystemVersion", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, MajorOperatingSystemVersion), 2, "WORD", + FW_DEF::VAL_TYPE_DATA}, + {MinorOperatingSystemVersion, "MinorOperatingSystemVersion", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, MinorOperatingSystemVersion), 2, "WORD", + FW_DEF::VAL_TYPE_DATA}, + {MajorImageVersion, "MajorImageVersion", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, MajorImageVersion), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {MinorImageVersion, "MinorImageVersion", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, MinorImageVersion), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {MajorSubsystemVersion, "MajorSubsystemVersion", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, MajorSubsystemVersion), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {MinorSubsystemVersion, "MinorSubsystemVersion", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, MinorSubsystemVersion), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {Win32VersionValue, "Win32VersionValue", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, Win32VersionValue), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {SizeOfImage, "SizeOfImage", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, SizeOfImage), 4, "DWORD", FW_DEF::VAL_TYPE_SIZE}, + {SizeOfHeaders, "SizeOfHeaders", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, SizeOfHeaders), 4, "DWORD", FW_DEF::VAL_TYPE_SIZE}, + {CheckSum, "CheckSum", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, CheckSum), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {Subsystem, "Subsystem", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, Subsystem), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {DllCharacteristics, "DllCharacteristics", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, DllCharacteristics), 2, "WORD", FW_DEF::VAL_TYPE_FLAGS}, + {SizeOfStackReserve, "SizeOfStackReserve", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, SizeOfStackReserve), 4, "DWORD", FW_DEF::VAL_TYPE_SIZE}, + {SizeOfStackCommit, "SizeOfStackCommit", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, SizeOfStackCommit), 4, "DWORD", FW_DEF::VAL_TYPE_SIZE}, + {SizeOfHeapReserve, "SizeOfHeapReserve", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, SizeOfHeapReserve), 4, "DWORD", FW_DEF::VAL_TYPE_SIZE}, + {SizeOfHeapCommit, "SizeOfHeapCommit", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, SizeOfHeapCommit), 4, "DWORD", FW_DEF::VAL_TYPE_SIZE}, + {LoaderFlags, "LoaderFlags", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, LoaderFlags), 4, "DWORD", FW_DEF::VAL_TYPE_FLAGS}, + {NumberOfRvaAndSizes, "NumberOfRvaAndSizes", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER32, NumberOfRvaAndSizes), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}}; const FW_DEF::HEADER_RECORD records64[] = { - {Magic, "Magic", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, Magic), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {MajorLinkerVersion, "MajorLinkerVersion", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, MajorLinkerVersion), 1, "BYTE", - FW_DEF::VAL_TYPE_DATA}, - {MinorLinkerVersion, "MinorLinkerVersion", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, MinorLinkerVersion), 1, "BYTE", - FW_DEF::VAL_TYPE_DATA}, - {SizeOfCode, "SizeOfCode", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, SizeOfCode), 4, "DWORD", + {Magic, "Magic", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, Magic), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {MajorLinkerVersion, "MajorLinkerVersion", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, MajorLinkerVersion), 1, "BYTE", FW_DEF::VAL_TYPE_DATA}, + {MinorLinkerVersion, "MinorLinkerVersion", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, MinorLinkerVersion), 1, "BYTE", FW_DEF::VAL_TYPE_DATA}, + {SizeOfCode, "SizeOfCode", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, SizeOfCode), 4, "DWORD", FW_DEF::VAL_TYPE_SIZE}, + {SizeOfInitializedData, "SizeOfInitializedData", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, SizeOfInitializedData), 4, "DWORD", FW_DEF::VAL_TYPE_SIZE}, + {SizeOfUninitializedData, "SizeOfUninitializedData", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, SizeOfUninitializedData), 4, "DWORD", FW_DEF::VAL_TYPE_SIZE}, - {SizeOfInitializedData, "SizeOfInitializedData", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, SizeOfInitializedData), 4, - "DWORD", FW_DEF::VAL_TYPE_SIZE}, - {SizeOfUninitializedData, "SizeOfUninitializedData", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, SizeOfUninitializedData), 4, - "DWORD", FW_DEF::VAL_TYPE_SIZE}, - {AddressOfEntryPoint, "AddressOfEntryPoint", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, AddressOfEntryPoint), 4, - "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, - {BaseOfCode, "BaseOfCode", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, BaseOfCode), 4, "DWORD", - FW_DEF::VAL_TYPE_RELADDRESS}, + {AddressOfEntryPoint, "AddressOfEntryPoint", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, AddressOfEntryPoint), 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {BaseOfCode, "BaseOfCode", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, BaseOfCode), 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, {BaseOfData, "", 0, 0, "", FW_DEF::VAL_TYPE_UNKNOWN}, - {ImageBase, "ImageBase", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, ImageBase), 8, "ULONGLONG", - FW_DEF::VAL_TYPE_ADDRESS}, - {SectionAlignment, "SectionAlignment", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, SectionAlignment), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {FileAlignment, "FileAlignment", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, FileAlignment), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {MajorOperatingSystemVersion, "MajorOperatingSystemVersion", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, MajorOperatingSystemVersion), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {MinorOperatingSystemVersion, "MinorOperatingSystemVersion", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, MinorOperatingSystemVersion), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {MajorImageVersion, "MajorImageVersion", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, MajorImageVersion), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {MinorImageVersion, "MinorImageVersion", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, MinorImageVersion), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {MajorSubsystemVersion, "MajorSubsystemVersion", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, MajorSubsystemVersion), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {MinorSubsystemVersion, "MinorSubsystemVersion", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, MinorSubsystemVersion), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {Win32VersionValue, "Win32VersionValue", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, Win32VersionValue), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {SizeOfImage, "SizeOfImage", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, SizeOfImage), 4, "DWORD", - FW_DEF::VAL_TYPE_SIZE}, - {SizeOfHeaders, "SizeOfHeaders", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, SizeOfHeaders), 4, "DWORD", - FW_DEF::VAL_TYPE_SIZE}, - {CheckSum, "CheckSum", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, CheckSum), - 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {Subsystem, "Subsystem", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, Subsystem), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {DllCharacteristics, "DllCharacteristics", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, DllCharacteristics), 2, "WORD", - FW_DEF::VAL_TYPE_FLAGS}, - {SizeOfStackReserve, "SizeOfStackReserve", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, SizeOfStackReserve), 8, - "ULONGLONG", FW_DEF::VAL_TYPE_SIZE}, - {SizeOfStackCommit, "SizeOfStackCommit", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, SizeOfStackCommit), 8, - "ULONGLONG", FW_DEF::VAL_TYPE_SIZE}, - {SizeOfHeapReserve, "SizeOfHeapReserve", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, SizeOfHeapReserve), 8, - "ULONGLONG", FW_DEF::VAL_TYPE_SIZE}, - {SizeOfHeapCommit, "SizeOfHeapCommit", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, SizeOfHeapCommit), 8, - "ULONGLONG", FW_DEF::VAL_TYPE_SIZE}, - {LoaderFlags, "LoaderFlags", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, LoaderFlags), 4, "DWORD", - FW_DEF::VAL_TYPE_FLAGS}, - {NumberOfRvaAndSizes, "NumberOfRvaAndSizes", - offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, NumberOfRvaAndSizes), 4, - "DWORD", FW_DEF::VAL_TYPE_DATA}}; + {ImageBase, "ImageBase", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, ImageBase), 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, + {SectionAlignment, "SectionAlignment", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, SectionAlignment), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {FileAlignment, "FileAlignment", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, FileAlignment), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {MajorOperatingSystemVersion, "MajorOperatingSystemVersion", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, MajorOperatingSystemVersion), 2, "WORD", + FW_DEF::VAL_TYPE_DATA}, + {MinorOperatingSystemVersion, "MinorOperatingSystemVersion", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, MinorOperatingSystemVersion), 2, "WORD", + FW_DEF::VAL_TYPE_DATA}, + {MajorImageVersion, "MajorImageVersion", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, MajorImageVersion), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {MinorImageVersion, "MinorImageVersion", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, MinorImageVersion), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {MajorSubsystemVersion, "MajorSubsystemVersion", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, MajorSubsystemVersion), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {MinorSubsystemVersion, "MinorSubsystemVersion", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, MinorSubsystemVersion), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {Win32VersionValue, "Win32VersionValue", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, Win32VersionValue), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {SizeOfImage, "SizeOfImage", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, SizeOfImage), 4, "DWORD", FW_DEF::VAL_TYPE_SIZE}, + {SizeOfHeaders, "SizeOfHeaders", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, SizeOfHeaders), 4, "DWORD", FW_DEF::VAL_TYPE_SIZE}, + {CheckSum, "CheckSum", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, CheckSum), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {Subsystem, "Subsystem", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, Subsystem), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {DllCharacteristics, "DllCharacteristics", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, DllCharacteristics), 2, "WORD", FW_DEF::VAL_TYPE_FLAGS}, + {SizeOfStackReserve, "SizeOfStackReserve", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, SizeOfStackReserve), 8, "ULONGLONG", FW_DEF::VAL_TYPE_SIZE}, + {SizeOfStackCommit, "SizeOfStackCommit", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, SizeOfStackCommit), 8, "ULONGLONG", FW_DEF::VAL_TYPE_SIZE}, + {SizeOfHeapReserve, "SizeOfHeapReserve", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, SizeOfHeapReserve), 8, "ULONGLONG", FW_DEF::VAL_TYPE_SIZE}, + {SizeOfHeapCommit, "SizeOfHeapCommit", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, SizeOfHeapCommit), 8, "ULONGLONG", FW_DEF::VAL_TYPE_SIZE}, + {LoaderFlags, "LoaderFlags", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, LoaderFlags), 4, "DWORD", FW_DEF::VAL_TYPE_FLAGS}, + {NumberOfRvaAndSizes, "NumberOfRvaAndSizes", offsetof(XPE_DEF::IMAGE_OPTIONAL_HEADER64, NumberOfRvaAndSizes), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}}; } // namespace N_IMAGE_OPTIONAL_HEADER namespace N_IMAGE_TLS { const FW_DEF::HEADER_RECORD records32[] = { - {StartAddressOfRawData, "StartAddressOfRawData", - offsetof(XPE_DEF::S_IMAGE_TLS_DIRECTORY32, StartAddressOfRawData), 4, - "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, - {EndAddressOfRawData, "EndAddressOfRawData", - offsetof(XPE_DEF::S_IMAGE_TLS_DIRECTORY32, EndAddressOfRawData), 4, - "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, - {AddressOfIndex, "AddressOfIndex", - offsetof(XPE_DEF::S_IMAGE_TLS_DIRECTORY32, AddressOfIndex), 4, "DWORD", - FW_DEF::VAL_TYPE_ADDRESS}, - {AddressOfCallBacks, "AddressOfCallBacks", - offsetof(XPE_DEF::S_IMAGE_TLS_DIRECTORY32, AddressOfCallBacks), 4, "DWORD", - FW_DEF::VAL_TYPE_ADDRESS}, - {SizeOfZeroFill, "SizeOfZeroFill", - offsetof(XPE_DEF::S_IMAGE_TLS_DIRECTORY32, SizeOfZeroFill), 4, "DWORD", - FW_DEF::VAL_TYPE_SIZE}, - {Characteristics, "Characteristics", - offsetof(XPE_DEF::S_IMAGE_TLS_DIRECTORY32, Characteristics), 4, "DWORD", - FW_DEF::VAL_TYPE_FLAGS}}; + {StartAddressOfRawData, "StartAddressOfRawData", offsetof(XPE_DEF::S_IMAGE_TLS_DIRECTORY32, StartAddressOfRawData), 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, + {EndAddressOfRawData, "EndAddressOfRawData", offsetof(XPE_DEF::S_IMAGE_TLS_DIRECTORY32, EndAddressOfRawData), 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, + {AddressOfIndex, "AddressOfIndex", offsetof(XPE_DEF::S_IMAGE_TLS_DIRECTORY32, AddressOfIndex), 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, + {AddressOfCallBacks, "AddressOfCallBacks", offsetof(XPE_DEF::S_IMAGE_TLS_DIRECTORY32, AddressOfCallBacks), 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, + {SizeOfZeroFill, "SizeOfZeroFill", offsetof(XPE_DEF::S_IMAGE_TLS_DIRECTORY32, SizeOfZeroFill), 4, "DWORD", FW_DEF::VAL_TYPE_SIZE}, + {Characteristics, "Characteristics", offsetof(XPE_DEF::S_IMAGE_TLS_DIRECTORY32, Characteristics), 4, "DWORD", FW_DEF::VAL_TYPE_FLAGS}}; const FW_DEF::HEADER_RECORD records64[] = { - {StartAddressOfRawData, "StartAddressOfRawData", - offsetof(XPE_DEF::S_IMAGE_TLS_DIRECTORY64, StartAddressOfRawData), 8, - "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, - {EndAddressOfRawData, "EndAddressOfRawData", - offsetof(XPE_DEF::S_IMAGE_TLS_DIRECTORY64, EndAddressOfRawData), 8, - "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, - {AddressOfIndex, "AddressOfIndex", - offsetof(XPE_DEF::S_IMAGE_TLS_DIRECTORY64, AddressOfIndex), 8, "ULONGLONG", + {StartAddressOfRawData, "StartAddressOfRawData", offsetof(XPE_DEF::S_IMAGE_TLS_DIRECTORY64, StartAddressOfRawData), 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, - {AddressOfCallBacks, "AddressOfCallBacks", - offsetof(XPE_DEF::S_IMAGE_TLS_DIRECTORY64, AddressOfCallBacks), 8, - "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, - {SizeOfZeroFill, "SizeOfZeroFill", - offsetof(XPE_DEF::S_IMAGE_TLS_DIRECTORY64, SizeOfZeroFill), 4, "DWORD", - FW_DEF::VAL_TYPE_SIZE}, - {Characteristics, "Characteristics", - offsetof(XPE_DEF::S_IMAGE_TLS_DIRECTORY64, Characteristics), 4, "DWORD", - FW_DEF::VAL_TYPE_FLAGS}}; + {EndAddressOfRawData, "EndAddressOfRawData", offsetof(XPE_DEF::S_IMAGE_TLS_DIRECTORY64, EndAddressOfRawData), 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, + {AddressOfIndex, "AddressOfIndex", offsetof(XPE_DEF::S_IMAGE_TLS_DIRECTORY64, AddressOfIndex), 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, + {AddressOfCallBacks, "AddressOfCallBacks", offsetof(XPE_DEF::S_IMAGE_TLS_DIRECTORY64, AddressOfCallBacks), 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, + {SizeOfZeroFill, "SizeOfZeroFill", offsetof(XPE_DEF::S_IMAGE_TLS_DIRECTORY64, SizeOfZeroFill), 4, "DWORD", FW_DEF::VAL_TYPE_SIZE}, + {Characteristics, "Characteristics", offsetof(XPE_DEF::S_IMAGE_TLS_DIRECTORY64, Characteristics), 4, "DWORD", FW_DEF::VAL_TYPE_FLAGS}}; } // namespace N_IMAGE_TLS namespace N_IMAGE_LOADCONFIG { const FW_DEF::HEADER_RECORD records32[] = { - {Size, "Size", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, Size), 4, - "DWORD", FW_DEF::VAL_TYPE_SIZE}, - {TimeDateStamp, "TimeDateStamp", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, TimeDateStamp), 4, - "DWORD", FW_DEF::VAL_TYPE_UNIXTIME}, - {MajorVersion, "MajorVersion", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, MajorVersion), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {MinorVersion, "MinorVersion", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, MinorVersion), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {GlobalFlagsClear, "GlobalFlagsClear", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, GlobalFlagsClear), 4, - "DWORD", FW_DEF::VAL_TYPE_DATA}, - {GlobalFlagsSet, "GlobalFlagsSet", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, GlobalFlagsSet), 4, - "DWORD", FW_DEF::VAL_TYPE_DATA}, - {CriticalSectionDefaultTimeout, "CriticalSectionDefaultTimeout", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, - CriticalSectionDefaultTimeout), - 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {DeCommitFreeBlockThreshold, "DeCommitFreeBlockThreshold", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, - DeCommitFreeBlockThreshold), - 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {DeCommitTotalFreeThreshold, "DeCommitTotalFreeThreshold", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, - DeCommitTotalFreeThreshold), - 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {LockPrefixTable, "LockPrefixTable", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, LockPrefixTable), 4, - "DWORD", FW_DEF::VAL_TYPE_DATA}, - {MaximumAllocationSize, "MaximumAllocationSize", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, MaximumAllocationSize), - 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {VirtualMemoryThreshold, "VirtualMemoryThreshold", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, VirtualMemoryThreshold), - 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {ProcessAffinityMask, "ProcessAffinityMask", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, ProcessAffinityMask), 4, + {Size, "Size", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, Size), 4, "DWORD", FW_DEF::VAL_TYPE_SIZE}, + {TimeDateStamp, "TimeDateStamp", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, TimeDateStamp), 4, "DWORD", FW_DEF::VAL_TYPE_UNIXTIME}, + {MajorVersion, "MajorVersion", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, MajorVersion), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {MinorVersion, "MinorVersion", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, MinorVersion), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {GlobalFlagsClear, "GlobalFlagsClear", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, GlobalFlagsClear), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {GlobalFlagsSet, "GlobalFlagsSet", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, GlobalFlagsSet), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {CriticalSectionDefaultTimeout, "CriticalSectionDefaultTimeout", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, CriticalSectionDefaultTimeout), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {CSDVersion, "CSDVersion", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, CSDVersion), 2, "WORD", + {DeCommitFreeBlockThreshold, "DeCommitFreeBlockThreshold", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, DeCommitFreeBlockThreshold), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {DependentLoadFlags, "DependentLoadFlags", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, DependentLoadFlags), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {VirtualMemoryThreshold, "EditList", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, EditList), 4, "DWORD", + {DeCommitTotalFreeThreshold, "DeCommitTotalFreeThreshold", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, DeCommitTotalFreeThreshold), 4, "DWORD", + FW_DEF::VAL_TYPE_DATA}, + {LockPrefixTable, "LockPrefixTable", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, LockPrefixTable), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {MaximumAllocationSize, "MaximumAllocationSize", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, MaximumAllocationSize), 4, "DWORD", + FW_DEF::VAL_TYPE_DATA}, + {VirtualMemoryThreshold, "VirtualMemoryThreshold", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, VirtualMemoryThreshold), 4, "DWORD", + FW_DEF::VAL_TYPE_DATA}, + {ProcessAffinityMask, "ProcessAffinityMask", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, ProcessAffinityMask), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {CSDVersion, "CSDVersion", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, CSDVersion), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {DependentLoadFlags, "DependentLoadFlags", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, DependentLoadFlags), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {VirtualMemoryThreshold, "EditList", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, EditList), 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, + {VirtualMemoryThreshold, "SecurityCookie", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, SecurityCookie), 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, + {VirtualMemoryThreshold, "SEHandlerTable", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, SEHandlerTable), 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, + {VirtualMemoryThreshold, "SEHandlerCount", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, SEHandlerCount), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {GuardCFCheckFunctionPointer, "GuardCFCheckFunctionPointer", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, GuardCFCheckFunctionPointer), 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, - {VirtualMemoryThreshold, "SecurityCookie", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, SecurityCookie), 4, + {GuardCFDispatchFunctionPointer, "GuardCFDispatchFunctionPointer", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, GuardCFDispatchFunctionPointer), 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, - {VirtualMemoryThreshold, "SEHandlerTable", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, SEHandlerTable), 4, + {GuardCFFunctionTable, "GuardCFFunctionTable", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, GuardCFFunctionTable), 4, "DWORD", + FW_DEF::VAL_TYPE_ADDRESS}, + {GuardCFFunctionCount, "GuardCFFunctionCount", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, GuardCFFunctionCount), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {GuardFlags, "GuardFlags", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, GuardFlags), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {CodeIntegrity_Flags, "CodeIntegrity_Flags", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, CodeIntegrity) + 0, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {CodeIntegrity_Catalog, "CodeIntegrity_Catalog", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, CodeIntegrity) + 2, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {CodeIntegrity_CatalogOffset, "CodeIntegrity_CatalogOffset", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, CodeIntegrity) + 4, 4, "DWORD", + FW_DEF::VAL_TYPE_OFFSET}, + {CodeIntegrity_Reserved, "CodeIntegrity_Reserved", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, CodeIntegrity) + 8, 4, "DWORD", + FW_DEF::VAL_TYPE_DATA}, + {GuardAddressTakenIatEntryTable, "GuardAddressTakenIatEntryTable", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, GuardAddressTakenIatEntryTable), 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, - {VirtualMemoryThreshold, "SEHandlerCount", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, SEHandlerCount), 4, + {GuardAddressTakenIatEntryCount, "GuardAddressTakenIatEntryCount", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, GuardAddressTakenIatEntryCount), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {GuardCFCheckFunctionPointer, "GuardCFCheckFunctionPointer", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, - GuardCFCheckFunctionPointer), - 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, - {GuardCFDispatchFunctionPointer, "GuardCFDispatchFunctionPointer", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, - GuardCFDispatchFunctionPointer), - 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, - {GuardCFFunctionTable, "GuardCFFunctionTable", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, GuardCFFunctionTable), - 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, - {GuardCFFunctionCount, "GuardCFFunctionCount", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, GuardCFFunctionCount), - 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {GuardFlags, "GuardFlags", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, GuardFlags), 4, "DWORD", + {GuardLongJumpTargetTable, "GuardLongJumpTargetTable", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, GuardLongJumpTargetTable), 4, "DWORD", + FW_DEF::VAL_TYPE_ADDRESS}, + {GuardLongJumpTargetCount, "GuardLongJumpTargetCount", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, GuardLongJumpTargetCount), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {CodeIntegrity_Flags, "CodeIntegrity_Flags", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, CodeIntegrity) + 0, 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {CodeIntegrity_Catalog, "CodeIntegrity_Catalog", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, CodeIntegrity) + 2, 2, + {DynamicValueRelocTable, "DynamicValueRelocTable", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, DynamicValueRelocTable), 4, "DWORD", + FW_DEF::VAL_TYPE_ADDRESS}, + {CHPEMetadataPointer, "CHPEMetadataPointer", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, CHPEMetadataPointer), 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, + {GuardRFFailureRoutine, "GuardRFFailureRoutine", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, GuardRFFailureRoutine), 4, "DWORD", + FW_DEF::VAL_TYPE_ADDRESS}, + {GuardRFFailureRoutineFunctionPointer, "GuardRFFailureRoutineFunctionPointer", + offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, GuardRFFailureRoutineFunctionPointer), 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, + {DynamicValueRelocTableOffset, "DynamicValueRelocTableOffset", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, DynamicValueRelocTableOffset), 4, "DWORD", + FW_DEF::VAL_TYPE_OFFSET}, + {DynamicValueRelocTableSection, "DynamicValueRelocTableSection", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, DynamicValueRelocTableSection), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, - {CodeIntegrity_CatalogOffset, "CodeIntegrity_CatalogOffset", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, CodeIntegrity) + 4, 4, - "DWORD", FW_DEF::VAL_TYPE_OFFSET}, - {CodeIntegrity_Reserved, "CodeIntegrity_Reserved", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, CodeIntegrity) + 8, 4, - "DWORD", FW_DEF::VAL_TYPE_DATA}, - {GuardAddressTakenIatEntryTable, "GuardAddressTakenIatEntryTable", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, - GuardAddressTakenIatEntryTable), - 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, - {GuardAddressTakenIatEntryCount, "GuardAddressTakenIatEntryCount", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, - GuardAddressTakenIatEntryCount), - 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {GuardLongJumpTargetTable, "GuardLongJumpTargetTable", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, - GuardLongJumpTargetTable), - 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, - {GuardLongJumpTargetCount, "GuardLongJumpTargetCount", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, - GuardLongJumpTargetCount), - 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {DynamicValueRelocTable, "DynamicValueRelocTable", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, DynamicValueRelocTable), - 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, - {CHPEMetadataPointer, "CHPEMetadataPointer", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, CHPEMetadataPointer), 4, + {Reserved2, "Reserved2", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, Reserved2), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {GuardRFVerifyStackPointerFunctionPointer, "GuardRFVerifyStackPointerFunctionPointer", + offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, GuardRFVerifyStackPointerFunctionPointer), 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, + {HotPatchTableOffset, "HotPatchTableOffset", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, HotPatchTableOffset), 4, "DWORD", FW_DEF::VAL_TYPE_OFFSET}, + {Reserved3, "Reserved3", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, Reserved3), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {EnclaveConfigurationPointer, "EnclaveConfigurationPointer", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, EnclaveConfigurationPointer), 4, "DWORD", + FW_DEF::VAL_TYPE_ADDRESS}, + {VolatileMetadataPointer, "VolatileMetadataPointer", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, VolatileMetadataPointer), 4, "DWORD", + FW_DEF::VAL_TYPE_ADDRESS}, + {GuardEHContinuationTable, "GuardEHContinuationTable", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, GuardEHContinuationTable), 4, "DWORD", + FW_DEF::VAL_TYPE_ADDRESS}, + {GuardEHContinuationCount, "GuardEHContinuationCount", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, GuardEHContinuationCount), 4, "DWORD", + FW_DEF::VAL_TYPE_ADDRESS}, + {GuardXFGCheckFunctionPointer, "GuardXFGCheckFunctionPointer", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, GuardXFGCheckFunctionPointer), 4, "DWORD", + FW_DEF::VAL_TYPE_ADDRESS}, + {GuardXFGDispatchFunctionPointer, "GuardXFGDispatchFunctionPointer", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, GuardXFGDispatchFunctionPointer), 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, - {GuardRFFailureRoutine, "GuardRFFailureRoutine", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, GuardRFFailureRoutine), - 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, - {GuardRFFailureRoutineFunctionPointer, - "GuardRFFailureRoutineFunctionPointer", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, - GuardRFFailureRoutineFunctionPointer), - 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, - {DynamicValueRelocTableOffset, "DynamicValueRelocTableOffset", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, - DynamicValueRelocTableOffset), - 4, "DWORD", FW_DEF::VAL_TYPE_OFFSET}, - {DynamicValueRelocTableSection, "DynamicValueRelocTableSection", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, - DynamicValueRelocTableSection), - 2, "WORD", FW_DEF::VAL_TYPE_DATA}, - {Reserved2, "Reserved2", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, Reserved2), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {GuardRFVerifyStackPointerFunctionPointer, - "GuardRFVerifyStackPointerFunctionPointer", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, - GuardRFVerifyStackPointerFunctionPointer), - 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, - {HotPatchTableOffset, "HotPatchTableOffset", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, HotPatchTableOffset), 4, - "DWORD", FW_DEF::VAL_TYPE_OFFSET}, - {Reserved3, "Reserved3", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, Reserved3), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {EnclaveConfigurationPointer, "EnclaveConfigurationPointer", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, - EnclaveConfigurationPointer), - 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, - {VolatileMetadataPointer, "VolatileMetadataPointer", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, - VolatileMetadataPointer), - 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, - {GuardEHContinuationTable, "GuardEHContinuationTable", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, - GuardEHContinuationTable), - 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, - {GuardEHContinuationCount, "GuardEHContinuationCount", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, - GuardEHContinuationCount), - 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, - {GuardXFGCheckFunctionPointer, "GuardXFGCheckFunctionPointer", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, - GuardXFGCheckFunctionPointer), - 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, - {GuardXFGDispatchFunctionPointer, "GuardXFGDispatchFunctionPointer", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, - GuardXFGDispatchFunctionPointer), - 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, - {GuardXFGTableDispatchFunctionPointer, - "GuardXFGTableDispatchFunctionPointer", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, - GuardXFGTableDispatchFunctionPointer), - 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, - {CastGuardOsDeterminedFailureMode, "CastGuardOsDeterminedFailureMode", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, - CastGuardOsDeterminedFailureMode), - 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, - {GuardMemcpyFunctionPointer, "GuardMemcpyFunctionPointer", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, - GuardMemcpyFunctionPointer), + {GuardXFGTableDispatchFunctionPointer, "GuardXFGTableDispatchFunctionPointer", + offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, GuardXFGTableDispatchFunctionPointer), 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, + {CastGuardOsDeterminedFailureMode, "CastGuardOsDeterminedFailureMode", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, CastGuardOsDeterminedFailureMode), 4, "DWORD", FW_DEF::VAL_TYPE_ADDRESS}, + {GuardMemcpyFunctionPointer, "GuardMemcpyFunctionPointer", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32, GuardMemcpyFunctionPointer), 4, "DWORD", + FW_DEF::VAL_TYPE_ADDRESS}, }; const FW_DEF::HEADER_RECORD records64[] = { - {Size, "Size", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, Size), 4, - "DWORD", FW_DEF::VAL_TYPE_SIZE}, - {TimeDateStamp, "TimeDateStamp", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, TimeDateStamp), 4, - "DWORD", FW_DEF::VAL_TYPE_UNIXTIME}, - {MajorVersion, "MajorVersion", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, MajorVersion), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {MinorVersion, "MinorVersion", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, MinorVersion), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {GlobalFlagsClear, "GlobalFlagsClear", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, GlobalFlagsClear), 4, - "DWORD", FW_DEF::VAL_TYPE_DATA}, - {GlobalFlagsSet, "GlobalFlagsSet", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, GlobalFlagsSet), 4, + {Size, "Size", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, Size), 4, "DWORD", FW_DEF::VAL_TYPE_SIZE}, + {TimeDateStamp, "TimeDateStamp", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, TimeDateStamp), 4, "DWORD", FW_DEF::VAL_TYPE_UNIXTIME}, + {MajorVersion, "MajorVersion", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, MajorVersion), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {MinorVersion, "MinorVersion", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, MinorVersion), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {GlobalFlagsClear, "GlobalFlagsClear", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, GlobalFlagsClear), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {GlobalFlagsSet, "GlobalFlagsSet", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, GlobalFlagsSet), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {CriticalSectionDefaultTimeout, "CriticalSectionDefaultTimeout", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, CriticalSectionDefaultTimeout), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {CriticalSectionDefaultTimeout, "CriticalSectionDefaultTimeout", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, - CriticalSectionDefaultTimeout), - 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {DeCommitFreeBlockThreshold, "DeCommitFreeBlockThreshold", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, - DeCommitFreeBlockThreshold), - 8, "ULONGLONG", FW_DEF::VAL_TYPE_DATA}, - {DeCommitTotalFreeThreshold, "DeCommitTotalFreeThreshold", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, - DeCommitTotalFreeThreshold), - 8, "ULONGLONG", FW_DEF::VAL_TYPE_DATA}, - {LockPrefixTable, "LockPrefixTable", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, LockPrefixTable), 8, - "ULONGLONG", FW_DEF::VAL_TYPE_DATA}, - {MaximumAllocationSize, "MaximumAllocationSize", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, MaximumAllocationSize), - 8, "ULONGLONG", FW_DEF::VAL_TYPE_DATA}, - {VirtualMemoryThreshold, "VirtualMemoryThreshold", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, VirtualMemoryThreshold), - 8, "ULONGLONG", FW_DEF::VAL_TYPE_DATA}, - {ProcessAffinityMask, "ProcessAffinityMask", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, ProcessAffinityMask), 8, - "ULONGLONG", FW_DEF::VAL_TYPE_DATA}, - {CSDVersion, "CSDVersion", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, CSDVersion), 2, "WORD", + {DeCommitFreeBlockThreshold, "DeCommitFreeBlockThreshold", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, DeCommitFreeBlockThreshold), 8, "ULONGLONG", FW_DEF::VAL_TYPE_DATA}, - {DependentLoadFlags, "DependentLoadFlags", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, DependentLoadFlags), 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {VirtualMemoryThreshold, "EditList", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, EditList), 8, + {DeCommitTotalFreeThreshold, "DeCommitTotalFreeThreshold", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, DeCommitTotalFreeThreshold), 8, "ULONGLONG", + FW_DEF::VAL_TYPE_DATA}, + {LockPrefixTable, "LockPrefixTable", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, LockPrefixTable), 8, "ULONGLONG", FW_DEF::VAL_TYPE_DATA}, + {MaximumAllocationSize, "MaximumAllocationSize", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, MaximumAllocationSize), 8, "ULONGLONG", + FW_DEF::VAL_TYPE_DATA}, + {VirtualMemoryThreshold, "VirtualMemoryThreshold", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, VirtualMemoryThreshold), 8, "ULONGLONG", + FW_DEF::VAL_TYPE_DATA}, + {ProcessAffinityMask, "ProcessAffinityMask", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, ProcessAffinityMask), 8, "ULONGLONG", + FW_DEF::VAL_TYPE_DATA}, + {CSDVersion, "CSDVersion", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, CSDVersion), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {DependentLoadFlags, "DependentLoadFlags", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, DependentLoadFlags), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {VirtualMemoryThreshold, "EditList", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, EditList), 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, + {VirtualMemoryThreshold, "SecurityCookie", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, SecurityCookie), 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, + {VirtualMemoryThreshold, "SEHandlerTable", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, SEHandlerTable), 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, + {VirtualMemoryThreshold, "SEHandlerCount", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, SEHandlerCount), 8, "ULONGLONG", FW_DEF::VAL_TYPE_DATA}, + {GuardCFCheckFunctionPointer, "GuardCFCheckFunctionPointer", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, GuardCFCheckFunctionPointer), 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, - {VirtualMemoryThreshold, "SecurityCookie", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, SecurityCookie), 8, + {GuardCFDispatchFunctionPointer, "GuardCFDispatchFunctionPointer", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, GuardCFDispatchFunctionPointer), 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, - {VirtualMemoryThreshold, "SEHandlerTable", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, SEHandlerTable), 8, + {GuardCFFunctionTable, "GuardCFFunctionTable", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, GuardCFFunctionTable), 8, "ULONGLONG", + FW_DEF::VAL_TYPE_ADDRESS}, + {GuardCFFunctionCount, "GuardCFFunctionCount", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, GuardCFFunctionCount), 8, "ULONGLONG", + FW_DEF::VAL_TYPE_DATA}, + {GuardFlags, "GuardFlags", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, GuardFlags), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {CodeIntegrity_Flags, "CodeIntegrity_Flags", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, CodeIntegrity) + 0, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {CodeIntegrity_Catalog, "CodeIntegrity_Catalog", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, CodeIntegrity) + 2, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {CodeIntegrity_CatalogOffset, "CodeIntegrity_CatalogOffset", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, CodeIntegrity) + 4, 4, "DWORD", + FW_DEF::VAL_TYPE_OFFSET}, + {CodeIntegrity_Reserved, "CodeIntegrity_Reserved", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, CodeIntegrity) + 8, 4, "DWORD", + FW_DEF::VAL_TYPE_DATA}, + {GuardAddressTakenIatEntryTable, "GuardAddressTakenIatEntryTable", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, GuardAddressTakenIatEntryTable), 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, - {VirtualMemoryThreshold, "SEHandlerCount", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, SEHandlerCount), 8, + {GuardAddressTakenIatEntryCount, "GuardAddressTakenIatEntryCount", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, GuardAddressTakenIatEntryCount), 8, "ULONGLONG", FW_DEF::VAL_TYPE_DATA}, - {GuardCFCheckFunctionPointer, "GuardCFCheckFunctionPointer", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, - GuardCFCheckFunctionPointer), - 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, - {GuardCFDispatchFunctionPointer, "GuardCFDispatchFunctionPointer", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, - GuardCFDispatchFunctionPointer), - 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, - {GuardCFFunctionTable, "GuardCFFunctionTable", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, GuardCFFunctionTable), - 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, - {GuardCFFunctionCount, "GuardCFFunctionCount", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, GuardCFFunctionCount), - 8, "ULONGLONG", FW_DEF::VAL_TYPE_DATA}, - {GuardFlags, "GuardFlags", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, GuardFlags), 4, "DWORD", + {GuardLongJumpTargetTable, "GuardLongJumpTargetTable", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, GuardLongJumpTargetTable), 8, "ULONGLONG", + FW_DEF::VAL_TYPE_ADDRESS}, + {GuardLongJumpTargetCount, "GuardLongJumpTargetCount", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, GuardLongJumpTargetCount), 8, "ULONGLONG", FW_DEF::VAL_TYPE_DATA}, - {CodeIntegrity_Flags, "CodeIntegrity_Flags", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, CodeIntegrity) + 0, 2, - "WORD", FW_DEF::VAL_TYPE_DATA}, - {CodeIntegrity_Catalog, "CodeIntegrity_Catalog", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, CodeIntegrity) + 2, 2, + {DynamicValueRelocTable, "DynamicValueRelocTable", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, DynamicValueRelocTable), 8, "ULONGLONG", + FW_DEF::VAL_TYPE_ADDRESS}, + {CHPEMetadataPointer, "CHPEMetadataPointer", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, CHPEMetadataPointer), 8, "ULONGLONG", + FW_DEF::VAL_TYPE_ADDRESS}, + {GuardRFFailureRoutine, "GuardRFFailureRoutine", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, GuardRFFailureRoutine), 8, "ULONGLONG", + FW_DEF::VAL_TYPE_ADDRESS}, + {GuardRFFailureRoutineFunctionPointer, "GuardRFFailureRoutineFunctionPointer", + offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, GuardRFFailureRoutineFunctionPointer), 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, + {DynamicValueRelocTableOffset, "DynamicValueRelocTableOffset", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, DynamicValueRelocTableOffset), 4, "DWORD", + FW_DEF::VAL_TYPE_OFFSET}, + {DynamicValueRelocTableSection, "DynamicValueRelocTableSection", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, DynamicValueRelocTableSection), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, - {CodeIntegrity_CatalogOffset, "CodeIntegrity_CatalogOffset", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, CodeIntegrity) + 4, 4, - "DWORD", FW_DEF::VAL_TYPE_OFFSET}, - {CodeIntegrity_Reserved, "CodeIntegrity_Reserved", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, CodeIntegrity) + 8, 4, - "DWORD", FW_DEF::VAL_TYPE_DATA}, - {GuardAddressTakenIatEntryTable, "GuardAddressTakenIatEntryTable", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, - GuardAddressTakenIatEntryTable), - 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, - {GuardAddressTakenIatEntryCount, "GuardAddressTakenIatEntryCount", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, - GuardAddressTakenIatEntryCount), - 8, "ULONGLONG", FW_DEF::VAL_TYPE_DATA}, - {GuardLongJumpTargetTable, "GuardLongJumpTargetTable", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, - GuardLongJumpTargetTable), - 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, - {GuardLongJumpTargetCount, "GuardLongJumpTargetCount", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, - GuardLongJumpTargetCount), - 8, "ULONGLONG", FW_DEF::VAL_TYPE_DATA}, - {DynamicValueRelocTable, "DynamicValueRelocTable", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, DynamicValueRelocTable), - 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, - {CHPEMetadataPointer, "CHPEMetadataPointer", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, CHPEMetadataPointer), 8, + {Reserved2, "Reserved2", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, Reserved2), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {GuardRFVerifyStackPointerFunctionPointer, "GuardRFVerifyStackPointerFunctionPointer", + offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, GuardRFVerifyStackPointerFunctionPointer), 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, + {HotPatchTableOffset, "HotPatchTableOffset", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, HotPatchTableOffset), 4, "DWORD", FW_DEF::VAL_TYPE_OFFSET}, + {Reserved3, "Reserved3", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, Reserved3), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {EnclaveConfigurationPointer, "EnclaveConfigurationPointer", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, EnclaveConfigurationPointer), 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, - {GuardRFFailureRoutine, "GuardRFFailureRoutine", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, GuardRFFailureRoutine), - 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, - {GuardRFFailureRoutineFunctionPointer, - "GuardRFFailureRoutineFunctionPointer", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, - GuardRFFailureRoutineFunctionPointer), - 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, - {DynamicValueRelocTableOffset, "DynamicValueRelocTableOffset", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, - DynamicValueRelocTableOffset), - 4, "DWORD", FW_DEF::VAL_TYPE_OFFSET}, - {DynamicValueRelocTableSection, "DynamicValueRelocTableSection", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, - DynamicValueRelocTableSection), - 2, "WORD", FW_DEF::VAL_TYPE_DATA}, - {Reserved2, "Reserved2", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, Reserved2), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {GuardRFVerifyStackPointerFunctionPointer, - "GuardRFVerifyStackPointerFunctionPointer", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, - GuardRFVerifyStackPointerFunctionPointer), - 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, - {HotPatchTableOffset, "HotPatchTableOffset", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, HotPatchTableOffset), 4, - "DWORD", FW_DEF::VAL_TYPE_OFFSET}, - {Reserved3, "Reserved3", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, Reserved3), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {EnclaveConfigurationPointer, "EnclaveConfigurationPointer", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, - EnclaveConfigurationPointer), - 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, - {VolatileMetadataPointer, "VolatileMetadataPointer", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, - VolatileMetadataPointer), - 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, - {GuardEHContinuationTable, "GuardEHContinuationTable", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, - GuardEHContinuationTable), - 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, - {GuardEHContinuationCount, "GuardEHContinuationCount", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, - GuardEHContinuationCount), - 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, - {GuardXFGCheckFunctionPointer, "GuardXFGCheckFunctionPointer", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, - GuardXFGCheckFunctionPointer), - 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, - {GuardXFGDispatchFunctionPointer, "GuardXFGDispatchFunctionPointer", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, - GuardXFGDispatchFunctionPointer), - 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, - {GuardXFGTableDispatchFunctionPointer, - "GuardXFGTableDispatchFunctionPointer", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, - GuardXFGTableDispatchFunctionPointer), - 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, - {CastGuardOsDeterminedFailureMode, "CastGuardOsDeterminedFailureMode", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, - CastGuardOsDeterminedFailureMode), - 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, - {GuardMemcpyFunctionPointer, "GuardMemcpyFunctionPointer", - offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, - GuardMemcpyFunctionPointer), + {VolatileMetadataPointer, "VolatileMetadataPointer", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, VolatileMetadataPointer), 8, "ULONGLONG", + FW_DEF::VAL_TYPE_ADDRESS}, + {GuardEHContinuationTable, "GuardEHContinuationTable", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, GuardEHContinuationTable), 8, "ULONGLONG", + FW_DEF::VAL_TYPE_ADDRESS}, + {GuardEHContinuationCount, "GuardEHContinuationCount", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, GuardEHContinuationCount), 8, "ULONGLONG", + FW_DEF::VAL_TYPE_ADDRESS}, + {GuardXFGCheckFunctionPointer, "GuardXFGCheckFunctionPointer", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, GuardXFGCheckFunctionPointer), 8, + "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, + {GuardXFGDispatchFunctionPointer, "GuardXFGDispatchFunctionPointer", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, GuardXFGDispatchFunctionPointer), 8, + "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, + {GuardXFGTableDispatchFunctionPointer, "GuardXFGTableDispatchFunctionPointer", + offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, GuardXFGTableDispatchFunctionPointer), 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, + {CastGuardOsDeterminedFailureMode, "CastGuardOsDeterminedFailureMode", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, CastGuardOsDeterminedFailureMode), 8, "ULONGLONG", FW_DEF::VAL_TYPE_ADDRESS}, + {GuardMemcpyFunctionPointer, "GuardMemcpyFunctionPointer", offsetof(XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64, GuardMemcpyFunctionPointer), 8, "ULONGLONG", + FW_DEF::VAL_TYPE_ADDRESS}, }; } // namespace N_IMAGE_LOADCONFIG namespace N_IMAGE_DATA_DIRECTORY { const FW_DEF::HEADER_RECORD records[] = { - {Address, QObject::tr("Address"), 0, 4, "DWORD", - FW_DEF::VAL_TYPE_RELADDRESS}, + {Address, QObject::tr("Address"), 0, 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, {Size, QObject::tr("Size"), 4, 4, "DWORD", FW_DEF::VAL_TYPE_SIZE}, }; } namespace N_IMAGE_SECTION_HEADER { const FW_DEF::HEADER_RECORD records[] = { - {Name, QObject::tr("Name"), offsetof(XPE_DEF::IMAGE_SECTION_HEADER, Name), - 8, "BYTE[8]", FW_DEF::VAL_TYPE_TEXT}, - {VirtualSize, "VirtualSize", - offsetof(XPE_DEF::IMAGE_SECTION_HEADER, Misc.VirtualSize), 4, "DWORD", - FW_DEF::VAL_TYPE_SIZE}, - {VirtualAddress, "VirtualAddress", - offsetof(XPE_DEF::IMAGE_SECTION_HEADER, VirtualAddress), 4, "DWORD", - FW_DEF::VAL_TYPE_RELADDRESS}, - {SizeOfRawData, "SizeOfRawData", - offsetof(XPE_DEF::IMAGE_SECTION_HEADER, SizeOfRawData), 4, "DWORD", - FW_DEF::VAL_TYPE_SIZE}, - {PointerToRawData, "PointerToRawData", - offsetof(XPE_DEF::IMAGE_SECTION_HEADER, PointerToRawData), 4, "DWORD", - FW_DEF::VAL_TYPE_OFFSET}, - {PointerToRelocations, "PointerToRelocations", - offsetof(XPE_DEF::IMAGE_SECTION_HEADER, PointerToRelocations), 4, "DWORD", - FW_DEF::VAL_TYPE_OFFSET}, - {PointerToLinenumbers, "PointerToLinenumbers", - offsetof(XPE_DEF::IMAGE_SECTION_HEADER, PointerToLinenumbers), 4, "DWORD", - FW_DEF::VAL_TYPE_OFFSET}, - {NumberOfRelocations, "NumberOfRelocations", - offsetof(XPE_DEF::IMAGE_SECTION_HEADER, NumberOfRelocations), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {NumberOfLinenumbers, "NumberOfLinenumbers", - offsetof(XPE_DEF::IMAGE_SECTION_HEADER, NumberOfLinenumbers), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {Characteristics, "Characteristics", - offsetof(XPE_DEF::IMAGE_SECTION_HEADER, Characteristics), 4, "DWORD", - FW_DEF::VAL_TYPE_FLAGS}, + {Name, QObject::tr("Name"), offsetof(XPE_DEF::IMAGE_SECTION_HEADER, Name), 8, "BYTE[8]", FW_DEF::VAL_TYPE_TEXT}, + {VirtualSize, "VirtualSize", offsetof(XPE_DEF::IMAGE_SECTION_HEADER, Misc.VirtualSize), 4, "DWORD", FW_DEF::VAL_TYPE_SIZE}, + {VirtualAddress, "VirtualAddress", offsetof(XPE_DEF::IMAGE_SECTION_HEADER, VirtualAddress), 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {SizeOfRawData, "SizeOfRawData", offsetof(XPE_DEF::IMAGE_SECTION_HEADER, SizeOfRawData), 4, "DWORD", FW_DEF::VAL_TYPE_SIZE}, + {PointerToRawData, "PointerToRawData", offsetof(XPE_DEF::IMAGE_SECTION_HEADER, PointerToRawData), 4, "DWORD", FW_DEF::VAL_TYPE_OFFSET}, + {PointerToRelocations, "PointerToRelocations", offsetof(XPE_DEF::IMAGE_SECTION_HEADER, PointerToRelocations), 4, "DWORD", FW_DEF::VAL_TYPE_OFFSET}, + {PointerToLinenumbers, "PointerToLinenumbers", offsetof(XPE_DEF::IMAGE_SECTION_HEADER, PointerToLinenumbers), 4, "DWORD", FW_DEF::VAL_TYPE_OFFSET}, + {NumberOfRelocations, "NumberOfRelocations", offsetof(XPE_DEF::IMAGE_SECTION_HEADER, NumberOfRelocations), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {NumberOfLinenumbers, "NumberOfLinenumbers", offsetof(XPE_DEF::IMAGE_SECTION_HEADER, NumberOfLinenumbers), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {Characteristics, "Characteristics", offsetof(XPE_DEF::IMAGE_SECTION_HEADER, Characteristics), 4, "DWORD", FW_DEF::VAL_TYPE_FLAGS}, {Characteristics, "", -1, 0, "", FW_DEF::VAL_TYPE_UNKNOWN}}; } @@ -761,239 +363,135 @@ const FW_DEF::HEADER_RECORD records[] = { namespace N_IMAGE_EXPORT { const FW_DEF::HEADER_RECORD records[] = { - {Characteristics, "Characteristics", - offsetof(XPE_DEF::IMAGE_EXPORT_DIRECTORY, Characteristics), 4, "DWORD", - FW_DEF::VAL_TYPE_FLAGS}, - {TimeDateStamp, "TimeDateStamp", - offsetof(XPE_DEF::IMAGE_EXPORT_DIRECTORY, TimeDateStamp), 4, "DWORD", - FW_DEF::VAL_TYPE_UNIXTIME}, - {MajorVersion, "MajorVersion", - offsetof(XPE_DEF::IMAGE_EXPORT_DIRECTORY, MajorVersion), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {MinorVersion, "MinorVersion", - offsetof(XPE_DEF::IMAGE_EXPORT_DIRECTORY, MinorVersion), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {Name, "Name", offsetof(XPE_DEF::IMAGE_EXPORT_DIRECTORY, Name), 4, "DWORD", - FW_DEF::VAL_TYPE_RELADDRESS}, - {Base, "Base", offsetof(XPE_DEF::IMAGE_EXPORT_DIRECTORY, Base), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {NumberOfFunctions, "NumberOfFunctions", - offsetof(XPE_DEF::IMAGE_EXPORT_DIRECTORY, NumberOfFunctions), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {NumberOfNames, "NumberOfNames", - offsetof(XPE_DEF::IMAGE_EXPORT_DIRECTORY, NumberOfNames), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {AddressOfFunctions, "AddressOfFunctions", - offsetof(XPE_DEF::IMAGE_EXPORT_DIRECTORY, AddressOfFunctions), 4, "DWORD", - FW_DEF::VAL_TYPE_RELADDRESS}, - {AddressOfNames, "AddressOfNames", - offsetof(XPE_DEF::IMAGE_EXPORT_DIRECTORY, AddressOfNames), 4, "DWORD", - FW_DEF::VAL_TYPE_RELADDRESS}, - {AddressOfNameOrdinals, "AddressOfNameOrdinals", - offsetof(XPE_DEF::IMAGE_EXPORT_DIRECTORY, AddressOfNameOrdinals), 4, - "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}}; + {Characteristics, "Characteristics", offsetof(XPE_DEF::IMAGE_EXPORT_DIRECTORY, Characteristics), 4, "DWORD", FW_DEF::VAL_TYPE_FLAGS}, + {TimeDateStamp, "TimeDateStamp", offsetof(XPE_DEF::IMAGE_EXPORT_DIRECTORY, TimeDateStamp), 4, "DWORD", FW_DEF::VAL_TYPE_UNIXTIME}, + {MajorVersion, "MajorVersion", offsetof(XPE_DEF::IMAGE_EXPORT_DIRECTORY, MajorVersion), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {MinorVersion, "MinorVersion", offsetof(XPE_DEF::IMAGE_EXPORT_DIRECTORY, MinorVersion), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {Name, "Name", offsetof(XPE_DEF::IMAGE_EXPORT_DIRECTORY, Name), 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {Base, "Base", offsetof(XPE_DEF::IMAGE_EXPORT_DIRECTORY, Base), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {NumberOfFunctions, "NumberOfFunctions", offsetof(XPE_DEF::IMAGE_EXPORT_DIRECTORY, NumberOfFunctions), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {NumberOfNames, "NumberOfNames", offsetof(XPE_DEF::IMAGE_EXPORT_DIRECTORY, NumberOfNames), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {AddressOfFunctions, "AddressOfFunctions", offsetof(XPE_DEF::IMAGE_EXPORT_DIRECTORY, AddressOfFunctions), 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {AddressOfNames, "AddressOfNames", offsetof(XPE_DEF::IMAGE_EXPORT_DIRECTORY, AddressOfNames), 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {AddressOfNameOrdinals, "AddressOfNameOrdinals", offsetof(XPE_DEF::IMAGE_EXPORT_DIRECTORY, AddressOfNameOrdinals), 4, "DWORD", + FW_DEF::VAL_TYPE_RELADDRESS}}; } namespace N_IMAGE_EXPORT_FUNCTION { -const FW_DEF::HEADER_RECORD records[] = { - {Ordinal, "Ordinal", 0, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, - {RVA, "RVA", 0, 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, - {Name, QObject::tr("Name"), 0, 4, "SZCHAR", FW_DEF::VAL_TYPE_RELADDRESS}}; +const FW_DEF::HEADER_RECORD records[] = {{Ordinal, "Ordinal", 0, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {RVA, "RVA", 0, 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {Name, QObject::tr("Name"), 0, 4, "SZCHAR", FW_DEF::VAL_TYPE_RELADDRESS}}; } namespace N_IMAGE_IMPORT { const FW_DEF::HEADER_RECORD records[] = { - {OriginalFirstThunk, "OriginalFirstThunk", - offsetof(XPE_DEF::IMAGE_IMPORT_DESCRIPTOR, OriginalFirstThunk), 4, "DWORD", - FW_DEF::VAL_TYPE_RELADDRESS}, - {TimeDateStamp, "TimeDateStamp", - offsetof(XPE_DEF::IMAGE_IMPORT_DESCRIPTOR, TimeDateStamp), 4, "DWORD", - FW_DEF::VAL_TYPE_UNIXTIME}, - {ForwarderChain, "ForwarderChain", - offsetof(XPE_DEF::IMAGE_IMPORT_DESCRIPTOR, ForwarderChain), 4, "DWORD", - FW_DEF::VAL_TYPE_RELADDRESS}, - {Name, QObject::tr("Name"), - offsetof(XPE_DEF::IMAGE_IMPORT_DESCRIPTOR, Name), 4, "DWORD", - FW_DEF::VAL_TYPE_RELADDRESS}, - {FirstThunk, "FirstThunk", - offsetof(XPE_DEF::IMAGE_IMPORT_DESCRIPTOR, FirstThunk), 4, "DWORD", - FW_DEF::VAL_TYPE_RELADDRESS}}; + {OriginalFirstThunk, "OriginalFirstThunk", offsetof(XPE_DEF::IMAGE_IMPORT_DESCRIPTOR, OriginalFirstThunk), 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {TimeDateStamp, "TimeDateStamp", offsetof(XPE_DEF::IMAGE_IMPORT_DESCRIPTOR, TimeDateStamp), 4, "DWORD", FW_DEF::VAL_TYPE_UNIXTIME}, + {ForwarderChain, "ForwarderChain", offsetof(XPE_DEF::IMAGE_IMPORT_DESCRIPTOR, ForwarderChain), 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {Name, QObject::tr("Name"), offsetof(XPE_DEF::IMAGE_IMPORT_DESCRIPTOR, Name), 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {FirstThunk, "FirstThunk", offsetof(XPE_DEF::IMAGE_IMPORT_DESCRIPTOR, FirstThunk), 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}}; } namespace N_IMAGE_IMPORT_FUNCTION { -const FW_DEF::HEADER_RECORD records32[] = { - {Thunk, "Thunk", 0, 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, - {Ordinal, "Ordinal", 0, 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {Hint, "Hint", 0, 2, "WORD", FW_DEF::VAL_TYPE_DATA}}; -const FW_DEF::HEADER_RECORD records64[] = { - {Thunk, "Thunk", 0, 8, "QWORD", FW_DEF::VAL_TYPE_RELADDRESS}, - {Ordinal, "Ordinal", 0, 8, "QWORD", FW_DEF::VAL_TYPE_DATA}, - {Hint, "Hint", 0, 2, "WORD", FW_DEF::VAL_TYPE_DATA}}; +const FW_DEF::HEADER_RECORD records32[] = {{Thunk, "Thunk", 0, 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {Ordinal, "Ordinal", 0, 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {Hint, "Hint", 0, 2, "WORD", FW_DEF::VAL_TYPE_DATA}}; +const FW_DEF::HEADER_RECORD records64[] = {{Thunk, "Thunk", 0, 8, "QWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {Ordinal, "Ordinal", 0, 8, "QWORD", FW_DEF::VAL_TYPE_DATA}, + {Hint, "Hint", 0, 2, "WORD", FW_DEF::VAL_TYPE_DATA}}; } // namespace N_IMAGE_IMPORT_FUNCTION namespace N_IMAGE_DELAYIMPORT_FUNCTION { -const FW_DEF::HEADER_RECORD records32[] = { - {AddressThunk, "AddressThunk", 0, 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, - {BoundThunk, "BoundThunk", 0, 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, - {NameThunk, "NameThunk", 0, 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, - {Ordinal, "Ordinal", 0, 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {Hint, "Hint", 0, 2, "WORD", FW_DEF::VAL_TYPE_DATA}}; -const FW_DEF::HEADER_RECORD records64[] = { - {AddressThunk, "AddressThunk", 0, 8, "QWORD", FW_DEF::VAL_TYPE_RELADDRESS}, - {BoundThunk, "BoundThunk", 0, 8, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, - {NameThunk, "NameThunk", 0, 8, "QWORD", FW_DEF::VAL_TYPE_RELADDRESS}, - {Ordinal, "Ordinal", 0, 8, "QWORD", FW_DEF::VAL_TYPE_DATA}, - {Hint, "Hint", 0, 2, "WORD", FW_DEF::VAL_TYPE_DATA}}; +const FW_DEF::HEADER_RECORD records32[] = {{AddressThunk, "AddressThunk", 0, 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {BoundThunk, "BoundThunk", 0, 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {NameThunk, "NameThunk", 0, 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {Ordinal, "Ordinal", 0, 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {Hint, "Hint", 0, 2, "WORD", FW_DEF::VAL_TYPE_DATA}}; +const FW_DEF::HEADER_RECORD records64[] = {{AddressThunk, "AddressThunk", 0, 8, "QWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {BoundThunk, "BoundThunk", 0, 8, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {NameThunk, "NameThunk", 0, 8, "QWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {Ordinal, "Ordinal", 0, 8, "QWORD", FW_DEF::VAL_TYPE_DATA}, + {Hint, "Hint", 0, 2, "WORD", FW_DEF::VAL_TYPE_DATA}}; } // namespace N_IMAGE_DELAYIMPORT_FUNCTION namespace N_IMAGE_BOUNDIMPORT { const FW_DEF::HEADER_RECORD records[] = { {TimeDateStamp, "TimeDateStamp", 0, 4, "DWORD", FW_DEF::VAL_TYPE_UNIXTIME}, - {OffsetModuleName, "OffsetModuleName", 4, 2, "WORD", - FW_DEF::VAL_TYPE_OFFSET}, - {NumberOfModuleForwarderRefs, "NumberOfModuleForwarderRefs", 6, 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, + {OffsetModuleName, "OffsetModuleName", 4, 2, "WORD", FW_DEF::VAL_TYPE_OFFSET}, + {NumberOfModuleForwarderRefs, "NumberOfModuleForwarderRefs", 6, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, }; } namespace N_IMAGE_RELOCS { const FW_DEF::HEADER_RECORD records[] = { - {VirtualAddress, "VirtualAddress", 0, 4, "DWORD", - FW_DEF::VAL_TYPE_RELADDRESS}, + {VirtualAddress, "VirtualAddress", 0, 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, {SizeOfBlock, "SizeOfBlock", 4, 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, }; } namespace N_IMAGE_DEBUG { const FW_DEF::HEADER_RECORD records[] = { - {Characteristics, "Characteristics", - offsetof(XPE_DEF::S_IMAGE_DEBUG_DIRECTORY, Characteristics), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {TimeDateStamp, "TimeDateStamp", - offsetof(XPE_DEF::S_IMAGE_DEBUG_DIRECTORY, TimeDateStamp), 4, "DWORD", - FW_DEF::VAL_TYPE_UNIXTIME}, - {MajorVersion, "MajorVersion", - offsetof(XPE_DEF::S_IMAGE_DEBUG_DIRECTORY, MajorVersion), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {MinorVersion, "MinorVersion", - offsetof(XPE_DEF::S_IMAGE_DEBUG_DIRECTORY, MinorVersion), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {Type, "Type", offsetof(XPE_DEF::S_IMAGE_DEBUG_DIRECTORY, Type), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {SizeOfData, "SizeOfData", - offsetof(XPE_DEF::S_IMAGE_DEBUG_DIRECTORY, SizeOfData), 4, "DWORD", - FW_DEF::VAL_TYPE_SIZE}, - {AddressOfRawData, "AddressOfRawData", - offsetof(XPE_DEF::S_IMAGE_DEBUG_DIRECTORY, AddressOfRawData), 4, "DWORD", - FW_DEF::VAL_TYPE_RELADDRESS}, - {PointerToRawData, "PointerToRawData", - offsetof(XPE_DEF::S_IMAGE_DEBUG_DIRECTORY, PointerToRawData), 4, "DWORD", - FW_DEF::VAL_TYPE_OFFSET}, + {Characteristics, "Characteristics", offsetof(XPE_DEF::S_IMAGE_DEBUG_DIRECTORY, Characteristics), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {TimeDateStamp, "TimeDateStamp", offsetof(XPE_DEF::S_IMAGE_DEBUG_DIRECTORY, TimeDateStamp), 4, "DWORD", FW_DEF::VAL_TYPE_UNIXTIME}, + {MajorVersion, "MajorVersion", offsetof(XPE_DEF::S_IMAGE_DEBUG_DIRECTORY, MajorVersion), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {MinorVersion, "MinorVersion", offsetof(XPE_DEF::S_IMAGE_DEBUG_DIRECTORY, MinorVersion), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {Type, "Type", offsetof(XPE_DEF::S_IMAGE_DEBUG_DIRECTORY, Type), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {SizeOfData, "SizeOfData", offsetof(XPE_DEF::S_IMAGE_DEBUG_DIRECTORY, SizeOfData), 4, "DWORD", FW_DEF::VAL_TYPE_SIZE}, + {AddressOfRawData, "AddressOfRawData", offsetof(XPE_DEF::S_IMAGE_DEBUG_DIRECTORY, AddressOfRawData), 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {PointerToRawData, "PointerToRawData", offsetof(XPE_DEF::S_IMAGE_DEBUG_DIRECTORY, PointerToRawData), 4, "DWORD", FW_DEF::VAL_TYPE_OFFSET}, }; } namespace N_IMAGE_DELAYIMPORT { const FW_DEF::HEADER_RECORD records[] = { - {AllAttributes, "AllAttributes", - offsetof(XPE_DEF::S_IMAGE_DELAYLOAD_DESCRIPTOR, AllAttributes), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {DllNameRVA, "DllNameRVA", - offsetof(XPE_DEF::S_IMAGE_DELAYLOAD_DESCRIPTOR, DllNameRVA), 4, "DWORD", + {AllAttributes, "AllAttributes", offsetof(XPE_DEF::S_IMAGE_DELAYLOAD_DESCRIPTOR, AllAttributes), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {DllNameRVA, "DllNameRVA", offsetof(XPE_DEF::S_IMAGE_DELAYLOAD_DESCRIPTOR, DllNameRVA), 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {ModuleHandleRVA, "ModuleHandleRVA", offsetof(XPE_DEF::S_IMAGE_DELAYLOAD_DESCRIPTOR, ModuleHandleRVA), 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {ImportAddressTableRVA, "ImportAddressTableRVA", offsetof(XPE_DEF::S_IMAGE_DELAYLOAD_DESCRIPTOR, ImportAddressTableRVA), 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, - {ModuleHandleRVA, "ModuleHandleRVA", - offsetof(XPE_DEF::S_IMAGE_DELAYLOAD_DESCRIPTOR, ModuleHandleRVA), 4, - "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, - {ImportAddressTableRVA, "ImportAddressTableRVA", - offsetof(XPE_DEF::S_IMAGE_DELAYLOAD_DESCRIPTOR, ImportAddressTableRVA), 4, - "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, - {ImportNameTableRVA, "ImportNameTableRVA", - offsetof(XPE_DEF::S_IMAGE_DELAYLOAD_DESCRIPTOR, ImportNameTableRVA), 4, - "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, - {BoundImportAddressTableRVA, "BoundImportAddressTableRVA", - offsetof(XPE_DEF::S_IMAGE_DELAYLOAD_DESCRIPTOR, - BoundImportAddressTableRVA), - 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, - {UnloadInformationTableRVA, "UnloadInformationTableRVA", - offsetof(XPE_DEF::S_IMAGE_DELAYLOAD_DESCRIPTOR, UnloadInformationTableRVA), - 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, - {TimeDateStamp, "TimeDateStamp", - offsetof(XPE_DEF::S_IMAGE_DELAYLOAD_DESCRIPTOR, TimeDateStamp), 4, "DWORD", - FW_DEF::VAL_TYPE_UNIXTIME}, + {ImportNameTableRVA, "ImportNameTableRVA", offsetof(XPE_DEF::S_IMAGE_DELAYLOAD_DESCRIPTOR, ImportNameTableRVA), 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {BoundImportAddressTableRVA, "BoundImportAddressTableRVA", offsetof(XPE_DEF::S_IMAGE_DELAYLOAD_DESCRIPTOR, BoundImportAddressTableRVA), 4, "DWORD", + FW_DEF::VAL_TYPE_RELADDRESS}, + {UnloadInformationTableRVA, "UnloadInformationTableRVA", offsetof(XPE_DEF::S_IMAGE_DELAYLOAD_DESCRIPTOR, UnloadInformationTableRVA), 4, "DWORD", + FW_DEF::VAL_TYPE_RELADDRESS}, + {TimeDateStamp, "TimeDateStamp", offsetof(XPE_DEF::S_IMAGE_DELAYLOAD_DESCRIPTOR, TimeDateStamp), 4, "DWORD", FW_DEF::VAL_TYPE_UNIXTIME}, }; } namespace N_IMAGE_EXCEPTIONS { const FW_DEF::HEADER_RECORD records[] = { - {BeginAddress, "BeginAddress", - offsetof(XPE_DEF::S_IMAGE_RUNTIME_FUNCTION_ENTRY, BeginAddress), 4, - "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, - {EndAddress, "EndAddress", - offsetof(XPE_DEF::S_IMAGE_RUNTIME_FUNCTION_ENTRY, EndAddress), 4, "DWORD", - FW_DEF::VAL_TYPE_RELADDRESS}, - {UnwindInfoAddress, "UnwindInfoAddress", - offsetof(XPE_DEF::S_IMAGE_RUNTIME_FUNCTION_ENTRY, UnwindInfoAddress), 4, - "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {BeginAddress, "BeginAddress", offsetof(XPE_DEF::S_IMAGE_RUNTIME_FUNCTION_ENTRY, BeginAddress), 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {EndAddress, "EndAddress", offsetof(XPE_DEF::S_IMAGE_RUNTIME_FUNCTION_ENTRY, EndAddress), 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {UnwindInfoAddress, "UnwindInfoAddress", offsetof(XPE_DEF::S_IMAGE_RUNTIME_FUNCTION_ENTRY, UnwindInfoAddress), 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, }; } namespace N_IMAGE_NETHEADER { const FW_DEF::HEADER_RECORD records[] = { - {cb, "cb", offsetof(XPE_DEF::IMAGE_COR20_HEADER, cb), 4, "DWORD", - FW_DEF::VAL_TYPE_SIZE}, - {MajorRuntimeVersion, "MajorRuntimeVersion", - offsetof(XPE_DEF::IMAGE_COR20_HEADER, MajorRuntimeVersion), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {MinorRuntimeVersion, "MinorRuntimeVersion", - offsetof(XPE_DEF::IMAGE_COR20_HEADER, MinorRuntimeVersion), 2, "WORD", - FW_DEF::VAL_TYPE_DATA}, - {MetaData_Address, "MetaData_Address", - offsetof(XPE_DEF::IMAGE_COR20_HEADER, MetaData.VirtualAddress), 4, "DWORD", + {cb, "cb", offsetof(XPE_DEF::IMAGE_COR20_HEADER, cb), 4, "DWORD", FW_DEF::VAL_TYPE_SIZE}, + {MajorRuntimeVersion, "MajorRuntimeVersion", offsetof(XPE_DEF::IMAGE_COR20_HEADER, MajorRuntimeVersion), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {MinorRuntimeVersion, "MinorRuntimeVersion", offsetof(XPE_DEF::IMAGE_COR20_HEADER, MinorRuntimeVersion), 2, "WORD", FW_DEF::VAL_TYPE_DATA}, + {MetaData_Address, "MetaData_Address", offsetof(XPE_DEF::IMAGE_COR20_HEADER, MetaData.VirtualAddress), 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {MetaData_Size, "MetaData_Size", offsetof(XPE_DEF::IMAGE_COR20_HEADER, MetaData.Size), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {Flags, "Flags", offsetof(XPE_DEF::IMAGE_COR20_HEADER, Flags), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {EntryPoint, "EntryPoint", offsetof(XPE_DEF::IMAGE_COR20_HEADER, EntryPointRVA), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {Resources_Address, "Resources_Address", offsetof(XPE_DEF::IMAGE_COR20_HEADER, Resources.VirtualAddress), 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {Resources_Size, "Resources_Size", offsetof(XPE_DEF::IMAGE_COR20_HEADER, Resources.Size), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {StrongNameSignature_Address, "StrongNameSignature_Address", offsetof(XPE_DEF::IMAGE_COR20_HEADER, StrongNameSignature.VirtualAddress), 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, - {MetaData_Size, "MetaData_Size", - offsetof(XPE_DEF::IMAGE_COR20_HEADER, MetaData.Size), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {Flags, "Flags", offsetof(XPE_DEF::IMAGE_COR20_HEADER, Flags), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {EntryPoint, "EntryPoint", - offsetof(XPE_DEF::IMAGE_COR20_HEADER, EntryPointRVA), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {Resources_Address, "Resources_Address", - offsetof(XPE_DEF::IMAGE_COR20_HEADER, Resources.VirtualAddress), 4, - "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, - {Resources_Size, "Resources_Size", - offsetof(XPE_DEF::IMAGE_COR20_HEADER, Resources.Size), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {StrongNameSignature_Address, "StrongNameSignature_Address", - offsetof(XPE_DEF::IMAGE_COR20_HEADER, StrongNameSignature.VirtualAddress), - 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, - {StrongNameSignature_Size, "StrongNameSignature_Size", - offsetof(XPE_DEF::IMAGE_COR20_HEADER, StrongNameSignature.Size), 4, - "DWORD", FW_DEF::VAL_TYPE_DATA}, - {CodeManagerTable_Address, "CodeManagerTable_Address", - offsetof(XPE_DEF::IMAGE_COR20_HEADER, CodeManagerTable.VirtualAddress), 4, - "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, - {CodeManagerTable_Size, "CodeManagerTable_Size", - offsetof(XPE_DEF::IMAGE_COR20_HEADER, CodeManagerTable.Size), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {VTableFixups_Address, "VTableFixups_Address", - offsetof(XPE_DEF::IMAGE_COR20_HEADER, VTableFixups.VirtualAddress), 4, + {StrongNameSignature_Size, "StrongNameSignature_Size", offsetof(XPE_DEF::IMAGE_COR20_HEADER, StrongNameSignature.Size), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {CodeManagerTable_Address, "CodeManagerTable_Address", offsetof(XPE_DEF::IMAGE_COR20_HEADER, CodeManagerTable.VirtualAddress), 4, "DWORD", + FW_DEF::VAL_TYPE_RELADDRESS}, + {CodeManagerTable_Size, "CodeManagerTable_Size", offsetof(XPE_DEF::IMAGE_COR20_HEADER, CodeManagerTable.Size), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {VTableFixups_Address, "VTableFixups_Address", offsetof(XPE_DEF::IMAGE_COR20_HEADER, VTableFixups.VirtualAddress), 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, + {VTableFixups_Size, "VTableFixups_Size", offsetof(XPE_DEF::IMAGE_COR20_HEADER, VTableFixups.Size), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {ExportAddressTableJumps_Address, "ExportAddressTableJumps_Address", offsetof(XPE_DEF::IMAGE_COR20_HEADER, ExportAddressTableJumps.VirtualAddress), 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, - {VTableFixups_Size, "VTableFixups_Size", - offsetof(XPE_DEF::IMAGE_COR20_HEADER, VTableFixups.Size), 4, "DWORD", + {ExportAddressTableJumps_Size, "ExportAddressTableJumps_Size", offsetof(XPE_DEF::IMAGE_COR20_HEADER, ExportAddressTableJumps.Size), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {ExportAddressTableJumps_Address, "ExportAddressTableJumps_Address", - offsetof(XPE_DEF::IMAGE_COR20_HEADER, - ExportAddressTableJumps.VirtualAddress), - 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, - {ExportAddressTableJumps_Size, "ExportAddressTableJumps_Size", - offsetof(XPE_DEF::IMAGE_COR20_HEADER, ExportAddressTableJumps.Size), 4, - "DWORD", FW_DEF::VAL_TYPE_DATA}, - {ManagedNativeHeader_Address, "ManagedNativeHeader_Address", - offsetof(XPE_DEF::IMAGE_COR20_HEADER, ManagedNativeHeader.VirtualAddress), - 4, "DWORD", FW_DEF::VAL_TYPE_RELADDRESS}, - {ManagedNativeHeader_Size, "ManagedNativeHeader_Size", - offsetof(XPE_DEF::IMAGE_COR20_HEADER, ManagedNativeHeader.Size), 4, - "DWORD", FW_DEF::VAL_TYPE_DATA}, + {ManagedNativeHeader_Address, "ManagedNativeHeader_Address", offsetof(XPE_DEF::IMAGE_COR20_HEADER, ManagedNativeHeader.VirtualAddress), 4, "DWORD", + FW_DEF::VAL_TYPE_RELADDRESS}, + {ManagedNativeHeader_Size, "ManagedNativeHeader_Size", offsetof(XPE_DEF::IMAGE_COR20_HEADER, ManagedNativeHeader.Size), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, }; } @@ -1003,8 +501,7 @@ const FW_DEF::HEADER_RECORD records[] = { {MajorVersion, "MajorVersion", 4, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, {MinorVersion, "MinorVersion", 6, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, {Reserved, "Reserved", 8, 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, - {VersionStringLength, "VersionStringLength", 12, 4, "DWORD", - FW_DEF::VAL_TYPE_SIZE}, + {VersionStringLength, "VersionStringLength", 12, 4, "DWORD", FW_DEF::VAL_TYPE_SIZE}, {Version, "Version", 16, 1, "TEXT", FW_DEF::VAL_TYPE_TEXT}, {Flags, "Flags", -1, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, {Streams, "Streams", -1, 2, "WORD", FW_DEF::VAL_TYPE_DATA}, @@ -1013,44 +510,19 @@ const FW_DEF::HEADER_RECORD records[] = { namespace N_IMAGE_RESOURCE_FIXEDFILEINFO { const FW_DEF::HEADER_RECORD records[] = { - {dwSignature, "dwSignature", - offsetof(XPE_DEF::tagVS_FIXEDFILEINFO, dwSignature), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {dwStrucVersion, "dwStrucVersion", - offsetof(XPE_DEF::tagVS_FIXEDFILEINFO, dwStrucVersion), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {dwFileVersionMS, "dwFileVersionMS", - offsetof(XPE_DEF::tagVS_FIXEDFILEINFO, dwFileVersionMS), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {dwFileVersionLS, "dwFileVersionLS", - offsetof(XPE_DEF::tagVS_FIXEDFILEINFO, dwFileVersionLS), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {dwProductVersionMS, "dwProductVersionMS", - offsetof(XPE_DEF::tagVS_FIXEDFILEINFO, dwProductVersionMS), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {dwProductVersionLS, "dwProductVersionLS", - offsetof(XPE_DEF::tagVS_FIXEDFILEINFO, dwProductVersionLS), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {dwFileFlagsMask, "dwFileFlagsMask", - offsetof(XPE_DEF::tagVS_FIXEDFILEINFO, dwFileFlagsMask), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {dwFileFlags, "dwFileFlags", - offsetof(XPE_DEF::tagVS_FIXEDFILEINFO, dwFileFlags), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {dwFileOS, "dwFileOS", offsetof(XPE_DEF::tagVS_FIXEDFILEINFO, dwFileOS), 4, - "DWORD", FW_DEF::VAL_TYPE_DATA}, - {dwFileType, "dwFileType", - offsetof(XPE_DEF::tagVS_FIXEDFILEINFO, dwFileType), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {dwFileSubtype, "dwFileSubtype", - offsetof(XPE_DEF::tagVS_FIXEDFILEINFO, dwFileSubtype), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {dwFileDateMS, "dwFileDateMS", - offsetof(XPE_DEF::tagVS_FIXEDFILEINFO, dwFileDateMS), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, - {dwFileDateLS, "dwFileDateLS", - offsetof(XPE_DEF::tagVS_FIXEDFILEINFO, dwFileDateLS), 4, "DWORD", - FW_DEF::VAL_TYPE_DATA}, + {dwSignature, "dwSignature", offsetof(XPE_DEF::tagVS_FIXEDFILEINFO, dwSignature), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {dwStrucVersion, "dwStrucVersion", offsetof(XPE_DEF::tagVS_FIXEDFILEINFO, dwStrucVersion), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {dwFileVersionMS, "dwFileVersionMS", offsetof(XPE_DEF::tagVS_FIXEDFILEINFO, dwFileVersionMS), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {dwFileVersionLS, "dwFileVersionLS", offsetof(XPE_DEF::tagVS_FIXEDFILEINFO, dwFileVersionLS), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {dwProductVersionMS, "dwProductVersionMS", offsetof(XPE_DEF::tagVS_FIXEDFILEINFO, dwProductVersionMS), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {dwProductVersionLS, "dwProductVersionLS", offsetof(XPE_DEF::tagVS_FIXEDFILEINFO, dwProductVersionLS), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {dwFileFlagsMask, "dwFileFlagsMask", offsetof(XPE_DEF::tagVS_FIXEDFILEINFO, dwFileFlagsMask), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {dwFileFlags, "dwFileFlags", offsetof(XPE_DEF::tagVS_FIXEDFILEINFO, dwFileFlags), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {dwFileOS, "dwFileOS", offsetof(XPE_DEF::tagVS_FIXEDFILEINFO, dwFileOS), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {dwFileType, "dwFileType", offsetof(XPE_DEF::tagVS_FIXEDFILEINFO, dwFileType), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {dwFileSubtype, "dwFileSubtype", offsetof(XPE_DEF::tagVS_FIXEDFILEINFO, dwFileSubtype), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {dwFileDateMS, "dwFileDateMS", offsetof(XPE_DEF::tagVS_FIXEDFILEINFO, dwFileDateMS), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, + {dwFileDateLS, "dwFileDateLS", offsetof(XPE_DEF::tagVS_FIXEDFILEINFO, dwFileDateLS), 4, "DWORD", FW_DEF::VAL_TYPE_DATA}, }; } diff --git a/PE/pe_defs.h b/PE/pe_defs.h index 03e5c892..fe0613b4 100755 --- a/PE/pe_defs.h +++ b/PE/pe_defs.h @@ -121,16 +121,7 @@ extern const FW_DEF::HEADER_RECORD records[__data_size]; } // namespace N_IMAGE_NT_HEADERS namespace N_IMAGE_FILE_HEADER { -enum DATA { - Machine = 0, - NumberOfSections, - TimeDateStamp, - PointerToSymbolTable, - NumberOfSymbols, - SizeOfOptionalHeader, - Characteristics, - __data_size -}; +enum DATA { Machine = 0, NumberOfSections, TimeDateStamp, PointerToSymbolTable, NumberOfSymbols, SizeOfOptionalHeader, Characteristics, __data_size }; extern const FW_DEF::HEADER_RECORD records[__data_size]; } // namespace N_IMAGE_FILE_HEADER @@ -176,15 +167,7 @@ extern const FW_DEF::HEADER_RECORD records64[__data_size]; } // namespace N_IMAGE_OPTIONAL_HEADER namespace N_IMAGE_TLS { -enum DATA { - StartAddressOfRawData = 0, - EndAddressOfRawData, - AddressOfIndex, - AddressOfCallBacks, - SizeOfZeroFill, - Characteristics, - __data_size -}; +enum DATA { StartAddressOfRawData = 0, EndAddressOfRawData, AddressOfIndex, AddressOfCallBacks, SizeOfZeroFill, Characteristics, __data_size }; extern const FW_DEF::HEADER_RECORD records32[__data_size]; extern const FW_DEF::HEADER_RECORD records64[__data_size]; @@ -309,17 +292,7 @@ extern const FW_DEF::HEADER_RECORD records[__data_size]; } // namespace N_IMAGE_RESOURCES namespace N_IMAGE_DEBUG { -enum DATA { - Characteristics = 0, - TimeDateStamp, - MajorVersion, - MinorVersion, - Type, - SizeOfData, - AddressOfRawData, - PointerToRawData, - __data_size -}; +enum DATA { Characteristics = 0, TimeDateStamp, MajorVersion, MinorVersion, Type, SizeOfData, AddressOfRawData, PointerToRawData, __data_size }; extern const FW_DEF::HEADER_RECORD records[__data_size]; @@ -334,14 +307,7 @@ extern const FW_DEF::HEADER_RECORD records[__data_size]; } // namespace N_IMAGE_EXPORT_FUNCTION namespace N_IMAGE_IMPORT { -enum DATA { - OriginalFirstThunk = 0, - TimeDateStamp, - ForwarderChain, - Name, - FirstThunk, - __data_size -}; +enum DATA { OriginalFirstThunk = 0, TimeDateStamp, ForwarderChain, Name, FirstThunk, __data_size }; extern const FW_DEF::HEADER_RECORD records[__data_size]; @@ -369,12 +335,7 @@ enum INV { __INV_size }; } // namespace N_IMAGE_DELAYIMPORT namespace N_IMAGE_BOUNDIMPORT { -enum DATA { - TimeDateStamp = 0, - OffsetModuleName, - NumberOfModuleForwarderRefs, - __data_size -}; +enum DATA { TimeDateStamp = 0, OffsetModuleName, NumberOfModuleForwarderRefs, __data_size }; extern const FW_DEF::HEADER_RECORD records[__data_size]; @@ -390,14 +351,7 @@ extern const FW_DEF::HEADER_RECORD records64[__data_size]; } // namespace N_IMAGE_IMPORT_FUNCTION namespace N_IMAGE_DELAYIMPORT_FUNCTION { -enum DATA { - AddressThunk = 0, - BoundThunk, - NameThunk, - Ordinal, - Hint, - __data_size -}; +enum DATA { AddressThunk = 0, BoundThunk, NameThunk, Ordinal, Hint, __data_size }; extern const FW_DEF::HEADER_RECORD records32[__data_size]; extern const FW_DEF::HEADER_RECORD records64[__data_size]; @@ -440,17 +394,7 @@ extern const FW_DEF::HEADER_RECORD records[__data_size]; } // namespace N_IMAGE_NETHEADER namespace N_IMAGE_NET_METADATA { -enum DATA { - Signature = 0, - MajorVersion, - MinorVersion, - Reserved, - VersionStringLength, - Version, - Flags, - Streams, - __data_size -}; +enum DATA { Signature = 0, MajorVersion, MinorVersion, Reserved, VersionStringLength, Version, Flags, Streams, __data_size }; extern const FW_DEF::HEADER_RECORD records[__data_size]; } // namespace N_IMAGE_NET_METADATA diff --git a/PE/peprocessdata.cpp b/PE/peprocessdata.cpp index 57f04719..c3be7277 100755 --- a/PE/peprocessdata.cpp +++ b/PE/peprocessdata.cpp @@ -20,9 +20,7 @@ */ #include "peprocessdata.h" -PEProcessData::PEProcessData(int nType, QStandardItemModel **ppModel, XPE *pPE, - qint32 nNumber, qint64 nOffset, qint64 nSize, - QVariant varInfo) +PEProcessData::PEProcessData(int nType, QStandardItemModel **ppModel, XPE *pPE, qint32 nNumber, qint64 nOffset, qint64 nSize, QVariant varInfo) : ProcessData() { this->g_nType = nType; this->g_ppModel = ppModel; @@ -39,16 +37,13 @@ void PEProcessData::_process() { if (g_nType == SPE::TYPE_SECTIONS) { QList listLabels; listLabels.append(""); - listLabels.append(getStructList(N_IMAGE_SECTION_HEADER::records, - N_IMAGE_SECTION_HEADER::__data_size)); + listLabels.append(getStructList(N_IMAGE_SECTION_HEADER::records, N_IMAGE_SECTION_HEADER::__data_size)); - QList listSections = - g_pPE->getSectionHeaders(); + QList listSections = g_pPE->getSectionHeaders(); qint32 nNumberOfRecords = listSections.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfRecords, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfRecords, listLabels.count()); setMaximum(nNumberOfRecords); @@ -58,83 +53,47 @@ void PEProcessData::_process() { QStandardItem *pItemNumber = new QStandardItem; pItemNumber->setData(i, Qt::DisplayRole); - pItemNumber->setData(listSections.at(i).VirtualAddress, - Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); + pItemNumber->setData(listSections.at(i).VirtualAddress, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); if (g_pPE->isImage()) { - pItemNumber->setData(listSections.at(i).Misc.VirtualSize, - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); - pItemNumber->setData( - listSections.at(i).VirtualAddress, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItemNumber->setData(listSections.at(i).Misc.VirtualSize, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); + pItemNumber->setData(listSections.at(i).VirtualAddress, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); } else { - pItemNumber->setData(listSections.at(i).SizeOfRawData, - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); - pItemNumber->setData( - listSections.at(i).PointerToRawData, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItemNumber->setData(listSections.at(i).SizeOfRawData, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); + pItemNumber->setData(listSections.at(i).PointerToRawData, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); } (*g_ppModel)->setItem(i, 0, pItemNumber); QStandardItem *pItemName = new QStandardItem(); QString sName = QString((char *)listSections.at(i).Name); - sName.resize( - qMin(sName.length(), XPE_DEF::S_IMAGE_SIZEOF_SHORT_NAME)); + sName.resize(qMin(sName.length(), XPE_DEF::S_IMAGE_SIZEOF_SHORT_NAME)); pItemName->setText(sName); - pItemNumber->setData( - QString("%1_%2_%3") - .arg(tr("Section"), QString::number(i), sName), - Qt::UserRole + FW_DEF::SECTION_DATA_NAME); + pItemNumber->setData(QString("%1_%2_%3").arg(tr("Section"), QString::number(i), sName), Qt::UserRole + FW_DEF::SECTION_DATA_NAME); - (*g_ppModel) - ->setItem(i, N_IMAGE_SECTION_HEADER::Name + 1, pItemName); + (*g_ppModel)->setItem(i, N_IMAGE_SECTION_HEADER::Name + 1, pItemName); + (*g_ppModel)->setItem(i, N_IMAGE_SECTION_HEADER::VirtualSize + 1, new QStandardItem(XBinary::valueToHex(listSections.at(i).Misc.VirtualSize))); + (*g_ppModel)->setItem(i, N_IMAGE_SECTION_HEADER::VirtualAddress + 1, new QStandardItem(XBinary::valueToHex(listSections.at(i).VirtualAddress))); + (*g_ppModel)->setItem(i, N_IMAGE_SECTION_HEADER::SizeOfRawData + 1, new QStandardItem(XBinary::valueToHex(listSections.at(i).SizeOfRawData))); + (*g_ppModel)->setItem(i, N_IMAGE_SECTION_HEADER::PointerToRawData + 1, new QStandardItem(XBinary::valueToHex(listSections.at(i).PointerToRawData))); (*g_ppModel) - ->setItem(i, N_IMAGE_SECTION_HEADER::VirtualSize + 1, - new QStandardItem(XBinary::valueToHex( - listSections.at(i).Misc.VirtualSize))); - (*g_ppModel) - ->setItem(i, N_IMAGE_SECTION_HEADER::VirtualAddress + 1, - new QStandardItem(XBinary::valueToHex( - listSections.at(i).VirtualAddress))); - (*g_ppModel) - ->setItem(i, N_IMAGE_SECTION_HEADER::SizeOfRawData + 1, - new QStandardItem(XBinary::valueToHex( - listSections.at(i).SizeOfRawData))); - (*g_ppModel) - ->setItem(i, N_IMAGE_SECTION_HEADER::PointerToRawData + 1, - new QStandardItem(XBinary::valueToHex( - listSections.at(i).PointerToRawData))); - (*g_ppModel) - ->setItem(i, N_IMAGE_SECTION_HEADER::PointerToRelocations + 1, - new QStandardItem(XBinary::valueToHex( - listSections.at(i).PointerToRelocations))); + ->setItem(i, N_IMAGE_SECTION_HEADER::PointerToRelocations + 1, new QStandardItem(XBinary::valueToHex(listSections.at(i).PointerToRelocations))); (*g_ppModel) - ->setItem(i, N_IMAGE_SECTION_HEADER::PointerToLinenumbers + 1, - new QStandardItem(XBinary::valueToHex( - listSections.at(i).PointerToLinenumbers))); + ->setItem(i, N_IMAGE_SECTION_HEADER::PointerToLinenumbers + 1, new QStandardItem(XBinary::valueToHex(listSections.at(i).PointerToLinenumbers))); (*g_ppModel) - ->setItem(i, N_IMAGE_SECTION_HEADER::NumberOfRelocations + 1, - new QStandardItem(XBinary::valueToHex( - listSections.at(i).NumberOfRelocations))); + ->setItem(i, N_IMAGE_SECTION_HEADER::NumberOfRelocations + 1, new QStandardItem(XBinary::valueToHex(listSections.at(i).NumberOfRelocations))); (*g_ppModel) - ->setItem(i, N_IMAGE_SECTION_HEADER::NumberOfLinenumbers + 1, - new QStandardItem(XBinary::valueToHex( - listSections.at(i).NumberOfLinenumbers))); - (*g_ppModel) - ->setItem(i, N_IMAGE_SECTION_HEADER::Characteristics + 1, - new QStandardItem(XBinary::valueToHex( - listSections.at(i).Characteristics))); + ->setItem(i, N_IMAGE_SECTION_HEADER::NumberOfLinenumbers + 1, new QStandardItem(XBinary::valueToHex(listSections.at(i).NumberOfLinenumbers))); + (*g_ppModel)->setItem(i, N_IMAGE_SECTION_HEADER::Characteristics + 1, new QStandardItem(XBinary::valueToHex(listSections.at(i).Characteristics))); incValue(); } } else if (g_nType == SPE::TYPE_RELOCS) { QList listLabels; listLabels.append(""); - listLabels.append(getStructList(N_IMAGE_RELOCS::records, - N_IMAGE_RELOCS::__data_size)); + listLabels.append(getStructList(N_IMAGE_RELOCS::records, N_IMAGE_RELOCS::__data_size)); listLabels.append(""); listLabels.append(""); @@ -142,8 +101,7 @@ void PEProcessData::_process() { qint32 nNumberOfRecords = listRelocsHeaders.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfRecords, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfRecords, listLabels.count()); setMaximum(nNumberOfRecords); @@ -152,49 +110,32 @@ void PEProcessData::_process() { for (qint32 i = 0; (i < nNumberOfRecords) && (isRun()); i++) { QStandardItem *pItem = new QStandardItem; pItem->setData(i, Qt::DisplayRole); - pItem->setData(listRelocsHeaders.at(i).nOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); - pItem->setData(listRelocsHeaders.at(i).nOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); + pItem->setData(listRelocsHeaders.at(i).nOffset, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(listRelocsHeaders.at(i).nOffset, Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET); (*g_ppModel)->setItem(i, 0, pItem); (*g_ppModel) - ->setItem(i, N_IMAGE_RELOCS::VirtualAddress + 1, - new QStandardItem(XBinary::valueToHex( - listRelocsHeaders.at(i) - .baseRelocation.VirtualAddress))); + ->setItem(i, N_IMAGE_RELOCS::VirtualAddress + 1, new QStandardItem(XBinary::valueToHex(listRelocsHeaders.at(i).baseRelocation.VirtualAddress))); (*g_ppModel) - ->setItem( - i, N_IMAGE_RELOCS::SizeOfBlock + 1, - new QStandardItem(XBinary::valueToHex( - listRelocsHeaders.at(i).baseRelocation.SizeOfBlock))); + ->setItem(i, N_IMAGE_RELOCS::SizeOfBlock + 1, new QStandardItem(XBinary::valueToHex(listRelocsHeaders.at(i).baseRelocation.SizeOfBlock))); + (*g_ppModel)->setItem(i, N_IMAGE_RELOCS::SizeOfBlock + 2, new QStandardItem(QString::number(listRelocsHeaders.at(i).nCount))); (*g_ppModel) - ->setItem(i, N_IMAGE_RELOCS::SizeOfBlock + 2, - new QStandardItem( - QString::number(listRelocsHeaders.at(i).nCount))); - (*g_ppModel) - ->setItem( - i, N_IMAGE_RELOCS::SizeOfBlock + 3, - new QStandardItem(g_pPE->getMemoryRecordInfoByRelAddress( - listRelocsHeaders.at(i) - .baseRelocation.VirtualAddress))); // Comment + ->setItem(i, N_IMAGE_RELOCS::SizeOfBlock + 3, + new QStandardItem(g_pPE->getMemoryRecordInfoByRelAddress(listRelocsHeaders.at(i).baseRelocation.VirtualAddress))); // Comment incValue(); } } else if (g_nType == SPE::TYPE_RELOCS_POSITION) { QList listLabels; listLabels.append(""); - listLabels.append(getStructList(N_IMAGE_RELOCS_POSITION::records, - N_IMAGE_RELOCS_POSITION::__data_size)); + listLabels.append(getStructList(N_IMAGE_RELOCS_POSITION::records, N_IMAGE_RELOCS_POSITION::__data_size)); listLabels.append(tr("Type")); listLabels.append(tr("Address")); - QList listRelocsPositions = - g_pPE->getRelocsPositions(g_nOffset); + QList listRelocsPositions = g_pPE->getRelocsPositions(g_nOffset); int nNumberOfRelocs = listRelocsPositions.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfRelocs, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfRelocs, listLabels.count()); setMaximum(nNumberOfRelocs); @@ -206,26 +147,17 @@ void PEProcessData::_process() { QStandardItem *pItem = new QStandardItem; pItem->setData(i, Qt::DisplayRole); (*g_ppModel)->setItem(i, 0, pItem); + (*g_ppModel)->setItem(i, N_IMAGE_RELOCS_POSITION::TypeOffset + 1, new QStandardItem(XBinary::valueToHex(listRelocsPositions.at(i).nTypeOffset))); + (*g_ppModel)->setItem(i, N_IMAGE_RELOCS_POSITION::TypeOffset + 2, new QStandardItem(mapTypes.value(listRelocsPositions.at(i).nType))); (*g_ppModel) - ->setItem(i, N_IMAGE_RELOCS_POSITION::TypeOffset + 1, - new QStandardItem(XBinary::valueToHex( - listRelocsPositions.at(i).nTypeOffset))); - (*g_ppModel) - ->setItem(i, N_IMAGE_RELOCS_POSITION::TypeOffset + 2, - new QStandardItem( - mapTypes.value(listRelocsPositions.at(i).nType))); - (*g_ppModel) - ->setItem(i, N_IMAGE_RELOCS_POSITION::TypeOffset + 3, - new QStandardItem(XBinary::valueToHex( - (quint32)listRelocsPositions.at(i).nAddress))); + ->setItem(i, N_IMAGE_RELOCS_POSITION::TypeOffset + 3, new QStandardItem(XBinary::valueToHex((quint32)listRelocsPositions.at(i).nAddress))); incValue(); } } else if (g_nType == SPE::TYPE_IMPORT) { QList listLabels; listLabels.append(""); - listLabels.append(getStructList(N_IMAGE_IMPORT::records, - N_IMAGE_IMPORT::__data_size)); + listLabels.append(getStructList(N_IMAGE_IMPORT::records, N_IMAGE_IMPORT::__data_size)); listLabels.append(tr("Hash")); listLabels.append(""); @@ -233,11 +165,9 @@ void PEProcessData::_process() { QList listImport = g_pPE->getImports(&memoryMap); - QList listImportPositionHashes = - g_pPE->getImportPositionHashes(&listImport); + QList listImportPositionHashes = g_pPE->getImportPositionHashes(&listImport); - QList listID = - g_pPE->getImportDescriptorsEx(&memoryMap); + QList listID = g_pPE->getImportDescriptorsEx(&memoryMap); int nNumberOfIDs = listID.count(); @@ -251,45 +181,23 @@ void PEProcessData::_process() { QStandardItem *pItem = new QStandardItem; pItem->setData(i, Qt::DisplayRole); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, N_IMAGE_IMPORT::OriginalFirstThunk + 1, - new QStandardItem(XBinary::valueToHex( - listID.at(i).OriginalFirstThunk))); - (*g_ppModel) - ->setItem(i, N_IMAGE_IMPORT::TimeDateStamp + 1, - new QStandardItem( - XBinary::valueToHex(listID.at(i).TimeDateStamp))); - (*g_ppModel) - ->setItem(i, N_IMAGE_IMPORT::ForwarderChain + 1, - new QStandardItem(XBinary::valueToHex( - listID.at(i).ForwarderChain))); - (*g_ppModel) - ->setItem( - i, N_IMAGE_IMPORT::Name + 1, - new QStandardItem(XBinary::valueToHex(listID.at(i).Name))); - (*g_ppModel) - ->setItem(i, N_IMAGE_IMPORT::FirstThunk + 1, - new QStandardItem( - XBinary::valueToHex(listID.at(i).FirstThunk))); - (*g_ppModel) - ->setItem(i, N_IMAGE_IMPORT::FirstThunk + 2, - new QStandardItem(XBinary::valueToHex( - listImportPositionHashes.at(i)))); - (*g_ppModel) - ->setItem(i, N_IMAGE_IMPORT::FirstThunk + 3, - new QStandardItem(listID.at(i).sLibrary)); + (*g_ppModel)->setItem(i, N_IMAGE_IMPORT::OriginalFirstThunk + 1, new QStandardItem(XBinary::valueToHex(listID.at(i).OriginalFirstThunk))); + (*g_ppModel)->setItem(i, N_IMAGE_IMPORT::TimeDateStamp + 1, new QStandardItem(XBinary::valueToHex(listID.at(i).TimeDateStamp))); + (*g_ppModel)->setItem(i, N_IMAGE_IMPORT::ForwarderChain + 1, new QStandardItem(XBinary::valueToHex(listID.at(i).ForwarderChain))); + (*g_ppModel)->setItem(i, N_IMAGE_IMPORT::Name + 1, new QStandardItem(XBinary::valueToHex(listID.at(i).Name))); + (*g_ppModel)->setItem(i, N_IMAGE_IMPORT::FirstThunk + 1, new QStandardItem(XBinary::valueToHex(listID.at(i).FirstThunk))); + (*g_ppModel)->setItem(i, N_IMAGE_IMPORT::FirstThunk + 2, new QStandardItem(XBinary::valueToHex(listImportPositionHashes.at(i)))); + (*g_ppModel)->setItem(i, N_IMAGE_IMPORT::FirstThunk + 3, new QStandardItem(listID.at(i).sLibrary)); incValue(); } } else if (g_nType == SPE::TYPE_IMPORT_FUNCTION) { QList listLabels; listLabels.append(""); - listLabels.append(getStructList(N_IMAGE_IMPORT_FUNCTION::records32, - N_IMAGE_IMPORT_FUNCTION::__data_size)); + listLabels.append(getStructList(N_IMAGE_IMPORT_FUNCTION::records32, N_IMAGE_IMPORT_FUNCTION::__data_size)); listLabels.append(tr("Name")); - QList listImportPositions = - g_pPE->getImportPositions(g_nNumber); + QList listImportPositions = g_pPE->getImportPositions(g_nNumber); int nNumberOfIPs = listImportPositions.count(); @@ -309,38 +217,24 @@ void PEProcessData::_process() { QString sOrdinal; if (bIs64) { - sOrdinal = XBinary::valueToHex( - (quint64)listImportPositions.at(i).nOrdinal); + sOrdinal = XBinary::valueToHex((quint64)listImportPositions.at(i).nOrdinal); } else { - sOrdinal = XBinary::valueToHex( - (quint32)listImportPositions.at(i).nOrdinal); + sOrdinal = XBinary::valueToHex((quint32)listImportPositions.at(i).nOrdinal); } - (*g_ppModel) - ->setItem(i, N_IMAGE_IMPORT_FUNCTION::Ordinal + 1, - new QStandardItem(sOrdinal)); + (*g_ppModel)->setItem(i, N_IMAGE_IMPORT_FUNCTION::Ordinal + 1, new QStandardItem(sOrdinal)); } else { QString sThunk; if (bIs64) { - sThunk = XBinary::valueToHex( - (quint64)listImportPositions.at(i).nThunkValue); + sThunk = XBinary::valueToHex((quint64)listImportPositions.at(i).nThunkValue); } else { - sThunk = XBinary::valueToHex( - (quint32)listImportPositions.at(i).nThunkValue); + sThunk = XBinary::valueToHex((quint32)listImportPositions.at(i).nThunkValue); } - (*g_ppModel) - ->setItem(i, N_IMAGE_IMPORT_FUNCTION::Thunk + 1, - new QStandardItem(sThunk)); - (*g_ppModel) - ->setItem(i, N_IMAGE_IMPORT_FUNCTION::Hint + 1, - new QStandardItem(XBinary::valueToHex( - listImportPositions.at(i).nHint))); - (*g_ppModel) - ->setItem( - i, N_IMAGE_IMPORT_FUNCTION::Hint + 2, - new QStandardItem(listImportPositions.at(i).sName)); + (*g_ppModel)->setItem(i, N_IMAGE_IMPORT_FUNCTION::Thunk + 1, new QStandardItem(sThunk)); + (*g_ppModel)->setItem(i, N_IMAGE_IMPORT_FUNCTION::Hint + 1, new QStandardItem(XBinary::valueToHex(listImportPositions.at(i).nHint))); + (*g_ppModel)->setItem(i, N_IMAGE_IMPORT_FUNCTION::Hint + 2, new QStandardItem(listImportPositions.at(i).sName)); } incValue(); @@ -348,12 +242,10 @@ void PEProcessData::_process() { } else if (g_nType == SPE::TYPE_EXCEPTION) { QList listLabels; listLabels.append(""); - listLabels.append(getStructList(N_IMAGE_EXCEPTIONS::records, - N_IMAGE_EXCEPTIONS::__data_size)); + listLabels.append(getStructList(N_IMAGE_EXCEPTIONS::records, N_IMAGE_EXCEPTIONS::__data_size)); listLabels.append(""); - QList listRFE = - g_pPE->getExceptionsList(); + QList listRFE = g_pPE->getExceptionsList(); int nNumberOfRFEs = listRFE.count(); @@ -369,51 +261,32 @@ void PEProcessData::_process() { QStandardItem *pItem = new QStandardItem; pItem->setData(i, Qt::DisplayRole); - pItem->setData(listRFE.at(i).BeginAddress, - Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); - pItem->setData( - listRFE.at(i).EndAddress - listRFE.at(i).BeginAddress, - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); - pItem->setData(g_pPE->addressToOffset( - &memoryMap, memoryMap.nModuleAddress + - listRFE.at(i).BeginAddress), + pItem->setData(listRFE.at(i).BeginAddress, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); + pItem->setData(listRFE.at(i).EndAddress - listRFE.at(i).BeginAddress, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); + pItem->setData(g_pPE->addressToOffset(&memoryMap, memoryMap.nModuleAddress + listRFE.at(i).BeginAddress), Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); (*g_ppModel)->setItem(i, 0, pItem); + (*g_ppModel)->setItem(i, N_IMAGE_EXCEPTIONS::BeginAddress + 1, new QStandardItem(XBinary::valueToHex(listRFE.at(i).BeginAddress))); + (*g_ppModel)->setItem(i, N_IMAGE_EXCEPTIONS::EndAddress + 1, new QStandardItem(XBinary::valueToHex(listRFE.at(i).EndAddress))); + (*g_ppModel)->setItem(i, N_IMAGE_EXCEPTIONS::UnwindInfoAddress + 1, new QStandardItem(XBinary::valueToHex(listRFE.at(i).UnwindInfoAddress))); (*g_ppModel) - ->setItem(i, N_IMAGE_EXCEPTIONS::BeginAddress + 1, - new QStandardItem( - XBinary::valueToHex(listRFE.at(i).BeginAddress))); - (*g_ppModel) - ->setItem(i, N_IMAGE_EXCEPTIONS::EndAddress + 1, - new QStandardItem( - XBinary::valueToHex(listRFE.at(i).EndAddress))); - (*g_ppModel) - ->setItem(i, N_IMAGE_EXCEPTIONS::UnwindInfoAddress + 1, - new QStandardItem(XBinary::valueToHex( - listRFE.at(i).UnwindInfoAddress))); - (*g_ppModel) - ->setItem( - i, N_IMAGE_EXCEPTIONS::UnwindInfoAddress + 2, - new QStandardItem(g_pPE->getMemoryRecordInfoByRelAddress( - listRFE.at(i).BeginAddress))); // Comment + ->setItem(i, N_IMAGE_EXCEPTIONS::UnwindInfoAddress + 2, + new QStandardItem(g_pPE->getMemoryRecordInfoByRelAddress(listRFE.at(i).BeginAddress))); // Comment incValue(); } } else if (g_nType == SPE::TYPE_DELAYIMPORT) { QList listLabels; listLabels.append(""); - listLabels.append(getStructList(N_IMAGE_DELAYIMPORT::records, - N_IMAGE_DELAYIMPORT::__data_size)); + listLabels.append(getStructList(N_IMAGE_DELAYIMPORT::records, N_IMAGE_DELAYIMPORT::__data_size)); listLabels.append(""); - QList listDelayImport = - g_pPE->getDelayImportsList(); + QList listDelayImport = g_pPE->getDelayImportsList(); int nNumberOfDelayImports = listDelayImport.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfDelayImports, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfDelayImports, listLabels.count()); setMaximum(nNumberOfDelayImports); @@ -422,59 +295,35 @@ void PEProcessData::_process() { XBinary::_MEMORY_MAP memoryMap = g_pPE->getMemoryMap(); for (qint32 i = 0; (i < nNumberOfDelayImports) && (isRun()); i++) { - QString sLibraryName = - g_pPE->read_ansiString(g_pPE->relAddressToOffset( - &memoryMap, listDelayImport.at(i).DllNameRVA)); + QString sLibraryName = g_pPE->read_ansiString(g_pPE->relAddressToOffset(&memoryMap, listDelayImport.at(i).DllNameRVA)); QStandardItem *pItem = new QStandardItem; pItem->setData(i, Qt::DisplayRole); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, N_IMAGE_DELAYIMPORT::AllAttributes + 1, - new QStandardItem(XBinary::valueToHex( - listDelayImport.at(i).AllAttributes))); - (*g_ppModel) - ->setItem(i, N_IMAGE_DELAYIMPORT::DllNameRVA + 1, - new QStandardItem(XBinary::valueToHex( - listDelayImport.at(i).DllNameRVA))); - (*g_ppModel) - ->setItem(i, N_IMAGE_DELAYIMPORT::ModuleHandleRVA + 1, - new QStandardItem(XBinary::valueToHex( - listDelayImport.at(i).ModuleHandleRVA))); + (*g_ppModel)->setItem(i, N_IMAGE_DELAYIMPORT::AllAttributes + 1, new QStandardItem(XBinary::valueToHex(listDelayImport.at(i).AllAttributes))); + (*g_ppModel)->setItem(i, N_IMAGE_DELAYIMPORT::DllNameRVA + 1, new QStandardItem(XBinary::valueToHex(listDelayImport.at(i).DllNameRVA))); + (*g_ppModel)->setItem(i, N_IMAGE_DELAYIMPORT::ModuleHandleRVA + 1, new QStandardItem(XBinary::valueToHex(listDelayImport.at(i).ModuleHandleRVA))); (*g_ppModel) ->setItem(i, N_IMAGE_DELAYIMPORT::ImportAddressTableRVA + 1, - new QStandardItem(XBinary::valueToHex( - listDelayImport.at(i).ImportAddressTableRVA))); - (*g_ppModel) - ->setItem(i, N_IMAGE_DELAYIMPORT::ImportNameTableRVA + 1, - new QStandardItem(XBinary::valueToHex( - listDelayImport.at(i).ImportNameTableRVA))); - (*g_ppModel) - ->setItem( - i, N_IMAGE_DELAYIMPORT::BoundImportAddressTableRVA + 1, - new QStandardItem(XBinary::valueToHex( - listDelayImport.at(i).BoundImportAddressTableRVA))); + new QStandardItem(XBinary::valueToHex(listDelayImport.at(i).ImportAddressTableRVA))); (*g_ppModel) - ->setItem( - i, N_IMAGE_DELAYIMPORT::UnloadInformationTableRVA + 1, - new QStandardItem(XBinary::valueToHex( - listDelayImport.at(i).UnloadInformationTableRVA))); + ->setItem(i, N_IMAGE_DELAYIMPORT::ImportNameTableRVA + 1, new QStandardItem(XBinary::valueToHex(listDelayImport.at(i).ImportNameTableRVA))); (*g_ppModel) - ->setItem(i, N_IMAGE_DELAYIMPORT::TimeDateStamp + 1, - new QStandardItem(XBinary::valueToHex( - listDelayImport.at(i).TimeDateStamp))); + ->setItem(i, N_IMAGE_DELAYIMPORT::BoundImportAddressTableRVA + 1, + new QStandardItem(XBinary::valueToHex(listDelayImport.at(i).BoundImportAddressTableRVA))); (*g_ppModel) - ->setItem(i, N_IMAGE_DELAYIMPORT::TimeDateStamp + 2, - new QStandardItem(sLibraryName)); + ->setItem(i, N_IMAGE_DELAYIMPORT::UnloadInformationTableRVA + 1, + new QStandardItem(XBinary::valueToHex(listDelayImport.at(i).UnloadInformationTableRVA))); + (*g_ppModel)->setItem(i, N_IMAGE_DELAYIMPORT::TimeDateStamp + 1, new QStandardItem(XBinary::valueToHex(listDelayImport.at(i).TimeDateStamp))); + (*g_ppModel)->setItem(i, N_IMAGE_DELAYIMPORT::TimeDateStamp + 2, new QStandardItem(sLibraryName)); incValue(); } } else if (g_nType == SPE::TYPE_EXPORT_FUNCTION) { QList listLabels; // No need number - listLabels.append(getStructList(N_IMAGE_EXPORT_FUNCTION::records, - N_IMAGE_EXPORT_FUNCTION::__data_size)); + listLabels.append(getStructList(N_IMAGE_EXPORT_FUNCTION::records, N_IMAGE_EXPORT_FUNCTION::__data_size)); listLabels.append(""); bool bFilter = g_varInfo.toBool(); @@ -483,8 +332,7 @@ void PEProcessData::_process() { int nNumberOfPositions = eh.listPositions.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfPositions, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfPositions, listLabels.count()); setMaximum(nNumberOfPositions); @@ -494,49 +342,32 @@ void PEProcessData::_process() { for (qint32 i = 0; (i < nNumberOfPositions) && (isRun()); i++) { QStandardItem *pItem = new QStandardItem; - pItem->setText( - XBinary::valueToHex(eh.listPositions.at(i).nOrdinal)); + pItem->setText(XBinary::valueToHex(eh.listPositions.at(i).nOrdinal)); - pItem->setData( - memoryMap.nModuleAddress + eh.listPositions.at(i).nRVA, - Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); + pItem->setData(memoryMap.nModuleAddress + eh.listPositions.at(i).nRVA, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); pItem->setData(1, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); - pItem->setData(g_pPE->addressToOffset( - &memoryMap, memoryMap.nModuleAddress + - eh.listPositions.at(i).nRVA), + pItem->setData(g_pPE->addressToOffset(&memoryMap, memoryMap.nModuleAddress + eh.listPositions.at(i).nRVA), Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); (*g_ppModel)->setItem(i, N_IMAGE_EXPORT_FUNCTION::Ordinal, pItem); - (*g_ppModel) - ->setItem(i, N_IMAGE_EXPORT_FUNCTION::RVA, - new QStandardItem(XBinary::valueToHex( - eh.listPositions.at(i).nRVA))); - (*g_ppModel) - ->setItem(i, N_IMAGE_EXPORT_FUNCTION::Name, - new QStandardItem(XBinary::valueToHex( - eh.listPositions.at(i).nNameRVA))); - (*g_ppModel) - ->setItem( - i, N_IMAGE_EXPORT_FUNCTION::Name + 1, - new QStandardItem(eh.listPositions.at(i).sFunctionName)); + (*g_ppModel)->setItem(i, N_IMAGE_EXPORT_FUNCTION::RVA, new QStandardItem(XBinary::valueToHex(eh.listPositions.at(i).nRVA))); + (*g_ppModel)->setItem(i, N_IMAGE_EXPORT_FUNCTION::Name, new QStandardItem(XBinary::valueToHex(eh.listPositions.at(i).nNameRVA))); + (*g_ppModel)->setItem(i, N_IMAGE_EXPORT_FUNCTION::Name + 1, new QStandardItem(eh.listPositions.at(i).sFunctionName)); incValue(); } } else if (g_nType == SPE::TYPE_BOUNDIMPORT) { QList listLabels; listLabels.append(""); - listLabels.append(getStructList(N_IMAGE_BOUNDIMPORT::records, - N_IMAGE_BOUNDIMPORT::__data_size)); + listLabels.append(getStructList(N_IMAGE_BOUNDIMPORT::records, N_IMAGE_BOUNDIMPORT::__data_size)); listLabels.append(""); listLabels.append(""); - QList listBoundImportPositions = - g_pPE->getBoundImportPositions(); + QList listBoundImportPositions = g_pPE->getBoundImportPositions(); int nNumberOfPositions = listBoundImportPositions.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfPositions, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfPositions, listLabels.count()); setMaximum(nNumberOfPositions); @@ -549,46 +380,30 @@ void PEProcessData::_process() { (*g_ppModel)->setItem(i, 0, pItem); (*g_ppModel) ->setItem(i, N_IMAGE_BOUNDIMPORT::TimeDateStamp + 1, - new QStandardItem(XBinary::valueToHex( - listBoundImportPositions.at(i) - .descriptor.TimeDateStamp))); + new QStandardItem(XBinary::valueToHex(listBoundImportPositions.at(i).descriptor.TimeDateStamp))); (*g_ppModel) ->setItem(i, N_IMAGE_BOUNDIMPORT::OffsetModuleName + 1, - new QStandardItem(XBinary::valueToHex( - listBoundImportPositions.at(i) - .descriptor.OffsetModuleName))); - (*g_ppModel) - ->setItem(i, - N_IMAGE_BOUNDIMPORT::NumberOfModuleForwarderRefs + 1, - new QStandardItem(XBinary::valueToHex( - listBoundImportPositions.at(i) - .descriptor.NumberOfModuleForwarderRefs))); + new QStandardItem(XBinary::valueToHex(listBoundImportPositions.at(i).descriptor.OffsetModuleName))); (*g_ppModel) - ->setItem( - i, N_IMAGE_BOUNDIMPORT::NumberOfModuleForwarderRefs + 2, - new QStandardItem(XBinary::valueToTimeString( - listBoundImportPositions.at(i).descriptor.TimeDateStamp, - XBinary::DT_TYPE_POSIX))); + ->setItem(i, N_IMAGE_BOUNDIMPORT::NumberOfModuleForwarderRefs + 1, + new QStandardItem(XBinary::valueToHex(listBoundImportPositions.at(i).descriptor.NumberOfModuleForwarderRefs))); (*g_ppModel) - ->setItem( - i, N_IMAGE_BOUNDIMPORT::NumberOfModuleForwarderRefs + 3, - new QStandardItem(listBoundImportPositions.at(i).sName)); + ->setItem(i, N_IMAGE_BOUNDIMPORT::NumberOfModuleForwarderRefs + 2, + new QStandardItem(XBinary::valueToTimeString(listBoundImportPositions.at(i).descriptor.TimeDateStamp, XBinary::DT_TYPE_POSIX))); + (*g_ppModel)->setItem(i, N_IMAGE_BOUNDIMPORT::NumberOfModuleForwarderRefs + 3, new QStandardItem(listBoundImportPositions.at(i).sName)); incValue(); } } else if (g_nType == SPE::TYPE_DEBUG) { QList listLabels; listLabels.append(""); - listLabels.append( - getStructList(N_IMAGE_DEBUG::records, N_IMAGE_DEBUG::__data_size)); + listLabels.append(getStructList(N_IMAGE_DEBUG::records, N_IMAGE_DEBUG::__data_size)); - QList listDebug = - g_pPE->getDebugList(); + QList listDebug = g_pPE->getDebugList(); int nNumberOfDebugs = listDebug.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfDebugs, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfDebugs, listLabels.count()); setMaximum(nNumberOfDebugs); @@ -597,45 +412,18 @@ void PEProcessData::_process() { for (qint32 i = 0; (i < nNumberOfDebugs) && (isRun()); i++) { QStandardItem *pItem = new QStandardItem; pItem->setData(i, Qt::DisplayRole); - pItem->setData(listDebug.at(i).AddressOfRawData, - Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); - pItem->setData(listDebug.at(i).SizeOfData, - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); - pItem->setData(listDebug.at(i).PointerToRawData, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(listDebug.at(i).AddressOfRawData, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); + pItem->setData(listDebug.at(i).SizeOfData, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); + pItem->setData(listDebug.at(i).PointerToRawData, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem(i, N_IMAGE_DEBUG::Characteristics + 1, - new QStandardItem(XBinary::valueToHex( - listDebug.at(i).Characteristics))); - (*g_ppModel) - ->setItem(i, N_IMAGE_DEBUG::TimeDateStamp + 1, - new QStandardItem(XBinary::valueToHex( - listDebug.at(i).TimeDateStamp))); - (*g_ppModel) - ->setItem(i, N_IMAGE_DEBUG::MajorVersion + 1, - new QStandardItem(XBinary::valueToHex( - listDebug.at(i).MajorVersion))); - (*g_ppModel) - ->setItem(i, N_IMAGE_DEBUG::MinorVersion + 1, - new QStandardItem(XBinary::valueToHex( - listDebug.at(i).MinorVersion))); - (*g_ppModel) - ->setItem(i, N_IMAGE_DEBUG::Type + 1, - new QStandardItem( - XBinary::valueToHex(listDebug.at(i).Type))); - (*g_ppModel) - ->setItem(i, N_IMAGE_DEBUG::SizeOfData + 1, - new QStandardItem( - XBinary::valueToHex(listDebug.at(i).SizeOfData))); - (*g_ppModel) - ->setItem(i, N_IMAGE_DEBUG::AddressOfRawData + 1, - new QStandardItem(XBinary::valueToHex( - listDebug.at(i).AddressOfRawData))); - (*g_ppModel) - ->setItem(i, N_IMAGE_DEBUG::PointerToRawData + 1, - new QStandardItem(XBinary::valueToHex( - listDebug.at(i).PointerToRawData))); + (*g_ppModel)->setItem(i, N_IMAGE_DEBUG::Characteristics + 1, new QStandardItem(XBinary::valueToHex(listDebug.at(i).Characteristics))); + (*g_ppModel)->setItem(i, N_IMAGE_DEBUG::TimeDateStamp + 1, new QStandardItem(XBinary::valueToHex(listDebug.at(i).TimeDateStamp))); + (*g_ppModel)->setItem(i, N_IMAGE_DEBUG::MajorVersion + 1, new QStandardItem(XBinary::valueToHex(listDebug.at(i).MajorVersion))); + (*g_ppModel)->setItem(i, N_IMAGE_DEBUG::MinorVersion + 1, new QStandardItem(XBinary::valueToHex(listDebug.at(i).MinorVersion))); + (*g_ppModel)->setItem(i, N_IMAGE_DEBUG::Type + 1, new QStandardItem(XBinary::valueToHex(listDebug.at(i).Type))); + (*g_ppModel)->setItem(i, N_IMAGE_DEBUG::SizeOfData + 1, new QStandardItem(XBinary::valueToHex(listDebug.at(i).SizeOfData))); + (*g_ppModel)->setItem(i, N_IMAGE_DEBUG::AddressOfRawData + 1, new QStandardItem(XBinary::valueToHex(listDebug.at(i).AddressOfRawData))); + (*g_ppModel)->setItem(i, N_IMAGE_DEBUG::PointerToRawData + 1, new QStandardItem(XBinary::valueToHex(listDebug.at(i).PointerToRawData))); incValue(); } @@ -649,8 +437,7 @@ void PEProcessData::_process() { int nNumberOfRecords = listCallbacks.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfRecords, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfRecords, listLabels.count()); setMaximum(nNumberOfRecords); @@ -661,40 +448,27 @@ void PEProcessData::_process() { QStandardItem *pItem = new QStandardItem; pItem->setData(i, Qt::DisplayRole); - pItem->setData(nAddress, - Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); + pItem->setData(nAddress, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); // pItem->setData(listCallbacks.at(i).SizeOfData,Qt::UserRole+FW_DEF::SECTION_DATA_SIZE); // pItem->setData(listCallbacks.at(i).PointerToRawData,Qt::UserRole+FW_DEF::SECTION_DATA_OFFSET); (*g_ppModel)->setItem(i, 0, pItem); if (bIs64) { - (*g_ppModel) - ->setItem(i, 1, - new QStandardItem( - XBinary::valueToHex((quint64)nAddress))); + (*g_ppModel)->setItem(i, 1, new QStandardItem(XBinary::valueToHex((quint64)nAddress))); } else { - (*g_ppModel) - ->setItem(i, 1, - new QStandardItem( - XBinary::valueToHex((quint32)nAddress))); + (*g_ppModel)->setItem(i, 1, new QStandardItem(XBinary::valueToHex((quint32)nAddress))); } - (*g_ppModel) - ->setItem(i, 2, - new QStandardItem( - g_pPE->getMemoryRecordInfoByAddress(nAddress))); + (*g_ppModel)->setItem(i, 2, new QStandardItem(g_pPE->getMemoryRecordInfoByAddress(nAddress))); incValue(); } } else if (g_nType == SPE::TYPE_DELAYIMPORT_FUNCTION) { QList listLabels; listLabels.append(""); - listLabels.append( - getStructList(N_IMAGE_DELAYIMPORT_FUNCTION::records32, - N_IMAGE_DELAYIMPORT_FUNCTION::__data_size)); + listLabels.append(getStructList(N_IMAGE_DELAYIMPORT_FUNCTION::records32, N_IMAGE_DELAYIMPORT_FUNCTION::__data_size)); listLabels.append(tr("Name")); - QList listDIP = - g_pPE->getDelayImportPositions(g_nNumber); + QList listDIP = g_pPE->getDelayImportPositions(g_nNumber); int nNumberOfDIPs = listDIP.count(); @@ -713,58 +487,39 @@ void PEProcessData::_process() { if (bIs64) { (*g_ppModel) ->setItem(i, N_IMAGE_DELAYIMPORT_FUNCTION::AddressThunk + 1, - new QStandardItem(XBinary::valueToHex( - (quint64)listDIP.at(i).nAddressThunkRVA))); + new QStandardItem(XBinary::valueToHex((quint64)listDIP.at(i).nAddressThunkRVA))); (*g_ppModel) - ->setItem(i, N_IMAGE_DELAYIMPORT_FUNCTION::BoundThunk + 1, - new QStandardItem(XBinary::valueToHex( - (quint64)listDIP.at(i).nBoundThunkRVA))); + ->setItem(i, N_IMAGE_DELAYIMPORT_FUNCTION::BoundThunk + 1, new QStandardItem(XBinary::valueToHex((quint64)listDIP.at(i).nBoundThunkRVA))); } else { (*g_ppModel) ->setItem(i, N_IMAGE_DELAYIMPORT_FUNCTION::AddressThunk + 1, - new QStandardItem(XBinary::valueToHex( - (quint32)listDIP.at(i).nAddressThunkRVA))); + new QStandardItem(XBinary::valueToHex((quint32)listDIP.at(i).nAddressThunkRVA))); (*g_ppModel) - ->setItem(i, N_IMAGE_DELAYIMPORT_FUNCTION::BoundThunk + 1, - new QStandardItem(XBinary::valueToHex( - (quint32)listDIP.at(i).nBoundThunkRVA))); + ->setItem(i, N_IMAGE_DELAYIMPORT_FUNCTION::BoundThunk + 1, new QStandardItem(XBinary::valueToHex((quint32)listDIP.at(i).nBoundThunkRVA))); } if (listDIP.at(i).nOrdinal) { QString sOrdinal; if (bIs64) { - sOrdinal = - XBinary::valueToHex((quint64)listDIP.at(i).nOrdinal); + sOrdinal = XBinary::valueToHex((quint64)listDIP.at(i).nOrdinal); } else { - sOrdinal = - XBinary::valueToHex((quint32)listDIP.at(i).nOrdinal); + sOrdinal = XBinary::valueToHex((quint32)listDIP.at(i).nOrdinal); } - (*g_ppModel) - ->setItem(i, N_IMAGE_DELAYIMPORT_FUNCTION::Ordinal + 1, - new QStandardItem(sOrdinal)); + (*g_ppModel)->setItem(i, N_IMAGE_DELAYIMPORT_FUNCTION::Ordinal + 1, new QStandardItem(sOrdinal)); } else { QString sThunk; if (bIs64) { - sThunk = XBinary::valueToHex( - (quint64)listDIP.at(i).nNameThunkValue); + sThunk = XBinary::valueToHex((quint64)listDIP.at(i).nNameThunkValue); } else { - sThunk = XBinary::valueToHex( - (quint32)listDIP.at(i).nNameThunkValue); + sThunk = XBinary::valueToHex((quint32)listDIP.at(i).nNameThunkValue); } - (*g_ppModel) - ->setItem(i, N_IMAGE_DELAYIMPORT_FUNCTION::NameThunk + 1, - new QStandardItem(sThunk)); - (*g_ppModel) - ->setItem(i, N_IMAGE_DELAYIMPORT_FUNCTION::Hint + 1, - new QStandardItem( - XBinary::valueToHex(listDIP.at(i).nHint))); - (*g_ppModel) - ->setItem(i, N_IMAGE_DELAYIMPORT_FUNCTION::Hint + 2, - new QStandardItem(listDIP.at(i).sName)); + (*g_ppModel)->setItem(i, N_IMAGE_DELAYIMPORT_FUNCTION::NameThunk + 1, new QStandardItem(sThunk)); + (*g_ppModel)->setItem(i, N_IMAGE_DELAYIMPORT_FUNCTION::Hint + 1, new QStandardItem(XBinary::valueToHex(listDIP.at(i).nHint))); + (*g_ppModel)->setItem(i, N_IMAGE_DELAYIMPORT_FUNCTION::Hint + 2, new QStandardItem(listDIP.at(i).sName)); } incValue(); @@ -794,66 +549,39 @@ void PEProcessData::_process() { int nNumberOfPositions = pos.listPositions.count(); - for (qint32 j = 0; (j < nNumberOfPositions) && (isRun()); - j++) { - XPE::RESOURCE_POSITION subpos = - rh.listPositions.at(i).listPositions.at(j); + for (qint32 j = 0; (j < nNumberOfPositions) && (isRun()); j++) { + XPE::RESOURCE_POSITION subpos = rh.listPositions.at(i).listPositions.at(j); QStandardItem *pSubPos = new QStandardItem; - QString sSubPosText = - XPE::resourceIdNameToString(pos.rin, 1); + QString sSubPosText = XPE::resourceIdNameToString(pos.rin, 1); pSubPos->setText(sSubPosText); pPos->appendRow(pSubPos); - int nNumberOfSubPositions = - subpos.listPositions.count(); - - for (qint32 k = 0; - (k < nNumberOfSubPositions) && (isRun()); k++) { - XPE::RESOURCE_POSITION record1 = - rh.listPositions.at(i); - XPE::RESOURCE_POSITION record2 = - rh.listPositions.at(i).listPositions.at(j); - XPE::RESOURCE_POSITION record3 = - rh.listPositions.at(i) - .listPositions.at(j) - .listPositions.at(k); + int nNumberOfSubPositions = subpos.listPositions.count(); + + for (qint32 k = 0; (k < nNumberOfSubPositions) && (isRun()); k++) { + XPE::RESOURCE_POSITION record1 = rh.listPositions.at(i); + XPE::RESOURCE_POSITION record2 = rh.listPositions.at(i).listPositions.at(j); + XPE::RESOURCE_POSITION record3 = rh.listPositions.at(i).listPositions.at(j).listPositions.at(k); QStandardItem *pRecord = new QStandardItem; - QString sRecordText1 = - XPE::resourceIdNameToString(record1.rin, -1); - QString sRecordText2 = - XPE::resourceIdNameToString(record2.rin, -1); - QString sRecordText3 = - XPE::resourceIdNameToString(record3.rin, -1); + QString sRecordText1 = XPE::resourceIdNameToString(record1.rin, -1); + QString sRecordText2 = XPE::resourceIdNameToString(record2.rin, -1); + QString sRecordText3 = XPE::resourceIdNameToString(record3.rin, -1); pRecord->setText(sRecordText3); - pRecord->setData( - sRecordText1, - Qt::UserRole + FW_DEF::SECTION_DATA_VALUE1); - pRecord->setData( - sRecordText2, - Qt::UserRole + FW_DEF::SECTION_DATA_VALUE2); - pRecord->setData( - sRecordText3, - Qt::UserRole + FW_DEF::SECTION_DATA_VALUE3); - pRecord->setData( - record3.dataEntry.Size, - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); - pRecord->setData( - record3.dataEntry.OffsetToData, - Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); + pRecord->setData(sRecordText1, Qt::UserRole + FW_DEF::SECTION_DATA_VALUE1); + pRecord->setData(sRecordText2, Qt::UserRole + FW_DEF::SECTION_DATA_VALUE2); + pRecord->setData(sRecordText3, Qt::UserRole + FW_DEF::SECTION_DATA_VALUE3); + pRecord->setData(record3.dataEntry.Size, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); + pRecord->setData(record3.dataEntry.OffsetToData, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); if (g_pPE->isImage()) { - pRecord->setData( - record3.dataEntry.OffsetToData, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pRecord->setData(record3.dataEntry.OffsetToData, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); } else { - pRecord->setData( - record3.nDataOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pRecord->setData(record3.nDataOffset, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); } pSubPos->appendRow(pRecord); @@ -877,8 +605,7 @@ void PEProcessData::_process() { qint32 nNumberOfRecords = listResources.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfRecords, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfRecords, listLabels.count()); setMaximum(nNumberOfRecords); @@ -888,25 +615,15 @@ void PEProcessData::_process() { QStandardItem *pItemNumber = new QStandardItem; pItemNumber->setData(i, Qt::DisplayRole); - pItemNumber->setData( - listResources.at(i).nAddress, - Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); - pItemNumber->setData( - listResources.at(i).nOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); - pItemNumber->setData(listResources.at(i).nSize, - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); - - QString sResID1 = - XPE::resourceIdNameToString(listResources.at(i).irin[0], 0); - QString sResID2 = - XPE::resourceIdNameToString(listResources.at(i).irin[1], 1); - QString sResID3 = - XPE::resourceIdNameToString(listResources.at(i).irin[2], 2); - - pItemNumber->setData( - QString("%1_%2_%3").arg(sResID1, sResID2, sResID3), - Qt::UserRole + FW_DEF::SECTION_DATA_NAME); + pItemNumber->setData(listResources.at(i).nAddress, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); + pItemNumber->setData(listResources.at(i).nOffset, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItemNumber->setData(listResources.at(i).nSize, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); + + QString sResID1 = XPE::resourceIdNameToString(listResources.at(i).irin[0], 0); + QString sResID2 = XPE::resourceIdNameToString(listResources.at(i).irin[1], 1); + QString sResID3 = XPE::resourceIdNameToString(listResources.at(i).irin[2], 2); + + pItemNumber->setData(QString("%1_%2_%3").arg(sResID1, sResID2, sResID3), Qt::UserRole + FW_DEF::SECTION_DATA_NAME); (*g_ppModel)->setItem(i, 0, pItemNumber); @@ -915,18 +632,9 @@ void PEProcessData::_process() { (*g_ppModel)->setItem(i, 2, new QStandardItem(sResID2)); (*g_ppModel)->setItem(i, 3, new QStandardItem(sResID3)); - (*g_ppModel) - ->setItem(i, 4, - new QStandardItem(XBinary::valueToHexEx( - listResources.at(i).nAddress))); - (*g_ppModel) - ->setItem(i, 5, - new QStandardItem(XBinary::valueToHexEx( - listResources.at(i).nOffset))); - (*g_ppModel) - ->setItem(i, 6, - new QStandardItem(XBinary::valueToHexEx( - listResources.at(i).nSize))); + (*g_ppModel)->setItem(i, 4, new QStandardItem(XBinary::valueToHexEx(listResources.at(i).nAddress))); + (*g_ppModel)->setItem(i, 5, new QStandardItem(XBinary::valueToHexEx(listResources.at(i).nOffset))); + (*g_ppModel)->setItem(i, 6, new QStandardItem(XBinary::valueToHexEx(listResources.at(i).nSize))); incValue(); } @@ -938,13 +646,11 @@ void PEProcessData::_process() { listLabels.append(tr("Language")); listLabels.append(tr("String")); - QList listSTR = - g_pPE->getResourceStringTableRecords(); + QList listSTR = g_pPE->getResourceStringTableRecords(); int nNumberOfRecords = listSTR.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfRecords, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfRecords, listLabels.count()); setMaximum(nNumberOfRecords); @@ -954,24 +660,14 @@ void PEProcessData::_process() { QStandardItem *pItem = new QStandardItem; pItem->setData(i, Qt::DisplayRole); - pItem->setData(listSTR.at(i).nAddress, - Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); - pItem->setData(listSTR.at(i).nOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); - pItem->setData(listSTR.at(i).nSize, - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); + pItem->setData(listSTR.at(i).nAddress, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS); + pItem->setData(listSTR.at(i).nOffset, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pItem->setData(listSTR.at(i).nSize, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); (*g_ppModel)->setItem(i, 0, pItem); - (*g_ppModel) - ->setItem( - i, 1, - new QStandardItem(QString::number(listSTR.at(i).nID))); - (*g_ppModel) - ->setItem(i, 2, - new QStandardItem( - QString::number(listSTR.at(i).nLanguage))); - (*g_ppModel) - ->setItem(i, 3, new QStandardItem(listSTR.at(i).sString)); + (*g_ppModel)->setItem(i, 1, new QStandardItem(QString::number(listSTR.at(i).nID))); + (*g_ppModel)->setItem(i, 2, new QStandardItem(QString::number(listSTR.at(i).nLanguage))); + (*g_ppModel)->setItem(i, 3, new QStandardItem(listSTR.at(i).sString)); incValue(); } @@ -980,12 +676,9 @@ void PEProcessData::_process() { *g_ppModel = new QStandardItemModel; - XPE_DEF::IMAGE_DATA_DIRECTORY ddSecurity = - g_pPE->getOptionalHeader_DataDirectory( - XPE_DEF::S_IMAGE_DIRECTORY_ENTRY_SECURITY); + XPE_DEF::IMAGE_DATA_DIRECTORY ddSecurity = g_pPE->getOptionalHeader_DataDirectory(XPE_DEF::S_IMAGE_DIRECTORY_ENTRY_SECURITY); - QList listCert = - g_pPE->getCertList(ddSecurity.VirtualAddress, ddSecurity.Size); + QList listCert = g_pPE->getCertList(ddSecurity.VirtualAddress, ddSecurity.Size); if (listCert.count()) { int nNumberOfCerts = listCert.count(); @@ -995,19 +688,15 @@ void PEProcessData::_process() { pRoot->setText(tr("Certificate")); - pRoot->setData(listCert.at(i).record.dwLength, - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); - pRoot->setData(listCert.at(i).nOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pRoot->setData(listCert.at(i).record.dwLength, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); + pRoot->setData(listCert.at(i).nOffset, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); - int nNumberOfRecords = - listCert.at(i).certRecord.listRecords.count(); + int nNumberOfRecords = listCert.at(i).certRecord.listRecords.count(); for (qint32 j = 0; (j < nNumberOfRecords) && (isRun()); j++) { QStandardItem *pRecord = new QStandardItem; - handleCertRecord( - pRecord, listCert.at(i).certRecord.listRecords.at(j)); + handleCertRecord(pRecord, listCert.at(i).certRecord.listRecords.at(j)); pRoot->appendRow(pRecord); } @@ -1025,54 +714,20 @@ void PEProcessData::_process() { if (g_pPE->dumpToFile(sFileName, (qint64)0, g_pPE->getSize())) { XPE::XCERT_INFO xsertInfo = XPE::getCertInfo(sFileName); - (*g_ppModel) - ->appendRow(new QStandardItem(QString("%1: %2").arg( - tr("Status"), xsertInfo.sStatus))); - - if (xsertInfo.sProgramName != "") - (*g_ppModel) - ->appendRow(new QStandardItem(QString("%1: %2").arg( - tr("Program name"), xsertInfo.sProgramName))); - if (xsertInfo.sPublisher != "") - (*g_ppModel) - ->appendRow(new QStandardItem(QString("%1: %2").arg( - tr("Publisher"), xsertInfo.sPublisher))); - if (xsertInfo.sMoreInfo != "") - (*g_ppModel) - ->appendRow(new QStandardItem(QString("%1: %2").arg( - tr("More info"), xsertInfo.sMoreInfo))); + (*g_ppModel)->appendRow(new QStandardItem(QString("%1: %2").arg(tr("Status"), xsertInfo.sStatus))); + + if (xsertInfo.sProgramName != "") (*g_ppModel)->appendRow(new QStandardItem(QString("%1: %2").arg(tr("Program name"), xsertInfo.sProgramName))); + if (xsertInfo.sPublisher != "") (*g_ppModel)->appendRow(new QStandardItem(QString("%1: %2").arg(tr("Publisher"), xsertInfo.sPublisher))); + if (xsertInfo.sMoreInfo != "") (*g_ppModel)->appendRow(new QStandardItem(QString("%1: %2").arg(tr("More info"), xsertInfo.sMoreInfo))); if (xsertInfo.sSerialNumber != "") - (*g_ppModel) - ->appendRow(new QStandardItem(QString("%1: %2").arg( - tr("Serial number"), xsertInfo.sSerialNumber))); - if (xsertInfo.sIssuer != "") - (*g_ppModel) - ->appendRow(new QStandardItem(QString("%1: %2").arg( - tr("Issuer"), xsertInfo.sIssuer))); - if (xsertInfo.sSubject != "") - (*g_ppModel) - ->appendRow(new QStandardItem(QString("%1: %2").arg( - tr("Subject"), xsertInfo.sSubject))); - if (xsertInfo.sAlgorithm != "") - (*g_ppModel) - ->appendRow(new QStandardItem(QString("%1: %2").arg( - tr("Algorithm"), xsertInfo.sAlgorithm))); + (*g_ppModel)->appendRow(new QStandardItem(QString("%1: %2").arg(tr("Serial number"), xsertInfo.sSerialNumber))); + if (xsertInfo.sIssuer != "") (*g_ppModel)->appendRow(new QStandardItem(QString("%1: %2").arg(tr("Issuer"), xsertInfo.sIssuer))); + if (xsertInfo.sSubject != "") (*g_ppModel)->appendRow(new QStandardItem(QString("%1: %2").arg(tr("Subject"), xsertInfo.sSubject))); + if (xsertInfo.sAlgorithm != "") (*g_ppModel)->appendRow(new QStandardItem(QString("%1: %2").arg(tr("Algorithm"), xsertInfo.sAlgorithm))); if (xsertInfo.sTSSerialNumber != "") - (*g_ppModel) - ->appendRow(new QStandardItem( - QString("TS %1: %2") - .arg(tr("Serial number"), - xsertInfo.sTSSerialNumber))); - if (xsertInfo.sTSIssuer != "") - (*g_ppModel) - ->appendRow(new QStandardItem( - QString("TS %1: %2") - .arg(tr("Issuer"), xsertInfo.sTSIssuer))); - if (xsertInfo.sTSSubject != "") - (*g_ppModel) - ->appendRow(new QStandardItem( - QString("TS %1: %2") - .arg(tr("Subject"), xsertInfo.sTSSubject))); + (*g_ppModel)->appendRow(new QStandardItem(QString("TS %1: %2").arg(tr("Serial number"), xsertInfo.sTSSerialNumber))); + if (xsertInfo.sTSIssuer != "") (*g_ppModel)->appendRow(new QStandardItem(QString("TS %1: %2").arg(tr("Issuer"), xsertInfo.sTSIssuer))); + if (xsertInfo.sTSSubject != "") (*g_ppModel)->appendRow(new QStandardItem(QString("TS %1: %2").arg(tr("Subject"), xsertInfo.sTSSubject))); } } } else if (g_nType == SPE::TYPE_RICH) { @@ -1083,13 +738,11 @@ void PEProcessData::_process() { listLabels.append(tr("Count")); listLabels.append(""); - QList listRichSignatures = - g_pPE->getRichSignatureRecords(); + QList listRichSignatures = g_pPE->getRichSignatureRecords(); qint32 nNumberOfRecords = listRichSignatures.count(); - *g_ppModel = - new QStandardItemModel(nNumberOfRecords, listLabels.count()); + *g_ppModel = new QStandardItemModel(nNumberOfRecords, listLabels.count()); setMaximum(nNumberOfRecords); @@ -1102,23 +755,10 @@ void PEProcessData::_process() { (*g_ppModel)->setItem(i, 0, pItemNumber); // (*g_ppModel)->setItem(i,1,pItemName); - (*g_ppModel) - ->setItem(i, 1, - new QStandardItem(XBinary::valueToHex( - listRichSignatures.at(i).nId))); - (*g_ppModel) - ->setItem(i, 2, - new QStandardItem(QString::number( - listRichSignatures.at(i).nVersion))); - (*g_ppModel) - ->setItem(i, 3, - new QStandardItem(QString::number( - listRichSignatures.at(i).nCount))); - (*g_ppModel) - ->setItem(i, 4, - new QStandardItem(SpecAbstract::getMsRichString( - listRichSignatures.at(i).nId, - listRichSignatures.at(i).nVersion))); + (*g_ppModel)->setItem(i, 1, new QStandardItem(XBinary::valueToHex(listRichSignatures.at(i).nId))); + (*g_ppModel)->setItem(i, 2, new QStandardItem(QString::number(listRichSignatures.at(i).nVersion))); + (*g_ppModel)->setItem(i, 3, new QStandardItem(QString::number(listRichSignatures.at(i).nCount))); + (*g_ppModel)->setItem(i, 4, new QStandardItem(SpecAbstract::getMsRichString(listRichSignatures.at(i).nId, listRichSignatures.at(i).nVersion))); incValue(); } @@ -1129,291 +769,112 @@ void PEProcessData::ajustTableView(QWidget *pWidget, QTableView *pTableView) { XBinary::MODE mode = g_pPE->getMode(); if (g_nType == SPE::TYPE_SECTIONS) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 7, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 8, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 9, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 10, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(7, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(8, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(9, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(10, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); } else if (g_nType == SPE::TYPE_RELOCS) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGMID, - mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGMID, mode)); } else if (g_nType == SPE::TYPE_RELOCS_POSITION) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); } else if (g_nType == SPE::TYPE_IMPORT) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 7, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGMID, - mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(7, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGMID, mode)); } else if (g_nType == SPE::TYPE_IMPORT_FUNCTION) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 4, FormatWidget::getColumnWidth(pWidget, - FormatWidget::CW_STRINGLONG, mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGLONG, mode)); } else if (g_nType == SPE::TYPE_EXCEPTION) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGMID, - mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGMID, mode)); } else if (g_nType == SPE::TYPE_DELAYIMPORT) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 7, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 8, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 9, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGMID, - mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(7, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(8, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(9, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGMID, mode)); } else if (g_nType == SPE::TYPE_EXPORT_FUNCTION) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, - FormatWidget::CW_STRINGLONG, mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGLONG, mode)); } else if (g_nType == SPE::TYPE_BOUNDIMPORT) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 5, FormatWidget::getColumnWidth(pWidget, - FormatWidget::CW_STRINGLONG, mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGLONG, mode)); } else if (g_nType == SPE::TYPE_DEBUG) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 7, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 8, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(7, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(8, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); } else if (g_nType == SPE::TYPE_DELAYIMPORT_FUNCTION) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGMID, - mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGMID, mode)); } else if (g_nType == SPE::TYPE_TLSCALLBACKS) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); } else if (g_nType == SPE::TYPE_RESOURCES) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth( - pWidget, FormatWidget::CW_STRINGSHORT, mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth( - pWidget, FormatWidget::CW_STRINGSHORT, mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, - mode)); - pTableView->setColumnWidth( - 5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); - pTableView->setColumnWidth( - 6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, - mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGSHORT, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGSHORT, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINTMODE, mode)); + pTableView->setColumnWidth(5, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); + pTableView->setColumnWidth(6, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT32, mode)); } else if (g_nType == SPE::TYPE_RESOURCES) { - pTableView->setColumnWidth( - 0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, - mode)); - pTableView->setColumnWidth( - 4, FormatWidget::getColumnWidth(pWidget, - FormatWidget::CW_STRINGLONG, mode)); + pTableView->setColumnWidth(0, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(1, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(2, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(3, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_UINT16, mode)); + pTableView->setColumnWidth(4, FormatWidget::getColumnWidth(pWidget, FormatWidget::CW_STRINGLONG, mode)); } } -void PEProcessData::handleCertRecord(QStandardItem *pParent, - XPE::CERT_RECORD certRecord) { - QString sText = QString("%1 (%2)").arg( - XBinary::valueToHex(XBinary::MODE_UNKNOWN, certRecord.certTag.nTag), - XPE::certTagToString(certRecord.certTag.nTag)); +void PEProcessData::handleCertRecord(QStandardItem *pParent, XPE::CERT_RECORD certRecord) { + QString sText = QString("%1 (%2)").arg(XBinary::valueToHex(XBinary::MODE_UNKNOWN, certRecord.certTag.nTag), XPE::certTagToString(certRecord.certTag.nTag)); QString sValue = certRecord.varValue.toString(); @@ -1431,10 +892,8 @@ void PEProcessData::handleCertRecord(QStandardItem *pParent, pParent->setText(sText); - pParent->setData(certRecord.certTag.nHeaderSize + certRecord.certTag.nSize, - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); - pParent->setData(certRecord.certTag.nOffset, - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); + pParent->setData(certRecord.certTag.nHeaderSize + certRecord.certTag.nSize, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE); + pParent->setData(certRecord.certTag.nOffset, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET); int nNumberOfRecords = certRecord.listRecords.count(); diff --git a/PE/peprocessdata.h b/PE/peprocessdata.h index 39088a0f..5109c9a6 100755 --- a/PE/peprocessdata.h +++ b/PE/peprocessdata.h @@ -28,16 +28,14 @@ class PEProcessData : public ProcessData { Q_OBJECT - public: - explicit PEProcessData(int nType, QStandardItemModel **ppModel, XPE *pPE, - qint32 nNumber, qint64 nOffset, qint64 nSize, - QVariant varInfo = QVariant()); +public: + explicit PEProcessData(int nType, QStandardItemModel **ppModel, XPE *pPE, qint32 nNumber, qint64 nOffset, qint64 nSize, QVariant varInfo = QVariant()); virtual void _process(); virtual void ajustTableView(QWidget *pWidget, QTableView *pTableView); void handleCertRecord(QStandardItem *pParent, XPE::CERT_RECORD certRecord); - private: +private: int g_nType; XPE *g_pPE; QStandardItemModel **g_ppModel; diff --git a/PE/pesectionheaderwidget.cpp b/PE/pesectionheaderwidget.cpp index fc7bd479..fb0ea2ea 100644 --- a/PE/pesectionheaderwidget.cpp +++ b/PE/pesectionheaderwidget.cpp @@ -22,15 +22,11 @@ #include "ui_pesectionheaderwidget.h" -PESectionHeaderWidget::PESectionHeaderWidget(QWidget *pParent) - : FormatWidget(pParent), ui(new Ui::PESectionHeaderWidget) { +PESectionHeaderWidget::PESectionHeaderWidget(QWidget *pParent) : FormatWidget(pParent), ui(new Ui::PESectionHeaderWidget) { ui->setupUi(this); } -PESectionHeaderWidget::PESectionHeaderWidget(QIODevice *pDevice, - FW_DEF::OPTIONS options, - quint32 nNumber, qint64 nOffset, - qint32 nType, QWidget *pParent) +PESectionHeaderWidget::PESectionHeaderWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, quint32 nNumber, qint64 nOffset, qint32 nType, QWidget *pParent) : PESectionHeaderWidget(pParent) { PESectionHeaderWidget::setData(pDevice, options, nNumber, nOffset, nType); @@ -116,7 +112,9 @@ void PESectionHeaderWidget::clear() { ui->checkBoxReadonly->setChecked(true); } -void PESectionHeaderWidget::cleanup() { PESectionHeaderWidget::clear(); } +void PESectionHeaderWidget::cleanup() { + PESectionHeaderWidget::clear(); +} void PESectionHeaderWidget::reload() { PESectionHeaderWidget::clear(); @@ -126,16 +124,12 @@ void PESectionHeaderWidget::reload() { reloadData(); } -void PESectionHeaderWidget::setGlobal(XShortcuts *pShortcuts, - XOptions *pXOptions) { +void PESectionHeaderWidget::setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions) { ui->widgetHex->setGlobal(pShortcuts, pXOptions); 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, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset) { Q_UNUSED(nVtype) Q_UNUSED(nOffset) @@ -152,25 +146,15 @@ FormatWidget::SV PESectionHeaderWidget::_setValue(QVariant vValue, int nStype, case SPE::TYPE_IMAGE_SECTION_HEADER: switch (nNdata) { case N_IMAGE_SECTION_HEADER::VirtualAddress: - g_ppInvWidget - [N_IMAGE_SECTION_HEADER::INV_VirtualAddress] - ->setAddressAndSize( - &pe, - pe.getBaseAddress() + (quint32)nValue, - 0); + g_ppInvWidget[N_IMAGE_SECTION_HEADER::INV_VirtualAddress]->setAddressAndSize(&pe, pe.getBaseAddress() + (quint32)nValue, 0); break; case N_IMAGE_SECTION_HEADER::PointerToRawData: - g_ppInvWidget - [N_IMAGE_SECTION_HEADER::INV_PointerToRawData] - ->setOffsetAndSize(&pe, (quint32)nValue, 0); + g_ppInvWidget[N_IMAGE_SECTION_HEADER::INV_PointerToRawData]->setOffsetAndSize(&pe, (quint32)nValue, 0); break; case N_IMAGE_SECTION_HEADER::Characteristics: case N_IMAGE_SECTION_HEADER::Characteristics + 1: - g_ppComboBox - [N_IMAGE_SECTION_HEADER::CB_CHARACTERISTICS] - ->setValue((quint32)nValue); - g_ppComboBox[N_IMAGE_SECTION_HEADER::CB_ALIGH] - ->setValue((quint32)nValue); + g_ppComboBox[N_IMAGE_SECTION_HEADER::CB_CHARACTERISTICS]->setValue((quint32)nValue); + g_ppComboBox[N_IMAGE_SECTION_HEADER::CB_ALIGH]->setValue((quint32)nValue); break; } break; @@ -178,24 +162,13 @@ FormatWidget::SV PESectionHeaderWidget::_setValue(QVariant vValue, int nStype, case SPE::TYPE_IMPORT: switch (nNdata) { case N_IMAGE_IMPORT::OriginalFirstThunk: - g_ppInvWidget - [N_IMAGE_IMPORT::INV_OriginalFirstThunk] - ->setAddressAndSize( - &pe, - pe.getBaseAddress() + (quint32)nValue, - 0); + g_ppInvWidget[N_IMAGE_IMPORT::INV_OriginalFirstThunk]->setAddressAndSize(&pe, pe.getBaseAddress() + (quint32)nValue, 0); break; case N_IMAGE_IMPORT::Name: - g_ppInvWidget[N_IMAGE_IMPORT::INV_Name] - ->setAddressAndSize( - &pe, pe.getBaseAddress() + (quint32)nValue, - 0); + g_ppInvWidget[N_IMAGE_IMPORT::INV_Name]->setAddressAndSize(&pe, pe.getBaseAddress() + (quint32)nValue, 0); break; case N_IMAGE_IMPORT::FirstThunk: - g_ppInvWidget[N_IMAGE_IMPORT::INV_FirstThunk] - ->setAddressAndSize( - &pe, pe.getBaseAddress() + (quint32)nValue, - 0); + g_ppInvWidget[N_IMAGE_IMPORT::INV_FirstThunk]->setAddressAndSize(&pe, pe.getBaseAddress() + (quint32)nValue, 0); break; } break; @@ -203,8 +176,7 @@ FormatWidget::SV PESectionHeaderWidget::_setValue(QVariant vValue, int nStype, case SPE::TYPE_DEBUG: switch (nNdata) { case N_IMAGE_DEBUG::Type: - g_ppComboBox[N_IMAGE_DEBUG::CB_TYPE]->setValue( - (quint32)nValue); + g_ppComboBox[N_IMAGE_DEBUG::CB_TYPE]->setValue((quint32)nValue); break; } break; @@ -214,44 +186,34 @@ FormatWidget::SV PESectionHeaderWidget::_setValue(QVariant vValue, int nStype, case SPE::TYPE_IMAGE_SECTION_HEADER: switch (nNdata) { case N_IMAGE_SECTION_HEADER::Name: - pe.setSection_NameAsString((quint32)nPosition, - sValue); + pe.setSection_NameAsString((quint32)nPosition, sValue); break; case N_IMAGE_SECTION_HEADER::VirtualSize: - pe.setSection_VirtualSize((quint32)nPosition, - (quint32)nValue); + pe.setSection_VirtualSize((quint32)nPosition, (quint32)nValue); break; case N_IMAGE_SECTION_HEADER::VirtualAddress: - pe.setSection_VirtualAddress((quint32)nPosition, - (quint32)nValue); + pe.setSection_VirtualAddress((quint32)nPosition, (quint32)nValue); break; case N_IMAGE_SECTION_HEADER::SizeOfRawData: - pe.setSection_SizeOfRawData((quint32)nPosition, - (quint32)nValue); + pe.setSection_SizeOfRawData((quint32)nPosition, (quint32)nValue); break; case N_IMAGE_SECTION_HEADER::PointerToRawData: - pe.setSection_PointerToRawData((quint32)nPosition, - (quint32)nValue); + pe.setSection_PointerToRawData((quint32)nPosition, (quint32)nValue); break; case N_IMAGE_SECTION_HEADER::PointerToRelocations: - pe.setSection_PointerToRelocations( - (quint32)nPosition, (quint32)nValue); + pe.setSection_PointerToRelocations((quint32)nPosition, (quint32)nValue); break; case N_IMAGE_SECTION_HEADER::PointerToLinenumbers: - pe.setSection_PointerToLinenumbers( - (quint32)nPosition, (quint32)nValue); + pe.setSection_PointerToLinenumbers((quint32)nPosition, (quint32)nValue); break; case N_IMAGE_SECTION_HEADER::NumberOfRelocations: - pe.setSection_NumberOfRelocations( - (quint32)nPosition, (quint16)nValue); + pe.setSection_NumberOfRelocations((quint32)nPosition, (quint16)nValue); break; case N_IMAGE_SECTION_HEADER::NumberOfLinenumbers: - pe.setSection_NumberOfLinenumbers( - (quint32)nPosition, (quint16)nValue); + pe.setSection_NumberOfLinenumbers((quint32)nPosition, (quint16)nValue); break; case N_IMAGE_SECTION_HEADER::Characteristics: - pe.setSection_Characteristics((quint32)nPosition, - (quint32)nValue); + pe.setSection_Characteristics((quint32)nPosition, (quint32)nValue); break; } break; @@ -259,24 +221,19 @@ FormatWidget::SV PESectionHeaderWidget::_setValue(QVariant vValue, int nStype, case SPE::TYPE_IMPORT: switch (nNdata) { case N_IMAGE_IMPORT::OriginalFirstThunk: - pe.setImportDescriptor_OriginalFirstThunk( - nPosition, (quint32)nValue); + pe.setImportDescriptor_OriginalFirstThunk(nPosition, (quint32)nValue); break; case N_IMAGE_IMPORT::TimeDateStamp: - pe.setImportDescriptor_TimeDateStamp( - nPosition, (quint32)nValue); + pe.setImportDescriptor_TimeDateStamp(nPosition, (quint32)nValue); break; case N_IMAGE_IMPORT::ForwarderChain: - pe.setImportDescriptor_ForwarderChain( - nPosition, (quint32)nValue); + pe.setImportDescriptor_ForwarderChain(nPosition, (quint32)nValue); break; case N_IMAGE_IMPORT::Name: - pe.setImportDescriptor_Name(nPosition, - (quint32)nValue); + pe.setImportDescriptor_Name(nPosition, (quint32)nValue); break; case N_IMAGE_IMPORT::FirstThunk: - pe.setImportDescriptor_FirstThunk(nPosition, - (quint32)nValue); + pe.setImportDescriptor_FirstThunk(nPosition, (quint32)nValue); break; } break; @@ -284,35 +241,28 @@ FormatWidget::SV PESectionHeaderWidget::_setValue(QVariant vValue, int nStype, case SPE::TYPE_DEBUG: switch (nNdata) { case N_IMAGE_DEBUG::Characteristics: - pe.setDebugHeader_Characteristics(nPosition, - (quint32)nValue); + pe.setDebugHeader_Characteristics(nPosition, (quint32)nValue); break; case N_IMAGE_DEBUG::TimeDateStamp: - pe.setDebugHeader_TimeDateStamp(nPosition, - (quint32)nValue); + pe.setDebugHeader_TimeDateStamp(nPosition, (quint32)nValue); break; case N_IMAGE_DEBUG::MajorVersion: - pe.setDebugHeader_MajorVersion(nPosition, - (quint16)nValue); + pe.setDebugHeader_MajorVersion(nPosition, (quint16)nValue); break; case N_IMAGE_DEBUG::MinorVersion: - pe.setDebugHeader_MinorVersion(nPosition, - (quint16)nValue); + pe.setDebugHeader_MinorVersion(nPosition, (quint16)nValue); break; case N_IMAGE_DEBUG::Type: pe.setDebugHeader_Type(nPosition, (quint32)nValue); break; case N_IMAGE_DEBUG::SizeOfData: - pe.setDebugHeader_SizeOfData(nPosition, - (quint32)nValue); + pe.setDebugHeader_SizeOfData(nPosition, (quint32)nValue); break; case N_IMAGE_DEBUG::AddressOfRawData: - pe.setDebugHeader_AddressOfRawData(nPosition, - (quint32)nValue); + pe.setDebugHeader_AddressOfRawData(nPosition, (quint32)nValue); break; case N_IMAGE_DEBUG::PointerToRawData: - pe.setDebugHeader_PointerToRawData(nPosition, - (quint32)nValue); + pe.setDebugHeader_PointerToRawData(nPosition, (quint32)nValue); break; } break; @@ -320,8 +270,7 @@ FormatWidget::SV PESectionHeaderWidget::_setValue(QVariant vValue, int nStype, case SPE::TYPE_RELOCS: switch (nNdata) { case N_IMAGE_RELOCS::VirtualAddress: - pe.setRelocsVirtualAddress(nPosition, - (quint32)nValue); + pe.setRelocsVirtualAddress(nPosition, (quint32)nValue); break; case N_IMAGE_RELOCS::SizeOfBlock: pe.setRelocsSizeOfBlock(nPosition, (quint32)nValue); @@ -332,16 +281,13 @@ FormatWidget::SV PESectionHeaderWidget::_setValue(QVariant vValue, int nStype, case SPE::TYPE_EXCEPTION: switch (nNdata) { case N_IMAGE_EXCEPTIONS::BeginAddress: - pe.setException_BeginAddress(nPosition, - (quint32)nValue); + pe.setException_BeginAddress(nPosition, (quint32)nValue); break; case N_IMAGE_EXCEPTIONS::EndAddress: - pe.setException_EndAddress(nPosition, - (quint32)nValue); + pe.setException_EndAddress(nPosition, (quint32)nValue); break; case N_IMAGE_EXCEPTIONS::UnwindInfoAddress: - pe.setException_UnwindInfoAddress(nPosition, - (quint16)nValue); + pe.setException_UnwindInfoAddress(nPosition, (quint16)nValue); break; } break; @@ -349,36 +295,28 @@ FormatWidget::SV PESectionHeaderWidget::_setValue(QVariant vValue, int nStype, case SPE::TYPE_DELAYIMPORT: switch (nNdata) { case N_IMAGE_DELAYIMPORT::AllAttributes: - pe.setDelayImport_AllAttributes(nPosition, - (quint32)nValue); + pe.setDelayImport_AllAttributes(nPosition, (quint32)nValue); break; case N_IMAGE_DELAYIMPORT::DllNameRVA: - pe.setDelayImport_DllNameRVA(nPosition, - (quint32)nValue); + pe.setDelayImport_DllNameRVA(nPosition, (quint32)nValue); break; case N_IMAGE_DELAYIMPORT::ModuleHandleRVA: - pe.setDelayImport_ModuleHandleRVA(nPosition, - (quint32)nValue); + pe.setDelayImport_ModuleHandleRVA(nPosition, (quint32)nValue); break; case N_IMAGE_DELAYIMPORT::ImportAddressTableRVA: - pe.setDelayImport_ImportAddressTableRVA( - nPosition, (quint32)nValue); + pe.setDelayImport_ImportAddressTableRVA(nPosition, (quint32)nValue); break; case N_IMAGE_DELAYIMPORT::ImportNameTableRVA: - pe.setDelayImport_ImportNameTableRVA( - nPosition, (quint32)nValue); + pe.setDelayImport_ImportNameTableRVA(nPosition, (quint32)nValue); break; case N_IMAGE_DELAYIMPORT::BoundImportAddressTableRVA: - pe.setDelayImport_BoundImportAddressTableRVA( - nPosition, (quint32)nValue); + pe.setDelayImport_BoundImportAddressTableRVA(nPosition, (quint32)nValue); break; case N_IMAGE_DELAYIMPORT::UnloadInformationTableRVA: - pe.setDelayImport_UnloadInformationTableRVA( - nPosition, (quint32)nValue); + pe.setDelayImport_UnloadInformationTableRVA(nPosition, (quint32)nValue); break; case N_IMAGE_DELAYIMPORT::TimeDateStamp: - pe.setDelayImport_TimeDateStamp(nPosition, - (quint32)nValue); + pe.setDelayImport_TimeDateStamp(nPosition, (quint32)nValue); break; } break; @@ -386,16 +324,13 @@ FormatWidget::SV PESectionHeaderWidget::_setValue(QVariant vValue, int nStype, case SPE::TYPE_BOUNDIMPORT: switch (nNdata) { case N_IMAGE_BOUNDIMPORT::TimeDateStamp: - pe.setBoundImport_TimeDateStamp(nPosition, - (quint32)nValue); + pe.setBoundImport_TimeDateStamp(nPosition, (quint32)nValue); break; case N_IMAGE_BOUNDIMPORT::OffsetModuleName: - pe.setBoundImport_OffsetModuleName(nPosition, - (quint16)nValue); + pe.setBoundImport_OffsetModuleName(nPosition, (quint16)nValue); break; case N_IMAGE_BOUNDIMPORT::NumberOfModuleForwarderRefs: - pe.setBoundImport_NumberOfModuleForwarderRefs( - nPosition, (quint16)nValue); + pe.setBoundImport_NumberOfModuleForwarderRefs(nPosition, (quint16)nValue); break; } break; @@ -403,12 +338,10 @@ FormatWidget::SV PESectionHeaderWidget::_setValue(QVariant vValue, int nStype, case SPE::TYPE_IMAGE_DIRECTORY_ENTRIES: switch (nNdata) { case N_IMAGE_DATA_DIRECTORY::Address: - pe.setOptionalHeader_DataDirectory_VirtualAddress( - nPosition, (quint32)nValue); + pe.setOptionalHeader_DataDirectory_VirtualAddress(nPosition, (quint32)nValue); break; case N_IMAGE_DATA_DIRECTORY::Size: - pe.setOptionalHeader_DataDirectory_Size( - nPosition, (quint32)nValue); + pe.setOptionalHeader_DataDirectory_Size(nPosition, (quint32)nValue); break; } break; @@ -418,25 +351,16 @@ FormatWidget::SV PESectionHeaderWidget::_setValue(QVariant vValue, int nStype, case SPE::TYPE_IMPORT: switch (nNdata) { case N_IMAGE_IMPORT::OriginalFirstThunk: - addComment(ui->tableWidget, - N_IMAGE_IMPORT::OriginalFirstThunk, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByRelAddress( - (quint32)nValue)); + addComment(ui->tableWidget, N_IMAGE_IMPORT::OriginalFirstThunk, HEADER_COLUMN_COMMENT, + pe.getMemoryRecordInfoByRelAddress((quint32)nValue)); break; case N_IMAGE_IMPORT::Name: - addComment(ui->tableWidget, N_IMAGE_IMPORT::Name, - HEADER_COLUMN_COMMENT, - pe.read_ansiString(pe.relAddressToOffset( - (quint32)nValue))); + addComment(ui->tableWidget, N_IMAGE_IMPORT::Name, HEADER_COLUMN_COMMENT, + pe.read_ansiString(pe.relAddressToOffset((quint32)nValue))); break; break; case N_IMAGE_IMPORT::FirstThunk: - addComment(ui->tableWidget, - N_IMAGE_IMPORT::FirstThunk, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByRelAddress( - (quint32)nValue)); + addComment(ui->tableWidget, N_IMAGE_IMPORT::FirstThunk, HEADER_COLUMN_COMMENT, pe.getMemoryRecordInfoByRelAddress((quint32)nValue)); break; } break; @@ -460,87 +384,59 @@ void PESectionHeaderWidget::blockSignals(bool bState) { _blockSignals((QObject **)g_ppComboBox, g_nComboBoxSize, bState); } -void PESectionHeaderWidget::adjustHeaderTable(int nType, - QTableWidget *pTableWidget) { - XBinary::MODE mode = XPE::getMode(getDevice(), getOptions().bIsImage, - getOptions().nImageBase); +void PESectionHeaderWidget::adjustHeaderTable(int nType, QTableWidget *pTableWidget) { + XBinary::MODE mode = XPE::getMode(getDevice(), getOptions().bIsImage, getOptions().nImageBase); - pTableWidget->setColumnWidth(HEADER_COLUMN_OFFSET, - getColumnWidth(this, CW_UINT16, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_TYPE, - getColumnWidth(this, CW_TYPE, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_OFFSET, getColumnWidth(this, CW_UINT16, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_TYPE, getColumnWidth(this, CW_TYPE, mode)); switch (nType) { case SPE::TYPE_IMAGE_SECTION_HEADER: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGMID, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); break; case SPE::TYPE_IMPORT: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGMID, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); break; case SPE::TYPE_DEBUG: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGMID, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); break; case SPE::TYPE_RELOCS: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGMID, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); break; case SPE::TYPE_EXCEPTION: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGMID, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); break; case SPE::TYPE_DELAYIMPORT: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGMID, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); break; case SPE::TYPE_BOUNDIMPORT: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGMID, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); break; case SPE::TYPE_IMAGE_DIRECTORY_ENTRIES: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGMID, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); break; } } @@ -560,168 +456,104 @@ void PESectionHeaderWidget::reloadData() { if (pe.isValid()) { if (nType == SPE::TYPE_IMAGE_SECTION_HEADER) { - createHeaderTable(SPE::TYPE_IMAGE_SECTION_HEADER, ui->tableWidget, - N_IMAGE_SECTION_HEADER::records, g_ppLinedEdit, - N_IMAGE_SECTION_HEADER::__data_size + 1, - getNumber()); + createHeaderTable(SPE::TYPE_IMAGE_SECTION_HEADER, ui->tableWidget, N_IMAGE_SECTION_HEADER::records, g_ppLinedEdit, + N_IMAGE_SECTION_HEADER::__data_size + 1, getNumber()); g_ppComboBox[N_IMAGE_SECTION_HEADER::CB_CHARACTERISTICS] = - createComboBox(ui->tableWidget, - XPE::getImageSectionHeaderFlagsS(), - SPE::TYPE_IMAGE_SECTION_HEADER, - N_IMAGE_SECTION_HEADER::Characteristics, + createComboBox(ui->tableWidget, XPE::getImageSectionHeaderFlagsS(), SPE::TYPE_IMAGE_SECTION_HEADER, N_IMAGE_SECTION_HEADER::Characteristics, XComboBoxEx::CBTYPE_FLAGS); - g_ppComboBox[N_IMAGE_SECTION_HEADER::CB_ALIGH] = createComboBox( - ui->tableWidget, XPE::getImageSectionHeaderAlignsS(), - SPE::TYPE_IMAGE_SECTION_HEADER, - N_IMAGE_SECTION_HEADER::Characteristics + 1, - XComboBoxEx::CBTYPE_ELIST, XPE_DEF::S_IMAGE_SCN_ALIGN_MASK); + g_ppComboBox[N_IMAGE_SECTION_HEADER::CB_ALIGH] = + createComboBox(ui->tableWidget, XPE::getImageSectionHeaderAlignsS(), SPE::TYPE_IMAGE_SECTION_HEADER, + N_IMAGE_SECTION_HEADER::Characteristics + 1, XComboBoxEx::CBTYPE_ELIST, XPE_DEF::S_IMAGE_SCN_ALIGN_MASK); g_ppInvWidget[N_IMAGE_SECTION_HEADER::INV_VirtualAddress] = - createInvWidget(ui->tableWidget, SPE::TYPE_IMAGE_SECTION_HEADER, - N_IMAGE_SECTION_HEADER::VirtualAddress, - InvWidget::TYPE_HEX); + createInvWidget(ui->tableWidget, SPE::TYPE_IMAGE_SECTION_HEADER, N_IMAGE_SECTION_HEADER::VirtualAddress, InvWidget::TYPE_HEX); g_ppInvWidget[N_IMAGE_SECTION_HEADER::INV_PointerToRawData] = - createInvWidget(ui->tableWidget, SPE::TYPE_IMAGE_SECTION_HEADER, - N_IMAGE_SECTION_HEADER::PointerToRawData, - InvWidget::TYPE_HEX); + createInvWidget(ui->tableWidget, SPE::TYPE_IMAGE_SECTION_HEADER, N_IMAGE_SECTION_HEADER::PointerToRawData, InvWidget::TYPE_HEX); blockSignals(true); - XPE_DEF::IMAGE_SECTION_HEADER ish = - pe.getSectionHeader(getNumber()); + XPE_DEF::IMAGE_SECTION_HEADER ish = pe.getSectionHeader(getNumber()); QString sName = QString((char *)ish.Name); - sName.resize( - qMin(sName.length(), XPE_DEF::S_IMAGE_SIZEOF_SHORT_NAME)); - - g_ppLinedEdit[N_IMAGE_SECTION_HEADER::Name]->setStringValue( - sName, XPE_DEF::S_IMAGE_SIZEOF_SHORT_NAME); // TODO Check - g_ppLinedEdit[N_IMAGE_SECTION_HEADER::VirtualSize]->setValue( - ish.Misc.VirtualSize); - g_ppLinedEdit[N_IMAGE_SECTION_HEADER::VirtualAddress]->setValue( - ish.VirtualAddress); - g_ppLinedEdit[N_IMAGE_SECTION_HEADER::SizeOfRawData]->setValue( - ish.SizeOfRawData); - g_ppLinedEdit[N_IMAGE_SECTION_HEADER::PointerToRawData]->setValue( - ish.PointerToRawData); - g_ppLinedEdit[N_IMAGE_SECTION_HEADER::PointerToRelocations] - ->setValue(ish.PointerToRelocations); - g_ppLinedEdit[N_IMAGE_SECTION_HEADER::PointerToLinenumbers] - ->setValue(ish.PointerToLinenumbers); - g_ppLinedEdit[N_IMAGE_SECTION_HEADER::NumberOfRelocations] - ->setValue(ish.NumberOfRelocations); - g_ppLinedEdit[N_IMAGE_SECTION_HEADER::NumberOfLinenumbers] - ->setValue(ish.NumberOfLinenumbers); - g_ppLinedEdit[N_IMAGE_SECTION_HEADER::Characteristics]->setValue( - ish.Characteristics); - - g_ppComboBox[N_IMAGE_SECTION_HEADER::CB_CHARACTERISTICS]->setValue( - ish.Characteristics); - g_ppComboBox[N_IMAGE_SECTION_HEADER::CB_ALIGH]->setValue( - ish.Characteristics); - - g_ppInvWidget[N_IMAGE_SECTION_HEADER::INV_VirtualAddress] - ->setAddressAndSize( - &pe, pe.getBaseAddress() + ish.VirtualAddress, 0); - g_ppInvWidget[N_IMAGE_SECTION_HEADER::INV_PointerToRawData] - ->setOffsetAndSize(&pe, ish.PointerToRawData, 0); + sName.resize(qMin(sName.length(), XPE_DEF::S_IMAGE_SIZEOF_SHORT_NAME)); + + g_ppLinedEdit[N_IMAGE_SECTION_HEADER::Name]->setStringValue(sName, XPE_DEF::S_IMAGE_SIZEOF_SHORT_NAME); // TODO Check + g_ppLinedEdit[N_IMAGE_SECTION_HEADER::VirtualSize]->setValue(ish.Misc.VirtualSize); + g_ppLinedEdit[N_IMAGE_SECTION_HEADER::VirtualAddress]->setValue(ish.VirtualAddress); + g_ppLinedEdit[N_IMAGE_SECTION_HEADER::SizeOfRawData]->setValue(ish.SizeOfRawData); + g_ppLinedEdit[N_IMAGE_SECTION_HEADER::PointerToRawData]->setValue(ish.PointerToRawData); + g_ppLinedEdit[N_IMAGE_SECTION_HEADER::PointerToRelocations]->setValue(ish.PointerToRelocations); + g_ppLinedEdit[N_IMAGE_SECTION_HEADER::PointerToLinenumbers]->setValue(ish.PointerToLinenumbers); + g_ppLinedEdit[N_IMAGE_SECTION_HEADER::NumberOfRelocations]->setValue(ish.NumberOfRelocations); + g_ppLinedEdit[N_IMAGE_SECTION_HEADER::NumberOfLinenumbers]->setValue(ish.NumberOfLinenumbers); + g_ppLinedEdit[N_IMAGE_SECTION_HEADER::Characteristics]->setValue(ish.Characteristics); + + g_ppComboBox[N_IMAGE_SECTION_HEADER::CB_CHARACTERISTICS]->setValue(ish.Characteristics); + g_ppComboBox[N_IMAGE_SECTION_HEADER::CB_ALIGH]->setValue(ish.Characteristics); + + g_ppInvWidget[N_IMAGE_SECTION_HEADER::INV_VirtualAddress]->setAddressAndSize(&pe, pe.getBaseAddress() + ish.VirtualAddress, 0); + g_ppInvWidget[N_IMAGE_SECTION_HEADER::INV_PointerToRawData]->setOffsetAndSize(&pe, ish.PointerToRawData, 0); qint64 nOffset = pe.getSectionHeaderOffset(getNumber()); qint64 nSize = pe.getSectionHeaderSize(); qint64 nAddress = pe.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, - ui->widgetHex); + loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, ui->widgetHex); blockSignals(false); } else if (nType == SPE::TYPE_IMPORT) { - createHeaderTable(SPE::TYPE_IMPORT, ui->tableWidget, - N_IMAGE_IMPORT::records, g_ppLinedEdit, - N_IMAGE_IMPORT::__data_size, getNumber()); + createHeaderTable(SPE::TYPE_IMPORT, ui->tableWidget, N_IMAGE_IMPORT::records, g_ppLinedEdit, N_IMAGE_IMPORT::__data_size, getNumber()); g_ppInvWidget[N_IMAGE_IMPORT::INV_OriginalFirstThunk] = - createInvWidget(ui->tableWidget, SPE::TYPE_IMPORT, - N_IMAGE_IMPORT::OriginalFirstThunk, - InvWidget::TYPE_HEX); - g_ppInvWidget[N_IMAGE_IMPORT::INV_Name] = - createInvWidget(ui->tableWidget, SPE::TYPE_IMPORT, - N_IMAGE_IMPORT::Name, InvWidget::TYPE_HEX); - g_ppInvWidget[N_IMAGE_IMPORT::INV_FirstThunk] = createInvWidget( - ui->tableWidget, SPE::TYPE_IMPORT, N_IMAGE_IMPORT::FirstThunk, - InvWidget::TYPE_HEX); + createInvWidget(ui->tableWidget, SPE::TYPE_IMPORT, N_IMAGE_IMPORT::OriginalFirstThunk, InvWidget::TYPE_HEX); + g_ppInvWidget[N_IMAGE_IMPORT::INV_Name] = createInvWidget(ui->tableWidget, SPE::TYPE_IMPORT, N_IMAGE_IMPORT::Name, InvWidget::TYPE_HEX); + g_ppInvWidget[N_IMAGE_IMPORT::INV_FirstThunk] = createInvWidget(ui->tableWidget, SPE::TYPE_IMPORT, N_IMAGE_IMPORT::FirstThunk, InvWidget::TYPE_HEX); blockSignals(true); XBinary::_MEMORY_MAP memoryMap = pe.getMemoryMap(); - XPE_DEF::IMAGE_IMPORT_DESCRIPTOR idh = - pe.getImportDescriptor(getNumber()); + XPE_DEF::IMAGE_IMPORT_DESCRIPTOR idh = pe.getImportDescriptor(getNumber()); - g_ppLinedEdit[N_IMAGE_IMPORT::OriginalFirstThunk]->setValue( - idh.OriginalFirstThunk); - g_ppLinedEdit[N_IMAGE_IMPORT::TimeDateStamp]->setValue( - idh.TimeDateStamp); - g_ppLinedEdit[N_IMAGE_IMPORT::ForwarderChain]->setValue( - idh.ForwarderChain); + g_ppLinedEdit[N_IMAGE_IMPORT::OriginalFirstThunk]->setValue(idh.OriginalFirstThunk); + g_ppLinedEdit[N_IMAGE_IMPORT::TimeDateStamp]->setValue(idh.TimeDateStamp); + g_ppLinedEdit[N_IMAGE_IMPORT::ForwarderChain]->setValue(idh.ForwarderChain); g_ppLinedEdit[N_IMAGE_IMPORT::Name]->setValue(idh.Name); g_ppLinedEdit[N_IMAGE_IMPORT::FirstThunk]->setValue(idh.FirstThunk); - g_ppInvWidget[N_IMAGE_IMPORT::INV_OriginalFirstThunk] - ->setAddressAndSize( - &pe, pe.getBaseAddress() + idh.OriginalFirstThunk, 0); - g_ppInvWidget[N_IMAGE_IMPORT::INV_Name]->setAddressAndSize( - &pe, pe.getBaseAddress() + idh.Name, 0); - g_ppInvWidget[N_IMAGE_IMPORT::INV_FirstThunk]->setAddressAndSize( - &pe, pe.getBaseAddress() + idh.FirstThunk, 0); - - addComment(ui->tableWidget, N_IMAGE_IMPORT::OriginalFirstThunk, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByRelAddress( - &memoryMap, idh.OriginalFirstThunk)); - addComment(ui->tableWidget, N_IMAGE_IMPORT::Name, - HEADER_COLUMN_COMMENT, - pe.read_ansiString( - pe.relAddressToOffset(&memoryMap, idh.Name))); - addComment( - ui->tableWidget, N_IMAGE_IMPORT::FirstThunk, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByRelAddress(&memoryMap, idh.FirstThunk)); + g_ppInvWidget[N_IMAGE_IMPORT::INV_OriginalFirstThunk]->setAddressAndSize(&pe, pe.getBaseAddress() + idh.OriginalFirstThunk, 0); + g_ppInvWidget[N_IMAGE_IMPORT::INV_Name]->setAddressAndSize(&pe, pe.getBaseAddress() + idh.Name, 0); + g_ppInvWidget[N_IMAGE_IMPORT::INV_FirstThunk]->setAddressAndSize(&pe, pe.getBaseAddress() + idh.FirstThunk, 0); + + addComment(ui->tableWidget, N_IMAGE_IMPORT::OriginalFirstThunk, HEADER_COLUMN_COMMENT, + pe.getMemoryRecordInfoByRelAddress(&memoryMap, idh.OriginalFirstThunk)); + addComment(ui->tableWidget, N_IMAGE_IMPORT::Name, HEADER_COLUMN_COMMENT, pe.read_ansiString(pe.relAddressToOffset(&memoryMap, idh.Name))); + addComment(ui->tableWidget, N_IMAGE_IMPORT::FirstThunk, HEADER_COLUMN_COMMENT, pe.getMemoryRecordInfoByRelAddress(&memoryMap, idh.FirstThunk)); qint64 nOffset = pe.getImportDescriptorOffset(getNumber()); qint64 nSize = pe.getImportDescriptorSize(); qint64 nAddress = pe.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, - ui->widgetHex); + loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, ui->widgetHex); blockSignals(false); } else if (nType == SPE::TYPE_DEBUG) { - createHeaderTable(SPE::TYPE_DEBUG, ui->tableWidget, - N_IMAGE_DEBUG::records, g_ppLinedEdit, - N_IMAGE_DEBUG::__data_size, getNumber()); - g_ppComboBox[N_IMAGE_DEBUG::CB_TYPE] = createComboBox( - ui->tableWidget, XPE::getDebugTypesS(), SPE::TYPE_DEBUG, - N_IMAGE_DEBUG::Type, XComboBoxEx::CBTYPE_LIST); + createHeaderTable(SPE::TYPE_DEBUG, ui->tableWidget, N_IMAGE_DEBUG::records, g_ppLinedEdit, N_IMAGE_DEBUG::__data_size, getNumber()); + g_ppComboBox[N_IMAGE_DEBUG::CB_TYPE] = + createComboBox(ui->tableWidget, XPE::getDebugTypesS(), SPE::TYPE_DEBUG, N_IMAGE_DEBUG::Type, XComboBoxEx::CBTYPE_LIST); blockSignals(true); - XPE_DEF::S_IMAGE_DEBUG_DIRECTORY idd = - pe.getDebugHeader(getNumber()); - - g_ppLinedEdit[N_IMAGE_DEBUG::Characteristics]->setValue( - idd.Characteristics); - g_ppLinedEdit[N_IMAGE_DEBUG::TimeDateStamp]->setValue( - idd.TimeDateStamp); - g_ppLinedEdit[N_IMAGE_DEBUG::MajorVersion]->setValue( - idd.MajorVersion); - g_ppLinedEdit[N_IMAGE_DEBUG::MinorVersion]->setValue( - idd.MinorVersion); + XPE_DEF::S_IMAGE_DEBUG_DIRECTORY idd = pe.getDebugHeader(getNumber()); + + g_ppLinedEdit[N_IMAGE_DEBUG::Characteristics]->setValue(idd.Characteristics); + g_ppLinedEdit[N_IMAGE_DEBUG::TimeDateStamp]->setValue(idd.TimeDateStamp); + g_ppLinedEdit[N_IMAGE_DEBUG::MajorVersion]->setValue(idd.MajorVersion); + g_ppLinedEdit[N_IMAGE_DEBUG::MinorVersion]->setValue(idd.MinorVersion); g_ppLinedEdit[N_IMAGE_DEBUG::Type]->setValue(idd.Type); g_ppLinedEdit[N_IMAGE_DEBUG::SizeOfData]->setValue(idd.SizeOfData); - g_ppLinedEdit[N_IMAGE_DEBUG::AddressOfRawData]->setValue( - idd.AddressOfRawData); - g_ppLinedEdit[N_IMAGE_DEBUG::PointerToRawData]->setValue( - idd.PointerToRawData); + g_ppLinedEdit[N_IMAGE_DEBUG::AddressOfRawData]->setValue(idd.AddressOfRawData); + g_ppLinedEdit[N_IMAGE_DEBUG::PointerToRawData]->setValue(idd.PointerToRawData); g_ppComboBox[N_IMAGE_DEBUG::CB_TYPE]->setValue(idd.Type); @@ -729,14 +561,11 @@ void PESectionHeaderWidget::reloadData() { qint64 nSize = pe.getDebugHeaderSize(); qint64 nAddress = pe.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, - ui->widgetHex); + loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, ui->widgetHex); blockSignals(false); } else if (nType == SPE::TYPE_RELOCS) { - createHeaderTable(SPE::TYPE_RELOCS, ui->tableWidget, - N_IMAGE_RELOCS::records, g_ppLinedEdit, - N_IMAGE_RELOCS::__data_size, getNumber()); + createHeaderTable(SPE::TYPE_RELOCS, ui->tableWidget, N_IMAGE_RELOCS::records, g_ppLinedEdit, N_IMAGE_RELOCS::__data_size, getNumber()); blockSignals(true); @@ -745,128 +574,96 @@ void PESectionHeaderWidget::reloadData() { quint32 nVirtualAddress = pe.getRelocsVirtualAddress(nOffset); quint32 nSizeOfBlock = pe.getRelocsSizeOfBlock(nOffset); - g_ppLinedEdit[N_IMAGE_RELOCS::VirtualAddress]->setValue( - nVirtualAddress); + g_ppLinedEdit[N_IMAGE_RELOCS::VirtualAddress]->setValue(nVirtualAddress); g_ppLinedEdit[N_IMAGE_RELOCS::SizeOfBlock]->setValue(nSizeOfBlock); qint64 nSize = nSizeOfBlock; qint64 nAddress = pe.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, - ui->widgetHex); + loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, ui->widgetHex); blockSignals(false); } else if (nType == SPE::TYPE_EXCEPTION) { - createHeaderTable(SPE::TYPE_EXCEPTION, ui->tableWidget, - N_IMAGE_EXCEPTIONS::records, g_ppLinedEdit, - N_IMAGE_EXCEPTIONS::__data_size, getNumber()); + createHeaderTable(SPE::TYPE_EXCEPTION, ui->tableWidget, N_IMAGE_EXCEPTIONS::records, g_ppLinedEdit, N_IMAGE_EXCEPTIONS::__data_size, getNumber()); blockSignals(true); qint64 nOffset = pe.getExceptionRecordOffset(getNumber()); - XPE_DEF::S_IMAGE_RUNTIME_FUNCTION_ENTRY exception = - pe._read_IMAGE_RUNTIME_FUNCTION_ENTRY(nOffset); + XPE_DEF::S_IMAGE_RUNTIME_FUNCTION_ENTRY exception = pe._read_IMAGE_RUNTIME_FUNCTION_ENTRY(nOffset); - g_ppLinedEdit[N_IMAGE_EXCEPTIONS::BeginAddress]->setValue( - exception.BeginAddress); - g_ppLinedEdit[N_IMAGE_EXCEPTIONS::EndAddress]->setValue( - exception.EndAddress); - g_ppLinedEdit[N_IMAGE_EXCEPTIONS::UnwindInfoAddress]->setValue( - exception.UnwindInfoAddress); + g_ppLinedEdit[N_IMAGE_EXCEPTIONS::BeginAddress]->setValue(exception.BeginAddress); + g_ppLinedEdit[N_IMAGE_EXCEPTIONS::EndAddress]->setValue(exception.EndAddress); + g_ppLinedEdit[N_IMAGE_EXCEPTIONS::UnwindInfoAddress]->setValue(exception.UnwindInfoAddress); qint64 nSize = pe.getExceptionRecordSize(); qint64 nAddress = pe.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, - ui->widgetHex); + loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, ui->widgetHex); blockSignals(false); } else if (nType == SPE::TYPE_DELAYIMPORT) { - createHeaderTable(SPE::TYPE_DELAYIMPORT, ui->tableWidget, - N_IMAGE_DELAYIMPORT::records, g_ppLinedEdit, - N_IMAGE_DELAYIMPORT::__data_size, getNumber()); + createHeaderTable(SPE::TYPE_DELAYIMPORT, ui->tableWidget, N_IMAGE_DELAYIMPORT::records, g_ppLinedEdit, N_IMAGE_DELAYIMPORT::__data_size, + getNumber()); blockSignals(true); qint64 nOffset = pe.getDelayImportRecordOffset(getNumber()); - XPE_DEF::S_IMAGE_DELAYLOAD_DESCRIPTOR delayImport = - pe._read_IMAGE_DELAYLOAD_DESCRIPTOR(nOffset); - - g_ppLinedEdit[N_IMAGE_DELAYIMPORT::AllAttributes]->setValue( - delayImport.AllAttributes); - g_ppLinedEdit[N_IMAGE_DELAYIMPORT::DllNameRVA]->setValue( - delayImport.DllNameRVA); - g_ppLinedEdit[N_IMAGE_DELAYIMPORT::ModuleHandleRVA]->setValue( - delayImport.ModuleHandleRVA); - g_ppLinedEdit[N_IMAGE_DELAYIMPORT::ImportAddressTableRVA]->setValue( - delayImport.ImportAddressTableRVA); - g_ppLinedEdit[N_IMAGE_DELAYIMPORT::ImportNameTableRVA]->setValue( - delayImport.ImportNameTableRVA); - g_ppLinedEdit[N_IMAGE_DELAYIMPORT::BoundImportAddressTableRVA] - ->setValue(delayImport.BoundImportAddressTableRVA); - g_ppLinedEdit[N_IMAGE_DELAYIMPORT::UnloadInformationTableRVA] - ->setValue(delayImport.UnloadInformationTableRVA); - g_ppLinedEdit[N_IMAGE_DELAYIMPORT::TimeDateStamp]->setValue( - delayImport.TimeDateStamp); + XPE_DEF::S_IMAGE_DELAYLOAD_DESCRIPTOR delayImport = pe._read_IMAGE_DELAYLOAD_DESCRIPTOR(nOffset); + + g_ppLinedEdit[N_IMAGE_DELAYIMPORT::AllAttributes]->setValue(delayImport.AllAttributes); + g_ppLinedEdit[N_IMAGE_DELAYIMPORT::DllNameRVA]->setValue(delayImport.DllNameRVA); + g_ppLinedEdit[N_IMAGE_DELAYIMPORT::ModuleHandleRVA]->setValue(delayImport.ModuleHandleRVA); + g_ppLinedEdit[N_IMAGE_DELAYIMPORT::ImportAddressTableRVA]->setValue(delayImport.ImportAddressTableRVA); + g_ppLinedEdit[N_IMAGE_DELAYIMPORT::ImportNameTableRVA]->setValue(delayImport.ImportNameTableRVA); + g_ppLinedEdit[N_IMAGE_DELAYIMPORT::BoundImportAddressTableRVA]->setValue(delayImport.BoundImportAddressTableRVA); + g_ppLinedEdit[N_IMAGE_DELAYIMPORT::UnloadInformationTableRVA]->setValue(delayImport.UnloadInformationTableRVA); + g_ppLinedEdit[N_IMAGE_DELAYIMPORT::TimeDateStamp]->setValue(delayImport.TimeDateStamp); qint64 nSize = pe.getDelayImportRecordSize(); qint64 nAddress = pe.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, - ui->widgetHex); + loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, ui->widgetHex); blockSignals(false); } else if (nType == SPE::TYPE_BOUNDIMPORT) { - createHeaderTable(SPE::TYPE_BOUNDIMPORT, ui->tableWidget, - N_IMAGE_BOUNDIMPORT::records, g_ppLinedEdit, - N_IMAGE_BOUNDIMPORT::__data_size, getNumber()); + createHeaderTable(SPE::TYPE_BOUNDIMPORT, ui->tableWidget, N_IMAGE_BOUNDIMPORT::records, g_ppLinedEdit, N_IMAGE_BOUNDIMPORT::__data_size, + getNumber()); blockSignals(true); qint64 nOffset = pe.getBoundImportRecordOffset(getNumber()); - XPE_DEF::IMAGE_BOUND_IMPORT_DESCRIPTOR boundImport = - pe._read_IMAGE_BOUND_IMPORT_DESCRIPTOR(nOffset); + XPE_DEF::IMAGE_BOUND_IMPORT_DESCRIPTOR boundImport = pe._read_IMAGE_BOUND_IMPORT_DESCRIPTOR(nOffset); - g_ppLinedEdit[N_IMAGE_BOUNDIMPORT::TimeDateStamp]->setValue( - boundImport.TimeDateStamp); - g_ppLinedEdit[N_IMAGE_BOUNDIMPORT::OffsetModuleName]->setValue( - boundImport.OffsetModuleName); - g_ppLinedEdit[N_IMAGE_BOUNDIMPORT::NumberOfModuleForwarderRefs] - ->setValue(boundImport.NumberOfModuleForwarderRefs); + g_ppLinedEdit[N_IMAGE_BOUNDIMPORT::TimeDateStamp]->setValue(boundImport.TimeDateStamp); + g_ppLinedEdit[N_IMAGE_BOUNDIMPORT::OffsetModuleName]->setValue(boundImport.OffsetModuleName); + g_ppLinedEdit[N_IMAGE_BOUNDIMPORT::NumberOfModuleForwarderRefs]->setValue(boundImport.NumberOfModuleForwarderRefs); qint64 nSize = pe.getBoundImportRecordSize(); qint64 nAddress = pe.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, - ui->widgetHex); + loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, ui->widgetHex); blockSignals(false); } else if (nType == SPE::TYPE_IMAGE_DIRECTORY_ENTRIES) { - createHeaderTable(SPE::TYPE_IMAGE_DIRECTORY_ENTRIES, - ui->tableWidget, N_IMAGE_DATA_DIRECTORY::records, - g_ppLinedEdit, + createHeaderTable(SPE::TYPE_IMAGE_DIRECTORY_ENTRIES, ui->tableWidget, N_IMAGE_DATA_DIRECTORY::records, g_ppLinedEdit, N_IMAGE_DATA_DIRECTORY::__data_size, getNumber()); blockSignals(true); qint64 nOffset = pe.getDataDirectoryHeaderOffset(getNumber()); - XPE_DEF::IMAGE_DATA_DIRECTORY dataDirectory = - pe.read_IMAGE_DATA_DIRECTORY(nOffset); + XPE_DEF::IMAGE_DATA_DIRECTORY dataDirectory = pe.read_IMAGE_DATA_DIRECTORY(nOffset); - g_ppLinedEdit[N_IMAGE_DATA_DIRECTORY::Address]->setValue( - dataDirectory.VirtualAddress); - g_ppLinedEdit[N_IMAGE_DATA_DIRECTORY::Size]->setValue( - dataDirectory.Size); + g_ppLinedEdit[N_IMAGE_DATA_DIRECTORY::Address]->setValue(dataDirectory.VirtualAddress); + g_ppLinedEdit[N_IMAGE_DATA_DIRECTORY::Size]->setValue(dataDirectory.Size); qint64 nSize = pe.getDataDirectoryHeaderSize(); qint64 nAddress = pe.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, - ui->widgetHex); + loadHexSubdevice(nOffset, nSize, nAddress, &g_pSubDevice, ui->widgetHex); blockSignals(false); } @@ -885,12 +682,9 @@ void PESectionHeaderWidget::widgetValueChanged(quint64 nValue) { switch (nNdata) { case N_IMAGE_SECTION_HEADER::Characteristics: case N_IMAGE_SECTION_HEADER::Characteristics + 1: - g_ppLinedEdit[N_IMAGE_SECTION_HEADER::Characteristics] - ->setValue((quint32)nValue); - g_ppComboBox[N_IMAGE_SECTION_HEADER::CB_CHARACTERISTICS] - ->setValue(nValue); - g_ppComboBox[N_IMAGE_SECTION_HEADER::CB_ALIGH]->setValue( - nValue); + g_ppLinedEdit[N_IMAGE_SECTION_HEADER::Characteristics]->setValue((quint32)nValue); + g_ppComboBox[N_IMAGE_SECTION_HEADER::CB_CHARACTERISTICS]->setValue(nValue); + g_ppComboBox[N_IMAGE_SECTION_HEADER::CB_ALIGH]->setValue(nValue); break; } break; @@ -898,17 +692,14 @@ void PESectionHeaderWidget::widgetValueChanged(quint64 nValue) { case SPE::TYPE_DEBUG: switch (nNdata) { case N_IMAGE_DEBUG::Type: - g_ppLinedEdit[N_IMAGE_DEBUG::Type]->setValue( - (quint32)nValue); + g_ppLinedEdit[N_IMAGE_DEBUG::Type]->setValue((quint32)nValue); break; } break; } } -void PESectionHeaderWidget::on_tableWidget_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void PESectionHeaderWidget::on_tableWidget_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow) Q_UNUSED(nCurrentColumn) Q_UNUSED(nPreviousRow) diff --git a/PE/pesectionheaderwidget.h b/PE/pesectionheaderwidget.h index 288fa1d9..2919437a 100644 --- a/PE/pesectionheaderwidget.h +++ b/PE/pesectionheaderwidget.h @@ -31,34 +31,29 @@ class PESectionHeaderWidget; class PESectionHeaderWidget : public FormatWidget { Q_OBJECT - public: +public: PESectionHeaderWidget(QWidget *pParent = nullptr); - PESectionHeaderWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, - quint32 nNumber, qint64 nOffset, qint32 nType, - QWidget *pParent = nullptr); + PESectionHeaderWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, quint32 nNumber, qint64 nOffset, qint32 nType, QWidget *pParent = nullptr); ~PESectionHeaderWidget(); virtual void clear(); virtual void cleanup(); virtual void reload(); virtual void setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions); - protected: - virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, - int nPosition, qint64 nOffset); +protected: + virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset); virtual void setReadonly(bool bState); virtual void blockSignals(bool bState); virtual void adjustHeaderTable(int nType, QTableWidget *pTableWidget); virtual void _showInHexWindow(qint64 nOffset, qint64 nSize); - private slots: +private slots: void on_checkBoxReadonly_toggled(bool bChecked); void reloadData(); void widgetValueChanged(quint64 nValue); - void on_tableWidget_currentCellChanged(int nCurrentRow, int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); + void on_tableWidget_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); - private: +private: Ui::PESectionHeaderWidget *ui; XLineEditHEX **g_ppLinedEdit; int g_nLineEditSize; diff --git a/PE/pewidget.cpp b/PE/pewidget.cpp index d69ef1d5..2159f3fc 100755 --- a/PE/pewidget.cpp +++ b/PE/pewidget.cpp @@ -22,8 +22,7 @@ #include "ui_pewidget.h" -PEWidget::PEWidget(QWidget *pParent) - : FormatWidget(pParent), ui(new Ui::PEWidget) { +PEWidget::PEWidget(QWidget *pParent) : FormatWidget(pParent), ui(new Ui::PEWidget) { ui->setupUi(this); memset(g_subDevice, 0, sizeof g_subDevice); @@ -42,28 +41,25 @@ PEWidget::PEWidget(QWidget *pParent) #endif } -PEWidget::PEWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, - QWidget *pParent) - : PEWidget(pParent) { +PEWidget::PEWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, QWidget *pParent) : PEWidget(pParent) { PEWidget::setData(pDevice, options, 0, 0, 0); PEWidget::reload(); } -PEWidget::~PEWidget() { delete ui; } +PEWidget::~PEWidget() { + delete ui; +} void PEWidget::clear() { PEWidget::reset(); memset(g_lineEdit_IMAGE_DOS_HEADER, 0, sizeof g_lineEdit_IMAGE_DOS_HEADER); memset(g_lineEdit_IMAGE_NT_HEADERS, 0, sizeof g_lineEdit_IMAGE_NT_HEADERS); - memset(g_lineEdit_IMAGE_FILE_HEADER, 0, - sizeof g_lineEdit_IMAGE_FILE_HEADER); - memset(g_lineEdit_IMAGE_OPTIONAL_HEADER, 0, - sizeof g_lineEdit_IMAGE_OPTIONAL_HEADER); + memset(g_lineEdit_IMAGE_FILE_HEADER, 0, sizeof g_lineEdit_IMAGE_FILE_HEADER); + memset(g_lineEdit_IMAGE_OPTIONAL_HEADER, 0, sizeof g_lineEdit_IMAGE_OPTIONAL_HEADER); memset(g_lineEdit_TLS, 0, sizeof g_lineEdit_TLS); memset(g_lineEdit_LoadConfig, 0, sizeof g_lineEdit_LoadConfig); - memset(g_lineEdit_Version_FixedFileInfo, 0, - sizeof g_lineEdit_Version_FixedFileInfo); + memset(g_lineEdit_Version_FixedFileInfo, 0, sizeof g_lineEdit_Version_FixedFileInfo); memset(g_lineEdit_NetHeader, 0, sizeof g_lineEdit_NetHeader); memset(g_lineEdit_Net_Metadata, 0, sizeof g_lineEdit_Net_Metadata); memset(g_lineEdit_EXPORT, 0, sizeof g_lineEdit_EXPORT); @@ -73,8 +69,7 @@ void PEWidget::clear() { memset(g_dateTimeEdit, 0, sizeof g_dateTimeEdit); memset(g_invWidget, 0, sizeof g_invWidget); - _deleteSubdevices(g_subDevice, - (sizeof g_subDevice) / (sizeof(SubDevice *))); + _deleteSubdevices(g_subDevice, (sizeof g_subDevice) / (sizeof(SubDevice *))); resetWidget(); @@ -83,7 +78,9 @@ void PEWidget::clear() { ui->treeWidgetNavi->clear(); } -void PEWidget::cleanup() { PEWidget::clear(); } +void PEWidget::cleanup() { + PEWidget::clear(); +} void PEWidget::reload() { PEWidget::clear(); @@ -97,151 +94,112 @@ void PEWidget::reload() { setFileType(pe.getFileType()); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPE::TYPE_INFO, tr("Info"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPE::TYPE_VIRUSTOTAL, "VirusTotal")); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPE::TYPE_HEX, tr("Hex"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPE::TYPE_DISASM, tr("Disasm"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPE::TYPE_HASH, tr("Hash"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPE::TYPE_STRINGS, tr("Strings"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPE::TYPE_SIGNATURES, tr("Signatures"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPE::TYPE_MEMORYMAP, tr("Memory map"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPE::TYPE_ENTROPY, tr("Entropy"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPE::TYPE_HEURISTICSCAN, tr("Heuristic scan"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPE::TYPE_EXTRACTOR, tr("Extractor"))); - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPE::TYPE_IMAGE_DOS_HEADER, "IMAGE_DOS_HEADER")); - QTreeWidgetItem *pNtHeaders = - createNewItem(SPE::TYPE_IMAGE_NT_HEADERS, "IMAGE_NT_HEADERS"); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPE::TYPE_INFO, tr("Info"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPE::TYPE_VIRUSTOTAL, "VirusTotal")); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPE::TYPE_HEX, tr("Hex"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPE::TYPE_DISASM, tr("Disasm"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPE::TYPE_HASH, tr("Hash"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPE::TYPE_STRINGS, tr("Strings"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPE::TYPE_SIGNATURES, tr("Signatures"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPE::TYPE_MEMORYMAP, tr("Memory map"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPE::TYPE_ENTROPY, tr("Entropy"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPE::TYPE_HEURISTICSCAN, tr("Heuristic scan"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPE::TYPE_EXTRACTOR, tr("Extractor"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPE::TYPE_IMAGE_DOS_HEADER, "IMAGE_DOS_HEADER")); + QTreeWidgetItem *pNtHeaders = createNewItem(SPE::TYPE_IMAGE_NT_HEADERS, "IMAGE_NT_HEADERS"); ui->treeWidgetNavi->addTopLevelItem(pNtHeaders); - pNtHeaders->addChild( - createNewItem(SPE::TYPE_IMAGE_FILE_HEADER, "IMAGE_FILE_HEADER")); - QTreeWidgetItem *pOptionalHeader = createNewItem( - SPE::TYPE_IMAGE_OPTIONAL_HEADER, "IMAGE_OPTIONAL_HEADER"); + pNtHeaders->addChild(createNewItem(SPE::TYPE_IMAGE_FILE_HEADER, "IMAGE_FILE_HEADER")); + QTreeWidgetItem *pOptionalHeader = createNewItem(SPE::TYPE_IMAGE_OPTIONAL_HEADER, "IMAGE_OPTIONAL_HEADER"); pNtHeaders->addChild(pOptionalHeader); - pOptionalHeader->addChild(createNewItem( - SPE::TYPE_IMAGE_DIRECTORY_ENTRIES, "IMAGE_DIRECTORY_ENTRIES")); + pOptionalHeader->addChild(createNewItem(SPE::TYPE_IMAGE_DIRECTORY_ENTRIES, "IMAGE_DIRECTORY_ENTRIES")); if (pe.isRichSignaturePresent()) { - ui->treeWidgetNavi->addTopLevelItem(createNewItem( - SPE::TYPE_RICH, QString("Rich %1").arg(tr("Signature")))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPE::TYPE_RICH, QString("Rich %1").arg(tr("Signature")))); } if (pe.getFileHeader_NumberOfSections()) { - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPE::TYPE_SECTIONS, tr("Sections"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPE::TYPE_SECTIONS, tr("Sections"))); } if (pe.isExportPresent()) { - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPE::TYPE_EXPORT, tr("Export"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPE::TYPE_EXPORT, tr("Export"))); } if (pe.isImportPresent()) { - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPE::TYPE_IMPORT, tr("Import"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPE::TYPE_IMPORT, tr("Import"))); } if (pe.isResourcesPresent()) { - QTreeWidgetItem *pResources = - createNewItem(SPE::TYPE_RESOURCES, tr("Resources")); + QTreeWidgetItem *pResources = createNewItem(SPE::TYPE_RESOURCES, tr("Resources")); ui->treeWidgetNavi->addTopLevelItem(pResources); if (pe.isResourceStringTablePresent()) { - pResources->addChild(createNewItem( - SPE::TYPE_RESOURCES_STRINGTABLE, tr("String table"))); + pResources->addChild(createNewItem(SPE::TYPE_RESOURCES_STRINGTABLE, tr("String table"))); } if (pe.isResourceVersionPresent()) { - pResources->addChild( - createNewItem(SPE::TYPE_RESOURCES_VERSION, tr("Version"))); + pResources->addChild(createNewItem(SPE::TYPE_RESOURCES_VERSION, tr("Version"))); } if (pe.isResourceManifestPresent()) { - pResources->addChild(createNewItem(SPE::TYPE_RESOURCES_MANIFEST, - tr("Manifest"))); + pResources->addChild(createNewItem(SPE::TYPE_RESOURCES_MANIFEST, tr("Manifest"))); } } if (pe.isExceptionPresent()) { - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPE::TYPE_EXCEPTION, tr("Exceptions"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPE::TYPE_EXCEPTION, tr("Exceptions"))); } if (pe.isSignPresent()) { - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPE::TYPE_CERTIFICATE, tr("Certificate"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPE::TYPE_CERTIFICATE, tr("Certificate"))); } if (pe.isRelocsPresent()) { - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPE::TYPE_RELOCS, tr("Relocs"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPE::TYPE_RELOCS, tr("Relocs"))); } if (pe.isDebugPresent()) { - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPE::TYPE_DEBUG, tr("Debug"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPE::TYPE_DEBUG, tr("Debug"))); } if (pe.isTLSPresent()) { - QTreeWidgetItem *pTLS = - createNewItem(SPE::TYPE_TLS, QString("TLS")); + QTreeWidgetItem *pTLS = createNewItem(SPE::TYPE_TLS, QString("TLS")); ui->treeWidgetNavi->addTopLevelItem(pTLS); if (pe.isTLSCallbacksPresent(&memoryMap)) { - pTLS->addChild( - createNewItem(SPE::TYPE_TLSCALLBACKS, - QString("TLS %1").arg(tr("Callbacks")))); + pTLS->addChild(createNewItem(SPE::TYPE_TLSCALLBACKS, QString("TLS %1").arg(tr("Callbacks")))); } } if (pe.isLoadConfigPresent()) { - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPE::TYPE_LOADCONFIG, tr("Load config"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPE::TYPE_LOADCONFIG, tr("Load config"))); } if (pe.isBoundImportPresent()) { - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPE::TYPE_BOUNDIMPORT, tr("Bound import"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPE::TYPE_BOUNDIMPORT, tr("Bound import"))); } if (pe.isDelayImportPresent()) { - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPE::TYPE_DELAYIMPORT, tr("Delay import"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPE::TYPE_DELAYIMPORT, tr("Delay import"))); } if (pe.isNETPresent()) { - QTreeWidgetItem *pNetHeader = - createNewItem(SPE::TYPE_NETHEADER, QString(".NET")); + QTreeWidgetItem *pNetHeader = createNewItem(SPE::TYPE_NETHEADER, QString(".NET")); ui->treeWidgetNavi->addTopLevelItem(pNetHeader); XPE::CLI_INFO cliInfo = pe.getCliInfo(true); if (pe.isNetMetadataPresent(&cliInfo, &memoryMap)) { - QTreeWidgetItem *pNetMetadata = - createNewItem(SPE::TYPE_NET_METADATA, tr("Metadata")); + QTreeWidgetItem *pNetMetadata = createNewItem(SPE::TYPE_NET_METADATA, tr("Metadata")); pNetHeader->addChild(pNetMetadata); qint32 nNumberOfStreams = cliInfo.metaData.listStreams.count(); for (qint32 i = 0; i < nNumberOfStreams; i++) { - pNetMetadata->addChild(createNewItem( - SPE::TYPE_NET_METADATA_STREAM, - cliInfo.metaData.listStreams.at(i).sName, - cliInfo.metaData.listStreams.at(i).nOffset, - cliInfo.metaData.listStreams.at(i).nSize)); + pNetMetadata->addChild(createNewItem(SPE::TYPE_NET_METADATA_STREAM, cliInfo.metaData.listStreams.at(i).sName, + cliInfo.metaData.listStreams.at(i).nOffset, cliInfo.metaData.listStreams.at(i).nSize)); } } @@ -250,8 +208,7 @@ void PEWidget::reload() { } if (pe.isOverlayPresent()) { - ui->treeWidgetNavi->addTopLevelItem( - createNewItem(SPE::TYPE_OVERLAY, tr("Overlay"))); + ui->treeWidgetNavi->addTopLevelItem(createNewItem(SPE::TYPE_OVERLAY, tr("Overlay"))); } ui->treeWidgetNavi->expandAll(); @@ -262,9 +219,7 @@ void PEWidget::reload() { } } -FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, - int nVtype, int nPosition, - qint64 nOffset) { +FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset) { Q_UNUSED(nVtype) Q_UNUSED(nPosition) Q_UNUSED(nOffset) @@ -284,12 +239,10 @@ FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SPE::TYPE_IMAGE_DOS_HEADER: switch (nNdata) { case N_IMAGE_DOS_HEADER::e_magic: - g_comboBox[CB_IMAGE_DOS_HEADER_e_magic]->setValue( - nValue); + g_comboBox[CB_IMAGE_DOS_HEADER_e_magic]->setValue(nValue); break; case N_IMAGE_DOS_HEADER::e_lfanew: - g_invWidget[INV_IMAGE_DOS_HEADER_e_lfanew] - ->setOffsetAndSize(&pe, (quint32)nValue, 0); + g_invWidget[INV_IMAGE_DOS_HEADER_e_lfanew]->setOffsetAndSize(&pe, (quint32)nValue, 0); break; } break; @@ -297,8 +250,7 @@ FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SPE::TYPE_IMAGE_NT_HEADERS: switch (nNdata) { case N_IMAGE_NT_HEADERS::Signature: - g_comboBox[CB_IMAGE_NT_HEADERS_Signature]->setValue( - nValue); + g_comboBox[CB_IMAGE_NT_HEADERS_Signature]->setValue(nValue); break; } break; @@ -306,24 +258,16 @@ FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SPE::TYPE_IMAGE_FILE_HEADER: switch (nNdata) { case N_IMAGE_FILE_HEADER::Machine: - g_comboBox[CB_IMAGE_FILE_HEADER_Machine]->setValue( - nValue); + g_comboBox[CB_IMAGE_FILE_HEADER_Machine]->setValue(nValue); break; case N_IMAGE_FILE_HEADER::TimeDateStamp: - g_dateTimeEdit[TD_IMAGE_FILE_HEADER_TimeDateStamp] - ->setValue(nValue); + g_dateTimeEdit[TD_IMAGE_FILE_HEADER_TimeDateStamp]->setValue(nValue); break; case N_IMAGE_FILE_HEADER::PointerToSymbolTable: - g_invWidget - [INV_IMAGE_FILE_HEADER_PointerToSymbolTable] - ->setAddressAndSize( - &pe, - pe.getBaseAddress() + (quint32)nValue, - 0); + g_invWidget[INV_IMAGE_FILE_HEADER_PointerToSymbolTable]->setAddressAndSize(&pe, pe.getBaseAddress() + (quint32)nValue, 0); break; case N_IMAGE_FILE_HEADER::Characteristics: - g_comboBox[CB_IMAGE_FILE_HEADER_Characteristics] - ->setValue(nValue); + g_comboBox[CB_IMAGE_FILE_HEADER_Characteristics]->setValue(nValue); break; } break; @@ -331,47 +275,28 @@ FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SPE::TYPE_IMAGE_OPTIONAL_HEADER: switch (nNdata) { case N_IMAGE_OPTIONAL_HEADER::Magic: - g_comboBox[CB_IMAGE_OPTIONAL_HEADER_Magic] - ->setValue(nValue); + g_comboBox[CB_IMAGE_OPTIONAL_HEADER_Magic]->setValue(nValue); break; case N_IMAGE_OPTIONAL_HEADER::AddressOfEntryPoint: - g_invWidget - [INV_IMAGE_OPTIONAL_HEADER_AddressOfEntryPoint] - ->setAddressAndSize( - &pe, - pe.getBaseAddress() + (quint32)nValue, - 0); + g_invWidget[INV_IMAGE_OPTIONAL_HEADER_AddressOfEntryPoint]->setAddressAndSize(&pe, pe.getBaseAddress() + (quint32)nValue, 0); break; case N_IMAGE_OPTIONAL_HEADER::BaseOfCode: - g_invWidget[INV_IMAGE_OPTIONAL_HEADER_BaseOfCode] - ->setAddressAndSize( - &pe, pe.getBaseAddress() + (quint32)nValue, - 0); + g_invWidget[INV_IMAGE_OPTIONAL_HEADER_BaseOfCode]->setAddressAndSize(&pe, pe.getBaseAddress() + (quint32)nValue, 0); break; case N_IMAGE_OPTIONAL_HEADER::BaseOfData: - g_invWidget[INV_IMAGE_OPTIONAL_HEADER_BaseOfData] - ->setAddressAndSize( - &pe, pe.getBaseAddress() + (quint32)nValue, - 0); + g_invWidget[INV_IMAGE_OPTIONAL_HEADER_BaseOfData]->setAddressAndSize(&pe, pe.getBaseAddress() + (quint32)nValue, 0); break; case N_IMAGE_OPTIONAL_HEADER::Subsystem: - g_comboBox[CB_IMAGE_OPTIONAL_HEADER_Subsystem] - ->setValue(nValue); + g_comboBox[CB_IMAGE_OPTIONAL_HEADER_Subsystem]->setValue(nValue); break; case N_IMAGE_OPTIONAL_HEADER::DllCharacteristics: - g_comboBox - [CB_IMAGE_OPTIONAL_HEADER_DllCharacteristics] - ->setValue(nValue); - break; - case N_IMAGE_OPTIONAL_HEADER:: - MajorOperatingSystemVersion: - case N_IMAGE_OPTIONAL_HEADER:: - MinorOperatingSystemVersion: + g_comboBox[CB_IMAGE_OPTIONAL_HEADER_DllCharacteristics]->setValue(nValue); + break; + case N_IMAGE_OPTIONAL_HEADER::MajorOperatingSystemVersion: + case N_IMAGE_OPTIONAL_HEADER::MinorOperatingSystemVersion: case N_IMAGE_OPTIONAL_HEADER::OperatingSystemVersion: quint32 nVersion = pe.getOperatingSystemVersion(); - g_comboBox - [CB_IMAGE_OPTIONAL_HEADER_OperationSystemVersion] - ->setValue(nVersion); + g_comboBox[CB_IMAGE_OPTIONAL_HEADER_OperationSystemVersion]->setValue(nVersion); break; } break; @@ -379,32 +304,19 @@ FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SPE::TYPE_EXPORT: switch (nNdata) { case N_IMAGE_EXPORT::TimeDateStamp: - g_dateTimeEdit[TD_IMAGE_EXPORT_TimeDateStamp] - ->setValue(nValue); + g_dateTimeEdit[TD_IMAGE_EXPORT_TimeDateStamp]->setValue(nValue); break; case N_IMAGE_EXPORT::Name: - g_invWidget[INV_IMAGE_EXPORT_Name] - ->setAddressAndSize( - &pe, pe.getBaseAddress() + (quint32)nValue, - 0); + g_invWidget[INV_IMAGE_EXPORT_Name]->setAddressAndSize(&pe, pe.getBaseAddress() + (quint32)nValue, 0); break; case N_IMAGE_EXPORT::AddressOfFunctions: - g_invWidget[INV_IMAGE_EXPORT_AddressOfFunctions] - ->setAddressAndSize( - &pe, pe.getBaseAddress() + (quint32)nValue, - 0); + g_invWidget[INV_IMAGE_EXPORT_AddressOfFunctions]->setAddressAndSize(&pe, pe.getBaseAddress() + (quint32)nValue, 0); break; case N_IMAGE_EXPORT::AddressOfNames: - g_invWidget[INV_IMAGE_EXPORT_AddressOfNames] - ->setAddressAndSize( - &pe, pe.getBaseAddress() + (quint32)nValue, - 0); + g_invWidget[INV_IMAGE_EXPORT_AddressOfNames]->setAddressAndSize(&pe, pe.getBaseAddress() + (quint32)nValue, 0); break; case N_IMAGE_EXPORT::AddressOfNameOrdinals: - g_invWidget[INV_IMAGE_EXPORT_AddressOfNameOrdinals] - ->setAddressAndSize( - &pe, pe.getBaseAddress() + (quint32)nValue, - 0); + g_invWidget[INV_IMAGE_EXPORT_AddressOfNameOrdinals]->setAddressAndSize(&pe, pe.getBaseAddress() + (quint32)nValue, 0); break; } break; @@ -412,20 +324,16 @@ FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SPE::TYPE_TLS: switch (nNdata) { case N_IMAGE_TLS::StartAddressOfRawData: - g_invWidget[INV_IMAGE_TLS_StartAddressOfRawData] - ->setAddressAndSize(&pe, (quint64)nValue, 0); + g_invWidget[INV_IMAGE_TLS_StartAddressOfRawData]->setAddressAndSize(&pe, (quint64)nValue, 0); break; case N_IMAGE_TLS::EndAddressOfRawData: - g_invWidget[INV_IMAGE_TLS_EndAddressOfRawData] - ->setAddressAndSize(&pe, (quint64)nValue, 0); + g_invWidget[INV_IMAGE_TLS_EndAddressOfRawData]->setAddressAndSize(&pe, (quint64)nValue, 0); break; case N_IMAGE_TLS::AddressOfIndex: - g_invWidget[INV_IMAGE_TLS_AddressOfIndex] - ->setAddressAndSize(&pe, (quint64)nValue, 0); + g_invWidget[INV_IMAGE_TLS_AddressOfIndex]->setAddressAndSize(&pe, (quint64)nValue, 0); break; case N_IMAGE_TLS::AddressOfCallBacks: - g_invWidget[INV_IMAGE_TLS_AddressOfCallBacks] - ->setAddressAndSize(&pe, (quint64)nValue, 0); + g_invWidget[INV_IMAGE_TLS_AddressOfCallBacks]->setAddressAndSize(&pe, (quint64)nValue, 0); break; } break; @@ -433,8 +341,7 @@ FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SPE::TYPE_NETHEADER: switch (nNdata) { case N_IMAGE_NETHEADER::Flags: - g_comboBox[CB_IMAGE_NETHEADER_FLAGS]->setValue( - (quint32)nValue); + g_comboBox[CB_IMAGE_NETHEADER_FLAGS]->setValue((quint32)nValue); break; } break; @@ -442,20 +349,16 @@ FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SPE::TYPE_RESOURCES_VERSION: switch (nNdata) { case N_IMAGE_RESOURCE_FIXEDFILEINFO::dwSignature: - g_comboBox[CB_RESOURCES_VERSION_dwSignature] - ->setValue((quint32)nValue); + g_comboBox[CB_RESOURCES_VERSION_dwSignature]->setValue((quint32)nValue); break; case N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileFlags: - g_comboBox[CB_RESOURCES_VERSION_dwFileFlags] - ->setValue((quint32)nValue); + g_comboBox[CB_RESOURCES_VERSION_dwFileFlags]->setValue((quint32)nValue); break; case N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileOS: - g_comboBox[CB_RESOURCES_VERSION_dwFileOS]->setValue( - (quint32)nValue); + g_comboBox[CB_RESOURCES_VERSION_dwFileOS]->setValue((quint32)nValue); break; case N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileType: - g_comboBox[CB_RESOURCES_VERSION_dwFileType] - ->setValue((quint32)nValue); + g_comboBox[CB_RESOURCES_VERSION_dwFileType]->setValue((quint32)nValue); break; } break; @@ -463,30 +366,19 @@ FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SPE::TYPE_LOADCONFIG: switch (nNdata) { case N_IMAGE_LOADCONFIG::SecurityCookie: - g_invWidget[INV_IMAGE_LOADCONFIG_SecurityCookie] - ->setAddressAndSize(&pe, (quint64)nValue, 0); + g_invWidget[INV_IMAGE_LOADCONFIG_SecurityCookie]->setAddressAndSize(&pe, (quint64)nValue, 0); break; case N_IMAGE_LOADCONFIG::SEHandlerTable: - g_invWidget[INV_IMAGE_LOADCONFIG_SEHandlerTable] - ->setAddressAndSize(&pe, (quint64)nValue, 0); + g_invWidget[INV_IMAGE_LOADCONFIG_SEHandlerTable]->setAddressAndSize(&pe, (quint64)nValue, 0); break; case N_IMAGE_LOADCONFIG::GuardCFCheckFunctionPointer: - g_invWidget - [INV_IMAGE_LOADCONFIG_GuardCFCheckFunctionPointer] - ->setAddressAndSize(&pe, (quint64)nValue, - 0); + g_invWidget[INV_IMAGE_LOADCONFIG_GuardCFCheckFunctionPointer]->setAddressAndSize(&pe, (quint64)nValue, 0); break; case N_IMAGE_LOADCONFIG::GuardCFDispatchFunctionPointer: - g_invWidget - [INV_IMAGE_LOADCONFIG_GuardCFDispatchFunctionPointer] - ->setAddressAndSize(&pe, (quint64)nValue, - 0); + g_invWidget[INV_IMAGE_LOADCONFIG_GuardCFDispatchFunctionPointer]->setAddressAndSize(&pe, (quint64)nValue, 0); break; case N_IMAGE_LOADCONFIG::GuardMemcpyFunctionPointer: - g_invWidget - [INV_IMAGE_LOADCONFIG_GuardMemcpyFunctionPointer] - ->setAddressAndSize(&pe, (quint64)nValue, - 0); + g_invWidget[INV_IMAGE_LOADCONFIG_GuardMemcpyFunctionPointer]->setAddressAndSize(&pe, (quint64)nValue, 0); break; } break; @@ -615,15 +507,13 @@ FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, pe.setFileHeader_TimeDateStamp((quint32)nValue); break; case N_IMAGE_FILE_HEADER::PointerToSymbolTable: - pe.setFileHeader_PointerToSymbolTable( - (quint32)nValue); + pe.setFileHeader_PointerToSymbolTable((quint32)nValue); break; case N_IMAGE_FILE_HEADER::NumberOfSymbols: pe.setFileHeader_NumberOfSymbols((quint32)nValue); break; case N_IMAGE_FILE_HEADER::SizeOfOptionalHeader: - pe.setFileHeader_SizeOfOptionalHeader( - (quint16)nValue); + pe.setFileHeader_SizeOfOptionalHeader((quint16)nValue); break; case N_IMAGE_FILE_HEADER::Characteristics: pe.setFileHeader_Characteristics((quint16)nValue); @@ -639,27 +529,22 @@ FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, pe.setOptionalHeader_Magic((quint16)nValue); break; case N_IMAGE_OPTIONAL_HEADER::MajorLinkerVersion: - pe.setOptionalHeader_MajorLinkerVersion( - (quint8)nValue); + pe.setOptionalHeader_MajorLinkerVersion((quint8)nValue); break; case N_IMAGE_OPTIONAL_HEADER::MinorLinkerVersion: - pe.setOptionalHeader_MinorLinkerVersion( - (quint8)nValue); + pe.setOptionalHeader_MinorLinkerVersion((quint8)nValue); break; case N_IMAGE_OPTIONAL_HEADER::SizeOfCode: pe.setOptionalHeader_SizeOfCode((quint32)nValue); break; case N_IMAGE_OPTIONAL_HEADER::SizeOfInitializedData: - pe.setOptionalHeader_SizeOfInitializedData( - (quint32)nValue); + pe.setOptionalHeader_SizeOfInitializedData((quint32)nValue); break; case N_IMAGE_OPTIONAL_HEADER::SizeOfUninitializedData: - pe.setOptionalHeader_SizeOfUninitializedData( - (quint32)nValue); + pe.setOptionalHeader_SizeOfUninitializedData((quint32)nValue); break; case N_IMAGE_OPTIONAL_HEADER::AddressOfEntryPoint: - pe.setOptionalHeader_AddressOfEntryPoint( - (quint32)nValue); + pe.setOptionalHeader_AddressOfEntryPoint((quint32)nValue); break; case N_IMAGE_OPTIONAL_HEADER::BaseOfCode: pe.setOptionalHeader_BaseOfCode((quint32)nValue); @@ -671,41 +556,31 @@ FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, pe.setOptionalHeader_ImageBase((quint64)nValue); break; case N_IMAGE_OPTIONAL_HEADER::SectionAlignment: - pe.setOptionalHeader_SectionAlignment( - (quint32)nValue); + pe.setOptionalHeader_SectionAlignment((quint32)nValue); break; case N_IMAGE_OPTIONAL_HEADER::FileAlignment: pe.setOptionalHeader_FileAlignment((quint32)nValue); break; - case N_IMAGE_OPTIONAL_HEADER:: - MajorOperatingSystemVersion: - pe.setOptionalHeader_MajorOperatingSystemVersion( - (quint16)nValue); + case N_IMAGE_OPTIONAL_HEADER::MajorOperatingSystemVersion: + pe.setOptionalHeader_MajorOperatingSystemVersion((quint16)nValue); break; - case N_IMAGE_OPTIONAL_HEADER:: - MinorOperatingSystemVersion: - pe.setOptionalHeader_MinorOperatingSystemVersion( - (quint16)nValue); + case N_IMAGE_OPTIONAL_HEADER::MinorOperatingSystemVersion: + pe.setOptionalHeader_MinorOperatingSystemVersion((quint16)nValue); break; case N_IMAGE_OPTIONAL_HEADER::MajorImageVersion: - pe.setOptionalHeader_MajorImageVersion( - (quint16)nValue); + pe.setOptionalHeader_MajorImageVersion((quint16)nValue); break; case N_IMAGE_OPTIONAL_HEADER::MinorImageVersion: - pe.setOptionalHeader_MinorImageVersion( - (quint16)nValue); + pe.setOptionalHeader_MinorImageVersion((quint16)nValue); break; case N_IMAGE_OPTIONAL_HEADER::MajorSubsystemVersion: - pe.setOptionalHeader_MajorSubsystemVersion( - (quint16)nValue); + pe.setOptionalHeader_MajorSubsystemVersion((quint16)nValue); break; case N_IMAGE_OPTIONAL_HEADER::MinorSubsystemVersion: - pe.setOptionalHeader_MinorSubsystemVersion( - (quint16)nValue); + pe.setOptionalHeader_MinorSubsystemVersion((quint16)nValue); break; case N_IMAGE_OPTIONAL_HEADER::Win32VersionValue: - pe.setOptionalHeader_Win32VersionValue( - (quint16)nValue); + pe.setOptionalHeader_Win32VersionValue((quint16)nValue); break; case N_IMAGE_OPTIONAL_HEADER::SizeOfImage: pe.setOptionalHeader_SizeOfImage((quint32)nValue); @@ -720,31 +595,25 @@ FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, pe.setOptionalHeader_Subsystem((quint16)nValue); break; case N_IMAGE_OPTIONAL_HEADER::DllCharacteristics: - pe.setOptionalHeader_DllCharacteristics( - (quint16)nValue); + pe.setOptionalHeader_DllCharacteristics((quint16)nValue); break; case N_IMAGE_OPTIONAL_HEADER::SizeOfStackReserve: - pe.setOptionalHeader_SizeOfStackReserve( - (quint64)nValue); + pe.setOptionalHeader_SizeOfStackReserve((quint64)nValue); break; case N_IMAGE_OPTIONAL_HEADER::SizeOfStackCommit: - pe.setOptionalHeader_SizeOfStackCommit( - (quint64)nValue); + pe.setOptionalHeader_SizeOfStackCommit((quint64)nValue); break; case N_IMAGE_OPTIONAL_HEADER::SizeOfHeapReserve: - pe.setOptionalHeader_SizeOfHeapReserve( - (quint64)nValue); + pe.setOptionalHeader_SizeOfHeapReserve((quint64)nValue); break; case N_IMAGE_OPTIONAL_HEADER::SizeOfHeapCommit: - pe.setOptionalHeader_SizeOfHeapCommit( - (quint64)nValue); + pe.setOptionalHeader_SizeOfHeapCommit((quint64)nValue); break; case N_IMAGE_OPTIONAL_HEADER::LoaderFlags: pe.setOptionalHeader_LoaderFlags((quint32)nValue); break; case N_IMAGE_OPTIONAL_HEADER::NumberOfRvaAndSizes: - pe.setOptionalHeader_NumberOfRvaAndSizes( - (quint32)nValue); + pe.setOptionalHeader_NumberOfRvaAndSizes((quint32)nValue); break; // Extra case N_IMAGE_OPTIONAL_HEADER::OperatingSystemVersion: @@ -758,12 +627,10 @@ FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SPE::TYPE_EXPORT: switch (nNdata) { case N_IMAGE_EXPORT::Characteristics: - pe.setExportDirectory_Characteristics( - (quint32)nValue); + pe.setExportDirectory_Characteristics((quint32)nValue); break; case N_IMAGE_EXPORT::TimeDateStamp: - pe.setExportDirectory_TimeDateStamp( - (quint32)nValue); + pe.setExportDirectory_TimeDateStamp((quint32)nValue); break; case N_IMAGE_EXPORT::MajorVersion: pe.setExportDirectory_MajorVersion((quint16)nValue); @@ -778,24 +645,19 @@ FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, pe.setExportDirectory_Base((quint32)nValue); break; case N_IMAGE_EXPORT::NumberOfFunctions: - pe.setExportDirectory_NumberOfFunctions( - (quint32)nValue); + pe.setExportDirectory_NumberOfFunctions((quint32)nValue); break; case N_IMAGE_EXPORT::NumberOfNames: - pe.setExportDirectory_NumberOfNames( - (quint32)nValue); + pe.setExportDirectory_NumberOfNames((quint32)nValue); break; case N_IMAGE_EXPORT::AddressOfFunctions: - pe.setExportDirectory_AddressOfFunctions( - (quint32)nValue); + pe.setExportDirectory_AddressOfFunctions((quint32)nValue); break; case N_IMAGE_EXPORT::AddressOfNames: - pe.setExportDirectory_AddressOfNames( - (quint32)nValue); + pe.setExportDirectory_AddressOfNames((quint32)nValue); break; case N_IMAGE_EXPORT::AddressOfNameOrdinals: - pe.setExportDirectory_AddressOfNameOrdinals( - (quint32)nValue); + pe.setExportDirectory_AddressOfNameOrdinals((quint32)nValue); break; } break; @@ -834,24 +696,19 @@ FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, pe.setFixedFileInfo_dwStrucVersion((quint32)nValue); break; case N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileVersionMS: - pe.setFixedFileInfo_dwFileVersionMS( - (quint32)nValue); + pe.setFixedFileInfo_dwFileVersionMS((quint32)nValue); break; case N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileVersionLS: - pe.setFixedFileInfo_dwFileVersionLS( - (quint32)nValue); + pe.setFixedFileInfo_dwFileVersionLS((quint32)nValue); break; case N_IMAGE_RESOURCE_FIXEDFILEINFO::dwProductVersionMS: - pe.setFixedFileInfo_dwProductVersionMS( - (quint32)nValue); + pe.setFixedFileInfo_dwProductVersionMS((quint32)nValue); break; case N_IMAGE_RESOURCE_FIXEDFILEINFO::dwProductVersionLS: - pe.setFixedFileInfo_dwProductVersionLS( - (quint32)nValue); + pe.setFixedFileInfo_dwProductVersionLS((quint32)nValue); break; case N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileFlagsMask: - pe.setFixedFileInfo_dwFileFlagsMask( - (quint32)nValue); + pe.setFixedFileInfo_dwFileFlagsMask((quint32)nValue); break; case N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileFlags: pe.setFixedFileInfo_dwFileFlags((quint32)nValue); @@ -880,12 +737,10 @@ FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, pe.setNetHeader_cb((quint32)nValue); break; case N_IMAGE_NETHEADER::MinorRuntimeVersion: - pe.setNetHeader_MinorRuntimeVersion( - (quint16)nValue); + pe.setNetHeader_MinorRuntimeVersion((quint16)nValue); break; case N_IMAGE_NETHEADER::MajorRuntimeVersion: - pe.setNetHeader_MajorRuntimeVersion( - (quint16)nValue); + pe.setNetHeader_MajorRuntimeVersion((quint16)nValue); break; case N_IMAGE_NETHEADER::MetaData_Address: pe.setNetHeader_MetaData_Address((quint32)nValue); @@ -906,43 +761,34 @@ FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, pe.setNetHeader_Resources_Size((quint32)nValue); break; case N_IMAGE_NETHEADER::StrongNameSignature_Address: - pe.setNetHeader_StrongNameSignature_Address( - (quint32)nValue); + pe.setNetHeader_StrongNameSignature_Address((quint32)nValue); break; case N_IMAGE_NETHEADER::StrongNameSignature_Size: - pe.setNetHeader_StrongNameSignature_Size( - (quint32)nValue); + pe.setNetHeader_StrongNameSignature_Size((quint32)nValue); break; case N_IMAGE_NETHEADER::CodeManagerTable_Address: - pe.setNetHeader_CodeManagerTable_Address( - (quint32)nValue); + pe.setNetHeader_CodeManagerTable_Address((quint32)nValue); break; case N_IMAGE_NETHEADER::CodeManagerTable_Size: - pe.setNetHeader_CodeManagerTable_Size( - (quint32)nValue); + pe.setNetHeader_CodeManagerTable_Size((quint32)nValue); break; case N_IMAGE_NETHEADER::VTableFixups_Address: - pe.setNetHeader_VTableFixups_Address( - (quint32)nValue); + pe.setNetHeader_VTableFixups_Address((quint32)nValue); break; case N_IMAGE_NETHEADER::VTableFixups_Size: pe.setNetHeader_VTableFixups_Size((quint32)nValue); break; case N_IMAGE_NETHEADER::ExportAddressTableJumps_Address: - pe.setNetHeader_ExportAddressTableJumps_Address( - (quint32)nValue); + pe.setNetHeader_ExportAddressTableJumps_Address((quint32)nValue); break; case N_IMAGE_NETHEADER::ExportAddressTableJumps_Size: - pe.setNetHeader_ExportAddressTableJumps_Size( - (quint32)nValue); + pe.setNetHeader_ExportAddressTableJumps_Size((quint32)nValue); break; case N_IMAGE_NETHEADER::ManagedNativeHeader_Address: - pe.setNetHeader_ManagedNativeHeader_Address( - (quint32)nValue); + pe.setNetHeader_ManagedNativeHeader_Address((quint32)nValue); break; case N_IMAGE_NETHEADER::ManagedNativeHeader_Size: - pe.setNetHeader_ManagedNativeHeader_Size( - (quint32)nValue); + pe.setNetHeader_ManagedNativeHeader_Size((quint32)nValue); break; } @@ -964,8 +810,7 @@ FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, pe.setMetadataHeader_Reserved((quint32)nValue); break; case N_IMAGE_NET_METADATA::VersionStringLength: - pe.setMetadataHeader_VersionStringLength( - (quint32)nValue); + pe.setMetadataHeader_VersionStringLength((quint32)nValue); break; // TODO reload!!! case N_IMAGE_NET_METADATA::Version: pe.setMetadataHeader_Version(sValue); @@ -1002,38 +847,31 @@ FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, pe.setLoadConfig_GlobalFlagsSet((quint32)nValue); break; case N_IMAGE_LOADCONFIG::CriticalSectionDefaultTimeout: - pe.setLoadConfig_CriticalSectionDefaultTimeout( - (quint32)nValue); + pe.setLoadConfig_CriticalSectionDefaultTimeout((quint32)nValue); break; case N_IMAGE_LOADCONFIG::DeCommitFreeBlockThreshold: - pe.setLoadConfig_DeCommitFreeBlockThreshold( - (quint64)nValue); + pe.setLoadConfig_DeCommitFreeBlockThreshold((quint64)nValue); break; case N_IMAGE_LOADCONFIG::DeCommitTotalFreeThreshold: - pe.setLoadConfig_DeCommitTotalFreeThreshold( - (quint64)nValue); + pe.setLoadConfig_DeCommitTotalFreeThreshold((quint64)nValue); break; case N_IMAGE_LOADCONFIG::LockPrefixTable: pe.setLoadConfig_LockPrefixTable((quint64)nValue); break; case N_IMAGE_LOADCONFIG::MaximumAllocationSize: - pe.setLoadConfig_MaximumAllocationSize( - (quint64)nValue); + pe.setLoadConfig_MaximumAllocationSize((quint64)nValue); break; case N_IMAGE_LOADCONFIG::VirtualMemoryThreshold: - pe.setLoadConfig_VirtualMemoryThreshold( - (quint64)nValue); + pe.setLoadConfig_VirtualMemoryThreshold((quint64)nValue); break; case N_IMAGE_LOADCONFIG::ProcessAffinityMask: - pe.setLoadConfig_ProcessAffinityMask( - (quint64)nValue); + pe.setLoadConfig_ProcessAffinityMask((quint64)nValue); break; case N_IMAGE_LOADCONFIG::CSDVersion: pe.setLoadConfig_CSDVersion((quint16)nValue); break; case N_IMAGE_LOADCONFIG::DependentLoadFlags: - pe.setLoadConfig_DependentLoadFlags( - (quint16)nValue); + pe.setLoadConfig_DependentLoadFlags((quint16)nValue); break; case N_IMAGE_LOADCONFIG::EditList: pe.setLoadConfig_EditList((quint64)nValue); @@ -1048,134 +886,100 @@ FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, pe.setLoadConfig_SEHandlerCount((quint64)nValue); break; case N_IMAGE_LOADCONFIG::GuardCFCheckFunctionPointer: - pe.setLoadConfig_GuardCFCheckFunctionPointer( - (quint64)nValue); + pe.setLoadConfig_GuardCFCheckFunctionPointer((quint64)nValue); break; case N_IMAGE_LOADCONFIG::GuardCFDispatchFunctionPointer: - pe.setLoadConfig_GuardCFDispatchFunctionPointer( - (quint64)nValue); + pe.setLoadConfig_GuardCFDispatchFunctionPointer((quint64)nValue); break; case N_IMAGE_LOADCONFIG::GuardCFFunctionTable: - pe.setLoadConfig_GuardCFFunctionTable( - (quint64)nValue); + pe.setLoadConfig_GuardCFFunctionTable((quint64)nValue); break; case N_IMAGE_LOADCONFIG::GuardCFFunctionCount: - pe.setLoadConfig_GuardCFFunctionCount( - (quint64)nValue); + pe.setLoadConfig_GuardCFFunctionCount((quint64)nValue); break; case N_IMAGE_LOADCONFIG::GuardFlags: pe.setLoadConfig_GuardFlags((quint32)nValue); break; case N_IMAGE_LOADCONFIG::CodeIntegrity_Flags: - pe.setLoadConfig_CodeIntegrity_Flags( - (quint16)nValue); + pe.setLoadConfig_CodeIntegrity_Flags((quint16)nValue); break; case N_IMAGE_LOADCONFIG::CodeIntegrity_Catalog: - pe.setLoadConfig_CodeIntegrity_Catalog( - (quint16)nValue); + pe.setLoadConfig_CodeIntegrity_Catalog((quint16)nValue); break; case N_IMAGE_LOADCONFIG::CodeIntegrity_CatalogOffset: - pe.setLoadConfig_CodeIntegrity_CatalogOffset( - (quint32)nValue); + pe.setLoadConfig_CodeIntegrity_CatalogOffset((quint32)nValue); break; case N_IMAGE_LOADCONFIG::CodeIntegrity_Reserved: - pe.setLoadConfig_CodeIntegrity_Reserved( - (quint32)nValue); + pe.setLoadConfig_CodeIntegrity_Reserved((quint32)nValue); break; case N_IMAGE_LOADCONFIG::GuardAddressTakenIatEntryTable: - pe.setLoadConfig_GuardAddressTakenIatEntryTable( - (quint64)nValue); + pe.setLoadConfig_GuardAddressTakenIatEntryTable((quint64)nValue); break; case N_IMAGE_LOADCONFIG::GuardAddressTakenIatEntryCount: - pe.setLoadConfig_GuardAddressTakenIatEntryCount( - (quint64)nValue); + pe.setLoadConfig_GuardAddressTakenIatEntryCount((quint64)nValue); break; case N_IMAGE_LOADCONFIG::GuardLongJumpTargetTable: - pe.setLoadConfig_GuardLongJumpTargetTable( - (quint64)nValue); + pe.setLoadConfig_GuardLongJumpTargetTable((quint64)nValue); break; case N_IMAGE_LOADCONFIG::GuardLongJumpTargetCount: - pe.setLoadConfig_GuardLongJumpTargetCount( - (quint64)nValue); + pe.setLoadConfig_GuardLongJumpTargetCount((quint64)nValue); break; case N_IMAGE_LOADCONFIG::DynamicValueRelocTable: - pe.setLoadConfig_DynamicValueRelocTable( - (quint64)nValue); + pe.setLoadConfig_DynamicValueRelocTable((quint64)nValue); break; case N_IMAGE_LOADCONFIG::CHPEMetadataPointer: - pe.setLoadConfig_CHPEMetadataPointer( - (quint64)nValue); + pe.setLoadConfig_CHPEMetadataPointer((quint64)nValue); break; case N_IMAGE_LOADCONFIG::GuardRFFailureRoutine: - pe.setLoadConfig_GuardRFFailureRoutine( - (quint64)nValue); + pe.setLoadConfig_GuardRFFailureRoutine((quint64)nValue); break; - case N_IMAGE_LOADCONFIG:: - GuardRFFailureRoutineFunctionPointer: - pe.setLoadConfig_GuardRFFailureRoutineFunctionPointer( - (quint64)nValue); + case N_IMAGE_LOADCONFIG::GuardRFFailureRoutineFunctionPointer: + pe.setLoadConfig_GuardRFFailureRoutineFunctionPointer((quint64)nValue); break; case N_IMAGE_LOADCONFIG::DynamicValueRelocTableOffset: - pe.setLoadConfig_DynamicValueRelocTableOffset( - (quint32)nValue); + pe.setLoadConfig_DynamicValueRelocTableOffset((quint32)nValue); break; case N_IMAGE_LOADCONFIG::DynamicValueRelocTableSection: - pe.setLoadConfig_DynamicValueRelocTableSection( - (quint16)nValue); + pe.setLoadConfig_DynamicValueRelocTableSection((quint16)nValue); break; case N_IMAGE_LOADCONFIG::Reserved2: pe.setLoadConfig_Reserved2((quint16)nValue); break; - case N_IMAGE_LOADCONFIG:: - GuardRFVerifyStackPointerFunctionPointer: - pe.setLoadConfig_GuardRFVerifyStackPointerFunctionPointer( - (quint64)nValue); + case N_IMAGE_LOADCONFIG::GuardRFVerifyStackPointerFunctionPointer: + pe.setLoadConfig_GuardRFVerifyStackPointerFunctionPointer((quint64)nValue); break; case N_IMAGE_LOADCONFIG::HotPatchTableOffset: - pe.setLoadConfig_HotPatchTableOffset( - (quint32)nValue); + pe.setLoadConfig_HotPatchTableOffset((quint32)nValue); break; case N_IMAGE_LOADCONFIG::Reserved3: pe.setLoadConfig_Reserved3((quint32)nValue); break; case N_IMAGE_LOADCONFIG::EnclaveConfigurationPointer: - pe.setLoadConfig_EnclaveConfigurationPointer( - (quint64)nValue); + pe.setLoadConfig_EnclaveConfigurationPointer((quint64)nValue); break; case N_IMAGE_LOADCONFIG::VolatileMetadataPointer: - pe.setLoadConfig_VolatileMetadataPointer( - (quint64)nValue); + pe.setLoadConfig_VolatileMetadataPointer((quint64)nValue); break; case N_IMAGE_LOADCONFIG::GuardEHContinuationTable: - pe.setLoadConfig_GuardEHContinuationTable( - (quint64)nValue); + pe.setLoadConfig_GuardEHContinuationTable((quint64)nValue); break; case N_IMAGE_LOADCONFIG::GuardEHContinuationCount: - pe.setLoadConfig_GuardEHContinuationCount( - (quint64)nValue); + pe.setLoadConfig_GuardEHContinuationCount((quint64)nValue); break; case N_IMAGE_LOADCONFIG::GuardXFGCheckFunctionPointer: - pe.setLoadConfig_GuardXFGCheckFunctionPointer( - (quint64)nValue); + pe.setLoadConfig_GuardXFGCheckFunctionPointer((quint64)nValue); break; - case N_IMAGE_LOADCONFIG:: - GuardXFGDispatchFunctionPointer: - pe.setLoadConfig_GuardXFGDispatchFunctionPointer( - (quint64)nValue); + case N_IMAGE_LOADCONFIG::GuardXFGDispatchFunctionPointer: + pe.setLoadConfig_GuardXFGDispatchFunctionPointer((quint64)nValue); break; - case N_IMAGE_LOADCONFIG:: - GuardXFGTableDispatchFunctionPointer: - pe.setLoadConfig_GuardXFGTableDispatchFunctionPointer( - (quint64)nValue); + case N_IMAGE_LOADCONFIG::GuardXFGTableDispatchFunctionPointer: + pe.setLoadConfig_GuardXFGTableDispatchFunctionPointer((quint64)nValue); break; - case N_IMAGE_LOADCONFIG:: - CastGuardOsDeterminedFailureMode: - pe.setLoadConfig_CastGuardOsDeterminedFailureMode( - (quint64)nValue); + case N_IMAGE_LOADCONFIG::CastGuardOsDeterminedFailureMode: + pe.setLoadConfig_CastGuardOsDeterminedFailureMode((quint64)nValue); break; case N_IMAGE_LOADCONFIG::GuardMemcpyFunctionPointer: - pe.setLoadConfig_GuardMemcpyFunctionPointer( - (quint64)nValue); + pe.setLoadConfig_GuardMemcpyFunctionPointer((quint64)nValue); break; } ui->widgetHex_LoadConfig->reload(); @@ -1186,11 +990,8 @@ FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SPE::TYPE_IMAGE_FILE_HEADER: switch (nNdata) { case N_IMAGE_FILE_HEADER::SizeOfOptionalHeader: - addComment( - ui->tableWidget_IMAGE_FILE_HEADER, - N_IMAGE_FILE_HEADER::SizeOfOptionalHeader, - HEADER_COLUMN_COMMENT, - XBinary::bytesCountToString(nValue)); + addComment(ui->tableWidget_IMAGE_FILE_HEADER, N_IMAGE_FILE_HEADER::SizeOfOptionalHeader, HEADER_COLUMN_COMMENT, + XBinary::bytesCountToString(nValue)); break; } break; @@ -1198,99 +999,61 @@ FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SPE::TYPE_IMAGE_OPTIONAL_HEADER: switch (nNdata) { case N_IMAGE_OPTIONAL_HEADER::SizeOfCode: - addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SizeOfCode, - HEADER_COLUMN_COMMENT, + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SizeOfCode, HEADER_COLUMN_COMMENT, XBinary::bytesCountToString(nValue)); break; case N_IMAGE_OPTIONAL_HEADER::SizeOfInitializedData: - addComment( - ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SizeOfInitializedData, - HEADER_COLUMN_COMMENT, - XBinary::bytesCountToString(nValue)); + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SizeOfInitializedData, HEADER_COLUMN_COMMENT, + XBinary::bytesCountToString(nValue)); break; case N_IMAGE_OPTIONAL_HEADER::SizeOfUninitializedData: - addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER:: - SizeOfUninitializedData, - HEADER_COLUMN_COMMENT, + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SizeOfUninitializedData, HEADER_COLUMN_COMMENT, XBinary::bytesCountToString(nValue)); break; case N_IMAGE_OPTIONAL_HEADER::SectionAlignment: - addComment( - ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SectionAlignment, - HEADER_COLUMN_COMMENT, - XBinary::bytesCountToString(nValue)); + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SectionAlignment, HEADER_COLUMN_COMMENT, + XBinary::bytesCountToString(nValue)); break; case N_IMAGE_OPTIONAL_HEADER::FileAlignment: - addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::FileAlignment, - HEADER_COLUMN_COMMENT, + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::FileAlignment, HEADER_COLUMN_COMMENT, XBinary::bytesCountToString(nValue)); break; case N_IMAGE_OPTIONAL_HEADER::SizeOfImage: - addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SizeOfImage, - HEADER_COLUMN_COMMENT, + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SizeOfImage, HEADER_COLUMN_COMMENT, XBinary::bytesCountToString(nValue)); break; case N_IMAGE_OPTIONAL_HEADER::SizeOfHeaders: - addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SizeOfHeaders, - HEADER_COLUMN_COMMENT, + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SizeOfHeaders, HEADER_COLUMN_COMMENT, XBinary::bytesCountToString(nValue)); break; case N_IMAGE_OPTIONAL_HEADER::SizeOfStackReserve: - addComment( - ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SizeOfStackReserve, - HEADER_COLUMN_COMMENT, - XBinary::bytesCountToString(nValue)); + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SizeOfStackReserve, HEADER_COLUMN_COMMENT, + XBinary::bytesCountToString(nValue)); break; case N_IMAGE_OPTIONAL_HEADER::SizeOfStackCommit: - addComment( - ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SizeOfStackCommit, - HEADER_COLUMN_COMMENT, - XBinary::bytesCountToString(nValue)); + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SizeOfStackCommit, HEADER_COLUMN_COMMENT, + XBinary::bytesCountToString(nValue)); break; case N_IMAGE_OPTIONAL_HEADER::SizeOfHeapReserve: - addComment( - ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SizeOfHeapReserve, - HEADER_COLUMN_COMMENT, - XBinary::bytesCountToString(nValue)); + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SizeOfHeapReserve, HEADER_COLUMN_COMMENT, + XBinary::bytesCountToString(nValue)); break; case N_IMAGE_OPTIONAL_HEADER::SizeOfHeapCommit: - addComment( - ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SizeOfHeapCommit, - HEADER_COLUMN_COMMENT, - XBinary::bytesCountToString(nValue)); + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SizeOfHeapCommit, HEADER_COLUMN_COMMENT, + XBinary::bytesCountToString(nValue)); break; case N_IMAGE_OPTIONAL_HEADER::AddressOfEntryPoint: - addComment( - ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::AddressOfEntryPoint, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByRelAddress(nValue)); + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::AddressOfEntryPoint, HEADER_COLUMN_COMMENT, + pe.getMemoryRecordInfoByRelAddress(nValue)); break; case N_IMAGE_OPTIONAL_HEADER::BaseOfCode: - addComment( - ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::BaseOfCode, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByRelAddress(nValue)); + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::BaseOfCode, HEADER_COLUMN_COMMENT, + pe.getMemoryRecordInfoByRelAddress(nValue)); break; case N_IMAGE_OPTIONAL_HEADER::BaseOfData: - addComment( - ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::BaseOfData, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByRelAddress(nValue)); + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::BaseOfData, HEADER_COLUMN_COMMENT, + pe.getMemoryRecordInfoByRelAddress(nValue)); break; } break; @@ -1298,32 +1061,20 @@ FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SPE::TYPE_EXPORT: switch (nNdata) { case N_IMAGE_EXPORT::Name: - addComment( - ui->tableWidget_ExportHeader, - N_IMAGE_EXPORT::Name, HEADER_COLUMN_COMMENT, - pe.read_ansiString( - pe.relAddressToOffset((quint32)nValue))); + addComment(ui->tableWidget_ExportHeader, N_IMAGE_EXPORT::Name, HEADER_COLUMN_COMMENT, + pe.read_ansiString(pe.relAddressToOffset((quint32)nValue))); break; case N_IMAGE_EXPORT::AddressOfFunctions: - addComment(ui->tableWidget_ExportHeader, - N_IMAGE_EXPORT::AddressOfFunctions, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByRelAddress( - (quint32)nValue)); + addComment(ui->tableWidget_ExportHeader, N_IMAGE_EXPORT::AddressOfFunctions, HEADER_COLUMN_COMMENT, + pe.getMemoryRecordInfoByRelAddress((quint32)nValue)); break; case N_IMAGE_EXPORT::AddressOfNames: - addComment(ui->tableWidget_ExportHeader, - N_IMAGE_EXPORT::AddressOfNames, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByRelAddress( - (quint32)nValue)); + addComment(ui->tableWidget_ExportHeader, N_IMAGE_EXPORT::AddressOfNames, HEADER_COLUMN_COMMENT, + pe.getMemoryRecordInfoByRelAddress((quint32)nValue)); break; case N_IMAGE_EXPORT::AddressOfNameOrdinals: - addComment(ui->tableWidget_ExportHeader, - N_IMAGE_EXPORT::AddressOfNameOrdinals, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByRelAddress( - (quint32)nValue)); + addComment(ui->tableWidget_ExportHeader, N_IMAGE_EXPORT::AddressOfNameOrdinals, HEADER_COLUMN_COMMENT, + pe.getMemoryRecordInfoByRelAddress((quint32)nValue)); break; } break; @@ -1331,32 +1082,20 @@ FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SPE::TYPE_TLS: switch (nNdata) { case N_IMAGE_TLS::StartAddressOfRawData: - addComment(ui->tableWidget_TLS, - N_IMAGE_TLS::StartAddressOfRawData, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByAddress( - (quint64)nValue)); + addComment(ui->tableWidget_TLS, N_IMAGE_TLS::StartAddressOfRawData, HEADER_COLUMN_COMMENT, + pe.getMemoryRecordInfoByAddress((quint64)nValue)); break; case N_IMAGE_TLS::EndAddressOfRawData: - addComment(ui->tableWidget_TLS, - N_IMAGE_TLS::EndAddressOfRawData, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByAddress( - (quint64)nValue)); + addComment(ui->tableWidget_TLS, N_IMAGE_TLS::EndAddressOfRawData, HEADER_COLUMN_COMMENT, + pe.getMemoryRecordInfoByAddress((quint64)nValue)); break; case N_IMAGE_TLS::AddressOfIndex: - addComment(ui->tableWidget_TLS, - N_IMAGE_TLS::AddressOfIndex, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByAddress( - (quint64)nValue)); + addComment(ui->tableWidget_TLS, N_IMAGE_TLS::AddressOfIndex, HEADER_COLUMN_COMMENT, + pe.getMemoryRecordInfoByAddress((quint64)nValue)); break; case N_IMAGE_TLS::AddressOfCallBacks: - addComment(ui->tableWidget_TLS, - N_IMAGE_TLS::AddressOfCallBacks, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByAddress( - (quint64)nValue)); + addComment(ui->tableWidget_TLS, N_IMAGE_TLS::AddressOfCallBacks, HEADER_COLUMN_COMMENT, + pe.getMemoryRecordInfoByAddress((quint64)nValue)); break; } break; @@ -1364,41 +1103,24 @@ FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SPE::TYPE_RESOURCES_VERSION: switch (nNdata) { case N_IMAGE_RESOURCE_FIXEDFILEINFO::dwStrucVersion: - addComment( - ui->tableWidget_Resources_Version, - N_IMAGE_RESOURCE_FIXEDFILEINFO::dwStrucVersion, - HEADER_COLUMN_COMMENT, - XBinary::versionDwordToString((quint32)nValue)); + addComment(ui->tableWidget_Resources_Version, N_IMAGE_RESOURCE_FIXEDFILEINFO::dwStrucVersion, HEADER_COLUMN_COMMENT, + XBinary::versionDwordToString((quint32)nValue)); break; case N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileVersionMS: - addComment( - ui->tableWidget_Resources_Version, - N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileVersionMS, - HEADER_COLUMN_COMMENT, - XBinary::versionDwordToString((quint32)nValue)); + addComment(ui->tableWidget_Resources_Version, N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileVersionMS, HEADER_COLUMN_COMMENT, + XBinary::versionDwordToString((quint32)nValue)); break; case N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileVersionLS: - addComment( - ui->tableWidget_Resources_Version, - N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileVersionLS, - HEADER_COLUMN_COMMENT, - XBinary::versionDwordToString((quint32)nValue)); + addComment(ui->tableWidget_Resources_Version, N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileVersionLS, HEADER_COLUMN_COMMENT, + XBinary::versionDwordToString((quint32)nValue)); break; case N_IMAGE_RESOURCE_FIXEDFILEINFO::dwProductVersionMS: - addComment( - ui->tableWidget_Resources_Version, - N_IMAGE_RESOURCE_FIXEDFILEINFO:: - dwProductVersionMS, - HEADER_COLUMN_COMMENT, - XBinary::versionDwordToString((quint32)nValue)); + addComment(ui->tableWidget_Resources_Version, N_IMAGE_RESOURCE_FIXEDFILEINFO::dwProductVersionMS, HEADER_COLUMN_COMMENT, + XBinary::versionDwordToString((quint32)nValue)); break; case N_IMAGE_RESOURCE_FIXEDFILEINFO::dwProductVersionLS: - addComment( - ui->tableWidget_Resources_Version, - N_IMAGE_RESOURCE_FIXEDFILEINFO:: - dwProductVersionLS, - HEADER_COLUMN_COMMENT, - XBinary::versionDwordToString((quint32)nValue)); + addComment(ui->tableWidget_Resources_Version, N_IMAGE_RESOURCE_FIXEDFILEINFO::dwProductVersionLS, HEADER_COLUMN_COMMENT, + XBinary::versionDwordToString((quint32)nValue)); break; } break; @@ -1406,10 +1128,8 @@ FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, case SPE::TYPE_LOADCONFIG: switch (nNdata) { case N_IMAGE_LOADCONFIG::Size: - addComment( - ui->tableWidget_LoadConfig, - N_IMAGE_LOADCONFIG::Size, HEADER_COLUMN_COMMENT, - XBinary::bytesCountToString((quint64)nValue)); + addComment(ui->tableWidget_LoadConfig, N_IMAGE_LOADCONFIG::Size, HEADER_COLUMN_COMMENT, + XBinary::bytesCountToString((quint64)nValue)); break; } break; @@ -1425,25 +1145,16 @@ FormatWidget::SV PEWidget::_setValue(QVariant vValue, int nStype, int nNdata, } void PEWidget::setReadonly(bool bState) { - setLineEditsReadOnly(g_lineEdit_IMAGE_DOS_HEADER, - N_IMAGE_DOS_HEADER::__data_size, bState); - setLineEditsReadOnly(g_lineEdit_IMAGE_NT_HEADERS, - N_IMAGE_NT_HEADERS::__data_size, bState); - setLineEditsReadOnly(g_lineEdit_IMAGE_FILE_HEADER, - N_IMAGE_FILE_HEADER::__data_size, bState); - setLineEditsReadOnly(g_lineEdit_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_IMAGE_DOS_HEADER, N_IMAGE_DOS_HEADER::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_IMAGE_NT_HEADERS, N_IMAGE_NT_HEADERS::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_IMAGE_FILE_HEADER, N_IMAGE_FILE_HEADER::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::__data_size, bState); setLineEditsReadOnly(g_lineEdit_TLS, N_IMAGE_TLS::__data_size, bState); - setLineEditsReadOnly(g_lineEdit_Version_FixedFileInfo, - N_IMAGE_RESOURCE_FIXEDFILEINFO::__data_size, bState); - setLineEditsReadOnly(g_lineEdit_LoadConfig, N_IMAGE_LOADCONFIG::__data_size, - bState); - setLineEditsReadOnly(g_lineEdit_EXPORT, N_IMAGE_EXPORT::__data_size, - bState); - setLineEditsReadOnly(g_lineEdit_NetHeader, N_IMAGE_NETHEADER::__data_size, - bState); - setLineEditsReadOnly(g_lineEdit_Net_Metadata, - N_IMAGE_NET_METADATA::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_Version_FixedFileInfo, N_IMAGE_RESOURCE_FIXEDFILEINFO::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_LoadConfig, N_IMAGE_LOADCONFIG::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_EXPORT, N_IMAGE_EXPORT::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_NetHeader, N_IMAGE_NETHEADER::__data_size, bState); + setLineEditsReadOnly(g_lineEdit_Net_Metadata, N_IMAGE_NET_METADATA::__data_size, bState); // setLineEditsReadOnly(lineEdit_IMAGE_DIRECTORY_ADDRESS,N_IMAGE_DIRECORIES::__data_size,bState); // setLineEditsReadOnly(lineEdit_IMAGE_DIRECTORY_SIZE,N_IMAGE_DIRECORIES::__data_size,bState); @@ -1473,27 +1184,17 @@ void PEWidget::setReadonly(bool bState) { } void PEWidget::blockSignals(bool bState) { - _blockSignals((QObject **)g_lineEdit_IMAGE_DOS_HEADER, - N_IMAGE_DOS_HEADER::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_IMAGE_NT_HEADERS, - N_IMAGE_NT_HEADERS::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_IMAGE_FILE_HEADER, - N_IMAGE_FILE_HEADER::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_IMAGE_DOS_HEADER, N_IMAGE_DOS_HEADER::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_IMAGE_NT_HEADERS, N_IMAGE_NT_HEADERS::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_IMAGE_FILE_HEADER, N_IMAGE_FILE_HEADER::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::__data_size, bState); _blockSignals((QObject **)g_lineEdit_TLS, N_IMAGE_TLS::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_Version_FixedFileInfo, - N_IMAGE_RESOURCE_FIXEDFILEINFO::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_LoadConfig, - N_IMAGE_LOADCONFIG::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_EXPORT, N_IMAGE_EXPORT::__data_size, - bState); - _blockSignals((QObject **)g_lineEdit_NetHeader, - N_IMAGE_NETHEADER::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_Net_Metadata, - N_IMAGE_NET_METADATA::__data_size, bState); - _blockSignals((QObject **)g_lineEdit_Resources, - N_IMAGE_RESOURCES::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_Version_FixedFileInfo, N_IMAGE_RESOURCE_FIXEDFILEINFO::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_LoadConfig, N_IMAGE_LOADCONFIG::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_EXPORT, N_IMAGE_EXPORT::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_NetHeader, N_IMAGE_NETHEADER::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_Net_Metadata, N_IMAGE_NET_METADATA::__data_size, bState); + _blockSignals((QObject **)g_lineEdit_Resources, N_IMAGE_RESOURCES::__data_size, bState); // _blockSignals((QObject // **)lineEdit_IMAGE_DIRECTORY_ADDRESS,N_IMAGE_DIRECORIES::__data_size,bState); @@ -1505,8 +1206,7 @@ void PEWidget::blockSignals(bool bState) { _blockSignals((QObject **)g_dateTimeEdit, __TD_size, bState); } -void PEWidget::on_treeWidgetNavi_currentItemChanged( - QTreeWidgetItem *pItemCurrent, QTreeWidgetItem *pItemPrevious) { +void PEWidget::on_treeWidgetNavi_currentItemChanged(QTreeWidgetItem *pItemCurrent, QTreeWidgetItem *pItemPrevious) { Q_UNUSED(pItemPrevious) if (pItemCurrent) { @@ -1526,8 +1226,7 @@ void PEWidget::widgetValueChanged(quint64 nValue) { case SPE::TYPE_IMAGE_DOS_HEADER: switch (nNdata) { case N_IMAGE_DOS_HEADER::e_magic: - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_magic] - ->setValue((quint16)nValue); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_magic]->setValue((quint16)nValue); break; } break; @@ -1535,8 +1234,7 @@ void PEWidget::widgetValueChanged(quint64 nValue) { case SPE::TYPE_IMAGE_NT_HEADERS: switch (nNdata) { case N_IMAGE_NT_HEADERS::Signature: - g_lineEdit_IMAGE_NT_HEADERS[N_IMAGE_NT_HEADERS::Signature] - ->setValue((quint32)nValue); + g_lineEdit_IMAGE_NT_HEADERS[N_IMAGE_NT_HEADERS::Signature]->setValue((quint32)nValue); break; } break; @@ -1544,18 +1242,13 @@ void PEWidget::widgetValueChanged(quint64 nValue) { case SPE::TYPE_IMAGE_FILE_HEADER: switch (nNdata) { case N_IMAGE_FILE_HEADER::Machine: - g_lineEdit_IMAGE_FILE_HEADER[N_IMAGE_FILE_HEADER::Machine] - ->setValue((quint16)nValue); + g_lineEdit_IMAGE_FILE_HEADER[N_IMAGE_FILE_HEADER::Machine]->setValue((quint16)nValue); break; case N_IMAGE_FILE_HEADER::TimeDateStamp: - g_lineEdit_IMAGE_FILE_HEADER - [N_IMAGE_FILE_HEADER::TimeDateStamp] - ->setValue((quint32)nValue); + g_lineEdit_IMAGE_FILE_HEADER[N_IMAGE_FILE_HEADER::TimeDateStamp]->setValue((quint32)nValue); break; case N_IMAGE_FILE_HEADER::Characteristics: - g_lineEdit_IMAGE_FILE_HEADER - [N_IMAGE_FILE_HEADER::Characteristics] - ->setValue((quint16)nValue); + g_lineEdit_IMAGE_FILE_HEADER[N_IMAGE_FILE_HEADER::Characteristics]->setValue((quint16)nValue); break; } break; @@ -1563,38 +1256,26 @@ void PEWidget::widgetValueChanged(quint64 nValue) { case SPE::TYPE_IMAGE_OPTIONAL_HEADER: switch (nNdata) { case N_IMAGE_OPTIONAL_HEADER::Magic: - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::Magic] - ->setValue((quint16)nValue); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::Magic]->setValue((quint16)nValue); break; case N_IMAGE_OPTIONAL_HEADER::Subsystem: - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::Subsystem] - ->setValue((quint16)nValue); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::Subsystem]->setValue((quint16)nValue); break; case N_IMAGE_OPTIONAL_HEADER::DllCharacteristics: - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::DllCharacteristics] - ->setValue((quint16)nValue); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::DllCharacteristics]->setValue((quint16)nValue); break; // Extra case N_IMAGE_OPTIONAL_HEADER::OperatingSystemVersion: - XBinary::XDWORD xdword = - XBinary::make_xdword((quint32)nValue); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::MajorOperatingSystemVersion] - ->setValue((quint16)xdword.nValue1); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::MinorOperatingSystemVersion] - ->setValue((quint16)xdword.nValue2); + XBinary::XDWORD xdword = XBinary::make_xdword((quint32)nValue); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::MajorOperatingSystemVersion]->setValue((quint16)xdword.nValue1); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::MinorOperatingSystemVersion]->setValue((quint16)xdword.nValue2); } break; case SPE::TYPE_EXPORT: switch (nNdata) { case N_IMAGE_EXPORT::TimeDateStamp: - g_dateTimeEdit[TD_IMAGE_EXPORT_TimeDateStamp]->setValue( - nValue); + g_dateTimeEdit[TD_IMAGE_EXPORT_TimeDateStamp]->setValue(nValue); break; } break; @@ -1602,8 +1283,7 @@ void PEWidget::widgetValueChanged(quint64 nValue) { case SPE::TYPE_NETHEADER: switch (nNdata) { case N_IMAGE_NETHEADER::Flags: - g_lineEdit_NetHeader[N_IMAGE_NETHEADER::Flags]->setValue( - (quint32)nValue); + g_lineEdit_NetHeader[N_IMAGE_NETHEADER::Flags]->setValue((quint32)nValue); break; } break; @@ -1611,24 +1291,16 @@ void PEWidget::widgetValueChanged(quint64 nValue) { case SPE::TYPE_RESOURCES_VERSION: switch (nNdata) { case N_IMAGE_RESOURCE_FIXEDFILEINFO::dwSignature: - g_lineEdit_Version_FixedFileInfo - [N_IMAGE_RESOURCE_FIXEDFILEINFO::dwSignature] - ->setValue((quint32)nValue); + g_lineEdit_Version_FixedFileInfo[N_IMAGE_RESOURCE_FIXEDFILEINFO::dwSignature]->setValue((quint32)nValue); break; case N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileFlags: - g_lineEdit_Version_FixedFileInfo - [N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileFlags] - ->setValue((quint32)nValue); + g_lineEdit_Version_FixedFileInfo[N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileFlags]->setValue((quint32)nValue); break; case N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileOS: - g_lineEdit_Version_FixedFileInfo - [N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileOS] - ->setValue((quint32)nValue); + g_lineEdit_Version_FixedFileInfo[N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileOS]->setValue((quint32)nValue); break; case N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileType: - g_lineEdit_Version_FixedFileInfo - [N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileType] - ->setValue((quint32)nValue); + g_lineEdit_Version_FixedFileInfo[N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileType]->setValue((quint32)nValue); break; } break; @@ -1644,14 +1316,11 @@ void PEWidget::widgetAction() { case SPE::TYPE_IMAGE_OPTIONAL_HEADER: switch (nNdata) { case N_IMAGE_OPTIONAL_HEADER::CheckSum: - XPE pe(getDevice(), getOptions().bIsImage, - getOptions().nImageBase); + XPE pe(getDevice(), getOptions().bIsImage, getOptions().nImageBase); if (pe.isValid()) { quint32 nCheckSum = pe.calculateCheckSum(); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::CheckSum] - ->setValue(nCheckSum); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::CheckSum]->setValue(nCheckSum); } break; } @@ -1667,35 +1336,42 @@ void PEWidget::editSectionHeader() { showSectionHeader(SPE::TYPE_IMAGE_SECTION_HEADER, ui->tableView_Sections); } -void PEWidget::sectionHex() { showSectionHex(ui->tableView_Sections); } +void PEWidget::sectionHex() { + showSectionHex(ui->tableView_Sections); +} -void PEWidget::sectionDisasm() { showSectionDisasm(ui->tableView_Sections); } +void PEWidget::sectionDisasm() { + showSectionDisasm(ui->tableView_Sections); +} -void PEWidget::sectionEntropy() { showSectionEntropy(ui->tableView_Sections); } +void PEWidget::sectionEntropy() { + showSectionEntropy(ui->tableView_Sections); +} -void PEWidget::sectionDump() { dumpSection(ui->tableView_Sections); } +void PEWidget::sectionDump() { + dumpSection(ui->tableView_Sections); +} -void PEWidget::resourceHex() { showSectionHex(ui->tableView_Resources); } +void PEWidget::resourceHex() { + showSectionHex(ui->tableView_Resources); +} -void PEWidget::resourceDisasm() { showSectionDisasm(ui->tableView_Resources); } +void PEWidget::resourceDisasm() { + showSectionDisasm(ui->tableView_Resources); +} void PEWidget::resourceEntropy() { showSectionEntropy(ui->tableView_Resources); } -void PEWidget::resourceDump() { dumpSection(ui->tableView_Resources); } +void PEWidget::resourceDump() { + dumpSection(ui->tableView_Resources); +} void PEWidget::reloadData() { - int nType = ui->treeWidgetNavi->currentItem() - ->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_TYPE) - .toInt(); - qint64 nDataOffset = - ui->treeWidgetNavi->currentItem() - ->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET) - .toLongLong(); - qint64 nDataSize = ui->treeWidgetNavi->currentItem() - ->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE) - .toLongLong(); + int nType = ui->treeWidgetNavi->currentItem()->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_TYPE).toInt(); + qint64 nDataOffset = ui->treeWidgetNavi->currentItem()->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET).toLongLong(); + qint64 nDataSize = ui->treeWidgetNavi->currentItem()->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE).toLongLong(); QString sInit = getInitString(ui->treeWidgetNavi->currentItem()); @@ -1708,8 +1384,7 @@ void PEWidget::reloadData() { if (nType == SPE::TYPE_INFO) { if (!isInitPresent(sInit)) { - ui->widgetInfo->setData(getDevice(), pe.getFileType(), "Info", - true); + ui->widgetInfo->setData(getDevice(), pe.getFileType(), "Info", true); } } else if (nType == SPE::TYPE_VIRUSTOTAL) { if (!isInitPresent(sInit)) { @@ -1741,8 +1416,7 @@ void PEWidget::reloadData() { } } else if (nType == SPE::TYPE_HASH) { if (!isInitPresent(sInit)) { - ui->widgetHash->setData(getDevice(), pe.getFileType(), 0, -1, - true); + ui->widgetHash->setData(getDevice(), pe.getFileType(), 0, -1, true); } } else if (nType == SPE::TYPE_STRINGS) { if (!isInitPresent(sInit)) { @@ -1761,8 +1435,7 @@ void PEWidget::reloadData() { SearchSignaturesWidget::OPTIONS signaturesOptions = {}; signaturesOptions.bMenu_Hex = true; - ui->widgetSignatures->setData(getDevice(), pe.getFileType(), - signaturesOptions, false); + ui->widgetSignatures->setData(getDevice(), pe.getFileType(), signaturesOptions, false); } } else if (nType == SPE::TYPE_MEMORYMAP) { if (!isInitPresent(sInit)) { @@ -1770,764 +1443,385 @@ void PEWidget::reloadData() { } } else if (nType == SPE::TYPE_ENTROPY) { if (!isInitPresent(sInit)) { - ui->widgetEntropy->setData(getDevice(), 0, getDevice()->size(), - pe.getFileType(), + ui->widgetEntropy->setData(getDevice(), 0, getDevice()->size(), pe.getFileType(), true); // TODO save last directory } } else if (nType == SPE::TYPE_HEURISTICSCAN) { if (!isInitPresent(sInit)) { - ui->widgetHeuristicScan->setData(getDevice(), true, - pe.getFileType()); + ui->widgetHeuristicScan->setData(getDevice(), true, pe.getFileType()); } } else if (nType == SPE::TYPE_EXTRACTOR) { if (!isInitPresent(sInit)) { - ui->widgetExtractor->setData( - getDevice(), XExtractor::getDefaultOptions(), true); + XExtractor::OPTIONS extractorOptions = XExtractor::getDefaultOptions(); + extractorOptions.bMenu_Hex = true; + + ui->widgetExtractor->setData(getDevice(), extractorOptions, true); } } else if (nType == SPE::TYPE_IMAGE_DOS_HEADER) { if (!isInitPresent(sInit)) { - createHeaderTable(SPE::TYPE_IMAGE_DOS_HEADER, - ui->tableWidget_IMAGE_DOS_HEADER, - N_IMAGE_DOS_HEADER::records, - g_lineEdit_IMAGE_DOS_HEADER, + createHeaderTable(SPE::TYPE_IMAGE_DOS_HEADER, ui->tableWidget_IMAGE_DOS_HEADER, N_IMAGE_DOS_HEADER::records, g_lineEdit_IMAGE_DOS_HEADER, N_IMAGE_DOS_HEADER::__data_size, 0); - g_comboBox[CB_IMAGE_DOS_HEADER_e_magic] = createComboBox( - ui->tableWidget_IMAGE_DOS_HEADER, XPE::getImageMagicsS(), - SPE::TYPE_IMAGE_DOS_HEADER, N_IMAGE_DOS_HEADER::e_magic, - XComboBoxEx::CBTYPE_LIST); - g_invWidget[INV_IMAGE_DOS_HEADER_e_lfanew] = createInvWidget( - ui->tableWidget_IMAGE_DOS_HEADER, - SPE::TYPE_IMAGE_DOS_HEADER, N_IMAGE_DOS_HEADER::e_lfanew, - InvWidget::TYPE_HEX); + g_comboBox[CB_IMAGE_DOS_HEADER_e_magic] = createComboBox(ui->tableWidget_IMAGE_DOS_HEADER, XPE::getImageMagicsS(), SPE::TYPE_IMAGE_DOS_HEADER, + N_IMAGE_DOS_HEADER::e_magic, XComboBoxEx::CBTYPE_LIST); + g_invWidget[INV_IMAGE_DOS_HEADER_e_lfanew] = + createInvWidget(ui->tableWidget_IMAGE_DOS_HEADER, SPE::TYPE_IMAGE_DOS_HEADER, N_IMAGE_DOS_HEADER::e_lfanew, InvWidget::TYPE_HEX); blockSignals(true); - XMSDOS_DEF::IMAGE_DOS_HEADEREX msdosheaderex = - pe.getDosHeaderEx(); - - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_magic] - ->setValue(msdosheaderex.e_magic); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_cblp] - ->setValue(msdosheaderex.e_cblp); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_cp]->setValue( - msdosheaderex.e_cp); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_crlc] - ->setValue(msdosheaderex.e_crlc); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_cparhdr] - ->setValue(msdosheaderex.e_cparhdr); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_minalloc] - ->setValue(msdosheaderex.e_minalloc); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_maxalloc] - ->setValue(msdosheaderex.e_maxalloc); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_ss]->setValue( - msdosheaderex.e_ss); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_sp]->setValue( - msdosheaderex.e_sp); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_csum] - ->setValue(msdosheaderex.e_csum); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_ip]->setValue( - msdosheaderex.e_ip); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_cs]->setValue( - msdosheaderex.e_cs); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_lfarlc] - ->setValue(msdosheaderex.e_lfarlc); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_ovno] - ->setValue(msdosheaderex.e_ovno); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_res_0] - ->setValue(msdosheaderex.e_res[0]); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_res_1] - ->setValue(msdosheaderex.e_res[1]); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_res_2] - ->setValue(msdosheaderex.e_res[2]); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_res_3] - ->setValue(msdosheaderex.e_res[3]); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_oemid] - ->setValue(msdosheaderex.e_oemid); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_oeminfo] - ->setValue(msdosheaderex.e_oeminfo); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_res2_0] - ->setValue(msdosheaderex.e_res2[0]); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_res2_1] - ->setValue(msdosheaderex.e_res2[1]); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_res2_2] - ->setValue(msdosheaderex.e_res2[2]); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_res2_3] - ->setValue(msdosheaderex.e_res2[3]); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_res2_4] - ->setValue(msdosheaderex.e_res2[4]); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_res2_5] - ->setValue(msdosheaderex.e_res2[5]); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_res2_6] - ->setValue(msdosheaderex.e_res2[6]); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_res2_7] - ->setValue(msdosheaderex.e_res2[7]); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_res2_8] - ->setValue(msdosheaderex.e_res2[8]); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_res2_9] - ->setValue(msdosheaderex.e_res2[9]); - g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_lfanew] - ->setValue(msdosheaderex.e_lfanew); - - g_comboBox[CB_IMAGE_DOS_HEADER_e_magic]->setValue( - msdosheaderex.e_magic); - - g_invWidget[INV_IMAGE_DOS_HEADER_e_lfanew]->setOffsetAndSize( - &pe, msdosheaderex.e_lfanew, 0); + XMSDOS_DEF::IMAGE_DOS_HEADEREX msdosheaderex = pe.getDosHeaderEx(); + + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_magic]->setValue(msdosheaderex.e_magic); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_cblp]->setValue(msdosheaderex.e_cblp); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_cp]->setValue(msdosheaderex.e_cp); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_crlc]->setValue(msdosheaderex.e_crlc); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_cparhdr]->setValue(msdosheaderex.e_cparhdr); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_minalloc]->setValue(msdosheaderex.e_minalloc); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_maxalloc]->setValue(msdosheaderex.e_maxalloc); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_ss]->setValue(msdosheaderex.e_ss); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_sp]->setValue(msdosheaderex.e_sp); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_csum]->setValue(msdosheaderex.e_csum); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_ip]->setValue(msdosheaderex.e_ip); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_cs]->setValue(msdosheaderex.e_cs); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_lfarlc]->setValue(msdosheaderex.e_lfarlc); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_ovno]->setValue(msdosheaderex.e_ovno); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_res_0]->setValue(msdosheaderex.e_res[0]); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_res_1]->setValue(msdosheaderex.e_res[1]); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_res_2]->setValue(msdosheaderex.e_res[2]); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_res_3]->setValue(msdosheaderex.e_res[3]); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_oemid]->setValue(msdosheaderex.e_oemid); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_oeminfo]->setValue(msdosheaderex.e_oeminfo); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_res2_0]->setValue(msdosheaderex.e_res2[0]); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_res2_1]->setValue(msdosheaderex.e_res2[1]); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_res2_2]->setValue(msdosheaderex.e_res2[2]); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_res2_3]->setValue(msdosheaderex.e_res2[3]); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_res2_4]->setValue(msdosheaderex.e_res2[4]); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_res2_5]->setValue(msdosheaderex.e_res2[5]); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_res2_6]->setValue(msdosheaderex.e_res2[6]); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_res2_7]->setValue(msdosheaderex.e_res2[7]); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_res2_8]->setValue(msdosheaderex.e_res2[8]); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_res2_9]->setValue(msdosheaderex.e_res2[9]); + g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::e_lfanew]->setValue(msdosheaderex.e_lfanew); + + g_comboBox[CB_IMAGE_DOS_HEADER_e_magic]->setValue(msdosheaderex.e_magic); + + g_invWidget[INV_IMAGE_DOS_HEADER_e_lfanew]->setOffsetAndSize(&pe, msdosheaderex.e_lfanew, 0); qint64 nOffset = pe.getDosHeaderExOffset(); qint64 nSize = pe.getDosHeaderExSize(); qint64 nAddress = pe.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, - &g_subDevice[SPE::TYPE_IMAGE_DOS_HEADER], - ui->widgetHex_IMAGE_DOS_HEADER); + loadHexSubdevice(nOffset, nSize, nAddress, &g_subDevice[SPE::TYPE_IMAGE_DOS_HEADER], ui->widgetHex_IMAGE_DOS_HEADER); blockSignals(false); } } else if (nType == SPE::TYPE_IMAGE_NT_HEADERS) { if (!isInitPresent(sInit)) { - createHeaderTable(SPE::TYPE_IMAGE_NT_HEADERS, - ui->tableWidget_IMAGE_NT_HEADERS, - N_IMAGE_NT_HEADERS::records, - g_lineEdit_IMAGE_NT_HEADERS, + createHeaderTable(SPE::TYPE_IMAGE_NT_HEADERS, ui->tableWidget_IMAGE_NT_HEADERS, N_IMAGE_NT_HEADERS::records, g_lineEdit_IMAGE_NT_HEADERS, N_IMAGE_NT_HEADERS::__data_size, 0); - g_comboBox[CB_IMAGE_NT_HEADERS_Signature] = createComboBox( - ui->tableWidget_IMAGE_NT_HEADERS, - XPE::getImageNtHeadersSignaturesS(), - SPE::TYPE_IMAGE_NT_HEADERS, N_IMAGE_NT_HEADERS::Signature, - XComboBoxEx::CBTYPE_LIST); + g_comboBox[CB_IMAGE_NT_HEADERS_Signature] = createComboBox(ui->tableWidget_IMAGE_NT_HEADERS, XPE::getImageNtHeadersSignaturesS(), + SPE::TYPE_IMAGE_NT_HEADERS, N_IMAGE_NT_HEADERS::Signature, XComboBoxEx::CBTYPE_LIST); blockSignals(true); quint32 nSignature = pe.getNtHeaders_Signature(); - g_lineEdit_IMAGE_NT_HEADERS[N_IMAGE_NT_HEADERS::Signature] - ->setValue(nSignature); + g_lineEdit_IMAGE_NT_HEADERS[N_IMAGE_NT_HEADERS::Signature]->setValue(nSignature); g_comboBox[CB_IMAGE_NT_HEADERS_Signature]->setValue(nSignature); qint64 nOffset = pe.getNtHeadersOffset(); qint64 nSize = 4; qint64 nAddress = pe.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, - &g_subDevice[SPE::TYPE_IMAGE_NT_HEADERS], - ui->widgetHex_IMAGE_NT_HEADERS); + loadHexSubdevice(nOffset, nSize, nAddress, &g_subDevice[SPE::TYPE_IMAGE_NT_HEADERS], ui->widgetHex_IMAGE_NT_HEADERS); blockSignals(false); } } else if (nType == SPE::TYPE_IMAGE_FILE_HEADER) { if (!isInitPresent(sInit)) { - createHeaderTable(SPE::TYPE_IMAGE_FILE_HEADER, - ui->tableWidget_IMAGE_FILE_HEADER, - N_IMAGE_FILE_HEADER::records, - g_lineEdit_IMAGE_FILE_HEADER, + createHeaderTable(SPE::TYPE_IMAGE_FILE_HEADER, ui->tableWidget_IMAGE_FILE_HEADER, N_IMAGE_FILE_HEADER::records, g_lineEdit_IMAGE_FILE_HEADER, N_IMAGE_FILE_HEADER::__data_size, 0); - g_comboBox[CB_IMAGE_FILE_HEADER_Machine] = createComboBox( - ui->tableWidget_IMAGE_FILE_HEADER, - XPE::getImageFileHeaderMachinesS(), - SPE::TYPE_IMAGE_FILE_HEADER, N_IMAGE_FILE_HEADER::Machine, - XComboBoxEx::CBTYPE_LIST); + g_comboBox[CB_IMAGE_FILE_HEADER_Machine] = createComboBox(ui->tableWidget_IMAGE_FILE_HEADER, XPE::getImageFileHeaderMachinesS(), + SPE::TYPE_IMAGE_FILE_HEADER, N_IMAGE_FILE_HEADER::Machine, XComboBoxEx::CBTYPE_LIST); g_comboBox[CB_IMAGE_FILE_HEADER_Characteristics] = - createComboBox(ui->tableWidget_IMAGE_FILE_HEADER, - XPE::getImageFileHeaderCharacteristicsS(), - SPE::TYPE_IMAGE_FILE_HEADER, - N_IMAGE_FILE_HEADER::Characteristics, - XComboBoxEx::CBTYPE_FLAGS); - - g_dateTimeEdit[TD_IMAGE_FILE_HEADER_TimeDateStamp] = - createTimeDateEdit(ui->tableWidget_IMAGE_FILE_HEADER, - SPE::TYPE_IMAGE_FILE_HEADER, - N_IMAGE_FILE_HEADER::TimeDateStamp, - XDateTimeEditX::DT_TYPE_POSIX); - g_invWidget[INV_IMAGE_FILE_HEADER_PointerToSymbolTable] = - createInvWidget(ui->tableWidget_IMAGE_FILE_HEADER, - SPE::TYPE_IMAGE_FILE_HEADER, - N_IMAGE_FILE_HEADER::PointerToSymbolTable, - InvWidget::TYPE_HEX); + createComboBox(ui->tableWidget_IMAGE_FILE_HEADER, XPE::getImageFileHeaderCharacteristicsS(), SPE::TYPE_IMAGE_FILE_HEADER, + N_IMAGE_FILE_HEADER::Characteristics, XComboBoxEx::CBTYPE_FLAGS); + + g_dateTimeEdit[TD_IMAGE_FILE_HEADER_TimeDateStamp] = createTimeDateEdit(ui->tableWidget_IMAGE_FILE_HEADER, SPE::TYPE_IMAGE_FILE_HEADER, + N_IMAGE_FILE_HEADER::TimeDateStamp, XDateTimeEditX::DT_TYPE_POSIX); + g_invWidget[INV_IMAGE_FILE_HEADER_PointerToSymbolTable] = createInvWidget(ui->tableWidget_IMAGE_FILE_HEADER, SPE::TYPE_IMAGE_FILE_HEADER, + N_IMAGE_FILE_HEADER::PointerToSymbolTable, InvWidget::TYPE_HEX); blockSignals(true); XPE_DEF::IMAGE_FILE_HEADER fileheader = pe.getFileHeader(); - g_lineEdit_IMAGE_FILE_HEADER[N_IMAGE_FILE_HEADER::Machine] - ->setValue(fileheader.Machine); - g_lineEdit_IMAGE_FILE_HEADER - [N_IMAGE_FILE_HEADER::NumberOfSections] - ->setValue(fileheader.NumberOfSections); - g_lineEdit_IMAGE_FILE_HEADER[N_IMAGE_FILE_HEADER::TimeDateStamp] - ->setValue(fileheader.TimeDateStamp); - g_lineEdit_IMAGE_FILE_HEADER - [N_IMAGE_FILE_HEADER::PointerToSymbolTable] - ->setValue(fileheader.PointerToSymbolTable); - g_lineEdit_IMAGE_FILE_HEADER - [N_IMAGE_FILE_HEADER::NumberOfSymbols] - ->setValue(fileheader.NumberOfSymbols); - g_lineEdit_IMAGE_FILE_HEADER - [N_IMAGE_FILE_HEADER::SizeOfOptionalHeader] - ->setValue(fileheader.SizeOfOptionalHeader); - g_lineEdit_IMAGE_FILE_HEADER - [N_IMAGE_FILE_HEADER::Characteristics] - ->setValue(fileheader.Characteristics); - - g_comboBox[CB_IMAGE_FILE_HEADER_Machine]->setValue( - fileheader.Machine); - g_comboBox[CB_IMAGE_FILE_HEADER_Characteristics]->setValue( - fileheader.Characteristics); - g_dateTimeEdit[TD_IMAGE_FILE_HEADER_TimeDateStamp]->setValue( - fileheader.TimeDateStamp); - - addComment(ui->tableWidget_IMAGE_FILE_HEADER, - N_IMAGE_FILE_HEADER::SizeOfOptionalHeader, - HEADER_COLUMN_COMMENT, - XBinary::bytesCountToString( - fileheader.SizeOfOptionalHeader)); - - g_invWidget[INV_IMAGE_FILE_HEADER_PointerToSymbolTable] - ->setAddressAndSize( - &pe, - pe.getBaseAddress() + fileheader.PointerToSymbolTable, - 0); + g_lineEdit_IMAGE_FILE_HEADER[N_IMAGE_FILE_HEADER::Machine]->setValue(fileheader.Machine); + g_lineEdit_IMAGE_FILE_HEADER[N_IMAGE_FILE_HEADER::NumberOfSections]->setValue(fileheader.NumberOfSections); + g_lineEdit_IMAGE_FILE_HEADER[N_IMAGE_FILE_HEADER::TimeDateStamp]->setValue(fileheader.TimeDateStamp); + g_lineEdit_IMAGE_FILE_HEADER[N_IMAGE_FILE_HEADER::PointerToSymbolTable]->setValue(fileheader.PointerToSymbolTable); + g_lineEdit_IMAGE_FILE_HEADER[N_IMAGE_FILE_HEADER::NumberOfSymbols]->setValue(fileheader.NumberOfSymbols); + g_lineEdit_IMAGE_FILE_HEADER[N_IMAGE_FILE_HEADER::SizeOfOptionalHeader]->setValue(fileheader.SizeOfOptionalHeader); + g_lineEdit_IMAGE_FILE_HEADER[N_IMAGE_FILE_HEADER::Characteristics]->setValue(fileheader.Characteristics); + + g_comboBox[CB_IMAGE_FILE_HEADER_Machine]->setValue(fileheader.Machine); + g_comboBox[CB_IMAGE_FILE_HEADER_Characteristics]->setValue(fileheader.Characteristics); + g_dateTimeEdit[TD_IMAGE_FILE_HEADER_TimeDateStamp]->setValue(fileheader.TimeDateStamp); + + addComment(ui->tableWidget_IMAGE_FILE_HEADER, N_IMAGE_FILE_HEADER::SizeOfOptionalHeader, HEADER_COLUMN_COMMENT, + XBinary::bytesCountToString(fileheader.SizeOfOptionalHeader)); + + g_invWidget[INV_IMAGE_FILE_HEADER_PointerToSymbolTable]->setAddressAndSize(&pe, pe.getBaseAddress() + fileheader.PointerToSymbolTable, 0); qint64 nOffset = pe.getFileHeaderOffset(); qint64 nSize = pe.getFileHeaderSize(); qint64 nAddress = pe.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, - &g_subDevice[SPE::TYPE_IMAGE_FILE_HEADER], - ui->widgetHex_IMAGE_FILE_HEADER); + loadHexSubdevice(nOffset, nSize, nAddress, &g_subDevice[SPE::TYPE_IMAGE_FILE_HEADER], ui->widgetHex_IMAGE_FILE_HEADER); blockSignals(false); } } else if (nType == SPE::TYPE_IMAGE_OPTIONAL_HEADER) { if (!isInitPresent(sInit)) { - createHeaderTable(SPE::TYPE_IMAGE_OPTIONAL_HEADER, - ui->tableWidget_IMAGE_OPTIONAL_HEADER, - pe.is64() - ? (N_IMAGE_OPTIONAL_HEADER::records64) - : (N_IMAGE_OPTIONAL_HEADER::records32), - g_lineEdit_IMAGE_OPTIONAL_HEADER, + createHeaderTable(SPE::TYPE_IMAGE_OPTIONAL_HEADER, ui->tableWidget_IMAGE_OPTIONAL_HEADER, + pe.is64() ? (N_IMAGE_OPTIONAL_HEADER::records64) : (N_IMAGE_OPTIONAL_HEADER::records32), g_lineEdit_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::__data_size, 0); - g_comboBox[CB_IMAGE_OPTIONAL_HEADER_Magic] = createComboBox( - ui->tableWidget_IMAGE_OPTIONAL_HEADER, - XPE::getImageOptionalHeaderMagicS(), - SPE::TYPE_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::Magic, XComboBoxEx::CBTYPE_LIST); - - g_comboBox[CB_IMAGE_OPTIONAL_HEADER_OperationSystemVersion] = - createComboBox( - ui->tableWidget_IMAGE_OPTIONAL_HEADER, - XPE::getOperatingSystemVersions(pe.getOsInfo().osName), - SPE::TYPE_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::MajorOperatingSystemVersion, - XComboBoxEx::CBTYPE_LIST, 0, - N_IMAGE_OPTIONAL_HEADER::OperatingSystemVersion); + g_comboBox[CB_IMAGE_OPTIONAL_HEADER_Magic] = + createComboBox(ui->tableWidget_IMAGE_OPTIONAL_HEADER, XPE::getImageOptionalHeaderMagicS(), SPE::TYPE_IMAGE_OPTIONAL_HEADER, + N_IMAGE_OPTIONAL_HEADER::Magic, XComboBoxEx::CBTYPE_LIST); + + g_comboBox[CB_IMAGE_OPTIONAL_HEADER_OperationSystemVersion] = createComboBox( + ui->tableWidget_IMAGE_OPTIONAL_HEADER, XPE::getOperatingSystemVersions(pe.getOsInfo().osName), SPE::TYPE_IMAGE_OPTIONAL_HEADER, + N_IMAGE_OPTIONAL_HEADER::MajorOperatingSystemVersion, XComboBoxEx::CBTYPE_LIST, 0, N_IMAGE_OPTIONAL_HEADER::OperatingSystemVersion); g_comboBox[CB_IMAGE_OPTIONAL_HEADER_Subsystem] = - createComboBox(ui->tableWidget_IMAGE_OPTIONAL_HEADER, - XPE::getImageOptionalHeaderSubsystemS(), - SPE::TYPE_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::Subsystem, - XComboBoxEx::CBTYPE_LIST); + createComboBox(ui->tableWidget_IMAGE_OPTIONAL_HEADER, XPE::getImageOptionalHeaderSubsystemS(), SPE::TYPE_IMAGE_OPTIONAL_HEADER, + N_IMAGE_OPTIONAL_HEADER::Subsystem, XComboBoxEx::CBTYPE_LIST); g_comboBox[CB_IMAGE_OPTIONAL_HEADER_DllCharacteristics] = - createComboBox( - ui->tableWidget_IMAGE_OPTIONAL_HEADER, - XPE::getImageOptionalHeaderDllCharacteristicsS(), - SPE::TYPE_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::DllCharacteristics, - XComboBoxEx::CBTYPE_FLAGS); + createComboBox(ui->tableWidget_IMAGE_OPTIONAL_HEADER, XPE::getImageOptionalHeaderDllCharacteristicsS(), SPE::TYPE_IMAGE_OPTIONAL_HEADER, + N_IMAGE_OPTIONAL_HEADER::DllCharacteristics, XComboBoxEx::CBTYPE_FLAGS); g_invWidget[INV_IMAGE_OPTIONAL_HEADER_AddressOfEntryPoint] = - createInvWidget( - ui->tableWidget_IMAGE_OPTIONAL_HEADER, - SPE::TYPE_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::AddressOfEntryPoint, - InvWidget::TYPE_DISASM); - g_invWidget[INV_IMAGE_OPTIONAL_HEADER_BaseOfCode] = - createInvWidget(ui->tableWidget_IMAGE_OPTIONAL_HEADER, - SPE::TYPE_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::BaseOfCode, - InvWidget::TYPE_HEX); + createInvWidget(ui->tableWidget_IMAGE_OPTIONAL_HEADER, SPE::TYPE_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::AddressOfEntryPoint, + InvWidget::TYPE_DISASM); + g_invWidget[INV_IMAGE_OPTIONAL_HEADER_BaseOfCode] = createInvWidget(ui->tableWidget_IMAGE_OPTIONAL_HEADER, SPE::TYPE_IMAGE_OPTIONAL_HEADER, + N_IMAGE_OPTIONAL_HEADER::BaseOfCode, InvWidget::TYPE_HEX); if (!bIs64) { - g_invWidget[INV_IMAGE_OPTIONAL_HEADER_BaseOfData] = - createInvWidget(ui->tableWidget_IMAGE_OPTIONAL_HEADER, - SPE::TYPE_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::BaseOfData, - InvWidget::TYPE_HEX); + g_invWidget[INV_IMAGE_OPTIONAL_HEADER_BaseOfData] = createInvWidget(ui->tableWidget_IMAGE_OPTIONAL_HEADER, SPE::TYPE_IMAGE_OPTIONAL_HEADER, + N_IMAGE_OPTIONAL_HEADER::BaseOfData, InvWidget::TYPE_HEX); } - g_pushButton[PB_CalculateChecksum] = createPushButton( - ui->tableWidget_IMAGE_OPTIONAL_HEADER, - SPE::TYPE_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::CheckSum, tr("Calculate")); + g_pushButton[PB_CalculateChecksum] = createPushButton(ui->tableWidget_IMAGE_OPTIONAL_HEADER, SPE::TYPE_IMAGE_OPTIONAL_HEADER, + N_IMAGE_OPTIONAL_HEADER::CheckSum, tr("Calculate")); blockSignals(true); XBinary::_MEMORY_MAP memoryMap = pe.getMemoryMap(); if (bIs64) { - XPE_DEF::IMAGE_OPTIONAL_HEADER64S oh64 = - pe.getOptionalHeader64S(); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::Magic] - ->setValue(oh64.Magic); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::MajorLinkerVersion] - ->setValue(oh64.MajorLinkerVersion); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::MinorLinkerVersion] - ->setValue(oh64.MinorLinkerVersion); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::SizeOfCode] - ->setValue(oh64.SizeOfCode); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::SizeOfInitializedData] - ->setValue(oh64.SizeOfInitializedData); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::SizeOfUninitializedData] - ->setValue(oh64.SizeOfUninitializedData); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::AddressOfEntryPoint] - ->setValue(oh64.AddressOfEntryPoint); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::BaseOfCode] - ->setValue(oh64.BaseOfCode); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::ImageBase] - ->setValue(oh64.ImageBase); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::SectionAlignment] - ->setValue(oh64.SectionAlignment); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::FileAlignment] - ->setValue(oh64.FileAlignment); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::MajorOperatingSystemVersion] - ->setValue(oh64.MajorOperatingSystemVersion); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::MinorOperatingSystemVersion] - ->setValue(oh64.MinorOperatingSystemVersion); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::MajorImageVersion] - ->setValue(oh64.MajorImageVersion); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::MinorImageVersion] - ->setValue(oh64.MinorImageVersion); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::MajorSubsystemVersion] - ->setValue(oh64.MajorSubsystemVersion); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::MinorSubsystemVersion] - ->setValue(oh64.MinorSubsystemVersion); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::Win32VersionValue] - ->setValue(oh64.Win32VersionValue); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::SizeOfImage] - ->setValue(oh64.SizeOfImage); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::SizeOfHeaders] - ->setValue(oh64.SizeOfHeaders); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::CheckSum] - ->setValue(oh64.CheckSum); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::Subsystem] - ->setValue(oh64.Subsystem); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::DllCharacteristics] - ->setValue(oh64.DllCharacteristics); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::SizeOfStackReserve] - ->setValue(oh64.SizeOfStackReserve); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::SizeOfStackCommit] - ->setValue(oh64.SizeOfStackCommit); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::SizeOfHeapReserve] - ->setValue(oh64.SizeOfHeapReserve); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::SizeOfHeapCommit] - ->setValue(oh64.SizeOfHeapCommit); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::LoaderFlags] - ->setValue(oh64.LoaderFlags); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::NumberOfRvaAndSizes] - ->setValue(oh64.NumberOfRvaAndSizes); - - g_comboBox[CB_IMAGE_OPTIONAL_HEADER_Magic]->setValue( - oh64.Magic); - g_comboBox[CB_IMAGE_OPTIONAL_HEADER_Subsystem]->setValue( - oh64.Subsystem); - g_comboBox[CB_IMAGE_OPTIONAL_HEADER_DllCharacteristics] - ->setValue(oh64.DllCharacteristics); - - addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SizeOfCode, - HEADER_COLUMN_COMMENT, + XPE_DEF::IMAGE_OPTIONAL_HEADER64S oh64 = pe.getOptionalHeader64S(); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::Magic]->setValue(oh64.Magic); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::MajorLinkerVersion]->setValue(oh64.MajorLinkerVersion); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::MinorLinkerVersion]->setValue(oh64.MinorLinkerVersion); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::SizeOfCode]->setValue(oh64.SizeOfCode); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::SizeOfInitializedData]->setValue(oh64.SizeOfInitializedData); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::SizeOfUninitializedData]->setValue(oh64.SizeOfUninitializedData); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::AddressOfEntryPoint]->setValue(oh64.AddressOfEntryPoint); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::BaseOfCode]->setValue(oh64.BaseOfCode); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::ImageBase]->setValue(oh64.ImageBase); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::SectionAlignment]->setValue(oh64.SectionAlignment); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::FileAlignment]->setValue(oh64.FileAlignment); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::MajorOperatingSystemVersion]->setValue(oh64.MajorOperatingSystemVersion); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::MinorOperatingSystemVersion]->setValue(oh64.MinorOperatingSystemVersion); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::MajorImageVersion]->setValue(oh64.MajorImageVersion); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::MinorImageVersion]->setValue(oh64.MinorImageVersion); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::MajorSubsystemVersion]->setValue(oh64.MajorSubsystemVersion); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::MinorSubsystemVersion]->setValue(oh64.MinorSubsystemVersion); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::Win32VersionValue]->setValue(oh64.Win32VersionValue); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::SizeOfImage]->setValue(oh64.SizeOfImage); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::SizeOfHeaders]->setValue(oh64.SizeOfHeaders); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::CheckSum]->setValue(oh64.CheckSum); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::Subsystem]->setValue(oh64.Subsystem); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::DllCharacteristics]->setValue(oh64.DllCharacteristics); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::SizeOfStackReserve]->setValue(oh64.SizeOfStackReserve); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::SizeOfStackCommit]->setValue(oh64.SizeOfStackCommit); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::SizeOfHeapReserve]->setValue(oh64.SizeOfHeapReserve); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::SizeOfHeapCommit]->setValue(oh64.SizeOfHeapCommit); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::LoaderFlags]->setValue(oh64.LoaderFlags); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::NumberOfRvaAndSizes]->setValue(oh64.NumberOfRvaAndSizes); + + g_comboBox[CB_IMAGE_OPTIONAL_HEADER_Magic]->setValue(oh64.Magic); + g_comboBox[CB_IMAGE_OPTIONAL_HEADER_Subsystem]->setValue(oh64.Subsystem); + g_comboBox[CB_IMAGE_OPTIONAL_HEADER_DllCharacteristics]->setValue(oh64.DllCharacteristics); + + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SizeOfCode, HEADER_COLUMN_COMMENT, XBinary::bytesCountToString(oh64.SizeOfCode)); - addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SizeOfInitializedData, - HEADER_COLUMN_COMMENT, - XBinary::bytesCountToString( - oh64.SizeOfInitializedData)); - addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SizeOfUninitializedData, - HEADER_COLUMN_COMMENT, - XBinary::bytesCountToString( - oh64.SizeOfUninitializedData)); - addComment( - ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SectionAlignment, - HEADER_COLUMN_COMMENT, - XBinary::bytesCountToString(oh64.SectionAlignment)); - addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::FileAlignment, - HEADER_COLUMN_COMMENT, + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SizeOfInitializedData, HEADER_COLUMN_COMMENT, + XBinary::bytesCountToString(oh64.SizeOfInitializedData)); + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SizeOfUninitializedData, HEADER_COLUMN_COMMENT, + XBinary::bytesCountToString(oh64.SizeOfUninitializedData)); + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SectionAlignment, HEADER_COLUMN_COMMENT, + XBinary::bytesCountToString(oh64.SectionAlignment)); + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::FileAlignment, HEADER_COLUMN_COMMENT, XBinary::bytesCountToString(oh64.FileAlignment)); - addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SizeOfImage, - HEADER_COLUMN_COMMENT, + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SizeOfImage, HEADER_COLUMN_COMMENT, XBinary::bytesCountToString(oh64.SizeOfImage)); - addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SizeOfHeaders, - HEADER_COLUMN_COMMENT, + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SizeOfHeaders, HEADER_COLUMN_COMMENT, XBinary::bytesCountToString(oh64.SizeOfHeaders)); - addComment( - ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SizeOfStackReserve, - HEADER_COLUMN_COMMENT, - XBinary::bytesCountToString(oh64.SizeOfStackReserve)); - addComment( - ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SizeOfStackCommit, - HEADER_COLUMN_COMMENT, - XBinary::bytesCountToString(oh64.SizeOfStackCommit)); - addComment( - ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SizeOfHeapReserve, - HEADER_COLUMN_COMMENT, - XBinary::bytesCountToString(oh64.SizeOfHeapReserve)); - addComment( - ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SizeOfHeapCommit, - HEADER_COLUMN_COMMENT, - XBinary::bytesCountToString(oh64.SizeOfHeapCommit)); + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SizeOfStackReserve, HEADER_COLUMN_COMMENT, + XBinary::bytesCountToString(oh64.SizeOfStackReserve)); + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SizeOfStackCommit, HEADER_COLUMN_COMMENT, + XBinary::bytesCountToString(oh64.SizeOfStackCommit)); + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SizeOfHeapReserve, HEADER_COLUMN_COMMENT, + XBinary::bytesCountToString(oh64.SizeOfHeapReserve)); + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SizeOfHeapCommit, HEADER_COLUMN_COMMENT, + XBinary::bytesCountToString(oh64.SizeOfHeapCommit)); // TODO more - addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::AddressOfEntryPoint, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByRelAddress( - &memoryMap, oh64.AddressOfEntryPoint)); - addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::BaseOfCode, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByRelAddress( - &memoryMap, oh64.BaseOfCode)); - - g_invWidget[INV_IMAGE_OPTIONAL_HEADER_AddressOfEntryPoint] - ->setAddressAndSize( - &pe, pe.getBaseAddress() + oh64.AddressOfEntryPoint, - 0); - g_invWidget[INV_IMAGE_OPTIONAL_HEADER_BaseOfCode] - ->setAddressAndSize( - &pe, pe.getBaseAddress() + oh64.BaseOfCode, 0); + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::AddressOfEntryPoint, HEADER_COLUMN_COMMENT, + pe.getMemoryRecordInfoByRelAddress(&memoryMap, oh64.AddressOfEntryPoint)); + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::BaseOfCode, HEADER_COLUMN_COMMENT, + pe.getMemoryRecordInfoByRelAddress(&memoryMap, oh64.BaseOfCode)); + + g_invWidget[INV_IMAGE_OPTIONAL_HEADER_AddressOfEntryPoint]->setAddressAndSize(&pe, pe.getBaseAddress() + oh64.AddressOfEntryPoint, 0); + g_invWidget[INV_IMAGE_OPTIONAL_HEADER_BaseOfCode]->setAddressAndSize(&pe, pe.getBaseAddress() + oh64.BaseOfCode, 0); } else { - XPE_DEF::IMAGE_OPTIONAL_HEADER32S oh32 = - pe.getOptionalHeader32S(); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::Magic] - ->setValue(oh32.Magic); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::MajorLinkerVersion] - ->setValue(oh32.MajorLinkerVersion); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::MinorLinkerVersion] - ->setValue(oh32.MinorLinkerVersion); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::SizeOfCode] - ->setValue(oh32.SizeOfCode); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::SizeOfInitializedData] - ->setValue(oh32.SizeOfInitializedData); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::SizeOfUninitializedData] - ->setValue(oh32.SizeOfUninitializedData); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::AddressOfEntryPoint] - ->setValue(oh32.AddressOfEntryPoint); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::BaseOfCode] - ->setValue(oh32.BaseOfCode); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::BaseOfData] - ->setValue(oh32.BaseOfData); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::ImageBase] - ->setValue(oh32.ImageBase); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::SectionAlignment] - ->setValue(oh32.SectionAlignment); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::FileAlignment] - ->setValue(oh32.FileAlignment); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::MajorOperatingSystemVersion] - ->setValue(oh32.MajorOperatingSystemVersion); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::MinorOperatingSystemVersion] - ->setValue(oh32.MinorOperatingSystemVersion); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::MajorImageVersion] - ->setValue(oh32.MajorImageVersion); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::MinorImageVersion] - ->setValue(oh32.MinorImageVersion); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::MajorSubsystemVersion] - ->setValue(oh32.MajorSubsystemVersion); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::MinorSubsystemVersion] - ->setValue(oh32.MinorSubsystemVersion); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::Win32VersionValue] - ->setValue(oh32.Win32VersionValue); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::SizeOfImage] - ->setValue(oh32.SizeOfImage); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::SizeOfHeaders] - ->setValue(oh32.SizeOfHeaders); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::CheckSum] - ->setValue(oh32.CheckSum); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::Subsystem] - ->setValue(oh32.Subsystem); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::DllCharacteristics] - ->setValue(oh32.DllCharacteristics); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::SizeOfStackReserve] - ->setValue(oh32.SizeOfStackReserve); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::SizeOfStackCommit] - ->setValue(oh32.SizeOfStackCommit); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::SizeOfHeapReserve] - ->setValue(oh32.SizeOfHeapReserve); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::SizeOfHeapCommit] - ->setValue(oh32.SizeOfHeapCommit); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::LoaderFlags] - ->setValue(oh32.LoaderFlags); - g_lineEdit_IMAGE_OPTIONAL_HEADER - [N_IMAGE_OPTIONAL_HEADER::NumberOfRvaAndSizes] - ->setValue(oh32.NumberOfRvaAndSizes); - - g_comboBox[CB_IMAGE_OPTIONAL_HEADER_Magic]->setValue( - oh32.Magic); - g_comboBox[CB_IMAGE_OPTIONAL_HEADER_Subsystem]->setValue( - oh32.Subsystem); - g_comboBox[CB_IMAGE_OPTIONAL_HEADER_DllCharacteristics] - ->setValue(oh32.DllCharacteristics); - - addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SizeOfCode, - HEADER_COLUMN_COMMENT, + XPE_DEF::IMAGE_OPTIONAL_HEADER32S oh32 = pe.getOptionalHeader32S(); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::Magic]->setValue(oh32.Magic); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::MajorLinkerVersion]->setValue(oh32.MajorLinkerVersion); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::MinorLinkerVersion]->setValue(oh32.MinorLinkerVersion); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::SizeOfCode]->setValue(oh32.SizeOfCode); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::SizeOfInitializedData]->setValue(oh32.SizeOfInitializedData); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::SizeOfUninitializedData]->setValue(oh32.SizeOfUninitializedData); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::AddressOfEntryPoint]->setValue(oh32.AddressOfEntryPoint); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::BaseOfCode]->setValue(oh32.BaseOfCode); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::BaseOfData]->setValue(oh32.BaseOfData); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::ImageBase]->setValue(oh32.ImageBase); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::SectionAlignment]->setValue(oh32.SectionAlignment); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::FileAlignment]->setValue(oh32.FileAlignment); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::MajorOperatingSystemVersion]->setValue(oh32.MajorOperatingSystemVersion); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::MinorOperatingSystemVersion]->setValue(oh32.MinorOperatingSystemVersion); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::MajorImageVersion]->setValue(oh32.MajorImageVersion); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::MinorImageVersion]->setValue(oh32.MinorImageVersion); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::MajorSubsystemVersion]->setValue(oh32.MajorSubsystemVersion); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::MinorSubsystemVersion]->setValue(oh32.MinorSubsystemVersion); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::Win32VersionValue]->setValue(oh32.Win32VersionValue); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::SizeOfImage]->setValue(oh32.SizeOfImage); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::SizeOfHeaders]->setValue(oh32.SizeOfHeaders); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::CheckSum]->setValue(oh32.CheckSum); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::Subsystem]->setValue(oh32.Subsystem); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::DllCharacteristics]->setValue(oh32.DllCharacteristics); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::SizeOfStackReserve]->setValue(oh32.SizeOfStackReserve); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::SizeOfStackCommit]->setValue(oh32.SizeOfStackCommit); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::SizeOfHeapReserve]->setValue(oh32.SizeOfHeapReserve); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::SizeOfHeapCommit]->setValue(oh32.SizeOfHeapCommit); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::LoaderFlags]->setValue(oh32.LoaderFlags); + g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::NumberOfRvaAndSizes]->setValue(oh32.NumberOfRvaAndSizes); + + g_comboBox[CB_IMAGE_OPTIONAL_HEADER_Magic]->setValue(oh32.Magic); + g_comboBox[CB_IMAGE_OPTIONAL_HEADER_Subsystem]->setValue(oh32.Subsystem); + g_comboBox[CB_IMAGE_OPTIONAL_HEADER_DllCharacteristics]->setValue(oh32.DllCharacteristics); + + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SizeOfCode, HEADER_COLUMN_COMMENT, XBinary::bytesCountToString(oh32.SizeOfCode)); - addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SizeOfInitializedData, - HEADER_COLUMN_COMMENT, - XBinary::bytesCountToString( - oh32.SizeOfInitializedData)); - addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SizeOfUninitializedData, - HEADER_COLUMN_COMMENT, - XBinary::bytesCountToString( - oh32.SizeOfUninitializedData)); - addComment( - ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SectionAlignment, - HEADER_COLUMN_COMMENT, - XBinary::bytesCountToString(oh32.SectionAlignment)); - addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::FileAlignment, - HEADER_COLUMN_COMMENT, + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SizeOfInitializedData, HEADER_COLUMN_COMMENT, + XBinary::bytesCountToString(oh32.SizeOfInitializedData)); + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SizeOfUninitializedData, HEADER_COLUMN_COMMENT, + XBinary::bytesCountToString(oh32.SizeOfUninitializedData)); + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SectionAlignment, HEADER_COLUMN_COMMENT, + XBinary::bytesCountToString(oh32.SectionAlignment)); + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::FileAlignment, HEADER_COLUMN_COMMENT, XBinary::bytesCountToString(oh32.FileAlignment)); - addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SizeOfImage, - HEADER_COLUMN_COMMENT, + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SizeOfImage, HEADER_COLUMN_COMMENT, XBinary::bytesCountToString(oh32.SizeOfImage)); - addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SizeOfHeaders, - HEADER_COLUMN_COMMENT, + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SizeOfHeaders, HEADER_COLUMN_COMMENT, XBinary::bytesCountToString(oh32.SizeOfHeaders)); - addComment( - ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SizeOfStackReserve, - HEADER_COLUMN_COMMENT, - XBinary::bytesCountToString(oh32.SizeOfStackReserve)); - addComment( - ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SizeOfStackCommit, - HEADER_COLUMN_COMMENT, - XBinary::bytesCountToString(oh32.SizeOfStackCommit)); - addComment( - ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SizeOfHeapReserve, - HEADER_COLUMN_COMMENT, - XBinary::bytesCountToString(oh32.SizeOfHeapReserve)); - addComment( - ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::SizeOfHeapCommit, - HEADER_COLUMN_COMMENT, - XBinary::bytesCountToString(oh32.SizeOfHeapCommit)); + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SizeOfStackReserve, HEADER_COLUMN_COMMENT, + XBinary::bytesCountToString(oh32.SizeOfStackReserve)); + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SizeOfStackCommit, HEADER_COLUMN_COMMENT, + XBinary::bytesCountToString(oh32.SizeOfStackCommit)); + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SizeOfHeapReserve, HEADER_COLUMN_COMMENT, + XBinary::bytesCountToString(oh32.SizeOfHeapReserve)); + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::SizeOfHeapCommit, HEADER_COLUMN_COMMENT, + XBinary::bytesCountToString(oh32.SizeOfHeapCommit)); // TODO more - addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::AddressOfEntryPoint, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByRelAddress( - &memoryMap, oh32.AddressOfEntryPoint)); - addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::BaseOfCode, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByRelAddress( - &memoryMap, oh32.BaseOfCode)); - addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, - N_IMAGE_OPTIONAL_HEADER::BaseOfData, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByRelAddress( - &memoryMap, oh32.BaseOfData)); - - g_invWidget[INV_IMAGE_OPTIONAL_HEADER_AddressOfEntryPoint] - ->setAddressAndSize( - &pe, pe.getBaseAddress() + oh32.AddressOfEntryPoint, - 0); - g_invWidget[INV_IMAGE_OPTIONAL_HEADER_BaseOfCode] - ->setAddressAndSize( - &pe, pe.getBaseAddress() + oh32.BaseOfCode, 0); - g_invWidget[INV_IMAGE_OPTIONAL_HEADER_BaseOfData] - ->setAddressAndSize( - &pe, pe.getBaseAddress() + oh32.BaseOfData, 0); + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::AddressOfEntryPoint, HEADER_COLUMN_COMMENT, + pe.getMemoryRecordInfoByRelAddress(&memoryMap, oh32.AddressOfEntryPoint)); + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::BaseOfCode, HEADER_COLUMN_COMMENT, + pe.getMemoryRecordInfoByRelAddress(&memoryMap, oh32.BaseOfCode)); + addComment(ui->tableWidget_IMAGE_OPTIONAL_HEADER, N_IMAGE_OPTIONAL_HEADER::BaseOfData, HEADER_COLUMN_COMMENT, + pe.getMemoryRecordInfoByRelAddress(&memoryMap, oh32.BaseOfData)); + + g_invWidget[INV_IMAGE_OPTIONAL_HEADER_AddressOfEntryPoint]->setAddressAndSize(&pe, pe.getBaseAddress() + oh32.AddressOfEntryPoint, 0); + g_invWidget[INV_IMAGE_OPTIONAL_HEADER_BaseOfCode]->setAddressAndSize(&pe, pe.getBaseAddress() + oh32.BaseOfCode, 0); + g_invWidget[INV_IMAGE_OPTIONAL_HEADER_BaseOfData]->setAddressAndSize(&pe, pe.getBaseAddress() + oh32.BaseOfData, 0); } - g_comboBox[CB_IMAGE_OPTIONAL_HEADER_OperationSystemVersion] - ->setValue(pe.getOperatingSystemVersion()); + g_comboBox[CB_IMAGE_OPTIONAL_HEADER_OperationSystemVersion]->setValue(pe.getOperatingSystemVersion()); qint64 nOffset = pe.getOptionalHeaderOffset(); qint64 nSize = pe.getOptionalHeaderSize(); qint64 nAddress = pe.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, - &g_subDevice[SPE::TYPE_IMAGE_OPTIONAL_HEADER], - ui->widgetHex_IMAGE_OPTIONAL_HEADER); + loadHexSubdevice(nOffset, nSize, nAddress, &g_subDevice[SPE::TYPE_IMAGE_OPTIONAL_HEADER], ui->widgetHex_IMAGE_OPTIONAL_HEADER); blockSignals(false); } } else if (nType == SPE::TYPE_IMAGE_DIRECTORY_ENTRIES) { if (!isInitPresent(sInit)) { - createSectionTable(SPE::TYPE_IMAGE_DIRECTORY_ENTRIES, - ui->tableWidget_IMAGE_DIRECTORY_ENTRIES, - N_IMAGE_DATA_DIRECTORY::records, + createSectionTable(SPE::TYPE_IMAGE_DIRECTORY_ENTRIES, ui->tableWidget_IMAGE_DIRECTORY_ENTRIES, N_IMAGE_DATA_DIRECTORY::records, N_IMAGE_DATA_DIRECTORY::__data_size); blockSignals(true); - qint32 nNumberOfRvaAndSizes = - (qint32)pe.getOptionalHeader_NumberOfRvaAndSizes(); + qint32 nNumberOfRvaAndSizes = (qint32)pe.getOptionalHeader_NumberOfRvaAndSizes(); ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->setRowCount(16); XBinary::_MEMORY_MAP memoryMap = pe.getMemoryMap(); - QMap mapDD = - XPE::getImageOptionalHeaderDataDirectoryS(); + QMap mapDD = XPE::getImageOptionalHeaderDataDirectoryS(); for (qint32 i = 0; i < 16; i++) { - ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->setItem( - i, 4, new QTableWidgetItem()); // Comment - ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->setItem( - i, 5, new QTableWidgetItem()); // Comment + ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->setItem(i, 4, new QTableWidgetItem()); // Comment + ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->setItem(i, 5, new QTableWidgetItem()); // Comment - XPE_DEF::IMAGE_DATA_DIRECTORY dd = - pe.getOptionalHeader_DataDirectory((quint32)i); + XPE_DEF::IMAGE_DATA_DIRECTORY dd = pe.getOptionalHeader_DataDirectory((quint32)i); - QTableWidgetItem *pItemNumber = - new QTableWidgetItem(QString::number(i)); + QTableWidgetItem *pItemNumber = new QTableWidgetItem(QString::number(i)); - pItemNumber->setData( - Qt::UserRole + FW_DEF::SECTION_DATA_SIZE, dd.Size); - pItemNumber->setData( - Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET, - pe.getDataDirectoryHeaderOffset(i)); + pItemNumber->setData(Qt::UserRole + FW_DEF::SECTION_DATA_SIZE, dd.Size); + pItemNumber->setData(Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET, pe.getDataDirectoryHeaderOffset(i)); - addComment(ui->tableWidget_IMAGE_DIRECTORY_ENTRIES, i, 4, - XBinary::bytesCountToString(dd.Size)); + addComment(ui->tableWidget_IMAGE_DIRECTORY_ENTRIES, i, 4, XBinary::bytesCountToString(dd.Size)); if (i != XPE_DEF::S_IMAGE_DIRECTORY_ENTRY_SECURITY) { - pItemNumber->setData( - Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS, - dd.VirtualAddress); - pItemNumber->setData( - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET, - pe.addressToOffset( - &memoryMap, - memoryMap.nModuleAddress + dd.VirtualAddress)); - - if ((dd.VirtualAddress) && - (pe.isRelAddressValid(&memoryMap, - dd.VirtualAddress))) { - addComment(ui->tableWidget_IMAGE_DIRECTORY_ENTRIES, - i, 5, - pe.getMemoryRecordInfoByRelAddress( - &memoryMap, dd.VirtualAddress)); + pItemNumber->setData(Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS, dd.VirtualAddress); + pItemNumber->setData(Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET, + pe.addressToOffset(&memoryMap, memoryMap.nModuleAddress + dd.VirtualAddress)); + + if ((dd.VirtualAddress) && (pe.isRelAddressValid(&memoryMap, dd.VirtualAddress))) { + addComment(ui->tableWidget_IMAGE_DIRECTORY_ENTRIES, i, 5, pe.getMemoryRecordInfoByRelAddress(&memoryMap, dd.VirtualAddress)); } } else { - pItemNumber->setData( - Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS, - dd.VirtualAddress); - pItemNumber->setData( - Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET, - dd.VirtualAddress); - - if ((dd.VirtualAddress) && - (pe.isOffsetValid(&memoryMap, dd.VirtualAddress))) { - addComment(ui->tableWidget_IMAGE_DIRECTORY_ENTRIES, - i, 5, - pe.getMemoryRecordInfoByOffset( - &memoryMap, dd.VirtualAddress)); + pItemNumber->setData(Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS, dd.VirtualAddress); + pItemNumber->setData(Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET, dd.VirtualAddress); + + if ((dd.VirtualAddress) && (pe.isOffsetValid(&memoryMap, dd.VirtualAddress))) { + addComment(ui->tableWidget_IMAGE_DIRECTORY_ENTRIES, i, 5, pe.getMemoryRecordInfoByOffset(&memoryMap, dd.VirtualAddress)); } } - ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->setItem( - i, 0, pItemNumber); - - ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->setItem( - i, 1, new QTableWidgetItem(mapDD.value(i))); - ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->setItem( - i, 2, - new QTableWidgetItem( - XBinary::valueToHex(dd.VirtualAddress))); - - QTableWidgetItem *pItem = - new QTableWidgetItem(XBinary::valueToHex(dd.Size)); - ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->setItem(i, 3, - pItem); - - setItemEnable( - ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->item(i, 0), - i < nNumberOfRvaAndSizes); - setItemEnable( - ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->item(i, 1), - i < nNumberOfRvaAndSizes); - setItemEnable( - ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->item(i, 2), - i < nNumberOfRvaAndSizes); - setItemEnable( - ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->item(i, 3), - i < nNumberOfRvaAndSizes); + ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->setItem(i, 0, pItemNumber); + + ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->setItem(i, 1, new QTableWidgetItem(mapDD.value(i))); + ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->setItem(i, 2, new QTableWidgetItem(XBinary::valueToHex(dd.VirtualAddress))); + + QTableWidgetItem *pItem = new QTableWidgetItem(XBinary::valueToHex(dd.Size)); + ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->setItem(i, 3, pItem); + + setItemEnable(ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->item(i, 0), i < nNumberOfRvaAndSizes); + setItemEnable(ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->item(i, 1), i < nNumberOfRvaAndSizes); + setItemEnable(ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->item(i, 2), i < nNumberOfRvaAndSizes); + setItemEnable(ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->item(i, 3), i < nNumberOfRvaAndSizes); // TODO !!! // ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->setItem(i,3,new @@ -2540,8 +1834,7 @@ void PEWidget::reloadData() { // lineEdit_IMAGE_DIRECTORY_SIZE[i]->setEnabled(i<(int)nNumberOfRvaAndSizes); } - if (ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->currentRow() == - 0) { + if (ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->currentRow() == 0) { loadDirectory(0); } else { ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->selectRow(0); @@ -2551,226 +1844,133 @@ void PEWidget::reloadData() { } } else if (nType == SPE::TYPE_RICH) { if (!isInitPresent(sInit)) { - PEProcessData peProcessData( - SPE::TYPE_RICH, &g_tvModel[SPE::TYPE_RICH], &pe, 0, 0, 0); + PEProcessData peProcessData(SPE::TYPE_RICH, &g_tvModel[SPE::TYPE_RICH], &pe, 0, 0, 0); - ajustTableView(&peProcessData, &g_tvModel[SPE::TYPE_RICH], - ui->tableView_RICH, nullptr, true); + ajustTableView(&peProcessData, &g_tvModel[SPE::TYPE_RICH], ui->tableView_RICH, nullptr, true); } } else if (nType == SPE::TYPE_SECTIONS) { if (!isInitPresent(sInit)) { - PEProcessData peProcessData(SPE::TYPE_SECTIONS, - &g_tvModel[SPE::TYPE_SECTIONS], &pe, - 0, 0, 0); + PEProcessData peProcessData(SPE::TYPE_SECTIONS, &g_tvModel[SPE::TYPE_SECTIONS], &pe, 0, 0, 0); - ajustTableView(&peProcessData, &g_tvModel[SPE::TYPE_SECTIONS], - ui->tableView_Sections, nullptr, false); + ajustTableView(&peProcessData, &g_tvModel[SPE::TYPE_SECTIONS], ui->tableView_Sections, nullptr, false); - connect(ui->tableView_Sections->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTableView_Sections_currentRowChanged( - QModelIndex, QModelIndex))); + connect(ui->tableView_Sections->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTableView_Sections_currentRowChanged(QModelIndex, QModelIndex))); if (g_tvModel[SPE::TYPE_SECTIONS]->rowCount()) { - ui->tableView_Sections->setCurrentIndex( - ui->tableView_Sections->model()->index(0, 0)); + ui->tableView_Sections->setCurrentIndex(ui->tableView_Sections->model()->index(0, 0)); } } } else if (nType == SPE::TYPE_EXPORT) { if (!isInitPresent(sInit)) { - createHeaderTable(SPE::TYPE_EXPORT, - ui->tableWidget_ExportHeader, - N_IMAGE_EXPORT::records, g_lineEdit_EXPORT, - N_IMAGE_EXPORT::__data_size, 0); - - g_invWidget[INV_IMAGE_EXPORT_Name] = createInvWidget( - ui->tableWidget_ExportHeader, SPE::TYPE_EXPORT, - N_IMAGE_EXPORT::Name, InvWidget::TYPE_HEX); + createHeaderTable(SPE::TYPE_EXPORT, ui->tableWidget_ExportHeader, N_IMAGE_EXPORT::records, g_lineEdit_EXPORT, N_IMAGE_EXPORT::__data_size, 0); + + g_invWidget[INV_IMAGE_EXPORT_Name] = createInvWidget(ui->tableWidget_ExportHeader, SPE::TYPE_EXPORT, N_IMAGE_EXPORT::Name, InvWidget::TYPE_HEX); g_invWidget[INV_IMAGE_EXPORT_AddressOfFunctions] = - createInvWidget(ui->tableWidget_ExportHeader, - SPE::TYPE_EXPORT, - N_IMAGE_EXPORT::AddressOfFunctions, - InvWidget::TYPE_HEX); + createInvWidget(ui->tableWidget_ExportHeader, SPE::TYPE_EXPORT, N_IMAGE_EXPORT::AddressOfFunctions, InvWidget::TYPE_HEX); g_invWidget[INV_IMAGE_EXPORT_AddressOfNameOrdinals] = - createInvWidget(ui->tableWidget_ExportHeader, - SPE::TYPE_EXPORT, - N_IMAGE_EXPORT::AddressOfNameOrdinals, - InvWidget::TYPE_HEX); - g_invWidget[INV_IMAGE_EXPORT_AddressOfNames] = createInvWidget( - ui->tableWidget_ExportHeader, SPE::TYPE_EXPORT, - N_IMAGE_EXPORT::AddressOfNames, InvWidget::TYPE_HEX); + createInvWidget(ui->tableWidget_ExportHeader, SPE::TYPE_EXPORT, N_IMAGE_EXPORT::AddressOfNameOrdinals, InvWidget::TYPE_HEX); + g_invWidget[INV_IMAGE_EXPORT_AddressOfNames] = + createInvWidget(ui->tableWidget_ExportHeader, SPE::TYPE_EXPORT, N_IMAGE_EXPORT::AddressOfNames, InvWidget::TYPE_HEX); g_dateTimeEdit[TD_IMAGE_EXPORT_TimeDateStamp] = - createTimeDateEdit(ui->tableWidget_ExportHeader, - SPE::TYPE_EXPORT, - N_IMAGE_EXPORT::TimeDateStamp, - XDateTimeEditX::DT_TYPE_POSIX); + createTimeDateEdit(ui->tableWidget_ExportHeader, SPE::TYPE_EXPORT, N_IMAGE_EXPORT::TimeDateStamp, XDateTimeEditX::DT_TYPE_POSIX); blockSignals(true); XPE::EXPORT_HEADER eh = pe.getExport(); - g_lineEdit_EXPORT[N_IMAGE_EXPORT::Characteristics]->setValue( - eh.directory.Characteristics); - g_lineEdit_EXPORT[N_IMAGE_EXPORT::TimeDateStamp]->setValue( - eh.directory.TimeDateStamp); - g_lineEdit_EXPORT[N_IMAGE_EXPORT::MajorVersion]->setValue( - eh.directory.MajorVersion); - g_lineEdit_EXPORT[N_IMAGE_EXPORT::MinorVersion]->setValue( - eh.directory.MinorVersion); - g_lineEdit_EXPORT[N_IMAGE_EXPORT::Name]->setValue( - eh.directory.Name); - g_lineEdit_EXPORT[N_IMAGE_EXPORT::Base]->setValue( - eh.directory.Base); - g_lineEdit_EXPORT[N_IMAGE_EXPORT::NumberOfFunctions]->setValue( - eh.directory.NumberOfFunctions); - g_lineEdit_EXPORT[N_IMAGE_EXPORT::NumberOfNames]->setValue( - eh.directory.NumberOfNames); - g_lineEdit_EXPORT[N_IMAGE_EXPORT::AddressOfFunctions]->setValue( - eh.directory.AddressOfFunctions); - g_lineEdit_EXPORT[N_IMAGE_EXPORT::AddressOfNames]->setValue( - eh.directory.AddressOfNames); - g_lineEdit_EXPORT[N_IMAGE_EXPORT::AddressOfNameOrdinals] - ->setValue(eh.directory.AddressOfNameOrdinals); - - g_dateTimeEdit[TD_IMAGE_EXPORT_TimeDateStamp]->setValue( - eh.directory.TimeDateStamp); - - g_invWidget[INV_IMAGE_EXPORT_Name]->setAddressAndSize( - &pe, pe.getBaseAddress() + eh.directory.Name, 0); - g_invWidget[INV_IMAGE_EXPORT_AddressOfFunctions] - ->setAddressAndSize( - &pe, - pe.getBaseAddress() + eh.directory.AddressOfFunctions, - 0); - g_invWidget[INV_IMAGE_EXPORT_AddressOfNameOrdinals] - ->setAddressAndSize(&pe, - pe.getBaseAddress() + - eh.directory.AddressOfNameOrdinals, - 0); - g_invWidget[INV_IMAGE_EXPORT_AddressOfNames]->setAddressAndSize( - &pe, pe.getBaseAddress() + eh.directory.AddressOfNames, 0); + g_lineEdit_EXPORT[N_IMAGE_EXPORT::Characteristics]->setValue(eh.directory.Characteristics); + g_lineEdit_EXPORT[N_IMAGE_EXPORT::TimeDateStamp]->setValue(eh.directory.TimeDateStamp); + g_lineEdit_EXPORT[N_IMAGE_EXPORT::MajorVersion]->setValue(eh.directory.MajorVersion); + g_lineEdit_EXPORT[N_IMAGE_EXPORT::MinorVersion]->setValue(eh.directory.MinorVersion); + g_lineEdit_EXPORT[N_IMAGE_EXPORT::Name]->setValue(eh.directory.Name); + g_lineEdit_EXPORT[N_IMAGE_EXPORT::Base]->setValue(eh.directory.Base); + g_lineEdit_EXPORT[N_IMAGE_EXPORT::NumberOfFunctions]->setValue(eh.directory.NumberOfFunctions); + g_lineEdit_EXPORT[N_IMAGE_EXPORT::NumberOfNames]->setValue(eh.directory.NumberOfNames); + g_lineEdit_EXPORT[N_IMAGE_EXPORT::AddressOfFunctions]->setValue(eh.directory.AddressOfFunctions); + g_lineEdit_EXPORT[N_IMAGE_EXPORT::AddressOfNames]->setValue(eh.directory.AddressOfNames); + g_lineEdit_EXPORT[N_IMAGE_EXPORT::AddressOfNameOrdinals]->setValue(eh.directory.AddressOfNameOrdinals); + + g_dateTimeEdit[TD_IMAGE_EXPORT_TimeDateStamp]->setValue(eh.directory.TimeDateStamp); + + g_invWidget[INV_IMAGE_EXPORT_Name]->setAddressAndSize(&pe, pe.getBaseAddress() + eh.directory.Name, 0); + g_invWidget[INV_IMAGE_EXPORT_AddressOfFunctions]->setAddressAndSize(&pe, pe.getBaseAddress() + eh.directory.AddressOfFunctions, 0); + g_invWidget[INV_IMAGE_EXPORT_AddressOfNameOrdinals]->setAddressAndSize(&pe, pe.getBaseAddress() + eh.directory.AddressOfNameOrdinals, 0); + g_invWidget[INV_IMAGE_EXPORT_AddressOfNames]->setAddressAndSize(&pe, pe.getBaseAddress() + eh.directory.AddressOfNames, 0); XBinary::_MEMORY_MAP memoryMap = pe.getMemoryMap(); - addComment(ui->tableWidget_ExportHeader, N_IMAGE_EXPORT::Name, - HEADER_COLUMN_COMMENT, - pe.read_ansiString(pe.relAddressToOffset( - &memoryMap, eh.directory.Name))); - - addComment(ui->tableWidget_ExportHeader, - N_IMAGE_EXPORT::AddressOfFunctions, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByRelAddress( - &memoryMap, eh.directory.AddressOfFunctions)); - addComment(ui->tableWidget_ExportHeader, - N_IMAGE_EXPORT::AddressOfNames, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByRelAddress( - &memoryMap, eh.directory.AddressOfNames)); - addComment(ui->tableWidget_ExportHeader, - N_IMAGE_EXPORT::AddressOfNameOrdinals, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByRelAddress( - &memoryMap, eh.directory.AddressOfNameOrdinals)); + addComment(ui->tableWidget_ExportHeader, N_IMAGE_EXPORT::Name, HEADER_COLUMN_COMMENT, + pe.read_ansiString(pe.relAddressToOffset(&memoryMap, eh.directory.Name))); + + addComment(ui->tableWidget_ExportHeader, N_IMAGE_EXPORT::AddressOfFunctions, HEADER_COLUMN_COMMENT, + pe.getMemoryRecordInfoByRelAddress(&memoryMap, eh.directory.AddressOfFunctions)); + addComment(ui->tableWidget_ExportHeader, N_IMAGE_EXPORT::AddressOfNames, HEADER_COLUMN_COMMENT, + pe.getMemoryRecordInfoByRelAddress(&memoryMap, eh.directory.AddressOfNames)); + addComment(ui->tableWidget_ExportHeader, N_IMAGE_EXPORT::AddressOfNameOrdinals, HEADER_COLUMN_COMMENT, + pe.getMemoryRecordInfoByRelAddress(&memoryMap, eh.directory.AddressOfNameOrdinals)); blockSignals(false); - PEProcessData peProcessData( - SPE::TYPE_EXPORT_FUNCTION, - &g_tvModel[SPE::TYPE_EXPORT_FUNCTION], &pe, 0, 0, 0, - ui->checkBoxExportShowValid->isChecked()); + PEProcessData peProcessData(SPE::TYPE_EXPORT_FUNCTION, &g_tvModel[SPE::TYPE_EXPORT_FUNCTION], &pe, 0, 0, 0, + ui->checkBoxExportShowValid->isChecked()); - ajustTableView(&peProcessData, - &g_tvModel[SPE::TYPE_EXPORT_FUNCTION], - ui->tableView_ExportFunctions); + ajustTableView(&peProcessData, &g_tvModel[SPE::TYPE_EXPORT_FUNCTION], ui->tableView_ExportFunctions); if (g_tvModel[SPE::TYPE_EXPORT_FUNCTION]->rowCount()) { - ui->tableView_ExportFunctions->setCurrentIndex( - ui->tableView_ExportFunctions->model()->index(0, 0)); + ui->tableView_ExportFunctions->setCurrentIndex(ui->tableView_ExportFunctions->model()->index(0, 0)); } } } else if (nType == SPE::TYPE_IMPORT) { if (!isInitPresent(sInit)) { XBinary::_MEMORY_MAP memoryMap = pe.getMemoryMap(); - QList listImportRecords = - pe.getImportRecords(&memoryMap); + QList listImportRecords = pe.getImportRecords(&memoryMap); - ui->lineEditHash64->setValue( - pe.getImportHash64(&listImportRecords)); - ui->lineEditHash32->setValue( - pe.getImportHash32(&listImportRecords)); + ui->lineEditHash64->setValue(pe.getImportHash64(&listImportRecords)); + ui->lineEditHash32->setValue(pe.getImportHash32(&listImportRecords)); - PEProcessData peProcessData(SPE::TYPE_IMPORT, - &g_tvModel[SPE::TYPE_IMPORT], &pe, - 0, 0, 0); + PEProcessData peProcessData(SPE::TYPE_IMPORT, &g_tvModel[SPE::TYPE_IMPORT], &pe, 0, 0, 0); - ajustTableView(&peProcessData, &g_tvModel[SPE::TYPE_IMPORT], - ui->tableView_ImportLibraries); + ajustTableView(&peProcessData, &g_tvModel[SPE::TYPE_IMPORT], ui->tableView_ImportLibraries); - connect(ui->tableView_ImportLibraries->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTableView_ImportLibraries_currentRowChanged( - QModelIndex, QModelIndex))); + connect(ui->tableView_ImportLibraries->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTableView_ImportLibraries_currentRowChanged(QModelIndex, QModelIndex))); if (g_tvModel[SPE::TYPE_IMPORT]->rowCount()) { - ui->tableView_ImportLibraries->setCurrentIndex( - ui->tableView_ImportLibraries->model()->index(0, 0)); + ui->tableView_ImportLibraries->setCurrentIndex(ui->tableView_ImportLibraries->model()->index(0, 0)); } } } else if (nType == SPE::TYPE_RESOURCES) { if (!isInitPresent(sInit)) { // Table - PEProcessData peProcessData(SPE::TYPE_RESOURCES, - &g_tvModel[SPE::TYPE_RESOURCES], - &pe, 0, 0, 0, false); + PEProcessData peProcessData(SPE::TYPE_RESOURCES, &g_tvModel[SPE::TYPE_RESOURCES], &pe, 0, 0, 0, false); - ajustTableView(&peProcessData, &g_tvModel[SPE::TYPE_RESOURCES], - ui->tableView_Resources, nullptr, false); + ajustTableView(&peProcessData, &g_tvModel[SPE::TYPE_RESOURCES], ui->tableView_Resources, nullptr, false); - connect(ui->tableView_Resources->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTableView_Resources_currentRowChanged( - QModelIndex, QModelIndex))); + connect(ui->tableView_Resources->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTableView_Resources_currentRowChanged(QModelIndex, QModelIndex))); if (g_tvModel[SPE::TYPE_RESOURCES]->rowCount()) { - ui->tableView_Resources->setCurrentIndex( - ui->tableView_Resources->model()->index(0, 0)); + ui->tableView_Resources->setCurrentIndex(ui->tableView_Resources->model()->index(0, 0)); } // Tree - createListTable(SPE::TYPE_RESOURCES, ui->tableWidget_Resources, - N_IMAGE_RESOURCES::records, - g_lineEdit_Resources, + createListTable(SPE::TYPE_RESOURCES, ui->tableWidget_Resources, N_IMAGE_RESOURCES::records, g_lineEdit_Resources, N_IMAGE_RESOURCES::__data_size); - PEProcessData peProcessDataTree( - SPE::TYPE_RESOURCES, &g_tvModel[SPE::TYPE_RESOURCES_TREE], - &pe, 0, 0, 0, true); + PEProcessData peProcessDataTree(SPE::TYPE_RESOURCES, &g_tvModel[SPE::TYPE_RESOURCES_TREE], &pe, 0, 0, 0, true); - ajustTreeView(&peProcessDataTree, - &g_tvModel[SPE::TYPE_RESOURCES_TREE], - ui->treeView_Resources); + ajustTreeView(&peProcessDataTree, &g_tvModel[SPE::TYPE_RESOURCES_TREE], ui->treeView_Resources); - connect(ui->treeView_Resources->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTreeView_Resources_currentRowChanged( - QModelIndex, QModelIndex))); + connect(ui->treeView_Resources->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTreeView_Resources_currentRowChanged(QModelIndex, QModelIndex))); } } else if (nType == SPE::TYPE_RESOURCES_STRINGTABLE) { if (!isInitPresent(sInit)) { - PEProcessData peProcessData( - SPE::TYPE_RESOURCES_STRINGTABLE, - &g_tvModel[SPE::TYPE_RESOURCES_STRINGTABLE], &pe, 0, 0, 0, - false); + PEProcessData peProcessData(SPE::TYPE_RESOURCES_STRINGTABLE, &g_tvModel[SPE::TYPE_RESOURCES_STRINGTABLE], &pe, 0, 0, 0, false); - ajustTableView( - &peProcessData, &g_tvModel[SPE::TYPE_RESOURCES_STRINGTABLE], - ui->tableView_Resources_StringTable, nullptr, true); + ajustTableView(&peProcessData, &g_tvModel[SPE::TYPE_RESOURCES_STRINGTABLE], ui->tableView_Resources_StringTable, nullptr, true); // connect(ui->tableView_Resources_StringTable->selectionModel(),SIGNAL(currentRowChanged(QModelIndex,QModelIndex)),this,SLOT(onTableView_Resources_StringTable_currentRowChanged(QModelIndex,QModelIndex))); @@ -2781,117 +1981,55 @@ void PEWidget::reloadData() { } } else if (nType == SPE::TYPE_RESOURCES_VERSION) { if (!isInitPresent(sInit)) { - createHeaderTable(SPE::TYPE_RESOURCES_VERSION, - ui->tableWidget_Resources_Version, - N_IMAGE_RESOURCE_FIXEDFILEINFO::records, - g_lineEdit_Version_FixedFileInfo, - N_IMAGE_RESOURCE_FIXEDFILEINFO::__data_size, - 0); + createHeaderTable(SPE::TYPE_RESOURCES_VERSION, ui->tableWidget_Resources_Version, N_IMAGE_RESOURCE_FIXEDFILEINFO::records, + g_lineEdit_Version_FixedFileInfo, N_IMAGE_RESOURCE_FIXEDFILEINFO::__data_size, 0); g_comboBox[CB_RESOURCES_VERSION_dwSignature] = - createComboBox(ui->tableWidget_Resources_Version, - XPE::getResourcesFixedFileInfoSignaturesS(), - SPE::TYPE_RESOURCES_VERSION, - N_IMAGE_RESOURCE_FIXEDFILEINFO::dwSignature, - XComboBoxEx::CBTYPE_LIST); + createComboBox(ui->tableWidget_Resources_Version, XPE::getResourcesFixedFileInfoSignaturesS(), SPE::TYPE_RESOURCES_VERSION, + N_IMAGE_RESOURCE_FIXEDFILEINFO::dwSignature, XComboBoxEx::CBTYPE_LIST); g_comboBox[CB_RESOURCES_VERSION_dwFileFlags] = - createComboBox(ui->tableWidget_Resources_Version, - XPE::getResourcesFixedFileInfoFileFlagsS(), - SPE::TYPE_RESOURCES_VERSION, - N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileFlags, - XComboBoxEx::CBTYPE_FLAGS); + createComboBox(ui->tableWidget_Resources_Version, XPE::getResourcesFixedFileInfoFileFlagsS(), SPE::TYPE_RESOURCES_VERSION, + N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileFlags, XComboBoxEx::CBTYPE_FLAGS); g_comboBox[CB_RESOURCES_VERSION_dwFileOS] = - createComboBox(ui->tableWidget_Resources_Version, - XPE::getResourcesFixedFileInfoFileOsesS(), - SPE::TYPE_RESOURCES_VERSION, - N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileOS, - XComboBoxEx::CBTYPE_LIST); + createComboBox(ui->tableWidget_Resources_Version, XPE::getResourcesFixedFileInfoFileOsesS(), SPE::TYPE_RESOURCES_VERSION, + N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileOS, XComboBoxEx::CBTYPE_LIST); g_comboBox[CB_RESOURCES_VERSION_dwFileType] = - createComboBox(ui->tableWidget_Resources_Version, - XPE::getResourcesFixedFileInfoFileTypesS(), - SPE::TYPE_RESOURCES_VERSION, - N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileType, - XComboBoxEx::CBTYPE_LIST); + createComboBox(ui->tableWidget_Resources_Version, XPE::getResourcesFixedFileInfoFileTypesS(), SPE::TYPE_RESOURCES_VERSION, + N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileType, XComboBoxEx::CBTYPE_LIST); blockSignals(true); - XPE::RESOURCES_VERSION resourceVersion = - pe.getResourcesVersion(); - - g_lineEdit_Version_FixedFileInfo - [N_IMAGE_RESOURCE_FIXEDFILEINFO::dwSignature] - ->setValue(resourceVersion.fileInfo.dwSignature); - g_lineEdit_Version_FixedFileInfo - [N_IMAGE_RESOURCE_FIXEDFILEINFO::dwStrucVersion] - ->setValue(resourceVersion.fileInfo.dwStrucVersion); - g_lineEdit_Version_FixedFileInfo - [N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileVersionMS] - ->setValue(resourceVersion.fileInfo.dwFileVersionMS); - g_lineEdit_Version_FixedFileInfo - [N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileVersionLS] - ->setValue(resourceVersion.fileInfo.dwFileVersionLS); - g_lineEdit_Version_FixedFileInfo - [N_IMAGE_RESOURCE_FIXEDFILEINFO::dwProductVersionMS] - ->setValue(resourceVersion.fileInfo.dwProductVersionMS); - g_lineEdit_Version_FixedFileInfo - [N_IMAGE_RESOURCE_FIXEDFILEINFO::dwProductVersionLS] - ->setValue(resourceVersion.fileInfo.dwProductVersionLS); - g_lineEdit_Version_FixedFileInfo - [N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileFlagsMask] - ->setValue(resourceVersion.fileInfo.dwFileFlagsMask); - g_lineEdit_Version_FixedFileInfo - [N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileFlags] - ->setValue(resourceVersion.fileInfo.dwFileFlags); - g_lineEdit_Version_FixedFileInfo - [N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileOS] - ->setValue(resourceVersion.fileInfo.dwFileOS); - g_lineEdit_Version_FixedFileInfo - [N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileType] - ->setValue(resourceVersion.fileInfo.dwFileType); - g_lineEdit_Version_FixedFileInfo - [N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileSubtype] - ->setValue(resourceVersion.fileInfo.dwFileSubtype); - g_lineEdit_Version_FixedFileInfo - [N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileDateMS] - ->setValue(resourceVersion.fileInfo.dwFileDateMS); - g_lineEdit_Version_FixedFileInfo - [N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileDateLS] - ->setValue(resourceVersion.fileInfo.dwFileDateLS); - - g_comboBox[CB_RESOURCES_VERSION_dwSignature]->setValue( - resourceVersion.fileInfo.dwSignature); - g_comboBox[CB_RESOURCES_VERSION_dwFileFlags]->setValue( - resourceVersion.fileInfo.dwFileFlags); - g_comboBox[CB_RESOURCES_VERSION_dwFileOS]->setValue( - resourceVersion.fileInfo.dwFileOS); - g_comboBox[CB_RESOURCES_VERSION_dwFileType]->setValue( - resourceVersion.fileInfo.dwFileType); + XPE::RESOURCES_VERSION resourceVersion = pe.getResourcesVersion(); + + g_lineEdit_Version_FixedFileInfo[N_IMAGE_RESOURCE_FIXEDFILEINFO::dwSignature]->setValue(resourceVersion.fileInfo.dwSignature); + g_lineEdit_Version_FixedFileInfo[N_IMAGE_RESOURCE_FIXEDFILEINFO::dwStrucVersion]->setValue(resourceVersion.fileInfo.dwStrucVersion); + g_lineEdit_Version_FixedFileInfo[N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileVersionMS]->setValue(resourceVersion.fileInfo.dwFileVersionMS); + g_lineEdit_Version_FixedFileInfo[N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileVersionLS]->setValue(resourceVersion.fileInfo.dwFileVersionLS); + g_lineEdit_Version_FixedFileInfo[N_IMAGE_RESOURCE_FIXEDFILEINFO::dwProductVersionMS]->setValue(resourceVersion.fileInfo.dwProductVersionMS); + g_lineEdit_Version_FixedFileInfo[N_IMAGE_RESOURCE_FIXEDFILEINFO::dwProductVersionLS]->setValue(resourceVersion.fileInfo.dwProductVersionLS); + g_lineEdit_Version_FixedFileInfo[N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileFlagsMask]->setValue(resourceVersion.fileInfo.dwFileFlagsMask); + g_lineEdit_Version_FixedFileInfo[N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileFlags]->setValue(resourceVersion.fileInfo.dwFileFlags); + g_lineEdit_Version_FixedFileInfo[N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileOS]->setValue(resourceVersion.fileInfo.dwFileOS); + g_lineEdit_Version_FixedFileInfo[N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileType]->setValue(resourceVersion.fileInfo.dwFileType); + g_lineEdit_Version_FixedFileInfo[N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileSubtype]->setValue(resourceVersion.fileInfo.dwFileSubtype); + g_lineEdit_Version_FixedFileInfo[N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileDateMS]->setValue(resourceVersion.fileInfo.dwFileDateMS); + g_lineEdit_Version_FixedFileInfo[N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileDateLS]->setValue(resourceVersion.fileInfo.dwFileDateLS); + + g_comboBox[CB_RESOURCES_VERSION_dwSignature]->setValue(resourceVersion.fileInfo.dwSignature); + g_comboBox[CB_RESOURCES_VERSION_dwFileFlags]->setValue(resourceVersion.fileInfo.dwFileFlags); + g_comboBox[CB_RESOURCES_VERSION_dwFileOS]->setValue(resourceVersion.fileInfo.dwFileOS); + g_comboBox[CB_RESOURCES_VERSION_dwFileType]->setValue(resourceVersion.fileInfo.dwFileType); // TODO COMBOBOX dwFileSubtype - addComment(ui->tableWidget_Resources_Version, - N_IMAGE_RESOURCE_FIXEDFILEINFO::dwStrucVersion, - HEADER_COLUMN_COMMENT, - XBinary::versionDwordToString( - resourceVersion.fileInfo.dwStrucVersion)); - addComment(ui->tableWidget_Resources_Version, - N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileVersionMS, - HEADER_COLUMN_COMMENT, - XBinary::versionDwordToString( - resourceVersion.fileInfo.dwFileVersionMS)); - addComment(ui->tableWidget_Resources_Version, - N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileVersionLS, - HEADER_COLUMN_COMMENT, - XBinary::versionDwordToString( - resourceVersion.fileInfo.dwFileVersionLS)); - addComment(ui->tableWidget_Resources_Version, - N_IMAGE_RESOURCE_FIXEDFILEINFO::dwProductVersionMS, - HEADER_COLUMN_COMMENT, - XBinary::versionDwordToString( - resourceVersion.fileInfo.dwProductVersionMS)); - addComment(ui->tableWidget_Resources_Version, - N_IMAGE_RESOURCE_FIXEDFILEINFO::dwProductVersionLS, - HEADER_COLUMN_COMMENT, - XBinary::versionDwordToString( - resourceVersion.fileInfo.dwProductVersionLS)); + addComment(ui->tableWidget_Resources_Version, N_IMAGE_RESOURCE_FIXEDFILEINFO::dwStrucVersion, HEADER_COLUMN_COMMENT, + XBinary::versionDwordToString(resourceVersion.fileInfo.dwStrucVersion)); + addComment(ui->tableWidget_Resources_Version, N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileVersionMS, HEADER_COLUMN_COMMENT, + XBinary::versionDwordToString(resourceVersion.fileInfo.dwFileVersionMS)); + addComment(ui->tableWidget_Resources_Version, N_IMAGE_RESOURCE_FIXEDFILEINFO::dwFileVersionLS, HEADER_COLUMN_COMMENT, + XBinary::versionDwordToString(resourceVersion.fileInfo.dwFileVersionLS)); + addComment(ui->tableWidget_Resources_Version, N_IMAGE_RESOURCE_FIXEDFILEINFO::dwProductVersionMS, HEADER_COLUMN_COMMENT, + XBinary::versionDwordToString(resourceVersion.fileInfo.dwProductVersionMS)); + addComment(ui->tableWidget_Resources_Version, N_IMAGE_RESOURCE_FIXEDFILEINFO::dwProductVersionLS, HEADER_COLUMN_COMMENT, + XBinary::versionDwordToString(resourceVersion.fileInfo.dwProductVersionLS)); ui->textEditResources_Version->clear(); @@ -2900,8 +2038,7 @@ void PEWidget::reloadData() { QString sVersion; for (qint32 i = 0; i < nNumberOfResources; i++) { - sVersion += - resourceVersion.listRecords.at(i) + QString("\r\n"); + sVersion += resourceVersion.listRecords.at(i) + QString("\r\n"); } ui->textEditResources_Version->setText(sVersion); @@ -2914,206 +2051,125 @@ void PEWidget::reloadData() { } } else if (nType == SPE::TYPE_EXCEPTION) { if (!isInitPresent(sInit)) { - PEProcessData peProcessData(SPE::TYPE_EXCEPTION, - &g_tvModel[SPE::TYPE_EXCEPTION], - &pe, 0, 0, 0); + PEProcessData peProcessData(SPE::TYPE_EXCEPTION, &g_tvModel[SPE::TYPE_EXCEPTION], &pe, 0, 0, 0); - ajustTableView(&peProcessData, &g_tvModel[SPE::TYPE_EXCEPTION], - ui->tableView_Exceptions, nullptr, false); + ajustTableView(&peProcessData, &g_tvModel[SPE::TYPE_EXCEPTION], ui->tableView_Exceptions, nullptr, false); - connect(ui->tableView_Exceptions->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTableView_Exceptions_currentRowChanged( - QModelIndex, QModelIndex))); + connect(ui->tableView_Exceptions->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTableView_Exceptions_currentRowChanged(QModelIndex, QModelIndex))); if (g_tvModel[SPE::TYPE_EXCEPTION]->rowCount()) { - ui->tableView_Exceptions->setCurrentIndex( - ui->tableView_Exceptions->model()->index(0, 0)); + ui->tableView_Exceptions->setCurrentIndex(ui->tableView_Exceptions->model()->index(0, 0)); } } } else if (nType == SPE::TYPE_RELOCS) { if (!isInitPresent(sInit)) { - PEProcessData peProcessData(SPE::TYPE_RELOCS, - &g_tvModel[SPE::TYPE_RELOCS], &pe, - 0, 0, 0); + PEProcessData peProcessData(SPE::TYPE_RELOCS, &g_tvModel[SPE::TYPE_RELOCS], &pe, 0, 0, 0); - ajustTableView(&peProcessData, &g_tvModel[SPE::TYPE_RELOCS], - ui->tableView_Relocs, nullptr, false); + ajustTableView(&peProcessData, &g_tvModel[SPE::TYPE_RELOCS], ui->tableView_Relocs, nullptr, false); - connect(ui->tableView_Relocs->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTableView_Relocs_currentRowChanged( - QModelIndex, QModelIndex))); + connect(ui->tableView_Relocs->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTableView_Relocs_currentRowChanged(QModelIndex, QModelIndex))); if (g_tvModel[SPE::TYPE_RELOCS]->rowCount()) { - ui->tableView_Relocs->setCurrentIndex( - ui->tableView_Relocs->model()->index(0, 0)); + ui->tableView_Relocs->setCurrentIndex(ui->tableView_Relocs->model()->index(0, 0)); } } } else if (nType == SPE::TYPE_DEBUG) { if (!isInitPresent(sInit)) { - PEProcessData peProcessData( - SPE::TYPE_DEBUG, &g_tvModel[SPE::TYPE_DEBUG], &pe, 0, 0, 0); + PEProcessData peProcessData(SPE::TYPE_DEBUG, &g_tvModel[SPE::TYPE_DEBUG], &pe, 0, 0, 0); - ajustTableView(&peProcessData, &g_tvModel[SPE::TYPE_DEBUG], - ui->tableView_Debug, nullptr, false); + ajustTableView(&peProcessData, &g_tvModel[SPE::TYPE_DEBUG], ui->tableView_Debug, nullptr, false); - connect(ui->tableView_Debug->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTableView_Debug_currentRowChanged(QModelIndex, - QModelIndex))); + connect(ui->tableView_Debug->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTableView_Debug_currentRowChanged(QModelIndex, QModelIndex))); if (g_tvModel[SPE::TYPE_DEBUG]->rowCount()) { - ui->tableView_Debug->setCurrentIndex( - ui->tableView_Debug->model()->index(0, 0)); + ui->tableView_Debug->setCurrentIndex(ui->tableView_Debug->model()->index(0, 0)); } } } else if (nType == SPE::TYPE_TLS) { if (!isInitPresent(sInit)) { - createHeaderTable(SPE::TYPE_TLS, ui->tableWidget_TLS, - pe.is64() ? (N_IMAGE_TLS::records64) - : (N_IMAGE_TLS::records32), - g_lineEdit_TLS, N_IMAGE_TLS::__data_size, 0); - - g_invWidget[INV_IMAGE_TLS_AddressOfCallBacks] = createInvWidget( - ui->tableWidget_TLS, SPE::TYPE_TLS, - N_IMAGE_TLS::AddressOfCallBacks, InvWidget::TYPE_HEX); - g_invWidget[INV_IMAGE_TLS_AddressOfIndex] = createInvWidget( - ui->tableWidget_TLS, SPE::TYPE_TLS, - N_IMAGE_TLS::AddressOfIndex, InvWidget::TYPE_HEX); + createHeaderTable(SPE::TYPE_TLS, ui->tableWidget_TLS, pe.is64() ? (N_IMAGE_TLS::records64) : (N_IMAGE_TLS::records32), g_lineEdit_TLS, + N_IMAGE_TLS::__data_size, 0); + + g_invWidget[INV_IMAGE_TLS_AddressOfCallBacks] = + createInvWidget(ui->tableWidget_TLS, SPE::TYPE_TLS, N_IMAGE_TLS::AddressOfCallBacks, InvWidget::TYPE_HEX); + g_invWidget[INV_IMAGE_TLS_AddressOfIndex] = + createInvWidget(ui->tableWidget_TLS, SPE::TYPE_TLS, N_IMAGE_TLS::AddressOfIndex, InvWidget::TYPE_HEX); g_invWidget[INV_IMAGE_TLS_EndAddressOfRawData] = - createInvWidget(ui->tableWidget_TLS, SPE::TYPE_TLS, - N_IMAGE_TLS::EndAddressOfRawData, - InvWidget::TYPE_HEX); + createInvWidget(ui->tableWidget_TLS, SPE::TYPE_TLS, N_IMAGE_TLS::EndAddressOfRawData, InvWidget::TYPE_HEX); g_invWidget[INV_IMAGE_TLS_StartAddressOfRawData] = - createInvWidget(ui->tableWidget_TLS, SPE::TYPE_TLS, - N_IMAGE_TLS::StartAddressOfRawData, - InvWidget::TYPE_HEX); + createInvWidget(ui->tableWidget_TLS, SPE::TYPE_TLS, N_IMAGE_TLS::StartAddressOfRawData, InvWidget::TYPE_HEX); blockSignals(true); XBinary::_MEMORY_MAP memoryMap = pe.getMemoryMap(); if (bIs64) { - XPE_DEF::S_IMAGE_TLS_DIRECTORY64 tls64 = - pe.getTLSDirectory64(); - g_lineEdit_TLS[N_IMAGE_TLS::StartAddressOfRawData] - ->setValue(tls64.StartAddressOfRawData); - g_lineEdit_TLS[N_IMAGE_TLS::EndAddressOfRawData]->setValue( - tls64.EndAddressOfRawData); - g_lineEdit_TLS[N_IMAGE_TLS::AddressOfIndex]->setValue( - tls64.AddressOfIndex); - g_lineEdit_TLS[N_IMAGE_TLS::AddressOfCallBacks]->setValue( - tls64.AddressOfCallBacks); - g_lineEdit_TLS[N_IMAGE_TLS::SizeOfZeroFill]->setValue( - tls64.SizeOfZeroFill); - g_lineEdit_TLS[N_IMAGE_TLS::Characteristics]->setValue( - tls64.Characteristics); - - g_invWidget[INV_IMAGE_TLS_AddressOfCallBacks] - ->setAddressAndSize(&pe, tls64.AddressOfCallBacks, 0); - g_invWidget[INV_IMAGE_TLS_AddressOfIndex] - ->setAddressAndSize(&pe, tls64.AddressOfIndex, 0); - g_invWidget[INV_IMAGE_TLS_EndAddressOfRawData] - ->setAddressAndSize(&pe, tls64.EndAddressOfRawData, 0); - g_invWidget[INV_IMAGE_TLS_StartAddressOfRawData] - ->setAddressAndSize(&pe, tls64.StartAddressOfRawData, - 0); - - addComment(ui->tableWidget_TLS, - N_IMAGE_TLS::AddressOfCallBacks, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByAddress( - &memoryMap, tls64.AddressOfCallBacks)); - addComment(ui->tableWidget_TLS, N_IMAGE_TLS::AddressOfIndex, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByAddress( - &memoryMap, tls64.AddressOfIndex)); - addComment(ui->tableWidget_TLS, - N_IMAGE_TLS::EndAddressOfRawData, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByAddress( - &memoryMap, tls64.EndAddressOfRawData)); - addComment(ui->tableWidget_TLS, - N_IMAGE_TLS::StartAddressOfRawData, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByAddress( - &memoryMap, tls64.StartAddressOfRawData)); + XPE_DEF::S_IMAGE_TLS_DIRECTORY64 tls64 = pe.getTLSDirectory64(); + g_lineEdit_TLS[N_IMAGE_TLS::StartAddressOfRawData]->setValue(tls64.StartAddressOfRawData); + g_lineEdit_TLS[N_IMAGE_TLS::EndAddressOfRawData]->setValue(tls64.EndAddressOfRawData); + g_lineEdit_TLS[N_IMAGE_TLS::AddressOfIndex]->setValue(tls64.AddressOfIndex); + g_lineEdit_TLS[N_IMAGE_TLS::AddressOfCallBacks]->setValue(tls64.AddressOfCallBacks); + g_lineEdit_TLS[N_IMAGE_TLS::SizeOfZeroFill]->setValue(tls64.SizeOfZeroFill); + g_lineEdit_TLS[N_IMAGE_TLS::Characteristics]->setValue(tls64.Characteristics); + + g_invWidget[INV_IMAGE_TLS_AddressOfCallBacks]->setAddressAndSize(&pe, tls64.AddressOfCallBacks, 0); + g_invWidget[INV_IMAGE_TLS_AddressOfIndex]->setAddressAndSize(&pe, tls64.AddressOfIndex, 0); + g_invWidget[INV_IMAGE_TLS_EndAddressOfRawData]->setAddressAndSize(&pe, tls64.EndAddressOfRawData, 0); + g_invWidget[INV_IMAGE_TLS_StartAddressOfRawData]->setAddressAndSize(&pe, tls64.StartAddressOfRawData, 0); + + addComment(ui->tableWidget_TLS, N_IMAGE_TLS::AddressOfCallBacks, HEADER_COLUMN_COMMENT, + pe.getMemoryRecordInfoByAddress(&memoryMap, tls64.AddressOfCallBacks)); + addComment(ui->tableWidget_TLS, N_IMAGE_TLS::AddressOfIndex, HEADER_COLUMN_COMMENT, + pe.getMemoryRecordInfoByAddress(&memoryMap, tls64.AddressOfIndex)); + addComment(ui->tableWidget_TLS, N_IMAGE_TLS::EndAddressOfRawData, HEADER_COLUMN_COMMENT, + pe.getMemoryRecordInfoByAddress(&memoryMap, tls64.EndAddressOfRawData)); + addComment(ui->tableWidget_TLS, N_IMAGE_TLS::StartAddressOfRawData, HEADER_COLUMN_COMMENT, + pe.getMemoryRecordInfoByAddress(&memoryMap, tls64.StartAddressOfRawData)); } else { - XPE_DEF::S_IMAGE_TLS_DIRECTORY32 tls32 = - pe.getTLSDirectory32(); - g_lineEdit_TLS[N_IMAGE_TLS::StartAddressOfRawData] - ->setValue(tls32.StartAddressOfRawData); - g_lineEdit_TLS[N_IMAGE_TLS::EndAddressOfRawData]->setValue( - tls32.EndAddressOfRawData); - g_lineEdit_TLS[N_IMAGE_TLS::AddressOfIndex]->setValue( - tls32.AddressOfIndex); - g_lineEdit_TLS[N_IMAGE_TLS::AddressOfCallBacks]->setValue( - tls32.AddressOfCallBacks); - g_lineEdit_TLS[N_IMAGE_TLS::SizeOfZeroFill]->setValue( - tls32.SizeOfZeroFill); - g_lineEdit_TLS[N_IMAGE_TLS::Characteristics]->setValue( - tls32.Characteristics); - - g_invWidget[INV_IMAGE_TLS_AddressOfCallBacks] - ->setAddressAndSize(&pe, tls32.AddressOfCallBacks, 0); - g_invWidget[INV_IMAGE_TLS_AddressOfIndex] - ->setAddressAndSize(&pe, tls32.AddressOfIndex, 0); - g_invWidget[INV_IMAGE_TLS_EndAddressOfRawData] - ->setAddressAndSize(&pe, tls32.EndAddressOfRawData, 0); - g_invWidget[INV_IMAGE_TLS_StartAddressOfRawData] - ->setAddressAndSize(&pe, tls32.StartAddressOfRawData, - 0); - - addComment(ui->tableWidget_TLS, - N_IMAGE_TLS::AddressOfCallBacks, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByAddress( - &memoryMap, tls32.AddressOfCallBacks)); - addComment(ui->tableWidget_TLS, N_IMAGE_TLS::AddressOfIndex, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByAddress( - &memoryMap, tls32.AddressOfIndex)); - addComment(ui->tableWidget_TLS, - N_IMAGE_TLS::EndAddressOfRawData, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByAddress( - &memoryMap, tls32.EndAddressOfRawData)); - addComment(ui->tableWidget_TLS, - N_IMAGE_TLS::StartAddressOfRawData, - HEADER_COLUMN_COMMENT, - pe.getMemoryRecordInfoByAddress( - &memoryMap, tls32.StartAddressOfRawData)); + XPE_DEF::S_IMAGE_TLS_DIRECTORY32 tls32 = pe.getTLSDirectory32(); + g_lineEdit_TLS[N_IMAGE_TLS::StartAddressOfRawData]->setValue(tls32.StartAddressOfRawData); + g_lineEdit_TLS[N_IMAGE_TLS::EndAddressOfRawData]->setValue(tls32.EndAddressOfRawData); + g_lineEdit_TLS[N_IMAGE_TLS::AddressOfIndex]->setValue(tls32.AddressOfIndex); + g_lineEdit_TLS[N_IMAGE_TLS::AddressOfCallBacks]->setValue(tls32.AddressOfCallBacks); + g_lineEdit_TLS[N_IMAGE_TLS::SizeOfZeroFill]->setValue(tls32.SizeOfZeroFill); + g_lineEdit_TLS[N_IMAGE_TLS::Characteristics]->setValue(tls32.Characteristics); + + g_invWidget[INV_IMAGE_TLS_AddressOfCallBacks]->setAddressAndSize(&pe, tls32.AddressOfCallBacks, 0); + g_invWidget[INV_IMAGE_TLS_AddressOfIndex]->setAddressAndSize(&pe, tls32.AddressOfIndex, 0); + g_invWidget[INV_IMAGE_TLS_EndAddressOfRawData]->setAddressAndSize(&pe, tls32.EndAddressOfRawData, 0); + g_invWidget[INV_IMAGE_TLS_StartAddressOfRawData]->setAddressAndSize(&pe, tls32.StartAddressOfRawData, 0); + + addComment(ui->tableWidget_TLS, N_IMAGE_TLS::AddressOfCallBacks, HEADER_COLUMN_COMMENT, + pe.getMemoryRecordInfoByAddress(&memoryMap, tls32.AddressOfCallBacks)); + addComment(ui->tableWidget_TLS, N_IMAGE_TLS::AddressOfIndex, HEADER_COLUMN_COMMENT, + pe.getMemoryRecordInfoByAddress(&memoryMap, tls32.AddressOfIndex)); + addComment(ui->tableWidget_TLS, N_IMAGE_TLS::EndAddressOfRawData, HEADER_COLUMN_COMMENT, + pe.getMemoryRecordInfoByAddress(&memoryMap, tls32.EndAddressOfRawData)); + addComment(ui->tableWidget_TLS, N_IMAGE_TLS::StartAddressOfRawData, HEADER_COLUMN_COMMENT, + pe.getMemoryRecordInfoByAddress(&memoryMap, tls32.StartAddressOfRawData)); } qint64 nOffset = pe.getTLSHeaderOffset(); qint64 nSize = pe.getTLSHeaderSize(); qint64 nAddress = pe.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, - &g_subDevice[SPE::TYPE_TLS], - ui->widgetHex_TLS); + loadHexSubdevice(nOffset, nSize, nAddress, &g_subDevice[SPE::TYPE_TLS], ui->widgetHex_TLS); blockSignals(false); } } else if (nType == SPE::TYPE_TLSCALLBACKS) { if (!isInitPresent(sInit)) { - PEProcessData peProcessData(SPE::TYPE_TLSCALLBACKS, - &g_tvModel[SPE::TYPE_TLSCALLBACKS], - &pe, 0, 0, 0); + PEProcessData peProcessData(SPE::TYPE_TLSCALLBACKS, &g_tvModel[SPE::TYPE_TLSCALLBACKS], &pe, 0, 0, 0); - ajustTableView(&peProcessData, - &g_tvModel[SPE::TYPE_TLSCALLBACKS], - ui->tableView_TLSCallbacks, nullptr, true); + ajustTableView(&peProcessData, &g_tvModel[SPE::TYPE_TLSCALLBACKS], ui->tableView_TLSCallbacks, nullptr, true); // connect(ui->tableView_Sections->selectionModel(),SIGNAL(currentRowChanged(QModelIndex,QModelIndex)),this,SLOT(onTableView_Sections_currentRowChanged(QModelIndex,QModelIndex))); if (g_tvModel[SPE::TYPE_TLSCALLBACKS]->rowCount()) { - ui->tableView_TLSCallbacks->setCurrentIndex( - ui->tableView_TLSCallbacks->model()->index(0, 0)); + ui->tableView_TLSCallbacks->setCurrentIndex(ui->tableView_TLSCallbacks->model()->index(0, 0)); } } } else if (nType == SPE::TYPE_LOADCONFIG) { @@ -3122,9 +2178,7 @@ void PEWidget::reloadData() { qint32 nRecordSize = N_IMAGE_LOADCONFIG::__data_size; - const FW_DEF::HEADER_RECORD *pHeaderRecords = - (bIs64 ? (N_IMAGE_LOADCONFIG::records64) - : (N_IMAGE_LOADCONFIG::records32)); + const FW_DEF::HEADER_RECORD *pHeaderRecords = (bIs64 ? (N_IMAGE_LOADCONFIG::records64) : (N_IMAGE_LOADCONFIG::records32)); for (qint32 i = 0; i < N_IMAGE_LOADCONFIG::__data_size; i++) { if (nHeaderSize > (pHeaderRecords[i].nOffset)) { @@ -3132,713 +2186,323 @@ void PEWidget::reloadData() { } } - createHeaderTable(SPE::TYPE_LOADCONFIG, - ui->tableWidget_LoadConfig, - bIs64 ? (N_IMAGE_LOADCONFIG::records64) - : (N_IMAGE_LOADCONFIG::records32), + createHeaderTable(SPE::TYPE_LOADCONFIG, ui->tableWidget_LoadConfig, bIs64 ? (N_IMAGE_LOADCONFIG::records64) : (N_IMAGE_LOADCONFIG::records32), g_lineEdit_LoadConfig, nRecordSize, 0); if (nRecordSize > N_IMAGE_LOADCONFIG::SecurityCookie) g_invWidget[INV_IMAGE_LOADCONFIG_SecurityCookie] = - createInvWidget(ui->tableWidget_LoadConfig, - SPE::TYPE_LOADCONFIG, - N_IMAGE_LOADCONFIG::SecurityCookie, - InvWidget::TYPE_HEX); + createInvWidget(ui->tableWidget_LoadConfig, SPE::TYPE_LOADCONFIG, N_IMAGE_LOADCONFIG::SecurityCookie, InvWidget::TYPE_HEX); if (nRecordSize > N_IMAGE_LOADCONFIG::SEHandlerTable) g_invWidget[INV_IMAGE_LOADCONFIG_SEHandlerTable] = - createInvWidget(ui->tableWidget_LoadConfig, - SPE::TYPE_LOADCONFIG, - N_IMAGE_LOADCONFIG::SEHandlerTable, - InvWidget::TYPE_HEX); - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardCFCheckFunctionPointer) - g_invWidget - [INV_IMAGE_LOADCONFIG_GuardCFCheckFunctionPointer] = - createInvWidget( - ui->tableWidget_LoadConfig, - SPE::TYPE_LOADCONFIG, - N_IMAGE_LOADCONFIG::GuardCFCheckFunctionPointer, - InvWidget::TYPE_HEX); - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardCFDispatchFunctionPointer) - g_invWidget - [INV_IMAGE_LOADCONFIG_GuardCFDispatchFunctionPointer] = - createInvWidget(ui->tableWidget_LoadConfig, - SPE::TYPE_LOADCONFIG, - N_IMAGE_LOADCONFIG:: - GuardCFDispatchFunctionPointer, - InvWidget::TYPE_HEX); - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardMemcpyFunctionPointer) - g_invWidget - [INV_IMAGE_LOADCONFIG_GuardMemcpyFunctionPointer] = - createInvWidget( - ui->tableWidget_LoadConfig, - SPE::TYPE_LOADCONFIG, - N_IMAGE_LOADCONFIG::GuardMemcpyFunctionPointer, - InvWidget::TYPE_HEX); + createInvWidget(ui->tableWidget_LoadConfig, SPE::TYPE_LOADCONFIG, N_IMAGE_LOADCONFIG::SEHandlerTable, InvWidget::TYPE_HEX); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardCFCheckFunctionPointer) + g_invWidget[INV_IMAGE_LOADCONFIG_GuardCFCheckFunctionPointer] = + createInvWidget(ui->tableWidget_LoadConfig, SPE::TYPE_LOADCONFIG, N_IMAGE_LOADCONFIG::GuardCFCheckFunctionPointer, InvWidget::TYPE_HEX); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardCFDispatchFunctionPointer) + g_invWidget[INV_IMAGE_LOADCONFIG_GuardCFDispatchFunctionPointer] = createInvWidget( + ui->tableWidget_LoadConfig, SPE::TYPE_LOADCONFIG, N_IMAGE_LOADCONFIG::GuardCFDispatchFunctionPointer, InvWidget::TYPE_HEX); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardMemcpyFunctionPointer) + g_invWidget[INV_IMAGE_LOADCONFIG_GuardMemcpyFunctionPointer] = + createInvWidget(ui->tableWidget_LoadConfig, SPE::TYPE_LOADCONFIG, N_IMAGE_LOADCONFIG::GuardMemcpyFunctionPointer, InvWidget::TYPE_HEX); blockSignals(true); if (bIs64) { - XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64 lc64 = - pe.getLoadConfigDirectory64(); + XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY64 lc64 = pe.getLoadConfigDirectory64(); - if (nRecordSize > N_IMAGE_LOADCONFIG::Size) - g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::Size] - ->setValue(lc64.Size); - if (nRecordSize > N_IMAGE_LOADCONFIG::TimeDateStamp) - g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::TimeDateStamp] - ->setValue(lc64.TimeDateStamp); - if (nRecordSize > N_IMAGE_LOADCONFIG::MinorVersion) - g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::MinorVersion] - ->setValue(lc64.MinorVersion); - if (nRecordSize > N_IMAGE_LOADCONFIG::MajorVersion) - g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::MajorVersion] - ->setValue(lc64.MajorVersion); + if (nRecordSize > N_IMAGE_LOADCONFIG::Size) g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::Size]->setValue(lc64.Size); + if (nRecordSize > N_IMAGE_LOADCONFIG::TimeDateStamp) g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::TimeDateStamp]->setValue(lc64.TimeDateStamp); + if (nRecordSize > N_IMAGE_LOADCONFIG::MinorVersion) g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::MinorVersion]->setValue(lc64.MinorVersion); + if (nRecordSize > N_IMAGE_LOADCONFIG::MajorVersion) g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::MajorVersion]->setValue(lc64.MajorVersion); if (nRecordSize > N_IMAGE_LOADCONFIG::GlobalFlagsClear) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GlobalFlagsClear] - ->setValue(lc64.GlobalFlagsClear); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GlobalFlagsClear]->setValue(lc64.GlobalFlagsClear); if (nRecordSize > N_IMAGE_LOADCONFIG::GlobalFlagsSet) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GlobalFlagsSet] - ->setValue(lc64.GlobalFlagsSet); - if (nRecordSize > - N_IMAGE_LOADCONFIG::CriticalSectionDefaultTimeout) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::CriticalSectionDefaultTimeout] - ->setValue(lc64.CriticalSectionDefaultTimeout); - if (nRecordSize > - N_IMAGE_LOADCONFIG::DeCommitFreeBlockThreshold) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::DeCommitFreeBlockThreshold] - ->setValue(lc64.DeCommitFreeBlockThreshold); - if (nRecordSize > - N_IMAGE_LOADCONFIG::DeCommitTotalFreeThreshold) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::DeCommitTotalFreeThreshold] - ->setValue(lc64.DeCommitTotalFreeThreshold); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GlobalFlagsSet]->setValue(lc64.GlobalFlagsSet); + if (nRecordSize > N_IMAGE_LOADCONFIG::CriticalSectionDefaultTimeout) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::CriticalSectionDefaultTimeout]->setValue(lc64.CriticalSectionDefaultTimeout); + if (nRecordSize > N_IMAGE_LOADCONFIG::DeCommitFreeBlockThreshold) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::DeCommitFreeBlockThreshold]->setValue(lc64.DeCommitFreeBlockThreshold); + if (nRecordSize > N_IMAGE_LOADCONFIG::DeCommitTotalFreeThreshold) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::DeCommitTotalFreeThreshold]->setValue(lc64.DeCommitTotalFreeThreshold); if (nRecordSize > N_IMAGE_LOADCONFIG::LockPrefixTable) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::LockPrefixTable] - ->setValue(lc64.LockPrefixTable); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::LockPrefixTable]->setValue(lc64.LockPrefixTable); if (nRecordSize > N_IMAGE_LOADCONFIG::MaximumAllocationSize) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::MaximumAllocationSize] - ->setValue(lc64.MaximumAllocationSize); - if (nRecordSize > - N_IMAGE_LOADCONFIG::VirtualMemoryThreshold) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::VirtualMemoryThreshold] - ->setValue(lc64.VirtualMemoryThreshold); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::MaximumAllocationSize]->setValue(lc64.MaximumAllocationSize); + if (nRecordSize > N_IMAGE_LOADCONFIG::VirtualMemoryThreshold) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::VirtualMemoryThreshold]->setValue(lc64.VirtualMemoryThreshold); if (nRecordSize > N_IMAGE_LOADCONFIG::ProcessAffinityMask) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::ProcessAffinityMask] - ->setValue(lc64.ProcessAffinityMask); - if (nRecordSize > N_IMAGE_LOADCONFIG::CSDVersion) - g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::CSDVersion] - ->setValue(lc64.CSDVersion); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::ProcessAffinityMask]->setValue(lc64.ProcessAffinityMask); + if (nRecordSize > N_IMAGE_LOADCONFIG::CSDVersion) g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::CSDVersion]->setValue(lc64.CSDVersion); if (nRecordSize > N_IMAGE_LOADCONFIG::DependentLoadFlags) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::DependentLoadFlags] - ->setValue(lc64.DependentLoadFlags); - if (nRecordSize > N_IMAGE_LOADCONFIG::EditList) - g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::EditList] - ->setValue(lc64.EditList); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::DependentLoadFlags]->setValue(lc64.DependentLoadFlags); + if (nRecordSize > N_IMAGE_LOADCONFIG::EditList) g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::EditList]->setValue(lc64.EditList); if (nRecordSize > N_IMAGE_LOADCONFIG::SecurityCookie) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::SecurityCookie] - ->setValue(lc64.SecurityCookie); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::SecurityCookie]->setValue(lc64.SecurityCookie); if (nRecordSize > N_IMAGE_LOADCONFIG::SEHandlerTable) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::SEHandlerTable] - ->setValue(lc64.SEHandlerTable); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::SEHandlerTable]->setValue(lc64.SEHandlerTable); if (nRecordSize > N_IMAGE_LOADCONFIG::SEHandlerCount) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::SEHandlerCount] - ->setValue(lc64.SEHandlerCount); - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardCFCheckFunctionPointer) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GuardCFCheckFunctionPointer] - ->setValue(lc64.GuardCFCheckFunctionPointer); - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardCFDispatchFunctionPointer) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GuardCFDispatchFunctionPointer] - ->setValue(lc64.GuardCFDispatchFunctionPointer); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::SEHandlerCount]->setValue(lc64.SEHandlerCount); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardCFCheckFunctionPointer) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardCFCheckFunctionPointer]->setValue(lc64.GuardCFCheckFunctionPointer); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardCFDispatchFunctionPointer) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardCFDispatchFunctionPointer]->setValue(lc64.GuardCFDispatchFunctionPointer); if (nRecordSize > N_IMAGE_LOADCONFIG::GuardCFFunctionTable) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GuardCFFunctionTable] - ->setValue(lc64.GuardCFFunctionTable); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardCFFunctionTable]->setValue(lc64.GuardCFFunctionTable); if (nRecordSize > N_IMAGE_LOADCONFIG::GuardCFFunctionCount) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GuardCFFunctionCount] - ->setValue(lc64.GuardCFFunctionCount); - if (nRecordSize > N_IMAGE_LOADCONFIG::GuardFlags) - g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardFlags] - ->setValue(lc64.GuardFlags); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardCFFunctionCount]->setValue(lc64.GuardCFFunctionCount); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardFlags) g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardFlags]->setValue(lc64.GuardFlags); if (nRecordSize > N_IMAGE_LOADCONFIG::CodeIntegrity_Flags) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::CodeIntegrity_Flags] - ->setValue(lc64.CodeIntegrity.Flags); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::CodeIntegrity_Flags]->setValue(lc64.CodeIntegrity.Flags); if (nRecordSize > N_IMAGE_LOADCONFIG::CodeIntegrity_Catalog) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::CodeIntegrity_Catalog] - ->setValue(lc64.CodeIntegrity.Catalog); - if (nRecordSize > - N_IMAGE_LOADCONFIG::CodeIntegrity_CatalogOffset) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::CodeIntegrity_CatalogOffset] - ->setValue(lc64.CodeIntegrity.CatalogOffset); - if (nRecordSize > - N_IMAGE_LOADCONFIG::CodeIntegrity_Reserved) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::CodeIntegrity_Reserved] - ->setValue(lc64.CodeIntegrity.Reserved); - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardAddressTakenIatEntryTable) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GuardAddressTakenIatEntryTable] - ->setValue(lc64.GuardAddressTakenIatEntryTable); - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardAddressTakenIatEntryCount) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GuardAddressTakenIatEntryCount] - ->setValue(lc64.GuardAddressTakenIatEntryCount); - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardLongJumpTargetTable) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GuardLongJumpTargetTable] - ->setValue(lc64.GuardLongJumpTargetTable); - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardLongJumpTargetCount) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GuardLongJumpTargetCount] - ->setValue(lc64.GuardLongJumpTargetCount); - if (nRecordSize > - N_IMAGE_LOADCONFIG::DynamicValueRelocTable) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::DynamicValueRelocTable] - ->setValue(lc64.DynamicValueRelocTable); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::CodeIntegrity_Catalog]->setValue(lc64.CodeIntegrity.Catalog); + if (nRecordSize > N_IMAGE_LOADCONFIG::CodeIntegrity_CatalogOffset) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::CodeIntegrity_CatalogOffset]->setValue(lc64.CodeIntegrity.CatalogOffset); + if (nRecordSize > N_IMAGE_LOADCONFIG::CodeIntegrity_Reserved) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::CodeIntegrity_Reserved]->setValue(lc64.CodeIntegrity.Reserved); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardAddressTakenIatEntryTable) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardAddressTakenIatEntryTable]->setValue(lc64.GuardAddressTakenIatEntryTable); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardAddressTakenIatEntryCount) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardAddressTakenIatEntryCount]->setValue(lc64.GuardAddressTakenIatEntryCount); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardLongJumpTargetTable) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardLongJumpTargetTable]->setValue(lc64.GuardLongJumpTargetTable); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardLongJumpTargetCount) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardLongJumpTargetCount]->setValue(lc64.GuardLongJumpTargetCount); + if (nRecordSize > N_IMAGE_LOADCONFIG::DynamicValueRelocTable) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::DynamicValueRelocTable]->setValue(lc64.DynamicValueRelocTable); if (nRecordSize > N_IMAGE_LOADCONFIG::CHPEMetadataPointer) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::CHPEMetadataPointer] - ->setValue(lc64.CHPEMetadataPointer); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::CHPEMetadataPointer]->setValue(lc64.CHPEMetadataPointer); if (nRecordSize > N_IMAGE_LOADCONFIG::GuardRFFailureRoutine) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GuardRFFailureRoutine] - ->setValue(lc64.GuardRFFailureRoutine); - if (nRecordSize > N_IMAGE_LOADCONFIG:: - GuardRFFailureRoutineFunctionPointer) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG:: - GuardRFFailureRoutineFunctionPointer] - ->setValue( - lc64.GuardRFFailureRoutineFunctionPointer); - if (nRecordSize > - N_IMAGE_LOADCONFIG::DynamicValueRelocTableOffset) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::DynamicValueRelocTableOffset] - ->setValue(lc64.DynamicValueRelocTableOffset); - if (nRecordSize > - N_IMAGE_LOADCONFIG::DynamicValueRelocTableSection) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::DynamicValueRelocTableSection] - ->setValue(lc64.DynamicValueRelocTableSection); - if (nRecordSize > N_IMAGE_LOADCONFIG::Reserved2) - g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::Reserved2] - ->setValue(lc64.Reserved2); - if (nRecordSize > - N_IMAGE_LOADCONFIG:: - GuardRFVerifyStackPointerFunctionPointer) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG:: - GuardRFVerifyStackPointerFunctionPointer] - ->setValue( - lc64.GuardRFVerifyStackPointerFunctionPointer); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardRFFailureRoutine]->setValue(lc64.GuardRFFailureRoutine); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardRFFailureRoutineFunctionPointer) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardRFFailureRoutineFunctionPointer]->setValue(lc64.GuardRFFailureRoutineFunctionPointer); + if (nRecordSize > N_IMAGE_LOADCONFIG::DynamicValueRelocTableOffset) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::DynamicValueRelocTableOffset]->setValue(lc64.DynamicValueRelocTableOffset); + if (nRecordSize > N_IMAGE_LOADCONFIG::DynamicValueRelocTableSection) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::DynamicValueRelocTableSection]->setValue(lc64.DynamicValueRelocTableSection); + if (nRecordSize > N_IMAGE_LOADCONFIG::Reserved2) g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::Reserved2]->setValue(lc64.Reserved2); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardRFVerifyStackPointerFunctionPointer) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardRFVerifyStackPointerFunctionPointer]->setValue( + lc64.GuardRFVerifyStackPointerFunctionPointer); if (nRecordSize > N_IMAGE_LOADCONFIG::HotPatchTableOffset) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::HotPatchTableOffset] - ->setValue(lc64.HotPatchTableOffset); - if (nRecordSize > N_IMAGE_LOADCONFIG::Reserved3) - g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::Reserved3] - ->setValue(lc64.Reserved3); - if (nRecordSize > - N_IMAGE_LOADCONFIG::EnclaveConfigurationPointer) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::EnclaveConfigurationPointer] - ->setValue(lc64.EnclaveConfigurationPointer); - - if (nRecordSize > - N_IMAGE_LOADCONFIG::VolatileMetadataPointer) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::VolatileMetadataPointer] - ->setValue(lc64.VolatileMetadataPointer); - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardEHContinuationTable) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GuardEHContinuationTable] - ->setValue(lc64.GuardEHContinuationTable); - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardEHContinuationCount) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GuardEHContinuationCount] - ->setValue(lc64.GuardEHContinuationCount); - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardXFGCheckFunctionPointer) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GuardXFGCheckFunctionPointer] - ->setValue(lc64.GuardXFGCheckFunctionPointer); - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardXFGDispatchFunctionPointer) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG:: - GuardXFGDispatchFunctionPointer] - ->setValue( - lc64.GuardXFGDispatchFunctionPointer); - if (nRecordSize > N_IMAGE_LOADCONFIG:: - GuardXFGTableDispatchFunctionPointer) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG:: - GuardXFGTableDispatchFunctionPointer] - ->setValue( - lc64.GuardXFGTableDispatchFunctionPointer); - - if (nRecordSize > - N_IMAGE_LOADCONFIG::CastGuardOsDeterminedFailureMode) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG:: - CastGuardOsDeterminedFailureMode] - ->setValue( - lc64.CastGuardOsDeterminedFailureMode); - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardMemcpyFunctionPointer) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GuardMemcpyFunctionPointer] - ->setValue(lc64.GuardMemcpyFunctionPointer); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::HotPatchTableOffset]->setValue(lc64.HotPatchTableOffset); + if (nRecordSize > N_IMAGE_LOADCONFIG::Reserved3) g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::Reserved3]->setValue(lc64.Reserved3); + if (nRecordSize > N_IMAGE_LOADCONFIG::EnclaveConfigurationPointer) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::EnclaveConfigurationPointer]->setValue(lc64.EnclaveConfigurationPointer); + + if (nRecordSize > N_IMAGE_LOADCONFIG::VolatileMetadataPointer) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::VolatileMetadataPointer]->setValue(lc64.VolatileMetadataPointer); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardEHContinuationTable) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardEHContinuationTable]->setValue(lc64.GuardEHContinuationTable); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardEHContinuationCount) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardEHContinuationCount]->setValue(lc64.GuardEHContinuationCount); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardXFGCheckFunctionPointer) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardXFGCheckFunctionPointer]->setValue(lc64.GuardXFGCheckFunctionPointer); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardXFGDispatchFunctionPointer) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardXFGDispatchFunctionPointer]->setValue(lc64.GuardXFGDispatchFunctionPointer); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardXFGTableDispatchFunctionPointer) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardXFGTableDispatchFunctionPointer]->setValue(lc64.GuardXFGTableDispatchFunctionPointer); + + if (nRecordSize > N_IMAGE_LOADCONFIG::CastGuardOsDeterminedFailureMode) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::CastGuardOsDeterminedFailureMode]->setValue(lc64.CastGuardOsDeterminedFailureMode); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardMemcpyFunctionPointer) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardMemcpyFunctionPointer]->setValue(lc64.GuardMemcpyFunctionPointer); if (nRecordSize > N_IMAGE_LOADCONFIG::Size) - addComment(ui->tableWidget_LoadConfig, - N_IMAGE_LOADCONFIG::Size, - HEADER_COLUMN_COMMENT, - XBinary::bytesCountToString(lc64.Size)); + addComment(ui->tableWidget_LoadConfig, N_IMAGE_LOADCONFIG::Size, HEADER_COLUMN_COMMENT, XBinary::bytesCountToString(lc64.Size)); if (nRecordSize > N_IMAGE_LOADCONFIG::SecurityCookie) - g_invWidget[INV_IMAGE_LOADCONFIG_SecurityCookie] - ->setAddressAndSize(&pe, lc64.SecurityCookie, 0); + g_invWidget[INV_IMAGE_LOADCONFIG_SecurityCookie]->setAddressAndSize(&pe, lc64.SecurityCookie, 0); if (nRecordSize > N_IMAGE_LOADCONFIG::SEHandlerTable) - g_invWidget[INV_IMAGE_LOADCONFIG_SEHandlerTable] - ->setAddressAndSize(&pe, lc64.SEHandlerTable, 0); - - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardCFCheckFunctionPointer) - g_invWidget - [INV_IMAGE_LOADCONFIG_GuardCFCheckFunctionPointer] - ->setAddressAndSize( - &pe, lc64.GuardCFCheckFunctionPointer, 0); - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardCFDispatchFunctionPointer) - g_invWidget - [INV_IMAGE_LOADCONFIG_GuardCFDispatchFunctionPointer] - ->setAddressAndSize( - &pe, lc64.GuardCFDispatchFunctionPointer, - 0); - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardMemcpyFunctionPointer) - g_invWidget - [INV_IMAGE_LOADCONFIG_GuardMemcpyFunctionPointer] - ->setAddressAndSize( - &pe, lc64.GuardMemcpyFunctionPointer, 0); + g_invWidget[INV_IMAGE_LOADCONFIG_SEHandlerTable]->setAddressAndSize(&pe, lc64.SEHandlerTable, 0); + + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardCFCheckFunctionPointer) + g_invWidget[INV_IMAGE_LOADCONFIG_GuardCFCheckFunctionPointer]->setAddressAndSize(&pe, lc64.GuardCFCheckFunctionPointer, 0); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardCFDispatchFunctionPointer) + g_invWidget[INV_IMAGE_LOADCONFIG_GuardCFDispatchFunctionPointer]->setAddressAndSize(&pe, lc64.GuardCFDispatchFunctionPointer, 0); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardMemcpyFunctionPointer) + g_invWidget[INV_IMAGE_LOADCONFIG_GuardMemcpyFunctionPointer]->setAddressAndSize(&pe, lc64.GuardMemcpyFunctionPointer, 0); } else { - XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32 lc32 = - pe.getLoadConfigDirectory32(); + XPE_DEF::S_IMAGE_LOAD_CONFIG_DIRECTORY32 lc32 = pe.getLoadConfigDirectory32(); - if (nRecordSize > N_IMAGE_LOADCONFIG::Size) - g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::Size] - ->setValue(lc32.Size); - if (nRecordSize > N_IMAGE_LOADCONFIG::TimeDateStamp) - g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::TimeDateStamp] - ->setValue(lc32.TimeDateStamp); - if (nRecordSize > N_IMAGE_LOADCONFIG::MinorVersion) - g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::MinorVersion] - ->setValue(lc32.MinorVersion); - if (nRecordSize > N_IMAGE_LOADCONFIG::MajorVersion) - g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::MajorVersion] - ->setValue(lc32.MajorVersion); + if (nRecordSize > N_IMAGE_LOADCONFIG::Size) g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::Size]->setValue(lc32.Size); + if (nRecordSize > N_IMAGE_LOADCONFIG::TimeDateStamp) g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::TimeDateStamp]->setValue(lc32.TimeDateStamp); + if (nRecordSize > N_IMAGE_LOADCONFIG::MinorVersion) g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::MinorVersion]->setValue(lc32.MinorVersion); + if (nRecordSize > N_IMAGE_LOADCONFIG::MajorVersion) g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::MajorVersion]->setValue(lc32.MajorVersion); if (nRecordSize > N_IMAGE_LOADCONFIG::GlobalFlagsClear) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GlobalFlagsClear] - ->setValue(lc32.GlobalFlagsClear); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GlobalFlagsClear]->setValue(lc32.GlobalFlagsClear); if (nRecordSize > N_IMAGE_LOADCONFIG::GlobalFlagsSet) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GlobalFlagsSet] - ->setValue(lc32.GlobalFlagsSet); - if (nRecordSize > - N_IMAGE_LOADCONFIG::CriticalSectionDefaultTimeout) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::CriticalSectionDefaultTimeout] - ->setValue(lc32.CriticalSectionDefaultTimeout); - if (nRecordSize > - N_IMAGE_LOADCONFIG::DeCommitFreeBlockThreshold) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::DeCommitFreeBlockThreshold] - ->setValue(lc32.DeCommitFreeBlockThreshold); - if (nRecordSize > - N_IMAGE_LOADCONFIG::DeCommitTotalFreeThreshold) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::DeCommitTotalFreeThreshold] - ->setValue(lc32.DeCommitTotalFreeThreshold); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GlobalFlagsSet]->setValue(lc32.GlobalFlagsSet); + if (nRecordSize > N_IMAGE_LOADCONFIG::CriticalSectionDefaultTimeout) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::CriticalSectionDefaultTimeout]->setValue(lc32.CriticalSectionDefaultTimeout); + if (nRecordSize > N_IMAGE_LOADCONFIG::DeCommitFreeBlockThreshold) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::DeCommitFreeBlockThreshold]->setValue(lc32.DeCommitFreeBlockThreshold); + if (nRecordSize > N_IMAGE_LOADCONFIG::DeCommitTotalFreeThreshold) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::DeCommitTotalFreeThreshold]->setValue(lc32.DeCommitTotalFreeThreshold); if (nRecordSize > N_IMAGE_LOADCONFIG::LockPrefixTable) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::LockPrefixTable] - ->setValue(lc32.LockPrefixTable); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::LockPrefixTable]->setValue(lc32.LockPrefixTable); if (nRecordSize > N_IMAGE_LOADCONFIG::MaximumAllocationSize) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::MaximumAllocationSize] - ->setValue(lc32.MaximumAllocationSize); - if (nRecordSize > - N_IMAGE_LOADCONFIG::VirtualMemoryThreshold) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::VirtualMemoryThreshold] - ->setValue(lc32.VirtualMemoryThreshold); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::MaximumAllocationSize]->setValue(lc32.MaximumAllocationSize); + if (nRecordSize > N_IMAGE_LOADCONFIG::VirtualMemoryThreshold) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::VirtualMemoryThreshold]->setValue(lc32.VirtualMemoryThreshold); if (nRecordSize > N_IMAGE_LOADCONFIG::ProcessAffinityMask) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::ProcessAffinityMask] - ->setValue(lc32.ProcessAffinityMask); - if (nRecordSize > N_IMAGE_LOADCONFIG::CSDVersion) - g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::CSDVersion] - ->setValue(lc32.CSDVersion); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::ProcessAffinityMask]->setValue(lc32.ProcessAffinityMask); + if (nRecordSize > N_IMAGE_LOADCONFIG::CSDVersion) g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::CSDVersion]->setValue(lc32.CSDVersion); if (nRecordSize > N_IMAGE_LOADCONFIG::DependentLoadFlags) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::DependentLoadFlags] - ->setValue(lc32.DependentLoadFlags); - if (nRecordSize > N_IMAGE_LOADCONFIG::EditList) - g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::EditList] - ->setValue(lc32.EditList); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::DependentLoadFlags]->setValue(lc32.DependentLoadFlags); + if (nRecordSize > N_IMAGE_LOADCONFIG::EditList) g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::EditList]->setValue(lc32.EditList); if (nRecordSize > N_IMAGE_LOADCONFIG::SecurityCookie) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::SecurityCookie] - ->setValue(lc32.SecurityCookie); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::SecurityCookie]->setValue(lc32.SecurityCookie); if (nRecordSize > N_IMAGE_LOADCONFIG::SEHandlerTable) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::SEHandlerTable] - ->setValue(lc32.SEHandlerTable); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::SEHandlerTable]->setValue(lc32.SEHandlerTable); if (nRecordSize > N_IMAGE_LOADCONFIG::SEHandlerCount) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::SEHandlerCount] - ->setValue(lc32.SEHandlerCount); - - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardCFCheckFunctionPointer) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GuardCFCheckFunctionPointer] - ->setValue(lc32.GuardCFCheckFunctionPointer); - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardCFDispatchFunctionPointer) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GuardCFDispatchFunctionPointer] - ->setValue(lc32.GuardCFDispatchFunctionPointer); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::SEHandlerCount]->setValue(lc32.SEHandlerCount); + + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardCFCheckFunctionPointer) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardCFCheckFunctionPointer]->setValue(lc32.GuardCFCheckFunctionPointer); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardCFDispatchFunctionPointer) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardCFDispatchFunctionPointer]->setValue(lc32.GuardCFDispatchFunctionPointer); if (nRecordSize > N_IMAGE_LOADCONFIG::GuardCFFunctionTable) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GuardCFFunctionTable] - ->setValue(lc32.GuardCFFunctionTable); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardCFFunctionTable]->setValue(lc32.GuardCFFunctionTable); if (nRecordSize > N_IMAGE_LOADCONFIG::GuardCFFunctionCount) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GuardCFFunctionCount] - ->setValue(lc32.GuardCFFunctionCount); - if (nRecordSize > N_IMAGE_LOADCONFIG::GuardFlags) - g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardFlags] - ->setValue(lc32.GuardFlags); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardCFFunctionCount]->setValue(lc32.GuardCFFunctionCount); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardFlags) g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardFlags]->setValue(lc32.GuardFlags); if (nRecordSize > N_IMAGE_LOADCONFIG::CodeIntegrity_Flags) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::CodeIntegrity_Flags] - ->setValue(lc32.CodeIntegrity.Flags); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::CodeIntegrity_Flags]->setValue(lc32.CodeIntegrity.Flags); if (nRecordSize > N_IMAGE_LOADCONFIG::CodeIntegrity_Catalog) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::CodeIntegrity_Catalog] - ->setValue(lc32.CodeIntegrity.Catalog); - if (nRecordSize > - N_IMAGE_LOADCONFIG::CodeIntegrity_CatalogOffset) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::CodeIntegrity_CatalogOffset] - ->setValue(lc32.CodeIntegrity.CatalogOffset); - if (nRecordSize > - N_IMAGE_LOADCONFIG::CodeIntegrity_Reserved) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::CodeIntegrity_Reserved] - ->setValue(lc32.CodeIntegrity.Reserved); - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardAddressTakenIatEntryTable) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GuardAddressTakenIatEntryTable] - ->setValue(lc32.GuardAddressTakenIatEntryTable); - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardAddressTakenIatEntryCount) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GuardAddressTakenIatEntryCount] - ->setValue(lc32.GuardAddressTakenIatEntryCount); - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardLongJumpTargetTable) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GuardLongJumpTargetTable] - ->setValue(lc32.GuardLongJumpTargetTable); - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardLongJumpTargetCount) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GuardLongJumpTargetCount] - ->setValue(lc32.GuardLongJumpTargetCount); - if (nRecordSize > - N_IMAGE_LOADCONFIG::DynamicValueRelocTable) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::DynamicValueRelocTable] - ->setValue(lc32.DynamicValueRelocTable); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::CodeIntegrity_Catalog]->setValue(lc32.CodeIntegrity.Catalog); + if (nRecordSize > N_IMAGE_LOADCONFIG::CodeIntegrity_CatalogOffset) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::CodeIntegrity_CatalogOffset]->setValue(lc32.CodeIntegrity.CatalogOffset); + if (nRecordSize > N_IMAGE_LOADCONFIG::CodeIntegrity_Reserved) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::CodeIntegrity_Reserved]->setValue(lc32.CodeIntegrity.Reserved); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardAddressTakenIatEntryTable) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardAddressTakenIatEntryTable]->setValue(lc32.GuardAddressTakenIatEntryTable); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardAddressTakenIatEntryCount) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardAddressTakenIatEntryCount]->setValue(lc32.GuardAddressTakenIatEntryCount); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardLongJumpTargetTable) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardLongJumpTargetTable]->setValue(lc32.GuardLongJumpTargetTable); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardLongJumpTargetCount) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardLongJumpTargetCount]->setValue(lc32.GuardLongJumpTargetCount); + if (nRecordSize > N_IMAGE_LOADCONFIG::DynamicValueRelocTable) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::DynamicValueRelocTable]->setValue(lc32.DynamicValueRelocTable); if (nRecordSize > N_IMAGE_LOADCONFIG::CHPEMetadataPointer) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::CHPEMetadataPointer] - ->setValue(lc32.CHPEMetadataPointer); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::CHPEMetadataPointer]->setValue(lc32.CHPEMetadataPointer); if (nRecordSize > N_IMAGE_LOADCONFIG::GuardRFFailureRoutine) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GuardRFFailureRoutine] - ->setValue(lc32.GuardRFFailureRoutine); - if (nRecordSize > N_IMAGE_LOADCONFIG:: - GuardRFFailureRoutineFunctionPointer) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG:: - GuardRFFailureRoutineFunctionPointer] - ->setValue( - lc32.GuardRFFailureRoutineFunctionPointer); - if (nRecordSize > - N_IMAGE_LOADCONFIG::DynamicValueRelocTableOffset) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::DynamicValueRelocTableOffset] - ->setValue(lc32.DynamicValueRelocTableOffset); - if (nRecordSize > - N_IMAGE_LOADCONFIG::DynamicValueRelocTableSection) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::DynamicValueRelocTableSection] - ->setValue(lc32.DynamicValueRelocTableSection); - if (nRecordSize > N_IMAGE_LOADCONFIG::Reserved2) - g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::Reserved2] - ->setValue(lc32.Reserved2); - if (nRecordSize > - N_IMAGE_LOADCONFIG:: - GuardRFVerifyStackPointerFunctionPointer) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG:: - GuardRFVerifyStackPointerFunctionPointer] - ->setValue( - lc32.GuardRFVerifyStackPointerFunctionPointer); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardRFFailureRoutine]->setValue(lc32.GuardRFFailureRoutine); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardRFFailureRoutineFunctionPointer) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardRFFailureRoutineFunctionPointer]->setValue(lc32.GuardRFFailureRoutineFunctionPointer); + if (nRecordSize > N_IMAGE_LOADCONFIG::DynamicValueRelocTableOffset) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::DynamicValueRelocTableOffset]->setValue(lc32.DynamicValueRelocTableOffset); + if (nRecordSize > N_IMAGE_LOADCONFIG::DynamicValueRelocTableSection) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::DynamicValueRelocTableSection]->setValue(lc32.DynamicValueRelocTableSection); + if (nRecordSize > N_IMAGE_LOADCONFIG::Reserved2) g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::Reserved2]->setValue(lc32.Reserved2); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardRFVerifyStackPointerFunctionPointer) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardRFVerifyStackPointerFunctionPointer]->setValue( + lc32.GuardRFVerifyStackPointerFunctionPointer); if (nRecordSize > N_IMAGE_LOADCONFIG::HotPatchTableOffset) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::HotPatchTableOffset] - ->setValue(lc32.HotPatchTableOffset); - if (nRecordSize > N_IMAGE_LOADCONFIG::Reserved3) - g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::Reserved3] - ->setValue(lc32.Reserved3); - if (nRecordSize > - N_IMAGE_LOADCONFIG::EnclaveConfigurationPointer) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::EnclaveConfigurationPointer] - ->setValue(lc32.EnclaveConfigurationPointer); - if (nRecordSize > - N_IMAGE_LOADCONFIG::VolatileMetadataPointer) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::VolatileMetadataPointer] - ->setValue(lc32.VolatileMetadataPointer); - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardEHContinuationTable) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GuardEHContinuationTable] - ->setValue(lc32.GuardEHContinuationTable); - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardEHContinuationCount) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GuardEHContinuationCount] - ->setValue(lc32.GuardEHContinuationCount); - - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardXFGCheckFunctionPointer) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GuardXFGCheckFunctionPointer] - ->setValue(lc32.GuardXFGCheckFunctionPointer); - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardXFGDispatchFunctionPointer) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG:: - GuardXFGDispatchFunctionPointer] - ->setValue( - lc32.GuardXFGDispatchFunctionPointer); - if (nRecordSize > N_IMAGE_LOADCONFIG:: - GuardXFGTableDispatchFunctionPointer) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG:: - GuardXFGTableDispatchFunctionPointer] - ->setValue( - lc32.GuardXFGTableDispatchFunctionPointer); - - if (nRecordSize > - N_IMAGE_LOADCONFIG::CastGuardOsDeterminedFailureMode) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG:: - CastGuardOsDeterminedFailureMode] - ->setValue( - lc32.CastGuardOsDeterminedFailureMode); - - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardMemcpyFunctionPointer) - g_lineEdit_LoadConfig - [N_IMAGE_LOADCONFIG::GuardMemcpyFunctionPointer] - ->setValue(lc32.GuardMemcpyFunctionPointer); + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::HotPatchTableOffset]->setValue(lc32.HotPatchTableOffset); + if (nRecordSize > N_IMAGE_LOADCONFIG::Reserved3) g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::Reserved3]->setValue(lc32.Reserved3); + if (nRecordSize > N_IMAGE_LOADCONFIG::EnclaveConfigurationPointer) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::EnclaveConfigurationPointer]->setValue(lc32.EnclaveConfigurationPointer); + if (nRecordSize > N_IMAGE_LOADCONFIG::VolatileMetadataPointer) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::VolatileMetadataPointer]->setValue(lc32.VolatileMetadataPointer); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardEHContinuationTable) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardEHContinuationTable]->setValue(lc32.GuardEHContinuationTable); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardEHContinuationCount) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardEHContinuationCount]->setValue(lc32.GuardEHContinuationCount); + + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardXFGCheckFunctionPointer) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardXFGCheckFunctionPointer]->setValue(lc32.GuardXFGCheckFunctionPointer); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardXFGDispatchFunctionPointer) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardXFGDispatchFunctionPointer]->setValue(lc32.GuardXFGDispatchFunctionPointer); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardXFGTableDispatchFunctionPointer) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardXFGTableDispatchFunctionPointer]->setValue(lc32.GuardXFGTableDispatchFunctionPointer); + + if (nRecordSize > N_IMAGE_LOADCONFIG::CastGuardOsDeterminedFailureMode) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::CastGuardOsDeterminedFailureMode]->setValue(lc32.CastGuardOsDeterminedFailureMode); + + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardMemcpyFunctionPointer) + g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::GuardMemcpyFunctionPointer]->setValue(lc32.GuardMemcpyFunctionPointer); if (nRecordSize > N_IMAGE_LOADCONFIG::Size) - addComment(ui->tableWidget_LoadConfig, - N_IMAGE_LOADCONFIG::Size, - HEADER_COLUMN_COMMENT, - XBinary::bytesCountToString(lc32.Size)); + addComment(ui->tableWidget_LoadConfig, N_IMAGE_LOADCONFIG::Size, HEADER_COLUMN_COMMENT, XBinary::bytesCountToString(lc32.Size)); if (nRecordSize > N_IMAGE_LOADCONFIG::SecurityCookie) - g_invWidget[INV_IMAGE_LOADCONFIG_SecurityCookie] - ->setAddressAndSize(&pe, lc32.SecurityCookie, 0); + g_invWidget[INV_IMAGE_LOADCONFIG_SecurityCookie]->setAddressAndSize(&pe, lc32.SecurityCookie, 0); if (nRecordSize > N_IMAGE_LOADCONFIG::SEHandlerTable) - g_invWidget[INV_IMAGE_LOADCONFIG_SEHandlerTable] - ->setAddressAndSize(&pe, lc32.SEHandlerTable, 0); - - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardCFCheckFunctionPointer) - g_invWidget - [INV_IMAGE_LOADCONFIG_GuardCFCheckFunctionPointer] - ->setAddressAndSize( - &pe, lc32.GuardCFCheckFunctionPointer, 0); - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardCFDispatchFunctionPointer) - g_invWidget - [INV_IMAGE_LOADCONFIG_GuardCFDispatchFunctionPointer] - ->setAddressAndSize( - &pe, lc32.GuardCFDispatchFunctionPointer, - 0); - if (nRecordSize > - N_IMAGE_LOADCONFIG::GuardMemcpyFunctionPointer) - g_invWidget - [INV_IMAGE_LOADCONFIG_GuardMemcpyFunctionPointer] - ->setAddressAndSize( - &pe, lc32.GuardMemcpyFunctionPointer, 0); + g_invWidget[INV_IMAGE_LOADCONFIG_SEHandlerTable]->setAddressAndSize(&pe, lc32.SEHandlerTable, 0); + + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardCFCheckFunctionPointer) + g_invWidget[INV_IMAGE_LOADCONFIG_GuardCFCheckFunctionPointer]->setAddressAndSize(&pe, lc32.GuardCFCheckFunctionPointer, 0); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardCFDispatchFunctionPointer) + g_invWidget[INV_IMAGE_LOADCONFIG_GuardCFDispatchFunctionPointer]->setAddressAndSize(&pe, lc32.GuardCFDispatchFunctionPointer, 0); + if (nRecordSize > N_IMAGE_LOADCONFIG::GuardMemcpyFunctionPointer) + g_invWidget[INV_IMAGE_LOADCONFIG_GuardMemcpyFunctionPointer]->setAddressAndSize(&pe, lc32.GuardMemcpyFunctionPointer, 0); } qint64 nOffset = pe.getLoadConfigDirectoryOffset(); qint64 nSize = pe.getLoadConfigDirectorySize(); qint64 nAddress = pe.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, - &g_subDevice[SPE::TYPE_LOADCONFIG], - ui->widgetHex_LoadConfig); + loadHexSubdevice(nOffset, nSize, nAddress, &g_subDevice[SPE::TYPE_LOADCONFIG], ui->widgetHex_LoadConfig); blockSignals(false); } } else if (nType == SPE::TYPE_BOUNDIMPORT) { if (!isInitPresent(sInit)) { - PEProcessData peProcessData(SPE::TYPE_BOUNDIMPORT, - &g_tvModel[SPE::TYPE_BOUNDIMPORT], - &pe, 0, 0, 0); + PEProcessData peProcessData(SPE::TYPE_BOUNDIMPORT, &g_tvModel[SPE::TYPE_BOUNDIMPORT], &pe, 0, 0, 0); - ajustTableView(&peProcessData, - &g_tvModel[SPE::TYPE_BOUNDIMPORT], - ui->tableView_BoundImport); + ajustTableView(&peProcessData, &g_tvModel[SPE::TYPE_BOUNDIMPORT], ui->tableView_BoundImport); if (g_tvModel[SPE::TYPE_BOUNDIMPORT]->rowCount()) { - ui->tableView_BoundImport->setCurrentIndex( - ui->tableView_BoundImport->model()->index(0, 0)); + ui->tableView_BoundImport->setCurrentIndex(ui->tableView_BoundImport->model()->index(0, 0)); } } } else if (nType == SPE::TYPE_DELAYIMPORT) { if (!isInitPresent(sInit)) { - PEProcessData peProcessData(SPE::TYPE_DELAYIMPORT, - &g_tvModel[SPE::TYPE_DELAYIMPORT], - &pe, 0, 0, 0); + PEProcessData peProcessData(SPE::TYPE_DELAYIMPORT, &g_tvModel[SPE::TYPE_DELAYIMPORT], &pe, 0, 0, 0); - ajustTableView(&peProcessData, - &g_tvModel[SPE::TYPE_DELAYIMPORT], - ui->tableView_DelayImportLibraries); + ajustTableView(&peProcessData, &g_tvModel[SPE::TYPE_DELAYIMPORT], ui->tableView_DelayImportLibraries); - connect(ui->tableView_DelayImportLibraries->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTableView_DelayImportLibraries_currentRowChanged( - QModelIndex, QModelIndex))); + connect(ui->tableView_DelayImportLibraries->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTableView_DelayImportLibraries_currentRowChanged(QModelIndex, QModelIndex))); if (g_tvModel[SPE::TYPE_DELAYIMPORT]->rowCount()) { - ui->tableView_DelayImportLibraries->setCurrentIndex( - ui->tableView_DelayImportLibraries->model()->index(0, - 0)); + ui->tableView_DelayImportLibraries->setCurrentIndex(ui->tableView_DelayImportLibraries->model()->index(0, 0)); } } } else if (nType == SPE::TYPE_NETHEADER) { if (!isInitPresent(sInit)) { - createHeaderTable( - SPE::TYPE_NETHEADER, ui->tableWidget_NetHeader, - N_IMAGE_NETHEADER::records, g_lineEdit_NetHeader, - N_IMAGE_NETHEADER::__data_size, 0); + createHeaderTable(SPE::TYPE_NETHEADER, ui->tableWidget_NetHeader, N_IMAGE_NETHEADER::records, g_lineEdit_NetHeader, + N_IMAGE_NETHEADER::__data_size, 0); - g_comboBox[CB_IMAGE_NETHEADER_FLAGS] = createComboBox( - ui->tableWidget_NetHeader, XPE::getComImageFlagsS(), - SPE::TYPE_NETHEADER, N_IMAGE_NETHEADER::Flags, - XComboBoxEx::CBTYPE_FLAGS); + g_comboBox[CB_IMAGE_NETHEADER_FLAGS] = createComboBox(ui->tableWidget_NetHeader, XPE::getComImageFlagsS(), SPE::TYPE_NETHEADER, + N_IMAGE_NETHEADER::Flags, XComboBoxEx::CBTYPE_FLAGS); blockSignals(true); XPE_DEF::IMAGE_COR20_HEADER netHeader = pe.getNetHeader(); - g_lineEdit_NetHeader[N_IMAGE_NETHEADER::cb]->setValue( - netHeader.cb); - g_lineEdit_NetHeader[N_IMAGE_NETHEADER::MajorRuntimeVersion] - ->setValue(netHeader.MajorRuntimeVersion); - g_lineEdit_NetHeader[N_IMAGE_NETHEADER::MinorRuntimeVersion] - ->setValue(netHeader.MinorRuntimeVersion); - g_lineEdit_NetHeader[N_IMAGE_NETHEADER::MetaData_Address] - ->setValue(netHeader.MetaData.VirtualAddress); - g_lineEdit_NetHeader[N_IMAGE_NETHEADER::MetaData_Size] - ->setValue(netHeader.MetaData.Size); - g_lineEdit_NetHeader[N_IMAGE_NETHEADER::Flags]->setValue( - netHeader.Flags); - g_lineEdit_NetHeader[N_IMAGE_NETHEADER::EntryPoint]->setValue( - netHeader.EntryPointRVA); - g_lineEdit_NetHeader[N_IMAGE_NETHEADER::Resources_Address] - ->setValue(netHeader.Resources.VirtualAddress); - g_lineEdit_NetHeader[N_IMAGE_NETHEADER::Resources_Size] - ->setValue(netHeader.Resources.Size); - g_lineEdit_NetHeader - [N_IMAGE_NETHEADER::StrongNameSignature_Address] - ->setValue( - netHeader.StrongNameSignature.VirtualAddress); - g_lineEdit_NetHeader - [N_IMAGE_NETHEADER::StrongNameSignature_Size] - ->setValue(netHeader.StrongNameSignature.Size); - g_lineEdit_NetHeader - [N_IMAGE_NETHEADER::CodeManagerTable_Address] - ->setValue(netHeader.CodeManagerTable.VirtualAddress); - g_lineEdit_NetHeader[N_IMAGE_NETHEADER::CodeManagerTable_Size] - ->setValue(netHeader.CodeManagerTable.Size); - g_lineEdit_NetHeader[N_IMAGE_NETHEADER::VTableFixups_Address] - ->setValue(netHeader.VTableFixups.VirtualAddress); - g_lineEdit_NetHeader[N_IMAGE_NETHEADER::VTableFixups_Size] - ->setValue(netHeader.VTableFixups.Size); - g_lineEdit_NetHeader - [N_IMAGE_NETHEADER::ExportAddressTableJumps_Address] - ->setValue( - netHeader.ExportAddressTableJumps.VirtualAddress); - g_lineEdit_NetHeader - [N_IMAGE_NETHEADER::ExportAddressTableJumps_Size] - ->setValue(netHeader.ExportAddressTableJumps.Size); - g_lineEdit_NetHeader - [N_IMAGE_NETHEADER::ManagedNativeHeader_Address] - ->setValue( - netHeader.ManagedNativeHeader.VirtualAddress); - g_lineEdit_NetHeader - [N_IMAGE_NETHEADER::ManagedNativeHeader_Size] - ->setValue(netHeader.ManagedNativeHeader.Size); + g_lineEdit_NetHeader[N_IMAGE_NETHEADER::cb]->setValue(netHeader.cb); + g_lineEdit_NetHeader[N_IMAGE_NETHEADER::MajorRuntimeVersion]->setValue(netHeader.MajorRuntimeVersion); + g_lineEdit_NetHeader[N_IMAGE_NETHEADER::MinorRuntimeVersion]->setValue(netHeader.MinorRuntimeVersion); + g_lineEdit_NetHeader[N_IMAGE_NETHEADER::MetaData_Address]->setValue(netHeader.MetaData.VirtualAddress); + g_lineEdit_NetHeader[N_IMAGE_NETHEADER::MetaData_Size]->setValue(netHeader.MetaData.Size); + g_lineEdit_NetHeader[N_IMAGE_NETHEADER::Flags]->setValue(netHeader.Flags); + g_lineEdit_NetHeader[N_IMAGE_NETHEADER::EntryPoint]->setValue(netHeader.EntryPointRVA); + g_lineEdit_NetHeader[N_IMAGE_NETHEADER::Resources_Address]->setValue(netHeader.Resources.VirtualAddress); + g_lineEdit_NetHeader[N_IMAGE_NETHEADER::Resources_Size]->setValue(netHeader.Resources.Size); + g_lineEdit_NetHeader[N_IMAGE_NETHEADER::StrongNameSignature_Address]->setValue(netHeader.StrongNameSignature.VirtualAddress); + g_lineEdit_NetHeader[N_IMAGE_NETHEADER::StrongNameSignature_Size]->setValue(netHeader.StrongNameSignature.Size); + g_lineEdit_NetHeader[N_IMAGE_NETHEADER::CodeManagerTable_Address]->setValue(netHeader.CodeManagerTable.VirtualAddress); + g_lineEdit_NetHeader[N_IMAGE_NETHEADER::CodeManagerTable_Size]->setValue(netHeader.CodeManagerTable.Size); + g_lineEdit_NetHeader[N_IMAGE_NETHEADER::VTableFixups_Address]->setValue(netHeader.VTableFixups.VirtualAddress); + g_lineEdit_NetHeader[N_IMAGE_NETHEADER::VTableFixups_Size]->setValue(netHeader.VTableFixups.Size); + g_lineEdit_NetHeader[N_IMAGE_NETHEADER::ExportAddressTableJumps_Address]->setValue(netHeader.ExportAddressTableJumps.VirtualAddress); + g_lineEdit_NetHeader[N_IMAGE_NETHEADER::ExportAddressTableJumps_Size]->setValue(netHeader.ExportAddressTableJumps.Size); + g_lineEdit_NetHeader[N_IMAGE_NETHEADER::ManagedNativeHeader_Address]->setValue(netHeader.ManagedNativeHeader.VirtualAddress); + g_lineEdit_NetHeader[N_IMAGE_NETHEADER::ManagedNativeHeader_Size]->setValue(netHeader.ManagedNativeHeader.Size); g_comboBox[CB_IMAGE_NETHEADER_FLAGS]->setValue(netHeader.Flags); @@ -3846,62 +2510,39 @@ void PEWidget::reloadData() { qint64 nSize = pe.getNetHeaderSize(); qint64 nAddress = pe.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, - &g_subDevice[SPE::TYPE_NETHEADER], - ui->widgetHex_NetHeader); + loadHexSubdevice(nOffset, nSize, nAddress, &g_subDevice[SPE::TYPE_NETHEADER], ui->widgetHex_NetHeader); blockSignals(false); } } else if (nType == SPE::TYPE_NET_METADATA) { if (!isInitPresent(sInit)) { - createHeaderTable( - SPE::TYPE_NET_METADATA, ui->tableWidget_Net_Metadata, - N_IMAGE_NET_METADATA::records, g_lineEdit_Net_Metadata, - N_IMAGE_NET_METADATA::__data_size, 0); + createHeaderTable(SPE::TYPE_NET_METADATA, ui->tableWidget_Net_Metadata, N_IMAGE_NET_METADATA::records, g_lineEdit_Net_Metadata, + N_IMAGE_NET_METADATA::__data_size, 0); blockSignals(true); XBinary::OFFSETSIZE osMetadata = pe.getNet_MetadataOffsetSize(); - XPE::CLI_METADATA_HEADER header = - pe._read_MetadataHeader(osMetadata.nOffset); - - g_lineEdit_Net_Metadata[N_IMAGE_NET_METADATA::Signature] - ->setValue(header.nSignature); - g_lineEdit_Net_Metadata[N_IMAGE_NET_METADATA::MajorVersion] - ->setValue(header.nMajorVersion); - g_lineEdit_Net_Metadata[N_IMAGE_NET_METADATA::MinorVersion] - ->setValue(header.nMinorVersion); - g_lineEdit_Net_Metadata[N_IMAGE_NET_METADATA::Reserved] - ->setValue(header.nReserved); - g_lineEdit_Net_Metadata - [N_IMAGE_NET_METADATA::VersionStringLength] - ->setValue(header.nVersionStringLength); - g_lineEdit_Net_Metadata[N_IMAGE_NET_METADATA::Version] - ->setStringValue(header.sVersion, - header.nVersionStringLength); - g_lineEdit_Net_Metadata[N_IMAGE_NET_METADATA::Flags]->setValue( - header.nFlags); - g_lineEdit_Net_Metadata[N_IMAGE_NET_METADATA::Streams] - ->setValue(header.nStreams); - - updateTableRecord(ui->tableWidget_Net_Metadata, - N_IMAGE_NET_METADATA::Version, 16, - header.nVersionStringLength); - updateTableRecord(ui->tableWidget_Net_Metadata, - N_IMAGE_NET_METADATA::Flags, - 16 + header.nVersionStringLength, 2); - updateTableRecord(ui->tableWidget_Net_Metadata, - N_IMAGE_NET_METADATA::Streams, - 16 + header.nVersionStringLength + 2, 2); + XPE::CLI_METADATA_HEADER header = pe._read_MetadataHeader(osMetadata.nOffset); + + g_lineEdit_Net_Metadata[N_IMAGE_NET_METADATA::Signature]->setValue(header.nSignature); + g_lineEdit_Net_Metadata[N_IMAGE_NET_METADATA::MajorVersion]->setValue(header.nMajorVersion); + g_lineEdit_Net_Metadata[N_IMAGE_NET_METADATA::MinorVersion]->setValue(header.nMinorVersion); + g_lineEdit_Net_Metadata[N_IMAGE_NET_METADATA::Reserved]->setValue(header.nReserved); + g_lineEdit_Net_Metadata[N_IMAGE_NET_METADATA::VersionStringLength]->setValue(header.nVersionStringLength); + g_lineEdit_Net_Metadata[N_IMAGE_NET_METADATA::Version]->setStringValue(header.sVersion, header.nVersionStringLength); + g_lineEdit_Net_Metadata[N_IMAGE_NET_METADATA::Flags]->setValue(header.nFlags); + g_lineEdit_Net_Metadata[N_IMAGE_NET_METADATA::Streams]->setValue(header.nStreams); + + updateTableRecord(ui->tableWidget_Net_Metadata, N_IMAGE_NET_METADATA::Version, 16, header.nVersionStringLength); + updateTableRecord(ui->tableWidget_Net_Metadata, N_IMAGE_NET_METADATA::Flags, 16 + header.nVersionStringLength, 2); + updateTableRecord(ui->tableWidget_Net_Metadata, N_IMAGE_NET_METADATA::Streams, 16 + header.nVersionStringLength + 2, 2); qint64 nOffset = osMetadata.nOffset; qint64 nSize = osMetadata.nSize; qint64 nAddress = pe.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, - &g_subDevice[SPE::TYPE_NET_METADATA], - ui->widgetHex_Net_Metadata); + loadHexSubdevice(nOffset, nSize, nAddress, &g_subDevice[SPE::TYPE_NET_METADATA], ui->widgetHex_Net_Metadata); blockSignals(false); } @@ -3911,35 +2552,25 @@ void PEWidget::reloadData() { qint64 nSize = nDataSize; qint64 nAddress = pe.offsetToRelAddress(nOffset); - loadHexSubdevice(nOffset, nSize, nAddress, - &g_subDevice[SPE::TYPE_NET_METADATA_STREAM], - ui->widgetHex_Net_Metadata_Stream); + loadHexSubdevice(nOffset, nSize, nAddress, &g_subDevice[SPE::TYPE_NET_METADATA_STREAM], ui->widgetHex_Net_Metadata_Stream); } } else if (nType == SPE::TYPE_CERTIFICATE) { if (!isInitPresent(sInit)) { // TODO - PEProcessData peProcessData(SPE::TYPE_CERTIFICATE, - &g_tvModel[SPE::TYPE_CERTIFICATE], - &pe, 0, 0, 0); + PEProcessData peProcessData(SPE::TYPE_CERTIFICATE, &g_tvModel[SPE::TYPE_CERTIFICATE], &pe, 0, 0, 0); - ajustTreeView(&peProcessData, &g_tvModel[SPE::TYPE_CERTIFICATE], - ui->treeView_Certificate); + ajustTreeView(&peProcessData, &g_tvModel[SPE::TYPE_CERTIFICATE], ui->treeView_Certificate); - connect(ui->treeView_Certificate->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), - this, - SLOT(onTreeView_Certificate_currentRowChanged( - QModelIndex, QModelIndex))); + connect(ui->treeView_Certificate->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, + SLOT(onTreeView_Certificate_currentRowChanged(QModelIndex, QModelIndex))); } } else if (nType == SPE::TYPE_OVERLAY) { if (!isInitPresent(sInit)) { qint64 nOverLayOffset = pe.getOverlayOffset(); qint64 nOverlaySize = pe.getOverlaySize(); - loadHexSubdevice(nOverLayOffset, nOverlaySize, nOverLayOffset, - &g_subDevice[SPE::TYPE_OVERLAY], - ui->widgetHex_Overlay, true); + loadHexSubdevice(nOverLayOffset, nOverlaySize, nOverLayOffset, &g_subDevice[SPE::TYPE_OVERLAY], ui->widgetHex_Overlay, true); } } @@ -3949,8 +2580,7 @@ void PEWidget::reloadData() { addInit(sInit); } -void PEWidget::on_tableView_Sections_customContextMenuRequested( - const QPoint &pos) { +void PEWidget::on_tableView_Sections_customContextMenuRequested(const QPoint &pos) { int nRow = ui->tableView_Sections->currentIndex().row(); if (nRow != -1) { @@ -3959,8 +2589,7 @@ void PEWidget::on_tableView_Sections_customContextMenuRequested( QMenu contextMenu(this); QAction actionEdit(tr("Edit"), this); - connect(&actionEdit, SIGNAL(triggered()), this, - SLOT(editSectionHeader())); + connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editSectionHeader())); contextMenu.addAction(&actionEdit); QAction actionHex(tr("Hex"), this); @@ -3969,14 +2598,12 @@ void PEWidget::on_tableView_Sections_customContextMenuRequested( contextMenu.addAction(&actionHex); QAction actionDisasm(tr("Disasm"), this); - connect(&actionDisasm, SIGNAL(triggered()), this, - SLOT(sectionDisasm())); + connect(&actionDisasm, SIGNAL(triggered()), this, SLOT(sectionDisasm())); actionDisasm.setEnabled(bIsEnable); contextMenu.addAction(&actionDisasm); QAction actionEntropy(tr("Entropy"), this); - connect(&actionEntropy, SIGNAL(triggered()), this, - SLOT(sectionEntropy())); + connect(&actionEntropy, SIGNAL(triggered()), this, SLOT(sectionEntropy())); actionEntropy.setEnabled(bIsEnable); contextMenu.addAction(&actionEntropy); @@ -3993,16 +2620,12 @@ void PEWidget::loadImportLibrary(int nRow) { XPE pe(getDevice(), getOptions().bIsImage, getOptions().nImageBase); if (pe.isValid()) { - PEProcessData peProcessData(SPE::TYPE_IMPORT_FUNCTION, - &g_tvModel[SPE::TYPE_IMPORT_FUNCTION], &pe, - nRow, 0, 0); + PEProcessData peProcessData(SPE::TYPE_IMPORT_FUNCTION, &g_tvModel[SPE::TYPE_IMPORT_FUNCTION], &pe, nRow, 0, 0); - ajustTableView(&peProcessData, &g_tvModel[SPE::TYPE_IMPORT_FUNCTION], - ui->tableView_ImportFunctions); + ajustTableView(&peProcessData, &g_tvModel[SPE::TYPE_IMPORT_FUNCTION], ui->tableView_ImportFunctions); if (g_tvModel[SPE::TYPE_IMPORT_FUNCTION]->rowCount()) { - ui->tableView_ImportFunctions->setCurrentIndex( - ui->tableView_ImportFunctions->model()->index(0, 0)); + ui->tableView_ImportFunctions->setCurrentIndex(ui->tableView_ImportFunctions->model()->index(0, 0)); } } } @@ -4010,170 +2633,114 @@ void PEWidget::loadImportLibrary(int nRow) { void PEWidget::loadRelocs(int nRow) { QModelIndex index = ui->tableView_Relocs->model()->index(nRow, 0); - qint64 nOffset = - ui->tableView_Relocs->model() - ->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET) - .toLongLong(); + qint64 nOffset = ui->tableView_Relocs->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET).toLongLong(); XPE pe(getDevice(), getOptions().bIsImage, getOptions().nImageBase); if (pe.isValid()) { - PEProcessData peProcessData(SPE::TYPE_RELOCS_POSITION, - &g_tvModel[SPE::TYPE_RELOCS_POSITION], &pe, - 0, nOffset, 0); + PEProcessData peProcessData(SPE::TYPE_RELOCS_POSITION, &g_tvModel[SPE::TYPE_RELOCS_POSITION], &pe, 0, nOffset, 0); - ajustTableView(&peProcessData, &g_tvModel[SPE::TYPE_RELOCS_POSITION], - ui->tableView_RelocsPositions, nullptr, false); + ajustTableView(&peProcessData, &g_tvModel[SPE::TYPE_RELOCS_POSITION], ui->tableView_RelocsPositions, nullptr, false); if (g_tvModel[SPE::TYPE_RELOCS_POSITION]->rowCount()) { - ui->tableView_RelocsPositions->setCurrentIndex( - ui->tableView_RelocsPositions->model()->index(0, 0)); + ui->tableView_RelocsPositions->setCurrentIndex(ui->tableView_RelocsPositions->model()->index(0, 0)); } } } void PEWidget::loadSection(int nRow) { - loadHexSubdeviceByTableView(nRow, SPE::TYPE_SECTIONS, ui->widgetHex_Section, - ui->tableView_Sections, - &g_subDevice[SPE::TYPE_SECTIONS]); + loadHexSubdeviceByTableView(nRow, SPE::TYPE_SECTIONS, ui->widgetHex_Section, ui->tableView_Sections, &g_subDevice[SPE::TYPE_SECTIONS]); } void PEWidget::loadException(int nRow) { - loadHexSubdeviceByTableView( - nRow, SPE::TYPE_EXCEPTION, ui->widgetHex_Exception, - ui->tableView_Exceptions, &g_subDevice[SPE::TYPE_EXCEPTION]); + loadHexSubdeviceByTableView(nRow, SPE::TYPE_EXCEPTION, ui->widgetHex_Exception, ui->tableView_Exceptions, &g_subDevice[SPE::TYPE_EXCEPTION]); } void PEWidget::loadDirectory(int nRow) { - qint64 nOffset = ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->item(nRow, 0) - ->data(Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET) - .toLongLong(); - qint64 nSize = ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->item(nRow, 0) - ->data(Qt::UserRole + FW_DEF::SECTION_DATA_SIZE) - .toLongLong(); - XADDR nAddress = ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->item(nRow, 0) - ->data(Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS) - .toLongLong(); - - loadHexSubdevice(nOffset, nSize, nAddress, - &g_subDevice[SPE::TYPE_IMAGE_DIRECTORY_ENTRIES], - ui->widgetHex_IMAGE_DIRECTORY_ENTRIES); + qint64 nOffset = ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->item(nRow, 0)->data(Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET).toLongLong(); + qint64 nSize = ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->item(nRow, 0)->data(Qt::UserRole + FW_DEF::SECTION_DATA_SIZE).toLongLong(); + XADDR nAddress = ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->item(nRow, 0)->data(Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS).toLongLong(); + + loadHexSubdevice(nOffset, nSize, nAddress, &g_subDevice[SPE::TYPE_IMAGE_DIRECTORY_ENTRIES], ui->widgetHex_IMAGE_DIRECTORY_ENTRIES); } void PEWidget::loadDebug(int nRow) { - loadHexSubdeviceByTableView(nRow, SPE::TYPE_DEBUG, ui->widgetHex_Debug, - ui->tableView_Debug, - &g_subDevice[SPE::TYPE_DEBUG]); + loadHexSubdeviceByTableView(nRow, SPE::TYPE_DEBUG, ui->widgetHex_Debug, ui->tableView_Debug, &g_subDevice[SPE::TYPE_DEBUG]); } void PEWidget::loadDelayImport(int nRow) { XPE pe(getDevice(), getOptions().bIsImage, getOptions().nImageBase); if (pe.isValid()) { - PEProcessData peProcessData(SPE::TYPE_DELAYIMPORT_FUNCTION, - &g_tvModel[SPE::TYPE_DELAYIMPORT_FUNCTION], - &pe, nRow, 0, 0); + PEProcessData peProcessData(SPE::TYPE_DELAYIMPORT_FUNCTION, &g_tvModel[SPE::TYPE_DELAYIMPORT_FUNCTION], &pe, nRow, 0, 0); - ajustTableView(&peProcessData, - &g_tvModel[SPE::TYPE_DELAYIMPORT_FUNCTION], - ui->tableView_DelayImportFunctions); + ajustTableView(&peProcessData, &g_tvModel[SPE::TYPE_DELAYIMPORT_FUNCTION], ui->tableView_DelayImportFunctions); if (g_tvModel[SPE::TYPE_DELAYIMPORT]->rowCount()) { - ui->tableView_DelayImportFunctions->setCurrentIndex( - ui->tableView_DelayImportFunctions->model()->index(0, 0)); + ui->tableView_DelayImportFunctions->setCurrentIndex(ui->tableView_DelayImportFunctions->model()->index(0, 0)); } } } void PEWidget::adjustHeaderTable(int nType, QTableWidget *pTableWidget) { - XBinary::MODE mode = XPE::getMode(getDevice(), getOptions().bIsImage, - getOptions().nImageBase); + XBinary::MODE mode = XPE::getMode(getDevice(), getOptions().bIsImage, getOptions().nImageBase); - pTableWidget->setColumnWidth(HEADER_COLUMN_OFFSET, - getColumnWidth(this, CW_UINT16, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_TYPE, - getColumnWidth(this, CW_TYPE, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_OFFSET, getColumnWidth(this, CW_UINT16, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_TYPE, getColumnWidth(this, CW_TYPE, mode)); switch (nType) { case SPE::TYPE_IMAGE_DOS_HEADER: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); break; case SPE::TYPE_IMAGE_NT_HEADERS: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); break; case SPE::TYPE_IMAGE_FILE_HEADER: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGMID, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); break; case SPE::TYPE_IMAGE_OPTIONAL_HEADER: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGMID, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); break; case SPE::TYPE_EXPORT: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGMID, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); break; case SPE::TYPE_TLS: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGMID, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); break; case SPE::TYPE_LOADCONFIG: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGMID, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINTMODE, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); break; case SPE::TYPE_NETHEADER: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGSHORT, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); break; case SPE::TYPE_RESOURCES_VERSION: - pTableWidget->setColumnWidth( - HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGMID, mode)); - pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, - getColumnWidth(this, CW_UINT32, mode)); - pTableWidget->setColumnWidth( - HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_NAME, getColumnWidth(this, CW_STRINGMID, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_VALUE, getColumnWidth(this, CW_UINT32, mode)); + pTableWidget->setColumnWidth(HEADER_COLUMN_INFO, getColumnWidth(this, CW_STRINGMID, mode)); break; } } @@ -4228,9 +2795,7 @@ void PEWidget::_showInHexWindow(qint64 nOffset, qint64 nSize) { ui->widgetHex->setSelection(nOffset, nSize); } -bool PEWidget::createSectionTable(int nType, QTableWidget *pTableWidget, - const FW_DEF::HEADER_RECORD *pRecords, - int nNumberOfRecords) { +bool PEWidget::createSectionTable(int nType, QTableWidget *pTableWidget, const FW_DEF::HEADER_RECORD *pRecords, int nNumberOfRecords) { qint32 nSymbolWidth = XLineEditHEX::getSymbolWidth(this); QStringList slHeader; @@ -4269,8 +2834,7 @@ bool PEWidget::createSectionTable(int nType, QTableWidget *pTableWidget, switch (nType) { case SPE::TYPE_IMAGE_DIRECTORY_ENTRIES: - pTableWidget->horizontalHeader()->setSectionResizeMode( - 5, QHeaderView::Stretch); + pTableWidget->horizontalHeader()->setSectionResizeMode(5, QHeaderView::Stretch); break; } @@ -4284,11 +2848,11 @@ void PEWidget::on_pushButtonReload_clicked() { QTimer::singleShot(1000, this, SLOT(enableButton())); } -void PEWidget::enableButton() { ui->pushButtonReload->setEnabled(true); } +void PEWidget::enableButton() { + ui->pushButtonReload->setEnabled(true); +} -void PEWidget::on_tableWidget_IMAGE_DIRECTORY_ENTRIES_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void PEWidget::on_tableWidget_IMAGE_DIRECTORY_ENTRIES_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentColumn) Q_UNUSED(nPreviousRow) Q_UNUSED(nPreviousColumn) @@ -4298,69 +2862,52 @@ void PEWidget::on_tableWidget_IMAGE_DIRECTORY_ENTRIES_currentCellChanged( } } -void PEWidget::on_tableWidget_IMAGE_DOS_HEADER_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void PEWidget::on_tableWidget_IMAGE_DOS_HEADER_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow) Q_UNUSED(nCurrentColumn) Q_UNUSED(nPreviousRow) Q_UNUSED(nPreviousColumn) - setHeaderTableSelection(ui->widgetHex_IMAGE_DOS_HEADER, - ui->tableWidget_IMAGE_DOS_HEADER); + setHeaderTableSelection(ui->widgetHex_IMAGE_DOS_HEADER, ui->tableWidget_IMAGE_DOS_HEADER); } -void PEWidget::on_tableWidget_IMAGE_NT_HEADERS_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void PEWidget::on_tableWidget_IMAGE_NT_HEADERS_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow) Q_UNUSED(nCurrentColumn) Q_UNUSED(nPreviousRow) Q_UNUSED(nPreviousColumn) - setHeaderTableSelection(ui->widgetHex_IMAGE_NT_HEADERS, - ui->tableWidget_IMAGE_NT_HEADERS); + setHeaderTableSelection(ui->widgetHex_IMAGE_NT_HEADERS, ui->tableWidget_IMAGE_NT_HEADERS); } -void PEWidget::on_tableWidget_IMAGE_FILE_HEADER_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void PEWidget::on_tableWidget_IMAGE_FILE_HEADER_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow) Q_UNUSED(nCurrentColumn) Q_UNUSED(nPreviousRow) Q_UNUSED(nPreviousColumn) - setHeaderTableSelection(ui->widgetHex_IMAGE_FILE_HEADER, - ui->tableWidget_IMAGE_FILE_HEADER); + setHeaderTableSelection(ui->widgetHex_IMAGE_FILE_HEADER, ui->tableWidget_IMAGE_FILE_HEADER); } -void PEWidget::on_tableWidget_IMAGE_OPTIONAL_HEADER_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void PEWidget::on_tableWidget_IMAGE_OPTIONAL_HEADER_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow) Q_UNUSED(nCurrentColumn) Q_UNUSED(nPreviousRow) Q_UNUSED(nPreviousColumn) - setHeaderTableSelection(ui->widgetHex_IMAGE_OPTIONAL_HEADER, - ui->tableWidget_IMAGE_OPTIONAL_HEADER); + setHeaderTableSelection(ui->widgetHex_IMAGE_OPTIONAL_HEADER, ui->tableWidget_IMAGE_OPTIONAL_HEADER); } -void PEWidget::on_tableWidget_LoadConfig_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void PEWidget::on_tableWidget_LoadConfig_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow) Q_UNUSED(nCurrentColumn) Q_UNUSED(nPreviousRow) Q_UNUSED(nPreviousColumn) - setHeaderTableSelection(ui->widgetHex_LoadConfig, - ui->tableWidget_LoadConfig); + setHeaderTableSelection(ui->widgetHex_LoadConfig, ui->tableWidget_LoadConfig); } -void PEWidget::on_tableWidget_NetHeader_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void PEWidget::on_tableWidget_NetHeader_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow) Q_UNUSED(nCurrentColumn) Q_UNUSED(nPreviousRow) @@ -4369,10 +2916,7 @@ void PEWidget::on_tableWidget_NetHeader_currentCellChanged( setHeaderTableSelection(ui->widgetHex_NetHeader, ui->tableWidget_NetHeader); } -void PEWidget::on_tableWidget_TLS_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn) { +void PEWidget::on_tableWidget_TLS_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow) Q_UNUSED(nCurrentColumn) Q_UNUSED(nPreviousRow) @@ -4398,8 +2942,7 @@ void PEWidget::editExceptionHeader() { } void PEWidget::editDelayImportHeader() { - showSectionHeader(SPE::TYPE_DELAYIMPORT, - ui->tableView_DelayImportLibraries); + showSectionHeader(SPE::TYPE_DELAYIMPORT, ui->tableView_DelayImportLibraries); } void PEWidget::editBoundImportHeader() { @@ -4415,29 +2958,22 @@ void PEWidget::exportFunctionDisasm() { } void PEWidget::exportFunctionDemangle() { - showTableViewDemangle(ui->tableView_ExportFunctions, - N_IMAGE_EXPORT_FUNCTION::Name + 1); + showTableViewDemangle(ui->tableView_ExportFunctions, N_IMAGE_EXPORT_FUNCTION::Name + 1); } void PEWidget::importFunctionDemangle() { - showTableViewDemangle(ui->tableView_ImportFunctions, - N_IMAGE_IMPORT_FUNCTION::Hint + 2); + showTableViewDemangle(ui->tableView_ImportFunctions, N_IMAGE_IMPORT_FUNCTION::Hint + 2); } void PEWidget::showSectionHeader(int nType, QTableView *pTableView) { int nRow = pTableView->currentIndex().row(); if (nRow != -1) { - QModelIndex index = - pTableView->selectionModel()->selectedIndexes().at(0); + QModelIndex index = pTableView->selectionModel()->selectedIndexes().at(0); - qint64 nOffset = - pTableView->model() - ->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET) - .toLongLong(); + qint64 nOffset = pTableView->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_HEADEROFFSET).toLongLong(); - PESectionHeaderWidget *pSectionHeaderWidget = new PESectionHeaderWidget( - getDevice(), getOptions(), (quint32)nRow, nOffset, nType, this); + PESectionHeaderWidget *pSectionHeaderWidget = new PESectionHeaderWidget(getDevice(), getOptions(), (quint32)nRow, nOffset, nType, this); DialogSectionHeader dsh(this); dsh.setWidget(pSectionHeaderWidget); @@ -4460,35 +2996,28 @@ void PEWidget::on_tableView_Sections_doubleClicked(const QModelIndex &index) { editSectionHeader(); } -void PEWidget::on_tableView_ImportLibraries_customContextMenuRequested( - const QPoint &pos) { +void PEWidget::on_tableView_ImportLibraries_customContextMenuRequested(const QPoint &pos) { int nRow = ui->tableView_ImportLibraries->currentIndex().row(); if (nRow != -1) { QMenu contextMenu(this); QAction actionEdit(tr("Edit"), this); - connect(&actionEdit, SIGNAL(triggered()), this, - SLOT(editImportHeader())); + connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editImportHeader())); contextMenu.addAction(&actionEdit); - contextMenu.exec( - ui->tableView_ImportLibraries->viewport()->mapToGlobal(pos)); + contextMenu.exec(ui->tableView_ImportLibraries->viewport()->mapToGlobal(pos)); } } -void PEWidget::onTableView_Sections_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void PEWidget::onTableView_Sections_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(current) Q_UNUSED(previous) - loadHexSubdeviceByTableView(current.row(), SPE::TYPE_SECTIONS, - ui->widgetHex_Section, ui->tableView_Sections, - &g_subDevice[SPE::TYPE_SECTIONS]); + loadHexSubdeviceByTableView(current.row(), SPE::TYPE_SECTIONS, ui->widgetHex_Section, ui->tableView_Sections, &g_subDevice[SPE::TYPE_SECTIONS]); } -void PEWidget::onTableView_ImportLibraries_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void PEWidget::onTableView_ImportLibraries_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(previous) int nRow = current.row(); @@ -4498,31 +3027,27 @@ void PEWidget::onTableView_ImportLibraries_currentRowChanged( } } -void PEWidget::on_tableView_ImportLibraries_doubleClicked( - const QModelIndex &index) { +void PEWidget::on_tableView_ImportLibraries_doubleClicked(const QModelIndex &index) { Q_UNUSED(index) editImportHeader(); } -void PEWidget::on_tableView_Relocs_customContextMenuRequested( - const QPoint &pos) { +void PEWidget::on_tableView_Relocs_customContextMenuRequested(const QPoint &pos) { int nRow = ui->tableView_Relocs->currentIndex().row(); if (nRow != -1) { QMenu contextMenu(this); QAction actionEdit(tr("Edit"), this); - connect(&actionEdit, SIGNAL(triggered()), this, - SLOT(editRelocsHeader())); + connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editRelocsHeader())); contextMenu.addAction(&actionEdit); contextMenu.exec(ui->tableView_Relocs->viewport()->mapToGlobal(pos)); } } -void PEWidget::onTableView_Relocs_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void PEWidget::onTableView_Relocs_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(previous) int nRow = current.row(); @@ -4538,24 +3063,21 @@ void PEWidget::on_tableView_Relocs_doubleClicked(const QModelIndex &index) { editRelocsHeader(); } -void PEWidget::on_tableView_Debug_customContextMenuRequested( - const QPoint &pos) { +void PEWidget::on_tableView_Debug_customContextMenuRequested(const QPoint &pos) { int nRow = ui->tableView_Debug->currentIndex().row(); if (nRow != -1) { QMenu contextMenu(this); QAction actionEdit(tr("Edit"), this); - connect(&actionEdit, SIGNAL(triggered()), this, - SLOT(editDebugHeader())); + connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editDebugHeader())); contextMenu.addAction(&actionEdit); contextMenu.exec(ui->tableView_Debug->viewport()->mapToGlobal(pos)); } } -void PEWidget::onTableView_Debug_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void PEWidget::onTableView_Debug_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(previous) int nRow = current.row(); @@ -4571,8 +3093,7 @@ void PEWidget::on_tableView_Debug_doubleClicked(const QModelIndex &index) { editDebugHeader(); } -void PEWidget::on_tableView_Resources_customContextMenuRequested( - const QPoint &pos) { +void PEWidget::on_tableView_Resources_customContextMenuRequested(const QPoint &pos) { int nRow = ui->tableView_Resources->currentIndex().row(); if (nRow != -1) { @@ -4586,14 +3107,12 @@ void PEWidget::on_tableView_Resources_customContextMenuRequested( contextMenu.addAction(&actionHex); QAction actionDisasm(tr("Disasm"), this); - connect(&actionDisasm, SIGNAL(triggered()), this, - SLOT(resourceDisasm())); + connect(&actionDisasm, SIGNAL(triggered()), this, SLOT(resourceDisasm())); actionDisasm.setEnabled(bIsEnable); contextMenu.addAction(&actionDisasm); QAction actionEntropy(tr("Entropy"), this); - connect(&actionEntropy, SIGNAL(triggered()), this, - SLOT(resourceEntropy())); + connect(&actionEntropy, SIGNAL(triggered()), this, SLOT(resourceEntropy())); actionEntropy.setEnabled(bIsEnable); contextMenu.addAction(&actionEntropy); @@ -4606,34 +3125,27 @@ void PEWidget::on_tableView_Resources_customContextMenuRequested( } } -void PEWidget::onTableView_Resources_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void PEWidget::onTableView_Resources_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(previous) - loadHexSubdeviceByTableView( - current.row(), SPE::TYPE_RESOURCES, ui->widgetHex_Resources, - ui->tableView_Resources, &g_subDevice[SPE::TYPE_RESOURCES]); + loadHexSubdeviceByTableView(current.row(), SPE::TYPE_RESOURCES, ui->widgetHex_Resources, ui->tableView_Resources, &g_subDevice[SPE::TYPE_RESOURCES]); } -void PEWidget::on_tableView_Exceptions_customContextMenuRequested( - const QPoint &pos) { +void PEWidget::on_tableView_Exceptions_customContextMenuRequested(const QPoint &pos) { int nRow = ui->tableView_Exceptions->currentIndex().row(); if (nRow != -1) { QMenu contextMenu(this); QAction actionEdit(tr("Edit"), this); - connect(&actionEdit, SIGNAL(triggered()), this, - SLOT(editExceptionHeader())); + connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editExceptionHeader())); contextMenu.addAction(&actionEdit); - contextMenu.exec( - ui->tableView_Exceptions->viewport()->mapToGlobal(pos)); + contextMenu.exec(ui->tableView_Exceptions->viewport()->mapToGlobal(pos)); } } -void PEWidget::onTableView_Exceptions_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void PEWidget::onTableView_Exceptions_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(previous) int nRow = current.row(); @@ -4649,25 +3161,21 @@ void PEWidget::on_tableView_Exceptions_doubleClicked(const QModelIndex &index) { editExceptionHeader(); } -void PEWidget::on_tableView_DelayImportLibraries_customContextMenuRequested( - const QPoint &pos) { +void PEWidget::on_tableView_DelayImportLibraries_customContextMenuRequested(const QPoint &pos) { int nRow = ui->tableView_DelayImportLibraries->currentIndex().row(); if (nRow != -1) { QMenu contextMenu(this); QAction actionEdit(tr("Edit"), this); - connect(&actionEdit, SIGNAL(triggered()), this, - SLOT(editDelayImportHeader())); + connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editDelayImportHeader())); contextMenu.addAction(&actionEdit); - contextMenu.exec( - ui->tableView_DelayImportLibraries->viewport()->mapToGlobal(pos)); + contextMenu.exec(ui->tableView_DelayImportLibraries->viewport()->mapToGlobal(pos)); } } -void PEWidget::onTableView_DelayImportLibraries_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void PEWidget::onTableView_DelayImportLibraries_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(previous) int nRow = current.row(); @@ -4677,126 +3185,84 @@ void PEWidget::onTableView_DelayImportLibraries_currentRowChanged( } } -void PEWidget::on_tableView_DelayImportLibraries_doubleClicked( - const QModelIndex &index) { +void PEWidget::on_tableView_DelayImportLibraries_doubleClicked(const QModelIndex &index) { Q_UNUSED(index) editDelayImportHeader(); } -void PEWidget::on_tableView_BoundImport_customContextMenuRequested( - const QPoint &pos) { +void PEWidget::on_tableView_BoundImport_customContextMenuRequested(const QPoint &pos) { int nRow = ui->tableView_BoundImport->currentIndex().row(); if (nRow != -1) { QMenu contextMenu(this); QAction actionEdit(tr("Edit"), this); - connect(&actionEdit, SIGNAL(triggered()), this, - SLOT(editBoundImportHeader())); + connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editBoundImportHeader())); contextMenu.addAction(&actionEdit); - contextMenu.exec( - ui->tableView_BoundImport->viewport()->mapToGlobal(pos)); + contextMenu.exec(ui->tableView_BoundImport->viewport()->mapToGlobal(pos)); } } -void PEWidget::on_tableView_BoundImport_doubleClicked( - const QModelIndex &index) { +void PEWidget::on_tableView_BoundImport_doubleClicked(const QModelIndex &index) { Q_UNUSED(index) editBoundImportHeader(); } -void PEWidget::onTreeView_Resources_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void PEWidget::onTreeView_Resources_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(previous) if (current.row() != -1) { - QString sID1 = - ui->treeView_Resources->model() - ->data(current, Qt::UserRole + FW_DEF::SECTION_DATA_VALUE1) - .toString(); - QString sID2 = - ui->treeView_Resources->model() - ->data(current, Qt::UserRole + FW_DEF::SECTION_DATA_VALUE2) - .toString(); - QString sID3 = - ui->treeView_Resources->model() - ->data(current, Qt::UserRole + FW_DEF::SECTION_DATA_VALUE3) - .toString(); - qint64 nOffset = - ui->treeView_Resources->model() - ->data(current, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET) - .toLongLong(); - qint64 nSize = - ui->treeView_Resources->model() - ->data(current, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE) - .toLongLong(); - XADDR nAddress = - ui->treeView_Resources->model() - ->data(current, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS) - .toLongLong(); + QString sID1 = ui->treeView_Resources->model()->data(current, Qt::UserRole + FW_DEF::SECTION_DATA_VALUE1).toString(); + QString sID2 = ui->treeView_Resources->model()->data(current, Qt::UserRole + FW_DEF::SECTION_DATA_VALUE2).toString(); + QString sID3 = ui->treeView_Resources->model()->data(current, Qt::UserRole + FW_DEF::SECTION_DATA_VALUE3).toString(); + qint64 nOffset = ui->treeView_Resources->model()->data(current, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET).toLongLong(); + qint64 nSize = ui->treeView_Resources->model()->data(current, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE).toLongLong(); + XADDR nAddress = ui->treeView_Resources->model()->data(current, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS).toLongLong(); g_lineEdit_Resources[N_IMAGE_RESOURCES::ID1]->setStringValue(sID1); g_lineEdit_Resources[N_IMAGE_RESOURCES::ID2]->setStringValue(sID2); g_lineEdit_Resources[N_IMAGE_RESOURCES::ID3]->setStringValue(sID3); - g_lineEdit_Resources[N_IMAGE_RESOURCES::ADDRESS]->setValue( - (quint32)nAddress); - g_lineEdit_Resources[N_IMAGE_RESOURCES::OFFSET]->setValue( - (quint32)nOffset); + g_lineEdit_Resources[N_IMAGE_RESOURCES::ADDRESS]->setValue((quint32)nAddress); + g_lineEdit_Resources[N_IMAGE_RESOURCES::OFFSET]->setValue((quint32)nOffset); g_lineEdit_Resources[N_IMAGE_RESOURCES::SIZE]->setValue((quint32)nSize); - loadHexSubdevice(nOffset, nSize, nAddress, - &g_subDevice[SPE::TYPE_RESOURCES], - ui->widgetHex_Resources); + loadHexSubdevice(nOffset, nSize, nAddress, &g_subDevice[SPE::TYPE_RESOURCES], ui->widgetHex_Resources); } } -void PEWidget::onTreeView_Certificate_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous) { +void PEWidget::onTreeView_Certificate_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(previous) if (current.row() != -1) { - qint64 nOffset = - ui->treeView_Certificate->model() - ->data(current, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET) - .toLongLong(); - qint64 nSize = - ui->treeView_Certificate->model() - ->data(current, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE) - .toLongLong(); - - loadHexSubdevice(nOffset, nSize, nOffset, - &g_subDevice[SPE::TYPE_CERTIFICATE], - ui->widgetHex_Certificate, true); + qint64 nOffset = ui->treeView_Certificate->model()->data(current, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET).toLongLong(); + qint64 nSize = ui->treeView_Certificate->model()->data(current, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE).toLongLong(); + + loadHexSubdevice(nOffset, nSize, nOffset, &g_subDevice[SPE::TYPE_CERTIFICATE], ui->widgetHex_Certificate, true); } } -void PEWidget::on_tableView_ExportFunctions_customContextMenuRequested( - const QPoint &pos) { +void PEWidget::on_tableView_ExportFunctions_customContextMenuRequested(const QPoint &pos) { int nRow = ui->tableView_ExportFunctions->currentIndex().row(); if (nRow != -1) { QMenu contextMenu(this); QAction actionHex(tr("Hex"), this); - connect(&actionHex, SIGNAL(triggered()), this, - SLOT(exportFunctionHex())); + connect(&actionHex, SIGNAL(triggered()), this, SLOT(exportFunctionHex())); contextMenu.addAction(&actionHex); QAction actionDisasm(tr("Disasm"), this); - connect(&actionDisasm, SIGNAL(triggered()), this, - SLOT(exportFunctionDisasm())); + connect(&actionDisasm, SIGNAL(triggered()), this, SLOT(exportFunctionDisasm())); contextMenu.addAction(&actionDisasm); QAction actionDemangle(tr("Demangle"), this); - connect(&actionDemangle, SIGNAL(triggered()), this, - SLOT(exportFunctionDemangle())); + connect(&actionDemangle, SIGNAL(triggered()), this, SLOT(exportFunctionDemangle())); contextMenu.addAction(&actionDemangle); - contextMenu.exec( - ui->tableView_ExportFunctions->viewport()->mapToGlobal(pos)); + contextMenu.exec(ui->tableView_ExportFunctions->viewport()->mapToGlobal(pos)); } } @@ -4824,16 +3290,13 @@ void PEWidget::on_pushButtonDisasm_clicked() { setTreeItem(ui->treeWidgetNavi, SPE::TYPE_DISASM); } -void PEWidget::on_tableWidget_Net_Metadata_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn) { +void PEWidget::on_tableWidget_Net_Metadata_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn) { Q_UNUSED(nCurrentRow) Q_UNUSED(nCurrentColumn) Q_UNUSED(nPreviousRow) Q_UNUSED(nPreviousColumn) - setHeaderTableSelection(ui->widgetHex_Net_Metadata, - ui->tableWidget_Net_Metadata); + setHeaderTableSelection(ui->widgetHex_Net_Metadata, ui->tableWidget_Net_Metadata); } void PEWidget::on_toolButtonPrev_clicked() { @@ -4854,29 +3317,23 @@ void PEWidget::on_checkBoxExportShowValid_stateChanged(int nState) { XPE pe(getDevice(), getOptions().bIsImage, getOptions().nImageBase); if (pe.isValid()) { - PEProcessData peProcessData( - SPE::TYPE_EXPORT_FUNCTION, &g_tvModel[SPE::TYPE_EXPORT_FUNCTION], - &pe, 0, 0, 0, ui->checkBoxExportShowValid->isChecked()); + PEProcessData peProcessData(SPE::TYPE_EXPORT_FUNCTION, &g_tvModel[SPE::TYPE_EXPORT_FUNCTION], &pe, 0, 0, 0, ui->checkBoxExportShowValid->isChecked()); - ajustTableView(&peProcessData, &g_tvModel[SPE::TYPE_EXPORT_FUNCTION], - ui->tableView_ExportFunctions); + ajustTableView(&peProcessData, &g_tvModel[SPE::TYPE_EXPORT_FUNCTION], ui->tableView_ExportFunctions); } } -void PEWidget::on_tableView_ImportFunctions_customContextMenuRequested( - const QPoint &pos) { +void PEWidget::on_tableView_ImportFunctions_customContextMenuRequested(const QPoint &pos) { int nRow = ui->tableView_ImportFunctions->currentIndex().row(); if (nRow != -1) { QMenu contextMenu(this); QAction actionDemangle(tr("Demangle"), this); - connect(&actionDemangle, SIGNAL(triggered()), this, - SLOT(importFunctionDemangle())); + connect(&actionDemangle, SIGNAL(triggered()), this, SLOT(importFunctionDemangle())); contextMenu.addAction(&actionDemangle); - contextMenu.exec( - ui->tableView_ImportFunctions->viewport()->mapToGlobal(pos)); + contextMenu.exec(ui->tableView_ImportFunctions->viewport()->mapToGlobal(pos)); } } @@ -4884,13 +3341,9 @@ void PEWidget::on_pushButtonCertificateCheck_clicked() { XPE pe(getDevice(), getOptions().bIsImage, getOptions().nImageBase); if (pe.isValid()) { - PEProcessData peProcessData(SPE::TYPE_CERTIFICATE_CHECK, - &g_tvModel[SPE::TYPE_CERTIFICATE_CHECK], - &pe, 0, 0, 0); + PEProcessData peProcessData(SPE::TYPE_CERTIFICATE_CHECK, &g_tvModel[SPE::TYPE_CERTIFICATE_CHECK], &pe, 0, 0, 0); - ajustDialogModel(&peProcessData, - &g_tvModel[SPE::TYPE_CERTIFICATE_CHECK], - tr("Certificate")); + ajustDialogModel(&peProcessData, &g_tvModel[SPE::TYPE_CERTIFICATE_CHECK], tr("Certificate")); } } @@ -4918,20 +3371,16 @@ void PEWidget::formatXML() { } } -void PEWidget:: - on_tableWidget_IMAGE_DIRECTORY_ENTRIES_customContextMenuRequested( - const QPoint &pos) { +void PEWidget::on_tableWidget_IMAGE_DIRECTORY_ENTRIES_customContextMenuRequested(const QPoint &pos) { int nRow = ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->currentIndex().row(); if (nRow != -1) { - bool bIsEnable = - getTableViewItemSize(ui->tableWidget_IMAGE_DIRECTORY_ENTRIES); + bool bIsEnable = getTableViewItemSize(ui->tableWidget_IMAGE_DIRECTORY_ENTRIES); QMenu contextMenu(this); QAction actionEdit(tr("Edit"), this); - connect(&actionEdit, SIGNAL(triggered()), this, - SLOT(editDirectoryHeader())); + connect(&actionEdit, SIGNAL(triggered()), this, SLOT(editDirectoryHeader())); contextMenu.addAction(&actionEdit); QAction actionHex(tr("Hex"), this); @@ -4940,20 +3389,16 @@ void PEWidget:: contextMenu.addAction(&actionHex); QAction actionEntropy(tr("Entropy"), this); - connect(&actionEntropy, SIGNAL(triggered()), this, - SLOT(directoryEntropy())); + connect(&actionEntropy, SIGNAL(triggered()), this, SLOT(directoryEntropy())); actionEntropy.setEnabled(bIsEnable); contextMenu.addAction(&actionEntropy); - contextMenu.exec( - ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->viewport()->mapToGlobal( - pos)); + contextMenu.exec(ui->tableWidget_IMAGE_DIRECTORY_ENTRIES->viewport()->mapToGlobal(pos)); } } void PEWidget::editDirectoryHeader() { - showSectionHeader(SPE::TYPE_IMAGE_DIRECTORY_ENTRIES, - ui->tableWidget_IMAGE_DIRECTORY_ENTRIES); + showSectionHeader(SPE::TYPE_IMAGE_DIRECTORY_ENTRIES, ui->tableWidget_IMAGE_DIRECTORY_ENTRIES); } void PEWidget::directoryHex() { @@ -4964,20 +3409,17 @@ void PEWidget::directoryEntropy() { showSectionEntropy(ui->tableWidget_IMAGE_DIRECTORY_ENTRIES); } -void PEWidget::on_tableView_TLSCallbacks_customContextMenuRequested( - const QPoint &pos) { +void PEWidget::on_tableView_TLSCallbacks_customContextMenuRequested(const QPoint &pos) { int nRow = ui->tableView_TLSCallbacks->currentIndex().row(); if (nRow != -1) { QMenu contextMenu(this); QAction actionDisasm(tr("Disasm"), this); - connect(&actionDisasm, SIGNAL(triggered()), this, - SLOT(disasmTLSCallback())); + connect(&actionDisasm, SIGNAL(triggered()), this, SLOT(disasmTLSCallback())); contextMenu.addAction(&actionDisasm); - contextMenu.exec( - ui->tableView_TLSCallbacks->viewport()->mapToGlobal(pos)); + contextMenu.exec(ui->tableView_TLSCallbacks->viewport()->mapToGlobal(pos)); } } @@ -4986,14 +3428,10 @@ void PEWidget::disasmTLSCallback() { } void PEWidget::on_pushButtonSaveSections_clicked() { - XShortcutsWidget::saveModel( - ui->tableView_Sections->model(), - XBinary::getResultFileName(getDevice(), - QString("%1.txt").arg(tr("Sections")))); + XShortcutsWidget::saveModel(ui->tableView_Sections->model(), XBinary::getResultFileName(getDevice(), QString("%1.txt").arg(tr("Sections")))); } -void PEWidget::on_tableView_Resources_StringTable_customContextMenuRequested( - const QPoint &pos) { +void PEWidget::on_tableView_Resources_StringTable_customContextMenuRequested(const QPoint &pos) { int nRow = ui->tableView_Resources_StringTable->currentIndex().row(); if (nRow != -1) { @@ -5003,8 +3441,7 @@ void PEWidget::on_tableView_Resources_StringTable_customContextMenuRequested( connect(&actionHex, SIGNAL(triggered()), this, SLOT(stringTableHex())); contextMenu.addAction(&actionHex); - contextMenu.exec( - ui->tableView_Resources_StringTable->viewport()->mapToGlobal(pos)); + contextMenu.exec(ui->tableView_Resources_StringTable->viewport()->mapToGlobal(pos)); } } @@ -5013,22 +3450,14 @@ void PEWidget::stringTableHex() { } void PEWidget::on_pushButtonSave_Debug_clicked() { - XShortcutsWidget::saveModel( - ui->tableView_Debug->model(), - XBinary::getResultFileName(getDevice(), - QString("%1.txt").arg(QString("Debug")))); + XShortcutsWidget::saveModel(ui->tableView_Debug->model(), XBinary::getResultFileName(getDevice(), QString("%1.txt").arg(QString("Debug")))); } void PEWidget::on_pushButtonSave_Exception_clicked() { - XShortcutsWidget::saveModel( - ui->tableView_Exceptions->model(), - XBinary::getResultFileName( - getDevice(), QString("%1.txt").arg(QString("Exceptions")))); + XShortcutsWidget::saveModel(ui->tableView_Exceptions->model(), XBinary::getResultFileName(getDevice(), QString("%1.txt").arg(QString("Exceptions")))); } void PEWidget::on_pushButtonSave_IMAGE_DIRECTORY_ENTRIES_clicked() { saveHeaderTable(ui->tableWidget_IMAGE_DIRECTORY_ENTRIES, - XBinary::getResultFileName( - getDevice(), QString("%1.txt").arg( - QString("IMAGE_DIRECTORY_ENTRIES")))); + XBinary::getResultFileName(getDevice(), QString("%1.txt").arg(QString("IMAGE_DIRECTORY_ENTRIES")))); } diff --git a/PE/pewidget.h b/PE/pewidget.h index 4d194a96..c211d878 100755 --- a/PE/pewidget.h +++ b/PE/pewidget.h @@ -34,19 +34,17 @@ class PEWidget; class PEWidget : public FormatWidget { Q_OBJECT - public: +public: PEWidget(QWidget *pParent = nullptr); - PEWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, - QWidget *pParent = nullptr); + PEWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, QWidget *pParent = nullptr); ~PEWidget(); virtual void clear(); virtual void cleanup(); virtual void reload(); - protected: - virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, - int nPosition, qint64 nOffset); +protected: + virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset); virtual void setReadonly(bool bState); virtual void blockSignals(bool bState); virtual void adjustHeaderTable(int nType, QTableWidget *pTableWidget); @@ -56,9 +54,8 @@ class PEWidget : public FormatWidget { virtual void _showInMemoryMapWindowOffset(qint64 nOffset); virtual void _showInHexWindow(qint64 nOffset, qint64 nSize); - private slots: - void on_treeWidgetNavi_currentItemChanged(QTreeWidgetItem *pItemCurrent, - QTreeWidgetItem *pItemPrevious); +private slots: + void on_treeWidgetNavi_currentItemChanged(QTreeWidgetItem *pItemCurrent, QTreeWidgetItem *pItemPrevious); void widgetValueChanged(quint64 nValue); void widgetAction(); void on_checkBoxReadonly_toggled(bool bChecked); @@ -79,38 +76,17 @@ class PEWidget : public FormatWidget { void loadDirectory(int nRow); void loadDebug(int nRow); void loadDelayImport(int nRow); - bool createSectionTable(int nType, QTableWidget *pTableWidget, - const FW_DEF::HEADER_RECORD *pRecords, - int nNumberOfRecords); + bool createSectionTable(int nType, QTableWidget *pTableWidget, const FW_DEF::HEADER_RECORD *pRecords, int nNumberOfRecords); void on_pushButtonReload_clicked(); void enableButton(); - void on_tableWidget_IMAGE_DIRECTORY_ENTRIES_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn); - void on_tableWidget_IMAGE_DOS_HEADER_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn); - void on_tableWidget_IMAGE_NT_HEADERS_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn); - void on_tableWidget_IMAGE_FILE_HEADER_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn); - void on_tableWidget_IMAGE_OPTIONAL_HEADER_currentCellChanged( - int nCurrentRow, int nCurrentColumn, int nPreviousRow, - int nPreviousColumn); - void on_tableWidget_LoadConfig_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); - void on_tableWidget_NetHeader_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); - void on_tableWidget_TLS_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); + void on_tableWidget_IMAGE_DIRECTORY_ENTRIES_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); + void on_tableWidget_IMAGE_DOS_HEADER_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); + void on_tableWidget_IMAGE_NT_HEADERS_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); + void on_tableWidget_IMAGE_FILE_HEADER_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); + void on_tableWidget_IMAGE_OPTIONAL_HEADER_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); + void on_tableWidget_LoadConfig_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); + void on_tableWidget_NetHeader_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); + void on_tableWidget_TLS_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); void editImportHeader(); void editDebugHeader(); void editRelocsHeader(); @@ -124,77 +100,57 @@ class PEWidget : public FormatWidget { void showSectionHeader(int nType, QTableView *pTableView); void on_tableView_Sections_customContextMenuRequested(const QPoint &pos); void on_tableView_Sections_doubleClicked(const QModelIndex &index); - void onTableView_Sections_currentRowChanged(const QModelIndex ¤t, - const QModelIndex &previous); - void on_tableView_ImportLibraries_customContextMenuRequested( - const QPoint &pos); - void onTableView_ImportLibraries_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous); + void onTableView_Sections_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); + void on_tableView_ImportLibraries_customContextMenuRequested(const QPoint &pos); + void onTableView_ImportLibraries_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); void on_tableView_ImportLibraries_doubleClicked(const QModelIndex &index); void on_tableView_Relocs_customContextMenuRequested(const QPoint &pos); - void onTableView_Relocs_currentRowChanged(const QModelIndex ¤t, - const QModelIndex &previous); + void onTableView_Relocs_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); void on_tableView_Relocs_doubleClicked(const QModelIndex &index); void on_tableView_Debug_customContextMenuRequested(const QPoint &pos); - void onTableView_Debug_currentRowChanged(const QModelIndex ¤t, - const QModelIndex &previous); + void onTableView_Debug_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); void on_tableView_Debug_doubleClicked(const QModelIndex &index); void on_tableView_Resources_customContextMenuRequested(const QPoint &pos); - void onTableView_Resources_currentRowChanged(const QModelIndex ¤t, - const QModelIndex &previous); + void onTableView_Resources_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); void on_tableView_Exceptions_customContextMenuRequested(const QPoint &pos); - void onTableView_Exceptions_currentRowChanged(const QModelIndex ¤t, - const QModelIndex &previous); + void onTableView_Exceptions_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); void on_tableView_Exceptions_doubleClicked(const QModelIndex &index); - void on_tableView_DelayImportLibraries_customContextMenuRequested( - const QPoint &pos); - void onTableView_DelayImportLibraries_currentRowChanged( - const QModelIndex ¤t, const QModelIndex &previous); - void on_tableView_DelayImportLibraries_doubleClicked( - const QModelIndex &index); + void on_tableView_DelayImportLibraries_customContextMenuRequested(const QPoint &pos); + void onTableView_DelayImportLibraries_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); + void on_tableView_DelayImportLibraries_doubleClicked(const QModelIndex &index); void on_tableView_BoundImport_customContextMenuRequested(const QPoint &pos); void on_tableView_BoundImport_doubleClicked(const QModelIndex &index); - void onTreeView_Resources_currentRowChanged(const QModelIndex ¤t, - const QModelIndex &previous); - void onTreeView_Certificate_currentRowChanged(const QModelIndex ¤t, - const QModelIndex &previous); - void on_tableView_ExportFunctions_customContextMenuRequested( - const QPoint &pos); + void onTreeView_Resources_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); + void onTreeView_Certificate_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); + void on_tableView_ExportFunctions_customContextMenuRequested(const QPoint &pos); void on_pushButtonHex_clicked(); void on_pushButtonStrings_clicked(); void on_pushButtonMemoryMap_clicked(); void on_pushButtonEntropy_clicked(); void on_pushButtonHeuristicScan_clicked(); void on_pushButtonDisasm_clicked(); - void on_tableWidget_Net_Metadata_currentCellChanged(int nCurrentRow, - int nCurrentColumn, - int nPreviousRow, - int nPreviousColumn); + void on_tableWidget_Net_Metadata_currentCellChanged(int nCurrentRow, int nCurrentColumn, int nPreviousRow, int nPreviousColumn); void on_toolButtonPrev_clicked(); void on_toolButtonNext_clicked(); void on_checkBoxExportShowValid_stateChanged(int nState); - void on_tableView_ImportFunctions_customContextMenuRequested( - const QPoint &pos); + void on_tableView_ImportFunctions_customContextMenuRequested(const QPoint &pos); void on_pushButtonCertificateCheck_clicked(); void on_checkBox_ManifestFormat_stateChanged(int nState); void formatXML(); - void on_tableWidget_IMAGE_DIRECTORY_ENTRIES_customContextMenuRequested( - const QPoint &pos); + void on_tableWidget_IMAGE_DIRECTORY_ENTRIES_customContextMenuRequested(const QPoint &pos); void editDirectoryHeader(); void directoryHex(); void directoryEntropy(); - void on_tableView_TLSCallbacks_customContextMenuRequested( - const QPoint &pos); + void on_tableView_TLSCallbacks_customContextMenuRequested(const QPoint &pos); void disasmTLSCallback(); void on_pushButtonSaveSections_clicked(); - void on_tableView_Resources_StringTable_customContextMenuRequested( - const QPoint &pos); + void on_tableView_Resources_StringTable_customContextMenuRequested(const QPoint &pos); void stringTableHex(); void on_pushButtonSave_Debug_clicked(); void on_pushButtonSave_Exception_clicked(); void on_pushButtonSave_IMAGE_DIRECTORY_ENTRIES_clicked(); - private: +private: enum CB { CB_IMAGE_DOS_HEADER_e_magic = 0, CB_IMAGE_NT_HEADERS_Signature, @@ -214,11 +170,7 @@ class PEWidget : public FormatWidget { enum PB { PB_CalculateChecksum, __PB_size }; - enum TD { - TD_IMAGE_FILE_HEADER_TimeDateStamp, - TD_IMAGE_EXPORT_TimeDateStamp, - __TD_size - }; + enum TD { TD_IMAGE_FILE_HEADER_TimeDateStamp, TD_IMAGE_EXPORT_TimeDateStamp, __TD_size }; enum INV { INV_IMAGE_DOS_HEADER_e_lfanew, @@ -245,18 +197,15 @@ class PEWidget : public FormatWidget { Ui::PEWidget *ui; XLineEditHEX *g_lineEdit_IMAGE_DOS_HEADER[N_IMAGE_DOS_HEADER::__data_size]; XLineEditHEX *g_lineEdit_IMAGE_NT_HEADERS[N_IMAGE_NT_HEADERS::__data_size]; - XLineEditHEX - *g_lineEdit_IMAGE_FILE_HEADER[N_IMAGE_FILE_HEADER::__data_size]; - XLineEditHEX - *g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::__data_size]; + XLineEditHEX *g_lineEdit_IMAGE_FILE_HEADER[N_IMAGE_FILE_HEADER::__data_size]; + XLineEditHEX *g_lineEdit_IMAGE_OPTIONAL_HEADER[N_IMAGE_OPTIONAL_HEADER::__data_size]; XLineEditHEX *g_lineEdit_TLS[N_IMAGE_TLS::__data_size]; XLineEditHEX *g_lineEdit_LoadConfig[N_IMAGE_LOADCONFIG::__data_size]; XLineEditHEX *g_lineEdit_NetHeader[N_IMAGE_NETHEADER::__data_size]; XLineEditHEX *g_lineEdit_Net_Metadata[N_IMAGE_NET_METADATA::__data_size]; XLineEditHEX *g_lineEdit_EXPORT[N_IMAGE_EXPORT::__data_size]; XLineEditHEX *g_lineEdit_Resources[N_IMAGE_RESOURCES::__data_size]; - XLineEditHEX *g_lineEdit_Version_FixedFileInfo - [N_IMAGE_RESOURCE_FIXEDFILEINFO::__data_size]; + XLineEditHEX *g_lineEdit_Version_FixedFileInfo[N_IMAGE_RESOURCE_FIXEDFILEINFO::__data_size]; XComboBoxEx *g_comboBox[__CB_size]; QPushButton *g_pushButton[__PB_size]; XDateTimeEditX *g_dateTimeEdit[__TD_size]; diff --git a/SearchSignatures/dialogsearchsignatures.cpp b/SearchSignatures/dialogsearchsignatures.cpp index b144aa87..5a3fc0a7 100644 --- a/SearchSignatures/dialogsearchsignatures.cpp +++ b/SearchSignatures/dialogsearchsignatures.cpp @@ -22,30 +22,31 @@ #include "ui_dialogsearchsignatures.h" -DialogSearchSignatures::DialogSearchSignatures(QWidget *pParent) - : XShortcutsDialog(pParent), ui(new Ui::DialogSearchSignatures) { +DialogSearchSignatures::DialogSearchSignatures(QWidget *pParent) : XShortcutsDialog(pParent), ui(new Ui::DialogSearchSignatures) { ui->setupUi(this); setWindowFlags(Qt::Window); - connect(ui->searchSignaturesWidget, SIGNAL(showHex(qint64, qint64)), this, - SIGNAL(showHex(qint64, qint64))); + connect(ui->searchSignaturesWidget, SIGNAL(showHex(qint64, qint64)), this, SIGNAL(showHex(qint64, qint64))); } -DialogSearchSignatures::~DialogSearchSignatures() { delete ui; } +DialogSearchSignatures::~DialogSearchSignatures() { + delete ui; +} -void DialogSearchSignatures::setData(QIODevice *pDevice, XBinary::FT fileType, - SearchSignaturesWidget::OPTIONS options, - bool bAuto) { +void DialogSearchSignatures::setData(QIODevice *pDevice, XBinary::FT fileType, SearchSignaturesWidget::OPTIONS options, bool bAuto) { ui->searchSignaturesWidget->setData(pDevice, fileType, options, bAuto); } -void DialogSearchSignatures::setGlobal(XShortcuts *pShortcuts, - XOptions *pXOptions) { +void DialogSearchSignatures::setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions) { ui->searchSignaturesWidget->setGlobal(pShortcuts, pXOptions); XShortcutsDialog::setGlobal(pShortcuts, pXOptions); } -void DialogSearchSignatures::adjust() { ui->searchSignaturesWidget->adjust(); } +void DialogSearchSignatures::adjust() { + ui->searchSignaturesWidget->adjust(); +} -void DialogSearchSignatures::on_pushButtonClose_clicked() { this->close(); } +void DialogSearchSignatures::on_pushButtonClose_clicked() { + this->close(); +} diff --git a/SearchSignatures/dialogsearchsignatures.h b/SearchSignatures/dialogsearchsignatures.h index 3d000182..6da27131 100644 --- a/SearchSignatures/dialogsearchsignatures.h +++ b/SearchSignatures/dialogsearchsignatures.h @@ -32,21 +32,20 @@ class DialogSearchSignatures; class DialogSearchSignatures : public XShortcutsDialog { Q_OBJECT - public: +public: explicit DialogSearchSignatures(QWidget *pParent); ~DialogSearchSignatures(); - void setData(QIODevice *pDevice, XBinary::FT fileType, - SearchSignaturesWidget::OPTIONS options, bool bAuto = false); + void setData(QIODevice *pDevice, XBinary::FT fileType, SearchSignaturesWidget::OPTIONS options, bool bAuto = false); void setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions); void adjust(); - signals: +signals: void showHex(qint64 nOffset, qint64 nSize); - private slots: +private slots: void on_pushButtonClose_clicked(); - private: +private: Ui::DialogSearchSignatures *ui; }; diff --git a/SearchSignatures/searchsignaturesoptionswidget.cpp b/SearchSignatures/searchsignaturesoptionswidget.cpp index f3d242ee..718d5e78 100755 --- a/SearchSignatures/searchsignaturesoptionswidget.cpp +++ b/SearchSignatures/searchsignaturesoptionswidget.cpp @@ -22,8 +22,7 @@ #include "ui_searchsignaturesoptionswidget.h" -SearchSignaturesOptionsWidget::SearchSignaturesOptionsWidget(QWidget *pParent) - : QWidget(pParent), ui(new Ui::SearchSignaturesOptionsWidget) { +SearchSignaturesOptionsWidget::SearchSignaturesOptionsWidget(QWidget *pParent) : QWidget(pParent), ui(new Ui::SearchSignaturesOptionsWidget) { ui->setupUi(this); g_pOptions = nullptr; @@ -31,7 +30,9 @@ SearchSignaturesOptionsWidget::SearchSignaturesOptionsWidget(QWidget *pParent) setProperty("GROUPID", XOptions::GROUPID_SIGNATURES); } -SearchSignaturesOptionsWidget::~SearchSignaturesOptionsWidget() { delete ui; } +SearchSignaturesOptionsWidget::~SearchSignaturesOptionsWidget() { + delete ui; +} void SearchSignaturesOptionsWidget::setOptions(XOptions *pOptions) { g_pOptions = pOptions; @@ -40,8 +41,7 @@ void SearchSignaturesOptionsWidget::setOptions(XOptions *pOptions) { } void SearchSignaturesOptionsWidget::save() { - g_pOptions->getLineEdit(ui->lineEditSearchSignaturesPath, - XOptions::ID_SIGNATURES_PATH); + g_pOptions->getLineEdit(ui->lineEditSearchSignaturesPath, XOptions::ID_SIGNATURES_PATH); } void SearchSignaturesOptionsWidget::setDefaultValues(XOptions *pOptions) { @@ -49,18 +49,14 @@ void SearchSignaturesOptionsWidget::setDefaultValues(XOptions *pOptions) { } void SearchSignaturesOptionsWidget::reload() { - g_pOptions->setLineEdit(ui->lineEditSearchSignaturesPath, - XOptions::ID_SIGNATURES_PATH); + g_pOptions->setLineEdit(ui->lineEditSearchSignaturesPath, XOptions::ID_SIGNATURES_PATH); } -void SearchSignaturesOptionsWidget:: - on_toolButtonSearchSignaturesPath_clicked() { +void SearchSignaturesOptionsWidget::on_toolButtonSearchSignaturesPath_clicked() { QString sText = ui->lineEditSearchSignaturesPath->text(); QString sInitDirectory = XBinary::convertPathName(sText); - QString sDirectoryName = QFileDialog::getExistingDirectory( - this, tr("Open directory") + QString("..."), sInitDirectory, - QFileDialog::ShowDirsOnly); + QString sDirectoryName = QFileDialog::getExistingDirectory(this, tr("Open directory") + QString("..."), sInitDirectory, QFileDialog::ShowDirsOnly); if (!sDirectoryName.isEmpty()) { ui->lineEditSearchSignaturesPath->setText(sDirectoryName); diff --git a/SearchSignatures/searchsignaturesoptionswidget.h b/SearchSignatures/searchsignaturesoptionswidget.h index 64143ae9..46982b00 100755 --- a/SearchSignatures/searchsignaturesoptionswidget.h +++ b/SearchSignatures/searchsignaturesoptionswidget.h @@ -33,7 +33,7 @@ class SearchSignaturesOptionsWidget; class SearchSignaturesOptionsWidget : public QWidget { Q_OBJECT - public: +public: explicit SearchSignaturesOptionsWidget(QWidget *pParent = nullptr); ~SearchSignaturesOptionsWidget(); @@ -41,14 +41,14 @@ class SearchSignaturesOptionsWidget : public QWidget { static void setDefaultValues(XOptions *pOptions); - public slots: +public slots: void save(); void reload(); - private slots: +private slots: void on_toolButtonSearchSignaturesPath_clicked(); - private: +private: Ui::SearchSignaturesOptionsWidget *ui; XOptions *g_pOptions; }; diff --git a/SearchSignatures/searchsignatureswidget.cpp b/SearchSignatures/searchsignatureswidget.cpp index 9222f145..26231b0d 100644 --- a/SearchSignatures/searchsignatureswidget.cpp +++ b/SearchSignatures/searchsignatureswidget.cpp @@ -22,8 +22,7 @@ #include "ui_searchsignatureswidget.h" -SearchSignaturesWidget::SearchSignaturesWidget(QWidget *pParent) - : XShortcutsWidget(pParent), ui(new Ui::SearchSignaturesWidget) { +SearchSignaturesWidget::SearchSignaturesWidget(QWidget *pParent) : XShortcutsWidget(pParent), ui(new Ui::SearchSignaturesWidget) { ui->setupUi(this); g_pDevice = nullptr; g_pFilter = new QSortFilterProxyModel(this); @@ -41,8 +40,7 @@ SearchSignaturesWidget::~SearchSignaturesWidget() { delete ui; } -void SearchSignaturesWidget::setData(QIODevice *pDevice, XBinary::FT fileType, - OPTIONS options, bool bAuto) { +void SearchSignaturesWidget::setData(QIODevice *pDevice, XBinary::FT fileType, OPTIONS options, bool bAuto) { this->g_pDevice = pDevice; g_bInit = false; @@ -60,8 +58,7 @@ void SearchSignaturesWidget::setData(QIODevice *pDevice, XBinary::FT fileType, } } -void SearchSignaturesWidget::setOptions( - SearchSignaturesWidget::OPTIONS options) { +void SearchSignaturesWidget::setOptions(SearchSignaturesWidget::OPTIONS options) { g_options = options; adjust(); } @@ -79,19 +76,14 @@ void SearchSignaturesWidget::updateSignaturesPath() { ui->comboBoxFile->addItem("", g_options.sUserSignature); } - QList listFiles = XBinary::getAllFilesFromDirectory( - XBinary::convertPathName(getGlobalOptions()->getSearchSignaturesPath()), - "*.db"); + QList listFiles = XBinary::getAllFilesFromDirectory(XBinary::convertPathName(getGlobalOptions()->getSearchSignaturesPath()), "*.db"); qint32 nNumberOfFiles = listFiles.count(); for (qint32 i = 0; i < nNumberOfFiles; i++) { QString sFileName = listFiles.at(i); - ui->comboBoxFile->addItem( - XBinary::getBaseFileName(sFileName), - XBinary::convertPathName( - getGlobalOptions()->getSearchSignaturesPath()) + - QDir::separator() + sFileName); + ui->comboBoxFile->addItem(XBinary::getBaseFileName(sFileName), + XBinary::convertPathName(getGlobalOptions()->getSearchSignaturesPath()) + QDir::separator() + sFileName); } if (g_options.sUserSignature != "") { @@ -103,54 +95,55 @@ void SearchSignaturesWidget::updateSignaturesPath() { ui->comboBoxFile->blockSignals(bBlocked1); } -void SearchSignaturesWidget::reload() { search(); } +void SearchSignaturesWidget::reload() { + search(); +} -bool SearchSignaturesWidget::getInitStatus() { return g_bInit; } +bool SearchSignaturesWidget::getInitStatus() { + return g_bInit; +} -void SearchSignaturesWidget::adjust() { updateSignaturesPath(); } +void SearchSignaturesWidget::adjust() { + updateSignaturesPath(); +} -void SearchSignaturesWidget::adjustView() { adjust(); } +void SearchSignaturesWidget::adjustView() { + adjust(); +} void SearchSignaturesWidget::on_pushButtonSave_clicked() { if (g_pModel) { - XShortcutsWidget::saveModel( - g_pModel, XBinary::getResultFileName( - g_pDevice, QString("%1.txt").arg(tr("Signatures")))); + XShortcutsWidget::saveModel(g_pModel, XBinary::getResultFileName(g_pDevice, QString("%1.txt").arg(tr("Signatures")))); } } -void SearchSignaturesWidget::on_pushButtonSearch_clicked() { search(); } +void SearchSignaturesWidget::on_pushButtonSearch_clicked() { + search(); +} -void SearchSignaturesWidget::on_tableViewResult_customContextMenuRequested( - const QPoint &pos) { +void SearchSignaturesWidget::on_tableViewResult_customContextMenuRequested(const QPoint &pos) { QMenu contextMenu(this); QMenu menuCopy(tr("Copy"), this); QMenu menuFollowIn(tr("Follow in"), this); QAction actionCopyName(tr("Name"), this); - actionCopyName.setShortcut( - getShortcuts()->getShortcut(X_ID_SIGNATURES_COPY_NAME)); + actionCopyName.setShortcut(getShortcuts()->getShortcut(X_ID_SIGNATURES_COPY_NAME)); connect(&actionCopyName, SIGNAL(triggered()), this, SLOT(_copyName())); menuCopy.addAction(&actionCopyName); QAction actionCopySignature(tr("Signature"), this); - actionCopySignature.setShortcut( - getShortcuts()->getShortcut(X_ID_SIGNATURES_COPY_SIGNATURE)); - connect(&actionCopySignature, SIGNAL(triggered()), this, - SLOT(_copySignature())); + actionCopySignature.setShortcut(getShortcuts()->getShortcut(X_ID_SIGNATURES_COPY_SIGNATURE)); + connect(&actionCopySignature, SIGNAL(triggered()), this, SLOT(_copySignature())); menuCopy.addAction(&actionCopySignature); QAction actionCopyAddress(tr("Address"), this); - actionCopyAddress.setShortcut( - getShortcuts()->getShortcut(X_ID_SIGNATURES_COPY_ADDRESS)); - connect(&actionCopyAddress, SIGNAL(triggered()), this, - SLOT(_copyAddress())); + actionCopyAddress.setShortcut(getShortcuts()->getShortcut(X_ID_SIGNATURES_COPY_ADDRESS)); + connect(&actionCopyAddress, SIGNAL(triggered()), this, SLOT(_copyAddress())); menuCopy.addAction(&actionCopyAddress); QAction actionCopyOffset(tr("Offset"), this); - actionCopyOffset.setShortcut( - getShortcuts()->getShortcut(X_ID_SIGNATURES_COPY_OFFSET)); + actionCopyOffset.setShortcut(getShortcuts()->getShortcut(X_ID_SIGNATURES_COPY_OFFSET)); connect(&actionCopyOffset, SIGNAL(triggered()), this, SLOT(_copyOffset())); menuCopy.addAction(&actionCopyOffset); @@ -159,8 +152,7 @@ void SearchSignaturesWidget::on_tableViewResult_customContextMenuRequested( QAction actionHex(tr("Hex"), this); if (g_options.bMenu_Hex) { - actionHex.setShortcut( - getShortcuts()->getShortcut(X_ID_SIGNATURES_FOLLOWIN_HEX)); + actionHex.setShortcut(getShortcuts()->getShortcut(X_ID_SIGNATURES_FOLLOWIN_HEX)); connect(&actionHex, SIGNAL(triggered()), this, SLOT(_hex())); menuFollowIn.addAction(&actionHex); @@ -174,8 +166,7 @@ void SearchSignaturesWidget::_copyName() { qint32 nRow = ui->tableViewResult->currentIndex().row(); if ((nRow != -1) && (g_pModel)) { - QModelIndex index = - ui->tableViewResult->selectionModel()->selectedIndexes().at(2); + QModelIndex index = ui->tableViewResult->selectionModel()->selectedIndexes().at(2); QString sString = ui->tableViewResult->model()->data(index).toString(); @@ -187,13 +178,9 @@ void SearchSignaturesWidget::_copySignature() { qint32 nRow = ui->tableViewResult->currentIndex().row(); if ((nRow != -1) && (g_pModel)) { - QModelIndex index = - ui->tableViewResult->selectionModel()->selectedIndexes().at(0); + QModelIndex index = ui->tableViewResult->selectionModel()->selectedIndexes().at(0); - QString sString = - ui->tableViewResult->model() - ->data(index, Qt::UserRole + MultiSearch::USERROLE_STRING) - .toString(); + QString sString = ui->tableViewResult->model()->data(index, Qt::UserRole + MultiSearch::USERROLE_STRING).toString(); QApplication::clipboard()->setText(sString); } @@ -203,8 +190,7 @@ void SearchSignaturesWidget::_copyAddress() { qint32 nRow = ui->tableViewResult->currentIndex().row(); if ((nRow != -1) && (g_pModel)) { - QModelIndex index = - ui->tableViewResult->selectionModel()->selectedIndexes().at(0); + QModelIndex index = ui->tableViewResult->selectionModel()->selectedIndexes().at(0); QString sString = ui->tableViewResult->model()->data(index).toString(); @@ -216,8 +202,7 @@ void SearchSignaturesWidget::_copyOffset() { int nRow = ui->tableViewResult->currentIndex().row(); if ((nRow != -1) && (g_pModel)) { - QModelIndex index = - ui->tableViewResult->selectionModel()->selectedIndexes().at(1); + QModelIndex index = ui->tableViewResult->selectionModel()->selectedIndexes().at(1); QString sString = ui->tableViewResult->model()->data(index).toString(); @@ -229,17 +214,10 @@ void SearchSignaturesWidget::_hex() { int nRow = ui->tableViewResult->currentIndex().row(); if ((nRow != -1) && (g_pModel)) { - QModelIndex index = - ui->tableViewResult->selectionModel()->selectedIndexes().at(0); - - qint64 nOffset = - ui->tableViewResult->model() - ->data(index, Qt::UserRole + MultiSearch::USERROLE_OFFSET) - .toLongLong(); - qint64 nSize = - ui->tableViewResult->model() - ->data(index, Qt::UserRole + MultiSearch::USERROLE_SIZE) - .toLongLong(); + QModelIndex index = ui->tableViewResult->selectionModel()->selectedIndexes().at(0); + + qint64 nOffset = ui->tableViewResult->model()->data(index, Qt::UserRole + MultiSearch::USERROLE_OFFSET).toLongLong(); + qint64 nSize = ui->tableViewResult->model()->data(index, Qt::UserRole + MultiSearch::USERROLE_SIZE).toLongLong(); XIODevice *pSubDevice = dynamic_cast(g_pDevice); @@ -258,8 +236,7 @@ void SearchSignaturesWidget::search() { g_pFilter->setSourceModel(nullptr); ui->tableViewResult->setModel(nullptr); - XBinary::FT fileType = - (XBinary::FT)(ui->comboBoxType->currentData().toInt()); + XBinary::FT fileType = (XBinary::FT)(ui->comboBoxType->currentData().toInt()); MultiSearch::OPTIONS options = {}; @@ -274,13 +251,11 @@ void SearchSignaturesWidget::search() { QWidget *pParent = XOptions::getMainWidget(this); DialogMultiSearchProcess dsp(pParent); - dsp.processSearch(g_pDevice, &listRecords, options, - MultiSearch::TYPE_SIGNATURES); + dsp.processSearch(g_pDevice, &listRecords, options, MultiSearch::TYPE_SIGNATURES); dsp.exec(); DialogMultiSearchProcess dmp(pParent); - dmp.processModel(&listRecords, &g_pModel, options, - MultiSearch::TYPE_SIGNATURES); + dmp.processModel(&listRecords, &g_pModel, options, MultiSearch::TYPE_SIGNATURES); dmp.exec(); g_pFilter->setSourceModel(g_pModel); @@ -310,13 +285,11 @@ void SearchSignaturesWidget::loadSignatures(QString sFileName) { nNumberOfSignatures = g_listSignatureRecords.count(); } else { // User signature - g_listSignatureRecords.append(MultiSearch::createSignature( - g_options.sUserSignature, g_options.sUserSignature)); + g_listSignatureRecords.append(MultiSearch::createSignature(g_options.sUserSignature, g_options.sUserSignature)); nNumberOfSignatures = 1; } - ui->labelInfo->setText(QString("%1: %2").arg( - tr("Signatures"), QString::number(nNumberOfSignatures))); + ui->labelInfo->setText(QString("%1: %2").arg(tr("Signatures"), QString::number(nNumberOfSignatures))); } void SearchSignaturesWidget::on_comboBoxFile_currentIndexChanged(int index) { @@ -329,26 +302,14 @@ void SearchSignaturesWidget::on_comboBoxFile_currentIndexChanged(int index) { void SearchSignaturesWidget::registerShortcuts(bool bState) { if (bState) { - if (!shortCuts[SC_COPYNAME]) - shortCuts[SC_COPYNAME] = new QShortcut( - getShortcuts()->getShortcut(X_ID_SIGNATURES_COPY_NAME), this, - SLOT(_copyName())); + if (!shortCuts[SC_COPYNAME]) shortCuts[SC_COPYNAME] = new QShortcut(getShortcuts()->getShortcut(X_ID_SIGNATURES_COPY_NAME), this, SLOT(_copyName())); if (!shortCuts[SC_COPYSIGNATURE]) - shortCuts[SC_COPYSIGNATURE] = new QShortcut( - getShortcuts()->getShortcut(X_ID_SIGNATURES_COPY_SIGNATURE), - this, SLOT(_copySignature())); + shortCuts[SC_COPYSIGNATURE] = new QShortcut(getShortcuts()->getShortcut(X_ID_SIGNATURES_COPY_SIGNATURE), this, SLOT(_copySignature())); if (!shortCuts[SC_COPYADDRESS]) - shortCuts[SC_COPYADDRESS] = new QShortcut( - getShortcuts()->getShortcut(X_ID_SIGNATURES_COPY_ADDRESS), this, - SLOT(_copyAddress())); + shortCuts[SC_COPYADDRESS] = new QShortcut(getShortcuts()->getShortcut(X_ID_SIGNATURES_COPY_ADDRESS), this, SLOT(_copyAddress())); if (!shortCuts[SC_COPYOFFSET]) - shortCuts[SC_COPYOFFSET] = new QShortcut( - getShortcuts()->getShortcut(X_ID_SIGNATURES_COPY_OFFSET), this, - SLOT(_copyOffset())); - if (!shortCuts[SC_HEX]) - shortCuts[SC_HEX] = new QShortcut( - getShortcuts()->getShortcut(X_ID_SIGNATURES_FOLLOWIN_HEX), this, - SLOT(_hex())); + shortCuts[SC_COPYOFFSET] = new QShortcut(getShortcuts()->getShortcut(X_ID_SIGNATURES_COPY_OFFSET), this, SLOT(_copyOffset())); + if (!shortCuts[SC_HEX]) shortCuts[SC_HEX] = new QShortcut(getShortcuts()->getShortcut(X_ID_SIGNATURES_FOLLOWIN_HEX), this, SLOT(_hex())); } else { for (qint32 i = 0; i < __SC_SIZE; i++) { if (shortCuts[i]) { diff --git a/SearchSignatures/searchsignatureswidget.h b/SearchSignatures/searchsignatureswidget.h index 1d947bb5..beba055c 100644 --- a/SearchSignatures/searchsignatureswidget.h +++ b/SearchSignatures/searchsignatureswidget.h @@ -42,16 +42,9 @@ class SearchSignaturesWidget; class SearchSignaturesWidget : public XShortcutsWidget { Q_OBJECT - enum SC { - SC_COPYNAME = 0, - SC_COPYSIGNATURE, - SC_COPYADDRESS, - SC_COPYOFFSET, - SC_HEX, - __SC_SIZE - }; + enum SC { SC_COPYNAME = 0, SC_COPYSIGNATURE, SC_COPYADDRESS, SC_COPYOFFSET, SC_HEX, __SC_SIZE }; - public: +public: struct OPTIONS { bool bMenu_Hex; QString sUserSignature; // It is not global @@ -60,8 +53,7 @@ class SearchSignaturesWidget : public XShortcutsWidget { explicit SearchSignaturesWidget(QWidget *pParent = nullptr); ~SearchSignaturesWidget(); - void setData(QIODevice *pDevice, XBinary::FT fileType, OPTIONS options, - bool bAuto = false); + void setData(QIODevice *pDevice, XBinary::FT fileType, OPTIONS options, bool bAuto = false); void setOptions(OPTIONS options); OPTIONS getOptions(); void updateSignaturesPath(); @@ -71,7 +63,7 @@ class SearchSignaturesWidget : public XShortcutsWidget { void adjust(); void adjustView(); - private slots: +private slots: void on_pushButtonSave_clicked(); void on_pushButtonSearch_clicked(); void on_tableViewResult_customContextMenuRequested(const QPoint &pos); @@ -84,13 +76,13 @@ class SearchSignaturesWidget : public XShortcutsWidget { void loadSignatures(QString sFileName); void on_comboBoxFile_currentIndexChanged(int index); - protected: +protected: virtual void registerShortcuts(bool bState); - signals: +signals: void showHex(qint64 nOffset, qint64 nSize); - private: +private: Ui::SearchSignaturesWidget *ui; QIODevice *g_pDevice; QSortFilterProxyModel *g_pFilter; diff --git a/SearchStrings/dialogsearchstrings.cpp b/SearchStrings/dialogsearchstrings.cpp index 0764788d..09c1aebc 100644 --- a/SearchStrings/dialogsearchstrings.cpp +++ b/SearchStrings/dialogsearchstrings.cpp @@ -22,21 +22,19 @@ #include "ui_dialogsearchstrings.h" -DialogSearchStrings::DialogSearchStrings(QWidget *pParent) - : XShortcutsDialog(pParent), ui(new Ui::DialogSearchStrings) { +DialogSearchStrings::DialogSearchStrings(QWidget *pParent) : XShortcutsDialog(pParent), ui(new Ui::DialogSearchStrings) { ui->setupUi(this); setWindowFlags(Qt::Window); - connect(ui->widgetSearchStrings, SIGNAL(showHex(qint64, qint64)), this, - SIGNAL(showHex(qint64, qint64))); + connect(ui->widgetSearchStrings, SIGNAL(showHex(qint64, qint64)), this, SIGNAL(showHex(qint64, qint64))); } -DialogSearchStrings::~DialogSearchStrings() { delete ui; } +DialogSearchStrings::~DialogSearchStrings() { + delete ui; +} -void DialogSearchStrings::setData(QIODevice *pDevice, - SearchStringsWidget::OPTIONS options, - bool bAuto) { +void DialogSearchStrings::setData(QIODevice *pDevice, SearchStringsWidget::OPTIONS options, bool bAuto) { ui->widgetSearchStrings->setData(pDevice, options, bAuto); if (options.sTitle != "") { @@ -44,10 +42,11 @@ void DialogSearchStrings::setData(QIODevice *pDevice, } } -void DialogSearchStrings::setGlobal(XShortcuts *pShortcuts, - XOptions *pXOptions) { +void DialogSearchStrings::setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions) { ui->widgetSearchStrings->setGlobal(pShortcuts, pXOptions); XShortcutsDialog::setGlobal(pShortcuts, pXOptions); } -void DialogSearchStrings::on_pushButtonClose_clicked() { this->close(); } +void DialogSearchStrings::on_pushButtonClose_clicked() { + this->close(); +} diff --git a/SearchStrings/dialogsearchstrings.h b/SearchStrings/dialogsearchstrings.h index 818ddeaa..e5ead700 100644 --- a/SearchStrings/dialogsearchstrings.h +++ b/SearchStrings/dialogsearchstrings.h @@ -31,20 +31,19 @@ class DialogSearchStrings; class DialogSearchStrings : public XShortcutsDialog { Q_OBJECT - public: +public: explicit DialogSearchStrings(QWidget *pParent); ~DialogSearchStrings(); - void setData(QIODevice *pDevice, SearchStringsWidget::OPTIONS options, - bool bAuto = false); + void setData(QIODevice *pDevice, SearchStringsWidget::OPTIONS options, bool bAuto = false); void setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions); - signals: +signals: void showHex(qint64 nOffset, qint64 nSize); - private slots: +private slots: void on_pushButtonClose_clicked(); - private: +private: Ui::DialogSearchStrings *ui; }; diff --git a/SearchStrings/searchstringswidget.cpp b/SearchStrings/searchstringswidget.cpp index 1b02c20e..36183b11 100644 --- a/SearchStrings/searchstringswidget.cpp +++ b/SearchStrings/searchstringswidget.cpp @@ -22,8 +22,7 @@ #include "ui_searchstringswidget.h" -SearchStringsWidget::SearchStringsWidget(QWidget *pParent) - : XShortcutsWidget(pParent), ui(new Ui::SearchStringsWidget) { +SearchStringsWidget::SearchStringsWidget(QWidget *pParent) : XShortcutsWidget(pParent), ui(new Ui::SearchStringsWidget) { ui->setupUi(this); g_pDevice = nullptr; g_pBackupDevice = nullptr; @@ -69,8 +68,7 @@ SearchStringsWidget::~SearchStringsWidget() { delete ui; } -void SearchStringsWidget::setData(QIODevice *pDevice, OPTIONS options, - bool bAuto) { +void SearchStringsWidget::setData(QIODevice *pDevice, OPTIONS options, bool bAuto) { this->g_pDevice = pDevice; ui->checkBoxAnsi->setChecked(options.bAnsi); @@ -114,7 +112,9 @@ void SearchStringsWidget::setBackupDevice(QIODevice *pDevice) { g_pBackupDevice = pDevice; } -QIODevice *SearchStringsWidget::getDevice() { return g_pDevice; } +QIODevice *SearchStringsWidget::getDevice() { + return g_pDevice; +} QIODevice *SearchStringsWidget::getBackupDevice() { QIODevice *pResult = nullptr; @@ -128,9 +128,13 @@ QIODevice *SearchStringsWidget::getBackupDevice() { return pResult; } -void SearchStringsWidget::reload() { search(); } +void SearchStringsWidget::reload() { + search(); +} -bool SearchStringsWidget::getInitStatus() { return g_bInit; } +bool SearchStringsWidget::getInitStatus() { + return g_bInit; +} bool SearchStringsWidget::isEdited() { bool bResult = XBinary::isBackupPresent(getBackupDevice()); @@ -149,19 +153,23 @@ bool SearchStringsWidget::saveBackup() { return bResult; } -void SearchStringsWidget::setReadonly(bool bState) { g_bIsReadonly = bState; } +void SearchStringsWidget::setReadonly(bool bState) { + g_bIsReadonly = bState; +} -bool SearchStringsWidget::isReadonly() { return g_bIsReadonly; } +bool SearchStringsWidget::isReadonly() { + return g_bIsReadonly; +} void SearchStringsWidget::on_pushButtonSave_clicked() { if (g_pFilter) { - XShortcutsWidget::saveModel( - g_pFilter, XBinary::getResultFileName( - g_pDevice, QString("%1.txt").arg(tr("Strings")))); + XShortcutsWidget::saveModel(g_pFilter, XBinary::getResultFileName(g_pDevice, QString("%1.txt").arg(tr("Strings")))); } } -void SearchStringsWidget::on_pushButtonSearch_clicked() { search(); } +void SearchStringsWidget::on_pushButtonSearch_clicked() { + search(); +} void SearchStringsWidget::on_lineEditFilter_textChanged(const QString &sText) { filter(sText); @@ -173,8 +181,7 @@ void SearchStringsWidget::filter(QString sString) { g_pFilter->setFilterKeyColumn(3); } -void SearchStringsWidget::on_tableViewResult_customContextMenuRequested( - const QPoint &pos) { +void SearchStringsWidget::on_tableViewResult_customContextMenuRequested(const QPoint &pos) { QMenu contextMenu(this); QMenu menuCopy(tr("Copy"), this); @@ -182,8 +189,7 @@ void SearchStringsWidget::on_tableViewResult_customContextMenuRequested( QMenu menuEdit(tr("Edit"), this); QAction actionCopyString(tr("String"), this); - actionCopyString.setShortcut( - getShortcuts()->getShortcut(X_ID_STRINGS_COPY_STRING)); + actionCopyString.setShortcut(getShortcuts()->getShortcut(X_ID_STRINGS_COPY_STRING)); connect(&actionCopyString, SIGNAL(triggered()), this, SLOT(_copyString())); menuCopy.addAction(&actionCopyString); @@ -196,14 +202,12 @@ void SearchStringsWidget::on_tableViewResult_customContextMenuRequested( } QAction actionCopyOffset(sCopyString, this); - actionCopyOffset.setShortcut( - getShortcuts()->getShortcut(X_ID_STRINGS_COPY_OFFSET)); + actionCopyOffset.setShortcut(getShortcuts()->getShortcut(X_ID_STRINGS_COPY_OFFSET)); connect(&actionCopyOffset, SIGNAL(triggered()), this, SLOT(_copyOffset())); menuCopy.addAction(&actionCopyOffset); QAction actionCopySize(tr("Size"), this); - actionCopySize.setShortcut( - getShortcuts()->getShortcut(X_ID_STRINGS_COPY_SIZE)); + actionCopySize.setShortcut(getShortcuts()->getShortcut(X_ID_STRINGS_COPY_SIZE)); connect(&actionCopySize, SIGNAL(triggered()), this, SLOT(_copySize())); menuCopy.addAction(&actionCopySize); @@ -213,16 +217,14 @@ void SearchStringsWidget::on_tableViewResult_customContextMenuRequested( QAction actionDemangle(tr("Demangle"), this); if (g_options.bMenu_Hex) { - actionHex.setShortcut( - getShortcuts()->getShortcut(X_ID_STRINGS_FOLLOWIN_HEX)); + actionHex.setShortcut(getShortcuts()->getShortcut(X_ID_STRINGS_FOLLOWIN_HEX)); connect(&actionHex, SIGNAL(triggered()), this, SLOT(_hex())); menuFollowIn.addAction(&actionHex); } if (g_options.bMenu_Demangle) { - actionDemangle.setShortcut( - getShortcuts()->getShortcut(X_ID_STRINGS_DEMANGLE)); + actionDemangle.setShortcut(getShortcuts()->getShortcut(X_ID_STRINGS_DEMANGLE)); connect(&actionDemangle, SIGNAL(triggered()), this, SLOT(_demangle())); contextMenu.addAction(&actionDemangle); } @@ -232,8 +234,7 @@ void SearchStringsWidget::on_tableViewResult_customContextMenuRequested( } QAction actionEditString(tr("String"), this); - actionEditString.setShortcut( - getShortcuts()->getShortcut(X_ID_STRINGS_EDIT_STRING)); + actionEditString.setShortcut(getShortcuts()->getShortcut(X_ID_STRINGS_EDIT_STRING)); connect(&actionEditString, SIGNAL(triggered()), this, SLOT(_editString())); menuEdit.addAction(&actionEditString); @@ -249,8 +250,7 @@ void SearchStringsWidget::_copyString() { qint32 nRow = ui->tableViewResult->currentIndex().row(); if ((nRow != -1) && (g_pModel)) { - QModelIndex index = - ui->tableViewResult->selectionModel()->selectedIndexes().at(3); + QModelIndex index = ui->tableViewResult->selectionModel()->selectedIndexes().at(3); QString sString = ui->tableViewResult->model()->data(index).toString(); @@ -262,8 +262,7 @@ void SearchStringsWidget::_copyOffset() { int nRow = ui->tableViewResult->currentIndex().row(); if ((nRow != -1) && (g_pModel)) { - QModelIndex index = - ui->tableViewResult->selectionModel()->selectedIndexes().at(0); + QModelIndex index = ui->tableViewResult->selectionModel()->selectedIndexes().at(0); QString sString = ui->tableViewResult->model()->data(index).toString(); @@ -275,8 +274,7 @@ void SearchStringsWidget::_copySize() { int nRow = ui->tableViewResult->currentIndex().row(); if ((nRow != -1) && (g_pModel)) { - QModelIndex index = - ui->tableViewResult->selectionModel()->selectedIndexes().at(1); + QModelIndex index = ui->tableViewResult->selectionModel()->selectedIndexes().at(1); QString sString = ui->tableViewResult->model()->data(index).toString(); @@ -288,17 +286,10 @@ void SearchStringsWidget::_hex() { int nRow = ui->tableViewResult->currentIndex().row(); if ((nRow != -1) && (g_pModel)) { - QModelIndex index = - ui->tableViewResult->selectionModel()->selectedIndexes().at(0); - - qint64 nOffset = - ui->tableViewResult->model() - ->data(index, Qt::UserRole + MultiSearch::USERROLE_OFFSET) - .toLongLong(); - qint64 nSize = - ui->tableViewResult->model() - ->data(index, Qt::UserRole + MultiSearch::USERROLE_SIZE) - .toLongLong(); + QModelIndex index = ui->tableViewResult->selectionModel()->selectedIndexes().at(0); + + qint64 nOffset = ui->tableViewResult->model()->data(index, Qt::UserRole + MultiSearch::USERROLE_OFFSET).toLongLong(); + qint64 nSize = ui->tableViewResult->model()->data(index, Qt::UserRole + MultiSearch::USERROLE_SIZE).toLongLong(); XIODevice *pSubDevice = dynamic_cast(g_pDevice); @@ -314,8 +305,7 @@ void SearchStringsWidget::_demangle() { int nRow = ui->tableViewResult->currentIndex().row(); if ((nRow != -1) && (g_pModel)) { - QModelIndex index = - ui->tableViewResult->selectionModel()->selectedIndexes().at(3); + QModelIndex index = ui->tableViewResult->selectionModel()->selectedIndexes().at(3); QString sString = ui->tableViewResult->model()->data(index).toString(); @@ -325,33 +315,19 @@ void SearchStringsWidget::_demangle() { void SearchStringsWidget::_editString() { if (!isReadonly()) { - QModelIndex index0 = - ui->tableViewResult->selectionModel()->selectedIndexes().at(0); - QModelIndex index1 = - ui->tableViewResult->selectionModel()->selectedIndexes().at(1); - QModelIndex index2 = - ui->tableViewResult->selectionModel()->selectedIndexes().at(2); - QModelIndex index3 = - ui->tableViewResult->selectionModel()->selectedIndexes().at(3); + QModelIndex index0 = ui->tableViewResult->selectionModel()->selectedIndexes().at(0); + QModelIndex index1 = ui->tableViewResult->selectionModel()->selectedIndexes().at(1); + QModelIndex index2 = ui->tableViewResult->selectionModel()->selectedIndexes().at(2); + QModelIndex index3 = ui->tableViewResult->selectionModel()->selectedIndexes().at(3); DialogEditString::DATA_STRUCT dataStruct = {}; - dataStruct.nOffset = - ui->tableViewResult->model() - ->data(index0, Qt::UserRole + MultiSearch::USERROLE_OFFSET) - .toLongLong(); - dataStruct.nSize = - ui->tableViewResult->model() - ->data(index0, Qt::UserRole + MultiSearch::USERROLE_SIZE) - .toLongLong(); - dataStruct.recordType = (XBinary::MS_RECORD_TYPE)( - ui->tableViewResult->model() - ->data(index0, Qt::UserRole + MultiSearch::USERROLE_TYPE) - .toLongLong()); + dataStruct.nOffset = ui->tableViewResult->model()->data(index0, Qt::UserRole + MultiSearch::USERROLE_OFFSET).toLongLong(); + dataStruct.nSize = ui->tableViewResult->model()->data(index0, Qt::UserRole + MultiSearch::USERROLE_SIZE).toLongLong(); + dataStruct.recordType = (XBinary::MS_RECORD_TYPE)(ui->tableViewResult->model()->data(index0, Qt::UserRole + MultiSearch::USERROLE_TYPE).toLongLong()); dataStruct.bIsCStrings = false; - dataStruct.sString = - ui->tableViewResult->model()->data(index3).toString(); + dataStruct.sString = ui->tableViewResult->model()->data(index3).toString(); DialogEditString dialogEditString(this, g_pDevice, &dataStruct); @@ -360,28 +336,14 @@ void SearchStringsWidget::_editString() { bool bSuccess = false; if (saveBackup()) { - if (XBinary::write_array( - g_pDevice, dataStruct.nOffset, - XBinary::getStringData(dataStruct.recordType, - dataStruct.sString, - dataStruct.bIsCStrings))) { - ui->tableViewResult->model()->setData( - index0, dataStruct.nSize, - Qt::UserRole + MultiSearch::USERROLE_SIZE); - ui->tableViewResult->model()->setData( - index0, dataStruct.recordType, - Qt::UserRole + MultiSearch::USERROLE_TYPE); - - ui->tableViewResult->model()->setData( - index1, - XBinary::valueToHexEx(dataStruct.sString.size()), - Qt::DisplayRole); - ui->tableViewResult->model()->setData( - index2, - XBinary::msRecordTypeIdToString(dataStruct.recordType), - Qt::DisplayRole); - ui->tableViewResult->model()->setData( - index3, dataStruct.sString, Qt::DisplayRole); + if (XBinary::write_array(g_pDevice, dataStruct.nOffset, + XBinary::getStringData(dataStruct.recordType, dataStruct.sString, dataStruct.bIsCStrings))) { + ui->tableViewResult->model()->setData(index0, dataStruct.nSize, Qt::UserRole + MultiSearch::USERROLE_SIZE); + ui->tableViewResult->model()->setData(index0, dataStruct.recordType, Qt::UserRole + MultiSearch::USERROLE_TYPE); + + ui->tableViewResult->model()->setData(index1, XBinary::valueToHexEx(dataStruct.sString.size()), Qt::DisplayRole); + ui->tableViewResult->model()->setData(index2, XBinary::msRecordTypeIdToString(dataStruct.recordType), Qt::DisplayRole); + ui->tableViewResult->model()->setData(index3, dataStruct.sString, Qt::DisplayRole); bSuccess = true; } @@ -390,11 +352,8 @@ void SearchStringsWidget::_editString() { if (bSuccess) { emit dataChanged(); } else { - QMessageBox::critical( - XOptions::getMainWidget(this), tr("Error"), - tr("Cannot save file") + - QString(": %1").arg( - XBinary::getBackupFileName(getBackupDevice()))); + QMessageBox::critical(XOptions::getMainWidget(this), tr("Error"), + tr("Cannot save file") + QString(": %1").arg(XBinary::getBackupFileName(getBackupDevice()))); } } } @@ -423,8 +382,7 @@ void SearchStringsWidget::search() { options.bLinks = g_options.bLinks; options.bMenu_Hex = g_options.bMenu_Hex; options.nMinLenght = g_options.nMinLenght; - options.memoryMap = - XBinary(g_pDevice, true, g_options.nBaseAddress).getMemoryMap(); + options.memoryMap = XBinary(g_pDevice, true, g_options.nBaseAddress).getMemoryMap(); g_pOldModel = g_pModel; @@ -436,13 +394,11 @@ void SearchStringsWidget::search() { QWidget *pParent = XOptions::getMainWidget(this); DialogMultiSearchProcess dsp(pParent); - dsp.processSearch(g_pDevice, &listRecords, options, - MultiSearch::TYPE_STRINGS); + dsp.processSearch(g_pDevice, &listRecords, options, MultiSearch::TYPE_STRINGS); dsp.showDialogDelay(1000); DialogMultiSearchProcess dmp(pParent); - dmp.processModel(&listRecords, &g_pModel, options, - MultiSearch::TYPE_STRINGS); + dmp.processModel(&listRecords, &g_pModel, options, MultiSearch::TYPE_STRINGS); dmp.showDialogDelay(1000); g_pFilter->setSourceModel(g_pModel); @@ -453,11 +409,9 @@ void SearchStringsWidget::search() { ui->tableViewResult->setColumnWidth(2, 30); // TODO #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) - QFuture future = - QtConcurrent::run(&SearchStringsWidget::deleteOldModel, this); + QFuture future = QtConcurrent::run(&SearchStringsWidget::deleteOldModel, this); #else - QFuture future = - QtConcurrent::run(this, &SearchStringsWidget::deleteOldModel); + QFuture future = QtConcurrent::run(this, &SearchStringsWidget::deleteOldModel); #endif g_watcher.setFuture(future); @@ -469,34 +423,21 @@ void SearchStringsWidget::search() { } } -void SearchStringsWidget::deleteOldModel() { delete g_pOldModel; } +void SearchStringsWidget::deleteOldModel() { + delete g_pOldModel; +} void SearchStringsWidget::registerShortcuts(bool bState) { if (bState) { if (!shortCuts[SC_COPYSTRING]) - shortCuts[SC_COPYSTRING] = new QShortcut( - getShortcuts()->getShortcut(X_ID_STRINGS_COPY_STRING), this, - SLOT(_copyString())); + shortCuts[SC_COPYSTRING] = new QShortcut(getShortcuts()->getShortcut(X_ID_STRINGS_COPY_STRING), this, SLOT(_copyString())); if (!shortCuts[SC_COPYOFFSET]) - shortCuts[SC_COPYOFFSET] = new QShortcut( - getShortcuts()->getShortcut(X_ID_STRINGS_COPY_OFFSET), this, - SLOT(_copyOffset())); - if (!shortCuts[SC_COPYSIZE]) - shortCuts[SC_COPYSIZE] = new QShortcut( - getShortcuts()->getShortcut(X_ID_STRINGS_COPY_SIZE), this, - SLOT(_copySize())); - if (!shortCuts[SC_HEX]) - shortCuts[SC_HEX] = new QShortcut( - getShortcuts()->getShortcut(X_ID_STRINGS_FOLLOWIN_HEX), this, - SLOT(_hex())); - if (!shortCuts[SC_DEMANGLE]) - shortCuts[SC_DEMANGLE] = new QShortcut( - getShortcuts()->getShortcut(X_ID_STRINGS_DEMANGLE), this, - SLOT(_demangle())); + shortCuts[SC_COPYOFFSET] = new QShortcut(getShortcuts()->getShortcut(X_ID_STRINGS_COPY_OFFSET), this, SLOT(_copyOffset())); + if (!shortCuts[SC_COPYSIZE]) shortCuts[SC_COPYSIZE] = new QShortcut(getShortcuts()->getShortcut(X_ID_STRINGS_COPY_SIZE), this, SLOT(_copySize())); + if (!shortCuts[SC_HEX]) shortCuts[SC_HEX] = new QShortcut(getShortcuts()->getShortcut(X_ID_STRINGS_FOLLOWIN_HEX), this, SLOT(_hex())); + if (!shortCuts[SC_DEMANGLE]) shortCuts[SC_DEMANGLE] = new QShortcut(getShortcuts()->getShortcut(X_ID_STRINGS_DEMANGLE), this, SLOT(_demangle())); if (!shortCuts[SC_EDITSTRING]) - shortCuts[SC_EDITSTRING] = new QShortcut( - getShortcuts()->getShortcut(X_ID_STRINGS_EDIT_STRING), this, - SLOT(_editString())); + shortCuts[SC_EDITSTRING] = new QShortcut(getShortcuts()->getShortcut(X_ID_STRINGS_EDIT_STRING), this, SLOT(_editString())); } else { for (qint32 i = 0; i < __SC_SIZE; i++) { if (shortCuts[i]) { diff --git a/SearchStrings/searchstringswidget.h b/SearchStrings/searchstringswidget.h index da6179a3..13c64666 100644 --- a/SearchStrings/searchstringswidget.h +++ b/SearchStrings/searchstringswidget.h @@ -41,17 +41,9 @@ class SearchStringsWidget; class SearchStringsWidget : public XShortcutsWidget { Q_OBJECT - enum SC { - SC_COPYSTRING = 0, - SC_COPYOFFSET, - SC_COPYSIZE, - SC_HEX, - SC_DEMANGLE, - SC_EDITSTRING, - __SC_SIZE - }; + enum SC { SC_COPYSTRING = 0, SC_COPYOFFSET, SC_COPYSIZE, SC_HEX, SC_DEMANGLE, SC_EDITSTRING, __SC_SIZE }; - public: +public: struct OPTIONS { qint64 nBaseAddress; bool bAnsi; @@ -69,8 +61,7 @@ class SearchStringsWidget : public XShortcutsWidget { explicit SearchStringsWidget(QWidget *pParent = nullptr); ~SearchStringsWidget(); - void setData(QIODevice *pDevice, SearchStringsWidget::OPTIONS options, - bool bAuto = false); + void setData(QIODevice *pDevice, SearchStringsWidget::OPTIONS options, bool bAuto = false); void setBackupDevice(QIODevice *pDevice); QIODevice *getDevice(); QIODevice *getBackupDevice(); @@ -82,7 +73,7 @@ class SearchStringsWidget : public XShortcutsWidget { void setReadonly(bool bState); bool isReadonly(); - private slots: +private slots: void on_pushButtonSave_clicked(); void on_pushButtonSearch_clicked(); void on_lineEditFilter_textChanged(const QString &sText); @@ -101,15 +92,15 @@ class SearchStringsWidget : public XShortcutsWidget { void on_checkBoxUnicode_stateChanged(int nArg); void adjust(); - protected: +protected: virtual void registerShortcuts(bool bState); - signals: +signals: void showHex(qint64 nOffset, qint64 nSize); void showDemangle(QString sString); void dataChanged(); - private: +private: Ui::SearchStringsWidget *ui; QIODevice *g_pDevice; QIODevice *g_pBackupDevice; diff --git a/dialogmodelinfo.cpp b/dialogmodelinfo.cpp index 4232c12c..63a887e1 100644 --- a/dialogmodelinfo.cpp +++ b/dialogmodelinfo.cpp @@ -22,17 +22,17 @@ #include "ui_dialogmodelinfo.h" -DialogModelInfo::DialogModelInfo(QWidget *pParent) - : QDialog(pParent), ui(new Ui::DialogModelInfo) { +DialogModelInfo::DialogModelInfo(QWidget *pParent) : QDialog(pParent), ui(new Ui::DialogModelInfo) { ui->setupUi(this); g_pDevice = 0; } -DialogModelInfo::~DialogModelInfo() { delete ui; } +DialogModelInfo::~DialogModelInfo() { + delete ui; +} -void DialogModelInfo::setData(QIODevice *pDevice, QString sTitle, - QStandardItemModel *pModel) { +void DialogModelInfo::setData(QIODevice *pDevice, QString sTitle, QStandardItemModel *pModel) { g_pDevice = pDevice; g_sTitle = sTitle; @@ -48,14 +48,13 @@ void DialogModelInfo::setData(QIODevice *pDevice, QString sTitle, } } -void DialogModelInfo::on_pushButtonOK_clicked() { this->close(); } +void DialogModelInfo::on_pushButtonOK_clicked() { + this->close(); +} void DialogModelInfo::on_pushButtonSave_clicked() { - QString sFileName = - XBinary::getResultFileName(g_pDevice, QString("%1.txt").arg(g_sTitle)); - sFileName = QFileDialog::getSaveFileName( - this, tr("Save file"), sFileName, - QString("%1 (*.txt);;%2 (*)").arg(tr("Text files"), tr("All files"))); + QString sFileName = XBinary::getResultFileName(g_pDevice, QString("%1.txt").arg(g_sTitle)); + sFileName = QFileDialog::getSaveFileName(this, tr("Save file"), sFileName, QString("%1 (*.txt);;%2 (*)").arg(tr("Text files"), tr("All files"))); if (!sFileName.isEmpty()) { XOptions::saveTextEdit(ui->textEdit, sFileName); diff --git a/dialogmodelinfo.h b/dialogmodelinfo.h index e08f2291..f7197911 100644 --- a/dialogmodelinfo.h +++ b/dialogmodelinfo.h @@ -35,18 +35,17 @@ class DialogModelInfo; class DialogModelInfo : public QDialog { Q_OBJECT - public: +public: explicit DialogModelInfo(QWidget *pParent = nullptr); ~DialogModelInfo(); - void setData(QIODevice *pDevice, QString sTitle, - QStandardItemModel *pModel); + void setData(QIODevice *pDevice, QString sTitle, QStandardItemModel *pModel); - private slots: +private slots: void on_pushButtonOK_clicked(); void on_pushButtonSave_clicked(); - private: +private: Ui::DialogModelInfo *ui; QIODevice *g_pDevice; QString g_sTitle; diff --git a/dialogprocessdata.cpp b/dialogprocessdata.cpp index 322c6dd9..6fe4c7e1 100755 --- a/dialogprocessdata.cpp +++ b/dialogprocessdata.cpp @@ -22,9 +22,7 @@ #include "ui_dialogprocessdata.h" -DialogProcessData::DialogProcessData(QWidget *pParent, - ProcessData *pProcessData) - : XDialogProcess(pParent) { +DialogProcessData::DialogProcessData(QWidget *pParent, ProcessData *pProcessData) : XDialogProcess(pParent) { this->g_pProcessData = pProcessData; pProcessData->setPdStruct(getPdStruct()); @@ -34,10 +32,8 @@ DialogProcessData::DialogProcessData(QWidget *pParent, pProcessData->moveToThread(g_pThread); connect(g_pThread, SIGNAL(started()), pProcessData, SLOT(process())); - connect(pProcessData, SIGNAL(completed(qint64)), this, - SLOT(onCompleted(qint64))); - connect(pProcessData, SIGNAL(errorMessage(QString)), this, - SLOT(errorMessage(QString))); + connect(pProcessData, SIGNAL(completed(qint64)), this, SLOT(onCompleted(qint64))); + connect(pProcessData, SIGNAL(errorMessage(QString)), this, SLOT(errorMessage(QString))); g_pThread->start(); } diff --git a/dialogprocessdata.h b/dialogprocessdata.h index fa8039e2..06ff350a 100755 --- a/dialogprocessdata.h +++ b/dialogprocessdata.h @@ -31,11 +31,11 @@ class DialogProcessData : public XDialogProcess { Q_OBJECT - public: +public: explicit DialogProcessData(QWidget *pParent, ProcessData *pProcessData); ~DialogProcessData(); - private: +private: ProcessData *g_pProcessData; QThread *g_pThread; }; diff --git a/dialogsectionheader.cpp b/dialogsectionheader.cpp index c0f9cc1b..20f3f1fc 100644 --- a/dialogsectionheader.cpp +++ b/dialogsectionheader.cpp @@ -22,8 +22,7 @@ #include "ui_dialogsectionheader.h" -DialogSectionHeader::DialogSectionHeader(QWidget *pParent) - : XShortcutsDialog(pParent), ui(new Ui::DialogSectionHeader) { +DialogSectionHeader::DialogSectionHeader(QWidget *pParent) : XShortcutsDialog(pParent), ui(new Ui::DialogSectionHeader) { ui->setupUi(this); this->g_pWidget = nullptr; @@ -31,7 +30,9 @@ DialogSectionHeader::DialogSectionHeader(QWidget *pParent) setWindowFlags(Qt::Window); } -DialogSectionHeader::~DialogSectionHeader() { delete ui; } +DialogSectionHeader::~DialogSectionHeader() { + delete ui; +} void DialogSectionHeader::setWidget(FormatWidget *pWidget) { this->g_pWidget = pWidget; @@ -41,9 +42,7 @@ void DialogSectionHeader::setWidget(FormatWidget *pWidget) { connect(pWidget, SIGNAL(changed()), this, SIGNAL(changed())); } -void DialogSectionHeader::setData(QIODevice *pDevice, FW_DEF::OPTIONS options, - quint32 nNumber, qint64 nOffset, - QString sTitle, qint32 nType) { +void DialogSectionHeader::setData(QIODevice *pDevice, FW_DEF::OPTIONS options, quint32 nNumber, qint64 nOffset, QString sTitle, qint32 nType) { setWindowTitle(sTitle); g_pWidget->setData(pDevice, options, nNumber, nOffset, nType); @@ -56,10 +55,11 @@ void DialogSectionHeader::setData(QString sTitle) { g_pWidget->reload(); } -void DialogSectionHeader::setEdited() { g_pWidget->setEdited(); } +void DialogSectionHeader::setEdited() { + g_pWidget->setEdited(); +} -void DialogSectionHeader::setGlobal(XShortcuts *pShortcuts, - XOptions *pXOptions) { +void DialogSectionHeader::setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions) { if (g_pWidget) { g_pWidget->setGlobal(pShortcuts, pXOptions); } diff --git a/dialogsectionheader.h b/dialogsectionheader.h index 754d83fe..e81ca42f 100644 --- a/dialogsectionheader.h +++ b/dialogsectionheader.h @@ -33,21 +33,20 @@ class DialogSectionHeader; class DialogSectionHeader : public XShortcutsDialog { Q_OBJECT - public: +public: explicit DialogSectionHeader(QWidget *pParent); ~DialogSectionHeader(); void setWidget(FormatWidget *pWidget); - void setData(QIODevice *pDevice, FW_DEF::OPTIONS options, quint32 nNumber, - qint64 nOffset, QString sTitle, qint32 nType); // TODO remove + void setData(QIODevice *pDevice, FW_DEF::OPTIONS options, quint32 nNumber, qint64 nOffset, QString sTitle, qint32 nType); // TODO remove void setData(QString sTitle); void setEdited(); virtual void setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions); - signals: +signals: void changed(); - private: +private: Ui::DialogSectionHeader *ui; FormatWidget *g_pWidget; }; diff --git a/formatswidget.cpp b/formatswidget.cpp index 98659f4a..fd58fda3 100644 --- a/formatswidget.cpp +++ b/formatswidget.cpp @@ -22,8 +22,7 @@ #include "ui_formatswidget.h" -FormatsWidget::FormatsWidget(QWidget *pParent) - : XShortcutsWidget(pParent), ui(new Ui::FormatsWidget) { +FormatsWidget::FormatsWidget(QWidget *pParent) : XShortcutsWidget(pParent), ui(new Ui::FormatsWidget) { ui->setupUi(this); const bool bBlocked1 = ui->comboBoxScanEngine->blockSignals(true); @@ -36,14 +35,10 @@ FormatsWidget::FormatsWidget(QWidget *pParent) adjustScanTab(SE_AUTO); - connect(ui->pageScanNFD, SIGNAL(scanStarted()), this, - SLOT(onScanStarted())); - connect(ui->pageScanNFD, SIGNAL(scanFinished()), this, - SLOT(onScanFinished())); - connect(ui->pageScanDIE, SIGNAL(scanStarted()), this, - SLOT(onScanStarted())); - connect(ui->pageScanDIE, SIGNAL(scanFinished()), this, - SLOT(onScanFinished())); + connect(ui->pageScanNFD, SIGNAL(scanStarted()), this, SLOT(onScanStarted())); + connect(ui->pageScanNFD, SIGNAL(scanFinished()), this, SLOT(onScanFinished())); + connect(ui->pageScanDIE, SIGNAL(scanStarted()), this, SLOT(onScanStarted())); + connect(ui->pageScanDIE, SIGNAL(scanFinished()), this, SLOT(onScanFinished())); ui->comboBoxScanEngine->blockSignals(bBlocked1); } @@ -79,7 +74,9 @@ void FormatsWidget::adjustView() { XShortcutsWidget::adjustView(); } -FormatsWidget::~FormatsWidget() { delete ui; } +FormatsWidget::~FormatsWidget() { + delete ui; +} void FormatsWidget::on_comboBoxFileType_currentIndexChanged(int nIndex) { Q_UNUSED(nIndex) @@ -98,8 +95,7 @@ void FormatsWidget::reload() { if (file.open(QIODevice::ReadOnly)) { ui->lineEditFileSize->setText(XBinary::bytesCountToString(file.size())); - XBinary::_MEMORY_MAP memoryMap = - XFormats::getMemoryMap(fileType, &file); + XBinary::_MEMORY_MAP memoryMap = XFormats::getMemoryMap(fileType, &file); XBinary::MODE mode = memoryMap.mode; @@ -119,23 +115,17 @@ void FormatsWidget::reload() { ui->lineEditBaseAddress->setValue((quint8)memoryMap.nModuleAddress); } else if (mode == XBinary::MODE_16) { if (memoryMap.fileType == XBinary::FT_MSDOS) { - ui->lineEditBaseAddress->setValue( - (quint32)memoryMap.nModuleAddress); + ui->lineEditBaseAddress->setValue((quint32)memoryMap.nModuleAddress); } else { - ui->lineEditBaseAddress->setValue( - (quint16)memoryMap.nModuleAddress); + ui->lineEditBaseAddress->setValue((quint16)memoryMap.nModuleAddress); } - } else if ((mode == XBinary::MODE_16SEG) || - (mode == XBinary::MODE_32)) { - ui->lineEditBaseAddress->setValue( - (quint32)memoryMap.nModuleAddress); + } else if ((mode == XBinary::MODE_16SEG) || (mode == XBinary::MODE_32)) { + ui->lineEditBaseAddress->setValue((quint32)memoryMap.nModuleAddress); } else if (mode == XBinary::MODE_64) { - ui->lineEditBaseAddress->setValue( - (quint64)memoryMap.nModuleAddress); + ui->lineEditBaseAddress->setValue((quint64)memoryMap.nModuleAddress); } - ui->lineEditEndianness->setText( - XBinary::endiannessToString(memoryMap.bIsBigEndian)); + ui->lineEditEndianness->setText(XBinary::endiannessToString(memoryMap.bIsBigEndian)); ui->lineEditArch->setText(memoryMap.sArch); ui->lineEditMode->setText(XBinary::modeIdToString(memoryMap.mode)); ui->lineEditType->setText(memoryMap.sType); @@ -145,16 +135,14 @@ void FormatsWidget::reload() { ui->stackedWidgetMain->setCurrentIndex(TABINFO_BINARY); - ui->lineEditEntryPoint->setValue( - (quint32)binary.getEntryPointAddress()); + ui->lineEditEntryPoint->setValue((quint32)binary.getEntryPointAddress()); } else if (fileType == XBinary::FT_COM) { ui->stackedWidgetMain->setCurrentIndex(TABINFO_COM); XCOM com(&file); if (com.isValid()) { - ui->lineEditEntryPoint->setValue( - (quint16)com.getEntryPointAddress()); + ui->lineEditEntryPoint->setValue((quint16)com.getEntryPointAddress()); } } else if (fileType == XBinary::FT_ZIP) { // TODO Set name on button @@ -171,8 +159,7 @@ void FormatsWidget::reload() { XDEX dex(&file); if (dex.isValid()) { - ui->lineEditEntryPoint->setValue( - (quint16)dex.getEntryPointAddress()); + ui->lineEditEntryPoint->setValue((quint16)dex.getEntryPointAddress()); } } else if (fileType == XBinary::FT_MSDOS) { ui->stackedWidgetMain->setCurrentIndex(TABINFO_MSDOS); @@ -180,22 +167,18 @@ void FormatsWidget::reload() { XMSDOS msdos(&file); if (msdos.isValid()) { - ui->lineEditEntryPoint->setValue( - (quint32)msdos.getEntryPointAddress()); + ui->lineEditEntryPoint->setValue((quint32)msdos.getEntryPointAddress()); - ui->pushButtonMSDOSOverlay->setEnabled( - msdos.isOverlayPresent()); + ui->pushButtonMSDOSOverlay->setEnabled(msdos.isOverlayPresent()); } - } else if ((fileType == XBinary::FT_LE) || - (fileType == XBinary::FT_LX)) // mb TODO LX + } else if ((fileType == XBinary::FT_LE) || (fileType == XBinary::FT_LX)) // mb TODO LX { ui->stackedWidgetMain->setCurrentIndex(TABINFO_LE); XLE le(&file); if (le.isValid()) { - ui->lineEditEntryPoint->setValue( - (quint32)le.getEntryPointAddress()); + ui->lineEditEntryPoint->setValue((quint32)le.getEntryPointAddress()); } } else if (fileType == XBinary::FT_NE) { ui->stackedWidgetMain->setCurrentIndex(TABINFO_NE); @@ -203,28 +186,23 @@ void FormatsWidget::reload() { XNE ne(&file); if (ne.isValid()) { - ui->lineEditEntryPoint->setValue( - (quint32)ne.getEntryPointAddress()); + ui->lineEditEntryPoint->setValue((quint32)ne.getEntryPointAddress()); } - } else if ((fileType == XBinary::FT_PE32) || - (fileType == XBinary::FT_PE64)) { + } else if ((fileType == XBinary::FT_PE32) || (fileType == XBinary::FT_PE64)) { ui->stackedWidgetMain->setCurrentIndex(TABINFO_PE); XPE pe(&file); if (pe.isValid()) { if (pe.is64()) { - ui->lineEditEntryPoint->setValue( - (quint64)pe.getEntryPointAddress()); + ui->lineEditEntryPoint->setValue((quint64)pe.getEntryPointAddress()); } else { - ui->lineEditEntryPoint->setValue( - (quint32)pe.getEntryPointAddress()); + ui->lineEditEntryPoint->setValue((quint32)pe.getEntryPointAddress()); } bool bIsResourcesPresent = pe.isResourcesPresent(); - ui->lineEditPESections->setValue( - pe.getFileHeader_NumberOfSections()); + ui->lineEditPESections->setValue(pe.getFileHeader_NumberOfSections()); ui->groupBoxPESections->setEnabled(pe.isSectionsTablePresent()); ui->pushButtonPEExport->setEnabled(pe.isExportPresent()); @@ -234,31 +212,24 @@ void FormatsWidget::reload() { ui->pushButtonPETLS->setEnabled(pe.isTLSPresent()); ui->groupBoxPEResources->setEnabled(bIsResourcesPresent); - ui->pushButtonPEManifest->setEnabled( - pe.isResourceManifestPresent()); - ui->pushButtonPEVersion->setEnabled( - pe.isResourceVersionPresent()); + ui->pushButtonPEManifest->setEnabled(pe.isResourceManifestPresent()); + ui->pushButtonPEVersion->setEnabled(pe.isResourceVersionPresent()); ui->pushButtonPEOverlay->setEnabled(pe.isOverlayPresent()); - ui->lineEditPETimeDateStamp->setText(XBinary::valueToTimeString( - pe.getFileHeader_TimeDateStamp(), XBinary::DT_TYPE_POSIX)); - ui->lineEditPESizeOfImage->setValue( - pe.getOptionalHeader_SizeOfImage()); + ui->lineEditPETimeDateStamp->setText(XBinary::valueToTimeString(pe.getFileHeader_TimeDateStamp(), XBinary::DT_TYPE_POSIX)); + ui->lineEditPESizeOfImage->setValue(pe.getOptionalHeader_SizeOfImage()); } - } else if ((fileType == XBinary::FT_ELF32) || - (fileType == XBinary::FT_ELF64)) { + } else if ((fileType == XBinary::FT_ELF32) || (fileType == XBinary::FT_ELF64)) { ui->stackedWidgetMain->setCurrentIndex(TABINFO_ELF); XELF elf(&file); if (elf.isValid()) { if (elf.is64()) { - ui->lineEditEntryPoint->setValue( - (quint64)elf.getEntryPointAddress()); + ui->lineEditEntryPoint->setValue((quint64)elf.getEntryPointAddress()); } else { - ui->lineEditEntryPoint->setValue( - (quint32)elf.getEntryPointAddress()); + ui->lineEditEntryPoint->setValue((quint32)elf.getEntryPointAddress()); } } @@ -266,47 +237,32 @@ void FormatsWidget::reload() { ui->lineEditELFSections->setEnabled(elf.isSectionsTablePresent()); ui->lineEditELFPrograms->setValue(elf.getNumberOfPrograms()); ui->lineEditELFSections->setValue(elf.getNumberOfSections()); - } else if ((fileType == XBinary::FT_MACHO32) || - (fileType == XBinary::FT_MACHO64)) { + } else if ((fileType == XBinary::FT_MACHO32) || (fileType == XBinary::FT_MACHO64)) { ui->stackedWidgetMain->setCurrentIndex(TABINFO_MACH); XMACH mach(&file); if (mach.isValid()) { if (mach.is64()) { - ui->lineEditEntryPoint->setValue( - (quint64)mach.getEntryPointAddress()); + ui->lineEditEntryPoint->setValue((quint64)mach.getEntryPointAddress()); } else { - ui->lineEditEntryPoint->setValue( - (quint32)mach.getEntryPointAddress()); + ui->lineEditEntryPoint->setValue((quint32)mach.getEntryPointAddress()); } - QList listCommandRecords = - mach.getCommandRecords(); - QList listSectionRecords = - mach.getSectionRecords(&listCommandRecords); - QList listSegmentRecords = - mach.getSegmentRecords(&listCommandRecords); - QList listLibraryRecords = - mach.getLibraryRecords(&listCommandRecords); - - ui->lineEditMACHCommands->setEnabled( - listCommandRecords.count()); - ui->lineEditMACHSections->setEnabled( - listSectionRecords.count()); - ui->lineEditMACHSegments->setEnabled( - listSegmentRecords.count()); - ui->lineEditMACHLibraries->setEnabled( - listLibraryRecords.count()); - - ui->lineEditMACHCommands->setValue( - (quint16)listCommandRecords.count()); - ui->lineEditMACHSections->setValue( - (quint16)listSectionRecords.count()); - ui->lineEditMACHSegments->setValue( - (quint16)listSegmentRecords.count()); - ui->lineEditMACHLibraries->setValue( - (quint16)listLibraryRecords.count()); + QList listCommandRecords = mach.getCommandRecords(); + QList listSectionRecords = mach.getSectionRecords(&listCommandRecords); + QList listSegmentRecords = mach.getSegmentRecords(&listCommandRecords); + QList listLibraryRecords = mach.getLibraryRecords(&listCommandRecords); + + ui->lineEditMACHCommands->setEnabled(listCommandRecords.count()); + ui->lineEditMACHSections->setEnabled(listSectionRecords.count()); + ui->lineEditMACHSegments->setEnabled(listSegmentRecords.count()); + ui->lineEditMACHLibraries->setEnabled(listLibraryRecords.count()); + + ui->lineEditMACHCommands->setValue((quint16)listCommandRecords.count()); + ui->lineEditMACHSections->setValue((quint16)listSectionRecords.count()); + ui->lineEditMACHSegments->setValue((quint16)listSegmentRecords.count()); + ui->lineEditMACHLibraries->setValue((quint16)listLibraryRecords.count()); } } else if (fileType == XBinary::FT_MACHOFAT) { ui->stackedWidgetMain->setCurrentIndex(TABINFO_MACHOFAT); @@ -314,8 +270,7 @@ void FormatsWidget::reload() { XMACHOFat machofat(&file); if (machofat.isValid()) { - ui->lineEditEntryPoint->setValue( - machofat.getEntryPointAddress()); + ui->lineEditEntryPoint->setValue(machofat.getEntryPointAddress()); } } @@ -336,11 +291,9 @@ void FormatsWidget::scan() { if (g_sFileName != "") { if (nIndex == SE_DIE) { - ui->pageScanDIE->setData(g_sFileName, g_bScan, - getCurrentFileType()); + ui->pageScanDIE->setData(g_sFileName, g_bScan, getCurrentFileType()); } else if (nIndex == SE_NFD) { - ui->pageScanNFD->setData(g_sFileName, g_bScan, - getCurrentFileType()); + ui->pageScanNFD->setData(g_sFileName, g_bScan, getCurrentFileType()); } } @@ -377,8 +330,7 @@ void FormatsWidget::on_pushButtonHexEntryPoint_clicked() { if (XBinary::tryToOpen(&file)) { XHexView::OPTIONS hexOptions = {}; // hexOptions.sBackupFileName=XBinary::getBackupName(&file); - hexOptions.nStartSelectionOffset = - XFormats::getEntryPointOffset(getCurrentFileType(), &file); + hexOptions.nStartSelectionOffset = XFormats::getEntryPointOffset(getCurrentFileType(), &file); DialogHexView dialogHex(this, &file, hexOptions, &file); dialogHex.setGlobal(getShortcuts(), getGlobalOptions()); @@ -610,8 +562,7 @@ void FormatsWidget::showDEX(SDEX::TYPE type) { } XBinary::FT FormatsWidget::getCurrentFileType() { - XBinary::FT fileType = - (XBinary::FT)(ui->comboBoxFileType->currentData().toInt()); + XBinary::FT fileType = (XBinary::FT)(ui->comboBoxFileType->currentData().toInt()); return fileType; } @@ -624,9 +575,13 @@ void FormatsWidget::on_pushButtonMSDOS_clicked() { showMSDOS(SMSDOS::TYPE_DOS_HEADER); } -void FormatsWidget::on_pushButtonPETLS_clicked() { showPE(SPE::TYPE_TLS); } +void FormatsWidget::on_pushButtonPETLS_clicked() { + showPE(SPE::TYPE_TLS); +} -void FormatsWidget::on_pushButtonELF_clicked() { showELF(SELF::TYPE_Elf_Ehdr); } +void FormatsWidget::on_pushButtonELF_clicked() { + showELF(SELF::TYPE_Elf_Ehdr); +} void FormatsWidget::on_pushButtonELFSections_clicked() { showELF(SELF::TYPE_Elf_Shdr); @@ -642,11 +597,17 @@ void FormatsWidget::on_comboBoxScanEngine_currentIndexChanged(int nIndex) { scan(); } -void FormatsWidget::on_pushButtonLE_clicked() { showLE(SLE::TYPE_VXD_HEADER); } +void FormatsWidget::on_pushButtonLE_clicked() { + showLE(SLE::TYPE_VXD_HEADER); +} -void FormatsWidget::on_pushButtonNE_clicked() { showNE(SNE::TYPE_OS2_HEADER); } +void FormatsWidget::on_pushButtonNE_clicked() { + showNE(SNE::TYPE_OS2_HEADER); +} -void FormatsWidget::on_pushButtonDEX_clicked() { showDEX(SDEX::TYPE_HEADER); } +void FormatsWidget::on_pushButtonDEX_clicked() { + showDEX(SDEX::TYPE_HEADER); +} void FormatsWidget::on_pushButtonZIP_clicked() { DialogArchive dialogArchive(this); @@ -687,14 +648,9 @@ FormatsWidget::SE FormatsWidget::getScanEngine(FormatsWidget::SE seIndex) { XBinary::FT fileType = getCurrentFileType(); // TODO !!! - if ((fileType == XBinary::FT_DEX) || (fileType == XBinary::FT_ELF32) || - (fileType == XBinary::FT_ELF64) || - (fileType == XBinary::FT_MACHO32) || - (fileType == XBinary::FT_MACHO64) || - (fileType == XBinary::FT_MACHOFAT) || - (fileType == XBinary::FT_ZIP) || (fileType == XBinary::FT_JAR) || - (fileType == XBinary::FT_APK) || (fileType == XBinary::FT_APKS) || - (fileType == XBinary::FT_IPA)) { + if ((fileType == XBinary::FT_DEX) || (fileType == XBinary::FT_ELF32) || (fileType == XBinary::FT_ELF64) || (fileType == XBinary::FT_MACHO32) || + (fileType == XBinary::FT_MACHO64) || (fileType == XBinary::FT_MACHOFAT) || (fileType == XBinary::FT_ZIP) || (fileType == XBinary::FT_JAR) || + (fileType == XBinary::FT_APK) || (fileType == XBinary::FT_APKS) || (fileType == XBinary::FT_IPA)) { tabResult = SE_NFD; } } @@ -726,7 +682,9 @@ void FormatsWidget::onScanFinished() { ui->groupBoxBaseAddress->setEnabled(true); } -void FormatsWidget::registerShortcuts(bool bState) { Q_UNUSED(bState) } +void FormatsWidget::registerShortcuts(bool bState) { + Q_UNUSED(bState) +} void FormatsWidget::on_pushButtonFileInfo_clicked() { QString sFileName = g_sFileName; @@ -821,10 +779,8 @@ void FormatsWidget::on_pushButtonSignatures_clicked() { SearchSignaturesWidget::OPTIONS signaturesOptions = {}; DialogSearchSignatures dialogSearchSignatures(this); - dialogSearchSignatures.setData(&file, XBinary::FT_UNKNOWN, - signaturesOptions); - dialogSearchSignatures.setGlobal(getShortcuts(), - getGlobalOptions()); + dialogSearchSignatures.setData(&file, XBinary::FT_UNKNOWN, signaturesOptions); + dialogSearchSignatures.setGlobal(getShortcuts(), getGlobalOptions()); dialogSearchSignatures.exec(); diff --git a/formatswidget.h b/formatswidget.h index 26ca5f9a..c2a5bee1 100644 --- a/formatswidget.h +++ b/formatswidget.h @@ -68,7 +68,7 @@ class FormatsWidget : public XShortcutsWidget { enum SE { SE_AUTO = 0, SE_DIE, SE_NFD }; - public: +public: explicit FormatsWidget(QWidget *pParent = nullptr); ~FormatsWidget(); @@ -76,7 +76,7 @@ class FormatsWidget : public XShortcutsWidget { void setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions); void adjustView(); - private slots: +private slots: void on_comboBoxFileType_currentIndexChanged(int nIndex); void on_comboBoxScanEngine_currentIndexChanged(int nIndex); void reload(); @@ -136,10 +136,10 @@ class FormatsWidget : public XShortcutsWidget { void on_pushButtonHash_clicked(); void on_pushButtonExtractor_clicked(); - protected: +protected: virtual void registerShortcuts(bool bState); - private: +private: Ui::FormatsWidget *ui; QString g_sFileName; bool g_bScan; diff --git a/formatwidget.cpp b/formatwidget.cpp index e8485d4e..505c3b9b 100644 --- a/formatwidget.cpp +++ b/formatwidget.cpp @@ -34,9 +34,7 @@ FormatWidget::FormatWidget(QWidget *pParent) : XShortcutsWidget(pParent) { g_colEnabled = QWidget::palette().color(QPalette::BrightText); } -FormatWidget::FormatWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, - quint32 nNumber, qint64 nOffset, qint32 nType, - QWidget *pParent) +FormatWidget::FormatWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, quint32 nNumber, qint64 nOffset, qint32 nType, QWidget *pParent) : FormatWidget(pParent) { FormatWidget::setData(pDevice, options, nNumber, nOffset, nType); } @@ -55,31 +53,29 @@ void FormatWidget::setXInfoDB(XInfoDB *pXInfoDB) { this->g_pXInfoDB = pXInfoDB; } -XInfoDB *FormatWidget::getXInfoDB() { return g_pXInfoDB; } +XInfoDB *FormatWidget::getXInfoDB() { + return g_pXInfoDB; +} void FormatWidget::setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions) { - QList listWidgets = - this->findChildren(); + QList listWidgets = this->findChildren(); qint32 nNumberOfWidgets = listWidgets.count(); for (qint32 i = 0; i < nNumberOfWidgets; i++) { - XShortcutsWidget *pChild = - dynamic_cast(listWidgets.at(i)); + XShortcutsWidget *pChild = dynamic_cast(listWidgets.at(i)); if (pChild) { pChild->setGlobal(pShortcuts, pXOptions); } } - QList listAreas = - this->findChildren(); + QList listAreas = this->findChildren(); qint32 nNumberOfAreas = listAreas.count(); for (qint32 i = 0; i < nNumberOfAreas; i++) { - XShortcutstScrollArea *pChild = - dynamic_cast(listAreas.at(i)); + XShortcutstScrollArea *pChild = dynamic_cast(listAreas.at(i)); if (pChild) { pChild->setGlobal(pShortcuts, pXOptions); @@ -90,28 +86,24 @@ void FormatWidget::setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions) { } void FormatWidget::adjustView() { - QList listWidgets = - this->findChildren(); + QList listWidgets = this->findChildren(); qint32 nNumberOfWidgets = listWidgets.count(); for (qint32 i = 0; i < nNumberOfWidgets; i++) { - XShortcutsWidget *pChild = - dynamic_cast(listWidgets.at(i)); + XShortcutsWidget *pChild = dynamic_cast(listWidgets.at(i)); if (pChild) { pChild->adjustView(); } } - QList listAreas = - this->findChildren(); + QList listAreas = this->findChildren(); qint32 nNumberOfAreas = listAreas.count(); for (qint32 i = 0; i < nNumberOfAreas; i++) { - XShortcutstScrollArea *pChild = - dynamic_cast(listAreas.at(i)); + XShortcutstScrollArea *pChild = dynamic_cast(listAreas.at(i)); if (pChild) { pChild->adjustView(); @@ -119,16 +111,14 @@ void FormatWidget::adjustView() { } } -void FormatWidget::setData(QIODevice *pDevice, FW_DEF::OPTIONS options, - quint32 nNumber, qint64 nOffset, qint32 nType) { +void FormatWidget::setData(QIODevice *pDevice, FW_DEF::OPTIONS options, quint32 nNumber, qint64 nOffset, qint32 nType) { g_pDevice = pDevice; g_bIsReadonly = !(pDevice->isWritable()); setData(options, nNumber, nOffset, nType); } -void FormatWidget::setData(QString sFileName, FW_DEF::OPTIONS options, - quint32 nNumber, qint64 nOffset, qint32 nType) { +void FormatWidget::setData(QString sFileName, FW_DEF::OPTIONS options, quint32 nNumber, qint64 nOffset, qint32 nType) { g_sFileName = sFileName; QFile *pFile = new QFile(sFileName); @@ -138,8 +128,7 @@ void FormatWidget::setData(QString sFileName, FW_DEF::OPTIONS options, setData(pFile, options, nNumber, nOffset, nType); } -void FormatWidget::setData(FW_DEF::OPTIONS options, quint32 nNumber, - qint64 nOffset, qint32 nType) { +void FormatWidget::setData(FW_DEF::OPTIONS options, quint32 nNumber, qint64 nOffset, qint32 nType) { g_nNumber = nNumber; g_nOffset = nOffset; g_nType = nType; @@ -173,47 +162,57 @@ QIODevice *FormatWidget::getBackupDevice() { return pResult; } -void FormatWidget::setFileType(XBinary::FT fileType) { g_fileType = fileType; } +void FormatWidget::setFileType(XBinary::FT fileType) { + g_fileType = fileType; +} -XBinary::FT FormatWidget::getFileType() { return g_fileType; } +XBinary::FT FormatWidget::getFileType() { + return g_fileType; +} -QIODevice *FormatWidget::getDevice() { return this->g_pDevice; } +QIODevice *FormatWidget::getDevice() { + return this->g_pDevice; +} void FormatWidget::setOptions(FW_DEF::OPTIONS options) { g_fwOptions = options; } -FW_DEF::OPTIONS FormatWidget::getOptions() { return g_fwOptions; } +FW_DEF::OPTIONS FormatWidget::getOptions() { + return g_fwOptions; +} -quint32 FormatWidget::getNumber() { return g_nNumber; } +quint32 FormatWidget::getNumber() { + return g_nNumber; +} -qint64 FormatWidget::getOffset() { return g_nOffset; } +qint64 FormatWidget::getOffset() { + return g_nOffset; +} -qint32 FormatWidget::getType() { return g_nType; } +qint32 FormatWidget::getType() { + return g_nType; +} -bool FormatWidget::isReadonly() { return g_bIsReadonly; } +bool FormatWidget::isReadonly() { + return g_bIsReadonly; +} -QTreeWidgetItem *FormatWidget::createNewItem(int nType, QString sTitle, - qint64 nOffset, qint64 nSize, - qint64 nExtraOffset, - qint64 nExtraSize) { +QTreeWidgetItem *FormatWidget::createNewItem(int nType, QString sTitle, qint64 nOffset, qint64 nSize, qint64 nExtraOffset, qint64 nExtraSize) { QTreeWidgetItem *pResult = new QTreeWidgetItem; pResult->setText(0, sTitle); pResult->setData(0, Qt::UserRole + FW_DEF::SECTION_DATA_TYPE, nType); pResult->setData(0, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET, nOffset); pResult->setData(0, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE, nSize); - pResult->setData(0, Qt::UserRole + FW_DEF::SECTION_DATA_EXTRAOFFSET, - nExtraOffset); - pResult->setData(0, Qt::UserRole + FW_DEF::SECTION_DATA_EXTRASIZE, - nExtraSize); + pResult->setData(0, Qt::UserRole + FW_DEF::SECTION_DATA_EXTRAOFFSET, nExtraOffset); + pResult->setData(0, Qt::UserRole + FW_DEF::SECTION_DATA_EXTRASIZE, nExtraSize); pResult->setData(0, Qt::UserRole + FW_DEF::SECTION_DATA_NAME, sTitle); return pResult; } -void FormatWidget::setValue(QVariant vValue, int nStype, int nNdata, int nVtype, - int nPosition, qint64 nOffset) { +void FormatWidget::setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset) { if (saveBackup()) { SV sv = _setValue(vValue, nStype, nNdata, nVtype, nPosition, nOffset); if (sv == SV_EDITED) { @@ -229,11 +228,8 @@ void FormatWidget::setValue(QVariant vValue, int nStype, int nNdata, int nVtype, emit changed(); } else { - QMessageBox::critical( - XOptions::getMainWidget(this), tr("Error"), - tr("Cannot save file") + - QString(": %1").arg( - XBinary::getBackupFileName(getBackupDevice()))); + QMessageBox::critical(XOptions::getMainWidget(this), tr("Error"), + tr("Cannot save file") + QString(": %1").arg(XBinary::getBackupFileName(getBackupDevice()))); } } @@ -261,9 +257,7 @@ bool FormatWidget::isEdited() { return bResult; } -bool FormatWidget::loadHexSubdevice(qint64 nOffset, qint64 nSize, - XADDR nAddress, SubDevice **ppSubDevice, - ToolsWidget *pToolsWidget, bool bOffset, +bool FormatWidget::loadHexSubdevice(qint64 nOffset, qint64 nSize, XADDR nAddress, SubDevice **ppSubDevice, ToolsWidget *pToolsWidget, bool bOffset, bool bDisasm) { if (*ppSubDevice) { (*ppSubDevice)->close(); @@ -290,16 +284,12 @@ bool FormatWidget::loadHexSubdevice(qint64 nOffset, qint64 nSize, hexOptions.nImageBase = nAddress; hexOptions.bOffset = bOffset; - pToolsWidget->setData((*ppSubDevice), hexOptions, getBackupDevice(), - bDisasm); + pToolsWidget->setData((*ppSubDevice), hexOptions, getBackupDevice(), bDisasm); return true; } -bool FormatWidget::loadHexSubdeviceByTableView(int nRow, int nType, - ToolsWidget *pToolsWidget, - QTableView *pTableView, - SubDevice **ppSubDevice) { +bool FormatWidget::loadHexSubdeviceByTableView(int nRow, int nType, ToolsWidget *pToolsWidget, QTableView *pTableView, SubDevice **ppSubDevice) { Q_UNUSED(nType) bool bResult = false; @@ -307,29 +297,17 @@ bool FormatWidget::loadHexSubdeviceByTableView(int nRow, int nType, if (nRow != -1) { QModelIndex index = pTableView->model()->index(nRow, 0); - qint64 nOffset = - pTableView->model() - ->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET) - .toLongLong(); - qint64 nSize = - pTableView->model() - ->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE) - .toLongLong(); - XADDR nAddress = - pTableView->model() - ->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS) - .toLongLong(); - - bResult = loadHexSubdevice(nOffset, nSize, nAddress, ppSubDevice, - pToolsWidget); + qint64 nOffset = pTableView->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET).toLongLong(); + qint64 nSize = pTableView->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE).toLongLong(); + XADDR nAddress = pTableView->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS).toLongLong(); + + bResult = loadHexSubdevice(nOffset, nSize, nAddress, ppSubDevice, pToolsWidget); } return bResult; } -bool FormatWidget::setHexSubdeviceByTableView(int nRow, int nType, - ToolsWidget *pToolsWidget, - QTableView *pTableView) { +bool FormatWidget::setHexSubdeviceByTableView(int nRow, int nType, ToolsWidget *pToolsWidget, QTableView *pTableView) { Q_UNUSED(nType) bool bResult = false; @@ -337,14 +315,8 @@ bool FormatWidget::setHexSubdeviceByTableView(int nRow, int nType, if (nRow != -1) { QModelIndex index = pTableView->model()->index(nRow, 0); - qint64 nOffset = - pTableView->model() - ->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET) - .toLongLong(); - qint64 nSize = - pTableView->model() - ->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE) - .toLongLong(); + qint64 nOffset = pTableView->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET).toLongLong(); + qint64 nSize = pTableView->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE).toLongLong(); pToolsWidget->setSelection(nOffset, nSize); bResult = true; @@ -353,17 +325,12 @@ bool FormatWidget::setHexSubdeviceByTableView(int nRow, int nType, return bResult; } -void FormatWidget::setHeaderTableSelection(ToolsWidget *pToolWidget, - QTableWidget *pTableWidget) { +void FormatWidget::setHeaderTableSelection(ToolsWidget *pToolWidget, QTableWidget *pTableWidget) { qint32 nCurrentRow = pTableWidget->currentRow(); if (nCurrentRow != -1) { - qint32 nOffset = pTableWidget->item(nCurrentRow, 0) - ->data(Qt::UserRole + HEADER_DATA_OFFSET) - .toInt(); - qint64 nSize = pTableWidget->item(nCurrentRow, 0) - ->data(Qt::UserRole + HEADER_DATA_SIZE) - .toInt(); + qint32 nOffset = pTableWidget->item(nCurrentRow, 0)->data(Qt::UserRole + HEADER_DATA_OFFSET).toInt(); + qint64 nSize = pTableWidget->item(nCurrentRow, 0)->data(Qt::UserRole + HEADER_DATA_SIZE).toInt(); if (nOffset != -1) { // qint64 @@ -374,9 +341,13 @@ void FormatWidget::setHeaderTableSelection(ToolsWidget *pToolWidget, } } -QColor FormatWidget::getEnabledColor() { return g_colEnabled; } +QColor FormatWidget::getEnabledColor() { + return g_colEnabled; +} -QColor FormatWidget::getDisabledColor() { return g_colDisabled; } +QColor FormatWidget::getDisabledColor() { + return g_colDisabled; +} void FormatWidget::setItemEnable(QTableWidgetItem *pItem, bool bState) { if (!bState) { @@ -384,17 +355,13 @@ void FormatWidget::setItemEnable(QTableWidgetItem *pItem, bool bState) { } } -void FormatWidget::setLineEdit(XLineEditHEX *pLineEdit, qint32 nMaxLength, - QString sText, qint64 nOffset) { +void FormatWidget::setLineEdit(XLineEditHEX *pLineEdit, qint32 nMaxLength, QString sText, qint64 nOffset) { pLineEdit->setMaxLength(nMaxLength); pLineEdit->setText(sText); pLineEdit->setProperty("OFFSET", nOffset); } -void FormatWidget::ajustTableView(ProcessData *pProcessData, - QStandardItemModel **ppModel, - QTableView *pTableView, - QSortFilterProxyModel *pProxyModel, +void FormatWidget::ajustTableView(ProcessData *pProcessData, QStandardItemModel **ppModel, QTableView *pTableView, QSortFilterProxyModel *pProxyModel, bool bStretchLastSection) { QAbstractItemModel *pOldModel = 0; @@ -434,9 +401,7 @@ void FormatWidget::ajustTableView(ProcessData *pProcessData, deleteOldAbstractModel(&pOldModel); } -void FormatWidget::ajustTreeView(ProcessData *pProcessData, - QStandardItemModel **ppModel, - QTreeView *pTreeView) { +void FormatWidget::ajustTreeView(ProcessData *pProcessData, QStandardItemModel **ppModel, QTreeView *pTreeView) { QAbstractItemModel *pOldModel = pTreeView->model(); DialogProcessData dialogProcessData(this, pProcessData); @@ -450,9 +415,7 @@ void FormatWidget::ajustTreeView(ProcessData *pProcessData, deleteOldAbstractModel(&pOldModel); } -void FormatWidget::ajustDialogModel(ProcessData *pProcessData, - QStandardItemModel **ppModel, - QString sTitle) { +void FormatWidget::ajustDialogModel(ProcessData *pProcessData, QStandardItemModel **ppModel, QString sTitle) { DialogProcessData dialogProcessData(this, pProcessData); dialogProcessData.showDialogDelay(1000); @@ -468,17 +431,10 @@ void FormatWidget::showSectionHex(QTableView *pTableView) { int nRow = pTableView->currentIndex().row(); if (nRow != -1) { - QModelIndex index = - pTableView->selectionModel()->selectedIndexes().at(0); - - qint64 nOffset = - pTableView->model() - ->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET) - .toLongLong(); - qint64 nSize = - pTableView->model() - ->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE) - .toLongLong(); + QModelIndex index = pTableView->selectionModel()->selectedIndexes().at(0); + + qint64 nOffset = pTableView->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET).toLongLong(); + qint64 nSize = pTableView->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE).toLongLong(); showInHexWindow(nOffset, nSize); @@ -492,17 +448,10 @@ void FormatWidget::showSectionEntropy(QTableView *pTableView) { int nRow = pTableView->currentIndex().row(); if (nRow != -1) { - QModelIndex index = - pTableView->selectionModel()->selectedIndexes().at(0); - - qint64 nOffset = - pTableView->model() - ->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET) - .toLongLong(); - qint64 nSize = - pTableView->model() - ->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE) - .toLongLong(); + QModelIndex index = pTableView->selectionModel()->selectedIndexes().at(0); + + qint64 nOffset = pTableView->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET).toLongLong(); + qint64 nSize = pTableView->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE).toLongLong(); showEntropy(nOffset, nSize); } @@ -512,13 +461,9 @@ void FormatWidget::showSectionDisasm(QTableView *pTableView) { int nRow = pTableView->currentIndex().row(); if (nRow != -1) { - QModelIndex index = - pTableView->selectionModel()->selectedIndexes().at(0); + QModelIndex index = pTableView->selectionModel()->selectedIndexes().at(0); - XADDR nAddress = - pTableView->model() - ->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS) - .toLongLong(); + XADDR nAddress = pTableView->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_ADDRESS).toLongLong(); showInDisasmWindowAddress(nAddress); } @@ -528,21 +473,11 @@ void FormatWidget::dumpSection(QTableView *pTableView) { int nRow = pTableView->currentIndex().row(); if (nRow != -1) { - QModelIndex index = - pTableView->selectionModel()->selectedIndexes().at(0); - - qint64 nOffset = - pTableView->model() - ->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET) - .toLongLong(); - qint64 nSize = - pTableView->model() - ->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE) - .toLongLong(); - QString sName = - pTableView->model() - ->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_NAME) - .toString(); + QModelIndex index = pTableView->selectionModel()->selectedIndexes().at(0); + + qint64 nOffset = pTableView->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET).toLongLong(); + qint64 nSize = pTableView->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE).toLongLong(); + QString sName = pTableView->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_NAME).toString(); dumpRegion(nOffset, nSize, sName); } @@ -554,11 +489,8 @@ qint64 FormatWidget::getTableViewItemSize(QTableView *pTableView) { int nRow = pTableView->currentIndex().row(); if (nRow != -1) { - QModelIndex index = - pTableView->selectionModel()->selectedIndexes().at(0); - nResult = pTableView->model() - ->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE) - .toLongLong(); + QModelIndex index = pTableView->selectionModel()->selectedIndexes().at(0); + nResult = pTableView->model()->data(index, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE).toLongLong(); } return nResult; @@ -568,16 +500,14 @@ void FormatWidget::showTableViewDemangle(QTableView *pTableView, int nColumn) { int nRow = pTableView->currentIndex().row(); if (nRow != -1) { - QModelIndex index = - pTableView->selectionModel()->selectedIndexes().at(nColumn); + QModelIndex index = pTableView->selectionModel()->selectedIndexes().at(nColumn); QString sString = pTableView->model()->data(index).toString(); showDemangle(sString); } } -bool FormatWidget::_setTreeItem(QTreeWidget *pTree, QTreeWidgetItem *pItem, - int nID) { +bool FormatWidget::_setTreeItem(QTreeWidget *pTree, QTreeWidgetItem *pItem, int nID) { bool bResult = false; if (pItem->data(0, Qt::UserRole).toInt() == nID) { @@ -608,21 +538,18 @@ void FormatWidget::setTreeItem(QTreeWidget *pTree, int nID) { } } -void FormatWidget::reset() { g_mapInit.clear(); } +void FormatWidget::reset() { + g_mapInit.clear(); +} QString FormatWidget::getInitString(QTreeWidgetItem *pItem) { QString sResult; - int nType = - pItem->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_TYPE).toInt(); - qint64 nDataOffset = - pItem->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET).toLongLong(); - qint64 nDataSize = - pItem->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE).toLongLong(); + int nType = pItem->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_TYPE).toInt(); + qint64 nDataOffset = pItem->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_OFFSET).toLongLong(); + qint64 nDataSize = pItem->data(0, Qt::UserRole + FW_DEF::SECTION_DATA_SIZE).toLongLong(); - sResult = QString("%1-%2-%3") - .arg(QString::number(nType), QString::number(nDataOffset), - QString::number(nDataSize)); + sResult = QString("%1-%2-%3").arg(QString::number(nType), QString::number(nDataOffset), QString::number(nDataSize)); return sResult; } @@ -674,7 +601,9 @@ QTreeWidgetItem *FormatWidget::getNextPage() { return pResult; } -bool FormatWidget::isPrevPageAvailable() { return g_nPageIndex > 0; } +bool FormatWidget::isPrevPageAvailable() { + return g_nPageIndex > 0; +} bool FormatWidget::isNextPageAvailable() { return g_nPageIndex < (g_listPages.count() - 1); @@ -712,14 +641,12 @@ void FormatWidget::initWidget() { } } { - QList listWidgets = - this->findChildren(); + QList listWidgets = this->findChildren(); qint32 nNumberOfWidgets = listWidgets.count(); for (qint32 i = 0; i < nNumberOfWidgets; i++) { - XMultiDisasmWidget *pChild = - dynamic_cast(listWidgets.at(i)); + XMultiDisasmWidget *pChild = dynamic_cast(listWidgets.at(i)); if (pChild) { initMultiDisasmWidget(pChild); @@ -727,14 +654,12 @@ void FormatWidget::initWidget() { } } { - QList listWidgets = - this->findChildren(); + QList listWidgets = this->findChildren(); qint32 nNumberOfWidgets = listWidgets.count(); for (qint32 i = 0; i < nNumberOfWidgets; i++) { - SearchSignaturesWidget *pChild = - dynamic_cast(listWidgets.at(i)); + SearchSignaturesWidget *pChild = dynamic_cast(listWidgets.at(i)); if (pChild) { initSearchSignaturesWidget(pChild); @@ -742,14 +667,12 @@ void FormatWidget::initWidget() { } } { - QList listWidgets = - this->findChildren(); + QList listWidgets = this->findChildren(); qint32 nNumberOfWidgets = listWidgets.count(); for (qint32 i = 0; i < nNumberOfWidgets; i++) { - SearchStringsWidget *pChild = - dynamic_cast(listWidgets.at(i)); + SearchStringsWidget *pChild = dynamic_cast(listWidgets.at(i)); if (pChild) { initSearchStringsWidget(pChild); @@ -777,18 +700,29 @@ void FormatWidget::initWidget() { // } // } // } + { + QList listWidgets = this->findChildren(); + + qint32 nNumberOfWidgets = listWidgets.count(); + + for (qint32 i = 0; i < nNumberOfWidgets; i++) { + XExtractorWidget *pChild = dynamic_cast(listWidgets.at(i)); + + if (pChild) { + initExtractorWidget(pChild); + } + } + } } void FormatWidget::resetWidget() { { - QList listWidgets = - this->findChildren(); + QList listWidgets = this->findChildren(); qint32 nNumberOfWidgets = listWidgets.count(); for (qint32 i = 0; i < nNumberOfWidgets; i++) { - XHexViewWidget *pChild = - dynamic_cast(listWidgets.at(i)); + XHexViewWidget *pChild = dynamic_cast(listWidgets.at(i)); if (pChild) { pChild->setDevice(0); @@ -801,8 +735,7 @@ void FormatWidget::resetWidget() { qint32 nNumberOfWidgets = listWidgets.count(); for (qint32 i = 0; i < nNumberOfWidgets; i++) { - ToolsWidget *pChild = - dynamic_cast(listWidgets.at(i)); + ToolsWidget *pChild = dynamic_cast(listWidgets.at(i)); if (pChild) { pChild->setDevice(0); @@ -810,14 +743,12 @@ void FormatWidget::resetWidget() { } } { - QList listWidgets = - this->findChildren(); + QList listWidgets = this->findChildren(); qint32 nNumberOfWidgets = listWidgets.count(); for (qint32 i = 0; i < nNumberOfWidgets; i++) { - XMultiDisasmWidget *pChild = - dynamic_cast(listWidgets.at(i)); + XMultiDisasmWidget *pChild = dynamic_cast(listWidgets.at(i)); if (pChild) { XMultiDisasmWidget::OPTIONS options = {}; @@ -827,14 +758,12 @@ void FormatWidget::resetWidget() { } } { - QList listWidgets = - this->findChildren(); + QList listWidgets = this->findChildren(); qint32 nNumberOfWidgets = listWidgets.count(); for (qint32 i = 0; i < nNumberOfWidgets; i++) { - XMemoryMapWidget *pChild = - dynamic_cast(listWidgets.at(i)); + XMemoryMapWidget *pChild = dynamic_cast(listWidgets.at(i)); if (pChild) { pChild->setData(0, XBinary::FT_UNKNOWN); @@ -845,57 +774,48 @@ void FormatWidget::resetWidget() { void FormatWidget::initSearchStringsWidget(SearchStringsWidget *pWidget) { connect(pWidget, SIGNAL(dataChanged()), this, SLOT(setEdited())); - connect(pWidget, SIGNAL(showHex(qint64, qint64)), this, - SLOT(showInHexWindow(qint64, qint64))); - connect(pWidget, SIGNAL(showDemangle(QString)), this, - SLOT(showDemangle(QString))); + connect(pWidget, SIGNAL(showHex(qint64, qint64)), this, SLOT(showInHexWindow(qint64, qint64))); + connect(pWidget, SIGNAL(showDemangle(QString)), this, SLOT(showDemangle(QString))); } void FormatWidget::initSearchSignaturesWidget(SearchSignaturesWidget *pWidget) { - connect(pWidget, SIGNAL(showHex(qint64, qint64)), this, - SLOT(showInHexWindow(qint64, qint64))); + connect(pWidget, SIGNAL(showHex(qint64, qint64)), this, SLOT(showInHexWindow(qint64, qint64))); } void FormatWidget::initHexViewWidget(XHexViewWidget *pWidget) { connect(pWidget, SIGNAL(dataChanged()), this, SLOT(setEdited())); - connect(pWidget, SIGNAL(showOffsetDisasm(qint64)), this, - SLOT(showInDisasmWindowOffset(qint64))); - connect(pWidget, SIGNAL(showOffsetMemoryMap(qint64)), this, - SLOT(showInMemoryMapWindowOffset(qint64))); + connect(pWidget, SIGNAL(showOffsetDisasm(qint64)), this, SLOT(showInDisasmWindowOffset(qint64))); + connect(pWidget, SIGNAL(showOffsetMemoryMap(qint64)), this, SLOT(showInMemoryMapWindowOffset(qint64))); } void FormatWidget::initMultiDisasmWidget(XMultiDisasmWidget *pWidget) { connect(pWidget, SIGNAL(dataChanged()), this, SLOT(setEdited())); - connect(pWidget, SIGNAL(showOffsetHex(qint64)), this, - SLOT(showInHexWindow(qint64))); + connect(pWidget, SIGNAL(showOffsetHex(qint64)), this, SLOT(showInHexWindow(qint64))); } void FormatWidget::initHexView(XHexView *pWidget) { connect(pWidget, SIGNAL(dataChanged()), this, SLOT(setEdited())); - connect(pWidget, SIGNAL(showOffsetDisasm(qint64)), this, - SLOT(showInDisasmWindowOffset(qint64))); - connect(pWidget, SIGNAL(showOffsetMemoryMap(qint64)), this, - SLOT(showInMemoryMapWindowOffset(qint64))); - connect(pWidget, SIGNAL(showOffsetMainHex(qint64, qint64)), this, - SLOT(showInHexWindow(qint64, qint64))); + connect(pWidget, SIGNAL(showOffsetDisasm(qint64)), this, SLOT(showInDisasmWindowOffset(qint64))); + connect(pWidget, SIGNAL(showOffsetMemoryMap(qint64)), this, SLOT(showInMemoryMapWindowOffset(qint64))); + connect(pWidget, SIGNAL(showOffsetMainHex(qint64, qint64)), this, SLOT(showInHexWindow(qint64, qint64))); } void FormatWidget::initToolsWidget(ToolsWidget *pWidget) { connect(pWidget, SIGNAL(dataChanged()), this, SLOT(setEdited())); - connect(pWidget, SIGNAL(showOffsetHex(qint64, qint64)), this, - SLOT(showInHexWindow(qint64, qint64))); - connect(pWidget, SIGNAL(showOffsetDisasm(qint64)), this, - SLOT(showInDisasmWindowOffset(qint64))); - connect(pWidget, SIGNAL(showOffsetMemoryMap(qint64)), this, - SLOT(showInMemoryMapWindowOffset(qint64))); - connect(pWidget, SIGNAL(showDemangle(QString)), this, - SLOT(showDemangle(QString))); + connect(pWidget, SIGNAL(showOffsetHex(qint64, qint64)), this, SLOT(showInHexWindow(qint64, qint64))); + connect(pWidget, SIGNAL(showOffsetDisasm(qint64)), this, SLOT(showInDisasmWindowOffset(qint64))); + connect(pWidget, SIGNAL(showOffsetMemoryMap(qint64)), this, SLOT(showInMemoryMapWindowOffset(qint64))); + connect(pWidget, SIGNAL(showDemangle(QString)), this, SLOT(showDemangle(QString))); pWidget->resize(pWidget->width(), 150); // TODO Check } -qint32 FormatWidget::getColumnWidth(QWidget *pParent, FormatWidget::CW cw, - XBinary::MODE mode) { +void FormatWidget::initExtractorWidget(XExtractorWidget *pWidget) +{ + connect(pWidget, SIGNAL(showOffsetHex(qint64, qint64)), this, SLOT(showInHexWindow(qint64, qint64))); +} + +qint32 FormatWidget::getColumnWidth(QWidget *pParent, FormatWidget::CW cw, XBinary::MODE mode) { qint32 nResult = 0; int nSymbolWidth = XLineEditHEX::getSymbolWidth(pParent); @@ -956,19 +876,18 @@ void FormatWidget::setDisasmInitAddress(XADDR nDisasmInitAddress) { g_nDisamInitAddress = nDisasmInitAddress; } -XADDR FormatWidget::getDisasmInitAddress() { return g_nDisamInitAddress; } +XADDR FormatWidget::getDisasmInitAddress() { + return g_nDisamInitAddress; +} -QStandardItemModel *FormatWidget::getHeaderTableModel( - QTableWidget *pTableWidget) { +QStandardItemModel *FormatWidget::getHeaderTableModel(QTableWidget *pTableWidget) { int nNumberOfColumns = pTableWidget->columnCount(); int nNumberOfRows = pTableWidget->rowCount(); - QStandardItemModel *pResult = - new QStandardItemModel(nNumberOfRows, nNumberOfColumns); + QStandardItemModel *pResult = new QStandardItemModel(nNumberOfRows, nNumberOfColumns); for (qint32 i = 0; i < nNumberOfColumns; i++) { - pResult->setHeaderData(i, Qt::Horizontal, - pTableWidget->horizontalHeaderItem(i)->text()); + pResult->setHeaderData(i, Qt::Horizontal, pTableWidget->horizontalHeaderItem(i)->text()); } for (qint32 i = 0; i < nNumberOfRows; i++) { @@ -1001,19 +920,14 @@ QStandardItemModel *FormatWidget::getHeaderTableModel( return pResult; } -void FormatWidget::saveHeaderTable(QTableWidget *pTableWidget, - QString sFileName) { - sFileName = QFileDialog::getSaveFileName( - this, tr("Save"), sFileName, - QString("%1 (*.txt);;%2 (*)").arg(tr("Text files"), tr("All files"))); +void FormatWidget::saveHeaderTable(QTableWidget *pTableWidget, QString sFileName) { + sFileName = QFileDialog::getSaveFileName(this, tr("Save"), sFileName, QString("%1 (*.txt);;%2 (*)").arg(tr("Text files"), tr("All files"))); if (!sFileName.isEmpty()) { QStandardItemModel *pModel = getHeaderTableModel(pTableWidget); if (!XOptions::saveModel(pModel, sFileName)) { - QMessageBox::critical( - XOptions::getMainWidget(this), tr("Error"), - QString("%1: %2").arg(tr("Cannot save file"), sFileName)); + QMessageBox::critical(XOptions::getMainWidget(this), tr("Error"), QString("%1: %2").arg(tr("Cannot save file"), sFileName)); } delete pModel; @@ -1109,8 +1023,7 @@ void FormatWidget::showHex(qint64 nOffset, qint64 nSize) { DialogHexView dialogHexView(this, getDevice(), hexOptions); dialogHexView.setGlobal(getShortcuts(), getGlobalOptions()); - connect(&dialogHexView, SIGNAL(editState(bool)), this, - SLOT(setEdited(bool))); + connect(&dialogHexView, SIGNAL(editState(bool)), this, SLOT(setEdited(bool))); dialogHexView.exec(); @@ -1150,15 +1063,11 @@ void FormatWidget::dumpRegion(qint64 nOffset, qint64 nSize, QString sName) { sName = tr("Dump"); } - QString sSaveFileName = - XBinary::getResultFileName(getDevice(), QString("%1.bin").arg(sName)); - QString sFileName = - QFileDialog::getSaveFileName(this, tr("Save dump"), sSaveFileName, - QString("%1 (*.bin)").arg(tr("Raw data"))); + QString sSaveFileName = XBinary::getResultFileName(getDevice(), QString("%1.bin").arg(sName)); + QString sFileName = QFileDialog::getSaveFileName(this, tr("Save dump"), sSaveFileName, QString("%1 (*.bin)").arg(tr("Raw data"))); if (!sFileName.isEmpty()) { - DialogDumpProcess dd(this, getDevice(), nOffset, nSize, sFileName, - DumpProcess::DT_OFFSET); + DialogDumpProcess dd(this, getDevice(), nOffset, nSize, sFileName, DumpProcess::DT_OFFSET); dd.showDialogDelay(1000); } @@ -1181,13 +1090,12 @@ bool FormatWidget::saveBackup() { return bResult; } -void FormatWidget::registerShortcuts(bool bState) { Q_UNUSED(bState) } +void FormatWidget::registerShortcuts(bool bState) { + Q_UNUSED(bState) +} -bool FormatWidget::createHeaderTable(int nType, QTableWidget *pTableWidget, - const FW_DEF::HEADER_RECORD *pRecords, - XLineEditHEX **ppLineEdits, - int nNumberOfRecords, int nPosition, - qint64 nOffset) { +bool FormatWidget::createHeaderTable(int nType, QTableWidget *pTableWidget, const FW_DEF::HEADER_RECORD *pRecords, XLineEditHEX **ppLineEdits, + int nNumberOfRecords, int nPosition, qint64 nOffset) { pTableWidget->setColumnCount(6); pTableWidget->setRowCount(nNumberOfRecords); @@ -1205,16 +1113,14 @@ bool FormatWidget::createHeaderTable(int nType, QTableWidget *pTableWidget, for (qint32 i = 0; i < nNumberOfRecords; i++) { QTableWidgetItem *pItemName = new QTableWidgetItem; pItemName->setText(pRecords[i].sName); - pItemName->setData(Qt::UserRole + HEADER_DATA_OFFSET, - pRecords[i].nOffset); + pItemName->setData(Qt::UserRole + HEADER_DATA_OFFSET, pRecords[i].nOffset); pItemName->setData(Qt::UserRole + HEADER_DATA_SIZE, pRecords[i].nSize); pTableWidget->setItem(i, HEADER_COLUMN_NAME, pItemName); QTableWidgetItem *pItemOffset = new QTableWidgetItem; if (pRecords[i].nOffset != -1) { - pItemOffset->setText( - XBinary::valueToHex((quint16)pRecords[i].nOffset)); + pItemOffset->setText(XBinary::valueToHex((quint16)pRecords[i].nOffset)); } pTableWidget->setItem(i, HEADER_COLUMN_OFFSET, pItemOffset); @@ -1229,17 +1135,14 @@ bool FormatWidget::createHeaderTable(int nType, QTableWidget *pTableWidget, ppLineEdits[i]->setProperty("POSITION", nPosition); ppLineEdits[i]->setProperty("OFFSET", nOffset); - if ((pRecords[i].vtype == FW_DEF::VAL_TYPE_TEXT) || - (pRecords[i].vtype == FW_DEF::VAL_TYPE_UUID)) { - connect(ppLineEdits[i], SIGNAL(valueChanged(QString)), this, - SLOT(textValueChanged(QString))); + if ((pRecords[i].vtype == FW_DEF::VAL_TYPE_TEXT) || (pRecords[i].vtype == FW_DEF::VAL_TYPE_UUID)) { + connect(ppLineEdits[i], SIGNAL(valueChanged(QString)), this, SLOT(textValueChanged(QString))); if (pRecords[i].nSize != -1) { ppLineEdits[i]->setMaxLength(pRecords[i].nSize); } } else { - connect(ppLineEdits[i], SIGNAL(valueChanged(quint64)), this, - SLOT(hexValueChanged(quint64))); + connect(ppLineEdits[i], SIGNAL(valueChanged(quint64)), this, SLOT(hexValueChanged(quint64))); } pTableWidget->setCellWidget(i, HEADER_COLUMN_VALUE, ppLineEdits[i]); @@ -1251,17 +1154,14 @@ bool FormatWidget::createHeaderTable(int nType, QTableWidget *pTableWidget, pTableWidget->setItem(i, HEADER_COLUMN_COMMENT, new QTableWidgetItem); } - pTableWidget->horizontalHeader()->setSectionResizeMode( - HEADER_COLUMN_COMMENT, QHeaderView::Stretch); + pTableWidget->horizontalHeader()->setSectionResizeMode(HEADER_COLUMN_COMMENT, QHeaderView::Stretch); adjustHeaderTable(nType, pTableWidget); return true; } -bool FormatWidget::createListTable(int nType, QTableWidget *pTableWidget, - const FW_DEF::HEADER_RECORD *pRecords, - XLineEditHEX **ppLineEdits, +bool FormatWidget::createListTable(int nType, QTableWidget *pTableWidget, const FW_DEF::HEADER_RECORD *pRecords, XLineEditHEX **ppLineEdits, int nNumberOfRecords) { pTableWidget->setColumnCount(2); pTableWidget->setRowCount(nNumberOfRecords); @@ -1288,13 +1188,10 @@ bool FormatWidget::createListTable(int nType, QTableWidget *pTableWidget, } if (pRecords[i].nOffset != -1) { - if ((pRecords[i].vtype == FW_DEF::VAL_TYPE_TEXT) || - (pRecords[i].vtype == FW_DEF::VAL_TYPE_UUID)) { - connect(ppLineEdits[i], SIGNAL(valueChanged(QString)), this, - SLOT(textValueChanged(QString))); + if ((pRecords[i].vtype == FW_DEF::VAL_TYPE_TEXT) || (pRecords[i].vtype == FW_DEF::VAL_TYPE_UUID)) { + connect(ppLineEdits[i], SIGNAL(valueChanged(QString)), this, SLOT(textValueChanged(QString))); } else { - connect(ppLineEdits[i], SIGNAL(valueChanged(quint64)), this, - SLOT(hexValueChanged(quint64))); + connect(ppLineEdits[i], SIGNAL(valueChanged(quint64)), this, SLOT(hexValueChanged(quint64))); } } else { ppLineEdits[i]->setReadOnly(true); @@ -1303,29 +1200,22 @@ bool FormatWidget::createListTable(int nType, QTableWidget *pTableWidget, pTableWidget->setCellWidget(i, LIST_COLUMN_VALUE, ppLineEdits[i]); } - pTableWidget->horizontalHeader()->setSectionResizeMode( - LIST_COLUMN_VALUE, QHeaderView::Stretch); + pTableWidget->horizontalHeader()->setSectionResizeMode(LIST_COLUMN_VALUE, QHeaderView::Stretch); adjustListTable(nType, pTableWidget); return true; } -void FormatWidget::addComment(QTableWidget *pTableWidget, int nRow, int nColumn, - QString sComment) { +void FormatWidget::addComment(QTableWidget *pTableWidget, int nRow, int nColumn, QString sComment) { pTableWidget->item(nRow, nColumn)->setText(sComment); } -void FormatWidget::updateTableRecord(QTableWidget *pTableWidget, int nRow, - qint64 nOffset, qint64 nSize) { - pTableWidget->item(nRow, HEADER_COLUMN_NAME) - ->setData(Qt::UserRole + HEADER_DATA_OFFSET, nOffset); - pTableWidget->item(nRow, HEADER_COLUMN_NAME) - ->setData(Qt::UserRole + HEADER_DATA_SIZE, nSize); - pTableWidget->item(nRow, HEADER_COLUMN_OFFSET) - ->setText(XBinary::valueToHex((quint16)nOffset)); - pTableWidget->cellWidget(nRow, HEADER_COLUMN_VALUE) - ->setProperty("OFFSET", nOffset); +void FormatWidget::updateTableRecord(QTableWidget *pTableWidget, int nRow, qint64 nOffset, qint64 nSize) { + pTableWidget->item(nRow, HEADER_COLUMN_NAME)->setData(Qt::UserRole + HEADER_DATA_OFFSET, nOffset); + pTableWidget->item(nRow, HEADER_COLUMN_NAME)->setData(Qt::UserRole + HEADER_DATA_SIZE, nSize); + pTableWidget->item(nRow, HEADER_COLUMN_OFFSET)->setText(XBinary::valueToHex((quint16)nOffset)); + pTableWidget->cellWidget(nRow, HEADER_COLUMN_VALUE)->setProperty("OFFSET", nOffset); } // bool FormatWidget::createDirectoryTable(int type,QTableWidget @@ -1368,7 +1258,7 @@ void FormatWidget::updateTableRecord(QTableWidget *pTableWidget, int nRow, //// ppLineEdits1[i]->setProperty("VTYPE",pRecords[i].vtype[0]); //// -///connect(ppLineEdits1[i],SIGNAL(valueChanged(quint64)),this,SLOT(hexValueChanged(quint64))); +/// connect(ppLineEdits1[i],SIGNAL(valueChanged(quint64)),this,SLOT(hexValueChanged(quint64))); //// pTableWidget->setCellWidget(i,DIRECTORY_COLUMN_ADDRESS,ppLineEdits1[i]); @@ -1378,7 +1268,7 @@ void FormatWidget::updateTableRecord(QTableWidget *pTableWidget, int nRow, //// ppLineEdits2[i]->setProperty("VTYPE",pRecords[i].vtype[1]); //// -///connect(ppLineEdits2[i],SIGNAL(valueChanged(quint64)),this,SLOT(hexValueChanged(quint64))); +/// connect(ppLineEdits2[i],SIGNAL(valueChanged(quint64)),this,SLOT(hexValueChanged(quint64))); //// pTableWidget->setCellWidget(i,DIRECTORY_COLUMN_SIZE,ppLineEdits2[i]); // } @@ -1386,9 +1276,7 @@ void FormatWidget::updateTableRecord(QTableWidget *pTableWidget, int nRow, // return true; //} -bool FormatWidget::createSectionTable(int nType, QTableWidget *pTableWidget, - const FW_DEF::HEADER_RECORD *pRecords, - int nNumberOfRecords) { +bool FormatWidget::createSectionTable(int nType, QTableWidget *pTableWidget, const FW_DEF::HEADER_RECORD *pRecords, int nNumberOfRecords) { Q_UNUSED(nType) QStringList slHeader; @@ -1406,8 +1294,7 @@ bool FormatWidget::createSectionTable(int nType, QTableWidget *pTableWidget, return true; } -void FormatWidget::setLineEditsReadOnly(XLineEditHEX **ppLineEdits, int nCount, - bool bState) { +void FormatWidget::setLineEditsReadOnly(XLineEditHEX **ppLineEdits, int nCount, bool bState) { for (qint32 i = 0; i < nCount; i++) { if (ppLineEdits[i]) { ppLineEdits[i]->setReadOnly(bState); @@ -1415,8 +1302,7 @@ void FormatWidget::setLineEditsReadOnly(XLineEditHEX **ppLineEdits, int nCount, } } -void FormatWidget::setComboBoxesReadOnly(XComboBoxEx **ppComboBoxes, int nCount, - bool bState) { +void FormatWidget::setComboBoxesReadOnly(XComboBoxEx **ppComboBoxes, int nCount, bool bState) { for (qint32 i = 0; i < nCount; i++) { if (ppComboBoxes[i]) { ppComboBoxes[i]->setReadOnly(bState); @@ -1424,8 +1310,7 @@ void FormatWidget::setComboBoxesReadOnly(XComboBoxEx **ppComboBoxes, int nCount, } } -void FormatWidget::setPushButtonReadOnly(QPushButton **ppPushButtons, - int nCount, bool bState) { +void FormatWidget::setPushButtonReadOnly(QPushButton **ppPushButtons, int nCount, bool bState) { for (qint32 i = 0; i < nCount; i++) { if (ppPushButtons[i]) { ppPushButtons[i]->setEnabled(!bState); @@ -1433,8 +1318,7 @@ void FormatWidget::setPushButtonReadOnly(QPushButton **ppPushButtons, } } -void FormatWidget::setDateTimeEditReadOnly(XDateTimeEditX **ppDateTimeEdits, - int nCount, bool bState) { +void FormatWidget::setDateTimeEditReadOnly(XDateTimeEditX **ppDateTimeEdits, int nCount, bool bState) { for (qint32 i = 0; i < nCount; i++) { if (ppDateTimeEdits[i]) { ppDateTimeEdits[i]->setReadOnly(bState); @@ -1464,10 +1348,7 @@ void FormatWidget::_deleteSubdevices(SubDevice **ppSubdevices, qint32 nCount) { } } -XComboBoxEx *FormatWidget::createComboBox(QTableWidget *pTableWidget, - QMap mapData, - int nType, int nData, - XComboBoxEx::CBTYPE cbtype, +XComboBoxEx *FormatWidget::createComboBox(QTableWidget *pTableWidget, QMap mapData, int nType, int nData, XComboBoxEx::CBTYPE cbtype, quint64 nMask, int nExtraData) { XComboBoxEx *result = new XComboBoxEx(this); result->setData(mapData, cbtype, nMask); @@ -1480,52 +1361,42 @@ XComboBoxEx *FormatWidget::createComboBox(QTableWidget *pTableWidget, result->setProperty("NDATA", nExtraData); } - connect(result, SIGNAL(valueChanged(quint64)), this, - SLOT(widgetValueChanged(quint64))); + connect(result, SIGNAL(valueChanged(quint64)), this, SLOT(widgetValueChanged(quint64))); pTableWidget->setCellWidget(nData, HEADER_COLUMN_INFO, result); return result; } -InvWidget *FormatWidget::createInvWidget(QTableWidget *pTableWidget, int nType, - int nData, - InvWidget::TYPE widgetType) { +InvWidget *FormatWidget::createInvWidget(QTableWidget *pTableWidget, int nType, int nData, InvWidget::TYPE widgetType) { InvWidget *pResult = new InvWidget(this, widgetType); pResult->setProperty("STYPE", nType); pResult->setProperty("NDATA", nData); - connect(pResult, SIGNAL(showHex(qint64, qint64)), this, - SLOT(showInHexWindow(qint64, qint64))); - connect(pResult, SIGNAL(showDisasm(XADDR)), this, - SLOT(showInDisasmWindowAddress(XADDR))); + connect(pResult, SIGNAL(showHex(qint64, qint64)), this, SLOT(showInHexWindow(qint64, qint64))); + connect(pResult, SIGNAL(showDisasm(XADDR)), this, SLOT(showInDisasmWindowAddress(XADDR))); pTableWidget->setCellWidget(nData, HEADER_COLUMN_INFO, pResult); return pResult; } -XDateTimeEditX *FormatWidget::createTimeDateEdit( - QTableWidget *pTableWidget, int nType, int nData, - XDateTimeEditX::DT_TYPE dtType) { +XDateTimeEditX *FormatWidget::createTimeDateEdit(QTableWidget *pTableWidget, int nType, int nData, XDateTimeEditX::DT_TYPE dtType) { XDateTimeEditX *result = new XDateTimeEditX(this); result->setType(dtType); result->setProperty("STYPE", nType); result->setProperty("NDATA", nData); - connect(result, SIGNAL(valueChanged(quint64)), this, - SLOT(widgetValueChanged(quint64))); + connect(result, SIGNAL(valueChanged(quint64)), this, SLOT(widgetValueChanged(quint64))); pTableWidget->setCellWidget(nData, HEADER_COLUMN_INFO, result); return result; } -QPushButton *FormatWidget::createPushButton(QTableWidget *pTableWidget, - int nType, int nData, - QString sText) { +QPushButton *FormatWidget::createPushButton(QTableWidget *pTableWidget, int nType, int nData, QString sText) { QPushButton *pPushButton = new QPushButton(this); pPushButton->setText(sText); diff --git a/formatwidget.h b/formatwidget.h index bc549378..e096054d 100644 --- a/formatwidget.h +++ b/formatwidget.h @@ -44,34 +44,22 @@ #include "xmultidisasmwidget.h" #include "xoptions.h" #include "xshortcutsdialog.h" +#include "xextractorwidget.h" class FormatWidget : public XShortcutsWidget { Q_OBJECT - public: - enum HEADER_COLUMN { - HEADER_COLUMN_NAME = 0, - HEADER_COLUMN_OFFSET, - HEADER_COLUMN_TYPE, - HEADER_COLUMN_VALUE, - HEADER_COLUMN_INFO, - HEADER_COLUMN_COMMENT - }; +public: + enum HEADER_COLUMN { HEADER_COLUMN_NAME = 0, HEADER_COLUMN_OFFSET, HEADER_COLUMN_TYPE, HEADER_COLUMN_VALUE, HEADER_COLUMN_INFO, HEADER_COLUMN_COMMENT }; enum LIST_COLUMN { LIST_COLUMN_NAME = 0, LIST_COLUMN_VALUE }; enum HEADER_DATA { HEADER_DATA_OFFSET = 0, HEADER_DATA_SIZE }; - enum DIRECTORY_COLUMN { - DIRECTORY_COLUMN_NUMBER = 0, - DIRECTORY_COLUMN_NAME, - DIRECTORY_COLUMN_ADDRESS, - DIRECTORY_COLUMN_SIZE - }; + enum DIRECTORY_COLUMN { DIRECTORY_COLUMN_NUMBER = 0, DIRECTORY_COLUMN_NAME, DIRECTORY_COLUMN_ADDRESS, DIRECTORY_COLUMN_SIZE }; FormatWidget(QWidget *pParent = nullptr); - FormatWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, quint32 nNumber, - qint64 nOffset, qint32 nType, QWidget *pParent); + FormatWidget(QIODevice *pDevice, FW_DEF::OPTIONS options, quint32 nNumber, qint64 nOffset, qint32 nType, QWidget *pParent); ~FormatWidget(); void setXInfoDB(XInfoDB *pXInfoDB); @@ -80,12 +68,9 @@ class FormatWidget : public XShortcutsWidget { void setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions); void adjustView(); - void setData(QIODevice *pDevice, FW_DEF::OPTIONS options, quint32 nNumber, - qint64 nOffset, qint32 nType); - void setData(QString sFileName, FW_DEF::OPTIONS options, quint32 nNumber, - qint64 nOffset, qint32 nType); - void setData(FW_DEF::OPTIONS options, quint32 nNumber, qint64 nOffset, - qint32 nType); + void setData(QIODevice *pDevice, FW_DEF::OPTIONS options, quint32 nNumber, qint64 nOffset, qint32 nType); + void setData(QString sFileName, FW_DEF::OPTIONS options, quint32 nNumber, qint64 nOffset, qint32 nType); + void setData(FW_DEF::OPTIONS options, quint32 nNumber, qint64 nOffset, qint32 nType); void setBackupDevice(QIODevice *pDevice); QIODevice *getBackupDevice(); @@ -98,87 +83,53 @@ class FormatWidget : public XShortcutsWidget { qint64 getOffset(); qint32 getType(); bool isReadonly(); - QTreeWidgetItem *createNewItem(int nType, QString sTitle, - qint64 nOffset = 0, qint64 nSize = 0, - qint64 nExtraOffset = 0, - qint64 nExtraSize = 0); - bool createHeaderTable(int nType, QTableWidget *pTableWidget, - const FW_DEF::HEADER_RECORD *pRecords, - XLineEditHEX **ppLineEdits, int nNumberOfRecords, + QTreeWidgetItem *createNewItem(int nType, QString sTitle, qint64 nOffset = 0, qint64 nSize = 0, qint64 nExtraOffset = 0, qint64 nExtraSize = 0); + bool createHeaderTable(int nType, QTableWidget *pTableWidget, const FW_DEF::HEADER_RECORD *pRecords, XLineEditHEX **ppLineEdits, int nNumberOfRecords, int nPosition = 0, qint64 nOffset = 0); - bool createListTable(int nType, QTableWidget *pTableWidget, - const FW_DEF::HEADER_RECORD *pRecords, - XLineEditHEX **ppLineEdits, int nNumberOfRecords); - void addComment(QTableWidget *pTableWidget, int nRow, int nColumn, - QString sComment); - void updateTableRecord(QTableWidget *pTableWidget, int nRow, qint64 nOffset, - qint64 nSize); + bool createListTable(int nType, QTableWidget *pTableWidget, const FW_DEF::HEADER_RECORD *pRecords, XLineEditHEX **ppLineEdits, int nNumberOfRecords); + void addComment(QTableWidget *pTableWidget, int nRow, int nColumn, QString sComment); + void updateTableRecord(QTableWidget *pTableWidget, int nRow, qint64 nOffset, qint64 nSize); // bool createDirectoryTable(int type,QTableWidget *pTableWidget,const // DIRECTORY_ENTRY_RECORD *pRecords,int nRecordCount); - bool createSectionTable(int nType, QTableWidget *pTableWidget, - const FW_DEF::HEADER_RECORD *pRecords, - int nNumberOfRecords); - void setLineEditsReadOnly(XLineEditHEX **ppLineEdits, int nCount, - bool bState); - void setComboBoxesReadOnly(XComboBoxEx **ppComboBoxes, int nCount, - bool bState); - void setPushButtonReadOnly(QPushButton **ppPushButtons, int nCount, - bool bState); - void setDateTimeEditReadOnly(XDateTimeEditX **ppDateTimeEdits, int nCount, - bool bState); + bool createSectionTable(int nType, QTableWidget *pTableWidget, const FW_DEF::HEADER_RECORD *pRecords, int nNumberOfRecords); + void setLineEditsReadOnly(XLineEditHEX **ppLineEdits, int nCount, bool bState); + void setComboBoxesReadOnly(XComboBoxEx **ppComboBoxes, int nCount, bool bState); + void setPushButtonReadOnly(QPushButton **ppPushButtons, int nCount, bool bState); + void setDateTimeEditReadOnly(XDateTimeEditX **ppDateTimeEdits, int nCount, bool bState); void _deleteObjects(QObject **ppObjects, qint32 nCount); void _deleteSubdevices(SubDevice **ppSubdevices, qint32 nCount); - XComboBoxEx *createComboBox(QTableWidget *pTableWidget, - QMap mapData, int nType, - int nData, XComboBoxEx::CBTYPE cbtype, - quint64 nMask = 0, int nExtraData = -1); - InvWidget *createInvWidget(QTableWidget *pTableWidget, int nType, int nData, - InvWidget::TYPE widgetType); - XDateTimeEditX *createTimeDateEdit(QTableWidget *pTableWidget, int nType, - int nData, - XDateTimeEditX::DT_TYPE dtType); - QPushButton *createPushButton(QTableWidget *pTableWidget, int nType, - int nData, QString sText); - - void setValue(QVariant vValue, int nStype, int nNdata, int nVtype, - int nPosition, qint64 nOffset); + XComboBoxEx *createComboBox(QTableWidget *pTableWidget, QMap mapData, int nType, int nData, XComboBoxEx::CBTYPE cbtype, quint64 nMask = 0, + int nExtraData = -1); + InvWidget *createInvWidget(QTableWidget *pTableWidget, int nType, int nData, InvWidget::TYPE widgetType); + XDateTimeEditX *createTimeDateEdit(QTableWidget *pTableWidget, int nType, int nData, XDateTimeEditX::DT_TYPE dtType); + QPushButton *createPushButton(QTableWidget *pTableWidget, int nType, int nData, QString sText); + + void setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset); bool isEdited(); // QPushButton *createHexButton(QTableWidget *pTableWidget,int nType,int // nData); - bool loadHexSubdevice(qint64 nOffset, qint64 nSize, XADDR nAddress, - SubDevice **ppSubDevice, ToolsWidget *pToolsWidget, - bool bOffset = false, bool bDisasm = true); - bool loadHexSubdeviceByTableView(int nRow, int nType, - ToolsWidget *pToolsWidget, - QTableView *pTableView, - SubDevice **ppSubDevice); - bool setHexSubdeviceByTableView(int nRow, int nType, - ToolsWidget *pToolsWidget, - QTableView *pTableView); + bool loadHexSubdevice(qint64 nOffset, qint64 nSize, XADDR nAddress, SubDevice **ppSubDevice, ToolsWidget *pToolsWidget, bool bOffset = false, + bool bDisasm = true); + bool loadHexSubdeviceByTableView(int nRow, int nType, ToolsWidget *pToolsWidget, QTableView *pTableView, SubDevice **ppSubDevice); + bool setHexSubdeviceByTableView(int nRow, int nType, ToolsWidget *pToolsWidget, QTableView *pTableView); - void setHeaderTableSelection(ToolsWidget *pToolWidget, - QTableWidget *pTableWidget); + void setHeaderTableSelection(ToolsWidget *pToolWidget, QTableWidget *pTableWidget); QColor getEnabledColor(); QColor getDisabledColor(); void setItemEnable(QTableWidgetItem *pItem, bool bState); - void setLineEdit(XLineEditHEX *pLineEdit, qint32 nMaxLength, QString sText, - qint64 nOffset); - void ajustTableView(ProcessData *pProcessData, QStandardItemModel **ppModel, - QTableView *pTableView, - QSortFilterProxyModel *pProxyModel = nullptr, + void setLineEdit(XLineEditHEX *pLineEdit, qint32 nMaxLength, QString sText, qint64 nOffset); + void ajustTableView(ProcessData *pProcessData, QStandardItemModel **ppModel, QTableView *pTableView, QSortFilterProxyModel *pProxyModel = nullptr, bool bStretchLastSection = true); - void ajustTreeView(ProcessData *pProcessData, QStandardItemModel **ppModel, - QTreeView *pTreeView); - void ajustDialogModel(ProcessData *pProcessData, - QStandardItemModel **ppModel, QString sTitle); + void ajustTreeView(ProcessData *pProcessData, QStandardItemModel **ppModel, QTreeView *pTreeView); + void ajustDialogModel(ProcessData *pProcessData, QStandardItemModel **ppModel, QString sTitle); void showSectionHex(QTableView *pTableView); void showSectionEntropy(QTableView *pTableView); void showSectionDisasm(QTableView *pTableView); @@ -187,8 +138,7 @@ class FormatWidget : public XShortcutsWidget { void showTableViewDemangle(QTableView *pTableView, int nColumn); - static bool _setTreeItem(QTreeWidget *pTree, QTreeWidgetItem *pItem, - int nID); + static bool _setTreeItem(QTreeWidget *pTree, QTreeWidgetItem *pItem, int nID); static void setTreeItem(QTreeWidget *pTree, int nID); virtual void clear() = 0; virtual void cleanup() = 0; @@ -214,19 +164,9 @@ class FormatWidget : public XShortcutsWidget { void initMultiDisasmWidget(XMultiDisasmWidget *pWidget); void initHexView(XHexView *pWidget); void initToolsWidget(ToolsWidget *pWidget); + void initExtractorWidget(XExtractorWidget *pWidget); - enum CW { - CW_UINT8 = 0, - CW_UINT16, - CW_UINT32, - CW_UINT64, - CW_UINTMODE, - CW_TYPE, - CW_STRINGSHORT, - CW_STRINGSHORT2, - CW_STRINGMID, - CW_STRINGLONG - }; + enum CW { CW_UINT8 = 0, CW_UINT16, CW_UINT32, CW_UINT64, CW_UINTMODE, CW_TYPE, CW_STRINGSHORT, CW_STRINGSHORT2, CW_STRINGMID, CW_STRINGLONG }; static qint32 getColumnWidth(QWidget *pParent, CW cw, XBinary::MODE mode); @@ -236,11 +176,10 @@ class FormatWidget : public XShortcutsWidget { QStandardItemModel *getHeaderTableModel(QTableWidget *pTableWidget); void saveHeaderTable(QTableWidget *pTableWidget, QString sFileName); - protected: +protected: enum SV { SV_NONE = 0, SV_EDITED, SV_RELOAD, SV_RELOADDATA }; - virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, - int nPosition, qint64 nOffset) = 0; + virtual SV _setValue(QVariant vValue, int nStype, int nNdata, int nVtype, int nPosition, qint64 nOffset) = 0; virtual void setReadonly(bool bState) = 0; virtual void blockSignals(bool bState) = 0; virtual void reloadData() = 0; @@ -252,11 +191,11 @@ class FormatWidget : public XShortcutsWidget { virtual void _showInMemoryMapWindowOffset(qint64 nOffset); virtual void _showInHexWindow(qint64 nOffset, qint64 nSize); - signals: +signals: void changed(); void closeApp(); - public slots: +public slots: void hexValueChanged(quint64 nValue); void textValueChanged(QString sText); void setEdited(); @@ -271,10 +210,10 @@ class FormatWidget : public XShortcutsWidget { void showDemangle(QString sString); bool saveBackup(); - protected: +protected: virtual void registerShortcuts(bool bState); - private: +private: QIODevice *g_pDevice; QString g_sFileName; QIODevice *g_pBackupDevice; diff --git a/invwidget.cpp b/invwidget.cpp index 2e6b5770..caad5e0c 100644 --- a/invwidget.cpp +++ b/invwidget.cpp @@ -36,8 +36,7 @@ InvWidget::InvWidget(QWidget *pParent, TYPE type) : XShortcutsWidget(pParent) { } else if (type == TYPE_DISASM) { g_pDisasmPushButton = new QPushButton(tr("Disasm"), this); - connect(g_pDisasmPushButton, SIGNAL(clicked()), this, - SLOT(showDisasmSlot())); + connect(g_pDisasmPushButton, SIGNAL(clicked()), this, SLOT(showDisasmSlot())); pLayot->addWidget(g_pDisasmPushButton); } @@ -48,10 +47,10 @@ InvWidget::InvWidget(QWidget *pParent, TYPE type) : XShortcutsWidget(pParent) { g_nSize = 0; } -InvWidget::~InvWidget() {} +InvWidget::~InvWidget() { +} -void InvWidget::setOffsetAndSize(XBinary *pBinary, qint64 nOffset, qint64 nSize, - bool bNotNull) { +void InvWidget::setOffsetAndSize(XBinary *pBinary, qint64 nOffset, qint64 nSize, bool bNotNull) { bool bValid = false; if ((bNotNull) && (nOffset == 0)) { @@ -73,8 +72,7 @@ void InvWidget::setOffsetAndSize(XBinary *pBinary, qint64 nOffset, qint64 nSize, } } -void InvWidget::setAddressAndSize(XBinary *pBinary, XADDR nAddress, - qint64 nSize, bool bNotNull) { +void InvWidget::setAddressAndSize(XBinary *pBinary, XADDR nAddress, qint64 nSize, bool bNotNull) { bool bValid = false; this->g_nAddress = nAddress; @@ -110,8 +108,14 @@ void InvWidget::_setEnabled(bool bState) { } } -void InvWidget::showHexSlot() { emit showHex(g_nOffset, g_nSize); } +void InvWidget::showHexSlot() { + emit showHex(g_nOffset, g_nSize); +} -void InvWidget::showDisasmSlot() { emit showDisasm(g_nAddress); } +void InvWidget::showDisasmSlot() { + emit showDisasm(g_nAddress); +} -void InvWidget::registerShortcuts(bool bState) { Q_UNUSED(bState) } +void InvWidget::registerShortcuts(bool bState) { + Q_UNUSED(bState) +} diff --git a/invwidget.h b/invwidget.h index 9f23085e..3e2b2558 100644 --- a/invwidget.h +++ b/invwidget.h @@ -31,30 +31,28 @@ class InvWidget : public XShortcutsWidget { Q_OBJECT - public: +public: enum TYPE { TYPE_HEX, TYPE_DISASM }; explicit InvWidget(QWidget *pParent, TYPE type); ~InvWidget(); - void setOffsetAndSize(XBinary *pBinary, qint64 nOffset, qint64 nSize, - bool bNotNull = false); - void setAddressAndSize(XBinary *pBinary, XADDR nAddress, qint64 nSize, - bool bNotNull = false); + void setOffsetAndSize(XBinary *pBinary, qint64 nOffset, qint64 nSize, bool bNotNull = false); + void setAddressAndSize(XBinary *pBinary, XADDR nAddress, qint64 nSize, bool bNotNull = false); void _setEnabled(bool bState); - private slots: +private slots: void showHexSlot(); void showDisasmSlot(); - signals: +signals: void showHex(qint64 nOffset, qint64 nSize); void showDisasm(XADDR nAddress); - protected: +protected: virtual void registerShortcuts(bool bState); - private: +private: qint64 g_nAddress; qint64 g_nOffset; qint64 g_nSize; diff --git a/processdata.cpp b/processdata.cpp index ec3bd760..ff195c0d 100755 --- a/processdata.cpp +++ b/processdata.cpp @@ -37,7 +37,9 @@ void ProcessData::incValue() { XBinary::setPdStructCurrentIncrement(g_pPdStruct, g_nFreeIndex); } -bool ProcessData::isRun() { return !(g_pPdStruct->bIsStop); } +bool ProcessData::isRun() { + return !(g_pPdStruct->bIsStop); +} void ProcessData::ajustTreeView(QWidget *pWidget, QTreeView *pTreeView) { Q_UNUSED(pWidget) @@ -45,8 +47,7 @@ void ProcessData::ajustTreeView(QWidget *pWidget, QTreeView *pTreeView) { pTreeView->expand(pTreeView->model()->index(0, 0)); } -QList ProcessData::getStructList(const FW_DEF::HEADER_RECORD *pRecords, - int nRecordCount) { +QList ProcessData::getStructList(const FW_DEF::HEADER_RECORD *pRecords, int nRecordCount) { QList listResult; for (qint32 i = 0; i < nRecordCount; i++) { @@ -56,8 +57,7 @@ QList ProcessData::getStructList(const FW_DEF::HEADER_RECORD *pRecords, return listResult; } -void ProcessData::setHeader(QStandardItemModel *pModel, - QList *pListStrings) { +void ProcessData::setHeader(QStandardItemModel *pModel, QList *pListStrings) { int nNumberOfRecords = pListStrings->count(); for (qint32 i = 0; i < nNumberOfRecords; i++) { diff --git a/processdata.h b/processdata.h index fafe53f2..a5cf760e 100755 --- a/processdata.h +++ b/processdata.h @@ -34,7 +34,7 @@ class ProcessData : public QObject { Q_OBJECT - public: +public: explicit ProcessData(); void setPdStruct(XBinary::PDSTRUCT *pPdStruct); @@ -44,19 +44,17 @@ class ProcessData : public QObject { virtual void _process() = 0; virtual void ajustTableView(QWidget *pWidget, QTableView *pTableView) = 0; virtual void ajustTreeView(QWidget *pWidget, QTreeView *pTreeView); - static QList getStructList(const FW_DEF::HEADER_RECORD *pRecords, - int nRecordCount); - static void setHeader(QStandardItemModel *pModel, - QList *pListStrings); + static QList getStructList(const FW_DEF::HEADER_RECORD *pRecords, int nRecordCount); + static void setHeader(QStandardItemModel *pModel, QList *pListStrings); - public slots: +public slots: void process(); - signals: +signals: void errorMessage(QString sText); void completed(qint64 nElapsed); - private: +private: XBinary::PDSTRUCT *g_pPdStruct; qint32 g_nFreeIndex; }; diff --git a/toolswidget.cpp b/toolswidget.cpp index 74c95199..5ec3869c 100644 --- a/toolswidget.cpp +++ b/toolswidget.cpp @@ -22,29 +22,21 @@ #include "ui_toolswidget.h" -ToolsWidget::ToolsWidget(QWidget *pParent) - : XShortcutsWidget(pParent), ui(new Ui::ToolsWidget) { +ToolsWidget::ToolsWidget(QWidget *pParent) : XShortcutsWidget(pParent), ui(new Ui::ToolsWidget) { ui->setupUi(this); g_pDevice = nullptr; connect(ui->widgetHex, SIGNAL(dataChanged()), this, SIGNAL(dataChanged())); - connect(ui->widgetHex, SIGNAL(showOffsetDisasm(qint64)), this, - SLOT(_showDisasm(qint64))); - connect(ui->widgetHex, SIGNAL(showOffsetMemoryMap(qint64)), this, - SLOT(_showMemoryMap(qint64))); - connect(ui->widgetHex, SIGNAL(showOffsetMainHex(qint64, qint64)), this, - SLOT(_showHex(qint64, qint64))); - connect(ui->widgetStrings, SIGNAL(dataChanged()), this, - SIGNAL(dataChanged())); - connect(ui->widgetStrings, SIGNAL(showHex(qint64, qint64)), this, - SLOT(_showHex(qint64, qint64))); - connect(ui->widgetStrings, SIGNAL(showDemangle(QString)), this, - SIGNAL(showDemangle(QString))); -} - -void ToolsWidget::setData(QIODevice *pDevice, FW_DEF::OPTIONS options, - QIODevice *pBackupDevice, bool bDisasm) { + connect(ui->widgetHex, SIGNAL(showOffsetDisasm(qint64)), this, SLOT(_showDisasm(qint64))); + connect(ui->widgetHex, SIGNAL(showOffsetMemoryMap(qint64)), this, SLOT(_showMemoryMap(qint64))); + connect(ui->widgetHex, SIGNAL(showOffsetMainHex(qint64, qint64)), this, SLOT(_showHex(qint64, qint64))); + connect(ui->widgetStrings, SIGNAL(dataChanged()), this, SIGNAL(dataChanged())); + connect(ui->widgetStrings, SIGNAL(showHex(qint64, qint64)), this, SLOT(_showHex(qint64, qint64))); + connect(ui->widgetStrings, SIGNAL(showDemangle(QString)), this, SIGNAL(showDemangle(QString))); +} + +void ToolsWidget::setData(QIODevice *pDevice, FW_DEF::OPTIONS options, QIODevice *pBackupDevice, bool bDisasm) { g_pDevice = pDevice; XHexView::OPTIONS hexOptions = {}; @@ -113,7 +105,9 @@ void ToolsWidget::setSelection(qint64 nOffset, qint64 nSize) { ui->widgetHex->setSelection(nOffset, nSize); } -ToolsWidget::~ToolsWidget() { delete ui; } +ToolsWidget::~ToolsWidget() { + delete ui; +} void ToolsWidget::setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions) { ui->widgetHex->setGlobal(pShortcuts, pXOptions); @@ -158,4 +152,6 @@ void ToolsWidget::_showMemoryMap(qint64 nOffset) { emit showOffsetMemoryMap(nOffset); } -void ToolsWidget::registerShortcuts(bool bState) { Q_UNUSED(bState) } +void ToolsWidget::registerShortcuts(bool bState) { + Q_UNUSED(bState) +} diff --git a/toolswidget.h b/toolswidget.h index 91897483..371ccfdd 100644 --- a/toolswidget.h +++ b/toolswidget.h @@ -32,13 +32,12 @@ class ToolsWidget; class ToolsWidget : public XShortcutsWidget { Q_OBJECT - public: +public: explicit ToolsWidget(QWidget *pParent = nullptr); ~ToolsWidget(); void setGlobal(XShortcuts *pShortcuts, XOptions *pXOptions); - void setData(QIODevice *pDevice, FW_DEF::OPTIONS options, - QIODevice *pBackupDevice, bool bDisasm = false); + void setData(QIODevice *pDevice, FW_DEF::OPTIONS options, QIODevice *pBackupDevice, bool bDisasm = false); void setDevice(QIODevice *pDevice); void setBackupDevice(QIODevice *pDevice); void setEdited(); @@ -47,23 +46,23 @@ class ToolsWidget : public XShortcutsWidget { qint64 getStartAddress(); void setSelection(qint64 nOffset, qint64 nSize); - signals: +signals: void dataChanged(); void showOffsetHex(qint64 nOffset, qint64 nSize); void showOffsetDisasm(qint64 nOffset); void showOffsetMemoryMap(qint64 nOffset); void showDemangle(QString sString); - private slots: +private slots: void on_tabWidgetMain_currentChanged(int nIndex); void _showHex(qint64 nOffset, qint64 nSize); void _showDisasm(qint64 nOffset); void _showMemoryMap(qint64 nOffset); - protected: +protected: virtual void registerShortcuts(bool bState); - private: +private: Ui::ToolsWidget *ui; QIODevice *g_pDevice; SearchStringsWidget::OPTIONS g_stringsOptions;