Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 75094: [LIBMPG123] - Add missing files CORE-13451
by tfaber＠svn.reactos.org 18 Jun '17

18 Jun '17

Author: tfaber Date: Sun Jun 18 14:08:53 2017 New Revision: 75094 URL: http://svn.reactos.org/svn/reactos?rev=75094&view=rev Log: [LIBMPG123] - Add missing files CORE-13451 Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/config.h trunk/reactos/sdk/include/reactos/libs/libmpg123/intsym.h trunk/reactos/sdk/include/reactos/libs/libmpg123/mpg123.h Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libmpg123/config.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libmpg123/config.h [iso-8859-1] Sun Jun 18 14:08:53 2017 @@ -83,9 +83,21 @@ /* Define to 1 if you have the <CUlib.h> header file. */ /* #undef HAVE_CULIB_H */ +/* Define to 1 if you have the <dirent.h> header file. */ +#define HAVE_DIRENT_H 1 + +/* Define to 1 if you have the `dlclose' function. */ +/* #undef HAVE_DLCLOSE */ + /* Define to 1 if you have the <dlfcn.h> header file. */ /* #undef HAVE_DLFCN_H */ +/* Define to 1 if you have the `dlopen' function. */ +/* #undef HAVE_DLOPEN */ + +/* Define to 1 if you have the `dlsym' function. */ +/* #undef HAVE_DLSYM */ + /* Define if getaddrinfo accepts the AI_ADDRCONFIG flag */ /* #undef HAVE_GAI_ADDRCONFIG */ @@ -119,9 +131,6 @@ /* Define to 1 if you have the <locale.h> header file. */ #define HAVE_LOCALE_H 1 -/* Define if libltdl is available */ -/* #undef HAVE_LTDL */ - /* Define to 1 if you have the <machine/soundcard.h> header file. */ /* #undef HAVE_MACHINE_SOUNDCARD_H */ @@ -191,9 +200,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #define HAVE_STDLIB_H 1 -/* Define to 1 if you have the `strdup' function. */ -#define HAVE_STRDUP 1 - /* Define to 1 if you have the `strerror' function. */ #define HAVE_STRERROR 1 @@ -220,6 +226,9 @@ /* Define to 1 if you have the <sys/resource.h> header file. */ /* #undef HAVE_SYS_RESOURCE_H */ + +/* Define to 1 if you have the <sys/select.h> header file. */ +/* #undef HAVE_SYS_SELECT_H */ /* Define to 1 if you have the <sys/signal.h> header file. */ /* #undef HAVE_SYS_SIGNAL_H */ @@ -267,11 +276,17 @@ functions. */ #define LFS_ALIAS_BITS 32 +/* Define to the extension used for runtime loadable modules, say, ".so". */ +/* #undef LT_MODULE_EXT */ + /* Define to the sub-directory where libtool stores uninstalled libraries. */ #define LT_OBJDIR ".libs/" -/* The suffix for module files. */ -#define MODULE_FILE_SUFFIX ".la" +/* Define to the shared library suffix, say, ".dylib". */ +/* #undef LT_SHARED_EXT */ + +/* Define to the shared archive member specification, say "(shr.o)". */ +/* #undef LT_SHARED_LIB_MEMBER */ /* Define if network support is enabled. */ #define NETWORK 1 @@ -341,7 +356,7 @@ #define PACKAGE_NAME "mpg123" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "mpg123 1.23.0" +#define PACKAGE_STRING "mpg123 1.25.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "mpg123" @@ -350,7 +365,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.23.0" +#define PACKAGE_VERSION "1.25.0" /* Define if portaudio v18 API is wanted. */ /* #undef PORTAUDIO18 */ @@ -383,7 +398,7 @@ /* #undef USE_YASM_FOR_AVX */ /* Version number of package */ -#define VERSION "1.23.0" +#define VERSION "1.25.0" /* Define to use Win32 named pipes */ #define WANT_WIN32_FIFO 1 Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/intsym.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libmpg123/intsym.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libmpg123/intsym.h [iso-8859-1] Sun Jun 18 14:08:53 2017 @@ -6,9 +6,12 @@ #define COS9 INT123_COS9 #define tfcos36 INT123_tfcos36 #define pnts INT123_pnts +#define catchsignal INT123_catchsignal #define safe_realloc INT123_safe_realloc +#define compat_strdup INT123_compat_strdup #define compat_open INT123_compat_open #define compat_fopen INT123_compat_fopen +#define compat_fdopen INT123_compat_fdopen #define compat_close INT123_compat_close #define compat_fclose INT123_compat_fclose #define win32_wide_utf8 INT123_win32_wide_utf8 @@ -242,6 +245,57 @@ #define feed_forget INT123_feed_forget #define feed_set_pos INT123_feed_set_pos #define open_bad INT123_open_bad +#define open_module INT123_open_module +#define close_module INT123_close_module +#define list_modules INT123_list_modules +#define buffer_init INT123_buffer_init +#define buffer_exit INT123_buffer_exit +#define buffer_sync_param INT123_buffer_sync_param +#define buffer_open INT123_buffer_open +#define buffer_encodings INT123_buffer_encodings +#define buffer_formats INT123_buffer_formats +#define buffer_start INT123_buffer_start +#define buffer_ndrain INT123_buffer_ndrain +#define buffer_stop INT123_buffer_stop +#define buffer_close INT123_buffer_close +#define buffer_continue INT123_buffer_continue +#define buffer_ignore_lowmem INT123_buffer_ignore_lowmem +#define buffer_drain INT123_buffer_drain +#define buffer_end INT123_buffer_end +#define buffer_pause INT123_buffer_pause +#define buffer_drop INT123_buffer_drop +#define buffer_write INT123_buffer_write +#define buffer_fill INT123_buffer_fill +#define read_buf INT123_read_buf +#define xfer_write_string INT123_xfer_write_string +#define xfer_read_string INT123_xfer_read_string +#define xfermem_init INT123_xfermem_init +#define xfermem_init_writer INT123_xfermem_init_writer +#define xfermem_init_reader INT123_xfermem_init_reader +#define xfermem_get_freespace INT123_xfermem_get_freespace +#define xfermem_get_usedspace INT123_xfermem_get_usedspace +#define xfermem_getcmd INT123_xfermem_getcmd +#define xfermem_getcmds INT123_xfermem_getcmds +#define xfermem_putcmd INT123_xfermem_putcmd +#define xfermem_writer_block INT123_xfermem_writer_block +#define xfermem_write INT123_xfermem_write +#define xfermem_done INT123_xfermem_done +#define au_open INT123_au_open +#define cdr_open INT123_cdr_open +#define raw_open INT123_raw_open +#define wav_open INT123_wav_open +#define wav_write INT123_wav_write +#define wav_close INT123_wav_close +#define au_close INT123_au_close +#define raw_close INT123_raw_close +#define cdr_formats INT123_cdr_formats +#define au_formats INT123_au_formats +#define raw_formats INT123_raw_formats +#define wav_formats INT123_wav_formats +#define wav_drain INT123_wav_drain +#define write_parameters INT123_write_parameters +#define read_parameters INT123_read_parameters +#define stringlists_add INT123_stringlists_add #define check_neon INT123_check_neon #define dct64_3dnow INT123_dct64_3dnow #define dct64_3dnowext INT123_dct64_3dnowext @@ -300,9 +354,6 @@ #define synth_1to1_s32_x86_64_asm INT123_synth_1to1_s32_x86_64_asm #define costab_mmxsse INT123_costab_mmxsse #define make_decode_tables_mmx_asm INT123_make_decode_tables_mmx_asm -#ifndef HAVE_STRDUP -#define strdup INT123_strdup -#endif #ifndef HAVE_STRERROR #define strerror INT123_strerror #endif Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/mpg123.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libmpg123/mpg123.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libmpg123/mpg123.h [iso-8859-1] Sun Jun 18 14:08:53 2017 @@ -1,5 +1,5 @@ /* - libmpg123: MPEG Audio Decoder library (version 1.23.0) + libmpg123: MPEG Audio Decoder library (version 1.25.0) copyright 1995-2015 by the mpg123 project free software under the terms of the LGPL 2.1 @@ -17,8 +17,9 @@ * This should be incremented at least each time a new symbol is added * to the header. */ -#define MPG123_API_VERSION 42 - +#define MPG123_API_VERSION 44 + +#ifndef MPG123_EXPORT /** Defines needed for MS Visual Studio(tm) DLL builds. * Every public function must be prefixed with MPG123_EXPORT. When building * the DLL ensure to define BUILD_MPG123_DLL. This makes the function accessible @@ -38,14 +39,26 @@ #define MPG123_EXPORT #endif #endif +#endif + +#ifndef __REACTOS__ +/* This is for Visual Studio, so this header works as distributed in the binary downloads */ +#if defined(_MSC_VER) && !defined(MPG123_DEF_SSIZE_T) +#define MPG123_DEF_SSIZE_T +#include <stddef.h> +typedef ptrdiff_t ssize_t; +#endif +#endif /* __REACTOS__ */ #ifndef MPG123_NO_CONFIGURE /* Enable use of this file without configure. */ #include <stdlib.h> #include <sys/types.h> +#ifdef __REACTOS__ #ifndef ssize_t typedef long ssize_t; #endif +#endif /* __REACTOS__ */ /* Simplified large file handling. I used to have a check here that prevents building for a library with conflicting large file setup @@ -196,6 +209,13 @@ ,MPG123_IGNORE_INFOFRAME = 0x4000 /**< 100 0000 0000 0000 Do not parse the LAME/Xing info frame, treat it as normal MPEG data. */ ,MPG123_AUTO_RESAMPLE = 0x8000 /**< 1000 0000 0000 0000 Allow automatic internal resampling of any kind (default on if supported). Especially when going lowlevel with replacing output buffer, you might want to unset this flag. Setting MPG123_DOWNSAMPLE or MPG123_FORCE_RATE will override this. */ ,MPG123_PICTURE = 0x10000 /**< 17th bit: Enable storage of pictures from tags (ID3v2 APIC). */ + ,MPG123_NO_PEEK_END = 0x20000 /**< 18th bit: Do not seek to the end of + * the stream in order to probe + * the stream length and search for the id3v1 field. This also means + * the file size is unknown unless set using mpg123_set_filesize() and + * the stream is assumed as non-seekable unless overridden. + */ + ,MPG123_FORCE_SEEKABLE = 0x40000 /**< 19th bit: Force the stream to be seekable. */ }; /** choices for MPG123_RVA */ @@ -395,7 +415,7 @@ * The active decoder engine can vary depening on output constraints, * mostly non-resampling, integer output is accelerated via 3DNow & Co. but for * other modes a fallback engine kicks in. - * Note that this can return a decoder that is ony active in the hidden and not + * Note that this can return a decoder that is only active in the hidden and not * available as decoder choice from the outside. * \param mh handle * \return The decoder name or NULL on error. @@ -411,7 +431,7 @@ * * Before you dive in, please be warned that you might get confused by this. This seems to happen a lot, therefore I am trying to explain in advance. * - * The mpg123 library decides what output format to use when encountering the first frame in a stream, or actually any frame that is still valid but differs from the frames before in the prompted output format. At such a deciding point, an internal table of allowed encodings, sampling rates and channel setups is consulted. According to this table, an output format is chosen and the decoding engine set up accordingly (including ptimized routines for different output formats). This might seem unusual but it just follows from the non-existence of "MPEG audio files" with defined overall properties. There are streams, streams are concatenations of (semi) independent frames. We store streams on disk and call them "MPEG audio files", but that does not change their nature as the decoder is concerned (the LAME/Xing header for gapless decoding makes things interesting again). + * The mpg123 library decides what output format to use when encountering the first frame in a stream, or actually any frame that is still valid but differs from the frames before in the prompted output format. At such a deciding point, an internal table of allowed encodings, sampling rates and channel setups is consulted. According to this table, an output format is chosen and the decoding engine set up accordingly (including optimized routines for different output formats). This might seem unusual but it just follows from the non-existence of "MPEG audio files" with defined overall properties. There are streams, streams are concatenations of (semi) independent frames. We store streams on disk and call them "MPEG audio files", but that does not change their nature as the decoder is concerned (the LAME/Xing header for gapless decoding makes things interesting again). * * To get to the point: What you do with mpg123_format() and friends is to fill the internal table of allowed formats before it is used. That includes removing support for some formats or adding your forced sample rate (see MPG123_FORCE_RATE) that will be used with the crude internal resampler. Also keep in mind that the sample encoding is just a question of choice -- the MPEG frames do only indicate their native sampling rate and channel count. If you want to decode to integer or float samples, 8 or 16 bit ... that is your decision. In a "clean" world, libmpg123 would always decode to 32 bit float and let you handle any sample conversion. But there are optimized routines that work faster by directly decoding to the desired encoding / accuracy. We prefer efficiency over conceptual tidyness. * @@ -481,6 +501,10 @@ , long rate, int encoding ); /** Get the current output format written to the addresses given. + * If the stream is freshly loaded, this will try to parse enough + * of it to give you the format to come. This clears the flag that + * would otherwise make the first decoding call return + * MPG123_NEW_FORMAT. * \param mh handle * \param rate sampling rate return address * \param channels channel count return address @@ -489,6 +513,20 @@ */ MPG123_EXPORT int mpg123_getformat( mpg123_handle *mh , long *rate, int *channels, int *encoding ); + +/** Get the current output format written to the addresses given. + * This differs from plain mpg123_getformat() in that you can choose + * _not_ to clear the flag that would trigger the next decoding call + * to return MPG123_NEW_FORMAT in case of a new format arriving. + * \param mh handle + * \param rate sampling rate return address + * \param channels channel count return address + * \param encoding encoding return address + * \param clear_flag if true, clear internal format flag + * \return MPG123_OK on success + */ +MPG123_EXPORT int mpg123_getformat2( mpg123_handle *mh +, long *rate, int *channels, int *encoding, int clear_flag ); /*@}*/ @@ -1101,7 +1139,7 @@ * Also, you might want to take a bit of care with preparing the data; for example, strip leading zeroes (I have seen that). * \param sb target string * \param enc mpg123 text encoding value - * \param source source buffer with plain unsigned bytes (you might need to cast from char *) + * \param source source buffer with plain unsigned bytes (you might need to cast from signed char) * \param source_size number of bytes in the source buffer * \return 0 on error, 1 on success (on error, mpg123_free_string is called on sb) */ @@ -1391,7 +1429,7 @@ * Note: As it would be troublesome to mess with this while having a file open, * this mpg123_close() is implied here. * \param mh handle - * \param r_read callback for reading (behaviour like POSIXread) + * \param r_read callback for reading (behaviour like POSIX read) * \param r_lseek callback for seeking (like POSIX lseek) * \param cleanup A callback to clean up an I/O handle on mpg123_close, * can be NULL for none (you take care of cleaning your handles). @@ -1408,6 +1446,4 @@ } #endif -#undef MPG123_EXPORT - #endif

1 0

[tfaber] 75093: [LIBMPG123] - Update to version 1.25.0 CORE-13451
by tfaber＠svn.reactos.org 18 Jun '17

18 Jun '17

