Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 72642: [CRT] fix build
by cwittich＠svn.reactos.org 10 Sep '16

10 Sep '16

Author: cwittich Date: Sat Sep 10 07:18:50 2016 New Revision: 72642 URL: http://svn.reactos.org/svn/reactos?rev=72642&view=rev Log: [CRT] fix build Modified: trunk/reactos/sdk/lib/crt/string/wtoi64.c Modified: trunk/reactos/sdk/lib/crt/string/wtoi64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/string/wtoi64.… ============================================================================== --- trunk/reactos/sdk/lib/crt/string/wtoi64.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/string/wtoi64.c [iso-8859-1] Sat Sep 10 07:18:50 2016 @@ -9,7 +9,7 @@ ULONGLONG RunningTotal = 0; BOOL bMinus = FALSE; - while (isspaceW(*str)) { + while (iswctype((int)*str, _SPACE)) { str++; } /* while */ @@ -48,13 +48,15 @@ BOOL negative = FALSE; __int64 ret = 0; +#ifndef _LIBCNT_ TRACE("(%s %p %d %p)\n", debugstr_w(nptr), endptr, base, locale); +#endif if (!MSVCRT_CHECK_PMT(nptr != NULL)) return 0; if (!MSVCRT_CHECK_PMT(base == 0 || base >= 2)) return 0; if (!MSVCRT_CHECK_PMT(base <= 36)) return 0; - while(isspaceW(*nptr)) nptr++; + while (iswctype((int)*nptr, _SPACE)) nptr++; if(*nptr == '-') { negative = TRUE; @@ -62,7 +64,7 @@ } else if(*nptr == '+') nptr++; - if((base==0 || base==16) && *nptr=='0' && tolowerW(*(nptr+1))=='x') { + if((base==0 || base==16) && *nptr=='0' && towlower(*(nptr+1))=='x') { base = 16; nptr += 2; } @@ -75,7 +77,7 @@ } while(*nptr) { - wchar_t cur = tolowerW(*nptr); + wchar_t cur = towlower(*nptr); int v; if(cur>='0' && cur<='9') { @@ -95,10 +97,14 @@ if(!negative && (ret>_I64_MAX/base || ret*base>_I64_MAX-v)) { ret = _I64_MAX; +#ifndef _LIBCNT_ *_errno() = ERANGE; +#endif } else if(negative && (ret<_I64_MIN/base || ret*base<_I64_MIN-v)) { ret = _I64_MIN; +#ifndef _LIBCNT_ *_errno() = ERANGE; +#endif } else ret = ret*base + v; } @@ -129,13 +135,15 @@ BOOL negative = FALSE; unsigned __int64 ret = 0; +#ifndef _LIBCNT_ TRACE("(%s %p %d %p)\n", debugstr_w(nptr), endptr, base, locale); +#endif if (!MSVCRT_CHECK_PMT(nptr != NULL)) return 0; if (!MSVCRT_CHECK_PMT(base == 0 || base >= 2)) return 0; if (!MSVCRT_CHECK_PMT(base <= 36)) return 0; - while(isspaceW(*nptr)) nptr++; + while (iswctype((int)*nptr, _SPACE)) nptr++; if(*nptr == '-') { negative = TRUE; @@ -143,7 +151,7 @@ } else if(*nptr == '+') nptr++; - if((base==0 || base==16) && *nptr=='0' && tolowerW(*(nptr+1))=='x') { + if((base==0 || base==16) && *nptr=='0' && towlower(*(nptr+1))=='x') { base = 16; nptr += 2; } @@ -156,7 +164,7 @@ } while(*nptr) { - wchar_t cur = tolowerW(*nptr); + wchar_t cur = towlower(*nptr); int v; if(cur>='0' && cur<='9') { @@ -173,8 +181,10 @@ if(ret>_UI64_MAX/base || ret*base>_UI64_MAX-v) { ret = _UI64_MAX; +#ifndef _LIBCNT_ *_errno() = ERANGE; - } else +#endif + } else ret = ret*base + v; }

1 0

[cwittich] 72641: [CRT] sync wtoi64.c with wine 1.9.16
by cwittich＠svn.reactos.org 10 Sep '16

10 Sep '16

