Ros-diffs September 2012

ros-diffs@reactos.org

17 participants
236 discussions

[akhaldi] 57357: * Exclude host tools when setting the default build type.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Sep 21 14:35:19 2012 New Revision: 57357 URL: http://svn.reactos.org/svn/reactos?rev=57357&view=rev Log: * Exclude host tools when setting the default build type. Modified: trunk/reactos/CMakeLists.txt trunk/reactos/cmake/config.cmake Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=57357&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Fri Sep 21 14:35:19 2012 @@ -90,6 +90,10 @@ set(CMAKE_C_USE_RESPONSE_FILE_FOR_INCLUDES OFF) set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES OFF) endif() + + # Default to Debug for the build type + set(CMAKE_BUILD_TYPE "Debug" CACHE STRING +"Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE) # Do some cleanup file(REMOVE Modified: trunk/reactos/cmake/config.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/config.cmake?rev=573… ============================================================================== --- trunk/reactos/cmake/config.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/config.cmake [iso-8859-1] Fri Sep 21 14:35:19 2012 @@ -52,9 +52,6 @@ "Whether to compile with the KD protocol.") endif() -set(CMAKE_BUILD_TYPE "Debug" CACHE STRING -"Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE) - set(_ELF_ FALSE CACHE BOOL "Whether to compile support for ELF files. Do not enable unless you know what you're doing.")

12 years, 3 months

[akhaldi] 57356: * Make CMAKE_BUILD_TYPE default to Debug for all our builds.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Sep 21 14:29:02 2012 New Revision: 57356 URL: http://svn.reactos.org/svn/reactos?rev=57356&view=rev Log: * Make CMAKE_BUILD_TYPE default to Debug for all our builds. Modified: trunk/reactos/cmake/config.cmake Modified: trunk/reactos/cmake/config.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/config.cmake?rev=573… ============================================================================== --- trunk/reactos/cmake/config.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/config.cmake [iso-8859-1] Fri Sep 21 14:29:02 2012 @@ -52,6 +52,9 @@ "Whether to compile with the KD protocol.") endif() +set(CMAKE_BUILD_TYPE "Debug" CACHE STRING +"Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE) + set(_ELF_ FALSE CACHE BOOL "Whether to compile support for ELF files. Do not enable unless you know what you're doing.")

12 years, 3 months