Author: tfaber Date: Sun Jun 18 14:03:50 2017 New Revision: 75093 URL: http://svn.reactos.org/svn/reactos?rev=75093&view=rev Log: [LIBMPG123] - Update to version 1.25.0 CORE-13451 Added: trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat.c - copied, changed from r75092, trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat_impl.h trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat_str.c - copied, changed from r75091, trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat_impl.h Removed: trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat_impl.h Modified: trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt trunk/reactos/sdk/include/reactos/libs/libmpg123/compat.h trunk/reactos/sdk/include/reactos/libs/libmpg123/mangle.h trunk/reactos/sdk/include/reactos/libs/libmpg123/sample.h trunk/reactos/sdk/include/reactos/libs/libmpg123/synth_sse3d.h trunk/reactos/sdk/lib/3rdparty/libmpg123/CMakeLists.txt trunk/reactos/sdk/lib/3rdparty/libmpg123/icy2utf8.c trunk/reactos/sdk/lib/3rdparty/libmpg123/id3.c trunk/reactos/sdk/lib/3rdparty/libmpg123/libmpg123.c trunk/reactos/sdk/lib/3rdparty/libmpg123/readers.c trunk/reactos/sdk/lib/3rdparty/libmpg123/synth.c Modified: trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/CMak… ============================================================================== --- trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] Sun Jun 18 14:03:50 2017 @@ -16,5 +16,5 @@ set_module_type(winemp3.acm win32dll) set_target_properties(winemp3.acm PROPERTIES SUFFIX "") target_link_libraries(winemp3.acm wine libmpg123 oldnames) -add_importlibs(winemp3.acm winmm user32 msvcrt kernel32 ntdll) +add_importlibs(winemp3.acm shlwapi winmm user32 msvcrt kernel32 ntdll) add_cd_file(TARGET winemp3.acm DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/compat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libmpg123/compat.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libmpg123/compat.h [iso-8859-1] Sun Jun 18 14:03:50 2017 @@ -15,10 +15,14 @@ #define MPG123_COMPAT_H #include "config.h" - -/* Needed for strdup(), in strict mode ... */ -#ifndef _XOPEN_SOURCE -#define _XOPEN_SOURCE 500 +#include "intsym.h" + +/* For --nagging compilation with -std=c89, we need + to disable the inline keyword. */ +#ifdef PLAIN_C89 +#ifndef inline +#define inline +#endif #endif #include <errno.h> @@ -98,8 +102,10 @@ typedef unsigned char byte; #ifndef __REACTOS__ -#ifdef _MSC_VER -typedef long ssize_t; +#if defined(_MSC_VER) && !defined(MPG123_DEF_SSIZE_T) +#define MPG123_DEF_SSIZE_T +#include <stddef.h> +typedef ptrdiff_t ssize_t; #endif #endif /* __REACTOS__ */ @@ -109,9 +115,9 @@ const char *strerror(int errnum); #endif -#ifndef HAVE_STRDUP -char *strdup(const char *s); -#endif +/* Roll our own strdup() that does not depend on libc feature test macros + and returns NULL on NULL input instead of crashing. */ +char* compat_strdup(const char *s); /* If we have the size checks enabled, try to derive some sane printfs. Simple start: Use max integer type and format if long is not big enough. @@ -140,6 +146,10 @@ typedef long ssize_p; #endif +/* Get an environment variable, possibly converted to UTF-8 from wide string. + The return value is a copy that you shall free. */ +char *compat_getenv(const char* name); + /** * Opening a file handle can be different. * This function here is defined to take a path in native encoding (ISO8859 / UTF-8 / ...), or, when MS Windows Unicode support is enabled, an UTF-8 string that will be converted back to native UCS-2 (wide character) before calling the system's open function. @@ -149,6 +159,10 @@ */ int compat_open(const char *filename, int flags); FILE* compat_fopen(const char *filename, const char *mode); +/** + * Also fdopen to avoid having to define POSIX macros in various source files. + */ +FILE* compat_fdopen(int fd, const char *mode); /** * Closing a file handle can be platform specific. @@ -190,6 +204,67 @@ int win32_utf8_wide(const char *const mbptr, wchar_t **wptr, size_t *buflen); #endif +/* + A little bit of path abstraction: We always work with plain char strings + that usually represent POSIX-ish UTF-8 paths (something like c:/some/file + might appear). For Windows, those are converted to wide strings with \ + instead of / and possible fun is had with prefixes to get around the old + path length limit. Outside of the compat library, that stuff should not + matter, although something like //?/UNC/server/some/file could be thrown + around as UTF-8 string, to be converted to a wide \\?\UNC\server\some\file + just before handing it to Windows API. + + There is a lot of unnecessary memory allocation and string copying because + of this, but this filesystem stuff is not really relevant to mpg123 + performance, so the goal is to keep the code outside the compatibility layer + simple. +*/ + +/* + Concatenate a prefix and a path, one of them alowed to be NULL. + If the path is already absolute, the prefix is ignored. Relative + parts (like /..) are resolved if this is sensible for the platform + (meaning: for Windows), else they are preserved (on POSIX, actual + file system access would be needed because of symlinks). +*/ +char* compat_catpath(const char *prefix, const char* path); + +/* Return 1 if the given path indicates an existing directory, + 0 otherwise. */ +int compat_isdir(const char *path); + +/* + Directory traversal. This talks ASCII/UTF-8 paths externally, converts + to/from wchar_t internally if the platform wants that. Returning NULL + means failure to open/end of listing. + There is no promise about sorting entries. +*/ +struct compat_dir; +/* Returns NULL if either directory failed to open or listing is empty. + Listing can still be empty even if non-NULL, so always rely on the + nextfile/nextdir functions. */ +struct compat_dir* compat_diropen(char *path); +void compat_dirclose(struct compat_dir*); +/* Get the next entry that is a file (or symlink to one). + The returned string is a copy that needs to be freed after use. */ +char* compat_nextfile(struct compat_dir*); +/* Get the next entry that is a directory (or symlink to one). + The returned string is a copy that needs to be freed after use. */ +char* compat_nextdir (struct compat_dir*); + +#ifdef USE_MODULES +/* + For keeping the path mess local, a system-specific dlopen() variant + is contained in here, too. This is very thin wrapping, even sparing + definition of a handle type, just using void pointers. + Use of absolute paths is a good idea if you want to be sure which + file is openend, as default search paths vary. +*/ +void *compat_dlopen (const char *path); +void *compat_dlsym (void *handle, const char* name); +void compat_dlclose(void *handle); +#endif + /* Blocking write/read of data with signal resilience. Both continue after being interrupted by signals and always return the amount of processed data (shortage indicating actual problem or EOF). */ Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/mangle.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libmpg123/mangle.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libmpg123/mangle.h [iso-8859-1] Sun Jun 18 14:03:50 2017 @@ -12,6 +12,13 @@ #include "config.h" #include "intsym.h" + +#if (defined OPT_I486) || (defined OPT_I586) || (defined OPT_I586_DITHER) \ + || (defined OPT_MMX) || (defined OPT_SSE) || (defined OPT_3DNOW) || (defined OPT_3DNOWEXT) \ + || (defined OPT_3DNOW_VINTAGE) || (defined OPT_3DNOWEXT_VINTAGE) \ + || (defined OPT_SSE_VINTAGE) +#define OPT_X86 +#endif #ifdef CCALIGN #define MOVUAPS movaps @@ -49,7 +56,15 @@ #define ALIGN32 .align 32 #define ALIGN64 .align 64 #else +#ifdef ASMALIGN_ARMASM +#define ALIGN4 ALIGN 4 +#define ALIGN8 ALIGN 8 +#define ALIGN16 ALIGN 16 +#define ALIGN32 ALIGN 32 +#define ALIGN64 ALIGN 64 +#else #error "Dunno how assembler alignment works. Please specify." +#endif #endif #endif @@ -61,7 +76,7 @@ #if defined(__USER_LABEL_PREFIX__) #define ASM_NAME(a) MANGLE_MACROCAT(__USER_LABEL_PREFIX__,a) #define ASM_VALUE(a) MANGLE_MACROCAT($,ASM_NAME(a)) -#elif defined(__CYGWIN__) || defined(_WIN32) && !defined (_WIN64) || defined(__OS2__) || \ +#elif defined(__CYGWIN__) || defined(_WIN32) && !defined (_WIN64) && !defined (_M_ARM) || defined(__OS2__) || \ (defined(__OpenBSD__) && !defined(__ELF__)) || defined(__APPLE__) #define ASM_NAME(a) MANGLE_MACROCAT(_,a) #define ASM_VALUE(a) MANGLE_MACROCAT($_,a) @@ -69,6 +84,62 @@ #define ASM_NAME(a) a #define ASM_VALUE(a) MANGLE_MACROCAT($,a) #endif + +/* Enable position-independent code for certain platforms. */ + +#if defined(OPT_X86) + +#define _EBX_ %ebx + +#if defined(PIC) && defined(__ELF__) + +/* ELF binaries (Unix/Linux) */ +#define LOCAL_VAR(a) a ## @GOTOFF(_EBX_) +#define GLOBAL_VAR(a) ASM_NAME(a) ## @GOTOFF(_EBX_) +#define GLOBAL_VAR_PTR(a) ASM_NAME(a) ## @GOT(_EBX_) +#define FUNC(a) ASM_NAME(a) +#define EXTERNAL_FUNC(a) ASM_NAME(a) ## @PLT +#undef ASM_VALUE +#define ASM_VALUE(a) MANGLE_MACROCAT($,a) ##@GOTOFF +#define GET_GOT \ + call 1f; \ +1: \ + pop _EBX_; \ +2: \ + addl $_GLOBAL_OFFSET_TABLE_ + (2b-1b), _EBX_ +#define PREPARE_GOT pushl _EBX_ +#define RESTORE_GOT popl _EBX_ + +#elif defined(PIC) && defined(__APPLE__) + +/* Mach-O binaries (OSX/iOS) */ +#define LOCAL_VAR(a) a ## - Lpic_base(_EBX_) +#define GLOBAL_VAR(a) #error This ABI cannot access non-local symbols directly. +#define GLOBAL_VAR_PTR(a) L_ ## a ## - Lpic_base(_EBX_) +#define FUNC(a) L_ ## a +#define EXTERNAL_FUNC(a) L_ ## a +#define GET_GOT \ + call Lpic_base; \ +Lpic_base: \ + pop _EBX_ +#define PREPARE_GOT pushl _EBX_ +#define RESTORE_GOT popl _EBX_ + +#else + +/* Dummies for everyone else. */ +#define LOCAL_VAR(a) a +#define GLOBAL_VAR ASM_NAME +#define GLOBAL_VAR_PTR(a) #error Cannot use indirect addressing in non-PIC object. +#define FUNC ASM_NAME +#define EXTERNAL_FUNC ASM_NAME +#define GET_GOT +#define PREPARE_GOT +#define RESTORE_GOT + +#endif /* PIC variants */ + +#endif /* OPT_X86 */ #if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__APPLE__) #define COMM(a,b,c) .comm a,b @@ -80,6 +151,13 @@ #define BSS .data #else #define BSS .bss +#endif + +/* armasm for WIN32 UWP */ +#ifdef _M_ARM +#define GLOBAL_SYMBOL EXPORT +#else +#define GLOBAL_SYMBOL .globl #endif /* Mark non-executable stack. @@ -94,7 +172,7 @@ #define NONEXEC_STACK #endif -#if defined(__x86_64__) && (defined(_WIN64) || defined (__CYGWIN__)) +#if (defined(__x86_64__) || defined(_M_X64)) && (defined(_WIN64) || defined (__CYGWIN__)) #define IS_MSABI 1 /* Not using SYSV */ #endif Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/sample.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libmpg123/sample.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libmpg123/sample.h [iso-8859-1] Sun Jun 18 14:03:50 2017 @@ -32,6 +32,7 @@ /* From now on for single precision float... double precision is a possible option once we added some bits. But, it would be rather insane. */ #ifndef REAL_TO_SHORT +#if (defined FORCE_ACCURATE) || (defined ACCURATE_ROUNDING) /* Define the accurate rounding function. */ # if (defined REAL_IS_FLOAT) && (defined IEEE_FLOAT) /* This function is only available for IEEE754 single-precision values @@ -51,6 +52,7 @@ /* The "proper" rounding, plain C, a bit slow. */ # define REAL_TO_SHORT_ACCURATE(x) (short)((x)>0.0?(x)+0.5:(x)-0.5) # endif +#endif /* Now define the normal rounding. */ # ifdef ACCURATE_ROUNDING Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/synth_sse3d.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libmpg123/synth_sse3d.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libmpg123/synth_sse3d.h [iso-8859-1] Sun Jun 18 14:03:50 2017 @@ -15,11 +15,12 @@ That's not memory efficient since there's doubled code, but it's easier than giving another function pointer. Maybe I'll change it in future, but now I need something that works. - Original comment from MPlayer source follows: + Original comment from MPlayer source follows. Regarding the license history see + synth_mmx.S, which the original comment about this being licensed under GPL is + relating to. */ /* - * this code comes under GPL * This code was taken from http://www.mpg123.org * See ChangeLog of mpg123-0.59s-pre.1 for detail * Applied to mplayer by Nick Kurshev <nickols_k(a)mail.ru> @@ -48,11 +49,25 @@ pushl %ebp /* stack:0=ebp 4=back 8=bandptr 12=channel 16=samples 20=buffs 24=bo 28=decwins */ movl %esp, %ebp + /* Now the old stack addresses are preserved via %epb. */ +#ifdef PIC + subl $8,%esp /* What has been called temp before. */ +#else subl $4,%esp /* What has been called temp before. */ +#endif pushl %edi pushl %esi pushl %ebx + +#ifdef PIC + #undef _EBX_ + #define _EBX_ %eax + GET_GOT +#define EBXSAVE -4(%ebp) + movl _EBX_, EBXSAVE /* save PIC register */ +#endif + #define TEMP 12(%esp) /* APP */ movl 12(%ebp),%ecx @@ -94,6 +109,9 @@ leal (%ecx,%ebx,2), %edx movl (%esp),%ecx /* restore, but leave value on stack */ shrl $1, %ecx +#ifdef PIC + movl EBXSAVE, _EBX_ +#endif ALIGN16 3: movq (%edx),%mm0 @@ -130,8 +148,8 @@ packssdw %mm4,%mm4 movq (%edi), %mm1 punpckldq %mm4, %mm0 - pand one_null, %mm1 - pand null_one, %mm0 + pand LOCAL_VAR(one_null), %mm1 + pand LOCAL_VAR(null_one), %mm0 por %mm0, %mm1 movq %mm1,(%edi) leal 64(%esi),%esi @@ -166,6 +184,10 @@ 4: subl $64,%esi movl $7,%ecx + +#ifdef PIC + movl EBXSAVE, _EBX_ +#endif ALIGN16 5: movq (%edx),%mm0 @@ -206,8 +228,8 @@ psubsw %mm5,%mm4 movq (%edi), %mm1 punpckldq %mm4, %mm0 - pand one_null, %mm1 - pand null_one, %mm0 + pand LOCAL_VAR(one_null), %mm1 + pand LOCAL_VAR(null_one), %mm0 por %mm0, %mm1 movq %mm1,(%edi) subl $64,%esi @@ -241,6 +263,6 @@ popl %ebx popl %esi popl %edi - addl $4,%esp + mov %ebp, %esp popl %ebp ret Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libmpg123/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libmpg123/CMakeLists.txt [iso-8859-1] Sun Jun 18 14:03:50 2017 @@ -15,6 +15,7 @@ list(APPEND SOURCE compat/compat.c + compat/compat_str.c dct64.c dct64_i386.c equalizer.c Copied: trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat.c (from r75092, trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat_impl.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat_impl.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat.c [iso-8859-1] Sun Jun 18 14:03:50 2017 @@ -1,59 +1,180 @@ /* - compat: Some compatibility functions. + compat: Some compatibility functions (basic memory & string stuff in separate file) The mpg123 code is determined to keep it's legacy. A legacy of old, old UNIX. So anything possibly somewhat advanced should be considered to be put here, with proper #ifdef;-) - copyright 2007-8 by the mpg123 project - free software under the terms of the LGPL 2.1 + copyright 2007-2016 by the mpg123 project - free software under the terms of the LGPL 2.1 see COPYING and AUTHORS files in distribution or http://mpg123.org initially written by Thomas Orgis, Windows Unicode stuff by JonY. */ #include "config.h" +/* This source file does need _POSIX_SOURCE to get some sigaction. */ +#define _POSIX_SOURCE #include "compat.h" #ifdef _MSC_VER #include <io.h> -#else -#include <fcntl.h> -#endif -#include <sys/stat.h> - + +#if(defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_APP)) +#define WINDOWS_UWP +#endif + +#endif +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif +#ifdef HAVE_DIRENT_H +# include <dirent.h> +#endif + +/* Win32 is only supported with unicode now. These headers also cover + module stuff. The WANT_WIN32_UNICODE macro is synonymous with + "want windows-specific API, and only the unicode variants of which". */ #ifdef WANT_WIN32_UNICODE #include <wchar.h> #include <windows.h> #include <winnls.h> +#include <shlwapi.h> +#endif + +#ifdef USE_MODULES +# ifdef HAVE_DLFCN_H +# include <dlfcn.h> +# endif #endif #include "debug.h" -/* A safe realloc also for very old systems where realloc(NULL, size) returns NULL. */ -void *safe_realloc(void *ptr, size_t size) -{ - if(ptr == NULL) return malloc(size); - else return realloc(ptr, size); -} - -#ifndef HAVE_STRERROR -const char *strerror(int errnum) -{ - extern int sys_nerr; - extern char *sys_errlist[]; - - return (errnum < sys_nerr) ? sys_errlist[errnum] : ""; -} -#endif - -#ifndef HAVE_STRDUP -char *strdup(const char *src) -{ - char *dest; - - if (!(dest = (char *) malloc(strlen(src)+1))) - return NULL; +#ifndef WINDOWS_UWP + +char *compat_getenv(const char* name) +{ + char *ret = NULL; +#ifdef WANT_WIN32_UNICODE + wchar_t *env; + wchar_t *wname = NULL; + if(win32_utf8_wide(name, &wname, NULL) > 0) + { + env = _wgetenv(wname); + free(wname); + if(env) + win32_wide_utf8(env, &ret, NULL); + } +#else + ret = getenv(name); + if(ret) + ret = compat_strdup(ret); +#endif + return ret; +} + +#ifdef WANT_WIN32_UNICODE + +/* Convert unix UTF-8 (or ASCII) paths to Windows wide character paths. */ +static wchar_t* u2wpath(const char *upath) +{ + wchar_t* wpath, *p; + if(!upath || win32_utf8_wide(upath, &wpath, NULL) < 1) + return NULL; + for(p=wpath; *p; ++p) + if(*p == L'/') + *p = L'\\'; + return wpath; +} + +/* Convert Windows wide character paths to unix UTF-8. */ +static char* w2upath(const wchar_t *wpath) +{ + char* upath, *p; + if(!wpath || win32_wide_utf8(wpath, &upath, NULL) < 1) + return NULL; + for(p=upath; *p; ++p) + if(*p == '\\') + *p = '/'; + return upath; +} + +/* An absolute path that is too long and not already marked with + \\?\ can be marked as a long one and still work. */ +static int wpath_need_elongation(wchar_t *wpath) +{ + if( wpath && !PathIsRelativeW(wpath) + && wcslen(wpath) > MAX_PATH-1 + && wcsncmp(L"\\\\?\\", wpath, 4) ) + return 1; else - return strcpy(dest, src); -} + return 0; +} + +/* Take any wide windows path and turn it into a path that is allowed + to be longer than MAX_PATH, if it is not already. */ +static wchar_t* wlongpath(wchar_t *wpath) +{ + size_t len, plen; + const wchar_t *prefix = L""; + wchar_t *wlpath = NULL; + if(!wpath) + return NULL; + + /* Absolute paths that do not start with \\?\ get that prepended + to allow them being long. */ + if(!PathIsRelativeW(wpath) && wcsncmp(L"\\\\?\\", wpath, 4)) + { + if(wcslen(wpath) >= 2 && PathIsUNCW(wpath)) + { + /* \\server\path -> \\?\UNC\server\path */ + prefix = L"\\\\?\\UNC"; + ++wpath; /* Skip the first \. */ + } + else /* c:\some/path -> \\?\c:\some\path */ + prefix = L"\\\\?\\"; + } + plen = wcslen(prefix); + len = plen + wcslen(wpath); + wlpath = malloc(len+1*sizeof(wchar_t)); + if(wlpath) + { + /* Brute force memory copying, swprintf is too dandy. */ + memcpy(wlpath, prefix, sizeof(wchar_t)*plen); + memcpy(wlpath+plen, wpath, sizeof(wchar_t)*(len-plen)); + wlpath[len] = 0; + } + return wlpath; +} + +/* Convert unix path to wide windows path, optionally marking + it as long path if necessary. */ +static wchar_t* u2wlongpath(const char *upath) +{ + wchar_t *wpath = NULL; + wchar_t *wlpath = NULL; + wpath = u2wpath(upath); + if(wpath_need_elongation(wpath)) + { + wlpath = wlongpath(wpath); + free(wpath); + wpath = wlpath; + } + return wpath; +} + +#endif + +#else + +static wchar_t* u2wlongpath(const char *upath) +{ + wchar_t* wpath, *p; + if (!upath || win32_utf8_wide(upath, &wpath, NULL) < 1) + return NULL; + for (p = wpath; *p; ++p) + if (*p == L'/') + *p = L'\\'; + return wpath; +} + #endif /* Always add a default permission mask in case of flags|O_CREAT. */ @@ -63,9 +184,9 @@ #if defined (WANT_WIN32_UNICODE) wchar_t *frag = NULL; - ret = win32_utf8_wide(filename, &frag, NULL); + frag = u2wlongpath(filename); /* Fallback to plain open when ucs-2 conversion fails */ - if((frag == NULL) || (ret == 0)) + if(!frag) goto open_fallback; /*Try _wopen */ @@ -86,8 +207,7 @@ #if defined (WANT_WIN32_UNICODE) open_ok: - /* A cast to void*? Does Windows need that?! */ - free((void *)frag); + free(frag); #endif return ret; @@ -103,8 +223,8 @@ wchar_t *wname = NULL; wchar_t *wmode = NULL; - cnt = win32_utf8_wide(filename, &wname, NULL); - if( (wname == NULL) || (cnt == 0)) + wname = u2wlongpath(filename); + if(!wname) goto fopen_fallback; cnt = win32_utf8_wide(mode, &wmode, NULL); if( (wmode == NULL) || (cnt == 0)) @@ -123,6 +243,11 @@ free(wname); #endif return stream; +} + +FILE* compat_fdopen(int fd, const char *mode) +{ + return fdopen(fd, mode); } int compat_close(int infd) @@ -181,6 +306,310 @@ } #endif +#ifndef WINDOWS_UWP + +/* + The Windows file and path stuff is an extract of jon_y's win32 loader + prototype from the loader_rework branch. It's been divided in to + reusable functons by ThOr in the hope to work out some generic-looking + loader code for both POSIX and Windows. The routines might be + helpful for consistent path work in other parts of mpg123, too. + + This all is about getting some working code on a wide range of + systems while staying somewhat sane. If it does ridiculously inefficient + things with extraneous copies and grabbing of functions that made + it late to some official APIs, that's still fine with us. +*/ + +char* compat_catpath(const char *prefix, const char* path) +{ + char *ret = NULL; +#ifdef WANT_WIN32_UNICODE + wchar_t *wprefix = NULL; /* Wide windows versions of */ + wchar_t *wpath = NULL; /* input arguments. */ + wchar_t *locwret = NULL; /* Tmp return value from LocalAlloc */ + /* + This variation of combinepath can work with long and UNC paths, but + is not officially exposed in any DLLs, It also allocates all its buffers + internally via LocalAlloc, avoiding buffer overflow problems. + ThOr: I presume this hack is for supporting pre-8 Windows, as + from Windows 8 on, this is documented in the API. + */ + HRESULT (__stdcall *mypac)( const wchar_t *in, const wchar_t* more + , unsigned long flags, wchar_t **out ) = NULL; + HMODULE pathcch = NULL; + + if(!prefix && !path) + goto catpath_end; + wprefix = u2wpath(prefix); + wpath = u2wpath(path); + if((prefix && !wprefix) || (path && !wpath)) + goto catpath_end; + + /* Again: I presume this whole fun is to get at PathAllocCombine + even when pathcch.h is not available (like in MinGW32). */ + if( (pathcch = GetModuleHandleA("kernelbase")) ) + mypac = (void *)GetProcAddress(pathcch, "PathAllocCombine"); + if(mypac) /* PATHCCH_ALLOW_LONG_PATH = 1 per API docs */ + { + debug("Actually calling PathAllocCombine!"); + mypac(wprefix, wpath, 1, &locwret); + } + else + { + /* Playing safe, if we'd care much about performance, this would be on + the stack. */ + locwret = LocalAlloc(LPTR, sizeof(wchar_t)*MAX_PATH); + if(locwret) + PathCombineW(locwret, wprefix, wpath); + } + ret = w2upath(locwret); + +catpath_end: + LocalFree(locwret); + free(wprefix); + free(wpath); +#else + size_t len, prelen, patlen; + + if(path && path[0] == '/') + prefix = NULL; /* Absolute path stays as it is. */ + prelen = prefix ? strlen(prefix) : 0; + patlen = path ? strlen(path) : 0; + /* Concatenate the two, put a / in between if both present. */ + len = ((prefix && path) ? 1 : 0) + prelen + patlen; + ret = malloc(len+1); + if(ret) + { + size_t off=0; + memcpy(ret, prefix, prelen); + if(prefix && path) + ret[prelen+(off++)] = '/'; + memcpy(ret+prelen+off, path, patlen); + ret[len] = 0; + } +#endif + return ret; +} + +int compat_isdir(const char *path) +{ + int ret = 0; +#ifdef WANT_WIN32_UNICODE + wchar_t *wpath; + wpath = u2wlongpath(path); + if(wpath) + { + DWORD attr = GetFileAttributesW(wpath); + if(attr != INVALID_FILE_ATTRIBUTES && attr & FILE_ATTRIBUTE_DIRECTORY) + ret=1; + free(wpath); + } +#else + struct stat sb; + if(path && !stat(path, &sb)) + { + if(S_ISDIR(sb.st_mode)) + ret=1; + } +#endif + return ret; +} + +struct compat_dir +{ + char *path; +#ifdef WANT_WIN32_UNICODE + int gotone; /* Got a result stored from FindFirstFileW. */ + WIN32_FIND_DATAW d; + HANDLE ffn; +#else + DIR* dir; +#endif +}; + +struct compat_dir* compat_diropen(char *path) +{ + struct compat_dir *cd; + if(!path) + return NULL; + cd = malloc(sizeof(*cd)); + if(!cd) + return NULL; +#ifdef WANT_WIN32_UNICODE + cd->gotone = 0; + { + char *pattern; + wchar_t *wpattern; + pattern = compat_catpath(path, "*"); + wpattern = u2wlongpath(pattern); + if(wpattern) + { + cd->ffn = FindFirstFileW(wpattern, &(cd->d)); + if(cd->ffn == INVALID_HANDLE_VALUE) + { + /* FindClose() only needed after successful first find, right? */ + free(cd); + cd = NULL; + } + else + cd->gotone = 1; + } + free(wpattern); + free(pattern); + } +#else + cd->dir = opendir(path); + if(!cd->dir) + { + free(cd); + cd = NULL; + } +#endif + if(cd) + { + cd->path = compat_strdup(path); + if(!cd->path) + { + compat_dirclose(cd); + cd = NULL; + } + } + return cd; +} + +void compat_dirclose(struct compat_dir *cd) +{ + if(cd) + { + free(cd->path); +#ifdef WANT_WIN32_UNICODE + FindClose(cd->ffn); +#else + closedir(cd->dir); +#endif + free(cd); + } +} + +char* compat_nextfile(struct compat_dir *cd) +{ + if(!cd) + return NULL; +#ifdef WANT_WIN32_UNICODE + while(cd->gotone || FindNextFileW(cd->ffn, &(cd->d))) + { + cd->gotone = 0; + if(!(cd->d.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + { + char *ret; + win32_wide_utf8(cd->d.cFileName, &ret, NULL); + return ret; + } + } +#else + { + struct dirent *dp; + while((dp = readdir(cd->dir))) + { + struct stat fst; + char *fullpath = compat_catpath(cd->path, dp->d_name); + if(fullpath && !stat(fullpath, &fst) && S_ISREG(fst.st_mode)) + { + free(fullpath); + return compat_strdup(dp->d_name); + } + free(fullpath); + } + } +#endif + return NULL; +} + +char* compat_nextdir(struct compat_dir *cd) +{ + if(!cd) + return NULL; +#ifdef WANT_WIN32_UNICODE + while(cd->gotone || FindNextFileW(cd->ffn, &(cd->d))) + { + cd->gotone = 0; + if(cd->d.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + char *ret; + win32_wide_utf8(cd->d.cFileName, &ret, NULL); + return ret; + } + } +#else + { + struct dirent *dp; + while((dp = readdir(cd->dir))) + { + struct stat fst; + char *fullpath = compat_catpath(cd->path, dp->d_name); + if(fullpath && !stat(fullpath, &fst) && S_ISDIR(fst.st_mode)) + { + free(fullpath); + return compat_strdup(dp->d_name); + } + free(fullpath); + } + } +#endif + return NULL; +} + +#endif + +#ifdef USE_MODULES +/* + This is what I expected the platform-specific dance for dynamic module + support to be. Little did I know about the peculiarities of (long) + paths and directory/file search on Windows. +*/ + +void *compat_dlopen(const char *path) +{ + void *handle = NULL; +#ifdef WANT_WIN32_UNICODE + wchar_t *wpath; + wpath = u2wlongpath(path); + if(wpath) + handle = LoadLibraryW(wpath); + free(wpath); +#else + handle = dlopen(path, RTLD_NOW); +#endif + return handle; +} + +void *compat_dlsym(void *handle, const char *name) +{ + void *sym = NULL; + if(!handle) + return NULL; +#ifdef WANT_WIN32_UNICODE + sym = GetProcAddress(handle, name); +#else + sym = dlsym(handle, name); +#endif + return sym; +} + +void compat_dlclose(void *handle) +{ + if(!handle) + return; +#ifdef WANT_WIN32_UNICODE + FreeLibrary(handle); +#else + dlclose(handle); +#endif +} + +#endif /* USE_MODULES */ + /* This shall survive signals and any return value less than given byte count is an error */ Removed: trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat_impl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat_impl.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat_impl.h (removed) @@ -1,236 +0,0 @@ -/* - compat: Some compatibility functions. - - The mpg123 code is determined to keep it's legacy. A legacy of old, old UNIX. - So anything possibly somewhat advanced should be considered to be put here, with proper #ifdef;-) - - copyright 2007-8 by the mpg123 project - free software under the terms of the LGPL 2.1 - see COPYING and AUTHORS files in distribution or http://mpg123.org - initially written by Thomas Orgis, Windows Unicode stuff by JonY. -*/ - -#include "config.h" -#include "compat.h" - -#ifdef _MSC_VER -#include <io.h> -#else -#include <fcntl.h> -#endif -#include <sys/stat.h> - -#ifdef WANT_WIN32_UNICODE -#include <wchar.h> -#include <windows.h> -#include <winnls.h> -#endif - -#include "debug.h" - -/* A safe realloc also for very old systems where realloc(NULL, size) returns NULL. */ -void *safe_realloc(void *ptr, size_t size) -{ - if(ptr == NULL) return malloc(size); - else return realloc(ptr, size); -} - -#ifndef HAVE_STRERROR -const char *strerror(int errnum) -{ - extern int sys_nerr; - extern char *sys_errlist[]; - - return (errnum < sys_nerr) ? sys_errlist[errnum] : ""; -} -#endif - -#ifndef HAVE_STRDUP -char *strdup(const char *src) -{ - char *dest; - - if (!(dest = (char *) malloc(strlen(src)+1))) - return NULL; - else - return strcpy(dest, src); -} -#endif - -/* Always add a default permission mask in case of flags|O_CREAT. */ -int compat_open(const char *filename, int flags) -{ - int ret; -#if defined (WANT_WIN32_UNICODE) - wchar_t *frag = NULL; - - ret = win32_utf8_wide(filename, &frag, NULL); - /* Fallback to plain open when ucs-2 conversion fails */ - if((frag == NULL) || (ret == 0)) - goto open_fallback; - - /*Try _wopen */ - ret = _wopen(frag, flags|_O_BINARY, _S_IREAD | _S_IWRITE); - if(ret != -1 ) - goto open_ok; /* msdn says -1 means failure */ - -open_fallback: -#endif - -#if (defined(WIN32) && !defined (__CYGWIN__)) - /* MSDN says POSIX function is deprecated beginning in Visual C++ 2005 */ - /* Try plain old _open(), if it fails, do nothing */ - ret = _open(filename, flags|_O_BINARY, _S_IREAD | _S_IWRITE); -#else - ret = open(filename, flags, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH); -#endif - -#if defined (WANT_WIN32_UNICODE) -open_ok: - /* A cast to void*? Does Windows need that?! */ - free((void *)frag); -#endif - - return ret; -} - -/* Moved over from wav.c, logic with fallbacks added from the - example of compat_open(). */ -FILE* compat_fopen(const char *filename, const char *mode) -{ - FILE* stream = NULL; -#ifdef WANT_WIN32_UNICODE - int cnt = 0; - wchar_t *wname = NULL; - wchar_t *wmode = NULL; - - cnt = win32_utf8_wide(filename, &wname, NULL); - if( (wname == NULL) || (cnt == 0)) - goto fopen_fallback; - cnt = win32_utf8_wide(mode, &wmode, NULL); - if( (wmode == NULL) || (cnt == 0)) - goto fopen_fallback; - - stream = _wfopen(wname, wmode); - if(stream) goto fopen_ok; - -fopen_fallback: -#endif - stream = fopen(filename, mode); -#ifdef WANT_WIN32_UNICODE - -fopen_ok: - free(wmode); - free(wname); -#endif - return stream; -} - -int compat_close(int infd) -{ -#if (defined(WIN32) && !defined (__CYGWIN__)) /* MSDN says POSIX function is deprecated beginning in Visual C++ 2005 */ - return _close(infd); -#else - return close(infd); -#endif -} - -int compat_fclose(FILE *stream) -{ - return fclose(stream); -} - -/* Windows Unicode stuff */ - -#ifdef WANT_WIN32_UNICODE -int win32_wide_utf8(const wchar_t * const wptr, char **mbptr, size_t * buflen) -{ - size_t len; - char *buf; - int ret = 0; - - len = WideCharToMultiByte(CP_UTF8, 0, wptr, -1, NULL, 0, NULL, NULL); /* Get utf-8 string length */ - buf = calloc(len + 1, sizeof (char)); /* Can we assume sizeof char always = 1? */ - - if(!buf) len = 0; - else { - if (len != 0) ret = WideCharToMultiByte(CP_UTF8, 0, wptr, -1, buf, len, NULL, NULL); /*Do actual conversion*/ - buf[len] = '0'; /* Must terminate */ - } - *mbptr = buf; /* Set string pointer to allocated buffer */ - if(buflen != NULL) *buflen = (len) * sizeof (char); /* Give length of allocated memory if needed. */ - return ret; -} - -int win32_utf8_wide(const char *const mbptr, wchar_t **wptr, size_t *buflen) -{ - size_t len; - wchar_t *buf; - int ret = 0; - - len = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, mbptr, -1, NULL, 0); /* Get converted size */ - buf = calloc(len + 1, sizeof (wchar_t)); /* Allocate memory accordingly */ - - if(!buf) len = 0; - else { - if (len != 0) ret = MultiByteToWideChar (CP_UTF8, MB_ERR_INVALID_CHARS, mbptr, -1, buf, len); /* Do conversion */ - buf[len] = L'0'; /* Must terminate */ - } - *wptr = buf; /* Set string pointer to allocated buffer */ - if (buflen != NULL) *buflen = len * sizeof (wchar_t); /* Give length of allocated memory if needed. */ - return ret; /* Number of characters written */ -} -#endif - - -/* This shall survive signals and any return value less than given byte count - is an error */ -size_t unintr_write(int fd, void const *buffer, size_t bytes) -{ - size_t written = 0; - while(bytes) - { - ssize_t part = write(fd, (char*)buffer+written, bytes); - if(part < 0 && errno != EINTR) - break; - bytes -= part; - written += part; - } - return written; -} - -/* Same for reading the data. */ -size_t unintr_read(int fd, void *buffer, size_t bytes) -{ - size_t got = 0; - while(bytes) - { - ssize_t part = read(fd, (char*)buffer+got, bytes); - if(part < 0 && errno != EINTR) - break; - bytes -= part; - got += part; - } - return got; -} - -#ifndef NO_CATCHSIGNAL -#if (!defined(WIN32) || defined (__CYGWIN__)) && defined(HAVE_SIGNAL_H) -void (*catchsignal(int signum, void(*handler)()))() -{ - struct sigaction new_sa; - struct sigaction old_sa; - -#ifdef DONT_CATCH_SIGNALS - fprintf (stderr, "Not catching any signals.\n"); - return ((void (*)()) -1); -#endif - - new_sa.sa_handler = handler; - sigemptyset(&new_sa.sa_mask); - new_sa.sa_flags = 0; - if(sigaction(signum, &new_sa, &old_sa) == -1) - return ((void (*)()) -1); - return (old_sa.sa_handler); -} -#endif -#endif Copied: trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat_str.c (from r75091, trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat_impl.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat_impl.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat_str.c [iso-8859-1] Sun Jun 18 14:03:50 2017 @@ -1,30 +1,15 @@ /* - compat: Some compatibility functions. + compat: Some compatibility functions (basic memory and string stuff) The mpg123 code is determined to keep it's legacy. A legacy of old, old UNIX. So anything possibly somewhat advanced should be considered to be put here, with proper #ifdef;-) - copyright 2007-8 by the mpg123 project - free software under the terms of the LGPL 2.1 + copyright 2007-2016 by the mpg123 project - free software under the terms of the LGPL 2.1 see COPYING and AUTHORS files in distribution or http://mpg123.org initially written by Thomas Orgis, Windows Unicode stuff by JonY. */ -#include "config.h" #include "compat.h" - -#ifdef _MSC_VER -#include <io.h> -#else -#include <fcntl.h> -#endif -#include <sys/stat.h> - -#ifdef WANT_WIN32_UNICODE -#include <wchar.h> -#include <windows.h> -#include <winnls.h> -#endif - #include "debug.h" /* A safe realloc also for very old systems where realloc(NULL, size) returns NULL. */ @@ -44,193 +29,15 @@ } #endif -#ifndef HAVE_STRDUP -char *strdup(const char *src) +char* compat_strdup(const char *src) { - char *dest; - - if (!(dest = (char *) malloc(strlen(src)+1))) - return NULL; - else - return strcpy(dest, src); + char *dest = NULL; + if(src) + { + size_t len; + len = strlen(src)+1; + if((dest = malloc(len))) + memcpy(dest, src, len); + } + return dest; } -#endif - -/* Always add a default permission mask in case of flags|O_CREAT. */ -int compat_open(const char *filename, int flags) -{ - int ret; -#if defined (WANT_WIN32_UNICODE) - wchar_t *frag = NULL; - - ret = win32_utf8_wide(filename, &frag, NULL); - /* Fallback to plain open when ucs-2 conversion fails */ - if((frag == NULL) || (ret == 0)) - goto open_fallback; - - /*Try _wopen */ - ret = _wopen(frag, flags|_O_BINARY, _S_IREAD | _S_IWRITE); - if(ret != -1 ) - goto open_ok; /* msdn says -1 means failure */ - -open_fallback: -#endif - -#if (defined(WIN32) && !defined (__CYGWIN__)) - /* MSDN says POSIX function is deprecated beginning in Visual C++ 2005 */ - /* Try plain old _open(), if it fails, do nothing */ - ret = _open(filename, flags|_O_BINARY, _S_IREAD | _S_IWRITE); -#else - ret = open(filename, flags, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH); -#endif - -#if defined (WANT_WIN32_UNICODE) -open_ok: - /* A cast to void*? Does Windows need that?! */ - free((void *)frag); -#endif - - return ret; -} - -/* Moved over from wav.c, logic with fallbacks added from the - example of compat_open(). */ -FILE* compat_fopen(const char *filename, const char *mode) -{ - FILE* stream = NULL; -#ifdef WANT_WIN32_UNICODE - int cnt = 0; - wchar_t *wname = NULL; - wchar_t *wmode = NULL; - - cnt = win32_utf8_wide(filename, &wname, NULL); - if( (wname == NULL) || (cnt == 0)) - goto fopen_fallback; - cnt = win32_utf8_wide(mode, &wmode, NULL); - if( (wmode == NULL) || (cnt == 0)) - goto fopen_fallback; - - stream = _wfopen(wname, wmode); - if(stream) goto fopen_ok; - -fopen_fallback: -#endif - stream = fopen(filename, mode); -#ifdef WANT_WIN32_UNICODE - -fopen_ok: - free(wmode); - free(wname); -#endif - return stream; -} - -int compat_close(int infd) -{ -#if (defined(WIN32) && !defined (__CYGWIN__)) /* MSDN says POSIX function is deprecated beginning in Visual C++ 2005 */ - return _close(infd); -#else - return close(infd); -#endif -} - -int compat_fclose(FILE *stream) -{ - return fclose(stream); -} - -/* Windows Unicode stuff */ - -#ifdef WANT_WIN32_UNICODE -int win32_wide_utf8(const wchar_t * const wptr, char **mbptr, size_t * buflen) -{ - size_t len; - char *buf; - int ret = 0; - - len = WideCharToMultiByte(CP_UTF8, 0, wptr, -1, NULL, 0, NULL, NULL); /* Get utf-8 string length */ - buf = calloc(len + 1, sizeof (char)); /* Can we assume sizeof char always = 1? */ - - if(!buf) len = 0; - else { - if (len != 0) ret = WideCharToMultiByte(CP_UTF8, 0, wptr, -1, buf, len, NULL, NULL); /*Do actual conversion*/ - buf[len] = '0'; /* Must terminate */ - } - *mbptr = buf; /* Set string pointer to allocated buffer */ - if(buflen != NULL) *buflen = (len) * sizeof (char); /* Give length of allocated memory if needed. */ - return ret; -} - -int win32_utf8_wide(const char *const mbptr, wchar_t **wptr, size_t *buflen) -{ - size_t len; - wchar_t *buf; - int ret = 0; - - len = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, mbptr, -1, NULL, 0); /* Get converted size */ - buf = calloc(len + 1, sizeof (wchar_t)); /* Allocate memory accordingly */ - - if(!buf) len = 0; - else { - if (len != 0) ret = MultiByteToWideChar (CP_UTF8, MB_ERR_INVALID_CHARS, mbptr, -1, buf, len); /* Do conversion */ - buf[len] = L'0'; /* Must terminate */ - } - *wptr = buf; /* Set string pointer to allocated buffer */ - if (buflen != NULL) *buflen = len * sizeof (wchar_t); /* Give length of allocated memory if needed. */ - return ret; /* Number of characters written */ -} -#endif - - -/* This shall survive signals and any return value less than given byte count - is an error */ -size_t unintr_write(int fd, void const *buffer, size_t bytes) -{ - size_t written = 0; - while(bytes) - { - ssize_t part = write(fd, (char*)buffer+written, bytes); - if(part < 0 && errno != EINTR) - break; - bytes -= part; - written += part; - } - return written; -} - -/* Same for reading the data. */ -size_t unintr_read(int fd, void *buffer, size_t bytes) -{ - size_t got = 0; - while(bytes) - { - ssize_t part = read(fd, (char*)buffer+got, bytes); - if(part < 0 && errno != EINTR) - break; - bytes -= part; - got += part; - } - return got; -} - -#ifndef NO_CATCHSIGNAL -#if (!defined(WIN32) || defined (__CYGWIN__)) && defined(HAVE_SIGNAL_H) -void (*catchsignal(int signum, void(*handler)()))() -{ - struct sigaction new_sa; - struct sigaction old_sa; - -#ifdef DONT_CATCH_SIGNALS - fprintf (stderr, "Not catching any signals.\n"); - return ((void (*)()) -1); -#endif - - new_sa.sa_handler = handler; - sigemptyset(&new_sa.sa_mask); - new_sa.sa_flags = 0; - if(sigaction(signum, &new_sa, &old_sa) == -1) - return ((void (*)()) -1); - return (old_sa.sa_handler); -} -#endif -#endif Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/icy2utf8.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libmpg123/icy2utf8.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libmpg123/icy2utf8.c [iso-8859-1] Sun Jun 18 14:03:50 2017 @@ -384,7 +384,7 @@ /* Some funny streams from Apple/iTunes give ICY info in UTF-8 already. So, be prepared and don't try to re-encode such. Unless forced. */ - if(!force && is_utf8(src)) return (strdup(src)); + if(!force && is_utf8(src)) return (compat_strdup(src)); srclen = strlen(src) + 1; /* allocate conservatively */ Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/id3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libmpg123/id3.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libmpg123/id3.c [iso-8859-1] Sun Jun 18 14:03:50 2017 @@ -656,6 +656,9 @@ unsigned char flags = 0; int ret = 1; int ret2; +#ifndef NO_ID3V2 + int skiptag = 0; +#endif unsigned char major = first4bytes & 0xff; debug1("ID3v2: major tag version: %i", major); if(major == 0xff) return 0; /* Invalid... */ @@ -706,17 +709,28 @@ #ifndef NO_ID3V2 if(VERBOSE2) fprintf(stderr,"Note: ID3v2.%i rev %i tag of %lu bytes\n", major, buf[0], length); /* skip if unknown version/scary flags, parse otherwise */ - if(fr->p.flags & MPG123_SKIP_ID3V2 || ((flags & UNKNOWN_FLAGS) || (major > 4) || (major < 2))) + if(fr->p.flags & MPG123_SKIP_ID3V2) + { + if(VERBOSE3) + fprintf(stderr, "Note: Skipping ID3v2 tag per user request.\n"); + skiptag = 1; + } + if((flags & UNKNOWN_FLAGS) || (major > 4) || (major < 2)) { if(NOQUIET) - { - if(fr->p.flags & MPG123_SKIP_ID3V2) - { - if(VERBOSE3) fprintf(stderr, "Note: Skipping ID3v2 tag per user request.\n"); - } - else /* Must be because of scary Tag properties. */ - warning2("ID3v2: Won't parse the ID3v2 tag with major version %u and flags 0x%xu - some extra code may be needed", major, flags); - } + warning2( "ID3v2: Won't parse the ID3v2 tag with major version" + " %u and flags 0x%xu - some extra code may be needed" + , major, flags ); + skiptag = 1; + } + if(length < 10) + { + if(NOQUIET) + warning1("ID3v2: unrealistic small tag lengh %lu, skipping", length); + skiptag = 1; + } + if(skiptag) + { #endif if((ret2 = fr->rd->skip_bytes(fr,length)) < 0) /* will not store data in backbuff! */ ret = ret2; Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/libmpg123.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libmpg123/libmpg123.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libmpg123/libmpg123.c [iso-8859-1] Sun Jun 18 14:03:50 2017 @@ -11,6 +11,9 @@ #include "debug.h" #include "gapless.h" +/* Want accurate rounding function regardless of decoder setup. */ +#define FORCE_ACCURATE +#include "sample.h" #define SEEKFRAME(mh) ((mh)->ignoreframe < 0 ? 0 : (mh)->ignoreframe) @@ -31,6 +34,15 @@ prepare_decode_tables(); check_decoders(); initialized = 1; +#if (defined REAL_IS_FLOAT) && (defined IEEE_FLOAT) + /* This is rather pointless but it eases my mind to check that we did + not enable the special rounding on a VAX or something. */ + if(12346 != REAL_TO_SHORT_ACCURATE(12345.67f)) + { + error("Bad IEEE 754 rounding. Re-build libmpg123 properly."); + return MPG123_ERR; + } +#endif return MPG123_OK; } @@ -357,7 +369,7 @@ { size_t sval = bc_fill(&mh->rdat.buffer); theval = (long)sval; - if((size_t)theval != sval) + if(theval < 0 || (size_t)theval != sval) { mh->err = MPG123_INT_OVERFLOW; ret = MPG123_ERR; @@ -1035,7 +1047,8 @@ return MPG123_OK; } -int attribute_align_arg mpg123_getformat(mpg123_handle *mh, long *rate, int *channels, int *encoding) +int attribute_align_arg mpg123_getformat2( mpg123_handle *mh +, long *rate, int *channels, int *encoding, int clear_flag ) { int b; @@ -1046,8 +1059,13 @@ if(rate != NULL) *rate = mh->af.rate; if(channels != NULL) *channels = mh->af.channels; if(encoding != NULL) *encoding = mh->af.encoding; - mh->new_format = 0; + if(clear_flag) mh->new_format = 0; return MPG123_OK; +} + +int attribute_align_arg mpg123_getformat(mpg123_handle *mh, long *rate, int *channels, int *encoding) +{ + return mpg123_getformat2(mh, rate, channels, encoding, 1); } off_t attribute_align_arg mpg123_timeframe(mpg123_handle *mh, double seconds) Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/readers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libmpg123/readers.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libmpg123/readers.c [iso-8859-1] Sun Jun 18 14:03:50 2017 @@ -1049,8 +1049,10 @@ if(fr->p.icy_interval > 0) fr->rdat.lseek = nix_lseek; #endif - fr->rdat.filelen = get_fileinfo(fr); + fr->rdat.filelen = fr->p.flags & MPG123_NO_PEEK_END ? -1 : get_fileinfo(fr); fr->rdat.filepos = 0; + if(fr->p.flags & MPG123_FORCE_SEEKABLE) + fr->rdat.flags |= READER_SEEKABLE; /* Don't enable seeking on ICY streams, just plain normal files. This check is necessary since the client can enforce ICY parsing on files that would otherwise be seekable. Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/synth.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libmpg123/synth.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libmpg123/synth.c [iso-8859-1] Sun Jun 18 14:03:50 2017 @@ -7,6 +7,9 @@ */ #include "mpg123lib_intern.h" +#ifdef OPT_GENERIC_DITHER +#define FORCE_ACCURATE +#endif #include "sample.h" #include "debug.h"

