Ros-diffs October 2012

ros-diffs@reactos.org

14 participants
211 discussions

[hbelusca] 57470: [CLB] - Code cleaning
by hbelusca＠svn.reactos.org 03 Oct '12

03 Oct '12

Author: hbelusca Date: Wed Oct 3 21:58:28 2012 New Revision: 57470 URL: http://svn.reactos.org/svn/reactos?rev=57470&view=rev Log: [CLB] - Code cleaning Modified: trunk/reactos/base/applications/regedit/clb/CMakeLists.txt trunk/reactos/base/applications/regedit/clb/clb.c Modified: trunk/reactos/base/applications/regedit/clb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/clb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/clb/CMakeLists.txt [iso-8859-1] Wed Oct 3 21:58:28 2012 @@ -10,4 +10,3 @@ set_module_type(clb win32dll UNICODE) add_importlibs(clb user32 gdi32 comctl32 kernel32 ntdll) - Modified: trunk/reactos/base/applications/regedit/clb/clb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/clb/clb.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/clb/clb.c [iso-8859-1] Wed Oct 3 21:58:28 2012 @@ -308,3 +308,4 @@ return Ret; } +/* EOF */

1 0

[tfaber] 57469: [KMTEST:KE] - Show that Mutexes disable APCs when acquired, while Mutants don't
by tfaber＠svn.reactos.org 03 Oct '12

03 Oct '12

Author: tfaber Date: Wed Oct 3 20:52:33 2012 New Revision: 57469 URL: http://svn.reactos.org/svn/reactos?rev=57469&view=rev Log: [KMTEST:KE] - Show that Mutexes disable APCs when acquired, while Mutants don't Modified: trunk/rostests/kmtests/ntos_ke/KeMutex.c Modified: trunk/rostests/kmtests/ntos_ke/KeMutex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ke/KeMutex.c… ============================================================================== --- trunk/rostests/kmtests/ntos_ke/KeMutex.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ke/KeMutex.c [iso-8859-1] Wed Oct 3 20:52:33 2012 @@ -51,43 +51,88 @@ ok_eq_uint((Mutex)->ApcDisable, ExpectedApcDisable); \ } while (0) +#define CheckApcs(KernelApcsDisabled, SpecialApcsDisabled, AllApcsDisabled, Irql) do \ +{ \ + ok_eq_bool(KeAreApcsDisabled(), KernelApcsDisabled || SpecialApcsDisabled); \ + ok_eq_int(Thread->KernelApcDisable, KernelApcsDisabled); \ + ok_eq_bool(KeAreAllApcsDisabled(), AllApcsDisabled); \ + ok_eq_int(Thread->SpecialApcDisable, SpecialApcsDisabled); \ + ok_irql(Irql); \ +} while (0) + static VOID TestMutant(VOID) { + NTSTATUS Status; KMUTANT Mutant; LONG State; + PKTHREAD Thread = KeGetCurrentThread(); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); RtlFillMemory(&Mutant, sizeof(Mutant), 0x55); KeInitializeMutant(&Mutant, FALSE); - ok_irql(PASSIVE_LEVEL); CheckMutex(&Mutant, FALSE, TRUE, 0); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); RtlFillMemory(&Mutant, sizeof(Mutant), 0x55); KeInitializeMutant(&Mutant, TRUE); - ok_irql(PASSIVE_LEVEL); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); CheckMutex(&Mutant, TRUE, TRUE, 0); State = KeReleaseMutant(&Mutant, 1, FALSE, FALSE); ok_eq_long(State, 0); - ok_irql(PASSIVE_LEVEL); CheckMutex(&Mutant, FALSE, FALSE, 0); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + + /* Acquire and release */ + Status = KeWaitForSingleObject(&Mutant, + Executive, + KernelMode, + FALSE, + NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + CheckMutex(&Mutant, TRUE, TRUE, 0); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + + State = KeReleaseMutant(&Mutant, 1, FALSE, FALSE); + ok_eq_long(State, 0); + CheckMutex(&Mutant, FALSE, FALSE, 0); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); } static VOID TestMutex(VOID) { + NTSTATUS Status; KMUTEX Mutex; + LONG State; + PKTHREAD Thread = KeGetCurrentThread(); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); RtlFillMemory(&Mutex, sizeof(Mutex), 0x55); KeInitializeMutex(&Mutex, 0); - ok_irql(PASSIVE_LEVEL); CheckMutex(&Mutex, FALSE, TRUE, 1); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); RtlFillMemory(&Mutex, sizeof(Mutex), 0x55); KeInitializeMutex(&Mutex, 123); - ok_irql(PASSIVE_LEVEL); CheckMutex(&Mutex, FALSE, TRUE, 1); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + + Status = KeWaitForSingleObject(&Mutex, + Executive, + KernelMode, + FALSE, + NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + CheckMutex(&Mutex, TRUE, FALSE, 1); + CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); + + State = KeReleaseMutex(&Mutex, FALSE); + ok_eq_long(State, 0); + CheckMutex(&Mutex, FALSE, FALSE, 1); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); } START_TEST(KeMutex)

1 0

[mnordell] 57468: [NTOSKERNEL] Stop KeRundownThread from bugchecking on at least CTRL_C for console app.
by mnordell＠svn.reactos.org 03 Oct '12

03 Oct '12

Author: mnordell Date: Wed Oct 3 19:51:22 2012 New Revision: 57468 URL: http://svn.reactos.org/svn/reactos?rev=57468&view=rev Log: [NTOSKERNEL] Stop KeRundownThread from bugchecking on at least CTRL_C for console app. Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] Wed Oct 3 19:51:22 2012 @@ -470,6 +470,9 @@ 0); } + /* Move on, but save NextEntry before we remove */ + NextEntry = NextEntry->Flink; + /* Now we can remove it */ RemoveEntryList(&Mutant->MutantListEntry); @@ -484,9 +487,6 @@ /* Wake the Mutant */ KiWaitTest(&Mutant->Header, MUTANT_INCREMENT); } - - /* Move on */ - NextEntry = NextEntry->Flink; } /* Release the Lock */

1 0

[tkreuzer] 57467: [WIN32K] Reduce size of desktop heap from 4MB to 400KB (Windows uses 200KB) [NTOSKRNL] Go back to 20 MB session space.
by tkreuzer＠svn.reactos.org 03 Oct '12

03 Oct '12