[tfaber] 57355: [RTL] - Separate condition calculation in RtlVerifyVersionInfo into an extra function. Patch by Hermès Bélusca (2/X) - Don't make the Hungarian more ridiculous than it needs to be C...

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Sep 20 20:46:08 2012 New Revision: 57355 URL: http://svn.reactos.org/svn/reactos?rev=57355&view=rev Log: [RTL] - Separate condition calculation in RtlVerifyVersionInfo into an extra function. Patch by Hermès Bélusca (2/X) - Don't make the Hungarian more ridiculous than it needs to be CORE-6611 Modified: trunk/reactos/lib/rtl/version.c Modified: trunk/reactos/lib/rtl/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/version.c?rev=5735… ============================================================================== --- trunk/reactos/lib/rtl/version.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/version.c [iso-8859-1] Thu Sep 20 20:46:08 2012 @@ -3,7 +3,8 @@ * PROJECT: ReactOS system libraries * PURPOSE: Runtime code * FILE: lib/rtl/version.c - * PROGRAMER: Filip Navara + * PROGRAMERS: Filip Navara + * Hermes BELUSCA - MAITO */ /* INCLUDES *****************************************************************/ @@ -22,6 +23,10 @@ ); /* FUNCTIONS ****************************************************************/ + +static BYTE +RtlpVerGetCondition(IN ULONGLONG dwlConditionMask, + IN DWORD dwTypeBitMask); static BOOLEAN RtlpVerCompare(ULONG left, ULONG right, UCHAR condition) @@ -67,7 +72,7 @@ */ ver.dwOSVersionInfoSize = sizeof(ver); - status = RtlGetVersion( (PRTL_OSVERSIONINFOW)&ver ); + status = RtlGetVersion((PRTL_OSVERSIONINFOW)&ver); if (status != STATUS_SUCCESS) return status; if (!TypeMask || !ConditionMask) return STATUS_INVALID_PARAMETER; @@ -76,14 +81,14 @@ { comparison = RtlpVerCompare(ver.wProductType, VersionInfo->wProductType, - ConditionMask >> 7 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK); + RtlpVerGetCondition(ConditionMask, VER_PRODUCT_TYPE)); if (!comparison) return STATUS_REVISION_MISMATCH; } if (TypeMask & VER_SUITENAME) { - switch (ConditionMask >> 6 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK) + switch (RtlpVerGetCondition(ConditionMask, VER_SUITENAME)) { case VER_AND: if ((VersionInfo->wSuiteMask & ver.wSuiteMask) != VersionInfo->wSuiteMask) @@ -106,7 +111,7 @@ { comparison = RtlpVerCompare(ver.dwPlatformId, VersionInfo->dwPlatformId, - ConditionMask >> 3 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK); + RtlpVerGetCondition(ConditionMask, VER_PLATFORMID)); if (!comparison) return STATUS_REVISION_MISMATCH; } @@ -115,24 +120,21 @@ { comparison = RtlpVerCompare(ver.dwBuildNumber, VersionInfo->dwBuildNumber, - ConditionMask >> 2 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK); - if (!comparison) - return STATUS_REVISION_MISMATCH; - } - - if (TypeMask & (VER_MAJORVERSION|VER_MINORVERSION|VER_SERVICEPACKMAJOR|VER_SERVICEPACKMINOR)) - { - UCHAR condition = 0; + RtlpVerGetCondition(ConditionMask, VER_BUILDNUMBER)); + if (!comparison) + return STATUS_REVISION_MISMATCH; + } + + TypeMask &= VER_MAJORVERSION|VER_MINORVERSION|VER_SERVICEPACKMAJOR|VER_SERVICEPACKMINOR; + if (TypeMask) + { BOOLEAN do_next_check = TRUE; - - if (TypeMask & VER_MAJORVERSION) - condition = ConditionMask >> 1 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK; - else if (TypeMask & VER_MINORVERSION) - condition = ConditionMask >> 0 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK; - else if (TypeMask & VER_SERVICEPACKMAJOR) - condition = ConditionMask >> 5 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK; - else if (TypeMask & VER_SERVICEPACKMINOR) - condition = ConditionMask >> 4 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK; + /* + * Select the leading comparison operator (for example, the comparison + * operator for VER_MAJORVERSION supersedes the others for VER_MINORVERSION, + * VER_SERVICEPACKMAJOR and VER_SERVICEPACKMINOR). + */ + BYTE condition = RtlpVerGetCondition(ConditionMask, TypeMask); comparison = TRUE; if (TypeMask & VER_MAJORVERSION) @@ -171,6 +173,40 @@ } return STATUS_SUCCESS; +} + +static BYTE +RtlpVerGetCondition(IN ULONGLONG dwlConditionMask, + IN DWORD dwTypeBitMask) +{ + BYTE bConditionMask = 0; + + if (dwTypeBitMask & VER_PRODUCT_TYPE) + bConditionMask |= dwlConditionMask >> 7 * VER_NUM_BITS_PER_CONDITION_MASK; + else if (dwTypeBitMask & VER_SUITENAME) + bConditionMask |= dwlConditionMask >> 6 * VER_NUM_BITS_PER_CONDITION_MASK; + else if (dwTypeBitMask & VER_PLATFORMID) + bConditionMask |= dwlConditionMask >> 3 * VER_NUM_BITS_PER_CONDITION_MASK; + else if (dwTypeBitMask & VER_BUILDNUMBER) + bConditionMask |= dwlConditionMask >> 2 * VER_NUM_BITS_PER_CONDITION_MASK; + /* + * We choose here the lexicographical order on the 4D space + * {(Major ; Minor ; SP Major ; SP Minor)} to select the + * appropriate comparison operator. + * Therefore the following 'else if' instructions must be in this order. + */ + else if (dwTypeBitMask & VER_MAJORVERSION) + bConditionMask |= dwlConditionMask >> 1 * VER_NUM_BITS_PER_CONDITION_MASK; + else if (dwTypeBitMask & VER_MINORVERSION) + bConditionMask |= dwlConditionMask >> 0 * VER_NUM_BITS_PER_CONDITION_MASK; + else if (dwTypeBitMask & VER_SERVICEPACKMAJOR) + bConditionMask |= dwlConditionMask >> 5 * VER_NUM_BITS_PER_CONDITION_MASK; + else if (dwTypeBitMask & VER_SERVICEPACKMINOR) + bConditionMask |= dwlConditionMask >> 4 * VER_NUM_BITS_PER_CONDITION_MASK; + + bConditionMask &= VER_CONDITION_MASK; + + return bConditionMask; } /* @@ -180,32 +216,32 @@ NTAPI VerSetConditionMask(IN ULONGLONG dwlConditionMask, IN DWORD dwTypeBitMask, - IN BYTE dwConditionMask) + IN BYTE bConditionMask) { if (dwTypeBitMask == 0) return dwlConditionMask; - dwConditionMask &= VER_CONDITION_MASK; - - if (dwConditionMask == 0) + bConditionMask &= VER_CONDITION_MASK; + + if (bConditionMask == 0) return dwlConditionMask; if (dwTypeBitMask & VER_PRODUCT_TYPE) - dwlConditionMask |= dwConditionMask << 7 * VER_NUM_BITS_PER_CONDITION_MASK; + dwlConditionMask |= bConditionMask << 7 * VER_NUM_BITS_PER_CONDITION_MASK; else if (dwTypeBitMask & VER_SUITENAME) - dwlConditionMask |= dwConditionMask << 6 * VER_NUM_BITS_PER_CONDITION_MASK; + dwlConditionMask |= bConditionMask << 6 * VER_NUM_BITS_PER_CONDITION_MASK; else if (dwTypeBitMask & VER_SERVICEPACKMAJOR) - dwlConditionMask |= dwConditionMask << 5 * VER_NUM_BITS_PER_CONDITION_MASK; + dwlConditionMask |= bConditionMask << 5 * VER_NUM_BITS_PER_CONDITION_MASK; else if (dwTypeBitMask & VER_SERVICEPACKMINOR) - dwlConditionMask |= dwConditionMask << 4 * VER_NUM_BITS_PER_CONDITION_MASK; + dwlConditionMask |= bConditionMask << 4 * VER_NUM_BITS_PER_CONDITION_MASK; else if (dwTypeBitMask & VER_PLATFORMID) - dwlConditionMask |= dwConditionMask << 3 * VER_NUM_BITS_PER_CONDITION_MASK; + dwlConditionMask |= bConditionMask << 3 * VER_NUM_BITS_PER_CONDITION_MASK; else if (dwTypeBitMask & VER_BUILDNUMBER) - dwlConditionMask |= dwConditionMask << 2 * VER_NUM_BITS_PER_CONDITION_MASK; + dwlConditionMask |= bConditionMask << 2 * VER_NUM_BITS_PER_CONDITION_MASK; else if (dwTypeBitMask & VER_MAJORVERSION) - dwlConditionMask |= dwConditionMask << 1 * VER_NUM_BITS_PER_CONDITION_MASK; + dwlConditionMask |= bConditionMask << 1 * VER_NUM_BITS_PER_CONDITION_MASK; else if (dwTypeBitMask & VER_MINORVERSION) - dwlConditionMask |= dwConditionMask << 0 * VER_NUM_BITS_PER_CONDITION_MASK; + dwlConditionMask |= bConditionMask << 0 * VER_NUM_BITS_PER_CONDITION_MASK; return dwlConditionMask; }

12 years, 3 months