Author: cwittich Date: Sat Sep 10 06:52:50 2016 New Revision: 72641 URL: http://svn.reactos.org/svn/reactos?rev=72641&view=rev Log: [CRT] sync wtoi64.c with wine 1.9.16 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/sdk/lib/crt/string/wtoi64.c Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 10 06:52:50 2016 @@ -300,6 +300,7 @@ reactos/sdk/lib/crt/string/strxfrm.c # Synced to Wine-1.9.16 reactos/sdk/lib/crt/string/wcs.c # Synced at 20080611 reactos/sdk/lib/crt/string/wctype.c # Synced at WineStaging-1.9.16 + reactos/sdk/lib/crt/string/wtoi64.c # Synced at Wine-1.9.16 reactos/sdk/lib/crt/wine/heap.c # Synced at 20080529 reactos/sdk/lib/crt/wine/undname.c # Synced to WineStaging-1.9.16 reactos/sdk/lib/crt/process/thread.c # Synced to WineStaging-1.7.55 Modified: trunk/reactos/sdk/lib/crt/string/wtoi64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/string/wtoi64.… ============================================================================== --- trunk/reactos/sdk/lib/crt/string/wtoi64.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/string/wtoi64.c [iso-8859-1] Sat Sep 10 06:52:50 2016 @@ -1,72 +1,196 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/sdk/crt/string/wtoi64.c - * PURPOSE: Unknown - * PROGRAMER: Unknown - * UPDATE HISTORY: - * 25/11/05: Added license header +#include <precomp.h> +#include <internal/wine/msvcrt.h> + +/********************************************************************* + * _wtoi64_l (MSVCRT.@) */ +__int64 CDECL _wtoi64_l(const wchar_t *str, _locale_t locale) +{ + ULONGLONG RunningTotal = 0; + BOOL bMinus = FALSE; -#include <precomp.h> + while (isspaceW(*str)) { + str++; + } /* while */ -/* - * @implemented + if (*str == '+') { + str++; + } else if (*str == '-') { + bMinus = TRUE; + str++; + } /* if */ + + while (*str >= '0' && *str <= '9') { + RunningTotal = RunningTotal * 10 + *str - '0'; + str++; + } /* while */ + + return bMinus ? -RunningTotal : RunningTotal; +} + +/********************************************************************* + * _wtoi64 (MSVCRT.@) */ -__int64 -CDECL -_wtoi64 (const wchar_t *nptr) +__int64 CDECL _wtoi64(const wchar_t *str) { - int c; - __int64 value; - int sign; - - if (nptr == NULL) - return 0; - - while (iswctype((int)*nptr, _SPACE)) - ++nptr; - - c = (int)*nptr++; - sign = c; - if (c == L'-' || c == L'+') - c = (int)*nptr++; - - value = 0; - - while (iswctype(c, _DIGIT)) - { - value = 10 * value + (c - L'0'); - c = (int)*nptr++; - } - - if (sign == L'-') - return -value; - else - return value; + return _wtoi64_l(str, NULL); } -/* - * @unimplemented +/********************************************************************* + * _wcstoi64_l (MSVCRT.@) + * + * FIXME: locale parameter is ignored */ -__int64 -CDECL -_wcstoi64 (const wchar_t *nptr, wchar_t **endptr, int base) +__int64 CDECL _wcstoi64_l(const wchar_t *nptr, + wchar_t **endptr, int base, _locale_t locale) { - TRACE("_wcstoi64 is UNIMPLEMENTED\n"); - return 0; + BOOL negative = FALSE; + __int64 ret = 0; + + TRACE("(%s %p %d %p)\n", debugstr_w(nptr), endptr, base, locale); + + if (!MSVCRT_CHECK_PMT(nptr != NULL)) return 0; + if (!MSVCRT_CHECK_PMT(base == 0 || base >= 2)) return 0; + if (!MSVCRT_CHECK_PMT(base <= 36)) return 0; + + while(isspaceW(*nptr)) nptr++; + + if(*nptr == '-') { + negative = TRUE; + nptr++; + } else if(*nptr == '+') + nptr++; + + if((base==0 || base==16) && *nptr=='0' && tolowerW(*(nptr+1))=='x') { + base = 16; + nptr += 2; + } + + if(base == 0) { + if(*nptr=='0') + base = 8; + else + base = 10; + } + + while(*nptr) { + wchar_t cur = tolowerW(*nptr); + int v; + + if(cur>='0' && cur<='9') { + if(cur >= '0'+base) + break; + v = cur-'0'; + } else { + if(cur<'a' || cur>='a'+base-10) + break; + v = cur-'a'+10; + } + + if(negative) + v = -v; + + nptr++; + + if(!negative && (ret>_I64_MAX/base || ret*base>_I64_MAX-v)) { + ret = _I64_MAX; + *_errno() = ERANGE; + } else if(negative && (ret<_I64_MIN/base || ret*base<_I64_MIN-v)) { + ret = _I64_MIN; + *_errno() = ERANGE; + } else + ret = ret*base + v; + } + + if(endptr) + *endptr = (wchar_t*)nptr; + + return ret; } -/* - * @unimplemented +/********************************************************************* + * _wcstoi64 (MSVCRT.@) */ -unsigned __int64 -CDECL -_wcstoui64 (const wchar_t *nptr, wchar_t **endptr, int base) +__int64 CDECL _wcstoi64(const wchar_t *nptr, + wchar_t **endptr, int base) { - TRACE("_wcstoui64 is UNIMPLEMENTED\n"); - return 0; + return _wcstoi64_l(nptr, endptr, base, NULL); +} + +/********************************************************************* + * _wcstoui64_l (MSVCRT.@) + * + * FIXME: locale parameter is ignored + */ +unsigned __int64 CDECL _wcstoui64_l(const wchar_t *nptr, + wchar_t **endptr, int base, _locale_t locale) +{ + BOOL negative = FALSE; + unsigned __int64 ret = 0; + + TRACE("(%s %p %d %p)\n", debugstr_w(nptr), endptr, base, locale); + + if (!MSVCRT_CHECK_PMT(nptr != NULL)) return 0; + if (!MSVCRT_CHECK_PMT(base == 0 || base >= 2)) return 0; + if (!MSVCRT_CHECK_PMT(base <= 36)) return 0; + + while(isspaceW(*nptr)) nptr++; + + if(*nptr == '-') { + negative = TRUE; + nptr++; + } else if(*nptr == '+') + nptr++; + + if((base==0 || base==16) && *nptr=='0' && tolowerW(*(nptr+1))=='x') { + base = 16; + nptr += 2; + } + + if(base == 0) { + if(*nptr=='0') + base = 8; + else + base = 10; + } + + while(*nptr) { + wchar_t cur = tolowerW(*nptr); + int v; + + if(cur>='0' && cur<='9') { + if(cur >= '0'+base) + break; + v = *nptr-'0'; + } else { + if(cur<'a' || cur>='a'+base-10) + break; + v = cur-'a'+10; + } + + nptr++; + + if(ret>_UI64_MAX/base || ret*base>_UI64_MAX-v) { + ret = _UI64_MAX; + *_errno() = ERANGE; + } else + ret = ret*base + v; + } + + if(endptr) + *endptr = (wchar_t*)nptr; + + return negative ? -ret : ret; +} + +/********************************************************************* + * _wcstoui64 (MSVCRT.@) + */ +unsigned __int64 CDECL _wcstoui64(const wchar_t *nptr, + wchar_t **endptr, int base) +{ + return _wcstoui64_l(nptr, endptr, base, NULL); }

1 0

[cwittich] 72640: [SETUPAPI] sync diskspace.c with wine 1.9.16
by cwittich＠svn.reactos.org 10 Sep '16

10 Sep '16

Author: cwittich Date: Sat Sep 10 06:20:10 2016 New Revision: 72640 URL: http://svn.reactos.org/svn/reactos?rev=72640&view=rev Log: [SETUPAPI] sync diskspace.c with wine 1.9.16 Modified: trunk/reactos/dll/win32/setupapi/diskspace.c trunk/reactos/dll/win32/setupapi/setupapi.spec Modified: trunk/reactos/dll/win32/setupapi/diskspace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/diskspa… ============================================================================== --- trunk/reactos/dll/win32/setupapi/diskspace.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/diskspace.c [iso-8859-1] Sat Sep 10 06:20:10 2016 @@ -248,3 +248,27 @@ HeapFree(GetProcessHeap(),0,list); return TRUE; } + +/*********************************************************************** +* SetupAddToDiskSpaceListA (SETUPAPI.@) +*/ +BOOL WINAPI SetupAddToDiskSpaceListA(HDSKSPC diskspace, PCSTR targetfile, + LONGLONG filesize, UINT operation, + PVOID reserved1, UINT reserved2) +{ + FIXME(": stub\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** +* SetupAddToDiskSpaceListW (SETUPAPI.@) +*/ +BOOL WINAPI SetupAddToDiskSpaceListW(HDSKSPC diskspace, PCWSTR targetfile, + LONGLONG filesize, UINT operation, + PVOID reserved1, UINT reserved2) +{ + FIXME(": stub\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Sat Sep 10 06:20:10 2016 @@ -221,8 +221,8 @@ @ stub SetupAddInstallSectionToDiskSpaceListW @ stdcall -stub SetupAddSectionToDiskSpaceListA(long long long str long ptr long) @ stub SetupAddSectionToDiskSpaceListW -@ stdcall -stub SetupAddToDiskSpaceListA(long str double long ptr long) -@ stub SetupAddToDiskSpaceListW +@ stdcall SetupAddToDiskSpaceListA(long str int64 long ptr long) +@ stdcall SetupAddToDiskSpaceListW(long wstr int64 long ptr long) @ stub SetupAddToSourceListA @ stub SetupAddToSourceListW @ stub SetupAdjustDiskSpaceListA

