Ros-diffs May 2013

ros-diffs@reactos.org

16 participants
234 discussions

[ekohl] 58900: [INCLUDE] Add missing LSA_TOKEN_INFORMATION_NULL and LSA_TOKEN_INFORMATION_V1 types.
by ekohl＠svn.reactos.org 01 May '13

01 May '13

Author: ekohl Date: Wed May 1 13:44:24 2013 New Revision: 58900 URL: http://svn.reactos.org/svn/reactos?rev=58900&view=rev Log: [INCLUDE] Add missing LSA_TOKEN_INFORMATION_NULL and LSA_TOKEN_INFORMATION_V1 types. Modified: trunk/reactos/include/psdk/ntsecpkg.h Modified: trunk/reactos/include/psdk/ntsecpkg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecpkg.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecpkg.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntsecpkg.h [iso-8859-1] Wed May 1 13:44:24 2013 @@ -60,6 +60,23 @@ } SECPKG_NAME_TYPE; /* struct definitions for SSP/AP */ +typedef struct _LSA_TOKEN_INFORMATION_NULL +{ + LARGE_INTEGER ExpirationTime; + PTOKEN_GROUPS Groups; +} LSA_TOKEN_INFORMATION_NULL, *PLSA_TOKEN_INFORMATION_NULL; + +typedef struct _LSA_TOKEN_INFORMATION_V1 +{ + LARGE_INTEGER ExpirationTime; + TOKEN_USER User; + PTOKEN_GROUPS Groups; + TOKEN_PRIMARY_GROUP PrimaryGroup; + PTOKEN_PRIVILEGES Privileges; + TOKEN_OWNER Owner; + TOKEN_DEFAULT_DACL DefaultDacl; +} LSA_TOKEN_INFORMATION_V1, *PLSA_TOKEN_INFORMATION_V1; + typedef struct _SECPKG_PRIMARY_CRED { LUID LogonId; UNICODE_STRING DownlevelName;

1 0

[pschweitzer] 58899: [NTOSKRNL] Make post stack overflow functions use the same (unimplemented) helper function
by pschweitzer＠svn.reactos.org 01 May '13

01 May '13

Author: pschweitzer Date: Wed May 1 10:54:02 2013 New Revision: 58899 URL: http://svn.reactos.org/svn/reactos?rev=58899&view=rev Log: [NTOSKRNL] Make post stack overflow functions use the same (unimplemented) helper function Modified: trunk/reactos/ntoskrnl/fsrtl/stackovf.c Modified: trunk/reactos/ntoskrnl/fsrtl/stackovf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/stackovf.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/stackovf.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/stackovf.c [iso-8859-1] Wed May 1 10:54:02 2013 @@ -11,6 +11,18 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +FsRtlpPostStackOverflow(IN PVOID Context, + IN PKEVENT Event, + IN PFSRTL_STACK_OVERFLOW_ROUTINE StackOverflowRoutine, + IN BOOLEAN IsPaging) +{ + UNIMPLEMENTED; +} /* PUBLIC FUNCTIONS **********************************************************/ @@ -37,7 +49,7 @@ IN PKEVENT Event, IN PFSRTL_STACK_OVERFLOW_ROUTINE StackOverflowRoutine) { - UNIMPLEMENTED; + FsRtlpPostStackOverflow(Context, Event, StackOverflowRoutine, TRUE); } /*++ @@ -63,7 +75,7 @@ IN PKEVENT Event, IN PFSRTL_STACK_OVERFLOW_ROUTINE StackOverflowRoutine) { - KeBugCheck(FILE_SYSTEM); + FsRtlpPostStackOverflow(Context, Event, StackOverflowRoutine, FALSE); } /* EOF */

1 0

[akhaldi] 58898: [NET] * Fix MSVC build.
by akhaldi＠svn.reactos.org 01 May '13

01 May '13