[tfaber] 57354: [NTOSKRNL][NTDLL][RTL][KERNEL32] - Code simplification and clarification for version-reporting functionality. Patch by Hermès Bélusca (1/X) CORE-6611

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Sep 20 19:53:14 2012 New Revision: 57354 URL: http://svn.reactos.org/svn/reactos?rev=57354&view=rev Log: [NTOSKRNL][NTDLL][RTL][KERNEL32] - Code simplification and clarification for version-reporting functionality. Patch by Hermès Bélusca (1/X) CORE-6611 Modified: trunk/reactos/dll/ntdll/rtl/version.c trunk/reactos/dll/win32/kernel32/client/version.c trunk/reactos/include/psdk/ntverp.h trunk/reactos/lib/rtl/version.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/rtl/misc.c Modified: trunk/reactos/dll/ntdll/rtl/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/version.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/version.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/rtl/version.c [iso-8859-1] Thu Sep 20 19:53:14 2012 @@ -3,7 +3,7 @@ * PROJECT: ReactOS system libraries * FILE: lib/ntdll/rtl/process.c * PURPOSE: Process functions - * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) + * PROGRAMMER: Ariadne (ariadne(a)xs4all.nl) * UPDATE HISTORY: * Created 01/11/98 */ @@ -31,9 +31,9 @@ * * NOTE * ProductType can be one of the following values: - * 1 Workstation (Winnt) - * 2 Server (Lanmannt) - * 3 Advanced Server (Servernt) + * 1 Workstation (WinNT) + * 2 Server (LanmanNT) + * 3 Advanced Server (ServerNT) * * REVISIONS * 2000-08-10 ekohl @@ -56,46 +56,48 @@ * Get the version numbers of the run time library. * * ARGUMENTS - * major [OUT] Destination for the Major version - * minor [OUT] Destination for the Minor version - * build [OUT] Destination for the Build version + * pdwMajorVersion [OUT] Destination for the Major version + * pdwMinorVersion [OUT] Destination for the Minor version + * pdwBuildNumber [OUT] Destination for the Build version * * RETURN VALUE * Nothing. * - * NOTE - * Introduced in Windows XP (NT5.1) + * NOTES + * - Introduced in Windows XP (NT 5.1) + * - Since this call didn't exist before XP, we report at least the version + * 5.1. This fixes the loading of msvcrt.dll as released with XP Home, + * which fails in DLLMain() if the major version isn't 5. * * @implemented */ -void NTAPI -RtlGetNtVersionNumbers(LPDWORD major, LPDWORD minor, LPDWORD build) +VOID NTAPI +RtlGetNtVersionNumbers(OUT LPDWORD pdwMajorVersion, + OUT LPDWORD pdwMinorVersion, + OUT LPDWORD pdwBuildNumber) { - PPEB pPeb = NtCurrentPeb(); + PPEB pPeb = NtCurrentPeb(); - if (major) - { - /* msvcrt.dll as released with XP Home fails in DLLMain() if the - * major version is not 5. So, we should never set a version < 5 ... - * This makes sense since this call didn't exist before XP anyway. - */ - *major = pPeb->OSMajorVersion < 5 ? 5 : pPeb->OSMajorVersion; - } + if (pdwMajorVersion) + { + *pdwMajorVersion = pPeb->OSMajorVersion < 5 ? 5 : pPeb->OSMajorVersion; + } - if (minor) - { - if (pPeb->OSMinorVersion <= 5) - *minor = pPeb->OSMinorVersion < 1 ? 1 : pPeb->OSMinorVersion; - else - *minor = pPeb->OSMinorVersion; - } + if (pdwMinorVersion) + { + if ( (pPeb->OSMajorVersion < 5) || + ((pPeb->OSMajorVersion == 5) && (pPeb->OSMinorVersion < 1)) ) + *pdwMinorVersion = 1; + else + *pdwMinorVersion = pPeb->OSMinorVersion; + } - if (build) - { - /* FIXME: Does anybody know the real formula? */ - *build = (0xF0000000 | pPeb->OSBuildNumber); - } + if (pdwBuildNumber) + { + /* Windows really does this! */ + *pdwBuildNumber = (0xF0000000 | pPeb->OSBuildNumber); + } } /* @@ -134,7 +136,7 @@ RTL_OSVERSIONINFOEXW *InfoEx = (RTL_OSVERSIONINFOEXW *)Info; InfoEx->wServicePackMajor = (Peb->OSCSDVersion >> 8) & 0xFF; InfoEx->wServicePackMinor = Peb->OSCSDVersion & 0xFF; - InfoEx->wSuiteMask = SharedUserData->SuiteMask; + InfoEx->wSuiteMask = SharedUserData->SuiteMask & 0xFFFF; InfoEx->wProductType = SharedUserData->NtProductType; } Modified: trunk/reactos/dll/win32/kernel32/client/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/version.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/version.c [iso-8859-1] Thu Sep 20 19:53:14 2012 @@ -73,12 +73,11 @@ GetVersion(VOID) { PPEB Peb = NtCurrentPeb(); - DWORD Result; - - Result = MAKELONG(MAKEWORD(Peb->OSMajorVersion, Peb->OSMinorVersion), - (Peb->OSPlatformId ^ 2) << 14); - Result |= LOWORD(Peb->OSBuildNumber) << 16; - return Result; + + return (DWORD)( ((Peb->OSPlatformId ^ 2) << 30) | + (Peb->OSBuildNumber << 16) | + (Peb->OSMinorVersion << 8 ) | + Peb->OSMajorVersion ); } /* Modified: trunk/reactos/include/psdk/ntverp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntverp.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/ntverp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntverp.h [iso-8859-1] Thu Sep 20 19:53:14 2012 @@ -9,7 +9,7 @@ * The VER_PRODUCTBUILD lines must contain the product * comments and end with the build#<CR><LF>. * The VER_PRODUCTBETA_STR lines must contain the product - * comments and end with "somestring"<CR><LF. + * comments and end with "somestring"<CR><LF>. * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ Modified: trunk/reactos/lib/rtl/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/version.c?rev=5735… ============================================================================== --- trunk/reactos/lib/rtl/version.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/version.c [iso-8859-1] Thu Sep 20 19:53:14 2012 @@ -1,4 +1,5 @@ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * PURPOSE: Runtime code * FILE: lib/rtl/version.c @@ -22,28 +23,25 @@ /* FUNCTIONS ****************************************************************/ -static inline NTSTATUS version_compare_values(ULONG left, ULONG right, UCHAR condition) +static BOOLEAN +RtlpVerCompare(ULONG left, ULONG right, UCHAR condition) { - switch (condition) { + switch (condition) + { case VER_EQUAL: - if (left != right) return STATUS_REVISION_MISMATCH; + return (left == right); + case VER_GREATER: + return (left > right); + case VER_GREATER_EQUAL: + return (left >= right); + case VER_LESS: + return (left < right); + case VER_LESS_EQUAL: + return (left <= right); + default: break; - case VER_GREATER: - if (left <= right) return STATUS_REVISION_MISMATCH; - break; - case VER_GREATER_EQUAL: - if (left < right) return STATUS_REVISION_MISMATCH; - break; - case VER_LESS: - if (left >= right) return STATUS_REVISION_MISMATCH; - break; - case VER_LESS_EQUAL: - if (left > right) return STATUS_REVISION_MISMATCH; - break; - default: - return STATUS_REVISION_MISMATCH; - } - return STATUS_SUCCESS; + } + return FALSE; } /* @@ -59,6 +57,7 @@ { RTL_OSVERSIONINFOEXW ver; NTSTATUS status; + BOOLEAN comparison; /* FIXME: - Check the following special case on Windows (various versions): @@ -71,81 +70,104 @@ status = RtlGetVersion( (PRTL_OSVERSIONINFOW)&ver ); if (status != STATUS_SUCCESS) return status; - if(!(TypeMask && ConditionMask)) return STATUS_INVALID_PARAMETER; - - if(TypeMask & VER_PRODUCT_TYPE) - { - status = version_compare_values(ver.wProductType, VersionInfo->wProductType, ConditionMask >> 7 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK); - if (status != STATUS_SUCCESS) - return status; - } - if(TypeMask & VER_SUITENAME) - { - switch(ConditionMask >> 6 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK) + if (!TypeMask || !ConditionMask) return STATUS_INVALID_PARAMETER; + + if (TypeMask & VER_PRODUCT_TYPE) + { + comparison = RtlpVerCompare(ver.wProductType, + VersionInfo->wProductType, + ConditionMask >> 7 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK); + if (!comparison) + return STATUS_REVISION_MISMATCH; + } + + if (TypeMask & VER_SUITENAME) + { + switch (ConditionMask >> 6 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK) { case VER_AND: - if((VersionInfo->wSuiteMask & ver.wSuiteMask) != VersionInfo->wSuiteMask) + if ((VersionInfo->wSuiteMask & ver.wSuiteMask) != VersionInfo->wSuiteMask) + { return STATUS_REVISION_MISMATCH; + } break; case VER_OR: - if(!(VersionInfo->wSuiteMask & ver.wSuiteMask) && VersionInfo->wSuiteMask) + if (!(VersionInfo->wSuiteMask & ver.wSuiteMask) && VersionInfo->wSuiteMask) + { return STATUS_REVISION_MISMATCH; + } break; default: return STATUS_INVALID_PARAMETER; } } - if(TypeMask & VER_PLATFORMID) - { - status = version_compare_values(ver.dwPlatformId, VersionInfo->dwPlatformId, ConditionMask >> 3 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK); - if (status != STATUS_SUCCESS) - return status; - } - if(TypeMask & VER_BUILDNUMBER) - { - status = version_compare_values(ver.dwBuildNumber, VersionInfo->dwBuildNumber, ConditionMask >> 2 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK); - if (status != STATUS_SUCCESS) - return status; - } - if(TypeMask & (VER_MAJORVERSION|VER_MINORVERSION|VER_SERVICEPACKMAJOR|VER_SERVICEPACKMINOR)) - { - unsigned char condition = 0; + + if (TypeMask & VER_PLATFORMID) + { + comparison = RtlpVerCompare(ver.dwPlatformId, + VersionInfo->dwPlatformId, + ConditionMask >> 3 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK); + if (!comparison) + return STATUS_REVISION_MISMATCH; + } + + if (TypeMask & VER_BUILDNUMBER) + { + comparison = RtlpVerCompare(ver.dwBuildNumber, + VersionInfo->dwBuildNumber, + ConditionMask >> 2 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK); + if (!comparison) + return STATUS_REVISION_MISMATCH; + } + + if (TypeMask & (VER_MAJORVERSION|VER_MINORVERSION|VER_SERVICEPACKMAJOR|VER_SERVICEPACKMINOR)) + { + UCHAR condition = 0; BOOLEAN do_next_check = TRUE; - if(TypeMask & VER_MAJORVERSION) + if (TypeMask & VER_MAJORVERSION) condition = ConditionMask >> 1 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK; - else if(TypeMask & VER_MINORVERSION) + else if (TypeMask & VER_MINORVERSION) condition = ConditionMask >> 0 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK; - else if(TypeMask & VER_SERVICEPACKMAJOR) + else if (TypeMask & VER_SERVICEPACKMAJOR) condition = ConditionMask >> 5 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK; - else if(TypeMask & VER_SERVICEPACKMINOR) + else if (TypeMask & VER_SERVICEPACKMINOR) condition = ConditionMask >> 4 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK; - if(TypeMask & VER_MAJORVERSION) - { - status = version_compare_values(ver.dwMajorVersion, VersionInfo->dwMajorVersion, condition); + comparison = TRUE; + if (TypeMask & VER_MAJORVERSION) + { + comparison = RtlpVerCompare(ver.dwMajorVersion, + VersionInfo->dwMajorVersion, + condition); do_next_check = (ver.dwMajorVersion == VersionInfo->dwMajorVersion) && - ((condition != VER_EQUAL) || (status == STATUS_SUCCESS)); - } - if((TypeMask & VER_MINORVERSION) && do_next_check) - { - status = version_compare_values(ver.dwMinorVersion, VersionInfo->dwMinorVersion, condition); + ((condition != VER_EQUAL) || comparison); + } + if ((TypeMask & VER_MINORVERSION) && do_next_check) + { + comparison = RtlpVerCompare(ver.dwMinorVersion, + VersionInfo->dwMinorVersion, + condition); do_next_check = (ver.dwMinorVersion == VersionInfo->dwMinorVersion) && - ((condition != VER_EQUAL) || (status == STATUS_SUCCESS)); - } - if((TypeMask & VER_SERVICEPACKMAJOR) && do_next_check) - { - status = version_compare_values(ver.wServicePackMajor, VersionInfo->wServicePackMajor, condition); + ((condition != VER_EQUAL) || comparison); + } + if ((TypeMask & VER_SERVICEPACKMAJOR) && do_next_check) + { + comparison = RtlpVerCompare(ver.wServicePackMajor, + VersionInfo->wServicePackMajor, + condition); do_next_check = (ver.wServicePackMajor == VersionInfo->wServicePackMajor) && - ((condition != VER_EQUAL) || (status == STATUS_SUCCESS)); - } - if((TypeMask & VER_SERVICEPACKMINOR) && do_next_check) - { - status = version_compare_values(ver.wServicePackMinor, VersionInfo->wServicePackMinor, condition); - } - - if (status != STATUS_SUCCESS) - return status; + ((condition != VER_EQUAL) || comparison); + } + if ((TypeMask & VER_SERVICEPACKMINOR) && do_next_check) + { + comparison = RtlpVerCompare(ver.wServicePackMinor, + VersionInfo->wServicePackMinor, + condition); + } + + if (!comparison) + return STATUS_REVISION_MISMATCH; } return STATUS_SUCCESS; Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=573… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Thu Sep 20 19:53:14 2012 @@ -1077,15 +1077,16 @@ CmGetSystemControlValues(LoaderBlock->RegistryBase, CmControlVector); /* Load static defaults for Service Pack 1 and add our SVN revision */ + /* Format of CSD : SPMajor - SPMinor */ CmNtCSDVersion = 0x100 | (KERNEL_VERSION_BUILD_HEX << 16); CmNtCSDReleaseType = 0; /* Set Service Pack data for Service Pack 1 */ - CmNtSpBuildNumber = 1830; + CmNtSpBuildNumber = VER_PRODUCTBUILD_QFE; if (!(CmNtCSDVersion & 0xFFFF0000)) { /* Check the release type */ - if (CmNtCSDReleaseType == 1) CmNtSpBuildNumber |= 1830 << 16; + if (CmNtCSDReleaseType == 1) CmNtSpBuildNumber |= VER_PRODUCTBUILD_QFE << 16; } /* Add loaded CmNtGlobalFlag value */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Thu Sep 20 19:53:14 2012 @@ -2398,7 +2398,7 @@ } else { - /* Check for LanMan server */ + /* Check for LanMan server (La for LanmanNT) */ if (MmProductType == '\0a\0L') { /* This is a domain controller */ @@ -2406,7 +2406,7 @@ } else { - /* Otherwise it must be a normal server */ + /* Otherwise it must be a normal server (Se for ServerNT) */ SharedUserData->NtProductType = NtProductServer; } Modified: trunk/reactos/ntoskrnl/rtl/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/misc.c?rev=57… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/misc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/misc.c [iso-8859-1] Thu Sep 20 19:53:14 2012 @@ -67,7 +67,7 @@ RTL_OSVERSIONINFOEXW *InfoEx = (RTL_OSVERSIONINFOEXW *)lpVersionInformation; InfoEx->wServicePackMajor = (USHORT)(CmNtCSDVersion >> 8) & 0xFF; InfoEx->wServicePackMinor = (USHORT)(CmNtCSDVersion & 0xFF); - InfoEx->wSuiteMask = (USHORT)SharedUserData->SuiteMask; + InfoEx->wSuiteMask = (USHORT)(SharedUserData->SuiteMask & 0xFFFF); InfoEx->wProductType = SharedUserData->NtProductType; }