1 0

[dchapyshev] 72639: [NtUser] - Initialize cbSize filed for HIGHCONTRASTW - SOUNDSENTRY -> SOUNDSENTRYW - Add checks of size for SPI_GETHIGHCONTRAST and SPI_SETHIGHCONTRAST
by dchapyshev＠svn.reactos.org 09 Sep '16

09 Sep '16

Author: dchapyshev Date: Fri Sep 9 23:03:42 2016 New Revision: 72639 URL: http://svn.reactos.org/svn/reactos?rev=72639&view=rev Log: [NtUser] - Initialize cbSize filed for HIGHCONTRASTW - SOUNDSENTRY -> SOUNDSENTRYW - Add checks of size for SPI_GETHIGHCONTRAST and SPI_SETHIGHCONTRAST Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/syspar… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] Fri Sep 9 23:03:42 2016 @@ -310,7 +310,8 @@ gspv.mousekeys.cbSize = sizeof(MOUSEKEYS); gspv.stickykeys.cbSize = sizeof(STICKYKEYS); gspv.serialkeys.cbSize = sizeof(SERIALKEYS); - gspv.soundsentry.cbSize = sizeof(SOUNDSENTRY); + gspv.soundsentry.cbSize = sizeof(SOUNDSENTRYW); + gspv.highcontrast.cbSize = sizeof(HIGHCONTRASTW); /* Make sure we don't use broken values */ SpiFixupValues(); @@ -1103,6 +1104,7 @@ if (!SpiSet(&gspv.filterkeys, pvParam, sizeof(FILTERKEYS), fl)) return 0; + if (fl & SPIF_UPDATEINIFILE) { // FIXME: What to do? @@ -1287,28 +1289,28 @@ case SPI_GETSOUNDSENTRY: { - LPSOUNDSENTRY SoundsEntry = (LPSOUNDSENTRY)pvParam; - - if (uiParam != 0 && uiParam != sizeof(SOUNDSENTRY)) - return 0; - - if (!SoundsEntry || SoundsEntry->cbSize != sizeof(SOUNDSENTRY)) - return 0; - - return SpiGet(pvParam, &gspv.soundsentry, sizeof(SOUNDSENTRY), fl); + LPSOUNDSENTRYW SoundsEntry = (LPSOUNDSENTRYW)pvParam; + + if (uiParam != 0 && uiParam != sizeof(SOUNDSENTRYW)) + return 0; + + if (!SoundsEntry || SoundsEntry->cbSize != sizeof(SOUNDSENTRYW)) + return 0; + + return SpiGet(pvParam, &gspv.soundsentry, sizeof(SOUNDSENTRYW), fl); } case SPI_SETSOUNDSENTRY: { - LPSOUNDSENTRY SoundsEntry = (LPSOUNDSENTRY)pvParam; - - if (uiParam != 0 && uiParam != sizeof(SOUNDSENTRY)) - return 0; - - if (!SoundsEntry || SoundsEntry->cbSize != sizeof(SOUNDSENTRY)) - return 0; - - if (!SpiSet(&gspv.soundsentry, pvParam, sizeof(SOUNDSENTRY), fl)) + LPSOUNDSENTRYW SoundsEntry = (LPSOUNDSENTRYW)pvParam; + + if (uiParam != 0 && uiParam != sizeof(SOUNDSENTRYW)) + return 0; + + if (!SoundsEntry || SoundsEntry->cbSize != sizeof(SOUNDSENTRYW)) + return 0; + + if (!SpiSet(&gspv.soundsentry, pvParam, sizeof(SOUNDSENTRYW), fl)) return 0; if (fl & SPIF_UPDATEINIFILE) @@ -1319,16 +1321,37 @@ } case SPI_GETHIGHCONTRAST: - return SpiGet(pvParam, &gspv.highcontrast, sizeof(HIGHCONTRAST), fl); + { + LPHIGHCONTRASTW highcontrast = (LPHIGHCONTRASTW)pvParam; + + if (uiParam != 0 && uiParam != sizeof(HIGHCONTRASTW)) + return 0; + + if (!highcontrast || highcontrast->cbSize != sizeof(HIGHCONTRASTW)) + return 0; + + return SpiGet(pvParam, &gspv.highcontrast, sizeof(HIGHCONTRASTW), fl); + } case SPI_SETHIGHCONTRAST: - if (!SpiSet(&gspv.highcontrast, pvParam, sizeof(HIGHCONTRAST), fl)) - return 0; + { + LPHIGHCONTRASTW highcontrast = (LPHIGHCONTRASTW)pvParam; + + if (uiParam != 0 && uiParam != sizeof(HIGHCONTRASTW)) + return 0; + + if (!highcontrast || highcontrast->cbSize != sizeof(HIGHCONTRASTW)) + return 0; + + if (!SpiSet(&gspv.highcontrast, pvParam, sizeof(HIGHCONTRASTW), fl)) + return 0; + if (fl & SPIF_UPDATEINIFILE) { // FIXME: What to do? } return (UINT_PTR)KEY_DESKTOP; + } case SPI_GETKEYBOARDPREF: return SpiGetInt(pvParam, &gspv.bKbdPref, fl); @@ -1881,7 +1904,7 @@ break; case SPI_GETICONMETRICS: - cbSize = sizeof(ICONMETRICS); + cbSize = sizeof(ICONMETRICSW); break; case SPI_GETWORKAREA: @@ -1913,11 +1936,11 @@ break; case SPI_GETSOUNDSENTRY: - cbSize = sizeof(SOUNDSENTRY); + cbSize = sizeof(SOUNDSENTRYW); break; case SPI_GETHIGHCONTRAST: - cbSize = sizeof(HIGHCONTRAST); + cbSize = sizeof(HIGHCONTRASTW); break; case SPI_GETANIMATION: @@ -1995,12 +2018,12 @@ break; case SPI_SETSOUNDSENTRY: - cbSize = sizeof(SOUNDSENTRY); + cbSize = sizeof(SOUNDSENTRYW); bToUser = FALSE; break; case SPI_SETHIGHCONTRAST: - cbSize = sizeof(HIGHCONTRAST); + cbSize = sizeof(HIGHCONTRASTW); bToUser = FALSE; break;

