Fix: 2021-10-27

horsicq · Oct 27, 2021 · c00658f · c00658f
1 parent b1cdd5d
commit c00658f
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 17 deletions.
diff --git a/xbinary.cpp b/xbinary.cpp
@@ -217,7 +217,7 @@ void XBinary::setType(int nType)
     g_nType=nType;
 }
 
-int XBinary::getType()
+qint32 XBinary::getType()
 {
     return g_nType;
 }

diff --git a/xbinary.h b/xbinary.h
@@ -467,7 +467,7 @@ static const double D_ENTROPY_THRESHOLD; // 6.5
     virtual MODE getMode();
 
     void setType(int nType);
-    virtual int getType();
+    virtual qint32 getType();
     virtual QString typeIdToString(int nType);
     QString getTypeAsString();
 
@@ -1154,7 +1154,7 @@ public slots:
     QString g_sOsVersion;
     MODE g_mode;
     QString g_sVersion;
-    int g_nType;
+    qint32 g_nType;
     FT g_fileType;
     bool g_bLog;
     qint64 g_nSize;

diff --git a/xcom.cpp b/xcom.cpp
@@ -155,7 +155,7 @@ XBinary::FT XCOM::getFileType()
     return FT_COM;
 }
 
-int XCOM::getType()
+qint32 XCOM::getType()
 {
     return TYPE_EXE;
 }

diff --git a/xcom.h b/xcom.h
@@ -49,7 +49,7 @@ class XCOM : public XBinary
     virtual qint64 getEntryPointOffset(_MEMORY_MAP *pMemoryMap);
     virtual qint64 getImageSize();
     virtual FT getFileType();
-    virtual int getType();
+    virtual qint32 getType();
     virtual QString typeIdToString(int nType);
 };
 

diff --git a/xelf.cpp b/xelf.cpp
@@ -3949,7 +3949,7 @@ QString XELF::getArch()
     return getMachinesS().value(getHdr32_machine(),tr("Unknown"));
 }
 
-int XELF::getType()
+qint32 XELF::getType()
 {
     int nResult=TYPE_UNKNOWN;
 

diff --git a/xelf.h b/xelf.h
@@ -407,7 +407,7 @@ class XELF : public XBinary
 
     virtual MODE getMode();
     virtual QString getArch();
-    virtual int getType();
+    virtual qint32 getType();
     virtual FT getFileType();
     virtual OSNAME getOsName();
     virtual QString typeIdToString(int nType);

diff --git a/xle.cpp b/xle.cpp
@@ -1391,7 +1391,7 @@ XBinary::FT XLE::getFileType()
     return result;
 }
 
-int XLE::getType()
+qint32 XLE::getType()
 {
     return TYPE_EXE; // TODO
 }

diff --git a/xle.h b/xle.h
@@ -151,7 +151,7 @@ class XLE : public XMSDOS
     virtual bool isBigEndian();
     virtual qint64 getEntryPointOffset(_MEMORY_MAP *pMemoryMap);
     virtual FT getFileType();
-    virtual int getType();
+    virtual qint32 getType();
     virtual QString typeIdToString(int nType);
 
     static QMap<quint64,QString> getImageLEMagics();

diff --git a/xmach.cpp b/xmach.cpp
@@ -4319,7 +4319,7 @@ XBinary::FT XMACH::getFileType()
     return result;
 }
 
-int XMACH::getType()
+qint32 XMACH::getType()
 {
     int nResult=TYPE_UNKNOWN;
 
@@ -4476,6 +4476,7 @@ XBinary::OSINFO XMACH::getOsInfo()
                 {
                     result.osName=OSNAME_MAC_OS_X;
                 }
+                // TODO !
             }
             else if((result.osName==OSNAME_IPHONEOS)||(result.osName==OSNAME_IOS)||(result.osName==OSNAME_IPADOS))
             {
@@ -4504,6 +4505,10 @@ XBinary::OSINFO XMACH::getOsInfo()
                 {
                     result.osName=OSNAME_IPHONEOS;
                 }
+                else
+                {
+                    result.osName=OSNAME_IOS;
+                }
             }
         }
     }

diff --git a/xmach.h b/xmach.h
@@ -660,7 +660,7 @@ class XMACH : public XBinary
     virtual MODE getMode();
     virtual QString getArch();
     virtual FT getFileType();
-    virtual int getType();
+    virtual qint32 getType();
     virtual OSINFO getOsInfo();
     virtual QString typeIdToString(int nType);
 

diff --git a/xmsdos.cpp b/xmsdos.cpp
@@ -643,7 +643,7 @@ XBinary::FT XMSDOS::getFileType()
     return FT_MSDOS;
 }
 
-int XMSDOS::getType()
+qint32 XMSDOS::getType()
 {
     return TYPE_EXE;
 }

diff --git a/xmsdos.h b/xmsdos.h
@@ -132,7 +132,7 @@ class XMSDOS : public XBinary
     virtual QString getArch();
     virtual bool isBigEndian();
     virtual FT getFileType();
-    virtual int getType();
+    virtual qint32 getType();
     virtual OSINFO getOsInfo();
     virtual QString typeIdToString(int nType);
 };

diff --git a/xne.cpp b/xne.cpp
@@ -1108,7 +1108,7 @@ XBinary::FT XNE::getFileType()
     return FT_NE;
 }
 
-int XNE::getType()
+qint32 XNE::getType()
 {
     return TYPE_EXE; // TODO
 }

diff --git a/xne.h b/xne.h
@@ -136,7 +136,7 @@ class XNE : public XMSDOS
     virtual bool isBigEndian();
     virtual qint64 getEntryPointOffset(_MEMORY_MAP *pMemoryMap);
     virtual FT getFileType();
-    virtual int getType();
+    virtual qint32 getType();
     virtual QString typeIdToString(int nType);
 };
 

diff --git a/xpe.cpp b/xpe.cpp
@@ -194,7 +194,7 @@ XBinary::FT XPE::getFileType()
     return result;
 }
 
-int XPE::getType()
+qint32 XPE::getType()
 {
     TYPE result=TYPE_APPLICATION;
 

diff --git a/xpe.h b/xpe.h
@@ -340,7 +340,7 @@ class XPE : public XMSDOS
     virtual OSINFO getOsInfo();
 
     virtual FT getFileType();
-    virtual int getType();
+    virtual qint32 getType();
     virtual QString typeIdToString(int nType);
 
     virtual bool isSigned();