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

A music tracker software for Windows.

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

modplug-svn-commit — OpenMPT subversion commit notifications

You can subscribe to this list here.

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

Flat | Threaded

<< < 1 2 3 4 5 6 .. 948 > >> (Page 4 of 948)

[OMPT-svn-commit] OpenMPT r23574 - trunk/OpenMPT/common

From: <sv...@op...> - 2025-06-20 15:52:47

Author: manx
Date: Fri Jun 20 17:52:35 2025
New Revision: 23574
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23574

Log:
[Ref] mptTime: Improve precision of fallback conversions when std::chrono is not behaving.

Modified:
   trunk/OpenMPT/common/mptTime.cpp
   trunk/OpenMPT/common/mptTime.h

Modified: trunk/OpenMPT/common/mptTime.cpp
==============================================================================
--- trunk/OpenMPT/common/mptTime.cpp	Fri Jun 20 16:58:34 2025	(r23573)
+++ trunk/OpenMPT/common/mptTime.cpp	Fri Jun 20 17:52:35 2025	(r23574)
@@ -138,7 +138,7 @@
 		ULARGE_INTEGER time_value{};
 		time_value.LowPart = ft.dwLowDateTime;
 		time_value.HighPart = ft.dwHighDateTime;
-		return UnixFromSeconds(static_cast<int64>((time_value.QuadPart - 116444736000000000LL) / 10000000LL));
+		return UnixFromNanoseconds(static_cast<int64>((time_value.QuadPart - 116444736000000000LL) * 100LL));
 	} catch(const tz_error &)
 	{
 		// nothing
@@ -168,7 +168,7 @@
 		ULARGE_INTEGER time_value{};
 		time_value.LowPart = ft.dwLowDateTime;
 		time_value.HighPart = ft.dwHighDateTime;
-		return UnixFromSeconds(static_cast<int64>((time_value.QuadPart - 116444736000000000LL) / 10000000LL));
+		return UnixFromNanoseconds(static_cast<int64>((time_value.QuadPart - 116444736000000000LL) * 100LL));
 	} catch(const tz_error &)
 	{
 		// nothing
@@ -196,7 +196,7 @@
 			throw tz_error{};
 		}
 		ULARGE_INTEGER time_value{};
-		time_value.QuadPart = static_cast<int64>(UnixAsSeconds(tp)) * 10000000LL + 116444736000000000LL;
+		time_value.QuadPart = (static_cast<int64>(UnixAsNanoseconds(tp)) / 100LL) + 116444736000000000LL;
 		FILETIME ft{};
 		ft.dwLowDateTime = time_value.LowPart;
 		ft.dwHighDateTime = time_value.HighPart;
@@ -233,7 +233,7 @@
 	try
 	{
 		ULARGE_INTEGER time_value{};
-		time_value.QuadPart = static_cast<int64>(UnixAsSeconds(tp)) * 10000000LL + 116444736000000000LL;
+		time_value.QuadPart = (static_cast<int64>(UnixAsNanoseconds(tp)) / 100LL) + 116444736000000000LL;
 		FILETIME ft{};
 		ft.dwLowDateTime = time_value.LowPart;
 		ft.dwHighDateTime = time_value.HighPart;

Modified: trunk/OpenMPT/common/mptTime.h
==============================================================================
--- trunk/OpenMPT/common/mptTime.h	Fri Jun 20 16:58:34 2025	(r23573)
+++ trunk/OpenMPT/common/mptTime.h	Fri Jun 20 17:52:35 2025	(r23574)
@@ -253,7 +253,7 @@
 			std::chrono::duration_cast<std::chrono::system_clock::duration>(std::chrono::nanoseconds{ utc.nanoseconds })};
 	} catch(const std::exception &)
 	{
-		return mpt::Date::UnixFromSeconds(mpt::Date::nochrono::UnixAsSeconds(mpt::Date::nochrono::UnixFromUTC(utc)));
+		return mpt::Date::UnixFromNanoseconds(mpt::Date::nochrono::UnixAsNanoseconds(mpt::Date::nochrono::UnixFromUTC(utc)));
 	}
 }
 
@@ -275,7 +275,7 @@
 		return result;
 	} catch(const std::exception &)
 	{
-		return mpt::Date::nochrono::UnixAsUTC(mpt::Date::nochrono::UnixFromSeconds(mpt::Date::UnixAsSeconds(tp)));
+		return mpt::Date::nochrono::UnixAsUTC(mpt::Date::nochrono::UnixFromNanoseconds(mpt::Date::UnixAsNanoseconds(tp)));
 	}
 }
 
@@ -304,7 +304,7 @@
 	} catch(const std::exception &)
 #endif
 	{
-		return mpt::Date::UnixFromSeconds(mpt::Date::nochrono::UnixAsSeconds(mpt::Date::nochrono::UnixFromLocal(local)));
+		return mpt::Date::UnixFromNanoseconds(mpt::Date::nochrono::UnixAsNanoseconds(mpt::Date::nochrono::UnixFromLocal(local)));
 	}
 }
 
@@ -329,7 +329,7 @@
 	} catch(const std::exception &)
 #endif
 	{
-		return mpt::Date::nochrono::UnixAsLocal(mpt::Date::nochrono::UnixFromSeconds(mpt::Date::UnixAsSeconds(tp)));
+		return mpt::Date::nochrono::UnixAsLocal(mpt::Date::nochrono::UnixFromNanoseconds(mpt::Date::UnixAsNanoseconds(tp)));
 	}
 }

[OMPT-svn-commit] OpenMPT r23573 - trunk/OpenMPT/common

From: <sv...@op...> - 2025-06-20 14:58:45

Author: manx
Date: Fri Jun 20 16:58:34 2025
New Revision: 23573
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23573

Log:
[Fix] mptTime: Fix C++17 build. Broken since r23571.

Modified:
   trunk/OpenMPT/common/mptTime.h

Modified: trunk/OpenMPT/common/mptTime.h
==============================================================================
--- trunk/OpenMPT/common/mptTime.h	Fri Jun 20 16:57:52 2025	(r23572)
+++ trunk/OpenMPT/common/mptTime.h	Fri Jun 20 16:58:34 2025	(r23573)
@@ -163,7 +163,7 @@
 
 inline Unix UnixNow()
 {
-	return Unix{static_cast<int64>(std::time(nullptr))};
+	return Unix{static_cast<int64>(std::time(nullptr)), static_cast<int32>(0)};
 }
 
 #endif

[OMPT-svn-commit] OpenMPT r23572 - trunk/OpenMPT/common

From: <sv...@op...> - 2025-06-20 14:58:03

Author: manx
Date: Fri Jun 20 16:57:52 2025
New Revision: 23572
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23572

Log:
[Ref] mptTime: Remove unused include.

Modified:
   trunk/OpenMPT/common/mptTime.cpp

Modified: trunk/OpenMPT/common/mptTime.cpp
==============================================================================
--- trunk/OpenMPT/common/mptTime.cpp	Fri Jun 20 15:42:50 2025	(r23571)
+++ trunk/OpenMPT/common/mptTime.cpp	Fri Jun 20 16:57:52 2025	(r23572)
@@ -15,8 +15,6 @@
 #include "mpt/osinfo/windows_wine_version.hpp"
 #endif // MODPLUG_TRACKER && MPT_OS_WINDOWS
 
-#include "mptStringBuffer.h"
-
 #if MPT_CXX_AT_LEAST(20) && !defined(MPT_LIBCXX_QUIRK_NO_CHRONO) && !defined(MPT_LIBCXX_QUIRK_NO_CHRONO_DATE)
 #include <chrono>
 #endif

[OMPT-svn-commit] OpenMPT r23571 - trunk/OpenMPT/common

From: <sv...@op...> - 2025-06-20 13:43:03

Author: manx
Date: Fri Jun 20 15:42:50 2025
New Revision: 23571
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23571

Log:
[Ref] mptTime: Improve mpt::Date::Unix to 1ns internal precision (Windows only provides 100ns, but we normalize across all systems).
[Ref] mptTime: Improve mpt::Date::Gregorian to 1ns internal precision.
[Ref] mptTime: Add mpt::Date::ToISO8601() which prints full nanoseconds precision.
[Ref] Logging: Use mpt::Date::Unix everywhere and avoid Windows-specific mpt::Date::ANSI.
[Ref] mptTime: Remove mpt::Date::ANSI.

Modified:
   trunk/OpenMPT/common/Logging.cpp
   trunk/OpenMPT/common/mptTime.cpp
   trunk/OpenMPT/common/mptTime.h

Modified: trunk/OpenMPT/common/Logging.cpp
==============================================================================
--- trunk/OpenMPT/common/Logging.cpp	Fri Jun 20 15:39:58 2025	(r23570)
+++ trunk/OpenMPT/common/Logging.cpp	Fri Jun 20 15:42:50 2025	(r23571)
@@ -125,9 +125,10 @@
 	#if defined(MODPLUG_TRACKER) && !defined(MPT_BUILD_WINESUPPORT)
 #if MPT_OS_WINDOWS
 		static uint64 s_lastlogtime = 0;
-		uint64 cur = mpt::Date::ANSI::Now();
-		uint64 diff = cur/10000 - s_lastlogtime;
-		s_lastlogtime = cur/10000;
+		mpt::Date::Unix cur = mpt::Date::UnixNow();
+		int64 cur_ms = mpt::Date::UnixAsNanoseconds(cur) / 1'000'000;
+		uint64 diff = cur_ms - s_lastlogtime;
+		s_lastlogtime = cur_ms ;
 #else
 		uint64 cur = 0;
 		uint64 diff = 0;