1 0

[dchapyshev] 72638: [NtUser] - LPICONMETRICS -> LPICONMETRICSW
by dchapyshev＠svn.reactos.org 09 Sep '16

09 Sep '16

Author: dchapyshev Date: Fri Sep 9 22:39:25 2016 New Revision: 72638 URL: http://svn.reactos.org/svn/reactos?rev=72638&view=rev Log: [NtUser] - LPICONMETRICS -> LPICONMETRICSW Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/syspar… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] Fri Sep 9 22:39:25 2016 @@ -1013,15 +1013,15 @@ case SPI_SETICONMETRICS: { - LPICONMETRICS IconMetrics = (LPICONMETRICS)pvParam; - - if (uiParam != 0 && uiParam != sizeof(ICONMETRICS)) - return 0; - - if (!IconMetrics || IconMetrics->cbSize != sizeof(ICONMETRICS)) - return 0; - - if (!SpiSet(&gspv.im, pvParam, sizeof(ICONMETRICS), fl)) + LPICONMETRICSW IconMetrics = (LPICONMETRICSW)pvParam; + + if (uiParam != 0 && uiParam != sizeof(ICONMETRICSW)) + return 0; + + if (!IconMetrics || IconMetrics->cbSize != sizeof(ICONMETRICSW)) + return 0; + + if (!SpiSet(&gspv.im, pvParam, sizeof(ICONMETRICSW), fl)) return 0; if (fl & SPIF_UPDATEINIFILE) @@ -1955,7 +1955,7 @@ break; case SPI_SETICONMETRICS: - cbSize = sizeof(ICONMETRICS); + cbSize = sizeof(ICONMETRICSW); bToUser = FALSE; break;

1 0

[akhaldi] 72637: [WIN32K] Fix the size passed to UserSystemParametersInfo(). Addresses test issues revealed by r72636.
by akhaldi＠svn.reactos.org 09 Sep '16

09 Sep '16

Author: akhaldi Date: Fri Sep 9 22:26:55 2016 New Revision: 72637 URL: http://svn.reactos.org/svn/reactos?rev=72637&view=rev Log: [WIN32K] Fix the size passed to UserSystemParametersInfo(). Addresses test issues revealed by r72636. Modified: trunk/reactos/win32ss/user/ntuser/painting.c Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Fri Sep 9 22:26:55 2016 @@ -1995,7 +1995,7 @@ TRACE("UserDrawCaptionText: %wZ\n", Text); nclm.cbSize = sizeof(nclm); - if(!UserSystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &nclm, 0)) + if (!UserSystemParametersInfo(SPI_GETNONCLIENTMETRICS, nclm.cbSize, &nclm, 0)) { ERR("UserSystemParametersInfo() failed!\n"); return FALSE;

1 0

[dchapyshev] 72636: [WIN32KNT_APITEST] - Fix copypasta [NTUSER] - User's buffer has to be checked before check of size parameters, differently we cannot safely check the sizes of structures
by dchapyshev＠svn.reactos.org 09 Sep '16

09 Sep '16

