Fix

horsicq · Apr 29, 2019 · 1d98240 · 1d98240
1 parent 3b45fdb
commit 1d98240
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 71 deletions.
diff --git a/binary.h b/binary.h
@@ -225,16 +225,12 @@ public slots:
     //    char pEntryPoint[EPCODE];
     //    unsigned int nEntryPointSize;
     unsigned long long ___nSize;
-
     unsigned char *___pMemory;
-
     int nIsReverse;
 
 private:
     //    void _clearMemory();
     //    void addMemory(unsigned int nOffset,unsigned int nSize);
-
-
 };
 
 #endif // BINARY_H
diff --git a/die_source/dielib/dielib.h b/die_source/dielib/dielib.h
@@ -11,10 +11,9 @@
 #define DIE_SINGLELINEOUTPUT        0x00000010
 #define DIE_SHOWFILEFORMATONCE      0x00000020
 
-#ifdef Q_OS_WIN
-typedef unsigned short wchar_t;
-#endif
-
+//#ifdef Q_OS_WIN
+//typedef unsigned short wchar_t;
+//#endif
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/die_source/scan.h b/die_source/scan.h
@@ -21,7 +21,6 @@
 #ifndef SCAN_H
 #define SCAN_H
 
-
 #include <QCoreApplication>
 //#include <QtConcurrentMap>
 #include <QFutureWatcher>