@@ -142,7 +143,7 @@
 			if(s_logfile)
 			{
 				mpt::IO::WriteText(*s_logfile, mpt::transcode<std::string>(mpt::logfile_encoding, MPT_UFORMAT("{}+{} {}({}): {} [{}]\n")
-					( mpt::Date::ANSI::ToUString(cur)
+					( mpt::Date::ToISO8601(mpt::Date::UnixAsUTC(cur))
 					, mpt::ufmt::right(6, mpt::ufmt::dec(diff))
 					, file
 					, line
@@ -319,7 +320,8 @@
 	LARGE_INTEGER qpcNow;
 	qpcNow.QuadPart = 0;
 	QueryPerformanceCounter(&qpcNow);
-	uint64 ftNow = mpt::Date::ANSI::Now();
+	mpt::Date::Unix time_unix = mpt::Date::UnixNow();
+	uint64 time_unix_ns = mpt::Date::UnixAsNanoseconds(time_unix);
 
 	// sort according to index in case of overflows
 	std::stable_sort(Entries.begin(), Entries.end());
@@ -338,7 +340,7 @@
 		qpcValid = true;
 	}
 
-	f << "Dump: " << mpt::transcode<std::string>(mpt::logfile_encoding, mpt::Date::ANSI::ToUString(ftNow)) << std::endl;
+	f << "Dump: " << mpt::transcode<std::string>(mpt::logfile_encoding, mpt::Date::ToISO8601(mpt::Date::UnixAsUTC(time_unix))) << std::endl;
 	f << "Captured events: " << Entries.size() << std::endl;
 	if(qpcValid && (Entries.size() > 0))
 	{
@@ -355,7 +357,7 @@
 		std::string time;
 		if(qpcValid)
 		{
-			time = mpt::transcode<std::string>(mpt::logfile_encoding, mpt::Date::ANSI::ToUString( ftNow - static_cast<int64>( static_cast<double>(qpcNow.QuadPart - entry.Timestamp) * (10000000.0 / static_cast<double>(qpcFreq.QuadPart) ) ) ) );
+			time = mpt::transcode<std::string>(mpt::logfile_encoding, mpt::Date::ToISO8601( mpt::Date::UnixAsUTC( mpt::Date::UnixFromNanoseconds( time_unix_ns - static_cast<int64>( static_cast<double>(qpcNow.QuadPart - entry.Timestamp) * (1'000'000'000.0 / static_cast<double>(qpcFreq.QuadPart) ) ) ) ) ) );
 		} else
 		{
 			time = MPT_AFORMAT("0x{}")(mpt::afmt::hex0<16>(entry.Timestamp));

Modified: trunk/OpenMPT/common/mptTime.cpp
==============================================================================
--- trunk/OpenMPT/common/mptTime.cpp	Fri Jun 20 15:39:58 2025	(r23570)
+++ trunk/OpenMPT/common/mptTime.cpp	Fri Jun 20 15:42:50 2025	(r23571)
@@ -21,10 +21,6 @@
 #include <chrono>
 #endif
 
-#if defined(MODPLUG_TRACKER) && MPT_OS_WINDOWS
-#include <optional>
-#endif // MODPLUG_TRACKER && MPT_OS_WINDOWS
-
 #if defined(MPT_FALLBACK_TIMEZONE_C)
 #include <ctime>
 #endif // MPT_FALLBACK_TIMEZONE_C
@@ -44,62 +40,6 @@
 
 
 
-#if defined(MODPLUG_TRACKER)
-
-#if MPT_OS_WINDOWS
-
-namespace ANSI
-{
-
-uint64 Now()
-{
-	FILETIME filetime;
-#if MPT_WIN_AT_LEAST(MPT_WIN_8)
-	GetSystemTimePreciseAsFileTime(&filetime);
-#else
-	GetSystemTimeAsFileTime(&filetime);
-#endif
-	return ((uint64)filetime.dwHighDateTime << 32 | filetime.dwLowDateTime);
-}
-
-mpt::ustring ToUString(uint64 time100ns)
-{
-	constexpr std::size_t bufsize = 256;
-
-	mpt::ustring result;
-
-	FILETIME filetime;
-	SYSTEMTIME systime;
-	filetime.dwHighDateTime = (DWORD)(((uint64)time100ns) >> 32);
-	filetime.dwLowDateTime = (DWORD)((uint64)time100ns);
-	FileTimeToSystemTime(&filetime, &systime);
-
-	TCHAR buf[bufsize];
-
-	GetDateFormat(LOCALE_SYSTEM_DEFAULT, 0, &systime, TEXT("yyyy-MM-dd"), buf, bufsize);
-	result.append(mpt::ToUnicode(mpt::String::ReadWinBuf(buf)));
-
-	result.append(U_(" "));
-
-	GetTimeFormat(LOCALE_SYSTEM_DEFAULT, TIME_FORCE24HOURFORMAT, &systime, TEXT("HH:mm:ss"), buf, bufsize);
-	result.append(mpt::ToUnicode(mpt::String::ReadWinBuf(buf)));
-
-	result.append(U_("."));
-
-	result.append(mpt::ufmt::dec0<3>((unsigned)systime.wMilliseconds));
-
-	return result;
-
-}
-
-} // namespace ANSI
-
-#endif // MPT_OS_WINDOWS
-
-#endif // MODPLUG_TRACKER
-
-
-
 namespace nochrono
 {
 
@@ -137,12 +77,12 @@
 {
 	int32 daynum = ToDaynum(timeUtc.year, timeUtc.month, timeUtc.day);
 	int64 seconds = static_cast<int64>(daynum - ToDaynum(1970, 1, 1)) * 24 * 60 * 60 + timeUtc.hours * 60 * 60 + timeUtc.minutes * 60 + timeUtc.seconds;
-	return Unix{seconds};
+	return Unix{seconds, timeUtc.nanoseconds};
 }
 
 UTC UnixAsUTC(Unix tp)
 {
-	int64 tmp = tp.value;
+	int64 tmp = tp.seconds;
 	int64 seconds = tmp % 60; tmp /= 60;
 	int64 minutes = tmp % 60; tmp /= 60;
 	int64 hours   = tmp % 24; tmp /= 24;
@@ -154,7 +94,8 @@
 	result.day = day;
 	result.hours = static_cast<int32>(hours);
 	result.minutes = static_cast<int32>(minutes);
-	result.seconds = seconds;
+	result.seconds = static_cast<int32>(seconds);
+	result.nanoseconds = tp.nanoseconds;
 	return result;
 }
 
@@ -180,7 +121,7 @@
 		sys_local.wHour = static_cast<uint16>(timeLocal.hours);
 		sys_local.wMinute = static_cast<uint16>(timeLocal.minutes);
 		sys_local.wSecond = static_cast<uint16>(timeLocal.seconds);
-		sys_local.wMilliseconds = 0;
+		sys_local.wMilliseconds = static_cast<uint16>(timeLocal.nanoseconds / 1'000'000);
 		DYNAMIC_TIME_ZONE_INFORMATION dtzi{};
 		if(GetDynamicTimeZoneInformation(&dtzi) == TIME_ZONE_ID_INVALID) // WinVista
 		{
@@ -215,7 +156,7 @@
 		sys_local.wHour = static_cast<uint16>(timeLocal.hours);
 		sys_local.wMinute = static_cast<uint16>(timeLocal.minutes);
 		sys_local.wSecond = static_cast<uint16>(timeLocal.seconds);
-		sys_local.wMilliseconds = 0;
+		sys_local.wMilliseconds = static_cast<uint16>(timeLocal.nanoseconds / 1'000'000);
 		SYSTEMTIME sys_utc{};
 		if(TzSpecificLocalTimeToSystemTime(NULL, &sys_local, &sys_utc) == FALSE) // WinXP
 		{
@@ -283,6 +224,7 @@
 		result.hours = sys_local.wHour;
 		result.minutes = sys_local.wMinute;
 		result.seconds = sys_local.wSecond;
+		result.nanoseconds = static_cast<int32>(sys_local.wMilliseconds) * 1'000'000;
 		return result;
 	} catch(const tz_error&)
 	{
@@ -314,6 +256,7 @@
 		result.hours = sys_local.wHour;
 		result.minutes = sys_local.wMinute;
 		result.seconds = sys_local.wSecond;
+		result.nanoseconds = static_cast<int32>(sys_local.wMilliseconds) * 1'000'000;
 		return result;
 	} catch(const tz_error&)
 	{
@@ -335,6 +278,7 @@
 	result.hours = local.tm_hour;
 	result.minutes = local.tm_min;
 	result.seconds = local.tm_sec;
+	result.nanoseconds = 0;
 	return result;
 #endif
 }
@@ -344,7 +288,7 @@
 } // namespace nochrono
 
 template <LogicalTimezone TZ>
-static mpt::ustring ToShortenedISO8601Impl(mpt::Date::Gregorian<TZ> date)
+static mpt::ustring ToISO8601Impl(mpt::Date::Gregorian<TZ> date, bool shorten)
 {
 	mpt::ustring result;
 	mpt::ustring tz;
@@ -358,42 +302,64 @@
 	{
 		tz = U_("");
 	}
-	if(date.year == 0)
+	if(shorten && (date.year == 0))
 	{
 		return result;
 	}
 	result += mpt::ufmt::dec0<4>(date.year);
 	result += U_("-") + mpt::ufmt::dec0<2>(date.month);
 	result += U_("-") + mpt::ufmt::dec0<2>(date.day);
-	if(date.hours == 0 && date.minutes == 0 && date.seconds)
+	if(shorten && (date.hours == 0 && date.minutes == 0 && date.seconds))
 	{
 		return result;
 	}
 	result += U_("T");
 	result += mpt::ufmt::dec0<2>(date.hours) + U_(":") + mpt::ufmt::dec0<2>(date.minutes);
-	if(date.seconds == 0)
+	if(shorten && (date.seconds == 0))
 	{
 		return result + tz;
 	}
 	result += U_(":") + mpt::ufmt::dec0<2>(date.seconds);
+	if(shorten)
+	{
+		return result + tz;
+	}
+	result += U_(".") + mpt::ufmt::dec0<9>(date.nanoseconds);
 	result += tz;
 	return result;
 }
 
 mpt::ustring ToShortenedISO8601(mpt::Date::AnyGregorian date)
 {
-	return ToShortenedISO8601Impl(date);
+	return ToISO8601Impl(date, true);
 }
 
 mpt::ustring ToShortenedISO8601(mpt::Date::UTC date)
 {
-	return ToShortenedISO8601Impl(date);
+	return ToISO8601Impl(date, true);
 }
 
 #ifdef MODPLUG_TRACKER
 mpt::ustring ToShortenedISO8601(Local date)
 {
-	return ToShortenedISO8601Impl(date);
+	return ToISO8601Impl(date, true);
+}
+#endif // MODPLUG_TRACKER
+
+mpt::ustring ToISO8601(mpt::Date::AnyGregorian date)
+{
+	return ToISO8601Impl(date, false);
+}
+
+mpt::ustring ToISO8601(mpt::Date::UTC date)
+{
+	return ToISO8601Impl(date, false);
+}
+
+#ifdef MODPLUG_TRACKER
+mpt::ustring ToISO8601(Local date)
+{
+	return ToISO8601Impl(date, false);
 }
 #endif // MODPLUG_TRACKER
 

Modified: trunk/OpenMPT/common/mptTime.h
==============================================================================
--- trunk/OpenMPT/common/mptTime.h	Fri Jun 20 15:39:58 2025	(r23570)
+++ trunk/OpenMPT/common/mptTime.h	Fri Jun 20 15:42:50 2025	(r23571)
@@ -69,26 +69,6 @@
 
 
 
-#if defined(MODPLUG_TRACKER)
-
-#if MPT_OS_WINDOWS
-
-namespace ANSI
-{
-// uint64 counts 100ns since 1601-01-01T00:00Z
-
-uint64 Now();
-
-mpt::ustring ToUString(uint64 time100ns); // i.e. 2015-01-15 18:32:01.718
-
-} // namespacee ANSI
-
-#endif // MPT_OS_WINDOWS
-
-#endif // MODPLUG_TRACKER
-
-
-
 enum class LogicalTimezone
 {
 	Unspecified,
@@ -101,26 +81,27 @@
 template <LogicalTimezone tz>
 struct Gregorian
 {
-	int          year    = 0;
-	unsigned int month   = 0;
-	unsigned int day     = 0;
-	int32        hours   = 0;
-	int32        minutes = 0;
-	int64        seconds = 0;
+	int          year        = 0;
+	unsigned int month       = 0;
+	unsigned int day         = 0;
+	int32        hours       = 0;
+	int32        minutes     = 0;
+	int32        seconds     = 0;
+	int32        nanoseconds = 0;
 	friend bool operator==(const Gregorian<tz>& lhs, const Gregorian<tz>& rhs)
 	{
-		return std::tie(lhs.year, lhs.month, lhs.day, lhs.hours, lhs.minutes, lhs.seconds)
-			== std::tie(rhs.year, rhs.month, rhs.day, rhs.hours, rhs.minutes, rhs.seconds);
+		return std::tie(lhs.year, lhs.month, lhs.day, lhs.hours, lhs.minutes, lhs.seconds, lhs.nanoseconds)
+			== std::tie(rhs.year, rhs.month, rhs.day, rhs.hours, rhs.minutes, rhs.seconds, rhs.nanoseconds);
 	}
 	friend bool operator!=(const Gregorian<tz>& lhs, const Gregorian<tz>& rhs)
 	{
-		return std::tie(lhs.year, lhs.month, lhs.day, lhs.hours, lhs.minutes, lhs.seconds)
-			!= std::tie(rhs.year, rhs.month, rhs.day, rhs.hours, rhs.minutes, rhs.seconds);
+		return std::tie(lhs.year, lhs.month, lhs.day, lhs.hours, lhs.minutes, lhs.seconds, lhs.nanoseconds)
+			!= std::tie(rhs.year, rhs.month, rhs.day, rhs.hours, rhs.minutes, rhs.seconds, rhs.nanoseconds);
 	}
 	friend bool operator<(const Gregorian<tz> &lhs, const Gregorian<tz> &rhs)
 	{
-		return std::tie(lhs.year, lhs.month, lhs.day, lhs.hours, lhs.minutes, lhs.seconds)
-			< std::tie(rhs.year, rhs.month, rhs.day, rhs.hours, rhs.minutes, rhs.seconds);
+		return std::tie(lhs.year, lhs.month, lhs.day, lhs.hours, lhs.minutes, lhs.seconds, lhs.nanoseconds)
+			< std::tie(rhs.year, rhs.month, rhs.day, rhs.hours, rhs.minutes, rhs.seconds, rhs.nanoseconds);
 	}
 };
 
@@ -142,6 +123,7 @@
 	result.hours = gregorian.hours;
 	result.minutes = gregorian.minutes;
 	result.seconds = gregorian.seconds;
+	result.nanoseconds = gregorian.nanoseconds;
 	return result;
 }
 
@@ -155,6 +137,7 @@
 	result.hours = gregorian.hours;
 	result.minutes = gregorian.minutes;
 	result.seconds = gregorian.seconds;
+	result.nanoseconds = gregorian.nanoseconds;
 	return result;
 }
 
@@ -164,14 +147,15 @@
 // int64 counts 1s since 1970-01-01T00:00Z
 struct Unix
 {
-	int64 value{};
+	int64 seconds{};
+	int32 nanoseconds{};
 	friend bool operator==(const Unix &a, const Unix &b)
 	{
-		return a.value == b.value;
+		return a.seconds == b.seconds && a.nanoseconds == b.nanoseconds;
 	}
 	friend bool operator!=(const Unix &a, const Unix &b)
 	{
-		return a.value != b.value;
+		return a.seconds != b.seconds || a.nanoseconds != b.nanoseconds;
 	}
 };
 
@@ -186,12 +170,22 @@
 
 inline int64 UnixAsSeconds(Unix tp)
 {
-	return tp.value;
+	return tp.seconds;
+}
+
+inline int64 UnixAsNanoseconds(Unix tp)
+{
+	return (tp.seconds * 1'000'000'000) + tp.nanoseconds;
 }
 
 inline Unix UnixFromSeconds(int64 seconds)
 {
-	return Unix{seconds};
+	return Unix{static_cast<int64>(seconds), static_cast<int32>(0)};
+}
+
+inline Unix UnixFromNanoseconds(int64 nanoseconds)
+{
+	return Unix{static_cast<int64>(nanoseconds / 1'000'000'000ll), static_cast<int32>(nanoseconds % 1'000'000'000ll)};
 }
 
 Unix UnixFromUTC(UTC timeUtc);
@@ -222,11 +216,27 @@
 	return std::chrono::duration_cast<std::chrono::seconds>(tp.time_since_epoch()).count();
 }
 
+inline int64 UnixAsNanoseconds(Unix tp)
+{
+	return std::chrono::duration_cast<std::chrono::nanoseconds>(tp.time_since_epoch()).count();
+}
+
 inline Unix UnixFromSeconds(int64 seconds)
 {
 	return std::chrono::system_clock::time_point{std::chrono::seconds{seconds}};
 }
 
+inline Unix UnixFromNanoseconds(int64 nanoseconds)
+{
+	try
+	{
+		return std::chrono::system_clock::time_point{std::chrono::duration_cast<std::chrono::system_clock::duration>(std::chrono::nanoseconds{nanoseconds})};
+	} catch(const std::exception &)
+	{
+		return mpt::Date::UnixFromSeconds(mpt::Date::nochrono::UnixAsSeconds(mpt::Date::nochrono::UnixFromNanoseconds(nanoseconds)));
+	}
+}
+
 inline mpt::Date::Unix UnixFromUTC(UTC utc)
 {
 	try
@@ -239,7 +249,8 @@
 			} +
 			std::chrono::hours{ utc.hours } +
 			std::chrono::minutes{ utc.minutes } +
-			std::chrono::seconds{ utc.seconds }};
+			std::chrono::seconds{ utc.seconds } +
+			std::chrono::duration_cast<std::chrono::system_clock::duration>(std::chrono::nanoseconds{ utc.nanoseconds })};
 	} catch(const std::exception &)
 	{
 		return mpt::Date::UnixFromSeconds(mpt::Date::nochrono::UnixAsSeconds(mpt::Date::nochrono::UnixFromUTC(utc)));
@@ -259,7 +270,8 @@
 		result.day = static_cast<unsigned int>(ymd.day());
 		result.hours = static_cast<int32>(hms.hours().count());
 		result.minutes = static_cast<int32>(hms.minutes().count());
-		result.seconds = static_cast<int64>(hms.seconds().count());
+		result.seconds = static_cast<int32>(hms.seconds().count());
+		result.nanoseconds = static_cast<int32>(std::chrono::duration_cast<std::chrono::nanoseconds>(hms.subseconds()).count());
 		return result;
 	} catch(const std::exception &)
 	{
@@ -274,7 +286,7 @@
 #if !defined(MPT_LIBCXX_QUIRK_CHRONO_DATE_NO_ZONED_TIME)
 	try
 	{
-		std::chrono::time_point<std::chrono::local_t, std::chrono::seconds> local_tp =
+		std::chrono::time_point<std::chrono::local_t, std::chrono::system_clock::duration> local_tp =
 			std::chrono::local_days {
 				std::chrono::year{ local.year } /
 				std::chrono::month{ local.month } /
@@ -282,7 +294,8 @@
 			} +
 			std::chrono::hours{ local.hours } +
 			std::chrono::minutes{ local.minutes } +
-			std::chrono::seconds{ local.seconds };
+			std::chrono::seconds{ local.seconds } +
+			std::chrono::duration_cast<std::chrono::system_clock::duration>(std::chrono::nanoseconds{ local.nanoseconds });
 #if defined(MPT_LIBCXX_QUIRK_CHRONO_DATE_BROKEN_ZONED_TIME)
 		return std::chrono::zoned_time{std::chrono::current_zone(), std::chrono::current_zone()->to_sys(local_tp)}.get_sys_time();
 #else
@@ -310,7 +323,8 @@
 		result.day = static_cast<unsigned int>(ymd.day());
 		result.hours = static_cast<int32>(hms.hours().count());
 		result.minutes = static_cast<int32>(hms.minutes().count());
-		result.seconds = static_cast<int64>(hms.seconds().count());
+		result.seconds = static_cast<int32>(hms.seconds().count());
+		result.nanoseconds = static_cast<int32>(std::chrono::duration_cast<std::chrono::nanoseconds>(hms.subseconds()).count());
 		return result;
 	} catch(const std::exception &)
 #endif
@@ -327,7 +341,9 @@
 
 using nochrono::UnixNow;
 using nochrono::UnixAsSeconds;
+using nochrono::UnixAsNanoseconds;
 using nochrono::UnixFromSeconds;
+using nochrono::UnixFromNanoseconds;
 
 using nochrono::UnixFromUTC;
 using nochrono::UnixAsUTC;
@@ -349,6 +365,14 @@
 mpt::ustring ToShortenedISO8601(Local date); // i.e. 2015-01-15T18:32:01
 #endif // MODPLUG_TRACKER
 
+mpt::ustring ToISO8601(AnyGregorian date);
+
+mpt::ustring ToISO8601(UTC date);
+
+#ifdef MODPLUG_TRACKER
+mpt::ustring ToISO8601(Local date);
+#endif // MODPLUG_TRACKER
+
 } // namespace Date
 } // namespace mpt

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

From: <sv...@op...> - 2025-06-20 13:40:12

Author: sagamusix
Date: Fri Jun 20 15:39:58 2025
New Revision: 23570
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23570

Log:
[Ref] Avoid quadratic complexity when sanitizing MIDI macros.

Modified:
   trunk/OpenMPT/mptrack/plugins/MidiInOut.cpp
   trunk/OpenMPT/soundlib/MIDIMacros.cpp

Modified: trunk/OpenMPT/mptrack/plugins/MidiInOut.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/plugins/MidiInOut.cpp	Fri Jun 20 13:08:58 2025	(r23569)
+++ trunk/OpenMPT/mptrack/plugins/MidiInOut.cpp	Fri Jun 20 15:39:58 2025	(r23570)
@@ -295,8 +295,8 @@
 				m_parameterMacros.resize(dumpID - kMacroParamMin + 1);
 				auto &str = m_parameterMacros[dumpID - kMacroParamMin].first;
 				file.ReadString<mpt::String::maybeNullTerminated>(str, dumpSize);
-				std::string::size_type pos;
-				while((pos = str.find_first_not_of(" 0123456789ABCDEFabchmnopsuvxyz")) != std::string::npos)
+				std::string::size_type pos = 0;
+				while((pos = str.find_first_not_of(" 0123456789ABCDEFabchmnopsuvxyz", pos)) != std::string::npos)
 				{
 					str.erase(pos, 1);
 				}

Modified: trunk/OpenMPT/soundlib/MIDIMacros.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/MIDIMacros.cpp	Fri Jun 20 13:08:58 2025	(r23569)
+++ trunk/OpenMPT/soundlib/MIDIMacros.cpp	Fri Jun 20 15:39:58 2025	(r23570)
@@ -357,8 +357,8 @@
 {
 	std::string sanitizedMacro = *this;
 
-	std::string::size_type pos;
-	while((pos = sanitizedMacro.find_first_not_of("0123456789ABCDEFabchmnopsuvxyz")) != std::string::npos)
+	std::string::size_type pos = 0;
+	while((pos = sanitizedMacro.find_first_not_of("0123456789ABCDEFabchmnopsuvxyz", pos)) != std::string::npos)
 	{
 		sanitizedMacro.erase(pos, 1);
 	}

[OMPT-svn-commit] OpenMPT r23569 - trunk/OpenMPT/sounddsp

From: <sv...@op...> - 2025-06-20 11:09:10

Author: manx
Date: Fri Jun 20 13:08:58 2025
New Revision: 23569
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23569

Log:
[Ref] sounddsp: Surround: Keep calculations in float.
[Ref] sounddsp: Surround: Do not #define PI.

Modified:
   trunk/OpenMPT/sounddsp/DSP.cpp

Modified: trunk/OpenMPT/sounddsp/DSP.cpp
==============================================================================
--- trunk/OpenMPT/sounddsp/DSP.cpp	Fri Jun 20 09:04:04 2025	(r23568)
+++ trunk/OpenMPT/sounddsp/DSP.cpp	Fri Jun 20 13:08:58 2025	(r23569)
@@ -11,8 +11,9 @@
 
 #include "stdafx.h"
 #include "DSP.h"
+#include "mpt/base/numbers.hpp"
 #include "openmpt/soundbase/MixSample.hpp"
-#include <math.h>
+#include <cmath>
 
 OPENMPT_NAMESPACE_BEGIN
 
@@ -36,8 +37,8 @@
 //
 
 
-#define PI	3.14159265358979323f
 static inline float Sgn(float x) { return (x >= 0) ? 1.0f : -1.0f; }
+
 static void ShelfEQ(int32 scale,
 	int32 &outA1, int32 &outB0, int32 &outB1,
 	int32 F_c, int32 F_s, float gainDC, float gainFT, float gainPI)
@@ -47,7 +48,7 @@
 	float alpha, beta0, beta1, rho;
 	float wT, quad;
 
-	wT = PI * F_c / F_s;
+	wT = mpt::numbers::pi_v<float> * F_c / F_s;
 	gainPI2 = gainPI * gainPI;
 	gainFT2 = gainFT * gainFT;
 	gainDC2 = gainDC * gainDC;
@@ -59,12 +60,12 @@
 	if (quad != 0)
 	{
 		float lambda = (gainPI2 - gainDC2) / quad;
-		alpha  = (float)(lambda - Sgn(lambda)*sqrt(lambda*lambda - 1.0f));
+		alpha  = lambda - Sgn(lambda)*std::sqrt(lambda*lambda - 1.0f);
 	}
 
 	beta0 = 0.5f * ((gainDC + gainPI) + (gainDC - gainPI) * alpha);
 	beta1 = 0.5f * ((gainDC - gainPI) + (gainDC + gainPI) * alpha);
-	rho   = (float)((sin((wT*0.5f) - (PI/4.0f))) / (sin((wT*0.5f) + (PI/4.0f))));
+	rho   = std::sin((wT*0.5f) - (mpt::numbers::pi_v<float>/4.0f)) / std::sin((wT*0.5f) + (mpt::numbers::pi_v<float>/4.0f));
 
 	quad  = 1.0f / (1.0f + rho*alpha);

[OMPT-svn-commit] OpenMPT r23568 - in branches/OpenMPT-1.32: . src/openmpt/streamencoder

From: <sv...@op...> - 2025-06-20 07:04:15

Author: manx
Date: Fri Jun 20 09:04:04 2025
New Revision: 23568
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23568

Log:
Merged revision(s) 23567 from trunk/OpenMPT:
[Fix] openmpt/streamencoder: RAW: Remove "little-endian" from the description. We can output big-endian as well.
........

Modified:
   branches/OpenMPT-1.32/   (props changed)
   branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderRAW.cpp

Modified: branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderRAW.cpp
==============================================================================
--- branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderRAW.cpp	Fri Jun 20 09:03:38 2025	(r23567)
+++ branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderRAW.cpp	Fri Jun 20 09:04:04 2025	(r23568)
@@ -143,7 +143,7 @@
 	Encoder::Traits traits;
 	traits.fileExtension = MPT_NATIVE_PATH("raw");
 	traits.fileShortDescription = MPT_USTRING("Raw PCM");
-	traits.fileDescription = MPT_USTRING("Headerless raw little-endian PCM");
+	traits.fileDescription = MPT_USTRING("Headerless raw PCM");
 	traits.encoderSettingsName = MPT_USTRING("RAW");
 	traits.canTags = false;
 	traits.canCues = false;

[OMPT-svn-commit] OpenMPT r23567 - trunk/OpenMPT/src/openmpt/streamencoder

From: <sv...@op...> - 2025-06-20 07:03:50

Author: manx
Date: Fri Jun 20 09:03:38 2025
New Revision: 23567
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23567

Log:
[Fix] openmpt/streamencoder: RAW: Remove "little-endian" from the description. We can output big-endian as well.

Modified:
   trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderRAW.cpp

Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderRAW.cpp
==============================================================================
--- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderRAW.cpp	Thu Jun 19 17:50:43 2025	(r23566)
+++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderRAW.cpp	Fri Jun 20 09:03:38 2025	(r23567)
@@ -143,7 +143,7 @@
 	Encoder::Traits traits;
 	traits.fileExtension = MPT_NATIVE_PATH("raw");
 	traits.fileShortDescription = MPT_USTRING("Raw PCM");
-	traits.fileDescription = MPT_USTRING("Headerless raw little-endian PCM");
+	traits.fileDescription = MPT_USTRING("Headerless raw PCM");
 	traits.encoderSettingsName = MPT_USTRING("RAW");
 	traits.canTags = false;
 	traits.canCues = false;

[OMPT-svn-commit] OpenMPT r23566 - trunk/OpenMPT/sounddsp

From: <sv...@op...> - 2025-06-19 15:50:55

Author: manx
Date: Thu Jun 19 17:50:43 2025
New Revision: 23566
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23566

Log:
[Ref] Reverb: ftol() serves no real purpose, just use the cast directly.

Modified:
   trunk/OpenMPT/sounddsp/Reverb.cpp

Modified: trunk/OpenMPT/sounddsp/Reverb.cpp
==============================================================================
--- trunk/OpenMPT/sounddsp/Reverb.cpp	Thu Jun 19 16:50:23 2025	(r23565)
+++ trunk/OpenMPT/sounddsp/Reverb.cpp	Thu Jun 19 17:50:43 2025	(r23566)
@@ -175,8 +175,6 @@
 // Implementation
 //
 
-static MPT_FORCEINLINE int32 ftol(float f) { return static_cast<int32>(f); }
-
 static void I3dl2_to_Generic(
 				const SNDMIX_REVERB_PROPERTIES *pReverb,
 				EnvironmentReverb *pRvb,
@@ -205,20 +203,20 @@
 	}
 
 	// Pre-Diffusion factor (for both reflections and late reverb)
-	lDensity = 8192 + ftol(79.31f * pReverb->flDensity);
+	lDensity = 8192 + static_cast<int32>(79.31f * pReverb->flDensity);
 	pRvb->PreDiffusion = lDensity;
 
 	// Late reverb diffusion
-	lTailDiffusion = ftol((0.15f + pReverb->flDiffusion * (0.36f*0.01f)) * 32767.0f);
+	lTailDiffusion = static_cast<int32>((0.15f + pReverb->flDiffusion * (0.36f*0.01f)) * 32767.0f);
 	if (lTailDiffusion > 0x7f00) lTailDiffusion = 0x7f00;
 	pRvb->TankDiffusion = lTailDiffusion;
 
 	// Verify reflections and reverb delay parameters
 	float flRefDelay = pReverb->flReflectionsDelay;
 	if (flRefDelay > 0.100f) flRefDelay = 0.100f;
-	int32 lReverbDelay = ftol(pReverb->flReverbDelay * flOutputFreq);
-	int32 lReflectionsDelay = ftol(flRefDelay * flOutputFreq);
-	int32 lReverbDecayTime = ftol(pReverb->flDecayTime * flOutputFreq);
+	int32 lReverbDelay = static_cast<int32>(pReverb->flReverbDelay * flOutputFreq);
+	int32 lReflectionsDelay = static_cast<int32>(flRefDelay * flOutputFreq);
+	int32 lReverbDecayTime = static_cast<int32>(pReverb->flDecayTime * flOutputFreq);
 	if (lReflectionsDelay < lMinRefDelay)
 	{
 		lReverbDelay -= (lMinRefDelay - lReflectionsDelay);
@@ -256,7 +254,7 @@
 	// Late reverb decay time
 	if (lTankLength < 10) lTankLength = 10;
 	flDelayFactor = (lReverbDecayTime <= lTankLength) ? 1.0f : ((float)lTankLength / (float)lReverbDecayTime);
-	pRvb->ReverbDecay = ftol(std::pow(0.001f, flDelayFactor) * 32768.0f);
+	pRvb->ReverbDecay = static_cast<int32>(std::pow(0.001f, flDelayFactor) * 32768.0f);
 
 	// Late Reverb Decay HF
 	flDecayTimeHF = (float)lReverbDecayTime * pReverb->flDecayHFRatio;

[OMPT-svn-commit] OpenMPT r23565 - in trunk/OpenMPT/build: premake vs2017winxp vs2017winxpansi vs2019win7 vs2022win10 vs2022win11 vs2022win11clang vs2022win7 vs2022win8 vs2022win81

From: <sv...@op...> - 2025-06-19 14:50:32

Author: manx
Date: Thu Jun 19 16:50:23 2025
New Revision: 23565
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23565

Log:
[Ref] build: SignalsmithStrech: Include header files in the project using the library, as with other header-only libraries.

Modified:
   trunk/OpenMPT/build/premake/ext-SignalsmithStretch.lua
   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/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/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/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/vs2022win11/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2022win11/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11/OpenMPT-UTF8.vcxproj
   trunk/OpenMPT/build/vs2022win11/OpenMPT-UTF8.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11/OpenMPT.vcxproj
   trunk/OpenMPT/build/vs2022win11/OpenMPT.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11clang/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2022win11clang/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11clang/OpenMPT-UTF8.vcxproj
   trunk/OpenMPT/build/vs2022win11clang/OpenMPT-UTF8.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11clang/OpenMPT.vcxproj
   trunk/OpenMPT/build/vs2022win11clang/OpenMPT.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/vs2022win8/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj
   trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj.filters
   trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj
   trunk/OpenMPT/build/vs2022win8/OpenMPT.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

Modified: trunk/OpenMPT/build/premake/ext-SignalsmithStretch.lua
==============================================================================
--- trunk/OpenMPT/build/premake/ext-SignalsmithStretch.lua	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/premake/ext-SignalsmithStretch.lua	Thu Jun 19 16:50:23 2025	(r23565)
@@ -5,5 +5,10 @@
 	includedirs {
 		"../../include/SignalsmithStretch",
 	}
+	files {
+		"../../include/SignalsmithStretch/signalsmith-linear/fft.h",
+		"../../include/SignalsmithStretch/signalsmith-linear/stft.h",
+		"../../include/SignalsmithStretch/SignalsmithStretch/signalsmith-stretch.h",
+	}
 	filter {}
 end

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj	Thu Jun 19 16:50:23 2025	(r23565)
@@ -788,6 +788,9 @@
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
     <ClInclude Include="..\..\common\zlib_helper.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\byte_container_with_subtype.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\abi_macros.hpp" />

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters	Thu Jun 19 16:50:23 2025	(r23565)
@@ -19,6 +19,15 @@
     <Filter Include="include">
       <UniqueIdentifier>{89AF369E-F58E-B539-FEA6-40106A051C9B}</UniqueIdentifier>
     </Filter>
+    <Filter Include="include\SignalsmithStretch">
+      <UniqueIdentifier>{58A08AD3-44B0-36A4-AD69-9BC29998253D}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\SignalsmithStretch">
+      <UniqueIdentifier>{C71027C1-3381-293A-FC9F-A3C268CF613B}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\signalsmith-linear">
+      <UniqueIdentifier>{12DE7E03-7E4E-817C-476D-FB04B39CB97D}</UniqueIdentifier>
+    </Filter>
     <Filter Include="include\nlohmann-json">
       <UniqueIdentifier>{5A0436C9-C670-F1C3-8F64-8921FB8F132C}</UniqueIdentifier>
     </Filter>
@@ -354,6 +363,15 @@
     <ClInclude Include="..\..\common\zlib_helper.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h">
+      <Filter>include\SignalsmithStretch\SignalsmithStretch</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp">
       <Filter>include\nlohmann-json\include\nlohmann</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj	Thu Jun 19 16:50:23 2025	(r23565)
@@ -788,6 +788,9 @@
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
     <ClInclude Include="..\..\common\zlib_helper.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\byte_container_with_subtype.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\abi_macros.hpp" />

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters	Thu Jun 19 16:50:23 2025	(r23565)
@@ -19,6 +19,15 @@
     <Filter Include="include">
       <UniqueIdentifier>{89AF369E-F58E-B539-FEA6-40106A051C9B}</UniqueIdentifier>
     </Filter>
+    <Filter Include="include\SignalsmithStretch">
+      <UniqueIdentifier>{58A08AD3-44B0-36A4-AD69-9BC29998253D}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\SignalsmithStretch">
+      <UniqueIdentifier>{C71027C1-3381-293A-FC9F-A3C268CF613B}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\signalsmith-linear">
+      <UniqueIdentifier>{12DE7E03-7E4E-817C-476D-FB04B39CB97D}</UniqueIdentifier>
+    </Filter>
     <Filter Include="include\nlohmann-json">
       <UniqueIdentifier>{5A0436C9-C670-F1C3-8F64-8921FB8F132C}</UniqueIdentifier>
     </Filter>
@@ -354,6 +363,15 @@
     <ClInclude Include="..\..\common\zlib_helper.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h">
+      <Filter>include\SignalsmithStretch\SignalsmithStretch</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp">
       <Filter>include\nlohmann-json\include\nlohmann</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj	Thu Jun 19 16:50:23 2025	(r23565)
@@ -788,6 +788,9 @@
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
     <ClInclude Include="..\..\common\zlib_helper.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\byte_container_with_subtype.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\abi_macros.hpp" />

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters	Thu Jun 19 16:50:23 2025	(r23565)
@@ -19,6 +19,15 @@
     <Filter Include="include">
       <UniqueIdentifier>{89AF369E-F58E-B539-FEA6-40106A051C9B}</UniqueIdentifier>
     </Filter>
+    <Filter Include="include\SignalsmithStretch">
+      <UniqueIdentifier>{58A08AD3-44B0-36A4-AD69-9BC29998253D}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\SignalsmithStretch">
+      <UniqueIdentifier>{C71027C1-3381-293A-FC9F-A3C268CF613B}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\signalsmith-linear">
+      <UniqueIdentifier>{12DE7E03-7E4E-817C-476D-FB04B39CB97D}</UniqueIdentifier>
+    </Filter>
     <Filter Include="include\nlohmann-json">
       <UniqueIdentifier>{5A0436C9-C670-F1C3-8F64-8921FB8F132C}</UniqueIdentifier>
     </Filter>
@@ -354,6 +363,15 @@
     <ClInclude Include="..\..\common\zlib_helper.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h">
+      <Filter>include\SignalsmithStretch\SignalsmithStretch</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp">
       <Filter>include\nlohmann-json\include\nlohmann</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj	Thu Jun 19 16:50:23 2025	(r23565)
@@ -788,6 +788,9 @@
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
     <ClInclude Include="..\..\common\zlib_helper.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\byte_container_with_subtype.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\abi_macros.hpp" />

Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters	Thu Jun 19 16:50:23 2025	(r23565)
@@ -19,6 +19,15 @@
     <Filter Include="include">
       <UniqueIdentifier>{89AF369E-F58E-B539-FEA6-40106A051C9B}</UniqueIdentifier>
     </Filter>
+    <Filter Include="include\SignalsmithStretch">
+      <UniqueIdentifier>{58A08AD3-44B0-36A4-AD69-9BC29998253D}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\SignalsmithStretch">
+      <UniqueIdentifier>{C71027C1-3381-293A-FC9F-A3C268CF613B}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\signalsmith-linear">
+      <UniqueIdentifier>{12DE7E03-7E4E-817C-476D-FB04B39CB97D}</UniqueIdentifier>
+    </Filter>
     <Filter Include="include\nlohmann-json">
       <UniqueIdentifier>{5A0436C9-C670-F1C3-8F64-8921FB8F132C}</UniqueIdentifier>
     </Filter>
@@ -354,6 +363,15 @@
     <ClInclude Include="..\..\common\zlib_helper.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h">
+      <Filter>include\SignalsmithStretch\SignalsmithStretch</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp">
       <Filter>include\nlohmann-json\include\nlohmann</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj	Thu Jun 19 16:50:23 2025	(r23565)
@@ -788,6 +788,9 @@
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
     <ClInclude Include="..\..\common\zlib_helper.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\byte_container_with_subtype.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\abi_macros.hpp" />

Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters	Thu Jun 19 16:50:23 2025	(r23565)
@@ -19,6 +19,15 @@
     <Filter Include="include">
       <UniqueIdentifier>{89AF369E-F58E-B539-FEA6-40106A051C9B}</UniqueIdentifier>
     </Filter>
+    <Filter Include="include\SignalsmithStretch">
+      <UniqueIdentifier>{58A08AD3-44B0-36A4-AD69-9BC29998253D}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\SignalsmithStretch">
+      <UniqueIdentifier>{C71027C1-3381-293A-FC9F-A3C268CF613B}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\signalsmith-linear">
+      <UniqueIdentifier>{12DE7E03-7E4E-817C-476D-FB04B39CB97D}</UniqueIdentifier>
+    </Filter>
     <Filter Include="include\nlohmann-json">
       <UniqueIdentifier>{5A0436C9-C670-F1C3-8F64-8921FB8F132C}</UniqueIdentifier>
     </Filter>
@@ -354,6 +363,15 @@
     <ClInclude Include="..\..\common\zlib_helper.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h">
+      <Filter>include\SignalsmithStretch\SignalsmithStretch</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp">
       <Filter>include\nlohmann-json\include\nlohmann</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj	Thu Jun 19 16:50:23 2025	(r23565)
@@ -788,6 +788,9 @@
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
     <ClInclude Include="..\..\common\zlib_helper.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\byte_container_with_subtype.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\abi_macros.hpp" />

Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters	Thu Jun 19 16:50:23 2025	(r23565)
@@ -19,6 +19,15 @@
     <Filter Include="include">
       <UniqueIdentifier>{89AF369E-F58E-B539-FEA6-40106A051C9B}</UniqueIdentifier>
     </Filter>
+    <Filter Include="include\SignalsmithStretch">
+      <UniqueIdentifier>{58A08AD3-44B0-36A4-AD69-9BC29998253D}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\SignalsmithStretch">
+      <UniqueIdentifier>{C71027C1-3381-293A-FC9F-A3C268CF613B}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\signalsmith-linear">
+      <UniqueIdentifier>{12DE7E03-7E4E-817C-476D-FB04B39CB97D}</UniqueIdentifier>
+    </Filter>
     <Filter Include="include\nlohmann-json">
       <UniqueIdentifier>{5A0436C9-C670-F1C3-8F64-8921FB8F132C}</UniqueIdentifier>
     </Filter>
@@ -354,6 +363,15 @@
     <ClInclude Include="..\..\common\zlib_helper.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h">
+      <Filter>include\SignalsmithStretch\SignalsmithStretch</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp">
       <Filter>include\nlohmann-json\include\nlohmann</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj	Thu Jun 19 16:50:23 2025	(r23565)
@@ -809,6 +809,9 @@
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
     <ClInclude Include="..\..\common\zlib_helper.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOConfig.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOCore.hpp" />

Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters	Thu Jun 19 16:50:23 2025	(r23565)
@@ -19,6 +19,15 @@
     <Filter Include="include">
       <UniqueIdentifier>{89AF369E-F58E-B539-FEA6-40106A051C9B}</UniqueIdentifier>
     </Filter>
+    <Filter Include="include\SignalsmithStretch">
+      <UniqueIdentifier>{58A08AD3-44B0-36A4-AD69-9BC29998253D}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\SignalsmithStretch">
+      <UniqueIdentifier>{C71027C1-3381-293A-FC9F-A3C268CF613B}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\signalsmith-linear">
+      <UniqueIdentifier>{12DE7E03-7E4E-817C-476D-FB04B39CB97D}</UniqueIdentifier>
+    </Filter>
     <Filter Include="include\asiomodern">
       <UniqueIdentifier>{E97649C5-D55A-0A1B-3EBB-046E2ABEF49C}</UniqueIdentifier>
     </Filter>
@@ -363,6 +372,15 @@
     <ClInclude Include="..\..\common\zlib_helper.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h">
+      <Filter>include\SignalsmithStretch\SignalsmithStretch</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp">
       <Filter>include\asiomodern\include\ASIOModern</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj	Thu Jun 19 16:50:23 2025	(r23565)
@@ -809,6 +809,9 @@
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
     <ClInclude Include="..\..\common\zlib_helper.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOConfig.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOCore.hpp" />

Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters	Thu Jun 19 16:50:23 2025	(r23565)
@@ -19,6 +19,15 @@
     <Filter Include="include">
       <UniqueIdentifier>{89AF369E-F58E-B539-FEA6-40106A051C9B}</UniqueIdentifier>
     </Filter>
+    <Filter Include="include\SignalsmithStretch">
+      <UniqueIdentifier>{58A08AD3-44B0-36A4-AD69-9BC29998253D}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\SignalsmithStretch">
+      <UniqueIdentifier>{C71027C1-3381-293A-FC9F-A3C268CF613B}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\signalsmith-linear">
+      <UniqueIdentifier>{12DE7E03-7E4E-817C-476D-FB04B39CB97D}</UniqueIdentifier>
+    </Filter>
     <Filter Include="include\asiomodern">
       <UniqueIdentifier>{E97649C5-D55A-0A1B-3EBB-046E2ABEF49C}</UniqueIdentifier>
     </Filter>
@@ -363,6 +372,15 @@
     <ClInclude Include="..\..\common\zlib_helper.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h">
+      <Filter>include\SignalsmithStretch\SignalsmithStretch</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp">
       <Filter>include\asiomodern\include\ASIOModern</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj	Thu Jun 19 16:50:23 2025	(r23565)
@@ -809,6 +809,9 @@
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
     <ClInclude Include="..\..\common\zlib_helper.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOConfig.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOCore.hpp" />

Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters	Thu Jun 19 16:50:23 2025	(r23565)
@@ -19,6 +19,15 @@
     <Filter Include="include">
       <UniqueIdentifier>{89AF369E-F58E-B539-FEA6-40106A051C9B}</UniqueIdentifier>
     </Filter>
+    <Filter Include="include\SignalsmithStretch">
+      <UniqueIdentifier>{58A08AD3-44B0-36A4-AD69-9BC29998253D}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\SignalsmithStretch">
+      <UniqueIdentifier>{C71027C1-3381-293A-FC9F-A3C268CF613B}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\signalsmith-linear">
+      <UniqueIdentifier>{12DE7E03-7E4E-817C-476D-FB04B39CB97D}</UniqueIdentifier>
+    </Filter>
     <Filter Include="include\asiomodern">
       <UniqueIdentifier>{E97649C5-D55A-0A1B-3EBB-046E2ABEF49C}</UniqueIdentifier>
     </Filter>
@@ -363,6 +372,15 @@
     <ClInclude Include="..\..\common\zlib_helper.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h">
+      <Filter>include\SignalsmithStretch\SignalsmithStretch</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp">
       <Filter>include\asiomodern\include\ASIOModern</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj	Thu Jun 19 16:50:23 2025	(r23565)
@@ -1597,6 +1597,9 @@
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
     <ClInclude Include="..\..\common\zlib_helper.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOConfig.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOCore.hpp" />

Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters	Thu Jun 19 16:50:23 2025	(r23565)
@@ -19,6 +19,15 @@
     <Filter Include="include">
       <UniqueIdentifier>{89AF369E-F58E-B539-FEA6-40106A051C9B}</UniqueIdentifier>
     </Filter>
+    <Filter Include="include\SignalsmithStretch">
+      <UniqueIdentifier>{58A08AD3-44B0-36A4-AD69-9BC29998253D}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\SignalsmithStretch">
+      <UniqueIdentifier>{C71027C1-3381-293A-FC9F-A3C268CF613B}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\signalsmith-linear">
+      <UniqueIdentifier>{12DE7E03-7E4E-817C-476D-FB04B39CB97D}</UniqueIdentifier>
+    </Filter>
     <Filter Include="include\asiomodern">
       <UniqueIdentifier>{E97649C5-D55A-0A1B-3EBB-046E2ABEF49C}</UniqueIdentifier>
     </Filter>
@@ -363,6 +372,15 @@
     <ClInclude Include="..\..\common\zlib_helper.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h">
+      <Filter>include\SignalsmithStretch\SignalsmithStretch</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp">
       <Filter>include\asiomodern\include\ASIOModern</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj	Thu Jun 19 16:50:23 2025	(r23565)
@@ -1597,6 +1597,9 @@
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
     <ClInclude Include="..\..\common\zlib_helper.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOConfig.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOCore.hpp" />

Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters	Thu Jun 19 16:50:23 2025	(r23565)
@@ -19,6 +19,15 @@
     <Filter Include="include">
       <UniqueIdentifier>{89AF369E-F58E-B539-FEA6-40106A051C9B}</UniqueIdentifier>
     </Filter>
+    <Filter Include="include\SignalsmithStretch">
+      <UniqueIdentifier>{58A08AD3-44B0-36A4-AD69-9BC29998253D}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\SignalsmithStretch">
+      <UniqueIdentifier>{C71027C1-3381-293A-FC9F-A3C268CF613B}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\signalsmith-linear">
+      <UniqueIdentifier>{12DE7E03-7E4E-817C-476D-FB04B39CB97D}</UniqueIdentifier>
+    </Filter>
     <Filter Include="include\asiomodern">
       <UniqueIdentifier>{E97649C5-D55A-0A1B-3EBB-046E2ABEF49C}</UniqueIdentifier>
     </Filter>
@@ -363,6 +372,15 @@
     <ClInclude Include="..\..\common\zlib_helper.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h">
+      <Filter>include\SignalsmithStretch\SignalsmithStretch</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp">
       <Filter>include\asiomodern\include\ASIOModern</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj	Thu Jun 19 16:50:23 2025	(r23565)
@@ -1597,6 +1597,9 @@
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
     <ClInclude Include="..\..\common\zlib_helper.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOConfig.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOCore.hpp" />

Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters	Thu Jun 19 16:50:23 2025	(r23565)
@@ -19,6 +19,15 @@
     <Filter Include="include">
       <UniqueIdentifier>{89AF369E-F58E-B539-FEA6-40106A051C9B}</UniqueIdentifier>
     </Filter>
+    <Filter Include="include\SignalsmithStretch">
+      <UniqueIdentifier>{58A08AD3-44B0-36A4-AD69-9BC29998253D}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\SignalsmithStretch">
+      <UniqueIdentifier>{C71027C1-3381-293A-FC9F-A3C268CF613B}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\signalsmith-linear">
+      <UniqueIdentifier>{12DE7E03-7E4E-817C-476D-FB04B39CB97D}</UniqueIdentifier>
+    </Filter>
     <Filter Include="include\asiomodern">
       <UniqueIdentifier>{E97649C5-D55A-0A1B-3EBB-046E2ABEF49C}</UniqueIdentifier>
     </Filter>
@@ -363,6 +372,15 @@
     <ClInclude Include="..\..\common\zlib_helper.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h">
+      <Filter>include\SignalsmithStretch\SignalsmithStretch</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp">
       <Filter>include\asiomodern\include\ASIOModern</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2022win11/OpenMPT-ANSI.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win11/OpenMPT-ANSI.vcxproj	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2022win11/OpenMPT-ANSI.vcxproj	Thu Jun 19 16:50:23 2025	(r23565)
@@ -1599,6 +1599,9 @@
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
     <ClInclude Include="..\..\common\zlib_helper.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOConfig.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOCore.hpp" />

Modified: trunk/OpenMPT/build/vs2022win11/OpenMPT-ANSI.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win11/OpenMPT-ANSI.vcxproj.filters	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2022win11/OpenMPT-ANSI.vcxproj.filters	Thu Jun 19 16:50:23 2025	(r23565)
@@ -19,6 +19,15 @@
     <Filter Include="include">
       <UniqueIdentifier>{89AF369E-F58E-B539-FEA6-40106A051C9B}</UniqueIdentifier>
     </Filter>
+    <Filter Include="include\SignalsmithStretch">
+      <UniqueIdentifier>{58A08AD3-44B0-36A4-AD69-9BC29998253D}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\SignalsmithStretch">
+      <UniqueIdentifier>{C71027C1-3381-293A-FC9F-A3C268CF613B}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\signalsmith-linear">
+      <UniqueIdentifier>{12DE7E03-7E4E-817C-476D-FB04B39CB97D}</UniqueIdentifier>
+    </Filter>
     <Filter Include="include\asiomodern">
       <UniqueIdentifier>{E97649C5-D55A-0A1B-3EBB-046E2ABEF49C}</UniqueIdentifier>
     </Filter>
@@ -363,6 +372,15 @@
     <ClInclude Include="..\..\common\zlib_helper.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h">
+      <Filter>include\SignalsmithStretch\SignalsmithStretch</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp">
       <Filter>include\asiomodern\include\ASIOModern</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2022win11/OpenMPT-UTF8.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win11/OpenMPT-UTF8.vcxproj	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2022win11/OpenMPT-UTF8.vcxproj	Thu Jun 19 16:50:23 2025	(r23565)
@@ -1599,6 +1599,9 @@
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
     <ClInclude Include="..\..\common\zlib_helper.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOConfig.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOCore.hpp" />

Modified: trunk/OpenMPT/build/vs2022win11/OpenMPT-UTF8.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win11/OpenMPT-UTF8.vcxproj.filters	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2022win11/OpenMPT-UTF8.vcxproj.filters	Thu Jun 19 16:50:23 2025	(r23565)
@@ -19,6 +19,15 @@
     <Filter Include="include">
       <UniqueIdentifier>{89AF369E-F58E-B539-FEA6-40106A051C9B}</UniqueIdentifier>
     </Filter>
+    <Filter Include="include\SignalsmithStretch">
+      <UniqueIdentifier>{58A08AD3-44B0-36A4-AD69-9BC29998253D}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\SignalsmithStretch">
+      <UniqueIdentifier>{C71027C1-3381-293A-FC9F-A3C268CF613B}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\signalsmith-linear">
+      <UniqueIdentifier>{12DE7E03-7E4E-817C-476D-FB04B39CB97D}</UniqueIdentifier>
+    </Filter>
     <Filter Include="include\asiomodern">
       <UniqueIdentifier>{E97649C5-D55A-0A1B-3EBB-046E2ABEF49C}</UniqueIdentifier>
     </Filter>
@@ -363,6 +372,15 @@
     <ClInclude Include="..\..\common\zlib_helper.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h">
+      <Filter>include\SignalsmithStretch\SignalsmithStretch</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp">
       <Filter>include\asiomodern\include\ASIOModern</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2022win11/OpenMPT.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win11/OpenMPT.vcxproj	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2022win11/OpenMPT.vcxproj	Thu Jun 19 16:50:23 2025	(r23565)
@@ -1599,6 +1599,9 @@
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
     <ClInclude Include="..\..\common\zlib_helper.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOConfig.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOCore.hpp" />

Modified: trunk/OpenMPT/build/vs2022win11/OpenMPT.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win11/OpenMPT.vcxproj.filters	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2022win11/OpenMPT.vcxproj.filters	Thu Jun 19 16:50:23 2025	(r23565)
@@ -19,6 +19,15 @@
     <Filter Include="include">
       <UniqueIdentifier>{89AF369E-F58E-B539-FEA6-40106A051C9B}</UniqueIdentifier>
     </Filter>
+    <Filter Include="include\SignalsmithStretch">
+      <UniqueIdentifier>{58A08AD3-44B0-36A4-AD69-9BC29998253D}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\SignalsmithStretch">
+      <UniqueIdentifier>{C71027C1-3381-293A-FC9F-A3C268CF613B}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\signalsmith-linear">
+      <UniqueIdentifier>{12DE7E03-7E4E-817C-476D-FB04B39CB97D}</UniqueIdentifier>
+    </Filter>
     <Filter Include="include\asiomodern">
       <UniqueIdentifier>{E97649C5-D55A-0A1B-3EBB-046E2ABEF49C}</UniqueIdentifier>
     </Filter>
@@ -363,6 +372,15 @@
     <ClInclude Include="..\..\common\zlib_helper.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h">
+      <Filter>include\SignalsmithStretch\SignalsmithStretch</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp">
       <Filter>include\asiomodern\include\ASIOModern</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2022win11clang/OpenMPT-ANSI.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win11clang/OpenMPT-ANSI.vcxproj	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2022win11clang/OpenMPT-ANSI.vcxproj	Thu Jun 19 16:50:23 2025	(r23565)
@@ -1175,6 +1175,9 @@
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
     <ClInclude Include="..\..\common\zlib_helper.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\byte_container_with_subtype.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\abi_macros.hpp" />

Modified: trunk/OpenMPT/build/vs2022win11clang/OpenMPT-ANSI.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win11clang/OpenMPT-ANSI.vcxproj.filters	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2022win11clang/OpenMPT-ANSI.vcxproj.filters	Thu Jun 19 16:50:23 2025	(r23565)
@@ -19,6 +19,15 @@
     <Filter Include="include">
       <UniqueIdentifier>{89AF369E-F58E-B539-FEA6-40106A051C9B}</UniqueIdentifier>
     </Filter>
+    <Filter Include="include\SignalsmithStretch">
+      <UniqueIdentifier>{58A08AD3-44B0-36A4-AD69-9BC29998253D}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\SignalsmithStretch">
+      <UniqueIdentifier>{C71027C1-3381-293A-FC9F-A3C268CF613B}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\signalsmith-linear">
+      <UniqueIdentifier>{12DE7E03-7E4E-817C-476D-FB04B39CB97D}</UniqueIdentifier>
+    </Filter>
     <Filter Include="include\nlohmann-json">
       <UniqueIdentifier>{5A0436C9-C670-F1C3-8F64-8921FB8F132C}</UniqueIdentifier>
     </Filter>
@@ -354,6 +363,15 @@
     <ClInclude Include="..\..\common\zlib_helper.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h">
+      <Filter>include\SignalsmithStretch\SignalsmithStretch</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp">
       <Filter>include\nlohmann-json\include\nlohmann</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2022win11clang/OpenMPT-UTF8.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win11clang/OpenMPT-UTF8.vcxproj	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2022win11clang/OpenMPT-UTF8.vcxproj	Thu Jun 19 16:50:23 2025	(r23565)
@@ -1175,6 +1175,9 @@
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
     <ClInclude Include="..\..\common\zlib_helper.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\byte_container_with_subtype.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\abi_macros.hpp" />

Modified: trunk/OpenMPT/build/vs2022win11clang/OpenMPT-UTF8.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win11clang/OpenMPT-UTF8.vcxproj.filters	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2022win11clang/OpenMPT-UTF8.vcxproj.filters	Thu Jun 19 16:50:23 2025	(r23565)
@@ -19,6 +19,15 @@
     <Filter Include="include">
       <UniqueIdentifier>{89AF369E-F58E-B539-FEA6-40106A051C9B}</UniqueIdentifier>
     </Filter>
+    <Filter Include="include\SignalsmithStretch">
+      <UniqueIdentifier>{58A08AD3-44B0-36A4-AD69-9BC29998253D}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\SignalsmithStretch">
+      <UniqueIdentifier>{C71027C1-3381-293A-FC9F-A3C268CF613B}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\signalsmith-linear">
+      <UniqueIdentifier>{12DE7E03-7E4E-817C-476D-FB04B39CB97D}</UniqueIdentifier>
+    </Filter>
     <Filter Include="include\nlohmann-json">
       <UniqueIdentifier>{5A0436C9-C670-F1C3-8F64-8921FB8F132C}</UniqueIdentifier>
     </Filter>
@@ -354,6 +363,15 @@
     <ClInclude Include="..\..\common\zlib_helper.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h">
+      <Filter>include\SignalsmithStretch\SignalsmithStretch</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp">
       <Filter>include\nlohmann-json\include\nlohmann</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2022win11clang/OpenMPT.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win11clang/OpenMPT.vcxproj	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2022win11clang/OpenMPT.vcxproj	Thu Jun 19 16:50:23 2025	(r23565)
@@ -1175,6 +1175,9 @@
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
     <ClInclude Include="..\..\common\zlib_helper.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\byte_container_with_subtype.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\abi_macros.hpp" />

Modified: trunk/OpenMPT/build/vs2022win11clang/OpenMPT.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win11clang/OpenMPT.vcxproj.filters	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2022win11clang/OpenMPT.vcxproj.filters	Thu Jun 19 16:50:23 2025	(r23565)
@@ -19,6 +19,15 @@
     <Filter Include="include">
       <UniqueIdentifier>{89AF369E-F58E-B539-FEA6-40106A051C9B}</UniqueIdentifier>
     </Filter>
+    <Filter Include="include\SignalsmithStretch">
+      <UniqueIdentifier>{58A08AD3-44B0-36A4-AD69-9BC29998253D}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\SignalsmithStretch">
+      <UniqueIdentifier>{C71027C1-3381-293A-FC9F-A3C268CF613B}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\signalsmith-linear">
+      <UniqueIdentifier>{12DE7E03-7E4E-817C-476D-FB04B39CB97D}</UniqueIdentifier>
+    </Filter>
     <Filter Include="include\nlohmann-json">
       <UniqueIdentifier>{5A0436C9-C670-F1C3-8F64-8921FB8F132C}</UniqueIdentifier>
     </Filter>
@@ -354,6 +363,15 @@
     <ClInclude Include="..\..\common\zlib_helper.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h">
+      <Filter>include\SignalsmithStretch\SignalsmithStretch</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h">
+      <Filter>include\SignalsmithStretch\signalsmith-linear</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp">
       <Filter>include\nlohmann-json\include\nlohmann</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj	Thu Jun 19 16:50:23 2025	(r23565)
@@ -817,6 +817,9 @@
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
     <ClInclude Include="..\..\common\zlib_helper.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\SignalsmithStretch\signalsmith-stretch.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\fft.h" />
+    <ClInclude Include="..\..\include\SignalsmithStretch\signalsmith-linear\stft.h" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOConfig.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOCore.hpp" />

Modified: trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters	Thu Jun 19 13:56:10 2025	(r23564)
+++ trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters	Thu Jun 19 16:50:23 2025	(r23565)
@@ -19,6 +19,15 @@
     <Filter Include="include">
       <UniqueIdentifier>{89AF369E-F58E-B539-FEA6-40106A051C9B}</UniqueIdentifier>
     </Filter>
+    <Filter Include="include\SignalsmithStretch">
+      <UniqueIdentifier>{58A08AD3-44B0-36A4-AD69-9BC29998253D}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\SignalsmithStretch">
+      <UniqueIdentifier>{C71027C1-3381-293A-FC9F-A3C268CF613B}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\SignalsmithStretch\signalsmith-linear">
+      <UniqueIdentifier>{12DE7E03-7E4E-817C-476D-FB04B39CB97D}</UniqueIdentifier>
+    </Filter>
     <Filter Include="include\asiomodern">
       <UniqueIdentifier>{E97649C5-D55A-0A1B-3EBB-046E2ABEF49C}</UniqueIdentifier>
     </Filter>
@@ -363,6 +372,15 @@
     <ClInclude Include="..\..\common\zlib_helper.h">
       <Filter>common</Filter>
     </ClInclud...
 
[truncated message content]

[OMPT-svn-commit] OpenMPT r23564 - trunk/OpenMPT/misc

From: <sv...@op...> - 2025-06-19 11:56:17

Author: manx
Date: Thu Jun 19 13:56:10 2025
New Revision: 23564
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23564

Log:
[Ref] GzipWriter: Use mpt::Date for Unix time.
[Ref] GzipWriter: Include all required headers.

Modified:
   trunk/OpenMPT/misc/GzipWriter.h

Modified: trunk/OpenMPT/misc/GzipWriter.h
==============================================================================
--- trunk/OpenMPT/misc/GzipWriter.h	Thu Jun 19 13:40:08 2025	(r23563)
+++ trunk/OpenMPT/misc/GzipWriter.h	Thu Jun 19 13:56:10 2025	(r23564)
@@ -13,13 +13,20 @@
 
 #ifdef MPT_WITH_ZLIB
 
+#include "mpt/base/memory.hpp"
+#include "mpt/base/namespace.hpp"
+#include "mpt/base/saturate_cast.hpp"
 #include "mpt/io/io.hpp"
 #include "mpt/io/io_stdstream.hpp"
+#include "mpt/string/types.hpp"
+#include "mpt/string_transcode/transcode.hpp"
 
-#include "../common/mptString.h"
+#include "../common/mptTime.h"
 #include "../common/zlib_helper.h"
 
-#include <ctime>
+#include <array>
+#include <ostream>
+#include <string>
 
 #include <zlib.h>
 
@@ -32,8 +39,8 @@
 	strm->next_in = mpt::byte_cast<Bytef *>(outData.data());
 	zlib::expect_Z_OK(deflateInit2(&*strm, Z_BEST_COMPRESSION, Z_DEFLATED, 15 | 16, 9, Z_DEFAULT_STRATEGY), "deflateInit2() failed");
 	gz_header gzHeader{};
-	gzHeader.time = static_cast<uLong>(std::time(nullptr));
-	std::string filenameISO = mpt::ToCharset(mpt::Charset::ISO8859_1, fileName);
+	gzHeader.time = mpt::saturate_cast<uLong>(mpt::Date::UnixAsSeconds(mpt::Date::UnixNow()));
+	std::string filenameISO = mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, fileName);
 	gzHeader.name = mpt::byte_cast<Bytef *>(filenameISO.data());
 	zlib::expect_Z_OK(deflateSetHeader(&*strm, &gzHeader), "deflateSetHeader() failed");
 	do

[OMPT-svn-commit] OpenMPT r23563 - in trunk/OpenMPT: build/autotools build/vs2017winxp build/vs2017winxpansi build/vs2019win7 build/vs2022win10 build/vs2022win10uwp build/vs2022win11 build/vs2022win11clang build/vs2022win11uwp build/vs2022win7 build/vs2022win8 build/vs2022win81 build/xcode-ios/libopenmpt.xcodeproj build/xcode-macosx/libopenmpt.xcodeproj common misc mptrack

From: <sv...@op...> - 2025-06-19 11:40:18

Author: manx
Date: Thu Jun 19 13:40:08 2025
New Revision: 23563
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23563

Log:
[Ref] GzipWriter: Move from common/ to misc/.

Added:
   trunk/OpenMPT/misc/GzipWriter.h
      - copied, changed from r23562, trunk/OpenMPT/common/GzipWriter.h
Deleted:
   trunk/OpenMPT/common/GzipWriter.h
Modified:
   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-NativeSupport.vcxproj
   trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.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/vs2017winxp/updatesigntool.vcxproj
   trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters
   trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj
   trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.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/vs2017winxpansi/updatesigntool.vcxproj
   trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters
   trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj
   trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.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/vs2019win7/updatesigntool.vcxproj
   trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj.filters
   trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj
   trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.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/vs2022win10/updatesigntool.vcxproj
   trunk/OpenMPT/build/vs2022win10/updatesigntool.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/vs2022win10uwp/libopenmpt_test.vcxproj
   trunk/OpenMPT/build/vs2022win10uwp/libopenmpt_test.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2022win11/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11/OpenMPT-NativeSupport.vcxproj
   trunk/OpenMPT/build/vs2022win11/OpenMPT-NativeSupport.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11/OpenMPT-UTF8.vcxproj
   trunk/OpenMPT/build/vs2022win11/OpenMPT-UTF8.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11/OpenMPT.vcxproj
   trunk/OpenMPT/build/vs2022win11/OpenMPT.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11/libopenmpt-small.vcxproj
   trunk/OpenMPT/build/vs2022win11/libopenmpt-small.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11/libopenmpt.vcxproj
   trunk/OpenMPT/build/vs2022win11/libopenmpt.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11/libopenmpt_test.vcxproj
   trunk/OpenMPT/build/vs2022win11/libopenmpt_test.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11/updatesigntool.vcxproj
   trunk/OpenMPT/build/vs2022win11/updatesigntool.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11clang/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2022win11clang/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11clang/OpenMPT-NativeSupport.vcxproj
   trunk/OpenMPT/build/vs2022win11clang/OpenMPT-NativeSupport.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11clang/OpenMPT-UTF8.vcxproj
   trunk/OpenMPT/build/vs2022win11clang/OpenMPT-UTF8.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11clang/OpenMPT.vcxproj
   trunk/OpenMPT/build/vs2022win11clang/OpenMPT.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11clang/libopenmpt-small.vcxproj
   trunk/OpenMPT/build/vs2022win11clang/libopenmpt-small.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11clang/libopenmpt.vcxproj
   trunk/OpenMPT/build/vs2022win11clang/libopenmpt.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11clang/libopenmpt_test.vcxproj
   trunk/OpenMPT/build/vs2022win11clang/libopenmpt_test.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11clang/updatesigntool.vcxproj
   trunk/OpenMPT/build/vs2022win11clang/updatesigntool.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11uwp/libopenmpt-small.vcxproj
   trunk/OpenMPT/build/vs2022win11uwp/libopenmpt-small.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11uwp/libopenmpt.vcxproj
   trunk/OpenMPT/build/vs2022win11uwp/libopenmpt.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11uwp/libopenmpt_test.vcxproj
   trunk/OpenMPT/build/vs2022win11uwp/libopenmpt_test.vcxproj.filters
   trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2022win7/OpenMPT-NativeSupport.vcxproj
   trunk/OpenMPT/build/vs2022win7/OpenMPT-NativeSupport.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/vs2022win7/updatesigntool.vcxproj
   trunk/OpenMPT/build/vs2022win7/updatesigntool.vcxproj.filters
   trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2022win8/OpenMPT-NativeSupport.vcxproj
   trunk/OpenMPT/build/vs2022win8/OpenMPT-NativeSupport.vcxproj.filters
   trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj
   trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj.filters
   trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj
   trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj.filters
   trunk/OpenMPT/build/vs2022win8/libopenmpt-small.vcxproj
   trunk/OpenMPT/build/vs2022win8/libopenmpt-small.vcxproj.filters
   trunk/OpenMPT/build/vs2022win8/libopenmpt.vcxproj
   trunk/OpenMPT/build/vs2022win8/libopenmpt.vcxproj.filters
   trunk/OpenMPT/build/vs2022win8/libopenmpt_test.vcxproj
   trunk/OpenMPT/build/vs2022win8/libopenmpt_test.vcxproj.filters
   trunk/OpenMPT/build/vs2022win8/updatesigntool.vcxproj
   trunk/OpenMPT/build/vs2022win8/updatesigntool.vcxproj.filters
   trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2022win81/OpenMPT-NativeSupport.vcxproj
   trunk/OpenMPT/build/vs2022win81/OpenMPT-NativeSupport.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/vs2022win81/updatesigntool.vcxproj
   trunk/OpenMPT/build/vs2022win81/updatesigntool.vcxproj.filters
   trunk/OpenMPT/build/xcode-ios/libopenmpt.xcodeproj/project.pbxproj
   trunk/OpenMPT/build/xcode-macosx/libopenmpt.xcodeproj/project.pbxproj
   trunk/OpenMPT/mptrack/MainFrm.cpp
   trunk/OpenMPT/mptrack/OPLExport.cpp

Modified: trunk/OpenMPT/build/autotools/Makefile.am
==============================================================================
--- trunk/OpenMPT/build/autotools/Makefile.am	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/autotools/Makefile.am	Thu Jun 19 13:40:08 2025	(r23563)
@@ -332,7 +332,6 @@
 MPT_FILES_COMMON += common/ComponentManager.h
 MPT_FILES_COMMON += common/FileReader.h
 MPT_FILES_COMMON += common/FileReaderFwd.h
-MPT_FILES_COMMON += common/GzipWriter.h
 MPT_FILES_COMMON += common/Logging.cpp
 MPT_FILES_COMMON += common/Logging.h
 MPT_FILES_COMMON += common/misc_util.h

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj	Thu Jun 19 13:40:08 2025	(r23563)
@@ -766,7 +766,6 @@
     <ClInclude Include="..\..\common\ComponentManager.h" />
     <ClInclude Include="..\..\common\FileReader.h" />
     <ClInclude Include="..\..\common\FileReaderFwd.h" />
-    <ClInclude Include="..\..\common\GzipWriter.h" />
     <ClInclude Include="..\..\common\Logging.h" />
     <ClInclude Include="..\..\common\Profiler.h" />
     <ClInclude Include="..\..\common\misc_util.h" />
@@ -835,6 +834,7 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\ordered_map.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" />
+    <ClInclude Include="..\..\misc\GzipWriter.h" />
     <ClInclude Include="..\..\misc\WriteMemoryDump.h" />
     <ClInclude Include="..\..\misc\mptClock.h" />
     <ClInclude Include="..\..\misc\mptColor.h" />

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters	Thu Jun 19 13:40:08 2025	(r23563)
@@ -288,9 +288,6 @@
     <ClInclude Include="..\..\common\FileReaderFwd.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\GzipWriter.h">
-      <Filter>common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\Logging.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -495,6 +492,9 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp">
       <Filter>include\nlohmann-json\include\nlohmann\thirdparty\hedley</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\misc\GzipWriter.h">
+      <Filter>misc</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\misc\WriteMemoryDump.h">
       <Filter>misc</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj	Thu Jun 19 13:40:08 2025	(r23563)
@@ -646,7 +646,6 @@
     <ClInclude Include="..\..\common\ComponentManager.h" />
     <ClInclude Include="..\..\common\FileReader.h" />
     <ClInclude Include="..\..\common\FileReaderFwd.h" />
-    <ClInclude Include="..\..\common\GzipWriter.h" />
     <ClInclude Include="..\..\common\Logging.h" />
     <ClInclude Include="..\..\common\Profiler.h" />
     <ClInclude Include="..\..\common\misc_util.h" />
@@ -715,6 +714,7 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\ordered_map.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" />
+    <ClInclude Include="..\..\misc\GzipWriter.h" />
     <ClInclude Include="..\..\misc\WriteMemoryDump.h" />
     <ClInclude Include="..\..\misc\mptClock.h" />
     <ClInclude Include="..\..\misc\mptColor.h" />

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters	Thu Jun 19 13:40:08 2025	(r23563)
@@ -237,9 +237,6 @@
     <ClInclude Include="..\..\common\FileReaderFwd.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\GzipWriter.h">
-      <Filter>common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\Logging.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -444,6 +441,9 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp">
       <Filter>include\nlohmann-json\include\nlohmann\thirdparty\hedley</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\misc\GzipWriter.h">
+      <Filter>misc</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\misc\WriteMemoryDump.h">
       <Filter>misc</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj	Thu Jun 19 13:40:08 2025	(r23563)
@@ -766,7 +766,6 @@
     <ClInclude Include="..\..\common\ComponentManager.h" />
     <ClInclude Include="..\..\common\FileReader.h" />
     <ClInclude Include="..\..\common\FileReaderFwd.h" />
-    <ClInclude Include="..\..\common\GzipWriter.h" />
     <ClInclude Include="..\..\common\Logging.h" />
     <ClInclude Include="..\..\common\Profiler.h" />
     <ClInclude Include="..\..\common\misc_util.h" />
@@ -835,6 +834,7 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\ordered_map.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" />
+    <ClInclude Include="..\..\misc\GzipWriter.h" />
     <ClInclude Include="..\..\misc\WriteMemoryDump.h" />
     <ClInclude Include="..\..\misc\mptClock.h" />
     <ClInclude Include="..\..\misc\mptColor.h" />

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters	Thu Jun 19 13:40:08 2025	(r23563)
@@ -288,9 +288,6 @@
     <ClInclude Include="..\..\common\FileReaderFwd.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\GzipWriter.h">
-      <Filter>common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\Logging.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -495,6 +492,9 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp">
       <Filter>include\nlohmann-json\include\nlohmann\thirdparty\hedley</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\misc\GzipWriter.h">
+      <Filter>misc</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\misc\WriteMemoryDump.h">
       <Filter>misc</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj	Thu Jun 19 13:40:08 2025	(r23563)
@@ -766,7 +766,6 @@
     <ClInclude Include="..\..\common\ComponentManager.h" />
     <ClInclude Include="..\..\common\FileReader.h" />
     <ClInclude Include="..\..\common\FileReaderFwd.h" />
-    <ClInclude Include="..\..\common\GzipWriter.h" />
     <ClInclude Include="..\..\common\Logging.h" />
     <ClInclude Include="..\..\common\Profiler.h" />
     <ClInclude Include="..\..\common\misc_util.h" />
@@ -835,6 +834,7 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\ordered_map.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" />
+    <ClInclude Include="..\..\misc\GzipWriter.h" />
     <ClInclude Include="..\..\misc\WriteMemoryDump.h" />
     <ClInclude Include="..\..\misc\mptClock.h" />
     <ClInclude Include="..\..\misc\mptColor.h" />

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters	Thu Jun 19 13:40:08 2025	(r23563)
@@ -288,9 +288,6 @@
     <ClInclude Include="..\..\common\FileReaderFwd.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\GzipWriter.h">
-      <Filter>common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\Logging.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -495,6 +492,9 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp">
       <Filter>include\nlohmann-json\include\nlohmann\thirdparty\hedley</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\misc\GzipWriter.h">
+      <Filter>misc</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\misc\WriteMemoryDump.h">
       <Filter>misc</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj	Thu Jun 19 13:40:08 2025	(r23563)
@@ -652,7 +652,6 @@
     <ClInclude Include="..\..\common\ComponentManager.h" />
     <ClInclude Include="..\..\common\FileReader.h" />
     <ClInclude Include="..\..\common\FileReaderFwd.h" />
-    <ClInclude Include="..\..\common\GzipWriter.h" />
     <ClInclude Include="..\..\common\Logging.h" />
     <ClInclude Include="..\..\common\Profiler.h" />
     <ClInclude Include="..\..\common\misc_util.h" />

Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters	Thu Jun 19 13:40:08 2025	(r23563)
@@ -183,9 +183,6 @@
     <ClInclude Include="..\..\common\FileReaderFwd.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\GzipWriter.h">
-      <Filter>common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\Logging.h">
       <Filter>common</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj	Thu Jun 19 13:40:08 2025	(r23563)
@@ -652,7 +652,6 @@
     <ClInclude Include="..\..\common\ComponentManager.h" />
     <ClInclude Include="..\..\common\FileReader.h" />
     <ClInclude Include="..\..\common\FileReaderFwd.h" />
-    <ClInclude Include="..\..\common\GzipWriter.h" />
     <ClInclude Include="..\..\common\Logging.h" />
     <ClInclude Include="..\..\common\Profiler.h" />
     <ClInclude Include="..\..\common\misc_util.h" />

Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters	Thu Jun 19 13:40:08 2025	(r23563)
@@ -183,9 +183,6 @@
     <ClInclude Include="..\..\common\FileReaderFwd.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\GzipWriter.h">
-      <Filter>common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\Logging.h">
       <Filter>common</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj	Thu Jun 19 13:40:08 2025	(r23563)
@@ -730,7 +730,6 @@
     <ClInclude Include="..\..\common\ComponentManager.h" />
     <ClInclude Include="..\..\common\FileReader.h" />
     <ClInclude Include="..\..\common\FileReaderFwd.h" />
-    <ClInclude Include="..\..\common\GzipWriter.h" />
     <ClInclude Include="..\..\common\Logging.h" />
     <ClInclude Include="..\..\common\Profiler.h" />
     <ClInclude Include="..\..\common\misc_util.h" />

Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters	Thu Jun 19 13:40:08 2025	(r23563)
@@ -198,9 +198,6 @@
     <ClInclude Include="..\..\common\FileReaderFwd.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\GzipWriter.h">
-      <Filter>common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\Logging.h">
       <Filter>common</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj	Thu Jun 19 13:40:08 2025	(r23563)
@@ -634,7 +634,6 @@
     <ClInclude Include="..\..\common\ComponentManager.h" />
     <ClInclude Include="..\..\common\FileReader.h" />
     <ClInclude Include="..\..\common\FileReaderFwd.h" />
-    <ClInclude Include="..\..\common\GzipWriter.h" />
     <ClInclude Include="..\..\common\Logging.h" />
     <ClInclude Include="..\..\common\Profiler.h" />
     <ClInclude Include="..\..\common\misc_util.h" />
@@ -703,6 +702,7 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\ordered_map.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" />
+    <ClInclude Include="..\..\misc\GzipWriter.h" />
     <ClInclude Include="..\..\misc\WriteMemoryDump.h" />
     <ClInclude Include="..\..\misc\mptClock.h" />
     <ClInclude Include="..\..\misc\mptColor.h" />

Modified: trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters	Thu Jun 19 13:40:08 2025	(r23563)
@@ -231,9 +231,6 @@
     <ClInclude Include="..\..\common\FileReaderFwd.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\GzipWriter.h">
-      <Filter>common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\Logging.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -438,6 +435,9 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp">
       <Filter>include\nlohmann-json\include\nlohmann\thirdparty\hedley</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\misc\GzipWriter.h">
+      <Filter>misc</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\misc\WriteMemoryDump.h">
       <Filter>misc</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj	Thu Jun 19 13:40:08 2025	(r23563)
@@ -766,7 +766,6 @@
     <ClInclude Include="..\..\common\ComponentManager.h" />
     <ClInclude Include="..\..\common\FileReader.h" />
     <ClInclude Include="..\..\common\FileReaderFwd.h" />
-    <ClInclude Include="..\..\common\GzipWriter.h" />
     <ClInclude Include="..\..\common\Logging.h" />
     <ClInclude Include="..\..\common\Profiler.h" />
     <ClInclude Include="..\..\common\misc_util.h" />
@@ -835,6 +834,7 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\ordered_map.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" />
+    <ClInclude Include="..\..\misc\GzipWriter.h" />
     <ClInclude Include="..\..\misc\WriteMemoryDump.h" />
     <ClInclude Include="..\..\misc\mptClock.h" />
     <ClInclude Include="..\..\misc\mptColor.h" />

Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters	Thu Jun 19 13:40:08 2025	(r23563)
@@ -288,9 +288,6 @@
     <ClInclude Include="..\..\common\FileReaderFwd.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\GzipWriter.h">
-      <Filter>common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\Logging.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -495,6 +492,9 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp">
       <Filter>include\nlohmann-json\include\nlohmann\thirdparty\hedley</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\misc\GzipWriter.h">
+      <Filter>misc</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\misc\WriteMemoryDump.h">
       <Filter>misc</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj	Thu Jun 19 13:40:08 2025	(r23563)
@@ -646,7 +646,6 @@
     <ClInclude Include="..\..\common\ComponentManager.h" />
     <ClInclude Include="..\..\common\FileReader.h" />
     <ClInclude Include="..\..\common\FileReaderFwd.h" />
-    <ClInclude Include="..\..\common\GzipWriter.h" />
     <ClInclude Include="..\..\common\Logging.h" />
     <ClInclude Include="..\..\common\Profiler.h" />
     <ClInclude Include="..\..\common\misc_util.h" />
@@ -715,6 +714,7 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\ordered_map.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" />
+    <ClInclude Include="..\..\misc\GzipWriter.h" />
     <ClInclude Include="..\..\misc\WriteMemoryDump.h" />
     <ClInclude Include="..\..\misc\mptClock.h" />
     <ClInclude Include="..\..\misc\mptColor.h" />

Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters	Thu Jun 19 13:40:08 2025	(r23563)
@@ -237,9 +237,6 @@
     <ClInclude Include="..\..\common\FileReaderFwd.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\GzipWriter.h">
-      <Filter>common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\Logging.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -444,6 +441,9 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp">
       <Filter>include\nlohmann-json\include\nlohmann\thirdparty\hedley</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\misc\GzipWriter.h">
+      <Filter>misc</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\misc\WriteMemoryDump.h">
       <Filter>misc</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj	Thu Jun 19 13:40:08 2025	(r23563)
@@ -766,7 +766,6 @@
     <ClInclude Include="..\..\common\ComponentManager.h" />
     <ClInclude Include="..\..\common\FileReader.h" />
     <ClInclude Include="..\..\common\FileReaderFwd.h" />
-    <ClInclude Include="..\..\common\GzipWriter.h" />
     <ClInclude Include="..\..\common\Logging.h" />
     <ClInclude Include="..\..\common\Profiler.h" />
     <ClInclude Include="..\..\common\misc_util.h" />
@@ -835,6 +834,7 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\ordered_map.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" />
+    <ClInclude Include="..\..\misc\GzipWriter.h" />
     <ClInclude Include="..\..\misc\WriteMemoryDump.h" />
     <ClInclude Include="..\..\misc\mptClock.h" />
     <ClInclude Include="..\..\misc\mptColor.h" />

Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters	Thu Jun 19 13:40:08 2025	(r23563)
@@ -288,9 +288,6 @@
     <ClInclude Include="..\..\common\FileReaderFwd.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\GzipWriter.h">
-      <Filter>common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\Logging.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -495,6 +492,9 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp">
       <Filter>include\nlohmann-json\include\nlohmann\thirdparty\hedley</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\misc\GzipWriter.h">
+      <Filter>misc</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\misc\WriteMemoryDump.h">
       <Filter>misc</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj	Thu Jun 19 13:40:08 2025	(r23563)
@@ -766,7 +766,6 @@
     <ClInclude Include="..\..\common\ComponentManager.h" />
     <ClInclude Include="..\..\common\FileReader.h" />
     <ClInclude Include="..\..\common\FileReaderFwd.h" />
-    <ClInclude Include="..\..\common\GzipWriter.h" />
     <ClInclude Include="..\..\common\Logging.h" />
     <ClInclude Include="..\..\common\Profiler.h" />
     <ClInclude Include="..\..\common\misc_util.h" />
@@ -835,6 +834,7 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\ordered_map.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" />
+    <ClInclude Include="..\..\misc\GzipWriter.h" />
     <ClInclude Include="..\..\misc\WriteMemoryDump.h" />
     <ClInclude Include="..\..\misc\mptClock.h" />
     <ClInclude Include="..\..\misc\mptColor.h" />

Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters	Thu Jun 19 13:40:08 2025	(r23563)
@@ -288,9 +288,6 @@
     <ClInclude Include="..\..\common\FileReaderFwd.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\GzipWriter.h">
-      <Filter>common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\Logging.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -495,6 +492,9 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp">
       <Filter>include\nlohmann-json\include\nlohmann\thirdparty\hedley</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\misc\GzipWriter.h">
+      <Filter>misc</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\misc\WriteMemoryDump.h">
       <Filter>misc</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj	Thu Jun 19 13:40:08 2025	(r23563)
@@ -652,7 +652,6 @@
     <ClInclude Include="..\..\common\ComponentManager.h" />
     <ClInclude Include="..\..\common\FileReader.h" />
     <ClInclude Include="..\..\common\FileReaderFwd.h" />
-    <ClInclude Include="..\..\common\GzipWriter.h" />
     <ClInclude Include="..\..\common\Logging.h" />
     <ClInclude Include="..\..\common\Profiler.h" />
     <ClInclude Include="..\..\common\misc_util.h" />

Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters	Thu Jun 19 13:40:08 2025	(r23563)
@@ -183,9 +183,6 @@
     <ClInclude Include="..\..\common\FileReaderFwd.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\GzipWriter.h">
-      <Filter>common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\Logging.h">
       <Filter>common</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj	Thu Jun 19 13:40:08 2025	(r23563)
@@ -652,7 +652,6 @@
     <ClInclude Include="..\..\common\ComponentManager.h" />
     <ClInclude Include="..\..\common\FileReader.h" />
     <ClInclude Include="..\..\common\FileReaderFwd.h" />
-    <ClInclude Include="..\..\common\GzipWriter.h" />
     <ClInclude Include="..\..\common\Logging.h" />
     <ClInclude Include="..\..\common\Profiler.h" />
     <ClInclude Include="..\..\common\misc_util.h" />

Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters	Thu Jun 19 13:40:08 2025	(r23563)
@@ -183,9 +183,6 @@
     <ClInclude Include="..\..\common\FileReaderFwd.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\GzipWriter.h">
-      <Filter>common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\Logging.h">
       <Filter>common</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj	Thu Jun 19 13:40:08 2025	(r23563)
@@ -730,7 +730,6 @@
     <ClInclude Include="..\..\common\ComponentManager.h" />
     <ClInclude Include="..\..\common\FileReader.h" />
     <ClInclude Include="..\..\common\FileReaderFwd.h" />
-    <ClInclude Include="..\..\common\GzipWriter.h" />
     <ClInclude Include="..\..\common\Logging.h" />
     <ClInclude Include="..\..\common\Profiler.h" />
     <ClInclude Include="..\..\common\misc_util.h" />

Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters	Thu Jun 19 13:40:08 2025	(r23563)
@@ -198,9 +198,6 @@
     <ClInclude Include="..\..\common\FileReaderFwd.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\GzipWriter.h">
-      <Filter>common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\Logging.h">
       <Filter>common</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj	Thu Jun 19 13:40:08 2025	(r23563)
@@ -634,7 +634,6 @@
     <ClInclude Include="..\..\common\ComponentManager.h" />
     <ClInclude Include="..\..\common\FileReader.h" />
     <ClInclude Include="..\..\common\FileReaderFwd.h" />
-    <ClInclude Include="..\..\common\GzipWriter.h" />
     <ClInclude Include="..\..\common\Logging.h" />
     <ClInclude Include="..\..\common\Profiler.h" />
     <ClInclude Include="..\..\common\misc_util.h" />
@@ -703,6 +702,7 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\ordered_map.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" />
+    <ClInclude Include="..\..\misc\GzipWriter.h" />
     <ClInclude Include="..\..\misc\WriteMemoryDump.h" />
     <ClInclude Include="..\..\misc\mptClock.h" />
     <ClInclude Include="..\..\misc\mptColor.h" />

Modified: trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters	Thu Jun 19 13:40:08 2025	(r23563)
@@ -231,9 +231,6 @@
     <ClInclude Include="..\..\common\FileReaderFwd.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\GzipWriter.h">
-      <Filter>common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\Logging.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -438,6 +435,9 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp">
       <Filter>include\nlohmann-json\include\nlohmann\thirdparty\hedley</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\misc\GzipWriter.h">
+      <Filter>misc</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\misc\WriteMemoryDump.h">
       <Filter>misc</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj	Thu Jun 19 13:40:08 2025	(r23563)
@@ -787,7 +787,6 @@
     <ClInclude Include="..\..\common\ComponentManager.h" />
     <ClInclude Include="..\..\common\FileReader.h" />
     <ClInclude Include="..\..\common\FileReaderFwd.h" />
-    <ClInclude Include="..\..\common\GzipWriter.h" />
     <ClInclude Include="..\..\common\Logging.h" />
     <ClInclude Include="..\..\common\Profiler.h" />
     <ClInclude Include="..\..\common\misc_util.h" />
@@ -866,6 +865,7 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\ordered_map.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" />
+    <ClInclude Include="..\..\misc\GzipWriter.h" />
     <ClInclude Include="..\..\misc\WriteMemoryDump.h" />
     <ClInclude Include="..\..\misc\mptClock.h" />
     <ClInclude Include="..\..\misc\mptColor.h" />

Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters	Thu Jun 19 13:40:08 2025	(r23563)
@@ -297,9 +297,6 @@
     <ClInclude Include="..\..\common\FileReaderFwd.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\GzipWriter.h">
-      <Filter>common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\Logging.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -534,6 +531,9 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp">
       <Filter>include\nlohmann-json\include\nlohmann\thirdparty\hedley</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\misc\GzipWriter.h">
+      <Filter>misc</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\misc\WriteMemoryDump.h">
       <Filter>misc</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj	Thu Jun 19 13:40:08 2025	(r23563)
@@ -655,7 +655,6 @@
     <ClInclude Include="..\..\common\ComponentManager.h" />
     <ClInclude Include="..\..\common\FileReader.h" />
     <ClInclude Include="..\..\common\FileReaderFwd.h" />
-    <ClInclude Include="..\..\common\GzipWriter.h" />
     <ClInclude Include="..\..\common\Logging.h" />
     <ClInclude Include="..\..\common\Profiler.h" />
     <ClInclude Include="..\..\common\misc_util.h" />
@@ -734,6 +733,7 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\ordered_map.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" />
+    <ClInclude Include="..\..\misc\GzipWriter.h" />
     <ClInclude Include="..\..\misc\WriteMemoryDump.h" />
     <ClInclude Include="..\..\misc\mptClock.h" />
     <ClInclude Include="..\..\misc\mptColor.h" />

Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters	Thu Jun 19 13:40:08 2025	(r23563)
@@ -246,9 +246,6 @@
     <ClInclude Include="..\..\common\FileReaderFwd.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\GzipWriter.h">
-      <Filter>common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\Logging.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -483,6 +480,9 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp">
       <Filter>include\nlohmann-json\include\nlohmann\thirdparty\hedley</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\misc\GzipWriter.h">
+      <Filter>misc</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\misc\WriteMemoryDump.h">
       <Filter>misc</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj	Thu Jun 19 13:40:08 2025	(r23563)
@@ -787,7 +787,6 @@
     <ClInclude Include="..\..\common\ComponentManager.h" />
     <ClInclude Include="..\..\common\FileReader.h" />
     <ClInclude Include="..\..\common\FileReaderFwd.h" />
-    <ClInclude Include="..\..\common\GzipWriter.h" />
     <ClInclude Include="..\..\common\Logging.h" />
     <ClInclude Include="..\..\common\Profiler.h" />
     <ClInclude Include="..\..\common\misc_util.h" />
@@ -866,6 +865,7 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\ordered_map.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" />
+    <ClInclude Include="..\..\misc\GzipWriter.h" />
     <ClInclude Include="..\..\misc\WriteMemoryDump.h" />
     <ClInclude Include="..\..\misc\mptClock.h" />
     <ClInclude Include="..\..\misc\mptColor.h" />

Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters	Thu Jun 19 13:40:08 2025	(r23563)
@@ -297,9 +297,6 @@
     <ClInclude Include="..\..\common\FileReaderFwd.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\GzipWriter.h">
-      <Filter>common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\Logging.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -534,6 +531,9 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp">
       <Filter>include\nlohmann-json\include\nlohmann\thirdparty\hedley</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\misc\GzipWriter.h">
+      <Filter>misc</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\misc\WriteMemoryDump.h">
       <Filter>misc</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj	Thu Jun 19 13:40:08 2025	(r23563)
@@ -787,7 +787,6 @@
     <ClInclude Include="..\..\common\ComponentManager.h" />
     <ClInclude Include="..\..\common\FileReader.h" />
     <ClInclude Include="..\..\common\FileReaderFwd.h" />
-    <ClInclude Include="..\..\common\GzipWriter.h" />
     <ClInclude Include="..\..\common\Logging.h" />
     <ClInclude Include="..\..\common\Profiler.h" />
     <ClInclude Include="..\..\common\misc_util.h" />
@@ -866,6 +865,7 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\ordered_map.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" />
+    <ClInclude Include="..\..\misc\GzipWriter.h" />
     <ClInclude Include="..\..\misc\WriteMemoryDump.h" />
     <ClInclude Include="..\..\misc\mptClock.h" />
     <ClInclude Include="..\..\misc\mptColor.h" />

Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters	Thu Jun 19 13:40:08 2025	(r23563)
@@ -297,9 +297,6 @@
     <ClInclude Include="..\..\common\FileReaderFwd.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\GzipWriter.h">
-      <Filter>common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\Logging.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -534,6 +531,9 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp">
       <Filter>include\nlohmann-json\include\nlohmann\thirdparty\hedley</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\misc\GzipWriter.h">
+      <Filter>misc</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\misc\WriteMemoryDump.h">
       <Filter>misc</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj	Thu Jun 19 13:40:08 2025	(r23563)
@@ -661,7 +661,6 @@
     <ClInclude Include="..\..\common\ComponentManager.h" />
     <ClInclude Include="..\..\common\FileReader.h" />
     <ClInclude Include="..\..\common\FileReaderFwd.h" />
-    <ClInclude Include="..\..\common\GzipWriter.h" />
     <ClInclude Include="..\..\common\Logging.h" />
     <ClInclude Include="..\..\common\Profiler.h" />
     <ClInclude Include="..\..\common\misc_util.h" />

Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters	Thu Jun 19 13:40:08 2025	(r23563)
@@ -183,9 +183,6 @@
     <ClInclude Include="..\..\common\FileReaderFwd.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\GzipWriter.h">
-      <Filter>common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\Logging.h">
       <Filter>common</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj	Thu Jun 19 13:40:08 2025	(r23563)
@@ -661,7 +661,6 @@
     <ClInclude Include="..\..\common\ComponentManager.h" />
     <ClInclude Include="..\..\common\FileReader.h" />
     <ClInclude Include="..\..\common\FileReaderFwd.h" />
-    <ClInclude Include="..\..\common\GzipWriter.h" />
     <ClInclude Include="..\..\common\Logging.h" />
     <ClInclude Include="..\..\common\Profiler.h" />
     <ClInclude Include="..\..\common\misc_util.h" />

Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters	Thu Jun 19 13:40:08 2025	(r23563)
@@ -183,9 +183,6 @@
     <ClInclude Include="..\..\common\FileReaderFwd.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\GzipWriter.h">
-      <Filter>common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\Logging.h">
       <Filter>common</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj	Thu Jun 19 13:40:08 2025	(r23563)
@@ -739,7 +739,6 @@
     <ClInclude Include="..\..\common\ComponentManager.h" />
     <ClInclude Include="..\..\common\FileReader.h" />
     <ClInclude Include="..\..\common\FileReaderFwd.h" />
-    <ClInclude Include="..\..\common\GzipWriter.h" />
     <ClInclude Include="..\..\common\Logging.h" />
     <ClInclude Include="..\..\common\Profiler.h" />
     <ClInclude Include="..\..\common\misc_util.h" />

Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters	Thu Jun 19 13:40:08 2025	(r23563)
@@ -204,9 +204,6 @@
     <ClInclude Include="..\..\common\FileReaderFwd.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\GzipWriter.h">
-      <Filter>common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\Logging.h">
       <Filter>common</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj	Thu Jun 19 13:40:08 2025	(r23563)
@@ -679,7 +679,6 @@
     <ClInclude Include="..\..\common\ComponentManager.h" />
     <ClInclude Include="..\..\common\FileReader.h" />
     <ClInclude Include="..\..\common\FileReaderFwd.h" />
-    <ClInclude Include="..\..\common\GzipWriter.h" />
     <ClInclude Include="..\..\common\Logging.h" />
     <ClInclude Include="..\..\common\Profiler.h" />
     <ClInclude Include="..\..\common\misc_util.h" />
@@ -748,6 +747,7 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\ordered_map.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" />
+    <ClInclude Include="..\..\misc\GzipWriter.h" />
     <ClInclude Include="..\..\misc\WriteMemoryDump.h" />
     <ClInclude Include="..\..\misc\mptClock.h" />
     <ClInclude Include="..\..\misc\mptColor.h" />

Modified: trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj.filters	Thu Jun 19 13:40:08 2025	(r23563)
@@ -237,9 +237,6 @@
     <ClInclude Include="..\..\common\FileReaderFwd.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\GzipWriter.h">
-      <Filter>common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\Logging.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -444,6 +441,9 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp">
       <Filter>include\nlohmann-json\include\nlohmann\thirdparty\hedley</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\misc\GzipWriter.h">
+      <Filter>misc</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\misc\WriteMemoryDump.h">
       <Filter>misc</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
+++ trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj	Thu Jun 19 13:40:08 2025	(r23563)
@@ -1575,7 +1575,6 @@
     <ClInclude Include="..\..\common\ComponentManager.h" />
     <ClInclude Include="..\..\common\FileReader.h" />
     <ClInclude Include="..\..\common\FileReaderFwd.h" />
-    <ClInclude Include="..\..\common\GzipWriter.h" />
     <ClInclude Include="..\..\common\Logging.h" />
     <ClInclude Include="..\..\common\Profiler.h" />
     <ClInclude Include="..\..\common\misc_util.h" />
@@ -1654,6 +1653,7 @@
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\ordered_map.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" />
+    <ClInclude Include="..\..\misc\GzipWriter.h" />
     <ClInclude Include="..\..\misc\WriteMemoryDump.h" />
     <ClInclude Include="..\..\misc\mptClock.h" />
  ...
 
[truncated message content]

[OMPT-svn-commit] OpenMPT r23562 - in trunk/OpenMPT: build/autotools build/vs2017winxp build/vs2017winxpansi build/vs2019win7 build/vs2022win10 build/vs2022win10uwp build/vs2022win11 build/vs2022win11clang build/vs2022win11uwp build/vs2022win7 build/vs2022win8 build/vs2022win81 build/xcode-ios/libopenmpt.xcodeproj build/xcode-macosx/libopenmpt.xcodeproj common soundlib unarchiver

From: <sv...@op...> - 2025-06-19 11:34:40

Author: manx
Date: Thu Jun 19 13:34:24 2025
New Revision: 23562
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23562

Log:
[Ref] zlib_helper: Consolidate zlib RAII and error handling into a single place.

Added:
   trunk/OpenMPT/common/zlib_helper.h   (contents, props changed)
Modified:
   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-NativeSupport.vcxproj
   trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.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/vs2017winxp/updatesigntool.vcxproj
   trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters
   trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj
   trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.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/vs2017winxpansi/updatesigntool.vcxproj
   trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters
   trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj
   trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.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/vs2019win7/updatesigntool.vcxproj
   trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj.filters
   trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj
   trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.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/vs2022win10/updatesigntool.vcxproj
   trunk/OpenMPT/build/vs2022win10/updatesigntool.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/vs2022win10uwp/libopenmpt_test.vcxproj
   trunk/OpenMPT/build/vs2022win10uwp/libopenmpt_test.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2022win11/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11/OpenMPT-NativeSupport.vcxproj
   trunk/OpenMPT/build/vs2022win11/OpenMPT-NativeSupport.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11/OpenMPT-UTF8.vcxproj
   trunk/OpenMPT/build/vs2022win11/OpenMPT-UTF8.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11/OpenMPT.vcxproj
   trunk/OpenMPT/build/vs2022win11/OpenMPT.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11/libopenmpt-small.vcxproj
   trunk/OpenMPT/build/vs2022win11/libopenmpt-small.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11/libopenmpt.vcxproj
   trunk/OpenMPT/build/vs2022win11/libopenmpt.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11/libopenmpt_test.vcxproj
   trunk/OpenMPT/build/vs2022win11/libopenmpt_test.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11/updatesigntool.vcxproj
   trunk/OpenMPT/build/vs2022win11/updatesigntool.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11clang/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2022win11clang/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11clang/OpenMPT-NativeSupport.vcxproj
   trunk/OpenMPT/build/vs2022win11clang/OpenMPT-NativeSupport.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11clang/OpenMPT-UTF8.vcxproj
   trunk/OpenMPT/build/vs2022win11clang/OpenMPT-UTF8.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11clang/OpenMPT.vcxproj
   trunk/OpenMPT/build/vs2022win11clang/OpenMPT.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11clang/libopenmpt-small.vcxproj
   trunk/OpenMPT/build/vs2022win11clang/libopenmpt-small.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11clang/libopenmpt.vcxproj
   trunk/OpenMPT/build/vs2022win11clang/libopenmpt.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11clang/libopenmpt_test.vcxproj
   trunk/OpenMPT/build/vs2022win11clang/libopenmpt_test.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11clang/updatesigntool.vcxproj
   trunk/OpenMPT/build/vs2022win11clang/updatesigntool.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11uwp/libopenmpt-small.vcxproj
   trunk/OpenMPT/build/vs2022win11uwp/libopenmpt-small.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11uwp/libopenmpt.vcxproj
   trunk/OpenMPT/build/vs2022win11uwp/libopenmpt.vcxproj.filters
   trunk/OpenMPT/build/vs2022win11uwp/libopenmpt_test.vcxproj
   trunk/OpenMPT/build/vs2022win11uwp/libopenmpt_test.vcxproj.filters
   trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2022win7/OpenMPT-NativeSupport.vcxproj
   trunk/OpenMPT/build/vs2022win7/OpenMPT-NativeSupport.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/vs2022win7/updatesigntool.vcxproj
   trunk/OpenMPT/build/vs2022win7/updatesigntool.vcxproj.filters
   trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2022win8/OpenMPT-NativeSupport.vcxproj
   trunk/OpenMPT/build/vs2022win8/OpenMPT-NativeSupport.vcxproj.filters
   trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj
   trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj.filters
   trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj
   trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj.filters
   trunk/OpenMPT/build/vs2022win8/libopenmpt-small.vcxproj
   trunk/OpenMPT/build/vs2022win8/libopenmpt-small.vcxproj.filters
   trunk/OpenMPT/build/vs2022win8/libopenmpt.vcxproj
   trunk/OpenMPT/build/vs2022win8/libopenmpt.vcxproj.filters
   trunk/OpenMPT/build/vs2022win8/libopenmpt_test.vcxproj
   trunk/OpenMPT/build/vs2022win8/libopenmpt_test.vcxproj.filters
   trunk/OpenMPT/build/vs2022win8/updatesigntool.vcxproj
   trunk/OpenMPT/build/vs2022win8/updatesigntool.vcxproj.filters
   trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2022win81/OpenMPT-NativeSupport.vcxproj
   trunk/OpenMPT/build/vs2022win81/OpenMPT-NativeSupport.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/vs2022win81/updatesigntool.vcxproj
   trunk/OpenMPT/build/vs2022win81/updatesigntool.vcxproj.filters
   trunk/OpenMPT/build/xcode-ios/libopenmpt.xcodeproj/project.pbxproj
   trunk/OpenMPT/build/xcode-macosx/libopenmpt.xcodeproj/project.pbxproj
   trunk/OpenMPT/common/GzipWriter.h
   trunk/OpenMPT/soundlib/load_j2b.cpp
   trunk/OpenMPT/unarchiver/ungzip.cpp

Modified: trunk/OpenMPT/build/autotools/Makefile.am
==============================================================================
--- trunk/OpenMPT/build/autotools/Makefile.am	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/autotools/Makefile.am	Thu Jun 19 13:34:24 2025	(r23562)
@@ -363,6 +363,7 @@
 MPT_FILES_COMMON += common/version.cpp
 MPT_FILES_COMMON += common/version.h
 MPT_FILES_COMMON += common/versionNumber.h
+MPT_FILES_COMMON += common/zlib_helper.h
 MPT_FILES_SOUNDLIB = 
 MPT_FILES_SOUNDLIB += soundlib/AudioCriticalSection.cpp
 MPT_FILES_SOUNDLIB += soundlib/AudioCriticalSection.h

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -788,6 +788,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\byte_container_with_subtype.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\abi_macros.hpp" />

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -354,6 +354,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp">
       <Filter>include\nlohmann-json\include\nlohmann</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -668,6 +668,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\byte_container_with_subtype.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\abi_macros.hpp" />

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -303,6 +303,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp">
       <Filter>include\nlohmann-json\include\nlohmann</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -788,6 +788,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\byte_container_with_subtype.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\abi_macros.hpp" />

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -354,6 +354,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp">
       <Filter>include\nlohmann-json\include\nlohmann</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -788,6 +788,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\byte_container_with_subtype.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\abi_macros.hpp" />

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -354,6 +354,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp">
       <Filter>include\nlohmann-json\include\nlohmann</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -674,6 +674,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt.h" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt.hpp" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt_config.h" />

Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -249,6 +249,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\libopenmpt\libopenmpt.h">
       <Filter>libopenmpt</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -674,6 +674,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt.h" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt.hpp" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt_config.h" />

Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -249,6 +249,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\libopenmpt\libopenmpt.h">
       <Filter>libopenmpt</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -752,6 +752,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt.h" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt.hpp" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt_config.h" />

Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -264,6 +264,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\libopenmpt\libopenmpt.h">
       <Filter>libopenmpt</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -656,6 +656,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\byte_container_with_subtype.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\abi_macros.hpp" />

Modified: trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -297,6 +297,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp">
       <Filter>include\nlohmann-json\include\nlohmann</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -788,6 +788,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\byte_container_with_subtype.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\abi_macros.hpp" />

Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -354,6 +354,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp">
       <Filter>include\nlohmann-json\include\nlohmann</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -668,6 +668,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\byte_container_with_subtype.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\abi_macros.hpp" />

Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -303,6 +303,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp">
       <Filter>include\nlohmann-json\include\nlohmann</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -788,6 +788,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\byte_container_with_subtype.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\abi_macros.hpp" />

Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -354,6 +354,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp">
       <Filter>include\nlohmann-json\include\nlohmann</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -788,6 +788,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\byte_container_with_subtype.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\abi_macros.hpp" />

Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -354,6 +354,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp">
       <Filter>include\nlohmann-json\include\nlohmann</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -674,6 +674,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt.h" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt.hpp" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt_config.h" />

Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -249,6 +249,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\libopenmpt\libopenmpt.h">
       <Filter>libopenmpt</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -674,6 +674,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt.h" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt.hpp" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt_config.h" />

Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -249,6 +249,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\libopenmpt\libopenmpt.h">
       <Filter>libopenmpt</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -752,6 +752,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt.h" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt.hpp" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt_config.h" />

Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -264,6 +264,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\libopenmpt\libopenmpt.h">
       <Filter>libopenmpt</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -656,6 +656,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\byte_container_with_subtype.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\abi_macros.hpp" />

Modified: trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -297,6 +297,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp">
       <Filter>include\nlohmann-json\include\nlohmann</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -809,6 +809,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOConfig.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOCore.hpp" />

Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -363,6 +363,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp">
       <Filter>include\asiomodern\include\ASIOModern</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -677,6 +677,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOConfig.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOCore.hpp" />

Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -312,6 +312,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp">
       <Filter>include\asiomodern\include\ASIOModern</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -809,6 +809,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOConfig.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOCore.hpp" />

Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -363,6 +363,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp">
       <Filter>include\asiomodern\include\ASIOModern</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -809,6 +809,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOConfig.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOCore.hpp" />

Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -363,6 +363,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp">
       <Filter>include\asiomodern\include\ASIOModern</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -683,6 +683,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt.h" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt.hpp" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt_config.h" />

Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -249,6 +249,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\libopenmpt\libopenmpt.h">
       <Filter>libopenmpt</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -683,6 +683,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt.h" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt.hpp" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt_config.h" />

Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -249,6 +249,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\libopenmpt\libopenmpt.h">
       <Filter>libopenmpt</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -761,6 +761,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt.h" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt.hpp" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt_config.h" />

Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -270,6 +270,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\libopenmpt\libopenmpt.h">
       <Filter>libopenmpt</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -701,6 +701,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\byte_container_with_subtype.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\abi_macros.hpp" />

Modified: trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -303,6 +303,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp">
       <Filter>include\nlohmann-json\include\nlohmann</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -1597,6 +1597,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOConfig.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOCore.hpp" />

Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -363,6 +363,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp">
       <Filter>include\asiomodern\include\ASIOModern</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -1333,6 +1333,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOConfig.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOCore.hpp" />

Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -312,6 +312,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp">
       <Filter>include\asiomodern\include\ASIOModern</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -1597,6 +1597,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOConfig.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOCore.hpp" />

Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -363,6 +363,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp">
       <Filter>include\asiomodern\include\ASIOModern</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -1597,6 +1597,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOConfig.hpp" />
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIOCore.hpp" />

Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -363,6 +363,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\asiomodern\include\ASIOModern\ASIO.hpp">
       <Filter>include\asiomodern\include\ASIOModern</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -1345,6 +1345,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt.h" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt.hpp" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt_config.h" />

Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -249,6 +249,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\libopenmpt\libopenmpt.h">
       <Filter>libopenmpt</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -1345,6 +1345,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt.h" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt.hpp" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt_config.h" />

Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -249,6 +249,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\libopenmpt\libopenmpt.h">
       <Filter>libopenmpt</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -1501,6 +1501,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt.h" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt.hpp" />
     <ClInclude Include="..\..\libopenmpt\libopenmpt_config.h" />

Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -270,6 +270,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\libopenmpt\libopenmpt.h">
       <Filter>libopenmpt</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -1381,6 +1381,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude Include="..\..\common\version.h" />
     <ClInclude Include="..\..\common\versionNumber.h" />
+    <ClInclude Include="..\..\common\zlib_helper.h" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\byte_container_with_subtype.hpp" />
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\detail\abi_macros.hpp" />

Modified: trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj.filters	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj.filters	Thu Jun 19 13:34:24 2025	(r23562)
@@ -303,6 +303,9 @@
     <ClInclude Include="..\..\common\versionNumber.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\zlib_helper.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\adl_serializer.hpp">
       <Filter>include\nlohmann-json\include\nlohmann</Filter>
     </ClInclude>

Modified: trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj	Thu Jun 19 12:54:20 2025	(r23561)
+++ trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj	Thu Jun 19 13:34:24 2025	(r23562)
@@ -1375,6 +1375,7 @@
     <ClInclude Include="..\..\common\stdafx.h" />
     <ClInclude ...
 
[truncated message content]

[OMPT-svn-commit] OpenMPT r23561 - in branches/OpenMPT-1.32: . common

From: <sv...@op...> - 2025-06-19 10:54:27

Author: manx
Date: Thu Jun 19 12:54:20 2025
New Revision: 23561
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23561

Log:
Merged revision(s) 23554-23555, 23558 from trunk/OpenMPT:
[Fix] GzipWriter: Move setting input stream after stream initialization.
........
[Fix] GzipWriter: Add missing include.
[Ref] GzipWriter: Other minor cleanups.
........
[Fix] GzipWriter: Handle zlib errors.
........

Modified:
   branches/OpenMPT-1.32/   (props changed)
   branches/OpenMPT-1.32/common/GzipWriter.h

Modified: branches/OpenMPT-1.32/common/GzipWriter.h
==============================================================================
--- branches/OpenMPT-1.32/common/GzipWriter.h	Thu Jun 19 12:53:49 2025	(r23560)
+++ branches/OpenMPT-1.32/common/GzipWriter.h	Thu Jun 19 12:54:20 2025	(r23561)
@@ -12,12 +12,15 @@
 
 #include "openmpt/all/BuildSettings.hpp"
 
-#include "mptString.h"
 #include "mpt/io/io.hpp"
 #include "mpt/io/io_stdstream.hpp"
 
+#include "mptString.h"
+
 #ifdef MPT_WITH_ZLIB
 
+#include <ctime>
+
 #include <zlib.h>
 
 OPENMPT_NAMESPACE_BEGIN
@@ -25,15 +28,31 @@
 inline void WriteGzip(std::ostream &output, std::string &outData, const mpt::ustring &fileName)
 {
 	z_stream strm{};
+	int zlib_errc = Z_OK;
 	strm.avail_in = static_cast<uInt>(outData.size());
 	strm.next_in = reinterpret_cast<Bytef *>(outData.data());
-	if(deflateInit2(&strm, Z_BEST_COMPRESSION, Z_DEFLATED, 15 | 16, 9, Z_DEFAULT_STRATEGY) != Z_OK)
-		throw std::runtime_error{"zlib init failed"};
+	zlib_errc = deflateInit2(&strm, Z_BEST_COMPRESSION, Z_DEFLATED, 15 | 16, 9, Z_DEFAULT_STRATEGY);
+	if(zlib_errc == Z_MEM_ERROR)
+	{
+		mpt::throw_out_of_memory();
+	} else if(zlib_errc < Z_OK)
+	{
+		throw std::runtime_error{"zlib: deflateInit2() failed"};
+	}
 	gz_header gzHeader{};
-	gzHeader.time = static_cast<uLong>(time(nullptr));
+	gzHeader.time = static_cast<uLong>(std::time(nullptr));
 	std::string filenameISO = mpt::ToCharset(mpt::Charset::ISO8859_1, fileName);
 	gzHeader.name = reinterpret_cast<Bytef *>(filenameISO.data());
-	deflateSetHeader(&strm, &gzHeader);
+	zlib_errc = deflateSetHeader(&strm, &gzHeader);
+	if(zlib_errc == Z_MEM_ERROR)
+	{
+		deflateEnd(&strm);
+		mpt::throw_out_of_memory();
+	} else if(zlib_errc < Z_OK)
+	{
+		deflateEnd(&strm);
+		throw std::runtime_error{"zlib: deflateSetHeader() failed"};
+	}
 	try
 	{
 		do
@@ -41,15 +60,33 @@
 			std::array<Bytef, mpt::IO::BUFFERSIZE_TINY> buffer;
 			strm.avail_out = static_cast<uInt>(buffer.size());
 			strm.next_out = buffer.data();
-			deflate(&strm, Z_FINISH);
+			zlib_errc = deflate(&strm, Z_FINISH);
+			if(zlib_errc == Z_BUF_ERROR)
+			{
+				// expected
+			} else if(zlib_errc == Z_MEM_ERROR)
+			{
+				mpt::throw_out_of_memory();
+			} else if(zlib_errc < Z_OK)
+			{
+				throw std::runtime_error{"zlib: deflate() failed"};
+			}
 			mpt::IO::WritePartial(output, buffer, buffer.size() - strm.avail_out);
 		} while(strm.avail_out == 0);
+	} catch(mpt::out_of_memory e)
+	{
 		deflateEnd(&strm);
+		mpt::rethrow_out_of_memory(e);
 	} catch(const std::exception &)
 	{
 		deflateEnd(&strm);
 		throw;
+	} catch(...)
+	{
+		deflateEnd(&strm);
+		throw;
 	}
+	deflateEnd(&strm);
 }
 
 OPENMPT_NAMESPACE_END

[OMPT-svn-commit] OpenMPT r23560 - in branches/OpenMPT-1.32: . unarchiver

From: <sv...@op...> - 2025-06-19 10:53:55

Author: manx
Date: Thu Jun 19 12:53:49 2025
New Revision: 23560
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23560

Log:
Merged revision(s) 23557 from trunk/OpenMPT:
[Fix] Unarchiver: GZIP: Handle zlib errors.
........

Modified:
   branches/OpenMPT-1.32/   (props changed)
   branches/OpenMPT-1.32/unarchiver/ungzip.cpp

Modified: branches/OpenMPT-1.32/unarchiver/ungzip.cpp
==============================================================================
--- branches/OpenMPT-1.32/unarchiver/ungzip.cpp	Thu Jun 19 12:53:22 2025	(r23559)
+++ branches/OpenMPT-1.32/unarchiver/ungzip.cpp	Thu Jun 19 12:53:49 2025	(r23560)
@@ -129,13 +129,20 @@
 
 	// Inflate!
 	z_stream strm{};
+	int zlib_errc = Z_OK;
 	strm.zalloc = Z_NULL;
 	strm.zfree = Z_NULL;
 	strm.opaque = Z_NULL;
 	strm.avail_in = 0;
 	strm.next_in = Z_NULL;
-	if(inflateInit2(&strm, -15) != Z_OK)
+	zlib_errc = inflateInit2(&strm, -15);
+	if(zlib_errc == Z_MEM_ERROR)
+	{
+		return false;
+	} else if(zlib_errc < Z_OK)
+	{
 		return false;
+	}
 	int retVal = Z_OK;
 	uint32 crc = 0;
 	auto bytesLeft = inFile.BytesLeft() - sizeof(GZtrailer);
@@ -150,7 +157,20 @@
 		{
 			strm.avail_out = static_cast<uInt>(outBuffer.size());
 			strm.next_out = mpt::byte_cast<Bytef *>(outBuffer.data());
-			retVal = inflate(&strm, Z_NO_FLUSH);
+			zlib_errc = inflate(&strm, Z_NO_FLUSH);
+			if(zlib_errc == Z_BUF_ERROR)
+			{
+				// expected
+			} else if(zlib_errc == Z_MEM_ERROR)
+			{
+				inflateEnd(&strm);
+				return false;
+			} else if(zlib_errc < Z_OK)
+			{
+				inflateEnd(&strm);
+				return false;
+			}
+			retVal = zlib_errc;
 			const auto output = mpt::as_span(outBuffer.data(), outBuffer.data() + outBuffer.size() - strm.avail_out);
 			crc = crc32(crc, mpt::byte_cast<Bytef *>(output.data()), static_cast<uInt>(output.size()));
 			data.insert(data.end(), output.begin(), output.end());

[OMPT-svn-commit] OpenMPT r23559 - in branches/OpenMPT-1.32: . soundlib

From: <sv...@op...> - 2025-06-19 10:53:28

Author: manx
Date: Thu Jun 19 12:53:22 2025
New Revision: 23559
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23559

Log:
Merged revision(s) 23556 from trunk/OpenMPT:
[Fix] J2B: Handle zlib errors.
........

Modified:
   branches/OpenMPT-1.32/   (props changed)
   branches/OpenMPT-1.32/soundlib/load_j2b.cpp

Modified: branches/OpenMPT-1.32/soundlib/load_j2b.cpp
==============================================================================
--- branches/OpenMPT-1.32/soundlib/load_j2b.cpp	Thu Jun 19 12:51:57 2025	(r23558)
+++ branches/OpenMPT-1.32/soundlib/load_j2b.cpp	Thu Jun 19 12:53:22 2025	(r23559)
@@ -1017,33 +1017,68 @@
 
 	// Header is valid, now unpack the RIFF AM file using inflate
 	z_stream strm{};
-	if(inflateInit(&strm) != Z_OK)
+	int zlib_errc = Z_OK;
+	zlib_errc = inflateInit(&strm);
+	if(zlib_errc == Z_MEM_ERROR)
+	{
+		mpt::throw_out_of_memory();
+	} else if(zlib_errc < Z_OK)
+	{
 		return false;
+	}
 
 	uint32 remainRead = fileHeader.packedLength, remainWrite = fileHeader.unpackedLength, totalWritten = 0;
 	uint32 crc = 0;
-	std::vector<Bytef> amFileData(remainWrite);
+	std::vector<Bytef> amFileData;
 	int retVal = Z_OK;
-	while(remainRead && remainWrite && retVal != Z_STREAM_END)
+	try
 	{
-		Bytef buffer[mpt::IO::BUFFERSIZE_TINY];
-		uint32 readSize = std::min(static_cast<uint32>(sizeof(buffer)), remainRead);
-		file.ReadRaw(mpt::span(buffer, readSize));
-		crc = static_cast<uint32>(crc32(crc, buffer, readSize));
-
-		strm.avail_in = readSize;
-		strm.next_in = buffer;
-		do
+		amFileData.resize(remainWrite);
+		while(remainRead && remainWrite && retVal != Z_STREAM_END)
 		{
-			strm.avail_out = remainWrite;
-			strm.next_out = amFileData.data() + totalWritten;
-			retVal = inflate(&strm, Z_NO_FLUSH);
-			uint32 written = remainWrite - strm.avail_out;
-			totalWritten += written;
-			remainWrite -= written;
-		} while(remainWrite && strm.avail_out == 0);
+			Bytef buffer[mpt::IO::BUFFERSIZE_TINY];
+			uint32 readSize = std::min(static_cast<uint32>(sizeof(buffer)), remainRead);
+			file.ReadRaw(mpt::span(buffer, readSize));
+			crc = static_cast<uint32>(crc32(crc, buffer, readSize));
+
+			strm.avail_in = readSize;
+			strm.next_in = buffer;
+			do
+			{
+				strm.avail_out = remainWrite;
+				strm.next_out = amFileData.data() + totalWritten;
+				zlib_errc = inflate(&strm, Z_NO_FLUSH);
+				if(zlib_errc == Z_BUF_ERROR)
+				{
+					// expected
+				} else if(zlib_errc == Z_MEM_ERROR)
+				{
+					mpt::throw_out_of_memory();
+				} else if(zlib_errc < Z_OK)
+				{
+					inflateEnd(&strm);
+					return false;
+				}
+				retVal = zlib_errc;
+				uint32 written = remainWrite - strm.avail_out;
+				totalWritten += written;
+				remainWrite -= written;
+			} while(remainWrite && strm.avail_out == 0);
 
-		remainRead -= readSize;
+			remainRead -= readSize;
+		}
+	} catch(mpt::out_of_memory e)
+	{
+		inflateEnd(&strm);
+		mpt::rethrow_out_of_memory(e);	
+	} catch(const std::exception &)
+	{
+		inflateEnd(&strm);
+		return false;
+	} catch(...)
+	{
+		inflateEnd(&strm);
+		return false;
 	}
 	inflateEnd(&strm);

[OMPT-svn-commit] OpenMPT r23558 - trunk/OpenMPT/common

From: <sv...@op...> - 2025-06-19 10:52:04

Author: manx
Date: Thu Jun 19 12:51:57 2025
New Revision: 23558
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23558

Log:
[Fix] GzipWriter: Handle zlib errors.

Modified:
   trunk/OpenMPT/common/GzipWriter.h

Modified: trunk/OpenMPT/common/GzipWriter.h
==============================================================================
--- trunk/OpenMPT/common/GzipWriter.h	Thu Jun 19 12:51:42 2025	(r23557)
+++ trunk/OpenMPT/common/GzipWriter.h	Thu Jun 19 12:51:57 2025	(r23558)
@@ -28,15 +28,31 @@
 inline void WriteGzip(std::ostream &output, std::string &outData, const mpt::ustring &fileName)
 {
 	z_stream strm{};
-	if(deflateInit2(&strm, Z_BEST_COMPRESSION, Z_DEFLATED, 15 | 16, 9, Z_DEFAULT_STRATEGY) != Z_OK)
-		throw std::runtime_error{"zlib init failed"};
+	int zlib_errc = Z_OK;
 	strm.avail_in = static_cast<uInt>(outData.size());
 	strm.next_in = mpt::byte_cast<Bytef *>(outData.data());
+	zlib_errc = deflateInit2(&strm, Z_BEST_COMPRESSION, Z_DEFLATED, 15 | 16, 9, Z_DEFAULT_STRATEGY);
+	if(zlib_errc == Z_MEM_ERROR)
+	{
+		mpt::throw_out_of_memory();
+	} else if(zlib_errc < Z_OK)
+	{
+		throw std::runtime_error{"zlib: deflateInit2() failed"};
+	}
 	gz_header gzHeader{};
 	gzHeader.time = static_cast<uLong>(std::time(nullptr));
 	std::string filenameISO = mpt::ToCharset(mpt::Charset::ISO8859_1, fileName);
 	gzHeader.name = mpt::byte_cast<Bytef *>(filenameISO.data());
-	deflateSetHeader(&strm, &gzHeader);
+	zlib_errc = deflateSetHeader(&strm, &gzHeader);
+	if(zlib_errc == Z_MEM_ERROR)
+	{
+		deflateEnd(&strm);
+		mpt::throw_out_of_memory();
+	} else if(zlib_errc < Z_OK)
+	{
+		deflateEnd(&strm);
+		throw std::runtime_error{"zlib: deflateSetHeader() failed"};
+	}
 	try
 	{
 		do
@@ -44,15 +60,33 @@
 			std::array<Bytef, mpt::IO::BUFFERSIZE_TINY> buffer;
 			strm.avail_out = static_cast<uInt>(buffer.size());
 			strm.next_out = buffer.data();
-			deflate(&strm, Z_FINISH);
+			zlib_errc = deflate(&strm, Z_FINISH);
+			if(zlib_errc == Z_BUF_ERROR)
+			{
+				// expected
+			} else if(zlib_errc == Z_MEM_ERROR)
+			{
+				mpt::throw_out_of_memory();
+			} else if(zlib_errc < Z_OK)
+			{
+				throw std::runtime_error{"zlib: deflate() failed"};
+			}
 			mpt::IO::WritePartial(output, buffer, buffer.size() - strm.avail_out);
 		} while(strm.avail_out == 0);
+	} catch(mpt::out_of_memory e)
+	{
 		deflateEnd(&strm);
+		mpt::rethrow_out_of_memory(e);
 	} catch(const std::exception &)
 	{
 		deflateEnd(&strm);
 		throw;
+	} catch(...)
+	{
+		deflateEnd(&strm);
+		throw;
 	}
+	deflateEnd(&strm);
 }
 
 OPENMPT_NAMESPACE_END

[OMPT-svn-commit] OpenMPT r23557 - trunk/OpenMPT/unarchiver

From: <sv...@op...> - 2025-06-19 10:51:54

Author: manx
Date: Thu Jun 19 12:51:42 2025
New Revision: 23557
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23557

Log:
[Fix] Unarchiver: GZIP: Handle zlib errors.

Modified:
   trunk/OpenMPT/unarchiver/ungzip.cpp

Modified: trunk/OpenMPT/unarchiver/ungzip.cpp
==============================================================================
--- trunk/OpenMPT/unarchiver/ungzip.cpp	Thu Jun 19 12:51:22 2025	(r23556)
+++ trunk/OpenMPT/unarchiver/ungzip.cpp	Thu Jun 19 12:51:42 2025	(r23557)
@@ -129,13 +129,20 @@
 
 	// Inflate!
 	z_stream strm{};
+	int zlib_errc = Z_OK;
 	strm.zalloc = Z_NULL;
 	strm.zfree = Z_NULL;
 	strm.opaque = Z_NULL;
 	strm.avail_in = 0;
 	strm.next_in = Z_NULL;
-	if(inflateInit2(&strm, -15) != Z_OK)
+	zlib_errc = inflateInit2(&strm, -15);
+	if(zlib_errc == Z_MEM_ERROR)
+	{
+		return false;
+	} else if(zlib_errc < Z_OK)
+	{
 		return false;
+	}
 	int retVal = Z_OK;
 	uint32 crc = 0;
 	auto bytesLeft = inFile.BytesLeft() - sizeof(GZtrailer);
@@ -150,7 +157,20 @@
 		{
 			strm.avail_out = static_cast<uInt>(outBuffer.size());
 			strm.next_out = mpt::byte_cast<Bytef *>(outBuffer.data());
-			retVal = inflate(&strm, Z_NO_FLUSH);
+			zlib_errc = inflate(&strm, Z_NO_FLUSH);
+			if(zlib_errc == Z_BUF_ERROR)
+			{
+				// expected
+			} else if(zlib_errc == Z_MEM_ERROR)
+			{
+				inflateEnd(&strm);
+				return false;
+			} else if(zlib_errc < Z_OK)
+			{
+				inflateEnd(&strm);
+				return false;
+			}
+			retVal = zlib_errc;
 			const auto output = mpt::as_span(outBuffer.data(), outBuffer.data() + outBuffer.size() - strm.avail_out);
 			crc = crc32(crc, mpt::byte_cast<Bytef *>(output.data()), static_cast<uInt>(output.size()));
 			data.insert(data.end(), output.begin(), output.end());

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

From: <sv...@op...> - 2025-06-19 10:51:33

Author: manx
Date: Thu Jun 19 12:51:22 2025
New Revision: 23556
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23556

Log:
[Fix] J2B: Handle zlib errors.

Modified:
   trunk/OpenMPT/soundlib/load_j2b.cpp

Modified: trunk/OpenMPT/soundlib/load_j2b.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/load_j2b.cpp	Thu Jun 19 11:21:43 2025	(r23555)
+++ trunk/OpenMPT/soundlib/load_j2b.cpp	Thu Jun 19 12:51:22 2025	(r23556)
@@ -1017,33 +1017,68 @@
 
 	// Header is valid, now unpack the RIFF AM file using inflate
 	z_stream strm{};
-	if(inflateInit(&strm) != Z_OK)
+	int zlib_errc = Z_OK;
+	zlib_errc = inflateInit(&strm);
+	if(zlib_errc == Z_MEM_ERROR)
+	{
+		mpt::throw_out_of_memory();
+	} else if(zlib_errc < Z_OK)
+	{
 		return false;
+	}
 
 	uint32 remainRead = fileHeader.packedLength, remainWrite = fileHeader.unpackedLength, totalWritten = 0;
 	uint32 crc = 0;
-	std::vector<Bytef> amFileData(remainWrite);
+	std::vector<Bytef> amFileData;
 	int retVal = Z_OK;
-	while(remainRead && remainWrite && retVal != Z_STREAM_END)
+	try
 	{
-		Bytef buffer[mpt::IO::BUFFERSIZE_TINY];
-		uint32 readSize = std::min(static_cast<uint32>(sizeof(buffer)), remainRead);
-		file.ReadRaw(mpt::span(buffer, readSize));
-		crc = static_cast<uint32>(crc32(crc, buffer, readSize));
-
-		strm.avail_in = readSize;
-		strm.next_in = buffer;
-		do
+		amFileData.resize(remainWrite);
+		while(remainRead && remainWrite && retVal != Z_STREAM_END)
 		{
-			strm.avail_out = remainWrite;
-			strm.next_out = amFileData.data() + totalWritten;
-			retVal = inflate(&strm, Z_NO_FLUSH);
-			uint32 written = remainWrite - strm.avail_out;
-			totalWritten += written;
-			remainWrite -= written;
-		} while(remainWrite && strm.avail_out == 0);
+			Bytef buffer[mpt::IO::BUFFERSIZE_TINY];
+			uint32 readSize = std::min(static_cast<uint32>(sizeof(buffer)), remainRead);
+			file.ReadRaw(mpt::span(buffer, readSize));
+			crc = static_cast<uint32>(crc32(crc, buffer, readSize));
+
+			strm.avail_in = readSize;
+			strm.next_in = buffer;
+			do
+			{
+				strm.avail_out = remainWrite;
+				strm.next_out = amFileData.data() + totalWritten;
+				zlib_errc = inflate(&strm, Z_NO_FLUSH);
+				if(zlib_errc == Z_BUF_ERROR)
+				{
+					// expected
+				} else if(zlib_errc == Z_MEM_ERROR)
+				{
+					mpt::throw_out_of_memory();
+				} else if(zlib_errc < Z_OK)
+				{
+					inflateEnd(&strm);
+					return false;
+				}
+				retVal = zlib_errc;
+				uint32 written = remainWrite - strm.avail_out;
+				totalWritten += written;
+				remainWrite -= written;
+			} while(remainWrite && strm.avail_out == 0);
 
-		remainRead -= readSize;
+			remainRead -= readSize;
+		}
+	} catch(mpt::out_of_memory e)
+	{
+		inflateEnd(&strm);
+		mpt::rethrow_out_of_memory(e);	
+	} catch(const std::exception &)
+	{
+		inflateEnd(&strm);
+		return false;
+	} catch(...)
+	{
+		inflateEnd(&strm);
+		return false;
 	}
 	inflateEnd(&strm);

[OMPT-svn-commit] OpenMPT r23555 - trunk/OpenMPT/common

From: <sv...@op...> - 2025-06-19 09:21:55

Author: manx
Date: Thu Jun 19 11:21:43 2025
New Revision: 23555
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23555

Log:
[Fix] GzipWriter: Add missing include.
[Ref] GzipWriter: Other minor cleanups.

Modified:
   trunk/OpenMPT/common/GzipWriter.h

Modified: trunk/OpenMPT/common/GzipWriter.h
==============================================================================
--- trunk/OpenMPT/common/GzipWriter.h	Thu Jun 19 08:38:58 2025	(r23554)
+++ trunk/OpenMPT/common/GzipWriter.h	Thu Jun 19 11:21:43 2025	(r23555)
@@ -12,12 +12,15 @@
 
 #include "openmpt/all/BuildSettings.hpp"
 
-#include "mptString.h"
 #include "mpt/io/io.hpp"
 #include "mpt/io/io_stdstream.hpp"
 
+#include "mptString.h"
+
 #ifdef MPT_WITH_ZLIB
 
+#include <ctime>
+
 #include <zlib.h>
 
 OPENMPT_NAMESPACE_BEGIN
@@ -30,7 +33,7 @@
 	strm.avail_in = static_cast<uInt>(outData.size());
 	strm.next_in = mpt::byte_cast<Bytef *>(outData.data());
 	gz_header gzHeader{};
-	gzHeader.time = static_cast<uLong>(time(nullptr));
+	gzHeader.time = static_cast<uLong>(std::time(nullptr));
 	std::string filenameISO = mpt::ToCharset(mpt::Charset::ISO8859_1, fileName);
 	gzHeader.name = mpt::byte_cast<Bytef *>(filenameISO.data());
 	deflateSetHeader(&strm, &gzHeader);

[OMPT-svn-commit] OpenMPT r23554 - trunk/OpenMPT/common

From: <sv...@op...> - 2025-06-19 06:39:12

Author: manx
Date: Thu Jun 19 08:38:58 2025
New Revision: 23554
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23554

Log:
[Fix] GzipWriter: Move setting input stream after stream initialization.

Modified:
   trunk/OpenMPT/common/GzipWriter.h

Modified: trunk/OpenMPT/common/GzipWriter.h
==============================================================================
--- trunk/OpenMPT/common/GzipWriter.h	Tue Jun 17 20:14:30 2025	(r23553)
+++ trunk/OpenMPT/common/GzipWriter.h	Thu Jun 19 08:38:58 2025	(r23554)
@@ -25,10 +25,10 @@
 inline void WriteGzip(std::ostream &output, std::string &outData, const mpt::ustring &fileName)
 {
 	z_stream strm{};
-	strm.avail_in = static_cast<uInt>(outData.size());
-	strm.next_in = mpt::byte_cast<Bytef *>(outData.data());
 	if(deflateInit2(&strm, Z_BEST_COMPRESSION, Z_DEFLATED, 15 | 16, 9, Z_DEFAULT_STRATEGY) != Z_OK)
 		throw std::runtime_error{"zlib init failed"};
+	strm.avail_in = static_cast<uInt>(outData.size());
+	strm.next_in = mpt::byte_cast<Bytef *>(outData.data());
 	gz_header gzHeader{};
 	gzHeader.time = static_cast<uLong>(time(nullptr));
 	std::string filenameISO = mpt::ToCharset(mpt::Charset::ISO8859_1, fileName);

[OMPT-svn-commit] OpenMPT r23553 - in branches/OpenMPT-1.32: . sounddsp

From: <sv...@op...> - 2025-06-17 18:14:43

Author: manx
Date: Tue Jun 17 20:14:30 2025
New Revision: 23553
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23553

Log:
Merged revision(s) 23551 from trunk/OpenMPT:
[Ref] Reverb: ftol() should be static.
........

Modified:
   branches/OpenMPT-1.32/   (props changed)
   branches/OpenMPT-1.32/sounddsp/Reverb.cpp

Modified: branches/OpenMPT-1.32/sounddsp/Reverb.cpp
==============================================================================
--- branches/OpenMPT-1.32/sounddsp/Reverb.cpp	Tue Jun 17 20:14:01 2025	(r23552)
+++ branches/OpenMPT-1.32/sounddsp/Reverb.cpp	Tue Jun 17 20:14:30 2025	(r23553)
@@ -159,7 +159,7 @@
 // Implementation
 //
 
-MPT_FORCEINLINE int32 ftol(float f) { return static_cast<int32>(f); }
+static MPT_FORCEINLINE int32 ftol(float f) { return static_cast<int32>(f); }
 
 static void I3dl2_to_Generic(
 				const SNDMIX_REVERB_PROPERTIES *pReverb,

[OMPT-svn-commit] OpenMPT r23552 - trunk/OpenMPT/sounddsp

From: <sv...@op...> - 2025-06-17 18:14:14

Author: manx
Date: Tue Jun 17 20:14:01 2025
New Revision: 23552
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23552

Log:
[Ref] Reverb: gReflectionsPreset can be static.

Modified:
   trunk/OpenMPT/sounddsp/Reverb.cpp

Modified: trunk/OpenMPT/sounddsp/Reverb.cpp
==============================================================================
--- trunk/OpenMPT/sounddsp/Reverb.cpp	Tue Jun 17 20:12:24 2025	(r23551)
+++ trunk/OpenMPT/sounddsp/Reverb.cpp	Tue Jun 17 20:14:01 2025	(r23552)
@@ -157,7 +157,7 @@
 	int16 sGainLL, sGainRR, sGainLR, sGainRL;
 };
 
-const REFLECTIONPRESET gReflectionsPreset[ENVIRONMENT_NUMREFLECTIONS] =
+static const REFLECTIONPRESET gReflectionsPreset[ENVIRONMENT_NUMREFLECTIONS] =
 {
 	// %Delay, ll,    rr,   lr,    rl
 	{0,    9830,   6554,	  0,     0},

[OMPT-svn-commit] OpenMPT r23551 - trunk/OpenMPT/sounddsp

From: <sv...@op...> - 2025-06-17 18:12:31

Author: manx
Date: Tue Jun 17 20:12:24 2025
New Revision: 23551
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23551

Log:
[Ref] Reverb: ftol() should be static.

Modified:
   trunk/OpenMPT/sounddsp/Reverb.cpp

Modified: trunk/OpenMPT/sounddsp/Reverb.cpp
==============================================================================
--- trunk/OpenMPT/sounddsp/Reverb.cpp	Tue Jun 17 16:08:03 2025	(r23550)
+++ trunk/OpenMPT/sounddsp/Reverb.cpp	Tue Jun 17 20:12:24 2025	(r23551)
@@ -175,7 +175,7 @@
 // Implementation
 //
 
-MPT_FORCEINLINE int32 ftol(float f) { return static_cast<int32>(f); }
+static MPT_FORCEINLINE int32 ftol(float f) { return static_cast<int32>(f); }
 
 static void I3dl2_to_Generic(
 				const SNDMIX_REVERB_PROPERTIES *pReverb,

[OMPT-svn-commit] OpenMPT r23550 - trunk/OpenMPT/src/mpt/base

From: <sv...@op...> - 2025-06-17 14:08:14

Author: manx
Date: Tue Jun 17 16:08:03 2025
New Revision: 23550
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23550

Log:
[Ref] mpt/base/macros.hpp: Add version constraints for MSVC attributes.

Modified:
   trunk/OpenMPT/src/mpt/base/macros.hpp

Modified: trunk/OpenMPT/src/mpt/base/macros.hpp
==============================================================================
--- trunk/OpenMPT/src/mpt/base/macros.hpp	Tue Jun 17 15:35:22 2025	(r23549)
+++ trunk/OpenMPT/src/mpt/base/macros.hpp	Tue Jun 17 16:08:03 2025	(r23550)
@@ -16,7 +16,11 @@
 
 
 #if MPT_COMPILER_MSVC
+#if MPT_MSVC_AT_LEAST(2022, 0)
 #define MPT_ATTR_FLATTEN [[msvc::flatten]]
+#else
+#define MPT_ATTR_FLATTEN
+#endif
 #elif MPT_COMPILER_GCC || MPT_COMPILER_CLANG
 #define MPT_ATTR_FLATTEN [[gnu::flatten]]
 #else
@@ -26,7 +30,11 @@
 
 
 #if MPT_COMPILER_MSVC
+#if MPT_MSVC_AT_LEAST(2019, 1) && MPT_CXX_AT_LEAST(20)
 #define MPT_ATTR_NOINLINE [[msvc::noinline]]
+#else
+#define MPT_ATTR_NOINLINE
+#endif
 #elif MPT_COMPILER_GCC || MPT_COMPILER_CLANG
 #define MPT_ATTR_NOINLINE [[gnu::noinline]]
 #else
@@ -36,7 +44,11 @@
 
 
 #if MPT_COMPILER_MSVC
+#if MPT_MSVC_AT_LEAST(2019, 1) && MPT_CXX_AT_LEAST(20)
 #define MPT_ATTR_ALWAYSINLINE [[msvc::forceinline]]
+#else
+#define MPT_ATTR_ALWAYSINLINE
+#endif
 #elif MPT_COMPILER_GCC || MPT_COMPILER_CLANG
 #define MPT_ATTR_ALWAYSINLINE [[gnu::always_inline]]
 #else

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

Flat | Threaded

<< < 1 2 3 4 5 6 .. 948 > >> (Page 4 of 948)