Author: dchapyshev Date: Fri Sep 9 20:44:34 2016 New Revision: 72636 URL: http://svn.reactos.org/svn/reactos?rev=72636&view=rev Log: [WIN32KNT_APITEST] - Fix copypasta [NTUSER] - User's buffer has to be checked before check of size parameters, differently we cannot safely check the sizes of structures Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c trunk/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/syspar… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] Fri Sep 9 20:44:34 2016 @@ -222,7 +222,7 @@ TRACE("Enter SpiUpdatePerUserSystemParameters\n"); /* Clear the structure */ - memset(&gspv, 0, sizeof(gspv)); + RtlZeroMemory(&gspv, sizeof(gspv)); /* Load mouse settings */ gspv.caiMouse.FirstThreshold = SpiLoadMouse(VAL_MOUSE1, 6); @@ -424,7 +424,7 @@ // FIXME: get rid of the flags and only use this from um. kernel can access data directly. static UINT_PTR -SpiMemCopy(PVOID pvDst, PVOID pvSrc, ULONG cbSize, BOOL bProtect, BOOL bToUser) +SpiMemCopy(PVOID pvDst, PVOID pvSrc, ULONG cbSize, BOOL bProtect) { NTSTATUS Status = STATUS_SUCCESS; @@ -432,15 +432,7 @@ { _SEH2_TRY { - if (bToUser) - { - ProbeForWrite(pvDst, cbSize, 1); - } - else - { - ProbeForRead(pvSrc, cbSize, 1); - } - memcpy(pvDst, pvSrc, cbSize); + RtlCopyMemory(pvDst, pvSrc, cbSize); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -450,14 +442,15 @@ } else { - memcpy(pvDst, pvSrc, cbSize); + RtlCopyMemory(pvDst, pvSrc, cbSize); } if (!NT_SUCCESS(Status)) { SetLastNtError(Status); - ERR("SpiMemCopy failed, pvDst=%p, pvSrc=%p, bProtect=%d, bToUser=%d\n", pvDst, pvSrc, bProtect, bToUser); - } + ERR("SpiMemCopy failed, pvDst=%p, pvSrc=%p, bProtect=%d\n", pvDst, pvSrc, bProtect); + } + return NT_SUCCESS(Status); } @@ -466,7 +459,7 @@ SpiGet(PVOID pvParam, PVOID pvData, ULONG cbSize, FLONG fl) { REQ_INTERACTIVE_WINSTA(ERROR_ACCESS_DENIED); - return SpiMemCopy(pvParam, pvData, cbSize, fl & SPIF_PROTECT, TRUE); + return SpiMemCopy(pvParam, pvData, cbSize, fl & SPIF_PROTECT); } static inline @@ -474,7 +467,7 @@ SpiSet(PVOID pvData, PVOID pvParam, ULONG cbSize, FLONG fl) { REQ_INTERACTIVE_WINSTA(ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION); - return SpiMemCopy(pvData, pvParam, cbSize, fl & SPIF_PROTECT, FALSE); + return SpiMemCopy(pvData, pvParam, cbSize, fl & SPIF_PROTECT); } static inline @@ -631,13 +624,13 @@ } /* Capture UNICODE_STRING */ - bResult = SpiMemCopy(&ustr, pvParam, sizeof(ustr), fl & SPIF_PROTECT, 0); + bResult = SpiMemCopy(&ustr, pvParam, sizeof(ustr), fl & SPIF_PROTECT); if (!bResult) return 0; if (ustr.Length > MAX_PATH * sizeof(WCHAR)) return 0; /* Copy the string buffer name */ - bResult = SpiMemCopy(gspv.awcWallpaper, ustr.Buffer, ustr.Length, fl & SPIF_PROTECT, 0); + bResult = SpiMemCopy(gspv.awcWallpaper, ustr.Buffer, ustr.Length, fl & SPIF_PROTECT); if (!bResult) return 0; /* Update the UNICODE_STRING */ @@ -911,11 +904,31 @@ return SpiSetInt(&gspv.bDragFullWindows, uiParam, KEY_DESKTOP, VAL_DRAG, fl); case SPI_GETNONCLIENTMETRICS: + { + LPNONCLIENTMETRICSW metrics = (LPNONCLIENTMETRICSW)pvParam; + + if (uiParam != 0 && uiParam != sizeof(NONCLIENTMETRICSW)) + return 0; + + if (!metrics || metrics->cbSize != sizeof(NONCLIENTMETRICSW)) + return 0; + return SpiGet(pvParam, &gspv.ncm, sizeof(NONCLIENTMETRICSW), fl); + } case SPI_SETNONCLIENTMETRICS: + { + LPNONCLIENTMETRICSW metrics = (LPNONCLIENTMETRICSW)pvParam; + + if (uiParam != 0 && uiParam != sizeof(NONCLIENTMETRICSW)) + return 0; + + if (!metrics || metrics->cbSize != sizeof(NONCLIENTMETRICSW)) + return 0; + if (!SpiSet(&gspv.ncm, pvParam, sizeof(NONCLIENTMETRICSW), fl)) return 0; + if (fl & SPIF_UPDATEINIFILE) { SpiStoreMetric(VAL_BORDER, gspv.ncm.iBorderWidth); @@ -936,20 +949,44 @@ SpiStoreFont(L"StatusFont", &gspv.ncm.lfStatusFont); SpiStoreFont(L"MessageFont", &gspv.ncm.lfMessageFont); } + if(!SpiNotifyNCMetricsChanged()) return 0; + return (UINT_PTR)KEY_METRIC; + } case SPI_GETMINIMIZEDMETRICS: + { + LPMINIMIZEDMETRICS metrics = (LPMINIMIZEDMETRICS)pvParam; + + if (uiParam != 0 && uiParam != sizeof(MINIMIZEDMETRICS)) + return 0; + + if (!metrics || metrics->cbSize != sizeof(MINIMIZEDMETRICS)) + return 0; + return SpiGet(pvParam, &gspv.mm, sizeof(MINIMIZEDMETRICS), fl); + } case SPI_SETMINIMIZEDMETRICS: + { + LPMINIMIZEDMETRICS metrics = (LPMINIMIZEDMETRICS)pvParam; + + if (uiParam != 0 && uiParam != sizeof(MINIMIZEDMETRICS)) + return 0; + + if (!metrics || metrics->cbSize != sizeof(MINIMIZEDMETRICS)) + return 0; + if (!SpiSet(&gspv.mm, pvParam, sizeof(MINIMIZEDMETRICS), fl)) return 0; + gspv.mm.iWidth = max(0, gspv.mm.iWidth); gspv.mm.iHorzGap = max(0, gspv.mm.iHorzGap); gspv.mm.iVertGap = max(0, gspv.mm.iVertGap); gspv.mm.iArrange = gspv.mm.iArrange & 0xf; + if (fl & SPIF_UPDATEINIFILE) { SpiStoreMetric(L"MinWidth", gspv.mm.iWidth); @@ -957,14 +994,36 @@ SpiStoreMetric(L"MinVertGap", gspv.mm.iVertGap); SpiStoreMetric(L"MinArrange", gspv.mm.iArrange); } + return (UINT_PTR)KEY_METRIC; + } case SPI_GETICONMETRICS: - return SpiGet(pvParam, &gspv.im, sizeof(ICONMETRICS), fl); + { + LPICONMETRICSW IconMetrics = (LPICONMETRICSW)pvParam; + + if (uiParam != 0 && uiParam != sizeof(ICONMETRICSW)) + return 0; + + if (!IconMetrics || IconMetrics->cbSize != sizeof(ICONMETRICSW)) + return 0; + + return SpiGet(pvParam, &gspv.im, sizeof(ICONMETRICSW), fl); + } case SPI_SETICONMETRICS: + { + LPICONMETRICS IconMetrics = (LPICONMETRICS)pvParam; + + if (uiParam != 0 && uiParam != sizeof(ICONMETRICS)) + return 0; + + if (!IconMetrics || IconMetrics->cbSize != sizeof(ICONMETRICS)) + return 0; + if (!SpiSet(&gspv.im, pvParam, sizeof(ICONMETRICS), fl)) return 0; + if (fl & SPIF_UPDATEINIFILE) { SpiStoreMetric(VAL_ICONSPC, gspv.im.iHorzSpacing); @@ -973,6 +1032,7 @@ SpiStoreFont(L"IconFont", &gspv.im.lfFont); } return (UINT_PTR)KEY_METRIC; + } case SPI_GETWORKAREA: { @@ -1713,6 +1773,276 @@ return 0; } +static BOOL +SpiGetSetProbeBuffer(UINT uiAction, UINT uiParam, PVOID pvParam) +{ + BOOL bToUser = TRUE; + ULONG cbSize = 0; + + switch (uiAction) + { + case SPI_GETBEEP: + case SPI_GETBORDER: + case SPI_GETKEYBOARDSPEED: + case SPI_GETSCREENSAVETIMEOUT: + case SPI_GETSCREENSAVEACTIVE: + case SPI_GETGRIDGRANULARITY: + case SPI_GETKEYBOARDDELAY: + case SPI_GETICONTITLEWRAP: + case SPI_GETMENUDROPALIGNMENT: + case SPI_GETFASTTASKSWITCH: + case SPI_GETDRAGFULLWINDOWS: + case SPI_GETSHOWSOUNDS: + case SPI_GETKEYBOARDPREF: + case SPI_GETSCREENREADER: + case SPI_GETFONTSMOOTHING: + case SPI_GETLOWPOWERTIMEOUT: + case SPI_GETPOWEROFFTIMEOUT: + case SPI_GETLOWPOWERACTIVE: + case SPI_GETPOWEROFFACTIVE: + case SPI_GETMOUSETRAILS: + case SPI_GETSNAPTODEFBUTTON: + case SPI_GETMOUSEHOVERWIDTH: + case SPI_GETMOUSEHOVERHEIGHT: + case SPI_GETMOUSEHOVERTIME: + case SPI_GETWHEELSCROLLLINES: + case SPI_GETMENUSHOWDELAY: +#if (_WIN32_WINNT >= 0x0600) + case SPI_GETWHEELSCROLLCHARS: +#endif + case SPI_GETSHOWIMEUI: + case SPI_GETMOUSESPEED: + case SPI_GETSCREENSAVERRUNNING: +#if(WINVER >= 0x0600) + case SPI_GETSCREENSAVESECURE: +#endif + case SPI_GETACTIVEWINDOWTRACKING: + case SPI_GETMENUANIMATION: + case SPI_GETCOMBOBOXANIMATION: + case SPI_GETLISTBOXSMOOTHSCROLLING: + case SPI_GETGRADIENTCAPTIONS: + case SPI_GETKEYBOARDCUES: + case SPI_GETACTIVEWNDTRKZORDER: + case SPI_GETHOTTRACKING: + case SPI_GETMENUFADE: + case SPI_GETSELECTIONFADE: + case SPI_GETTOOLTIPANIMATION: + case SPI_GETTOOLTIPFADE: + case SPI_GETCURSORSHADOW: + case SPI_GETUIEFFECTS: + case SPI_GETMOUSESONAR: + case SPI_GETMOUSECLICKLOCK: + case SPI_GETMOUSEVANISH: + case SPI_GETFLATMENU: + case SPI_GETDROPSHADOW: + case SPI_GETBLOCKSENDINPUTRESETS: +#if(_WIN32_WINNT >= 0x0600) + case SPI_GETDISABLEOVERLAPPEDCONTENT: + case SPI_GETCLIENTAREAANIMATION: + case SPI_GETCLEARTYPE: + case SPI_GETSPEECHRECOGNITION: +#endif + case SPI_GETFOREGROUNDLOCKTIMEOUT: + case SPI_GETACTIVEWNDTRKTIMEOUT: + case SPI_GETFOREGROUNDFLASHCOUNT: + case SPI_GETCARETWIDTH: + case SPI_GETMOUSECLICKLOCKTIME: + case SPI_GETFONTSMOOTHINGTYPE: + case SPI_GETFONTSMOOTHINGCONTRAST: + case SPI_GETFOCUSBORDERWIDTH: + case SPI_GETFOCUSBORDERHEIGHT: + case SPI_GETFONTSMOOTHINGORIENTATION: + cbSize = sizeof(INT); + break; + + case SPI_ICONHORIZONTALSPACING: + case SPI_ICONVERTICALSPACING: + if (pvParam) cbSize = sizeof(INT); + break; + + case SPI_GETMOUSE: + cbSize = 3 * sizeof(INT); + break; + + case SPI_GETDESKWALLPAPER: + cbSize = min(uiParam, gspv.ustrWallpaper.Length + 1UL); + break; + + case SPI_GETICONTITLELOGFONT: + cbSize = sizeof(LOGFONTW); + break; + + case SPI_GETNONCLIENTMETRICS: + cbSize = sizeof(NONCLIENTMETRICSW); + break; + + case SPI_GETMINIMIZEDMETRICS: + cbSize = sizeof(MINIMIZEDMETRICS); + break; + + case SPI_GETICONMETRICS: + cbSize = sizeof(ICONMETRICS); + break; + + case SPI_GETWORKAREA: + cbSize = sizeof(RECTL); + break; + + case SPI_GETFILTERKEYS: + cbSize = sizeof(FILTERKEYS); + break; + + case SPI_GETTOGGLEKEYS: + cbSize = sizeof(TOGGLEKEYS); + break; + + case SPI_GETMOUSEKEYS: + cbSize = sizeof(MOUSEKEYS); + break; + + case SPI_GETSTICKYKEYS: + cbSize = sizeof(STICKYKEYS); + break; + + case SPI_GETACCESSTIMEOUT: + cbSize = sizeof(ACCESSTIMEOUT); + break; + + case SPI_GETSERIALKEYS: + cbSize = sizeof(SERIALKEYS); + break; + + case SPI_GETSOUNDSENTRY: + cbSize = sizeof(SOUNDSENTRY); + break; + + case SPI_GETHIGHCONTRAST: + cbSize = sizeof(HIGHCONTRAST); + break; + + case SPI_GETANIMATION: + cbSize = sizeof(ANIMATIONINFO); + break; + + case SPI_GETDEFAULTINPUTLANG: + cbSize = sizeof(HKL); + break; + +#if(WINVER >= 0x0600) + case SPI_GETAUDIODESCRIPTION: + cbSize = sizeof(AUDIODESCRIPTION); + break; +#endif + + case SPI_SETMOUSE: + cbSize = 3 * sizeof(INT); + bToUser = FALSE; + break; + + case SPI_SETICONTITLELOGFONT: + cbSize = sizeof(LOGFONTW); + bToUser = FALSE; + break; + + case SPI_SETNONCLIENTMETRICS: + cbSize = sizeof(NONCLIENTMETRICSW); + bToUser = FALSE; + break; + + case SPI_SETMINIMIZEDMETRICS: + cbSize = sizeof(MINIMIZEDMETRICS); + bToUser = FALSE; + break; + + case SPI_SETICONMETRICS: + cbSize = sizeof(ICONMETRICS); + bToUser = FALSE; + break; + + case SPI_SETWORKAREA: + cbSize = sizeof(RECTL); + bToUser = FALSE; + break; + + case SPI_SETFILTERKEYS: + cbSize = sizeof(FILTERKEYS); + bToUser = FALSE; + break; + + case SPI_SETTOGGLEKEYS: + cbSize = sizeof(TOGGLEKEYS); + bToUser = FALSE; + break; + + case SPI_SETMOUSEKEYS: + cbSize = sizeof(MOUSEKEYS); + bToUser = FALSE; + break; + + case SPI_SETSTICKYKEYS: + cbSize = sizeof(STICKYKEYS); + bToUser = FALSE; + break; + + case SPI_SETACCESSTIMEOUT: + cbSize = sizeof(ACCESSTIMEOUT); + bToUser = FALSE; + break; + + case SPI_SETSERIALKEYS: + cbSize = sizeof(SERIALKEYS); + bToUser = FALSE; + break; + + case SPI_SETSOUNDSENTRY: + cbSize = sizeof(SOUNDSENTRY); + bToUser = FALSE; + break; + + case SPI_SETHIGHCONTRAST: + cbSize = sizeof(HIGHCONTRAST); + bToUser = FALSE; + break; + + case SPI_SETANIMATION: + cbSize = sizeof(ANIMATIONINFO); + bToUser = FALSE; + break; + + case SPI_SETDEFAULTINPUTLANG: + cbSize = sizeof(HKL); + bToUser = FALSE; + break; + + case SPI_SETMOUSESPEED: + cbSize = sizeof(INT); + bToUser = FALSE; + break; + } + + if (cbSize) + { + _SEH2_TRY + { + if (bToUser) + { + ProbeForWrite(pvParam, cbSize, sizeof(UCHAR)); + } + else + { + ProbeForRead(pvParam, cbSize, sizeof(UCHAR)); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return FALSE); + } + _SEH2_END; + } + + return TRUE; +} + BOOL FASTCALL UserSystemParametersInfo( @@ -1739,6 +2069,12 @@ ERR("UserSystemParametersInfo called without active window station.\n"); //ASSERT(FALSE); //return FALSE; + } + + if ((fWinIni & SPIF_PROTECT) && !SpiGetSetProbeBuffer(uiAction, uiParam, pvParam)) + { + EngSetLastError(ERROR_NOACCESS); + return FALSE; } /* Do the actual operation */ Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… ============================================================================== --- trunk/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c [iso-8859-1] Fri Sep 9 20:44:34 2016 @@ -742,9 +742,9 @@ NONCLIENTMETRICSW metrics; metrics.cbSize = sizeof(NONCLIENTMETRICSW); - TEST(NtUserSystemParametersInfo(SPI_GETMINIMIZEDMETRICS, sizeof(NONCLIENTMETRICSW), &metrics, 0) == 1); - TEST(NtUserSystemParametersInfo(SPI_GETMINIMIZEDMETRICS, sizeof(NONCLIENTMETRICSW) + 1, &metrics, 0) == 0); - TEST(NtUserSystemParametersInfo(SPI_GETMINIMIZEDMETRICS, sizeof(NONCLIENTMETRICSW), (PVOID)0xdeadbeef, 0) == 0); + TEST(NtUserSystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW), &metrics, 0) == 1); + TEST(NtUserSystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW) + 1, &metrics, 0) == 0); + TEST(NtUserSystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW), (PVOID)0xdeadbeef, 0) == 0); } void @@ -753,20 +753,20 @@ MINIMIZEDMETRICS metrics; metrics.cbSize = sizeof(MINIMIZEDMETRICS); - TEST(NtUserSystemParametersInfo(SPI_GETICONMETRICS, sizeof(MINIMIZEDMETRICS), (PVOID)&metrics, 0) == 1); - TEST(NtUserSystemParametersInfo(SPI_GETICONMETRICS, sizeof(MINIMIZEDMETRICS) + 1, (PVOID)&metrics, 0) == 0); - TEST(NtUserSystemParametersInfo(SPI_GETICONMETRICS, sizeof(MINIMIZEDMETRICS), (PVOID)0xdeadbeef, 0) == 0); + TEST(NtUserSystemParametersInfo(SPI_GETMINIMIZEDMETRICS, sizeof(MINIMIZEDMETRICS), (PVOID)&metrics, 0) == 1); + TEST(NtUserSystemParametersInfo(SPI_GETMINIMIZEDMETRICS, sizeof(MINIMIZEDMETRICS) + 1, (PVOID)&metrics, 0) == 0); + TEST(NtUserSystemParametersInfo(SPI_GETMINIMIZEDMETRICS, sizeof(MINIMIZEDMETRICS), (PVOID)0xdeadbeef, 0) == 0); } void Test_SPI_SETICONMETRICS(void) { - ICONMETRICS metrics; - - metrics.cbSize = sizeof(ICONMETRICS); - TEST(NtUserSystemParametersInfo(SPI_GETICONMETRICS, sizeof(ICONMETRICS), (PVOID)&metrics, 0) == 1); - TEST(NtUserSystemParametersInfo(SPI_GETICONMETRICS, sizeof(ICONMETRICS) + 1, (PVOID)&metrics, 0) == 0); - TEST(NtUserSystemParametersInfo(SPI_GETICONMETRICS, sizeof(ICONMETRICS), (PVOID)0xdeadbeef, 0) == 0); + ICONMETRICSW metrics; + + metrics.cbSize = sizeof(ICONMETRICSW); + TEST(NtUserSystemParametersInfo(SPI_GETICONMETRICS, sizeof(ICONMETRICSW), (PVOID)&metrics, 0) == 1); + TEST(NtUserSystemParametersInfo(SPI_GETICONMETRICS, sizeof(ICONMETRICSW) + 1, (PVOID)&metrics, 0) == 0); + TEST(NtUserSystemParametersInfo(SPI_GETICONMETRICS, sizeof(ICONMETRICSW), (PVOID)0xdeadbeef, 0) == 0); } void

