Menu
▾
▴
[OMPT-svn-commit] OpenMPT r20427 - in trunk/OpenMPT: build/vs2017winxp/ext build/vs2017winxpansi/ext build/vs2019win10/ext build/vs2019win7/ext build/vs2019win81/ext build/vs2022win10/ext build/vs2022win10clang/ext build/vs2022win7/ext build/vs2022win81/ext include/ancient include/ancient/api/ancient include/ancient/src include/ancient/src/common
|
From: <sv...@op...> - 2024-03-23 14:50:07
|
Author: sagamusix Date: Sat Mar 23 15:49:49 2024 New Revision: 20427 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20427 Log: [Var] ancient: Update to commit c6038c179aeac138667c4319e997d6dd5a25a4be (2024-03-23) Added: trunk/OpenMPT/include/ancient/src/SHRXDecompressor.cpp (contents, props changed) trunk/OpenMPT/include/ancient/src/SHRXDecompressor.hpp (contents, props changed) trunk/OpenMPT/include/ancient/src/VariableLengthCodeDecoder.hpp (contents, props changed) trunk/OpenMPT/include/ancient/src/VicXDecompressor.cpp (contents, props changed) trunk/OpenMPT/include/ancient/src/VicXDecompressor.hpp (contents, props changed) Modified: trunk/OpenMPT/build/vs2017winxp/ext/ancient.vcxproj trunk/OpenMPT/build/vs2017winxp/ext/ancient.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/ext/ancient.vcxproj trunk/OpenMPT/build/vs2017winxpansi/ext/ancient.vcxproj.filters trunk/OpenMPT/build/vs2019win10/ext/ancient.vcxproj trunk/OpenMPT/build/vs2019win10/ext/ancient.vcxproj.filters trunk/OpenMPT/build/vs2019win7/ext/ancient.vcxproj trunk/OpenMPT/build/vs2019win7/ext/ancient.vcxproj.filters trunk/OpenMPT/build/vs2019win81/ext/ancient.vcxproj trunk/OpenMPT/build/vs2019win81/ext/ancient.vcxproj.filters trunk/OpenMPT/build/vs2022win10/ext/ancient.vcxproj trunk/OpenMPT/build/vs2022win10/ext/ancient.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/ext/ancient.vcxproj trunk/OpenMPT/build/vs2022win10clang/ext/ancient.vcxproj.filters trunk/OpenMPT/build/vs2022win7/ext/ancient.vcxproj trunk/OpenMPT/build/vs2022win7/ext/ancient.vcxproj.filters trunk/OpenMPT/build/vs2022win81/ext/ancient.vcxproj trunk/OpenMPT/build/vs2022win81/ext/ancient.vcxproj.filters trunk/OpenMPT/include/ancient/OpenMPT.txt trunk/OpenMPT/include/ancient/api/ancient/ancient.hpp trunk/OpenMPT/include/ancient/src/ACCADecompressor.cpp trunk/OpenMPT/include/ancient/src/ACCADecompressor.hpp trunk/OpenMPT/include/ancient/src/API.cpp trunk/OpenMPT/include/ancient/src/ARTMDecompressor.cpp trunk/OpenMPT/include/ancient/src/ARTMDecompressor.hpp trunk/OpenMPT/include/ancient/src/BLZWDecompressor.cpp trunk/OpenMPT/include/ancient/src/BLZWDecompressor.hpp trunk/OpenMPT/include/ancient/src/BZIP2Decompressor.cpp trunk/OpenMPT/include/ancient/src/BZIP2Decompressor.hpp trunk/OpenMPT/include/ancient/src/CBR0Decompressor.cpp trunk/OpenMPT/include/ancient/src/CBR0Decompressor.hpp trunk/OpenMPT/include/ancient/src/CRMDecompressor.cpp trunk/OpenMPT/include/ancient/src/CRMDecompressor.hpp trunk/OpenMPT/include/ancient/src/CYB2Decoder.cpp trunk/OpenMPT/include/ancient/src/CYB2Decoder.hpp trunk/OpenMPT/include/ancient/src/CompactDecompressor.cpp trunk/OpenMPT/include/ancient/src/CompactDecompressor.hpp trunk/OpenMPT/include/ancient/src/CompressDecompressor.cpp trunk/OpenMPT/include/ancient/src/CompressDecompressor.hpp trunk/OpenMPT/include/ancient/src/DEFLATEDecompressor.cpp trunk/OpenMPT/include/ancient/src/DEFLATEDecompressor.hpp trunk/OpenMPT/include/ancient/src/DLTADecode.cpp trunk/OpenMPT/include/ancient/src/DLTADecode.hpp trunk/OpenMPT/include/ancient/src/DMSDecompressor.cpp trunk/OpenMPT/include/ancient/src/DMSDecompressor.hpp trunk/OpenMPT/include/ancient/src/Decompressor.cpp trunk/OpenMPT/include/ancient/src/Decompressor.hpp trunk/OpenMPT/include/ancient/src/DynamicHuffmanDecoder.hpp trunk/OpenMPT/include/ancient/src/FASTDecompressor.cpp trunk/OpenMPT/include/ancient/src/FASTDecompressor.hpp trunk/OpenMPT/include/ancient/src/FBR2Decompressor.cpp trunk/OpenMPT/include/ancient/src/FBR2Decompressor.hpp trunk/OpenMPT/include/ancient/src/FRLEDecompressor.cpp trunk/OpenMPT/include/ancient/src/FRLEDecompressor.hpp trunk/OpenMPT/include/ancient/src/FreezeDecompressor.cpp trunk/OpenMPT/include/ancient/src/FreezeDecompressor.hpp trunk/OpenMPT/include/ancient/src/FrequencyTree.hpp trunk/OpenMPT/include/ancient/src/HFMNDecompressor.cpp trunk/OpenMPT/include/ancient/src/HFMNDecompressor.hpp trunk/OpenMPT/include/ancient/src/HUFFDecompressor.cpp trunk/OpenMPT/include/ancient/src/HUFFDecompressor.hpp trunk/OpenMPT/include/ancient/src/HuffmanDecoder.hpp trunk/OpenMPT/include/ancient/src/ILZRDecompressor.cpp trunk/OpenMPT/include/ancient/src/ILZRDecompressor.hpp trunk/OpenMPT/include/ancient/src/IMPDecompressor.cpp trunk/OpenMPT/include/ancient/src/IMPDecompressor.hpp trunk/OpenMPT/include/ancient/src/InputStream.cpp trunk/OpenMPT/include/ancient/src/InputStream.hpp trunk/OpenMPT/include/ancient/src/LHLBDecompressor.cpp trunk/OpenMPT/include/ancient/src/LHLBDecompressor.hpp trunk/OpenMPT/include/ancient/src/LIN1Decompressor.cpp trunk/OpenMPT/include/ancient/src/LIN1Decompressor.hpp trunk/OpenMPT/include/ancient/src/LIN2Decompressor.cpp trunk/OpenMPT/include/ancient/src/LIN2Decompressor.hpp trunk/OpenMPT/include/ancient/src/LOBDecompressor.cpp trunk/OpenMPT/include/ancient/src/LOBDecompressor.hpp trunk/OpenMPT/include/ancient/src/LZBSDecompressor.cpp trunk/OpenMPT/include/ancient/src/LZBSDecompressor.hpp trunk/OpenMPT/include/ancient/src/LZCBDecompressor.cpp trunk/OpenMPT/include/ancient/src/LZCBDecompressor.hpp trunk/OpenMPT/include/ancient/src/LZW2Decompressor.cpp trunk/OpenMPT/include/ancient/src/LZW2Decompressor.hpp trunk/OpenMPT/include/ancient/src/LZW4Decompressor.cpp trunk/OpenMPT/include/ancient/src/LZW4Decompressor.hpp trunk/OpenMPT/include/ancient/src/LZW5Decompressor.cpp trunk/OpenMPT/include/ancient/src/LZW5Decompressor.hpp trunk/OpenMPT/include/ancient/src/LZWDecoder.cpp trunk/OpenMPT/include/ancient/src/LZWDecoder.hpp trunk/OpenMPT/include/ancient/src/LZXDecompressor.cpp trunk/OpenMPT/include/ancient/src/LZXDecompressor.hpp trunk/OpenMPT/include/ancient/src/MASHDecompressor.cpp trunk/OpenMPT/include/ancient/src/MASHDecompressor.hpp trunk/OpenMPT/include/ancient/src/MMCMPDecompressor.cpp trunk/OpenMPT/include/ancient/src/MMCMPDecompressor.hpp trunk/OpenMPT/include/ancient/src/NONEDecompressor.cpp trunk/OpenMPT/include/ancient/src/NONEDecompressor.hpp trunk/OpenMPT/include/ancient/src/NUKEDecompressor.cpp trunk/OpenMPT/include/ancient/src/NUKEDecompressor.hpp trunk/OpenMPT/include/ancient/src/OutputStream.cpp trunk/OpenMPT/include/ancient/src/OutputStream.hpp trunk/OpenMPT/include/ancient/src/PPDecompressor.cpp trunk/OpenMPT/include/ancient/src/PPDecompressor.hpp trunk/OpenMPT/include/ancient/src/PPMQDecompressor.cpp trunk/OpenMPT/include/ancient/src/PPMQDecompressor.hpp trunk/OpenMPT/include/ancient/src/PackDecompressor.cpp trunk/OpenMPT/include/ancient/src/PackDecompressor.hpp trunk/OpenMPT/include/ancient/src/RAKEDecompressor.cpp trunk/OpenMPT/include/ancient/src/RAKEDecompressor.hpp trunk/OpenMPT/include/ancient/src/RDCNDecompressor.cpp trunk/OpenMPT/include/ancient/src/RDCNDecompressor.hpp trunk/OpenMPT/include/ancient/src/RLENDecompressor.cpp trunk/OpenMPT/include/ancient/src/RLENDecompressor.hpp trunk/OpenMPT/include/ancient/src/RNCDecompressor.cpp trunk/OpenMPT/include/ancient/src/RNCDecompressor.hpp trunk/OpenMPT/include/ancient/src/RangeDecoder.cpp trunk/OpenMPT/include/ancient/src/RangeDecoder.hpp trunk/OpenMPT/include/ancient/src/SCOCompressDecompressor.cpp trunk/OpenMPT/include/ancient/src/SCOCompressDecompressor.hpp trunk/OpenMPT/include/ancient/src/SDHCDecompressor.cpp trunk/OpenMPT/include/ancient/src/SDHCDecompressor.hpp trunk/OpenMPT/include/ancient/src/SLZ3Decompressor.cpp trunk/OpenMPT/include/ancient/src/SLZ3Decompressor.hpp trunk/OpenMPT/include/ancient/src/SMPLDecompressor.cpp trunk/OpenMPT/include/ancient/src/SMPLDecompressor.hpp trunk/OpenMPT/include/ancient/src/SQSHDecompressor.cpp trunk/OpenMPT/include/ancient/src/SQSHDecompressor.hpp trunk/OpenMPT/include/ancient/src/SXSCDecompressor.cpp trunk/OpenMPT/include/ancient/src/SXSCDecompressor.hpp trunk/OpenMPT/include/ancient/src/StoneCrackerDecompressor.cpp trunk/OpenMPT/include/ancient/src/StoneCrackerDecompressor.hpp trunk/OpenMPT/include/ancient/src/TDCSDecompressor.cpp trunk/OpenMPT/include/ancient/src/TDCSDecompressor.hpp trunk/OpenMPT/include/ancient/src/TPWMDecompressor.cpp trunk/OpenMPT/include/ancient/src/TPWMDecompressor.hpp trunk/OpenMPT/include/ancient/src/XPKDecompressor.cpp trunk/OpenMPT/include/ancient/src/XPKDecompressor.hpp trunk/OpenMPT/include/ancient/src/XPKMain.cpp trunk/OpenMPT/include/ancient/src/XPKMain.hpp trunk/OpenMPT/include/ancient/src/XPKUnimplemented.cpp trunk/OpenMPT/include/ancient/src/XPKUnimplemented.hpp trunk/OpenMPT/include/ancient/src/ZENODecompressor.cpp trunk/OpenMPT/include/ancient/src/ZENODecompressor.hpp trunk/OpenMPT/include/ancient/src/common/Buffer.cpp trunk/OpenMPT/include/ancient/src/common/Buffer.hpp trunk/OpenMPT/include/ancient/src/common/Common.cpp trunk/OpenMPT/include/ancient/src/common/Common.hpp trunk/OpenMPT/include/ancient/src/common/MemoryBuffer.cpp trunk/OpenMPT/include/ancient/src/common/MemoryBuffer.hpp trunk/OpenMPT/include/ancient/src/common/StaticBuffer.cpp trunk/OpenMPT/include/ancient/src/common/StaticBuffer.hpp trunk/OpenMPT/include/ancient/src/common/SubBuffer.hpp trunk/OpenMPT/include/ancient/src/common/WrappedVectorBuffer.cpp trunk/OpenMPT/include/ancient/src/common/WrappedVectorBuffer.hpp Modified: trunk/OpenMPT/build/vs2017winxp/ext/ancient.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/ext/ancient.vcxproj Sat Mar 23 15:09:57 2024 (r20426) +++ trunk/OpenMPT/build/vs2017winxp/ext/ancient.vcxproj Sat Mar 23 15:49:49 2024 (r20427) @@ -636,8 +636,7 @@ <ClInclude Include="..\..\..\include\ancient\src\RangeDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SCOCompressDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SDHCDecompressor.hpp" /> - <ClInclude Include="..\..\..\include\ancient\src\SHR3Decompressor.hpp" /> - <ClInclude Include="..\..\..\include\ancient\src\SHRIDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\SHRXDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SLZ3Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SMPLDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SQSHDecompressor.hpp" /> @@ -645,6 +644,8 @@ <ClInclude Include="..\..\..\include\ancient\src\StoneCrackerDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\TDCSDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\TPWMDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\VariableLengthCodeDecoder.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\VicXDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\XPKDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\XPKMain.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\XPKUnimplemented.hpp" /> @@ -709,8 +710,7 @@ <ClCompile Include="..\..\..\include\ancient\src\RangeDecoder.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SCOCompressDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SDHCDecompressor.cpp" /> - <ClCompile Include="..\..\..\include\ancient\src\SHR3Decompressor.cpp" /> - <ClCompile Include="..\..\..\include\ancient\src\SHRIDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\SHRXDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SLZ3Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SMPLDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SQSHDecompressor.cpp" /> @@ -718,6 +718,7 @@ <ClCompile Include="..\..\..\include\ancient\src\StoneCrackerDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\TDCSDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\TPWMDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\VicXDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\XPKDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\XPKMain.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\XPKUnimplemented.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/ext/ancient.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/ext/ancient.vcxproj.filters Sat Mar 23 15:09:57 2024 (r20426) +++ trunk/OpenMPT/build/vs2017winxp/ext/ancient.vcxproj.filters Sat Mar 23 15:49:49 2024 (r20427) @@ -174,10 +174,7 @@ <ClInclude Include="..\..\..\include\ancient\src\SDHCDecompressor.hpp"> <Filter>src</Filter> </ClInclude> - <ClInclude Include="..\..\..\include\ancient\src\SHR3Decompressor.hpp"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\ancient\src\SHRIDecompressor.hpp"> + <ClInclude Include="..\..\..\include\ancient\src\SHRXDecompressor.hpp"> <Filter>src</Filter> </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\SLZ3Decompressor.hpp"> @@ -201,6 +198,12 @@ <ClInclude Include="..\..\..\include\ancient\src\TPWMDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\VariableLengthCodeDecoder.hpp"> + <Filter>src</Filter> + </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\VicXDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\XPKDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -389,10 +392,7 @@ <ClCompile Include="..\..\..\include\ancient\src\SDHCDecompressor.cpp"> <Filter>src</Filter> </ClCompile> - <ClCompile Include="..\..\..\include\ancient\src\SHR3Decompressor.cpp"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\ancient\src\SHRIDecompressor.cpp"> + <ClCompile Include="..\..\..\include\ancient\src\SHRXDecompressor.cpp"> <Filter>src</Filter> </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\SLZ3Decompressor.cpp"> @@ -416,6 +416,9 @@ <ClCompile Include="..\..\..\include\ancient\src\TPWMDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\VicXDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\XPKDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/ext/ancient.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/ext/ancient.vcxproj Sat Mar 23 15:09:57 2024 (r20426) +++ trunk/OpenMPT/build/vs2017winxpansi/ext/ancient.vcxproj Sat Mar 23 15:49:49 2024 (r20427) @@ -636,8 +636,7 @@ <ClInclude Include="..\..\..\include\ancient\src\RangeDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SCOCompressDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SDHCDecompressor.hpp" /> - <ClInclude Include="..\..\..\include\ancient\src\SHR3Decompressor.hpp" /> - <ClInclude Include="..\..\..\include\ancient\src\SHRIDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\SHRXDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SLZ3Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SMPLDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SQSHDecompressor.hpp" /> @@ -645,6 +644,8 @@ <ClInclude Include="..\..\..\include\ancient\src\StoneCrackerDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\TDCSDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\TPWMDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\VariableLengthCodeDecoder.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\VicXDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\XPKDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\XPKMain.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\XPKUnimplemented.hpp" /> @@ -709,8 +710,7 @@ <ClCompile Include="..\..\..\include\ancient\src\RangeDecoder.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SCOCompressDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SDHCDecompressor.cpp" /> - <ClCompile Include="..\..\..\include\ancient\src\SHR3Decompressor.cpp" /> - <ClCompile Include="..\..\..\include\ancient\src\SHRIDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\SHRXDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SLZ3Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SMPLDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SQSHDecompressor.cpp" /> @@ -718,6 +718,7 @@ <ClCompile Include="..\..\..\include\ancient\src\StoneCrackerDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\TDCSDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\TPWMDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\VicXDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\XPKDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\XPKMain.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\XPKUnimplemented.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/ext/ancient.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/ext/ancient.vcxproj.filters Sat Mar 23 15:09:57 2024 (r20426) +++ trunk/OpenMPT/build/vs2017winxpansi/ext/ancient.vcxproj.filters Sat Mar 23 15:49:49 2024 (r20427) @@ -174,10 +174,7 @@ <ClInclude Include="..\..\..\include\ancient\src\SDHCDecompressor.hpp"> <Filter>src</Filter> </ClInclude> - <ClInclude Include="..\..\..\include\ancient\src\SHR3Decompressor.hpp"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\ancient\src\SHRIDecompressor.hpp"> + <ClInclude Include="..\..\..\include\ancient\src\SHRXDecompressor.hpp"> <Filter>src</Filter> </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\SLZ3Decompressor.hpp"> @@ -201,6 +198,12 @@ <ClInclude Include="..\..\..\include\ancient\src\TPWMDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\VariableLengthCodeDecoder.hpp"> + <Filter>src</Filter> + </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\VicXDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\XPKDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -389,10 +392,7 @@ <ClCompile Include="..\..\..\include\ancient\src\SDHCDecompressor.cpp"> <Filter>src</Filter> </ClCompile> - <ClCompile Include="..\..\..\include\ancient\src\SHR3Decompressor.cpp"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\ancient\src\SHRIDecompressor.cpp"> + <ClCompile Include="..\..\..\include\ancient\src\SHRXDecompressor.cpp"> <Filter>src</Filter> </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\SLZ3Decompressor.cpp"> @@ -416,6 +416,9 @@ <ClCompile Include="..\..\..\include\ancient\src\TPWMDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\VicXDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\XPKDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win10/ext/ancient.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/ext/ancient.vcxproj Sat Mar 23 15:09:57 2024 (r20426) +++ trunk/OpenMPT/build/vs2019win10/ext/ancient.vcxproj Sat Mar 23 15:49:49 2024 (r20427) @@ -1227,8 +1227,7 @@ <ClInclude Include="..\..\..\include\ancient\src\RangeDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SCOCompressDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SDHCDecompressor.hpp" /> - <ClInclude Include="..\..\..\include\ancient\src\SHR3Decompressor.hpp" /> - <ClInclude Include="..\..\..\include\ancient\src\SHRIDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\SHRXDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SLZ3Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SMPLDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SQSHDecompressor.hpp" /> @@ -1236,6 +1235,8 @@ <ClInclude Include="..\..\..\include\ancient\src\StoneCrackerDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\TDCSDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\TPWMDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\VariableLengthCodeDecoder.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\VicXDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\XPKDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\XPKMain.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\XPKUnimplemented.hpp" /> @@ -1300,8 +1301,7 @@ <ClCompile Include="..\..\..\include\ancient\src\RangeDecoder.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SCOCompressDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SDHCDecompressor.cpp" /> - <ClCompile Include="..\..\..\include\ancient\src\SHR3Decompressor.cpp" /> - <ClCompile Include="..\..\..\include\ancient\src\SHRIDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\SHRXDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SLZ3Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SMPLDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SQSHDecompressor.cpp" /> @@ -1309,6 +1309,7 @@ <ClCompile Include="..\..\..\include\ancient\src\StoneCrackerDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\TDCSDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\TPWMDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\VicXDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\XPKDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\XPKMain.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\XPKUnimplemented.cpp" /> Modified: trunk/OpenMPT/build/vs2019win10/ext/ancient.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/ext/ancient.vcxproj.filters Sat Mar 23 15:09:57 2024 (r20426) +++ trunk/OpenMPT/build/vs2019win10/ext/ancient.vcxproj.filters Sat Mar 23 15:49:49 2024 (r20427) @@ -174,10 +174,7 @@ <ClInclude Include="..\..\..\include\ancient\src\SDHCDecompressor.hpp"> <Filter>src</Filter> </ClInclude> - <ClInclude Include="..\..\..\include\ancient\src\SHR3Decompressor.hpp"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\ancient\src\SHRIDecompressor.hpp"> + <ClInclude Include="..\..\..\include\ancient\src\SHRXDecompressor.hpp"> <Filter>src</Filter> </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\SLZ3Decompressor.hpp"> @@ -201,6 +198,12 @@ <ClInclude Include="..\..\..\include\ancient\src\TPWMDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\VariableLengthCodeDecoder.hpp"> + <Filter>src</Filter> + </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\VicXDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\XPKDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -389,10 +392,7 @@ <ClCompile Include="..\..\..\include\ancient\src\SDHCDecompressor.cpp"> <Filter>src</Filter> </ClCompile> - <ClCompile Include="..\..\..\include\ancient\src\SHR3Decompressor.cpp"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\ancient\src\SHRIDecompressor.cpp"> + <ClCompile Include="..\..\..\include\ancient\src\SHRXDecompressor.cpp"> <Filter>src</Filter> </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\SLZ3Decompressor.cpp"> @@ -416,6 +416,9 @@ <ClCompile Include="..\..\..\include\ancient\src\TPWMDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\VicXDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\XPKDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/ext/ancient.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/ext/ancient.vcxproj Sat Mar 23 15:09:57 2024 (r20426) +++ trunk/OpenMPT/build/vs2019win7/ext/ancient.vcxproj Sat Mar 23 15:49:49 2024 (r20427) @@ -645,8 +645,7 @@ <ClInclude Include="..\..\..\include\ancient\src\RangeDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SCOCompressDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SDHCDecompressor.hpp" /> - <ClInclude Include="..\..\..\include\ancient\src\SHR3Decompressor.hpp" /> - <ClInclude Include="..\..\..\include\ancient\src\SHRIDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\SHRXDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SLZ3Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SMPLDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SQSHDecompressor.hpp" /> @@ -654,6 +653,8 @@ <ClInclude Include="..\..\..\include\ancient\src\StoneCrackerDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\TDCSDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\TPWMDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\VariableLengthCodeDecoder.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\VicXDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\XPKDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\XPKMain.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\XPKUnimplemented.hpp" /> @@ -718,8 +719,7 @@ <ClCompile Include="..\..\..\include\ancient\src\RangeDecoder.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SCOCompressDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SDHCDecompressor.cpp" /> - <ClCompile Include="..\..\..\include\ancient\src\SHR3Decompressor.cpp" /> - <ClCompile Include="..\..\..\include\ancient\src\SHRIDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\SHRXDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SLZ3Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SMPLDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SQSHDecompressor.cpp" /> @@ -727,6 +727,7 @@ <ClCompile Include="..\..\..\include\ancient\src\StoneCrackerDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\TDCSDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\TPWMDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\VicXDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\XPKDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\XPKMain.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\XPKUnimplemented.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/ext/ancient.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/ext/ancient.vcxproj.filters Sat Mar 23 15:09:57 2024 (r20426) +++ trunk/OpenMPT/build/vs2019win7/ext/ancient.vcxproj.filters Sat Mar 23 15:49:49 2024 (r20427) @@ -174,10 +174,7 @@ <ClInclude Include="..\..\..\include\ancient\src\SDHCDecompressor.hpp"> <Filter>src</Filter> </ClInclude> - <ClInclude Include="..\..\..\include\ancient\src\SHR3Decompressor.hpp"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\ancient\src\SHRIDecompressor.hpp"> + <ClInclude Include="..\..\..\include\ancient\src\SHRXDecompressor.hpp"> <Filter>src</Filter> </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\SLZ3Decompressor.hpp"> @@ -201,6 +198,12 @@ <ClInclude Include="..\..\..\include\ancient\src\TPWMDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\VariableLengthCodeDecoder.hpp"> + <Filter>src</Filter> + </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\VicXDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\XPKDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -389,10 +392,7 @@ <ClCompile Include="..\..\..\include\ancient\src\SDHCDecompressor.cpp"> <Filter>src</Filter> </ClCompile> - <ClCompile Include="..\..\..\include\ancient\src\SHR3Decompressor.cpp"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\ancient\src\SHRIDecompressor.cpp"> + <ClCompile Include="..\..\..\include\ancient\src\SHRXDecompressor.cpp"> <Filter>src</Filter> </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\SLZ3Decompressor.cpp"> @@ -416,6 +416,9 @@ <ClCompile Include="..\..\..\include\ancient\src\TPWMDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\VicXDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\XPKDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win81/ext/ancient.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win81/ext/ancient.vcxproj Sat Mar 23 15:09:57 2024 (r20426) +++ trunk/OpenMPT/build/vs2019win81/ext/ancient.vcxproj Sat Mar 23 15:49:49 2024 (r20427) @@ -645,8 +645,7 @@ <ClInclude Include="..\..\..\include\ancient\src\RangeDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SCOCompressDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SDHCDecompressor.hpp" /> - <ClInclude Include="..\..\..\include\ancient\src\SHR3Decompressor.hpp" /> - <ClInclude Include="..\..\..\include\ancient\src\SHRIDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\SHRXDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SLZ3Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SMPLDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SQSHDecompressor.hpp" /> @@ -654,6 +653,8 @@ <ClInclude Include="..\..\..\include\ancient\src\StoneCrackerDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\TDCSDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\TPWMDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\VariableLengthCodeDecoder.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\VicXDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\XPKDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\XPKMain.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\XPKUnimplemented.hpp" /> @@ -718,8 +719,7 @@ <ClCompile Include="..\..\..\include\ancient\src\RangeDecoder.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SCOCompressDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SDHCDecompressor.cpp" /> - <ClCompile Include="..\..\..\include\ancient\src\SHR3Decompressor.cpp" /> - <ClCompile Include="..\..\..\include\ancient\src\SHRIDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\SHRXDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SLZ3Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SMPLDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SQSHDecompressor.cpp" /> @@ -727,6 +727,7 @@ <ClCompile Include="..\..\..\include\ancient\src\StoneCrackerDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\TDCSDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\TPWMDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\VicXDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\XPKDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\XPKMain.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\XPKUnimplemented.cpp" /> Modified: trunk/OpenMPT/build/vs2019win81/ext/ancient.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win81/ext/ancient.vcxproj.filters Sat Mar 23 15:09:57 2024 (r20426) +++ trunk/OpenMPT/build/vs2019win81/ext/ancient.vcxproj.filters Sat Mar 23 15:49:49 2024 (r20427) @@ -174,10 +174,7 @@ <ClInclude Include="..\..\..\include\ancient\src\SDHCDecompressor.hpp"> <Filter>src</Filter> </ClInclude> - <ClInclude Include="..\..\..\include\ancient\src\SHR3Decompressor.hpp"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\ancient\src\SHRIDecompressor.hpp"> + <ClInclude Include="..\..\..\include\ancient\src\SHRXDecompressor.hpp"> <Filter>src</Filter> </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\SLZ3Decompressor.hpp"> @@ -201,6 +198,12 @@ <ClInclude Include="..\..\..\include\ancient\src\TPWMDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\VariableLengthCodeDecoder.hpp"> + <Filter>src</Filter> + </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\VicXDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\XPKDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -389,10 +392,7 @@ <ClCompile Include="..\..\..\include\ancient\src\SDHCDecompressor.cpp"> <Filter>src</Filter> </ClCompile> - <ClCompile Include="..\..\..\include\ancient\src\SHR3Decompressor.cpp"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\ancient\src\SHRIDecompressor.cpp"> + <ClCompile Include="..\..\..\include\ancient\src\SHRXDecompressor.cpp"> <Filter>src</Filter> </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\SLZ3Decompressor.cpp"> @@ -416,6 +416,9 @@ <ClCompile Include="..\..\..\include\ancient\src\TPWMDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\VicXDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\XPKDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/ext/ancient.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/ext/ancient.vcxproj Sat Mar 23 15:09:57 2024 (r20426) +++ trunk/OpenMPT/build/vs2022win10/ext/ancient.vcxproj Sat Mar 23 15:49:49 2024 (r20427) @@ -1251,8 +1251,7 @@ <ClInclude Include="..\..\..\include\ancient\src\RangeDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SCOCompressDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SDHCDecompressor.hpp" /> - <ClInclude Include="..\..\..\include\ancient\src\SHR3Decompressor.hpp" /> - <ClInclude Include="..\..\..\include\ancient\src\SHRIDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\SHRXDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SLZ3Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SMPLDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SQSHDecompressor.hpp" /> @@ -1260,6 +1259,8 @@ <ClInclude Include="..\..\..\include\ancient\src\StoneCrackerDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\TDCSDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\TPWMDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\VariableLengthCodeDecoder.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\VicXDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\XPKDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\XPKMain.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\XPKUnimplemented.hpp" /> @@ -1324,8 +1325,7 @@ <ClCompile Include="..\..\..\include\ancient\src\RangeDecoder.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SCOCompressDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SDHCDecompressor.cpp" /> - <ClCompile Include="..\..\..\include\ancient\src\SHR3Decompressor.cpp" /> - <ClCompile Include="..\..\..\include\ancient\src\SHRIDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\SHRXDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SLZ3Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SMPLDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SQSHDecompressor.cpp" /> @@ -1333,6 +1333,7 @@ <ClCompile Include="..\..\..\include\ancient\src\StoneCrackerDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\TDCSDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\TPWMDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\VicXDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\XPKDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\XPKMain.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\XPKUnimplemented.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/ext/ancient.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/ext/ancient.vcxproj.filters Sat Mar 23 15:09:57 2024 (r20426) +++ trunk/OpenMPT/build/vs2022win10/ext/ancient.vcxproj.filters Sat Mar 23 15:49:49 2024 (r20427) @@ -174,10 +174,7 @@ <ClInclude Include="..\..\..\include\ancient\src\SDHCDecompressor.hpp"> <Filter>src</Filter> </ClInclude> - <ClInclude Include="..\..\..\include\ancient\src\SHR3Decompressor.hpp"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\ancient\src\SHRIDecompressor.hpp"> + <ClInclude Include="..\..\..\include\ancient\src\SHRXDecompressor.hpp"> <Filter>src</Filter> </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\SLZ3Decompressor.hpp"> @@ -201,6 +198,12 @@ <ClInclude Include="..\..\..\include\ancient\src\TPWMDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\VariableLengthCodeDecoder.hpp"> + <Filter>src</Filter> + </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\VicXDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\XPKDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -389,10 +392,7 @@ <ClCompile Include="..\..\..\include\ancient\src\SDHCDecompressor.cpp"> <Filter>src</Filter> </ClCompile> - <ClCompile Include="..\..\..\include\ancient\src\SHR3Decompressor.cpp"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\ancient\src\SHRIDecompressor.cpp"> + <ClCompile Include="..\..\..\include\ancient\src\SHRXDecompressor.cpp"> <Filter>src</Filter> </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\SLZ3Decompressor.cpp"> @@ -416,6 +416,9 @@ <ClCompile Include="..\..\..\include\ancient\src\TPWMDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\VicXDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\XPKDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10clang/ext/ancient.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/ext/ancient.vcxproj Sat Mar 23 15:09:57 2024 (r20426) +++ trunk/OpenMPT/build/vs2022win10clang/ext/ancient.vcxproj Sat Mar 23 15:49:49 2024 (r20427) @@ -1185,8 +1185,7 @@ <ClInclude Include="..\..\..\include\ancient\src\RangeDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SCOCompressDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SDHCDecompressor.hpp" /> - <ClInclude Include="..\..\..\include\ancient\src\SHR3Decompressor.hpp" /> - <ClInclude Include="..\..\..\include\ancient\src\SHRIDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\SHRXDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SLZ3Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SMPLDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SQSHDecompressor.hpp" /> @@ -1194,6 +1193,8 @@ <ClInclude Include="..\..\..\include\ancient\src\StoneCrackerDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\TDCSDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\TPWMDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\VariableLengthCodeDecoder.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\VicXDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\XPKDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\XPKMain.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\XPKUnimplemented.hpp" /> @@ -1258,8 +1259,7 @@ <ClCompile Include="..\..\..\include\ancient\src\RangeDecoder.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SCOCompressDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SDHCDecompressor.cpp" /> - <ClCompile Include="..\..\..\include\ancient\src\SHR3Decompressor.cpp" /> - <ClCompile Include="..\..\..\include\ancient\src\SHRIDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\SHRXDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SLZ3Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SMPLDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SQSHDecompressor.cpp" /> @@ -1267,6 +1267,7 @@ <ClCompile Include="..\..\..\include\ancient\src\StoneCrackerDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\TDCSDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\TPWMDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\VicXDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\XPKDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\XPKMain.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\XPKUnimplemented.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10clang/ext/ancient.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/ext/ancient.vcxproj.filters Sat Mar 23 15:09:57 2024 (r20426) +++ trunk/OpenMPT/build/vs2022win10clang/ext/ancient.vcxproj.filters Sat Mar 23 15:49:49 2024 (r20427) @@ -174,10 +174,7 @@ <ClInclude Include="..\..\..\include\ancient\src\SDHCDecompressor.hpp"> <Filter>src</Filter> </ClInclude> - <ClInclude Include="..\..\..\include\ancient\src\SHR3Decompressor.hpp"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\ancient\src\SHRIDecompressor.hpp"> + <ClInclude Include="..\..\..\include\ancient\src\SHRXDecompressor.hpp"> <Filter>src</Filter> </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\SLZ3Decompressor.hpp"> @@ -201,6 +198,12 @@ <ClInclude Include="..\..\..\include\ancient\src\TPWMDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\VariableLengthCodeDecoder.hpp"> + <Filter>src</Filter> + </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\VicXDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\XPKDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -389,10 +392,7 @@ <ClCompile Include="..\..\..\include\ancient\src\SDHCDecompressor.cpp"> <Filter>src</Filter> </ClCompile> - <ClCompile Include="..\..\..\include\ancient\src\SHR3Decompressor.cpp"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\ancient\src\SHRIDecompressor.cpp"> + <ClCompile Include="..\..\..\include\ancient\src\SHRXDecompressor.cpp"> <Filter>src</Filter> </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\SLZ3Decompressor.cpp"> @@ -416,6 +416,9 @@ <ClCompile Include="..\..\..\include\ancient\src\TPWMDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\VicXDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\XPKDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win7/ext/ancient.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win7/ext/ancient.vcxproj Sat Mar 23 15:09:57 2024 (r20426) +++ trunk/OpenMPT/build/vs2022win7/ext/ancient.vcxproj Sat Mar 23 15:49:49 2024 (r20427) @@ -657,8 +657,7 @@ <ClInclude Include="..\..\..\include\ancient\src\RangeDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SCOCompressDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SDHCDecompressor.hpp" /> - <ClInclude Include="..\..\..\include\ancient\src\SHR3Decompressor.hpp" /> - <ClInclude Include="..\..\..\include\ancient\src\SHRIDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\SHRXDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SLZ3Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SMPLDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SQSHDecompressor.hpp" /> @@ -666,6 +665,8 @@ <ClInclude Include="..\..\..\include\ancient\src\StoneCrackerDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\TDCSDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\TPWMDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\VariableLengthCodeDecoder.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\VicXDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\XPKDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\XPKMain.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\XPKUnimplemented.hpp" /> @@ -730,8 +731,7 @@ <ClCompile Include="..\..\..\include\ancient\src\RangeDecoder.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SCOCompressDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SDHCDecompressor.cpp" /> - <ClCompile Include="..\..\..\include\ancient\src\SHR3Decompressor.cpp" /> - <ClCompile Include="..\..\..\include\ancient\src\SHRIDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\SHRXDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SLZ3Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SMPLDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SQSHDecompressor.cpp" /> @@ -739,6 +739,7 @@ <ClCompile Include="..\..\..\include\ancient\src\StoneCrackerDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\TDCSDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\TPWMDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\VicXDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\XPKDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\XPKMain.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\XPKUnimplemented.cpp" /> Modified: trunk/OpenMPT/build/vs2022win7/ext/ancient.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win7/ext/ancient.vcxproj.filters Sat Mar 23 15:09:57 2024 (r20426) +++ trunk/OpenMPT/build/vs2022win7/ext/ancient.vcxproj.filters Sat Mar 23 15:49:49 2024 (r20427) @@ -174,10 +174,7 @@ <ClInclude Include="..\..\..\include\ancient\src\SDHCDecompressor.hpp"> <Filter>src</Filter> </ClInclude> - <ClInclude Include="..\..\..\include\ancient\src\SHR3Decompressor.hpp"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\ancient\src\SHRIDecompressor.hpp"> + <ClInclude Include="..\..\..\include\ancient\src\SHRXDecompressor.hpp"> <Filter>src</Filter> </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\SLZ3Decompressor.hpp"> @@ -201,6 +198,12 @@ <ClInclude Include="..\..\..\include\ancient\src\TPWMDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\VariableLengthCodeDecoder.hpp"> + <Filter>src</Filter> + </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\VicXDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\XPKDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -389,10 +392,7 @@ <ClCompile Include="..\..\..\include\ancient\src\SDHCDecompressor.cpp"> <Filter>src</Filter> </ClCompile> - <ClCompile Include="..\..\..\include\ancient\src\SHR3Decompressor.cpp"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\ancient\src\SHRIDecompressor.cpp"> + <ClCompile Include="..\..\..\include\ancient\src\SHRXDecompressor.cpp"> <Filter>src</Filter> </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\SLZ3Decompressor.cpp"> @@ -416,6 +416,9 @@ <ClCompile Include="..\..\..\include\ancient\src\TPWMDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\VicXDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\XPKDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win81/ext/ancient.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win81/ext/ancient.vcxproj Sat Mar 23 15:09:57 2024 (r20426) +++ trunk/OpenMPT/build/vs2022win81/ext/ancient.vcxproj Sat Mar 23 15:49:49 2024 (r20427) @@ -657,8 +657,7 @@ <ClInclude Include="..\..\..\include\ancient\src\RangeDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SCOCompressDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SDHCDecompressor.hpp" /> - <ClInclude Include="..\..\..\include\ancient\src\SHR3Decompressor.hpp" /> - <ClInclude Include="..\..\..\include\ancient\src\SHRIDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\SHRXDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SLZ3Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SMPLDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\SQSHDecompressor.hpp" /> @@ -666,6 +665,8 @@ <ClInclude Include="..\..\..\include\ancient\src\StoneCrackerDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\TDCSDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\TPWMDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\VariableLengthCodeDecoder.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\VicXDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\XPKDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\XPKMain.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\XPKUnimplemented.hpp" /> @@ -730,8 +731,7 @@ <ClCompile Include="..\..\..\include\ancient\src\RangeDecoder.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SCOCompressDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SDHCDecompressor.cpp" /> - <ClCompile Include="..\..\..\include\ancient\src\SHR3Decompressor.cpp" /> - <ClCompile Include="..\..\..\include\ancient\src\SHRIDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\SHRXDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SLZ3Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SMPLDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\SQSHDecompressor.cpp" /> @@ -739,6 +739,7 @@ <ClCompile Include="..\..\..\include\ancient\src\StoneCrackerDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\TDCSDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\TPWMDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\VicXDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\XPKDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\XPKMain.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\XPKUnimplemented.cpp" /> Modified: trunk/OpenMPT/build/vs2022win81/ext/ancient.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win81/ext/ancient.vcxproj.filters Sat Mar 23 15:09:57 2024 (r20426) +++ trunk/OpenMPT/build/vs2022win81/ext/ancient.vcxproj.filters Sat Mar 23 15:49:49 2024 (r20427) @@ -174,10 +174,7 @@ <ClInclude Include="..\..\..\include\ancient\src\SDHCDecompressor.hpp"> <Filter>src</Filter> </ClInclude> - <ClInclude Include="..\..\..\include\ancient\src\SHR3Decompressor.hpp"> - <Filter>src</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include\ancient\src\SHRIDecompressor.hpp"> + <ClInclude Include="..\..\..\include\ancient\src\SHRXDecompressor.hpp"> <Filter>src</Filter> </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\SLZ3Decompressor.hpp"> @@ -201,6 +198,12 @@ <ClInclude Include="..\..\..\include\ancient\src\TPWMDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\VariableLengthCodeDecoder.hpp"> + <Filter>src</Filter> + </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\VicXDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\XPKDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -389,10 +392,7 @@ <ClCompile Include="..\..\..\include\ancient\src\SDHCDecompressor.cpp"> <Filter>src</Filter> </ClCompile> - <ClCompile Include="..\..\..\include\ancient\src\SHR3Decompressor.cpp"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\..\include\ancient\src\SHRIDecompressor.cpp"> + <ClCompile Include="..\..\..\include\ancient\src\SHRXDecompressor.cpp"> <Filter>src</Filter> </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\SLZ3Decompressor.cpp"> @@ -416,6 +416,9 @@ <ClCompile Include="..\..\..\include\ancient\src\TPWMDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\VicXDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\XPKDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: trunk/OpenMPT/include/ancient/OpenMPT.txt ============================================================================== --- trunk/OpenMPT/include/ancient/OpenMPT.txt Sat Mar 23 15:09:57 2024 (r20426) +++ trunk/OpenMPT/include/ancient/OpenMPT.txt Sat Mar 23 15:49:49 2024 (r20427) @@ -1,4 +1,2 @@ - * ancient <https://github.com/temisu/ancient> v2.1.1 (2023-07-12) - * <https://github.com/temisu/ancient/commit/cdfa1498711e6b7f377013e2e1f8a00561e9a5e2> - has been applied. + * ancient <https://github.com/temisu/ancient> commit c6038c179aeac138667c4319e997d6dd5a25a4be (2024-03-23) * Unnecssary files have been removed. Modified: trunk/OpenMPT/include/ancient/api/ancient/ancient.hpp ============================================================================== --- trunk/OpenMPT/include/ancient/api/ancient/ancient.hpp Sat Mar 23 15:09:57 2024 (r20426) +++ trunk/OpenMPT/include/ancient/api/ancient/ancient.hpp Sat Mar 23 15:49:49 2024 (r20427) @@ -52,28 +52,28 @@ { public: Error() noexcept; - virtual ~Error(); + virtual ~Error() noexcept; }; class ANCIENT_API InvalidFormatError : public Error { public: InvalidFormatError() noexcept; - virtual ~InvalidFormatError(); + ~InvalidFormatError() noexcept; }; class ANCIENT_API DecompressionError : public Error { public: DecompressionError() noexcept; - virtual ~DecompressionError(); + ~DecompressionError() noexcept; }; class ANCIENT_API VerificationError : public Error { public: VerificationError() noexcept; - virtual ~VerificationError(); + ~VerificationError() noexcept; }; class ANCIENT_API Decompressor final @@ -128,7 +128,7 @@ // can throw VerificationError if verify enabled and checksum does not match std::vector<uint8_t> decompress(bool verify); - ~Decompressor(); + ~Decompressor() noexcept; private: Modified: trunk/OpenMPT/include/ancient/src/ACCADecompressor.cpp ============================================================================== --- trunk/OpenMPT/include/ancient/src/ACCADecompressor.cpp Sat Mar 23 15:09:57 2024 (r20426) +++ trunk/OpenMPT/include/ancient/src/ACCADecompressor.cpp Sat Mar 23 15:49:49 2024 (r20427) @@ -5,6 +5,7 @@ #include "OutputStream.hpp" #include "common/Common.hpp" +#include <array> namespace ancient::internal { @@ -20,27 +21,23 @@ } ACCADecompressor::ACCADecompressor(uint32_t hdr,uint32_t recursionLevel,const Buffer &packedData,std::shared_ptr<XPKDecompressor::State> &state,bool verify) : - XPKDecompressor(recursionLevel), - _packedData(packedData) + XPKDecompressor{recursionLevel}, + _packedData{packedData} { - if (!detectHeaderXPK(hdr)) throw Decompressor::InvalidFormatError(); -} - -ACCADecompressor::~ACCADecompressor() -{ - // nothing needed + if (!detectHeaderXPK(hdr)) + throw Decompressor::InvalidFormatError(); } const std::string &ACCADec... [truncated message content] |
