Skip to content

Commit

Permalink
Update file(s): 2024-05-15
Browse files Browse the repository at this point in the history
horsicq committed May 15, 2024
1 parent 1ff0ae3 commit d68db2c
Showing 25 changed files with 33 additions and 112 deletions.
5 changes: 0 additions & 5 deletions Binary/binarywidget.cpp
Original file line number Diff line number Diff line change
@@ -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);
1 change: 0 additions & 1 deletion Binary/binarywidget.h
Original file line number Diff line number Diff line change
@@ -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);

31 changes: 12 additions & 19 deletions Binary/binarywidget.ui
Original file line number Diff line number Diff line change
@@ -97,13 +97,6 @@
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonHeuristicScan">
<property name="text">
<string>Heuristic scan</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBoxReadonly">
<property name="text">
@@ -468,18 +461,6 @@
<header>xhexviewwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>XMultiDisasmWidget</class>
<extends>QWidget</extends>
<header>xmultidisasmwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>SearchSignaturesWidget</class>
<extends>QWidget</extends>
<header>searchsignatureswidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>XHashWidget</class>
<extends>QWidget</extends>
@@ -510,6 +491,12 @@
<header>xvisualizationwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>SearchSignaturesWidget</class>
<extends>QWidget</extends>
<header>searchsignatureswidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>DIEWidgetAdvanced</class>
<extends>QWidget</extends>
@@ -522,6 +509,12 @@
<header>yarawidgetadvanced.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>XMultiDisasmWidget</class>
<extends>QWidget</extends>
<header>xmultidisasmwidget.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>
5 changes: 0 additions & 5 deletions ELF/elfwidget.cpp
Original file line number Diff line number Diff line change
@@ -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);
1 change: 0 additions & 1 deletion ELF/elfwidget.h
Original file line number Diff line number Diff line change
@@ -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();
9 changes: 2 additions & 7 deletions ELF/elfwidget.ui
Original file line number Diff line number Diff line change
@@ -97,13 +97,6 @@
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonHeuristicScan">
<property name="text">
<string>Heuristic scan</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBoxReadonly">
<property name="text">
@@ -1274,11 +1267,13 @@
<class>DIEWidgetAdvanced</class>
<extends>QWidget</extends>
<header>diewidgetadvanced.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>YARAWidgetAdvanced</class>
<extends>QWidget</extends>
<header>yarawidgetadvanced.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>XMultiDisasmWidget</class>
5 changes: 0 additions & 5 deletions LE/lewidget.cpp
Original file line number Diff line number Diff line change
@@ -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);
}
1 change: 0 additions & 1 deletion LE/lewidget.h
Original file line number Diff line number Diff line change
@@ -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 {
9 changes: 2 additions & 7 deletions LE/lewidget.ui
Original file line number Diff line number Diff line change
@@ -100,13 +100,6 @@
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonHeuristicScan">
<property name="text">
<string>Heuristic scan</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBoxReadonly">
<property name="text">
@@ -679,11 +672,13 @@
<class>DIEWidgetAdvanced</class>
<extends>QWidget</extends>
<header>diewidgetadvanced.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>YARAWidgetAdvanced</class>
<extends>QWidget</extends>
<header>yarawidgetadvanced.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>XMultiDisasmWidget</class>
4 changes: 2 additions & 2 deletions MACH/machprocessdata.cpp
Original file line number Diff line number Diff line change
@@ -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();
}
4 changes: 2 additions & 2 deletions MACH/machsectionheaderwidget.cpp
Original file line number Diff line number Diff line change
@@ -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();
5 changes: 0 additions & 5 deletions MACH/machwidget.cpp
Original file line number Diff line number Diff line change
@@ -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);
}
1 change: 0 additions & 1 deletion MACH/machwidget.h
Original file line number Diff line number Diff line change
@@ -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 {
9 changes: 2 additions & 7 deletions MACH/machwidget.ui
Original file line number Diff line number Diff line change
@@ -100,13 +100,6 @@
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonHeuristicScan">
<property name="text">
<string>Heuristic scan</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBoxReadonly">
<property name="text">
@@ -2864,11 +2857,13 @@
<class>DIEWidgetAdvanced</class>
<extends>QWidget</extends>
<header>diewidgetadvanced.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>YARAWidgetAdvanced</class>
<extends>QWidget</extends>
<header>yarawidgetadvanced.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>XMultiDisasmWidget</class>
5 changes: 0 additions & 5 deletions MSDOS/msdoswidget.cpp
Original file line number Diff line number Diff line change
@@ -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);
}
1 change: 0 additions & 1 deletion MSDOS/msdoswidget.h
Original file line number Diff line number Diff line change
@@ -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 {
9 changes: 2 additions & 7 deletions MSDOS/msdoswidget.ui
Original file line number Diff line number Diff line change
@@ -100,13 +100,6 @@
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonHeuristicScan">
<property name="text">
<string>Heuristic scan</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBoxReadonly">
<property name="text">
@@ -580,11 +573,13 @@
<class>DIEWidgetAdvanced</class>
<extends>QWidget</extends>
<header>diewidgetadvanced.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>YARAWidgetAdvanced</class>
<extends>QWidget</extends>
<header>yarawidgetadvanced.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>XMultiDisasmWidget</class>
5 changes: 0 additions & 5 deletions NE/newidget.cpp
Original file line number Diff line number Diff line change
@@ -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 &current, const QModelIndex &previous)
{
Q_UNUSED(current)
1 change: 0 additions & 1 deletion NE/newidget.h
Original file line number Diff line number Diff line change
@@ -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 &current, const QModelIndex &previous);

private:
9 changes: 2 additions & 7 deletions NE/newidget.ui
Original file line number Diff line number Diff line change
@@ -100,13 +100,6 @@
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonHeuristicScan">
<property name="text">
<string>Heuristic scan</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBoxReadonly">
<property name="text">
@@ -688,11 +681,13 @@
<class>DIEWidgetAdvanced</class>
<extends>QWidget</extends>
<header>diewidgetadvanced.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>YARAWidgetAdvanced</class>
<extends>QWidget</extends>
<header>yarawidgetadvanced.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>XMultiDisasmWidget</class>
5 changes: 0 additions & 5 deletions PE/pewidget.cpp
Original file line number Diff line number Diff line change
@@ -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);
1 change: 0 additions & 1 deletion PE/pewidget.h
Original file line number Diff line number Diff line change
@@ -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();
9 changes: 2 additions & 7 deletions PE/pewidget.ui
Original file line number Diff line number Diff line change
@@ -103,13 +103,6 @@
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonHeuristicScan">
<property name="text">
<string>Heuristic scan</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBoxReadonly">
<property name="text">
@@ -3171,11 +3164,13 @@
<class>DIEWidgetAdvanced</class>
<extends>QWidget</extends>
<header>diewidgetadvanced.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>YARAWidgetAdvanced</class>
<extends>QWidget</extends>
<header>yarawidgetadvanced.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>XMultiDisasmWidget</class>
6 changes: 3 additions & 3 deletions formatswidget.cpp
Original file line number Diff line number Diff line change
@@ -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";
4 changes: 2 additions & 2 deletions formatwidget.cpp
Original file line number Diff line number Diff line change
@@ -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);

0 comments on commit d68db2c

Please sign in to comment.