modplug-svn-commit Mailing List for modplug (Page 147)

A music tracker software for Windows.

Brought to you by: lpchip, manxorist, rewbs, saga-games

modplug-svn-commit — OpenMPT subversion commit notifications

You can subscribe to this list here.

2006	Jan	Feb	Mar (1)	Apr (1)	May	Jun (1)	Jul	Aug (10)	Sep	Oct	Nov	Dec (3)
2007	Jan (1)	Feb (2)	Mar (3)	Apr (2)	May (10)	Jun (2)	Jul (1)	Aug	Sep	Oct	Nov (3)	Dec
2008	Jan (6)	Feb (4)	Mar (5)	Apr (2)	May (1)	Jun (1)	Jul (4)	Aug (6)	Sep (2)	Oct (9)	Nov (1)	Dec (4)
2009	Jan (9)	Feb (2)	Mar (2)	Apr (2)	May (6)	Jun (18)	Jul (33)	Aug (39)	Sep (33)	Oct (24)	Nov (23)	Dec (22)
2010	Jan (29)	Feb (32)	Mar (51)	Apr (17)	May (31)	Jun (21)	Jul (32)	Aug (28)	Sep (35)	Oct (27)	Nov (11)	Dec (13)
2011	Jan (14)	Feb (13)	Mar (27)	Apr (27)	May (28)	Jun (20)	Jul (43)	Aug (52)	Sep (66)	Oct (61)	Nov (11)	Dec (8)
2012	Jan (20)	Feb (30)	Mar (38)	Apr (21)	May (33)	Jun (21)	Jul (25)	Aug (9)	Sep (24)	Oct (42)	Nov (27)	Dec (41)
2013	Jan (20)	Feb (35)	Mar (156)	Apr (298)	May (258)	Jun (201)	Jul (105)	Aug (60)	Sep (193)	Oct (245)	Nov (280)	Dec (194)
2014	Jan (63)	Feb (202)	Mar (200)	Apr (23)	May (53)	Jun (105)	Jul (18)	Aug (26)	Sep (110)	Oct (187)	Nov (97)	Dec (74)
2015	Jan (45)	Feb (55)	Mar (116)	Apr (116)	May (193)	Jun (164)	Jul (50)	Aug (111)	Sep (98)	Oct (71)	Nov (103)	Dec (63)
2016	Jan (33)	Feb (101)	Mar (182)	Apr (139)	May (140)	Jun (103)	Jul (165)	Aug (286)	Sep (208)	Oct (127)	Nov (97)	Dec (54)
2017	Jan (64)	Feb (335)	Mar (202)	Apr (212)	May (139)	Jun (127)	Jul (294)	Aug (154)	Sep (170)	Oct (152)	Nov (156)	Dec (62)
2018	Jan (168)	Feb (237)	Mar (196)	Apr (174)	May (174)	Jun (161)	Jul (127)	Aug (88)	Sep (149)	Oct (66)	Nov (52)	Dec (135)
2019	Jan (146)	Feb (126)	Mar (104)	Apr (58)	May (60)	Jun (28)	Jul (197)	Aug (129)	Sep (141)	Oct (148)	Nov (63)	Dec (100)
2020	Jan (74)	Feb (37)	Mar (59)	Apr (154)	May (194)	Jun (133)	Jul (313)	Aug (197)	Sep (49)	Oct (162)	Nov (143)	Dec (57)
2021	Jan (120)	Feb (107)	Mar (314)	Apr (157)	May (524)	Jun (169)	Jul (72)	Aug (133)	Sep (135)	Oct (146)	Nov (198)	Dec (325)
2022	Jan (409)	Feb (249)	Mar (138)	Apr (95)	May (102)	Jun (221)	Jul (66)	Aug (120)	Sep (192)	Oct (131)	Nov (53)	Dec (171)
2023	Jan (357)	Feb (82)	Mar (168)	Apr (218)	May (196)	Jun (86)	Jul (115)	Aug (49)	Sep (190)	Oct (102)	Nov (45)	Dec (76)
2024	Jan (86)	Feb (50)	Mar (324)	Apr (209)	May (197)	Jun (232)	Jul (194)	Aug (247)	Sep (219)	Oct (266)	Nov (328)	Dec (304)
2025	Jan (191)	Feb (115)	Mar (137)	Apr (32)	May (126)	Jun (403)	Jul (213)	Aug (189)	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 145 146 147 148 149 .. 965 > >> (Page 147 of 965)

[OMPT-svn-commit] OpenMPT r20434 - trunk/OpenMPT/include/ancient/src

From: <sv...@op...> - 2024-03-23 19:40:17

Author: sagamusix
Date: Sat Mar 23 20:40:09 2024
New Revision: 20434
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20434

Log:
[Var] ancient: Apply commit 35e1f2883b246de860dc3fe7dc2de2a75a840b90 from https://github.com/temisu/ancient/pull/67 to fix VS2107 builds.

Modified:
   trunk/OpenMPT/include/ancient/src/FrequencyTree.hpp

Modified: trunk/OpenMPT/include/ancient/src/FrequencyTree.hpp
==============================================================================
--- trunk/OpenMPT/include/ancient/src/FrequencyTree.hpp	Sat Mar 23 17:38:20 2024	(r20433)
+++ trunk/OpenMPT/include/ancient/src/FrequencyTree.hpp	Sat Mar 23 20:40:09 2024	(r20434)
@@ -192,7 +192,7 @@
 	static constexpr std::array<uint32_t,_levels>	_levelOffsets{makeArray(makeLevelOffsetSequence(std::make_integer_sequence<uint32_t,levels()>{}))};
 	static constexpr std::array<uint32_t,_levels>	_levelSizes{makeArray(makeLevelSizeSequence(std::make_integer_sequence<uint32_t,levels()>{}))};
 
-	std::array<T,size()>				_tree;
+	std::array<T,_size>					_tree;
 };
 
 }

[OMPT-svn-commit] OpenMPT r20433 - in branches/OpenMPT-1.31: . mptrack

From: <sv...@op...> - 2024-03-23 16:38:30

Author: sagamusix
Date: Sat Mar 23 17:38:20 2024
New Revision: 20433
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20433