Author: akhaldi Date: Wed May 1 10:00:06 2013 New Revision: 58898 URL: http://svn.reactos.org/svn/reactos?rev=58898&view=rev Log: [NET] * Fix MSVC build. Modified: trunk/reactos/base/applications/network/net/cmdHelpMsg.c Modified: trunk/reactos/base/applications/network/net/cmdHelpMsg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdHelpMsg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdHelpMsg.c [iso-8859-1] Wed May 1 10:00:06 2013 @@ -14,12 +14,14 @@ { wchar_t *endptr; LPSTR lpBuffer; + long errNum; + if(argc<3) { puts("Usage: NET HELPMSG <Error Code>"); return 1; } - long errNum=wcstol(argv[2], &endptr, 10); + errNum = wcstol(argv[2], &endptr, 10); if(*endptr != 0) { puts("Usage: NET HELPMSG <Error Code>");

1 0

[pschweitzer] 58897: [NTOSKRNL] Patch by Aleksey Bragin (he's not aware yet!): Also implement FsRtlIs*InExpression prologue in FsRtlIsDbcsInExpression (adapted from Aleksey's work on FsRtlIsNameInE...
by pschweitzer＠svn.reactos.org 01 May '13

01 May '13

Author: pschweitzer Date: Wed May 1 09:10:34 2013 New Revision: 58897 URL: http://svn.reactos.org/svn/reactos?rev=58897&view=rev Log: [NTOSKRNL] Patch by Aleksey Bragin (he's not aware yet!): Also implement FsRtlIs*InExpression prologue in FsRtlIsDbcsInExpression (adapted from Aleksey's work on FsRtlIsNameInExpression) Also added support for Dbcs chars in it Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/dbcsname.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Wed May 1 09:10:34 2013 @@ -169,9 +169,67 @@ ASSERT(Expression->Length); ASSERT(!FsRtlDoesDbcsContainWildCards(Name)); - if (Name->Length == 0) - { - return (Expression->Length == 0); + /* Check if we were given strings at all */ + if (!Name->Length || !Expression->Length) + { + /* Return TRUE if both strings are empty, otherwise FALSE */ + if (Name->Length == 0 && Expression->Length == 0) + return TRUE; + else + return FALSE; + } + + /* Check for a shortcut: just one wildcard */ + if (Expression->Length == sizeof(CHAR)) + { + if (Expression->Buffer[0] == '*') + return TRUE; + } + + //ASSERT(FsRtlDoesDbcsContainWildCards(Expression)); + + /* Another shortcut, wildcard followed by some string */ + if (Expression->Buffer[0] == '*') + { + /* Copy Expression to our local variable */ + ANSI_STRING IntExpression = *Expression; + + /* Skip the first char */ + IntExpression.Buffer++; + IntExpression.Length -= sizeof(CHAR); + + /* Continue only if the rest of the expression does NOT contain + any more wildcards */ + if (!FsRtlDoesDbcsContainWildCards(&IntExpression)) + { + /* Check for a degenerate case */ + if (Name->Length < (Expression->Length - sizeof(CHAR))) + return FALSE; + + /* Calculate position */ + NamePosition = (Name->Length - IntExpression.Length) / sizeof(CHAR); + + /* Check whether we are breaking a two chars char (DBCS) */ + if (NlsMbOemCodePageTag) + { + MatchingChars = 0; + + while (MatchingChars < NamePosition) + { + /* Check if current char is DBCS lead char, if so, jump by two chars */ + MatchingChars += FsRtlIsLeadDbcsCharacter(Name->Buffer[MatchingChars]) ? 2 : 1; + } + + /* If so, deny */ + if (MatchingChars > NamePosition) + return FALSE; + } + + /* Compare */ + return RtlEqualMemory(IntExpression.Buffer, + (Name->Buffer + NamePosition), + IntExpression.Length); + } } while (NamePosition < Name->Length && ExpressionPosition < Expression->Length)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2013