Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 57404: [CRT] Implement _mbsnlen, _mbstrnlen
by tkreuzer＠svn.reactos.org 27 Sep '12

27 Sep '12

Author: tkreuzer Date: Thu Sep 27 21:53:25 2012 New Revision: 57404 URL: http://svn.reactos.org/svn/reactos?rev=57404&view=rev Log: [CRT] Implement _mbsnlen, _mbstrnlen Added: trunk/reactos/lib/sdk/crt/string/_mbsnlen.c (with props) trunk/reactos/lib/sdk/crt/string/_mbstrnlen.c (with props) Added: trunk/reactos/lib/sdk/crt/string/_mbsnlen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/_mbsnle… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/_mbsnlen.c (added) +++ trunk/reactos/lib/sdk/crt/string/_mbsnlen.c [iso-8859-1] Thu Sep 27 21:53:25 2012 @@ -1,0 +1,36 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT + * PURPOSE: Implementation of _mbsnlen + * FILE: lib/sdk/crt/string/_mbsnlen.c + * PROGRAMMER: Timo Kreuzer + */ + +#include <mbstring.h> + +_Check_return_ +_CRTIMP +size_t +__cdecl +_mbsnlen( + _In_z_ const unsigned char *pmbstr, + _In_ size_t cjMaxLen) +{ + size_t cchCount = 0; + unsigned char jMbsByte; + + /* Loop while we have bytes to process */ + while (cjMaxLen-- > 0) + { + /* Get next mb byte */ + jMbsByte = *pmbstr++; + + /* If this is 0, we're done */ + if (jMbsByte == 0) break; + + /* Don't count lead bytes */ + if (!_ismbblead(jMbsByte)) cchCount++; + } + + return cchCount; +} Propchange: trunk/reactos/lib/sdk/crt/string/_mbsnlen.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/string/_mbstrnlen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/_mbstrn… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/_mbstrnlen.c (added) +++ trunk/reactos/lib/sdk/crt/string/_mbstrnlen.c [iso-8859-1] Thu Sep 27 21:53:25 2012 @@ -1,0 +1,53 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT + * PURPOSE: Implementation of _mbstrnlen + * FILE: lib/sdk/crt/string/_mbstrnlen.c + * PROGRAMMER: Timo Kreuzer + */ + +#include <precomp.h> +#include <mbctype.h> +#include <specstrings.h> + +_Check_return_ +_CRTIMP +size_t +__cdecl +_mbstrnlen( + _In_z_ const char *pmbstr, + _In_ size_t cjMaxLen) +{ + size_t cchCount = 0; + unsigned char jMbsByte; + + /* Check parameters */ + if (!MSVCRT_CHECK_PMT((pmbstr != 0)) && (cjMaxLen <= INT_MAX)) + { + _set_errno(EINVAL); + return -1; + } + + /* Loop while we have bytes to process */ + while (cjMaxLen-- > 0) + { + /* Get next mb byte */ + jMbsByte = *pmbstr++; + + /* If this is 0, we're done */ + if (jMbsByte == 0) break; + + /* if this is a lead byte, continue with next char */ + if (_ismbblead(jMbsByte)) + { + // FIXME: check if this is a valid char. + continue; + } + + /* Count this character */ + cchCount++; + } + + return cchCount; +} + Propchange: trunk/reactos/lib/sdk/crt/string/_mbstrnlen.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 57403: [CRT_APITEST] - Add tests for wcstombs_s - Improve tests for mbstowcs_s
by tkreuzer＠svn.reactos.org 27 Sep '12

27 Sep '12