Log:
Merged revision(s) 20224 from trunk/OpenMPT:
[New] Add two more octaves worth of note key assignments suitable for micro-tuning (https://bugs.openmpt.org/view.php?id=1727).
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/mptrack/CommandSet.cpp
   branches/OpenMPT-1.31/mptrack/CommandSet.h
   branches/OpenMPT-1.31/mptrack/TrackerSettings.cpp
   branches/OpenMPT-1.31/mptrack/TrackerSettings.h
   branches/OpenMPT-1.31/mptrack/View_pat.cpp

Modified: branches/OpenMPT-1.31/mptrack/CommandSet.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/CommandSet.cpp	Sat Mar 23 17:16:39 2024	(r20432)
+++ branches/OpenMPT-1.31/mptrack/CommandSet.cpp	Sat Mar 23 17:38:20 2024	(r20433)
@@ -655,6 +655,32 @@
 	{1095, kcVPNoteG_2, _T("Base octave +2 G")},
 	{1096, kcVPNoteGS2, _T("Base octave +2 G#")},
 	{1097, kcVPNoteA_3, _T("Base octave +2 A")},
+	{2070, kcVPNoteAS3, _T("Base octave +2 A#")},
+	{2071, kcVPNoteB_3, _T("Base octave +2 B")},
+	{2072, kcVPNoteC_3, _T("Base octave +3 C")},
+	{2073, kcVPNoteCS3, _T("Base octave +3 C#")},
+	{2074, kcVPNoteD_3, _T("Base octave +3 D")},
+	{2075, kcVPNoteDS3, _T("Base octave +3 D#")},
+	{2076, kcVPNoteE_3, _T("Base octave +3 E")},
+	{2077, kcVPNoteF_3, _T("Base octave +3 F")},
+	{2078, kcVPNoteFS3, _T("Base octave +3 F#")},
+	{2079, kcVPNoteG_3, _T("Base octave +3 G")},
+	{2080, kcVPNoteGS3, _T("Base octave +3 G#")},
+	{2081, kcVPNoteA_4, _T("Base octave +3 A")},
+	{2082, kcVPNoteAS4, _T("Base octave +3 A#")},
+	{2083, kcVPNoteB_4, _T("Base octave +3 B")},
+	{2084, kcVPNoteC_4, _T("Base octave +4 C")},
+	{2085, kcVPNoteCS4, _T("Base octave +4 C#")},
+	{2086, kcVPNoteD_4, _T("Base octave +4 D")},
+	{2087, kcVPNoteDS4, _T("Base octave +4 D#")},
+	{2088, kcVPNoteE_4, _T("Base octave +4 E")},
+	{2089, kcVPNoteF_4, _T("Base octave +4 F")},
+	{2090, kcVPNoteFS4, _T("Base octave +4 F#")},
+	{2091, kcVPNoteG_4, _T("Base octave +4 G")},
+	{2092, kcVPNoteGS4, _T("Base octave +4 G#")},
+	{2093, kcVPNoteA_5, _T("Base octave +4 A")},
+	{2094, kcVPNoteAS5, _T("Base octave +4 A#")},
+	{2095, kcVPNoteB_5, _T("Base octave +4 B")},
 	{KeyCommand::Hidden, kcVPNoteStopC_0, _T("Stop base octave C")},
 	{KeyCommand::Hidden, kcVPNoteStopCS0, _T("Stop base octave C#")},
 	{KeyCommand::Hidden, kcVPNoteStopD_0, _T("Stop base octave D")},
@@ -664,9 +690,9 @@
 	{KeyCommand::Hidden, kcVPNoteStopFS0, _T("Stop base octave F#")},
 	{KeyCommand::Hidden, kcVPNoteStopG_0, _T("Stop base octave G")},
 	{KeyCommand::Hidden, kcVPNoteStopGS0, _T("Stop base octave G#")},
-	{KeyCommand::Hidden, kcVPNoteStopA_1, _T("Stop base octave +1 A")},
-	{KeyCommand::Hidden, kcVPNoteStopAS1, _T("Stop base octave +1 A#")},
-	{KeyCommand::Hidden, kcVPNoteStopB_1, _T("Stop base octave +1 B")},
+	{KeyCommand::Hidden, kcVPNoteStopA_1, _T("Stop base octave A")},
+	{KeyCommand::Hidden, kcVPNoteStopAS1, _T("Stop base octave A#")},
+	{KeyCommand::Hidden, kcVPNoteStopB_1, _T("Stop base octave B")},
 	{KeyCommand::Hidden, kcVPNoteStopC_1, _T("Stop base octave +1 C")},
 	{KeyCommand::Hidden, kcVPNoteStopCS1, _T("Stop base octave +1 C#")},
 	{KeyCommand::Hidden, kcVPNoteStopD_1, _T("Stop base octave +1 D")},
@@ -676,9 +702,9 @@
 	{KeyCommand::Hidden, kcVPNoteStopFS1, _T("Stop base octave +1 F#")},
 	{KeyCommand::Hidden, kcVPNoteStopG_1, _T("Stop base octave +1 G")},
 	{KeyCommand::Hidden, kcVPNoteStopGS1, _T("Stop base octave +1 G#")},
-	{KeyCommand::Hidden, kcVPNoteStopA_2, _T("Stop base octave +2 A")},
-	{KeyCommand::Hidden, kcVPNoteStopAS2, _T("Stop base octave +2 A#")},
-	{KeyCommand::Hidden, kcVPNoteStopB_2, _T("Stop base octave +2 B")},
+	{KeyCommand::Hidden, kcVPNoteStopA_2, _T("Stop base octave +1 A")},
+	{KeyCommand::Hidden, kcVPNoteStopAS2, _T("Stop base octave +1 A#")},
+	{KeyCommand::Hidden, kcVPNoteStopB_2, _T("Stop base octave +1 B")},
 	{KeyCommand::Hidden, kcVPNoteStopC_2, _T("Stop base octave +2 C")},
 	{KeyCommand::Hidden, kcVPNoteStopCS2, _T("Stop base octave +2 C#")},
 	{KeyCommand::Hidden, kcVPNoteStopD_2, _T("Stop base octave +2 D")},
@@ -688,7 +714,33 @@
 	{KeyCommand::Hidden, kcVPNoteStopFS2, _T("Stop base octave +2 F#")},
 	{KeyCommand::Hidden, kcVPNoteStopG_2, _T("Stop base octave +2 G")},
 	{KeyCommand::Hidden, kcVPNoteStopGS2, _T("Stop base octave +2 G#")},
-	{KeyCommand::Hidden, kcVPNoteStopA_3, _T("Stop base octave +3 A")},
+	{KeyCommand::Hidden, kcVPNoteStopA_3, _T("Stop base octave +2 A")},
+	{KeyCommand::Hidden, kcVPNoteStopAS3, _T("Stop base octave +2 A#")},
+	{KeyCommand::Hidden, kcVPNoteStopB_3, _T("Stop base octave +2 B")},
+	{KeyCommand::Hidden, kcVPNoteStopC_3, _T("Stop base octave +3 C")},
+	{KeyCommand::Hidden, kcVPNoteStopCS3, _T("Stop base octave +3 C#")},
+	{KeyCommand::Hidden, kcVPNoteStopD_3, _T("Stop base octave +3 D")},
+	{KeyCommand::Hidden, kcVPNoteStopDS3, _T("Stop base octave +3 D#")},
+	{KeyCommand::Hidden, kcVPNoteStopE_3, _T("Stop base octave +3 E")},
+	{KeyCommand::Hidden, kcVPNoteStopF_3, _T("Stop base octave +3 F")},
+	{KeyCommand::Hidden, kcVPNoteStopFS3, _T("Stop base octave +3 F#")},
+	{KeyCommand::Hidden, kcVPNoteStopG_3, _T("Stop base octave +3 G")},
+	{KeyCommand::Hidden, kcVPNoteStopGS3, _T("Stop base octave +3 G#")},
+	{KeyCommand::Hidden, kcVPNoteStopA_4, _T("Stop base octave +3 A")},
+	{KeyCommand::Hidden, kcVPNoteStopAS4, _T("Stop base octave +3 A#")},
+	{KeyCommand::Hidden, kcVPNoteStopB_4, _T("Stop base octave +3 B")},
+	{KeyCommand::Hidden, kcVPNoteStopC_4, _T("Stop base octave +4 C")},
+	{KeyCommand::Hidden, kcVPNoteStopCS4, _T("Stop base octave +4 C#")},
+	{KeyCommand::Hidden, kcVPNoteStopD_4, _T("Stop base octave +4 D")},
+	{KeyCommand::Hidden, kcVPNoteStopDS4, _T("Stop base octave +4 D#")},
+	{KeyCommand::Hidden, kcVPNoteStopE_4, _T("Stop base octave +4 E")},
+	{KeyCommand::Hidden, kcVPNoteStopF_4, _T("Stop base octave +4 F")},
+	{KeyCommand::Hidden, kcVPNoteStopFS4, _T("Stop base octave +4 F#")},
+	{KeyCommand::Hidden, kcVPNoteStopG_4, _T("Stop base octave +4 G")},
+	{KeyCommand::Hidden, kcVPNoteStopGS4, _T("Stop base octave +4 G#")},
+	{KeyCommand::Hidden, kcVPNoteStopA_5, _T("Stop base octave +4 A")},
+	{KeyCommand::Hidden, kcVPNoteStopAS5, _T("Stop base octave +4 A#")},
+	{KeyCommand::Hidden, kcVPNoteStopB_5, _T("Stop base octave +4 B")},
 	{KeyCommand::Hidden, kcVPChordC_0, _T("Base octave chord C")},
 	{KeyCommand::Hidden, kcVPChordCS0, _T("Base octave chord C#")},
 	{KeyCommand::Hidden, kcVPChordD_0, _T("Base octave chord D")},
@@ -698,9 +750,9 @@
 	{KeyCommand::Hidden, kcVPChordFS0, _T("Base octave chord F#")},
 	{KeyCommand::Hidden, kcVPChordG_0, _T("Base octave chord G")},
 	{KeyCommand::Hidden, kcVPChordGS0, _T("Base octave chord G#")},
-	{KeyCommand::Hidden, kcVPChordA_1, _T("Base octave +1 chord A")},
-	{KeyCommand::Hidden, kcVPChordAS1, _T("Base octave +1 chord A#")},
-	{KeyCommand::Hidden, kcVPChordB_1, _T("Base octave +1 chord B")},
+	{KeyCommand::Hidden, kcVPChordA_1, _T("Base octave chord A")},
+	{KeyCommand::Hidden, kcVPChordAS1, _T("Base octave chord A#")},
+	{KeyCommand::Hidden, kcVPChordB_1, _T("Base octave chord B")},
 	{KeyCommand::Hidden, kcVPChordC_1, _T("Base octave +1 chord C")},
 	{KeyCommand::Hidden, kcVPChordCS1, _T("Base octave +1 chord C#")},
 	{KeyCommand::Hidden, kcVPChordD_1, _T("Base octave +1 chord D")},
@@ -710,9 +762,9 @@
 	{KeyCommand::Hidden, kcVPChordFS1, _T("Base octave +1 chord F#")},
 	{KeyCommand::Hidden, kcVPChordG_1, _T("Base octave +1 chord G")},
 	{KeyCommand::Hidden, kcVPChordGS1, _T("Base octave +1 chord G#")},
-	{KeyCommand::Hidden, kcVPChordA_2, _T("Base octave +2 chord A")},
-	{KeyCommand::Hidden, kcVPChordAS2, _T("Base octave +2 chord A#")},
-	{KeyCommand::Hidden, kcVPChordB_2, _T("Base octave +2 chord B")},
+	{KeyCommand::Hidden, kcVPChordA_2, _T("Base octave +1 chord A")},
+	{KeyCommand::Hidden, kcVPChordAS2, _T("Base octave +1 chord A#")},
+	{KeyCommand::Hidden, kcVPChordB_2, _T("Base octave +1 chord B")},
 	{KeyCommand::Hidden, kcVPChordC_2, _T("Base octave +2 chord C")},
 	{KeyCommand::Hidden, kcVPChordCS2, _T("Base octave +2 chord C#")},
 	{KeyCommand::Hidden, kcVPChordD_2, _T("Base octave +2 chord D")},
@@ -722,7 +774,33 @@
 	{KeyCommand::Hidden, kcVPChordFS2, _T("Base octave +2 chord F#")},
 	{KeyCommand::Hidden, kcVPChordG_2, _T("Base octave +2 chord G")},
 	{KeyCommand::Hidden, kcVPChordGS2, _T("Base octave +2 chord G#")},
-	{KeyCommand::Hidden, kcVPChordA_3, _T("Base octave chord +3 A")},
+	{KeyCommand::Hidden, kcVPChordA_3, _T("Base octave +2 chord A")},
+	{KeyCommand::Hidden, kcVPChordAS3, _T("Base octave +2 chord A#")},
+	{KeyCommand::Hidden, kcVPChordB_3, _T("Base octave +2 chord B")},
+	{KeyCommand::Hidden, kcVPChordC_3, _T("Base octave +3 chord C")},
+	{KeyCommand::Hidden, kcVPChordCS3, _T("Base octave +3 chord C#")},
+	{KeyCommand::Hidden, kcVPChordD_3, _T("Base octave +3 chord D")},
+	{KeyCommand::Hidden, kcVPChordDS3, _T("Base octave +3 chord D#")},
+	{KeyCommand::Hidden, kcVPChordE_3, _T("Base octave +3 chord E")},
+	{KeyCommand::Hidden, kcVPChordF_3, _T("Base octave +3 chord F")},
+	{KeyCommand::Hidden, kcVPChordFS3, _T("Base octave +3 chord F#")},
+	{KeyCommand::Hidden, kcVPChordG_3, _T("Base octave +3 chord G")},
+	{KeyCommand::Hidden, kcVPChordGS3, _T("Base octave +3 chord G#")},
+	{KeyCommand::Hidden, kcVPChordA_4, _T("Base octave +3 chord A")},
+	{KeyCommand::Hidden, kcVPChordAS4, _T("Base octave +3 chord A#")},
+	{KeyCommand::Hidden, kcVPChordB_4, _T("Base octave +3 chord B")},
+	{KeyCommand::Hidden, kcVPChordC_4, _T("Base octave +4 chord C")},
+	{KeyCommand::Hidden, kcVPChordCS4, _T("Base octave +4 chord C#")},
+	{KeyCommand::Hidden, kcVPChordD_4, _T("Base octave +4 chord D")},
+	{KeyCommand::Hidden, kcVPChordDS4, _T("Base octave +4 chord D#")},
+	{KeyCommand::Hidden, kcVPChordE_4, _T("Base octave +4 chord E")},
+	{KeyCommand::Hidden, kcVPChordF_4, _T("Base octave +4 chord F")},
+	{KeyCommand::Hidden, kcVPChordFS4, _T("Base octave +4 chord F#")},
+	{KeyCommand::Hidden, kcVPChordG_4, _T("Base octave +4 chord G")},
+	{KeyCommand::Hidden, kcVPChordGS4, _T("Base octave +4 chord G#")},
+	{KeyCommand::Hidden, kcVPChordA_5, _T("Base octave +4 chord A")},
+	{KeyCommand::Hidden, kcVPChordAS5, _T("Base octave +4 chord A#")},
+	{KeyCommand::Hidden, kcVPChordB_5, _T("Base octave +4 chord B")},
 	{KeyCommand::Hidden, kcVPChordStopC_0, _T("Stop base octave chord C")},
 	{KeyCommand::Hidden, kcVPChordStopCS0, _T("Stop base octave chord C#")},
 	{KeyCommand::Hidden, kcVPChordStopD_0, _T("Stop base octave chord D")},
@@ -732,9 +810,9 @@
 	{KeyCommand::Hidden, kcVPChordStopFS0, _T("Stop base octave chord F#")},
 	{KeyCommand::Hidden, kcVPChordStopG_0, _T("Stop base octave chord G")},
 	{KeyCommand::Hidden, kcVPChordStopGS0, _T("Stop base octave chord G#")},
-	{KeyCommand::Hidden, kcVPChordStopA_1, _T("Stop base octave +1 chord A")},
-	{KeyCommand::Hidden, kcVPChordStopAS1, _T("Stop base octave +1 chord A#")},
-	{KeyCommand::Hidden, kcVPChordStopB_1, _T("Stop base octave +1 chord B")},
+	{KeyCommand::Hidden, kcVPChordStopA_1, _T("Stop base octave chord A")},
+	{KeyCommand::Hidden, kcVPChordStopAS1, _T("Stop base octave chord A#")},
+	{KeyCommand::Hidden, kcVPChordStopB_1, _T("Stop base octave chord B")},
 	{KeyCommand::Hidden, kcVPChordStopC_1, _T("Stop base octave +1 chord C")},
 	{KeyCommand::Hidden, kcVPChordStopCS1, _T("Stop base octave +1 chord C#")},
 	{KeyCommand::Hidden, kcVPChordStopD_1, _T("Stop base octave +1 chord D")},
@@ -744,9 +822,9 @@
 	{KeyCommand::Hidden, kcVPChordStopFS1, _T("Stop base octave +1 chord F#")},
 	{KeyCommand::Hidden, kcVPChordStopG_1, _T("Stop base octave +1 chord G")},
 	{KeyCommand::Hidden, kcVPChordStopGS1, _T("Stop base octave +1 chord G#")},
-	{KeyCommand::Hidden, kcVPChordStopA_2, _T("Stop base octave +2 chord A")},
-	{KeyCommand::Hidden, kcVPChordStopAS2, _T("Stop base octave +2 chord A#")},
-	{KeyCommand::Hidden, kcVPChordStopB_2, _T("Stop base octave +2 chord B")},
+	{KeyCommand::Hidden, kcVPChordStopA_2, _T("Stop base octave +1 chord A")},
+	{KeyCommand::Hidden, kcVPChordStopAS2, _T("Stop base octave +1 chord A#")},
+	{KeyCommand::Hidden, kcVPChordStopB_2, _T("Stop base octave +1 chord B")},
 	{KeyCommand::Hidden, kcVPChordStopC_2, _T("Stop base octave +2 chord C")},
 	{KeyCommand::Hidden, kcVPChordStopCS2, _T("Stop base octave +2 chord C#")},
 	{KeyCommand::Hidden, kcVPChordStopD_2, _T("Stop base octave +2 chord D")},
@@ -756,7 +834,33 @@
 	{KeyCommand::Hidden, kcVPChordStopFS2, _T("Stop base octave +2 chord F#")},
 	{KeyCommand::Hidden, kcVPChordStopG_2, _T("Stop base octave +2 chord G")},
 	{KeyCommand::Hidden, kcVPChordStopGS2, _T("Stop base octave +2 chord G#")},
-	{KeyCommand::Hidden, kcVPChordStopA_3, _T("Stop base octave +3 chord A")},
+	{KeyCommand::Hidden, kcVPChordStopA_3, _T("Stop base octave +2 chord A")},
+	{KeyCommand::Hidden, kcVPChordStopAS3, _T("Stop base octave +2 chord A#")},
+	{KeyCommand::Hidden, kcVPChordStopB_3, _T("Stop base octave +2 chord B")},
+	{KeyCommand::Hidden, kcVPChordStopC_3, _T("Stop base octave +3 chord C")},
+	{KeyCommand::Hidden, kcVPChordStopCS3, _T("Stop base octave +3 chord C#")},
+	{KeyCommand::Hidden, kcVPChordStopD_3, _T("Stop base octave +3 chord D")},
+	{KeyCommand::Hidden, kcVPChordStopDS3, _T("Stop base octave +3 chord D#")},
+	{KeyCommand::Hidden, kcVPChordStopE_3, _T("Stop base octave +3 chord E")},
+	{KeyCommand::Hidden, kcVPChordStopF_3, _T("Stop base octave +3 chord F")},
+	{KeyCommand::Hidden, kcVPChordStopFS3, _T("Stop base octave +3 chord F#")},
+	{KeyCommand::Hidden, kcVPChordStopG_3, _T("Stop base octave +3 chord G")},
+	{KeyCommand::Hidden, kcVPChordStopGS3, _T("Stop base octave +3 chord G#")},
+	{KeyCommand::Hidden, kcVPChordStopA_4, _T("Stop base octave +3 chord A")},
+	{KeyCommand::Hidden, kcVPChordStopAS4, _T("Stop base octave +3 chord A#")},
+	{KeyCommand::Hidden, kcVPChordStopB_4, _T("Stop base octave +3 chord B")},
+	{KeyCommand::Hidden, kcVPChordStopC_4, _T("Stop base octave +4 chord C")},
+	{KeyCommand::Hidden, kcVPChordStopCS4, _T("Stop base octave +4 chord C#")},
+	{KeyCommand::Hidden, kcVPChordStopD_4, _T("Stop base octave +4 chord D")},
+	{KeyCommand::Hidden, kcVPChordStopDS4, _T("Stop base octave +4 chord D#")},
+	{KeyCommand::Hidden, kcVPChordStopE_4, _T("Stop base octave +4 chord E")},
+	{KeyCommand::Hidden, kcVPChordStopF_4, _T("Stop base octave +4 chord F")},
+	{KeyCommand::Hidden, kcVPChordStopFS4, _T("Stop base octave +4 chord F#")},
+	{KeyCommand::Hidden, kcVPChordStopG_4, _T("Stop base octave +4 chord G")},
+	{KeyCommand::Hidden, kcVPChordStopGS4, _T("Stop base octave +4 chord G#")},
+	{KeyCommand::Hidden, kcVPChordStopA_5, _T("Stop base octave +4 chord A")},
+	{KeyCommand::Hidden, kcVPChordStopAS5, _T("Stop base octave +4 chord A#")},
+	{KeyCommand::Hidden, kcVPChordStopB_5, _T("Stop base octave +4 chord B")},
 	{1200, kcNoteCut, _T("Note Cut")},
 	{1201, kcNoteOff, _T("Note Off")},
 	{1202, kcSetIns0, _T("Set instrument digit 0")},

Modified: branches/OpenMPT-1.31/mptrack/CommandSet.h
==============================================================================
--- branches/OpenMPT-1.31/mptrack/CommandSet.h	Sat Mar 23 17:16:39 2024	(r20432)
+++ branches/OpenMPT-1.31/mptrack/CommandSet.h	Sat Mar 23 17:38:20 2024	(r20433)
@@ -65,7 +65,7 @@
 
 enum CommandID
 {
-	kcCommandSetNumNotes = 33,  // kcVPEndNotes - kcVPStartNotes
+	kcCommandSetNumNotes = 59,  // kcVPEndNotes - kcVPStartNotes
 
 	kcNull = -1,
 	kcFirst,
@@ -433,7 +433,33 @@
 	kcVPNoteG_2,
 	kcVPNoteGS2,
 	kcVPNoteA_3,
-	kcVPEndNotes = kcVPNoteA_3,
+	kcVPNoteAS3,
+	kcVPNoteB_3,
+	kcVPNoteC_3,
+	kcVPNoteCS3,
+	kcVPNoteD_3,
+	kcVPNoteDS3,
+	kcVPNoteE_3,
+	kcVPNoteF_3,
+	kcVPNoteFS3,
+	kcVPNoteG_3,
+	kcVPNoteGS3,
+	kcVPNoteA_4,
+	kcVPNoteAS4,
+	kcVPNoteB_4,
+	kcVPNoteC_4,
+	kcVPNoteCS4,
+	kcVPNoteD_4,
+	kcVPNoteDS4,
+	kcVPNoteE_4,
+	kcVPNoteF_4,
+	kcVPNoteFS4,
+	kcVPNoteG_4,
+	kcVPNoteGS4,
+	kcVPNoteA_5,
+	kcVPNoteAS5,
+	kcVPNoteB_5,
+	kcVPEndNotes = kcVPNoteB_5,
 
 	//Note stops
 	kcVPStartNoteStops,
@@ -471,7 +497,33 @@
 	kcVPNoteStopG_2,
 	kcVPNoteStopGS2,
 	kcVPNoteStopA_3,
-	kcVPEndNoteStops = kcVPNoteStopA_3,
+	kcVPNoteStopAS3,
+	kcVPNoteStopB_3,
+	kcVPNoteStopC_3,
+	kcVPNoteStopCS3,
+	kcVPNoteStopD_3,
+	kcVPNoteStopDS3,
+	kcVPNoteStopE_3,
+	kcVPNoteStopF_3,
+	kcVPNoteStopFS3,
+	kcVPNoteStopG_3,
+	kcVPNoteStopGS3,
+	kcVPNoteStopA_4,
+	kcVPNoteStopAS4,
+	kcVPNoteStopB_4,
+	kcVPNoteStopC_4,
+	kcVPNoteStopCS4,
+	kcVPNoteStopD_4,
+	kcVPNoteStopDS4,
+	kcVPNoteStopE_4,
+	kcVPNoteStopF_4,
+	kcVPNoteStopFS4,
+	kcVPNoteStopG_4,
+	kcVPNoteStopGS4,
+	kcVPNoteStopA_5,
+	kcVPNoteStopAS5,
+	kcVPNoteStopB_5,
+	kcVPEndNoteStops = kcVPNoteStopB_5,
 
 	//Chords
 	kcVPStartChords,
@@ -509,7 +561,33 @@
 	kcVPChordG_2,
 	kcVPChordGS2,
 	kcVPChordA_3,
-	kcVPEndChords = kcVPChordA_3,
+	kcVPChordAS3,
+	kcVPChordB_3,
+	kcVPChordC_3,
+	kcVPChordCS3,
+	kcVPChordD_3,
+	kcVPChordDS3,
+	kcVPChordE_3,
+	kcVPChordF_3,
+	kcVPChordFS3,
+	kcVPChordG_3,
+	kcVPChordGS3,
+	kcVPChordA_4,
+	kcVPChordAS4,
+	kcVPChordB_4,
+	kcVPChordC_4,
+	kcVPChordCS4,
+	kcVPChordD_4,
+	kcVPChordDS4,
+	kcVPChordE_4,
+	kcVPChordF_4,
+	kcVPChordFS4,
+	kcVPChordG_4,
+	kcVPChordGS4,
+	kcVPChordA_5,
+	kcVPChordAS5,
+	kcVPChordB_5,
+	kcVPEndChords = kcVPChordA_5,
 
 	//Chord Stops
 	kcVPStartChordStops,
@@ -547,7 +625,33 @@
 	kcVPChordStopG_2,
 	kcVPChordStopGS2,
 	kcVPChordStopA_3,
-	kcVPEndChordStops = kcVPChordStopA_3,
+	kcVPChordStopAS3,
+	kcVPChordStopB_3,
+	kcVPChordStopC_3,
+	kcVPChordStopCS3,
+	kcVPChordStopD_3,
+	kcVPChordStopDS3,
+	kcVPChordStopE_3,
+	kcVPChordStopF_3,
+	kcVPChordStopFS3,
+	kcVPChordStopG_3,
+	kcVPChordStopGS3,
+	kcVPChordStopA_4,
+	kcVPChordStopAS4,
+	kcVPChordStopB_4,
+	kcVPChordStopC_4,
+	kcVPChordStopCS4,
+	kcVPChordStopD_4,
+	kcVPChordStopDS4,
+	kcVPChordStopE_4,
+	kcVPChordStopF_4,
+	kcVPChordStopFS4,
+	kcVPChordStopG_4,
+	kcVPChordStopGS4,
+	kcVPChordStopA_5,
+	kcVPChordStopAS5,
+	kcVPChordStopB_5,
+	kcVPEndChordStops = kcVPChordStopB_5,
 
 	//Set octave from note column
 	kcSetOctave0,

Modified: branches/OpenMPT-1.31/mptrack/TrackerSettings.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/TrackerSettings.cpp	Sat Mar 23 17:16:39 2024	(r20432)
+++ branches/OpenMPT-1.31/mptrack/TrackerSettings.cpp	Sat Mar 23 17:38:20 2024	(r20433)
@@ -404,26 +404,26 @@
 	// init old and messy stuff:
 
 	// Default chords
-	MemsetZero(Chords);
-	for(UINT ichord = 0; ichord < 3 * 12; ichord++)
+	for(size_t i = 0; i < Chords.size(); i++)
 	{
-		Chords[ichord].key = (uint8)ichord;
-		Chords[ichord].notes[0] = MPTChord::noNote;
-		Chords[ichord].notes[1] = MPTChord::noNote;
-		Chords[ichord].notes[2] = MPTChord::noNote;
+		mpt::reset(Chords[i]);
+		Chords[i].key = static_cast<uint8>(i);
+		Chords[i].notes[0] = MPTChord::noNote;
+		Chords[i].notes[1] = MPTChord::noNote;
+		Chords[i].notes[2] = MPTChord::noNote;
 
-		if(ichord < 12)
+		if(i < 12)
 		{
 			// Major Chords
-			Chords[ichord].notes[0] = (int8)(ichord + 4);
-			Chords[ichord].notes[1] = (int8)(ichord + 7);
-			Chords[ichord].notes[2] = (int8)(ichord + 10);
-		} else if(ichord < 24)
+			Chords[i].notes[0] = static_cast<int8>(i + 4);
+			Chords[i].notes[1] = static_cast<int8>(i + 7);
+			Chords[i].notes[2] = static_cast<int8>(i + 10);
+		} else if(i < 24)
 		{
 			// Minor Chords
-			Chords[ichord].notes[0] = (int8)(ichord - 9);
-			Chords[ichord].notes[1] = (int8)(ichord - 5);
-			Chords[ichord].notes[2] = (int8)(ichord - 2);
+			Chords[i].notes[0] = static_cast<int8>(i - 9);
+			Chords[i].notes[1] = static_cast<int8>(i - 5);
+			Chords[i].notes[2] = static_cast<int8>(i - 2);
 		}
 	}
 
@@ -1406,7 +1406,7 @@
 
 void TrackerSettings::LoadChords(MPTChords &chords)
 {
-	for(std::size_t i = 0; i < std::size(chords); i++)
+	for(std::size_t i = 0; i < chords.size(); i++)
 	{
 		uint32 chord;
 		mpt::ustring noteName = MPT_UFORMAT("{}{}")(mpt::ustring(NoteNamesSharp[i % 12]), i / 12);
@@ -1435,7 +1435,7 @@
 
 void TrackerSettings::SaveChords(MPTChords &chords)
 {
-	for(std::size_t i = 0; i < std::size(chords); i++)
+	for(std::size_t i = 0; i < chords.size(); i++)
 	{
 		auto notes = chords[i].notes;
 		for(auto &note : notes)

Modified: branches/OpenMPT-1.31/mptrack/TrackerSettings.h
==============================================================================
--- branches/OpenMPT-1.31/mptrack/TrackerSettings.h	Sat Mar 23 17:16:39 2024	(r20432)
+++ branches/OpenMPT-1.31/mptrack/TrackerSettings.h	Sat Mar 23 17:38:20 2024	(r20433)
@@ -209,7 +209,7 @@
 	std::array<NoteType, notesPerChord - 1> notes;  // Additional chord notes
 };
 
-using MPTChords = std::array<MPTChord, 3 * 12>;	// 3 octaves
+using MPTChords = std::array<MPTChord, 60>;  // Size == kcCommandSetNumNotes
 
 // MIDI recording
 enum RecordAftertouchOptions

Modified: branches/OpenMPT-1.31/mptrack/View_pat.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/View_pat.cpp	Sat Mar 23 17:16:39 2024	(r20432)
+++ branches/OpenMPT-1.31/mptrack/View_pat.cpp	Sat Mar 23 17:38:20 2024	(r20433)
@@ -5649,6 +5649,7 @@
 {
 	const MPTChords &chords = TrackerSettings::GetChords();
 	UINT chordNum = note - GetBaseNote();
+	static_assert(mpt::extent<decltype(chords)>() == kcCommandSetNumNotes + 1);
 
 	if(chordNum >= chords.size())
 	{

[OMPT-svn-commit] OpenMPT r20432 - branches/OpenMPT-1.28/libopenmpt/dox

From: <sv...@op...> - 2024-03-23 16:16:46

Author: sagamusix
Date: Sat Mar 23 17:16:39 2024
New Revision: 20432
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20432

Log:
[Doc] libopenmpt: Update changelog.

Modified:
   branches/OpenMPT-1.28/libopenmpt/dox/changelog.md

Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md
==============================================================================
--- branches/OpenMPT-1.28/libopenmpt/dox/changelog.md	Sat Mar 23 17:15:57 2024	(r20431)
+++ branches/OpenMPT-1.28/libopenmpt/dox/changelog.md	Sat Mar 23 17:16:39 2024	(r20432)
@@ -7,6 +7,15 @@
 
 ### libopenmpt 0.4.41-pre
 
+ *  [**Sec**] Undefined behaviour in song length calculation with nested loops
+    that cause a length of infinity to be calculated (r20423).
+
+ *  MED: Transposed samples were playing too low in some files (e.g. mix94.mmd1).
+ *  OKT: Some files with garbage at the end were rejected
+    (e.g. katharsis - piano lesson.okta).
+ *  Compressor DMO: It was possible that the plugin would not behave as intended
+    at mix rates above 500 kHz.
+
 ### libopenmpt 0.4.40 (2024-03-17)
 
  *  [**Sec**] Null-pointer write (32bit platforms) or excessive memory

[OMPT-svn-commit] OpenMPT r20431 - branches/OpenMPT-1.29/libopenmpt/dox

From: <sv...@op...> - 2024-03-23 16:16:09

Author: sagamusix
Date: Sat Mar 23 17:15:57 2024
New Revision: 20431
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20431

Log:
[Doc] libopenmpt: Update changelog.

Modified:
   branches/OpenMPT-1.29/libopenmpt/dox/changelog.md

Modified: branches/OpenMPT-1.29/libopenmpt/dox/changelog.md
==============================================================================
--- branches/OpenMPT-1.29/libopenmpt/dox/changelog.md	Sat Mar 23 16:38:08 2024	(r20430)
+++ branches/OpenMPT-1.29/libopenmpt/dox/changelog.md	Sat Mar 23 17:15:57 2024	(r20431)
@@ -7,6 +7,15 @@
 
 ### libopenmpt 0.5.29-pre
 
+ *  [**Sec**] Undefined behaviour in song length calculation with nested loops
+    that cause a length of infinity to be calculated (r20422).
+
+ *  MED: Transposed samples were playing too low in some files (e.g. mix94.mmd1).
+ *  OKT: Some files with garbage at the end were rejected
+    (e.g. katharsis - piano lesson.okta).
+ *  Compressor DMO: It was possible that the plugin would not behave as intended
+    at mix rates above 500 kHz.
+
 ### libopenmpt 0.5.28 (2024-03-17)
 
  *  [**Sec**] Null-pointer write (32bit platforms) or excessive memory

[OMPT-svn-commit] OpenMPT r20430 - branches/OpenMPT-1.30/libopenmpt/dox

From: <sv...@op...> - 2024-03-23 15:38:20

Author: sagamusix
Date: Sat Mar 23 16:38:08 2024
New Revision: 20430
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20430

Log:
[Doc] libopenmpt: Update changelog.

Modified:
   branches/OpenMPT-1.30/libopenmpt/dox/changelog.md

Modified: branches/OpenMPT-1.30/libopenmpt/dox/changelog.md
==============================================================================
--- branches/OpenMPT-1.30/libopenmpt/dox/changelog.md	Sat Mar 23 16:37:12 2024	(r20429)
+++ branches/OpenMPT-1.30/libopenmpt/dox/changelog.md	Sat Mar 23 16:38:08 2024	(r20430)
@@ -7,6 +7,17 @@
 
 ### libopenmpt 0.6.15-pre
 
+ *  [**Sec**] Potential heap out-of-bounds read or write past sample end with
+    malformed sustain loops in SymMOD files (r20421).
+
+ *  MED: Transposed samples were playing too low in some files (e.g. mix94.mmd1).
+ *  OKT: Some files with garbage at the end were rejected
+    (e.g. katharsis - piano lesson.okta).
+ *  Compressor DMO: It was possible that the plugin would not behave as intended
+    at mix rates above 500 kHz.
+ *  Avoid re-allocating the loop state map contents on every playthrough of the
+    module
+
 ### libopenmpt 0.6.14 (2024-03-17)
 
  *  [**Sec**] Null-pointer write (32bit platforms) or excessive memory

[OMPT-svn-commit] OpenMPT r20429 - branches/OpenMPT-1.31/doc/libopenmpt

From: <sv...@op...> - 2024-03-23 15:37:25

Author: sagamusix
Date: Sat Mar 23 16:37:12 2024
New Revision: 20429
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20429

Log:
[Doc] libopenmpt: Update changelog.

Modified:
   branches/OpenMPT-1.31/doc/libopenmpt/changelog.md

Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md
==============================================================================
--- branches/OpenMPT-1.31/doc/libopenmpt/changelog.md	Sat Mar 23 16:33:37 2024	(r20428)
+++ branches/OpenMPT-1.31/doc/libopenmpt/changelog.md	Sat Mar 23 16:37:12 2024	(r20429)
@@ -7,6 +7,17 @@
 
 ### libopenmpt 0.7.6-pre
 
+ *  [**Sec**] Potential heap out-of-bounds read or write past sample end with
+    malformed sustain loops in SymMOD files (r20420).
+
+ *  MED: Transposed samples were playing too low in some files (e.g. mix94.mmd1).
+ *  OKT: Some files with garbage at the end were rejected
+    (e.g. katharsis - piano lesson.okta).
+ *  Compressor DMO: It was possible that the plugin would not behave as intended
+    at mix rates above 500 kHz.
+ *  Avoid re-allocating the loop state map contents on every playthrough of the
+    module
+
 ### libopenmpt 0.7.5 (2024-03-17)
 
  *  [**Sec**] Null-pointer write (32bit platforms) or excessive memory

[OMPT-svn-commit] OpenMPT r20428 - 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/api/ancient include/ancient/src include/ancient/src/common

From: <sv...@op...> - 2024-03-23 15:33:57

Author: sagamusix
Date: Sat Mar 23 16:33:37 2024
New Revision: 20428
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20428

Log:
Merged revision(s) 20427 from trunk/OpenMPT:
[Var] ancient: Update to commit c6038c179aeac138667c4319e997d6dd5a25a4be (2024-03-23)

........

Added:
   branches/OpenMPT-1.31/include/ancient/src/SHRXDecompressor.cpp
      - copied unchanged from r20427, trunk/OpenMPT/include/ancient/src/SHRXDecompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/SHRXDecompressor.hpp
      - copied unchanged from r20427, trunk/OpenMPT/include/ancient/src/SHRXDecompressor.hpp
   branches/OpenMPT-1.31/include/ancient/src/VariableLengthCodeDecoder.hpp
      - copied unchanged from r20427, trunk/OpenMPT/include/ancient/src/VariableLengthCodeDecoder.hpp
   branches/OpenMPT-1.31/include/ancient/src/VicXDecompressor.cpp
      - copied unchanged from r20427, trunk/OpenMPT/include/ancient/src/VicXDecompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/VicXDecompressor.hpp
      - copied unchanged from r20427, trunk/OpenMPT/include/ancient/src/VicXDecompressor.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/api/ancient/ancient.hpp
   branches/OpenMPT-1.31/include/ancient/src/ACCADecompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/ACCADecompressor.hpp
   branches/OpenMPT-1.31/include/ancient/src/API.cpp
   branches/OpenMPT-1.31/include/ancient/src/ARTMDecompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/ARTMDecompressor.hpp
   branches/OpenMPT-1.31/include/ancient/src/BLZWDecompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/BLZWDecompressor.hpp
   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/CBR0Decompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/CBR0Decompressor.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/CYB2Decoder.cpp
   branches/OpenMPT-1.31/include/ancient/src/CYB2Decoder.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/DLTADecode.cpp
   branches/OpenMPT-1.31/include/ancient/src/DLTADecode.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/DynamicHuffmanDecoder.hpp
   branches/OpenMPT-1.31/include/ancient/src/FASTDecompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/FASTDecompressor.hpp
   branches/OpenMPT-1.31/include/ancient/src/FBR2Decompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/FBR2Decompressor.hpp
   branches/OpenMPT-1.31/include/ancient/src/FRLEDecompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/FRLEDecompressor.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/FrequencyTree.hpp
   branches/OpenMPT-1.31/include/ancient/src/HFMNDecompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/HFMNDecompressor.hpp
   branches/OpenMPT-1.31/include/ancient/src/HUFFDecompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/HUFFDecompressor.hpp
   branches/OpenMPT-1.31/include/ancient/src/HuffmanDecoder.hpp
   branches/OpenMPT-1.31/include/ancient/src/ILZRDecompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/ILZRDecompressor.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.cpp
   branches/OpenMPT-1.31/include/ancient/src/InputStream.hpp
   branches/OpenMPT-1.31/include/ancient/src/LHLBDecompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/LHLBDecompressor.hpp
   branches/OpenMPT-1.31/include/ancient/src/LIN1Decompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/LIN1Decompressor.hpp
   branches/OpenMPT-1.31/include/ancient/src/LIN2Decompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/LIN2Decompressor.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/LZBSDecompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/LZBSDecompressor.hpp
   branches/OpenMPT-1.31/include/ancient/src/LZCBDecompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/LZCBDecompressor.hpp
   branches/OpenMPT-1.31/include/ancient/src/LZW2Decompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/LZW2Decompressor.hpp
   branches/OpenMPT-1.31/include/ancient/src/LZW4Decompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/LZW4Decompressor.hpp
   branches/OpenMPT-1.31/include/ancient/src/LZW5Decompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/LZW5Decompressor.hpp
   branches/OpenMPT-1.31/include/ancient/src/LZWDecoder.cpp
   branches/OpenMPT-1.31/include/ancient/src/LZWDecoder.hpp
   branches/OpenMPT-1.31/include/ancient/src/LZXDecompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/LZXDecompressor.hpp
   branches/OpenMPT-1.31/include/ancient/src/MASHDecompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/MASHDecompressor.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/NONEDecompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/NONEDecompressor.hpp
   branches/OpenMPT-1.31/include/ancient/src/NUKEDecompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/NUKEDecompressor.hpp
   branches/OpenMPT-1.31/include/ancient/src/OutputStream.cpp
   branches/OpenMPT-1.31/include/ancient/src/OutputStream.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/PPMQDecompressor.hpp
   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/RAKEDecompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/RAKEDecompressor.hpp
   branches/OpenMPT-1.31/include/ancient/src/RDCNDecompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/RDCNDecompressor.hpp
   branches/OpenMPT-1.31/include/ancient/src/RLENDecompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/RLENDecompressor.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/RangeDecoder.cpp
   branches/OpenMPT-1.31/include/ancient/src/RangeDecoder.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/SDHCDecompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/SDHCDecompressor.hpp
   branches/OpenMPT-1.31/include/ancient/src/SLZ3Decompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/SLZ3Decompressor.hpp
   branches/OpenMPT-1.31/include/ancient/src/SMPLDecompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/SMPLDecompressor.hpp
   branches/OpenMPT-1.31/include/ancient/src/SQSHDecompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/SQSHDecompressor.hpp
   branches/OpenMPT-1.31/include/ancient/src/SXSCDecompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/SXSCDecompressor.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/TDCSDecompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/TDCSDecompressor.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/XPKDecompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/XPKDecompressor.hpp
   branches/OpenMPT-1.31/include/ancient/src/XPKMain.cpp
   branches/OpenMPT-1.31/include/ancient/src/XPKMain.hpp
   branches/OpenMPT-1.31/include/ancient/src/XPKUnimplemented.cpp
   branches/OpenMPT-1.31/include/ancient/src/XPKUnimplemented.hpp
   branches/OpenMPT-1.31/include/ancient/src/ZENODecompressor.cpp
   branches/OpenMPT-1.31/include/ancient/src/ZENODecompressor.hpp
   branches/OpenMPT-1.31/include/ancient/src/common/Buffer.cpp
   branches/OpenMPT-1.31/include/ancient/src/common/Buffer.hpp
   branches/OpenMPT-1.31/include/ancient/src/common/Common.cpp
   branches/OpenMPT-1.31/include/ancient/src/common/Common.hpp
   branches/OpenMPT-1.31/include/ancient/src/common/MemoryBuffer.cpp
   branches/OpenMPT-1.31/include/ancient/src/common/MemoryBuffer.hpp
   branches/OpenMPT-1.31/include/ancient/src/common/StaticBuffer.cpp
   branches/OpenMPT-1.31/include/ancient/src/common/StaticBuffer.hpp
   branches/OpenMPT-1.31/include/ancient/src/common/SubBuffer.hpp
   branches/OpenMPT-1.31/include/ancient/src/common/WrappedVectorBuffer.cpp
   branches/OpenMPT-1.31/include/ancient/src/common/WrappedVectorBuffer.hpp

Modified: branches/OpenMPT-1.31/build/vs2017winxp/ext/ancient.vcxproj
==============================================================================
--- branches/OpenMPT-1.31/build/vs2017winxp/ext/ancient.vcxproj	Sat Mar 23 15:49:49 2024	(r20427)
+++ branches/OpenMPT-1.31/build/vs2017winxp/ext/ancient.vcxproj	Sat Mar 23 16:33:37 2024	(r20428)
@@ -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: branches/OpenMPT-1.31/build/vs2017winxp/ext/ancient.vcxproj.filters
==============================================================================
--- branches/OpenMPT-1.31/build/vs2017winxp/ext/ancient.vcxproj.filters	Sat Mar 23 15:49:49 2024	(r20427)
+++ branches/OpenMPT-1.31/build/vs2017winxp/ext/ancient.vcxproj.filters	Sat Mar 23 16:33:37 2024	(r20428)
@@ -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: branches/OpenMPT-1.31/build/vs2017winxpansi/ext/ancient.vcxproj
==============================================================================
--- branches/OpenMPT-1.31/build/vs2017winxpansi/ext/ancient.vcxproj	Sat Mar 23 15:49:49 2024	(r20427)
+++ branches/OpenMPT-1.31/build/vs2017winxpansi/ext/ancient.vcxproj	Sat Mar 23 16:33:37 2024	(r20428)
@@ -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: branches/OpenMPT-1.31/build/vs2017winxpansi/ext/ancient.vcxproj.filters
==============================================================================
--- branches/OpenMPT-1.31/build/vs2017winxpansi/ext/ancient.vcxproj.filters	Sat Mar 23 15:49:49 2024	(r20427)
+++ branches/OpenMPT-1.31/build/vs2017winxpansi/ext/ancient.vcxproj.filters	Sat Mar 23 16:33:37 2024	(r20428)
@@ -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: branches/OpenMPT-1.31/build/vs2019win10/ext/ancient.vcxproj
==============================================================================
--- branches/OpenMPT-1.31/build/vs2019win10/ext/ancient.vcxproj	Sat Mar 23 15:49:49 2024	(r20427)
+++ branches/OpenMPT-1.31/build/vs2019win10/ext/ancient.vcxproj	Sat Mar 23 16:33:37 2024	(r20428)
@@ -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: branches/OpenMPT-1.31/build/vs2019win10/ext/ancient.vcxproj.filters
==============================================================================
--- branches/OpenMPT-1.31/build/vs2019win10/ext/ancient.vcxproj.filters	Sat Mar 23 15:49:49 2024	(r20427)
+++ branches/OpenMPT-1.31/build/vs2019win10/ext/ancient.vcxproj.filters	Sat Mar 23 16:33:37 2024	(r20428)
@@ -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: branches/OpenMPT-1.31/build/vs2019win7/ext/ancient.vcxproj
==============================================================================
--- branches/OpenMPT-1.31/build/vs2019win7/ext/ancient.vcxproj	Sat Mar 23 15:49:49 2024	(r20427)
+++ branches/OpenMPT-1.31/build/vs2019win7/ext/ancient.vcxproj	Sat Mar 23 16:33:37 2024	(r20428)
@@ -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: branches/OpenMPT-1.31/build/vs2019win7/ext/ancient.vcxproj.filters
==============================================================================
--- branches/OpenMPT-1.31/build/vs2019win7/ext/ancient.vcxproj.filters	Sat Mar 23 15:49:49 2024	(r20427)
+++ branches/OpenMPT-1.31/build/vs2019win7/ext/ancient.vcxproj.filters	Sat Mar 23 16:33:37 2024	(r20428)
@@ -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: branches/OpenMPT-1.31/build/vs2019win81/ext/ancient.vcxproj
==============================================================================
--- branches/OpenMPT-1.31/build/vs2019win81/ext/ancient.vcxproj	Sat Mar 23 15:49:49 2024	(r20427)
+++ branches/OpenMPT-1.31/build/vs2019win81/ext/ancient.vcxproj	Sat Mar 23 16:33:37 2024	(r20428)
@@ -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: branches/OpenMPT-1.31/build/vs2019win81/ext/ancient.vcxproj.filters
==============================================================================
--- branches/OpenMPT-1.31/build/vs2019win81/ext/ancient.vcxproj.filters	Sat Mar 23 15:49:49 2024	(r20427)
+++ branches/OpenMPT-1.31/build/vs2019win81/ext/ancient.vcxproj.filters	Sat Mar 23 16:33:37 2024	(r20428)
@@ -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: branches/OpenMPT-1.31/build/vs2022win10/ext/ancient.vcxproj
==============================================================================
--- branches/OpenMPT-1.31/build/vs2022win10/ext/ancient.vcxproj	Sat Mar 23 15:49:49 2024	(r20427)
+++ branches/OpenMPT-1.31/build/vs2022win10/ext/ancient.vcxproj	Sat Mar 23 16:33:37 2024	(r20428)
@@ -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: branches/OpenMPT-1.31/build/vs2022win10/ext/ancient.vcxproj.filters
==============================================================================
--- branches/OpenMPT-1.31/build/vs2022win10/ext/ancient.vcxproj.filters	Sat Mar 23 15:49:49 2024	(r20427)
+++ branches/OpenMPT-1.31/build/vs2022win10/ext/ancient.vcxproj.filters	Sat Mar 23 16:33:37 2024	(r20428)
@@ -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: branches/OpenMPT-1.31/build/vs2022win10clang/ext/ancient.vcxproj
==============================================================================
--- branches/OpenMPT-1.31/build/vs2022win10clang/ext/ancient.vcxproj	Sat Mar 23 15:49:49 2024	(r20427)
+++ branches/OpenMPT-1.31/build/vs2022win10clang/ext/ancient.vcxproj	Sat Mar 23 16:33:37 2024	(r20428)
@@ -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: branches/OpenMPT-1.31/build/vs2022win10clang/ext/ancient.vcxproj.filters
==============================================================================
--- branches/OpenMPT-1.31/build/vs2022win10clang/ext/ancient.vcxproj.filters	Sat Mar 23 15:49:49 2024	(r20427)
+++ branches/OpenMPT-1.31/build/vs2022win10clang/ext/ancient.vcxproj.filters	Sat Mar 23 16:33:37 2024	(r20428)
@@ -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: branches/OpenMPT-1.31/build/vs2022win7/ext/ancient.vcxproj
==============================================================================
--- branches/OpenMPT-1.31/build/vs2022win7/ext/ancient.vcxproj	Sat Mar 23 15:49:49 2024	(r20427)
+++ branches/OpenMPT-1.31/build/vs2022win7/ext/ancient.vcxproj	Sat Mar 23 16:33:37 2024	(r20428)
@@ -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: branches/OpenMPT-1.31/build/vs2022win7/ext/ancient.vcxproj.filters
==============================================================================
--- branches/OpenMPT-1.31/build/vs2022win7/ext/ancient.vcxproj.filters	Sat Mar 23 15:49:49 2024	(r20427)
+++ branches/OpenMPT-1.31/build/vs2022win7/ext/ancient.vcxproj.filters	Sat Mar 23 16:33:37 2024	(r20428)
@@ -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: branches/OpenMPT-1.31/build/vs2022win81/ext/ancient.vcxproj
==============================================================================
--- branches/OpenMPT-1.31/build/vs2022win81/ext/ancient.vcxproj	Sat Mar 23 15:49:49 2024	(r20427)
+++ branches/OpenMPT-1.31/build/vs2022win81/ext/ancient.vcxproj	Sat Mar 23 16:33:37 2024	(r20428)
@@ -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: branches/OpenMPT-1.31/build/vs2022win81/ext/ancient.vcxproj.filters
==============================================================================
--- branches/OpenMPT-1.31/build/vs2022win81/ext/ancient.vcxproj.filters	Sat Mar 23 15:49:49 2024	(r20427)
+++ branches/OpenMPT-1.31/build/vs2022win81/ext/ancient.vcxproj.filters	Sat Mar 23 16:33:37 2024	(r20428)
@@ -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: branches/OpenMPT-1.31/include/ancient/OpenMPT.txt
==============================================================================
--- branches/OpenMPT-1.31/include/ancient/OpenMPT.txt	Sat Mar 23 15:49:49 2024	(r20427)
+++ branches/OpenMPT-1.31/include/ancient/OpenMPT.txt	Sat Mar 23 16:33:37 2024	(r20428)
@@ -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: branches/OpenMPT-1.31/include/ancient/api/...
 
[truncated message content]

[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]

[OMPT-svn-commit] OpenMPT r20426 - in branches/OpenMPT-1.30: . soundlib

From: <sv...@op...> - 2024-03-23 14:10:14

Author: sagamusix
Date: Sat Mar 23 15:09:57 2024
New Revision: 20426
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20426

Log:
Merged revision(s) 20424 from trunk/OpenMPT:
[Imp] Avoid re-allocating the loop state map contents on every playthrough. For libopenmpt, the contents of patterns can never change anyway. For OpenMPT, this may in theory cause new allocations to be made during playback if the user inserted some pattern loops while playback was happening, but those allocations would happen anyway at the time the song loops, we cannot avoid them.
........

Modified:
   branches/OpenMPT-1.30/   (props changed)
   branches/OpenMPT-1.30/soundlib/RowVisitor.cpp

Modified: branches/OpenMPT-1.30/soundlib/RowVisitor.cpp
==============================================================================
--- branches/OpenMPT-1.30/soundlib/RowVisitor.cpp	Sat Mar 23 15:09:39 2024	(r20425)
+++ branches/OpenMPT-1.30/soundlib/RowVisitor.cpp	Sat Mar 23 15:09:57 2024	(r20426)
@@ -23,7 +23,7 @@
 
 RowVisitor::LoopState::LoopState(const ChannelStates &chnState, const bool ignoreRow)
 {
-	// Rather than storing the exact loop count vector, we compute a FNV-1a 64-bit hash of it.
+	// Rather than storing the exact loop count vector, we compute an FNV-1a 64-bit hash of it.
 	// This means we can store the loop state in a small and fixed amount of memory.
 	// In theory there is the possibility of hash collisions for different loop states, but in practice,
 	// the relevant inputs for the hashing algorithm are extremely unlikely to produce collisions.
@@ -84,10 +84,15 @@
 {
 	auto &order = Order();
 	const ORDERINDEX endOrder = order.GetLengthTailTrimmed();
+	bool reserveLoopStates = true;
 	m_visitedRows.resize(endOrder);
 	if(reset)
 	{
-		m_visitedLoopStates.clear();
+		reserveLoopStates = m_visitedLoopStates.empty();
+		for(auto &loopState : m_visitedLoopStates)
+		{
+			loopState.second.clear();
+		}
 		m_rowsSpentInLoops = 0;
 	}
 
@@ -104,7 +109,7 @@
 		else
 			visitedRows.resize(numRows, false);
 
-		if(!order.IsValidPat(ord))
+		if(!reserveLoopStates || !order.IsValidPat(ord))
 			continue;
 
 		const ROWINDEX startRow = std::min(static_cast<ROWINDEX>(reset ? 0 : visitedRows.size()), numRows);

[OMPT-svn-commit] OpenMPT r20425 - in branches/OpenMPT-1.31: . soundlib

From: <sv...@op...> - 2024-03-23 14:09:46

Author: sagamusix
Date: Sat Mar 23 15:09:39 2024
New Revision: 20425
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20425

Log:
Merged revision(s) 20424 from trunk/OpenMPT:
[Imp] Avoid re-allocating the loop state map contents on every playthrough. For libopenmpt, the contents of patterns can never change anyway. For OpenMPT, this may in theory cause new allocations to be made during playback if the user inserted some pattern loops while playback was happening, but those allocations would happen anyway at the time the song loops, we cannot avoid them.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/soundlib/RowVisitor.cpp

Modified: branches/OpenMPT-1.31/soundlib/RowVisitor.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/RowVisitor.cpp	Sat Mar 23 15:02:22 2024	(r20424)
+++ branches/OpenMPT-1.31/soundlib/RowVisitor.cpp	Sat Mar 23 15:09:39 2024	(r20425)
@@ -23,7 +23,7 @@
 
 RowVisitor::LoopState::LoopState(const ChannelStates &chnState, const bool ignoreRow)
 {
-	// Rather than storing the exact loop count vector, we compute a FNV-1a 64-bit hash of it.
+	// Rather than storing the exact loop count vector, we compute an FNV-1a 64-bit hash of it.
 	// This means we can store the loop state in a small and fixed amount of memory.
 	// In theory there is the possibility of hash collisions for different loop states, but in practice,
 	// the relevant inputs for the hashing algorithm are extremely unlikely to produce collisions.
@@ -84,10 +84,15 @@
 {
 	auto &order = Order();
 	const ORDERINDEX endOrder = order.GetLengthTailTrimmed();
+	bool reserveLoopStates = true;
 	m_visitedRows.resize(endOrder);
 	if(reset)
 	{
-		m_visitedLoopStates.clear();
+		reserveLoopStates = m_visitedLoopStates.empty();
+		for(auto &loopState : m_visitedLoopStates)
+		{
+			loopState.second.clear();
+		}
 		m_rowsSpentInLoops = 0;
 	}
 
@@ -104,7 +109,7 @@
 		else
 			visitedRows.resize(numRows, false);
 
-		if(!order.IsValidPat(ord))
+		if(!reserveLoopStates || !order.IsValidPat(ord))
 			continue;
 
 		const ROWINDEX startRow = std::min(static_cast<ROWINDEX>(reset ? 0 : visitedRows.size()), numRows);

[OMPT-svn-commit] OpenMPT r20424 - trunk/OpenMPT/soundlib

From: <sv...@op...> - 2024-03-23 14:02:34

Author: sagamusix
Date: Sat Mar 23 15:02:22 2024
New Revision: 20424
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20424

Log:
[Imp] Avoid re-allocating the loop state map contents on every playthrough. For libopenmpt, the contents of patterns can never change anyway. For OpenMPT, this may in theory cause new allocations to be made during playback if the user inserted some pattern loops while playback was happening, but those allocations would happen anyway at the time the song loops, we cannot avoid them.

Modified:
   trunk/OpenMPT/soundlib/RowVisitor.cpp

Modified: trunk/OpenMPT/soundlib/RowVisitor.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/RowVisitor.cpp	Sat Mar 23 14:19:49 2024	(r20423)
+++ trunk/OpenMPT/soundlib/RowVisitor.cpp	Sat Mar 23 15:02:22 2024	(r20424)
@@ -23,7 +23,7 @@
 
 RowVisitor::LoopState::LoopState(const ChannelStates &chnState, const bool ignoreRow)
 {
-	// Rather than storing the exact loop count vector, we compute a FNV-1a 64-bit hash of it.
+	// Rather than storing the exact loop count vector, we compute an FNV-1a 64-bit hash of it.
 	// This means we can store the loop state in a small and fixed amount of memory.
 	// In theory there is the possibility of hash collisions for different loop states, but in practice,
 	// the relevant inputs for the hashing algorithm are extremely unlikely to produce collisions.
@@ -84,10 +84,15 @@
 {
 	auto &order = Order();
 	const ORDERINDEX endOrder = order.GetLengthTailTrimmed();
+	bool reserveLoopStates = true;
 	m_visitedRows.resize(endOrder);
 	if(reset)
 	{
-		m_visitedLoopStates.clear();
+		reserveLoopStates = m_visitedLoopStates.empty();
+		for(auto &loopState : m_visitedLoopStates)
+		{
+			loopState.second.clear();
+		}
 		m_rowsSpentInLoops = 0;
 	}
 
@@ -104,7 +109,7 @@
 		else
 			visitedRows.resize(numRows, false);
 
-		if(!order.IsValidPat(ord))
+		if(!reserveLoopStates || !order.IsValidPat(ord))
 			continue;
 
 		const ROWINDEX startRow = std::min(static_cast<ROWINDEX>(reset ? 0 : visitedRows.size()), numRows);

[OMPT-svn-commit] OpenMPT r20423 - in branches/OpenMPT-1.28: . soundlib

From: <sv...@op...> - 2024-03-23 13:19:59

Author: sagamusix
Date: Sat Mar 23 14:19:49 2024
New Revision: 20423
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20423

Log:
Merged revision(s) 20422 from branches/OpenMPT-1.29:
[Fix] Avoid using infinity as map key when calculating pattern loop times to avoid UB (found with afl-fuzz + asan).
........

Modified:
   branches/OpenMPT-1.28/   (props changed)
   branches/OpenMPT-1.28/soundlib/Snd_fx.cpp

Modified: branches/OpenMPT-1.28/soundlib/Snd_fx.cpp
==============================================================================
--- branches/OpenMPT-1.28/soundlib/Snd_fx.cpp	Sat Mar 23 14:18:33 2024	(r20422)
+++ branches/OpenMPT-1.28/soundlib/Snd_fx.cpp	Sat Mar 23 14:19:49 2024	(r20423)
@@ -1222,6 +1222,8 @@
 					|| (command == CMD_MODCMDEX && param >= 0x61 && param <= 0x6F))
 				{
 					const double start = memory.chnSettings[nChn].patLoop;
+					if(!std::isnormal(start))
+						break;
 					if(!startTimes[start]) startTimes[start] = 1;
 					startTimes[start] = mpt::lcm(startTimes[start], 1 + (param & 0x0F));
 				}

[OMPT-svn-commit] OpenMPT r20422 - branches/OpenMPT-1.29/soundlib

From: <sv...@op...> - 2024-03-23 13:18:51

Author: sagamusix
Date: Sat Mar 23 14:18:33 2024
New Revision: 20422
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20422

Log:
[Fix] Avoid using infinity as map key when calculating pattern loop times to avoid UB (found with afl-fuzz + asan).

Modified:
   branches/OpenMPT-1.29/soundlib/Snd_fx.cpp

Modified: branches/OpenMPT-1.29/soundlib/Snd_fx.cpp
==============================================================================
--- branches/OpenMPT-1.29/soundlib/Snd_fx.cpp	Thu Mar 21 21:52:34 2024	(r20421)
+++ branches/OpenMPT-1.29/soundlib/Snd_fx.cpp	Sat Mar 23 14:18:33 2024	(r20422)
@@ -1249,6 +1249,8 @@
 					|| (command == CMD_MODCMDEX && param >= 0x61 && param <= 0x6F))
 				{
 					const double start = memory.chnSettings[nChn].patLoop;
+					if(!std::isnormal(start))
+						break;
 					if(!startTimes[start]) startTimes[start] = 1;
 					startTimes[start] = std::lcm(startTimes[start], 1 + (param & 0x0F));
 				}

[OMPT-svn-commit] OpenMPT r20421 - in branches/OpenMPT-1.30: . soundlib

From: <sv...@op...> - 2024-03-21 20:52:45

Author: sagamusix
Date: Thu Mar 21 21:52:34 2024
New Revision: 20421
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20421

Log:
Merged revision(s) 20418 from trunk/OpenMPT:
[Fix] SymMOD: Potential heap out-of-bounds read or write past sample end with malformed sustain loops.
........

Modified:
   branches/OpenMPT-1.30/   (props changed)
   branches/OpenMPT-1.30/soundlib/Load_symmod.cpp

Modified: branches/OpenMPT-1.30/soundlib/Load_symmod.cpp
==============================================================================
--- branches/OpenMPT-1.30/soundlib/Load_symmod.cpp	Thu Mar 21 21:52:11 2024	(r20420)
+++ branches/OpenMPT-1.30/soundlib/Load_symmod.cpp	Thu Mar 21 21:52:34 2024	(r20421)
@@ -665,7 +665,7 @@
 			loopLen = (loopLen << 16) + loopLenFine;
 
 			const double loopScale = static_cast<double>(mptSmp.nLength) / (100 << 16);
-			loopStart = mpt::saturate_cast<SmpLength>(loopStart * loopScale);
+			loopStart = std::min(mptSmp.nLength, mpt::saturate_cast<SmpLength>(loopStart * loopScale));
 			loopLen = std::min(mptSmp.nLength - loopStart, mpt::saturate_cast<SmpLength>(loopLen * loopScale));
 		} else if(mptSmp.HasSampleData())
 		{

[OMPT-svn-commit] OpenMPT r20420 - in branches/OpenMPT-1.31: . soundlib

From: <sv...@op...> - 2024-03-21 20:52:23

Author: sagamusix
Date: Thu Mar 21 21:52:11 2024
New Revision: 20420
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20420

Log:
Merged revision(s) 20418 from trunk/OpenMPT:
[Fix] SymMOD: Potential heap out-of-bounds read or write past sample end with malformed sustain loops.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/soundlib/Load_symmod.cpp

Modified: branches/OpenMPT-1.31/soundlib/Load_symmod.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Load_symmod.cpp	Thu Mar 21 21:51:51 2024	(r20419)
+++ branches/OpenMPT-1.31/soundlib/Load_symmod.cpp	Thu Mar 21 21:52:11 2024	(r20420)
@@ -665,7 +665,7 @@
 			loopLen = (loopLen << 16) + loopLenFine;
 
 			const double loopScale = static_cast<double>(mptSmp.nLength) / (100 << 16);
-			loopStart = mpt::saturate_cast<SmpLength>(loopStart * loopScale);
+			loopStart = std::min(mptSmp.nLength, mpt::saturate_cast<SmpLength>(loopStart * loopScale));
 			loopLen = std::min(mptSmp.nLength - loopStart, mpt::saturate_cast<SmpLength>(loopLen * loopScale));
 		} else if(mptSmp.HasSampleData())
 		{

[OMPT-svn-commit] OpenMPT r20419 - trunk/OpenMPT/soundlib

From: <sv...@op...> - 2024-03-21 20:51:58

Author: sagamusix
Date: Thu Mar 21 21:51:51 2024
New Revision: 20419
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20419

Log:
[Ref] SymMOD: Small cleanup.

Modified:
   trunk/OpenMPT/soundlib/Load_symmod.cpp

Modified: trunk/OpenMPT/soundlib/Load_symmod.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_symmod.cpp	Thu Mar 21 21:50:11 2024	(r20418)
+++ trunk/OpenMPT/soundlib/Load_symmod.cpp	Thu Mar 21 21:51:51 2024	(r20419)
@@ -640,7 +640,6 @@
 			if(!newSample)
 				return;
 
-			mptSmp.nLength = newLength;
 			std::memcpy(newSample, mptSmp.sampleb(), (loopStart + loopLen) * bps);
 			for(uint8 i = 0; i < numRepetitions; i++)
 			{
@@ -648,7 +647,7 @@
 			}
 			std::memcpy(newSample + loopEnd * bps, mptSmp.sampleb() + (loopStart + loopLen) * bps, (newLength - loopEnd) * bps);
 			
-			mptSmp.ReplaceWaveform(newSample, mptSmp.nLength, sndFile);
+			mptSmp.ReplaceWaveform(newSample, newLength, sndFile);
 		}
 	}
 
@@ -657,8 +656,8 @@
 		if(type != Loop && type != Sustain)
 			return {0, 0};
 
-		SmpLength loopStart = static_cast<SmpLength>(std::min(loopStartHigh.get(), uint8(100)));
-		SmpLength loopLen = static_cast<SmpLength>(std::min(loopLenHigh.get(), uint8(100)));
+		SmpLength loopStart = std::min(loopStartHigh.get(), uint8(100));
+		SmpLength loopLen = std::min(loopLenHigh.get(), uint8(100));
 		if(sampleFlags & NewLoopSystem)
 		{
 			loopStart = (loopStart << 16) + loopStartFine;

[OMPT-svn-commit] OpenMPT r20418 - trunk/OpenMPT/soundlib

From: <sv...@op...> - 2024-03-21 20:50:26

Author: sagamusix
Date: Thu Mar 21 21:50:11 2024
New Revision: 20418
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20418

Log:
[Fix] SymMOD: Potential heap out-of-bounds read or write past sample end with malformed sustain loops.

Modified:
   trunk/OpenMPT/soundlib/Load_symmod.cpp

Modified: trunk/OpenMPT/soundlib/Load_symmod.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_symmod.cpp	Sun Mar 17 19:00:20 2024	(r20417)
+++ trunk/OpenMPT/soundlib/Load_symmod.cpp	Thu Mar 21 21:50:11 2024	(r20418)
@@ -665,7 +665,7 @@
 			loopLen = (loopLen << 16) + loopLenFine;
 
 			const double loopScale = static_cast<double>(mptSmp.nLength) / (100 << 16);
-			loopStart = mpt::saturate_cast<SmpLength>(loopStart * loopScale);
+			loopStart = std::min(mptSmp.nLength, mpt::saturate_cast<SmpLength>(loopStart * loopScale));
 			loopLen = std::min(mptSmp.nLength - loopStart, mpt::saturate_cast<SmpLength>(loopLen * loopScale));
 		} else if(mptSmp.HasSampleData())
 		{

[OMPT-svn-commit] OpenMPT r20417 - in trunk/OpenMPT: mptrack soundlib

From: <sv...@op...> - 2024-03-17 18:00:36

Author: sagamusix
Date: Sun Mar 17 19:00:20 2024
New Revision: 20417
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20417

Log:
[Mod] Increase internal pattern row count limit from 1024 to 4096. This allows some MED files with longer patterns to be loaded properly (e.g. crybaby 5.mmd3, mellodrone.mmd3, see https://www.un4seen.com/forum/?topic=15448.msg142562#msg142562). For XM/IT/MPTM, the maximum pattern length the user can choose remains at 1024 for now.

Modified:
   trunk/OpenMPT/mptrack/Mpdlgs.cpp
   trunk/OpenMPT/mptrack/TrackerSettings.cpp
   trunk/OpenMPT/soundlib/Load_mid.cpp
   trunk/OpenMPT/soundlib/Snd_defs.h

Modified: trunk/OpenMPT/mptrack/Mpdlgs.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Mpdlgs.cpp	Sun Mar 17 17:34:14 2024	(r20416)
+++ trunk/OpenMPT/mptrack/Mpdlgs.cpp	Sun Mar 17 19:00:20 2024	(r20417)
@@ -20,6 +20,7 @@
 #include "WindowMessages.h"
 #include "../common/Dither.h"
 #include "../common/mptStringBuffer.h"
+#include "../soundlib/mod_specifications.h"
 #include "mpt/parse/parse.hpp"
 #include "openmpt/sounddevice/SoundDevice.hpp"
 #include "openmpt/sounddevice/SoundDeviceManager.hpp"
@@ -1790,8 +1791,8 @@
 			m_Quantize.SetCurSel(item);
 		}
 	}
-	m_SpinSpd.SetRange(2, 16);
-	m_SpinPat.SetRange(1, MAX_PATTERN_ROWS);
+	m_SpinSpd.SetRange32(2, 16);
+	m_SpinPat.SetRange32(ModSpecs::mptm.patternRowsMin, ModSpecs::mptm.patternRowsMax);
 	return TRUE;
 }
 
@@ -1871,8 +1872,11 @@
 	GetDlgItemText(IDC_EDIT4, cc);
 	TrackerSettings::Instance().midiIgnoreCCs = StringToIgnoredCCs(mpt::ToUnicode(cc));
 
-	TrackerSettings::Instance().midiImportTicks = static_cast<uint8>(Clamp(GetDlgItemInt(IDC_EDIT1), uint8(2), uint8(16)));
-	TrackerSettings::Instance().midiImportPatternLen = Clamp(GetDlgItemInt(IDC_EDIT2), ROWINDEX(1), MAX_PATTERN_ROWS);
+	int minVal, maxVal;
+	m_SpinSpd.GetRange32(minVal, maxVal);
+	TrackerSettings::Instance().midiImportTicks = static_cast<uint8>(Clamp(static_cast<int>(GetDlgItemInt(IDC_EDIT1)), minVal, maxVal));
+	m_SpinPat.GetRange32(minVal, maxVal);
+	TrackerSettings::Instance().midiImportPatternLen = static_cast<ROWINDEX>(Clamp(static_cast<int>(GetDlgItemInt(IDC_EDIT2)), minVal, maxVal));
 	if(m_Quantize.GetCurSel() != -1)
 	{
 		TrackerSettings::Instance().midiImportQuantize = static_cast<uint32>(m_Quantize.GetItemData(m_Quantize.GetCurSel()));

Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp	Sun Mar 17 17:34:14 2024	(r20416)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp	Sun Mar 17 19:00:20 2024	(r20417)
@@ -890,7 +890,7 @@
 	MigrateTunings(storedVersion);
 
 	// Sanitize MIDI import data
-	if(midiImportPatternLen < 1 || midiImportPatternLen > MAX_PATTERN_ROWS)
+	if(midiImportPatternLen < ModSpecs::mptm.patternRowsMin || midiImportPatternLen > ModSpecs::mptm.patternRowsMax)
 		midiImportPatternLen = 128;
 	if(midiImportQuantize < 4 || midiImportQuantize > 256)
 		midiImportQuantize = 32;

Modified: trunk/OpenMPT/soundlib/Load_mid.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_mid.cpp	Sun Mar 17 17:34:14 2024	(r20416)
+++ trunk/OpenMPT/soundlib/Load_mid.cpp	Sun Mar 17 19:00:20 2024	(r20417)
@@ -12,6 +12,7 @@
 #include "Loaders.h"
 #include "Dlsbank.h"
 #include "MIDIEvents.h"
+#include "mod_specifications.h"
 #ifdef MODPLUG_TRACKER
 #include "../mptrack/TrackerSettings.h"
 #include "../mptrack/Moddoc.h"
@@ -625,7 +626,7 @@
 
 #ifdef MODPLUG_TRACKER
 	const uint32 quantize = Clamp(TrackerSettings::Instance().midiImportQuantize.Get(), 4u, 256u);
-	const ROWINDEX patternLen = Clamp(TrackerSettings::Instance().midiImportPatternLen.Get(), ROWINDEX(1), MAX_PATTERN_ROWS);
+	const ROWINDEX patternLen = Clamp(TrackerSettings::Instance().midiImportPatternLen.Get(), GetModSpecifications().patternRowsMin, GetModSpecifications().patternRowsMax);
 	const uint8 ticksPerRow = Clamp(TrackerSettings::Instance().midiImportTicks.Get(), uint8(2), uint8(16));
 #else
 	const uint32 quantize = 32;		// Must be 4 or higher

Modified: trunk/OpenMPT/soundlib/Snd_defs.h
==============================================================================
--- trunk/OpenMPT/soundlib/Snd_defs.h	Sun Mar 17 17:34:14 2024	(r20416)
+++ trunk/OpenMPT/soundlib/Snd_defs.h	Sun Mar 17 19:00:20 2024	(r20417)
@@ -42,7 +42,7 @@
 
 inline constexpr SmpLength MAX_SAMPLE_LENGTH = 0x10000000; // Sample length in frames. Sample size in bytes can be more than this (= 256 MB).
 
-inline constexpr ROWINDEX MAX_PATTERN_ROWS       = 1024;
+inline constexpr ROWINDEX MAX_PATTERN_ROWS       = 4096;
 inline constexpr ROWINDEX MAX_ROWS_PER_BEAT      = 65536;
 inline constexpr ORDERINDEX MAX_ORDERS           = ORDERINDEX_MAX + 1;
 inline constexpr PATTERNINDEX MAX_PATTERNS       = 4000;

[OMPT-svn-commit] OpenMPT r20416 - in branches/OpenMPT-1.28: . soundlib

From: <sv...@op...> - 2024-03-17 16:34:35

Author: sagamusix
Date: Sun Mar 17 17:34:14 2024
New Revision: 20416
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20416

Log:
Merged revision(s) 20412 from trunk/OpenMPT:
[Fix] OKT: Don't reject files with non-ASCII chunk IDs. This fixes "katharsis - piano lesson.okta" which appears to have some leftover junk with unused sample data at the end of the file (https://www.un4seen.com/forum/?topic=15448.msg142562#msg142562).
........

Modified:
   branches/OpenMPT-1.28/   (props changed)
   branches/OpenMPT-1.28/soundlib/Load_okt.cpp

Modified: branches/OpenMPT-1.28/soundlib/Load_okt.cpp
==============================================================================
--- branches/OpenMPT-1.28/soundlib/Load_okt.cpp	Sun Mar 17 17:33:56 2024	(r20415)
+++ branches/OpenMPT-1.28/soundlib/Load_okt.cpp	Sun Mar 17 17:34:14 2024	(r20416)
@@ -29,8 +29,8 @@
 		idSBOD	= MagicBE("SBOD"),
 	};
 
-	uint32be signature;	// IFF chunk name
-	uint32be chunksize;	// chunk size without header
+	uint32be signature;  // IFF chunk name
+	uint32be chunksize;  // chunk size without header
 };
 
 MPT_BINARY_STRUCT(OktIffChunk, 8)
@@ -261,19 +261,6 @@
 	{
 		return ProbeFailure;
 	}
-	OktIffChunk iffHead;
-	if(!file.ReadStruct(iffHead))
-	{
-		return ProbeWantMoreData;
-	}
-	if(iffHead.chunksize == 0)
-	{
-		return ProbeFailure;
-	}
-	if((iffHead.signature & 0x80808080u) != 0) // ASCII?
-	{
-		return ProbeFailure;
-	}
 	MPT_UNREFERENCED_PARAMETER(pfilesize);
 	return ProbeSuccess;
 }
@@ -287,7 +274,6 @@
 		return false;
 	}
 
-	// prepare some arrays to store offsets etc.
 	std::vector<FileReader> patternChunks;
 	std::vector<FileReader> sampleChunks;
 	std::vector<bool> sample7bit;	// 7-/8-bit sample
@@ -304,15 +290,11 @@
 	{
 		OktIffChunk iffHead;
 		if(!file.ReadStruct(iffHead))
-		{
 			break;
-		}
 
 		FileReader chunk = file.ReadChunk(iffHead.chunksize);
 		if(!chunk.IsValid())
-		{
-			break;
-		}
+			continue;
 
 		switch(iffHead.signature)
 		{
@@ -390,12 +372,6 @@
 				sampleChunks.push_back(chunk);
 			}
 			break;
-
-		default:
-			// Non-ASCII chunk ID?
-			if(iffHead.signature & 0x80808080)
-				return false;
-			break;
 		}
 	}

[OMPT-svn-commit] OpenMPT r20415 - in branches/OpenMPT-1.29: . soundlib

From: <sv...@op...> - 2024-03-17 16:34:15

Author: sagamusix
Date: Sun Mar 17 17:33:56 2024
New Revision: 20415
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20415

Log:
Merged revision(s) 20412 from trunk/OpenMPT:
[Fix] OKT: Don't reject files with non-ASCII chunk IDs. This fixes "katharsis - piano lesson.okta" which appears to have some leftover junk with unused sample data at the end of the file (https://www.un4seen.com/forum/?topic=15448.msg142562#msg142562).
........

Modified:
   branches/OpenMPT-1.29/   (props changed)
   branches/OpenMPT-1.29/soundlib/Load_okt.cpp

Modified: branches/OpenMPT-1.29/soundlib/Load_okt.cpp
==============================================================================
--- branches/OpenMPT-1.29/soundlib/Load_okt.cpp	Sun Mar 17 17:33:42 2024	(r20414)
+++ branches/OpenMPT-1.29/soundlib/Load_okt.cpp	Sun Mar 17 17:33:56 2024	(r20415)
@@ -29,8 +29,8 @@
 		idSBOD	= MagicBE("SBOD"),
 	};
 
-	uint32be signature;	// IFF chunk name
-	uint32be chunksize;	// chunk size without header
+	uint32be signature;  // IFF chunk name
+	uint32be chunksize;  // chunk size without header
 };
 
 MPT_BINARY_STRUCT(OktIffChunk, 8)
@@ -279,19 +279,6 @@
 	{
 		return ProbeFailure;
 	}
-	OktIffChunk iffHead;
-	if(!file.ReadStruct(iffHead))
-	{
-		return ProbeWantMoreData;
-	}
-	if(iffHead.chunksize == 0)
-	{
-		return ProbeFailure;
-	}
-	if((iffHead.signature & 0x80808080u) != 0) // ASCII?
-	{
-		return ProbeFailure;
-	}
 	MPT_UNREFERENCED_PARAMETER(pfilesize);
 	return ProbeSuccess;
 }