Author: tkreuzer Date: Wed Oct 3 19:39:11 2012 New Revision: 57467 URL: http://svn.reactos.org/svn/reactos?rev=57467&view=rev Log: [WIN32K] Reduce size of desktop heap from 4MB to 400KB (Windows uses 200KB) [NTOSKRNL] Go back to 20 MB session space. Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/win32ss/user/ntuser/desktop.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Wed Oct 3 19:39:11 2012 @@ -18,7 +18,7 @@ #define MI_MIN_INIT_PAGED_POOLSIZE (32 * _1MB) -#define MI_SESSION_VIEW_SIZE (36 * _1MB) +#define MI_SESSION_VIEW_SIZE (20 * _1MB) #define MI_SESSION_POOL_SIZE (16 * _1MB) #define MI_SESSION_IMAGE_SIZE (8 * _1MB) #define MI_SESSION_WORKING_SET_SIZE (4 * _1MB) Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Wed Oct 3 19:39:11 2012 @@ -1081,7 +1081,7 @@ PVOID DesktopHeapSystemBase = NULL; SIZE_T DesktopInfoSize; BOOLEAN Context; - ULONG_PTR HeapSize = 4 * 1024 * 1024; /* FIXME */ + ULONG_PTR HeapSize = 400 * 1024; /* FIXME: Windows uses 200KB by default */ UNICODE_STRING ClassName; LARGE_STRING WindowName; BOOL NoHooks = FALSE;

1 0

[tfaber] 57466: [NTOSKRNL] - Add an ASSERT in KeRundownThread
by tfaber＠svn.reactos.org 03 Oct '12

03 Oct '12

Author: tfaber Date: Wed Oct 3 19:01:47 2012 New Revision: 57466 URL: http://svn.reactos.org/svn/reactos?rev=57466&view=rev Log: [NTOSKRNL] - Add an ASSERT in KeRundownThread Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] Wed Oct 3 19:01:47 2012 @@ -241,7 +241,7 @@ { /* Lock the thread */ KiAcquireThreadLock(Thread); - + /* Check again, and make sure there's not already a boost */ if ((Thread->Priority < LOW_REALTIME_PRIORITY) && !(Thread->PriorityDecrement)) @@ -266,7 +266,7 @@ /* Release thread lock */ KiReleaseThreadLock(Thread); } - + /* Release the dispatcher lokc */ KiReleaseDispatcherLock(OldIrql); } @@ -457,6 +457,7 @@ { /* Get the Mutant */ Mutant = CONTAINING_RECORD(NextEntry, KMUTANT, MutantListEntry); + ASSERT_MUTANT(Mutant); /* Make sure it's not terminating with APCs off */ if (Mutant->ApcDisable)

1 0

[mnordell] 57465: [NTOSKERNEL] Refactoring KiSatisfyObjectWait macro to prevent code duplication.
by mnordell＠svn.reactos.org 03 Oct '12

03 Oct '12

Author: mnordell Date: Wed Oct 3 17:57:14 2012 New Revision: 57465 URL: http://svn.reactos.org/svn/reactos?rev=57465&view=rev Log: [NTOSKERNEL] Refactoring KiSatisfyObjectWait macro to prevent code duplication. Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] Wed Oct 3 17:57:14 2012 @@ -683,55 +683,6 @@ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); KeReleaseInStackQueuedSpinLockFromDpcLevel(DeviceLock); } -} - -// -// Satisfies the wait of any dispatcher object -// -#define KiSatisfyObjectWait(Object, Thread) \ -{ \ - /* Special case for Mutants */ \ - if ((Object)->Header.Type == MutantObject) \ - { \ - /* Decrease the Signal State */ \ - (Object)->Header.SignalState--; \ - \ - /* Check if it's now non-signaled */ \ - if (!(Object)->Header.SignalState) \ - { \ - /* Set the Owner Thread */ \ - (Object)->OwnerThread = Thread; \ - \ - /* Disable APCs if needed */ \ - Thread->KernelApcDisable = Thread->KernelApcDisable - \ - (Object)->ApcDisable; \ - \ - /* Check if it's abandoned */ \ - if ((Object)->Abandoned) \ - { \ - /* Unabandon it */ \ - (Object)->Abandoned = FALSE; \ - \ - /* Return Status */ \ - Thread->WaitStatus = STATUS_ABANDONED; \ - } \ - \ - /* Insert it into the Mutant List */ \ - InsertHeadList(Thread->MutantListHead.Blink, \ - &(Object)->MutantListEntry); \ - } \ - } \ - else if (((Object)->Header.Type & TIMER_OR_EVENT_TYPE) == \ - EventSynchronizationObject) \ - { \ - /* Synchronization Timers and Events just get un-signaled */ \ - (Object)->Header.SignalState = 0; \ - } \ - else if ((Object)->Header.Type == SemaphoreObject) \ - { \ - /* These ones can have multiple states, so we only decrease it */ \ - (Object)->Header.SignalState--; \ - } \ } // @@ -787,6 +738,22 @@ } // +// Satisfies the wait of any dispatcher object +// +#define KiSatisfyObjectWait(Object, Thread) \ +{ \ + /* Special case for Mutants */ \ + if ((Object)->Header.Type == MutantObject) \ + { \ + KiSatisfyMutantWait((Object), (Thread)); \ + } \ + else \ + { \ + KiSatisfyNonMutantWait(Object); \ + } \ +} + +// // Recalculates the due time // FORCEINLINE

1 0

[ekohl] 57464: [LSASRV] Fixes several bugs in the current implementation of LsapSplitNames and LsapLookupNames. This fixes the crashing lsa advapi32 wintest. LsapLookupNames is still WIP.
by ekohl＠svn.reactos.org 03 Oct '12

03 Oct '12

Author: ekohl Date: Wed Oct 3 13:05:06 2012 New Revision: 57464 URL: http://svn.reactos.org/svn/reactos?rev=57464&view=rev Log: [LSASRV] Fixes several bugs in the current implementation of LsapSplitNames and LsapLookupNames. This fixes the crashing lsa advapi32 wintest. LsapLookupNames is still WIP. Modified: trunk/reactos/dll/win32/lsasrv/sids.c Modified: trunk/reactos/dll/win32/lsasrv/sids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/sids.c?re… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] Wed Oct 3 13:05:06 2012 @@ -676,8 +676,7 @@ PWELL_KNOWN_SID -LsapLookupWellKnownName(LPWSTR Domain, - LPWSTR Account) +LsapLookupWellKnownName(PUNICODE_STRING Name) { PLIST_ENTRY ListEntry; PWELL_KNOWN_SID Ptr; @@ -688,7 +687,7 @@ Ptr = CONTAINING_RECORD(ListEntry, WELL_KNOWN_SID, ListEntry); - if (_wcsicmp(Account, Ptr->Name.Buffer) == 0) + if (RtlEqualUnicodeString(Name, &Ptr->Name, TRUE)) return Ptr; ListEntry = ListEntry->Flink; @@ -708,6 +707,7 @@ PRPC_UNICODE_STRING DomainsBuffer = NULL; PRPC_UNICODE_STRING AccountsBuffer = NULL; ULONG DomainLength; + ULONG AccountLength; ULONG i; LPWSTR Ptr; NTSTATUS Status = STATUS_SUCCESS; @@ -728,13 +728,15 @@ for (i = 0; i < Count; i++) { -TRACE("Name: %S\n", Names[i].Buffer); +//TRACE("Name: %wZ\n", &Names[i]); Ptr = wcschr(Names[i].Buffer, L'\\'); if (Ptr == NULL) { + AccountLength = Names[i].Length / sizeof(WCHAR); + AccountsBuffer[i].Length = Names[i].Length; - AccountsBuffer[i].MaximumLength = Names[i].MaximumLength; + AccountsBuffer[i].MaximumLength = AccountsBuffer[i].Length + sizeof(WCHAR); AccountsBuffer[i].Buffer = MIDL_user_allocate(AccountsBuffer[i].MaximumLength); if (AccountsBuffer[i].Buffer == NULL) { @@ -745,13 +747,17 @@ CopyMemory(AccountsBuffer[i].Buffer, Names[i].Buffer, AccountsBuffer[i].Length); - AccountsBuffer[i].Buffer[AccountsBuffer[i].Length / sizeof(WCHAR)] = UNICODE_NULL; - -TRACE("Account name: %S\n", AccountsBuffer[i].Buffer); + AccountsBuffer[i].Buffer[AccountLength] = UNICODE_NULL; + +//TRACE("Account name: %wZ\n", &AccountsBuffer[i]); } else { - DomainLength = (ULONG)((ULONG_PTR)Ptr - (ULONG_PTR)Names[i].Buffer); + DomainLength = (ULONG)(ULONG_PTR)(Ptr - Names[i].Buffer); + AccountLength = (Names[i].Length / sizeof(WCHAR)) - DomainLength - 1; +//TRACE("DomainLength: %u\n", DomainLength); +//TRACE("AccountLength: %u\n", AccountLength); + if (DomainLength > 0) { DomainsBuffer[i].Length = (USHORT)DomainLength * sizeof(WCHAR); @@ -766,12 +772,12 @@ CopyMemory(DomainsBuffer[i].Buffer, Names[i].Buffer, DomainsBuffer[i].Length); - DomainsBuffer[i].Buffer[DomainsBuffer[i].Length / sizeof(WCHAR)] = UNICODE_NULL; - -TRACE("Domain name: %S\n", DomainsBuffer[i].Buffer); + DomainsBuffer[i].Buffer[DomainLength] = UNICODE_NULL; + +//TRACE("Domain name: %wZ\n", &DomainsBuffer[i]); } - AccountsBuffer[i].Length = Names[i].Length - (USHORT)((DomainLength + 1) * sizeof(WCHAR)); + AccountsBuffer[i].Length = (USHORT)AccountLength * sizeof(WCHAR); AccountsBuffer[i].MaximumLength = AccountsBuffer[i].Length + sizeof(WCHAR); AccountsBuffer[i].Buffer = MIDL_user_allocate(AccountsBuffer[i].MaximumLength); if (AccountsBuffer[i].Buffer == NULL) @@ -783,9 +789,9 @@ CopyMemory(AccountsBuffer[i].Buffer, &(Names[i].Buffer[DomainLength + 1]), AccountsBuffer[i].Length); - AccountsBuffer[i].Buffer[AccountsBuffer[i].Length / sizeof(WCHAR)] = UNICODE_NULL; - -TRACE("Account name: %S\n", AccountsBuffer[i].Buffer); + AccountsBuffer[i].Buffer[AccountLength] = UNICODE_NULL; + +//TRACE("Account name: %wZ\n", &AccountsBuffer[i]); } } @@ -849,9 +855,9 @@ PWELL_KNOWN_SID ptr; -TRACE("\n"); - - TranslatedSids->Entries = Count; +//TRACE("()\n"); + + TranslatedSids->Entries = 0; TranslatedSids->Sids = NULL; *ReferencedDomains = NULL; @@ -859,7 +865,7 @@ SidsBuffer = MIDL_user_allocate(SidsBufferLength); if (SidsBuffer == NULL) { -TRACE("\n"); +//TRACE("\n"); Status = STATUS_INSUFFICIENT_RESOURCES; goto done; } @@ -867,18 +873,26 @@ DomainsBuffer = MIDL_user_allocate(sizeof(LSAPR_REFERENCED_DOMAIN_LIST)); if (DomainsBuffer == NULL) { -TRACE("\n"); +//TRACE("\n"); Status = STATUS_INSUFFICIENT_RESOURCES; goto done; } - DomainsBuffer->Entries = Count; + DomainsBuffer->Entries = 0; //Count; DomainsBuffer->Domains = MIDL_user_allocate(Count * sizeof(LSA_TRUST_INFORMATION)); if (DomainsBuffer->Domains == NULL) { -TRACE("\n"); +//TRACE("\n"); Status = STATUS_INSUFFICIENT_RESOURCES; goto done; + } + + for (i = 0; i < Count; i++) + { + SidsBuffer[i].Use = SidTypeUnknown; + SidsBuffer[i].Sid = NULL; + SidsBuffer[i].DomainIndex = -1; + SidsBuffer[i].Flags = 0; } Status = LsapSplitNames(Count, @@ -893,22 +907,39 @@ for (i = 0; i < Count; i++) { -TRACE("Name: %S\n", Names[i].Buffer); - -TRACE("Domain name: %S\n", DomainNames[i].Buffer); -TRACE("Account name: %S\n", AccountNames[i].Buffer); - - ptr = LsapLookupWellKnownName(DomainNames[i].Buffer, - AccountNames[i].Buffer); +//TRACE("Name: %wZ\n", &Names[i]); + +//TRACE("Domain name: %wZ\n", &DomainNames[i]); +//TRACE("Account name: %wZ\n", &AccountNames[i]); + + ptr = LsapLookupWellKnownName((PUNICODE_STRING)&AccountNames[i]); if (ptr != NULL) { -TRACE("Found well known account!\n"); +//TRACE("Found well known account!\n"); SidsBuffer[i].Use = ptr->Use; SidsBuffer[i].Sid = ptr->Sid; SidsBuffer[i].DomainIndex = -1; SidsBuffer[i].Flags = 0; +#if 0 + if (DomainNames[i].Buffer != NULL) + { + ptr2= LsapLookupWellKnownName((PUNICODE_STRING)&DomainNames[i].Buffer); + if (ptr2 != NULL) + { + + } + } + else if (ptr->Domain.Length != 0) + { + + } + else + { + + } +#endif Mapped++; continue; @@ -919,10 +950,11 @@ } done: - TRACE("done: Status %lx\n", Status); +// TRACE("done: Status %lx\n", Status); if (DomainNames != NULL) { +//TRACE("Free DomainNames\n"); for (i = 0; i < Count; i++) { if (DomainNames[i].Buffer != NULL) @@ -934,10 +966,14 @@ if (AccountNames != NULL) { +//TRACE("Free AccountNames\n"); for (i = 0; i < Count; i++) { +//TRACE("i: %lu\n", i); if (AccountNames[i].Buffer != NULL) + { MIDL_user_free(AccountNames[i].Buffer); + } } MIDL_user_free(AccountNames); @@ -945,6 +981,9 @@ if (!NT_SUCCESS(Status)) { +//TRACE("Failure!\n"); + +//TRACE("Free DomainsBuffer\n"); if (DomainsBuffer != NULL) { if (DomainsBuffer->Domains != NULL) @@ -953,11 +992,17 @@ MIDL_user_free(DomainsBuffer); } +//TRACE("Free SidsBuffer\n"); if (SidsBuffer != NULL) MIDL_user_free(SidsBuffer); } else { +//TRACE("Success!\n"); + + *ReferencedDomains = DomainsBuffer; + TranslatedSids->Entries = Count; + TranslatedSids->Sids = SidsBuffer; *MappedCount = Mapped; if (Mapped == 0) @@ -966,6 +1011,8 @@ Status = STATUS_SOME_NOT_MAPPED; } +// TRACE("done: Status %lx\n", Status); + return Status; }

1 0

[hbelusca] 57463: [REGEDIT] - Don't forget to close the file handle.
by hbelusca＠svn.reactos.org 02 Oct '12

02 Oct '12

Author: hbelusca Date: Tue Oct 2 23:43:55 2012 New Revision: 57463 URL: http://svn.reactos.org/svn/reactos?rev=57463&view=rev Log: [REGEDIT] - Don't forget to close the file handle. Modified: trunk/reactos/base/applications/regedit/regedit.c Modified: trunk/reactos/base/applications/regedit/regedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] Tue Oct 2 23:43:55 2012 @@ -175,6 +175,8 @@ LoadString(hInst, IDS_IMPORT_OK, szText, COUNT_OF(szText)); InfoMessageBox(NULL, MB_OK | MB_ICONINFORMATION, szTitle, szText, filename); } + + fclose(fp); } else {

1 0

[hbelusca] 57462: [REGEDIT] - WCHAR ==> TCHAR in (before a REALLY conversion of regedit into UNICODE) - Correct some mistakes in displayed strings - Improve informative / warning / error messages w...
by hbelusca＠svn.reactos.org 02 Oct '12

02 Oct '12

Author: hbelusca Date: Tue Oct 2 23:29:22 2012 New Revision: 57462 URL: http://svn.reactos.org/svn/reactos?rev=57462&view=rev Log: [REGEDIT] - WCHAR ==> TCHAR in (before a REALLY conversion of regedit into UNICODE) - Correct some mistakes in displayed strings - Improve informative / warning / error messages when importing registry files - Now, try to import each registry file specified in the command line and don't fail miserably when one of them is missing, but continue with the next one (as Windows' regedit does). Patch by Edijs Kolesnikovičs (2/2) adapted by me. CORE-6239 #comment Fixed in r57462 with some adaptations. Thanks ;) #resolve Modified: trunk/reactos/base/applications/regedit/regedit.c Modified: trunk/reactos/base/applications/regedit/regedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] Tue Oct 2 23:29:22 2012 @@ -23,30 +23,31 @@ static const char *usage = "Usage:\n" - " regedit filename\n" + " regedit filenames\n" " regedit /E filename [regpath]\n" " regedit /D regpath\n" "\n" - "filename - registry file name\n" - "regpath - name of the registry key\n" + "filenames - List of registry files names\n" + "filename - Registry file name\n" + "regpath - Name of the registry key\n" "\n" "When is called without any switches adds contents of the specified\n" - "registry file to the registry\n" + "registry files to the registry.\n" "\n" "Switches:\n" - " /E - exports contents of the specified registry key to the specified\n" - " file. Exports the whole registry if no key is specified.\n" - " /D - deletes specified registry key\n" - " /S - silent execution, can be used with any other switch.\n" - " The only existing mode, exists for compatibility with Windows regedit.\n" - " /V - advanced mode, can be used with any other switch.\n" - " Ignored, exists for compatibility with Windows regedit.\n" - " /L - location of system.dat file. Can be used with any other switch.\n" - " Ignored. Exists for compatibility with Windows regedit.\n" - " /R - location of user.dat file. Can be used with any other switch.\n" - " Ignored. Exists for compatibility with Windows regedit.\n" - " /? - print this help. Any other switches are ignored.\n" - " /C - create registry from. Not implemented.\n" + " /E - Exports contents of the specified registry key to the specified\n" + " file. Exports the whole registry if no key is specified.\n" + " /D - Deletes specified registry key\n" + " /S - Silent execution, can be used with any other switch.\n" + " The only existing mode, exists for compatibility with Windows regedit.\n" + " /V - Advanced mode, can be used with any other switch.\n" + " Ignored, exists for compatibility with Windows regedit.\n" + " /L - Location of system.dat file. Can be used with any other switch.\n" + " Ignored. Exists for compatibility with Windows regedit.\n" + " /R - Location of user.dat file. Can be used with any other switch.\n" + " Ignored. Exists for compatibility with Windows regedit.\n" + " /? - Print this help. Any other switches are ignored.\n" + " /C - Create registry from. Not implemented.\n" "\n" "The switches are case-insensitive, can be prefixed either by '-' or '/'.\n" "This program is command-line compatible with Microsoft Windows\n" @@ -74,10 +75,10 @@ * where *s[0] is the first symbol of the file name. * file_name - buffer to write the file name to. */ -void get_file_name(LPWSTR *command_line, LPWSTR file_name) -{ - WCHAR *s = *command_line; - int pos = 0; /* position of pointer "s" in *command_line */ +void get_file_name(LPTSTR *command_line, LPTSTR file_name) +{ + TCHAR *s = *command_line; + int pos = 0; /* position of pointer "s" in *command_line */ file_name[0] = 0; if (!s[0]) @@ -85,11 +86,11 @@ return; } - if (s[0] == L'"') + if (s[0] == _T('"')) { s++; (*command_line)++; - while(s[0] != L'"') + while(s[0] != _T('"')) { if (!s[0]) { @@ -102,7 +103,7 @@ } else { - while(s[0] && !iswspace(s[0])) + while(s[0] && !_istspace(s[0])) { s++; pos++; @@ -110,13 +111,13 @@ } memcpy(file_name, *command_line, pos * sizeof(WCHAR)); /* remove the last backslash */ - if (file_name[pos - 1] == L'\\') - { - file_name[pos - 1] = L'\0'; + if (file_name[pos - 1] == _T('\\')) + { + file_name[pos - 1] = _T('\0'); } else { - file_name[pos] = L'\0'; + file_name[pos] = _T('\0'); } if (s[0]) @@ -124,7 +125,7 @@ s++; pos++; } - while(s[0] && iswspace(s[0])) + while(s[0] && _istspace(s[0])) { s++; pos++; @@ -132,88 +133,116 @@ (*command_line) += pos; } -BOOL PerformRegAction(REGEDIT_ACTION action, LPWSTR s, BOOL silent) -{ - TCHAR szTitle[256], szText[256]; +BOOL PerformRegAction(REGEDIT_ACTION action, LPTSTR s, BOOL silent) +{ switch (action) { - case ACTION_ADD: - { - WCHAR filename[MAX_PATH]; - FILE *fp; - - get_file_name(&s, filename); - if (!filename[0]) - { - fprintf(stderr, "%s: No file name is specified\n", getAppName()); - fprintf(stderr, usage); - exit(4); - } - - while(filename[0]) - { - fp = _wfopen(filename, L"r"); - if (fp == NULL) - { - LPSTR p = GetMultiByteString(filename); - perror(""); - fprintf(stderr, "%s: Can't open file \"%s\"\n", getAppName(), p); - HeapFree(GetProcessHeap(), 0, p); - exit(5); - } - import_registry_file(fp); + case ACTION_ADD: + { + TCHAR szTitle[512], szText[512]; + TCHAR filename[MAX_PATH]; + FILE *fp; + get_file_name(&s, filename); + if (!filename[0]) + { + fprintf(stderr, "%s: No file name is specified\n", getAppName()); + fprintf(stderr, usage); + exit(4); + } + LoadString(hInst, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); - LoadString(hInst, IDS_IMPORT_OK, szText, COUNT_OF(szText)); - /* show successful import */ - if (!silent) - MessageBox(NULL, szText, szTitle, MB_OK); - } - break; - } - case ACTION_DELETE: - { - WCHAR reg_key_name[KEY_MAX_LEN]; - get_file_name(&s, reg_key_name); - if (!reg_key_name[0]) - { - fprintf(stderr, "%s: No registry key is specified for removal\n", getAppName()); - fprintf(stderr, usage); - exit(6); - } - delete_registry_key(reg_key_name); - break; - } - case ACTION_EXPORT: - { - WCHAR filename[MAX_PATH]; - - filename[0] = _T('\0'); - get_file_name(&s, filename); - if (!filename[0]) - { - fprintf(stderr, "%s: No file name is specified\n", getAppName()); - fprintf(stderr, usage); - exit(7); - } - - if (s[0]) - { - WCHAR reg_key_name[KEY_MAX_LEN]; + + while (filename[0]) + { + /* Request import confirmation */ + if (!silent) + { + LoadString(hInst, IDS_IMPORT_PROMPT, szText, COUNT_OF(szText)); + + if (InfoMessageBox(NULL, MB_YESNO | MB_ICONWARNING, szTitle, szText, filename) != IDYES) + goto cont; + } + + fp = _tfopen(filename, _T("r")); + if (fp != NULL) + { + import_registry_file(fp); + + /* Show successful import */ + if (!silent) + { + LoadString(hInst, IDS_IMPORT_OK, szText, COUNT_OF(szText)); + InfoMessageBox(NULL, MB_OK | MB_ICONINFORMATION, szTitle, szText, filename); + } + } + else + { + LPSTR p = GetMultiByteString(filename); + perror(""); + fprintf(stderr, "%s: Can't open file \"%s\"\n", getAppName(), p); + HeapFree(GetProcessHeap(), 0, p); + + /* Error opening the file */ + if (!silent) + { + LoadString(hInst, IDS_IMPORT_ERROR, szText, COUNT_OF(szText)); + InfoMessageBox(NULL, MB_OK | MB_ICONERROR, szTitle, szText, filename); + } + } + +cont: + get_file_name(&s, filename); + } + break; + } + + case ACTION_DELETE: + { + TCHAR reg_key_name[KEY_MAX_LEN]; get_file_name(&s, reg_key_name); - export_registry_key(filename, reg_key_name, REG_FORMAT_4); - } - else - { - export_registry_key(filename, NULL, REG_FORMAT_4); - } - break; - } - default: - fprintf(stderr, "%s: Unhandled action!\n", getAppName()); - exit(8); - break; - } + if (!reg_key_name[0]) + { + fprintf(stderr, "%s: No registry key is specified for removal\n", getAppName()); + fprintf(stderr, usage); + exit(6); + } + delete_registry_key(reg_key_name); + break; + } + + case ACTION_EXPORT: + { + TCHAR filename[MAX_PATH]; + + filename[0] = _T('\0'); + get_file_name(&s, filename); + if (!filename[0]) + { + fprintf(stderr, "%s: No file name is specified\n", getAppName()); + fprintf(stderr, usage); + exit(7); + } + + if (s[0]) + { + TCHAR reg_key_name[KEY_MAX_LEN]; + get_file_name(&s, reg_key_name); + export_registry_key(filename, reg_key_name, REG_FORMAT_4); + } + else + { + export_registry_key(filename, NULL, REG_FORMAT_4); + } + break; + } + + default: + fprintf(stderr, "%s: Unhandled action!\n", getAppName()); + exit(8); + break; + } + return TRUE; } @@ -233,35 +262,35 @@ else { fprintf(stderr, "%s: Alphabetic character is expected after '%c' " - "in swit ch specification\n", getAppName(), *(s - 1)); + "in switch specification\n", getAppName(), *(s - 1)); } exit(1); } -BOOL ProcessCmdLine(LPWSTR lpCmdLine) +BOOL ProcessCmdLine(LPTSTR lpCmdLine) { BOOL silent = FALSE; REGEDIT_ACTION action = ACTION_UNDEF; - LPWSTR s = lpCmdLine; /* command line pointer */ - WCHAR ch = *s; /* current character */ - - while (ch && ((ch == L'-') || (ch == L'/'))) - { - WCHAR chu; - WCHAR ch2; + LPTSTR s = lpCmdLine; /* command line pointer */ + TCHAR ch = *s; /* current character */ + + while (ch && ((ch == _T('-')) || (ch == _T('/')))) + { + TCHAR chu; + TCHAR ch2; s++; ch = *s; ch2 = *(s + 1); - chu = (WCHAR)towupper(ch); - if (!ch2 || iswspace(ch2)) - { - if (chu == L'S') + chu = _totupper(ch); + if (!ch2 || _istspace(ch2)) + { + if (chu == _T('S')) { /* Silence dialogs */ silent = TRUE; } - else if (chu == L'V') + else if (chu == _T('V')) { /* Ignore this switch */ } @@ -269,41 +298,41 @@ { switch (chu) { - case L'D': - action = ACTION_DELETE; - break; - case L'E': - action = ACTION_EXPORT; - break; - case L'?': - fprintf(stderr, usage); - exit(3); - break; - default: - error_unknown_switch(chu, s); - break; + case _T('D'): + action = ACTION_DELETE; + break; + case _T('E'): + action = ACTION_EXPORT; + break; + case _T('?'): + fprintf(stderr, usage); + exit(3); + break; + default: + error_unknown_switch(chu, s); + break; } } s++; } else { - if (ch2 == L':') + if (ch2 == _T(':')) { switch (chu) { - case L'L': - /* fall through */ - case L'R': - s += 2; - while (*s && !iswspace(*s)) - { - s++; - } - break; - default: - error_unknown_switch(chu, s); - break; + case _T('L'): + /* fall through */ + case _T('R'): + s += 2; + while (*s && !_istspace(*s)) + { + s++; + } + break; + default: + error_unknown_switch(chu, s); + break; } } else @@ -315,7 +344,7 @@ } /* skip spaces to the next parameter */ ch = *s; - while (ch && iswspace(ch)) + while (ch && _istspace(ch)) { s++; ch = *s; @@ -323,25 +352,10 @@ } if (*s && action == ACTION_UNDEF) - { - if (!silent) - { - TCHAR szTitle[256], szText[256]; - LoadString(hInst, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); - LoadString(hInst, IDS_IMPORT_PROMPT, szText, COUNT_OF(szText)); - /* request import confirmation */ - if (MessageBox(NULL, szText, szTitle, MB_YESNO) == IDYES) - action = ACTION_ADD; - else - return TRUE; - } - else - { - action = ACTION_ADD; - } - } - if (action == ACTION_UNDEF) + action = ACTION_ADD; + + if (action != ACTION_UNDEF) + return PerformRegAction(action, s, silent); + else return FALSE; - - return PerformRegAction(action, s, silent); -} +}

1 0

[ekohl] 57461: [LSASRV] LsarLookupNames3: Use the existing list of well known SIDs to look-up well known account names.
by ekohl＠svn.reactos.org 02 Oct '12

02 Oct '12

Author: ekohl Date: Tue Oct 2 23:14:38 2012 New Revision: 57461 URL: http://svn.reactos.org/svn/reactos?rev=57461&view=rev Log: [LSASRV] LsarLookupNames3: Use the existing list of well known SIDs to look-up well known account names. Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/sids.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] Tue Oct 2 23:14:38 2012 @@ -2009,126 +2009,29 @@ DWORD LookupOptions, DWORD ClientRevision) { - SID_IDENTIFIER_AUTHORITY IdentifierAuthority = {SECURITY_NT_AUTHORITY}; - static const UNICODE_STRING DomainName = RTL_CONSTANT_STRING(L"DOMAIN"); - PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer = NULL; - PLSAPR_TRANSLATED_SID_EX2 SidsBuffer = NULL; - ULONG SidsBufferLength; - ULONG DomainSidLength; - ULONG AccountSidLength; - PSID DomainSid; - PSID AccountSid; - ULONG i; NTSTATUS Status; TRACE("LsarLookupNames3(%p, %lu, %p, %p, %p, %d, %p, %lu, %lu)\n", PolicyHandle, Count, Names, ReferencedDomains, TranslatedSids, LookupLevel, MappedCount, LookupOptions, ClientRevision); + TranslatedSids->Entries = 0; + TranslatedSids->Sids = NULL; + *ReferencedDomains = NULL; + if (Count == 0) return STATUS_NONE_MAPPED; - TranslatedSids->Entries = Count; - TranslatedSids->Sids = NULL; - *ReferencedDomains = NULL; - - SidsBufferLength = Count * sizeof(LSAPR_TRANSLATED_SID_EX2); - SidsBuffer = MIDL_user_allocate(SidsBufferLength); - if (SidsBuffer == NULL) - return STATUS_INSUFFICIENT_RESOURCES; - - for (i = 0; i < Count; i++) - { - SidsBuffer[i].Use = SidTypeUser; - SidsBuffer[i].Sid = NULL; - SidsBuffer[i].DomainIndex = -1; - SidsBuffer[i].Flags = 0; - } - - DomainsBuffer = MIDL_user_allocate(sizeof(LSAPR_REFERENCED_DOMAIN_LIST)); - if (DomainsBuffer == NULL) - { - MIDL_user_free(SidsBuffer); - return STATUS_INSUFFICIENT_RESOURCES; - } - - DomainsBuffer->Entries = Count; - DomainsBuffer->Domains = MIDL_user_allocate(Count * sizeof(LSA_TRUST_INFORMATION)); - if (DomainsBuffer->Domains == NULL) - { - MIDL_user_free(DomainsBuffer); - MIDL_user_free(SidsBuffer); - return STATUS_INSUFFICIENT_RESOURCES; - } - - Status = RtlAllocateAndInitializeSid(&IdentifierAuthority, - 2, - SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - 0, 0, 0, 0, 0, 0, - &DomainSid); - if (!NT_SUCCESS(Status)) - { - MIDL_user_free(DomainsBuffer->Domains); - MIDL_user_free(DomainsBuffer); - MIDL_user_free(SidsBuffer); - return Status; - } - - DomainSidLength = RtlLengthSid(DomainSid); - - for (i = 0; i < Count; i++) - { - DomainsBuffer->Domains[i].Sid = MIDL_user_allocate(DomainSidLength); - RtlCopyMemory(DomainsBuffer->Domains[i].Sid, - DomainSid, - DomainSidLength); - - DomainsBuffer->Domains[i].Name.Buffer = MIDL_user_allocate(DomainName.MaximumLength); - DomainsBuffer->Domains[i].Name.Length = DomainName.Length; - DomainsBuffer->Domains[i].Name.MaximumLength = DomainName.MaximumLength; - RtlCopyMemory(DomainsBuffer->Domains[i].Name.Buffer, - DomainName.Buffer, - DomainName.MaximumLength); - } - - Status = RtlAllocateAndInitializeSid(&IdentifierAuthority, - 3, - SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - DOMAIN_USER_RID_ADMIN, - 0, 0, 0, 0, 0, - &AccountSid); - if (!NT_SUCCESS(Status)) - { - MIDL_user_free(DomainsBuffer->Domains); - MIDL_user_free(DomainsBuffer); - MIDL_user_free(SidsBuffer); - return Status; - } - - AccountSidLength = RtlLengthSid(AccountSid); - - for (i = 0; i < Count; i++) - { - SidsBuffer[i].Use = SidTypeWellKnownGroup; - SidsBuffer[i].Sid = MIDL_user_allocate(AccountSidLength); - - RtlCopyMemory(SidsBuffer[i].Sid, - AccountSid, - AccountSidLength); - - SidsBuffer[i].DomainIndex = i; - SidsBuffer[i].Flags = 0; - } - - *ReferencedDomains = DomainsBuffer; - *MappedCount = Count; - - TranslatedSids->Entries = Count; - TranslatedSids->Sids = SidsBuffer; - - return STATUS_SUCCESS; + Status = LsapLookupNames(Count, + Names, + ReferencedDomains, + TranslatedSids, + LookupLevel, + MappedCount, + LookupOptions, + ClientRevision); + + return Status; } Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Tue Oct 2 23:14:38 2012 @@ -196,3 +196,14 @@ LsapLookupSids(PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, PLSAPR_TRANSLATED_NAME OutputNames); +NTSTATUS +LsapLookupNames(DWORD Count, + PRPC_UNICODE_STRING Names, + PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, + PLSAPR_TRANSLATED_SIDS_EX2 TranslatedSids, + LSAP_LOOKUP_LEVEL LookupLevel, + DWORD *MappedCount, + DWORD LookupOptions, + DWORD ClientRevision); + +/* EOF */ Modified: trunk/reactos/dll/win32/lsasrv/sids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/sids.c?re… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] Tue Oct 2 23:14:38 2012 @@ -17,7 +17,7 @@ PSID Sid; UNICODE_STRING Name; UNICODE_STRING Domain; - SID_NAME_USE NameUse; + SID_NAME_USE Use; } WELL_KNOWN_SID, *PWELL_KNOWN_SID; @@ -155,7 +155,7 @@ PULONG SubAuthorities, PWSTR Name, PWSTR Domain, - SID_NAME_USE NameUse) + SID_NAME_USE Use) { PWELL_KNOWN_SID SidEntry; PULONG p; @@ -192,7 +192,7 @@ RtlInitUnicodeString(&SidEntry->Domain, Domain); - SidEntry->NameUse = NameUse; + SidEntry->Use = Use; InsertTailList(&WellKnownSidListHead, &SidEntry->ListEntry); @@ -275,8 +275,8 @@ LsapCreateSid(&NtAuthority, 0, NULL, - L"NT Pseudo Domain", - L"NT Pseudo Domain", + L"NT AUTHORITY", + L"NT AUTHORITY", SidTypeDomain); /* Dialup Sid */ @@ -625,7 +625,7 @@ ptr = LsapLookupWellKnownSid(Sids[i]); if (ptr != NULL) { - OutputNames[i].Use = ptr->NameUse; + OutputNames[i].Use = ptr->Use; OutputNames[i].DomainIndex = i; /* Fixme */ @@ -635,18 +635,33 @@ RtlCopyMemory(OutputNames[i].Name.Buffer, ptr->Name.Buffer, ptr->Name.MaximumLength); Mapped++; + continue; } - else - { - OutputNames[i].Use = SidTypeWellKnownGroup; - OutputNames[i].DomainIndex = i; - OutputNames[i].Name.Buffer = MIDL_user_allocate(UserName.MaximumLength); - OutputNames[i].Name.Length = UserName.Length; - OutputNames[i].Name.MaximumLength = UserName.MaximumLength; - RtlCopyMemory(OutputNames[i].Name.Buffer, UserName.Buffer, UserName.MaximumLength); - - Mapped++; - } + + /* Check for buildin domain SID */ + + /* Check for account domain SID */ + + /* Check for primary domain SID (later) */ + + /* Check for trusted domain SID (later) */ + + /* Check for builtin domain account SID */ + + /* Check for account domain account SID */ + + /* Check for primary domain account SID (later) */ + + + /* Unknown SID */ + OutputNames[i].Use = SidTypeWellKnownGroup; + OutputNames[i].DomainIndex = i; + OutputNames[i].Name.Buffer = MIDL_user_allocate(UserName.MaximumLength); + OutputNames[i].Name.Length = UserName.Length; + OutputNames[i].Name.MaximumLength = UserName.MaximumLength; + RtlCopyMemory(OutputNames[i].Name.Buffer, UserName.Buffer, UserName.MaximumLength); + + Mapped++; } if (Mapped == 0) @@ -659,4 +674,299 @@ return Status; } + +PWELL_KNOWN_SID +LsapLookupWellKnownName(LPWSTR Domain, + LPWSTR Account) +{ + PLIST_ENTRY ListEntry; + PWELL_KNOWN_SID Ptr; + + ListEntry = WellKnownSidListHead.Flink; + while (ListEntry != &WellKnownSidListHead) + { + Ptr = CONTAINING_RECORD(ListEntry, + WELL_KNOWN_SID, + ListEntry); + if (_wcsicmp(Account, Ptr->Name.Buffer) == 0) + return Ptr; + + ListEntry = ListEntry->Flink; + } + + return NULL; +} + + +static +NTSTATUS +LsapSplitNames(DWORD Count, + PRPC_UNICODE_STRING Names, + PRPC_UNICODE_STRING *DomainNames, + PRPC_UNICODE_STRING *AccountNames) +{ + PRPC_UNICODE_STRING DomainsBuffer = NULL; + PRPC_UNICODE_STRING AccountsBuffer = NULL; + ULONG DomainLength; + ULONG i; + LPWSTR Ptr; + NTSTATUS Status = STATUS_SUCCESS; + + DomainsBuffer = MIDL_user_allocate(Count * sizeof(RPC_UNICODE_STRING)); + if (DomainsBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + AccountsBuffer = MIDL_user_allocate(Count * sizeof(RPC_UNICODE_STRING)); + if (AccountsBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + for (i = 0; i < Count; i++) + { +TRACE("Name: %S\n", Names[i].Buffer); + + Ptr = wcschr(Names[i].Buffer, L'\\'); + if (Ptr == NULL) + { + AccountsBuffer[i].Length = Names[i].Length; + AccountsBuffer[i].MaximumLength = Names[i].MaximumLength; + AccountsBuffer[i].Buffer = MIDL_user_allocate(AccountsBuffer[i].MaximumLength); + if (AccountsBuffer[i].Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + CopyMemory(AccountsBuffer[i].Buffer, + Names[i].Buffer, + AccountsBuffer[i].Length); + AccountsBuffer[i].Buffer[AccountsBuffer[i].Length / sizeof(WCHAR)] = UNICODE_NULL; + +TRACE("Account name: %S\n", AccountsBuffer[i].Buffer); + } + else + { + DomainLength = (ULONG)((ULONG_PTR)Ptr - (ULONG_PTR)Names[i].Buffer); + if (DomainLength > 0) + { + DomainsBuffer[i].Length = (USHORT)DomainLength * sizeof(WCHAR); + DomainsBuffer[i].MaximumLength = DomainsBuffer[i].Length + sizeof(WCHAR); + DomainsBuffer[i].Buffer = MIDL_user_allocate(DomainsBuffer[i].MaximumLength); + if (DomainsBuffer[i].Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + CopyMemory(DomainsBuffer[i].Buffer, + Names[i].Buffer, + DomainsBuffer[i].Length); + DomainsBuffer[i].Buffer[DomainsBuffer[i].Length / sizeof(WCHAR)] = UNICODE_NULL; + +TRACE("Domain name: %S\n", DomainsBuffer[i].Buffer); + } + + AccountsBuffer[i].Length = Names[i].Length - (USHORT)((DomainLength + 1) * sizeof(WCHAR)); + AccountsBuffer[i].MaximumLength = AccountsBuffer[i].Length + sizeof(WCHAR); + AccountsBuffer[i].Buffer = MIDL_user_allocate(AccountsBuffer[i].MaximumLength); + if (AccountsBuffer[i].Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + CopyMemory(AccountsBuffer[i].Buffer, + &(Names[i].Buffer[DomainLength + 1]), + AccountsBuffer[i].Length); + AccountsBuffer[i].Buffer[AccountsBuffer[i].Length / sizeof(WCHAR)] = UNICODE_NULL; + +TRACE("Account name: %S\n", AccountsBuffer[i].Buffer); + } + } + +done: + if (!NT_SUCCESS(Status)) + { + if (AccountsBuffer != NULL) + { + for (i = 0; i < Count; i++) + { + if (AccountsBuffer[i].Buffer != NULL) + MIDL_user_free(AccountsBuffer[i].Buffer); + } + + MIDL_user_free(AccountsBuffer); + } + + if (DomainsBuffer != NULL) + { + for (i = 0; i < Count; i++) + { + if (DomainsBuffer[i].Buffer != NULL) + MIDL_user_free(DomainsBuffer[i].Buffer); + } + + MIDL_user_free(DomainsBuffer); + } + } + else + { + *DomainNames = DomainsBuffer; + *AccountNames = AccountsBuffer; + } + + return Status; +} + + +NTSTATUS +LsapLookupNames(DWORD Count, + PRPC_UNICODE_STRING Names, + PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, + PLSAPR_TRANSLATED_SIDS_EX2 TranslatedSids, + LSAP_LOOKUP_LEVEL LookupLevel, + DWORD *MappedCount, + DWORD LookupOptions, + DWORD ClientRevision) +{ + PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer = NULL; + PLSAPR_TRANSLATED_SID_EX2 SidsBuffer = NULL; + PRPC_UNICODE_STRING DomainNames = NULL; + PRPC_UNICODE_STRING AccountNames = NULL; + ULONG SidsBufferLength; +// ULONG DomainSidLength; +// ULONG AccountSidLength; +// PSID DomainSid; +// PSID AccountSid; + ULONG i; + ULONG Mapped = 0; + NTSTATUS Status = STATUS_SUCCESS; + + PWELL_KNOWN_SID ptr; + +TRACE("\n"); + + TranslatedSids->Entries = Count; + TranslatedSids->Sids = NULL; + *ReferencedDomains = NULL; + + SidsBufferLength = Count * sizeof(LSAPR_TRANSLATED_SID_EX2); + SidsBuffer = MIDL_user_allocate(SidsBufferLength); + if (SidsBuffer == NULL) + { +TRACE("\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + DomainsBuffer = MIDL_user_allocate(sizeof(LSAPR_REFERENCED_DOMAIN_LIST)); + if (DomainsBuffer == NULL) + { +TRACE("\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + DomainsBuffer->Entries = Count; + DomainsBuffer->Domains = MIDL_user_allocate(Count * sizeof(LSA_TRUST_INFORMATION)); + if (DomainsBuffer->Domains == NULL) + { +TRACE("\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = LsapSplitNames(Count, + Names, + &DomainNames, + &AccountNames); + if (!NT_SUCCESS(Status)) + { + TRACE("LsapSplitNames failed! (Status %lx)\n", Status); + goto done; + } + + for (i = 0; i < Count; i++) + { +TRACE("Name: %S\n", Names[i].Buffer); + +TRACE("Domain name: %S\n", DomainNames[i].Buffer); +TRACE("Account name: %S\n", AccountNames[i].Buffer); + + ptr = LsapLookupWellKnownName(DomainNames[i].Buffer, + AccountNames[i].Buffer); + if (ptr != NULL) + { +TRACE("Found well known account!\n"); + SidsBuffer[i].Use = ptr->Use; + SidsBuffer[i].Sid = ptr->Sid; + + SidsBuffer[i].DomainIndex = -1; + SidsBuffer[i].Flags = 0; + + + Mapped++; + continue; + } + + + + } + +done: + TRACE("done: Status %lx\n", Status); + + if (DomainNames != NULL) + { + for (i = 0; i < Count; i++) + { + if (DomainNames[i].Buffer != NULL) + MIDL_user_free(DomainNames[i].Buffer); + } + + MIDL_user_free(DomainNames); + } + + if (AccountNames != NULL) + { + for (i = 0; i < Count; i++) + { + if (AccountNames[i].Buffer != NULL) + MIDL_user_free(AccountNames[i].Buffer); + } + + MIDL_user_free(AccountNames); + } + + if (!NT_SUCCESS(Status)) + { + if (DomainsBuffer != NULL) + { + if (DomainsBuffer->Domains != NULL) + MIDL_user_free(DomainsBuffer->Domains); + + MIDL_user_free(DomainsBuffer); + } + + if (SidsBuffer != NULL) + MIDL_user_free(SidsBuffer); + } + else + { + *MappedCount = Mapped; + + if (Mapped == 0) + Status = STATUS_NONE_MAPPED; + else if (Mapped < Count) + Status = STATUS_SOME_NOT_MAPPED; + } + + return Status; +} + /* EOF */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2012