12 years, 3 months

[tfaber] 57353: [QMGR_WINETESTS] - Skip all qmgr tests because they cause timeouts on testbot. This should hopefully be fixed soon and they can be re-enabled. CORE-6536

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Sep 20 15:41:32 2012 New Revision: 57353 URL: http://svn.reactos.org/svn/reactos?rev=57353&view=rev Log: [QMGR_WINETESTS] - Skip all qmgr tests because they cause timeouts on testbot. This should hopefully be fixed soon and they can be re-enabled. CORE-6536 Modified: trunk/rostests/winetests/qmgr/testlist.c Modified: trunk/rostests/winetests/qmgr/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qmgr/testlist.c… ============================================================================== --- trunk/rostests/winetests/qmgr/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/qmgr/testlist.c [iso-8859-1] Thu Sep 20 15:41:32 2012 @@ -6,18 +6,27 @@ #define STANDALONE #include "wine/test.h" +extern void func_enum_files(void); +extern void func_enum_jobs(void); +extern void func_file(void); +extern void func_job(void); extern void func_qmgr(void); -extern void func_job(void); -extern void func_file(void); -extern void func_enum_jobs(void); -extern void func_enum_files(void); + +#ifdef __REACTOS__ +void func_skipped(void) { skip("qmgr tests skipped due to CORE-6536\n"); } +#endif const struct test winetest_testlist[] = { +/* Skipped because of testbot timeouts. See CORE-6536. */ +#ifdef __REACTOS__ + { "skipped", func_skipped }, +#else + { "enum_files", func_enum_files }, + { "enum_jobs", func_enum_jobs }, + { "file", func_file }, + { "job", func_job }, { "qmgr", func_qmgr }, - { "job", func_job }, - { "file", func_file }, - { "enum_jobs", func_enum_jobs }, - { "enum_files", func_enum_files }, +#endif { 0, 0 } };

