Skip to content

Commit aa811c0

Browse files
ThFabbaThFabba
committed
[MPG123] Update to version 1.26.1. CORE-17098
1 parent cab7e9a commit aa811c0

27 files changed

+2143
-690
lines changed

‎media/doc/3rd Party Files.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Used Version: 0.1.9
6464
Website: http://www.mega-nerd.com/SRC/download.html
6565

6666
Title: libmpg123 (used by winemp3.acm)
67-
Used Version: 1.25.13
67+
Used Version: 1.26.1
6868
Website: http://www.mpg123.de/
6969

7070
Title: STLport

‎sdk/include/reactos/libs/libmpg123/compat.h

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717
#include "config.h"
1818
#include "intsym.h"
1919

20-
/* For --nagging compilation with -std=c89, we need
21-
to disable the inline keyword. */
22-
#ifdef PLAIN_C89
20+
/* Disable inline for non-C99 compilers. */
21+
#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L
2322
#ifndef inline
2423
#define inline
2524
#endif
@@ -66,6 +65,9 @@
6665
#ifndef SIZE_MAX
6766
#define SIZE_MAX ((size_t)-1)
6867
#endif
68+
#ifndef SSIZE_MAX
69+
#define SSIZE_MAX ((size_t)-1/2)
70+
#endif
6971
#ifndef ULONG_MAX
7072
#define ULONG_MAX ((unsigned long)-1)
7173
#endif
@@ -122,23 +124,23 @@ char* compat_strdup(const char *s);
122124
/* If we have the size checks enabled, try to derive some sane printfs.
123125
Simple start: Use max integer type and format if long is not big enough.
124126
I am hesitating to use %ll without making sure that it's there... */
125-
#if !(defined PLAIN_C89) && (defined SIZEOF_OFF_T) && (SIZEOF_OFF_T > SIZEOF_LONG) && (defined PRIiMAX)
127+
#if (defined SIZEOF_OFF_T) && (SIZEOF_OFF_T > SIZEOF_LONG) && (defined PRIiMAX)
126128
# define OFF_P PRIiMAX
127129
typedef intmax_t off_p;
128130
#else
129131
# define OFF_P "li"
130132
typedef long off_p;
131133
#endif
132134

133-
#if !(defined PLAIN_C89) && (defined SIZEOF_SIZE_T) && (SIZEOF_SIZE_T > SIZEOF_LONG) && (defined PRIuMAX)
135+
#if (defined SIZEOF_SIZE_T) && (SIZEOF_SIZE_T > SIZEOF_LONG) && (defined PRIuMAX)
134136
# define SIZE_P PRIuMAX
135137
typedef uintmax_t size_p;
136138
#else
137139
# define SIZE_P "lu"
138140
typedef unsigned long size_p;
139141
#endif
140142

141-
#if !(defined PLAIN_C89) && (defined SIZEOF_SSIZE_T) && (SIZEOF_SSIZE_T > SIZEOF_LONG) && (defined PRIiMAX)
143+
#if (defined SIZEOF_SSIZE_T) && (SIZEOF_SSIZE_T > SIZEOF_LONG) && (defined PRIiMAX)
142144
# define SSIZE_P PRIuMAX
143145
typedef intmax_t ssize_p;
144146
#else
@@ -266,10 +268,11 @@ void compat_dlclose(void *handle);
266268
#endif
267269

268270
/* Blocking write/read of data with signal resilience.
269-
Both continue after being interrupted by signals and always return the
271+
They continue after being interrupted by signals and always return the
270272
amount of processed data (shortage indicating actual problem or EOF). */
271273
size_t unintr_write(int fd, void const *buffer, size_t bytes);
272274
size_t unintr_read (int fd, void *buffer, size_t bytes);
275+
size_t unintr_fwrite(const void *ptr, size_t size, size_t nmemb, FILE *stream);
273276

274277
/* That one comes from Tellie on OS/2, needed in resolver. */
275278
#ifdef __KLIBC__

‎sdk/include/reactos/libs/libmpg123/config.h

Lines changed: 52 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#define ABI_ALIGN_FUN 1
77

88
/* Define to use proper rounding. */
9-
/* #undef ACCURATE_ROUNDING */
9+
#define ACCURATE_ROUNDING 1
1010

1111
/* Define if building universal (internal helper macro) */
1212
/* #undef AC_APPLE_UNIVERSAL_BUILD */
@@ -77,6 +77,9 @@
7777
/* Define to 1 if you have the <AudioUnit/AudioUnit.h> header file. */
7878
/* #undef HAVE_AUDIOUNIT_AUDIOUNIT_H */
7979

80+
/* Define to 1 if you have the <byteswap.h> header file. */
81+
/* #undef HAVE_BYTESWAP_H */
82+
8083
/* Define to 1 if you have the <CoreServices/CoreServices.h> header file. */
8184
/* #undef HAVE_CORESERVICES_CORESERVICES_H */
8285

@@ -104,15 +107,15 @@
104107
/* Define to 1 if you have the `getaddrinfo' function. */
105108
/* #undef HAVE_GETADDRINFO */
106109

107-
/* Define to 1 if you have the `getpagesize' function. */
108-
#define HAVE_GETPAGESIZE 1
109-
110110
/* Define to 1 if you have the `getuid' function. */
111111
/* #undef HAVE_GETUID */
112112

113113
/* Define to 1 if you have the <inttypes.h> header file. */
114114
#define HAVE_INTTYPES_H 1
115115

116+
/* Define to 1 if you have the `iswprint' function. */
117+
#define HAVE_ISWPRINT 1
118+
116119
/* Define to 1 if you have the <langinfo.h> header file. */
117120
/* #undef HAVE_LANGINFO_H */
118121

@@ -134,13 +137,16 @@
134137
/* Define to 1 if you have the <machine/soundcard.h> header file. */
135138
/* #undef HAVE_MACHINE_SOUNDCARD_H */
136139

140+
/* Define to 1 if you have the `mbstowcs' function. */
141+
#define HAVE_MBSTOWCS 1
142+
137143
/* Define to 1 if you have the <memory.h> header file. */
138144
#define HAVE_MEMORY_H 1
139145

140146
/* Define to 1 if you have the `mkfifo' function. */
141147
/* #undef HAVE_MKFIFO */
142148

143-
/* Define to 1 if you have a working `mmap' system call. */
149+
/* Define to 1 if you have the `mmap' function. */
144150
/* #undef HAVE_MMAP */
145151

146152
/* Define to 1 if you have the <netdb.h> header file. */
@@ -185,6 +191,18 @@
185191
/* Define to 1 if you have the `setuid' function. */
186192
/* #undef HAVE_SETUID */
187193

194+
/* Define to 1 if you have the `shmat' function. */
195+
/* #undef HAVE_SHMAT */
196+
197+
/* Define to 1 if you have the `shmctl' function. */
198+
/* #undef HAVE_SHMCTL */
199+
200+
/* Define to 1 if you have the `shmdt' function. */
201+
/* #undef HAVE_SHMDT */
202+
203+
/* Define to 1 if you have the `shmget' function. */
204+
/* #undef HAVE_SHMGET */
205+
188206
/* Define to 1 if you have the <signal.h> header file. */
189207
#define HAVE_SIGNAL_H 1
190208

@@ -221,6 +239,9 @@
221239
/* Define to 1 if you have the <sys/ioctl.h> header file. */
222240
/* #undef HAVE_SYS_IOCTL_H */
223241

242+
/* Define to 1 if you have the <sys/ipc.h> header file. */
243+
/* #undef HAVE_SYS_IPC_H */
244+
224245
/* Define to 1 if you have the <sys/param.h> header file. */
225246
#define HAVE_SYS_PARAM_H 1
226247

@@ -230,6 +251,9 @@
230251
/* Define to 1 if you have the <sys/select.h> header file. */
231252
/* #undef HAVE_SYS_SELECT_H */
232253

254+
/* Define to 1 if you have the <sys/shm.h> header file. */
255+
/* #undef HAVE_SYS_SHM_H */
256+
233257
/* Define to 1 if you have the <sys/signal.h> header file. */
234258
/* #undef HAVE_SYS_SIGNAL_H */
235259

@@ -257,6 +281,18 @@
257281
/* Define to 1 if you have the <unistd.h> header file. */
258282
#define HAVE_UNISTD_H 1
259283

284+
/* Define to 1 if you have the <wchar.h> header file. */
285+
#define HAVE_WCHAR_H 1
286+
287+
/* Define to 1 if you have the `wcstombs' function. */
288+
#define HAVE_WCSTOMBS 1
289+
290+
/* Define to 1 if you have the `wcswidth' function. */
291+
/* #undef HAVE_WCSWIDTH */
292+
293+
/* Define to 1 if you have the <wctype.h> header file. */
294+
#define HAVE_WCTYPE_H 1
295+
260296
/* Define to 1 if you have the <windows.h> header file. */
261297
#define HAVE_WINDOWS_H 1
262298

@@ -331,6 +367,9 @@
331367
/* Define to disable layer III. */
332368
/* #undef NO_LAYER3 */
333369

370+
/* Define to disable analyzer info. */
371+
/* #undef NO_MOREINFO */
372+
334373
/* Define to disable ntom resampling. */
335374
/* #undef NO_NTOM */
336375

@@ -356,7 +395,7 @@
356395
#define PACKAGE_NAME "mpg123"
357396

358397
/* Define to the full name and version of this package. */
359-
#define PACKAGE_STRING "mpg123 1.25.13"
398+
#define PACKAGE_STRING "mpg123 1.26.1"
360399

361400
/* Define to the one symbol short name of this package. */
362401
#define PACKAGE_TARNAME "mpg123"
@@ -365,7 +404,7 @@
365404
#define PACKAGE_URL ""
366405

367406
/* Define to the version of this package. */
368-
#define PACKAGE_VERSION "1.25.13"
407+
#define PACKAGE_VERSION "1.26.1"
369408

370409
/* Define if portaudio v18 API is wanted. */
371410
/* #undef PORTAUDIO18 */
@@ -388,6 +427,9 @@
388427
/* Define to 1 if you have the ANSI C header files. */
389428
#define STDC_HEADERS 1
390429

430+
/* Define to not duplicate some code for likely cases in libsyn123. */
431+
/* #undef SYN123_NO_CASES */
432+
391433
/* Define if modules are enabled */
392434
/* #undef USE_MODULES */
393435

@@ -398,7 +440,7 @@
398440
/* #undef USE_YASM_FOR_AVX */
399441

400442
/* Version number of package */
401-
#define VERSION "1.25.13"
443+
#define VERSION "1.26.1"
402444

403445
/* Define to use Win32 named pipes */
404446
#define WANT_WIN32_FIFO 1
@@ -409,7 +451,7 @@
409451
/* Define to use Unicode for Windows */
410452
#define WANT_WIN32_UNICODE 1
411453

412-
/* WinXP and above for ipv6 */
454+
/* Windows Vista and later APIs */
413455
/* #undef WINVER */
414456

415457
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
@@ -435,7 +477,7 @@
435477
/* Define for large files, on AIX-style hosts. */
436478
/* #undef _LARGE_FILES */
437479

438-
/* WinXP and above for ipv6 */
480+
/* Windows Vista and later APIs */
439481
/* #undef _WIN32_WINNT */
440482

441483
/* Define to empty if `const' does not conform to ANSI C. */

‎sdk/include/reactos/libs/libmpg123/debug.h

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
Variadic macros are a C99 feature...
2121
Now just predefining stuff non-variadic for up to 15 arguments.
2222
It's cumbersome to have them all with different names, though...
23+
24+
Update: Also adding variadic macros now. We star to use some C99.
2325
*/
2426

2527
#ifdef ME
@@ -31,6 +33,10 @@
3133
#ifdef DEBUG
3234

3335
#include <stdio.h>
36+
37+
// The future (from about 20 years ago;-):
38+
#define mdebug(s, ...) fprintf(stderr, DBGPRFX "[" __FILE__ ":%i] debug: " s "\n", __LINE__, __VA_ARGS__)
39+
3440
#define debug(s) fprintf(stderr, DBGPRFX"[" __FILE__ ":%i] debug: " s "\n", __LINE__)
3541
#define debug1(s, a) fprintf(stderr, DBGPRFX"[" __FILE__ ":%i] debug: " s "\n", __LINE__, a)
3642
#define debug2(s, a, b) fprintf(stderr, DBGPRFX"[" __FILE__ ":%i] debug: " s "\n", __LINE__, a, b)
@@ -48,6 +54,9 @@
4854
#define debug14(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n) fprintf(stderr, DBGPRFX"[" __FILE__ ":%i] debug: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l, m, n)
4955
#define debug15(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) fprintf(stderr, DBGPRFX"[" __FILE__ ":%i] debug: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o)
5056
#else
57+
58+
#define mdebug(s, ...)
59+
5160
#define debug(s)
5261
#define debug1(s, a)
5362
#define debug2(s, a, b)
@@ -68,6 +77,9 @@
6877

6978
/* warning macros also here... */
7079
#ifndef NO_WARNING
80+
81+
#define mwarning(s, ...) fprintf(stderr, DBGPRFX "[" __FILE__ ":%i] warning: " s "\n", __LINE__, __VA_ARGS__)
82+
7183
#define warning(s) fprintf(stderr, DBGPRFX"[" __FILE__ ":%i] warning: " s "\n", __LINE__)
7284
#define warning1(s, a) fprintf(stderr, DBGPRFX"[" __FILE__ ":%i] warning: " s "\n", __LINE__, a)
7385
#define warning2(s, a, b) fprintf(stderr, DBGPRFX"[" __FILE__ ":%i] warning: " s "\n", __LINE__, a, b)
@@ -85,6 +97,7 @@
8597
#define warning14(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n) fprintf(stderr, DBGPRFX"[" __FILE__ ":%i] warning: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l, m, n)
8698
#define warning15(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) fprintf(stderr, DBGPRFX"[" __FILE__ ":%i] warning: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o)
8799
#else
100+
#define mwarning(s, ...)
88101
#define warning(s)
89102
#define warning1(s, a)
90103
#define warning2(s, a, b)
@@ -104,7 +117,10 @@
104117
#endif
105118

106119
/* error macros also here... */
107-
#ifndef NO_ERROR
120+
#ifndef NO_ERRORMSG
121+
122+
#define merror(s, ...) fprintf(stderr, DBGPRFX "[" __FILE__ ":%i] error: " s "\n", __LINE__, __VA_ARGS__)
123+
108124
#define error(s) fprintf(stderr, DBGPRFX"[" __FILE__ ":%i] error: " s "\n", __LINE__)
109125
#define error1(s, a) fprintf(stderr, DBGPRFX"[" __FILE__ ":%i] error: " s "\n", __LINE__, a)
110126
#define error2(s, a, b) fprintf(stderr, DBGPRFX"[" __FILE__ ":%i] error: " s "\n", __LINE__, a, b)
@@ -122,6 +138,7 @@
122138
#define error14(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n) fprintf(stderr, DBGPRFX"[" __FILE__ ":%i] error: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l, m, n)
123139
#define error15(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) fprintf(stderr, DBGPRFX"[" __FILE__ ":%i] error: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o)
124140
#else
141+
#define merror(s, ...)
125142
#define error(s)
126143
#define error1(s, a)
127144
#define error2(s, a, b)
@@ -142,6 +159,9 @@
142159

143160
/* ereturn macros also here... */
144161
#ifndef NO_ERETURN
162+
163+
#define mereturn(rv, s, ...) do{ fprintf(stderr, DBGPRFX "[" __FILE__ ":%i] ereturn: " s "\n", __LINE__, __VA_ARGS__); return rv; }while(0)
164+
145165
#define ereturn(rv, s) do{ fprintf(stderr, DBGPRFX"[" __FILE__ ":%i] ereturn: " s "\n", __LINE__); return rv; }while(0)
146166
#define ereturn1(rv, s, a) do{ fprintf(stderr, DBGPRFX"[" __FILE__ ":%i] ereturn: " s "\n", __LINE__, a); return rv; }while(0)
147167
#define ereturn2(rv, s, a, b) do{ fprintf(stderr, DBGPRFX"[" __FILE__ ":%i] ereturn: " s "\n", __LINE__, a, b); return rv; }while(0)
@@ -159,6 +179,7 @@
159179
#define ereturn14(rv, s, a, b, c, d, e, f, g, h, i, j, k, l, m, n) do{ fprintf(stderr, DBGPRFX"[" __FILE__ ":%i] ereturn: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l, m, n); return rv; }while(0)
160180
#define ereturn15(rv, s, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) do{ fprintf(stderr, DBGPRFX"[" __FILE__ ":%i] ereturn: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o); return rv; }while(0)
161181
#else
182+
#define mereturn(rv, s, ...) return rv
162183
#define ereturn(rv, s) return rv
163184
#define ereturn1(rv, s, a) return rv
164185
#define ereturn2(rv, s, a, b) return rv

0 commit comments

Comments
 (0)