@@ -55,26 +54,22 @@ class Scan : public QObject
 {
     Q_OBJECT
 public:
-    explicit Scan(QObject *parent = 0);
+    explicit Scan(QObject *parent=nullptr);
     void setData(QString sScanFileName,__DIE_OPTIONS *pOptions);
     void setData(QList<QString> *dirContent,__DIE_OPTIONS *pOptions);
     void setData(__DIE_OPTIONS *pOptions);
     void setShowSource(bool bShowSource);
-
     bool isRun();
     bool isCompleted();
     void setRun(bool bIsRun);
-
     bool analize(QString sFileName,bool bFullScan);
     bool die_scanPE(QString sFileName,QString sPrefix);
     bool die_scanELF(QString sFileName,QString sPrefix);
     bool die_scanMACH(QString sFileName,QString sPrefix);
     bool die_scanMSDOS(QString sFileName,QString sPrefix);
     bool die_scanText(QString sFileName,QString sPrefix);
     bool die_scanBinary(QString sFileName,QString sPrefix);
-
     void die_handleSignatures(PluginsScript *pluginScript,QList<__SIGNATURE> *pListSignatures,QString sType);
-
     static void loadTypeScripts(QList<__SIGNATURE> *pList,QString sType,__DIE_OPTIONS *pOptions);
     static void die_loadScripts(__DIE_OPTIONS *pOptions);
     //    void _compareFile(QString sScript);

diff --git a/die_source/scriptbinary.h b/die_source/scriptbinary.h
@@ -29,7 +29,7 @@ class scriptBinary : public scriptGeneric
 {
     Q_OBJECT
 public:
-    explicit scriptBinary(QObject *parent = 0);
+    explicit scriptBinary(QObject *parent=nullptr);
     void setData(Binary *binary);
 
 signals:
@@ -41,12 +41,10 @@ public slots:
     //    QString upperCase(QString sString);
 
     //    bool isPlainText();
-
     bool compare(QString sSignature,unsigned int nOffset=0);
     //    bool compareHeader(QString sSignature);
     bool compareEP(QString sSignature,unsigned int nOffset=0);
     //    bool compareEPn(QString sSignature,unsigned int nOffset);
-
     QString getString(unsigned int nOffset,unsigned int nSize=50);
     unsigned int readDword(unsigned int nOffset);
     unsigned short readWord(unsigned int nOffset);
@@ -62,7 +60,6 @@ public slots:
     int findString(unsigned int nOffset, unsigned int nSize, QString sValue);
     int findSignature(unsigned int nOffset, unsigned int nSize, QString sSignature);
     bool isSignaturePresent(unsigned int nOffset, unsigned int nSize, QString sSignature);
-
     float calculateEntropy(unsigned int nOffset, unsigned int nSize);
     QString getSignature(unsigned int nOffset,unsigned int nSize);
     QString calculateMD5(unsigned int nOffset, unsigned int nSize);

diff --git a/die_source/scriptelf.h b/die_source/scriptelf.h
@@ -34,7 +34,6 @@ class scriptELF : public scriptGeneric
 
 public slots:
     QString getGeneralOptions();
-
     unsigned short getElfHeader_type();
     unsigned short getElfHeader_machine();
     unsigned int getElfHeader_version();
@@ -51,7 +50,6 @@ public slots:
     unsigned short getElfHeader_shentsize();
     unsigned short getElfHeader_shnum();
     unsigned short getElfHeader_shstrndx();
-
     bool compareEP(QString sSignature,unsigned int nOffset=0);
     //    bool compareEPn(QString sSignature,unsigned int nOffset);
     //    bool compareHeader(QString sSignature);
@@ -71,41 +69,28 @@ public slots:
     int findString(unsigned int nOffset, unsigned int nSize, QString sValue);
     int findSignature(unsigned int nOffset, unsigned int nSize, QString sSignature);
     bool isSignaturePresent(unsigned int nOffset, unsigned int nSize, QString sSignature);
-
     //    bool compareReg(QString sSignature,unsigned int nOffset);
-
     bool isSectionNamePresent(QString sSectionName);
     bool isStringInTablePresent(QString sSectionName, QString sString);
-
     float calculateEntropy(unsigned int nOffset, unsigned int nSize);
     QString getSignature(unsigned int nOffset,unsigned int nSize);
     QString calculateMD5(unsigned int nOffset, unsigned int nSize);
-
     unsigned int getSectionFileOffset(int nSection);
     unsigned int getSectionFileSize(int nSection);
     int getSectionNumber(QString sSectionName);
-
     long long RVAToOffset(unsigned long long nRVA);
     long long VAToOffset(unsigned long long nVA);
     long long OffsetToVA(unsigned long long nOffset);
     long long OffsetToRVA(unsigned long long nOffset);
-
     unsigned int getProgramFileOffset(int nProgram);
     unsigned int getProgramFileSize(int nProgram);
-
     unsigned int getOverlaySize();
     unsigned int getOverlayOffset();
     bool isOverlayPresent();
-
-
     int getNumberOfSections();
     int getNumberOfPrograms();
-
     QString getSectionName(int nSection);
-
-
     bool compareOverlay(QString sSignature,unsigned int nOffset=0);
-
     long long getEntryPointOffset();
 private:
     ELFFile *elffile;

diff --git a/die_source/scriptgeneric.h b/die_source/scriptgeneric.h
@@ -45,7 +45,6 @@ public slots:
     //    virtual bool compareHeader(QString sSignature)=0;
     virtual bool compareEP(QString sSignature,unsigned int nOffset)=0;
     //    virtual bool compareEP(unsigned int nOffset,QString sSignature)=0;
-
     virtual QString getString(unsigned int nOffset,unsigned int nSize=50)=0;
     virtual unsigned int readDword(unsigned int nOffset)=0;
     virtual unsigned short readWord(unsigned int nOffset)=0;
@@ -63,7 +62,6 @@ public slots:
     virtual bool isSignaturePresent(unsigned int nOffset, unsigned int nSize, QString sSignature)=0;
     virtual float calculateEntropy(unsigned int nOffset, unsigned int nSize)=0;
     virtual QString getSignature(unsigned int nOffset,unsigned int nSize)=0;
-
     virtual QString calculateMD5(unsigned int nOffset, unsigned int nSize)=0;
 
 public slots:

diff --git a/die_source/scriptmach.h b/die_source/scriptmach.h
@@ -35,7 +35,6 @@ public slots:
 
     bool compareEP(QString sSignature,unsigned int nOffset=0);
     //    bool compareEPn(QString sSignature,unsigned int nOffset);
-
     QString getString(unsigned int nOffset,unsigned int nSize=50);
     unsigned int readDword(unsigned int nOffset);
     unsigned short readWord(unsigned int nOffset);
@@ -58,33 +57,25 @@ public slots:
     bool isLibraryPresent(QString sLibrary);
     unsigned int getLibraryCurrentVersion(QString sLibrary);
     int getSectionNumber(QString sSectionName);
-
     QString getGeneralOptions();
     int getNumberOfSections();
     int getNumberOfSegments();
-
     float calculateEntropy(unsigned int nOffset, unsigned int nSize);
     QString getSignature(unsigned int nOffset,unsigned int nSize);
     QString calculateMD5(unsigned int nOffset, unsigned int nSize);
-
     unsigned int getSectionFileOffset(int nSection);
     unsigned int getSectionFileSize(int nSection);
-
     QString getSectionName(int nSection);
-
     QString getSegmentName(int nSegment);
     unsigned int getSegmentFileSize(int nSegment);
     unsigned int getSegmentFileOffset(int nSegment);
-
     long long RVAToOffset(unsigned long long nRVA);
     long long VAToOffset(unsigned long long nVA);
     long long OffsetToVA(unsigned long long nOffset);
     long long OffsetToRVA(unsigned long long nOffset);
-
     unsigned int getOverlaySize();
     unsigned int getOverlayOffset();
     bool isOverlayPresent();
-
     bool compareOverlay(QString sSignature,unsigned int nOffset=0);
     long long getEntryPointOffset();
 private:

diff --git a/die_source/scriptmsdos.h b/die_source/scriptmsdos.h
@@ -31,12 +31,10 @@ class scriptMSDOS : public scriptGeneric
     explicit scriptMSDOS(QObject *parent = 0);
     void setData(MSDOSFile *msdosfile);
 
-
 public slots:
 
     bool compareEP(QString sSignature,unsigned int nOffset=0);
     //    bool compareEPn(QString sSignature,unsigned int nOffset);
-
     QString getString(unsigned int nOffset,unsigned int nSize=50);
     unsigned int readDword(unsigned int nOffset);
     unsigned short readWord(unsigned int nOffset);

diff --git a/die_source/singlefilescan.cpp b/die_source/singlefilescan.cpp
@@ -177,7 +177,7 @@ void SingleFileScan::appendError(QString sMessage)
     appendMessage(sMessage);
 }
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
 bool  WINAPI  _DllMain(_In_  HINSTANCE hinstDLL,_In_  DWORD fdwReason,_In_  LPVOID lpvReserved)
 {
     switch(fdwReason)

diff --git a/die_source/singlefilescan.h b/die_source/singlefilescan.h
@@ -10,7 +10,7 @@ class SingleFileScan : public QObject
 {
     Q_OBJECT
 public:
-    SingleFileScan(QObject *parent = 0);
+    SingleFileScan(QObject *parent=nullptr);
 
     //    void setOptions(__DIE_OPTIONS *pOptions);
     static void flagsToOptions(unsigned int nFlags,__DIE_OPTIONS *pOptions);
@@ -31,7 +31,7 @@ private slots:
     QString sResult;
     QString sCurrentType;
 };
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
 bool  WINAPI  _DllMain(_In_  HINSTANCE hinstDLL,_In_  DWORD fdwReason,_In_  LPVOID lpvReserved);
 #endif
 int __DIE_scan(QString szFileName,char *pszOutBuffer,int nOutBufferSize,unsigned int nFlags,QString sDataBase);

diff --git a/machfile.cpp b/machfile.cpp
@@ -27,7 +27,6 @@ MACHFile::MACHFile(QObject *parent) :
 
 bool MACHFile::isValid()
 {
-
     if(size()>=(int)sizeof(mach_header))
     {
         unsigned int nMagic=readDword(0);
@@ -53,13 +52,11 @@ bool MACHFile::isMACH64()
         return true;
     }
 
-
     return false;
 }
 
 bool MACHFile::isReverse()
 {
-
     if(nIsReverse==-1)
     {
         unsigned int nMagic=readDword(0);
@@ -429,8 +426,6 @@ unsigned int MACHFile::getSegmentHeaderOffset(unsigned int nSegment)
         {
             return getLoadCommand_offset(nResult-1);
         }
-
-
     }
 
     emit appendError(QString("Invalid segment number: %1").arg(nSegment));
@@ -912,8 +907,6 @@ QList<load_command_offset> MACHFile::getLoadCommands_offset()
         nOffset+=record.cmdsize;
     }
 
-
-
     return listResult;
 }
 
@@ -1046,7 +1039,6 @@ QList<section_64> MACHFile::getSectionsList64()
 {
     QList<section_64> listResult;
 
-
     QList<load_command_offset> list=getLoadCommands_offset();
     unsigned int nOffset=0;
 

diff --git a/pluginsscript.h b/pluginsscript.h
@@ -26,20 +26,6 @@
 #include <QFile>
 #include <QDir>
 #include "die_source/utils.h"
-//#include "../_pe.h"
-//#include "scriptpe.h"
-//#include "scriptbinary.h"
-//#include "scriptelf.h"
-//#include "scriptmsdos.h"
-////#include "dialogoptions.h"
-//#include <QTime>
-
-//struct __SD
-//{
-//    QByteArray *baData;
-//    unsigned int nEntryPointOffset;
-//    unsigned int nSize;
-//};
 
 class PluginsScript : public QScriptEngine
 {