@@ -305,7 +292,6 @@
 		return false;
 	}
 
-	// prepare some arrays to store offsets etc.
 	std::vector<FileReader> patternChunks;
 	std::vector<FileReader> sampleChunks;
 	std::vector<bool> sample7bit;	// 7-/8-bit sample
@@ -322,15 +308,11 @@
 	{
 		OktIffChunk iffHead;
 		if(!file.ReadStruct(iffHead))
-		{
 			break;
-		}
 
 		FileReader chunk = file.ReadChunk(iffHead.chunksize);
 		if(!chunk.IsValid())
-		{
-			break;
-		}
+			continue;
 
 		switch(iffHead.signature)
 		{
@@ -408,12 +390,6 @@
 				sampleChunks.push_back(chunk);
 			}
 			break;
-
-		default:
-			// Non-ASCII chunk ID?
-			if(iffHead.signature & 0x80808080)
-				return false;
-			break;
 		}
 	}

[OMPT-svn-commit] OpenMPT r20414 - in branches/OpenMPT-1.30: . soundlib

From: <sv...@op...> - 2024-03-17 16:33:58

Author: sagamusix
Date: Sun Mar 17 17:33:42 2024
New Revision: 20414
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20414

Log:
Merged revision(s) 20412 from trunk/OpenMPT:
[Fix] OKT: Don't reject files with non-ASCII chunk IDs. This fixes "katharsis - piano lesson.okta" which appears to have some leftover junk with unused sample data at the end of the file (https://www.un4seen.com/forum/?topic=15448.msg142562#msg142562).
........