1 0

[tfaber] 75092: [LIBMPG123] - Fix ssize_t CORE-13451
by tfaber＠svn.reactos.org 18 Jun '17

18 Jun '17

Author: tfaber Date: Sun Jun 18 13:35:40 2017 New Revision: 75092 URL: http://svn.reactos.org/svn/reactos?rev=75092&view=rev Log: [LIBMPG123] - Fix ssize_t CORE-13451 Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/compat.h trunk/reactos/sdk/include/reactos/libs/libmpg123/config.h Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/compat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libmpg123/compat.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libmpg123/compat.h [iso-8859-1] Sun Jun 18 13:35:40 2017 @@ -97,9 +97,11 @@ typedef unsigned char byte; +#ifndef __REACTOS__ #ifdef _MSC_VER typedef long ssize_t; #endif +#endif /* __REACTOS__ */ /* A safe realloc also for very old systems where realloc(NULL, size) returns NULL. */ void *safe_realloc(void *ptr, size_t size); Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libmpg123/config.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libmpg123/config.h [iso-8859-1] Sun Jun 18 13:35:40 2017 @@ -451,7 +451,7 @@ /* #undef size_t */ /* Define to `long' if <sys/types.h> does not define. */ -/* #undef ssize_t */ +#define ssize_t long /* Define to `unsigned short' if <sys/types.h> does not define. */ /* #undef uint16_t */

