Ros-diffs July 2013

ros-diffs@reactos.org

13 participants
199 discussions

[ekohl] 59594: [SAMSRV] Use a common routine to check all account names.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jul 28 22:18:42 2013 New Revision: 59594 URL: http://svn.reactos.org/svn/reactos?rev=59594&view=rev Log: [SAMSRV] Use a common routine to check all account names. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/dll/win32/samsrv/utils.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sun Jul 28 22:18:42 2013 @@ -1756,6 +1756,14 @@ return Status; } + /* Check the group account name */ + Status = SampCheckAccountName(Name, 256); + if (!NT_SUCCESS(Status)) + { + TRACE("SampCheckAccountName failed (Status 0x%08lx)\n", Status); + return Status; + } + /* Check if the group name already exists in the domain */ Status = SampCheckAccountNameInDomain(DomainObject, Name->Buffer); @@ -2128,10 +2136,12 @@ return Status; } - if (Name->Length > 20 * sizeof(WCHAR)) - { - TRACE("User name is too long!\n"); - return STATUS_INVALID_ACCOUNT_NAME; + /* Check the user account name */ + Status = SampCheckAccountName(Name, 20); + if (!NT_SUCCESS(Status)) + { + TRACE("SampCheckAccountName failed (Status 0x%08lx)\n", Status); + return Status; } /* Check if the user name already exists in the domain */ @@ -2691,6 +2701,14 @@ return Status; } + /* Check the alias acoount name */ + Status = SampCheckAccountName(AccountName, 256); + if (!NT_SUCCESS(Status)) + { + TRACE("SampCheckAccountName failed (Status 0x%08lx)\n", Status); + return Status; + } + /* Check if the alias name already exists in the domain */ Status = SampCheckAccountNameInDomain(DomainObject, AccountName->Buffer); @@ -3985,6 +4003,14 @@ goto done; } + /* Check the new account name */ + Status = SampCheckAccountName(&Buffer->Name.Name, 256); + if (!NT_SUCCESS(Status)) + { + TRACE("SampCheckAccountName failed (Status 0x%08lx)\n", Status); + return Status; + } + NewGroupName.Length = Buffer->Name.Name.Length; NewGroupName.MaximumLength = Buffer->Name.Name.MaximumLength; NewGroupName.Buffer = Buffer->Name.Name.Buffer; @@ -4710,6 +4736,14 @@ { TRACE("SampGetObjectAttributeString failed (Status 0x%08lx)\n", Status); goto done; + } + + /* Check the new account name */ + Status = SampCheckAccountName(&Buffer->Name.Name, 256); + if (!NT_SUCCESS(Status)) + { + TRACE("SampCheckAccountName failed (Status 0x%08lx)\n", Status); + return Status; } NewAliasName.Length = Buffer->Name.Name.Length; @@ -6763,6 +6797,14 @@ { UNICODE_STRING OldUserName = {0, 0, NULL}; NTSTATUS Status; + + /* Check the account name */ + Status = SampCheckAccountName(NewUserName, 20); + if (!NT_SUCCESS(Status)) + { + TRACE("SampCheckAccountName failed (Status 0x%08lx)\n", Status); + return Status; + } Status = SampGetObjectAttributeString(UserObject, L"Name", @@ -8097,10 +8139,12 @@ return Status; } - if (Name->Length > 20 * sizeof(WCHAR)) - { - TRACE("User name is too long!\n"); - return STATUS_INVALID_ACCOUNT_NAME; + /* Check the user account name */ + Status = SampCheckAccountName(Name, 20); + if (!NT_SUCCESS(Status)) + { + TRACE("SampCheckAccountName failed (Status 0x%08lx)\n", Status); + return Status; } /* Check if the user name already exists in the domain */ Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Sun Jul 28 22:18:42 2013 @@ -388,6 +388,10 @@ SampGetRidFromSid(IN PSID Sid, OUT PULONG Rid); +NTSTATUS +SampCheckAccountName(IN PRPC_UNICODE_STRING AccountName, + IN USHORT MaxLength); + /* Undocumented advapi32 functions */ Modified: trunk/reactos/dll/win32/samsrv/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/utils.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/utils.c [iso-8859-1] Sun Jul 28 22:18:42 2013 @@ -155,4 +155,15 @@ return STATUS_SUCCESS; } + +NTSTATUS +SampCheckAccountName(IN PRPC_UNICODE_STRING AccountName, + IN USHORT MaxLength) +{ + if (AccountName->Length > MaxLength * sizeof(WCHAR)) + return STATUS_INVALID_ACCOUNT_NAME; + + return STATUS_SUCCESS; +} + /* EOF */