12 years, 3 months

[ekohl] 57352: [ADVAPI32/LSASRV] Implement LsaQuerySecret/LsarQuerySecret. Does not work due to bugs in widl.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Sep 20 13:44:24 2012 New Revision: 57352 URL: http://svn.reactos.org/svn/reactos?rev=57352&view=rev Log: [ADVAPI32/LSASRV] Implement LsaQuerySecret/LsarQuerySecret. Does not work due to bugs in widl. Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/dll/win32/lsasrv/lsarpc.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 20 13:44:24 2012 @@ -387,7 +387,7 @@ @ stdcall LsaQueryForestTrustInformation(ptr ptr ptr) @ stdcall LsaQueryInfoTrustedDomain(long long long) @ stdcall LsaQueryInformationPolicy(ptr long ptr) -@ stub LsaQuerySecret +@ stdcall LsaQuerySecret(ptr ptr ptr ptr ptr) @ stub LsaQuerySecurityObject @ stdcall LsaQueryTrustedDomainInfo(ptr ptr long ptr) @ stdcall LsaQueryTrustedDomainInfoByName(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 20 13:44:24 2012 @@ -968,6 +968,125 @@ */ NTSTATUS WINAPI +LsaQuerySecret(IN LSA_HANDLE SecretHandle, + OUT PLSA_UNICODE_STRING *CurrentValue OPTIONAL, + OUT PLARGE_INTEGER CurrentValueSetTime OPTIONAL, + OUT PLSA_UNICODE_STRING *OldValue OPTIONAL, + OUT PLARGE_INTEGER OldValueSetTime OPTIONAL) +{ + PLSAPR_CR_CIPHER_VALUE EncryptedCurrentValue = NULL; + PLSAPR_CR_CIPHER_VALUE EncryptedOldValue = NULL; + PLSA_UNICODE_STRING DecryptedCurrentValue = NULL; + PLSA_UNICODE_STRING DecryptedOldValue = NULL; + SIZE_T BufferSize; + NTSTATUS Status; + + RpcTryExcept + { + Status = LsarQuerySecret((PLSAPR_HANDLE)SecretHandle, + &EncryptedCurrentValue, + CurrentValueSetTime, + &EncryptedOldValue, + OldValueSetTime); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + if (!NT_SUCCESS(Status)) + goto done; + + /* Decrypt the current value */ + if (CurrentValue != NULL) + { + if (EncryptedCurrentValue == NULL) + { + *CurrentValue = NULL; + } + else + { + /* FIXME: Decrypt the current value */ + BufferSize = sizeof(LSA_UNICODE_STRING) + EncryptedCurrentValue->MaximumLength; + DecryptedCurrentValue = midl_user_allocate(BufferSize); + if (DecryptedCurrentValue == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + DecryptedCurrentValue->Length = (USHORT)EncryptedCurrentValue->Length; + DecryptedCurrentValue->MaximumLength = (USHORT)EncryptedCurrentValue->MaximumLength; + DecryptedCurrentValue->Buffer = (PWSTR)(DecryptedCurrentValue + 1); + RtlCopyMemory(DecryptedCurrentValue->Buffer, + EncryptedCurrentValue->Buffer, + EncryptedCurrentValue->Length); + + *CurrentValue = DecryptedCurrentValue; + } + } + + /* Decrypt the old value */ + if (OldValue != NULL) + { + if (EncryptedOldValue == NULL) + { + *OldValue = NULL; + } + else + { + /* FIXME: Decrypt the old value */ + BufferSize = sizeof(LSA_UNICODE_STRING) + EncryptedOldValue->MaximumLength; + DecryptedOldValue = midl_user_allocate(BufferSize); + if (DecryptedOldValue == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + DecryptedOldValue->Length = (USHORT)EncryptedOldValue->Length; + DecryptedOldValue->MaximumLength = (USHORT)EncryptedOldValue->MaximumLength; + DecryptedOldValue->Buffer = (PWSTR)(DecryptedOldValue + 1); + RtlCopyMemory(DecryptedOldValue->Buffer, + EncryptedOldValue->Buffer, + EncryptedOldValue->Length); + + *OldValue = DecryptedOldValue; + } + } + +done: + if (!NT_SUCCESS(Status)) + { + if (DecryptedCurrentValue != NULL) + midl_user_free(DecryptedCurrentValue); + + if (DecryptedOldValue != NULL) + midl_user_free(DecryptedOldValue); + + if (CurrentValue != NULL) + *CurrentValue = NULL; + + if (OldValue != NULL) + *OldValue = NULL; + } + + if (EncryptedCurrentValue != NULL) + midl_user_free(EncryptedCurrentValue); + + if (EncryptedOldValue != NULL) + midl_user_free(EncryptedOldValue); + + return Status; +} + + +/* + * @unimplemented + */ +NTSTATUS +WINAPI LsaQueryTrustedDomainInfo( LSA_HANDLE PolicyHandle, PSID TrustedDomainSid, 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] Thu Sep 20 13:44:24 2012 @@ -1262,6 +1262,9 @@ LARGE_INTEGER Time; NTSTATUS Status; + TRACE("LsarSetSecret(%p %p %p)\n", SecretHandle, + EncryptedCurrentValue, EncryptedOldValue); + /* Validate the SecretHandle */ Status = LsapValidateDbObject(SecretHandle, LsaDbSecretObject, @@ -1351,8 +1354,175 @@ PLSAPR_CR_CIPHER_VALUE *EncryptedOldValue, PLARGE_INTEGER OldValueSetTime) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PLSA_DB_OBJECT SecretObject; + PLSAPR_CR_CIPHER_VALUE EncCurrentValue = NULL; + PLSAPR_CR_CIPHER_VALUE EncOldValue = NULL; + PBYTE CurrentValue = NULL; + PBYTE OldValue = NULL; + ULONG CurrentValueLength = 0; + ULONG OldValueLength = 0; + ULONG BufferSize; + NTSTATUS Status; + + TRACE("LsarQuerySecret(%p %p %p %p %p)\n", SecretHandle, + EncryptedCurrentValue, CurrentValueSetTime, + EncryptedOldValue, OldValueSetTime); + + /* Validate the SecretHandle */ + Status = LsapValidateDbObject(SecretHandle, + LsaDbSecretObject, + SECRET_QUERY_VALUE, + &SecretObject); + if (!NT_SUCCESS(Status)) + { + ERR("LsapValidateDbObject returned 0x%08lx\n", Status); + return Status; + } + + if (EncryptedCurrentValue != NULL) + { + CurrentValueLength = 0; + + /* Get the size of the current value */ + Status = LsapGetObjectAttribute(SecretObject, + L"CurrentValue", + NULL, + &CurrentValueLength); + if (!NT_SUCCESS(Status)) + goto done; + + /* Allocate a buffer for the current value */ + CurrentValue = midl_user_allocate(CurrentValueLength); + if (CurrentValue == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + /* Get the current value */ + Status = LsapGetObjectAttribute(SecretObject, + L"CurrentValue", + CurrentValue, + &CurrentValueLength); + if (!NT_SUCCESS(Status)) + goto done; + + /* Allocate a buffer for the encrypted current value */ + EncCurrentValue = midl_user_allocate(sizeof(LSAPR_CR_CIPHER_VALUE)); + if (EncCurrentValue == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + /* FIXME: Encrypt the current value */ + EncCurrentValue->Length = (USHORT)(CurrentValueLength - sizeof(WCHAR)); + EncCurrentValue->MaximumLength = (USHORT)CurrentValueLength; + EncCurrentValue->Buffer = (PBYTE)CurrentValue; + } + + if (CurrentValueSetTime != NULL) + { + BufferSize = sizeof(LARGE_INTEGER); + + /* Get the current value time */ + Status = LsapGetObjectAttribute(SecretObject, + L"CurrentTime", + (PBYTE)CurrentValueSetTime, + &BufferSize); + if (!NT_SUCCESS(Status)) + goto done; + } + + if (EncryptedOldValue != NULL) + { + OldValueLength = 0; + + /* Get the size of the old value */ + Status = LsapGetObjectAttribute(SecretObject, + L"OldValue", + NULL, + &OldValueLength); + if (!NT_SUCCESS(Status)) + goto done; + + /* Allocate a buffer for the old value */ + OldValue = midl_user_allocate(OldValueLength); + if (OldValue == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + /* Get the old value */ + Status = LsapGetObjectAttribute(SecretObject, + L"OldValue", + OldValue, + &OldValueLength); + if (!NT_SUCCESS(Status)) + goto done; + + /* Allocate a buffer for the encrypted old value */ + EncOldValue = midl_user_allocate(sizeof(LSAPR_CR_CIPHER_VALUE) + OldValueLength); + if (EncOldValue == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + /* FIXME: Encrypt the old value */ + EncOldValue->Length = (USHORT)(OldValueLength - sizeof(WCHAR)); + EncOldValue->MaximumLength = (USHORT)OldValueLength; + EncOldValue->Buffer = (PBYTE)OldValue; + } + + if (OldValueSetTime != NULL) + { + BufferSize = sizeof(LARGE_INTEGER); + + /* Get the old value time */ + Status = LsapGetObjectAttribute(SecretObject, + L"OldTime", + (PBYTE)OldValueSetTime, + &BufferSize); + if (!NT_SUCCESS(Status)) + goto done; + } + + +done: + if (NT_SUCCESS(Status)) + { + if (EncryptedCurrentValue != NULL) + *EncryptedCurrentValue = EncCurrentValue; + + if (EncryptedOldValue != NULL) + *EncryptedOldValue = EncOldValue; + } + else + { + if (EncryptedCurrentValue != NULL) + *EncryptedCurrentValue = NULL; + + if (EncryptedOldValue != NULL) + *EncryptedOldValue = NULL; + + if (EncCurrentValue != NULL) + midl_user_free(EncCurrentValue); + + if (EncOldValue != NULL) + midl_user_free(EncOldValue); + + if (CurrentValue != NULL) + midl_user_free(CurrentValue); + + if (OldValue != NULL) + midl_user_free(OldValue); + } + + TRACE("LsarQuerySecret done (Status 0x%08lx)\n", Status); + + return Status; } 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 20 13:44:24 2012 @@ -721,6 +721,8 @@ NTSTATUS NTAPI LsaQueryInformationPolicy(LSA_HANDLE,POLICY_INFORMATION_CLASS,PVOID*); NTSTATUS NTAPI LsaQueryLocalInformationPolicy(LSA_HANDLE, POLICY_LOCAL_INFORMATION_CLASS,PVOID*); +NTSTATUS NTAPI LsaQuerySecret(LSA_HANDLE,PLSA_UNICODE_STRING*,PLARGE_INTEGER, + PLSA_UNICODE_STRING*,PLARGE_INTEGER); NTSTATUS NTAPI LsaQueryTrustedDomainInfo(LSA_HANDLE,PSID, TRUSTED_INFORMATION_CLASS,PVOID*); NTSTATUS NTAPI LsaQueryTrustedDomainInfoByName(LSA_HANDLE,PLSA_UNICODE_STRING,

