Menu
▾
▴
[OMPT-svn-commit] OpenMPT r21187 - in branches/OpenMPT-1.31: . 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/src
|
From: <sv...@op...> - 2024-07-15 19:02:42
|
Author: sagamusix Date: Mon Jul 15 21:02:26 2024 New Revision: 21187 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21187 Log: Merged revision(s) 21186 from trunk/OpenMPT: [Var] Update ancient to commit 9929dc420d9810f4d9b435007e9200f3d9f1d620 (2024-07-15). Fixes a crash with malformed PPMQ files and adds support for Pack-Ice and PMC. ........ Added: branches/OpenMPT-1.31/include/ancient/src/IceDecompressor.cpp - copied unchanged from r21186, trunk/OpenMPT/include/ancient/src/IceDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/IceDecompressor.hpp - copied unchanged from r21186, trunk/OpenMPT/include/ancient/src/IceDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/LHDecompressor.cpp - copied unchanged from r21186, trunk/OpenMPT/include/ancient/src/LHDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/LHDecompressor.hpp - copied unchanged from r21186, trunk/OpenMPT/include/ancient/src/LHDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/PMCDecompressor.cpp - copied unchanged from r21186, trunk/OpenMPT/include/ancient/src/PMCDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/PMCDecompressor.hpp - copied unchanged from r21186, trunk/OpenMPT/include/ancient/src/PMCDecompressor.hpp Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/build/vs2017winxp/ext/ancient.vcxproj branches/OpenMPT-1.31/build/vs2017winxp/ext/ancient.vcxproj.filters branches/OpenMPT-1.31/build/vs2017winxpansi/ext/ancient.vcxproj branches/OpenMPT-1.31/build/vs2017winxpansi/ext/ancient.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win10/ext/ancient.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/ancient.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win7/ext/ancient.vcxproj branches/OpenMPT-1.31/build/vs2019win7/ext/ancient.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win81/ext/ancient.vcxproj branches/OpenMPT-1.31/build/vs2019win81/ext/ancient.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win10/ext/ancient.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/ancient.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win10clang/ext/ancient.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/ancient.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win7/ext/ancient.vcxproj branches/OpenMPT-1.31/build/vs2022win7/ext/ancient.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win81/ext/ancient.vcxproj branches/OpenMPT-1.31/build/vs2022win81/ext/ancient.vcxproj.filters branches/OpenMPT-1.31/include/ancient/OpenMPT.txt branches/OpenMPT-1.31/include/ancient/src/API.cpp branches/OpenMPT-1.31/include/ancient/src/BZIP2Decompressor.cpp branches/OpenMPT-1.31/include/ancient/src/BZIP2Decompressor.hpp branches/OpenMPT-1.31/include/ancient/src/CRMDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/CRMDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/CompactDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/CompactDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/CompressDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/CompressDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/DEFLATEDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/DEFLATEDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/DMSDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/DMSDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/Decompressor.cpp branches/OpenMPT-1.31/include/ancient/src/Decompressor.hpp branches/OpenMPT-1.31/include/ancient/src/FreezeDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/FreezeDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/IMPDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/IMPDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/InputStream.hpp branches/OpenMPT-1.31/include/ancient/src/LOBDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/LOBDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/MMCMPDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/MMCMPDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/PPDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/PPDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/PPMQDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/PackDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/PackDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/RNCDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/RNCDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/SCOCompressDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/SCOCompressDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/StoneCrackerDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/StoneCrackerDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/TPWMDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/TPWMDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/VicXDecompressor.cpp branches/OpenMPT-1.31/include/ancient/src/VicXDecompressor.hpp branches/OpenMPT-1.31/include/ancient/src/XPKMain.cpp branches/OpenMPT-1.31/include/ancient/src/XPKMain.hpp Modified: branches/OpenMPT-1.31/build/vs2017winxp/ext/ancient.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxp/ext/ancient.vcxproj Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2017winxp/ext/ancient.vcxproj Mon Jul 15 21:02:26 2024 (r21187) @@ -609,7 +609,9 @@ <ClInclude Include="..\..\..\include\ancient\src\HuffmanDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\ILZRDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN1Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN2Decompressor.hpp" /> @@ -626,6 +628,7 @@ <ClInclude Include="..\..\..\include\ancient\src\NONEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\NUKEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPMQDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PackDecompressor.hpp" /> @@ -683,7 +686,9 @@ <ClCompile Include="..\..\..\include\ancient\src\HUFFDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\ILZRDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN1Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN2Decompressor.cpp" /> @@ -700,6 +705,7 @@ <ClCompile Include="..\..\..\include\ancient\src\NONEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\NUKEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPMQDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PackDecompressor.cpp" /> Modified: branches/OpenMPT-1.31/build/vs2017winxp/ext/ancient.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxp/ext/ancient.vcxproj.filters Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2017winxp/ext/ancient.vcxproj.filters Mon Jul 15 21:02:26 2024 (r21187) @@ -93,9 +93,15 @@ <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -144,6 +150,9 @@ <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -311,9 +320,15 @@ <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp"> <Filter>src</Filter> </ClCompile> @@ -362,6 +377,9 @@ <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: branches/OpenMPT-1.31/build/vs2017winxpansi/ext/ancient.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxpansi/ext/ancient.vcxproj Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2017winxpansi/ext/ancient.vcxproj Mon Jul 15 21:02:26 2024 (r21187) @@ -609,7 +609,9 @@ <ClInclude Include="..\..\..\include\ancient\src\HuffmanDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\ILZRDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN1Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN2Decompressor.hpp" /> @@ -626,6 +628,7 @@ <ClInclude Include="..\..\..\include\ancient\src\NONEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\NUKEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPMQDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PackDecompressor.hpp" /> @@ -683,7 +686,9 @@ <ClCompile Include="..\..\..\include\ancient\src\HUFFDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\ILZRDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN1Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN2Decompressor.cpp" /> @@ -700,6 +705,7 @@ <ClCompile Include="..\..\..\include\ancient\src\NONEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\NUKEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPMQDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PackDecompressor.cpp" /> Modified: branches/OpenMPT-1.31/build/vs2017winxpansi/ext/ancient.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxpansi/ext/ancient.vcxproj.filters Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2017winxpansi/ext/ancient.vcxproj.filters Mon Jul 15 21:02:26 2024 (r21187) @@ -93,9 +93,15 @@ <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -144,6 +150,9 @@ <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -311,9 +320,15 @@ <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp"> <Filter>src</Filter> </ClCompile> @@ -362,6 +377,9 @@ <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: branches/OpenMPT-1.31/build/vs2019win10/ext/ancient.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win10/ext/ancient.vcxproj Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2019win10/ext/ancient.vcxproj Mon Jul 15 21:02:26 2024 (r21187) @@ -1200,7 +1200,9 @@ <ClInclude Include="..\..\..\include\ancient\src\HuffmanDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\ILZRDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN1Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN2Decompressor.hpp" /> @@ -1217,6 +1219,7 @@ <ClInclude Include="..\..\..\include\ancient\src\NONEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\NUKEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPMQDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PackDecompressor.hpp" /> @@ -1274,7 +1277,9 @@ <ClCompile Include="..\..\..\include\ancient\src\HUFFDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\ILZRDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN1Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN2Decompressor.cpp" /> @@ -1291,6 +1296,7 @@ <ClCompile Include="..\..\..\include\ancient\src\NONEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\NUKEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPMQDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PackDecompressor.cpp" /> Modified: branches/OpenMPT-1.31/build/vs2019win10/ext/ancient.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win10/ext/ancient.vcxproj.filters Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2019win10/ext/ancient.vcxproj.filters Mon Jul 15 21:02:26 2024 (r21187) @@ -93,9 +93,15 @@ <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -144,6 +150,9 @@ <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -311,9 +320,15 @@ <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp"> <Filter>src</Filter> </ClCompile> @@ -362,6 +377,9 @@ <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: branches/OpenMPT-1.31/build/vs2019win7/ext/ancient.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win7/ext/ancient.vcxproj Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2019win7/ext/ancient.vcxproj Mon Jul 15 21:02:26 2024 (r21187) @@ -618,7 +618,9 @@ <ClInclude Include="..\..\..\include\ancient\src\HuffmanDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\ILZRDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN1Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN2Decompressor.hpp" /> @@ -635,6 +637,7 @@ <ClInclude Include="..\..\..\include\ancient\src\NONEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\NUKEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPMQDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PackDecompressor.hpp" /> @@ -692,7 +695,9 @@ <ClCompile Include="..\..\..\include\ancient\src\HUFFDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\ILZRDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN1Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN2Decompressor.cpp" /> @@ -709,6 +714,7 @@ <ClCompile Include="..\..\..\include\ancient\src\NONEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\NUKEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPMQDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PackDecompressor.cpp" /> Modified: branches/OpenMPT-1.31/build/vs2019win7/ext/ancient.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win7/ext/ancient.vcxproj.filters Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2019win7/ext/ancient.vcxproj.filters Mon Jul 15 21:02:26 2024 (r21187) @@ -93,9 +93,15 @@ <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -144,6 +150,9 @@ <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -311,9 +320,15 @@ <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp"> <Filter>src</Filter> </ClCompile> @@ -362,6 +377,9 @@ <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: branches/OpenMPT-1.31/build/vs2019win81/ext/ancient.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win81/ext/ancient.vcxproj Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2019win81/ext/ancient.vcxproj Mon Jul 15 21:02:26 2024 (r21187) @@ -618,7 +618,9 @@ <ClInclude Include="..\..\..\include\ancient\src\HuffmanDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\ILZRDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN1Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN2Decompressor.hpp" /> @@ -635,6 +637,7 @@ <ClInclude Include="..\..\..\include\ancient\src\NONEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\NUKEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPMQDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PackDecompressor.hpp" /> @@ -692,7 +695,9 @@ <ClCompile Include="..\..\..\include\ancient\src\HUFFDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\ILZRDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN1Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN2Decompressor.cpp" /> @@ -709,6 +714,7 @@ <ClCompile Include="..\..\..\include\ancient\src\NONEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\NUKEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPMQDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PackDecompressor.cpp" /> Modified: branches/OpenMPT-1.31/build/vs2019win81/ext/ancient.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2019win81/ext/ancient.vcxproj.filters Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2019win81/ext/ancient.vcxproj.filters Mon Jul 15 21:02:26 2024 (r21187) @@ -93,9 +93,15 @@ <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -144,6 +150,9 @@ <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -311,9 +320,15 @@ <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp"> <Filter>src</Filter> </ClCompile> @@ -362,6 +377,9 @@ <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: branches/OpenMPT-1.31/build/vs2022win10/ext/ancient.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2022win10/ext/ancient.vcxproj Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2022win10/ext/ancient.vcxproj Mon Jul 15 21:02:26 2024 (r21187) @@ -1224,7 +1224,9 @@ <ClInclude Include="..\..\..\include\ancient\src\HuffmanDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\ILZRDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN1Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN2Decompressor.hpp" /> @@ -1241,6 +1243,7 @@ <ClInclude Include="..\..\..\include\ancient\src\NONEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\NUKEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPMQDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PackDecompressor.hpp" /> @@ -1298,7 +1301,9 @@ <ClCompile Include="..\..\..\include\ancient\src\HUFFDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\ILZRDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN1Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN2Decompressor.cpp" /> @@ -1315,6 +1320,7 @@ <ClCompile Include="..\..\..\include\ancient\src\NONEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\NUKEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPMQDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PackDecompressor.cpp" /> Modified: branches/OpenMPT-1.31/build/vs2022win10/ext/ancient.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2022win10/ext/ancient.vcxproj.filters Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2022win10/ext/ancient.vcxproj.filters Mon Jul 15 21:02:26 2024 (r21187) @@ -93,9 +93,15 @@ <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -144,6 +150,9 @@ <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -311,9 +320,15 @@ <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp"> <Filter>src</Filter> </ClCompile> @@ -362,6 +377,9 @@ <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: branches/OpenMPT-1.31/build/vs2022win10clang/ext/ancient.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2022win10clang/ext/ancient.vcxproj Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2022win10clang/ext/ancient.vcxproj Mon Jul 15 21:02:26 2024 (r21187) @@ -1158,7 +1158,9 @@ <ClInclude Include="..\..\..\include\ancient\src\HuffmanDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\ILZRDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN1Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN2Decompressor.hpp" /> @@ -1175,6 +1177,7 @@ <ClInclude Include="..\..\..\include\ancient\src\NONEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\NUKEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPMQDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PackDecompressor.hpp" /> @@ -1232,7 +1235,9 @@ <ClCompile Include="..\..\..\include\ancient\src\HUFFDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\ILZRDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN1Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN2Decompressor.cpp" /> @@ -1249,6 +1254,7 @@ <ClCompile Include="..\..\..\include\ancient\src\NONEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\NUKEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPMQDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PackDecompressor.cpp" /> Modified: branches/OpenMPT-1.31/build/vs2022win10clang/ext/ancient.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2022win10clang/ext/ancient.vcxproj.filters Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2022win10clang/ext/ancient.vcxproj.filters Mon Jul 15 21:02:26 2024 (r21187) @@ -93,9 +93,15 @@ <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -144,6 +150,9 @@ <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -311,9 +320,15 @@ <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp"> <Filter>src</Filter> </ClCompile> @@ -362,6 +377,9 @@ <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: branches/OpenMPT-1.31/build/vs2022win7/ext/ancient.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2022win7/ext/ancient.vcxproj Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2022win7/ext/ancient.vcxproj Mon Jul 15 21:02:26 2024 (r21187) @@ -630,7 +630,9 @@ <ClInclude Include="..\..\..\include\ancient\src\HuffmanDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\ILZRDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN1Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN2Decompressor.hpp" /> @@ -647,6 +649,7 @@ <ClInclude Include="..\..\..\include\ancient\src\NONEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\NUKEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPMQDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PackDecompressor.hpp" /> @@ -704,7 +707,9 @@ <ClCompile Include="..\..\..\include\ancient\src\HUFFDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\ILZRDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN1Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN2Decompressor.cpp" /> @@ -721,6 +726,7 @@ <ClCompile Include="..\..\..\include\ancient\src\NONEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\NUKEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPMQDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PackDecompressor.cpp" /> Modified: branches/OpenMPT-1.31/build/vs2022win7/ext/ancient.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2022win7/ext/ancient.vcxproj.filters Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2022win7/ext/ancient.vcxproj.filters Mon Jul 15 21:02:26 2024 (r21187) @@ -93,9 +93,15 @@ <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -144,6 +150,9 @@ <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -311,9 +320,15 @@ <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp"> <Filter>src</Filter> </ClCompile> @@ -362,6 +377,9 @@ <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: branches/OpenMPT-1.31/build/vs2022win81/ext/ancient.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2022win81/ext/ancient.vcxproj Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2022win81/ext/ancient.vcxproj Mon Jul 15 21:02:26 2024 (r21187) @@ -630,7 +630,9 @@ <ClInclude Include="..\..\..\include\ancient\src\HuffmanDecoder.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\ILZRDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN1Decompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\LIN2Decompressor.hpp" /> @@ -647,6 +649,7 @@ <ClInclude Include="..\..\..\include\ancient\src\NONEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\NUKEDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp" /> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PPMQDecompressor.hpp" /> <ClInclude Include="..\..\..\include\ancient\src\PackDecompressor.hpp" /> @@ -704,7 +707,9 @@ <ClCompile Include="..\..\..\include\ancient\src\HUFFDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\ILZRDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN1Decompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\LIN2Decompressor.cpp" /> @@ -721,6 +726,7 @@ <ClCompile Include="..\..\..\include\ancient\src\NONEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\NUKEDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp" /> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PPMQDecompressor.cpp" /> <ClCompile Include="..\..\..\include\ancient\src\PackDecompressor.cpp" /> Modified: branches/OpenMPT-1.31/build/vs2022win81/ext/ancient.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2022win81/ext/ancient.vcxproj.filters Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/build/vs2022win81/ext/ancient.vcxproj.filters Mon Jul 15 21:02:26 2024 (r21187) @@ -93,9 +93,15 @@ <ClInclude Include="..\..\..\include\ancient\src\IMPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\IceDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\InputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\LHDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\LHLBDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -144,6 +150,9 @@ <ClInclude Include="..\..\..\include\ancient\src\OutputStream.hpp"> <Filter>src</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\ancient\src\PMCDecompressor.hpp"> + <Filter>src</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\ancient\src\PPDecompressor.hpp"> <Filter>src</Filter> </ClInclude> @@ -311,9 +320,15 @@ <ClCompile Include="..\..\..\include\ancient\src\IMPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\IceDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\InputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\LHDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\LHLBDecompressor.cpp"> <Filter>src</Filter> </ClCompile> @@ -362,6 +377,9 @@ <ClCompile Include="..\..\..\include\ancient\src\OutputStream.cpp"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\ancient\src\PMCDecompressor.cpp"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\ancient\src\PPDecompressor.cpp"> <Filter>src</Filter> </ClCompile> Modified: branches/OpenMPT-1.31/include/ancient/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.31/include/ancient/OpenMPT.txt Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/include/ancient/OpenMPT.txt Mon Jul 15 21:02:26 2024 (r21187) @@ -1,2 +1,3 @@ - * ancient <https://github.com/temisu/ancient> v2.2.0 (2024-06-07) + * ancient <https://github.com/temisu/ancient> + commit 9929dc420d9810f4d9b435007e9200f3d9f1d620 (2024-07-15) * Unnecssary files have been removed. Modified: branches/OpenMPT-1.31/include/ancient/src/API.cpp ============================================================================== --- branches/OpenMPT-1.31/include/ancient/src/API.cpp Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/include/ancient/src/API.cpp Mon Jul 15 21:02:26 2024 (r21187) @@ -88,12 +88,12 @@ bool Decompressor::detect(const std::vector<uint8_t> &packedData) noexcept { - return internal::Decompressor::detect(internal::ConstStaticBuffer(packedData.data(), packedData.size())); + return internal::Decompressor::detect(internal::ConstStaticBuffer(packedData.data(), packedData.size()),true); } bool Decompressor::detect(const uint8_t *packedData, size_t packedSize) noexcept { - return internal::Decompressor::detect(internal::ConstStaticBuffer(packedData, packedSize)); + return internal::Decompressor::detect(internal::ConstStaticBuffer(packedData, packedSize),true); } Decompressor::Decompressor(const std::vector<uint8_t> &packedData,bool exactSizeKnown,bool verify) : Modified: branches/OpenMPT-1.31/include/ancient/src/BZIP2Decompressor.cpp ============================================================================== --- branches/OpenMPT-1.31/include/ancient/src/BZIP2Decompressor.cpp Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/include/ancient/src/BZIP2Decompressor.cpp Mon Jul 15 21:02:26 2024 (r21187) @@ -16,7 +16,7 @@ namespace ancient::internal { -bool BZIP2Decompressor::detectHeader(uint32_t hdr) noexcept +bool BZIP2Decompressor::detectHeader(uint32_t hdr,uint32_t footer) noexcept { return ((hdr&0xffff'ff00U)==FourCC("BZh\0") && (hdr&0xffU)>='1' && (hdr&0xffU)<='9'); } @@ -41,7 +41,7 @@ _packedSize{0} { uint32_t hdr=packedData.readBE32(0); - if (!detectHeader(hdr)) + if (!detectHeader(hdr,0)) throw Decompressor::InvalidFormatError();; _blockSize=((hdr&0xffU)-'0')*100'000; } @@ -52,7 +52,7 @@ _packedSize{_packedData.size()} { uint32_t blockHdr=packedData.readBE32(0); - if (!detectHeader(blockHdr)) + if (!detectHeader(blockHdr,0)) throw Decompressor::InvalidFormatError();; _blockSize=((blockHdr&0xffU)-'0')*100'000; } Modified: branches/OpenMPT-1.31/include/ancient/src/BZIP2Decompressor.hpp ============================================================================== --- branches/OpenMPT-1.31/include/ancient/src/BZIP2Decompressor.hpp Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/include/ancient/src/BZIP2Decompressor.hpp Mon Jul 15 21:02:26 2024 (r21187) @@ -25,7 +25,7 @@ void decompressImpl(Buffer &rawData,bool verify) final; void decompressImpl(Buffer &rawData,const Buffer &previousData,bool verify) final; - static bool detectHeader(uint32_t hdr) noexcept; + static bool detectHeader(uint32_t hdr,uint32_t footer) noexcept; static bool detectHeaderXPK(uint32_t hdr) noexcept; static std::shared_ptr<Decompressor> create(const Buffer &packedData,bool exactSizeKnown,bool verify); Modified: branches/OpenMPT-1.31/include/ancient/src/CRMDecompressor.cpp ============================================================================== --- branches/OpenMPT-1.31/include/ancient/src/CRMDecompressor.cpp Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/include/ancient/src/CRMDecompressor.cpp Mon Jul 15 21:02:26 2024 (r21187) @@ -13,7 +13,7 @@ namespace ancient::internal { -bool CRMDecompressor::detectHeader(uint32_t hdr) noexcept +bool CRMDecompressor::detectHeader(uint32_t hdr,uint32_t footer) noexcept { switch (hdr) { @@ -63,7 +63,7 @@ _packedData{packedData} { uint32_t hdr{packedData.readBE32(0)}; - if (!detectHeader(hdr) || packedData.size()<20) + if (!detectHeader(hdr,0) || packedData.size()<20) throw Decompressor::InvalidFormatError(); if (hdr==0x1805'1973U || hdr==FourCC("CD\xb3\xb9") || hdr==FourCC("Iron") || hdr==FourCC("MSS!")) hdr=FourCC("CrM2"); Modified: branches/OpenMPT-1.31/include/ancient/src/CRMDecompressor.hpp ============================================================================== --- branches/OpenMPT-1.31/include/ancient/src/CRMDecompressor.hpp Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/include/ancient/src/CRMDecompressor.hpp Mon Jul 15 21:02:26 2024 (r21187) @@ -25,7 +25,7 @@ void decompressImpl(Buffer &rawData,bool verify) final; void decompressImpl(Buffer &rawData,const Buffer &previousData,bool verify) final; - static bool detectHeader(uint32_t hdr) noexcept; + static bool detectHeader(uint32_t hdr,uint32_t footer) noexcept; static bool detectHeaderXPK(uint32_t hdr) noexcept; static std::shared_ptr<Decompressor> create(const Buffer &packedData,bool exactSizeKnown,bool verify); Modified: branches/OpenMPT-1.31/include/ancient/src/CompactDecompressor.cpp ============================================================================== --- branches/OpenMPT-1.31/include/ancient/src/CompactDecompressor.cpp Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/include/ancient/src/CompactDecompressor.cpp Mon Jul 15 21:02:26 2024 (r21187) @@ -11,7 +11,7 @@ namespace ancient::internal { -bool CompactDecompressor::detectHeader(uint32_t hdr) noexcept +bool CompactDecompressor::detectHeader(uint32_t hdr,uint32_t footer) noexcept { // If a compact file has signature of 0x1fff it means the its endianess is wrongly configured // (This is easy since it only knows of vax and pdp-11) @@ -32,7 +32,7 @@ if (_packedData.size()<2U) throw InvalidFormatError(); uint32_t hdr{_packedData.readBE16(0)}; - if (!detectHeader(hdr<<16)) + if (!detectHeader(hdr<<16,0)) throw InvalidFormatError(); if (exactSizeKnown) _packedSize=packedData.size(); Modified: branches/OpenMPT-1.31/include/ancient/src/CompactDecompressor.hpp ============================================================================== --- branches/OpenMPT-1.31/include/ancient/src/CompactDecompressor.hpp Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/include/ancient/src/CompactDecompressor.hpp Mon Jul 15 21:02:26 2024 (r21187) @@ -21,7 +21,7 @@ void decompressImpl(Buffer &rawData,bool verify) final; - static bool detectHeader(uint32_t hdr) noexcept; + static bool detectHeader(uint32_t hdr,uint32_t footer) noexcept; static std::shared_ptr<Decompressor> create(const Buffer &packedData,bool exactSizeKnown,bool verify); Modified: branches/OpenMPT-1.31/include/ancient/src/CompressDecompressor.cpp ============================================================================== --- branches/OpenMPT-1.31/include/ancient/src/CompressDecompressor.cpp Mon Jul 15 20:58:24 2024 (r21186) +++ branches/OpenMPT-1.31/include/ancient/src/CompressDecompressor.cpp Mon Jul 15 21:02:26 2024 (r21187) @@ -10,7 +10,7 @@ namespace ancient::internal { -bool CompressDecompressor::detectHeader(uint32_t hdr) noexcept +bool CompressDecompressor::detectHeader(uint32_t hdr,uint32_t footer) noexcept { return ((hdr>>16)==0x1f9dU); } @@ -29,7 +29,7 @@ if (_packedData.size()<3U) throw InvalidFormatError(); uint32_t... [truncated message content] |