1 0

[tfaber] 75091: [LIBMPG123] - Update to version 1.23.0 CORE-13451
by tfaber＠svn.reactos.org 18 Jun '17

18 Jun '17

Author: tfaber Date: Sun Jun 18 13:21:16 2017 New Revision: 75091 URL: http://svn.reactos.org/svn/reactos?rev=75091&view=rev Log: [LIBMPG123] - Update to version 1.23.0 CORE-13451 Added: trunk/reactos/sdk/include/reactos/libs/libmpg123/dither_impl.h - copied unchanged from r75080, trunk/reactos/sdk/lib/3rdparty/libmpg123/dither.c trunk/reactos/sdk/include/reactos/libs/libmpg123/fmt123.h - copied, changed from r75080, trunk/reactos/sdk/include/reactos/libs/libmpg123/mpg123.h trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/ trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat.c - copied, changed from r75090, trunk/reactos/sdk/lib/3rdparty/libmpg123/compat.c trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat_impl.h - copied, changed from r75080, trunk/reactos/sdk/lib/3rdparty/libmpg123/compat.c Removed: trunk/reactos/sdk/lib/3rdparty/libmpg123/compat.c Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/abi_align.h trunk/reactos/sdk/include/reactos/libs/libmpg123/compat.h trunk/reactos/sdk/include/reactos/libs/libmpg123/config.h trunk/reactos/sdk/include/reactos/libs/libmpg123/debug.h trunk/reactos/sdk/include/reactos/libs/libmpg123/decode.h trunk/reactos/sdk/include/reactos/libs/libmpg123/frame.h trunk/reactos/sdk/include/reactos/libs/libmpg123/intsym.h trunk/reactos/sdk/include/reactos/libs/libmpg123/mpg123.h trunk/reactos/sdk/include/reactos/libs/libmpg123/synth.h trunk/reactos/sdk/include/reactos/libs/libmpg123/synth_ntom.h trunk/reactos/sdk/lib/3rdparty/libmpg123/CMakeLists.txt trunk/reactos/sdk/lib/3rdparty/libmpg123/dither.c trunk/reactos/sdk/lib/3rdparty/libmpg123/feature.c trunk/reactos/sdk/lib/3rdparty/libmpg123/format.c trunk/reactos/sdk/lib/3rdparty/libmpg123/frame.c trunk/reactos/sdk/lib/3rdparty/libmpg123/icy.c trunk/reactos/sdk/lib/3rdparty/libmpg123/icy2utf8.c trunk/reactos/sdk/lib/3rdparty/libmpg123/index.c trunk/reactos/sdk/lib/3rdparty/libmpg123/lfs_alias.c trunk/reactos/sdk/lib/3rdparty/libmpg123/lfs_wrap.c trunk/reactos/sdk/lib/3rdparty/libmpg123/libmpg123.c trunk/reactos/sdk/lib/3rdparty/libmpg123/optimize.c trunk/reactos/sdk/lib/3rdparty/libmpg123/parse.c trunk/reactos/sdk/lib/3rdparty/libmpg123/stringbuf.c trunk/reactos/sdk/lib/3rdparty/libmpg123/synth.c trunk/reactos/sdk/lib/3rdparty/libmpg123/synth_altivec.c trunk/reactos/sdk/lib/3rdparty/libmpg123/synth_real.c trunk/reactos/sdk/lib/3rdparty/libmpg123/synth_s32.c trunk/reactos/sdk/lib/3rdparty/libmpg123/tabinit.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/abi_align.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/compat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/decode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Copied: trunk/reactos/sdk/include/reactos/libs/libmpg123/fmt123.h (from r75080, trunk/reactos/sdk/include/reactos/libs/libmpg123/mpg123.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/frame.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/intsym.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/mpg123.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/synth.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Modified: trunk/reactos/sdk/include/reactos/libs/libmpg123/synth_ntom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… Removed: trunk/reactos/sdk/lib/3rdparty/libmpg123/compat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… Copied: trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat.c (from r75090, trunk/reactos/sdk/lib/3rdparty/libmpg123/compat.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… Copied: trunk/reactos/sdk/lib/3rdparty/libmpg123/compat/compat_impl.h (from r75080, trunk/reactos/sdk/lib/3rdparty/libmpg123/compat.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/dither.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/feature.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/frame.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/icy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/icy2utf8.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/index.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/lfs_alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/lfs_wrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/libmpg123.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/optimize.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/stringbuf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/synth.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/synth_altivec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/synth_real.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/synth_s32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123… Modified: trunk/reactos/sdk/lib/3rdparty/libmpg123/tabinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libmpg123…

1 0

[gadamopoulos] 75090: [SHELL32] -CMenuBand::SetSite: Don't fail if the site doesn't support the SID_STopLevelBrowser service.
by gadamopoulos＠svn.reactos.org 18 Jun '17

18 Jun '17

Author: gadamopoulos Date: Sun Jun 18 12:34:30 2017 New Revision: 75090 URL: http://svn.reactos.org/svn/reactos?rev=75090&view=rev Log: [SHELL32] -CMenuBand::SetSite: Don't fail if the site doesn't support the SID_STopLevelBrowser service. Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp [iso-8859-1] Sun Jun 18 12:34:30 2017 @@ -240,10 +240,18 @@ CComPtr<IOleWindow> pTopLevelWindow; hr = IUnknown_QueryService(m_site, SID_STopLevelBrowser, IID_PPV_ARG(IOleWindow, &pTopLevelWindow)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - return pTopLevelWindow->GetWindow(&m_topLevelWindow); + if (SUCCEEDED(hr)) + { + hr = pTopLevelWindow->GetWindow(&m_topLevelWindow); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + } + else + { + m_topLevelWindow = hwndParent; + } + + return S_OK; } HRESULT STDMETHODCALLTYPE CMenuBand::GetSite(REFIID riid, PVOID *ppvSite)

1 0

[tfaber] 75089: [LIBPNG] - Update to version 1.6.29 CORE-13451
by tfaber＠svn.reactos.org 18 Jun '17

18 Jun '17