12 years, 3 months

[ekohl] 57351: [LSASRV] LsarSetInfromationPolicy: Check desired access depending on the information class. LsarLookupPrivilegeValue / LsarLookupPrivilegeName: Check desired access.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Sep 20 11:29:45 2012 New Revision: 57351 URL: http://svn.reactos.org/svn/reactos?rev=57351&view=rev Log: [LSASRV] LsarSetInfromationPolicy: Check desired access depending on the information class. LsarLookupPrivilegeValue / LsarLookupPrivilegeName: Check desired access. Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c 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] Thu Sep 20 11:29:45 2012 @@ -278,6 +278,7 @@ PLSAPR_POLICY_INFORMATION PolicyInformation) { PLSA_DB_OBJECT DbObject; + ACCESS_MASK DesiredAccess = 0; NTSTATUS Status; TRACE("LsarSetInformationPolicy(%p,0x%08x,%p)\n", @@ -288,9 +289,39 @@ TRACE("*PolicyInformation %p\n", *PolicyInformation); } + switch (InformationClass) + { + case PolicyAuditLogInformation: + case PolicyAuditFullSetInformation: + DesiredAccess = POLICY_AUDIT_LOG_ADMIN; + break; + + case PolicyAuditEventsInformation: + DesiredAccess = POLICY_SET_AUDIT_REQUIREMENTS; + break; + + case PolicyPrimaryDomainInformation: + case PolicyAccountDomainInformation: + DesiredAccess = POLICY_TRUST_ADMIN; + break; + + case PolicyLsaServerRoleInformation: + case PolicyReplicaSourceInformation: + DesiredAccess = POLICY_SERVER_ADMIN; + break; + + case PolicyDefaultQuotaInformation: + DesiredAccess = POLICY_SET_DEFAULT_QUOTA_LIMITS; + break; + + default: + ERR("Invalid InformationClass!\n"); + return STATUS_INVALID_PARAMETER; + } + Status = LsapValidateDbObject(PolicyHandle, LsaDbPolicyObject, - 0, /* FIXME */ + DesiredAccess, &DbObject); if (!NT_SUCCESS(Status)) return Status; @@ -1338,7 +1369,7 @@ Status = LsapValidateDbObject(PolicyHandle, LsaDbPolicyObject, - 0, /* FIXME */ + POLICY_LOOKUP_NAMES, NULL); if (!NT_SUCCESS(Status)) { @@ -1368,7 +1399,7 @@ Status = LsapValidateDbObject(PolicyHandle, LsaDbPolicyObject, - 0, /* FIXME */ + POLICY_LOOKUP_NAMES, NULL); if (!NT_SUCCESS(Status)) {