1 0

[dchapyshev] 72635: [WIN32NT_APITEST] - Add some tests for NtUserSystemParametersInfo
by dchapyshev＠svn.reactos.org 09 Sep '16

09 Sep '16

Author: dchapyshev Date: Fri Sep 9 20:27:31 2016 New Revision: 72635 URL: http://svn.reactos.org/svn/reactos?rev=72635&view=rev Log: [WIN32NT_APITEST] - Add some tests for NtUserSystemParametersInfo Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… ============================================================================== --- trunk/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c [iso-8859-1] Fri Sep 9 20:27:31 2016 @@ -739,19 +739,34 @@ void Test_SPI_SETNONCLIENTMETRICS(void) { - + NONCLIENTMETRICSW metrics; + + metrics.cbSize = sizeof(NONCLIENTMETRICSW); + TEST(NtUserSystemParametersInfo(SPI_GETMINIMIZEDMETRICS, sizeof(NONCLIENTMETRICSW), &metrics, 0) == 1); + TEST(NtUserSystemParametersInfo(SPI_GETMINIMIZEDMETRICS, sizeof(NONCLIENTMETRICSW) + 1, &metrics, 0) == 0); + TEST(NtUserSystemParametersInfo(SPI_GETMINIMIZEDMETRICS, sizeof(NONCLIENTMETRICSW), (PVOID)0xdeadbeef, 0) == 0); } void Test_SPI_SETMINIMIZEDMETRICS(void) { - + MINIMIZEDMETRICS metrics; + + metrics.cbSize = sizeof(MINIMIZEDMETRICS); + TEST(NtUserSystemParametersInfo(SPI_GETICONMETRICS, sizeof(MINIMIZEDMETRICS), (PVOID)&metrics, 0) == 1); + TEST(NtUserSystemParametersInfo(SPI_GETICONMETRICS, sizeof(MINIMIZEDMETRICS) + 1, (PVOID)&metrics, 0) == 0); + TEST(NtUserSystemParametersInfo(SPI_GETICONMETRICS, sizeof(MINIMIZEDMETRICS), (PVOID)0xdeadbeef, 0) == 0); } void Test_SPI_SETICONMETRICS(void) { - + ICONMETRICS metrics; + + metrics.cbSize = sizeof(ICONMETRICS); + TEST(NtUserSystemParametersInfo(SPI_GETICONMETRICS, sizeof(ICONMETRICS), (PVOID)&metrics, 0) == 1); + TEST(NtUserSystemParametersInfo(SPI_GETICONMETRICS, sizeof(ICONMETRICS) + 1, (PVOID)&metrics, 0) == 0); + TEST(NtUserSystemParametersInfo(SPI_GETICONMETRICS, sizeof(ICONMETRICS), (PVOID)0xdeadbeef, 0) == 0); } void

1 0

[cwittich] 72634: [CRT] add #ifdef for easier syncing
by cwittich＠svn.reactos.org 09 Sep '16

09 Sep '16

Author: cwittich Date: Fri Sep 9 17:40:53 2016 New Revision: 72634 URL: http://svn.reactos.org/svn/reactos?rev=72634&view=rev Log: [CRT] add #ifdef for easier syncing Modified: trunk/reactos/sdk/lib/crt/string/strtoi64.c Modified: trunk/reactos/sdk/lib/crt/string/strtoi64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/string/strtoi6… ============================================================================== --- trunk/reactos/sdk/lib/crt/string/strtoi64.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/string/strtoi64.c [iso-8859-1] Fri Sep 9 17:40:53 2016 @@ -18,6 +18,9 @@ TRACE("(%s %p %d %p)\n", debugstr_a(nptr), endptr, base, locale); #endif +#ifndef __REACTOS__ + if (!MSVCRT_CHECK_PMT(nptr != NULL)) return 0; +#endif if (!MSVCRT_CHECK_PMT(base == 0 || base >= 2)) return 0; if (!MSVCRT_CHECK_PMT(base <= 36)) return 0;

1 0

[cwittich] 72633: [CRT] sync strxfrm.c to wine-1.9.16
by cwittich＠svn.reactos.org 09 Sep '16