Author: tfaber Date: Sun Jun 18 12:19:52 2017 New Revision: 75089 URL: http://svn.reactos.org/svn/reactos?rev=75089&view=rev Log: [LIBPNG] - Update to version 1.6.29 CORE-13451 Modified: trunk/reactos/dll/3rdparty/libpng/docs/ANNOUNCE trunk/reactos/dll/3rdparty/libpng/docs/CHANGES trunk/reactos/dll/3rdparty/libpng/docs/LICENSE trunk/reactos/dll/3rdparty/libpng/docs/README trunk/reactos/dll/3rdparty/libpng/docs/TODO trunk/reactos/dll/3rdparty/libpng/docs/libpng-manual.txt trunk/reactos/dll/3rdparty/libpng/png.c trunk/reactos/dll/3rdparty/libpng/pngpriv.h trunk/reactos/dll/3rdparty/libpng/pngrtran.c trunk/reactos/dll/3rdparty/libpng/pngrutil.c trunk/reactos/dll/3rdparty/libpng/pngwutil.c trunk/reactos/sdk/include/reactos/libs/libpng/png.h trunk/reactos/sdk/include/reactos/libs/libpng/pngconf.h trunk/reactos/sdk/include/reactos/libs/libpng/pnglibconf.h Modified: trunk/reactos/dll/3rdparty/libpng/docs/ANNOUNCE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/docs/A… ============================================================================== --- trunk/reactos/dll/3rdparty/libpng/docs/ANNOUNCE [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libpng/docs/ANNOUNCE [iso-8859-1] Sun Jun 18 12:19:52 2017 @@ -1,4 +1,4 @@ -Libpng 1.6.28 - January 5, 2017 +Libpng 1.6.29 - March 16, 2017 This is a public release of libpng, intended for use in production codes. @@ -7,28 +7,37 @@ Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.6.28.tar.xz (LZMA-compressed, recommended) - libpng-1.6.28.tar.gz + libpng-1.6.29.tar.xz (LZMA-compressed, recommended) + libpng-1.6.29.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lpng1628.7z (LZMA-compressed, recommended) - lpng1628.zip + lpng1629.7z (LZMA-compressed, recommended) + lpng1629.zip Other information: - libpng-1.6.28-README.txt - libpng-1.6.28-LICENSE.txt - libpng-1.6.28-*.asc (armored detached GPG signatures) + libpng-1.6.29-README.txt + libpng-1.6.29-LICENSE.txt + libpng-1.6.29-*.asc (armored detached GPG signatures) -Changes since the last public release (1.6.27): - Fixed arm/aarch64 detection in CMakeLists.txt (Gianfranco Costamagna). - Added option to Cmake build allowing a custom location of zlib to be - specified in a scenario where libpng is being built as a subproject - alongside zlib by another project (Sam Serrels). - Changed png_ptr->options from a png_byte to png_uint_32, to accomodate - up to 16 options. +Changes since the last public release (1.6.28): + + Readded "include(GNUInstallDirs)" to CMakeLists.txt (Gianfranco Costamagna). + Moved SSE2 optimization code into the main libpng source directory. + Configure libpng with "configure --enable-intel-sse" or compile + libpng with "-DPNG_INTEL_SSE" in CPPFLAGS to enable it. + Simplified conditional compilation in pngvalid.c, for AIX (Michael Felt). + Avoid conditional directives that break statements in pngrutil.c (Romero + Malaquias) + The contrib/examples/pngtopng.c recovery code was in the wrong "if" + branches; the comments were correct. + Added code for PowerPC VSX optimisation (Vadim Barkov). + Avoid potential overflow of shift operations in png_do_expand() (Aaron Boxer). + Change test ZLIB_VERNUM >= 0x1281 to ZLIB_VERNUM >= 0x1290 in pngrutil.c + because Solaris 11 distributes zlib-1.2.8.f that is older than 1.2.8.1. + Suppress clang warnings about implicit sign changes in png.c Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit Modified: trunk/reactos/dll/3rdparty/libpng/docs/CHANGES URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/docs/C… ============================================================================== --- trunk/reactos/dll/3rdparty/libpng/docs/CHANGES [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libpng/docs/CHANGES [iso-8859-1] Sun Jun 18 12:19:52 2017 @@ -5794,6 +5794,29 @@ Version 1.6.28 [January 5, 2017] No changes. +Version 1.6.29beta01 [January 12, 2017] + Readded "include(GNUInstallDirs)" to CMakeLists.txt (Gianfranco Costamagna). + Moved SSE2 optimization code into the main libpng source directory. + Configure libpng with "configure --enable-intel-sse" or compile + libpng with "-DPNG_INTEL_SSE" in CPPFLAGS to enable it. + Simplified conditional compilation in pngvalid.c, for AIX (Michael Felt). + +Version 1.6.29beta02 [February 22, 2017] + Avoid conditional directives that break statements in pngrutil.c (Romero + Malaquias) + The contrib/examples/pngtopng.c recovery code was in the wrong "if" + branches; the comments were correct. + Added code for PowerPC VSX optimisation (Vadim Barkov). + +Version 1.6.29beta03 [March 1, 2017] + Avoid potential overflow of shift operations in png_do_expand() (Aaron Boxer). + Change test ZLIB_VERNUM >= 0x1281 to ZLIB_VERNUM >= 0x1290 in pngrutil.c + because Solaris 11 distributes zlib-1.2.8.f that is older than 1.2.8.1. + Suppress clang warnings about implicit sign changes in png.c + +Version 1.6.29 [March 16, 2017] + No changes. + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement Modified: trunk/reactos/dll/3rdparty/libpng/docs/LICENSE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/docs/L… ============================================================================== --- trunk/reactos/dll/3rdparty/libpng/docs/LICENSE [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libpng/docs/LICENSE [iso-8859-1] Sun Jun 18 12:19:52 2017 @@ -10,7 +10,7 @@ This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.28, January 5, 2017 are +libpng versions 1.0.7, July 1, 2000 through 1.6.29, March 16, 2017 are Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals @@ -23,6 +23,8 @@ Gilles Vollant James Yu Mandar Sahastrabuddhe + Google Inc. + Vadim Barkov and with the following additions to the disclaimer: @@ -128,4 +130,4 @@ Glenn Randers-Pehrson glennrp at users.sourceforge.net -January 5, 2017 +March 16, 2017 Modified: trunk/reactos/dll/3rdparty/libpng/docs/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/docs/R… ============================================================================== --- trunk/reactos/dll/3rdparty/libpng/docs/README [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libpng/docs/README [iso-8859-1] Sun Jun 18 12:19:52 2017 @@ -1,4 +1,4 @@ -README for libpng version 1.6.28 - January 5, 2017 (shared library 16.0) +README for libpng version 1.6.29 - March 16, 2017 (shared library 16.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -179,14 +179,16 @@ pngwtran.c => Write data transformations pngwutil.c => Write utility functions arm => Contains optimized code for the ARM platform + powerpc => Contains optimized code for the PowerPC platform contrib => Contributions arm-neon => Optimized code for ARM-NEON platform + powerpc-vsx => Optimized code for POWERPC-VSX platform examples => Example programs gregbook => source code for PNG reading and writing, from Greg Roelofs' "PNG: The Definitive Guide", O'Reilly, 1999 - intel => Optimized code for INTEL-SSE2 platform libtests => Test programs + mips-msa => Optimized code for MIPS-MSA platform pngminim => Minimal decoder, encoder, and progressive decoder programs demonstrating use of pngusr.dfa pngminus => Simple pnm2png and png2pnm programs @@ -194,6 +196,8 @@ testpngs tools => Various tools visupng => Contains a MSVC workspace for VisualPng + intel => Optimized code for INTEL-SSE2 platform + mips => Optimized code for MIPS platform projects => Contains project files and workspaces for building a DLL owatcom => Contains a WATCOM project for building libpng Modified: trunk/reactos/dll/3rdparty/libpng/docs/TODO URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/docs/T… ============================================================================== --- trunk/reactos/dll/3rdparty/libpng/docs/TODO [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libpng/docs/TODO [iso-8859-1] Sun Jun 18 12:19:52 2017 @@ -25,5 +25,6 @@ Investigate pre-incremented loop counters and other loop constructions. Add interpolated method of handling interlacing. Extend pngvalid.c to validate more of the libpng transformations. +Refactor preprocessor conditionals to compile entire statements */ Modified: trunk/reactos/dll/3rdparty/libpng/docs/libpng-manual.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/docs/l… ============================================================================== --- trunk/reactos/dll/3rdparty/libpng/docs/libpng-manual.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libpng/docs/libpng-manual.txt [iso-8859-1] Sun Jun 18 12:19:52 2017 @@ -1,6 +1,6 @@ libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.6.28 - January 5, 2017 + libpng version 1.6.29 - March 16, 2017 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ Based on: - libpng versions 0.97, January 1998, through 1.6.28 - January 5, 2017 + libpng versions 0.97, January 1998, through 1.6.29 - March 16, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -5355,7 +5355,7 @@ an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.6.28 are Y2K compliant. It is my belief that earlier +upward through 1.6.29 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has two year fields. One is a 2-byte unsigned integer Modified: trunk/reactos/dll/3rdparty/libpng/png.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/png.c?… ============================================================================== --- trunk/reactos/dll/3rdparty/libpng/png.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libpng/png.c [iso-8859-1] Sun Jun 18 12:19:52 2017 @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.6.28 [January 5, 2017] + * Last changed in libpng 1.6.29 [March 16, 2017] * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -14,7 +14,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_28 Your_png_h_is_not_version_1_6_28; +typedef png_libpng_version_1_6_29 Your_png_h_is_not_version_1_6_29; /* Tells libpng that we have already handled the first "num_bytes" bytes * of the PNG file signature. If the PNG data is embedded into another @@ -776,14 +776,14 @@ #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.28 - January 5, 2017" PNG_STRING_NEWLINE \ + "libpng version 1.6.29 - March 16, 2017" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson" \ PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ PNG_STRING_NEWLINE; # else - return "libpng version 1.6.28 - January 5, 2017\ + return "libpng version 1.6.29 - March 16, 2017\ Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; @@ -4260,13 +4260,13 @@ if (png_ptr != NULL && option >= 0 && option < PNG_OPTION_NEXT && (option & 1) == 0) { - png_uint_32 mask = 3 << option; - png_uint_32 setting = (2 + (onoff != 0)) << option; + png_uint_32 mask = 3U << option; + png_uint_32 setting = (2U + (onoff != 0)) << option; png_uint_32 current = png_ptr->options; png_ptr->options = (png_uint_32)(((current & ~mask) | setting) & 0xff); - return (current & mask) >> option; + return (int)(current & mask) >> option; } return PNG_OPTION_INVALID; Modified: trunk/reactos/dll/3rdparty/libpng/pngpriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngpri… ============================================================================== --- trunk/reactos/dll/3rdparty/libpng/pngpriv.h [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libpng/pngpriv.h [iso-8859-1] Sun Jun 18 12:19:52 2017 @@ -1,8 +1,8 @@ /* pngpriv.h - private declarations for use inside libpng * - * Last changed in libpng 1.6.26 [October 20, 2016] - * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson + * Last changed in libpng 1.6.29 [March 16, 2017] + * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * @@ -190,6 +190,50 @@ # endif #endif +#ifndef PNG_POWERPC_VSX_OPT +# if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__) +# define PNG_POWERPC_VSX_OPT 2 +# else +# define PNG_POWERPC_VSX_OPT 0 +# endif +#endif + +#ifndef PNG_INTEL_SSE_OPT +# ifdef PNG_INTEL_SSE + /* Only check for SSE if the build configuration has been modified to + * enable SSE optimizations. This means that these optimizations will + * be off by default. See contrib/intel for more details. + */ +# if defined(__SSE4_1__) || defined(__AVX__) || defined(__SSSE3__) || \ + defined(__SSE2__) || defined(_M_X64) || defined(_M_AMD64) || \ + (defined(_M_IX86_FP) && _M_IX86_FP >= 2) +# define PNG_INTEL_SSE_OPT 1 +# endif +# endif +#endif + +#if PNG_INTEL_SSE_OPT > 0 +# ifndef PNG_INTEL_SSE_IMPLEMENTATION +# if defined(__SSE4_1__) || defined(__AVX__) + /* We are not actually using AVX, but checking for AVX is the best + way we can detect SSE4.1 and SSSE3 on MSVC. + */ +# define PNG_INTEL_SSE_IMPLEMENTATION 3 +# elif defined(__SSSE3__) +# define PNG_INTEL_SSE_IMPLEMENTATION 2 +# elif defined(__SSE2__) || defined(_M_X64) || defined(_M_AMD64) || \ + (defined(_M_IX86_FP) && _M_IX86_FP >= 2) +# define PNG_INTEL_SSE_IMPLEMENTATION 1 +# else +# define PNG_INTEL_SSE_IMPLEMENTATION 0 +# endif +# endif + +# if PNG_INTEL_SSE_IMPLEMENTATION > 0 +# define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_sse2 +# endif +#endif + #if PNG_MIPS_MSA_OPT > 0 # define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_msa # ifndef PNG_MIPS_MSA_IMPLEMENTATION @@ -209,6 +253,11 @@ # define PNG_MIPS_MSA_IMPLEMENTATION 1 # endif #endif /* PNG_MIPS_MSA_OPT > 0 */ + +#if PNG_POWERPC_VSX_OPT > 0 +# define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_vsx +# define PNG_POWERPC_VSX_IMPLEMENTATION 1 +#endif /* Is this a build of a DLL where compilation of the object modules requires @@ -1256,6 +1305,38 @@ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY); #endif +#if PNG_POWERPC_VSX_OPT > 0 +PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_vsx,(png_row_infop row_info, + png_bytep row, png_const_bytep prev_row),PNG_EMPTY); +PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_vsx,(png_row_infop + row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY); +PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_vsx,(png_row_infop + row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY); +PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_vsx,(png_row_infop + row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY); +PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_vsx,(png_row_infop + row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY); +PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_vsx,(png_row_infop + row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY); +PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_vsx,(png_row_infop + row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY); +#endif + +#if PNG_INTEL_SSE_IMPLEMENTATION > 0 +PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_sse2,(png_row_infop + row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY); +PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_sse2,(png_row_infop + row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY); +PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_sse2,(png_row_infop + row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY); +PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_sse2,(png_row_infop + row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY); +PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_sse2,(png_row_infop + row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY); +PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_sse2,(png_row_infop + row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY); +#endif + /* Choose the best filter to use and filter the row data */ PNG_INTERNAL_FUNCTION(void,png_write_find_filter,(png_structrp png_ptr, png_row_infop row_info),PNG_EMPTY); @@ -1991,6 +2072,11 @@ PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_msa, (png_structp png_ptr, unsigned int bpp), PNG_EMPTY); #endif + +# if PNG_INTEL_SSE_IMPLEMENTATION > 0 +PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_sse2, + (png_structp png_ptr, unsigned int bpp), PNG_EMPTY); +# endif #endif PNG_INTERNAL_FUNCTION(png_uint_32, png_check_keyword, (png_structrp png_ptr, Modified: trunk/reactos/dll/3rdparty/libpng/pngrtran.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngrtr… ============================================================================== --- trunk/reactos/dll/3rdparty/libpng/pngrtran.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libpng/pngrtran.c [iso-8859-1] Sun Jun 18 12:19:52 2017 @@ -1,8 +1,8 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.6.24 [August 4, 2016] - * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson + * Last changed in libpng 1.6.29 [March 16, 2017] + * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * @@ -4302,7 +4302,7 @@ if (num_trans > 0) { sp = row + (png_size_t)row_width - 1; - dp = row + (png_size_t)(row_width << 2) - 1; + dp = row + ((png_size_t)row_width << 2) - 1; for (i = 0; i < row_width; i++) { @@ -4463,7 +4463,7 @@ { gray = gray & 0xff; sp = row + (png_size_t)row_width - 1; - dp = row + (png_size_t)(row_width << 1) - 1; + dp = row + ((png_size_t)row_width << 1) - 1; for (i = 0; i < row_width; i++) { @@ -4519,7 +4519,7 @@ png_byte green = (png_byte)(trans_color->green & 0xff); png_byte blue = (png_byte)(trans_color->blue & 0xff); sp = row + (png_size_t)row_info->rowbytes - 1; - dp = row + (png_size_t)(row_width << 2) - 1; + dp = row + ((png_size_t)row_width << 2) - 1; for (i = 0; i < row_width; i++) { if (*(sp - 2) == red && *(sp - 1) == green && *(sp) == blue) @@ -4542,7 +4542,7 @@ png_byte green_low = (png_byte)(trans_color->green & 0xff); png_byte blue_low = (png_byte)(trans_color->blue & 0xff); sp = row + row_info->rowbytes - 1; - dp = row + (png_size_t)(row_width << 3) - 1; + dp = row + ((png_size_t)row_width << 3) - 1; for (i = 0; i < row_width; i++) { if (*(sp - 5) == red_high && Modified: trunk/reactos/dll/3rdparty/libpng/pngrutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngrut… ============================================================================== --- trunk/reactos/dll/3rdparty/libpng/pngrutil.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libpng/pngrutil.c [iso-8859-1] Sun Jun 18 12:19:52 2017 @@ -1,8 +1,8 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.6.27 [January 5, 2017] - * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson + * Last changed in libpng 1.6.29 [March 16, 2017] + * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * @@ -418,7 +418,7 @@ png_ptr->flags |= PNG_FLAG_ZSTREAM_INITIALIZED; } -#if ZLIB_VERNUM >= 0x1281 && \ +#if ZLIB_VERNUM >= 0x1290 && \ defined(PNG_SET_OPTION_SUPPORTED) && defined(PNG_IGNORE_ADLER32) if (((png_ptr->options >> PNG_IGNORE_ADLER32) & 3) == PNG_OPTION_ON) /* Turn off validation of the ADLER32 checksum in IDAT chunks */ Modified: trunk/reactos/dll/3rdparty/libpng/pngwutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngwut… ============================================================================== --- trunk/reactos/dll/3rdparty/libpng/pngwutil.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libpng/pngwutil.c [iso-8859-1] Sun Jun 18 12:19:52 2017 @@ -675,6 +675,7 @@ int interlace_type) { png_byte buf[13]; /* Buffer to store the IHDR info */ + int is_invalid_depth; png_debug(1, "in png_write_IHDR"); @@ -700,11 +701,11 @@ break; case PNG_COLOR_TYPE_RGB: + is_invalid_depth = (bit_depth != 8); #ifdef PNG_WRITE_16BIT_SUPPORTED - if (bit_depth != 8 && bit_depth != 16) -#else - if (bit_depth != 8) -#endif + is_invalid_depth = (is_invalid_depth && bit_depth != 16); +#endif + if (is_invalid_depth) png_error(png_ptr, "Invalid bit depth for RGB image"); png_ptr->channels = 3; @@ -726,18 +727,22 @@ break; case PNG_COLOR_TYPE_GRAY_ALPHA: - if (bit_depth != 8 && bit_depth != 16) + is_invalid_depth = (bit_depth != 8); +#ifdef PNG_WRITE_16BIT_SUPPORTED + is_invalid_depth = (is_invalid_depth && bit_depth != 16); +#endif + if (is_invalid_depth) png_error(png_ptr, "Invalid bit depth for grayscale+alpha image"); png_ptr->channels = 2; break; case PNG_COLOR_TYPE_RGB_ALPHA: + is_invalid_depth = (bit_depth != 8); #ifdef PNG_WRITE_16BIT_SUPPORTED - if (bit_depth != 8 && bit_depth != 16) -#else - if (bit_depth != 8) -#endif + is_invalid_depth = (is_invalid_depth && bit_depth != 16); +#endif + if (is_invalid_depth) png_error(png_ptr, "Invalid bit depth for RGBA image"); png_ptr->channels = 4; Modified: trunk/reactos/sdk/include/reactos/libs/libpng/png.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libpng/png.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libpng/png.h [iso-8859-1] Sun Jun 18 12:19:52 2017 @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.28, January 5, 2017 + * libpng version 1.6.29, March 16, 2017 * * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -12,7 +12,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.6.28, January 5, 2017: + * libpng versions 0.97, January 1998, through 1.6.29, March 16, 2017: * Glenn Randers-Pehrson. * See also "Contributing Authors", below. */ @@ -25,7 +25,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.0.7, July 1, 2000 through 1.6.28, January 5, 2017 are + * libpng versions 1.0.7, July 1, 2000 through 1.6.29, March 16, 2017 are * Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are * derived from libpng-1.0.6, and are distributed according to the same * disclaimer and license as libpng-1.0.6 with the following individuals @@ -38,6 +38,8 @@ * Gilles Vollant * James Yu * Mandar Sahastrabuddhe + * Google Inc. + * Vadim Barkov * * and with the following additions to the disclaimer: * @@ -211,7 +213,7 @@ * ... * 1.5.28 15 10527 15.so.15.28[.0] * ... - * 1.6.28 16 10628 16.so.16.28[.0] + * 1.6.29 16 10629 16.so.16.29[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -239,13 +241,13 @@ * Y2K compliance in libpng: * ========================= * - * January 5, 2017 + * March 16, 2017 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.6.28 are Y2K compliant. It is my belief that + * upward through 1.6.29 are Y2K compliant. It is my belief that * earlier versions were also Y2K compliant. * * Libpng only has two year fields. One is a 2-byte unsigned integer @@ -307,8 +309,8 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.28" -#define PNG_HEADER_VERSION_STRING " libpng version 1.6.28 - January 5, 2017\n" +#define PNG_LIBPNG_VER_STRING "1.6.29" +#define PNG_HEADER_VERSION_STRING " libpng version 1.6.29 - March 16, 2017\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -316,7 +318,7 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 6 -#define PNG_LIBPNG_VER_RELEASE 28 +#define PNG_LIBPNG_VER_RELEASE 29 /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: @@ -347,7 +349,7 @@ * version 1.0.0 was mis-numbered 100 instead of 10000). From * version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release */ -#define PNG_LIBPNG_VER 10628 /* 1.6.28 */ +#define PNG_LIBPNG_VER 10629 /* 1.6.29 */ /* Library configuration: these options cannot be changed after * the library has been built. @@ -457,7 +459,7 @@ /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef char* png_libpng_version_1_6_28; +typedef char* png_libpng_version_1_6_29; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * @@ -3224,7 +3226,10 @@ # define PNG_MIPS_MSA 6 /* HARDWARE: MIPS Msa SIMD instructions supported */ #endif #define PNG_IGNORE_ADLER32 8 -#define PNG_OPTION_NEXT 10 /* Next option - numbers must be even */ +#ifdef PNG_POWERPC_VSX_API_SUPPORTED +# define PNG_POWERPC_VSX 10 /* HARDWARE: PowerPC VSX SIMD instructions supported */ +#endif +#define PNG_OPTION_NEXT 12 /* Next option - numbers must be even */ /* Return values: NOTE: there are four values and 'off' is *not* zero */ #define PNG_OPTION_UNSET 0 /* Unset - defaults to off */ Modified: trunk/reactos/sdk/include/reactos/libs/libpng/pngconf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libpng/pngconf.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libpng/pngconf.h [iso-8859-1] Sun Jun 18 12:19:52 2017 @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.28, January 5, 2017 + * libpng version 1.6.29, March 16, 2017 * * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) Modified: trunk/reactos/sdk/include/reactos/libs/libpng/pnglibconf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libpng/pnglibconf.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libpng/pnglibconf.h [iso-8859-1] Sun Jun 18 12:19:52 2017 @@ -1,8 +1,8 @@ -/* libpng 1.6.28 STANDARD API DEFINITION */ +/* libpng 1.6.29 STANDARD API DEFINITION */ /* pnglibconf.h - library build configuration */ -/* Libpng version 1.6.28 - January 5, 2017 */ +/* Libpng version 1.6.29 - March 16, 2017 */ /* Copyright (c) 1998-2015 Glenn Randers-Pehrson */ @@ -20,6 +20,8 @@ #define PNG_ALIGNED_MEMORY_SUPPORTED /*#undef PNG_ARM_NEON_API_SUPPORTED*/ /*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/ +/*#undef PNG_POWERPC_VSX_API_SUPPORTED*/ +/*#undef PNG_POWERPC_VSX_CHECK_SUPPORTED*/ #define PNG_BENIGN_ERRORS_SUPPORTED #define PNG_BENIGN_READ_ERRORS_SUPPORTED /*#undef PNG_BENIGN_WRITE_ERRORS_SUPPORTED*/

1 0

[tfaber] 75088: [LIBSAMPLERATE] - Update to version 1.0.9 CORE-13451
by tfaber＠svn.reactos.org 18 Jun '17

18 Jun '17

