diff --git a/Binary/binarywidget.cpp b/Binary/binarywidget.cpp index 9440c3fb..cf23d398 100644 --- a/Binary/binarywidget.cpp +++ b/Binary/binarywidget.cpp @@ -362,11 +362,6 @@ void BinaryWidget::on_pushButtonEntropy_clicked() setTreeItem(ui->treeWidgetNavi, SBINARY::TYPE_ENTROPY); } -void BinaryWidget::on_pushButtonHeuristicScan_clicked() -{ - setTreeItem(ui->treeWidgetNavi, SBINARY::TYPE_NFDSCAN); -} - void BinaryWidget::on_pushButtonMemoryMap_clicked() { setTreeItem(ui->treeWidgetNavi, SBINARY::TYPE_MEMORYMAP); diff --git a/Binary/binarywidget.h b/Binary/binarywidget.h index 10f860cb..35b70b7e 100644 --- a/Binary/binarywidget.h +++ b/Binary/binarywidget.h @@ -63,7 +63,6 @@ private slots: void on_pushButtonDisasm_clicked(); void on_pushButtonStrings_clicked(); void on_pushButtonEntropy_clicked(); - void on_pushButtonHeuristicScan_clicked(); void on_pushButtonMemoryMap_clicked(); void on_treeWidgetNavi_currentItemChanged(QTreeWidgetItem *pItemCurrent, QTreeWidgetItem *pItemPrevious); diff --git a/Binary/binarywidget.ui b/Binary/binarywidget.ui index 33f9cab0..3c893aa2 100644 --- a/Binary/binarywidget.ui +++ b/Binary/binarywidget.ui @@ -97,13 +97,6 @@ - - - - Heuristic scan - - - @@ -468,18 +461,6 @@
xhexviewwidget.h
1 - - XMultiDisasmWidget - QWidget -
xmultidisasmwidget.h
- 1 - - - SearchSignaturesWidget - QWidget -
searchsignatureswidget.h
- 1 - XHashWidget QWidget @@ -510,6 +491,12 @@
xvisualizationwidget.h
1 + + SearchSignaturesWidget + QWidget +
searchsignatureswidget.h
+ 1 + DIEWidgetAdvanced QWidget @@ -522,6 +509,12 @@
yarawidgetadvanced.h
1 + + XMultiDisasmWidget + QWidget +
xmultidisasmwidget.h
+ 1 + diff --git a/ELF/elfwidget.cpp b/ELF/elfwidget.cpp index 788126c1..40e37196 100644 --- a/ELF/elfwidget.cpp +++ b/ELF/elfwidget.cpp @@ -1187,11 +1187,6 @@ void ELFWidget::on_pushButtonEntropy_clicked() setTreeItem(ui->treeWidgetNavi, SELF::TYPE_ENTROPY); } -void ELFWidget::on_pushButtonHeuristicScan_clicked() -{ - setTreeItem(ui->treeWidgetNavi, SELF::TYPE_NFDSCAN); -} - void ELFWidget::on_toolButtonPrev_clicked() { setAddPageEnabled(false); diff --git a/ELF/elfwidget.h b/ELF/elfwidget.h index 7b16e2af..7202e4dd 100644 --- a/ELF/elfwidget.h +++ b/ELF/elfwidget.h @@ -107,7 +107,6 @@ private slots: void on_pushButtonStrings_clicked(); void on_pushButtonMemoryMap_clicked(); void on_pushButtonEntropy_clicked(); - void on_pushButtonHeuristicScan_clicked(); void on_toolButtonPrev_clicked(); void on_toolButtonNext_clicked(); diff --git a/ELF/elfwidget.ui b/ELF/elfwidget.ui index 0432e529..563108b8 100644 --- a/ELF/elfwidget.ui +++ b/ELF/elfwidget.ui @@ -97,13 +97,6 @@ - - - - Heuristic scan - - - @@ -1274,11 +1267,13 @@ DIEWidgetAdvanced QWidget
diewidgetadvanced.h
+ 1 YARAWidgetAdvanced QWidget
yarawidgetadvanced.h
+ 1 XMultiDisasmWidget diff --git a/LE/lewidget.cpp b/LE/lewidget.cpp index 0e919aff..4efa52e0 100755 --- a/LE/lewidget.cpp +++ b/LE/lewidget.cpp @@ -755,8 +755,3 @@ void LEWidget::on_pushButtonEntropy_clicked() { setTreeItem(ui->treeWidgetNavi, SLE::TYPE_ENTROPY); } - -void LEWidget::on_pushButtonHeuristicScan_clicked() -{ - setTreeItem(ui->treeWidgetNavi, SLE::TYPE_NFDSCAN); -} diff --git a/LE/lewidget.h b/LE/lewidget.h index 9ee20e2f..e4b0aea1 100755 --- a/LE/lewidget.h +++ b/LE/lewidget.h @@ -73,7 +73,6 @@ private slots: void on_pushButtonStrings_clicked(); void on_pushButtonMemoryMap_clicked(); void on_pushButtonEntropy_clicked(); - void on_pushButtonHeuristicScan_clicked(); private: enum CB { diff --git a/LE/lewidget.ui b/LE/lewidget.ui index dc7cee2c..428863a3 100755 --- a/LE/lewidget.ui +++ b/LE/lewidget.ui @@ -100,13 +100,6 @@ - - - - Heuristic scan - - - @@ -679,11 +672,13 @@ DIEWidgetAdvanced QWidget
diewidgetadvanced.h
+ 1 YARAWidgetAdvanced QWidget
yarawidgetadvanced.h
+ 1 XMultiDisasmWidget diff --git a/MACH/machprocessdata.cpp b/MACH/machprocessdata.cpp index dfc22bbd..642a6073 100755 --- a/MACH/machprocessdata.cpp +++ b/MACH/machprocessdata.cpp @@ -60,9 +60,9 @@ void MACHProcessData::_process() 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::cmd + 1, new QStandardItem(XBinary::valueToHex((quint32)listCommandRecords.at(i).nId))); (*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::cmdsize + 2, new QStandardItem(mapLC.value(listCommandRecords.at(i).nId))); incValue(); } diff --git a/MACH/machsectionheaderwidget.cpp b/MACH/machsectionheaderwidget.cpp index f80ad840..3acaf5b2 100644 --- a/MACH/machsectionheaderwidget.cpp +++ b/MACH/machsectionheaderwidget.cpp @@ -561,10 +561,10 @@ void MACHSectionHeaderWidget::reloadData(bool bSaveSelection) XMACH::COMMAND_RECORD cr = mach._readLoadCommand(nHeaderOffset, bIsBigEndian); - g_ppLinedEdit[N_mach_commands::cmd]->setValue_uint32((quint32)cr.nType); + g_ppLinedEdit[N_mach_commands::cmd]->setValue_uint32((quint32)cr.nId); g_ppLinedEdit[N_mach_commands::cmdsize]->setValue_uint32((quint32)cr.nSize); - g_ppComboBox[N_mach_commands::CB_CMD]->setValue(cr.nType); + g_ppComboBox[N_mach_commands::CB_CMD]->setValue(cr.nId); qint64 nOffset = nHeaderOffset; qint64 nSize = mach.getCommandHeaderSize(); diff --git a/MACH/machwidget.cpp b/MACH/machwidget.cpp index f83dc9fd..7a887961 100644 --- a/MACH/machwidget.cpp +++ b/MACH/machwidget.cpp @@ -3529,8 +3529,3 @@ void MACHWidget::on_pushButtonEntropy_clicked() { setTreeItem(ui->treeWidgetNavi, SMACH::TYPE_ENTROPY); } - -void MACHWidget::on_pushButtonHeuristicScan_clicked() -{ - setTreeItem(ui->treeWidgetNavi, SMACH::TYPE_NFDSCAN); -} diff --git a/MACH/machwidget.h b/MACH/machwidget.h index e145708d..423cb994 100644 --- a/MACH/machwidget.h +++ b/MACH/machwidget.h @@ -170,7 +170,6 @@ private slots: void on_pushButtonStrings_clicked(); void on_pushButtonMemoryMap_clicked(); void on_pushButtonEntropy_clicked(); - void on_pushButtonHeuristicScan_clicked(); private: enum CB { diff --git a/MACH/machwidget.ui b/MACH/machwidget.ui index 6411f955..9abf9a8e 100644 --- a/MACH/machwidget.ui +++ b/MACH/machwidget.ui @@ -100,13 +100,6 @@ - - - - Heuristic scan - - - @@ -2864,11 +2857,13 @@ DIEWidgetAdvanced QWidget
diewidgetadvanced.h
+ 1 YARAWidgetAdvanced QWidget
yarawidgetadvanced.h
+ 1 XMultiDisasmWidget diff --git a/MSDOS/msdoswidget.cpp b/MSDOS/msdoswidget.cpp index 3cf3d9a8..0ec40b1f 100644 --- a/MSDOS/msdoswidget.cpp +++ b/MSDOS/msdoswidget.cpp @@ -509,8 +509,3 @@ void MSDOSWidget::on_pushButtonEntropy_clicked() { setTreeItem(ui->treeWidgetNavi, SMSDOS::TYPE_ENTROPY); } - -void MSDOSWidget::on_pushButtonHeuristicScan_clicked() -{ - setTreeItem(ui->treeWidgetNavi, SMSDOS::TYPE_NFDSCAN); -} diff --git a/MSDOS/msdoswidget.h b/MSDOS/msdoswidget.h index eb8dd502..da6bff0c 100644 --- a/MSDOS/msdoswidget.h +++ b/MSDOS/msdoswidget.h @@ -67,7 +67,6 @@ private slots: void on_pushButtonStrings_clicked(); void on_pushButtonMemoryMap_clicked(); void on_pushButtonEntropy_clicked(); - void on_pushButtonHeuristicScan_clicked(); private: enum CB { diff --git a/MSDOS/msdoswidget.ui b/MSDOS/msdoswidget.ui index 5e2af988..0eebf037 100644 --- a/MSDOS/msdoswidget.ui +++ b/MSDOS/msdoswidget.ui @@ -100,13 +100,6 @@ - - - - Heuristic scan - - - @@ -580,11 +573,13 @@ DIEWidgetAdvanced QWidget
diewidgetadvanced.h
+ 1 YARAWidgetAdvanced QWidget
yarawidgetadvanced.h
+ 1 XMultiDisasmWidget diff --git a/NE/newidget.cpp b/NE/newidget.cpp index 47f71cfb..672b9405 100644 --- a/NE/newidget.cpp +++ b/NE/newidget.cpp @@ -733,11 +733,6 @@ void NEWidget::on_pushButtonEntropy_clicked() setTreeItem(ui->treeWidgetNavi, SNE::TYPE_ENTROPY); } -void NEWidget::on_pushButtonHeuristicScan_clicked() -{ - setTreeItem(ui->treeWidgetNavi, SNE::TYPE_NFDSCAN); -} - void NEWidget::onTableView_SEGMENTS_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(current) diff --git a/NE/newidget.h b/NE/newidget.h index c156a5d8..c7ac467a 100644 --- a/NE/newidget.h +++ b/NE/newidget.h @@ -70,7 +70,6 @@ private slots: void on_pushButtonStrings_clicked(); void on_pushButtonMemoryMap_clicked(); void on_pushButtonEntropy_clicked(); - void on_pushButtonHeuristicScan_clicked(); void onTableView_SEGMENTS_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); private: diff --git a/NE/newidget.ui b/NE/newidget.ui index 4962c375..3f937f10 100644 --- a/NE/newidget.ui +++ b/NE/newidget.ui @@ -100,13 +100,6 @@ - - - - Heuristic scan - - - @@ -688,11 +681,13 @@ DIEWidgetAdvanced QWidget
diewidgetadvanced.h
+ 1 YARAWidgetAdvanced QWidget
yarawidgetadvanced.h
+ 1 XMultiDisasmWidget diff --git a/PE/pewidget.cpp b/PE/pewidget.cpp index a921e31e..f96f6451 100755 --- a/PE/pewidget.cpp +++ b/PE/pewidget.cpp @@ -3072,11 +3072,6 @@ void PEWidget::on_pushButtonEntropy_clicked() setTreeItem(ui->treeWidgetNavi, SPE::TYPE_ENTROPY); } -void PEWidget::on_pushButtonHeuristicScan_clicked() -{ - setTreeItem(ui->treeWidgetNavi, SPE::TYPE_NFDSCAN); -} - void PEWidget::on_pushButtonDisasm_clicked() { setTreeItem(ui->treeWidgetNavi, SPE::TYPE_DISASM); diff --git a/PE/pewidget.h b/PE/pewidget.h index 9112482b..954d8818 100755 --- a/PE/pewidget.h +++ b/PE/pewidget.h @@ -129,7 +129,6 @@ private slots: 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_toolButtonPrev_clicked(); diff --git a/PE/pewidget.ui b/PE/pewidget.ui index 263fde32..7a9482fe 100755 --- a/PE/pewidget.ui +++ b/PE/pewidget.ui @@ -103,13 +103,6 @@ - - - - Heuristic scan - - - @@ -3171,11 +3164,13 @@ DIEWidgetAdvanced QWidget
diewidgetadvanced.h
+ 1 YARAWidgetAdvanced QWidget
yarawidgetadvanced.h
+ 1 XMultiDisasmWidget diff --git a/formatswidget.cpp b/formatswidget.cpp index 9393b301..ea70620d 100644 --- a/formatswidget.cpp +++ b/formatswidget.cpp @@ -47,7 +47,7 @@ void FormatsWidget::setName(const QString &sFileName, bool bScan) this->g_sFileName = sFileName; this->g_bScan = bScan; - XFormats::setFileTypeComboBox(XBinary::FT_UNKNOWN, g_sFileName, ui->comboBoxFileType); + XFormats::setFileTypeComboBox(XBinary::FT_UNKNOWN, g_sFileName, ui->comboBoxFileType, XBinary::TL_OPTION_ALL); reload(); } @@ -177,7 +177,7 @@ void FormatsWidget::reload() } else if ((fileType == XBinary::FT_ZIP) || (fileType == XBinary::FT_MACHOFAT) || (fileType == XBinary::FT_AR) || (fileType == XBinary::FT_TAR) || (fileType == XBinary::FT_GZIP) || (fileType == XBinary::FT_TARGZ) || (fileType == XBinary::FT_NPM) || (fileType == XBinary::FT_ZLIB) || (fileType == XBinary::FT_LHA) || (fileType == XBinary::FT_JAR) || (fileType == XBinary::FT_APK) || (fileType == XBinary::FT_IPA) || - (fileType == XBinary::FT_APKS)) { + (fileType == XBinary::FT_APKS || (fileType == XBinary::FT_MACHOFAT))) { ui->pushButtonArchive->setText(XFormats::getFileFormatInfo(fileType, &file).sString); bool bMANIFESTMF = false; @@ -860,7 +860,7 @@ QString FormatsWidget::getScanEngine(const QString &sDefault) XBinary::FT fileType = getCurrentFileType(); // TODO !!! - if ((fileType == XBinary::FT_DEX) || (fileType == XBinary::FT_ELF32) || (fileType == XBinary::FT_ELF64) || (fileType == XBinary::FT_MACHO32) || + if ((fileType == XBinary::FT_DEX) || (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)) { sResult = "nfd"; diff --git a/formatwidget.cpp b/formatwidget.cpp index 05a3859c..23375f35 100644 --- a/formatwidget.cpp +++ b/formatwidget.cpp @@ -129,7 +129,7 @@ void FormatWidget::setData(const QString &sFileName, FW_DEF::OPTIONS options, qu { g_sFileName = sFileName; - QFile *pFile = new QFile(sFileName); + QFile *pFile = new QFile(sFileName); // TODO delete !!! XBinary::tryToOpen(pFile); @@ -1603,7 +1603,7 @@ XDateTimeEditX *FormatWidget::createTimeDateEdit(QTableWidget *pTableWidget, qin result->setProperty("STYPE", nType); result->setProperty("NDATA", nData); - connect(result, SIGNAL(valueChanged(QVariant)), this, SLOT(widgetValueChange(QVariant))); // TODO Check widgetValueChanged + connect(result, SIGNAL(valueChanged(QVariant)), this, SLOT(widgetValueChanged(QVariant))); // TODO Check widgetValueChanged pTableWidget->setCellWidget(nData, HEADER_COLUMN_INFO, result);