12 years, 3 months

[osiejka] 57350: [TRANSLATION] - hungarian calc translation by Nagy Tibor(xnagytibor at gmail dot com); CORE-6511 #resolve #comment Commited. Thanks for your work - dutch rapps translation update b...

by osiejka＠svn.reactos.org

Author: osiejka Date: Thu Sep 20 11:15:16 2012 New Revision: 57350 URL: http://svn.reactos.org/svn/reactos?rev=57350&view=rev Log: [TRANSLATION] - hungarian calc translation by Nagy Tibor(xnagytibor at gmail dot com); CORE-6511 #resolve #comment Commited. Thanks for your work - dutch rapps translation update by stijnsanders (stijn at yoy dot be); CORE-6540 #resolve #comment Commited. Thanks for your work Added: trunk/reactos/base/applications/calc/lang/hu-HU.rc (with props) Modified: trunk/reactos/base/applications/calc/resource.rc trunk/reactos/base/applications/rapps/rapps/7zip.txt trunk/reactos/base/applications/rapps/rapps/abiword.txt trunk/reactos/base/applications/rapps/rapps/abiword28x.txt trunk/reactos/base/applications/rapps/rapps/abyss.txt trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt trunk/reactos/base/applications/rapps/rapps/audiograbber.txt trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt trunk/reactos/base/applications/rapps/rapps/diablo2.txt trunk/reactos/base/applications/rapps/rapps/dosblaster.txt trunk/reactos/base/applications/rapps/rapps/doublecommander.txt trunk/reactos/base/applications/rapps/rapps/fap.txt trunk/reactos/base/applications/rapps/rapps/firefox2.txt trunk/reactos/base/applications/rapps/rapps/firefox3.txt trunk/reactos/base/applications/rapps/rapps/firefox36.txt trunk/reactos/base/applications/rapps/rapps/firefox5.txt trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt trunk/reactos/base/applications/rapps/rapps/irfanview.txt trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt trunk/reactos/base/applications/rapps/rapps/kdewin.txt trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt trunk/reactos/base/applications/rapps/rapps/lgeneral.txt trunk/reactos/base/applications/rapps/rapps/libreoffice.txt trunk/reactos/base/applications/rapps/rapps/lmarbles.txt trunk/reactos/base/applications/rapps/rapps/mfc40.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/mirc.txt trunk/reactos/base/applications/rapps/rapps/mirc6.txt trunk/reactos/base/applications/rapps/rapps/mpc.txt trunk/reactos/base/applications/rapps/rapps/msxml3.txt trunk/reactos/base/applications/rapps/rapps/offbyone.txt trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt trunk/reactos/base/applications/rapps/rapps/openttd.txt trunk/reactos/base/applications/rapps/rapps/opera.txt trunk/reactos/base/applications/rapps/rapps/opera9.txt trunk/reactos/base/applications/rapps/rapps/putty.txt trunk/reactos/base/applications/rapps/rapps/python.txt trunk/reactos/base/applications/rapps/rapps/python3.txt trunk/reactos/base/applications/rapps/rapps/remood.txt trunk/reactos/base/applications/rapps/rapps/rosbe.txt trunk/reactos/base/applications/rapps/rapps/rosbeamd64.txt trunk/reactos/base/applications/rapps/rapps/rosbearm.txt trunk/reactos/base/applications/rapps/rapps/sambatng.txt trunk/reactos/base/applications/rapps/rapps/sbforvmware.txt trunk/reactos/base/applications/rapps/rapps/scite.txt trunk/reactos/base/applications/rapps/rapps/scummvm.txt trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt trunk/reactos/base/applications/rapps/rapps/seamonkey.txt trunk/reactos/base/applications/rapps/rapps/smplayer.txt trunk/reactos/base/applications/rapps/rapps/steam.txt trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt trunk/reactos/base/applications/rapps/rapps/superfinder.txt trunk/reactos/base/applications/rapps/rapps/tahoma.txt trunk/reactos/base/applications/rapps/rapps/thunderbird.txt trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt trunk/reactos/base/applications/rapps/rapps/tileworld.txt trunk/reactos/base/applications/rapps/rapps/totalcommander.txt trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt trunk/reactos/base/applications/rapps/rapps/ultravnc.txt trunk/reactos/base/applications/rapps/rapps/utorrent.txt trunk/reactos/base/applications/rapps/rapps/vb5run.txt trunk/reactos/base/applications/rapps/rapps/vb6run.txt trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt trunk/reactos/base/applications/rapps/rapps/vc2008sp1run.txt trunk/reactos/base/applications/rapps/rapps/vc6run.txt trunk/reactos/base/applications/rapps/rapps/vlc.txt trunk/reactos/base/applications/rapps/rapps/winboard.txt trunk/reactos/base/applications/rapps/rapps/wme9.txt [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/base/applications/calc/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/abiword.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/abiword28x.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/abyss.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/audiograbber.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/diablo2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/dosblaster.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/doublecommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/fap.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/firefox2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/firefox3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/firefox36.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/firefox5.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/kdewin.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/lgeneral.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/lmarbles.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mfc40.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mirc6.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/msxml3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/offbyone.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/opera9.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/putty.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/python.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/python3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/remood.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/rosbeamd64.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/rosbearm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/sambatng.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/sbforvmware.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/steam.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/superfinder.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/tahoma.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/tileworld.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/totalcommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/vb5run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/vb6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/vc2008sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/vc6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/winboard.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/wme9.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…