Author: tfaber Date: Sun Jun 18 11:41:14 2017 New Revision: 75088 URL: http://svn.reactos.org/svn/reactos?rev=75088&view=rev Log: [LIBSAMPLERATE] - Update to version 1.0.9 CORE-13451 Added: trunk/reactos/sdk/lib/3rdparty/libsamplerate/COPYING (with props) Modified: trunk/reactos/sdk/lib/3rdparty/libsamplerate/common.h trunk/reactos/sdk/lib/3rdparty/libsamplerate/config.h trunk/reactos/sdk/lib/3rdparty/libsamplerate/fastest_coeffs.h trunk/reactos/sdk/lib/3rdparty/libsamplerate/float_cast.h trunk/reactos/sdk/lib/3rdparty/libsamplerate/high_qual_coeffs.h trunk/reactos/sdk/lib/3rdparty/libsamplerate/mid_qual_coeffs.h trunk/reactos/sdk/lib/3rdparty/libsamplerate/samplerate.c trunk/reactos/sdk/lib/3rdparty/libsamplerate/samplerate.h trunk/reactos/sdk/lib/3rdparty/libsamplerate/src_linear.c trunk/reactos/sdk/lib/3rdparty/libsamplerate/src_sinc.c trunk/reactos/sdk/lib/3rdparty/libsamplerate/src_zoh.c trunk/reactos/sdk/lib/3rdparty/libsamplerate/unistd.h Added: trunk/reactos/sdk/lib/3rdparty/libsamplerate/COPYING URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libsample… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libsamplerate/COPYING (added) +++ trunk/reactos/sdk/lib/3rdparty/libsamplerate/COPYING [iso-8859-1] Sun Jun 18 11:41:14 2017 @@ -0,0 +1,25 @@ +Copyright (c) 2012-2016, Erik de Castro Lopo <erikd(a)mega-nerd.com> +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Propchange: trunk/reactos/sdk/lib/3rdparty/libsamplerate/COPYING ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/sdk/lib/3rdparty/libsamplerate/common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libsample… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libsamplerate/common.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libsamplerate/common.h [iso-8859-1] Sun Jun 18 11:41:14 2017 @@ -1,25 +1,9 @@ /* -** Copyright (C) 2002-2011 Erik de Castro Lopo <erikd(a)mega-nerd.com> +** Copyright (c) 2002-2016, Erik de Castro Lopo <erikd(a)mega-nerd.com> +** All rights reserved. ** -** This program is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. -*/ - -/* -** This code is part of Secret Rabbit Code aka libsamplerate. A commercial -** use license for this code is available, please see: -** http://www.mega-nerd.com/SRC/procedure.html +** This code is released under 2-clause BSD license. Please see the +** file at : https://github.com/erikd/libsamplerate/blob/master/COPYING */ #ifndef COMMON_H_INCLUDED @@ -99,6 +83,7 @@ SRC_ERR_NULL_CALLBACK, SRC_ERR_NO_VARIABLE_RATIO, SRC_ERR_SINC_PREPARE_DATA_BAD_LEN, + SRC_ERR_BAD_INTERNAL_STATE, /* This must be the last error number. */ SRC_ERR_MAX_ERROR @@ -129,7 +114,7 @@ src_callback_t callback_func ; void *user_callback_data ; long saved_frames ; - float *saved_data ; + const float *saved_data ; } SRC_PRIVATE ; /* In src_sinc.c */ @@ -165,5 +150,11 @@ return res ; } /* fmod_one */ +static inline int +is_bad_src_ratio (double ratio) +{ return (ratio < (1.0 / SRC_MAX_RATIO) || ratio > (1.0 * SRC_MAX_RATIO)) ; +} /* is_bad_src_ratio */ + + #endif /* COMMON_H_INCLUDED */ Modified: trunk/reactos/sdk/lib/3rdparty/libsamplerate/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libsample… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libsamplerate/config.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libsamplerate/config.h [iso-8859-1] Sun Jun 18 11:41:14 2017 @@ -1,19 +1,9 @@ /* -** Copyright (C) 2002-2011 Erik de Castro Lopo <erikd(a)mega-nerd.com> -** -** This program is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. +** Copyright (c) 2002-2016, Erik de Castro Lopo <erikd(a)mega-nerd.com> +** All rights reserved. +** +** This code is released under 2-clause BSD license. Please see the +** file at : https://github.com/erikd/libsamplerate/blob/master/COPYING */ /* Modified: trunk/reactos/sdk/lib/3rdparty/libsamplerate/fastest_coeffs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libsample… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libsamplerate/fastest_coeffs.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libsamplerate/fastest_coeffs.h [iso-8859-1] Sun Jun 18 11:41:14 2017 @@ -1,25 +1,9 @@ /* -** Copyright (C) 2002-2011 Erik de Castro Lopo <erikd(a)mega-nerd.com> +** Copyright (c) 2002-2016, Erik de Castro Lopo <erikd(a)mega-nerd.com> +** All rights reserved. ** -** This program is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. -*/ - -/* -** This code is part of Secret Rabbit Code aka libsamplerate. A commercial -** use license for this code is available, please see: -** http://www.mega-nerd.com/SRC/procedure.html +** This code is released under 2-clause BSD license. Please see the +** file at : https://github.com/erikd/libsamplerate/blob/master/COPYING */ /* Modified: trunk/reactos/sdk/lib/3rdparty/libsamplerate/float_cast.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libsample… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libsamplerate/float_cast.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libsamplerate/float_cast.h [iso-8859-1] Sun Jun 18 11:41:14 2017 @@ -1,19 +1,9 @@ /* -** Copyright (C) 2001-2011 Erik de Castro Lopo <erikd(a)mega-nerd.com> -** -** This program is free software; you can redistribute it and/or modify -** it under the terms of the GNU Lesser General Public License as published by -** the Free Software Foundation; either version 2.1 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU Lesser General Public License for more details. -** -** You should have received a copy of the GNU Lesser General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +** Copyright (c) 2001-2016, Erik de Castro Lopo <erikd(a)mega-nerd.com> +** All rights reserved. +** +** This code is released under 2-clause BSD license. Please see the +** file at : https://github.com/erikd/libsamplerate/blob/master/COPYING */ /* Version 1.5 */ Modified: trunk/reactos/sdk/lib/3rdparty/libsamplerate/high_qual_coeffs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libsample… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libsamplerate/high_qual_coeffs.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libsamplerate/high_qual_coeffs.h [iso-8859-1] Sun Jun 18 11:41:14 2017 @@ -1,25 +1,9 @@ /* -** Copyright (C) 2007-2011 Erik de Castro Lopo <erikd(a)mega-nerd.com> +** Copyright (c) 2007-2016, Erik de Castro Lopo <erikd(a)mega-nerd.com> +** All rights reserved. ** -** This program is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. -*/ - -/* -** This code is part of Secret Rabbit Code aka libsamplerate. A commercial -** use license for this code is available, please see: -** http://www.mega-nerd.com/SRC/procedure.html +** This code is released under 2-clause BSD license. Please see the +** file at : https://github.com/erikd/libsamplerate/blob/master/COPYING */ /* Modified: trunk/reactos/sdk/lib/3rdparty/libsamplerate/mid_qual_coeffs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libsample… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libsamplerate/mid_qual_coeffs.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libsamplerate/mid_qual_coeffs.h [iso-8859-1] Sun Jun 18 11:41:14 2017 @@ -1,25 +1,9 @@ /* -** Copyright (C) 2007-2011 Erik de Castro Lopo <erikd(a)mega-nerd.com> +** Copyright (c) 2007-2016, Erik de Castro Lopo <erikd(a)mega-nerd.com> +** All rights reserved. ** -** This program is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. -*/ - -/* -** This code is part of Secret Rabbit Code aka libsamplerate. A commercial -** use license for this code is available, please see: -** http://www.mega-nerd.com/SRC/procedure.html +** This code is released under 2-clause BSD license. Please see the +** file at : https://github.com/erikd/libsamplerate/blob/master/COPYING */ /* Modified: trunk/reactos/sdk/lib/3rdparty/libsamplerate/samplerate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libsample… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libsamplerate/samplerate.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libsamplerate/samplerate.c [iso-8859-1] Sun Jun 18 11:41:14 2017 @@ -1,36 +1,15 @@ /* -** Copyright (C) 2002-2011 Erik de Castro Lopo <erikd(a)mega-nerd.com> +** Copyright (c) 2002-2016, Erik de Castro Lopo <erikd(a)mega-nerd.com> +** All rights reserved. ** -** This program is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. +** This code is released under 2-clause BSD license. Please see the +** file at : https://github.com/erikd/libsamplerate/blob/master/COPYING */ -/* -** This code is part of Secret Rabbit Code aka libsamplerate. A commercial -** use license for this code is available, please see: -** http://www.mega-nerd.com/SRC/procedure.html -*/ - #include "precomp.h" static int psrc_set_converter (SRC_PRIVATE *psrc, int converter_type) ; - -static inline int -is_bad_src_ratio (double ratio) -{ return (ratio < (1.0 / SRC_MAX_RATIO) || ratio > (1.0 * SRC_MAX_RATIO)) ; -} /* is_bad_src_ratio */ SRC_STATE * src_new (int converter_type, int channels, int *error) @@ -285,6 +264,20 @@ return SRC_ERR_NO_ERROR ; } /* src_set_ratio */ + +int +src_get_channels (SRC_STATE *state) +{ SRC_PRIVATE *psrc ; + + psrc = (SRC_PRIVATE*) state ; + + if (psrc == NULL) + return SRC_ERR_BAD_STATE ; + if (psrc->vari_process == NULL || psrc->const_process == NULL) + return SRC_ERR_BAD_PROC_PTR ; + + return psrc->channels ; +} /* src_get_channels */ int src_reset (SRC_STATE *state) @@ -381,7 +374,7 @@ case SRC_ERR_BAD_DATA : return "SRC_DATA pointer is NULL." ; case SRC_ERR_BAD_DATA_PTR : - return "SRC_DATA->data_out is NULL." ; + return "SRC_DATA->data_out or SRC_DATA->data_in is NULL." ; case SRC_ERR_NO_PRIVATE : return "Internal error. No private data." ; @@ -418,6 +411,8 @@ return "This converter only allows constant conversion ratios." ; case SRC_ERR_SINC_PREPARE_DATA_BAD_LEN : return "Internal error : Bad length in prepare_data ()." ; + case SRC_ERR_BAD_INTERNAL_STATE : + return "Error : Someone is trampling on my internal state." ; case SRC_ERR_MAX_ERROR : return "Placeholder. No error defined for this error number." ; @@ -445,7 +440,7 @@ error = src_process (src_state, src_data) ; - src_state = src_delete (src_state) ; + src_delete (src_state) ; return error ; } /* src_simple */ Modified: trunk/reactos/sdk/lib/3rdparty/libsamplerate/samplerate.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libsample… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libsamplerate/samplerate.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libsamplerate/samplerate.h [iso-8859-1] Sun Jun 18 11:41:14 2017 @@ -1,25 +1,9 @@ /* -** Copyright (C) 2002-2011 Erik de Castro Lopo <erikd(a)mega-nerd.com> +** Copyright (c) 2002-2016, Erik de Castro Lopo <erikd(a)mega-nerd.com> +** All rights reserved. ** -** This program is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. -*/ - -/* -** This code is part of Secret Rabbit Code aka libsamplerate. A commercial -** use license for this code is available, please see: -** http://www.mega-nerd.com/SRC/procedure.html +** This code is released under 2-clause BSD license. Please see the +** file at : https://github.com/erikd/libsamplerate/blob/master/COPYING */ /* @@ -40,7 +24,8 @@ /* SRC_DATA is used to pass data to src_simple() and src_process(). */ typedef struct -{ float *data_in, *data_out ; +{ const float *data_in ; + float *data_out ; long input_frames, output_frames ; long input_frames_used, output_frames_gen ; @@ -49,12 +34,6 @@ double src_ratio ; } SRC_DATA ; - -/* SRC_CB_DATA is used with callback based API. */ -typedef struct -{ long frames ; - float *data_in ; -} SRC_CB_DATA ; /* ** User supplied callback function type for use with src_callback_new() @@ -137,6 +116,13 @@ int src_set_ratio (SRC_STATE *state, double new_ratio) ; /* +** Get the current channel count. +** Returns negative on error, positive channel count otherwise +*/ + +int src_get_channels (SRC_STATE *state) ; + +/* ** Reset the internal SRC state. ** Does not modify the quality settings. ** Does not free any memory allocations. Modified: trunk/reactos/sdk/lib/3rdparty/libsamplerate/src_linear.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libsample… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libsamplerate/src_linear.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libsamplerate/src_linear.c [iso-8859-1] Sun Jun 18 11:41:14 2017 @@ -1,25 +1,9 @@ /* -** Copyright (C) 2002-2011 Erik de Castro Lopo <erikd(a)mega-nerd.com> +** Copyright (c) 2002-2016, Erik de Castro Lopo <erikd(a)mega-nerd.com> +** All rights reserved. ** -** This program is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. -*/ - -/* -** This code is part of Secret Rabbit Code aka libsamplerate. A commercial -** use license for this code is available, please see: -** http://www.mega-nerd.com/SRC/procedure.html +** This code is released under 2-clause BSD license. Please see the +** file at : https://github.com/erikd/libsamplerate/blob/master/COPYING */ #include "precomp.h" @@ -72,6 +56,10 @@ priv->in_used = priv->out_gen = 0 ; src_ratio = psrc->last_ratio ; + + if (is_bad_src_ratio (src_ratio)) + return SRC_ERR_BAD_INTERNAL_STATE ; + input_index = psrc->last_position ; /* Calculate samples before first sample in input array. */ @@ -177,10 +165,11 @@ if (psrc->private_data == NULL) { priv = calloc (1, sizeof (*priv) + psrc->channels * sizeof (float)) ; - if (priv == NULL) - return SRC_ERR_MALLOC_FAILED ; psrc->private_data = priv ; } ; + + if (priv == NULL) + return SRC_ERR_MALLOC_FAILED ; priv->linear_magic_marker = LINEAR_MAGIC_MARKER ; priv->channels = psrc->channels ; Modified: trunk/reactos/sdk/lib/3rdparty/libsamplerate/src_sinc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libsample… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libsamplerate/src_sinc.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libsamplerate/src_sinc.c [iso-8859-1] Sun Jun 18 11:41:14 2017 @@ -1,25 +1,9 @@ /* -** Copyright (C) 2002-2011 Erik de Castro Lopo <erikd(a)mega-nerd.com> +** Copyright (c) 2002-2016, Erik de Castro Lopo <erikd(a)mega-nerd.com> +** All rights reserved. ** -** This program is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. -*/ - -/* -** This code is part of Secret Rabbit Code aka libsamplerate. A commercial -** use license for this code is available, please see: -** http://www.mega-nerd.com/SRC/procedure.html +** This code is released under 2-clause BSD license. Please see the +** file at : https://github.com/erikd/libsamplerate/blob/master/COPYING */ #include "precomp.h" @@ -136,7 +120,7 @@ return "Band limited sinc interpolation, medium quality, 121dB SNR, 90% BW." ; case SRC_SINC_BEST_QUALITY : - return "Band limited sinc interpolation, best quality, 145dB SNR, 96% BW." ; + return "Band limited sinc interpolation, best quality, 144dB SNR, 96% BW." ; default : break ; @@ -195,19 +179,19 @@ switch (src_enum) { case SRC_SINC_FASTEST : temp_filter.coeffs = fastest_coeffs.coeffs ; - temp_filter.coeff_half_len = ARRAY_LEN (fastest_coeffs.coeffs) - 1 ; + temp_filter.coeff_half_len = ARRAY_LEN (fastest_coeffs.coeffs) - 2 ; temp_filter.index_inc = fastest_coeffs.increment ; break ; case SRC_SINC_MEDIUM_QUALITY : temp_filter.coeffs = slow_mid_qual_coeffs.coeffs ; - temp_filter.coeff_half_len = ARRAY_LEN (slow_mid_qual_coeffs.coeffs) - 1 ; + temp_filter.coeff_half_len = ARRAY_LEN (slow_mid_qual_coeffs.coeffs) - 2 ; temp_filter.index_inc = slow_mid_qual_coeffs.increment ; break ; case SRC_SINC_BEST_QUALITY : temp_filter.coeffs = slow_high_qual_coeffs.coeffs ; - temp_filter.coeff_half_len = ARRAY_LEN (slow_high_qual_coeffs.coeffs) - 1 ; + temp_filter.coeff_half_len = ARRAY_LEN (slow_high_qual_coeffs.coeffs) - 2 ; temp_filter.index_inc = slow_high_qual_coeffs.increment ; break ; @@ -341,6 +325,9 @@ src_ratio = psrc->last_ratio ; + if (is_bad_src_ratio (src_ratio)) + return SRC_ERR_BAD_INTERNAL_STATE ; + /* Check the sample rate ratio wrt the buffer len. */ count = (filter->coeff_half_len + 2.0) / filter->index_inc ; if (MIN (psrc->last_ratio, data->src_ratio) < 1.0) @@ -375,17 +362,14 @@ /* This is the termination condition. */ if (filter->b_real_end >= 0) - { if (filter->b_current + input_index + terminate >= filter->b_real_end) + { if (filter->b_current + input_index + terminate > filter->b_real_end) break ; } ; if (filter->out_count > 0 && fabs (psrc->last_ratio - data->src_ratio) > 1e-10) src_ratio = psrc->last_ratio + filter->out_gen * (data->src_ratio - psrc->last_ratio) / filter->out_count ; - float_increment = filter->index_inc * 1.0 ; - if (src_ratio < 1.0) - float_increment = filter->index_inc * src_ratio ; - + float_increment = filter->index_inc * (src_ratio < 1.0 ? src_ratio : 1.0) ; increment = double_to_fp (float_increment) ; start_filter_index = double_to_fp (input_index * float_increment) ; @@ -490,6 +474,9 @@ src_ratio = psrc->last_ratio ; + if (is_bad_src_ratio (src_ratio)) + return SRC_ERR_BAD_INTERNAL_STATE ; + /* Check the sample rate ratio wrt the buffer len. */ count = (filter->coeff_half_len + 2.0) / filter->index_inc ; if (MIN (psrc->last_ratio, data->src_ratio) < 1.0) @@ -531,10 +518,7 @@ if (filter->out_count > 0 && fabs (psrc->last_ratio - data->src_ratio) > 1e-10) src_ratio = psrc->last_ratio + filter->out_gen * (data->src_ratio - psrc->last_ratio) / filter->out_count ; - float_increment = filter->index_inc * 1.0 ; - if (src_ratio < 1.0) - float_increment = filter->index_inc * src_ratio ; - + float_increment = filter->index_inc * (src_ratio < 1.0 ? src_ratio : 1.0) ; increment = double_to_fp (float_increment) ; start_filter_index = double_to_fp (input_index * float_increment) ; @@ -644,6 +628,9 @@ src_ratio = psrc->last_ratio ; + if (is_bad_src_ratio (src_ratio)) + return SRC_ERR_BAD_INTERNAL_STATE ; + /* Check the sample rate ratio wrt the buffer len. */ count = (filter->coeff_half_len + 2.0) / filter->index_inc ; if (MIN (psrc->last_ratio, data->src_ratio) < 1.0) @@ -685,10 +672,7 @@ if (filter->out_count > 0 && fabs (psrc->last_ratio - data->src_ratio) > 1e-10) src_ratio = psrc->last_ratio + filter->out_gen * (data->src_ratio - psrc->last_ratio) / filter->out_count ; - float_increment = filter->index_inc * 1.0 ; - if (src_ratio < 1.0) - float_increment = filter->index_inc * src_ratio ; - + float_increment = filter->index_inc * (src_ratio < 1.0 ? src_ratio : 1.0) ; increment = double_to_fp (float_increment) ; start_filter_index = double_to_fp (input_index * float_increment) ; @@ -804,6 +788,9 @@ src_ratio = psrc->last_ratio ; + if (is_bad_src_ratio (src_ratio)) + return SRC_ERR_BAD_INTERNAL_STATE ; + /* Check the sample rate ratio wrt the buffer len. */ count = (filter->coeff_half_len + 2.0) / filter->index_inc ; if (MIN (psrc->last_ratio, data->src_ratio) < 1.0) @@ -845,10 +832,7 @@ if (filter->out_count > 0 && fabs (psrc->last_ratio - data->src_ratio) > 1e-10) src_ratio = psrc->last_ratio + filter->out_gen * (data->src_ratio - psrc->last_ratio) / filter->out_count ; - float_increment = filter->index_inc * 1.0 ; - if (src_ratio < 1.0) - float_increment = filter->index_inc * src_ratio ; - + float_increment = filter->index_inc * (src_ratio < 1.0 ? src_ratio : 1.0) ; increment = double_to_fp (float_increment) ; start_filter_index = double_to_fp (input_index * float_increment) ; @@ -1051,6 +1035,9 @@ src_ratio = psrc->last_ratio ; + if (is_bad_src_ratio (src_ratio)) + return SRC_ERR_BAD_INTERNAL_STATE ; + /* Check the sample rate ratio wrt the buffer len. */ count = (filter->coeff_half_len + 2.0) / filter->index_inc ; if (MIN (psrc->last_ratio, data->src_ratio) < 1.0) @@ -1092,10 +1079,7 @@ if (filter->out_count > 0 && fabs (psrc->last_ratio - data->src_ratio) > 1e-10) src_ratio = psrc->last_ratio + filter->out_gen * (data->src_ratio - psrc->last_ratio) / filter->out_count ; - float_increment = filter->index_inc * 1.0 ; - if (src_ratio < 1.0) - float_increment = filter->index_inc * src_ratio ; - + float_increment = filter->index_inc * (src_ratio < 1.0 ? src_ratio : 1.0) ; increment = double_to_fp (float_increment) ; start_filter_index = double_to_fp (input_index * float_increment) ; Modified: trunk/reactos/sdk/lib/3rdparty/libsamplerate/src_zoh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libsample… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libsamplerate/src_zoh.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libsamplerate/src_zoh.c [iso-8859-1] Sun Jun 18 11:41:14 2017 @@ -1,25 +1,9 @@ /* -** Copyright (C) 2002-2011 Erik de Castro Lopo <erikd(a)mega-nerd.com> +** Copyright (c) 2002-2016, Erik de Castro Lopo <erikd(a)mega-nerd.com> +** All rights reserved. ** -** This program is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. -*/ - -/* -** This code is part of Secret Rabbit Code aka libsamplerate. A commercial -** use license for this code is available, please see: -** http://www.mega-nerd.com/SRC/procedure.html +** This code is released under 2-clause BSD license. Please see the +** file at : https://github.com/erikd/libsamplerate/blob/master/COPYING */ #include "precomp.h" @@ -70,6 +54,10 @@ priv->in_used = priv->out_gen = 0 ; src_ratio = psrc->last_ratio ; + + if (is_bad_src_ratio (src_ratio)) + return SRC_ERR_BAD_INTERNAL_STATE ; + input_index = psrc->last_position ; /* Calculate samples before first sample in input array. */ @@ -168,10 +156,11 @@ if (psrc->private_data == NULL) { priv = calloc (1, sizeof (*priv) + psrc->channels * sizeof (float)) ; - if (priv == NULL) - return SRC_ERR_MALLOC_FAILED ; psrc->private_data = priv ; } ; + + if (priv == NULL) + return SRC_ERR_MALLOC_FAILED ; priv->zoh_magic_marker = ZOH_MAGIC_MARKER ; priv->channels = psrc->channels ; Modified: trunk/reactos/sdk/lib/3rdparty/libsamplerate/unistd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libsample… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libsamplerate/unistd.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libsamplerate/unistd.h [iso-8859-1] Sun Jun 18 11:41:14 2017 @@ -1,19 +1,9 @@ /* -** Copyright (C) 2002-2011 Erik de Castro Lopo <erikd(a)mega-nerd.com> +** Copyright (c) 2002-2016, Erik de Castro Lopo <erikd(a)mega-nerd.com> +** All rights reserved. ** -** This program is free software; you can redistribute it and/or modify -** it under the terms of the GNU Lesser General Public License as published by -** the Free Software Foundation; either version 2.1 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU Lesser General Public License for more details. -** -** You should have received a copy of the GNU Lesser General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +** This code is released under 2-clause BSD license. Please see the +** file at : https://github.com/erikd/libsamplerate/blob/master/COPYING */ /*

1 0

[tfaber] 75087: [NTOS:MM] - Implement MiMapLockedPagesInUserSpace and MiUnmapLockedPagesInUserSpace. CORE-13444 #resolve
by tfaber＠svn.reactos.org 18 Jun '17

18 Jun '17