11 years, 4 months

[akhaldi] 59593: [RSYM] * Speedup FindOrAddString(). Brought to you by Art Yerkes (arty).

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 28 20:37:51 2013 New Revision: 59593 URL: http://svn.reactos.org/svn/reactos?rev=59593&view=rev Log: [RSYM] * Speedup FindOrAddString(). Brought to you by Art Yerkes (arty). Modified: trunk/reactos/tools/rsym/rsym.c Modified: trunk/reactos/tools/rsym/rsym.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/rsym.c?rev=5959… ============================================================================== --- trunk/reactos/tools/rsym/rsym.c [iso-8859-1] (original) +++ trunk/reactos/tools/rsym/rsym.c [iso-8859-1] Sun Jul 28 20:37:51 2013 @@ -33,6 +33,83 @@ #define MAX_PATH 260 #define MAX_SYM_NAME 2000 +struct StringEntry +{ + struct StringEntry *Next; + ULONG Offset; + char *String; +}; + +struct StringHashTable +{ + ULONG TableSize; + struct StringEntry **Table; +}; + +/* This is the famous DJB hash */ +static unsigned int +ComputeDJBHash(const char *name) +{ + unsigned int val = 5381; + int i = 0; + + for (i = 0; name[i]; i++) + { + val = (33 * val) + name[i]; + } + + return val; +} + +static void +AddStringToHash(struct StringHashTable *StringTable, + unsigned int hash, + ULONG Offset, + char *StringPtr) +{ + struct StringEntry *entry = calloc(1, sizeof(struct StringEntry)); + entry->Offset = Offset; + entry->String = StringPtr; + entry->Next = StringTable->Table[hash]; + StringTable->Table[hash] = entry; +} + +static void +StringHashTableInit(struct StringHashTable *StringTable, + ULONG StringsLength, + char *StringsBase) +{ + char *Start = StringsBase; + char *End = StringsBase + StringsLength; + StringTable->TableSize = 1024; + StringTable->Table = calloc(1024, sizeof(struct StringEntry *)); + while (Start < End) + { + AddStringToHash(StringTable, + ComputeDJBHash(Start) % StringTable->TableSize, + Start - StringsBase, + Start); + Start += strlen(Start) + 1; + } +} + +static void +StringHashTableFree(struct StringHashTable *StringTable) +{ + int i; + struct StringEntry *entry; + for (i = 0; i < StringTable->TableSize; i++) + { + while ((entry = StringTable->Table[i])) + { + entry = entry->Next; + free(StringTable->Table[i]); + StringTable->Table[i] = entry; + } + } + free(StringTable->Table); +} + static int CompareSymEntry(const PROSSYM_ENTRY SymEntry1, const PROSSYM_ENTRY SymEntry2) { @@ -112,26 +189,32 @@ } static ULONG -FindOrAddString(char *StringToFind, ULONG *StringsLength, void *StringsBase) -{ - char *Search, *End; - - Search = (char *)StringsBase; - End = Search + *StringsLength; - - while (Search < End) - { - if (strcmp(Search, StringToFind) == 0) - { - return Search - (char *)StringsBase; - } - Search += strlen(Search) + 1; - } - - strcpy(Search, StringToFind); - *StringsLength += strlen(StringToFind) + 1; - - return Search - (char *)StringsBase; +FindOrAddString(struct StringHashTable *StringTable, + char *StringToFind, + ULONG *StringsLength, + void *StringsBase) +{ + unsigned int hash = ComputeDJBHash(StringToFind) % StringTable->TableSize; + struct StringEntry *entry = StringTable->Table[hash]; + + while (entry && strcmp(entry->String, StringToFind)) + entry = entry->Next; + + if (entry) + { + return entry->Offset; + } + else + { + char *End = (char *)StringsBase + *StringsLength; + + strcpy(End, StringToFind); + *StringsLength += strlen(StringToFind) + 1; + + AddStringToHash(StringTable, hash, End - (char *)StringsBase, End); + + return End - (char *)StringsBase; + } } static int @@ -150,6 +233,7 @@ ULONG NameLen; char FuncName[256]; PROSSYM_ENTRY Current; + struct StringHashTable StringHash; StabEntry = StabSymbolsBase; Count = StabSymbolsLength / sizeof(STAB_ENTRY); @@ -170,6 +254,8 @@ } Current = *SymbolsBase; memset(Current, 0, sizeof(*Current)); + + StringHashTableInit(&StringHash, *StringsLength, (char *)StringsBase); LastFunctionAddress = 0; for (i = 0; i < Count; i++) @@ -206,8 +292,8 @@ First = 0; Current->Address = Address; } - Current->FileOffset = FindOrAddString((char *)StabStringsBase - + StabEntry[i].n_strx, + Current->FileOffset = FindOrAddString(&StringHash, + (char *)StabStringsBase + StabEntry[i].n_strx, StringsLength, StringsBase); break; @@ -236,7 +322,8 @@ } memcpy(FuncName, Name, NameLen); FuncName[NameLen] = '\0'; - Current->FunctionOffset = FindOrAddString(FuncName, + Current->FunctionOffset = FindOrAddString(&StringHash, + FuncName, StringsLength, StringsBase); Current->SourceLine = 0; @@ -265,6 +352,8 @@ qsort(*SymbolsBase, *SymbolsCount, sizeof(ROSSYM_ENTRY), (int (*)(const void *, const void *)) CompareSymEntry); + StringHashTableFree(&StringHash); + return 0; } @@ -281,6 +370,7 @@ char FuncName[256], FileName[1024]; char *p; PROSSYM_ENTRY Current; + struct StringHashTable StringHash; CoffEntry = (PCOFF_SYMENT) CoffSymbolsBase; Count = CoffSymbolsLength / sizeof(COFF_SYMENT); @@ -293,6 +383,8 @@ } *SymbolsCount = 0; Current = *SymbolsBase; + + StringHashTableInit(&StringHash, *StringsLength, (char*)StringsBase); for (i = 0; i < Count; i++) { @@ -319,6 +411,7 @@ { free(*SymbolsBase); fprintf(stderr, "Function name too long\n"); + StringHashTableFree(&StringHash); return 1; } strcpy(FuncName, (char *) CoffStringsBase + CoffEntry[i].e.e.e_offset); @@ -336,7 +429,8 @@ *p = '\0'; } p = ('_' == FuncName[0] || '@' == FuncName[0] ? FuncName + 1 : FuncName); - Current->FunctionOffset = FindOrAddString(p, + Current->FunctionOffset = FindOrAddString(&StringHash, + p, StringsLength, StringsBase); Current->SourceLine = 0; @@ -348,6 +442,8 @@ *SymbolsCount = (Current - *SymbolsBase + 1); qsort(*SymbolsBase, *SymbolsCount, sizeof(ROSSYM_ENTRY), (int (*)(const void *, const void *)) CompareSymEntry); + + StringHashTableFree(&StringHash); return 0; } @@ -370,21 +466,6 @@ DWORD module_base; struct DbgHelpLineEntry *lastLineEntry; }; - -/* This is the famous DJB hash */ -static unsigned int -ComputeDJBHash(const char *name) -{ - unsigned int val = 5381; - int i = 0; - - for (i = 0; name[i]; i++) - { - val = (33 * val) + name[i]; - } - - return val; -} static struct DbgHelpLineEntry* DbgHelpAddLineEntry(struct DbgHelpStringTab *tab)