09 Sep '16

Author: cwittich Date: Fri Sep 9 17:22:29 2016 New Revision: 72633 URL: http://svn.reactos.org/svn/reactos?rev=72633&view=rev Log: [CRT] sync strxfrm.c to wine-1.9.16 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/sdk/lib/crt/string/strxfrm.c Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Sep 9 17:22:29 2016 @@ -297,6 +297,7 @@ reactos/sdk/lib/crt/string/strtok.c # Synced to WineStaging-1.9.16 reactos/sdk/lib/crt/string/strtok_s.c # Synced to WineStaging-1.9.16 reactos/sdk/lib/crt/string/strtoul.c # Synced to WineStaging-1.9.9 + reactos/sdk/lib/crt/string/strxfrm.c # Synced to Wine-1.9.16 reactos/sdk/lib/crt/string/wcs.c # Synced at 20080611 reactos/sdk/lib/crt/string/wctype.c # Synced at WineStaging-1.9.16 reactos/sdk/lib/crt/wine/heap.c # Synced at 20080529 Modified: trunk/reactos/sdk/lib/crt/string/strxfrm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/string/strxfrm… ============================================================================== --- trunk/reactos/sdk/lib/crt/string/strxfrm.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/string/strxfrm.c [iso-8859-1] Fri Sep 9 17:22:29 2016 @@ -1,33 +1,55 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/sdk/crt/string/strxfrm.c - * PURPOSE: Unknown - * PROGRAMER: Unknown - * UPDATE HISTORY: - * 25/11/05: Added license header - */ - #include <precomp.h> -#if 1 -/* - * @implemented +#include <locale.h> +#include <internal/wine/msvcrt.h> + +size_t CDECL _strxfrm_l( char *dest, const char *src, + size_t len, _locale_t locale ) +{ + MSVCRT_pthreadlocinfo locinfo; + int ret; + + if(!MSVCRT_CHECK_PMT(src)) return INT_MAX; + if(!MSVCRT_CHECK_PMT(dest || !len)) return INT_MAX; + + if(len > INT_MAX) { + FIXME("len > INT_MAX not supported\n"); + len = INT_MAX; + } + + if(!locale) + locinfo = get_locinfo(); + else + locinfo = ((MSVCRT__locale_t)locale)->locinfo; + + if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) { + strncpy(dest, src, len); + return strlen(src); + } + + ret = LCMapStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], + LCMAP_SORTKEY, src, -1, NULL, 0); + if(!ret) { + if(len) dest[0] = 0; + *_errno() = EILSEQ; + return INT_MAX; + } + if(!len) return ret-1; + + if(ret > len) { + dest[0] = 0; + *_errno() = ERANGE; + return ret-1; + } + + return LCMapStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], + LCMAP_SORTKEY, src, -1, dest, len) - 1; +} + +/********************************************************************* + * strxfrm (MSVCRT.@) */ -size_t strxfrm( char *dest, const char *src, size_t n ) +size_t CDECL strxfrm( char *dest, const char *src, size_t len ) { - strncpy(dest, src, n); - return strnlen(src, n); + return _strxfrm_l(dest, src, len, NULL); } -#else -size_t strxfrm( char *dest, const char *src, size_t n ) -{ - int ret = LCMapStringA(LOCALE_USER_DEFAULT,LCMAP_LOWERCASE, - src, strlen(src), dest, strlen(dest)); - - if ( ret == 0 ) - return -1; - return ret; - -} -#endif

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs