Ros-diffs June 2017

ros-diffs@reactos.org

20 participants
526 discussions

[tfaber] 75091: [LIBMPG123] - Update to version 1.23.0 CORE-13451

by tfaber＠svn.reactos.org

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…

7 years, 6 months

[gadamopoulos] 75090: [SHELL32] -CMenuBand::SetSite: Don't fail if the site doesn't support the SID_STopLevelBrowser service.

by gadamopoulos＠svn.reactos.org

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)

7 years, 6 months

[tfaber] 75089: [LIBPNG] - Update to version 1.6.29 CORE-13451

by tfaber＠svn.reactos.org

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*/

7 years, 6 months

[tfaber] 75088: [LIBSAMPLERATE] - Update to version 1.0.9 CORE-13451

by tfaber＠svn.reactos.org

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 */ /*

7 years, 6 months

[tfaber] 75087: [NTOS:MM] - Implement MiMapLockedPagesInUserSpace and MiUnmapLockedPagesInUserSpace. CORE-13444 #resolve

by tfaber＠svn.reactos.org

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(

7 years, 6 months

[pschweitzer] 75086: [DESK] French translation for Eric's work on r75085. CORE-8352

by pschweitzer＠svn.reactos.org

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

7 years, 6 months

[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

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;

7 years, 6 months

[tfaber] 75084: [KMTESTS:MM] - Test unaligned address and addresses close to MmHighestUserAddress in MmMapLockedPagesSpecifyCache test CORE-13444

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jun 18 08:00:29 2017 New Revision: 75084 URL: http://svn.reactos.org/svn/reactos?rev=75084&view=rev Log: [KMTESTS:MM] - Test unaligned address and addresses close to MmHighestUserAddress in MmMapLockedPagesSpecifyCache test CORE-13444 Modified: trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache.h trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_drv.c trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_user.c Modified: trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmMapLock… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache.h [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache.h [iso-8859-1] Sun Jun 18 08:00:29 2017 @@ -14,6 +14,7 @@ USHORT Length; PVOID Buffer; BOOLEAN Cached; + NTSTATUS Status; } QUERY_BUFFER, *PQUERY_BUFFER; typedef struct _READ_BUFFER @@ -25,6 +26,7 @@ #define IOCTL_QUERY_BUFFER 1 #define IOCTL_READ_BUFFER 2 +#define IOCTL_CLEAN 3 #define WRITE_PATTERN 0xA4A5A6A7 Modified: trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmMapLock… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_drv.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_drv.c [iso-8859-1] Sun Jun 18 08:00:29 2017 @@ -121,7 +121,7 @@ TestCleanEverything(); - ok(ExGetPreviousMode() == UserMode, "Not comming from umode!\n"); + ok(ExGetPreviousMode() == UserMode, "Not coming from umode!\n"); if (!skip(Buffer && InLength >= sizeof(QUERY_BUFFER) && *OutLength >= sizeof(QUERY_BUFFER), "Cannot read/write from/to buffer!\n")) { PQUERY_BUFFER QueryBuffer; @@ -178,15 +178,26 @@ SehStatus = STATUS_SUCCESS; _SEH2_TRY { - CurrentUser = MmMapLockedPagesSpecifyCache(CurrentMdl, UserMode, CacheType, NULL, FALSE, NormalPagePriority); + CurrentUser = MmMapLockedPagesSpecifyCache(CurrentMdl, UserMode, CacheType, QueryBuffer->Buffer, FALSE, NormalPagePriority); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { SehStatus = _SEH2_GetExceptionCode(); } _SEH2_END; - ok_eq_hex(SehStatus, STATUS_SUCCESS); - ok(CurrentUser != NULL, "MmMapLockedPagesSpecifyCache failed!\n"); + if (QueryBuffer->Status != -1) + { + ok_eq_hex(SehStatus, QueryBuffer->Status); + if (NT_SUCCESS(QueryBuffer->Status)) + { + ok(CurrentUser != NULL, "MmMapLockedPagesSpecifyCache failed!\n"); + } + else + { + ok(CurrentUser == NULL, "MmMapLockedPagesSpecifyCache succeeded!\n"); + } + } + QueryBuffer->Status = SehStatus; } else { @@ -208,7 +219,7 @@ ok_eq_size(*OutLength, 0); ok(CurrentMdl != NULL, "MDL is not in use!\n"); - if (!skip(Buffer && InLength >= sizeof(QUERY_BUFFER), "Cannot read from buffer!\n")) + if (!skip(Buffer && InLength >= sizeof(READ_BUFFER), "Cannot read from buffer!\n")) { PREAD_BUFFER ReadBuffer; @@ -237,6 +248,11 @@ break; } + case IOCTL_CLEAN: + { + TestCleanEverything(); + break; + } default: ok(0, "Got an unknown message! DeviceObject=%p, ControlCode=%lu, Buffer=%p, In=%lu, Out=%lu bytes\n", DeviceObject, ControlCode, Buffer, InLength, *OutLength); Modified: trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_user.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmMapLock… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_user.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_user.c [iso-8859-1] Sun Jun 18 08:00:29 2017 @@ -6,8 +6,12 @@ */ #include <kmt_test.h> +#include <ndk/exfuncs.h> #include "MmMapLockedPagesSpecifyCache.h" + +#define ALIGN_DOWN_BY(size, align) \ + ((ULONG_PTR)(size) & ~((ULONG_PTR)(align) - 1)) #define SET_BUFFER_LENGTH(Var, Length) \ { \ @@ -20,6 +24,7 @@ QueryBuffer.Length = BufferLength; \ QueryBuffer.Buffer = NULL; \ QueryBuffer.Cached = UseCache; \ + QueryBuffer.Status = STATUS_SUCCESS; \ } #define FILL_READ_BUFFER(QueryBuffer, ReadBuffer) \ @@ -78,6 +83,9 @@ DWORD Length; USHORT i; USHORT BufferLength; + SYSTEM_BASIC_INFORMATION BasicInfo; + NTSTATUS Status; + ULONG_PTR HighestAddress; KmtLoadDriver(L"MmMapLockedPagesSpecifyCache", FALSE); KmtOpenDriver(); @@ -180,31 +188,92 @@ // more than 2 pages SET_BUFFER_LENGTH(BufferLength, 2 * 4096 + 2048); - QueryBuffer.Length = BufferLength; - QueryBuffer.Buffer = NULL; - QueryBuffer.Cached = FALSE; - Length = sizeof(QUERY_BUFFER); - ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - ok_eq_int(QueryBuffer.Length, BufferLength); - ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); - CHECK_ALLOC(QueryBuffer.Buffer, BufferLength); - - Length = 0; - FILL_READ_BUFFER(QueryBuffer, ReadBuffer); - ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - - QueryBuffer.Length = BufferLength; - QueryBuffer.Buffer = NULL; - QueryBuffer.Cached = TRUE; - Length = sizeof(QUERY_BUFFER); - ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - ok_eq_int(QueryBuffer.Length, BufferLength); - ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); - CHECK_ALLOC(QueryBuffer.Buffer, BufferLength); - - Length = 0; - FILL_READ_BUFFER(QueryBuffer, ReadBuffer); - ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + FILL_QUERY_BUFFER(QueryBuffer, BufferLength, FALSE); + Length = sizeof(QUERY_BUFFER); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, BufferLength); + ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); + CHECK_ALLOC(QueryBuffer.Buffer, BufferLength); + + Length = 0; + FILL_READ_BUFFER(QueryBuffer, ReadBuffer); + ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + + FILL_QUERY_BUFFER(QueryBuffer, BufferLength, TRUE); + Length = sizeof(QUERY_BUFFER); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, BufferLength); + ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); + CHECK_ALLOC(QueryBuffer.Buffer, BufferLength); + + Length = 0; + FILL_READ_BUFFER(QueryBuffer, ReadBuffer); + ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + + // ask for a specific address (we know that ReadBuffer.Buffer is free) + SET_BUFFER_LENGTH(BufferLength, 4096); + FILL_QUERY_BUFFER(QueryBuffer, BufferLength, FALSE); + QueryBuffer.Buffer = ReadBuffer.Buffer; + Length = sizeof(QUERY_BUFFER); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, BufferLength); + ok(QueryBuffer.Buffer == ReadBuffer.Buffer, "Buffer is NULL\n"); + CHECK_ALLOC(QueryBuffer.Buffer, BufferLength); + + Length = 0; + FILL_READ_BUFFER(QueryBuffer, ReadBuffer); + ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + + // ask for an unaligned address + SET_BUFFER_LENGTH(BufferLength, 4096); + FILL_QUERY_BUFFER(QueryBuffer, BufferLength, FALSE); + QueryBuffer.Buffer = (PVOID)((ULONG_PTR)ReadBuffer.Buffer + 2048); + QueryBuffer.Status = STATUS_INVALID_ADDRESS; + Length = sizeof(QUERY_BUFFER); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, BufferLength); + ok(QueryBuffer.Buffer == NULL, "Buffer is %p\n", QueryBuffer.Buffer); + + Length = 0; + ok(KmtSendBufferToDriver(IOCTL_CLEAN, NULL, 0, &Length) == ERROR_SUCCESS, "\n"); + + // get system info for MmHighestUserAddress + Status = NtQuerySystemInformation(SystemBasicInformation, + &BasicInfo, + sizeof(BasicInfo), + NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + trace("MaximumUserModeAddress: %lx\n", BasicInfo.MaximumUserModeAddress); + HighestAddress = ALIGN_DOWN_BY(BasicInfo.MaximumUserModeAddress, PAGE_SIZE); + + // near MmHighestUserAddress + SET_BUFFER_LENGTH(BufferLength, 4096); + FILL_QUERY_BUFFER(QueryBuffer, BufferLength, FALSE); + QueryBuffer.Buffer = (PVOID)(HighestAddress - 15 * PAGE_SIZE); // 7ffe0000 + QueryBuffer.Status = STATUS_INVALID_ADDRESS; + trace("QueryBuffer.Buffer %p\n", QueryBuffer.Buffer); + Length = sizeof(QUERY_BUFFER); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, BufferLength); + ok(QueryBuffer.Buffer == NULL, "Buffer is %p\n", QueryBuffer.Buffer); + + Length = 0; + ok(KmtSendBufferToDriver(IOCTL_CLEAN, NULL, 0, &Length) == ERROR_SUCCESS, "\n"); + + // far enough away from MmHighestUserAddress + SET_BUFFER_LENGTH(BufferLength, 4096); + FILL_QUERY_BUFFER(QueryBuffer, BufferLength, FALSE); + QueryBuffer.Buffer = (PVOID)(HighestAddress - 16 * PAGE_SIZE); // 7ffdf000 + QueryBuffer.Status = -1; + trace("QueryBuffer.Buffer %p\n", QueryBuffer.Buffer); + Length = sizeof(QUERY_BUFFER); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, BufferLength); + ok(QueryBuffer.Status == STATUS_SUCCESS || + QueryBuffer.Status == STATUS_CONFLICTING_ADDRESSES, "Status = %lx\n", QueryBuffer.Status); + + Length = 0; + ok(KmtSendBufferToDriver(IOCTL_CLEAN, NULL, 0, &Length) == ERROR_SUCCESS, "\n"); KmtCloseDriver(); KmtUnloadDriver();

7 years, 6 months

[hbelusca] 75083: [NTOS]: Use SEH inside CmQueryKey(), as it can be called with user-mode parameter KeyInformation. Remove unused code in CmLoadKey(). I've noticed that in cmapi.c / ntapi.c we do n...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jun 17 23:34:32 2017 New Revision: 75083 URL: http://svn.reactos.org/svn/reactos?rev=75083&view=rev Log: [NTOS]: Use SEH inside CmQueryKey(), as it can be called with user-mode parameter KeyInformation. Remove unused code in CmLoadKey(). I've noticed that in cmapi.c / ntapi.c we do not correctly check the validity of some OBJECT_ATTRIBUTES variables and user-mode vs. kernel-mode registry handles. Modified: trunk/reactos/ntoskrnl/config/cmapi.c Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Sat Jun 17 23:34:32 2017 @@ -1637,69 +1637,88 @@ goto Quickie; } - /* Check what class we got */ - switch (KeyInformationClass) - { - /* Typical information */ - case KeyFullInformation: - case KeyBasicInformation: - case KeyNodeInformation: - - /* Get the hive and parent */ - Hive = Kcb->KeyHive; - Parent = (PCM_KEY_NODE)HvGetCell(Hive, Kcb->KeyCell); - ASSERT(Parent); - - /* Track cell references */ - if (!HvTrackCellRef(&CellReferences, Hive, Kcb->KeyCell)) - { - /* Not enough memory to track references */ - Status = STATUS_INSUFFICIENT_RESOURCES; - } - else - { - /* Call the internal API */ - Status = CmpQueryKeyData(Hive, - Parent, - KeyInformationClass, - KeyInformation, - Length, - ResultLength); - } - break; - - case KeyCachedInformation: - /* Call the internal API */ - Status = CmpQueryKeyDataFromCache(Kcb, - KeyInformation, - Length, - ResultLength); - break; - - case KeyFlagsInformation: - /* Call the internal API */ - Status = CmpQueryFlagsInformation(Kcb, - KeyInformation, - Length, - ResultLength); - break; - - case KeyNameInformation: - /* Call the internal API */ - Status = CmpQueryNameInformation(Kcb, + /* Data can be user-mode, use SEH */ + _SEH2_TRY + { + /* Check what class we got */ + switch (KeyInformationClass) + { + /* Typical information */ + case KeyFullInformation: + case KeyBasicInformation: + case KeyNodeInformation: + { + /* Get the hive and parent */ + Hive = Kcb->KeyHive; + Parent = (PCM_KEY_NODE)HvGetCell(Hive, Kcb->KeyCell); + ASSERT(Parent); + + /* Track cell references */ + if (!HvTrackCellRef(&CellReferences, Hive, Kcb->KeyCell)) + { + /* Not enough memory to track references */ + Status = STATUS_INSUFFICIENT_RESOURCES; + } + else + { + /* Call the internal API */ + Status = CmpQueryKeyData(Hive, + Parent, + KeyInformationClass, KeyInformation, Length, ResultLength); - break; - - /* Illegal classes */ - default: - - /* Print message and fail */ - DPRINT1("Unsupported class: %d!\n", KeyInformationClass); - Status = STATUS_INVALID_INFO_CLASS; - break; - } + } + break; + } + + case KeyCachedInformation: + { + /* Call the internal API */ + Status = CmpQueryKeyDataFromCache(Kcb, + KeyInformation, + Length, + ResultLength); + break; + } + + case KeyFlagsInformation: + { + /* Call the internal API */ + Status = CmpQueryFlagsInformation(Kcb, + KeyInformation, + Length, + ResultLength); + break; + } + + case KeyNameInformation: + { + /* Call the internal API */ + Status = CmpQueryNameInformation(Kcb, + KeyInformation, + Length, + ResultLength); + break; + } + + /* Illegal classes */ + default: + { + /* Print message and fail */ + DPRINT1("Unsupported class: %d!\n", KeyInformationClass); + Status = STATUS_INVALID_INFO_CLASS; + break; + } + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Fail with exception code */ + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(goto Quickie); + } + _SEH2_END; Quickie: /* Release references */ @@ -2013,9 +2032,6 @@ } /* Open the target key */ -#if 0 - Status = ZwOpenKey(&KeyHandle, KEY_READ, TargetKey); -#else RtlZeroMemory(&ParseContext, sizeof(ParseContext)); ParseContext.CreateOperation = FALSE; Status = ObOpenObjectByName(TargetKey, @@ -2025,7 +2041,6 @@ KEY_READ, &ParseContext, &KeyHandle); -#endif if (!NT_SUCCESS(Status)) KeyHandle = NULL; /* Open the hive */ @@ -2112,7 +2127,7 @@ } /* Is this first profile load? */ - if (!(CmpProfileLoaded) && !(CmpWasSetupBoot)) + if (!CmpProfileLoaded && !CmpWasSetupBoot) { /* User is now logged on, set quotas */ CmpProfileLoaded = TRUE;

7 years, 6 months

[ekohl] 75082: [DESK] - Add a message box to ask the user to confirm the screen resolution change. - The resolution change will be reverted if the user clicks 'No'. A separate dialog box with a tim...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jun 17 23:21:16 2017 New Revision: 75082 URL: http://svn.reactos.org/svn/reactos?rev=75082&view=rev Log: [DESK] - Add a message box to ask the user to confirm the screen resolution change. - The resolution change will be reverted if the user clicks 'No'. A separate dialog box with a timer will be added next. Modified: trunk/reactos/dll/cpl/desk/settings.c 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] Sat Jun 17 23:21:16 2017 @@ -652,12 +652,95 @@ return Ret; } +static VOID +ApplyDisplaySettings(HWND hwndDlg, PDATA pData) +{ + TCHAR Message[1024], Title[256]; + DEVMODE devmode; + LONG rc; + + RtlZeroMemory(&devmode, sizeof(devmode)); + devmode.dmSize = (WORD)sizeof(devmode); + devmode.dmPelsWidth = pData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth; + devmode.dmPelsHeight = pData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight; + devmode.dmBitsPerPel = pData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel; + devmode.dmDisplayFrequency = pData->CurrentDisplayDevice->CurrentSettings->dmDisplayFrequency; + devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY; + + rc = ChangeDisplaySettingsEx(pData->CurrentDisplayDevice->DeviceName, + &devmode, + NULL, + CDS_UPDATEREGISTRY, + NULL); + switch (rc) + { + case DISP_CHANGE_SUCCESSFUL: + break; + + case DISP_CHANGE_RESTART: + LoadString(hApplet, IDS_DISPLAY_SETTINGS, Title, sizeof(Title) / sizeof(TCHAR)); + LoadString(hApplet, IDS_APPLY_NEEDS_RESTART, Message, sizeof(Message) / sizeof (TCHAR)); + MessageBox(hwndDlg, Message, Title, MB_OK | MB_ICONINFORMATION); + return; + + case DISP_CHANGE_FAILED: + default: + LoadString(hApplet, IDS_DISPLAY_SETTINGS, Title, sizeof(Title) / sizeof(TCHAR)); + LoadString(hApplet, IDS_APPLY_FAILED, Message, sizeof(Message) / sizeof (TCHAR)); + MessageBox(hwndDlg, Message, Title, MB_OK | MB_ICONSTOP); + 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) + { + pData->CurrentDisplayDevice->InitialSettings.dmPelsWidth = pData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth; + pData->CurrentDisplayDevice->InitialSettings.dmPelsHeight = pData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight; + pData->CurrentDisplayDevice->InitialSettings.dmBitsPerPel = pData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel; + } + else + { + devmode.dmPelsWidth = pData->CurrentDisplayDevice->InitialSettings.dmPelsWidth; + devmode.dmPelsHeight = pData->CurrentDisplayDevice->InitialSettings.dmPelsHeight; + devmode.dmBitsPerPel = pData->CurrentDisplayDevice->InitialSettings.dmBitsPerPel; + devmode.dmDisplayFrequency = pData->CurrentDisplayDevice->InitialSettings.dmDisplayFrequency; + + rc = ChangeDisplaySettingsEx(pData->CurrentDisplayDevice->DeviceName, + &devmode, + NULL, + CDS_UPDATEREGISTRY, + NULL); + switch (rc) + { + case DISP_CHANGE_SUCCESSFUL: + pData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth = pData->CurrentDisplayDevice->InitialSettings.dmPelsWidth; + pData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight = pData->CurrentDisplayDevice->InitialSettings.dmPelsHeight; + pData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel = pData->CurrentDisplayDevice->InitialSettings.dmBitsPerPel; + UpdateDisplay(hwndDlg, pData, TRUE); + break; + + case DISP_CHANGE_RESTART: + LoadString(hApplet, IDS_DISPLAY_SETTINGS, Title, sizeof(Title) / sizeof(TCHAR)); + LoadString(hApplet, IDS_APPLY_NEEDS_RESTART, Message, sizeof(Message) / sizeof (TCHAR)); + MessageBox(hwndDlg, Message, Title, MB_OK | MB_ICONINFORMATION); + return; + + case DISP_CHANGE_FAILED: + default: + LoadString(hApplet, IDS_DISPLAY_SETTINGS, Title, sizeof(Title) / sizeof(TCHAR)); + LoadString(hApplet, IDS_APPLY_FAILED, Message, sizeof(Message) / sizeof (TCHAR)); + MessageBox(hwndDlg, Message, Title, MB_OK | MB_ICONSTOP); + return; + } + } +} + /* Property page dialog callback */ INT_PTR CALLBACK SettingsPageProc(IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam) { PDATA pData; - TCHAR Message[1024], Title[256]; pData = (PDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); @@ -720,42 +803,8 @@ || pData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight != pData->CurrentDisplayDevice->InitialSettings.dmPelsHeight || pData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel != pData->CurrentDisplayDevice->InitialSettings.dmBitsPerPel) { - /* FIXME: Need to test changes */ /* Apply new settings */ - LONG rc; - DEVMODE devmode; - RtlZeroMemory(&devmode, sizeof(devmode)); - devmode.dmSize = (WORD)sizeof(devmode); - devmode.dmPelsWidth = pData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth; - devmode.dmPelsHeight = pData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight; - devmode.dmBitsPerPel = pData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel; - devmode.dmDisplayFrequency = pData->CurrentDisplayDevice->CurrentSettings->dmDisplayFrequency; - devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY; - rc = ChangeDisplaySettingsEx( - pData->CurrentDisplayDevice->DeviceName, - &devmode, - NULL, - CDS_UPDATEREGISTRY, - NULL); - switch (rc) - { - case DISP_CHANGE_SUCCESSFUL: - pData->CurrentDisplayDevice->InitialSettings.dmPelsWidth = pData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth; - pData->CurrentDisplayDevice->InitialSettings.dmPelsHeight = pData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight; - pData->CurrentDisplayDevice->InitialSettings.dmBitsPerPel = pData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel; - break; - case DISP_CHANGE_RESTART: - LoadString(hApplet, IDS_DISPLAY_SETTINGS, Title, sizeof(Title) / sizeof(TCHAR)); - LoadString(hApplet, IDS_APPLY_NEEDS_RESTART, Message, sizeof(Message) / sizeof (TCHAR)); - MessageBox(hwndDlg, Message, Title, MB_OK | MB_ICONINFORMATION); - break; - case DISP_CHANGE_FAILED: - default: - LoadString(hApplet, IDS_DISPLAY_SETTINGS, Title, sizeof(Title) / sizeof(TCHAR)); - LoadString(hApplet, IDS_APPLY_FAILED, Message, sizeof(Message) / sizeof (TCHAR)); - MessageBox(hwndDlg, Message, Title, MB_OK | MB_ICONSTOP); - break; - } + ApplyDisplaySettings(hwndDlg, pData); } } break;

7 years, 6 months

← Newer
1
...
14
15
16
17
18
19
20
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2017