11 years, 4 months

[tkreuzer] 59592: [CSRSRV] Use symbolic constant for number of hash buckets and use it where appropriate (fixing one missing location).

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jul 28 13:54:42 2013 New Revision: 59592 URL: http://svn.reactos.org/svn/reactos?rev=59592&view=rev Log: [CSRSRV] Use symbolic constant for number of hash buckets and use it where appropriate (fixing one missing location). Modified: trunk/reactos/subsystems/win32/csrsrv/api.h trunk/reactos/subsystems/win32/csrsrv/procsup.c trunk/reactos/subsystems/win32/csrsrv/thredsup.c Modified: trunk/reactos/subsystems/win32/csrsrv/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/ap… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/api.h [iso-8859-1] Sun Jul 28 13:54:42 2013 @@ -45,7 +45,8 @@ extern HANDLE CsrApiPort; extern HANDLE CsrSmApiPort; extern HANDLE CsrSbApiPort; -extern LIST_ENTRY CsrThreadHashTable[257]; +#define NUMBER_THREAD_HASH_BUCKETS 257 +extern LIST_ENTRY CsrThreadHashTable[NUMBER_THREAD_HASH_BUCKETS]; extern PCSR_PROCESS CsrRootProcess; extern UNICODE_STRING CsrDirectoryName; extern ULONG CsrDebug; Modified: trunk/reactos/subsystems/win32/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/pr… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/procsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/procsup.c [iso-8859-1] Sun Jul 28 13:54:42 2013 @@ -371,7 +371,7 @@ CsrRootProcess->ClientId = NtCurrentTeb()->ClientId; /* Initialize the Thread Hash List */ - for (i = 0; i < 256; i++) InitializeListHead(&CsrThreadHashTable[i]); + for (i = 0; i < NUMBER_THREAD_HASH_BUCKETS; i++) InitializeListHead(&CsrThreadHashTable[i]); /* Initialize the Wait Lock */ return RtlInitializeCriticalSection(&CsrWaitListsLock); @@ -1382,7 +1382,7 @@ /* Acquire process lock */ CsrAcquireProcessLock(); - + /* Get the list pointers */ NextEntry = CsrRootProcess->ListLink.Flink; while (NextEntry != &CsrRootProcess->ListLink) @@ -1397,13 +1397,13 @@ CsrProcess->Flags &= ~CsrProcessSkipShutdown; CsrProcess->ShutdownFlags = 0; } - + /* Set shudown Priority */ CsrSetToShutdownPriority(); /* Loop all processes */ //DPRINT1("Enumerating for LUID: %lx %lx\n", CallerLuid->HighPart, CallerLuid->LowPart); - + /* Start looping */ while (TRUE) { Modified: trunk/reactos/subsystems/win32/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/th… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] Sun Jul 28 13:54:42 2013 @@ -14,11 +14,11 @@ #define NDEBUG #include <debug.h> -#define CsrHashThread(t) (HandleToUlong(t) % 257) +#define CsrHashThread(t) (HandleToUlong(t) % NUMBER_THREAD_HASH_BUCKETS) /* GLOBALS ********************************************************************/ -LIST_ENTRY CsrThreadHashTable[257]; +LIST_ENTRY CsrThreadHashTable[NUMBER_THREAD_HASH_BUCKETS]; /* PRIVATE FUNCTIONS **********************************************************/

