Menu
▾
▴
modplug-svn-commit — OpenMPT subversion commit notifications
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
(10) |
Sep
|
Oct
|
Nov
|
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(1) |
Feb
(2) |
Mar
(3) |
Apr
(2) |
May
(10) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2008 |
Jan
(6) |
Feb
(4) |
Mar
(5) |
Apr
(2) |
May
(1) |
Jun
(1) |
Jul
(4) |
Aug
(6) |
Sep
(2) |
Oct
(9) |
Nov
(1) |
Dec
(4) |
| 2009 |
Jan
(9) |
Feb
(2) |
Mar
(2) |
Apr
(2) |
May
(6) |
Jun
(18) |
Jul
(33) |
Aug
(39) |
Sep
(33) |
Oct
(24) |
Nov
(23) |
Dec
(22) |
| 2010 |
Jan
(29) |
Feb
(32) |
Mar
(51) |
Apr
(17) |
May
(31) |
Jun
(21) |
Jul
(32) |
Aug
(28) |
Sep
(35) |
Oct
(27) |
Nov
(11) |
Dec
(13) |
| 2011 |
Jan
(14) |
Feb
(13) |
Mar
(27) |
Apr
(27) |
May
(28) |
Jun
(20) |
Jul
(43) |
Aug
(52) |
Sep
(66) |
Oct
(61) |
Nov
(11) |
Dec
(8) |
| 2012 |
Jan
(20) |
Feb
(30) |
Mar
(38) |
Apr
(21) |
May
(33) |
Jun
(21) |
Jul
(25) |
Aug
(9) |
Sep
(24) |
Oct
(42) |
Nov
(27) |
Dec
(41) |
| 2013 |
Jan
(20) |
Feb
(35) |
Mar
(156) |
Apr
(298) |
May
(258) |
Jun
(201) |
Jul
(105) |
Aug
(60) |
Sep
(193) |
Oct
(245) |
Nov
(280) |
Dec
(194) |
| 2014 |
Jan
(63) |
Feb
(202) |
Mar
(200) |
Apr
(23) |
May
(53) |
Jun
(105) |
Jul
(18) |
Aug
(26) |
Sep
(110) |
Oct
(187) |
Nov
(97) |
Dec
(74) |
| 2015 |
Jan
(45) |
Feb
(55) |
Mar
(116) |
Apr
(116) |
May
(193) |
Jun
(164) |
Jul
(50) |
Aug
(111) |
Sep
(98) |
Oct
(71) |
Nov
(103) |
Dec
(63) |
| 2016 |
Jan
(33) |
Feb
(101) |
Mar
(182) |
Apr
(139) |
May
(140) |
Jun
(103) |
Jul
(165) |
Aug
(286) |
Sep
(208) |
Oct
(127) |
Nov
(97) |
Dec
(54) |
| 2017 |
Jan
(64) |
Feb
(335) |
Mar
(202) |
Apr
(212) |
May
(139) |
Jun
(127) |
Jul
(294) |
Aug
(154) |
Sep
(170) |
Oct
(152) |
Nov
(156) |
Dec
(62) |
| 2018 |
Jan
(168) |
Feb
(237) |
Mar
(196) |
Apr
(174) |
May
(174) |
Jun
(161) |
Jul
(127) |
Aug
(88) |
Sep
(149) |
Oct
(66) |
Nov
(52) |
Dec
(135) |
| 2019 |
Jan
(146) |
Feb
(126) |
Mar
(104) |
Apr
(58) |
May
(60) |
Jun
(28) |
Jul
(197) |
Aug
(129) |
Sep
(141) |
Oct
(148) |
Nov
(63) |
Dec
(100) |
| 2020 |
Jan
(74) |
Feb
(37) |
Mar
(59) |
Apr
(154) |
May
(194) |
Jun
(133) |
Jul
(313) |
Aug
(197) |
Sep
(49) |
Oct
(162) |
Nov
(143) |
Dec
(57) |
| 2021 |
Jan
(120) |
Feb
(107) |
Mar
(314) |
Apr
(157) |
May
(524) |
Jun
(169) |
Jul
(72) |
Aug
(133) |
Sep
(135) |
Oct
(146) |
Nov
(198) |
Dec
(325) |
| 2022 |
Jan
(409) |
Feb
(249) |
Mar
(138) |
Apr
(95) |
May
(102) |
Jun
(221) |
Jul
(66) |
Aug
(120) |
Sep
(192) |
Oct
(131) |
Nov
(53) |
Dec
(171) |
| 2023 |
Jan
(357) |
Feb
(82) |
Mar
(168) |
Apr
(218) |
May
(196) |
Jun
(86) |
Jul
(115) |
Aug
(49) |
Sep
(190) |
Oct
(102) |
Nov
(45) |
Dec
(76) |
| 2024 |
Jan
(86) |
Feb
(50) |
Mar
(324) |
Apr
(209) |
May
(197) |
Jun
(232) |
Jul
(194) |
Aug
(247) |
Sep
(219) |
Oct
(266) |
Nov
(328) |
Dec
(304) |
| 2025 |
Jan
(191) |
Feb
(115) |
Mar
(137) |
Apr
(32) |
May
(126) |
Jun
(403) |
Jul
(72) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@op...> - 2025-03-07 20:14:37
|
Author: manx Date: Fri Mar 7 21:14:20 2025 New Revision: 22996 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22996 Log: Merged revision(s) 21890, 21902 from trunk/OpenMPT: [Fix] Vorbis: Fix ARM64EC build. ........ [Fix] Vorbis: r21890 broken non-MSVC SSE2 builds. ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/include/vorbis/OpenMPT.txt branches/OpenMPT-1.28/include/vorbis/lib/os.h Modified: branches/OpenMPT-1.28/include/vorbis/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.28/include/vorbis/OpenMPT.txt Fri Mar 7 21:13:50 2025 (r22995) +++ branches/OpenMPT-1.28/include/vorbis/OpenMPT.txt Fri Mar 7 21:14:20 2025 (r22996) @@ -5,6 +5,7 @@ - https://github.com/xiph/vorbis/pull/100 and https://github.com/xiph/vorbis/pull/101 have been applied. - GCC warnings in lib/lpc.c and lib/psy.c have been silenced. +- os.h has been modified to build for ARM64EC. - All modifications have been marked with /* OpenMPT */. - For building, premake is used to generate Visual Studio project files. See ../build/premake/ for details. Modified: branches/OpenMPT-1.28/include/vorbis/lib/os.h ============================================================================== --- branches/OpenMPT-1.28/include/vorbis/lib/os.h Fri Mar 7 21:13:50 2025 (r22995) +++ branches/OpenMPT-1.28/include/vorbis/lib/os.h Fri Mar 7 21:14:20 2025 (r22996) @@ -151,6 +151,9 @@ typedef ogg_int16_t vorbis_fpu_control; +#if defined(_MSC_VER) /* OpenMPT */ +#include <intrin.h> /* OpenMPT */ +#endif /* OpenMPT */ #include <emmintrin.h> static __inline int vorbis_ftoi(double f){ return _mm_cvtsd_si32(_mm_load_sd(&f)); |
|
From: <sv...@op...> - 2025-03-07 20:14:02
|
Author: manx Date: Fri Mar 7 21:13:50 2025 New Revision: 22995 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22995 Log: Merged revision(s) 21890, 21902 from trunk/OpenMPT: [Fix] Vorbis: Fix ARM64EC build. ........ [Fix] Vorbis: r21890 broken non-MSVC SSE2 builds. ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/include/vorbis/OpenMPT.txt branches/OpenMPT-1.29/include/vorbis/lib/os.h Modified: branches/OpenMPT-1.29/include/vorbis/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.29/include/vorbis/OpenMPT.txt Fri Mar 7 21:13:04 2025 (r22994) +++ branches/OpenMPT-1.29/include/vorbis/OpenMPT.txt Fri Mar 7 21:13:50 2025 (r22995) @@ -5,6 +5,7 @@ - https://github.com/xiph/vorbis/pull/100 and https://github.com/xiph/vorbis/pull/101 have been applied. - GCC warnings in lib/lpc.c and lib/psy.c have been silenced. +- os.h has been modified to build for ARM64EC. - All modifications have been marked with /* OpenMPT */. - For building, premake is used to generate Visual Studio project files. See ../build/premake/ for details. Modified: branches/OpenMPT-1.29/include/vorbis/lib/os.h ============================================================================== --- branches/OpenMPT-1.29/include/vorbis/lib/os.h Fri Mar 7 21:13:04 2025 (r22994) +++ branches/OpenMPT-1.29/include/vorbis/lib/os.h Fri Mar 7 21:13:50 2025 (r22995) @@ -151,6 +151,9 @@ typedef ogg_int16_t vorbis_fpu_control; +#if defined(_MSC_VER) /* OpenMPT */ +#include <intrin.h> /* OpenMPT */ +#endif /* OpenMPT */ #include <emmintrin.h> static __inline int vorbis_ftoi(double f){ return _mm_cvtsd_si32(_mm_load_sd(&f)); |
|
From: <sv...@op...> - 2025-03-07 20:13:21
|
Author: manx Date: Fri Mar 7 21:13:04 2025 New Revision: 22994 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22994 Log: Merged revision(s) 21890, 21902 from trunk/OpenMPT: [Fix] Vorbis: Fix ARM64EC build. ........ [Fix] Vorbis: r21890 broken non-MSVC SSE2 builds. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/include/vorbis/OpenMPT.txt branches/OpenMPT-1.30/include/vorbis/lib/os.h Modified: branches/OpenMPT-1.30/include/vorbis/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.30/include/vorbis/OpenMPT.txt Fri Mar 7 21:11:54 2025 (r22993) +++ branches/OpenMPT-1.30/include/vorbis/OpenMPT.txt Fri Mar 7 21:13:04 2025 (r22994) @@ -6,6 +6,7 @@ - https://github.com/xiph/vorbis/pull/100 and https://github.com/xiph/vorbis/pull/101 have been applied. - GCC warnings in lib/lpc.c and lib/psy.c have been silenced. +- os.h has been modified to build for ARM64EC. - All modifications have been marked with /* OpenMPT */. - For building, premake is used to generate Visual Studio project files. See ../build/premake/ for details. Modified: branches/OpenMPT-1.30/include/vorbis/lib/os.h ============================================================================== --- branches/OpenMPT-1.30/include/vorbis/lib/os.h Fri Mar 7 21:11:54 2025 (r22993) +++ branches/OpenMPT-1.30/include/vorbis/lib/os.h Fri Mar 7 21:13:04 2025 (r22994) @@ -153,6 +153,9 @@ typedef ogg_int16_t vorbis_fpu_control; +#if defined(_MSC_VER) /* OpenMPT */ +#include <intrin.h> /* OpenMPT */ +#endif /* OpenMPT */ #include <emmintrin.h> static __inline int vorbis_ftoi(double f){ return _mm_cvtsd_si32(_mm_load_sd(&f)); |
|
From: <sv...@op...> - 2025-03-07 20:12:16
|
Author: manx Date: Fri Mar 7 21:11:54 2025 New Revision: 22993 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22993 Log: Merged revision(s) 22985 from trunk/OpenMPT: [Fix] ogg: Apply <https://gitlab.xiph.org/xiph/ogg/-/commit/7cf42ea17aef7bc1b7b21af70724840a96c2e7d0>. ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/include/ogg/OpenMPT.txt branches/OpenMPT-1.28/include/ogg/src/bitwise.c branches/OpenMPT-1.28/include/ogg/src/framing.c Modified: branches/OpenMPT-1.28/include/ogg/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.28/include/ogg/OpenMPT.txt Fri Mar 7 21:10:09 2025 (r22992) +++ branches/OpenMPT-1.28/include/ogg/OpenMPT.txt Fri Mar 7 21:11:54 2025 (r22993) @@ -1,7 +1,9 @@ libogg library version 1.3.5 (2021-06-04). The following changes have been made: -- Obviously, unnecessary folders and files (documentation, makefiles, etc.) have - been removed. -- win32/ogg.def has been modified to not override the linker library name. -- For building, premake is used to generate Visual Studio project files. - See ../build/premake/ for details. + * Obviously, unnecessary folders and files (documentation, makefiles, etc.) + have been removed. + * The following commits have been applied: + * https://gitlab.xiph.org/xiph/ogg/-/commit/7cf42ea17aef7bc1b7b21af70724840a96c2e7d0 + * win32/ogg.def has been modified to not override the linker library name. + * For building, premake is used to generate Visual Studio project files. + See ../build/premake/ for details. Modified: branches/OpenMPT-1.28/include/ogg/src/bitwise.c ============================================================================== --- branches/OpenMPT-1.28/include/ogg/src/bitwise.c Fri Mar 7 21:10:09 2025 (r22992) +++ branches/OpenMPT-1.28/include/ogg/src/bitwise.c Fri Mar 7 21:11:54 2025 (r22993) @@ -284,13 +284,13 @@ ret=b->ptr[0]>>b->endbit; if(bits>8){ - ret|=b->ptr[1]<<(8-b->endbit); + ret|=(unsigned long)b->ptr[1]<<(8-b->endbit); if(bits>16){ - ret|=b->ptr[2]<<(16-b->endbit); + ret|=(unsigned long)b->ptr[2]<<(16-b->endbit); if(bits>24){ - ret|=b->ptr[3]<<(24-b->endbit); + ret|=(unsigned long)b->ptr[3]<<(24-b->endbit); if(bits>32 && b->endbit) - ret|=b->ptr[4]<<(32-b->endbit); + ret|=(unsigned long)b->ptr[4]<<(32-b->endbit); } } } @@ -313,13 +313,13 @@ else if(!bits)return(0L); } - ret=b->ptr[0]<<(24+b->endbit); + ret=(unsigned long)b->ptr[0]<<(24+b->endbit); if(bits>8){ - ret|=b->ptr[1]<<(16+b->endbit); + ret|=(unsigned long)b->ptr[1]<<(16+b->endbit); if(bits>16){ - ret|=b->ptr[2]<<(8+b->endbit); + ret|=(unsigned long)b->ptr[2]<<(8+b->endbit); if(bits>24){ - ret|=b->ptr[3]<<(b->endbit); + ret|=(unsigned long)b->ptr[3]<<(b->endbit); if(bits>32 && b->endbit) ret|=b->ptr[4]>>(8-b->endbit); } @@ -389,13 +389,13 @@ ret=b->ptr[0]>>b->endbit; if(bits>8){ - ret|=b->ptr[1]<<(8-b->endbit); + ret|=(unsigned long)b->ptr[1]<<(8-b->endbit); if(bits>16){ - ret|=b->ptr[2]<<(16-b->endbit); + ret|=(unsigned long)b->ptr[2]<<(16-b->endbit); if(bits>24){ - ret|=b->ptr[3]<<(24-b->endbit); + ret|=(unsigned long)b->ptr[3]<<(24-b->endbit); if(bits>32 && b->endbit){ - ret|=b->ptr[4]<<(32-b->endbit); + ret|=(unsigned long)b->ptr[4]<<(32-b->endbit); } } } @@ -430,13 +430,13 @@ else if(!bits)return(0L); } - ret=b->ptr[0]<<(24+b->endbit); + ret=(unsigned long)b->ptr[0]<<(24+b->endbit); if(bits>8){ - ret|=b->ptr[1]<<(16+b->endbit); + ret|=(unsigned long)b->ptr[1]<<(16+b->endbit); if(bits>16){ - ret|=b->ptr[2]<<(8+b->endbit); + ret|=(unsigned long)b->ptr[2]<<(8+b->endbit); if(bits>24){ - ret|=b->ptr[3]<<(b->endbit); + ret|=(unsigned long)b->ptr[3]<<(b->endbit); if(bits>32 && b->endbit) ret|=b->ptr[4]>>(8-b->endbit); } Modified: branches/OpenMPT-1.28/include/ogg/src/framing.c ============================================================================== --- branches/OpenMPT-1.28/include/ogg/src/framing.c Fri Mar 7 21:10:09 2025 (r22992) +++ branches/OpenMPT-1.28/include/ogg/src/framing.c Fri Mar 7 21:11:54 2025 (r22993) @@ -349,12 +349,13 @@ static int ogg_stream_flush_i(ogg_stream_state *os,ogg_page *og, int force, int nfill){ int i; int vals=0; - int maxvals=(os->lacing_fill>255?255:os->lacing_fill); + int maxvals; int bytes=0; long acc=0; ogg_int64_t granule_pos=-1; if(ogg_stream_check(os)) return(0); + maxvals=(os->lacing_fill>255?255:os->lacing_fill); if(maxvals==0) return(0); /* construct a page */ @@ -639,12 +640,15 @@ */ long ogg_sync_pageseek(ogg_sync_state *oy,ogg_page *og){ - unsigned char *page=oy->data+oy->returned; + unsigned char *page; unsigned char *next; - long bytes=oy->fill-oy->returned; + long bytes; if(ogg_sync_check(oy))return 0; + page=oy->data+oy->returned; + bytes=oy->fill-oy->returned; + if(oy->headerbytes==0){ int headerbytes,i; if(bytes<27)return(0); /* not enough for a header */ @@ -1086,11 +1090,11 @@ (int)og->header[4],(int)og->header[5]); fprintf(stderr," granulepos: %d serialno: %d pageno: %ld\n", - (og->header[9]<<24)|(og->header[8]<<16)| + ((unsigned)og->header[9]<<24)|(og->header[8]<<16)| (og->header[7]<<8)|og->header[6], - (og->header[17]<<24)|(og->header[16]<<16)| + ((unsigned)og->header[17]<<24)|(og->header[16]<<16)| (og->header[15]<<8)|og->header[14], - ((long)(og->header[21])<<24)|(og->header[20]<<16)| + ((long)((unsigned)og->header[21])<<24)|(og->header[20]<<16)| (og->header[19]<<8)|og->header[18]); fprintf(stderr," checksum: %02x:%02x:%02x:%02x\n segments: %d (", |
|
From: <sv...@op...> - 2025-03-07 20:10:21
|
Author: manx Date: Fri Mar 7 21:10:09 2025 New Revision: 22992 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22992 Log: Merged revision(s) 22985 from trunk/OpenMPT: [Fix] ogg: Apply <https://gitlab.xiph.org/xiph/ogg/-/commit/7cf42ea17aef7bc1b7b21af70724840a96c2e7d0>. ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/include/ogg/OpenMPT.txt branches/OpenMPT-1.29/include/ogg/src/bitwise.c branches/OpenMPT-1.29/include/ogg/src/framing.c Modified: branches/OpenMPT-1.29/include/ogg/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.29/include/ogg/OpenMPT.txt Fri Mar 7 21:09:26 2025 (r22991) +++ branches/OpenMPT-1.29/include/ogg/OpenMPT.txt Fri Mar 7 21:10:09 2025 (r22992) @@ -1,8 +1,10 @@ libogg library version 1.3.5 (2021-06-04). The following changes have been made: -- Obviously, unnecessary folders and files (documentation, makefiles, etc.) have - been removed. -- ports/makefile/ogg/config_types.h has been added for plain Makefile builds. -- win32/ogg.def has been modified to not override the linker library name. -- For building, premake is used to generate Visual Studio project files. - See ../build/premake/ for details. + * Obviously, unnecessary folders and files (documentation, makefiles, etc.) + have been removed. + * The following commits have been applied: + * https://gitlab.xiph.org/xiph/ogg/-/commit/7cf42ea17aef7bc1b7b21af70724840a96c2e7d0 + * ports/makefile/ogg/config_types.h has been added for plain Makefile builds. + * win32/ogg.def has been modified to not override the linker library name. + * For building, premake is used to generate Visual Studio project files. + See ../build/premake/ for details. Modified: branches/OpenMPT-1.29/include/ogg/src/bitwise.c ============================================================================== --- branches/OpenMPT-1.29/include/ogg/src/bitwise.c Fri Mar 7 21:09:26 2025 (r22991) +++ branches/OpenMPT-1.29/include/ogg/src/bitwise.c Fri Mar 7 21:10:09 2025 (r22992) @@ -284,13 +284,13 @@ ret=b->ptr[0]>>b->endbit; if(bits>8){ - ret|=b->ptr[1]<<(8-b->endbit); + ret|=(unsigned long)b->ptr[1]<<(8-b->endbit); if(bits>16){ - ret|=b->ptr[2]<<(16-b->endbit); + ret|=(unsigned long)b->ptr[2]<<(16-b->endbit); if(bits>24){ - ret|=b->ptr[3]<<(24-b->endbit); + ret|=(unsigned long)b->ptr[3]<<(24-b->endbit); if(bits>32 && b->endbit) - ret|=b->ptr[4]<<(32-b->endbit); + ret|=(unsigned long)b->ptr[4]<<(32-b->endbit); } } } @@ -313,13 +313,13 @@ else if(!bits)return(0L); } - ret=b->ptr[0]<<(24+b->endbit); + ret=(unsigned long)b->ptr[0]<<(24+b->endbit); if(bits>8){ - ret|=b->ptr[1]<<(16+b->endbit); + ret|=(unsigned long)b->ptr[1]<<(16+b->endbit); if(bits>16){ - ret|=b->ptr[2]<<(8+b->endbit); + ret|=(unsigned long)b->ptr[2]<<(8+b->endbit); if(bits>24){ - ret|=b->ptr[3]<<(b->endbit); + ret|=(unsigned long)b->ptr[3]<<(b->endbit); if(bits>32 && b->endbit) ret|=b->ptr[4]>>(8-b->endbit); } @@ -389,13 +389,13 @@ ret=b->ptr[0]>>b->endbit; if(bits>8){ - ret|=b->ptr[1]<<(8-b->endbit); + ret|=(unsigned long)b->ptr[1]<<(8-b->endbit); if(bits>16){ - ret|=b->ptr[2]<<(16-b->endbit); + ret|=(unsigned long)b->ptr[2]<<(16-b->endbit); if(bits>24){ - ret|=b->ptr[3]<<(24-b->endbit); + ret|=(unsigned long)b->ptr[3]<<(24-b->endbit); if(bits>32 && b->endbit){ - ret|=b->ptr[4]<<(32-b->endbit); + ret|=(unsigned long)b->ptr[4]<<(32-b->endbit); } } } @@ -430,13 +430,13 @@ else if(!bits)return(0L); } - ret=b->ptr[0]<<(24+b->endbit); + ret=(unsigned long)b->ptr[0]<<(24+b->endbit); if(bits>8){ - ret|=b->ptr[1]<<(16+b->endbit); + ret|=(unsigned long)b->ptr[1]<<(16+b->endbit); if(bits>16){ - ret|=b->ptr[2]<<(8+b->endbit); + ret|=(unsigned long)b->ptr[2]<<(8+b->endbit); if(bits>24){ - ret|=b->ptr[3]<<(b->endbit); + ret|=(unsigned long)b->ptr[3]<<(b->endbit); if(bits>32 && b->endbit) ret|=b->ptr[4]>>(8-b->endbit); } Modified: branches/OpenMPT-1.29/include/ogg/src/framing.c ============================================================================== --- branches/OpenMPT-1.29/include/ogg/src/framing.c Fri Mar 7 21:09:26 2025 (r22991) +++ branches/OpenMPT-1.29/include/ogg/src/framing.c Fri Mar 7 21:10:09 2025 (r22992) @@ -349,12 +349,13 @@ static int ogg_stream_flush_i(ogg_stream_state *os,ogg_page *og, int force, int nfill){ int i; int vals=0; - int maxvals=(os->lacing_fill>255?255:os->lacing_fill); + int maxvals; int bytes=0; long acc=0; ogg_int64_t granule_pos=-1; if(ogg_stream_check(os)) return(0); + maxvals=(os->lacing_fill>255?255:os->lacing_fill); if(maxvals==0) return(0); /* construct a page */ @@ -639,12 +640,15 @@ */ long ogg_sync_pageseek(ogg_sync_state *oy,ogg_page *og){ - unsigned char *page=oy->data+oy->returned; + unsigned char *page; unsigned char *next; - long bytes=oy->fill-oy->returned; + long bytes; if(ogg_sync_check(oy))return 0; + page=oy->data+oy->returned; + bytes=oy->fill-oy->returned; + if(oy->headerbytes==0){ int headerbytes,i; if(bytes<27)return(0); /* not enough for a header */ @@ -1086,11 +1090,11 @@ (int)og->header[4],(int)og->header[5]); fprintf(stderr," granulepos: %d serialno: %d pageno: %ld\n", - (og->header[9]<<24)|(og->header[8]<<16)| + ((unsigned)og->header[9]<<24)|(og->header[8]<<16)| (og->header[7]<<8)|og->header[6], - (og->header[17]<<24)|(og->header[16]<<16)| + ((unsigned)og->header[17]<<24)|(og->header[16]<<16)| (og->header[15]<<8)|og->header[14], - ((long)(og->header[21])<<24)|(og->header[20]<<16)| + ((long)((unsigned)og->header[21])<<24)|(og->header[20]<<16)| (og->header[19]<<8)|og->header[18]); fprintf(stderr," checksum: %02x:%02x:%02x:%02x\n segments: %d (", |
|
From: <sv...@op...> - 2025-03-07 20:09:37
|
Author: manx Date: Fri Mar 7 21:09:26 2025 New Revision: 22991 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22991 Log: Merged revision(s) 20682-20683 from trunk/OpenMPT: [Var] vorbis: Silence GCC false-positive warning. ........ [Var] vorbis: Silence GCC false-positive warning. ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/include/vorbis/OpenMPT.txt branches/OpenMPT-1.28/include/vorbis/lib/lpc.c branches/OpenMPT-1.28/include/vorbis/lib/psy.c Modified: branches/OpenMPT-1.28/include/vorbis/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.28/include/vorbis/OpenMPT.txt Fri Mar 7 21:08:57 2025 (r22990) +++ branches/OpenMPT-1.28/include/vorbis/OpenMPT.txt Fri Mar 7 21:09:26 2025 (r22991) @@ -4,6 +4,7 @@ symbian, test, vq) have been removed. - https://github.com/xiph/vorbis/pull/100 and https://github.com/xiph/vorbis/pull/101 have been applied. +- GCC warnings in lib/lpc.c and lib/psy.c have been silenced. - All modifications have been marked with /* OpenMPT */. - For building, premake is used to generate Visual Studio project files. See ../build/premake/ for details. Modified: branches/OpenMPT-1.28/include/vorbis/lib/lpc.c ============================================================================== --- branches/OpenMPT-1.28/include/vorbis/lib/lpc.c Fri Mar 7 21:08:57 2025 (r22990) +++ branches/OpenMPT-1.28/include/vorbis/lib/lpc.c Fri Mar 7 21:09:26 2025 (r22991) @@ -75,7 +75,14 @@ /* Generate lpc coefficients from autocorr values */ /* set our noise floor to about -100dB */ +#if defined(__GNUC__) && !defined(__clang__) && !defined(_MSC_VER) /* OpenMPT */ +#pragma GCC diagnostic push /* OpenMPT */ +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" /* OpenMPT */ +#endif /* OpenMPT */ error=aut[0] * (1. + 1e-10); +#if defined(__GNUC__) && !defined(__clang__) && !defined(_MSC_VER) /* OpenMPT */ +#pragma GCC diagnostic pop /* OpenMPT */ +#endif /* OpenMPT */ epsilon=1e-9*aut[0]+1e-10; for(i=0;i<m;i++){ Modified: branches/OpenMPT-1.28/include/vorbis/lib/psy.c ============================================================================== --- branches/OpenMPT-1.28/include/vorbis/lib/psy.c Fri Mar 7 21:08:57 2025 (r22990) +++ branches/OpenMPT-1.28/include/vorbis/lib/psy.c Fri Mar 7 21:09:26 2025 (r22991) @@ -711,8 +711,15 @@ for(i=0;i<n;i++)work[i]=logmdct[i]-logmask[i]; +#if defined(__GNUC__) && !defined(__clang__) && !defined(_MSC_VER) /* OpenMPT */ +#pragma GCC diagnostic push /* OpenMPT */ +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" /* OpenMPT */ +#endif /* OpenMPT */ bark_noise_hybridmp(n,p->bark,work,logmask,0., p->vi->noisewindowfixed); +#if defined(__GNUC__) && !defined(__clang__) && !defined(_MSC_VER) /* OpenMPT */ +#pragma GCC diagnostic pop /* OpenMPT */ +#endif /* OpenMPT */ for(i=0;i<n;i++)work[i]=logmdct[i]-work[i]; |
|
From: <sv...@op...> - 2025-03-07 20:09:15
|
Author: manx Date: Fri Mar 7 21:08:57 2025 New Revision: 22990 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22990 Log: Merged revision(s) 20682-20683 from trunk/OpenMPT: [Var] vorbis: Silence GCC false-positive warning. ........ [Var] vorbis: Silence GCC false-positive warning. ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/include/vorbis/OpenMPT.txt branches/OpenMPT-1.29/include/vorbis/lib/lpc.c branches/OpenMPT-1.29/include/vorbis/lib/psy.c Modified: branches/OpenMPT-1.29/include/vorbis/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.29/include/vorbis/OpenMPT.txt Fri Mar 7 21:08:13 2025 (r22989) +++ branches/OpenMPT-1.29/include/vorbis/OpenMPT.txt Fri Mar 7 21:08:57 2025 (r22990) @@ -4,6 +4,7 @@ symbian, test, vq) have been removed. - https://github.com/xiph/vorbis/pull/100 and https://github.com/xiph/vorbis/pull/101 have been applied. +- GCC warnings in lib/lpc.c and lib/psy.c have been silenced. - All modifications have been marked with /* OpenMPT */. - For building, premake is used to generate Visual Studio project files. See ../build/premake/ for details. Modified: branches/OpenMPT-1.29/include/vorbis/lib/lpc.c ============================================================================== --- branches/OpenMPT-1.29/include/vorbis/lib/lpc.c Fri Mar 7 21:08:13 2025 (r22989) +++ branches/OpenMPT-1.29/include/vorbis/lib/lpc.c Fri Mar 7 21:08:57 2025 (r22990) @@ -75,7 +75,14 @@ /* Generate lpc coefficients from autocorr values */ /* set our noise floor to about -100dB */ +#if defined(__GNUC__) && !defined(__clang__) && !defined(_MSC_VER) /* OpenMPT */ +#pragma GCC diagnostic push /* OpenMPT */ +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" /* OpenMPT */ +#endif /* OpenMPT */ error=aut[0] * (1. + 1e-10); +#if defined(__GNUC__) && !defined(__clang__) && !defined(_MSC_VER) /* OpenMPT */ +#pragma GCC diagnostic pop /* OpenMPT */ +#endif /* OpenMPT */ epsilon=1e-9*aut[0]+1e-10; for(i=0;i<m;i++){ Modified: branches/OpenMPT-1.29/include/vorbis/lib/psy.c ============================================================================== --- branches/OpenMPT-1.29/include/vorbis/lib/psy.c Fri Mar 7 21:08:13 2025 (r22989) +++ branches/OpenMPT-1.29/include/vorbis/lib/psy.c Fri Mar 7 21:08:57 2025 (r22990) @@ -711,8 +711,15 @@ for(i=0;i<n;i++)work[i]=logmdct[i]-logmask[i]; +#if defined(__GNUC__) && !defined(__clang__) && !defined(_MSC_VER) /* OpenMPT */ +#pragma GCC diagnostic push /* OpenMPT */ +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" /* OpenMPT */ +#endif /* OpenMPT */ bark_noise_hybridmp(n,p->bark,work,logmask,0., p->vi->noisewindowfixed); +#if defined(__GNUC__) && !defined(__clang__) && !defined(_MSC_VER) /* OpenMPT */ +#pragma GCC diagnostic pop /* OpenMPT */ +#endif /* OpenMPT */ for(i=0;i<n;i++)work[i]=logmdct[i]-work[i]; |
|
From: <sv...@op...> - 2025-03-07 20:08:20
|
Author: manx Date: Fri Mar 7 21:08:13 2025 New Revision: 22989 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22989 Log: Merged revision(s) 20682-20683 from trunk/OpenMPT: [Var] vorbis: Silence GCC false-positive warning. ........ [Var] vorbis: Silence GCC false-positive warning. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/include/vorbis/OpenMPT.txt branches/OpenMPT-1.30/include/vorbis/lib/lpc.c branches/OpenMPT-1.30/include/vorbis/lib/psy.c Modified: branches/OpenMPT-1.30/include/vorbis/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.30/include/vorbis/OpenMPT.txt Fri Mar 7 21:02:10 2025 (r22988) +++ branches/OpenMPT-1.30/include/vorbis/OpenMPT.txt Fri Mar 7 21:08:13 2025 (r22989) @@ -5,6 +5,7 @@ - Building for DJGPP has been fixed. - https://github.com/xiph/vorbis/pull/100 and https://github.com/xiph/vorbis/pull/101 have been applied. +- GCC warnings in lib/lpc.c and lib/psy.c have been silenced. - All modifications have been marked with /* OpenMPT */. - For building, premake is used to generate Visual Studio project files. See ../build/premake/ for details. Modified: branches/OpenMPT-1.30/include/vorbis/lib/lpc.c ============================================================================== --- branches/OpenMPT-1.30/include/vorbis/lib/lpc.c Fri Mar 7 21:02:10 2025 (r22988) +++ branches/OpenMPT-1.30/include/vorbis/lib/lpc.c Fri Mar 7 21:08:13 2025 (r22989) @@ -75,7 +75,14 @@ /* Generate lpc coefficients from autocorr values */ /* set our noise floor to about -100dB */ +#if defined(__GNUC__) && !defined(__clang__) && !defined(_MSC_VER) /* OpenMPT */ +#pragma GCC diagnostic push /* OpenMPT */ +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" /* OpenMPT */ +#endif /* OpenMPT */ error=aut[0] * (1. + 1e-10); +#if defined(__GNUC__) && !defined(__clang__) && !defined(_MSC_VER) /* OpenMPT */ +#pragma GCC diagnostic pop /* OpenMPT */ +#endif /* OpenMPT */ epsilon=1e-9*aut[0]+1e-10; for(i=0;i<m;i++){ Modified: branches/OpenMPT-1.30/include/vorbis/lib/psy.c ============================================================================== --- branches/OpenMPT-1.30/include/vorbis/lib/psy.c Fri Mar 7 21:02:10 2025 (r22988) +++ branches/OpenMPT-1.30/include/vorbis/lib/psy.c Fri Mar 7 21:08:13 2025 (r22989) @@ -711,8 +711,15 @@ for(i=0;i<n;i++)work[i]=logmdct[i]-logmask[i]; +#if defined(__GNUC__) && !defined(__clang__) && !defined(_MSC_VER) /* OpenMPT */ +#pragma GCC diagnostic push /* OpenMPT */ +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" /* OpenMPT */ +#endif /* OpenMPT */ bark_noise_hybridmp(n,p->bark,work,logmask,0., p->vi->noisewindowfixed); +#if defined(__GNUC__) && !defined(__clang__) && !defined(_MSC_VER) /* OpenMPT */ +#pragma GCC diagnostic pop /* OpenMPT */ +#endif /* OpenMPT */ for(i=0;i<n;i++)work[i]=logmdct[i]-work[i]; |
|
From: <sv...@op...> - 2025-03-07 20:02:25
|
Author: manx Date: Fri Mar 7 21:02:10 2025 New Revision: 22988 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22988 Log: Merged revision(s) 22985 from trunk/OpenMPT: [Fix] ogg: Apply <https://gitlab.xiph.org/xiph/ogg/-/commit/7cf42ea17aef7bc1b7b21af70724840a96c2e7d0>. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/include/ogg/OpenMPT.txt branches/OpenMPT-1.30/include/ogg/src/bitwise.c branches/OpenMPT-1.30/include/ogg/src/framing.c Modified: branches/OpenMPT-1.30/include/ogg/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.30/include/ogg/OpenMPT.txt Fri Mar 7 20:58:53 2025 (r22987) +++ branches/OpenMPT-1.30/include/ogg/OpenMPT.txt Fri Mar 7 21:02:10 2025 (r22988) @@ -1,8 +1,10 @@ libogg library version 1.3.5 (2021-06-04). The following changes have been made: -- Obviously, unnecessary folders and files (documentation, makefiles, etc.) have - been removed. -- ports/makefile/ogg/config_types.h has been added for plain Makefile builds. -- win32/ogg.def has been modified to not override the linker library name. -- For building, premake is used to generate Visual Studio project files. - See ../build/premake/ for details. + * Obviously, unnecessary folders and files (documentation, makefiles, etc.) + have been removed. + * The following commits have been applied: + * https://gitlab.xiph.org/xiph/ogg/-/commit/7cf42ea17aef7bc1b7b21af70724840a96c2e7d0 + * ports/makefile/ogg/config_types.h has been added for plain Makefile builds. + * win32/ogg.def has been modified to not override the linker library name. + * For building, premake is used to generate Visual Studio project files. + See ../build/premake/ for details. Modified: branches/OpenMPT-1.30/include/ogg/src/bitwise.c ============================================================================== --- branches/OpenMPT-1.30/include/ogg/src/bitwise.c Fri Mar 7 20:58:53 2025 (r22987) +++ branches/OpenMPT-1.30/include/ogg/src/bitwise.c Fri Mar 7 21:02:10 2025 (r22988) @@ -284,13 +284,13 @@ ret=b->ptr[0]>>b->endbit; if(bits>8){ - ret|=b->ptr[1]<<(8-b->endbit); + ret|=(unsigned long)b->ptr[1]<<(8-b->endbit); if(bits>16){ - ret|=b->ptr[2]<<(16-b->endbit); + ret|=(unsigned long)b->ptr[2]<<(16-b->endbit); if(bits>24){ - ret|=b->ptr[3]<<(24-b->endbit); + ret|=(unsigned long)b->ptr[3]<<(24-b->endbit); if(bits>32 && b->endbit) - ret|=b->ptr[4]<<(32-b->endbit); + ret|=(unsigned long)b->ptr[4]<<(32-b->endbit); } } } @@ -313,13 +313,13 @@ else if(!bits)return(0L); } - ret=b->ptr[0]<<(24+b->endbit); + ret=(unsigned long)b->ptr[0]<<(24+b->endbit); if(bits>8){ - ret|=b->ptr[1]<<(16+b->endbit); + ret|=(unsigned long)b->ptr[1]<<(16+b->endbit); if(bits>16){ - ret|=b->ptr[2]<<(8+b->endbit); + ret|=(unsigned long)b->ptr[2]<<(8+b->endbit); if(bits>24){ - ret|=b->ptr[3]<<(b->endbit); + ret|=(unsigned long)b->ptr[3]<<(b->endbit); if(bits>32 && b->endbit) ret|=b->ptr[4]>>(8-b->endbit); } @@ -389,13 +389,13 @@ ret=b->ptr[0]>>b->endbit; if(bits>8){ - ret|=b->ptr[1]<<(8-b->endbit); + ret|=(unsigned long)b->ptr[1]<<(8-b->endbit); if(bits>16){ - ret|=b->ptr[2]<<(16-b->endbit); + ret|=(unsigned long)b->ptr[2]<<(16-b->endbit); if(bits>24){ - ret|=b->ptr[3]<<(24-b->endbit); + ret|=(unsigned long)b->ptr[3]<<(24-b->endbit); if(bits>32 && b->endbit){ - ret|=b->ptr[4]<<(32-b->endbit); + ret|=(unsigned long)b->ptr[4]<<(32-b->endbit); } } } @@ -430,13 +430,13 @@ else if(!bits)return(0L); } - ret=b->ptr[0]<<(24+b->endbit); + ret=(unsigned long)b->ptr[0]<<(24+b->endbit); if(bits>8){ - ret|=b->ptr[1]<<(16+b->endbit); + ret|=(unsigned long)b->ptr[1]<<(16+b->endbit); if(bits>16){ - ret|=b->ptr[2]<<(8+b->endbit); + ret|=(unsigned long)b->ptr[2]<<(8+b->endbit); if(bits>24){ - ret|=b->ptr[3]<<(b->endbit); + ret|=(unsigned long)b->ptr[3]<<(b->endbit); if(bits>32 && b->endbit) ret|=b->ptr[4]>>(8-b->endbit); } Modified: branches/OpenMPT-1.30/include/ogg/src/framing.c ============================================================================== --- branches/OpenMPT-1.30/include/ogg/src/framing.c Fri Mar 7 20:58:53 2025 (r22987) +++ branches/OpenMPT-1.30/include/ogg/src/framing.c Fri Mar 7 21:02:10 2025 (r22988) @@ -349,12 +349,13 @@ static int ogg_stream_flush_i(ogg_stream_state *os,ogg_page *og, int force, int nfill){ int i; int vals=0; - int maxvals=(os->lacing_fill>255?255:os->lacing_fill); + int maxvals; int bytes=0; long acc=0; ogg_int64_t granule_pos=-1; if(ogg_stream_check(os)) return(0); + maxvals=(os->lacing_fill>255?255:os->lacing_fill); if(maxvals==0) return(0); /* construct a page */ @@ -639,12 +640,15 @@ */ long ogg_sync_pageseek(ogg_sync_state *oy,ogg_page *og){ - unsigned char *page=oy->data+oy->returned; + unsigned char *page; unsigned char *next; - long bytes=oy->fill-oy->returned; + long bytes; if(ogg_sync_check(oy))return 0; + page=oy->data+oy->returned; + bytes=oy->fill-oy->returned; + if(oy->headerbytes==0){ int headerbytes,i; if(bytes<27)return(0); /* not enough for a header */ @@ -1086,11 +1090,11 @@ (int)og->header[4],(int)og->header[5]); fprintf(stderr," granulepos: %d serialno: %d pageno: %ld\n", - (og->header[9]<<24)|(og->header[8]<<16)| + ((unsigned)og->header[9]<<24)|(og->header[8]<<16)| (og->header[7]<<8)|og->header[6], - (og->header[17]<<24)|(og->header[16]<<16)| + ((unsigned)og->header[17]<<24)|(og->header[16]<<16)| (og->header[15]<<8)|og->header[14], - ((long)(og->header[21])<<24)|(og->header[20]<<16)| + ((long)((unsigned)og->header[21])<<24)|(og->header[20]<<16)| (og->header[19]<<8)|og->header[18]); fprintf(stderr," checksum: %02x:%02x:%02x:%02x\n segments: %d (", |
|
From: <sv...@op...> - 2025-03-07 19:59:04
|
Author: manx Date: Fri Mar 7 20:58:53 2025 New Revision: 22987 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22987 Log: Merged revision(s) 22985 from trunk/OpenMPT: [Fix] ogg: Apply <https://gitlab.xiph.org/xiph/ogg/-/commit/7cf42ea17aef7bc1b7b21af70724840a96c2e7d0>. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/include/ogg/OpenMPT.txt branches/OpenMPT-1.31/include/ogg/src/bitwise.c branches/OpenMPT-1.31/include/ogg/src/framing.c Modified: branches/OpenMPT-1.31/include/ogg/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.31/include/ogg/OpenMPT.txt Fri Mar 7 20:58:15 2025 (r22986) +++ branches/OpenMPT-1.31/include/ogg/OpenMPT.txt Fri Mar 7 20:58:53 2025 (r22987) @@ -1,8 +1,10 @@ libogg library version 1.3.5 (2021-06-04). The following changes have been made: -- Obviously, unnecessary folders and files (documentation, makefiles, etc.) have - been removed. -- ports/makefile/ogg/config_types.h has been added for plain Makefile builds. -- win32/ogg.def has been modified to not override the linker library name. -- For building, premake is used to generate Visual Studio project files. - See ../build/premake/ for details. + * Obviously, unnecessary folders and files (documentation, makefiles, etc.) + have been removed. + * The following commits have been applied: + * https://gitlab.xiph.org/xiph/ogg/-/commit/7cf42ea17aef7bc1b7b21af70724840a96c2e7d0 + * ports/makefile/ogg/config_types.h has been added for plain Makefile builds. + * win32/ogg.def has been modified to not override the linker library name. + * For building, premake is used to generate Visual Studio project files. + See ../build/premake/ for details. Modified: branches/OpenMPT-1.31/include/ogg/src/bitwise.c ============================================================================== --- branches/OpenMPT-1.31/include/ogg/src/bitwise.c Fri Mar 7 20:58:15 2025 (r22986) +++ branches/OpenMPT-1.31/include/ogg/src/bitwise.c Fri Mar 7 20:58:53 2025 (r22987) @@ -284,13 +284,13 @@ ret=b->ptr[0]>>b->endbit; if(bits>8){ - ret|=b->ptr[1]<<(8-b->endbit); + ret|=(unsigned long)b->ptr[1]<<(8-b->endbit); if(bits>16){ - ret|=b->ptr[2]<<(16-b->endbit); + ret|=(unsigned long)b->ptr[2]<<(16-b->endbit); if(bits>24){ - ret|=b->ptr[3]<<(24-b->endbit); + ret|=(unsigned long)b->ptr[3]<<(24-b->endbit); if(bits>32 && b->endbit) - ret|=b->ptr[4]<<(32-b->endbit); + ret|=(unsigned long)b->ptr[4]<<(32-b->endbit); } } } @@ -313,13 +313,13 @@ else if(!bits)return(0L); } - ret=b->ptr[0]<<(24+b->endbit); + ret=(unsigned long)b->ptr[0]<<(24+b->endbit); if(bits>8){ - ret|=b->ptr[1]<<(16+b->endbit); + ret|=(unsigned long)b->ptr[1]<<(16+b->endbit); if(bits>16){ - ret|=b->ptr[2]<<(8+b->endbit); + ret|=(unsigned long)b->ptr[2]<<(8+b->endbit); if(bits>24){ - ret|=b->ptr[3]<<(b->endbit); + ret|=(unsigned long)b->ptr[3]<<(b->endbit); if(bits>32 && b->endbit) ret|=b->ptr[4]>>(8-b->endbit); } @@ -389,13 +389,13 @@ ret=b->ptr[0]>>b->endbit; if(bits>8){ - ret|=b->ptr[1]<<(8-b->endbit); + ret|=(unsigned long)b->ptr[1]<<(8-b->endbit); if(bits>16){ - ret|=b->ptr[2]<<(16-b->endbit); + ret|=(unsigned long)b->ptr[2]<<(16-b->endbit); if(bits>24){ - ret|=b->ptr[3]<<(24-b->endbit); + ret|=(unsigned long)b->ptr[3]<<(24-b->endbit); if(bits>32 && b->endbit){ - ret|=b->ptr[4]<<(32-b->endbit); + ret|=(unsigned long)b->ptr[4]<<(32-b->endbit); } } } @@ -430,13 +430,13 @@ else if(!bits)return(0L); } - ret=b->ptr[0]<<(24+b->endbit); + ret=(unsigned long)b->ptr[0]<<(24+b->endbit); if(bits>8){ - ret|=b->ptr[1]<<(16+b->endbit); + ret|=(unsigned long)b->ptr[1]<<(16+b->endbit); if(bits>16){ - ret|=b->ptr[2]<<(8+b->endbit); + ret|=(unsigned long)b->ptr[2]<<(8+b->endbit); if(bits>24){ - ret|=b->ptr[3]<<(b->endbit); + ret|=(unsigned long)b->ptr[3]<<(b->endbit); if(bits>32 && b->endbit) ret|=b->ptr[4]>>(8-b->endbit); } Modified: branches/OpenMPT-1.31/include/ogg/src/framing.c ============================================================================== --- branches/OpenMPT-1.31/include/ogg/src/framing.c Fri Mar 7 20:58:15 2025 (r22986) +++ branches/OpenMPT-1.31/include/ogg/src/framing.c Fri Mar 7 20:58:53 2025 (r22987) @@ -349,12 +349,13 @@ static int ogg_stream_flush_i(ogg_stream_state *os,ogg_page *og, int force, int nfill){ int i; int vals=0; - int maxvals=(os->lacing_fill>255?255:os->lacing_fill); + int maxvals; int bytes=0; long acc=0; ogg_int64_t granule_pos=-1; if(ogg_stream_check(os)) return(0); + maxvals=(os->lacing_fill>255?255:os->lacing_fill); if(maxvals==0) return(0); /* construct a page */ @@ -639,12 +640,15 @@ */ long ogg_sync_pageseek(ogg_sync_state *oy,ogg_page *og){ - unsigned char *page=oy->data+oy->returned; + unsigned char *page; unsigned char *next; - long bytes=oy->fill-oy->returned; + long bytes; if(ogg_sync_check(oy))return 0; + page=oy->data+oy->returned; + bytes=oy->fill-oy->returned; + if(oy->headerbytes==0){ int headerbytes,i; if(bytes<27)return(0); /* not enough for a header */ @@ -1086,11 +1090,11 @@ (int)og->header[4],(int)og->header[5]); fprintf(stderr," granulepos: %d serialno: %d pageno: %ld\n", - (og->header[9]<<24)|(og->header[8]<<16)| + ((unsigned)og->header[9]<<24)|(og->header[8]<<16)| (og->header[7]<<8)|og->header[6], - (og->header[17]<<24)|(og->header[16]<<16)| + ((unsigned)og->header[17]<<24)|(og->header[16]<<16)| (og->header[15]<<8)|og->header[14], - ((long)(og->header[21])<<24)|(og->header[20]<<16)| + ((long)((unsigned)og->header[21])<<24)|(og->header[20]<<16)| (og->header[19]<<8)|og->header[18]); fprintf(stderr," checksum: %02x:%02x:%02x:%02x\n segments: %d (", |
|
From: <sv...@op...> - 2025-03-07 19:58:22
|
Author: manx Date: Fri Mar 7 20:58:15 2025 New Revision: 22986 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22986 Log: Merged revision(s) 22984 from trunk/OpenMPT: [Var] Vorbis: Apply the following patches from git master: <https://gitlab.xiph.org/xiph/vorbis/-/commit/4e1155cc77a2c672f3dd18f9a32dbf1404693289>, <https://gitlab.xiph.org/xiph/vorbis/-/commit/bb4047de4c05712bf1fd49b9584c360b8e4e0adf>, <https://gitlab.xiph.org/xiph/vorbis/-/commit/315da9cc9d30484c802b2e2ea150df39e060e2b9>, <https://gitlab.xiph.org/xiph/vorbis/-/commit/f978052c2002456c11bbe34d80ccf3fb3ceb35cf>, <https://gitlab.xiph.org/xiph/vorbis/-/commit/13f0141eb2fc90869c4dd1957e7f300c8343a7fa>, <https://gitlab.xiph.org/xiph/vorbis/-/commit/e868e6b70dd3b444876f3e2943bc6ef2a48ee29c>. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/include/vorbis/OpenMPT.txt branches/OpenMPT-1.31/include/vorbis/include/vorbis/vorbisenc.h branches/OpenMPT-1.31/include/vorbis/lib/block.c branches/OpenMPT-1.31/include/vorbis/lib/psy.c branches/OpenMPT-1.31/include/vorbis/lib/sharedbook.c Modified: branches/OpenMPT-1.31/include/vorbis/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.31/include/vorbis/OpenMPT.txt Fri Mar 7 18:22:40 2025 (r22985) +++ branches/OpenMPT-1.31/include/vorbis/OpenMPT.txt Fri Mar 7 20:58:15 2025 (r22986) @@ -1,11 +1,16 @@ -libvorbis library version 1.3.7. +libvorbis library version 1.3.7 (2020-07-04). The following changes have been made: -- Obviously, unnecessary folders and files (doc, examples, m4, macos, macosx, - symbian, test, vq) have been removed. -- https://github.com/xiph/vorbis/pull/100 and - https://github.com/xiph/vorbis/pull/101 have been applied. -- GCC warnings in lib/lpc.c and lib/psy.c have been silenced. -- os.h has been modified to build for ARM64EC. -- All modifications have been marked with /* OpenMPT */. -- For building, premake is used to generate Visual Studio project files. - See ../build/premake/ for details. + * Obviously, unnecessary folders and files (doc, examples, m4, macos, macosx, + symbian, test, vq) have been removed. + * The following commits have been applied: + * https://gitlab.xiph.org/xiph/vorbis/-/commit/4e1155cc77a2c672f3dd18f9a32dbf1404693289 + * https://gitlab.xiph.org/xiph/vorbis/-/commit/bb4047de4c05712bf1fd49b9584c360b8e4e0adf + * https://gitlab.xiph.org/xiph/vorbis/-/commit/315da9cc9d30484c802b2e2ea150df39e060e2b9 + * https://gitlab.xiph.org/xiph/vorbis/-/commit/f978052c2002456c11bbe34d80ccf3fb3ceb35cf + * https://gitlab.xiph.org/xiph/vorbis/-/commit/13f0141eb2fc90869c4dd1957e7f300c8343a7fa + * https://gitlab.xiph.org/xiph/vorbis/-/commit/e868e6b70dd3b444876f3e2943bc6ef2a48ee29c + * GCC warnings in lib/lpc.c and lib/psy.c have been silenced. + * os.h has been modified to build for ARM64EC. + * All modifications have been marked with /* OpenMPT */. + * For building, premake is used to generate Visual Studio project files. + See ../build/premake/ for details. Modified: branches/OpenMPT-1.31/include/vorbis/include/vorbis/vorbisenc.h ============================================================================== --- branches/OpenMPT-1.31/include/vorbis/include/vorbis/vorbisenc.h Fri Mar 7 18:22:40 2025 (r22985) +++ branches/OpenMPT-1.31/include/vorbis/include/vorbis/vorbisenc.h Fri Mar 7 20:58:15 2025 (r22986) @@ -202,8 +202,8 @@ * * \param vi Pointer to an initialized vorbis_info struct. * - * \param number Specifies the desired action; See \ref encctlcodes "the list - * of available requests". + * \param number Specifies the desired action; See \ref encctlcodes + * "the list of available requests". * * \param arg void * pointing to a data structure matching the request * argument. @@ -298,7 +298,7 @@ * The type of the referent of that function's \c arg pointer depends on these * codes. */ -/*@{*/ +/**@{*/ /** * Query the current encoder bitrate management setting. @@ -424,7 +424,7 @@ */ #define OV_ECTL_RATEMANAGE_HARD 0x13 -/*@}*/ +/**@}*/ Modified: branches/OpenMPT-1.31/include/vorbis/lib/block.c ============================================================================== --- branches/OpenMPT-1.31/include/vorbis/lib/block.c Fri Mar 7 18:22:40 2025 (r22985) +++ branches/OpenMPT-1.31/include/vorbis/lib/block.c Fri Mar 7 20:58:15 2025 (r22986) @@ -392,9 +392,18 @@ private_state *b=v->backend_state; /* free header, header1, header2 */ - if(b->header){_ogg_free(b->header);b->header=NULL;} - if(b->header1){_ogg_free(b->header1);b->header1=NULL;} - if(b->header2){_ogg_free(b->header2);b->header2=NULL;} + if(b->header) { + _ogg_free(b->header); + b->header=NULL; + } + if(b->header1) { + _ogg_free(b->header1); + b->header1=NULL; + } + if(b->header2) { + _ogg_free(b->header2); + b->header2=NULL; + } /* Do we have enough storage space for the requested buffer? If not, expand the PCM (and envelope) storage */ Modified: branches/OpenMPT-1.31/include/vorbis/lib/psy.c ============================================================================== --- branches/OpenMPT-1.31/include/vorbis/lib/psy.c Fri Mar 7 18:22:40 2025 (r22985) +++ branches/OpenMPT-1.31/include/vorbis/lib/psy.c Fri Mar 7 20:58:15 2025 (r22986) @@ -339,6 +339,10 @@ if(halfoc<0)halfoc=0; if(halfoc>=P_BANDS-1)halfoc=P_BANDS-1; inthalfoc=(int)halfoc; + /*If we hit the P_BANDS-1 clamp above, inthalfoc+1 will be out of bounds, + even though it will have an interpolation weight of 0. + Shift the interval so we don't read past the end of the array.*/ + if(inthalfoc>=P_BANDS-2)inthalfoc=P_BANDS-2; del=halfoc-inthalfoc; for(j=0;j<P_NOISECURVES;j++) Modified: branches/OpenMPT-1.31/include/vorbis/lib/sharedbook.c ============================================================================== --- branches/OpenMPT-1.31/include/vorbis/lib/sharedbook.c Fri Mar 7 18:22:40 2025 (r22985) +++ branches/OpenMPT-1.31/include/vorbis/lib/sharedbook.c Fri Mar 7 20:58:15 2025 (r22986) @@ -422,7 +422,7 @@ long lo=0,hi=0; for(i=0;i<tabn;i++){ - ogg_uint32_t word=i<<(32-c->dec_firsttablen); + ogg_uint32_t word=((ogg_uint32_t)i<<(32-c->dec_firsttablen)); if(c->dec_firsttable[bitreverse(word)]==0){ while((lo+1)<n && c->codelist[lo+1]<=word)lo++; while( hi<n && word>=(c->codelist[hi]&mask))hi++; @@ -581,7 +581,7 @@ exit(1); } } - free(out); + _ogg_free(out); } int main(){ |
|
From: <sv...@op...> - 2025-03-07 17:23:00
|
Author: manx Date: Fri Mar 7 18:22:40 2025 New Revision: 22985 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22985 Log: [Fix] ogg: Apply <https://gitlab.xiph.org/xiph/ogg/-/commit/7cf42ea17aef7bc1b7b21af70724840a96c2e7d0>. Modified: trunk/OpenMPT/include/ogg/OpenMPT.txt trunk/OpenMPT/include/ogg/src/bitwise.c trunk/OpenMPT/include/ogg/src/framing.c Modified: trunk/OpenMPT/include/ogg/OpenMPT.txt ============================================================================== --- trunk/OpenMPT/include/ogg/OpenMPT.txt Fri Mar 7 18:15:08 2025 (r22984) +++ trunk/OpenMPT/include/ogg/OpenMPT.txt Fri Mar 7 18:22:40 2025 (r22985) @@ -1,8 +1,10 @@ libogg library version 1.3.5 (2021-06-04). The following changes have been made: -- Obviously, unnecessary folders and files (documentation, makefiles, etc.) have - been removed. -- ports/makefile/ogg/config_types.h has been added for plain Makefile builds. -- win32/ogg.def has been modified to not override the linker library name. -- For building, premake is used to generate Visual Studio project files. - See ../build/premake/ for details. + * Obviously, unnecessary folders and files (documentation, makefiles, etc.) + have been removed. + * The following commits have been applied: + * https://gitlab.xiph.org/xiph/ogg/-/commit/7cf42ea17aef7bc1b7b21af70724840a96c2e7d0 + * ports/makefile/ogg/config_types.h has been added for plain Makefile builds. + * win32/ogg.def has been modified to not override the linker library name. + * For building, premake is used to generate Visual Studio project files. + See ../build/premake/ for details. Modified: trunk/OpenMPT/include/ogg/src/bitwise.c ============================================================================== --- trunk/OpenMPT/include/ogg/src/bitwise.c Fri Mar 7 18:15:08 2025 (r22984) +++ trunk/OpenMPT/include/ogg/src/bitwise.c Fri Mar 7 18:22:40 2025 (r22985) @@ -284,13 +284,13 @@ ret=b->ptr[0]>>b->endbit; if(bits>8){ - ret|=b->ptr[1]<<(8-b->endbit); + ret|=(unsigned long)b->ptr[1]<<(8-b->endbit); if(bits>16){ - ret|=b->ptr[2]<<(16-b->endbit); + ret|=(unsigned long)b->ptr[2]<<(16-b->endbit); if(bits>24){ - ret|=b->ptr[3]<<(24-b->endbit); + ret|=(unsigned long)b->ptr[3]<<(24-b->endbit); if(bits>32 && b->endbit) - ret|=b->ptr[4]<<(32-b->endbit); + ret|=(unsigned long)b->ptr[4]<<(32-b->endbit); } } } @@ -313,13 +313,13 @@ else if(!bits)return(0L); } - ret=b->ptr[0]<<(24+b->endbit); + ret=(unsigned long)b->ptr[0]<<(24+b->endbit); if(bits>8){ - ret|=b->ptr[1]<<(16+b->endbit); + ret|=(unsigned long)b->ptr[1]<<(16+b->endbit); if(bits>16){ - ret|=b->ptr[2]<<(8+b->endbit); + ret|=(unsigned long)b->ptr[2]<<(8+b->endbit); if(bits>24){ - ret|=b->ptr[3]<<(b->endbit); + ret|=(unsigned long)b->ptr[3]<<(b->endbit); if(bits>32 && b->endbit) ret|=b->ptr[4]>>(8-b->endbit); } @@ -389,13 +389,13 @@ ret=b->ptr[0]>>b->endbit; if(bits>8){ - ret|=b->ptr[1]<<(8-b->endbit); + ret|=(unsigned long)b->ptr[1]<<(8-b->endbit); if(bits>16){ - ret|=b->ptr[2]<<(16-b->endbit); + ret|=(unsigned long)b->ptr[2]<<(16-b->endbit); if(bits>24){ - ret|=b->ptr[3]<<(24-b->endbit); + ret|=(unsigned long)b->ptr[3]<<(24-b->endbit); if(bits>32 && b->endbit){ - ret|=b->ptr[4]<<(32-b->endbit); + ret|=(unsigned long)b->ptr[4]<<(32-b->endbit); } } } @@ -430,13 +430,13 @@ else if(!bits)return(0L); } - ret=b->ptr[0]<<(24+b->endbit); + ret=(unsigned long)b->ptr[0]<<(24+b->endbit); if(bits>8){ - ret|=b->ptr[1]<<(16+b->endbit); + ret|=(unsigned long)b->ptr[1]<<(16+b->endbit); if(bits>16){ - ret|=b->ptr[2]<<(8+b->endbit); + ret|=(unsigned long)b->ptr[2]<<(8+b->endbit); if(bits>24){ - ret|=b->ptr[3]<<(b->endbit); + ret|=(unsigned long)b->ptr[3]<<(b->endbit); if(bits>32 && b->endbit) ret|=b->ptr[4]>>(8-b->endbit); } Modified: trunk/OpenMPT/include/ogg/src/framing.c ============================================================================== --- trunk/OpenMPT/include/ogg/src/framing.c Fri Mar 7 18:15:08 2025 (r22984) +++ trunk/OpenMPT/include/ogg/src/framing.c Fri Mar 7 18:22:40 2025 (r22985) @@ -349,12 +349,13 @@ static int ogg_stream_flush_i(ogg_stream_state *os,ogg_page *og, int force, int nfill){ int i; int vals=0; - int maxvals=(os->lacing_fill>255?255:os->lacing_fill); + int maxvals; int bytes=0; long acc=0; ogg_int64_t granule_pos=-1; if(ogg_stream_check(os)) return(0); + maxvals=(os->lacing_fill>255?255:os->lacing_fill); if(maxvals==0) return(0); /* construct a page */ @@ -639,12 +640,15 @@ */ long ogg_sync_pageseek(ogg_sync_state *oy,ogg_page *og){ - unsigned char *page=oy->data+oy->returned; + unsigned char *page; unsigned char *next; - long bytes=oy->fill-oy->returned; + long bytes; if(ogg_sync_check(oy))return 0; + page=oy->data+oy->returned; + bytes=oy->fill-oy->returned; + if(oy->headerbytes==0){ int headerbytes,i; if(bytes<27)return(0); /* not enough for a header */ @@ -1086,11 +1090,11 @@ (int)og->header[4],(int)og->header[5]); fprintf(stderr," granulepos: %d serialno: %d pageno: %ld\n", - (og->header[9]<<24)|(og->header[8]<<16)| + ((unsigned)og->header[9]<<24)|(og->header[8]<<16)| (og->header[7]<<8)|og->header[6], - (og->header[17]<<24)|(og->header[16]<<16)| + ((unsigned)og->header[17]<<24)|(og->header[16]<<16)| (og->header[15]<<8)|og->header[14], - ((long)(og->header[21])<<24)|(og->header[20]<<16)| + ((long)((unsigned)og->header[21])<<24)|(og->header[20]<<16)| (og->header[19]<<8)|og->header[18]); fprintf(stderr," checksum: %02x:%02x:%02x:%02x\n segments: %d (", |
|
From: <sv...@op...> - 2025-03-07 17:15:26
|
Author: manx Date: Fri Mar 7 18:15:08 2025 New Revision: 22984 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22984 Log: [Var] Vorbis: Apply the following patches from git master: <https://gitlab.xiph.org/xiph/vorbis/-/commit/4e1155cc77a2c672f3dd18f9a32dbf1404693289>, <https://gitlab.xiph.org/xiph/vorbis/-/commit/bb4047de4c05712bf1fd49b9584c360b8e4e0adf>, <https://gitlab.xiph.org/xiph/vorbis/-/commit/315da9cc9d30484c802b2e2ea150df39e060e2b9>, <https://gitlab.xiph.org/xiph/vorbis/-/commit/f978052c2002456c11bbe34d80ccf3fb3ceb35cf>, <https://gitlab.xiph.org/xiph/vorbis/-/commit/13f0141eb2fc90869c4dd1957e7f300c8343a7fa>, <https://gitlab.xiph.org/xiph/vorbis/-/commit/e868e6b70dd3b444876f3e2943bc6ef2a48ee29c>. Modified: trunk/OpenMPT/include/vorbis/OpenMPT.txt trunk/OpenMPT/include/vorbis/include/vorbis/vorbisenc.h trunk/OpenMPT/include/vorbis/lib/block.c trunk/OpenMPT/include/vorbis/lib/psy.c trunk/OpenMPT/include/vorbis/lib/sharedbook.c Modified: trunk/OpenMPT/include/vorbis/OpenMPT.txt ============================================================================== --- trunk/OpenMPT/include/vorbis/OpenMPT.txt Thu Mar 6 19:15:20 2025 (r22983) +++ trunk/OpenMPT/include/vorbis/OpenMPT.txt Fri Mar 7 18:15:08 2025 (r22984) @@ -1,11 +1,16 @@ -libvorbis library version 1.3.7. +libvorbis library version 1.3.7 (2020-07-04). The following changes have been made: -- Obviously, unnecessary folders and files (doc, examples, m4, macos, macosx, - symbian, test, vq) have been removed. -- https://github.com/xiph/vorbis/pull/100 and - https://github.com/xiph/vorbis/pull/101 have been applied. -- GCC warnings in lib/lpc.c and lib/psy.c have been silenced. -- os.h has been modified to build for ARM64EC. -- All modifications have been marked with /* OpenMPT */. -- For building, premake is used to generate Visual Studio project files. - See ../build/premake/ for details. + * Obviously, unnecessary folders and files (doc, examples, m4, macos, macosx, + symbian, test, vq) have been removed. + * The following commits have been applied: + * https://gitlab.xiph.org/xiph/vorbis/-/commit/4e1155cc77a2c672f3dd18f9a32dbf1404693289 + * https://gitlab.xiph.org/xiph/vorbis/-/commit/bb4047de4c05712bf1fd49b9584c360b8e4e0adf + * https://gitlab.xiph.org/xiph/vorbis/-/commit/315da9cc9d30484c802b2e2ea150df39e060e2b9 + * https://gitlab.xiph.org/xiph/vorbis/-/commit/f978052c2002456c11bbe34d80ccf3fb3ceb35cf + * https://gitlab.xiph.org/xiph/vorbis/-/commit/13f0141eb2fc90869c4dd1957e7f300c8343a7fa + * https://gitlab.xiph.org/xiph/vorbis/-/commit/e868e6b70dd3b444876f3e2943bc6ef2a48ee29c + * GCC warnings in lib/lpc.c and lib/psy.c have been silenced. + * os.h has been modified to build for ARM64EC. + * All modifications have been marked with /* OpenMPT */. + * For building, premake is used to generate Visual Studio project files. + See ../build/premake/ for details. Modified: trunk/OpenMPT/include/vorbis/include/vorbis/vorbisenc.h ============================================================================== --- trunk/OpenMPT/include/vorbis/include/vorbis/vorbisenc.h Thu Mar 6 19:15:20 2025 (r22983) +++ trunk/OpenMPT/include/vorbis/include/vorbis/vorbisenc.h Fri Mar 7 18:15:08 2025 (r22984) @@ -202,8 +202,8 @@ * * \param vi Pointer to an initialized vorbis_info struct. * - * \param number Specifies the desired action; See \ref encctlcodes "the list - * of available requests". + * \param number Specifies the desired action; See \ref encctlcodes + * "the list of available requests". * * \param arg void * pointing to a data structure matching the request * argument. @@ -298,7 +298,7 @@ * The type of the referent of that function's \c arg pointer depends on these * codes. */ -/*@{*/ +/**@{*/ /** * Query the current encoder bitrate management setting. @@ -424,7 +424,7 @@ */ #define OV_ECTL_RATEMANAGE_HARD 0x13 -/*@}*/ +/**@}*/ Modified: trunk/OpenMPT/include/vorbis/lib/block.c ============================================================================== --- trunk/OpenMPT/include/vorbis/lib/block.c Thu Mar 6 19:15:20 2025 (r22983) +++ trunk/OpenMPT/include/vorbis/lib/block.c Fri Mar 7 18:15:08 2025 (r22984) @@ -392,9 +392,18 @@ private_state *b=v->backend_state; /* free header, header1, header2 */ - if(b->header){_ogg_free(b->header);b->header=NULL;} - if(b->header1){_ogg_free(b->header1);b->header1=NULL;} - if(b->header2){_ogg_free(b->header2);b->header2=NULL;} + if(b->header) { + _ogg_free(b->header); + b->header=NULL; + } + if(b->header1) { + _ogg_free(b->header1); + b->header1=NULL; + } + if(b->header2) { + _ogg_free(b->header2); + b->header2=NULL; + } /* Do we have enough storage space for the requested buffer? If not, expand the PCM (and envelope) storage */ Modified: trunk/OpenMPT/include/vorbis/lib/psy.c ============================================================================== --- trunk/OpenMPT/include/vorbis/lib/psy.c Thu Mar 6 19:15:20 2025 (r22983) +++ trunk/OpenMPT/include/vorbis/lib/psy.c Fri Mar 7 18:15:08 2025 (r22984) @@ -339,6 +339,10 @@ if(halfoc<0)halfoc=0; if(halfoc>=P_BANDS-1)halfoc=P_BANDS-1; inthalfoc=(int)halfoc; + /*If we hit the P_BANDS-1 clamp above, inthalfoc+1 will be out of bounds, + even though it will have an interpolation weight of 0. + Shift the interval so we don't read past the end of the array.*/ + if(inthalfoc>=P_BANDS-2)inthalfoc=P_BANDS-2; del=halfoc-inthalfoc; for(j=0;j<P_NOISECURVES;j++) Modified: trunk/OpenMPT/include/vorbis/lib/sharedbook.c ============================================================================== --- trunk/OpenMPT/include/vorbis/lib/sharedbook.c Thu Mar 6 19:15:20 2025 (r22983) +++ trunk/OpenMPT/include/vorbis/lib/sharedbook.c Fri Mar 7 18:15:08 2025 (r22984) @@ -422,7 +422,7 @@ long lo=0,hi=0; for(i=0;i<tabn;i++){ - ogg_uint32_t word=i<<(32-c->dec_firsttablen); + ogg_uint32_t word=((ogg_uint32_t)i<<(32-c->dec_firsttablen)); if(c->dec_firsttable[bitreverse(word)]==0){ while((lo+1)<n && c->codelist[lo+1]<=word)lo++; while( hi<n && word>=(c->codelist[hi]&mask))hi++; @@ -581,7 +581,7 @@ exit(1); } } - free(out); + _ogg_free(out); } int main(){ |
|
From: <sv...@op...> - 2025-03-06 18:15:37
|
Author: manx Date: Thu Mar 6 19:15:20 2025 New Revision: 22983 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22983 Log: [Fix] libopenmpt: Only show build-time MinGW Unicode warning when it actually applies. Broken since r22980. Modified: trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp Modified: trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp ============================================================================== --- trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp Thu Mar 6 18:25:47 2025 (r22982) +++ trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp Thu Mar 6 19:15:20 2025 (r22983) @@ -77,11 +77,13 @@ MPT_WARNING("Warning: libopenmpt is known to trigger bad code generation with Clang 5..10 on powerpc (32bit) when using -O3. See <https://bugs.llvm.org/show_bug.cgi?id=46683>.") #endif +#if defined(MPT_ENABLE_FILEIO) #if defined(MPT_COMPILER_QUIRK_WINDOWS_FSTREAM_NO_WCHAR) #if MPT_GCC_BEFORE(9,1,0) MPT_WARNING("Warning: MinGW with GCC earlier than 9.1 detected. Standard library does neither provide std::fstream wchar_t overloads nor std::filesystem with wchar_t support. Unicode filename support is thus unavailable.") #endif // MPT_GCC_AT_LEAST(9,1,0) #endif // MPT_COMPILER_QUIRK_WINDOWS_FSTREAM_NO_WCHAR +#endif // MPT_ENABLE_FILEIO #endif // !MPT_BUILD_SILENCE_LIBOPENMPT_CONFIGURATION_WARNINGS |
|
From: <sv...@op...> - 2025-03-06 17:26:07
|
Author: manx Date: Thu Mar 6 18:25:47 2025 New Revision: 22982 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22982 Log: [Ref] mptFileTemporary: Convert to header-only. Deleted: trunk/OpenMPT/common/mptFileTemporary.cpp Modified: trunk/OpenMPT/build/android_ndk/Android.mk trunk/OpenMPT/build/autotools/Makefile.am trunk/OpenMPT/build/pch/PCH.h 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/vs2022win10clang/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win10clang/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/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/mptFileTemporary.h Modified: trunk/OpenMPT/build/android_ndk/Android.mk ============================================================================== --- trunk/OpenMPT/build/android_ndk/Android.mk Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/android_ndk/Android.mk Thu Mar 6 18:25:47 2025 (r22982) @@ -124,7 +124,6 @@ LOCAL_SRC_FILES += \ common/ComponentManager.cpp \ common/Logging.cpp \ - common/mptFileTemporary.cpp \ common/mptFileType.cpp \ common/mptPathString.cpp \ common/mptRandom.cpp \ Modified: trunk/OpenMPT/build/autotools/Makefile.am ============================================================================== --- trunk/OpenMPT/build/autotools/Makefile.am Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/autotools/Makefile.am Thu Mar 6 18:25:47 2025 (r22982) @@ -343,7 +343,6 @@ MPT_FILES_COMMON += common/mptBaseUtils.h MPT_FILES_COMMON += common/mptCPU.h MPT_FILES_COMMON += common/mptFileIO.h -MPT_FILES_COMMON += common/mptFileTemporary.cpp MPT_FILES_COMMON += common/mptFileTemporary.h MPT_FILES_COMMON += common/mptFileType.cpp MPT_FILES_COMMON += common/mptFileType.h Modified: trunk/OpenMPT/build/pch/PCH.h ============================================================================== --- trunk/OpenMPT/build/pch/PCH.h Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/pch/PCH.h Thu Mar 6 18:25:47 2025 (r22982) @@ -85,7 +85,6 @@ #include "../common/FileReader.h" #include "../common/mptCPU.h" #include "../common/mptFileIO.h" -#include "../common/mptFileTemporary.h" #include "../common/mptFileType.h" #include "../common/mptRandom.h" #include "../common/mptStringBuffer.h" Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -1272,7 +1272,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1814,9 +1814,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -938,7 +938,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1121,9 +1121,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -1272,7 +1272,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1814,9 +1814,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -1272,7 +1272,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1814,9 +1814,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -958,7 +958,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1109,9 +1109,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -958,7 +958,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1109,9 +1109,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -998,7 +998,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1157,9 +1157,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -893,7 +893,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1016,9 +1016,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -1272,7 +1272,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1814,9 +1814,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -938,7 +938,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1121,9 +1121,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -1272,7 +1272,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1814,9 +1814,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -1272,7 +1272,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1814,9 +1814,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -958,7 +958,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1109,9 +1109,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -958,7 +958,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1109,9 +1109,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -998,7 +998,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1157,9 +1157,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -893,7 +893,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1016,9 +1016,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -1291,7 +1291,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1853,9 +1853,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -945,7 +945,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1160,9 +1160,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -1291,7 +1291,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1853,9 +1853,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -1291,7 +1291,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1853,9 +1853,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -955,7 +955,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1109,9 +1109,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -955,7 +955,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1109,9 +1109,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -995,7 +995,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1163,9 +1163,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -926,7 +926,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1022,9 +1022,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -2493,7 +2493,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1853,9 +1853,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -1949,7 +1949,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1160,9 +1160,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -2493,7 +2493,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1853,9 +1853,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -2493,7 +2493,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1853,9 +1853,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -1968,7 +1968,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1109,9 +1109,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -1968,7 +1968,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1109,9 +1109,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -2053,7 +2053,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1163,9 +1163,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -1966,7 +1966,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1022,9 +1022,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -2061,7 +2061,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1814,9 +1814,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -1535,7 +1535,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> <ClCompile Include="..\..\common\mptRandom.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj.filters Thu Mar 6 18:25:47 2025 (r22982) @@ -1121,9 +1121,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileTemporary.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileType.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj Thu Mar 6 18:14:14 2025 (r22981) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj Thu Mar 6 18:25:47 2025 (r22982) @@ -2061,7 +2061,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileTempor... [truncated message content] |
|
From: <sv...@op...> - 2025-03-06 17:14:33
|
Author: manx Date: Thu Mar 6 18:14:14 2025 New Revision: 22981 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22981 Log: [Ref] mptFileIO: Split mptFileCompression into misc/. Added: trunk/OpenMPT/misc/mptFileCompression.cpp - copied, changed from r22980, trunk/OpenMPT/common/mptFileIO.cpp trunk/OpenMPT/misc/mptFileCompression.h - copied, changed from r22980, trunk/OpenMPT/common/mptFileIO.h Deleted: trunk/OpenMPT/common/mptFileIO.cpp Modified: trunk/OpenMPT/build/android_ndk/Android.mk trunk/OpenMPT/build/autotools/Makefile.am trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT-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/vs2022win10clang/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win10clang/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/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/mptFileIO.h trunk/OpenMPT/mptrack/ExceptionHandler.cpp Modified: trunk/OpenMPT/build/android_ndk/Android.mk ============================================================================== --- trunk/OpenMPT/build/android_ndk/Android.mk Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/android_ndk/Android.mk Thu Mar 6 18:14:14 2025 (r22981) @@ -124,7 +124,6 @@ LOCAL_SRC_FILES += \ common/ComponentManager.cpp \ common/Logging.cpp \ - common/mptFileIO.cpp \ common/mptFileTemporary.cpp \ common/mptFileType.cpp \ common/mptPathString.cpp \ Modified: trunk/OpenMPT/build/autotools/Makefile.am ============================================================================== --- trunk/OpenMPT/build/autotools/Makefile.am Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/autotools/Makefile.am Thu Mar 6 18:14:14 2025 (r22981) @@ -342,7 +342,6 @@ MPT_FILES_COMMON += common/mptBaseTypes.h MPT_FILES_COMMON += common/mptBaseUtils.h MPT_FILES_COMMON += common/mptCPU.h -MPT_FILES_COMMON += common/mptFileIO.cpp MPT_FILES_COMMON += common/mptFileIO.h MPT_FILES_COMMON += common/mptFileTemporary.cpp MPT_FILES_COMMON += common/mptFileTemporary.h Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Thu Mar 6 18:14:14 2025 (r22981) @@ -832,6 +832,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> + <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> <ClInclude Include="..\..\misc\mptMutex.h" /> <ClInclude Include="..\..\misc\mptOS.h" /> @@ -1271,7 +1272,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileIO.cpp" /> <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> @@ -1281,6 +1281,7 @@ <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> + <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> <ClCompile Include="..\..\misc\mptOS.cpp" /> <ClCompile Include="..\..\misc\mptWine.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) @@ -498,6 +498,9 @@ <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptFileCompression.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptLibrary.h"> <Filter>misc</Filter> </ClInclude> @@ -1811,9 +1814,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileIO.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileTemporary.cpp"> <Filter>common</Filter> </ClCompile> @@ -1841,6 +1841,9 @@ <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptFileCompression.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptLibrary.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj Thu Mar 6 18:14:14 2025 (r22981) @@ -712,6 +712,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> + <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> <ClInclude Include="..\..\misc\mptMutex.h" /> <ClInclude Include="..\..\misc\mptOS.h" /> @@ -937,7 +938,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileIO.cpp" /> <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> @@ -947,6 +947,7 @@ <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> + <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> <ClCompile Include="..\..\misc\mptOS.cpp" /> <ClCompile Include="..\..\misc\mptWine.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) @@ -447,6 +447,9 @@ <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptFileCompression.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptLibrary.h"> <Filter>misc</Filter> </ClInclude> @@ -1118,9 +1121,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileIO.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileTemporary.cpp"> <Filter>common</Filter> </ClCompile> @@ -1148,6 +1148,9 @@ <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptFileCompression.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptLibrary.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Thu Mar 6 18:14:14 2025 (r22981) @@ -832,6 +832,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> + <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> <ClInclude Include="..\..\misc\mptMutex.h" /> <ClInclude Include="..\..\misc\mptOS.h" /> @@ -1271,7 +1272,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileIO.cpp" /> <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> @@ -1281,6 +1281,7 @@ <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> + <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> <ClCompile Include="..\..\misc\mptOS.cpp" /> <ClCompile Include="..\..\misc\mptWine.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) @@ -498,6 +498,9 @@ <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptFileCompression.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptLibrary.h"> <Filter>misc</Filter> </ClInclude> @@ -1811,9 +1814,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileIO.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileTemporary.cpp"> <Filter>common</Filter> </ClCompile> @@ -1841,6 +1841,9 @@ <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptFileCompression.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptLibrary.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Thu Mar 6 18:14:14 2025 (r22981) @@ -832,6 +832,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> + <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> <ClInclude Include="..\..\misc\mptMutex.h" /> <ClInclude Include="..\..\misc\mptOS.h" /> @@ -1271,7 +1272,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileIO.cpp" /> <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> @@ -1281,6 +1281,7 @@ <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> + <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> <ClCompile Include="..\..\misc\mptOS.cpp" /> <ClCompile Include="..\..\misc\mptWine.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) @@ -498,6 +498,9 @@ <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptFileCompression.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptLibrary.h"> <Filter>misc</Filter> </ClInclude> @@ -1811,9 +1814,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileIO.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileTemporary.cpp"> <Filter>common</Filter> </ClCompile> @@ -1841,6 +1841,9 @@ <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptFileCompression.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptLibrary.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj Thu Mar 6 18:14:14 2025 (r22981) @@ -958,7 +958,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileIO.cpp" /> <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) @@ -1109,9 +1109,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileIO.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileTemporary.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj Thu Mar 6 18:14:14 2025 (r22981) @@ -958,7 +958,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileIO.cpp" /> <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) @@ -1109,9 +1109,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileIO.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileTemporary.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj Thu Mar 6 18:14:14 2025 (r22981) @@ -998,7 +998,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileIO.cpp" /> <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) @@ -1157,9 +1157,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileIO.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileTemporary.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj Thu Mar 6 18:14:14 2025 (r22981) @@ -700,6 +700,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> + <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> <ClInclude Include="..\..\misc\mptMutex.h" /> <ClInclude Include="..\..\misc\mptOS.h" /> @@ -892,7 +893,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileIO.cpp" /> <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> @@ -903,6 +903,7 @@ <ClCompile Include="..\..\common\version.cpp" /> <ClCompile Include="..\..\installer\updatesigntool\updatesigntool.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> + <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> <ClCompile Include="..\..\misc\mptOS.cpp" /> <ClCompile Include="..\..\misc\mptWine.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) @@ -441,6 +441,9 @@ <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptFileCompression.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptLibrary.h"> <Filter>misc</Filter> </ClInclude> @@ -1013,9 +1016,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileIO.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileTemporary.cpp"> <Filter>common</Filter> </ClCompile> @@ -1046,6 +1046,9 @@ <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptFileCompression.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptLibrary.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Thu Mar 6 18:14:14 2025 (r22981) @@ -832,6 +832,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> + <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> <ClInclude Include="..\..\misc\mptMutex.h" /> <ClInclude Include="..\..\misc\mptOS.h" /> @@ -1271,7 +1272,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileIO.cpp" /> <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> @@ -1281,6 +1281,7 @@ <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> + <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> <ClCompile Include="..\..\misc\mptOS.cpp" /> <ClCompile Include="..\..\misc\mptWine.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) @@ -498,6 +498,9 @@ <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptFileCompression.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptLibrary.h"> <Filter>misc</Filter> </ClInclude> @@ -1811,9 +1814,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileIO.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileTemporary.cpp"> <Filter>common</Filter> </ClCompile> @@ -1841,6 +1841,9 @@ <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptFileCompression.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptLibrary.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj Thu Mar 6 18:14:14 2025 (r22981) @@ -712,6 +712,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> + <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> <ClInclude Include="..\..\misc\mptMutex.h" /> <ClInclude Include="..\..\misc\mptOS.h" /> @@ -937,7 +938,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileIO.cpp" /> <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> @@ -947,6 +947,7 @@ <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> + <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> <ClCompile Include="..\..\misc\mptOS.cpp" /> <ClCompile Include="..\..\misc\mptWine.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) @@ -447,6 +447,9 @@ <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptFileCompression.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptLibrary.h"> <Filter>misc</Filter> </ClInclude> @@ -1118,9 +1121,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileIO.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileTemporary.cpp"> <Filter>common</Filter> </ClCompile> @@ -1148,6 +1148,9 @@ <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptFileCompression.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptLibrary.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Thu Mar 6 18:14:14 2025 (r22981) @@ -832,6 +832,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> + <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> <ClInclude Include="..\..\misc\mptMutex.h" /> <ClInclude Include="..\..\misc\mptOS.h" /> @@ -1271,7 +1272,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileIO.cpp" /> <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> @@ -1281,6 +1281,7 @@ <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> + <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> <ClCompile Include="..\..\misc\mptOS.cpp" /> <ClCompile Include="..\..\misc\mptWine.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) @@ -498,6 +498,9 @@ <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptFileCompression.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptLibrary.h"> <Filter>misc</Filter> </ClInclude> @@ -1811,9 +1814,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileIO.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileTemporary.cpp"> <Filter>common</Filter> </ClCompile> @@ -1841,6 +1841,9 @@ <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptFileCompression.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptLibrary.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Thu Mar 6 18:14:14 2025 (r22981) @@ -832,6 +832,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> + <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> <ClInclude Include="..\..\misc\mptMutex.h" /> <ClInclude Include="..\..\misc\mptOS.h" /> @@ -1271,7 +1272,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileIO.cpp" /> <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> @@ -1281,6 +1281,7 @@ <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> + <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> <ClCompile Include="..\..\misc\mptOS.cpp" /> <ClCompile Include="..\..\misc\mptWine.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) @@ -498,6 +498,9 @@ <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptFileCompression.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptLibrary.h"> <Filter>misc</Filter> </ClInclude> @@ -1811,9 +1814,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileIO.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileTemporary.cpp"> <Filter>common</Filter> </ClCompile> @@ -1841,6 +1841,9 @@ <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptFileCompression.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptLibrary.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj Thu Mar 6 18:14:14 2025 (r22981) @@ -958,7 +958,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileIO.cpp" /> <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) @@ -1109,9 +1109,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileIO.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileTemporary.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj Thu Mar 6 18:14:14 2025 (r22981) @@ -958,7 +958,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileIO.cpp" /> <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) @@ -1109,9 +1109,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileIO.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileTemporary.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj Thu Mar 6 18:14:14 2025 (r22981) @@ -998,7 +998,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileIO.cpp" /> <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) @@ -1157,9 +1157,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileIO.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileTemporary.cpp"> <Filter>common</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj Thu Mar 6 18:14:14 2025 (r22981) @@ -700,6 +700,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> + <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> <ClInclude Include="..\..\misc\mptMutex.h" /> <ClInclude Include="..\..\misc\mptOS.h" /> @@ -892,7 +893,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileIO.cpp" /> <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> @@ -903,6 +903,7 @@ <ClCompile Include="..\..\common\version.cpp" /> <ClCompile Include="..\..\installer\updatesigntool\updatesigntool.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> + <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> <ClCompile Include="..\..\misc\mptOS.cpp" /> <ClCompile Include="..\..\misc\mptWine.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) @@ -441,6 +441,9 @@ <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptFileCompression.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptLibrary.h"> <Filter>misc</Filter> </ClInclude> @@ -1013,9 +1016,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileIO.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileTemporary.cpp"> <Filter>common</Filter> </ClCompile> @@ -1046,6 +1046,9 @@ <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptFileCompression.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptLibrary.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj Thu Mar 6 18:14:14 2025 (r22981) @@ -851,6 +851,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> + <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> <ClInclude Include="..\..\misc\mptMutex.h" /> <ClInclude Include="..\..\misc\mptOS.h" /> @@ -1290,7 +1291,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileIO.cpp" /> <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> @@ -1300,6 +1300,7 @@ <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> + <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> <ClCompile Include="..\..\misc\mptOS.cpp" /> <ClCompile Include="..\..\misc\mptWine.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) @@ -537,6 +537,9 @@ <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptFileCompression.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptLibrary.h"> <Filter>misc</Filter> </ClInclude> @@ -1850,9 +1853,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileIO.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileTemporary.cpp"> <Filter>common</Filter> </ClCompile> @@ -1880,6 +1880,9 @@ <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptFileCompression.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptLibrary.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj Thu Mar 6 18:14:14 2025 (r22981) @@ -719,6 +719,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> + <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> <ClInclude Include="..\..\misc\mptMutex.h" /> <ClInclude Include="..\..\misc\mptOS.h" /> @@ -944,7 +945,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileIO.cpp" /> <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> @@ -954,6 +954,7 @@ <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> + <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> <ClCompile Include="..\..\misc\mptOS.cpp" /> <ClCompile Include="..\..\misc\mptWine.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) @@ -486,6 +486,9 @@ <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptFileCompression.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptLibrary.h"> <Filter>misc</Filter> </ClInclude> @@ -1157,9 +1160,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileIO.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileTemporary.cpp"> <Filter>common</Filter> </ClCompile> @@ -1187,6 +1187,9 @@ <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptFileCompression.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptLibrary.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj Thu Mar 6 18:14:14 2025 (r22981) @@ -851,6 +851,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> + <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> <ClInclude Include="..\..\misc\mptMutex.h" /> <ClInclude Include="..\..\misc\mptOS.h" /> @@ -1290,7 +1291,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileIO.cpp" /> <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> @@ -1300,6 +1300,7 @@ <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> + <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> <ClCompile Include="..\..\misc\mptOS.cpp" /> <ClCompile Include="..\..\misc\mptWine.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) @@ -537,6 +537,9 @@ <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptFileCompression.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptLibrary.h"> <Filter>misc</Filter> </ClInclude> @@ -1850,9 +1853,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileIO.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileTemporary.cpp"> <Filter>common</Filter> </ClCompile> @@ -1880,6 +1880,9 @@ <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptFileCompression.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptLibrary.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj Thu Mar 6 18:14:14 2025 (r22981) @@ -851,6 +851,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> + <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> <ClInclude Include="..\..\misc\mptMutex.h" /> <ClInclude Include="..\..\misc\mptOS.h" /> @@ -1290,7 +1291,6 @@ <ClCompile Include="..\..\common\ComponentManager.cpp" /> <ClCompile Include="..\..\common\Logging.cpp" /> <ClCompile Include="..\..\common\Profiler.cpp" /> - <ClCompile Include="..\..\common\mptFileIO.cpp" /> <ClCompile Include="..\..\common\mptFileTemporary.cpp" /> <ClCompile Include="..\..\common\mptFileType.cpp" /> <ClCompile Include="..\..\common\mptPathString.cpp" /> @@ -1300,6 +1300,7 @@ <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> + <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> <ClCompile Include="..\..\misc\mptOS.cpp" /> <ClCompile Include="..\..\misc\mptWine.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters Thu Mar 6 17:58:45 2025 (r22980) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters Thu Mar 6 18:14:14 2025 (r22981) @@ -537,6 +537,9 @@ <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptFileCompression.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptLibrary.h"> <Filter>misc</Filter> </ClInclude> @@ -1850,9 +1853,6 @@ <ClCompile Include="..\..\common\Profiler.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\common\mptFileIO.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\common\mptFileTemporary.cpp"> <Filter>common</Filter> </ClCompile> @@ -1880,6 +1880,9 @@ <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptFileCompression.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptLibrary.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj ====================================... [truncated message content] |
|
From: <sv...@op...> - 2025-03-06 16:59:11
|
Author: manx Date: Thu Mar 6 17:58:45 2025 New Revision: 22980 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22980 Log: [Ref] mptFileIO: Move libopenmpt build-time warning into libopenmpt/libopenmpt_impl.cpp. Modified: trunk/OpenMPT/common/mptFileIO.cpp trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp Modified: trunk/OpenMPT/common/mptFileIO.cpp ============================================================================== --- trunk/OpenMPT/common/mptFileIO.cpp Sun Mar 2 14:47:35 2025 (r22979) +++ trunk/OpenMPT/common/mptFileIO.cpp Thu Mar 6 17:58:45 2025 (r22980) @@ -25,18 +25,6 @@ #if defined(MPT_ENABLE_FILEIO) - -#if !defined(MPT_BUILD_SILENCE_LIBOPENMPT_CONFIGURATION_WARNINGS) - -#if defined(MPT_COMPILER_QUIRK_WINDOWS_FSTREAM_NO_WCHAR) -#if MPT_GCC_BEFORE(9,1,0) -MPT_WARNING("Warning: MinGW with GCC earlier than 9.1 detected. Standard library does neither provide std::fstream wchar_t overloads nor std::filesystem with wchar_t support. Unicode filename support is thus unavailable.") -#endif // MPT_GCC_AT_LEAST(9,1,0) -#endif // MPT_COMPILER_QUIRK_WINDOWS_FSTREAM_NO_WCHAR - -#endif // !MPT_BUILD_SILENCE_LIBOPENMPT_CONFIGURATION_WARNINGS - - #ifdef MODPLUG_TRACKER #if MPT_OS_WINDOWS Modified: trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp ============================================================================== --- trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp Sun Mar 2 14:47:35 2025 (r22979) +++ trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp Thu Mar 6 17:58:45 2025 (r22980) @@ -77,6 +77,12 @@ MPT_WARNING("Warning: libopenmpt is known to trigger bad code generation with Clang 5..10 on powerpc (32bit) when using -O3. See <https://bugs.llvm.org/show_bug.cgi?id=46683>.") #endif +#if defined(MPT_COMPILER_QUIRK_WINDOWS_FSTREAM_NO_WCHAR) +#if MPT_GCC_BEFORE(9,1,0) +MPT_WARNING("Warning: MinGW with GCC earlier than 9.1 detected. Standard library does neither provide std::fstream wchar_t overloads nor std::filesystem with wchar_t support. Unicode filename support is thus unavailable.") +#endif // MPT_GCC_AT_LEAST(9,1,0) +#endif // MPT_COMPILER_QUIRK_WINDOWS_FSTREAM_NO_WCHAR + #endif // !MPT_BUILD_SILENCE_LIBOPENMPT_CONFIGURATION_WARNINGS #if defined(MPT_ASSERT_HANDLER_NEEDED) && !defined(ENABLE_TESTS) |
|
From: <sv...@op...> - 2025-03-02 15:05:47
|
Author: manx Date: Sun Mar 2 14:47:35 2025 New Revision: 22979 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22979 Log: [Ref] mpt/base/detect_quirks.hpp: Link <https://developercommunity.visualstudio.com/t/Iterator-Debugging-breaks-C20-constexp/10861623>. Modified: trunk/OpenMPT/src/mpt/base/detect_quirks.hpp Modified: trunk/OpenMPT/src/mpt/base/detect_quirks.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/base/detect_quirks.hpp Sat Mar 1 21:03:08 2025 (r22978) +++ trunk/OpenMPT/src/mpt/base/detect_quirks.hpp Sun Mar 2 14:47:35 2025 (r22979) @@ -289,6 +289,7 @@ #if MPT_LIBCXX_MS // So, in 2025, Microsoft still ships a STL that by default is not standard-compliant with its own default Debug options. // constexpr auto foo = std::vector<int>{}; does not compile with iterator debugging enabled (i.e. in Debug builds). +// See <https://developercommunity.visualstudio.com/t/Iterator-Debugging-breaks-C20-constexp/10861623>. #if defined(_ITERATOR_DEBUG_LEVEL) #if (_ITERATOR_DEBUG_LEVEL >= 1) #ifndef MPT_LIBCXX_QUIRK_NO_CXX20_CONSTEXPR_CONTAINER |
|
From: <sv...@op...> - 2025-03-01 20:03:25
|
Author: manx Date: Sat Mar 1 21:03:08 2025 New Revision: 22978 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22978 Log: [Fix] So, apparently Microsoft's iterator debugging is not standard-complaint in that it does not support constexpr containers (i.e. constexpr auto foo = std::vector<int>{}; does not compile in default Debug builds). Set MPT_LIBCXX_QUIRK_NO_CXX20_CONSTEXPR_CONTAINER based on whether (_ITERATOR_DEBUG_LEVEL >= 1). Fixes r22906 for MSVC Debug builds. See also r22744. Modified: trunk/OpenMPT/src/mpt/base/detect_quirks.hpp Modified: trunk/OpenMPT/src/mpt/base/detect_quirks.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/base/detect_quirks.hpp Sat Mar 1 20:58:20 2025 (r22977) +++ trunk/OpenMPT/src/mpt/base/detect_quirks.hpp Sat Mar 1 21:03:08 2025 (r22978) @@ -17,6 +17,11 @@ #include <array> #endif // C++20 +#if MPT_LIBCXX_MS +// for _ITERATOR_DEBUG_LEVEL +#include <array> +#endif // MPT_LIBCXX_MS + #if MPT_OS_DJGPP @@ -277,9 +282,22 @@ #if MPT_CXX_AT_LEAST(20) #if MPT_LIBCXX_GNU_BEFORE(12) || MPT_LIBCXX_LLVM_BEFORE(15000) || (MPT_LIBCXX_MS && MPT_MSVC_BEFORE(2022, 0)) || (MPT_LIBCXX_MS && !MPT_COMPILER_MSVC) +#ifndef MPT_LIBCXX_QUIRK_NO_CXX20_CONSTEXPR_CONTAINER +#define MPT_LIBCXX_QUIRK_NO_CXX20_CONSTEXPR_CONTAINER +#endif +#endif +#if MPT_LIBCXX_MS +// So, in 2025, Microsoft still ships a STL that by default is not standard-compliant with its own default Debug options. +// constexpr auto foo = std::vector<int>{}; does not compile with iterator debugging enabled (i.e. in Debug builds). +#if defined(_ITERATOR_DEBUG_LEVEL) +#if (_ITERATOR_DEBUG_LEVEL >= 1) +#ifndef MPT_LIBCXX_QUIRK_NO_CXX20_CONSTEXPR_CONTAINER #define MPT_LIBCXX_QUIRK_NO_CXX20_CONSTEXPR_CONTAINER #endif #endif +#endif +#endif +#endif |
|
From: <sv...@op...> - 2025-03-01 19:58:33
|
Author: manx Date: Sat Mar 1 20:58:20 2025 New Revision: 22977 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22977 Log: [Var] build: Makefile: DJGPP: Small cleanup. Modified: trunk/OpenMPT/build/make/config-djgpp.mk Modified: trunk/OpenMPT/build/make/config-djgpp.mk ============================================================================== --- trunk/OpenMPT/build/make/config-djgpp.mk Wed Feb 26 23:33:00 2025 (r22976) +++ trunk/OpenMPT/build/make/config-djgpp.mk Sat Mar 1 20:58:20 2025 (r22977) @@ -139,7 +139,7 @@ -CACHE_386 :=64 # 0/64/128 +CACHE_386 :=64 # 0/32/64/128 CACHE_486 :=128 # 0/64/128/256 CACHE_S7 :=256 # 128/256/512 CACHE_SS7 :=512 # 256/512/1024 |
|
From: <sv...@op...> - 2025-02-26 22:33:12
|
Author: sagamusix Date: Wed Feb 26 23:33:00 2025 New Revision: 22976 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22976 Log: [Fix] Pattern tab: r22668 broke the Toggle Follow Song shortcut (https://bugs.openmpt.org/view.php?id=1867) Modified: trunk/OpenMPT/mptrack/Ctrl_pat.cpp Modified: trunk/OpenMPT/mptrack/Ctrl_pat.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Ctrl_pat.cpp Wed Feb 26 12:34:30 2025 (r22975) +++ trunk/OpenMPT/mptrack/Ctrl_pat.cpp Wed Feb 26 23:33:00 2025 (r22976) @@ -504,10 +504,10 @@ case CTRLMSG_PAT_FOLLOWSONG: // parameters: 0 = turn off, 1 = toggle { - UINT state = FALSE; + UINT state = BST_UNCHECKED; if(lParam == 1) // toggle { - state = IsDlgButtonChecked(IDC_PATTERN_FOLLOWSONG) != BST_UNCHECKED; + state = (IsDlgButtonChecked(IDC_PATTERN_FOLLOWSONG) == BST_UNCHECKED) ? BST_CHECKED : BST_UNCHECKED; } CheckDlgButton(IDC_PATTERN_FOLLOWSONG, state); OnFollowSong(); |
|
From: <sv...@op...> - 2025-02-26 11:34:46
|
Author: manx Date: Wed Feb 26 12:34:30 2025 New Revision: 22975 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22975 Log: [Ref] Silence cppcheck false-positive. Modified: branches/OpenMPT-1.31/soundlib/Sndfile.cpp Modified: branches/OpenMPT-1.31/soundlib/Sndfile.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Sndfile.cpp Tue Feb 25 22:35:47 2025 (r22974) +++ branches/OpenMPT-1.31/soundlib/Sndfile.cpp Wed Feb 26 12:34:30 2025 (r22975) @@ -1039,13 +1039,13 @@ { m_SongFlags.reset(SONG_FADINGSONG | SONG_ENDREACHED); m_PlayState.m_nBufferCount = 0; - for(auto &chn : m_PlayState.Chn) + for(CHANNELINDEX c = 0; c < static_cast<CHANNELINDEX>(std::size(m_PlayState.Chn)); ++c) { + ModChannel &chn = m_PlayState.Chn[c]; chn.nROfs = chn.nLOfs = 0; chn.nLength = 0; if(chn.dwFlags[CHN_ADLIB] && m_opl) { - CHANNELINDEX c = static_cast<CHANNELINDEX>(std::distance(m_PlayState.Chn.data(), &chn)); m_opl->NoteCut(c); } } |
|
From: <sv...@op...> - 2025-02-25 21:36:00
|
Author: sagamusix Date: Tue Feb 25 22:35:47 2025 New Revision: 22974 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22974 Log: Merged revision(s) 22973 from trunk/OpenMPT: [Fix] Sample tab: Fix crash when replacing a sample with a shorter one while outside of the sample editor, and then returning to the same sample slot (https://bugs.openmpt.org/view.php?id=1866). ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/mptrack/Globals.cpp branches/OpenMPT-1.31/mptrack/View_smp.cpp Modified: branches/OpenMPT-1.31/mptrack/Globals.cpp ============================================================================== --- branches/OpenMPT-1.31/mptrack/Globals.cpp Tue Feb 25 22:35:25 2025 (r22973) +++ branches/OpenMPT-1.31/mptrack/Globals.cpp Tue Feb 25 22:35:47 2025 (r22974) @@ -770,8 +770,12 @@ SCROLLINFO info; if(GetScrollInfo(SB_HORZ, &info, SIF_POS)) m_nScrollPosX = info.nPos; + else + m_nScrollPosX = 0; if(GetScrollInfo(SB_VERT, &info, SIF_POS)) m_nScrollPosY = info.nPos; + else + m_nScrollPosY = 0; } Modified: branches/OpenMPT-1.31/mptrack/View_smp.cpp ============================================================================== --- branches/OpenMPT-1.31/mptrack/View_smp.cpp Tue Feb 25 22:35:25 2025 (r22973) +++ branches/OpenMPT-1.31/mptrack/View_smp.cpp Tue Feb 25 22:35:47 2025 (r22974) @@ -1012,10 +1012,10 @@ const CRect rcClient = m_rcClient; CRect rect, rc; - const SmpLength smpScrollPos = ScrollPosToSamplePos(); const auto &colors = TrackerSettings::Instance().rgbCustomColors; const CSoundFile &sndFile = pModDoc->GetSoundFile(); const ModSample &sample = sndFile.GetSample((m_nSample <= sndFile.GetNumSamples()) ? m_nSample : 0); + const SmpLength smpScrollPos = std::min(ScrollPosToSamplePos(), sample.nLength); if(sample.uFlags[CHN_ADLIB]) { CModScrollView::OnDraw(pDC); |
|
From: <sv...@op...> - 2025-02-25 21:35:31
|
Author: sagamusix Date: Tue Feb 25 22:35:25 2025 New Revision: 22973 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22973 Log: [Fix] Sample tab: Fix crash when replacing a sample with a shorter one while outside of the sample editor, and then returning to the same sample slot (https://bugs.openmpt.org/view.php?id=1866). Modified: trunk/OpenMPT/mptrack/Globals.cpp trunk/OpenMPT/mptrack/View_smp.cpp Modified: trunk/OpenMPT/mptrack/Globals.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Globals.cpp Tue Feb 25 21:04:47 2025 (r22972) +++ trunk/OpenMPT/mptrack/Globals.cpp Tue Feb 25 22:35:25 2025 (r22973) @@ -801,8 +801,12 @@ SCROLLINFO info; if(GetScrollInfo(SB_HORZ, &info, SIF_POS)) m_nScrollPosX = info.nPos; + else + m_nScrollPosX = 0; if(GetScrollInfo(SB_VERT, &info, SIF_POS)) m_nScrollPosY = info.nPos; + else + m_nScrollPosY = 0; } Modified: trunk/OpenMPT/mptrack/View_smp.cpp ============================================================================== --- trunk/OpenMPT/mptrack/View_smp.cpp Tue Feb 25 21:04:47 2025 (r22972) +++ trunk/OpenMPT/mptrack/View_smp.cpp Tue Feb 25 22:35:25 2025 (r22973) @@ -1001,10 +1001,10 @@ const CRect rcClient = m_rcClient; CRect rect, rc; - const SmpLength smpScrollPos = ScrollPosToSamplePos(); const auto &colors = TrackerSettings::Instance().rgbCustomColors; const CSoundFile &sndFile = pModDoc->GetSoundFile(); const ModSample &sample = sndFile.GetSample((m_nSample <= sndFile.GetNumSamples()) ? m_nSample : 0); + const SmpLength smpScrollPos = std::min(ScrollPosToSamplePos(), sample.nLength); if(sample.uFlags[CHN_ADLIB]) { CModScrollView::OnDraw(pDC); |
|
From: <sv...@op...> - 2025-02-25 20:04:58
|
Author: sagamusix Date: Tue Feb 25 21:04:47 2025 New Revision: 22972 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22972 Log: Merged revision(s) 22971 from trunk/OpenMPT: [Fix] Sample tab: Drawing sample data from right to left instead of left to right caused the drawn lines to not be interpolated properly. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/mptrack/View_smp.cpp branches/OpenMPT-1.31/mptrack/View_smp.h Modified: branches/OpenMPT-1.31/mptrack/View_smp.cpp ============================================================================== --- branches/OpenMPT-1.31/mptrack/View_smp.cpp Tue Feb 25 21:04:24 2025 (r22971) +++ branches/OpenMPT-1.31/mptrack/View_smp.cpp Tue Feb 25 21:04:47 2025 (r22972) @@ -1684,20 +1684,19 @@ } -template<class T, class uT> +template<class T> T CViewSample::GetSampleValueFromPoint(const ModSample &smp, const CPoint &point) const { - static_assert(sizeof(T) == sizeof(uT) && sizeof(T) <= 2); + static_assert(sizeof(T) < sizeof(int)); const int channelHeight = (m_rcClient.Height() - m_timelineHeight) / smp.GetNumChannels(); - int yPos = point.y - m_drawChannel * channelHeight - m_timelineHeight; + const int yPos = point.y - m_drawChannel * channelHeight - m_timelineHeight; - int value = std::numeric_limits<T>::max() - std::numeric_limits<uT>::max() * yPos / channelHeight; - Limit(value, std::numeric_limits<T>::min(), std::numeric_limits<T>::max()); - return static_cast<T>(value); + const int value = std::numeric_limits<T>::max() - (std::numeric_limits<T>::max() - std::numeric_limits<T>::min()) * yPos / channelHeight; + return mpt::saturate_cast<T>(value); } -template<class T, class uT> +template<class T> void CViewSample::SetInitialDrawPoint(ModSample &smp, const CPoint &point) { if(m_rcClient.Height() >= m_timelineHeight) @@ -1707,24 +1706,29 @@ Limit(m_drawChannel, 0, (int)smp.GetNumChannels() - 1); T *data = static_cast<T *>(smp.samplev()) + m_drawChannel; - data[m_dwEndDrag * smp.GetNumChannels()] = GetSampleValueFromPoint<T, uT>(smp, point); + data[m_dwEndDrag * smp.GetNumChannels()] = GetSampleValueFromPoint<T>(smp, point); } -template<class T, class uT> +template<class T> void CViewSample::SetSampleData(ModSample &smp, const CPoint &point, const SmpLength old) { - T *data = static_cast<T *>(smp.samplev()) + m_drawChannel + old * smp.GetNumChannels(); - const int oldvalue = *data; - const int value = GetSampleValueFromPoint<T, uT>(smp, point); - const int inc = (m_dwEndDrag > old ? 1 : -1); - const int ptrInc = inc * smp.GetNumChannels(); + SmpLength x1 = old, x2 = m_dwEndDrag; + T *data = static_cast<T *>(smp.samplev()) + m_drawChannel + x1 * smp.GetNumChannels(); + T v1 = *data, v2 = GetSampleValueFromPoint<T>(smp, point); + if(x1 > x2) + { + data -= (x1 - x2) * smp.GetNumChannels(); + std::swap(x1, x2); + std::swap(v1, v2); + } - for(SmpLength i = old; i != m_dwEndDrag; i += inc, data += ptrInc) + const uint8 ptrInc = smp.GetNumChannels(); + for(SmpLength length = x2 - x1, remain = length; remain != 0; remain--, data += ptrInc) { - *data = static_cast<T>(static_cast<double>(oldvalue) + (value - oldvalue) * (static_cast<double>(i - old) / static_cast<double>(m_dwEndDrag - old))); + *data = static_cast<T>(v2 + Util::muldivr(v1 - v2, remain, length)); } - *data = static_cast<T>(value); + *data = v2; } @@ -1974,9 +1978,9 @@ LimitMax(old, sample.nLength); if(sample.GetElementarySampleSize() == 2) - SetSampleData<int16, uint16>(sample, point, old); + SetSampleData<int16>(sample, point, old); else if(sample.GetElementarySampleSize() == 1) - SetSampleData<int8, uint8>(sample, point, old); + SetSampleData<int8>(sample, point, old); sample.PrecomputeLoops(sndFile, false); @@ -2075,9 +2079,9 @@ m_lastDrawPoint = point; pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_replace, "Draw Sample"); if(sample.GetElementarySampleSize() == 2) - SetInitialDrawPoint<int16, uint16>(sample, point); + SetInitialDrawPoint<int16>(sample, point); else if(sample.GetElementarySampleSize() == 1) - SetInitialDrawPoint<int8, uint8>(sample, point); + SetInitialDrawPoint<int8>(sample, point); sndFile.GetSample(m_nSample).PrecomputeLoops(sndFile, false); Modified: branches/OpenMPT-1.31/mptrack/View_smp.h ============================================================================== --- branches/OpenMPT-1.31/mptrack/View_smp.h Tue Feb 25 21:04:24 2025 (r22971) +++ branches/OpenMPT-1.31/mptrack/View_smp.h Tue Feb 25 21:04:47 2025 (r22972) @@ -130,15 +130,15 @@ void DoPaste(PasteMode pasteMode); // Sets sample data on sample draw. - template<class T, class uT> + template<class T> void SetSampleData(ModSample &smp, const CPoint &point, const SmpLength old); // Sets initial draw point on sample draw. - template<class T, class uT> + template<class T> void SetInitialDrawPoint(ModSample &smp, const CPoint &point); // Returns sample value corresponding given point in the sample view. - template<class T, class uT> + template<class T> T GetSampleValueFromPoint(const ModSample &smp, const CPoint &point) const; int GetZoomLevel(SmpLength length) const; |
3 messages has been excluded from this view by a project administrator.