Modified:
   branches/OpenMPT-1.30/   (props changed)
   branches/OpenMPT-1.30/soundlib/Load_okt.cpp

Modified: branches/OpenMPT-1.30/soundlib/Load_okt.cpp
==============================================================================
--- branches/OpenMPT-1.30/soundlib/Load_okt.cpp	Sun Mar 17 17:33:20 2024	(r20413)
+++ branches/OpenMPT-1.30/soundlib/Load_okt.cpp	Sun Mar 17 17:33:42 2024	(r20414)
@@ -29,8 +29,8 @@
 		idSBOD	= MagicBE("SBOD"),
 	};
 
-	uint32be signature;	// IFF chunk name
-	uint32be chunksize;	// chunk size without header
+	uint32be signature;  // IFF chunk name
+	uint32be chunksize;  // chunk size without header
 };
 
 MPT_BINARY_STRUCT(OktIffChunk, 8)
@@ -322,19 +322,6 @@
 	{
 		return ProbeFailure;
 	}
-	OktIffChunk iffHead;
-	if(!file.ReadStruct(iffHead))
-	{
-		return ProbeWantMoreData;
-	}
-	if(iffHead.chunksize == 0)
-	{
-		return ProbeFailure;
-	}
-	if((iffHead.signature & 0x80808080u) != 0) // ASCII?
-	{
-		return ProbeFailure;
-	}
 	MPT_UNREFERENCED_PARAMETER(pfilesize);
 	return ProbeSuccess;
 }