11 years, 4 months

[tkreuzer] 59591: [CSRSRV] - Reduce number of hash collisions during bootup from 10 to 0, by choosing 257 (prime number = good) instead of 256 (power of 2 = bad) - Use ULONG for CsrpStaticThreadCou...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jul 28 10:41:27 2013 New Revision: 59591 URL: http://svn.reactos.org/svn/reactos?rev=59591&view=rev Log: [CSRSRV] - Reduce number of hash collisions during bootup from 10 to 0, by choosing 257 (prime number = good) instead of 256 (power of 2 = bad) - Use ULONG for CsrpStaticThreadCount and CsrpDynamicThreadTotal to fix an MSVC warning. Modified: trunk/reactos/subsystems/win32/csrsrv/api.c trunk/reactos/subsystems/win32/csrsrv/api.h trunk/reactos/subsystems/win32/csrsrv/srv.h trunk/reactos/subsystems/win32/csrsrv/thredsup.c Modified: trunk/reactos/subsystems/win32/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/ap… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/api.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/api.c [iso-8859-1] Sun Jul 28 10:41:27 2013 @@ -18,8 +18,8 @@ BOOLEAN (*CsrClientThreadSetup)(VOID) = NULL; UNICODE_STRING CsrApiPortName; -volatile LONG CsrpStaticThreadCount; -volatile LONG CsrpDynamicThreadTotal; +volatile ULONG CsrpStaticThreadCount; +volatile ULONG CsrpDynamicThreadTotal; extern ULONG CsrMaxApiRequestThreads; /* FUNCTIONS ******************************************************************/ @@ -269,7 +269,7 @@ NTSTATUS Status; /* Decrease the count, and see if we're out */ - if (_InterlockedDecrement(&CsrpStaticThreadCount) == 0) + if (InterlockedDecrementUL(&CsrpStaticThreadCount) == 0) { /* Check if we've still got space for a Dynamic Thread */ if (CsrpDynamicThreadTotal < CsrMaxApiRequestThreads) @@ -289,8 +289,8 @@ if (NT_SUCCESS(Status)) { /* Increase the thread counts */ - _InterlockedIncrement(&CsrpStaticThreadCount); - _InterlockedIncrement(&CsrpDynamicThreadTotal); + InterlockedIncrementUL(&CsrpStaticThreadCount); + InterlockedIncrementUL(&CsrpDynamicThreadTotal); /* Add a new server thread */ if (CsrAddStaticServerThread(hThread, @@ -303,8 +303,8 @@ else { /* Failed to create a new static thread */ - _InterlockedDecrement(&CsrpStaticThreadCount); - _InterlockedDecrement(&CsrpDynamicThreadTotal); + InterlockedDecrementUL(&CsrpStaticThreadCount); + InterlockedDecrementUL(&CsrpDynamicThreadTotal); /* Terminate it */ DPRINT1("Failing\n"); @@ -383,8 +383,8 @@ ASSERT(NT_SUCCESS(Status)); /* Increase the Thread Counts */ - _InterlockedIncrement(&CsrpStaticThreadCount); - _InterlockedIncrement(&CsrpDynamicThreadTotal); + InterlockedIncrementUL(&CsrpStaticThreadCount); + InterlockedIncrementUL(&CsrpDynamicThreadTotal); } /* Now start the loop */ @@ -513,7 +513,7 @@ } /* Increase the thread count */ - _InterlockedIncrement(&CsrpStaticThreadCount); + InterlockedIncrementUL(&CsrpStaticThreadCount); /* If the response was 0xFFFFFFFF, we'll ignore it */ if (HardErrorMsg->Response == 0xFFFFFFFF) @@ -595,7 +595,7 @@ ServerDll->DispatchTable[ApiId](&ReceiveMsg, &ReplyCode); /* Increase the static thread count */ - _InterlockedIncrement(&CsrpStaticThreadCount); + InterlockedIncrementUL(&CsrpStaticThreadCount); } _SEH2_EXCEPT(CsrUnhandledExceptionFilter(_SEH2_GetExceptionInformation())) { @@ -706,7 +706,7 @@ } /* Increase the thread count */ - _InterlockedIncrement(&CsrpStaticThreadCount); + InterlockedIncrementUL(&CsrpStaticThreadCount); /* If the response was 0xFFFFFFFF, we'll ignore it */ if (HardErrorMsg->Response == 0xFFFFFFFF) @@ -818,7 +818,7 @@ ReplyMsg->Status = ServerDll->DispatchTable[ApiId](&ReceiveMsg, &ReplyCode); /* Increase the static thread count */ - _InterlockedIncrement(&CsrpStaticThreadCount); + InterlockedIncrementUL(&CsrpStaticThreadCount); Teb->CsrClientThread = CurrentThread; Modified: trunk/reactos/subsystems/win32/csrsrv/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/ap… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/api.h [iso-8859-1] Sun Jul 28 10:41:27 2013 @@ -45,7 +45,7 @@ extern HANDLE CsrApiPort; extern HANDLE CsrSmApiPort; extern HANDLE CsrSbApiPort; -extern LIST_ENTRY CsrThreadHashTable[256]; +extern LIST_ENTRY CsrThreadHashTable[257]; extern PCSR_PROCESS CsrRootProcess; extern UNICODE_STRING CsrDirectoryName; extern ULONG CsrDebug; Modified: trunk/reactos/subsystems/win32/csrsrv/srv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/sr… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/srv.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/srv.h [iso-8859-1] Sun Jul 28 10:41:27 2013 @@ -55,6 +55,8 @@ #define ROUND_UP(n, align) ROUND_DOWN(((ULONG)n) + (align) - 1, (align)) #define ROUND_DOWN(n, align) (((ULONG)n) & ~((align) - 1l)) +#define InterlockedIncrementUL(Value) _InterlockedIncrement((PLONG)Value) +#define InterlockedDecrementUL(Value) _InterlockedDecrement((PLONG)Value) #endif // _SRV_H Modified: trunk/reactos/subsystems/win32/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/th… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] Sun Jul 28 10:41:27 2013 @@ -14,11 +14,11 @@ #define NDEBUG #include <debug.h> -#define CsrHashThread(t) (HandleToUlong(t)&(256 - 1)) +#define CsrHashThread(t) (HandleToUlong(t) % 257) /* GLOBALS ********************************************************************/ -LIST_ENTRY CsrThreadHashTable[256]; +LIST_ENTRY CsrThreadHashTable[257]; /* PRIVATE FUNCTIONS **********************************************************/ @@ -581,7 +581,7 @@ DPRINT1("No known process for %lx\n", ClientId->UniqueProcess); return Status; } - + /* Make sure the thread didn't terminate */ if (KernelTimes.ExitTime.QuadPart) {

