Menu
▾
▴
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
(184) |
Sep
|
Oct
|
Nov
|
Dec
|
Author: sagamusix Date: Wed Jun 5 21:44:08 2024 New Revision: 20931 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20931 Log: [New] Can now read Real Tracker 2 (RTM) files. [Mod] OpenMPT: Version is now 1.32.00.17 Added: trunk/OpenMPT/soundlib/Load_rtm.cpp (contents, props changed) Modified: trunk/OpenMPT/build/android_ndk/Android.mk trunk/OpenMPT/build/autotools/Makefile.am trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2019win10uwp/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2019win10uwp/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2019win10uwp/libopenmpt.vcxproj trunk/OpenMPT/build/vs2019win10uwp/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2019win81/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2019win81/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2019win81/libopenmpt.vcxproj trunk/OpenMPT/build/vs2019win81/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2019win81/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2019win81/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win7/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win7/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win7/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win7/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win7/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win7/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win81/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win81/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win81/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win81/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win81/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win81/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/xcode-ios/libopenmpt.xcodeproj/project.pbxproj trunk/OpenMPT/build/xcode-macosx/libopenmpt.xcodeproj/project.pbxproj trunk/OpenMPT/common/versionNumber.h trunk/OpenMPT/contrib/fuzzing/all_formats.dict trunk/OpenMPT/installer/filetypes-multi-arch-per-arch-retro.iss trunk/OpenMPT/installer/filetypes-multi-arch-per-arch.iss trunk/OpenMPT/installer/filetypes-multi-arch-retro.iss trunk/OpenMPT/installer/filetypes-multi-arch.iss trunk/OpenMPT/soundlib/Sndfile.cpp trunk/OpenMPT/soundlib/Sndfile.h trunk/OpenMPT/soundlib/Tables.cpp Modified: trunk/OpenMPT/build/android_ndk/Android.mk ============================================================================== --- trunk/OpenMPT/build/android_ndk/Android.mk Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/android_ndk/Android.mk Wed Jun 5 21:44:08 2024 (r20931) @@ -150,6 +150,7 @@ soundlib/Load_pt36.cpp \ soundlib/Load_ptm.cpp \ soundlib/Load_puma.cpp \ + soundlib/Load_rtm.cpp \ soundlib/Load_s3m.cpp \ soundlib/Load_sfx.cpp \ soundlib/Load_stk.cpp \ Modified: trunk/OpenMPT/build/autotools/Makefile.am ============================================================================== --- trunk/OpenMPT/build/autotools/Makefile.am Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/autotools/Makefile.am Wed Jun 5 21:44:08 2024 (r20931) @@ -415,6 +415,7 @@ MPT_FILES_SOUNDLIB += soundlib/Load_pt36.cpp MPT_FILES_SOUNDLIB += soundlib/Load_ptm.cpp MPT_FILES_SOUNDLIB += soundlib/Load_puma.cpp +MPT_FILES_SOUNDLIB += soundlib/Load_rtm.cpp MPT_FILES_SOUNDLIB += soundlib/Load_s3m.cpp MPT_FILES_SOUNDLIB += soundlib/Load_sfx.cpp MPT_FILES_SOUNDLIB += soundlib/Load_stk.cpp Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1387,6 +1387,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -2108,6 +2108,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1387,6 +1387,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -2108,6 +2108,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1387,6 +1387,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -2108,6 +2108,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1014,6 +1014,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -1271,6 +1271,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1014,6 +1014,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -1271,6 +1271,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1054,6 +1054,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -1313,6 +1313,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1387,6 +1387,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -2108,6 +2108,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1387,6 +1387,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -2108,6 +2108,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1387,6 +1387,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -2108,6 +2108,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1014,6 +1014,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -1271,6 +1271,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1014,6 +1014,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -1271,6 +1271,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1054,6 +1054,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -1313,6 +1313,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -2162,6 +2162,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -2150,6 +2150,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -2162,6 +2162,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -2150,6 +2150,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -2162,6 +2162,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -2150,6 +2150,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1641,6 +1641,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -1271,6 +1271,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1641,6 +1641,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -1271,6 +1271,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1711,6 +1711,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -1319,6 +1319,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win10uwp/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10uwp/libopenmpt-small.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win10uwp/libopenmpt-small.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1671,6 +1671,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2019win10uwp/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10uwp/libopenmpt-small.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win10uwp/libopenmpt-small.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -1271,6 +1271,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win10uwp/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10uwp/libopenmpt.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win10uwp/libopenmpt.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1671,6 +1671,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2019win10uwp/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10uwp/libopenmpt.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win10uwp/libopenmpt.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -1271,6 +1271,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1406,6 +1406,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -2150,6 +2150,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1406,6 +1406,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -2150,6 +2150,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1406,6 +1406,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -2150,6 +2150,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1011,6 +1011,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -1271,6 +1271,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1011,6 +1011,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -1271,6 +1271,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1051,6 +1051,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -1319,6 +1319,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1406,6 +1406,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -2150,6 +2150,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1406,6 +1406,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -2150,6 +2150,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1406,6 +1406,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -2150,6 +2150,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win81/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win81/libopenmpt-small.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win81/libopenmpt-small.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1011,6 +1011,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2019win81/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win81/libopenmpt-small.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win81/libopenmpt-small.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -1271,6 +1271,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win81/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win81/libopenmpt.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win81/libopenmpt.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1011,6 +1011,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2019win81/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win81/libopenmpt.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win81/libopenmpt.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -1271,6 +1271,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win81/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win81/libopenmpt_test.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win81/libopenmpt_test.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1051,6 +1051,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2019win81/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win81/libopenmpt_test.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2019win81/libopenmpt_test.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -1319,6 +1319,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -2202,6 +2202,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -2150,6 +2150,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -2202,6 +2202,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -2150,6 +2150,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -2202,6 +2202,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters Wed Jun 5 21:44:08 2024 (r20931) @@ -2150,6 +2150,9 @@ <ClCompile Include="..\..\soundlib\Load_puma.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_s3m.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj Wed Jun 5 21:44:08 2024 (r20931) @@ -1681,6 +1681,7 @@ <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> + <ClCompile Include="..\..\soundlib\Load_rtm.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj.filters Wed Jun 5 19:22:40 2024 (r20930) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt-smal... [truncated message content] |
|
From: <sv...@op...> - 2024-06-05 17:22:52
|
Author: manx Date: Wed Jun 5 19:22:40 2024 New Revision: 20930 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20930 Log: [Imp] build: download_externals: Provide more alternate download URLs for some files. Modified: trunk/OpenMPT/build/download_externals.txt Modified: trunk/OpenMPT/build/download_externals.txt ============================================================================== --- trunk/OpenMPT/build/download_externals.txt Wed Jun 5 18:42:53 2024 (r20929) +++ trunk/OpenMPT/build/download_externals.txt Wed Jun 5 19:22:40 2024 (r20930) @@ -1,14 +1,14 @@ -"build/externals/7za920.zip" 384846 84e830c91a0e8ae499cc4814080da6569d8a6acbddc585c8b62abc86c809793aeb669b0a741063a379fd281ade85f120bc27efeb67d63bf961be893eec8bc3b3 "https://7-zip.org/a/7za920.zip" -"build/externals/7z2406-extra.7z" 1610111 6b88a761f7cc8b8affc074b24750bcdc65cc3ab18d127c8bfdd1eca953d43e21558eb1137c4b934689990564d7d24cf14e249a773dc1e5ddb7316b10d73682f8 "https://7-zip.org/a/7z2406-extra.7z" -"build/externals/7z2406-x64.exe" 1619556 b635b449f49aac29234f677e662be35f72a059401ea0786d956485d07134f9dd10ed284338503f08ff7aad16833cf034eb955ca34e1faf35a8177ccad1f20c75 "https://7-zip.org/a/7z2406-x64.exe" -"build/externals/WA5.55_SDK.exe" 336166 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 "http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "https://web.archive.org/web/20131217072017if_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" +"build/externals/7za920.zip" 384846 84e830c91a0e8ae499cc4814080da6569d8a6acbddc585c8b62abc86c809793aeb669b0a741063a379fd281ade85f120bc27efeb67d63bf961be893eec8bc3b3 "https://7-zip.org/a/7za920.zip" "https://netcologne.dl.sourceforge.net/project/sevenzip/7-Zip/9.20/7za920.zip" +"build/externals/7z2406-extra.7z" 1610111 6b88a761f7cc8b8affc074b24750bcdc65cc3ab18d127c8bfdd1eca953d43e21558eb1137c4b934689990564d7d24cf14e249a773dc1e5ddb7316b10d73682f8 "https://7-zip.org/a/7z2406-extra.7z" "https://netcologne.dl.sourceforge.net/project/sevenzip/7-Zip/24.06/7z2406-extra.7z" +"build/externals/7z2406-x64.exe" 1619556 b635b449f49aac29234f677e662be35f72a059401ea0786d956485d07134f9dd10ed284338503f08ff7aad16833cf034eb955ca34e1faf35a8177ccad1f20c75 "https://7-zip.org/a/7z2406-x64.exe" "https://netcologne.dl.sourceforge.net/project/sevenzip/7-Zip/24.06/7z2406-x64.exe" +"build/externals/WA5.55_SDK.exe" 336166 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 "https://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "https://web.archive.org/web/20131217072017/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "build/externals/xmp-sdk.zip" 322744 62c442d656d4bb380360368a0f5f01da11b4ed54333d7f54f875a9a5ec390b08921e00bd08e62cd7a0a5fe642e3377023f20a950cc2a42898ff4cda9ab88fc91 "https://www.un4seen.com/files/xmp-sdk.zip" -"build/externals/htmlhelp.exe" 3509072 d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 "https://web.archive.org/web/20200918004813if_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" +"build/externals/htmlhelp.exe" 3509072 d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 "https://web.archive.org/web/20200918004813/https://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "https://web.archive.org/web/20200918004813/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "build/externals/python-3.12.3-embed-amd64.zip" 11055461 b09fb48e9e17117d0e370e4a9934296c1211556594933ecaed4438daaa5e55fe673bb40e9ee0bc1bf7a038fa0711fbcc853422c84f3862703085cf891fae4298 "https://www.python.org/ftp/python/3.12.3/python-3.12.3-embed-amd64.zip" -"build/externals/innounp050.rar" 141621 dbbc809308267a866db9d6b751fdeda6d179e1a65d8ddb14bb51984431ae91493f9a76105e1789b245732043a2c696c869ed10964b48cf59f81e55bd52f85330 "https://netcologne.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar" +"build/externals/innounp050.rar" 141621 dbbc809308267a866db9d6b751fdeda6d179e1a65d8ddb14bb51984431ae91493f9a76105e1789b245732043a2c696c869ed10964b48cf59f81e55bd52f85330 "https://netcologne.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar" "https://deac-fra.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar" "build/externals/innosetup-6.2.2.exe" 4722512 496375b1ce9c0d2f8eb3930ebd8366f5c4c938bc1eda47aed415e3f02bd8651a84a770a15f2825bf3c8ed9dbefa355b9eb805dd76bc782f6d8c8096d80443099 "https://files.jrsoftware.org/is/6/innosetup-6.2.2.exe" "build/externals/isetup-5.5.8-unicode.exe" 2342456 da7e27d85caec85b4194c7b1412c5a64c0ae12f22d903b94f2f4ee9ea0cb99c91b2d1dbb49262eefae8129e6b91f5c46f26f353011076e77e75f9c955fc5e1cb "https://files.jrsoftware.org/is/5/isetup-5.5.8-unicode.exe" "build/externals/example_songs_ompt_1_30.7z" 4881392 bfecf7f97fd71bd52bcfb38307ccb98c751e6a0fa0c1f31208b22b9392f03ea3da8f9271327df2de4fc2e463e0c13c6a24107fbe18caf8f446b7e7cf93073fa5 "https://download.openmpt.org/resources/modules/example_songs_ompt_1_30.7z" -"build/externals/allegro-4.2.3.1-hg.8+r8500.zip" 3872466 46cd8d4d7138b795dbc66994e953d0abc578c6d3c00615e3580237458529d33d7ad9d269a9778918d4b3719d75750d5cca74ff6bf38ad357a766472799ee9e7b "https://lib.openmpt.org/files/libopenmpt/contrib/allegro/allegro-4.2.3.1-hg.8+r8500.zip" -"build/externals/csdpmi7b.zip" 71339 58c24691d27cead1cec92d334af551f37a3ba31de25a687d99399c28d822ec9f6ffccc9332bfce35e65dae4dd1210b54e54b223a4de17f5adcb11e2da004b834 "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7b.zip" "https://djgpp.mirror.garr.it/current/v2misc/csdpmi7b.zip" -"build/externals/csdpmi7s.zip" 89872 ea5652d31850d8eb0d15a919de0b51849f58efea0d16ad2aa4687fac4abd223d0ca34a2d1b616b02fafe84651dbef3e506df9262cfb399eb6d9909bffc89bfd3 "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7s.zip" "https://djgpp.mirror.garr.it/current/v2misc/csdpmi7s.zip" +"build/externals/allegro-4.2.3.1-hg.8+r8500.zip" 3872466 46cd8d4d7138b795dbc66994e953d0abc578c6d3c00615e3580237458529d33d7ad9d269a9778918d4b3719d75750d5cca74ff6bf38ad357a766472799ee9e7b "https://lib.openmpt.org/files/libopenmpt/contrib/allegro/allegro-4.2.3.1-hg.8+r8500.zip" "https://mercury.sexy/members/manx/liballegro-4.2/allegro-4.2.3.1-hg.8+r8500.zip" +"build/externals/csdpmi7b.zip" 71339 58c24691d27cead1cec92d334af551f37a3ba31de25a687d99399c28d822ec9f6ffccc9332bfce35e65dae4dd1210b54e54b223a4de17f5adcb11e2da004b834 "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7b.zip" "https://www.mirrorservice.org/sites/ftp.delorie.com/pub/djgpp/current/v2misc/csdpmi7b.zip" "https://djgpp.mirror.garr.it/current/v2misc/csdpmi7b.zip" +"build/externals/csdpmi7s.zip" 89872 ea5652d31850d8eb0d15a919de0b51849f58efea0d16ad2aa4687fac4abd223d0ca34a2d1b616b02fafe84651dbef3e506df9262cfb399eb6d9909bffc89bfd3 "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7s.zip" "https://www.mirrorservice.org/sites/ftp.delorie.com/pub/djgpp/current/v2misc/csdpmi7s.zip" "https://djgpp.mirror.garr.it/current/v2misc/csdpmi7s.zip" |
|
From: <sv...@op...> - 2024-06-05 16:43:05
|
Author: sagamusix Date: Wed Jun 5 18:42:53 2024 New Revision: 20929 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20929 Log: Merged revision(s) 20928 from trunk/OpenMPT: [Var] ancient: Update to commit bdff39426d0460a6b114712b14da6cb40ccadb77 (2024-06-05) ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/include/ancient/OpenMPT.txt branches/OpenMPT-1.31/include/ancient/src/common/MemoryBuffer.cpp Modified: branches/OpenMPT-1.31/include/ancient/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.31/include/ancient/OpenMPT.txt Wed Jun 5 18:41:58 2024 (r20928) +++ branches/OpenMPT-1.31/include/ancient/OpenMPT.txt Wed Jun 5 18:42:53 2024 (r20929) @@ -1,3 +1,3 @@ * ancient <https://github.com/temisu/ancient> commit - 1a176949acdebefb6303d69e315837fc0d8bb166 (2024-03-26) + bdff39426d0460a6b114712b14da6cb40ccadb77 (2024-06-05) * Unnecssary files have been removed. Modified: branches/OpenMPT-1.31/include/ancient/src/common/MemoryBuffer.cpp ============================================================================== --- branches/OpenMPT-1.31/include/ancient/src/common/MemoryBuffer.cpp Wed Jun 5 18:41:58 2024 (r20928) +++ branches/OpenMPT-1.31/include/ancient/src/common/MemoryBuffer.cpp Wed Jun 5 18:42:53 2024 (r20929) @@ -53,8 +53,15 @@ return true; } -void MemoryBuffer::resize(size_t newSize) +void MemoryBuffer::resize(size_t newSize) { + if (!newSize) + { + std::free(_data); + _data=nullptr; + _size=0; + return; + } uint8_t *newData=reinterpret_cast<uint8_t*>(std::realloc(_data,newSize)); if (!newData) { |
|
From: <sv...@op...> - 2024-06-05 16:42:05
|
Author: sagamusix Date: Wed Jun 5 18:41:58 2024 New Revision: 20928 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20928 Log: [Var] ancient: Update to commit bdff39426d0460a6b114712b14da6cb40ccadb77 (2024-06-05) Modified: trunk/OpenMPT/include/ancient/OpenMPT.txt trunk/OpenMPT/include/ancient/src/common/MemoryBuffer.cpp Modified: trunk/OpenMPT/include/ancient/OpenMPT.txt ============================================================================== --- trunk/OpenMPT/include/ancient/OpenMPT.txt Wed Jun 5 15:42:51 2024 (r20927) +++ trunk/OpenMPT/include/ancient/OpenMPT.txt Wed Jun 5 18:41:58 2024 (r20928) @@ -1,3 +1,3 @@ * ancient <https://github.com/temisu/ancient> commit - 1a176949acdebefb6303d69e315837fc0d8bb166 (2024-03-26) + bdff39426d0460a6b114712b14da6cb40ccadb77 (2024-06-05) * Unnecssary files have been removed. Modified: trunk/OpenMPT/include/ancient/src/common/MemoryBuffer.cpp ============================================================================== --- trunk/OpenMPT/include/ancient/src/common/MemoryBuffer.cpp Wed Jun 5 15:42:51 2024 (r20927) +++ trunk/OpenMPT/include/ancient/src/common/MemoryBuffer.cpp Wed Jun 5 18:41:58 2024 (r20928) @@ -53,8 +53,15 @@ return true; } -void MemoryBuffer::resize(size_t newSize) +void MemoryBuffer::resize(size_t newSize) { + if (!newSize) + { + std::free(_data); + _data=nullptr; + _size=0; + return; + } uint8_t *newData=reinterpret_cast<uint8_t*>(std::realloc(_data,newSize)); if (!newData) { |
|
From: <sv...@op...> - 2024-06-05 13:43:00
|
Author: manx Date: Wed Jun 5 15:42:51 2024 New Revision: 20927 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20927 Log: [Mod] build: download_externals: Use the same download_externals.txt list of things to download on Windows and Unix. Added: trunk/OpenMPT/build/download_externals.txt (contents, props changed) Modified: trunk/OpenMPT/build/download_externals.cmd trunk/OpenMPT/build/download_externals.sh Modified: trunk/OpenMPT/build/download_externals.cmd ============================================================================== --- trunk/OpenMPT/build/download_externals.cmd Wed Jun 5 15:40:52 2024 (r20926) +++ trunk/OpenMPT/build/download_externals.cmd Wed Jun 5 15:42:51 2024 (r20927) @@ -28,24 +28,8 @@ if not exist "build\externals" mkdir "build\externals" if not exist "build\tools" mkdir "build\tools" - -call build\scriptlib\download.cmd "build\externals\7za920.zip" 384846 84e830c91a0e8ae499cc4814080da6569d8a6acbddc585c8b62abc86c809793aeb669b0a741063a379fd281ade85f120bc27efeb67d63bf961be893eec8bc3b3 "https://7-zip.org/a/7za920.zip" || goto error -call build\scriptlib\download.cmd "build\externals\7z2406-extra.7z" 1610111 6b88a761f7cc8b8affc074b24750bcdc65cc3ab18d127c8bfdd1eca953d43e21558eb1137c4b934689990564d7d24cf14e249a773dc1e5ddb7316b10d73682f8 "https://7-zip.org/a/7z2406-extra.7z" || goto error -call build\scriptlib\download.cmd "build\externals\7z2406-x64.exe" 1619556 b635b449f49aac29234f677e662be35f72a059401ea0786d956485d07134f9dd10ed284338503f08ff7aad16833cf034eb955ca34e1faf35a8177ccad1f20c75 "https://7-zip.org/a/7z2406-x64.exe" || goto error - -call build\scriptlib\download.cmd "build\externals\WA5.55_SDK.exe" 336166 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 "http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "https://web.archive.org/web/20131217072017if_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" || goto error -call build\scriptlib\download.cmd "build\externals\xmp-sdk.zip" 322744 62c442d656d4bb380360368a0f5f01da11b4ed54333d7f54f875a9a5ec390b08921e00bd08e62cd7a0a5fe642e3377023f20a950cc2a42898ff4cda9ab88fc91 "https://www.un4seen.com/files/xmp-sdk.zip" || goto error - -call build\scriptlib\download.cmd "build\externals\htmlhelp.exe" 3509072 d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 "https://web.archive.org/web/20200918004813if_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" || goto error - -call build\scriptlib\download.cmd "build\externals\python-3.12.3-embed-amd64.zip" 11055461 b09fb48e9e17117d0e370e4a9934296c1211556594933ecaed4438daaa5e55fe673bb40e9ee0bc1bf7a038fa0711fbcc853422c84f3862703085cf891fae4298 "https://www.python.org/ftp/python/3.12.3/python-3.12.3-embed-amd64.zip" || goto error - -call build\scriptlib\download.cmd "build\externals\innounp050.rar" 141621 dbbc809308267a866db9d6b751fdeda6d179e1a65d8ddb14bb51984431ae91493f9a76105e1789b245732043a2c696c869ed10964b48cf59f81e55bd52f85330 "https://netcologne.dl.sourceforge.net/project/innounp/innounp/innounp%%%%200.50/innounp050.rar" || goto error -call build\scriptlib\download.cmd "build\externals\innosetup-6.2.2.exe" 4722512 496375b1ce9c0d2f8eb3930ebd8366f5c4c938bc1eda47aed415e3f02bd8651a84a770a15f2825bf3c8ed9dbefa355b9eb805dd76bc782f6d8c8096d80443099 "https://files.jrsoftware.org/is/6/innosetup-6.2.2.exe" || goto error -call build\scriptlib\download.cmd "build\externals\isetup-5.5.8-unicode.exe" 2342456 da7e27d85caec85b4194c7b1412c5a64c0ae12f22d903b94f2f4ee9ea0cb99c91b2d1dbb49262eefae8129e6b91f5c46f26f353011076e77e75f9c955fc5e1cb "https://files.jrsoftware.org/is/5/isetup-5.5.8-unicode.exe" || goto error - -call build\scriptlib\download.cmd "build\externals\example_songs_ompt_1_30.7z" 4881392 bfecf7f97fd71bd52bcfb38307ccb98c751e6a0fa0c1f31208b22b9392f03ea3da8f9271327df2de4fc2e463e0c13c6a24107fbe18caf8f446b7e7cf93073fa5 "https://download.openmpt.org/resources/modules/example_songs_ompt_1_30.7z" || goto error - +rem download +for /f "delims=" %%a in ('type "build\download_externals.txt"') do ( call build\scriptlib\download.cmd %%a || goto error ) call :killdir "build\tools\7zipold" || goto error call :killdir "build\tools\7zipa" || goto error Modified: trunk/OpenMPT/build/download_externals.sh ============================================================================== --- trunk/OpenMPT/build/download_externals.sh Wed Jun 5 15:40:52 2024 (r20926) +++ trunk/OpenMPT/build/download_externals.sh Wed Jun 5 15:42:51 2024 (r20927) @@ -99,11 +99,12 @@ mkdir build/tools fi -download "build/externals/allegro-4.2.3.1-hg.8+r8500.zip" 3872466 46cd8d4d7138b795dbc66994e953d0abc578c6d3c00615e3580237458529d33d7ad9d269a9778918d4b3719d75750d5cca74ff6bf38ad357a766472799ee9e7b "https://lib.openmpt.org/files/libopenmpt/contrib/allegro/allegro-4.2.3.1-hg.8+r8500.zip" -download "build/externals/csdpmi7b.zip" 71339 58c24691d27cead1cec92d334af551f37a3ba31de25a687d99399c28d822ec9f6ffccc9332bfce35e65dae4dd1210b54e54b223a4de17f5adcb11e2da004b834 "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7b.zip" "https://djgpp.mirror.garr.it/current/v2misc/csdpmi7b.zip" -download "build/externals/csdpmi7s.zip" 89872 ea5652d31850d8eb0d15a919de0b51849f58efea0d16ad2aa4687fac4abd223d0ca34a2d1b616b02fafe84651dbef3e506df9262cfb399eb6d9909bffc89bfd3 "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7s.zip" "https://djgpp.mirror.garr.it/current/v2misc/csdpmi7s.zip" -download "build/externals/WA5.55_SDK.exe" 336166 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 "http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "https://web.archive.org/web/20131217072017if_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" -download "build/externals/xmp-sdk.zip" 322744 62c442d656d4bb380360368a0f5f01da11b4ed54333d7f54f875a9a5ec390b08921e00bd08e62cd7a0a5fe642e3377023f20a950cc2a42898ff4cda9ab88fc91 "https://www.un4seen.com/files/xmp-sdk.zip" +# download +cat build/download_externals.txt | ( + while IFS=$'\n' read -r URL; do + eval download $URL + done +) unpack "include/allegro42" "build/externals/allegro-4.2.3.1-hg.8+r8500.zip" "." unpack "include/cwsdpmi" "build/externals/csdpmi7b.zip" "." Added: trunk/OpenMPT/build/download_externals.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/OpenMPT/build/download_externals.txt Wed Jun 5 15:42:51 2024 (r20927) @@ -0,0 +1,14 @@ +"build/externals/7za920.zip" 384846 84e830c91a0e8ae499cc4814080da6569d8a6acbddc585c8b62abc86c809793aeb669b0a741063a379fd281ade85f120bc27efeb67d63bf961be893eec8bc3b3 "https://7-zip.org/a/7za920.zip" +"build/externals/7z2406-extra.7z" 1610111 6b88a761f7cc8b8affc074b24750bcdc65cc3ab18d127c8bfdd1eca953d43e21558eb1137c4b934689990564d7d24cf14e249a773dc1e5ddb7316b10d73682f8 "https://7-zip.org/a/7z2406-extra.7z" +"build/externals/7z2406-x64.exe" 1619556 b635b449f49aac29234f677e662be35f72a059401ea0786d956485d07134f9dd10ed284338503f08ff7aad16833cf034eb955ca34e1faf35a8177ccad1f20c75 "https://7-zip.org/a/7z2406-x64.exe" +"build/externals/WA5.55_SDK.exe" 336166 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 "http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "https://web.archive.org/web/20131217072017if_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" +"build/externals/xmp-sdk.zip" 322744 62c442d656d4bb380360368a0f5f01da11b4ed54333d7f54f875a9a5ec390b08921e00bd08e62cd7a0a5fe642e3377023f20a950cc2a42898ff4cda9ab88fc91 "https://www.un4seen.com/files/xmp-sdk.zip" +"build/externals/htmlhelp.exe" 3509072 d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 "https://web.archive.org/web/20200918004813if_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" +"build/externals/python-3.12.3-embed-amd64.zip" 11055461 b09fb48e9e17117d0e370e4a9934296c1211556594933ecaed4438daaa5e55fe673bb40e9ee0bc1bf7a038fa0711fbcc853422c84f3862703085cf891fae4298 "https://www.python.org/ftp/python/3.12.3/python-3.12.3-embed-amd64.zip" +"build/externals/innounp050.rar" 141621 dbbc809308267a866db9d6b751fdeda6d179e1a65d8ddb14bb51984431ae91493f9a76105e1789b245732043a2c696c869ed10964b48cf59f81e55bd52f85330 "https://netcologne.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar" +"build/externals/innosetup-6.2.2.exe" 4722512 496375b1ce9c0d2f8eb3930ebd8366f5c4c938bc1eda47aed415e3f02bd8651a84a770a15f2825bf3c8ed9dbefa355b9eb805dd76bc782f6d8c8096d80443099 "https://files.jrsoftware.org/is/6/innosetup-6.2.2.exe" +"build/externals/isetup-5.5.8-unicode.exe" 2342456 da7e27d85caec85b4194c7b1412c5a64c0ae12f22d903b94f2f4ee9ea0cb99c91b2d1dbb49262eefae8129e6b91f5c46f26f353011076e77e75f9c955fc5e1cb "https://files.jrsoftware.org/is/5/isetup-5.5.8-unicode.exe" +"build/externals/example_songs_ompt_1_30.7z" 4881392 bfecf7f97fd71bd52bcfb38307ccb98c751e6a0fa0c1f31208b22b9392f03ea3da8f9271327df2de4fc2e463e0c13c6a24107fbe18caf8f446b7e7cf93073fa5 "https://download.openmpt.org/resources/modules/example_songs_ompt_1_30.7z" +"build/externals/allegro-4.2.3.1-hg.8+r8500.zip" 3872466 46cd8d4d7138b795dbc66994e953d0abc578c6d3c00615e3580237458529d33d7ad9d269a9778918d4b3719d75750d5cca74ff6bf38ad357a766472799ee9e7b "https://lib.openmpt.org/files/libopenmpt/contrib/allegro/allegro-4.2.3.1-hg.8+r8500.zip" +"build/externals/csdpmi7b.zip" 71339 58c24691d27cead1cec92d334af551f37a3ba31de25a687d99399c28d822ec9f6ffccc9332bfce35e65dae4dd1210b54e54b223a4de17f5adcb11e2da004b834 "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7b.zip" "https://djgpp.mirror.garr.it/current/v2misc/csdpmi7b.zip" +"build/externals/csdpmi7s.zip" 89872 ea5652d31850d8eb0d15a919de0b51849f58efea0d16ad2aa4687fac4abd223d0ca34a2d1b616b02fafe84651dbef3e506df9262cfb399eb6d9909bffc89bfd3 "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7s.zip" "https://djgpp.mirror.garr.it/current/v2misc/csdpmi7s.zip" |
|
From: <sv...@op...> - 2024-06-05 13:41:07
|
Author: manx Date: Wed Jun 5 15:40:52 2024 New Revision: 20926 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20926 Log: [Fix] build: download_externals.sh: Automatically follow HTTP redirects. [Imp] build: download_externals.sh: Handle spaces in URLs. Modified: trunk/OpenMPT/build/download_externals.sh Modified: trunk/OpenMPT/build/download_externals.sh ============================================================================== --- trunk/OpenMPT/build/download_externals.sh Wed Jun 5 14:56:17 2024 (r20925) +++ trunk/OpenMPT/build/download_externals.sh Wed Jun 5 15:40:52 2024 (r20926) @@ -31,10 +31,10 @@ fi fi while (( "$#" )); do - URL="$1" + URL="$(echo ""$1"" | sed 's/ /%20/g')" if [ ! -f "$MPT_GET_FILE_NAME" ]; then echo "Downloading '$MPT_GET_FILE_NAME' from '$URL' ..." - curl -o "$MPT_GET_FILE_NAME" "$URL" + curl --location -o "$MPT_GET_FILE_NAME" "$URL" echo "Verifying '$URL' ..." if [ -f "$MPT_GET_FILE_NAME" ]; then FILE_SIZE=$(find "$MPT_GET_FILE_NAME" -printf '%s') |
|
From: <sv...@op...> - 2024-06-05 12:56:29
|
Author: manx Date: Wed Jun 5 14:56:17 2024 New Revision: 20925 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20925 Log: [Ref] build: download_externals: Use the exact same download syntax on Unix and Windows. Modified: trunk/OpenMPT/build/download_externals.sh Modified: trunk/OpenMPT/build/download_externals.sh ============================================================================== --- trunk/OpenMPT/build/download_externals.sh Tue Jun 4 20:52:01 2024 (r20924) +++ trunk/OpenMPT/build/download_externals.sh Wed Jun 5 14:56:17 2024 (r20925) @@ -12,7 +12,9 @@ MPT_GET_FILE_NAME="$1" MPT_GET_FILE_SIZE="$2" MPT_GET_FILE_CHECKSUM="$3" - MPT_GET_URLS="$4" + shift + shift + shift echo "Checking '$MPT_GET_FILE_NAME' ..." if [ -f "$MPT_GET_FILE_NAME" ]; then FILE_SIZE=$(find "$MPT_GET_FILE_NAME" -printf '%s') @@ -28,7 +30,8 @@ rm -f "$MPT_GET_FILE_NAME" fi fi - for URL in $MPT_GET_URLS; do + while (( "$#" )); do + URL="$1" if [ ! -f "$MPT_GET_FILE_NAME" ]; then echo "Downloading '$MPT_GET_FILE_NAME' from '$URL' ..." curl -o "$MPT_GET_FILE_NAME" "$URL" @@ -48,6 +51,7 @@ fi fi fi + shift done if [ ! -f "$MPT_GET_FILE_NAME" ]; then echo "Failed to download '$MPT_GET_FILE_NAME'." @@ -96,9 +100,9 @@ fi download "build/externals/allegro-4.2.3.1-hg.8+r8500.zip" 3872466 46cd8d4d7138b795dbc66994e953d0abc578c6d3c00615e3580237458529d33d7ad9d269a9778918d4b3719d75750d5cca74ff6bf38ad357a766472799ee9e7b "https://lib.openmpt.org/files/libopenmpt/contrib/allegro/allegro-4.2.3.1-hg.8+r8500.zip" -download "build/externals/csdpmi7b.zip" 71339 58c24691d27cead1cec92d334af551f37a3ba31de25a687d99399c28d822ec9f6ffccc9332bfce35e65dae4dd1210b54e54b223a4de17f5adcb11e2da004b834 "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7b.zip https://djgpp.mirror.garr.it/current/v2misc/csdpmi7b.zip" -download "build/externals/csdpmi7s.zip" 89872 ea5652d31850d8eb0d15a919de0b51849f58efea0d16ad2aa4687fac4abd223d0ca34a2d1b616b02fafe84651dbef3e506df9262cfb399eb6d9909bffc89bfd3 "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7s.zip https://djgpp.mirror.garr.it/current/v2misc/csdpmi7s.zip" -download "build/externals/WA5.55_SDK.exe" 336166 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 "http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe https://web.archive.org/web/20131217072017if_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" +download "build/externals/csdpmi7b.zip" 71339 58c24691d27cead1cec92d334af551f37a3ba31de25a687d99399c28d822ec9f6ffccc9332bfce35e65dae4dd1210b54e54b223a4de17f5adcb11e2da004b834 "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7b.zip" "https://djgpp.mirror.garr.it/current/v2misc/csdpmi7b.zip" +download "build/externals/csdpmi7s.zip" 89872 ea5652d31850d8eb0d15a919de0b51849f58efea0d16ad2aa4687fac4abd223d0ca34a2d1b616b02fafe84651dbef3e506df9262cfb399eb6d9909bffc89bfd3 "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7s.zip" "https://djgpp.mirror.garr.it/current/v2misc/csdpmi7s.zip" +download "build/externals/WA5.55_SDK.exe" 336166 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 "http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "https://web.archive.org/web/20131217072017if_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" download "build/externals/xmp-sdk.zip" 322744 62c442d656d4bb380360368a0f5f01da11b4ed54333d7f54f875a9a5ec390b08921e00bd08e62cd7a0a5fe642e3377023f20a950cc2a42898ff4cda9ab88fc91 "https://www.un4seen.com/files/xmp-sdk.zip" unpack "include/allegro42" "build/externals/allegro-4.2.3.1-hg.8+r8500.zip" "." |
|
From: <sv...@op...> - 2024-06-04 18:52:09
|
Author: sagamusix Date: Tue Jun 4 20:52:01 2024 New Revision: 20924 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20924 Log: [Fix] STK auto-slides should also stop with command parameter 0. Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Snd_fx.cpp Sun Jun 2 22:44:18 2024 (r20923) +++ trunk/OpenMPT/soundlib/Snd_fx.cpp Tue Jun 4 20:52:01 2024 (r20924) @@ -3830,7 +3830,7 @@ return; } - if(cmd == CMD_NONE && chn.autoSlide.IsActive(AutoSlideCommand::VolumeSlideSTK)) + if((cmd == CMD_NONE || !chn.rowCommand.param) && chn.autoSlide.IsActive(AutoSlideCommand::VolumeSlideSTK)) chn.autoSlide.SetActive(AutoSlideCommand::VolumeSlideSTK, false); if((cmd == CMD_CHANNELVOLUME || cmd == CMD_CHANNELVOLSLIDE) && chn.autoSlide.IsActive(AutoSlideCommand::VolumeDownWithDuration)) chn.autoSlide.SetActive(AutoSlideCommand::VolumeDownWithDuration, false); |
|
From: <sv...@op...> - 2024-06-02 20:44:30
|
Author: sagamusix Date: Sun Jun 2 22:44:18 2024 New Revision: 20923 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20923 Log: [Imp] In tracker debug builds, verify that for successfully loaded files the result of the corresponding probing function is successful, too. This makes it easier to verify the API contract outside of libopenmpt builds. Modified: trunk/OpenMPT/soundlib/Sndfile.cpp Modified: trunk/OpenMPT/soundlib/Sndfile.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Sndfile.cpp Sun Jun 2 20:30:15 2024 (r20922) +++ trunk/OpenMPT/soundlib/Sndfile.cpp Sun Jun 2 22:44:18 2024 (r20923) @@ -244,7 +244,7 @@ decltype(&CSoundFile::ReadXM) loader; }; -#ifdef MODPLUG_TRACKER +#if defined(MODPLUG_TRACKER) && !defined(MPT_BUILD_DEBUG) #define MPT_DECLARE_FORMAT(format) { nullptr, &CSoundFile::Read ## format } #else #define MPT_DECLARE_FORMAT(format) { CSoundFile::ProbeFileHeader ## format, &CSoundFile::Read ## format } @@ -507,7 +507,17 @@ { loaderSuccess = (this->*(format.loader))(file, loadFlags); if(loaderSuccess) + { +#if defined(MPT_BUILD_DEBUG) + // Verify that the probing function is consistent with our API contract + file.Rewind(); + const auto data = file.GetRawDataAsByteVector(ProbeRecommendedSize); + MemoryFileReader mf{mpt::as_span(data)}; + const uint64 size = file.GetLength(); + MPT_ASSERT(format.prober(mf, &size) != ProbeFailure); +#endif break; + } } if(!loaderSuccess) |
|
From: <sv...@op...> - 2024-06-02 18:30:27
|
Author: sagamusix Date: Sun Jun 2 20:30:15 2024 New Revision: 20922 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20922 Log: Merged revision(s) 20918 from trunk/OpenMPT: [Fix] Fuzzing: Remove input file from command line; as we use the shared memory fuzzing model now, it is useless. ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/contrib/fuzzing/fuzz-main.sh branches/OpenMPT-1.28/contrib/fuzzing/fuzz-secondary1.sh branches/OpenMPT-1.28/contrib/fuzzing/fuzz-secondary2.sh Modified: branches/OpenMPT-1.28/contrib/fuzzing/fuzz-main.sh ============================================================================== --- branches/OpenMPT-1.28/contrib/fuzzing/fuzz-main.sh Sun Jun 2 20:29:37 2024 (r20921) +++ branches/OpenMPT-1.28/contrib/fuzzing/fuzz-main.sh Sun Jun 2 20:30:15 2024 (r20922) @@ -10,4 +10,4 @@ cp -d ../../bin/* $FUZZING_TEMPDIR/bin/ #export AFL_PRELOAD=$AFL_DIR/libdislocator.so -LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p exploit -f $FUZZING_TEMPDIR/infile01 -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -D -M fuzzer01 $FUZZING_TEMPDIR/bin/fuzz $FUZZING_TEMPDIR/infile01 +LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p exploit -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -D -M fuzzer01 $FUZZING_TEMPDIR/bin/fuzz Modified: branches/OpenMPT-1.28/contrib/fuzzing/fuzz-secondary1.sh ============================================================================== --- branches/OpenMPT-1.28/contrib/fuzzing/fuzz-secondary1.sh Sun Jun 2 20:29:37 2024 (r20921) +++ branches/OpenMPT-1.28/contrib/fuzzing/fuzz-secondary1.sh Sun Jun 2 20:30:15 2024 (r20922) @@ -3,4 +3,4 @@ . ./fuzz-settings.sh #export AFL_PRELOAD=$AFL_DIR/libdislocator.so -LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p coe -f $FUZZING_TEMPDIR/infile02 -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -S fuzzer02 $FUZZING_TEMPDIR/bin/fuzz $FUZZING_TEMPDIR/infile02 +LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p coe -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -S fuzzer02 $FUZZING_TEMPDIR/bin/fuzz Modified: branches/OpenMPT-1.28/contrib/fuzzing/fuzz-secondary2.sh ============================================================================== --- branches/OpenMPT-1.28/contrib/fuzzing/fuzz-secondary2.sh Sun Jun 2 20:29:37 2024 (r20921) +++ branches/OpenMPT-1.28/contrib/fuzzing/fuzz-secondary2.sh Sun Jun 2 20:30:15 2024 (r20922) @@ -3,4 +3,4 @@ . ./fuzz-settings.sh #export AFL_PRELOAD=$AFL_DIR/libdislocator.so -LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p explore -f $FUZZING_TEMPDIR/infile03 -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -S fuzzer03 $FUZZING_TEMPDIR/bin/fuzz $FUZZING_TEMPDIR/infile03 +LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p explore -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -S fuzzer03 $FUZZING_TEMPDIR/bin/fuzz |
|
From: <sv...@op...> - 2024-06-02 18:29:44
|
Author: sagamusix Date: Sun Jun 2 20:29:37 2024 New Revision: 20921 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20921 Log: Merged revision(s) 20918 from trunk/OpenMPT: [Fix] Fuzzing: Remove input file from command line; as we use the shared memory fuzzing model now, it is useless. ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/contrib/fuzzing/fuzz-main.sh branches/OpenMPT-1.29/contrib/fuzzing/fuzz-secondary1.sh branches/OpenMPT-1.29/contrib/fuzzing/fuzz-secondary2.sh Modified: branches/OpenMPT-1.29/contrib/fuzzing/fuzz-main.sh ============================================================================== --- branches/OpenMPT-1.29/contrib/fuzzing/fuzz-main.sh Sun Jun 2 20:28:47 2024 (r20920) +++ branches/OpenMPT-1.29/contrib/fuzzing/fuzz-main.sh Sun Jun 2 20:29:37 2024 (r20921) @@ -10,4 +10,4 @@ cp -d ../../bin/* $FUZZING_TEMPDIR/bin/ #export AFL_PRELOAD=$AFL_DIR/libdislocator.so -LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p exploit -f $FUZZING_TEMPDIR/infile01 -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -D -M fuzzer01 $FUZZING_TEMPDIR/bin/fuzz $FUZZING_TEMPDIR/infile01 +LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p exploit1 -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -D -M fuzzer01 $FUZZING_TEMPDIR/bin/fuzz Modified: branches/OpenMPT-1.29/contrib/fuzzing/fuzz-secondary1.sh ============================================================================== --- branches/OpenMPT-1.29/contrib/fuzzing/fuzz-secondary1.sh Sun Jun 2 20:28:47 2024 (r20920) +++ branches/OpenMPT-1.29/contrib/fuzzing/fuzz-secondary1.sh Sun Jun 2 20:29:37 2024 (r20921) @@ -3,4 +3,4 @@ . ./fuzz-settings.sh #export AFL_PRELOAD=$AFL_DIR/libdislocator.so -LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p coe -f $FUZZING_TEMPDIR/infile02 -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -S fuzzer02 $FUZZING_TEMPDIR/bin/fuzz $FUZZING_TEMPDIR/infile02 +LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p coe -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -S fuzzer02 $FUZZING_TEMPDIR/bin/fuzz Modified: branches/OpenMPT-1.29/contrib/fuzzing/fuzz-secondary2.sh ============================================================================== --- branches/OpenMPT-1.29/contrib/fuzzing/fuzz-secondary2.sh Sun Jun 2 20:28:47 2024 (r20920) +++ branches/OpenMPT-1.29/contrib/fuzzing/fuzz-secondary2.sh Sun Jun 2 20:29:37 2024 (r20921) @@ -3,4 +3,4 @@ . ./fuzz-settings.sh #export AFL_PRELOAD=$AFL_DIR/libdislocator.so -LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p explore -f $FUZZING_TEMPDIR/infile03 -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -S fuzzer03 $FUZZING_TEMPDIR/bin/fuzz $FUZZING_TEMPDIR/infile03 +LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p explore -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -S fuzzer03 $FUZZING_TEMPDIR/bin/fuzz |
|
From: <sv...@op...> - 2024-06-02 18:28:54
|
Author: sagamusix Date: Sun Jun 2 20:28:47 2024 New Revision: 20920 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20920 Log: Merged revision(s) 20918 from trunk/OpenMPT: [Fix] Fuzzing: Remove input file from command line; as we use the shared memory fuzzing model now, it is useless. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/contrib/fuzzing/fuzz-main.sh branches/OpenMPT-1.30/contrib/fuzzing/fuzz-secondary1.sh branches/OpenMPT-1.30/contrib/fuzzing/fuzz-secondary2.sh Modified: branches/OpenMPT-1.30/contrib/fuzzing/fuzz-main.sh ============================================================================== --- branches/OpenMPT-1.30/contrib/fuzzing/fuzz-main.sh Sun Jun 2 20:27:32 2024 (r20919) +++ branches/OpenMPT-1.30/contrib/fuzzing/fuzz-main.sh Sun Jun 2 20:28:47 2024 (r20920) @@ -10,4 +10,4 @@ cp -d ../../bin/* $FUZZING_TEMPDIR/bin/ #export AFL_PRELOAD=$AFL_DIR/libdislocator.so -LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p exploit -f $FUZZING_TEMPDIR/infile01 -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -D -M fuzzer01 $FUZZING_TEMPDIR/bin/fuzz $FUZZING_TEMPDIR/infile01 +LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p exploit -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -D -M fuzzer01 $FUZZING_TEMPDIR/bin/fuzz Modified: branches/OpenMPT-1.30/contrib/fuzzing/fuzz-secondary1.sh ============================================================================== --- branches/OpenMPT-1.30/contrib/fuzzing/fuzz-secondary1.sh Sun Jun 2 20:27:32 2024 (r20919) +++ branches/OpenMPT-1.30/contrib/fuzzing/fuzz-secondary1.sh Sun Jun 2 20:28:47 2024 (r20920) @@ -3,4 +3,4 @@ . ./fuzz-settings.sh #export AFL_PRELOAD=$AFL_DIR/libdislocator.so -LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p coe -f $FUZZING_TEMPDIR/infile02 -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -S fuzzer02 $FUZZING_TEMPDIR/bin/fuzz $FUZZING_TEMPDIR/infile02 +LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p coe -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -S fuzzer02 $FUZZING_TEMPDIR/bin/fuzz Modified: branches/OpenMPT-1.30/contrib/fuzzing/fuzz-secondary2.sh ============================================================================== --- branches/OpenMPT-1.30/contrib/fuzzing/fuzz-secondary2.sh Sun Jun 2 20:27:32 2024 (r20919) +++ branches/OpenMPT-1.30/contrib/fuzzing/fuzz-secondary2.sh Sun Jun 2 20:28:47 2024 (r20920) @@ -3,4 +3,4 @@ . ./fuzz-settings.sh #export AFL_PRELOAD=$AFL_DIR/libdislocator.so -LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p explore -f $FUZZING_TEMPDIR/infile03 -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -S fuzzer03 $FUZZING_TEMPDIR/bin/fuzz $FUZZING_TEMPDIR/infile03 +LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p explore -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -S fuzzer03 $FUZZING_TEMPDIR/bin/fuzz |
|
From: <sv...@op...> - 2024-06-02 18:27:38
|
Author: sagamusix Date: Sun Jun 2 20:27:32 2024 New Revision: 20919 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20919 Log: Merged revision(s) 20918 from trunk/OpenMPT: [Fix] Fuzzing: Remove input file from command line; as we use the shared memory fuzzing model now, it is useless. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/contrib/fuzzing/fuzz-main.sh branches/OpenMPT-1.31/contrib/fuzzing/fuzz-secondary1.sh branches/OpenMPT-1.31/contrib/fuzzing/fuzz-secondary2.sh Modified: branches/OpenMPT-1.31/contrib/fuzzing/fuzz-main.sh ============================================================================== --- branches/OpenMPT-1.31/contrib/fuzzing/fuzz-main.sh Sun Jun 2 20:24:44 2024 (r20918) +++ branches/OpenMPT-1.31/contrib/fuzzing/fuzz-main.sh Sun Jun 2 20:27:32 2024 (r20919) @@ -10,4 +10,4 @@ cp -d ../../bin/* $FUZZING_TEMPDIR/bin/ #export AFL_PRELOAD=$AFL_DIR/libdislocator.so -LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p exploit -f $FUZZING_TEMPDIR/infile01 -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -D -M fuzzer01 $FUZZING_TEMPDIR/bin/fuzz $FUZZING_TEMPDIR/infile01 +LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p exploit -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -D -M fuzzer01 $FUZZING_TEMPDIR/bin/fuzz Modified: branches/OpenMPT-1.31/contrib/fuzzing/fuzz-secondary1.sh ============================================================================== --- branches/OpenMPT-1.31/contrib/fuzzing/fuzz-secondary1.sh Sun Jun 2 20:24:44 2024 (r20918) +++ branches/OpenMPT-1.31/contrib/fuzzing/fuzz-secondary1.sh Sun Jun 2 20:27:32 2024 (r20919) @@ -3,4 +3,4 @@ . ./fuzz-settings.sh #export AFL_PRELOAD=$AFL_DIR/libdislocator.so -LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p coe -f $FUZZING_TEMPDIR/infile02 -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -S fuzzer02 $FUZZING_TEMPDIR/bin/fuzz $FUZZING_TEMPDIR/infile02 +LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p coe -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -S fuzzer02 $FUZZING_TEMPDIR/bin/fuzz Modified: branches/OpenMPT-1.31/contrib/fuzzing/fuzz-secondary2.sh ============================================================================== --- branches/OpenMPT-1.31/contrib/fuzzing/fuzz-secondary2.sh Sun Jun 2 20:24:44 2024 (r20918) +++ branches/OpenMPT-1.31/contrib/fuzzing/fuzz-secondary2.sh Sun Jun 2 20:27:32 2024 (r20919) @@ -3,4 +3,4 @@ . ./fuzz-settings.sh #export AFL_PRELOAD=$AFL_DIR/libdislocator.so -LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p explore -f $FUZZING_TEMPDIR/infile03 -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -S fuzzer03 $FUZZING_TEMPDIR/bin/fuzz $FUZZING_TEMPDIR/infile03 +LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p explore -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -S fuzzer03 $FUZZING_TEMPDIR/bin/fuzz |
|
From: <sv...@op...> - 2024-06-02 18:24:56
|
Author: sagamusix Date: Sun Jun 2 20:24:44 2024 New Revision: 20918 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20918 Log: [Fix] Fuzzing: Remove input file from command line; as we use the shared memory fuzzing model now, it is useless. Modified: trunk/OpenMPT/contrib/fuzzing/fuzz-main.sh trunk/OpenMPT/contrib/fuzzing/fuzz-secondary1.sh trunk/OpenMPT/contrib/fuzzing/fuzz-secondary2.sh Modified: trunk/OpenMPT/contrib/fuzzing/fuzz-main.sh ============================================================================== --- trunk/OpenMPT/contrib/fuzzing/fuzz-main.sh Sun Jun 2 20:23:21 2024 (r20917) +++ trunk/OpenMPT/contrib/fuzzing/fuzz-main.sh Sun Jun 2 20:24:44 2024 (r20918) @@ -10,4 +10,4 @@ cp -d ../../bin/* $FUZZING_TEMPDIR/bin/ #export AFL_PRELOAD=$AFL_DIR/libdislocator.so -LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p explore -f $FUZZING_TEMPDIR/infile01 -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -D -M fuzzer01 $FUZZING_TEMPDIR/bin/fuzz $FUZZING_TEMPDIR/infile01 +LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p explore -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -D -M fuzzer01 $FUZZING_TEMPDIR/bin/fuzz Modified: trunk/OpenMPT/contrib/fuzzing/fuzz-secondary1.sh ============================================================================== --- trunk/OpenMPT/contrib/fuzzing/fuzz-secondary1.sh Sun Jun 2 20:23:21 2024 (r20917) +++ trunk/OpenMPT/contrib/fuzzing/fuzz-secondary1.sh Sun Jun 2 20:24:44 2024 (r20918) @@ -3,4 +3,4 @@ . ./fuzz-settings.sh #export AFL_PRELOAD=$AFL_DIR/libdislocator.so -LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p coe -f $FUZZING_TEMPDIR/infile02 -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -S fuzzer02 $FUZZING_TEMPDIR/bin/fuzz $FUZZING_TEMPDIR/infile02 +LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p coe -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -S fuzzer02 $FUZZING_TEMPDIR/bin/fuzz Modified: trunk/OpenMPT/contrib/fuzzing/fuzz-secondary2.sh ============================================================================== --- trunk/OpenMPT/contrib/fuzzing/fuzz-secondary2.sh Sun Jun 2 20:23:21 2024 (r20917) +++ trunk/OpenMPT/contrib/fuzzing/fuzz-secondary2.sh Sun Jun 2 20:24:44 2024 (r20918) @@ -3,4 +3,4 @@ . ./fuzz-settings.sh #export AFL_PRELOAD=$AFL_DIR/libdislocator.so -LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p exploit -f $FUZZING_TEMPDIR/infile03 -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -S fuzzer03 $FUZZING_TEMPDIR/bin/fuzz $FUZZING_TEMPDIR/infile03 +LD_LIBRARY_PATH=$FUZZING_TEMPDIR/bin $AFL_DIR/afl-fuzz -p exploit -x all_formats.dict -t $FUZZING_TIMEOUT $FUZZING_INPUT -o $FUZZING_FINDINGS_DIR -S fuzzer03 $FUZZING_TEMPDIR/bin/fuzz |
|
From: <sv...@op...> - 2024-06-02 18:23:33
|
Author: sagamusix Date: Sun Jun 2 20:23:21 2024 New Revision: 20917 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20917 Log: [Fix] Fix fuzzing dictionary entry. Modified: trunk/OpenMPT/contrib/fuzzing/all_formats.dict Modified: trunk/OpenMPT/contrib/fuzzing/all_formats.dict ============================================================================== --- trunk/OpenMPT/contrib/fuzzing/all_formats.dict Sun Jun 2 20:21:51 2024 (r20916) +++ trunk/OpenMPT/contrib/fuzzing/all_formats.dict Sun Jun 2 20:23:21 2024 (r20917) @@ -53,7 +53,7 @@ fmt="FMTracker\x01\x01" -ftm="FTMN\x03\x03\x00\08\x20\x20\x00\xFF\x3F\x03\x06\x10" +ftm="FTMN\x03\x03\x00\x08\x20\x20\x00\xFF\x3F\x03\x06\x10" gdm="GDM\xFE" gdm="\x0D\x0A\x1AGMFS\x01\x00" |
|
From: <sv...@op...> - 2024-06-02 18:21:58
|
Author: sagamusix Date: Sun Jun 2 20:21:51 2024 New Revision: 20916 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20916 Log: Merged revision(s) 20911 from trunk/OpenMPT: [Fix] SampleIO: Not all pinned view implementations were consistent in whether they return a nullptr or not when trying to read data at the end of the file; instead check if the memory size is 0, which must always be the case in such a situation. ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/soundlib/SampleIO.cpp Modified: branches/OpenMPT-1.28/soundlib/SampleIO.cpp ============================================================================== --- branches/OpenMPT-1.28/soundlib/SampleIO.cpp Sun Jun 2 20:21:34 2024 (r20915) +++ branches/OpenMPT-1.28/soundlib/SampleIO.cpp Sun Jun 2 20:21:51 2024 (r20916) @@ -56,7 +56,7 @@ restrictedSampleDataView = file.GetPinnedRawDataView(CalculateEncodedSize(sample.nLength)); sourceBuf = restrictedSampleDataView.data(); fileSize = restrictedSampleDataView.size(); - if(sourceBuf == nullptr) + if(fileSize < 1) return 0; } else { |
|
From: <sv...@op...> - 2024-06-02 18:21:41
|
Author: sagamusix Date: Sun Jun 2 20:21:34 2024 New Revision: 20915 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20915 Log: Merged revision(s) 20911 from trunk/OpenMPT: [Fix] SampleIO: Not all pinned view implementations were consistent in whether they return a nullptr or not when trying to read data at the end of the file; instead check if the memory size is 0, which must always be the case in such a situation. ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/soundlib/SampleIO.cpp Modified: branches/OpenMPT-1.29/soundlib/SampleIO.cpp ============================================================================== --- branches/OpenMPT-1.29/soundlib/SampleIO.cpp Sun Jun 2 20:21:20 2024 (r20914) +++ branches/OpenMPT-1.29/soundlib/SampleIO.cpp Sun Jun 2 20:21:34 2024 (r20915) @@ -56,7 +56,7 @@ restrictedSampleDataView = file.GetPinnedRawDataView(CalculateEncodedSize(sample.nLength)); sourceBuf = restrictedSampleDataView.data(); fileSize = restrictedSampleDataView.size(); - if(sourceBuf == nullptr) + if(fileSize < 1) return 0; } else { |
|
From: <sv...@op...> - 2024-06-02 18:21:26
|
Author: sagamusix Date: Sun Jun 2 20:21:20 2024 New Revision: 20914 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20914 Log: Merged revision(s) 20911 from trunk/OpenMPT: [Fix] SampleIO: Not all pinned view implementations were consistent in whether they return a nullptr or not when trying to read data at the end of the file; instead check if the memory size is 0, which must always be the case in such a situation. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/soundlib/SampleIO.cpp Modified: branches/OpenMPT-1.30/soundlib/SampleIO.cpp ============================================================================== --- branches/OpenMPT-1.30/soundlib/SampleIO.cpp Sun Jun 2 20:21:05 2024 (r20913) +++ branches/OpenMPT-1.30/soundlib/SampleIO.cpp Sun Jun 2 20:21:20 2024 (r20914) @@ -56,7 +56,7 @@ restrictedSampleDataView = file.GetPinnedView(CalculateEncodedSize(sample.nLength)); sourceBuf = restrictedSampleDataView.data(); fileSize = restrictedSampleDataView.size(); - if(sourceBuf == nullptr) + if(fileSize < 1) return 0; } else { |
|
From: <sv...@op...> - 2024-06-02 18:21:11
|
Author: sagamusix Date: Sun Jun 2 20:21:05 2024 New Revision: 20913 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20913 Log: Merged revision(s) 20911 from trunk/OpenMPT: [Fix] SampleIO: Not all pinned view implementations were consistent in whether they return a nullptr or not when trying to read data at the end of the file; instead check if the memory size is 0, which must always be the case in such a situation. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/SampleIO.cpp Modified: branches/OpenMPT-1.31/soundlib/SampleIO.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/SampleIO.cpp Sun Jun 2 20:20:42 2024 (r20912) +++ branches/OpenMPT-1.31/soundlib/SampleIO.cpp Sun Jun 2 20:21:05 2024 (r20913) @@ -56,7 +56,7 @@ restrictedSampleDataView = file.GetPinnedView(CalculateEncodedSize(sample.nLength)); sourceBuf = restrictedSampleDataView.data(); fileSize = restrictedSampleDataView.size(); - if(sourceBuf == nullptr) + if(fileSize < 1) return 0; } else { |
|
From: <sv...@op...> - 2024-06-02 18:20:49
|
Author: sagamusix Date: Sun Jun 2 20:20:42 2024 New Revision: 20912 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20912 Log: Merged revision(s) 20910 from trunk/OpenMPT: [Fix] DSm: Only the first 48 samples were ever read. [Fix] DSm: It was possible that sample data was read into slots past the last sample slot; for these samples, sample loop lengths were not sanitized, possibly causing an out-of-bounds memory read during playback. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/Load_dsm.cpp Modified: branches/OpenMPT-1.31/soundlib/Load_dsm.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Load_dsm.cpp Sun Jun 2 20:19:50 2024 (r20911) +++ branches/OpenMPT-1.31/soundlib/Load_dsm.cpp Sun Jun 2 20:20:42 2024 (r20912) @@ -511,7 +511,7 @@ if(loadFlags & loadSampleData) { - for(SAMPLEINDEX smp = 1; smp <= m_nSamplePreAmp; smp++) + for(SAMPLEINDEX smp = 1; smp <= m_nSamples; smp++) { SampleIO(Samples[smp].uFlags[CHN_16BIT] ? SampleIO::_16bit : SampleIO::_8bit, SampleIO::mono, |
|
From: <sv...@op...> - 2024-06-02 18:19:57
|
Author: sagamusix Date: Sun Jun 2 20:19:50 2024 New Revision: 20911 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20911 Log: [Fix] SampleIO: Not all pinned view implementations were consistent in whether they return a nullptr or not when trying to read data at the end of the file; instead check if the memory size is 0, which must always be the case in such a situation. Modified: trunk/OpenMPT/soundlib/SampleIO.cpp Modified: trunk/OpenMPT/soundlib/SampleIO.cpp ============================================================================== --- trunk/OpenMPT/soundlib/SampleIO.cpp Sun Jun 2 20:19:25 2024 (r20910) +++ trunk/OpenMPT/soundlib/SampleIO.cpp Sun Jun 2 20:19:50 2024 (r20911) @@ -56,7 +56,7 @@ restrictedSampleDataView = file.GetPinnedView(CalculateEncodedSize(sample.nLength)); sourceBuf = restrictedSampleDataView.data(); fileSize = restrictedSampleDataView.size(); - if(sourceBuf == nullptr) + if(fileSize < 1) return 0; } else { |
|
From: <sv...@op...> - 2024-06-02 18:19:32
|
Author: sagamusix Date: Sun Jun 2 20:19:25 2024 New Revision: 20910 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20910 Log: [Fix] DSm: Only the first 48 samples were ever read. [Fix] DSm: It was possible that sample data was read into slots past the last sample slot; for these samples, sample loop lengths were not sanitized, possibly causing an out-of-bounds memory read during playback. Modified: trunk/OpenMPT/soundlib/Load_dsm.cpp Modified: trunk/OpenMPT/soundlib/Load_dsm.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_dsm.cpp Sun Jun 2 17:10:31 2024 (r20909) +++ trunk/OpenMPT/soundlib/Load_dsm.cpp Sun Jun 2 20:19:25 2024 (r20910) @@ -510,7 +510,7 @@ if(loadFlags & loadSampleData) { - for(SAMPLEINDEX smp = 1; smp <= m_nSamplePreAmp; smp++) + for(SAMPLEINDEX smp = 1; smp <= m_nSamples; smp++) { SampleIO(Samples[smp].uFlags[CHN_16BIT] ? SampleIO::_16bit : SampleIO::_8bit, SampleIO::mono, |
|
From: <sv...@op...> - 2024-06-02 15:10:43
|
Author: sagamusix Date: Sun Jun 2 17:10:31 2024 New Revision: 20909 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20909 Log: [Fix] FTM: Allow order list to grow larger than 128 items (MOD limit) when evaluating pattern loops. Modified: trunk/OpenMPT/soundlib/Load_ftm.cpp trunk/OpenMPT/soundlib/ModSequence.cpp trunk/OpenMPT/soundlib/ModSequence.h Modified: trunk/OpenMPT/soundlib/Load_ftm.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_ftm.cpp Sun Jun 2 16:50:19 2024 (r20908) +++ trunk/OpenMPT/soundlib/Load_ftm.cpp Sun Jun 2 17:10:31 2024 (r20909) @@ -448,7 +448,7 @@ const std::vector<PATTERNINDEX> ordersToCopy(Order().begin() + start, Order().begin() + ord + 1); for(uint8 rep = 1; rep < loopStart[activeLoops].second && canAddMore; rep++) { - if(ORDERINDEX inserted = Order().insert(ord + 1, mpt::as_span(ordersToCopy)); inserted == ordersToCopy.size()) + if(ORDERINDEX inserted = Order().insert(ord + 1, mpt::as_span(ordersToCopy), false); inserted == ordersToCopy.size()) ordersInserted += inserted; else canAddMore = false; Modified: trunk/OpenMPT/soundlib/ModSequence.cpp ============================================================================== --- trunk/OpenMPT/soundlib/ModSequence.cpp Sun Jun 2 16:50:19 2024 (r20908) +++ trunk/OpenMPT/soundlib/ModSequence.cpp Sun Jun 2 17:10:31 2024 (r20909) @@ -112,16 +112,16 @@ } -ORDERINDEX ModSequence::GetRemainingCapacity(ORDERINDEX startingFrom) const noexcept +ORDERINDEX ModSequence::GetRemainingCapacity(ORDERINDEX startingFrom, bool enforceFormatLimits) const noexcept { - const auto &specs = m_sndFile.GetModSpecifications(); + const ORDERINDEX ordersMax = enforceFormatLimits ? m_sndFile.GetModSpecifications().ordersMax : MAX_ORDERS; ORDERINDEX length = GetLengthTailTrimmed(); if(startingFrom != ORDERINDEX_INVALID && startingFrom > length) length = startingFrom; - if(length >= specs.ordersMax) + if(length >= ordersMax) return 0; else - return specs.ordersMax - length; + return ordersMax - length; } @@ -219,11 +219,11 @@ } -ORDERINDEX ModSequence::insert(ORDERINDEX pos, ORDERINDEX count, PATTERNINDEX fill) +ORDERINDEX ModSequence::insert(ORDERINDEX pos, ORDERINDEX count, PATTERNINDEX fill, bool enforceFormatLimits) { - const auto ordersMax = m_sndFile.GetModSpecifications().ordersMax; + const ORDERINDEX ordersMax = enforceFormatLimits ? m_sndFile.GetModSpecifications().ordersMax : MAX_ORDERS; // Limit number of orders to be inserted so that we don't exceed the format limit or drop items at the end of the order list. - LimitMax(count, GetRemainingCapacity(pos)); + LimitMax(count, GetRemainingCapacity(pos, enforceFormatLimits)); if(pos >= ordersMax || GetLengthTailTrimmed() >= ordersMax || count == 0) return 0; reserve(std::max(pos, GetLength()) + count); @@ -238,10 +238,10 @@ } -ORDERINDEX ModSequence::insert(ORDERINDEX pos, const mpt::span<const PATTERNINDEX> orders) +ORDERINDEX ModSequence::insert(ORDERINDEX pos, const mpt::span<const PATTERNINDEX> orders, bool enforceFormatLimits) { MPT_ASSERT(reinterpret_cast<uintptr_t>(orders.data()) < reinterpret_cast<uintptr_t>(data()) || reinterpret_cast<uintptr_t>(orders.data()) > reinterpret_cast<uintptr_t>(data() + size())); - ORDERINDEX count = insert(pos, mpt::saturate_cast<ORDERINDEX>(orders.size())); + ORDERINDEX count = insert(pos, mpt::saturate_cast<ORDERINDEX>(orders.size()), 0, enforceFormatLimits); std::copy(orders.begin(), orders.begin() + count, begin() + pos); return count; } Modified: trunk/OpenMPT/soundlib/ModSequence.h ============================================================================== --- trunk/OpenMPT/soundlib/ModSequence.h Sun Jun 2 16:50:19 2024 (r20908) +++ trunk/OpenMPT/soundlib/ModSequence.h Sun Jun 2 17:10:31 2024 (r20909) @@ -51,7 +51,7 @@ // Returns length of sequence stopping counting on first '---' (or at the end of sequence). ORDERINDEX GetLengthFirstEmpty() const noexcept; // Returns amount of patterns that can be added at the end of the order list before reaching the current format's limits. - ORDERINDEX GetRemainingCapacity(ORDERINDEX startingFrom = ORDERINDEX_INVALID) const noexcept; + ORDERINDEX GetRemainingCapacity(ORDERINDEX startingFrom = ORDERINDEX_INVALID, bool enforceFormatLimits = true) const noexcept; // Replaces order list with 'newSize' copies of 'pat'. void assign(ORDERINDEX newSize, PATTERNINDEX pat); @@ -59,9 +59,9 @@ // Inserts 'count' orders starting from 'pos' using 'fill' as the pattern index for all inserted orders. // Sequence will automatically grow if needed and if it can't grow enough, some tail orders will be discarded. // Return: Number of orders inserted (up to 'count' many). - ORDERINDEX insert(ORDERINDEX pos, ORDERINDEX count) { return insert(pos, count, GetInvalidPatIndex()); } - ORDERINDEX insert(ORDERINDEX pos, ORDERINDEX count, PATTERNINDEX fill); - ORDERINDEX insert(ORDERINDEX pos, const mpt::span<const PATTERNINDEX> orders); + ORDERINDEX insert(ORDERINDEX pos, ORDERINDEX count) { return insert(pos, count, GetInvalidPatIndex(), true); } + ORDERINDEX insert(ORDERINDEX pos, ORDERINDEX count, PATTERNINDEX fill, bool enforceFormatLimits = true); + ORDERINDEX insert(ORDERINDEX pos, const mpt::span<const PATTERNINDEX> orders, bool enforceFormatLimits = true); void push_back() { push_back(GetInvalidPatIndex()); } void push_back(PATTERNINDEX pat) { if(GetLength() < MAX_ORDERS) std::vector<PATTERNINDEX>::push_back(pat); } |
|
From: <sv...@op...> - 2024-06-02 14:50:25
|
Author: sagamusix Date: Sun Jun 2 16:50:19 2024 New Revision: 20908 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20908 Log: Merged revision(s) 20901 from trunk/OpenMPT: [Fix] PSM: File header probing was stricter than actual file loader. ........ Merged revision(s) 20903-20904 from trunk/OpenMPT: [Fix] Fuzzer: Don't return from the AFL loop if we weren't able to load a file. ........ [Fix] PSM: Header probing was still too strict. ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/contrib/fuzzing/fuzz.cpp branches/OpenMPT-1.28/soundlib/Load_psm.cpp Modified: branches/OpenMPT-1.28/contrib/fuzzing/fuzz.cpp ============================================================================== --- branches/OpenMPT-1.28/contrib/fuzzing/fuzz.cpp Sun Jun 2 16:49:22 2024 (r20907) +++ branches/OpenMPT-1.28/contrib/fuzzing/fuzz.cpp Sun Jun 2 16:50:19 2024 (r20908) @@ -63,7 +63,7 @@ OpenMPT::mpt::reinit_global_random(); openmpt_module * mod = openmpt_module_create_from_memory2( fileBuffer, fileSize, nullptr, nullptr, ErrFunc, nullptr, nullptr, nullptr, nullptr); if ( mod == NULL ) - return 1; + break; // verify API contract: If the file can be loaded, header probing must be successful too. if ( openmpt_probe_file_header( OPENMPT_PROBE_FILE_HEADER_FLAGS_DEFAULT, fileBuffer, fileSize, fileSize, nullptr, nullptr, ErrFunc, nullptr, nullptr, nullptr ) == OPENMPT_PROBE_FILE_HEADER_RESULT_FAILURE ) Modified: branches/OpenMPT-1.28/soundlib/Load_psm.cpp ============================================================================== --- branches/OpenMPT-1.28/soundlib/Load_psm.cpp Sun Jun 2 16:49:22 2024 (r20907) +++ branches/OpenMPT-1.28/soundlib/Load_psm.cpp Sun Jun 2 16:50:19 2024 (r20908) @@ -236,19 +236,6 @@ { return ProbeFailure; } - PSMChunk chunkHeader; - if(!file.ReadStruct(chunkHeader)) - { - return ProbeWantMoreData; - } - if(chunkHeader.length == 0) - { - return ProbeFailure; - } - if((chunkHeader.id & 0x7f7f7f7fu) != chunkHeader.id) // ASCII? - { - return ProbeFailure; - } MPT_UNREFERENCED_PARAMETER(pfilesize); return ProbeSuccess; } |
|
From: <sv...@op...> - 2024-06-02 14:49:34
|
Author: sagamusix Date: Sun Jun 2 16:49:22 2024 New Revision: 20907 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20907 Log: Merged revision(s) 20901, 20903-20904 from trunk/OpenMPT: [Fix] PSM: File header probing was stricter than actual file loader. ........ [Fix] Fuzzer: Don't return from the AFL loop if we weren't able to load a file. ........ [Fix] PSM: Header probing was still too strict. ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/contrib/fuzzing/fuzz.cpp branches/OpenMPT-1.29/soundlib/Load_psm.cpp Modified: branches/OpenMPT-1.29/contrib/fuzzing/fuzz.cpp ============================================================================== --- branches/OpenMPT-1.29/contrib/fuzzing/fuzz.cpp Sun Jun 2 16:49:04 2024 (r20906) +++ branches/OpenMPT-1.29/contrib/fuzzing/fuzz.cpp Sun Jun 2 16:49:22 2024 (r20907) @@ -63,7 +63,7 @@ OpenMPT::mpt::reinit_global_random(); openmpt_module * mod = openmpt_module_create_from_memory2( fileBuffer, fileSize, nullptr, nullptr, ErrFunc, nullptr, nullptr, nullptr, nullptr); if ( mod == NULL ) - return 1; + break; // verify API contract: If the file can be loaded, header probing must be successful too. if ( openmpt_probe_file_header( OPENMPT_PROBE_FILE_HEADER_FLAGS_DEFAULT, fileBuffer, fileSize, fileSize, nullptr, nullptr, ErrFunc, nullptr, nullptr, nullptr ) == OPENMPT_PROBE_FILE_HEADER_RESULT_FAILURE ) Modified: branches/OpenMPT-1.29/soundlib/Load_psm.cpp ============================================================================== --- branches/OpenMPT-1.29/soundlib/Load_psm.cpp Sun Jun 2 16:49:04 2024 (r20906) +++ branches/OpenMPT-1.29/soundlib/Load_psm.cpp Sun Jun 2 16:49:22 2024 (r20907) @@ -234,19 +234,6 @@ { return ProbeFailure; } - PSMChunk chunkHeader; - if(!file.ReadStruct(chunkHeader)) - { - return ProbeWantMoreData; - } - if(chunkHeader.length == 0) - { - return ProbeFailure; - } - if((chunkHeader.id & 0x7F7F7F7Fu) != chunkHeader.id) // ASCII? - { - return ProbeFailure; - } MPT_UNREFERENCED_PARAMETER(pfilesize); return ProbeSuccess; } |
3 messages has been excluded from this view by a project administrator.