Author: tkreuzer Date: Thu Sep 27 21:46:39 2012 New Revision: 57403 URL: http://svn.reactos.org/svn/reactos?rev=57403&view=rev Log: [CRT_APITEST] - Add tests for wcstombs_s - Improve tests for mbstowcs_s Added: trunk/rostests/apitests/crt/wcstombs_s.c (with props) Modified: trunk/rostests/apitests/crt/mbstowcs_s.c trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake trunk/rostests/apitests/crt/testlist.c Modified: trunk/rostests/apitests/crt/mbstowcs_s.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/mbstowcs_s.c… ============================================================================== --- trunk/rostests/apitests/crt/mbstowcs_s.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/mbstowcs_s.c [iso-8859-1] Thu Sep 27 21:46:39 2012 @@ -11,141 +11,18 @@ #include <specstrings.h> #define ok_errno(x) ok_hex(errno, (x)) +#define ok_wchar(x,y) ok_int(x,y) errno_t mbstowcs_s( - size_t *returnval, + size_t *cchConverted, wchar_t *widechar, size_t charoutct, const char *multibyte, size_t count); -void -_invalid_parameter( - const wchar_t * expression, - const wchar_t * function, - const wchar_t * file, - unsigned int line, - uintptr_t pReserved); - -void -_invalid_parameterA( - const char * expression, - const char * function, - const char * file, - unsigned int line, - uintptr_t pReserved) -{ - // call _invalid_parameter -} - #define MSVCRT_INVALID_PMT(x) _invalid_parameterA(#x, __FUNCTION__, __FILE__, __LINE__, 0) #define MSVCRT_CHECK_PMT(x) ((x) || (MSVCRT_INVALID_PMT(x),0)) - -#define _mbsnlen strnlen - -errno_t -mbstowcs_s( - _Out_opt_ size_t *pReturnValue, - _Out_ wchar_t *pwcstr, - _In_ size_t sizeInWords, - _In_ const char *pmbstr, - _In_ size_t count) -{ - size_t cchMax, cwcWritten; - errno_t retval = 0; - - if (!MSVCRT_CHECK_PMT( ((sizeInWords != 0) && (pwcstr != 0)) || - ((sizeInWords == 0) && (pwcstr == 0)) )) - { - _set_errno(EINVAL); - return EINVAL; - } - - /* Check if we have a return value pointer */ - if (pReturnValue) - { - /* Default to 0 bytes written */ - *pReturnValue = 0; - } - - if (!MSVCRT_CHECK_PMT((count == 0) || (pmbstr != 0))) - { - _set_errno(EINVAL); - return EINVAL; - } - - /* Check if there is anything to do */ - if ((pwcstr == 0) && (pmbstr == 0)) - { - _set_errno(EINVAL); - return EINVAL; - } - - /* Check if we have a source string */ - if (pmbstr) - { - /* Check if we also have a wchar buffer */ - if (pwcstr) - { - /* Calculate the maximum the we can write */ - cchMax = (count < sizeInWords) ? count + 1 : sizeInWords; - - /* Now do the conversion */ - cwcWritten = mbstowcs(pwcstr, pmbstr, cchMax); - - /* Check if the buffer was not zero terminated */ - if (cwcWritten == cchMax) - { - /* Check if we reached the max size of the dest buffer */ - if (cwcWritten == sizeInWords) - { - /* Does the caller allow this? */ - if (count != _TRUNCATE) - { - /* Not allowed, truncate to 0 length */ - pwcstr[0] = L'\0'; - - /* Return error */ - _set_errno(ERANGE); - return ERANGE; - } - - /* Inform the caller about truncation */ - retval = STRUNCATE; - } - - /* zero teminate the buffer */ - pwcstr[cwcWritten - 1] = L'\0'; - } - else - { - /* The buffer is zero terminated, count the terminating char */ - cwcWritten++; - } - } - else - { - /* Get the length of the string, plus 0 terminator */ - cwcWritten = _mbsnlen(pmbstr, count) + 1; - } - } - else - { - cwcWritten = count + 1; - } - - /* Check if we have a return value pointer */ - if (pReturnValue) - { - /* Default to 0 bytes written */ - *pReturnValue = cwcWritten; - } - - return retval; -} - - wchar_t g_expression[64]; wchar_t g_function[64]; @@ -173,64 +50,64 @@ // _set_invalid_parameter_handler(_test_invalid_parameter); errno_t ret; - size_t returnval; + size_t cchConverted; wchar_t widechar[10]; -#if 1 - _set_errno(0); - returnval = 0xf00bac; + + _set_errno(0); + cchConverted = 0xf00bac; widechar[5] = 0xFF; - ret = mbstowcs_s(&returnval, widechar, 6, "hallo", 5); - ok_long(ret, 0); - ok_size_t(returnval, 6); - ok_char(widechar[5], 0); + ret = mbstowcs_s(&cchConverted, widechar, 6, "hallo", 5); + ok_long(ret, 0); + ok_size_t(cchConverted, 6); + ok_wchar(widechar[5], 0); ok_wstr(widechar, L"hallo"); ok_errno(0); _set_errno(0); - returnval = 0xf00bac; + cchConverted = 0xf00bac; widechar[0] = 0xFF; - ret = mbstowcs_s(&returnval, widechar, 1, "", 0); - ok_long(ret, 0); - ok_size_t(returnval, 1); - ok_char(widechar[0], 0); - ok_errno(0); - - _set_errno(0); - returnval = 0xf00bac; + ret = mbstowcs_s(&cchConverted, widechar, 1, "", 0); + ok_long(ret, 0); + ok_size_t(cchConverted, 1); + ok_wchar(widechar[0], 0); + ok_errno(0); + + _set_errno(0); + cchConverted = 0xf00bac; widechar[0] = 0xFF; widechar[1] = 0xFF; widechar[2] = 0xFF; widechar[3] = 0xFF; widechar[4] = 0xFF; widechar[5] = 0xFF; - ret = mbstowcs_s(&returnval, widechar, 5, "hallo", 5); + ret = mbstowcs_s(&cchConverted, widechar, 5, "hallo", 5); ok_long(ret, ERANGE); - ok_size_t(returnval, 0); - ok_char(widechar[5], 0xFF); - ok_char(widechar[4], L'o'); - ok_char(widechar[3], L'l'); - ok_char(widechar[2], L'l'); - ok_char(widechar[1], L'a'); - ok_char(widechar[0], 0); + ok_size_t(cchConverted, 0); + ok_wchar(widechar[5], 0xFF); + ok_wchar(widechar[4], L'o'); + ok_wchar(widechar[3], L'l'); + ok_wchar(widechar[2], L'l'); + ok_wchar(widechar[1], L'a'); + ok_wchar(widechar[0], 0); ok_errno(ERANGE); _set_errno(0); - returnval = 0xf00bac; + cchConverted = 0xf00bac; widechar[0] = 0xFF; widechar[1] = 0xFF; widechar[2] = 0xFF; widechar[3] = 0xFF; widechar[4] = 0xFF; widechar[5] = 0xFF; - ret = mbstowcs_s(&returnval, widechar, 3, "hallo", 5); + ret = mbstowcs_s(&cchConverted, widechar, 3, "hallo", 5); ok_long(ret, ERANGE); - ok_size_t(returnval, 0); - ok_char(widechar[5], 0xFF); - ok_char(widechar[4], 0xFF); - ok_char(widechar[3], 0xFF); - ok_char(widechar[2], L'l'); - ok_char(widechar[1], L'a'); - ok_char(widechar[0], 0); + ok_size_t(cchConverted, 0); + ok_wchar(widechar[5], 0xFF); + ok_wchar(widechar[4], 0xFF); + ok_wchar(widechar[3], 0xFF); + ok_wchar(widechar[2], L'l'); + ok_wchar(widechar[1], L'a'); + ok_wchar(widechar[0], 0); ok_errno(ERANGE); _set_errno(0); @@ -239,17 +116,17 @@ ok_errno(EINVAL); _set_errno(0); - returnval = 0xf00bac; - ret = mbstowcs_s(&returnval, 0, 0, 0, 0); - ok_long(ret, EINVAL); - ok_size_t(returnval, 0); + cchConverted = 0xf00bac; + ret = mbstowcs_s(&cchConverted, 0, 0, 0, 0); + ok_long(ret, EINVAL); + ok_size_t(cchConverted, 0); ok_errno(EINVAL); _set_errno(0); widechar[0] = L'x'; ret = mbstowcs_s(0, widechar, 0, 0, 0); ok_long(ret, EINVAL); - ok_char(widechar[0], L'x'); + ok_wchar(widechar[0], L'x'); ok_errno(EINVAL); _set_errno(0); @@ -263,98 +140,96 @@ ok_errno(EINVAL); _set_errno(0); - returnval = 0xf00bac; - ret = mbstowcs_s(&returnval, 0, 10, "hallo", 5); - ok_long(ret, EINVAL); - ok_size_t(returnval, 0xf00bac); - ok_errno(EINVAL); - - _set_errno(0); - returnval = 0xf00bac; - ret = mbstowcs_s(&returnval, 0, 0, "hallo", 5); - ok_long(ret, 0); - ok_size_t(returnval, 6); - ok_errno(0); - - _set_errno(0); - returnval = 0xf00bac; - ret = mbstowcs_s(&returnval, widechar, 10, 0, 5); - ok_long(ret, EINVAL); - ok_size_t(returnval, 0); - ok_errno(EINVAL); - - _set_errno(0); - returnval = 0xf00bac; - ret = mbstowcs_s(&returnval, widechar, 10, "hallo", 0); - ok_long(ret, 0); - ok_size_t(returnval, 1); - ok_errno(0); -#endif - _set_errno(0); - returnval = 0xf00bac; + cchConverted = 0xf00bac; + ret = mbstowcs_s(&cchConverted, 0, 10, "hallo", 5); + ok_long(ret, EINVAL); + ok_size_t(cchConverted, 0xf00bac); + ok_errno(EINVAL); + + _set_errno(0); + cchConverted = 0xf00bac; + ret = mbstowcs_s(&cchConverted, 0, 0, "hallo", 5); + ok_long(ret, 0); + ok_size_t(cchConverted, 6); + ok_errno(0); + + _set_errno(0); + cchConverted = 0xf00bac; + ret = mbstowcs_s(&cchConverted, widechar, 10, 0, 5); + ok_long(ret, EINVAL); + ok_size_t(cchConverted, 0); + ok_errno(EINVAL); + + _set_errno(0); + cchConverted = 0xf00bac; + ret = mbstowcs_s(&cchConverted, widechar, 10, "hallo", 0); + ok_long(ret, 0); + ok_size_t(cchConverted, 1); + ok_errno(0); + + _set_errno(0); + cchConverted = 0xf00bac; widechar[0] = 0xABCD; widechar[1] = 0xABCD; widechar[2] = 0xABCD; widechar[3] = 0xABCD; widechar[4] = 0xABCD; widechar[5] = 0xABCD; - ret = mbstowcs_s(&returnval, widechar, 10, "hallo", 2); - ok_long(ret, 0); - ok_size_t(returnval, 3); - ok_char(widechar[5], 0xABCD); - ok_char(widechar[4], 0xABCD); - ok_char(widechar[3], 0xABCD); - ok_char(widechar[2], 0); - ok_char(widechar[1], L'a'); - ok_char(widechar[0], L'h'); - ok_errno(0); -#if 1 - _set_errno(0); - returnval = 0xf00bac; - ret = mbstowcs_s(&returnval, widechar, 10, 0, 0); - ok_long(ret, 0); - ok_size_t(returnval, 1); - ok_errno(0); - - _set_errno(0); - returnval = 0xf00bac; - ret = mbstowcs_s(&returnval, widechar, 10, "hallo", 7); - ok_long(ret, 0); - ok_size_t(returnval, 6); - ok_errno(0); - - _set_errno(0); - returnval = 0xf00bac; - ret = mbstowcs_s(&returnval, 0, 0, "hallo", 7); - ok_long(ret, 0); - ok_size_t(returnval, 6); - ok_errno(0); - - _set_errno(0); - returnval = 0xf00bac; + ret = mbstowcs_s(&cchConverted, widechar, 10, "hallo", 2); + ok_long(ret, 0); + ok_size_t(cchConverted, 3); + ok_wchar(widechar[5], 0xABCD); + ok_wchar(widechar[4], 0xABCD); + ok_wchar(widechar[3], 0xABCD); + ok_wchar(widechar[2], 0); + ok_wchar(widechar[1], L'a'); + ok_wchar(widechar[0], L'h'); + ok_errno(0); + + _set_errno(0); + cchConverted = 0xf00bac; + ret = mbstowcs_s(&cchConverted, widechar, 10, 0, 0); + ok_long(ret, 0); + ok_size_t(cchConverted, 1); + ok_errno(0); + + _set_errno(0); + cchConverted = 0xf00bac; + ret = mbstowcs_s(&cchConverted, widechar, 10, "hallo", 7); + ok_long(ret, 0); + ok_size_t(cchConverted, 6); + ok_errno(0); + + _set_errno(0); + cchConverted = 0xf00bac; + ret = mbstowcs_s(&cchConverted, 0, 0, "hallo", 7); + ok_long(ret, 0); + ok_size_t(cchConverted, 6); + ok_errno(0); + + _set_errno(0); + cchConverted = 0xf00bac; widechar[0] = 0xABCD; widechar[1] = 0xABCD; widechar[2] = 0xABCD; widechar[3] = 0xABCD; widechar[4] = 0xABCD; widechar[5] = 0xABCD; - ret = mbstowcs_s(&returnval, widechar, 5, "hallo", _TRUNCATE); + ret = mbstowcs_s(&cchConverted, widechar, 5, "hallo", _TRUNCATE); ok_long(ret, STRUNCATE); - ok_size_t(returnval, 5); - ok_char(widechar[5], 0xABCD); - ok_char(widechar[4], 0); - ok_char(widechar[3], L'l'); - ok_char(widechar[2], L'l'); - ok_char(widechar[1], L'a'); - ok_char(widechar[0], L'h'); - ok_errno(0); - - _set_errno(0); - returnval = 0xf00bac; - ret = mbstowcs_s(&returnval, widechar, 10, "hallo", -1); - ok_long(ret, 0); - ok_size_t(returnval, 6); - ok_errno(0); -#endif - + ok_size_t(cchConverted, 5); + ok_wchar(widechar[5], 0xABCD); + ok_wchar(widechar[4], 0); + ok_wchar(widechar[3], L'l'); + ok_wchar(widechar[2], L'l'); + ok_wchar(widechar[1], L'a'); + ok_wchar(widechar[0], L'h'); + ok_errno(0); + + _set_errno(0); + cchConverted = 0xf00bac; + ret = mbstowcs_s(&cchConverted, widechar, 10, "hallo", -1); + ok_long(ret, 0); + ok_size_t(cchConverted, 6); + ok_errno(0); } Modified: trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/msvcrt_crt_a… ============================================================================== --- trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] Thu Sep 27 21:46:39 2012 @@ -1251,7 +1251,7 @@ # wcstok_s.c # wcstol.c # wcstombs.c -# wcstombs_s.c + wcstombs_s.c # wcstoul.c # wcsxfrm.c # wctob Modified: trunk/rostests/apitests/crt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/testlist.c?r… ============================================================================== --- trunk/rostests/apitests/crt/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/testlist.c [iso-8859-1] Thu Sep 27 21:46:39 2012 @@ -7,6 +7,7 @@ #if defined(TEST_MSVCRT) extern void func_mbstowcs_s(void); +extern void func_wcstombs_s(void); extern void func__vscprintf(void); extern void func__vscwprintf(void); #endif @@ -33,6 +34,7 @@ #if defined(TEST_STATIC_CRT) #elif defined(TEST_MSVCRT) { "mbstowcs_s", func_mbstowcs_s }, + { "wcstombs_s", func_wcstombs_s }, { "_vscprintf", func__vscprintf }, { "_vscwprintf", func__vscwprintf }, #elif defined(TEST_NTDLL) Added: trunk/rostests/apitests/crt/wcstombs_s.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/wcstombs_s.c… ============================================================================== --- trunk/rostests/apitests/crt/wcstombs_s.c (added) +++ trunk/rostests/apitests/crt/wcstombs_s.c [iso-8859-1] Thu Sep 27 21:46:39 2012 @@ -1,0 +1,218 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for wcstombs_s + */ + +#define WIN32_NO_STATUS +#include <stdio.h> +#include <stdlib.h> +#include <wine/test.h> +#include <specstrings.h> + +#define ok_errno(x) ok_hex(errno, (x)) + +#undef ok_char +#define ok_char(x,y) ok_int((unsigned)(unsigned char)(x),(unsigned)(unsigned char)(y)) +#define ok_wchar(x,y) ok_int((unsigned)(unsigned short)(x),(unsigned)(unsigned short)(y)) + +_Check_return_wat_ +_CRTIMP +errno_t +__cdecl +wcstombs_s( + _Out_opt_ size_t * pcchConverted, + _Out_writes_bytes_to_opt_(cjDstSize, *pcchConverted) + char * pmbsDst, + _In_ size_t cjDstSize, + _In_z_ const wchar_t * pwszSrc, + _In_ size_t cjMaxCount); + + +START_TEST(wcstombs_s) +{ + errno_t ret; + size_t cchConverted; + char mbsbuffer[10]; + + _set_errno(0); + cchConverted = 0xf00bac; + mbsbuffer[5] = 0xFF; + ret = wcstombs_s(&cchConverted, mbsbuffer, 6, L"hallo", 5); + ok_long(ret, 0); + ok_size_t(cchConverted, 6); + ok_char(mbsbuffer[5], 0); + ok_str(mbsbuffer, "hallo"); + ok_errno(0); + + _set_errno(0); + cchConverted = 0xf00bac; + mbsbuffer[0] = 0xFF; + ret = wcstombs_s(&cchConverted, mbsbuffer, 1, L"", 0); + ok_long(ret, 0); + ok_size_t(cchConverted, 1); + ok_wchar(mbsbuffer[0], 0); + ok_errno(0); + + _set_errno(0); + cchConverted = 0xf00bac; + mbsbuffer[0] = 0xFF; + mbsbuffer[1] = 0xFF; + mbsbuffer[2] = 0xFF; + mbsbuffer[3] = 0xFF; + mbsbuffer[4] = 0xFF; + mbsbuffer[5] = 0xFF; + ret = wcstombs_s(&cchConverted, mbsbuffer, 5, L"hallo", 5); + ok_long(ret, ERANGE); + ok_size_t(cchConverted, 0); + ok_char(mbsbuffer[5], 0xFF); + ok_char(mbsbuffer[4], L'o'); + ok_char(mbsbuffer[3], L'l'); + ok_char(mbsbuffer[2], L'l'); + ok_char(mbsbuffer[1], L'a'); + ok_char(mbsbuffer[0], 0); + ok_errno(ERANGE); + + _set_errno(0); + cchConverted = 0xf00bac; + mbsbuffer[0] = 0xFF; + mbsbuffer[1] = 0xFF; + mbsbuffer[2] = 0xFF; + mbsbuffer[3] = 0xFF; + mbsbuffer[4] = 0xFF; + mbsbuffer[5] = 0xFF; + ret = wcstombs_s(&cchConverted, mbsbuffer, 3, L"hallo", 5); + ok_long(ret, ERANGE); + ok_size_t(cchConverted, 0); + ok_char(mbsbuffer[5], 0xFF); + ok_char(mbsbuffer[4], 0xFF); + ok_char(mbsbuffer[3], 0xFF); + ok_char(mbsbuffer[2], L'l'); + ok_char(mbsbuffer[1], L'a'); + ok_char(mbsbuffer[0], 0); + ok_errno(ERANGE); + + _set_errno(0); + ret = wcstombs_s(0, 0, 0, 0, 0); + ok_long(ret, EINVAL); + ok_errno(EINVAL); + + _set_errno(0); + cchConverted = 0xf00bac; + ret = wcstombs_s(&cchConverted, 0, 0, 0, 0); + ok_long(ret, EINVAL); + ok_size_t(cchConverted, 0); + ok_errno(EINVAL); + + _set_errno(0); + mbsbuffer[0] = L'x'; + ret = wcstombs_s(0, mbsbuffer, 0, 0, 0); + ok_long(ret, EINVAL); + ok_char(mbsbuffer[0], L'x'); + ok_errno(EINVAL); + + _set_errno(0); + ret = wcstombs_s(0, mbsbuffer, 10, L"hallo", 5); + ok_long(ret, 0); + ok_errno(0); + + _set_errno(0); + ret = wcstombs_s(0, mbsbuffer, 0, L"hallo", 5); + ok_long(ret, EINVAL); + ok_errno(EINVAL); + + _set_errno(0); + cchConverted = 0xf00bac; + ret = wcstombs_s(&cchConverted, 0, 10, L"hallo", 5); + ok_long(ret, EINVAL); + ok_size_t(cchConverted, 0xf00bac); + ok_errno(EINVAL); + + _set_errno(0); + cchConverted = 0xf00bac; + ret = wcstombs_s(&cchConverted, 0, 0, L"hallo", 5); + ok_long(ret, 0); + ok_size_t(cchConverted, 6); + ok_errno(0); + + _set_errno(0); + cchConverted = 0xf00bac; + ret = wcstombs_s(&cchConverted, mbsbuffer, 10, 0, 5); + ok_long(ret, EINVAL); + ok_size_t(cchConverted, 0); + ok_errno(EINVAL); + + _set_errno(0); + cchConverted = 0xf00bac; + ret = wcstombs_s(&cchConverted, mbsbuffer, 10, L"hallo", 0); + ok_long(ret, 0); + ok_size_t(cchConverted, 1); + ok_errno(0); + + _set_errno(0); + cchConverted = 0xf00bac; + mbsbuffer[0] = 0xAB; + mbsbuffer[1] = 0xCD; + mbsbuffer[2] = 0xAB; + mbsbuffer[3] = 0xCD; + mbsbuffer[4] = 0xAB; + mbsbuffer[5] = 0xCD; + ret = wcstombs_s(&cchConverted, mbsbuffer, 10, L"hallo", 2); + ok_long(ret, 0); + ok_size_t(cchConverted, 3); + ok_char(mbsbuffer[5], 0xCD); + ok_char(mbsbuffer[4], 0xAB); + ok_char(mbsbuffer[3], 0xCD); + ok_char(mbsbuffer[2], 0); + ok_char(mbsbuffer[1], L'a'); + ok_char(mbsbuffer[0], L'h'); + ok_errno(0); + + _set_errno(0); + cchConverted = 0xf00bac; + ret = wcstombs_s(&cchConverted, mbsbuffer, 10, 0, 0); + ok_long(ret, 0); + ok_size_t(cchConverted, 1); + ok_errno(0); + + _set_errno(0); + cchConverted = 0xf00bac; + ret = wcstombs_s(&cchConverted, mbsbuffer, 10, L"hallo", 7); + ok_long(ret, 0); + ok_size_t(cchConverted, 6); + ok_errno(0); + + _set_errno(0); + cchConverted = 0xf00bac; + ret = wcstombs_s(&cchConverted, 0, 0, L"hallo", 7); + ok_long(ret, 0); + ok_size_t(cchConverted, 6); + ok_errno(0); + + _set_errno(0); + cchConverted = 0xf00bac; + mbsbuffer[0] = 0xAB; + mbsbuffer[1] = 0xCD; + mbsbuffer[2] = 0xAB; + mbsbuffer[3] = 0xCD; + mbsbuffer[4] = 0xAB; + mbsbuffer[5] = 0xCD; + ret = wcstombs_s(&cchConverted, mbsbuffer, 5, L"hallo", _TRUNCATE); + ok_long(ret, STRUNCATE); + ok_size_t(cchConverted, 5); + ok_char(mbsbuffer[5], 0xCD); + ok_char(mbsbuffer[4], 0); + ok_char(mbsbuffer[3], L'l'); + ok_char(mbsbuffer[2], L'l'); + ok_char(mbsbuffer[1], L'a'); + ok_char(mbsbuffer[0], L'h'); + ok_errno(0); + + _set_errno(0); + cchConverted = 0xf00bac; + ret = wcstombs_s(&cchConverted, mbsbuffer, 10, L"hallo", -1); + ok_long(ret, 0); + ok_size_t(cchConverted, 6); + ok_errno(0); + +} Propchange: trunk/rostests/apitests/crt/wcstombs_s.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 57402: [CSRSS/CSRSRV] - Do not compile anymore the old CSRSS. - Update some headers and resource files. - Add header guards in srv.h
by hbelusca＠svn.reactos.org 27 Sep '12