11 years, 4 months

[ekohl] 59590: [NETAPI32] NetpNtStatusToApiStatus: Map STATUS_INVALID_ACCOUNT_NAME to NERR_BadUsername.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jul 27 18:53:52 2013 New Revision: 59590 URL: http://svn.reactos.org/svn/reactos?rev=59590&view=rev Log: [NETAPI32] NetpNtStatusToApiStatus: Map STATUS_INVALID_ACCOUNT_NAME to NERR_BadUsername. Modified: trunk/reactos/dll/win32/netapi32/netapi32.c Modified: trunk/reactos/dll/win32/netapi32/netapi32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.c [iso-8859-1] Sat Jul 27 18:53:52 2013 @@ -218,7 +218,24 @@ WINAPI NetpNtStatusToApiStatus(NTSTATUS Status) { - return RtlNtStatusToDosError(Status); + NET_API_STATUS ApiStatus; + + switch (Status) + { + case STATUS_SUCCESS: + ApiStatus = NERR_Success; + break; + + case STATUS_INVALID_ACCOUNT_NAME: + ApiStatus = NERR_BadUsername; + break; + + default: + ApiStatus = RtlNtStatusToDosError(Status); + break; + } + + return ApiStatus; } NET_API_STATUS WINAPI NetUseEnum(LMSTR server, DWORD level, LPBYTE* bufptr, DWORD prefmaxsize,