@@ -348,7 +335,6 @@
 		return false;
 	}
 
-	// prepare some arrays to store offsets etc.
 	std::vector<FileReader> patternChunks;
 	std::vector<FileReader> sampleChunks;
 	std::array<int8, 8> pairedChn{{}};
@@ -365,15 +351,11 @@
 	{
 		OktIffChunk iffHead;
 		if(!file.ReadStruct(iffHead))
-		{
 			break;
-		}
 
 		FileReader chunk = file.ReadChunk(iffHead.chunksize);
 		if(!chunk.IsValid())
-		{
-			break;
-		}
+			continue;
 
 		switch(iffHead.signature)
 		{
@@ -451,12 +433,6 @@
 				sampleChunks.push_back(chunk);
 			}
 			break;
-
-		default:
-			// Non-ASCII chunk ID?
-			if(iffHead.signature & 0x80808080)
-				return false;
-			break;
 		}
 	}

[OMPT-svn-commit] OpenMPT r20413 - in branches/OpenMPT-1.31: . soundlib

From: <sv...@op...> - 2024-03-17 16:33:31

Author: sagamusix
Date: Sun Mar 17 17:33:20 2024
New Revision: 20413
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20413

Log:
Merged revision(s) 20412 from trunk/OpenMPT:
[Fix] OKT: Don't reject files with non-ASCII chunk IDs. This fixes "katharsis - piano lesson.okta" which appears to have some leftover junk with unused sample data at the end of the file (https://www.un4seen.com/forum/?topic=15448.msg142562#msg142562).
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/soundlib/Load_okt.cpp

Modified: branches/OpenMPT-1.31/soundlib/Load_okt.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Load_okt.cpp	Sun Mar 17 17:32:54 2024	(r20412)
+++ branches/OpenMPT-1.31/soundlib/Load_okt.cpp	Sun Mar 17 17:33:20 2024	(r20413)
@@ -29,8 +29,8 @@
 		idSBOD	= MagicBE("SBOD"),
 	};
 
-	uint32be signature;	// IFF chunk name
-	uint32be chunksize;	// chunk size without header
+	uint32be signature;  // IFF chunk name
+	uint32be chunksize;  // chunk size without header
 };
 
 MPT_BINARY_STRUCT(OktIffChunk, 8)
@@ -328,19 +328,6 @@
 	{
 		return ProbeFailure;
 	}
-	OktIffChunk iffHead;
-	if(!file.ReadStruct(iffHead))
-	{
-		return ProbeWantMoreData;
-	}
-	if(iffHead.chunksize == 0)
-	{
-		return ProbeFailure;
-	}
-	if((iffHead.signature & 0x80808080u) != 0) // ASCII?
-	{
-		return ProbeFailure;
-	}
 	MPT_UNREFERENCED_PARAMETER(pfilesize);
 	return ProbeSuccess;
 }
@@ -354,7 +341,6 @@
 		return false;
 	}
 
-	// prepare some arrays to store offsets etc.
 	std::vector<FileReader> patternChunks;
 	std::vector<FileReader> sampleChunks;
 	std::array<int8, 8> pairedChn{{}};
@@ -371,15 +357,11 @@
 	{
 		OktIffChunk iffHead;
 		if(!file.ReadStruct(iffHead))
-		{
 			break;
-		}
 
 		FileReader chunk = file.ReadChunk(iffHead.chunksize);
 		if(!chunk.IsValid())
-		{
-			break;
-		}
+			continue;
 
 		switch(iffHead.signature)
 		{
@@ -457,12 +439,6 @@
 				sampleChunks.push_back(chunk);
 			}
 			break;
-
-		default:
-			// Non-ASCII chunk ID?
-			if(iffHead.signature & 0x80808080)
-				return false;
-			break;
 		}
 	}

[OMPT-svn-commit] OpenMPT r20412 - trunk/OpenMPT/soundlib

From: <sv...@op...> - 2024-03-17 16:33:10

Author: sagamusix
Date: Sun Mar 17 17:32:54 2024
New Revision: 20412
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20412

Log:
[Fix] OKT: Don't reject files with non-ASCII chunk IDs. This fixes "katharsis - piano lesson.okta" which appears to have some leftover junk with unused sample data at the end of the file (https://www.un4seen.com/forum/?topic=15448.msg142562#msg142562).

Modified:
   trunk/OpenMPT/soundlib/Load_okt.cpp

Modified: trunk/OpenMPT/soundlib/Load_okt.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_okt.cpp	Sun Mar 17 13:46:53 2024	(r20411)
+++ trunk/OpenMPT/soundlib/Load_okt.cpp	Sun Mar 17 17:32:54 2024	(r20412)
@@ -29,8 +29,8 @@
 		idSBOD	= MagicBE("SBOD"),
 	};
 
-	uint32be signature;	// IFF chunk name
-	uint32be chunksize;	// chunk size without header
+	uint32be signature;  // IFF chunk name
+	uint32be chunksize;  // chunk size without header
 };
 
 MPT_BINARY_STRUCT(OktIffChunk, 8)
@@ -328,19 +328,6 @@
 	{
 		return ProbeFailure;
 	}
-	OktIffChunk iffHead;
-	if(!file.ReadStruct(iffHead))
-	{
-		return ProbeWantMoreData;
-	}
-	if(iffHead.chunksize == 0)
-	{
-		return ProbeFailure;
-	}
-	if((iffHead.signature & 0x80808080u) != 0) // ASCII?
-	{
-		return ProbeFailure;
-	}
 	MPT_UNREFERENCED_PARAMETER(pfilesize);
 	return ProbeSuccess;
 }
@@ -354,7 +341,6 @@
 		return false;
 	}
 
-	// prepare some arrays to store offsets etc.
 	std::vector<FileReader> patternChunks;
 	std::vector<FileReader> sampleChunks;
 	std::array<int8, 8> pairedChn{{}};
@@ -371,15 +357,11 @@
 	{
 		OktIffChunk iffHead;
 		if(!file.ReadStruct(iffHead))
-		{
 			break;
-		}
 
 		FileReader chunk = file.ReadChunk(iffHead.chunksize);
 		if(!chunk.IsValid())
-		{
-			break;
-		}
+			continue;
 
 		switch(iffHead.signature)
 		{
@@ -457,12 +439,6 @@
 				sampleChunks.push_back(chunk);
 			}
 			break;
-
-		default:
-			// Non-ASCII chunk ID?
-			if(iffHead.signature & 0x80808080)
-				return false;
-			break;
 		}
 	}

[OMPT-svn-commit] OpenMPT r20411 - branches/OpenMPT-1.29/soundlib

From: <sv...@op...> - 2024-03-17 12:47:03

Author: sagamusix
Date: Sun Mar 17 13:46:53 2024
New Revision: 20411
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20411

Log:
[Fix] Compile fix.

Modified:
   branches/OpenMPT-1.29/soundlib/Load_med.cpp

Modified: branches/OpenMPT-1.29/soundlib/Load_med.cpp
==============================================================================
--- branches/OpenMPT-1.29/soundlib/Load_med.cpp	Sun Mar 17 13:37:18 2024	(r20410)
+++ branches/OpenMPT-1.29/soundlib/Load_med.cpp	Sun Mar 17 13:46:53 2024	(r20411)
@@ -850,7 +850,7 @@
 			{
 				int realNote = note + sampleHeader.sampleTranspose;
 				if(realNote >= NOTE_MIDDLEC + 24)
-					note -= static_cast<uint8>(mpt::align_down(realNote - NOTE_MIDDLEC - 12, 12));
+					note -= static_cast<uint8>(((realNote - NOTE_MIDDLEC - 12) / 12) * 12);
 			}
 		}

[OMPT-svn-commit] OpenMPT r20410 - in branches/OpenMPT-1.28: . soundlib/plugins/dmo

From: <sv...@op...> - 2024-03-17 12:37:29

Author: sagamusix
Date: Sun Mar 17 13:37:18 2024
New Revision: 20410
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20410

Log:
Merged revision(s) 20385 from trunk/OpenMPT:
[Mod] Compressor DMO: Similar to Chorus / Flanger, avoid chance of reading from the wrong buffer offset at extremely high sample rates. In this particular case, the mix rate needs to be above 500 kHz before the overflow would occur.
........

Modified:
   branches/OpenMPT-1.28/   (props changed)
   branches/OpenMPT-1.28/soundlib/plugins/dmo/Compressor.cpp

Modified: branches/OpenMPT-1.28/soundlib/plugins/dmo/Compressor.cpp
==============================================================================
--- branches/OpenMPT-1.28/soundlib/plugins/dmo/Compressor.cpp	Sun Mar 17 13:36:19 2024	(r20409)
+++ branches/OpenMPT-1.28/soundlib/plugins/dmo/Compressor.cpp	Sun Mar 17 13:37:18 2024	(r20410)
@@ -89,10 +89,10 @@
 		}
 		compGainPow >>= (31 - compGainInt);
 		
-		int32 readOffset = m_predelay + m_bufPos * 4096 + m_bufSize - 1;
+		int32 readOffset = m_predelay + m_bufSize - 1;
 		readOffset /= 4096;
-		readOffset %= m_bufSize;
-		
+		readOffset = (readOffset + m_bufPos) % m_bufSize;
+
 		float outGain = (compGainPow * (1.0f / 2147483648.0f)) * m_gain;
 		*(out[0])++ = m_buffer[readOffset * 2] * outGain;
 		*(out[1])++ = m_buffer[readOffset * 2 + 1] * outGain;

3 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 145 146 147 148 149 .. 965 > >> (Page 147 of 965)