27 Sep '12

Author: hbelusca Date: Thu Sep 27 18:44:50 2012 New Revision: 57402 URL: http://svn.reactos.org/svn/reactos?rev=57402&view=rev Log: [CSRSS/CSRSRV] - Do not compile anymore the old CSRSS. - Update some headers and resource files. - Add header guards in srv.h Modified: trunk/reactos/subsystems/CMakeLists.txt trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rc trunk/reactos/subsystems/win32/csrss/csrsrv/server.c trunk/reactos/subsystems/win32/csrss/csrsrv/session.c trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h trunk/reactos/subsystems/win32/csrss/csrsrv/wait.c trunk/reactos/subsystems/win32/csrss/csrss.rc Modified: trunk/reactos/subsystems/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/CMakeLists.txt?… ============================================================================== --- trunk/reactos/subsystems/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/CMakeLists.txt [iso-8859-1] Thu Sep 27 18:44:50 2012 @@ -1,5 +1,4 @@ if(ARCH STREQUAL "i386") add_subdirectory(ntvdm) endif() -add_subdirectory(csr) add_subdirectory(win32) Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rc [iso-8859-1] Thu Sep 27 18:44:50 2012 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS CSR Core Server\0" +#define REACTOS_STR_FILE_DESCRIPTION "Client/Server Runtime SubSystem Process\0" #define REACTOS_STR_INTERNAL_NAME "csrsrv\0" #define REACTOS_STR_ORIGINAL_FILENAME "csrsrv.dll\0" #include <reactos/version.rc> Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/server.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/server.c [iso-8859-1] Thu Sep 27 18:44:50 2012 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS CSR Sub System - * FILE: subsys/csr/csrsrv/server.c + * FILE: subsystems/win32/csrss/csrsrv/server.c * PURPOSE: CSR Server DLL Server Functions * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/session.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/session.c [iso-8859-1] Thu Sep 27 18:44:50 2012 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS CSR Sub System - * FILE: subsys/csr/csrsrv/session.c + * FILE: subsystems/win32/csrss/csrsrv/session.c * PURPOSE: CSR Server DLL Session Implementation * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h [iso-8859-1] Thu Sep 27 18:44:50 2012 @@ -1,3 +1,6 @@ +#ifndef _SRV_H +#define _SRV_H + /* PSDK/NDK Headers */ #define NTOS_MODE_USER #include <stdio.h> @@ -35,3 +38,5 @@ /* Defines */ #define ROUND_UP(n, align) ROUND_DOWN(((ULONG)n) + (align) - 1, (align)) #define ROUND_DOWN(n, align) (((ULONG)n) & ~((align) - 1l)) + +#endif Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/wait.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/wait.c [iso-8859-1] Thu Sep 27 18:44:50 2012 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS CSR Sub System - * FILE: subsys/csr/csrsrv/wait.c + * FILE: subsystems/win32/csrss/csrsrv/wait.c * PURPOSE: CSR Server DLL Wait Implementation * PROGRAMMERS: Emanuele Aliberti * Alex Ionescu (alex(a)relsoft.net) Modified: trunk/reactos/subsystems/win32/csrss/csrss.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrss.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrss.rc [iso-8859-1] Thu Sep 27 18:44:50 2012 @@ -1,4 +1,4 @@ -#define REACTOS_STR_FILE_DESCRIPTION "Client/Server Runtime Process\0" -#define REACTOS_STR_INTERNAL_NAME "CSRSs and CSRSrv\0" -#define REACTOS_STR_ORIGINAL_FILENAME "CSRSs.exe and CSRSrv.dll\0" +#define REACTOS_STR_FILE_DESCRIPTION "Client/Server Runtime SubSystem Process\0" +#define REACTOS_STR_INTERNAL_NAME "csrss\0" +#define REACTOS_STR_ORIGINAL_FILENAME "csrss.exe\0" #include <reactos/version.rc>

1 0

[hbelusca] 57401: [BOOTDATA] - Correct the version signature of some inf files. CORE-6549 #comment Committed in rev.57401 #resolved
by hbelusca＠svn.reactos.org 27 Sep '12

27 Sep '12

Author: hbelusca Date: Thu Sep 27 18:18:36 2012 New Revision: 57401 URL: http://svn.reactos.org/svn/reactos?rev=57401&view=rev Log: [BOOTDATA] - Correct the version signature of some inf files. CORE-6549 #comment Committed in rev.57401 #resolved Modified: trunk/reactos/boot/bootdata/hivecls_amd64.inf trunk/reactos/boot/bootdata/hivecls_arm.inf trunk/reactos/boot/bootdata/hivecls_i386.inf trunk/reactos/boot/bootdata/hivedef_amd64.inf trunk/reactos/boot/bootdata/hivedef_arm.inf trunk/reactos/boot/bootdata/hivedef_i386.inf trunk/reactos/boot/bootdata/hivesft_amd64.inf trunk/reactos/boot/bootdata/hivesft_arm.inf trunk/reactos/boot/bootdata/hivesft_i386.inf Modified: trunk/reactos/boot/bootdata/hivecls_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_amd64.inf [iso-8859-1] Thu Sep 27 18:18:36 2012 @@ -1,5 +1,5 @@ [Version] -Signature="$ReactOS$ +Signature="$ReactOS$" [AddReg] HKLM,"SOFTWARE\Classes",,0x00000010 Modified: trunk/reactos/boot/bootdata/hivecls_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_arm.inf [iso-8859-1] Thu Sep 27 18:18:36 2012 @@ -1,5 +1,5 @@ [Version] -Signature="$ReactOS$ +Signature="$ReactOS$" [AddReg] HKLM,"SOFTWARE\Classes",,0x00000010 Modified: trunk/reactos/boot/bootdata/hivecls_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] Thu Sep 27 18:18:36 2012 @@ -1,5 +1,5 @@ [Version] -Signature="$ReactOS$ +Signature="$ReactOS$" [AddReg] HKLM,"SOFTWARE\Classes",,0x00000010 Modified: trunk/reactos/boot/bootdata/hivedef_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef_amd64.inf [iso-8859-1] Thu Sep 27 18:18:36 2012 @@ -1,5 +1,5 @@ [Version] -Signature="$ReactOS$ +Signature="$ReactOS$" [AddReg] Modified: trunk/reactos/boot/bootdata/hivedef_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef_arm.inf [iso-8859-1] Thu Sep 27 18:18:36 2012 @@ -1,5 +1,5 @@ [Version] -Signature="$ReactOS$ +Signature="$ReactOS$" [AddReg] Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_i386… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/boot/bootdata/hivesft_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_amd64.inf [iso-8859-1] Thu Sep 27 18:18:36 2012 @@ -1,5 +1,5 @@ [Version] -Signature="$ReactOS$ +Signature="$ReactOS$" [AddReg] Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] Thu Sep 27 18:18:36 2012 @@ -1,5 +1,5 @@ [Version] -Signature="$ReactOS$ +Signature="$ReactOS$" [AddReg] Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386… ============================================================================== Binary files - no diff available.

1 0

[hbelusca] 57400: [NTOSKRNL] Coverity code defects fixes : - Cache: CID 701441 - Config: CIDs 716570, 716669, 716760 - Dbgk: Kdbg: CIDs 716571, 515128/9, 500432 - Ex: CIDs 500156/7, 515122, 716200/...
by hbelusca＠svn.reactos.org 27 Sep '12

27 Sep '12

Author: hbelusca Date: Thu Sep 27 17:16:31 2012 New Revision: 57400 URL: http://svn.reactos.org/svn/reactos?rev=57400&view=rev Log: [NTOSKRNL] Coverity code defects fixes : - Cache: CID 701441 - Config: CIDs 716570, 716669, 716760 - Dbgk: Kdbg: CIDs 716571, 515128/9, 500432 - Ex: CIDs 500156/7, 515122, 716200/67, 701301, 514669 - Fsrtl: Fstub: CIDs 701341/2, 701288, 716770, 701302, and CIDs 716576/7/8 + 514636 + 716805 thanks to Thomas Faber - Io: CIDs 514576, 514643, 514672/3, 716203, 716269, 716581, 716591, 716713 - Ke: CIDs 515125, 716592 - Ps: CIDs 716603/4, 701422 - Ob: Po: CIDs 514671/680, 701419/420/421, 716763, 716601/2 All the details are given in the different bug reports. CORE-6677 CORE-6679 CORE-6680 CORE-6683 CORE-6686 CORE-6692 CORE-6693 CORE-6694 CORE-6695 CORE-6696 #comment Committed in rev.57400 #resolve #close Modified: trunk/reactos/lib/rtl/atom.c trunk/reactos/ntoskrnl/cache/section/swapout.c trunk/reactos/ntoskrnl/config/cminit.c trunk/reactos/ntoskrnl/config/cmparse.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/dbgk/dbgkobj.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/fsrtl/filelock.c trunk/reactos/ntoskrnl/fsrtl/notify.c trunk/reactos/ntoskrnl/fstub/disksup.c trunk/reactos/ntoskrnl/fstub/fstubex.c trunk/reactos/ntoskrnl/include/internal/cm.h trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/ioevent.c trunk/reactos/ntoskrnl/io/iomgr/iofunc.c trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c trunk/reactos/ntoskrnl/io/iomgr/ramdisk.c trunk/reactos/ntoskrnl/io/iomgr/volume.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c trunk/reactos/ntoskrnl/kdbg/kdb_cli.c trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/profobj.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/oblink.c trunk/reactos/ntoskrnl/ob/obsdcach.c trunk/reactos/ntoskrnl/ob/obsecure.c trunk/reactos/ntoskrnl/po/power.c trunk/reactos/ntoskrnl/ps/kill.c trunk/reactos/ntoskrnl/ps/security.c Modified: trunk/reactos/lib/rtl/atom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/atom.c?rev=57400&r… ============================================================================== --- trunk/reactos/lib/rtl/atom.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/atom.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -102,6 +102,12 @@ return TRUE; } + + /* + * AtomName cannot be NULL because this + * case was caught by the previous test. + */ + ASSERT(AtomName != NULL); if (*AtomName != L'#') return FALSE; Modified: trunk/reactos/ntoskrnl/cache/section/swapout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/swa… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -348,7 +348,7 @@ PMM_SECTION_SEGMENT Segment = NULL; LARGE_INTEGER FileOffset; PMEMORY_AREA MemoryArea; - PMMSUPPORT AddressSpace = MmGetKernelAddressSpace(); + PMMSUPPORT AddressSpace = NULL; BOOLEAN Dirty = FALSE; PVOID Address = NULL; PEPROCESS Process = NULL; @@ -385,7 +385,6 @@ DPRINT("No segment association for %x\n", Page); } - Dirty = MmIsDirtyPageRmap(Page); DPRINTC("Trying to unmap all instances of %x\n", Page); @@ -409,7 +408,8 @@ DPRINTC("Process %x Address %x Page %x\n", Process, Address, Page); - if (RMAP_IS_SEGMENT(Address)) { + if (RMAP_IS_SEGMENT(Address)) + { entry = entry->Next; continue; } @@ -440,10 +440,10 @@ KeBugCheck(MEMORY_MANAGEMENT); } - MmLockAddressSpace(AddressSpace); - do { + MmLockAddressSpace(AddressSpace); + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, Address); if (MemoryArea == NULL || MemoryArea->DeleteInProgress) { @@ -505,14 +505,13 @@ DPRINT1("bail\n"); goto bail; } - else Status = STATUS_MM_RESTART_OPERATION; + else + { + Status = STATUS_MM_RESTART_OPERATION; + } } - - MmLockAddressSpace(AddressSpace); } while (Status == STATUS_MM_RESTART_OPERATION); - - MmUnlockAddressSpace(AddressSpace); if (ProcRef) { Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -116,13 +116,24 @@ Hive->ViewLock = ExAllocatePoolWithTag(NonPagedPool, sizeof(KGUARDED_MUTEX), TAG_CM); - if (!Hive->ViewLock) return STATUS_INSUFFICIENT_RESOURCES; + if (!Hive->ViewLock) + { + /* Cleanup allocation and fail */ + ExFreePoolWithTag(Hive, TAG_CM); + return STATUS_INSUFFICIENT_RESOURCES; + } /* Allocate the flush lock */ Hive->FlusherLock = ExAllocatePoolWithTag(NonPagedPool, sizeof(ERESOURCE), TAG_CM); - if (!Hive->FlusherLock) return STATUS_INSUFFICIENT_RESOURCES; + if (!Hive->FlusherLock) + { + /* Cleanup allocations and fail */ + ExFreePoolWithTag(Hive->ViewLock, TAG_CM); + ExFreePoolWithTag(Hive, TAG_CM); + return STATUS_INSUFFICIENT_RESOURCES; + } /* Setup the handles */ Hive->FileHandles[HFILE_TYPE_PRIMARY] = Primary; @@ -189,10 +200,10 @@ (PUNICODE_STRING)FileName); if (!NT_SUCCESS(Status)) { - /* Clear allocations and fail */ - ExFreePool(Hive->ViewLock); - ExFreePool(Hive->FlusherLock); - ExFreePool(Hive); + /* Cleanup allocations and fail */ + ExFreePoolWithTag(Hive->FlusherLock, TAG_CM); + ExFreePoolWithTag(Hive->ViewLock, TAG_CM); + ExFreePoolWithTag(Hive, TAG_CM); return Status; } @@ -205,10 +216,10 @@ /* Verify integrity */ if (CmCheckRegistry((PCMHIVE)Hive, TRUE)) { - /* Free all alocations */ - ExFreePool(Hive->ViewLock); - ExFreePool(Hive->FlusherLock); - ExFreePool(Hive); + /* Cleanup allocations and fail */ + ExFreePoolWithTag(Hive->FlusherLock, TAG_CM); + ExFreePoolWithTag(Hive->ViewLock, TAG_CM); + ExFreePoolWithTag(Hive, TAG_CM); return STATUS_REGISTRY_CORRUPT; } } @@ -231,10 +242,10 @@ NTAPI CmpOpenHiveFiles(IN PCUNICODE_STRING BaseName, IN PCWSTR Extension OPTIONAL, - IN PHANDLE Primary, - IN PHANDLE Log, - IN PULONG PrimaryDisposition, - IN PULONG LogDisposition, + OUT PHANDLE Primary, + OUT PHANDLE Log, + OUT PULONG PrimaryDisposition, + OUT PULONG LogDisposition, IN BOOLEAN CreateAllowed, IN BOOLEAN MarkAsSystemHive, IN BOOLEAN NoBuffering, Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -136,7 +136,7 @@ if (Length > 0xFFFF) goto Exit; /* Check if we need a new buffer */ - if (Length > ObjectName->MaximumLength) + if (Length > ObjectName->MaximumLength) { /* We do -- allocate one */ NewBuffer = ExAllocatePoolWithTag(PagedPool, Length, TAG_CM); @@ -334,7 +334,7 @@ KeyNode->MaxClassLen = 0; KeyNode->NameLength = CmpCopyName(Hive, KeyNode->Name, Name); if (KeyNode->NameLength < Name->Length) KeyNode->Flags |= KEY_COMP_NAME; - + /* Create the KCB */ Kcb = CmpCreateKeyControlBlock(Hive, *KeyCell, @@ -349,7 +349,7 @@ Status = STATUS_INSUFFICIENT_RESOURCES; goto Quickie; } - + /* Sanity check */ ASSERT(Kcb->RefCount == 1); @@ -357,7 +357,7 @@ KeyBody->NotifyBlock = NULL; KeyBody->ProcessID = PsGetCurrentProcessId(); KeyBody->KeyControlBlock = Kcb; - + /* Link it with the KCB */ EnlistKeyBodyWithKCB(KeyBody, 0); @@ -745,7 +745,7 @@ DPRINT1("Invalid link node attempt\n"); return STATUS_ACCESS_DENIED; } - + /* Check if the parent is being deleted */ if (ParentKcb->Delete) { @@ -754,7 +754,7 @@ Status = STATUS_OBJECT_NAME_NOT_FOUND; goto Exit; } - + /* Allocate a link node */ LinkCell = HvAllocateCell(Hive, FIELD_OFFSET(CM_KEY_NODE, Name) + @@ -767,14 +767,14 @@ Status = STATUS_INSUFFICIENT_RESOURCES; goto Exit; } - + /* Get the key cell */ KeyCell = Context->ChildHive.KeyCell; if (KeyCell != HCELL_NIL) { /* Hive exists! */ ChildCell = KeyCell; - + /* Get the node data */ KeyNode = (PCM_KEY_NODE)HvGetCell(Context->ChildHive.KeyHive, ChildCell); if (!KeyNode) @@ -784,12 +784,12 @@ Status = STATUS_INSUFFICIENT_RESOURCES; goto Exit; } - + /* Fill out the data */ KeyNode->Parent = LinkCell; KeyNode->Flags |= KEY_HIVE_ENTRY | KEY_NO_DELETE; HvReleaseCell(Context->ChildHive.KeyHive, ChildCell); - + /* Now open the key cell */ KeyNode = (PCM_KEY_NODE)HvGetCell(Context->ChildHive.KeyHive, KeyCell); if (!KeyNode) @@ -799,7 +799,7 @@ Status = STATUS_INSUFFICIENT_RESOURCES; goto Exit; } - + /* Open the parent */ Status = CmpDoOpen(Context->ChildHive.KeyHive, KeyCell, @@ -834,13 +834,13 @@ Context->ChildHive.KeyHive->BaseBlock->RootCell = ChildCell; } } - + /* Check if open or create suceeded */ if (NT_SUCCESS(Status)) { /* Mark the cell dirty */ HvMarkCellDirty(Context->ChildHive.KeyHive, ChildCell, FALSE); - + /* Get the key node */ KeyNode = HvGetCell(Context->ChildHive.KeyHive, ChildCell); if (!KeyNode) @@ -850,14 +850,14 @@ Status = STATUS_INSUFFICIENT_RESOURCES; goto Exit; } - + /* Release it */ HvReleaseCell(Context->ChildHive.KeyHive, ChildCell); - + /* Set the parent and flags */ KeyNode->Parent = LinkCell; KeyNode->Flags |= KEY_HIVE_ENTRY | KEY_NO_DELETE; - + /* Get the link node */ KeyNode = HvGetCell(Hive, LinkCell); if (!KeyNode) @@ -867,7 +867,7 @@ Status = STATUS_INSUFFICIENT_RESOURCES; goto Exit; } - + /* Set it up */ KeyNode->Signature = CM_LINK_NODE_SIGNATURE; KeyNode->Flags = KEY_HIVE_EXIT | KEY_NO_DELETE; @@ -876,7 +876,7 @@ if (KeyNode->NameLength < Name.Length) KeyNode->Flags |= KEY_COMP_NAME; KeQuerySystemTime(&TimeStamp); KeyNode->LastWriteTime = TimeStamp; - + /* Clear out the rest */ KeyNode->SubKeyCounts[Stable] = 0; KeyNode->SubKeyCounts[Volatile] = 0; @@ -885,12 +885,12 @@ KeyNode->ValueList.Count = 0; KeyNode->ValueList.List = HCELL_NIL; KeyNode->ClassLength = 0; - + /* Reference the root node */ KeyNode->ChildHiveReference.KeyHive = Context->ChildHive.KeyHive; KeyNode->ChildHiveReference.KeyCell = ChildCell; HvReleaseCell(Hive, LinkCell); - + /* Get the parent node */ KeyNode = HvGetCell(Hive, Cell); if (!KeyNode) @@ -900,14 +900,14 @@ Status = STATUS_INSUFFICIENT_RESOURCES; goto Exit; } - + /* Now add the subkey */ if (!CmpAddSubKey(Hive, Cell, LinkCell)) { /* Failure! We don't handle this yet! */ ASSERT(FALSE); } - + /* Get the key body */ KeyBody = (PCM_KEY_BODY)*Object; @@ -915,12 +915,12 @@ ASSERT(KeyBody->KeyControlBlock->ParentKcb->KeyCell == Cell); ASSERT(KeyBody->KeyControlBlock->ParentKcb->KeyHive == Hive); ASSERT(KeyBody->KeyControlBlock->ParentKcb->KcbMaxNameLen == KeyNode->MaxNameLen); - + /* Update the timestamp */ KeQuerySystemTime(&TimeStamp); KeyNode->LastWriteTime = TimeStamp; KeyBody->KeyControlBlock->ParentKcb->KcbLastWriteTime = TimeStamp; - + /* Check if we need to update name maximum */ if (KeyNode->MaxNameLen < Name.Length) { @@ -928,14 +928,14 @@ KeyNode->MaxNameLen = Name.Length; KeyBody->KeyControlBlock->ParentKcb->KcbMaxNameLen = Name.Length; } - + /* Check if we need toupdate class length maximum */ if (KeyNode->MaxClassLen < Context->Class.Length) { /* Update it */ KeyNode->MaxClassLen = Context->Class.Length; } - + /* Release the cell */ HvReleaseCell(Hive, Cell); } @@ -944,7 +944,7 @@ /* Release the link cell */ HvReleaseCell(Hive, LinkCell); } - + Exit: /* Release the flusher locks and return status */ return Status; @@ -965,11 +965,11 @@ ASSERT(*ReleaseHive != NULL); HvReleaseCell((*ReleaseHive), *ReleaseCell); } - + /* Get the link references */ *Hive = (*KeyNode)->ChildHiveReference.KeyHive; *Cell = (*KeyNode)->ChildHiveReference.KeyCell; - + /* Get the new node */ *KeyNode = (PCM_KEY_NODE)HvGetCell((*Hive), *Cell); if (*KeyNode) @@ -1004,10 +1004,10 @@ /* Calculate hash values */ *TotalRemainingSubkeys = 0xBAADF00D; - + /* Lock the registry */ CmpLockRegistry(); - + /* Return hive and cell data */ *Hive = (*Kcb)->KeyHive; *Cell = (*Kcb)->KeyCell; @@ -1060,7 +1060,7 @@ /* Fail if this isn't a key object */ if (ObjectType != CmpKeyObjectType) return STATUS_OBJECT_TYPE_MISMATCH; - + /* Copy the remaining name */ Current = *RemainingName; @@ -1070,9 +1070,12 @@ /* It isn't, so no context */ ParseContext = NULL; } - + /* Grab the KCB */ Kcb = ((PCM_KEY_BODY)ParseObject)->KeyControlBlock; + + /* Sanity check */ + ASSERT(Kcb != NULL); /* Fail if the key was marked as deleted */ if (Kcb->Delete) @@ -1089,10 +1092,13 @@ &TotalSubkeys, NULL, &LockedKcbs); - + /* This is now the parent */ ParentKcb = Kcb; - + + /* Sanity check */ + ASSERT(ParentKcb != NULL); + /* Check if everything was found cached */ if (!TotalRemainingSubkeys) ASSERTMSG("Caching not implemented", FALSE); @@ -1127,7 +1133,7 @@ goto Quickie; } Current.MaximumLength += NextName.MaximumLength; - + /* Parse the symlink */ if (CmpGetSymbolicLink(Hive, CompleteName, @@ -1146,7 +1152,7 @@ /* We're done */ goto Quickie; } - + /* Get the key node */ Node = (PCM_KEY_NODE)HvGetCell(Hive, Cell); if (!Node) @@ -1174,7 +1180,7 @@ Cell = NextCell; Node = (PCM_KEY_NODE)HvGetCell(Hive, Cell); if (!Node) ASSERT(FALSE); - + /* Check if this was the last key */ if (Last) { @@ -1189,7 +1195,7 @@ &CellToRelease); if (!Node) ASSERT(FALSE); } - + /* Do the open */ Status = CmpDoOpen(Hive, Cell, @@ -1214,11 +1220,11 @@ Status = STATUS_OBJECT_NAME_NOT_FOUND; } } - + /* We are done */ break; } - + /* Is this an exit node */ if (Node->Flags & KEY_HIVE_EXIT) { @@ -1239,7 +1245,7 @@ 0, &NextName); if (!Kcb) ASSERT(FALSE); - + /* Dereference the parent and set the new one */ CmpDereferenceKeyControlBlock(ParentKcb); ParentKcb = Kcb; @@ -1275,7 +1281,7 @@ ParentKcb, Object); } - + /* Check for reparse (in this case, someone beat us) */ if (Status == STATUS_REPARSE) break; @@ -1295,7 +1301,7 @@ { /* Save the next name */ Current.Buffer = NextName.Buffer; - + /* Validate the current name string length */ if (Current.Length + NextName.Length > MAXUSHORT) { @@ -1304,7 +1310,7 @@ break; } Current.Length += NextName.Length; - + /* Validate the current name string maximum length */ if (Current.MaximumLength + NextName.MaximumLength > MAXUSHORT) { @@ -1313,7 +1319,7 @@ break; } Current.MaximumLength += NextName.MaximumLength; - + /* Parse the symlink */ if (CmpGetSymbolicLink(Hive, CompleteName, @@ -1363,7 +1369,7 @@ { /* Nothing to do */ } - + /* We're done */ break; } @@ -1378,7 +1384,7 @@ /* Dereference the parent if it exists */ Quickie: if (ParentKcb) CmpDereferenceKeyControlBlock(ParentKcb); - + /* Unlock the registry */ CmpUnlockRegistry(); return Status; Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -1104,7 +1104,7 @@ //ULONG RegStart; ULONG PrimaryDisposition, SecondaryDisposition, ClusterSize; PCMHIVE CmHive; - HANDLE PrimaryHandle, LogHandle; + HANDLE PrimaryHandle = NULL, LogHandle = NULL; NTSTATUS Status = STATUS_SUCCESS; PVOID ErrorParameters; PAGED_CODE(); Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkobj.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -192,7 +192,7 @@ ObDereferenceObject(Process); /* Free the debug event */ - ExFreePool(DebugEvent); + ExFreePoolWithTag(DebugEvent, 'EgbD'); } } @@ -418,7 +418,7 @@ /* Dereference process and thread and free the event */ ObDereferenceObject(DebugEvent->Process); ObDereferenceObject(DebugEvent->Thread); - ExFreePool(DebugEvent); + ExFreePoolWithTag(DebugEvent, 'EgbD'); } VOID Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=574… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -211,7 +211,7 @@ PLIST_ENTRY ListHead, NextEntry; PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; ULONG NlsTablesEncountered = 0; - SIZE_T NlsTableSizes[3]; /* 3 NLS tables */ + SIZE_T NlsTableSizes[3] = {0, 0, 0}; /* 3 NLS tables */ /* Check if this is boot-time phase 0 initialization */ if (!ExpInitializationPhase) @@ -405,12 +405,11 @@ if (!NT_SUCCESS(Status)) { /* Failed, display error */ - p = InitBuffer->DebugBuffer; - _snwprintf(p, - 256 * sizeof(WCHAR), + _snwprintf(InitBuffer->DebugBuffer, + sizeof(InitBuffer->DebugBuffer)/sizeof(WCHAR), L"INIT: Unable to allocate Process Parameters. 0x%lx", Status); - RtlInitUnicodeString(&DebugString, p); + RtlInitUnicodeString(&DebugString, InitBuffer->DebugBuffer); ZwDisplayString(&DebugString); /* Bugcheck the system */ @@ -434,12 +433,11 @@ if (!NT_SUCCESS(Status)) { /* Failed, display error */ - p = InitBuffer->DebugBuffer; - _snwprintf(p, - 256 * sizeof(WCHAR), + _snwprintf(InitBuffer->DebugBuffer, + sizeof(InitBuffer->DebugBuffer)/sizeof(WCHAR), L"INIT: Unable to allocate Process Environment. 0x%lx", Status); - RtlInitUnicodeString(&DebugString, p); + RtlInitUnicodeString(&DebugString, InitBuffer->DebugBuffer); ZwDisplayString(&DebugString); /* Bugcheck the system */ @@ -560,12 +558,11 @@ if (!NT_SUCCESS(Status)) { /* Failed, display error */ - p = InitBuffer->DebugBuffer; - _snwprintf(p, - 256 * sizeof(WCHAR), + _snwprintf(InitBuffer->DebugBuffer, + sizeof(InitBuffer->DebugBuffer)/sizeof(WCHAR), L"INIT: Unable to create Session Manager. 0x%lx", Status); - RtlInitUnicodeString(&DebugString, p); + RtlInitUnicodeString(&DebugString, InitBuffer->DebugBuffer); ZwDisplayString(&DebugString); /* Bugcheck the system */ @@ -577,12 +574,11 @@ if (!NT_SUCCESS(Status)) { /* Failed, display error */ - p = InitBuffer->DebugBuffer; - _snwprintf(p, - 256 * sizeof(WCHAR), + _snwprintf(InitBuffer->DebugBuffer, + sizeof(InitBuffer->DebugBuffer)/sizeof(WCHAR), L"INIT: Unable to resume Session Manager. 0x%lx", Status); - RtlInitUnicodeString(&DebugString, p); + RtlInitUnicodeString(&DebugString, InitBuffer->DebugBuffer); ZwDisplayString(&DebugString); /* Bugcheck the system */ Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -150,7 +150,7 @@ Prcb = KeGetCurrentPrcb(); - ScaledIdle = Prcb->IdleThread->KernelTime * 100; + ScaledIdle = (ULONGLONG)Prcb->IdleThread->KernelTime * 100; TotalTime = Prcb->KernelTime + Prcb->UserTime; if (TotalTime != 0) *CpuUsage = (ULONG)(100 - (ScaledIdle / TotalTime)); @@ -785,7 +785,7 @@ } } } - if (!ImageNameLength && Process != PsIdleProcess && Process->ImageFileName) + if (!ImageNameLength && Process != PsIdleProcess) { ImageNameLength = (USHORT)strlen(Process->ImageFileName) * sizeof(WCHAR); } @@ -824,7 +824,7 @@ /* Release the memory allocated by SeLocateProcessImageName */ ExFreePool(ProcessImageName); } - else if (Process->ImageFileName) + else { RtlInitAnsiString(&ImageName, Process->ImageFileName); RtlAnsiStringToUnicodeString(&SpiCurrent->ImageName, &ImageName, FALSE); Modified: trunk/reactos/ntoskrnl/fsrtl/filelock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/filelock.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/filelock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/filelock.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -380,12 +380,13 @@ if (!FileLock->LockInformation) { LockInfo = ExAllocatePoolWithTag(NonPagedPool, sizeof(LOCK_INFORMATION), 'FLCK'); - FileLock->LockInformation = LockInfo; - if (!FileLock) { + if (!LockInfo) + { IoStatus->Status = STATUS_NO_MEMORY; return FALSE; } - + FileLock->LockInformation = LockInfo; + LockInfo->BelongsTo = FileLock; InitializeListHead(&LockInfo->SharedLocks); @@ -416,13 +417,13 @@ ToInsert.Exclusive.FileLock.ProcessId = Process->UniqueProcessId; ToInsert.Exclusive.FileLock.Key = Key; ToInsert.Exclusive.FileLock.ExclusiveLock = ExclusiveLock; - + Conflict = RtlInsertElementGenericTable (FileLock->LockInformation, &ToInsert, sizeof(ToInsert), &InsertedNew); - + if (Conflict && !InsertedNew) { if (Conflict->Exclusive.FileLock.ExclusiveLock || ExclusiveLock) @@ -475,8 +476,9 @@ for (i = 0; i < RtlNumberGenericTableElements(&LockInfo->RangeTable); i++) { Conflict = RtlGetElementGenericTable(&LockInfo->RangeTable, i); + /* The first argument will be inserted as a shared range */ - if (LockCompare(&LockInfo->RangeTable, Conflict, &ToInsert) == GenericEqual) + if (Conflict && (LockCompare(&LockInfo->RangeTable, Conflict, &ToInsert) == GenericEqual)) { if (Conflict->Exclusive.FileLock.ExclusiveLock) { @@ -520,8 +522,9 @@ Conflict->Exclusive.FileLock.StartingByte.LowPart, Conflict->Exclusive.FileLock.EndingByte.HighPart, Conflict->Exclusive.FileLock.EndingByte.LowPart); - Conflict = FsRtlpRebuildSharedLockRange - (FileLock, LockInfo, &ToInsert); + Conflict = FsRtlpRebuildSharedLockRange(FileLock, + LockInfo, + &ToInsert); if (!Conflict) { IoStatus->Status = STATUS_NO_MEMORY; @@ -918,7 +921,6 @@ PLIST_ENTRY SharedRangeEntry; PLOCK_SHARED_RANGE WatchSharedRange; COMBINED_LOCK_ELEMENT RemadeElement; - PCOMBINED_LOCK_ELEMENT RemadeElementInserted = NULL; Find.Exclusive.FileLock.StartingByte = SharedRange->Start; Find.Exclusive.FileLock.EndingByte = SharedRange->End; SharedEntry = SharedRange->Entry.Flink; @@ -939,30 +941,28 @@ SharedRangeEntry != &InternalInfo->SharedLocks; SharedRangeEntry = SharedRangeEntry->Flink) { - COMBINED_LOCK_ELEMENT Find; + COMBINED_LOCK_ELEMENT LockElement; WatchSharedRange = CONTAINING_RECORD(SharedRangeEntry, LOCK_SHARED_RANGE, Entry); - Find.Exclusive.FileLock.StartingByte = WatchSharedRange->Start; - Find.Exclusive.FileLock.EndingByte = WatchSharedRange->End; - if (LockCompare(&InternalInfo->RangeTable, &RemadeElement, &Find) != GenericEqual) + LockElement.Exclusive.FileLock.StartingByte = WatchSharedRange->Start; + LockElement.Exclusive.FileLock.EndingByte = WatchSharedRange->End; + if (LockCompare(&InternalInfo->RangeTable, &RemadeElement, &LockElement) != GenericEqual) { DPRINT("Skipping range %08x%08x:%08x%08x\n", - Find.Exclusive.FileLock.StartingByte.HighPart, - Find.Exclusive.FileLock.StartingByte.LowPart, - Find.Exclusive.FileLock.EndingByte.HighPart, - Find.Exclusive.FileLock.EndingByte.LowPart); + LockElement.Exclusive.FileLock.StartingByte.HighPart, + LockElement.Exclusive.FileLock.StartingByte.LowPart, + LockElement.Exclusive.FileLock.EndingByte.HighPart, + LockElement.Exclusive.FileLock.EndingByte.LowPart); continue; } DPRINT("Re-creating range %08x%08x:%08x%08x\n", - Find.Exclusive.FileLock.StartingByte.HighPart, - Find.Exclusive.FileLock.StartingByte.LowPart, - Find.Exclusive.FileLock.EndingByte.HighPart, - Find.Exclusive.FileLock.EndingByte.LowPart); + LockElement.Exclusive.FileLock.StartingByte.HighPart, + LockElement.Exclusive.FileLock.StartingByte.LowPart, + LockElement.Exclusive.FileLock.EndingByte.HighPart, + LockElement.Exclusive.FileLock.EndingByte.LowPart); RtlZeroMemory(&RemadeElement, sizeof(RemadeElement)); RemadeElement.Exclusive.FileLock.StartingByte = WatchSharedRange->Start; RemadeElement.Exclusive.FileLock.EndingByte = WatchSharedRange->End; - RemadeElementInserted = - FsRtlpRebuildSharedLockRange - (FileLock, InternalInfo, &RemadeElement); + FsRtlpRebuildSharedLockRange(FileLock, InternalInfo, &RemadeElement); } } else Modified: trunk/reactos/ntoskrnl/fsrtl/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/notify.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -586,6 +586,13 @@ /* Allocate new notification */ NotifyChange = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, sizeof(NOTIFY_CHANGE), 'FSrN'); + + /* + * If NotifyChange == NULL then an + * exception was already raised. + */ + ASSERT(NotifyChange != NULL); + RtlZeroMemory(NotifyChange, sizeof(NOTIFY_CHANGE)); /* Set basic information */ Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -446,38 +446,46 @@ DPRINT("RDiskCount %d\n", RDiskCount); - Buffer1 = (PWSTR)ExAllocatePoolWithTag(PagedPool, - 64 * sizeof(WCHAR), TAG_FILE_SYSTEM); - Buffer2 = (PWSTR)ExAllocatePoolWithTag(PagedPool, - 32 * sizeof(WCHAR), TAG_FILE_SYSTEM); - - PartialInformation = (PKEY_VALUE_PARTIAL_INFORMATION)ExAllocatePoolWithTag(PagedPool, - sizeof(KEY_VALUE_PARTIAL_INFORMATION) + sizeof(REG_DISK_MOUNT_INFO), TAG_FILE_SYSTEM); - - if (!Buffer1 || !Buffer2 || !PartialInformation) return; + Buffer1 = ExAllocatePoolWithTag(PagedPool, + 64 * sizeof(WCHAR), + TAG_FILE_SYSTEM); + if (!Buffer1) return; + + Buffer2 = ExAllocatePoolWithTag(PagedPool, + 32 * sizeof(WCHAR), + TAG_FILE_SYSTEM); + if (!Buffer2) + { + ExFreePoolWithTag(Buffer1, TAG_FILE_SYSTEM); + return; + } + + PartialInformation = ExAllocatePoolWithTag(PagedPool, + sizeof(KEY_VALUE_PARTIAL_INFORMATION) + sizeof(REG_DISK_MOUNT_INFO), + TAG_FILE_SYSTEM); + if (!PartialInformation) + { + ExFreePoolWithTag(Buffer2, TAG_FILE_SYSTEM); + ExFreePoolWithTag(Buffer1, TAG_FILE_SYSTEM); + return; + } DiskMountInfo = (PREG_DISK_MOUNT_INFO) PartialInformation->Data; - /* Open or Create the 'MountedDevices' key */ + /* Create or open the 'MountedDevices' key */ RtlInitUnicodeString(&UnicodeString1, L"\\Registry\\Machine\\SYSTEM\\MountedDevices"); InitializeObjectAttributes(&ObjectAttributes, &UnicodeString1, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); - Status = ZwOpenKey(&hKey, + Status = ZwCreateKey(&hKey, KEY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - Status = ZwCreateKey(&hKey, - KEY_ALL_ACCESS, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - NULL); - } + &ObjectAttributes, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + NULL); if (!NT_SUCCESS(Status)) { hKey = NULL; @@ -535,7 +543,8 @@ ExFreePoolWithTag(PartialInformation, TAG_FILE_SYSTEM); ExFreePoolWithTag(Buffer2, TAG_FILE_SYSTEM); ExFreePoolWithTag(Buffer1, TAG_FILE_SYSTEM); - if (hKey) ZwClose(hKey); + if (hKey) ObCloseHandle(hKey, KernelMode); + return; } RtlZeroMemory(LayoutArray, @@ -951,10 +960,7 @@ ExFreePoolWithTag(PartialInformation, TAG_FILE_SYSTEM); ExFreePoolWithTag(Buffer2, TAG_FILE_SYSTEM); ExFreePoolWithTag(Buffer1, TAG_FILE_SYSTEM); - if (hKey) - { - ZwClose(hKey); - } + if (hKey) ObCloseHandle(hKey, KernelMode); } #endif Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/fstubex.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -985,7 +985,7 @@ if ((Disk->SectorCount - 1ULL) != EfiHeader.AlternateLBA) { /* We'll update it. First, count number of sectors needed to store partitions */ - SectorsForPartitions = (EfiHeader.NumberOfEntries * PARTITION_ENTRY_SIZE) / Disk->SectorSize; + SectorsForPartitions = ((ULONGLONG)EfiHeader.NumberOfEntries * PARTITION_ENTRY_SIZE) / Disk->SectorSize; /* Then set first usable LBA: Legacy MBR + GPT header + Partitions entries */ EfiHeader.FirstUsableLBA = SectorsForPartitions + 2; /* Then set last usable LBA: Last sector - GPT header - Partitions entries */ Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -801,10 +801,10 @@ CmpOpenHiveFiles( IN PCUNICODE_STRING BaseName, IN PCWSTR Extension OPTIONAL, - IN PHANDLE Primary, - IN PHANDLE Log, - IN PULONG PrimaryDisposition, - IN PULONG LogDisposition, + OUT PHANDLE Primary, + OUT PHANDLE Log, + OUT PULONG PrimaryDisposition, + OUT PULONG LogDisposition, IN BOOLEAN CreateAllowed, IN BOOLEAN MarkAsSystemHive, IN BOOLEAN NoBuffering, Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -227,11 +227,14 @@ NULL, &Event, &StatusBlock); - Status = IoCallDriver(DeviceObject, Irp); - if (Status == STATUS_PENDING) + if (Irp) { - /* Wait on the driver */ - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + /* Wait on the driver */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + } } /* Remove the flag */ Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -795,6 +795,11 @@ &MissingApiName, &MissingDriverName, &LoadedImports); + + /* Free the temporary buffer */ + ExFreePoolWithTag(Buffer, TAG_LDR_WSTR); + + /* Check the result of the imports resolution */ if (!NT_SUCCESS(Status)) return Status; /* Return */ Modified: trunk/reactos/ntoskrnl/io/iomgr/ioevent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/ioevent.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/ioevent.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/ioevent.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -42,12 +42,17 @@ if (!NT_SUCCESS(Status)) return NULL; /* Get a handle to it */ - ObReferenceObjectByHandle(Handle, - 0, - ExEventObjectType, - KernelMode, - (PVOID*)&Event, - NULL); + Status = ObReferenceObjectByHandle(Handle, + 0, + ExEventObjectType, + KernelMode, + (PVOID*)&Event, + NULL); + if (!NT_SUCCESS(Status)) + { + ZwClose(Handle); + return NULL; + } /* Dereference the extra count, and return the handle */ ObDereferenceObject(Event); Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -119,7 +119,7 @@ { NTSTATUS Status; PKNORMAL_ROUTINE NormalRoutine; - PVOID NormalContext; + PVOID NormalContext = NULL; KIRQL OldIrql; PAGED_CODE(); IOTRACE(IO_API_DEBUG, "IRP: %p. DO: %p. FO: %p \n", Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iorsrce.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -701,7 +701,7 @@ UNICODE_STRING LinkTarget, KeyName; OBJECT_ATTRIBUTES ObjectAttributes; HANDLE LinkHandle, RegistryHandle, KeyHandle; - WCHAR LinkTargetBuffer[256], KeyNameBuffer[sizeof(L"SystemPartition") / sizeof(WCHAR)]; + WCHAR LinkTargetBuffer[256]; UNICODE_STRING CmRegistryMachineSystemName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM"); ASSERT(NtSystemPartitionDeviceName->MaximumLength >= NtSystemPartitionDeviceName->Length + sizeof(WCHAR)); @@ -760,13 +760,9 @@ return; } - /* We'll store in Setup subkey, and as we love fun, we use only one buffer for three writings... */ - wcscpy(KeyNameBuffer, L"Setup"); - KeyName.Length = sizeof(L"Setup") - sizeof(UNICODE_NULL); - KeyName.MaximumLength = sizeof(L"Setup"); - KeyName.Buffer = KeyNameBuffer; - - /* So, open or create the subkey */ + /* Open or create the Setup subkey where we'll store in */ + RtlInitUnicodeString(&KeyName, L"Setup"); + Status = IopCreateRegistryKeyEx(&KeyHandle, RegistryHandle, &KeyName, @@ -784,9 +780,7 @@ } /* Prepare first data writing... */ - wcscpy(KeyNameBuffer, L"SystemPartition"); - KeyName.Length = sizeof(L"SystemPartition") - sizeof(UNICODE_NULL); - KeyName.MaximumLength = sizeof(L"SystemPartition"); + RtlInitUnicodeString(&KeyName, L"SystemPartition"); /* Write SystemPartition value which is the target of the symbolic link */ Status = ZwSetValueKey(KeyHandle, @@ -800,10 +794,8 @@ DPRINT("Failed writing SystemPartition value!\n"); } - /* Prepare for second data writing... */ - wcscpy(KeyName.Buffer, L"OsLoaderPath"); - KeyName.Length = sizeof(L"OsLoaderPath") - sizeof(UNICODE_NULL); - KeyName.MaximumLength = sizeof(L"OsLoaderPath"); + /* Prepare for second data writing... */ + RtlInitUnicodeString(&KeyName, L"OsLoaderPath"); /* Remove trailing slash if any (one slash only excepted) */ if (OsLoaderPathName->Length > sizeof(WCHAR) && Modified: trunk/reactos/ntoskrnl/io/iomgr/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/ramdisk.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/ramdisk.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -224,7 +224,7 @@ // Build the symbolic link name and target // _snwprintf(SourceString, - sizeof(SourceString), + sizeof(SourceString)/sizeof(WCHAR), L"\\Device\\Ramdisk%wZ", &GuidString); SymbolicLinkName.Length = 38; Modified: trunk/reactos/ntoskrnl/io/iomgr/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/volume.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -377,11 +377,14 @@ NULL, &Event, &StatusBlock); - Status = IoCallDriver(DeviceObject, Irp); - if (Status == STATUS_PENDING) - { - /* Wait on the driver */ - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + if (Irp) + { + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + /* Wait on the driver */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + } } /* Reset the event */ Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpnoti… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -80,7 +80,7 @@ if (!NT_SUCCESS(Status)) { KeReleaseGuardedMutex(&PnpNotifyListLock); - ExFreePool(NotificationStructure); + ExFreePoolWithTag(NotificationStructure, TAG_PNP_NOTIFY); return; } break; @@ -177,21 +177,22 @@ case EventCategoryTargetDeviceChange: { Status = IoGetRelatedTargetDevice(ChangeEntry->FileObject, &EntryDeviceObject); - if (NT_SUCCESS(Status)) - { - if (DeviceObject == EntryDeviceObject) - { - if (Event == &GUID_PNP_CUSTOM_NOTIFICATION) - { - ((PTARGET_DEVICE_CUSTOM_NOTIFICATION)NotificationStructure)->FileObject = ChangeEntry->FileObject; - } - else - { - ((PTARGET_DEVICE_REMOVAL_NOTIFICATION)NotificationStructure)->FileObject = ChangeEntry->FileObject; - } - CallCurrentEntry = TRUE; - } + if (NT_SUCCESS(Status)) + { + if (DeviceObject == EntryDeviceObject) + { + if (Event == &GUID_PNP_CUSTOM_NOTIFICATION) + { + ((PTARGET_DEVICE_CUSTOM_NOTIFICATION)NotificationStructure)->FileObject = ChangeEntry->FileObject; + } + else + { + ((PTARGET_DEVICE_REMOVAL_NOTIFICATION)NotificationStructure)->FileObject = ChangeEntry->FileObject; + } + CallCurrentEntry = TRUE; + } } + break; } default: { Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -864,7 +864,7 @@ else if (Argv[0][0] == 'c') /* cregs */ { ULONG Cr0, Cr2, Cr3, Cr4; - KDESCRIPTOR Gdtr, Idtr; + KDESCRIPTOR Gdtr = {0, 0, 0}, Idtr = {0, 0, 0}; USHORT Ldtr; static const PCHAR Cr0Bits[32] = { " PE", " MP", " EM", " TS", " ET", " NE", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -1137,7 +1137,7 @@ INIT_FUNCTION KiI386PentiumLockErrataFixup(VOID) { - KDESCRIPTOR IdtDescriptor; + KDESCRIPTOR IdtDescriptor = {0, 0, 0}; PKIDTENTRY NewIdt, NewIdt2; /* Allocate memory for a new IDT */ Modified: trunk/reactos/ntoskrnl/ke/profobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/profobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -142,7 +142,7 @@ KeLowerIrql(OldIrql); /* Free the pool */ - if (FreeBuffer) ExFreePool(SourceBuffer); + if (FreeBuffer) ExFreePoolWithTag(SourceBuffer, 'forP'); /* Return whether we could start the profile */ return StartedProfile; Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -1429,7 +1429,7 @@ POBJECT_HEADER ObjectHeader = NULL; POBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleFlags; POBJECT_BASIC_INFORMATION BasicInfo; - ULONG InfoLength; + ULONG InfoLength = 0; PVOID Object = NULL; NTSTATUS Status; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); Modified: trunk/reactos/ntoskrnl/ob/oblink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblink.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -595,7 +595,12 @@ ExAllocatePoolWithTag(PagedPool, CapturedLinkTarget.MaximumLength, TAG_SYMLINK_TARGET); - if (!SymbolicLink->LinkTarget.Buffer) return STATUS_NO_MEMORY; + if (!SymbolicLink->LinkTarget.Buffer) + { + /* Dereference the symbolic link object and fail */ + ObDereferenceObject(SymbolicLink); + return STATUS_NO_MEMORY; + } /* Copy it */ RtlCopyMemory(SymbolicLink->LinkTarget.Buffer, Modified: trunk/reactos/ntoskrnl/ob/obsdcach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obsdcach.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obsdcach.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obsdcach.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -427,7 +427,7 @@ *OutputSecurityDescriptor = &SdHeader->SecurityDescriptor; /* Free anything that we may have had to create */ - if (NewHeader) ExFreePool(NewHeader); + if (NewHeader) ExFreePoolWithTag(NewHeader, TAG_OB_SD_CACHE); return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/ob/obsecure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obsecure.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obsecure.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obsecure.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -217,7 +217,7 @@ { POBJECT_HEADER ObjectHeader; POBJECT_TYPE ObjectType; - PSECURITY_DESCRIPTOR SecurityDescriptor; + PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; BOOLEAN SdAllocated; BOOLEAN Result = TRUE; ACCESS_MASK GrantedAccess = 0; @@ -280,7 +280,7 @@ { POBJECT_HEADER ObjectHeader; POBJECT_TYPE ObjectType; - PSECURITY_DESCRIPTOR SecurityDescriptor; + PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; BOOLEAN SdAllocated; BOOLEAN Result; ACCESS_MASK GrantedAccess = 0; @@ -338,7 +338,7 @@ { POBJECT_HEADER ObjectHeader; POBJECT_TYPE ObjectType; - PSECURITY_DESCRIPTOR SecurityDescriptor; + PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; BOOLEAN SdAllocated; BOOLEAN Result; ACCESS_MASK GrantedAccess = 0; Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=57… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -79,11 +79,11 @@ PIO_STACK_LOCATION IrpSp; PIRP Irp; NTSTATUS Status; - + KeInitializeEvent(&Event, NotificationEvent, FALSE); - + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_POWER, DeviceObject, NULL, @@ -91,13 +91,14 @@ NULL, &Event, &IoStatusBlock); - + if (!Irp) return STATUS_INSUFFICIENT_RESOURCES; + IrpSp = IoGetNextIrpStackLocation(Irp); IrpSp->MinorFunction = IRP_MN_QUERY_POWER; IrpSp->Parameters.Power.Type = SystemPowerState; IrpSp->Parameters.Power.State.SystemState = SystemState; IrpSp->Parameters.Power.ShutdownType = PowerAction; - + Status = PoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { @@ -108,7 +109,7 @@ NULL); Status = IoStatusBlock.Status; } - + return Status; } @@ -120,11 +121,11 @@ PIO_STACK_LOCATION IrpSp; PIRP Irp; NTSTATUS Status; - + KeInitializeEvent(&Event, NotificationEvent, FALSE); - + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_POWER, DeviceObject, NULL, @@ -132,13 +133,14 @@ NULL, &Event, &IoStatusBlock); - + if (!Irp) return STATUS_INSUFFICIENT_RESOURCES; + IrpSp = IoGetNextIrpStackLocation(Irp); IrpSp->MinorFunction = IRP_MN_SET_POWER; IrpSp->Parameters.Power.Type = SystemPowerState; IrpSp->Parameters.Power.State.SystemState = SystemState; IrpSp->Parameters.Power.ShutdownType = PowerAction; - + Status = PoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { @@ -149,7 +151,7 @@ NULL); Status = IoStatusBlock.Status; } - + return Status; } Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=574… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -1006,7 +1006,7 @@ } /* We failed, free the APC */ - ExFreePool(Apc); + ExFreePoolWithTag(Apc, TAG_TERMINATE_APC); /* Return Status */ return Status; Modified: trunk/reactos/ntoskrnl/ps/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/security.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ps/security.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/security.c [iso-8859-1] Thu Sep 27 17:16:31 2012 @@ -221,7 +221,7 @@ PACCESS_TOKEN NewToken = Token; NTSTATUS Status, AccessStatus; BOOLEAN Result, SdAllocated; - PSECURITY_DESCRIPTOR SecurityDescriptor; + PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; SECURITY_SUBJECT_CONTEXT SubjectContext; PSTRACE(PS_SECURITY_DEBUG, "Process: %p Token: %p\n", Process, Token); @@ -638,7 +638,7 @@ if (OldData) { /* Someone beat us to it, free our copy */ - ExFreePool(Impersonation); + ExFreePoolWithTag(Impersonation, TAG_PS_IMPERSONATION); Impersonation = OldData; } }

1 0

[hbelusca] 57399: [NTOSKRNL] - Code formatting - It's my first commit \o/ CORE-6687 #comment Committed. #resolve
by hbelusca＠svn.reactos.org 27 Sep '12

27 Sep '12

Author: hbelusca Date: Thu Sep 27 13:39:14 2012 New Revision: 57399 URL: http://svn.reactos.org/svn/reactos?rev=57399&view=rev Log: [NTOSKRNL] - Code formatting - It's my first commit \o/ CORE-6687 #comment Committed. #resolve Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] Thu Sep 27 13:39:14 2012 @@ -543,10 +543,8 @@ /* Terminate the string */ SubKeyInfo->Name[SubKeyInfo->NameLength / sizeof(WCHAR)] = 0; - _snwprintf( - DevicePath, - sizeof(DevicePath) / sizeof(WCHAR), - L"%s\\%s", REGSTR_KEY_ROOTENUM, KeyInfo->Name); + _snwprintf(DevicePath, sizeof(DevicePath) / sizeof(WCHAR), + L"%s\\%s", REGSTR_KEY_ROOTENUM, KeyInfo->Name); DPRINT("Found device %S\\%s!\n", DevicePath, SubKeyInfo->Name); if (LocateChildDevice(DeviceExtension, DevicePath, SubKeyInfo->Name, &Device) == STATUS_NO_SUCH_DEVICE) {

1 0

[ekohl] 57398: [ADVAPI32] Implement LsaQuerySecurityObject and LsaSetSecurityObject.
by ekohl＠svn.reactos.org 27 Sep '12

27 Sep '12

Author: ekohl Date: Thu Sep 27 09:57:43 2012 New Revision: 57398 URL: http://svn.reactos.org/svn/reactos?rev=57398&view=rev Log: [ADVAPI32] Implement LsaQuerySecurityObject and LsaSetSecurityObject. Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/include/psdk/ntsecapi.h Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Thu Sep 27 09:57:43 2012 @@ -388,7 +388,7 @@ @ stdcall LsaQueryInfoTrustedDomain(long long long) @ stdcall LsaQueryInformationPolicy(ptr long ptr) @ stdcall LsaQuerySecret(ptr ptr ptr ptr ptr) -@ stub LsaQuerySecurityObject +@ stdcall LsaQuerySecurityObject(ptr long ptr) @ stdcall LsaQueryTrustedDomainInfo(ptr ptr long ptr) @ stdcall LsaQueryTrustedDomainInfoByName(ptr ptr long ptr) @ stdcall LsaRegisterPolicyChangeNotification(long long) @@ -401,7 +401,7 @@ @ stub LsaSetInformationTrustedDomain @ stdcall LsaSetQuotasForAccount(ptr ptr) @ stdcall LsaSetSecret(ptr ptr ptr) -@ stub LsaSetSecurityObject +@ stdcall LsaSetSecurityObject(ptr long ptr) @ stdcall LsaSetSystemAccessAccount(ptr long) @ stdcall LsaSetTrustedDomainInfoByName(ptr ptr long ptr) @ stdcall LsaSetTrustedDomainInformation(ptr ptr long ptr) Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Thu Sep 27 09:57:43 2012 @@ -1381,6 +1381,51 @@ /* + * @implemented + */ +NTSTATUS +WINAPI +LsaQuerySecurityObject(IN LSA_HANDLE ObjectHandle, + IN SECURITY_INFORMATION SecurityInformation, + OUT PSECURITY_DESCRIPTOR *SecurityDescriptor) +{ + LSAPR_SR_SECURITY_DESCRIPTOR SdBuffer; + PLSAPR_SR_SECURITY_DESCRIPTOR SdPointer; + NTSTATUS Status; + + TRACE("LsaQuerySecurityObject(%p %lx %p)\n", + ObjectHandle, SecurityInformation, SecurityDescriptor); + + SdBuffer.Length = 0; + SdBuffer.SecurityDescriptor = NULL; + + SdPointer = &SdBuffer; + + RpcTryExcept + { + Status = LsarQuerySecurityObject((LSAPR_HANDLE)ObjectHandle, + SecurityInformation, + &SdPointer); + if (NT_SUCCESS(Status)) + { + *SecurityDescriptor = SdBuffer.SecurityDescriptor; + } + else + { + *SecurityDescriptor = NULL; + } + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +/* * @unimplemented */ NTSTATUS @@ -1666,6 +1711,60 @@ */ NTSTATUS WINAPI +LsaSetSecurityObject(IN LSA_HANDLE ObjectHandle, + IN SECURITY_INFORMATION SecurityInformation, + IN PSECURITY_DESCRIPTOR SecurityDescriptor) +{ + LSAPR_SR_SECURITY_DESCRIPTOR SdBuffer = {0, NULL}; + ULONG SdLength = 0; + NTSTATUS Status; + + TRACE("LsaSetSecurityObject(%p %lx %p)\n", + ObjectHandle, SecurityInformation, SecurityDescriptor); + + Status = RtlMakeSelfRelativeSD(SecurityDescriptor, + NULL, + &SdLength); + if (Status != STATUS_BUFFER_TOO_SMALL) + return STATUS_INVALID_PARAMETER; + + SdBuffer.SecurityDescriptor = MIDL_user_allocate(SdLength); + if (SdBuffer.SecurityDescriptor == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Status = RtlMakeSelfRelativeSD(SecurityDescriptor, + (PSECURITY_DESCRIPTOR)SdBuffer.SecurityDescriptor, + &SdLength); + if (!NT_SUCCESS(Status)) + goto done; + + SdBuffer.Length = SdLength; + + RpcTryExcept + { + Status = LsarSetSecurityObject((LSAPR_HANDLE)ObjectHandle, + SecurityInformation, + &SdBuffer); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + +done: + if (SdBuffer.SecurityDescriptor != NULL) + MIDL_user_free(SdBuffer.SecurityDescriptor); + + return Status; +} + + +/* + * @implemented + */ +NTSTATUS +WINAPI LsaSetSystemAccessAccount(IN LSA_HANDLE AccountHandle, IN ULONG SystemAccess) { Modified: trunk/reactos/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] Thu Sep 27 09:57:43 2012 @@ -709,6 +709,7 @@ NTSTATUS NTAPI LsaOpenPolicy(PLSA_UNICODE_STRING,PLSA_OBJECT_ATTRIBUTES, ACCESS_MASK,PLSA_HANDLE); NTSTATUS NTAPI LsaOpenSecret(LSA_HANDLE, PLSA_UNICODE_STRING, ACCESS_MASK, PLSA_HANDLE); +NTSTATUS NTAPI LsaQuerySecurityObject(LSA_HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR*); NTSTATUS NTAPI LsaOpenTrustedDomain(LSA_HANDLE,PSID,ACCESS_MASK,PLSA_HANDLE); NTSTATUS NTAPI LsaOpenTrustedDomainByName(LSA_HANDLE,PLSA_UNICODE_STRING, ACCESS_MASK,PLSA_HANDLE); @@ -728,9 +729,10 @@ PLSA_UNICODE_STRING*); NTSTATUS NTAPI LsaSetDomainInformationPolicy(LSA_HANDLE, POLICY_DOMAIN_INFORMATION_CLASS,PVOID); -NTSTATUS NTAPI LsaSetInformationPolicy(LSA_HANDLE,POLICY_INFORMATION_CLASS, PVOID); +NTSTATUS NTAPI LsaSetInformationPolicy(LSA_HANDLE,POLICY_INFORMATION_CLASS,PVOID); NTSTATUS NTAPI LsaSetQuotasForAccount(LSA_HANDLE,PQUOTA_LIMITS); NTSTATUS NTAPI LsaSetSecret(LSA_HANDLE,PLSA_UNICODE_STRING,PLSA_UNICODE_STRING); +NTSTATUS NTAPI LsaSetSecurityObject(LSA_HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR); NTSTATUS NTAPI LsaSetSystemAccessAccount(LSA_HANDLE,ULONG); NTSTATUS NTAPI LsaSetTrustedDomainInformation(LSA_HANDLE,PSID, TRUSTED_INFORMATION_CLASS,PVOID); @@ -740,7 +742,7 @@ PLSA_UNICODE_STRING); typedef NTSTATUS (NTAPI *PSAM_PASSWORD_NOTIFICATION_ROUTINE)(PUNICODE_STRING, ULONG,PUNICODE_STRING); -typedef BOOLEAN (NTAPI *PSAM_INIT_NOTIFICATION_ROUTINE)(void); +typedef BOOLEAN (NTAPI *PSAM_INIT_NOTIFICATION_ROUTINE)(VOID); typedef BOOLEAN (NTAPI *PSAM_PASSWORD_FILTER_ROUTINE)(PUNICODE_STRING,PUNICODE_STRING, PUNICODE_STRING,BOOLEAN); #ifdef __cplusplus

1 0

[ekohl] 57397: [LSASRV] - Implement the PolicyDnsDomainInformation class of LsarQueryInformationPolicy and enable the PolicyModificationInformation class. - Add required attributes to the initializ...
by ekohl＠svn.reactos.org 26 Sep '12

26 Sep '12

Author: ekohl Date: Wed Sep 26 22:51:12 2012 New Revision: 57397 URL: http://svn.reactos.org/svn/reactos?rev=57397&view=rev Log: [LSASRV] - Implement the PolicyDnsDomainInformation class of LsarQueryInformationPolicy and enable the PolicyModificationInformation class. - Add required attributes to the initialization code. Modified: trunk/reactos/dll/win32/lsasrv/database.c trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/policy.c Modified: trunk/reactos/dll/win32/lsasrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/database.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] Wed Sep 26 22:51:12 2012 @@ -231,7 +231,7 @@ POLICY_MODIFICATION_INFO ModificationInfo; POLICY_AUDIT_FULL_QUERY_INFO AuditFullInfo = {FALSE, FALSE}; POLICY_AUDIT_LOG_INFO AuditLogInfo; - + GUID DnsDomainGuid; PLSA_DB_OBJECT PolicyObject = NULL; PSID AccountDomainSid = NULL; ULONG AuditEventsCount; @@ -255,6 +255,7 @@ AuditLogInfo.TimeToShutdown.QuadPart = 0; // LARGE_INTEGER AuditLogInfo.NextAuditRecordId = 0; // DWORD + /* Initialize the Audit Events attribute */ AuditEventsCount = AuditCategoryAccountLogon - AuditCategorySystem + 1; AuditEventsSize = sizeof(LSAP_POLICY_AUDIT_EVENTS_DATA) + AuditEventsCount * sizeof(DWORD); AuditEventsInfo = RtlAllocateHeap(RtlGetProcessHeap(), @@ -268,6 +269,9 @@ for (i = 0; i < AuditEventsCount; i++) AuditEventsInfo->AuditEvents[i] = 0; + /* Initialize the DNS Domain GUID attribute */ + memset(&DnsDomainGuid, 0, sizeof(GUID)); + /* Initialize the modification attribute */ ModificationInfo.ModifiedId.QuadPart = 0; NtQuerySystemTime(&ModificationInfo.DatabaseCreationTime); @@ -335,6 +339,24 @@ L"PolAdtEv", &AuditEventsInfo, AuditEventsSize); + + /* Set the DNS Domain Name attribute */ + LsapSetObjectAttribute(PolicyObject, + L"PolDnDDN", + NULL, + 0); + + /* Set the DNS Forest Name attribute */ + LsapSetObjectAttribute(PolicyObject, + L"PolDnTrN", + NULL, + 0); + + /* Set the DNS Domain GUID attribute */ + LsapSetObjectAttribute(PolicyObject, + L"PolDnDmG", + &DnsDomainGuid, + sizeof(GUID)); done: if (AuditEventsInfo != NULL) Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Wed Sep 26 22:51:12 2012 @@ -212,6 +212,7 @@ case PolicyLsaServerRoleInformation: case PolicyReplicaSourceInformation: case PolicyDefaultQuotaInformation: + case PolicyModificationInformation: case PolicyDnsDomainInformation: case PolicyDnsDomainInformationInt: case PolicyLocalAccountDomainInformation: Modified: trunk/reactos/dll/win32/lsasrv/policy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/policy.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/policy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/policy.c [iso-8859-1] Wed Sep 26 22:51:12 2012 @@ -612,42 +612,215 @@ PLSAPR_POLICY_INFORMATION *PolicyInformation) { PLSAPR_POLICY_DNS_DOMAIN_INFO p = NULL; + PUNICODE_STRING DomainName; + ULONG AttributeSize; + NTSTATUS Status; + + *PolicyInformation = NULL; p = MIDL_user_allocate(sizeof(LSAPR_POLICY_DNS_DOMAIN_INFO)); if (p == NULL) return STATUS_INSUFFICIENT_RESOURCES; - p->Name.Length = 0; - p->Name.MaximumLength = 0; - p->Name.Buffer = NULL; -#if 0 - p->Name.Length = wcslen(L"COMPUTERNAME"); - p->Name.MaximumLength = p->Name.Length + sizeof(WCHAR); - p->Name.Buffer = MIDL_user_allocate(p->Name.MaximumLength); + /* Primary Domain Name */ + AttributeSize = 0; + Status = LsapGetObjectAttribute(PolicyObject, + L"PolPrDmN", + NULL, + &AttributeSize); + if (!NT_SUCCESS(Status)) + { + goto done; + } + + if (AttributeSize > 0) + { + DomainName = MIDL_user_allocate(AttributeSize); + if (DomainName == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = LsapGetObjectAttribute(PolicyObject, + L"PolPrDmN", + DomainName, + &AttributeSize); + if (Status == STATUS_SUCCESS) + { + DomainName->Buffer = (LPWSTR)((ULONG_PTR)DomainName + (ULONG_PTR)DomainName->Buffer); + + TRACE("PrimaryDomainName: %wZ\n", DomainName); + + p->Name.Buffer = MIDL_user_allocate(DomainName->MaximumLength); if (p->Name.Buffer == NULL) { - MIDL_user_free(p); - return STATUS_INSUFFICIENT_RESOURCES; + MIDL_user_free(DomainName); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; } - wcscpy(p->Name.Buffer, L"COMPUTERNAME"); -#endif - - p->DnsDomainName.Length = 0; - p->DnsDomainName.MaximumLength = 0; - p->DnsDomainName.Buffer = NULL; - - p->DnsForestName.Length = 0; - p->DnsForestName.MaximumLength = 0; - p->DnsForestName.Buffer = 0; - - memset(&p->DomainGuid, 0, sizeof(GUID)); - - p->Sid = NULL; /* no domain, no workgroup */ + p->Name.Length = DomainName->Length; + p->Name.MaximumLength = DomainName->MaximumLength; + memcpy(p->Name.Buffer, + DomainName->Buffer, + DomainName->MaximumLength); + } + + MIDL_user_free(DomainName); + } + + /* Primary Domain SID */ + AttributeSize = 0; + Status = LsapGetObjectAttribute(PolicyObject, + L"PolPrDmS", + NULL, + &AttributeSize); + if (!NT_SUCCESS(Status)) + { + goto done; + } + + if (AttributeSize > 0) + { + p->Sid = MIDL_user_allocate(AttributeSize); + if (p->Sid == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = LsapGetObjectAttribute(PolicyObject, + L"PolPrDmS", + p->Sid, + &AttributeSize); + } + + /* DNS Domain Name */ + AttributeSize = 0; + Status = LsapGetObjectAttribute(PolicyObject, + L"PolDnDDN", + NULL, + &AttributeSize); + if (!NT_SUCCESS(Status)) + goto done; + + if (AttributeSize > 0) + { + DomainName = MIDL_user_allocate(AttributeSize); + if (DomainName == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = LsapGetObjectAttribute(PolicyObject, + L"PolDnDDN", + DomainName, + &AttributeSize); + if (Status == STATUS_SUCCESS) + { + DomainName->Buffer = (LPWSTR)((ULONG_PTR)DomainName + (ULONG_PTR)DomainName->Buffer); + + TRACE("DNS Domain Name: %wZ\n", DomainName); + + p->DnsDomainName.Buffer = MIDL_user_allocate(DomainName->MaximumLength); + if (p->DnsDomainName.Buffer == NULL) + { + MIDL_user_free(DomainName); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + p->DnsDomainName.Length = DomainName->Length; + p->DnsDomainName.MaximumLength = DomainName->MaximumLength; + memcpy(p->DnsDomainName.Buffer, + DomainName->Buffer, + DomainName->MaximumLength); + } + + MIDL_user_free(DomainName); + } + + /* DNS Forest Name */ + AttributeSize = 0; + Status = LsapGetObjectAttribute(PolicyObject, + L"PolDnTrN", + NULL, + &AttributeSize); + if (!NT_SUCCESS(Status)) + goto done; + + if (AttributeSize > 0) + { + DomainName = MIDL_user_allocate(AttributeSize); + if (DomainName == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = LsapGetObjectAttribute(PolicyObject, + L"PolDnTrN", + DomainName, + &AttributeSize); + if (Status == STATUS_SUCCESS) + { + DomainName->Buffer = (LPWSTR)((ULONG_PTR)DomainName + (ULONG_PTR)DomainName->Buffer); + + TRACE("DNS Forest Name: %wZ\n", DomainName); + + p->DnsForestName.Buffer = MIDL_user_allocate(DomainName->MaximumLength); + if (p->DnsForestName.Buffer == NULL) + { + MIDL_user_free(DomainName); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + p->DnsForestName.Length = DomainName->Length; + p->DnsForestName.MaximumLength = DomainName->MaximumLength; + memcpy(p->DnsForestName.Buffer, + DomainName->Buffer, + DomainName->MaximumLength); + } + + MIDL_user_free(DomainName); + } + + /* DNS Domain GUID */ + AttributeSize = sizeof(GUID); + Status = LsapGetObjectAttribute(PolicyObject, + L"PolDnDmG", + &(p->DomainGuid), + &AttributeSize); + if (!NT_SUCCESS(Status)) + goto done; *PolicyInformation = (PLSAPR_POLICY_INFORMATION)p; - return STATUS_SUCCESS; +done: + if (!NT_SUCCESS(Status)) + { + if (p) + { + if (p->Name.Buffer) + MIDL_user_free(p->Name.Buffer); + + if (p->DnsDomainName.Buffer) + MIDL_user_free(p->DnsDomainName.Buffer); + + if (p->DnsForestName.Buffer) + MIDL_user_free(p->DnsForestName.Buffer); + + if (p->Sid) + MIDL_user_free(p->Sid); + + MIDL_user_free(p); + } + } + + return Status; }

1 0

[fireball] 57396: - Final header files reshuffling. Now it compiles as it should.
by fireball＠svn.reactos.org 26 Sep '12

26 Sep '12

Author: fireball Date: Wed Sep 26 20:42:12 2012 New Revision: 57396 URL: http://svn.reactos.org/svn/reactos?rev=57396&view=rev Log: - Final header files reshuffling. Now it compiles as it should. Added: branches/arwinss/arwinss/include/wine/ (with props) branches/arwinss/arwinss/include/wine/ntrosgdi.h - copied unchanged from r57387, branches/arwinss/arwinss/include/ntrosgdi.h branches/arwinss/arwinss/include/wine/rosuser.h - copied unchanged from r57387, branches/arwinss/arwinss/include/rosuser.h branches/arwinss/arwinss/include/wine/server.h - copied unchanged from r57387, branches/arwinss/arwinss/include/server.h branches/arwinss/arwinss/include/wine/server_protocol.h - copied unchanged from r57387, branches/arwinss/arwinss/include/server_protocol.h Removed: branches/arwinss/arwinss/include/ntrosgdi.h branches/arwinss/arwinss/include/rosuser.h branches/arwinss/arwinss/include/server.h branches/arwinss/arwinss/include/server_protocol.h Modified: branches/arwinss/arwinss/client/gdi32/CMakeLists.txt branches/arwinss/arwinss/client/user32/CMakeLists.txt branches/arwinss/arwinss/client/user32/sysparams.c branches/arwinss/arwinss/client/winent.drv/CMakeLists.txt branches/arwinss/arwinss/server/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arwinss/arwinss/client/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/gdi32/CM… Modified: branches/arwinss/arwinss/client/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/C… Modified: branches/arwinss/arwinss/client/user32/sysparams.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/s… Modified: branches/arwinss/arwinss/client/winent.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/winent.d… Removed: branches/arwinss/arwinss/include/ntrosgdi.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/include/ntrosgd… Removed: branches/arwinss/arwinss/include/rosuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/include/rosuser… Removed: branches/arwinss/arwinss/include/server.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/include/server.… Removed: branches/arwinss/arwinss/include/server_protocol.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/include/server_… Modified: branches/arwinss/arwinss/server/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/CMakeLis…

1 0

[akhaldi] 57395: * Revert r57394 as per Mike's request.
by akhaldi＠svn.reactos.org 26 Sep '12

26 Sep '12

Author: akhaldi Date: Wed Sep 26 19:38:42 2012 New Revision: 57395 URL: http://svn.reactos.org/svn/reactos?rev=57395&view=rev Log: * Revert r57394 as per Mike's request. Removed: trunk/reactos/lib/3rdparty/libwin-iconv/ Modified: trunk/reactos/lib/3rdparty/CMakeLists.txt trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt Modified: trunk/reactos/lib/3rdparty/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/CMakeLists.tx… ============================================================================== --- trunk/reactos/lib/3rdparty/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/CMakeLists.txt [iso-8859-1] Wed Sep 26 19:38:42 2012 @@ -8,7 +8,6 @@ add_subdirectory(libmpg123) add_subdirectory(libsamplerate) add_subdirectory(libwine) -add_subdirectory(libwin-iconv) add_subdirectory(libxml2) # add_subdirectory(stlport) FIXME: Add proper STL support add_subdirectory(zlib) Modified: trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/CMake… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt [iso-8859-1] Wed Sep 26 19:38:42 2012 @@ -1,7 +1,5 @@ -include_directories( - include - ${REACTOS_SOURCE_DIR}/lib/3rdparty/libwin-iconv) +include_directories(include) add_definitions( -D__MINGW32__ @@ -12,8 +10,6 @@ -D_WINDOWS -DWIN32 -DHAVE_CONFIG_H - -DLIBXML_ICONV_ENABLED - -DICONV_CONST=const -D_DLL -D__USE_CRTIMP) list(APPEND SOURCE

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