11 years, 4 months

[ekohl] 59589: [SAMSRV] SamrCreateUserInDomain and SamrCreateUser2InDomain: Implement the user name length limit of 20 characters.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jul 27 17:59:28 2013 New Revision: 59589 URL: http://svn.reactos.org/svn/reactos?rev=59589&view=rev Log: [SAMSRV] SamrCreateUserInDomain and SamrCreateUser2InDomain: Implement the user name length limit of 20 characters. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sat Jul 27 17:59:28 2013 @@ -2126,6 +2126,12 @@ { TRACE("failed with status 0x%08lx\n", Status); return Status; + } + + if (Name->Length > 20 * sizeof(WCHAR)) + { + TRACE("User name is too long!\n"); + return STATUS_INVALID_ACCOUNT_NAME; } /* Check if the user name already exists in the domain */ @@ -8091,6 +8097,12 @@ return Status; } + if (Name->Length > 20 * sizeof(WCHAR)) + { + TRACE("User name is too long!\n"); + return STATUS_INVALID_ACCOUNT_NAME; + } + /* Check if the user name already exists in the domain */ Status = SampCheckAccountNameInDomain(DomainObject, Name->Buffer);

11 years, 5 months

[ekohl] 59588: [SAMLIB] - Implement SamGetDisplayEnumerationIndex. - Add DOMAIN_DISPLAY_INFORMATION to ntsam.h and update sam.idl.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jul 27 14:06:53 2013 New Revision: 59588 URL: http://svn.reactos.org/svn/reactos?rev=59588&view=rev Log: [SAMLIB] - Implement SamGetDisplayEnumerationIndex. - Add DOMAIN_DISPLAY_INFORMATION to ntsam.h and update sam.idl. Modified: trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samlib/samlib.spec trunk/reactos/include/ddk/ntsam.h trunk/reactos/include/reactos/idl/sam.idl Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Sat Jul 27 14:06:53 2013 @@ -872,6 +872,39 @@ NTSTATUS NTAPI +SamGetDisplayEnumerationIndex(IN SAM_HANDLE DomainHandle, + IN DOMAIN_DISPLAY_INFORMATION DisplayInformation, + IN PUNICODE_STRING Prefix, + OUT PULONG Index) +{ + NTSTATUS Status; + + TRACE("(%p %lu %wZ %p)\n", + DomainHandle, DisplayInformation, Prefix, Index); + + if ((Prefix == NULL) || + (Index == NULL)) + return STATUS_INVALID_PARAMETER; + + RpcTryExcept + { + Status = SamrGetDisplayEnumerationIndex2((SAMPR_HANDLE)DomainHandle, + DisplayInformation, + (PRPC_UNICODE_STRING)Prefix, + Index); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +NTSTATUS +NTAPI SamGetGroupsForUser(IN SAM_HANDLE UserHandle, OUT PGROUP_MEMBERSHIP *Groups, OUT PULONG MembershipCount) Modified: trunk/reactos/dll/win32/samlib/samlib.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.sp… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] Sat Jul 27 14:06:53 2013 @@ -21,7 +21,7 @@ @ stdcall SamFreeMemory(ptr) @ stdcall SamGetAliasMembership(ptr long ptr ptr ptr) @ stdcall SamGetCompatibilityMode(ptr ptr) -@ stub SamGetDisplayEnumerationIndex +@ stdcall SamGetDisplayEnumerationIndex(ptr long ptr ptr) @ stdcall SamGetGroupsForUser(ptr ptr ptr) @ stdcall SamGetMembersInAlias(ptr ptr ptr) @ stdcall SamGetMembersInGroup(ptr ptr ptr ptr) Modified: trunk/reactos/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntsam.h?rev=59… ============================================================================== --- trunk/reactos/include/ddk/ntsam.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntsam.h [iso-8859-1] Sat Jul 27 14:06:53 2013 @@ -298,6 +298,15 @@ UNICODE_STRING AdminComment; } ALIAS_ADM_COMMENT_INFORMATION, *PALIAS_ADM_COMMENT_INFORMATION; +typedef enum _DOMAIN_DISPLAY_INFORMATION +{ + DomainDisplayUser = 1, + DomainDisplayMachine, + DomainDisplayGroup, + DomainDisplayOemUser, + DomainDisplayOemGroup, + DomainDisplayServer +} DOMAIN_DISPLAY_INFORMATION, *PDOMAIN_DISPLAY_INFORMATION; typedef enum _DOMAIN_INFORMATION_CLASS { @@ -818,6 +827,13 @@ NTSTATUS NTAPI +SamGetDisplayEnumerationIndex(IN SAM_HANDLE DomainHandle, + IN DOMAIN_DISPLAY_INFORMATION DisplayInformation, + IN PUNICODE_STRING Prefix, + OUT PULONG Index); + +NTSTATUS +NTAPI SamGetGroupsForUser(IN SAM_HANDLE UserHandle, OUT PGROUP_MEMBERSHIP *Groups, OUT PULONG MembershipCount); Modified: trunk/reactos/include/reactos/idl/sam.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/sam.id… ============================================================================== --- trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] Sat Jul 27 14:06:53 2013 @@ -275,14 +275,17 @@ [case(DomainModifiedInformation2)] DOMAIN_MODIFIED_INFORMATION2 Modified2; } SAMPR_DOMAIN_INFO_BUFFER, *PSAMPR_DOMAIN_INFO_BUFFER; +cpp_quote("#ifndef _NTSAM_") typedef enum _DOMAIN_DISPLAY_INFORMATION { DomainDisplayUser = 1, DomainDisplayMachine, DomainDisplayGroup, DomainDisplayOemUser, - DomainDisplayOemGroup + DomainDisplayOemGroup, + DomainDisplayServer } DOMAIN_DISPLAY_INFORMATION, *PDOMAIN_DISPLAY_INFORMATION; +cpp_quote("#endif") typedef struct _SAMPR_DOMAIN_DISPLAY_USER {