12 years, 3 months

[ion] 57349: [NTOSKRNL] Typo fail, real fix.

by ion＠svn.reactos.org

Author: ion Date: Thu Sep 20 08:20:24 2012 New Revision: 57349 URL: http://svn.reactos.org/svn/reactos?rev=57349&view=rev Log: [NTOSKRNL] Typo fail, real fix. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Thu Sep 20 08:20:24 2012 @@ -172,7 +172,7 @@ /* Now get the session-specific page table for this address */ SessionAddress = MiPteToAddress(Address); - PointerPde = MiAddressToPde(Address); + PointerPde = MiAddressToPte(Address); if (PointerPde->u.Hard.Valid) return STATUS_WAIT_1; /* It's not valid, so find it in the page table array */

12 years, 3 months

[ion] 57348: [NTOSKRNL]: CORE-6675 #resolve #time 5h #comment Fixed the ASSERTion by increasing system view space to 36MB instead of 20MB. Note that the real bug is that we never free desktop heaps...

by ion＠svn.reactos.org

Author: ion Date: Thu Sep 20 07:44:43 2012 New Revision: 57348 URL: http://svn.reactos.org/svn/reactos?rev=57348&view=rev Log: [NTOSKRNL]: CORE-6675 #resolve #time 5h #comment Fixed the ASSERTion by increasing system view space to 36MB instead of 20MB. Note that the real bug is that we never free desktop heaps. But why fix the bug when the only thing people care about is "fix the tests!". So let's fix the tests instead of the bug :) Also, fix a bug in MiCheckForSessionPde which broke user32_apitest. All should be good now. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Thu Sep 20 07:44:43 2012 @@ -153,7 +153,7 @@ { MMPTE TempPde; PMMPTE PointerPde; - PVOID SessionPageTable; + PVOID SessionAddress; ULONG Index; /* Is this a session PTE? */ @@ -171,12 +171,12 @@ } /* Now get the session-specific page table for this address */ - SessionPageTable = MiPteToAddress(Address); - PointerPde = MiPteToAddress(Address); + SessionAddress = MiPteToAddress(Address); + PointerPde = MiAddressToPde(Address); if (PointerPde->u.Hard.Valid) return STATUS_WAIT_1; /* It's not valid, so find it in the page table array */ - Index = ((ULONG_PTR)SessionPageTable - (ULONG_PTR)MmSessionBase) >> 22; + Index = ((ULONG_PTR)SessionAddress - (ULONG_PTR)MmSessionBase) >> 22; TempPde.u.Long = MmSessionSpace->PageTables[Index].u.Long; if (TempPde.u.Hard.Valid) { @@ -187,7 +187,7 @@ /* We don't seem to have allocated a page table for this address yet? */ DbgPrint("MiCheckPdeForSessionSpace: No Session PDE for PTE %p, %p\n", - PointerPde->u.Long, SessionPageTable); + PointerPde->u.Long, SessionAddress); DbgBreakPoint(); return STATUS_ACCESS_VIOLATION; }

12 years, 3 months

← Newer
1
...
7
8
9
10
11
12
13
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2012