Attack of the clone compressors - adding some of them (#53)

Author: temisu

README.md

@@ -26,20 +26,25 @@ Decompression algorithms provided:
  * Crm!: Crunch-Mania standard-mode, sampled
  * CrM2: Crunch-Mania LZH-mode
  * Crm2: Crunch-Mania LZH-mode, sampled
+ * ID 0x18051973 (CrunchMania CrM2 Clone)
+ * ID CD³¹ (CrunchMania CrM2 Clone)
+ * ID DCS! (CrunchMania CrM! Clone)
+ * ID Iron (CrunchMania CrM2 Clone)
+ * ID MSS! (CrunchMania CrM2 Clone)
+ * ID mss! (CrunchMania Crm2 Clone)
 * Disk Masher System a.k.a. DMS
  * Supports all different compression methods (NONE,SIMPLE,QUICK,MEDIUM,DEEP,HEAVY1,HEAVY2)
  * Supports password bypassing
-* File Imploder (and most of its clones)
- * ATN!
- * BDPI
- * CHFI
- * EDAM
- * IMP!
- * M.H.
- * RDC9
- * FLT! (verification missing)
- * Dupa (verification missing)
- * PARA (verification missing)
+* File Imploder
+ * ID ATN! (Imploder Clone)
+ * ID BDPI (Imploder Clone)
+ * ID CHFI (Imploder Clone)
+ * ID EDAM (Imploder Clone)
+ * ID M.H. (Imploder Clone)
+ * ID RDC9 (Imploder Clone)
+ * ID FLT! (Imploder Clone) (verification missing)
+ * ID Dupa (Imploder Clone) (verification missing)
+ * ID PARA (Imploder Clone) (verification missing)
 * Freeze/Melt
  * Supports both old and new formats
 * gzip
@@ -52,10 +57,16 @@ Decompression algorithms provided:
  * PP 1.1 (verification missing)
  * PP 2.0
  * PX20: Supports bypassing password protected files.
+ * ID CHFC (PowerPacker Clone)
+ * ID DEN! (PowerPacker Clone)
+ * ID DXS9 (PowerPacker Clone)
+ * ID H.D. (PowerPacker Clone)
+ * ID RVV! (PowerPacker Clone)
 * Quasijarus Strong Compression
 * Rob Northen compressors.
  * RNC1: Both old and formats utilizing the same header. heuristics for detecting the correct one
  * RNC2: RNC version 2 stream
+ * ID ...1 (RNC1 Clone)
 * Turbo Packer by Wolfgang Mayerle.
 * MMCMP: Music Module Compressor
 * SCO Compress LZH
@@ -68,6 +79,11 @@ Decompression algorithms provided:
  * S401: StoneCracker v4.01
  * S403: StoneCracker v4.02a
  * S404: StoneCracker v4.10
+ * ID 1AM (StoneCracker S300 Clone)
+ * ID 2AM (StoneCracker S404 Clone)
+ * ID AYS! (StoneCracker S404 Clone)
+ * ID Z&G! (StoneCracker S403 Clone)
+ * ID ZULU (StoneCracker S403 Clone)
 * XPK-encapsulated files
  * ACCA: Andre's Code Compression Algorithm
  * ARTM: Arithmetic encoding compressor

main.cpp

@@ -229,54 +229,43 @@ int main(int argc,char **argv)
 processDir(name);
 } else if (st.st_mode&S_IFREG) {
 auto packed{readFile(name)};
-size_t scanPos=0;
-size_t scanSize=packed->size();
 for (size_t i=0;i<packed->size();)
 {
-scanPos+=1;
-scanSize-=1;
 // We will detect first, before trying the format for real
-if (!ancient::Decompressor::detect(packed->data()+scanPos,scanSize))
+if (!ancient::Decompressor::detect(packed->data()+i,packed->size()-i))
 {
 i++;
 continue;
 }
 try
 {
-ancient::Decompressor decompressor{packed->data()+scanPos,scanSize,false,true};
-// for formats that do not encode packed size.
-// we will get it from decompressor
+ancient::Decompressor decompressor{packed->data()+i,packed->size()-i,false,true};
+
+printf("trying %s\n",decompressor.getName().c_str());
 if (!decompressor.getPackedSize())
 {
-try
-{
-decompressor.decompress(true);
-} catch (const std::bad_alloc&) {
-fprintf(stderr,"Out of memory\n");
-i++;
-continue;
-}
+// for formats that do not encode packed size.
+// we will get it from decompressor
+decompressor.decompress(true);
 }
-if (decompressor.getPackedSize())
+
+// final checks with the limited buffer and fresh decompressor
+const uint8_t *finalData=packed->data()+i;
+size_t finalSize=decompressor.getPackedSize().value();
+ancient::Decompressor decompressor2{finalData,finalSize,true,true};
+try
 {
-// final checks with the limited buffer and fresh decompressor
-const uint8_t *finalData=packed->data()+scanPos;
-size_t finalSize=decompressor.getPackedSize().value();
-ancient::Decompressor decompressor2{finalData,finalSize,true,true};
-try
-{
-decompressor2.decompress(true);
-} catch (const std::bad_alloc&) {
-fprintf(stderr,"Out of memory\n");
-i++;
-continue;
-}
-std::string outputName=std::string(argv[3])+"/file"+std::to_string(fileIndex++)+".pack";
-printf("Found compressed stream at %zu, size %zu in file %s with type '%s', storing it into %s\n",i,decompressor2.getPackedSize().value(),name.c_str(),decompressor2.getName().c_str(),outputName.c_str());
-writeFile(outputName,finalData,finalSize);
-i+=finalSize;
+decompressor2.decompress(true);
+} catch (const std::bad_alloc&) {
+fprintf(stderr,"Out of memory\n");
+i++;
 continue;
 }
+std::string outputName=std::string(argv[3])+"/file"+std::to_string(fileIndex++)+".pack";
+printf("Found compressed stream at %zu, size %zu in file %s with type '%s', storing it into %s\n",i,decompressor2.getPackedSize().value(),name.c_str(),decompressor2.getName().c_str(),outputName.c_str());
+writeFile(outputName,finalData,finalSize);
+i+=finalSize;
+continue;
 } catch (const ancient::Error&) {
 // full steam ahead (with next offset)
 } catch (const std::bad_alloc&) {

src/CRMDecompressor.cpp

@@ -24,6 +24,18 @@ bool CRMDecompressor::detectHeader(uint32_t hdr) noexcept
 case FourCC("Crm!"):
 [[fallthrough]];
 case FourCC("Crm2"):
+[[fallthrough]];
+case 0x1805'1973U:// Fears
+[[fallthrough]];
+case FourCC("CD\xb3\xb9"):// BiFi 2
+[[fallthrough]];
+case FourCC("DCS!"):// Sonic Attack/DualCrew-Shining
+[[fallthrough]];
+case FourCC("Iron"):// Sun / TRSI
+[[fallthrough]];
+case FourCC("MSS!"):// Infection / Mystic
+[[fallthrough]];
+case FourCC("mss!"):
 return true;
 
 default:
@@ -53,6 +65,10 @@ CRMDecompressor::CRMDecompressor(const Buffer &packedData,uint32_t recursionLeve
 uint32_t hdr{packedData.readBE32(0)};
 if (!detectHeader(hdr) || packedData.size()<20)
 throw Decompressor::InvalidFormatError();
+if (hdr==0x1805'1973U || hdr==FourCC("CD\xb3\xb9") ||
+hdr==FourCC("Iron") || hdr==FourCC("MSS!")) hdr=FourCC("CrM2");
+if (hdr==FourCC("mss!")) hdr=FourCC("Crm2");
+if (hdr==FourCC("DCS!")) hdr=FourCC("CrM!");
 
 _rawSize=packedData.readBE32(6);
 _packedSize=packedData.readBE32(10);

src/CRMDecompressor.hpp

@@ -34,11 +34,11 @@ class CRMDecompressor : public Decompressor, public XPKDecompressor
 private:
 const Buffer	&_packedData;
 
-uint32_t_packedSize=0;
-uint32_t_rawSize=0;
-bool_isLZH=false;// "normal" compression or LZH compression
-bool_isSampled=false;// normal or "sampled" i.e. obsfuscated
-bool_isXPKDelta=false;// If delta encoding defined in XPK
+uint32_t_packedSize{0};
+uint32_t_rawSize{0};
+bool_isLZH{false};// "normal" compression or LZH compression
+bool_isSampled{false};// normal or "sampled" i.e. obsfuscated
+bool_isXPKDelta{false};// If delta encoding defined in XPK
 };
 
 }

src/CompactDecompressor.cpp

@@ -26,8 +26,8 @@ std::shared_ptr<Decompressor> CompactDecompressor::create(const Buffer &packedDa
 }
 
 CompactDecompressor::CompactDecompressor(const Buffer &packedData,bool exactSizeKnown,bool verify) :
-_packedData(packedData),
-_exactSizeKnown(exactSizeKnown)
+_packedData{packedData},
+_exactSizeKnown{exactSizeKnown}
 {
 if (_packedData.size()<2U)
 throw InvalidFormatError();

src/CompressDecompressor.cpp

@@ -21,7 +21,7 @@ std::shared_ptr<Decompressor> CompressDecompressor::create(const Buffer &packedD
 }
 
 CompressDecompressor::CompressDecompressor(const Buffer &packedData,bool exactSizeKnown,bool verify) :
-_packedData(packedData)
+_packedData{packedData}
 {
 // Can't do anything with undefined size stream
 if (!exactSizeKnown)

src/Decompressor.cpp

@@ -46,7 +46,8 @@ static std::vector<std::pair<bool(*)(uint32_t),std::shared_ptr<Decompressor>(*)(
 {TPWMDecompressor::detectHeader,TPWMDecompressor::create},
 {XPKMain::detectHeader,XPKMain::create},
 // Putting StoneCracker last since detection can be accidentally be detected instead of correct format
-{StoneCrackerDecompressor::detectHeader,StoneCrackerDecompressor::create}};
+{StoneCrackerDecompressor::detectHeader,StoneCrackerDecompressor::create}
+};
 
 std::shared_ptr<Decompressor> Decompressor::create(const Buffer &packedData,bool exactSizeKnown,bool verify)
 {
@@ -65,6 +66,7 @@ std::shared_ptr<Decompressor> Decompressor::create(const Buffer &packedData,bool
 
 bool Decompressor::detect(const Buffer &packedData) noexcept
 {
+if (packedData.size()<2) return false;
 try
 {
 uint32_t hdr{(packedData.size()>=4)?packedData.readBE32(0):(uint32_t(packedData.readBE16(0))<<16)};

src/HFMNDecompressor.hpp

@@ -14,9 +14,9 @@ class HFMNDecompressor : public XPKDecompressor
 HFMNDecompressor(uint32_t hdr,uint32_t recursionLevel,const Buffer &packedData,std::shared_ptr<XPKDecompressor::State> &state,bool verify);
 ~HFMNDecompressor() noexcept=default;
 
-virtual const std::string &getSubName() const noexcept final;
+const std::string &getSubName() const noexcept final;
 
-virtual void decompressImpl(Buffer &rawData,const Buffer &previousData,bool verify) final;
+void decompressImpl(Buffer &rawData,const Buffer &previousData,bool verify) final;
 
 static bool detectHeaderXPK(uint32_t hdr) noexcept;
 static std::shared_ptr<XPKDecompressor> create(uint32_t hdr,uint32_t recursionLevel,const Buffer &packedData,std::shared_ptr<XPKDecompressor::State> &state,bool verify);

src/IMPDecompressor.cpp

@@ -16,25 +16,25 @@ static bool readIMPHeader(uint32_t hdr,uint32_t &addition) noexcept
 {
 switch (hdr)
 {
-case FourCC("ATN!"):
+case FourCC("ATN!"):// Team 17 games
 [[fallthrough]];
-case FourCC("EDAM"):
+case FourCC("EDAM"):// Indy Heat
 [[fallthrough]];
-case FourCC("IMP!"):
+case FourCC("IMP!"):// Original!!
 [[fallthrough]];
-case FourCC("M.H."):
+case FourCC("M.H."):// Georg Glaxo
 addition=7;
 return true;
 
-case FourCC("BDPI"):
+case FourCC("BDPI"):// Dizzy's excellent adventures
 addition=0x6e8;
 return true;
 
-case FourCC("CHFI"):
+case FourCC("CHFI"):// Dizzy's excellent adventures, Bubble and Squeak
 addition=0xfe4;
 return true;
 
-case FourCC("RDC9"):// Files do not contain checksum
+case FourCC("RDC9"):// Telekommando 2 (Files do not contain checksum)
 [[fallthrough]];
 // I haven't got these files to be sure what is the addition
 case FourCC("Dupa"):

src/PPDecompressor.cpp

@@ -19,7 +19,12 @@ PPDecompressor::PPState::PPState(uint32_t mode) noexcept :
 
 bool PPDecompressor::detectHeader(uint32_t hdr) noexcept
 {
-return (hdr==FourCC("PP11") || hdr==FourCC("PP20") || hdr==FourCC("PX20"));
+return hdr==FourCC("PP11") || hdr==FourCC("PP20") || hdr==FourCC("PX20")
+|| hdr==FourCC("CHFC")// Sky High Stuntman
+|| hdr==FourCC("DEN!")// Jewels - Crossroads
+|| hdr==FourCC("DXS9")// Hopp oder Top, Punkt Punkt Punkt
+|| hdr==FourCC("H.D.")// F1 Challenge
+|| hdr==FourCC("RVV!");// Hoi AGA Remix
 }
 
 bool PPDecompressor::detectHeaderXPK(uint32_t hdr) noexcept