11 years, 5 months

[ion] 59587: [NTOSKRNL/BASESRV]: Tiny formatting clean-ups made while debugging.

by ion＠svn.reactos.org

Author: ion Date: Thu Jul 25 23:56:17 2013 New Revision: 59587 URL: http://svn.reactos.org/svn/reactos?rev=59587&view=rev Log: [NTOSKRNL/BASESRV]: Tiny formatting clean-ups made while debugging. Modified: trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/subsystems/win/basesrv/proc.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] Thu Jul 25 23:56:17 2013 @@ -3265,7 +3265,7 @@ PreviousMode, (PVOID*)&SourceProcess, NULL); - if (!NT_SUCCESS(Status)) return(Status); + if (!NT_SUCCESS(Status)) return Status; /* Check if got a target handle */ if (TargetProcessHandle) Modified: trunk/reactos/subsystems/win/basesrv/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/pro… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/proc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/proc.c [iso-8859-1] Thu Jul 25 23:56:17 2013 @@ -57,7 +57,7 @@ DUPLICATE_SAME_ACCESS); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to duplicate process handle\n"); + DPRINT1("Failed to duplicate process handle: %lx\n", Status); return Status; } @@ -71,7 +71,7 @@ DUPLICATE_SAME_ACCESS); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to duplicate process handle\n"); + DPRINT1("Failed to duplicate thread handle: %lx\n", Status); NtClose(ProcessHandle); return Status; }

11 years, 5 months

[tkreuzer] 59586: [GDI32] Handle CBM_CREATDIB [WIN32K] Make sure compressed DIBs have a bitmap size in the BITMAPINFOHEADER

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jul 25 21:03:14 2013 New Revision: 59586 URL: http://svn.reactos.org/svn/reactos?rev=59586&view=rev Log: [GDI32] Handle CBM_CREATDIB [WIN32K] Make sure compressed DIBs have a bitmap size in the BITMAPINFOHEADER Modified: branches/dib_rewrite/win32ss/gdi/gdi32/objects/dibitmap.c branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c Modified: branches/dib_rewrite/win32ss/gdi/gdi32/objects/dibitmap.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/gdi32/o… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/gdi32/objects/dibitmap.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/gdi32/objects/dibitmap.c [iso-8859-1] Thu Jul 25 21:03:14 2013 @@ -198,6 +198,11 @@ if (pbmi->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { pbmi = ConvertBitmapCoreInfo(pbmi, iUsage); + if (pbmi == NULL) + { + return NULL; + } + bConvertedInfo = TRUE; } @@ -227,21 +232,30 @@ cjInfo = 0; } + /* Check for the undocumented CBM_CREATDIB flag */ if (fdwInit & CBM_CREATDIB) { - if (!pbmi) return NULL; - - //__debugbreak(); - return 0; - } - else - { - if (!pbmih) + /* We need a BITMAPINFO */ + if (pbmi == NULL) + { + /* LastError is not set here! */ + goto cleanup; + } + + /* Get the dimension from the BITMAPINFO */ + cx = pbmi->bmiHeader.biWidth; + cy = abs(pbmi->bmiHeader.biHeight); + } + else + { + /* We need the BITMAPINFOHEADER */ + if (pbmih == NULL) { SetLastError(ERROR_INVALID_PARAMETER); goto cleanup; } + /* Check the type of the BITMAPINFOHEADER */ if (pbmih->biSize == sizeof(BITMAPCOREHEADER)) { PBITMAPCOREHEADER pbch = (PBITMAPCOREHEADER)pbmih; @@ -258,11 +272,13 @@ SetLastError(ERROR_INVALID_PARAMETER); goto cleanup; } - - if ((cx == 0) || (cy == 0)) - { - return GetStockObject(DEFAULT_BITMAP); - } + } + + /* Check if either width or height is 0 */ + if ((cx == 0) || (cy == 0)) + { + /* Return the default bitmap */ + return GetStockObject(DEFAULT_BITMAP); } @@ -279,7 +295,10 @@ 0); cleanup: - if (bConvertedInfo && pbmi) HeapFree(GetProcessHeap(), 0, (PVOID)pbmi); + if (bConvertedInfo) + { + HeapFree(GetProcessHeap(), 0, (PVOID)pbmi); + } return hbmp; } Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c [iso-8859-1] Thu Jul 25 21:03:14 2013 @@ -56,14 +56,22 @@ } else { + /* This is a compressed format, no line width. */ pbmf->cjWidthBytes = 0; - } - - /* Check compressed format and top-down */ - if ((pbmf->iFormat > BMF_32BPP) && (pbmf->sizel.cy < 0)) - { - DPRINT1("Compressed bitmaps cannot be top-down.\n"); - return FALSE; + + /* Check if we have a proper image size */ + if (pbmf->cjImageSize == 0) + { + DPRINT1("Invalid format, need biSizeImage != 0\n"); + return FALSE; + } + + /* Check for top-down */ + if (pbmf->sizel.cy < 0) + { + DPRINT1("Compressed bitmaps cannot be top-down.\n"); + return FALSE; + } } // FIXME: check bitmap extensions / size @@ -611,6 +619,7 @@ return NULL; } + /* Get the DC surface */ psurfDC = pdc->dclevel.pSurface; } else @@ -654,8 +663,8 @@ else { ppalBmp = CreateDIBPalette(pbmi, pdc, iUsage); - } - } + } + } else { if (psurfDC) @@ -674,8 +683,8 @@ GDIOBJ_vReferenceObjectByPointer(&ppalBmp->BaseObject); } - /* Allocate a surface for the bitmap */ - psurfBmp = SURFACE_AllocSurface(STYPE_BITMAP, cx, cy, iFormat, 0, 0, NULL); + /* Allocate a surface for the bitmap */ + psurfBmp = SURFACE_AllocSurface(STYPE_BITMAP, cx, cy, iFormat, 0, 0, NULL); if (psurfBmp) { /* Set new palette for the bitmap */ @@ -1310,7 +1319,7 @@ HANDLE hSecure; ULONG cyDIB; INT yTop, iResult; -__debugbreak(); +//__debugbreak(); /* Check if parameters are valid */ if ((cNumScan == 0) || (cx >= INT_MAX) || (cy >= INT_MAX)) {

11 years, 5 months

[tfaber] 59585: [NOTEPAD] - Don't assume out parameter initialization on failure. Patch by Samuel Serapión CORE-7292 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Jul 25 20:29:23 2013 New Revision: 59585 URL: http://svn.reactos.org/svn/reactos?rev=59585&view=rev Log: [NOTEPAD] - Don't assume out parameter initialization on failure. Patch by Samuel Serapión CORE-7292 #resolve Modified: trunk/reactos/base/applications/notepad/dialog.c Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] Thu Jul 25 20:29:23 2013 @@ -293,7 +293,7 @@ { static const TCHAR dotlog[] = _T(".LOG"); HANDLE hFile; - LPTSTR pszText; + LPTSTR pszText = NULL; DWORD dwTextLen; TCHAR log[5];

11 years, 5 months

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 July 2013