Author: tfaber Date: Sun Jun 18 11:18:41 2017 New Revision: 75087 URL: http://svn.reactos.org/svn/reactos?rev=75087&view=rev Log: [NTOS:MM] - Implement MiMapLockedPagesInUserSpace and MiUnmapLockedPagesInUserSpace. CORE-13444 #resolve Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Sun Jun 18 11:18:41 2017 @@ -20,6 +20,327 @@ BOOLEAN MmTrackPtes; BOOLEAN MmTrackLockedPages; SIZE_T MmSystemLockPagesCount; + +/* INTERNAL FUNCTIONS *********************************************************/ +static +PVOID +NTAPI +MiMapLockedPagesInUserSpace( + _In_ PMDL Mdl, + _In_ PVOID StartVa, + _In_ MEMORY_CACHING_TYPE CacheType, + _In_opt_ PVOID BaseAddress) +{ + NTSTATUS Status; + PEPROCESS Process = PsGetCurrentProcess(); + PETHREAD Thread = PsGetCurrentThread(); + TABLE_SEARCH_RESULT Result; + MI_PFN_CACHE_ATTRIBUTE CacheAttribute; + BOOLEAN IsIoMapping; + KIRQL OldIrql; + ULONG_PTR StartingVa; + ULONG_PTR EndingVa; + PMMADDRESS_NODE Parent; + PMMVAD_LONG Vad; + ULONG NumberOfPages; + PMMPTE PointerPte; + PMMPDE PointerPde; + MMPTE TempPte; + PPFN_NUMBER MdlPages; + PMMPFN Pfn1; + PMMPFN Pfn2; + BOOLEAN AddressSpaceLocked = FALSE; + + PAGED_CODE(); + + DPRINT("MiMapLockedPagesInUserSpace(%p, %p, 0x%x, %p)\n", + Mdl, StartVa, CacheType, BaseAddress); + + NumberOfPages = ADDRESS_AND_SIZE_TO_SPAN_PAGES(StartVa, + MmGetMdlByteCount(Mdl)); + MdlPages = MmGetMdlPfnArray(Mdl); + + ASSERT(CacheType <= MmWriteCombined); + + IsIoMapping = (Mdl->MdlFlags & MDL_IO_SPACE) != 0; + CacheAttribute = MiPlatformCacheAttributes[IsIoMapping][CacheType]; + + /* Large pages are always cached, make sure we're not asking for those */ + if (CacheAttribute != MiCached) + { + DPRINT1("FIXME: Need to check for large pages\n"); + } + + /* Allocate a VAD for our mapped region */ + Vad = ExAllocatePoolWithTag(NonPagedPool, sizeof(MMVAD_LONG), 'ldaV'); + if (Vad == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Error; + } + + /* Initialize PhysicalMemory VAD */ + RtlZeroMemory(Vad, sizeof(*Vad)); + Vad->u2.VadFlags2.LongVad = 1; + Vad->u.VadFlags.VadType = VadDevicePhysicalMemory; + Vad->u.VadFlags.Protection = MM_READWRITE; + Vad->u.VadFlags.PrivateMemory = 1; + + /* Did the caller specify an address? */ + if (BaseAddress == NULL) + { + /* We get to pick the address */ + MmLockAddressSpace(&Process->Vm); + AddressSpaceLocked = TRUE; + if (Process->VmDeleted) + { + Status = STATUS_PROCESS_IS_TERMINATING; + goto Error; + } + + Result = MiFindEmptyAddressRangeInTree(NumberOfPages << PAGE_SHIFT, + MM_VIRTMEM_GRANULARITY, + &Process->VadRoot, + &Parent, + &StartingVa); + if (Result == TableFoundNode) + { + Status = STATUS_NO_MEMORY; + goto Error; + } + EndingVa = StartingVa + NumberOfPages * PAGE_SIZE - 1; + BaseAddress = (PVOID)StartingVa; + } + else + { + /* Caller specified a base address */ + StartingVa = (ULONG_PTR)BaseAddress; + EndingVa = StartingVa + NumberOfPages * PAGE_SIZE - 1; + + /* Make sure it's valid */ + if (BYTE_OFFSET(StartingVa) != 0 || + EndingVa <= StartingVa || + EndingVa > (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS) + { + Status = STATUS_INVALID_ADDRESS; + goto Error; + } + + MmLockAddressSpace(&Process->Vm); + AddressSpaceLocked = TRUE; + if (Process->VmDeleted) + { + Status = STATUS_PROCESS_IS_TERMINATING; + goto Error; + } + + /* Check if it's already in use */ + Result = MiCheckForConflictingNode(StartingVa >> PAGE_SHIFT, + EndingVa >> PAGE_SHIFT, + &Process->VadRoot, + &Parent); + if (Result == TableFoundNode) + { + Status = STATUS_CONFLICTING_ADDRESSES; + goto Error; + } + } + + Vad->StartingVpn = StartingVa >> PAGE_SHIFT; + Vad->EndingVpn = EndingVa >> PAGE_SHIFT; + + MiLockProcessWorkingSetUnsafe(Process, Thread); + + ASSERT(Vad->EndingVpn >= Vad->StartingVpn); + + MiInsertVad((PMMVAD)Vad, &Process->VadRoot); + + /* Check if this is uncached */ + if (CacheAttribute != MiCached) + { + /* Flush all caches */ + KeFlushEntireTb(TRUE, TRUE); + KeInvalidateAllCaches(); + } + + PointerPte = MiAddressToPte(BaseAddress); + while (NumberOfPages != 0 && + *MdlPages != LIST_HEAD) + { + PointerPde = MiPteToPde(PointerPte); + MiMakePdeExistAndMakeValid(PointerPde, Process, MM_NOIRQL); + ASSERT(PointerPte->u.Hard.Valid == 0); + + /* Add a PDE reference for each page */ + MiIncrementPageTableReferences(BaseAddress); + + /* Set up our basic user PTE */ + MI_MAKE_HARDWARE_PTE_USER(&TempPte, + PointerPte, + MM_READWRITE, + *MdlPages); + + /* FIXME: We need to respect the PFN's caching information in some cases */ + Pfn2 = MiGetPfnEntry(*MdlPages); + if (Pfn2 != NULL) + { + ASSERT(Pfn2->u3.e2.ReferenceCount != 0); + + if (Pfn2->u3.e1.CacheAttribute != CacheAttribute) + { + DPRINT1("FIXME: Using caller's cache attribute instead of PFN override\n"); + } + + /* We don't support AWE magic */ + ASSERT(Pfn2->u3.e1.CacheAttribute != MiNotMapped); + } + + /* Configure caching */ + switch (CacheAttribute) + { + case MiNonCached: + MI_PAGE_DISABLE_CACHE(&TempPte); + MI_PAGE_WRITE_THROUGH(&TempPte); + break; + case MiCached: + break; + case MiWriteCombined: + MI_PAGE_DISABLE_CACHE(&TempPte); + MI_PAGE_WRITE_COMBINED(&TempPte); + break; + default: + ASSERT(FALSE); + break; + } + + /* Make the page valid */ + MI_WRITE_VALID_PTE(PointerPte, TempPte); + + /* Acquire a share count */ + Pfn1 = MI_PFN_ELEMENT(PointerPde->u.Hard.PageFrameNumber); + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + Pfn1->u2.ShareCount++; + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + /* Next page */ + MdlPages++; + PointerPte++; + NumberOfPages--; + BaseAddress = (PVOID)((ULONG_PTR)BaseAddress + PAGE_SIZE); + } + + MiUnlockProcessWorkingSetUnsafe(Process, Thread); + ASSERT(AddressSpaceLocked); + MmUnlockAddressSpace(&Process->Vm); + + ASSERT(StartingVa != 0); + return (PVOID)((ULONG_PTR)StartingVa + MmGetMdlByteOffset(Mdl)); + +Error: + if (AddressSpaceLocked) + { + MmUnlockAddressSpace(&Process->Vm); + } + if (Vad != NULL) + { + ExFreePoolWithTag(Vad, 'ldaV'); + } + ExRaiseStatus(Status); +} + +static +VOID +NTAPI +MiUnmapLockedPagesInUserSpace( + _In_ PVOID BaseAddress, + _In_ PMDL Mdl) +{ + PEPROCESS Process = PsGetCurrentProcess(); + PETHREAD Thread = PsGetCurrentThread(); + PMMVAD Vad; + PMMPTE PointerPte; + PMMPDE PointerPde; + KIRQL OldIrql; + ULONG NumberOfPages; + PPFN_NUMBER MdlPages; + PFN_NUMBER PageTablePage; + + DPRINT("MiUnmapLockedPagesInUserSpace(%p, %p)\n", BaseAddress, Mdl); + + NumberOfPages = ADDRESS_AND_SIZE_TO_SPAN_PAGES(MmGetMdlVirtualAddress(Mdl), + MmGetMdlByteCount(Mdl)); + ASSERT(NumberOfPages != 0); + MdlPages = MmGetMdlPfnArray(Mdl); + + /* Find the VAD */ + MmLockAddressSpace(&Process->Vm); + Vad = MiLocateAddress(BaseAddress); + if (!Vad || + Vad->u.VadFlags.VadType != VadDevicePhysicalMemory) + { + DPRINT1("MiUnmapLockedPagesInUserSpace invalid for %p\n", BaseAddress); + MmUnlockAddressSpace(&Process->Vm); + return; + } + + MiLockProcessWorkingSetUnsafe(Process, Thread); + + /* Remove it from the process VAD tree */ + ASSERT(Process->VadRoot.NumberGenericTableElements >= 1); + MiRemoveNode((PMMADDRESS_NODE)Vad, &Process->VadRoot); + + /* MiRemoveNode should have removed us if we were the hint */ + ASSERT(Process->VadRoot.NodeHint != Vad); + + PointerPte = MiAddressToPte(BaseAddress); + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + while (NumberOfPages != 0 && + *MdlPages != LIST_HEAD) + { + ASSERT(MiAddressToPte(PointerPte)->u.Hard.Valid == 1); + ASSERT(PointerPte->u.Hard.Valid == 1); + + /* Dereference the page */ + MiDecrementPageTableReferences(BaseAddress); + + /* Invalidate it */ + MI_ERASE_PTE(PointerPte); + + /* We invalidated this PTE, so dereference the PDE */ + PointerPde = MiAddressToPde(BaseAddress); + PageTablePage = PointerPde->u.Hard.PageFrameNumber; + MiDecrementShareCount(MiGetPfnEntry(PageTablePage), PageTablePage); + + /* Next page */ + PointerPte++; + NumberOfPages--; + BaseAddress = (PVOID)((ULONG_PTR)BaseAddress + PAGE_SIZE); + MdlPages++; + + /* Moving to a new PDE? */ + if (PointerPde != MiAddressToPde(BaseAddress)) + { + /* See if we should delete it */ + KeFlushProcessTb(); + PointerPde = MiPteToPde(PointerPte - 1); + ASSERT(PointerPde->u.Hard.Valid == 1); + if (MiQueryPageTableReferences(BaseAddress) == 0) + { + ASSERT(PointerPde->u.Long != 0); + MiDeletePte(PointerPde, + MiPteToAddress(PointerPde), + Process, + NULL); + } + } + } + + KeFlushProcessTb(); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiUnlockProcessWorkingSetUnsafe(Process, Thread); + MmUnlockAddressSpace(&Process->Vm); + ExFreePoolWithTag(Vad, 'ldaV'); +} /* PUBLIC FUNCTIONS ***********************************************************/ @@ -460,8 +781,7 @@ return Base; } - UNIMPLEMENTED; - return NULL; + return MiMapLockedPagesInUserSpace(Mdl, Base, CacheType, BaseAddress); } /* @@ -573,7 +893,7 @@ } else { - UNIMPLEMENTED; + MiUnmapLockedPagesInUserSpace(BaseAddress, Mdl); } } Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sun Jun 18 11:18:41 2017 @@ -1876,22 +1876,6 @@ IN ULONG Flags ); -PVOID -NTAPI -MiMapLockedPagesInUserSpace( - IN PMDL Mdl, - IN PVOID BaseVa, - IN MEMORY_CACHING_TYPE CacheType, - IN PVOID BaseAddress -); - -VOID -NTAPI -MiUnmapLockedPagesInUserSpace( - IN PVOID BaseAddress, - IN PMDL Mdl -); - VOID NTAPI MiInsertPageInList( @@ -2075,6 +2059,12 @@ IN ULONG ProtectionMask ); +VOID +NTAPI +MiInsertVad( + _Inout_ PMMVAD Vad, + _Inout_ PMM_AVL_TABLE VadRoot); + NTSTATUS NTAPI MiInsertVadEx(

1 0

[pschweitzer] 75086: [DESK] French translation for Eric's work on r75085. CORE-8352
by pschweitzer＠svn.reactos.org 18 Jun '17

18 Jun '17

Author: pschweitzer Date: Sun Jun 18 08:48:12 2017 New Revision: 75086 URL: http://svn.reactos.org/svn/reactos?rev=75086&view=rev Log: [DESK] French translation for Eric's work on r75085. CORE-8352 Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] Sun Jun 18 08:48:12 2017 @@ -154,13 +154,13 @@ IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Display Settings" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 +CAPTION "ParamÃ¨tres d'affichage" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Voulez-vous conserver ces paramÃ¨tres d'affichage ?", IDC_STATIC, 7, 7, 219, 8 LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 - PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 - DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 + PUSHBUTTON "&Oui", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&Non", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -263,7 +263,7 @@ STRINGTABLE BEGIN IDS_DISPLAY_SETTINGS "ParamÃ¨tres d'affichage" - IDS_APPLY_FAILED "Echec lors de l'application des nouveaux paramÃ¨tres..." + IDS_APPLY_FAILED "Ãchec lors de l'application des nouveaux paramÃ¨tres..." IDS_APPLY_NEEDS_RESTART "Vous devez redÃ©marrer votre ordinateur pour appliquer les modifications." - IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." -END + IDS_TIMEOUTTEXT "RÃ©tablissement des prÃ©cÃ©dents paramÃ¨tres dans %d secondes." +END

1 0

[ekohl] 75085: [DESK] Replace the screen resolution change confirmation message box by a proper dialog box with timeout. CORE-8352
by ekohl＠svn.reactos.org 18 Jun '17

18 Jun '17

Author: ekohl Date: Sun Jun 18 08:31:20 2017 New Revision: 75085 URL: http://svn.reactos.org/svn/reactos?rev=75085&view=rev Log: [DESK] Replace the screen resolution change confirmation message box by a proper dialog box with timeout. CORE-8352 Modified: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc trunk/reactos/dll/cpl/desk/lang/de-DE.rc trunk/reactos/dll/cpl/desk/lang/el-GR.rc trunk/reactos/dll/cpl/desk/lang/en-GB.rc trunk/reactos/dll/cpl/desk/lang/en-US.rc trunk/reactos/dll/cpl/desk/lang/es-ES.rc trunk/reactos/dll/cpl/desk/lang/fr-FR.rc trunk/reactos/dll/cpl/desk/lang/he-IL.rc trunk/reactos/dll/cpl/desk/lang/hu-HU.rc trunk/reactos/dll/cpl/desk/lang/id-ID.rc trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/desk/lang/ja-JP.rc trunk/reactos/dll/cpl/desk/lang/nl-NL.rc trunk/reactos/dll/cpl/desk/lang/no-NO.rc trunk/reactos/dll/cpl/desk/lang/pl-PL.rc trunk/reactos/dll/cpl/desk/lang/pt-BR.rc trunk/reactos/dll/cpl/desk/lang/ro-RO.rc trunk/reactos/dll/cpl/desk/lang/ru-RU.rc trunk/reactos/dll/cpl/desk/lang/sk-SK.rc trunk/reactos/dll/cpl/desk/lang/sq-AL.rc trunk/reactos/dll/cpl/desk/lang/sv-SE.rc trunk/reactos/dll/cpl/desk/lang/tr-TR.rc trunk/reactos/dll/cpl/desk/lang/uk-UA.rc trunk/reactos/dll/cpl/desk/lang/zh-CN.rc trunk/reactos/dll/cpl/desk/lang/zh-TW.rc trunk/reactos/dll/cpl/desk/resource.h trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/bg-BG.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/bg-BG.rc [iso-8859-1] Sun Jun 18 08:31:20 2017 @@ -148,6 +148,17 @@ AUTORADIOBUTTON "&ÐÑÐµÐ·Ð°Ð¿ÑÑÐº Ð¿ÑÐµÐ´Ð¸ Ð¿ÑÐ¸Ð»Ð°Ð³Ð°Ð½Ðµ Ð½Ð° Ð½Ð¾Ð²Ð¸ÑÐµ ÑÐ²ÐµÑÐ¾Ð²Ð¸ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸.", IDC_RESTART_RB, 14, 116, 228, 10 AUTORADIOBUTTON "ÐÑÐ¸Ð»Ð°Ð³Ð°Ð½Ðµ Ð½Ð° Ð½Ð¾Ð²Ð¸ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð±ÐµÐ· Ð¿ÑÐµÐ·Ð°Ð¿ÑÑÐº.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "ÐÐ¸ÑÐ°Ð½Ðµ Ð¿ÑÐµÐ´Ð¸ Ð¿ÑÐ¸Ð»Ð°Ð³Ð°Ð½Ðµ Ð½Ð° Ð½Ð¾Ð²Ð¸ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸", IDC_ASKME_RB, 14, 146, 228, 10 +END + +IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Display Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 + PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -252,4 +263,5 @@ IDS_DISPLAY_SETTINGS "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð½Ð° ÐµÐºÑÐ°Ð½Ð°" IDS_APPLY_FAILED "ÐÐµÑÑÐ¿ÐµÑÐ½Ð¾ Ð¿ÑÐ¸Ð»Ð°Ð³Ð°Ð½Ðµ Ð½Ð° Ð½Ð¾Ð²Ð¸ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸..." IDS_APPLY_NEEDS_RESTART "ÐÐ° Ð¿ÑÐ¸Ð»Ð°Ð³Ð°Ð½Ðµ Ð½Ð° Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ÑÐµ, ÑÑÑÐ±Ð²Ð° Ð´Ð° Ð¿ÑÐµÐ·Ð°Ð¿ÑÑÐ½ÐµÑÐµ ÐºÐ¾Ð¼Ð¿ÑÑÑÑÐ°" -END + IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." +END Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc [iso-8859-1] Sun Jun 18 08:31:20 2017 @@ -154,6 +154,17 @@ AUTORADIOBUTTON "&Restartovat poÄÃtaÄ pÅed aplikovÃ¡nÃm novÃ©ho nastavenÃ barev.", IDC_RESTART_RB, 14, 116, 228, 10 AUTORADIOBUTTON "Aplikovat novÃ© nastavenÃ barev bez restartovÃ¡nÃ.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "Zeptat se pÅed aplikovÃ¡nÃm novÃ©ho nastavenÃ barev.", IDC_ASKME_RB, 14, 146, 228, 10 +END + +IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Display Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 + PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -258,4 +269,5 @@ IDS_DISPLAY_SETTINGS "NastavenÃ zobrazenÃ" IDS_APPLY_FAILED "NepodaÅilo se aplikovat novÃ¡ nastavenÃ..." IDS_APPLY_NEEDS_RESTART "Aby se zmÄny projevily, je tÅeba restartovat poÄÃtaÄ." -END + IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." +END Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/de-DE.rc [iso-8859-1] Sun Jun 18 08:31:20 2017 @@ -148,6 +148,17 @@ AUTORADIOBUTTON "&Computer vor dem Anwenden der Farbeinstellungen neu starten.", IDC_RESTART_RB, 14, 116, 228, 10 AUTORADIOBUTTON "Farbeinstellungen ohne Neustart Ã¼bernehmen.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "Vor dem Anwenden der neuen Farbeinstellungen nachfragen.", IDC_ASKME_RB, 14, 146, 228, 10 +END + +IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Anzeigeeinstellungen" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "MÃ¶chten Sie diese Anzeigeeinstellungen beibehalten?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 + PUSHBUTTON "&Ja", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&Nein", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -252,4 +263,5 @@ IDS_DISPLAY_SETTINGS "Anzeigeeinstellungen" IDS_APPLY_FAILED "Beim Anwenden Ihrer Ãnderungen ist ein Fehler aufgetreten..." IDS_APPLY_NEEDS_RESTART "Sie mÃ¼ssen Ihren Computer neu starten, damit die Ãnderungen wirksam werden." -END + IDS_TIMEOUTTEXT "Einstellungen in %d Sekunden zurÃ¼cksetzen." +END Modified: trunk/reactos/dll/cpl/desk/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/el-GR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/el-GR.rc [iso-8859-1] Sun Jun 18 08:31:20 2017 @@ -148,6 +148,17 @@ AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 228, 10 AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 228, 10 +END + +IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Display Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 + PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -252,4 +263,5 @@ IDS_DISPLAY_SETTINGS "Display settings" IDS_APPLY_FAILED "Failed to apply new settings..." IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply changes." -END + IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." +END Modified: trunk/reactos/dll/cpl/desk/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-GB.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/en-GB.rc [iso-8859-1] Sun Jun 18 08:31:20 2017 @@ -148,6 +148,17 @@ AUTORADIOBUTTON "&Restart the computer before applying the new colour settings.", IDC_RESTART_RB, 14, 116, 228, 10 AUTORADIOBUTTON "Apply the new colour settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "Ask me before applying the new colour settings.", IDC_ASKME_RB, 14, 146, 228, 10 +END + +IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Display Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 + PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -252,4 +263,5 @@ IDS_DISPLAY_SETTINGS "Display settings" IDS_APPLY_FAILED "Failed to apply new settings..." IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply changes." -END + IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." +END Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] Sun Jun 18 08:31:20 2017 @@ -148,6 +148,17 @@ AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 228, 10 AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 228, 10 +END + +IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Display Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 + PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -252,4 +263,5 @@ IDS_DISPLAY_SETTINGS "Display settings" IDS_APPLY_FAILED "Failed to apply new settings..." IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply changes." -END + IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." +END Modified: trunk/reactos/dll/cpl/desk/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/es-ES.rc [iso-8859-1] Sun Jun 18 08:31:20 2017 @@ -150,6 +150,17 @@ AUTORADIOBUTTON "&Reiniciar el equipo antes de aplicar la nueva configuraciÃ³n.", IDC_RESTART_RB, 14, 116, 228, 10 AUTORADIOBUTTON "&Aplicar la nueva configuraciÃ³n de pantalla sin reiniciar.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "Pregu&ntar antes de aplicar la nueva configuraciÃ³n de pantalla.", IDC_ASKME_RB, 14, 146, 228, 10 +END + +IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Display Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 + PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -254,4 +265,5 @@ IDS_DISPLAY_SETTINGS "ConfiguraciÃ³n del monitor" IDS_APPLY_FAILED "Error al aplicar la nueva configuraciÃ³n..." IDS_APPLY_NEEDS_RESTART "Necesita reiniciar el equipo para aplicar los cambios." -END + IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." +END Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] Sun Jun 18 08:31:20 2017 @@ -150,6 +150,17 @@ AUTORADIOBUTTON "&RedÃ©marrer l'ordinateur avant d'appliquer les nouveaux paramÃ¨tres des couleurs.", IDC_RESTART_RB, 14, 116, 273, 10 AUTORADIOBUTTON "Appliquer les nouveaux paramÃ¨tres des couleurs sans redÃ©marrer.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "Me demander avant d'appliquer les nouveaux paramÃ¨tres des couleurs.", IDC_ASKME_RB, 14, 146, 243, 10 +END + +IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Display Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 + PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -254,4 +265,5 @@ IDS_DISPLAY_SETTINGS "ParamÃ¨tres d'affichage" IDS_APPLY_FAILED "Echec lors de l'application des nouveaux paramÃ¨tres..." IDS_APPLY_NEEDS_RESTART "Vous devez redÃ©marrer votre ordinateur pour appliquer les modifications." -END + IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." +END Modified: trunk/reactos/dll/cpl/desk/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/he-IL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/he-IL.rc [iso-8859-1] Sun Jun 18 08:31:20 2017 @@ -148,6 +148,17 @@ AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 228, 10 AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 228, 10 +END + +IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Display Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 + PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -252,4 +263,5 @@ IDS_DISPLAY_SETTINGS "××××¨××ª ×ª×¦×××" IDS_APPLY_FAILED "Failed to apply new settings..." IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply changes." -END + IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." +END Modified: trunk/reactos/dll/cpl/desk/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/hu-HU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/hu-HU.rc [iso-8859-1] Sun Jun 18 08:31:20 2017 @@ -150,6 +150,17 @@ AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 228, 10 AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 228, 10 +END + +IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Display Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 + PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -254,4 +265,5 @@ IDS_DISPLAY_SETTINGS "Display settings" IDS_APPLY_FAILED "Failed to apply new settings..." IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply changes." -END + IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." +END Modified: trunk/reactos/dll/cpl/desk/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/id-ID.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/id-ID.rc [iso-8859-1] Sun Jun 18 08:31:20 2017 @@ -148,6 +148,17 @@ AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 228, 10 AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 228, 10 +END + +IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Display Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 + PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -252,4 +263,5 @@ IDS_DISPLAY_SETTINGS "Display settings" IDS_APPLY_FAILED "Failed to apply new settings..." IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply changes." -END + IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." +END Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] Sun Jun 18 08:31:20 2017 @@ -148,6 +148,17 @@ AUTORADIOBUTTON "&Riavviare il computer prima di applicare le nuove impostazioni.", IDC_RESTART_RB, 14, 116, 228, 10 AUTORADIOBUTTON "Applicare le nuove impostazioni dei colori senza riavviare.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "Chiedere prima di applicare le nuove impostazioni dei colori.", IDC_ASKME_RB, 14, 146, 228, 10 +END + +IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Display Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 + PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -252,4 +263,5 @@ IDS_DISPLAY_SETTINGS "Impostazioni del monitor" IDS_APPLY_FAILED "Impossibile applicare le nuove impostazioni..." IDS_APPLY_NEEDS_RESTART "E' necessario riavviare il computer per applicare le modifiche." -END + IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." +END Modified: trunk/reactos/dll/cpl/desk/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ja-JP.rc [iso-8859-1] Sun Jun 18 08:31:20 2017 @@ -148,6 +148,17 @@ AUTORADIOBUTTON "æ°ããè²ã®è¨å®ãé©ç¨ããåã«ãã³ã³ãã¥ã¼ã¿ãåèµ·åãã(&R)", IDC_RESTART_RB, 14, 116, 228, 10 AUTORADIOBUTTON "åèµ·åããã«ãæ°ããè²ã®è¨å®ãé©ç¨ãã", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "æ°ããè²ã®è¨å®ãé©ç¨ããåã«ç¢ºèªãã", IDC_ASKME_RB, 14, 146, 228, 10 +END + +IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Display Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 + PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -252,4 +263,5 @@ IDS_DISPLAY_SETTINGS "è¡¨ç¤ºè¨å®" IDS_APPLY_FAILED "æ°ããè¨å®ã®é©ç¨ã«å¤±æãã¾ãã..." IDS_APPLY_NEEDS_RESTART "å¤æ´ãåæ ããã«ã¯ã³ã³ãã¥ã¼ã¿ãåèµ·åããå¿è¦ãããã¾ãã" -END + IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." +END Modified: trunk/reactos/dll/cpl/desk/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/nl-NL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/nl-NL.rc [iso-8859-1] Sun Jun 18 08:31:20 2017 @@ -148,6 +148,17 @@ AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 228, 10 AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 228, 10 +END + +IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Display Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 + PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -252,4 +263,5 @@ IDS_DISPLAY_SETTINGS "Display settings" IDS_APPLY_FAILED "Failed to apply new settings..." IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply changes." -END + IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." +END Modified: trunk/reactos/dll/cpl/desk/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/no-NO.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] Sun Jun 18 08:31:20 2017 @@ -148,6 +148,17 @@ AUTORADIOBUTTON "&Start maskinen pÃ¥ nytt fÃ¸r de nye skjerminnstillingene tas i bruk.", IDC_RESTART_RB, 14, 116, 228, 10 AUTORADIOBUTTON "Bruk de nye skjerminnstillingene uten Ã¥ starte pÃ¥ nytt.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "SpÃ¸r fÃ¸r de nye skjerminnstillingene tas i bruk.", IDC_ASKME_RB, 14, 146, 228, 10 +END + +IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Display Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 + PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -252,4 +263,5 @@ IDS_DISPLAY_SETTINGS "Skjerm innstillinger" IDS_APPLY_FAILED "Mislykket Ã¥ endre innstillingene..." IDS_APPLY_NEEDS_RESTART "Du trenger Ã¥ starte datamaskinen pÃ¥ nytt for at innstillingene skal endres." -END + IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." +END Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/pl-PL.rc [iso-8859-1] Sun Jun 18 08:31:20 2017 @@ -157,6 +157,17 @@ AUTORADIOBUTTON "&Zrestartuj system przed wprowadzeniem zmian.", IDC_RESTART_RB, 14, 116, 228, 10 AUTORADIOBUTTON "Zastosuj nowe ustawienia ekranu bez restartu systemu.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "Pytaj przed zastosowaniem nowych ustawieÅ ekranu.", IDC_ASKME_RB, 14, 146, 228, 10 +END + +IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Display Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 + PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -261,4 +272,5 @@ IDS_DISPLAY_SETTINGS "Ustawienia ekranu" IDS_APPLY_FAILED "Nie udaÅo siÄ zastosowaÄ nowych ustawieÅ..." IDS_APPLY_NEEDS_RESTART "Musisz ponownie uruchomiÄ komputer aby zastosowaÄ zmiany." -END + IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." +END Modified: trunk/reactos/dll/cpl/desk/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pt-BR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/pt-BR.rc [iso-8859-1] Sun Jun 18 08:31:20 2017 @@ -148,6 +148,17 @@ AUTORADIOBUTTON "&Reiniciar computador antes de aplicar novas configuraÃ§Ãµes de vÃdeo", IDC_RESTART_RB, 14, 116, 228, 10 AUTORADIOBUTTON "&Aplicar as novas configuraÃ§Ãµes de vÃdeo sem reiniciar o computador", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "Perg&untar antes de aplicar novas configuraÃ§Ãµes de vÃdeo", IDC_ASKME_RB, 14, 146, 228, 10 +END + +IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Display Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 + PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -252,4 +263,5 @@ IDS_DISPLAY_SETTINGS "ConfiguraÃ§Ãµes de vÃdeo" IDS_APPLY_FAILED "Falha ao aplicar as novas configuraÃ§Ãµes..." IDS_APPLY_NEEDS_RESTART "Ã necessÃ¡rio reiniciar o computador para aplicar as mudanÃ§as." -END + IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." +END Modified: trunk/reactos/dll/cpl/desk/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ro-RO.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ro-RO.rc [iso-8859-1] Sun Jun 18 08:31:20 2017 @@ -153,6 +153,17 @@ AUTORADIOBUTTON "&ReporneÈte calculatorul pentru a aplica noua configuraÈie", IDC_RESTART_RB, 14, 116, 228, 10 AUTORADIOBUTTON "AplicÄ noua &configuraÈie fÄrÄ a reporni calculatorul", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "SolicitÄ-mi &decizia la momentul aplicÄrii noii configuraÈii", IDC_ASKME_RB, 14, 146, 228, 10 +END + +IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Display Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 + PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -257,4 +268,5 @@ IDS_DISPLAY_SETTINGS "Configurare afiÈare" IDS_APPLY_FAILED "ModificÄrile aduse nu au putut fi aplicate." IDS_APPLY_NEEDS_RESTART "Pentru a aplica noua configuraÈie este necesarÄ repornirea calculatorului." -END + IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." +END Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ru-RU.rc [iso-8859-1] Sun Jun 18 08:31:20 2017 @@ -148,6 +148,17 @@ AUTORADIOBUTTON "ÐÐµÑÐµ&Ð·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ñ Ð½Ð¾Ð²ÑÐ¼Ð¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ°Ð¼Ð¸ ÑÐºÑÐ°Ð½Ð°", IDC_RESTART_RB, 14, 116, 228, 10 AUTORADIOBUTTON "&ÐÑÐ¸Ð¼ÐµÐ½Ð¸ÑÑ Ð½Ð¾Ð²ÑÐµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ ÑÐºÑÐ°Ð½Ð° Ð±ÐµÐ· Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·ÐºÐ¸", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "Ð&Ð°Ð¿ÑÐ¾ÑÐ¸ÑÑ Ð¿ÐµÑÐµÐ´ Ð¿ÑÐ¸Ð¼ÐµÐ½ÐµÐ½Ð¸ÐµÐ¼ Ð½Ð¾Ð²ÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² ÑÐºÑÐ°Ð½Ð°", IDC_ASKME_RB, 14, 146, 228, 10 +END + +IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Display Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 + PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -252,4 +263,5 @@ IDS_DISPLAY_SETTINGS "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ ÑÐºÑÐ°Ð½Ð°" IDS_APPLY_FAILED "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð¿ÑÐ¸Ð¼ÐµÐ½Ð¸ÑÑ Ð½Ð¾Ð²ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸..." IDS_APPLY_NEEDS_RESTART "ÐÑ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð´Ð»Ñ Ð¿ÑÐ¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹." -END + IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." +END Modified: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sk-SK.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/sk-SK.rc [iso-8859-1] Sun Jun 18 08:31:20 2017 @@ -150,6 +150,17 @@ AUTORADIOBUTTON "&ReÅ¡tartovaÅ¥ poÄÃtaÄ pred pouÅ¾itÃm novÃ½ch nastavenÃ farieb.", IDC_RESTART_RB, 14, 116, 228, 10 AUTORADIOBUTTON "PouÅ¾iÅ¥ &novÃ© nastavenia farieb bez reÅ¡tartovania.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "&OpÃ½taÅ¥ sa pred pouÅ¾itÃm novÃ½ch nastavenÃ farieb.", IDC_ASKME_RB, 14, 146, 228, 10 +END + +IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Display Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 + PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -254,4 +265,5 @@ IDS_DISPLAY_SETTINGS "Nastavenia zobrazenia" // obrazovky ? IDS_APPLY_FAILED "Nepodarilo sa aplikovaÅ¥ novÃ© nastavenia..." IDS_APPLY_NEEDS_RESTART "Je potrebnÃ© reÅ¡tartovaÅ¥ poÄÃtaÄ, aby sa prejavili zmeny." -END + IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." +END Modified: trunk/reactos/dll/cpl/desk/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sq-AL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/sq-AL.rc [iso-8859-1] Sun Jun 18 08:31:20 2017 @@ -152,6 +152,17 @@ AUTORADIOBUTTON "&Rifillo kompjuterin para se tÃ« aplikoni vetit e reja ngjyra.", IDC_RESTART_RB, 14, 116, 228, 10 AUTORADIOBUTTON "Apliko parametrat e ngjyrave te reja par rifilluar sistemit.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "Pyet para se te aplikosh parametrat e ngjyrave te reja.", IDC_ASKME_RB, 14, 146, 228, 10 +END + +IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Display Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 + PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -256,4 +267,5 @@ IDS_DISPLAY_SETTINGS "Konfigurimi i Ekranit" IDS_APPLY_FAILED "Deshtoj ne apilimin e konfigurimit..." IDS_APPLY_NEEDS_RESTART "Ju duhet te rifilloni sistemin tuaj qe te aplikoni ndryshimet." -END + IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." +END Modified: trunk/reactos/dll/cpl/desk/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sv-SE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/sv-SE.rc [iso-8859-1] Sun Jun 18 08:31:20 2017 @@ -150,6 +150,17 @@ AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 228, 10 AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 228, 10 +END + +IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Display Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 + PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -254,4 +265,5 @@ IDS_DISPLAY_SETTINGS "Display settings" IDS_APPLY_FAILED "Failed to apply new settings..." IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply changes." -END + IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." +END Modified: trunk/reactos/dll/cpl/desk/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/tr-TR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/tr-TR.rc [iso-8859-1] Sun Jun 18 08:31:20 2017 @@ -150,6 +150,17 @@ AUTORADIOBUTTON "&yeni renk ayarlarÄ± uygulanmadan Ã¶nce bilgisayarÄ± yeniden baÅlat.", IDC_RESTART_RB, 14, 116, 228, 10 AUTORADIOBUTTON "y&eniden baÅlatmadan yeni renk ayarlarÄ±nÄ± uygula.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "ye&ni renk ayarlarÄ±uygulanmadan Ã¶nce bana sor.", IDC_ASKME_RB, 14, 146, 228, 10 +END + +IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Display Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 + PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -254,4 +265,5 @@ IDS_DISPLAY_SETTINGS "GÃ¶rÃ¼ntÃ¼ AyarlarÄ±" IDS_APPLY_FAILED "Yeni ayarlarÄ±n uygulanmasÄ± baÅarÄ±sÄ±z oldu." IDS_APPLY_NEEDS_RESTART "DeÄiÅiklikleri uygulamak iÃ§in bilgisayarÄ±nÄ±zÄ± yeniden baÅlatmanÄ±z gerekir." -END + IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." +END Modified: trunk/reactos/dll/cpl/desk/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/uk-UA.rc [iso-8859-1] Sun Jun 18 08:31:20 2017 @@ -156,6 +156,17 @@ AUTORADIOBUTTON "&ÐÐµÑÐµÐ·Ð°Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑ ÑÐ· Ð½Ð¾Ð²Ð¸Ð¼Ð¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ°Ð¼Ð¸ ÐºÐ¾Ð»ÑÐ¾ÑÑ.", IDC_RESTART_RB, 14, 116, 228, 10 AUTORADIOBUTTON "&ÐÐ°ÑÑÐ¾ÑÑÐ²Ð°ÑÐ¸ Ð½Ð¾Ð²Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¸ ÐºÐ¾Ð»ÑÐ¾ÑÑ Ð±ÐµÐ· Ð¿ÐµÑÐµÐ·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "ÐÐ°Ð¿Ð¸ÑÐ°ÑÐ¸ Ð¿ÐµÑÐµÐ´ Ð·Ð°ÑÑÐ¾ÑÑÐ²Ð°Ð½Ð½ÑÐ¼ Ð½Ð¾Ð²Ð¸Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑÐ² ÐºÐ¾Ð»ÑÐ¾ÑÑ.", IDC_ASKME_RB, 14, 146, 228, 10 +END + +IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Display Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 + PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -260,4 +271,5 @@ IDS_DISPLAY_SETTINGS "ÐÐ°ÑÐ°Ð¼ÐµÑÑÐ¸ Ð´Ð¸ÑÐ¿Ð»ÐµÑ" IDS_APPLY_FAILED "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð°ÑÑÐ¾ÑÑÐ²Ð°ÑÐ¸ Ð½Ð¾Ð²Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¸..." IDS_APPLY_NEEDS_RESTART "ÐÐ¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ Ð¿ÐµÑÐµÐ·Ð°Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑ Ð´Ð»Ñ Ð·Ð°ÑÑÐ¾ÑÑÐ²Ð°Ð½Ð½Ñ Ð·Ð¼ÑÐ½." -END + IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." +END Modified: trunk/reactos/dll/cpl/desk/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/zh-CN.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/zh-CN.rc [iso-8859-1] Sun Jun 18 08:31:20 2017 @@ -155,6 +155,17 @@ AUTORADIOBUTTON "å¨åºç¨æ°çæ¾ç¤ºè®¾ç½®ä¹åéæ°å¯å¨è®¡ç®æº(&R)", IDC_RESTART_RB, 14, 116, 228, 10 AUTORADIOBUTTON "åºç¨æ°çæ¾ç¤ºè®¾ç½®èä¸éæ°å¯å¨è®¡ç®æº(&P)", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "å¨åºç¨æ°çæ¾ç¤ºè®¾ç½®ä¹åè¯¢é®(&K)", IDC_ASKME_RB, 14, 146, 228, 10 +END + +IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Display Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 + PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -259,4 +270,5 @@ IDS_DISPLAY_SETTINGS "æ¾ç¤ºè®¾ç½®" IDS_APPLY_FAILED "åºç¨æ°è®¾ç½®å¤±è´¥..." IDS_APPLY_NEEDS_RESTART "éè¦éæ°å¯å¨è®¡ç®æºä½¿æ´æ¹çæã" -END + IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." +END Modified: trunk/reactos/dll/cpl/desk/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/zh-TW.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/zh-TW.rc [iso-8859-1] Sun Jun 18 08:31:20 2017 @@ -150,6 +150,17 @@ AUTORADIOBUTTON "å¨æç¨æ°çé¡¯ç¤ºè¨å®ä¹åéæ°ååè¨ç®æ©(&R)", IDC_RESTART_RB, 14, 116, 228, 10 AUTORADIOBUTTON "æç¨æ°çé¡¯ç¤ºè¨å®èä¸éæ°ååè¨ç®æ©(&P)", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "å¨æç¨æ°çé¡¯ç¤ºè¨å®ä¹åè©¢å(&K)", IDC_ASKME_RB, 14, 146, 228, 10 +END + +IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Display Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 + PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -254,4 +265,5 @@ IDS_DISPLAY_SETTINGS "é¡¯ç¤ºè¨å®" IDS_APPLY_FAILED "æç¨æ°è¨å®å¤±æ..." IDS_APPLY_NEEDS_RESTART "éè¦éæ°ååè¨ç®æ©ä½¿æ´æ¹çæã" -END + IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." +END Modified: trunk/reactos/dll/cpl/desk/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/resource.h [iso-8859-1] Sun Jun 18 08:31:20 2017 @@ -14,6 +14,7 @@ #define IDD_ADVAPPEARANCE 104 #define IDD_EFFAPPEARANCE 105 #define IDD_ADVANCED_GENERAL 200 +#define IDD_CONFIRMSETTINGS 201 /* Background Page */ #define IDC_BACKGROUND_LIST 1000 @@ -170,3 +171,7 @@ #define IDC_RESTART_RB 5002 #define IDC_WITHOUTREBOOT_RB 5003 #define IDC_ASKME_RB 5004 + +/* Confirm Settings Dialog */ +#define IDC_TIMEOUTTEXT 5100 +#define IDS_TIMEOUTTEXT 3800 Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] Sun Jun 18 08:31:20 2017 @@ -19,6 +19,12 @@ int cySource[NUM_SPECTRUM_BITMAPS]; } DATA, *PDATA; +typedef struct _TIMEOUTDATA +{ + TCHAR szRawBuffer[256]; + TCHAR szCookedBuffer[256]; + INT nTimeout; +} TIMEOUTDATA, *PTIMEOUTDATA; static VOID UpdateDisplay(IN HWND hwndDlg, PDATA pData, IN BOOL bUpdateThumb) @@ -652,6 +658,69 @@ return Ret; } +static INT_PTR CALLBACK +ConfirmDlgProc(IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam) +{ + PTIMEOUTDATA pData; + + pData = (PTIMEOUTDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch(uMsg) + { + case WM_INITDIALOG: + /* Allocate the local dialog data */ + pData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(TIMEOUTDATA)); + if (pData == NULL) + return FALSE; + + /* Link the dialog data to the dialog */ + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pData); + + /* Timeout in seconds */ + pData->nTimeout = 15; + + /* Load the raw timeout string */ + LoadString(hApplet, IDS_TIMEOUTTEXT, pData->szRawBuffer, ARRAYSIZE(pData->szRawBuffer)); + + /* Cook the timeout string and show it */ + _stprintf(pData->szCookedBuffer, pData->szRawBuffer, pData->nTimeout); + SetDlgItemText(hwndDlg, IDC_TIMEOUTTEXT, pData->szCookedBuffer); + + /* Start the timer (ticks every second)*/ + SetTimer(hwndDlg, 1, 1000, NULL); + break; + + case WM_TIMER: + /* Update the timepout value */ + pData->nTimeout--; + + /* Update the timeout text */ + _stprintf(pData->szCookedBuffer, pData->szRawBuffer, pData->nTimeout); + SetDlgItemText(hwndDlg, IDC_TIMEOUTTEXT, pData->szCookedBuffer); + + /* Kill the timer and return a 'No', if we ran out of time */ + if (pData->nTimeout == 0) + { + KillTimer(hwndDlg, 1); + EndDialog(hwndDlg, IDNO); + } + break; + + case WM_COMMAND: + /* Kill the timer and return the clicked button id */ + KillTimer(hwndDlg, 1); + EndDialog(hwndDlg, LOWORD(wParam)); + break; + + case WM_DESTROY: + /* Free the local dialog data */ + HeapFree(GetProcessHeap(), 0, pData); + break; + } + + return FALSE; +} + static VOID ApplyDisplaySettings(HWND hwndDlg, PDATA pData) { @@ -691,9 +760,7 @@ return; } - LoadString(hApplet, IDS_DISPLAY_SETTINGS, Title, sizeof(Title) / sizeof(TCHAR)); - - if (MessageBox(hwndDlg, _T("Do you want to keep these display settings?"), Title, MB_YESNO | MB_ICONQUESTION) == IDYES) + if (DialogBox(hApplet, MAKEINTRESOURCE(IDD_CONFIRMSETTINGS), hwndDlg, ConfirmDlgProc) == IDYES) { pData->CurrentDisplayDevice->InitialSettings.dmPelsWidth = pData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth; pData->CurrentDisplayDevice->InitialSettings.dmPelsHeight = pData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs