Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 56685: [SAMLIB] - Implement SamFreeMemory and SamLookupDomainInSamServer. - Remove unused file debug.h. [SAMSRV] - Implement SamrLookupDomainInSamServer. - Add registry helper functions. - ...
by ekohl＠svn.reactos.org 01 Jun '12

01 Jun '12

Author: ekohl Date: Fri Jun 1 18:03:25 2012 New Revision: 56685 URL: http://svn.reactos.org/svn/reactos?rev=56685&view=rev Log: [SAMLIB] - Implement SamFreeMemory and SamLookupDomainInSamServer. - Remove unused file debug.h. [SAMSRV] - Implement SamrLookupDomainInSamServer. - Add registry helper functions. - Store the domain name in a new Name attribute which is used by Sam(r)LookupDomainInSamServer. Added: trunk/reactos/dll/win32/samsrv/registry.c (with props) Removed: trunk/reactos/dll/win32/samlib/debug.h Modified: trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samlib/samlib.spec trunk/reactos/dll/win32/samsrv/CMakeLists.txt trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/dll/win32/samsrv/setup.c trunk/reactos/include/ddk/ntsam.h Removed: trunk/reactos/dll/win32/samlib/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/debug.h?r… ============================================================================== --- trunk/reactos/dll/win32/samlib/debug.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/debug.h (removed) @@ -1,16 +1,0 @@ -#ifdef NDEBUG -#define DPRINT(...) -#define CHECKPOINT -#else -#define DPRINT(...) do { DebugPrint("(SAMLIB:%s:%d) ",__FILE__,__LINE__); DebugPrint(__VA_ARGS__); } while(0) -#define CHECKPOINT do { DebugPrint("(SAMLIB:%s:%d) Checkpoint\n",__FILE__,__LINE__); } while(0) -#endif - -#define DPRINT1(...) do { DebugPrint("(SAMLIB:%s:%d) ",__FILE__,__LINE__); DebugPrint(__VA_ARGS__); } while(0) -#define CHECKPOINT1 do { DebugPrint("(SAMLIB:%s:%d) Checkpoint\n",__FILE__,__LINE__); } while(0) - - -void -DebugPrint(char* fmt,...); - -/* EOF */ 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] Fri Jun 1 18:03:25 2012 @@ -186,6 +186,44 @@ NTSTATUS NTAPI +SamFreeMemory(IN PVOID Buffer) +{ + if (Buffer!= NULL) + midl_user_free(Buffer); + + return STATUS_SUCCESS; +} + + +NTSTATUS +NTAPI +SamLookupDomainInSamServer(IN SAM_HANDLE ServerHandle, + IN PUNICODE_STRING Name, + OUT PSID *DomainId) +{ + NTSTATUS Status; + + TRACE("SamLookupDomainInSamServer(%p,%p,%p)\n", + ServerHandle, Name, DomainId); + + RpcTryExcept + { + Status = SamrLookupDomainInSamServer((SAMPR_HANDLE)ServerHandle, + (PRPC_UNICODE_STRING)Name, + (PRPC_SID *)DomainId); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +NTSTATUS +NTAPI SamOpenDomain(IN SAM_HANDLE ServerHandle, IN ACCESS_MASK DesiredAccess, IN PSID DomainId, 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] Fri Jun 1 18:03:25 2012 @@ -18,14 +18,14 @@ @ stub SamEnumerateDomainsInSamServer @ stub SamEnumerateGroupsInDomain @ stub SamEnumerateUsersInDomain -@ stub SamFreeMemory +@ stdcall SamFreeMemory(ptr) @ stub SamGetAliasMembership @ stub SamGetCompatibilityMode @ stub SamGetDisplayEnumerationIndex @ stub SamGetGroupsForUser @ stub SamGetMembersInAlias @ stub SamGetMembersInGroup -@ stub SamLookupDomainInSamServer +@ stdcall SamLookupDomainInSamServer(ptr ptr ptr) @ stub SamLookupIdsInDomain @ stub SamLookupNamesInDomain @ stub SamOpenAlias Modified: trunk/reactos/dll/win32/samsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] Fri Jun 1 18:03:25 2012 @@ -9,6 +9,7 @@ list(APPEND SOURCE database.c + registry.c samrpc.c samsrv.c setup.c Added: trunk/reactos/dll/win32/samsrv/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/registry.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/registry.c (added) +++ trunk/reactos/dll/win32/samsrv/registry.c [iso-8859-1] Fri Jun 1 18:03:25 2012 @@ -1,0 +1,175 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Security Account Manager (SAM) Server + * FILE: reactos/dll/win32/samsrv/registry.c + * PURPOSE: Registry helper functions + * + * PROGRAMMERS: Eric Kohl + */ + +/* INCLUDES ****************************************************************/ + +#include "samsrv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(samsrv); + +/* FUNCTIONS ***************************************************************/ + +NTSTATUS +NTAPI +SampRegEnumerateSubKey(IN HANDLE KeyHandle, + IN ULONG Index, + IN ULONG Length, + OUT LPWSTR Buffer) +{ + PKEY_BASIC_INFORMATION KeyInfo = NULL; + ULONG BufferLength = 0; + ULONG ReturnedLength; + NTSTATUS Status; + + /* Check if we have a name */ + if (Length) + { + /* Allocate a buffer for it */ + BufferLength = sizeof(KEY_BASIC_INFORMATION) + Length * sizeof(WCHAR); + + KeyInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferLength); + if (KeyInfo == NULL) + return STATUS_NO_MEMORY; + } + + /* Enumerate the key */ + Status = ZwEnumerateKey(KeyHandle, + Index, + KeyBasicInformation, + KeyInfo, + BufferLength, + &ReturnedLength); + if (NT_SUCCESS(Status)) + { + /* Check if the name fits */ + if (KeyInfo->NameLength < (Length * sizeof(WCHAR))) + { + /* Copy it */ + RtlMoveMemory(Buffer, + KeyInfo->Name, + KeyInfo->NameLength); + + /* Terminate the string */ + Buffer[KeyInfo->NameLength / sizeof(WCHAR)] = 0; + } + else + { + /* Otherwise, we ran out of buffer space */ + Status = STATUS_BUFFER_OVERFLOW; + } + } + + /* Free the buffer and return status */ + if (KeyInfo) + RtlFreeHeap(RtlGetProcessHeap(), 0, KeyInfo); + + return Status; +} + + +NTSTATUS +NTAPI +SampRegOpenKey(IN HANDLE ParentKeyHandle, + IN LPCWSTR KeyName, + IN ACCESS_MASK DesiredAccess, + OUT HANDLE KeyHandle) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING Name; + + RtlInitUnicodeString(&Name, KeyName); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + ParentKeyHandle, + NULL); + + return NtOpenKey(KeyHandle, + DesiredAccess, + &ObjectAttributes); +} + + +NTSTATUS +SampRegSetValue(HANDLE KeyHandle, + LPWSTR ValueName, + ULONG Type, + LPVOID Data, + ULONG DataLength) +{ + UNICODE_STRING Name; + + RtlInitUnicodeString(&Name, + ValueName); + + return ZwSetValueKey(KeyHandle, + &Name, + 0, + Type, + Data, + DataLength); +} + + +NTSTATUS +SampRegQueryValue(HANDLE KeyHandle, + LPWSTR ValueName, + PULONG Type OPTIONAL, + LPVOID Data OPTIONAL, + PULONG DataLength OPTIONAL) +{ + PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; + UNICODE_STRING Name; + ULONG BufferLength = 0; + NTSTATUS Status; + + RtlInitUnicodeString(&Name, + ValueName); + + if (DataLength != NULL) + BufferLength = *DataLength; + + BufferLength += FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); + + /* Allocate memory for the value */ + ValueInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferLength); + if (ValueInfo == NULL) + return STATUS_NO_MEMORY; + + /* Query the value */ + Status = ZwQueryValueKey(KeyHandle, + &Name, + KeyValuePartialInformation, + ValueInfo, + BufferLength, + &BufferLength); + if ((NT_SUCCESS(Status)) || (Status == STATUS_BUFFER_OVERFLOW)) + { + if (Type != NULL) + *Type = ValueInfo->Type; + + if (DataLength != NULL) + *DataLength = ValueInfo->DataLength; + } + + /* Check if the caller wanted data back, and we got it */ + if ((NT_SUCCESS(Status)) && (Data != NULL)) + { + /* Copy it */ + RtlMoveMemory(Data, + ValueInfo->Data, + ValueInfo->DataLength); + } + + /* Free the memory and return status */ + RtlFreeHeap(RtlGetProcessHeap(), 0, ValueInfo); + + return Status; +} Propchange: trunk/reactos/dll/win32/samsrv/registry.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/samsrv/registry.c ------------------------------------------------------------------------------ svn:keywords = author date id revision 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] Fri Jun 1 18:03:25 2012 @@ -161,8 +161,106 @@ IN PRPC_UNICODE_STRING Name, OUT PRPC_SID *DomainId) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT ServerObject; + HANDLE DomainsKeyHandle = NULL; + HANDLE DomainKeyHandle = NULL; + WCHAR DomainKeyName[64]; + ULONG Index; + WCHAR DomainNameString[MAX_COMPUTERNAME_LENGTH + 1]; + UNICODE_STRING DomainName; + ULONG Length; + BOOL Found = FALSE; + NTSTATUS Status; + + TRACE("SamrLookupDomainInSamServer(%p %p %p)\n", + ServerHandle, Name, DomainId); + + /* Validate the server handle */ + Status = SampValidateDbObject(ServerHandle, + SamDbServerObject, + SAM_SERVER_LOOKUP_DOMAIN, + &ServerObject); + if (!NT_SUCCESS(Status)) + return Status; + + *DomainId = NULL; + + Status = SampRegOpenKey(ServerObject->KeyHandle, + L"Domains", + KEY_READ, + &DomainsKeyHandle); + if (!NT_SUCCESS(Status)) + return Status; + + Index = 0; + while (Found == FALSE) + { + Status = SampRegEnumerateSubKey(DomainsKeyHandle, + Index, + 64, + DomainKeyName); + if (!NT_SUCCESS(Status)) + { + if (Status == STATUS_NO_MORE_ENTRIES) + Status = STATUS_NO_SUCH_DOMAIN; + break; + } + + TRACE("Domain key name: %S\n", DomainKeyName); + + Status = SampRegOpenKey(DomainsKeyHandle, + DomainKeyName, + KEY_READ, + &DomainKeyHandle); + if (NT_SUCCESS(Status)) + { + Length = (MAX_COMPUTERNAME_LENGTH + 1) * sizeof(WCHAR); + Status = SampRegQueryValue(DomainKeyHandle, + L"Name", + NULL, + (PVOID)&DomainNameString, + &Length); + if (NT_SUCCESS(Status)) + { + TRACE("Domain name: %S\n", DomainNameString); + + RtlInitUnicodeString(&DomainName, + DomainNameString); + if (RtlEqualUnicodeString(&DomainName, (PUNICODE_STRING)Name, TRUE)) + { + TRACE("Found it!\n"); + Found = TRUE; + + Status = SampRegQueryValue(DomainKeyHandle, + L"SID", + NULL, + NULL, + &Length); + if (NT_SUCCESS(Status)) + { + *DomainId = midl_user_allocate(Length); + + SampRegQueryValue(DomainKeyHandle, + L"SID", + NULL, + (PVOID)*DomainId, + &Length); + + Status = STATUS_SUCCESS; + break; + } + } + } + + NtClose(DomainKeyHandle); + } + + Index++; + } + + NtClose(DomainsKeyHandle); + + return Status; } /* Function 6 */ 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] Fri Jun 1 18:03:25 2012 @@ -103,6 +103,35 @@ LPVOID AttributeData, PULONG AttributeSize); +/* registry.h */ +NTSTATUS +NTAPI +SampRegEnumerateSubKey(IN HANDLE KeyHandle, + IN ULONG Index, + IN ULONG Length, + OUT LPWSTR Buffer); + +NTSTATUS +NTAPI +SampRegOpenKey(IN HANDLE ParentKeyHandle, + IN LPCWSTR KeyName, + IN ACCESS_MASK DesiredAccess, + OUT HANDLE KeyHandle); + +NTSTATUS +SampRegQueryValue(IN HANDLE KeyHandle, + IN LPWSTR ValueName, + OUT PULONG Type OPTIONAL, + OUT LPVOID Data OPTIONAL, + IN OUT PULONG DataLength OPTIONAL); + +NTSTATUS +SampRegSetValue(IN HANDLE KeyHandle, + IN LPWSTR ValueName, + IN ULONG Type, + IN LPVOID Data, + IN ULONG DataLength); + /* samspc.c */ VOID SampStartRpcServer(VOID); Modified: trunk/reactos/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/setup.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] Fri Jun 1 18:03:25 2012 @@ -112,6 +112,7 @@ static BOOL SampCreateDomain(IN HKEY hDomainsKey, + IN LPCWSTR lpKeyName, IN LPCWSTR lpDomainName, IN PSID lpDomainSid, OUT PHKEY lpDomainKey) @@ -127,7 +128,7 @@ *lpDomainKey = NULL; if (RegCreateKeyExW(hDomainsKey, - lpDomainName, + lpKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, @@ -139,6 +140,13 @@ if (lpDomainSid != NULL) { + RegSetValueEx(hDomainKey, + L"Name", + 0, + REG_SZ, + (LPVOID)lpDomainName, + (wcslen(lpDomainName) + 1) * sizeof(WCHAR)); + RegSetValueEx(hDomainKey, L"SID", 0, @@ -332,6 +340,7 @@ /* Create the Builtin domain */ if (SampCreateDomain(hDomainsKey, L"Builtin", + L"Builtin", pBuiltinSid, &hDomainKey)) { @@ -342,7 +351,8 @@ /* Create the Account domain */ if (SampCreateDomain(hDomainsKey, L"Account", - AccountDomainInfo->DomainSid, //NULL, + L"", + AccountDomainInfo->DomainSid, &hDomainKey)) { SampCreateUserAccount(hDomainKey, Modified: trunk/reactos/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntsam.h?rev=56… ============================================================================== --- trunk/reactos/include/ddk/ntsam.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntsam.h [iso-8859-1] Fri Jun 1 18:03:25 2012 @@ -100,6 +100,16 @@ NTSTATUS NTAPI +SamFreeMemory(IN PVOID Buffer); + +NTSTATUS +NTAPI +SamLookupDomainInSamServer(IN SAM_HANDLE ServerHandle, + IN PUNICODE_STRING Name, + OUT PSID *DomainId); + +NTSTATUS +NTAPI SamOpenDomain(IN SAM_HANDLE ServerHandle, IN ACCESS_MASK DesiredAccess, IN PSID DomainId,

1 0

[tkreuzer] 56684: [WIN32K] Fix a comment
by tkreuzer＠svn.reactos.org 01 Jun '12

01 Jun '12

Author: tkreuzer Date: Fri Jun 1 16:15:46 2012 New Revision: 56684 URL: http://svn.reactos.org/svn/reactos?rev=56684&view=rev Log: [WIN32K] Fix a comment Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Fri Jun 1 16:15:46 2012 @@ -1070,7 +1070,7 @@ return -1; } - /* Translate the color to the target format and get the RGB value */ + /* Translate the color to the target format */ iSolidColor = TranslateCOLORREF(pdc, crColor); /* Use the DC's text brush, which is always a solid brush */

1 0

[tkreuzer] 56683: [PSDK] - Add __post_invalid to specstrings.h - Add missing InterlockedCompareExchangePointerAcquire and InterlockedCompareExchangePointerRelease for x86 to winbase.h - Add missing...
by tkreuzer＠svn.reactos.org 01 Jun '12

01 Jun '12

Author: tkreuzer Date: Fri Jun 1 16:10:14 2012 New Revision: 56683 URL: http://svn.reactos.org/svn/reactos?rev=56683&view=rev Log: [PSDK] - Add __post_invalid to specstrings.h - Add missing InterlockedCompareExchangePointerAcquire and InterlockedCompareExchangePointerRelease for x86 to winbase.h - Add missing MemoryBarrier definition Modified: trunk/reactos/include/psdk/specstrings.h trunk/reactos/include/psdk/winbase.h trunk/reactos/include/xdk/amd64/ke.h Modified: trunk/reactos/include/psdk/specstrings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/specstrings.h… ============================================================================== --- trunk/reactos/include/psdk/specstrings.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/specstrings.h [iso-8859-1] Fri Jun 1 16:10:14 2012 @@ -28,6 +28,7 @@ #define __field_bcount(size) __notnull __byte_writableTo(size) #define __field_ecount(size) __notnull __elem_writableTo(size) +#define __post_invalid _Post_ __notvalid #define __deref_in #define __deref_in_ecount(size) Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Fri Jun 1 16:10:14 2012 @@ -2392,6 +2392,8 @@ PSLIST_ENTRY WINAPI InterlockedPopEntrySList(PSLIST_HEADER); PSLIST_ENTRY WINAPI InterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY); #endif +#define InterlockedCompareExchangePointerAcquire InterlockedCompareExchangePointer +#define InterlockedCompareExchangePointerRelease InterlockedCompareExchangePointer #endif // !(defined (_M_AMD64) || defined (_M_IA64)) Modified: trunk/reactos/include/xdk/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/amd64/ke.h?rev… ============================================================================== --- trunk/reactos/include/xdk/amd64/ke.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/amd64/ke.h [iso-8859-1] Fri Jun 1 16:10:14 2012 @@ -45,6 +45,7 @@ #define KeGetDcacheFillSize() 1L #define YieldProcessor _mm_pause +#define MemoryBarrier __faststorefence #define FastFence __faststorefence #define LoadFence _mm_lfence #define MemoryFence _mm_mfence

1 0

[arty] 56682: [NTOSKRNL] - Allow placement of a wait entry in virgin address space prior to mapping a page. - Add a wait entry in the address space when paging in section view. - Correct a problem ...
by arty＠svn.reactos.org 01 Jun '12

01 Jun '12

Author: arty Date: Fri Jun 1 09:01:41 2012 New Revision: 56682 URL: http://svn.reactos.org/svn/reactos?rev=56682&view=rev Log: [NTOSKRNL] - Allow placement of a wait entry in virgin address space prior to mapping a page. - Add a wait entry in the address space when paging in section view. - Correct a problem that previously prevented us from evicting or querying pages that had been protected into PAGE_NOACCESS protection by adding a query for disabled mappings and handling disabled mappings in a few places (this may be controversial). Modified: trunk/reactos/ntoskrnl/cache/section/newmm.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/cache/section/newmm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/new… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/newmm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/newmm.h [iso-8859-1] Fri Jun 1 09:01:41 2012 @@ -4,7 +4,6 @@ /* TYPES *********************************************************************/ -#define MM_WAIT_ENTRY 0x7ffffc00 #define PFN_FROM_SSE(E) ((PFN_NUMBER)((E) >> PAGE_SHIFT)) #define IS_SWAP_FROM_SSE(E) ((E) & 0x00000001) #define MM_IS_WAIT_PTE(E) \ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Fri Jun 1 09:01:41 2012 @@ -179,6 +179,10 @@ (PAGE_WRITECOPY | \ PAGE_EXECUTE_WRITECOPY) +// +// Wait entry for marking pages that are being serviced +// +#define MM_WAIT_ENTRY 0x7ffffc00 #define InterlockedCompareExchangePte(PointerPte, Exchange, Comperand) \ InterlockedCompareExchange((PLONG)(PointerPte), Exchange, Comperand) @@ -1263,6 +1267,13 @@ PVOID Address ); +BOOLEAN +NTAPI +MmIsDisabledPage( + struct _EPROCESS* Process, + PVOID Address +); + VOID NTAPI MmInitGlobalKernelPageDirectory(VOID); Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Fri Jun 1 09:01:41 2012 @@ -467,7 +467,9 @@ */ Pte = InterlockedExchangePte(Pt, 0); - WasValid = (Pte & PA_PRESENT); + /* We count a mapping as valid if it's a present page, or it's a nonzero pfn with + * the swap bit unset, indicating a valid page protected to PAGE_NOACCESS. */ + WasValid = (Pte & PA_PRESENT) || ((Pte >> PAGE_SHIFT) && !(Pte & 0x800)); if (WasValid) { /* Flush the TLB since we transitioned this PTE @@ -702,6 +704,14 @@ BOOLEAN NTAPI +MmIsDisabledPage(PEPROCESS Process, PVOID Address) +{ + ULONG_PTR Entry = MmGetPageEntryForProcess(Process, Address); + return !(Entry & PA_PRESENT) && !(Entry & 0x800) && (Entry >> PAGE_SHIFT); +} + +BOOLEAN +NTAPI MmIsPageSwapEntry(PEPROCESS Process, PVOID Address) { ULONG Entry; @@ -738,12 +748,17 @@ if (Pt == NULL) { /* Nobody should page out an address that hasn't even been mapped */ - KeBugCheck(MEMORY_MANAGEMENT); + /* But we might place a wait entry first, requiring the page table */ + if (SwapEntry != MM_WAIT_ENTRY) + { + KeBugCheck(MEMORY_MANAGEMENT); + } + Pt = MmGetPageTableForProcess(Process, Address, TRUE); } Pte = InterlockedExchangePte(Pt, SwapEntry << 1); if (Pte != 0) { - KeBugCheck(MEMORY_MANAGEMENT); + KeBugCheckEx(MEMORY_MANAGEMENT, SwapEntry, (ULONG_PTR)Process, (ULONG_PTR)Address, 0); } if (Address < MmSystemRangeStart) @@ -975,7 +990,8 @@ } Pte = InterlockedExchangePte(Pt, PAGE_MASK(*Pt) | Attributes | (*Pt & (PA_ACCESSED|PA_DIRTY))); - if (!(Pte & PA_PRESENT)) + // We should be able to bring a page back from PAGE_NOACCESS + if ((Pte & 0x800) || !(Pte >> PAGE_SHIFT)) { DPRINT1("Invalid Pte %lx\n", Pte); KeBugCheck(MEMORY_MANAGEMENT); Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Fri Jun 1 09:01:41 2012 @@ -1223,6 +1223,11 @@ return(STATUS_SUCCESS); } + if (MmIsDisabledPage(Process, Address)) + { + return(STATUS_ACCESS_VIOLATION); + } + /* * Check for the virtual memory area being deleted. */ @@ -1438,6 +1443,8 @@ if (Entry == 0) { + SWAPENTRY FakeSwapEntry; + /* * If the entry is zero (and it can't change because we have * locked the segment) then we need to load the page. @@ -1448,6 +1455,7 @@ */ MmSetPageEntrySectionSegment(Segment, &Offset, MAKE_SWAP_SSE(MM_WAIT_ENTRY)); MmUnlockSectionSegment(Segment); + MmCreatePageFileMapping(Process, PAddress, MM_WAIT_ENTRY); MmUnlockAddressSpace(AddressSpace); if ((Segment->Flags & MM_PAGEFILE_SEGMENT) || @@ -1496,6 +1504,9 @@ MmSetPageEntrySectionSegment(Segment, &Offset, Entry); MmUnlockSectionSegment(Segment); + MmDeletePageFileMapping(Process, PAddress, &FakeSwapEntry); + DPRINT("CreateVirtualMapping Page %x Process %p PAddress %p Attributes %x\n", + Page, Process, PAddress, Attributes); Status = MmCreateVirtualMapping(Process, PAddress, Attributes, @@ -1506,6 +1517,7 @@ DPRINT1("Unable to create virtual mapping\n"); KeBugCheck(MEMORY_MANAGEMENT); } + ASSERT(MmIsPagePresent(Process, PAddress)); MmInsertRmap(Page, Process, Address); MiSetPageEvent(Process, Address); @@ -2441,7 +2453,7 @@ } } - if (MmIsPagePresent(Process, Address)) + if (MmIsPagePresent(Process, Address) || MmIsDisabledPage(Process, Address)) { MmSetPageProtect(Process, Address, Protect);

1 0

[ekohl] 56681: [ADVAPI32] Fixed broken build.
by ekohl＠svn.reactos.org 31 May '12

31 May '12

Author: ekohl Date: Thu May 31 14:18:59 2012 New Revision: 56681 URL: http://svn.reactos.org/svn/reactos?rev=56681&view=rev Log: [ADVAPI32] Fixed broken build. Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/lo… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] Thu May 31 14:18:59 2012 @@ -404,7 +404,6 @@ ULONG ulUserRid; DWORD dwLength; HKEY hNamesKey = NULL; - LONG lError; BOOL bResult = TRUE; if (!GetAccountDomainSid(&AccountDomainSid)) @@ -433,7 +432,7 @@ (LPBYTE)&ulUserRid, &dwLength)) { - ERR("Failed to read the SID! (Error %ld)\n", lError); + ERR("Failed to read the SID! (Error %ld)\n", GetLastError()); bResult = FALSE; goto done; }

1 0

[ekohl] 56680: [ADVAPI32] - Get the logon user SID using the new SAM keys and values. This is still a hack. [SAMLIB] - Remove all hacks. [SYSSETUP] - Remove all administrator account hacks.
by ekohl＠svn.reactos.org 31 May '12

31 May '12

Author: ekohl Date: Thu May 31 14:02:19 2012 New Revision: 56680 URL: http://svn.reactos.org/svn/reactos?rev=56680&view=rev Log: [ADVAPI32] - Get the logon user SID using the new SAM keys and values. This is still a hack. [SAMLIB] - Remove all hacks. [SYSSETUP] - Remove all administrator account hacks. Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samlib/samlib.spec trunk/reactos/dll/win32/syssetup/globals.h trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/security.c Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/lo… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] Thu May 31 14:02:19 2012 @@ -211,103 +211,7 @@ static BOOL WINAPI -SamGetUserSid(LPCWSTR UserName, - PSID *Sid) -{ - PSID lpSid; - DWORD dwLength; - HKEY hUsersKey; - HKEY hUserKey; - - if (Sid != NULL) - *Sid = NULL; - - /* Open the Users key */ - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"SAM\\SAM\\Domains\\Account\\Users", - 0, - KEY_READ, - &hUsersKey)) - { - ERR("Failed to open Users key! (Error %lu)\n", GetLastError()); - return FALSE; - } - - /* Open the user key */ - if (RegOpenKeyExW(hUsersKey, - UserName, - 0, - KEY_READ, - &hUserKey)) - { - if (GetLastError() == ERROR_FILE_NOT_FOUND) - { - ERR("Invalid user name!\n"); - SetLastError(ERROR_NO_SUCH_USER); - } - else - { - ERR("Failed to open user key! (Error %lu)\n", GetLastError()); - } - - RegCloseKey(hUsersKey); - return FALSE; - } - - RegCloseKey (hUsersKey); - - /* Get SID size */ - dwLength = 0; - if (RegQueryValueExW(hUserKey, - L"Sid", - NULL, - NULL, - NULL, - &dwLength)) - { - ERR("Failed to read the SID size! (Error %lu)\n", GetLastError()); - RegCloseKey(hUserKey); - return FALSE; - } - - /* Allocate sid buffer */ - TRACE("Required SID buffer size: %lu\n", dwLength); - lpSid = (PSID)RtlAllocateHeap(RtlGetProcessHeap(), - 0, - dwLength); - if (lpSid == NULL) - { - ERR("Failed to allocate SID buffer!\n"); - RegCloseKey(hUserKey); - return FALSE; - } - - /* Read sid */ - if (RegQueryValueExW(hUserKey, - L"Sid", - NULL, - NULL, - (LPBYTE)lpSid, - &dwLength)) - { - ERR("Failed to read the SID! (Error %lu)\n", GetLastError()); - RtlFreeHeap(RtlGetProcessHeap(), - 0, - lpSid); - RegCloseKey(hUserKey); - return FALSE; - } - - RegCloseKey(hUserKey); - - *Sid = lpSid; - - return TRUE; -} - - -static BOOL WINAPI -GetDomainSid(PSID *Sid) +GetAccountDomainSid(PSID *Sid) { PPOLICY_ACCOUNT_DOMAIN_INFO Info = NULL; LSA_OBJECT_ATTRIBUTES ObjectAttributes; @@ -323,7 +227,7 @@ Status = LsaOpenPolicy(NULL, &ObjectAttributes, - POLICY_TRUST_ADMIN, + POLICY_VIEW_LOCAL_INFORMATION, &PolicyHandle); if (!NT_SUCCESS(Status)) { @@ -400,6 +304,153 @@ } +static BOOL WINAPI +GetUserSid(LPCWSTR UserName, + PSID *Sid) +{ +#if 0 + PSID lpSid; + DWORD dwLength; + HKEY hUsersKey; + HKEY hUserKey; + + if (Sid != NULL) + *Sid = NULL; + + /* Open the Users key */ + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SAM\\SAM\\Domains\\Account\\Users", + 0, + KEY_READ, + &hUsersKey)) + { + ERR("Failed to open Users key! (Error %lu)\n", GetLastError()); + return FALSE; + } + + /* Open the user key */ + if (RegOpenKeyExW(hUsersKey, + UserName, + 0, + KEY_READ, + &hUserKey)) + { + if (GetLastError() == ERROR_FILE_NOT_FOUND) + { + ERR("Invalid user name!\n"); + SetLastError(ERROR_NO_SUCH_USER); + } + else + { + ERR("Failed to open user key! (Error %lu)\n", GetLastError()); + } + + RegCloseKey(hUsersKey); + return FALSE; + } + + RegCloseKey (hUsersKey); + + /* Get SID size */ + dwLength = 0; + if (RegQueryValueExW(hUserKey, + L"Sid", + NULL, + NULL, + NULL, + &dwLength)) + { + ERR("Failed to read the SID size! (Error %lu)\n", GetLastError()); + RegCloseKey(hUserKey); + return FALSE; + } + + /* Allocate sid buffer */ + TRACE("Required SID buffer size: %lu\n", dwLength); + lpSid = (PSID)RtlAllocateHeap(RtlGetProcessHeap(), + 0, + dwLength); + if (lpSid == NULL) + { + ERR("Failed to allocate SID buffer!\n"); + RegCloseKey(hUserKey); + return FALSE; + } + + /* Read sid */ + if (RegQueryValueExW(hUserKey, + L"Sid", + NULL, + NULL, + (LPBYTE)lpSid, + &dwLength)) + { + ERR("Failed to read the SID! (Error %lu)\n", GetLastError()); + RtlFreeHeap(RtlGetProcessHeap(), + 0, + lpSid); + RegCloseKey(hUserKey); + return FALSE; + } + + RegCloseKey(hUserKey); + + *Sid = lpSid; + + return TRUE; +#endif + + PSID AccountDomainSid = NULL; + ULONG ulUserRid; + DWORD dwLength; + HKEY hNamesKey = NULL; + LONG lError; + BOOL bResult = TRUE; + + if (!GetAccountDomainSid(&AccountDomainSid)) + { + return FALSE; + } + + /* Open the Users\Names key */ + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SAM\\SAM\\Domains\\Account\\Users\\Names", + 0, + KEY_READ, + &hNamesKey)) + { + ERR("Failed to open Users\\Names key! (Error %lu)\n", GetLastError()); + bResult = FALSE; + goto done; + } + + /* Read the user RID */ + dwLength = sizeof(ULONG); + if (RegQueryValueExW(hNamesKey, + UserName, + NULL, + NULL, + (LPBYTE)&ulUserRid, + &dwLength)) + { + ERR("Failed to read the SID! (Error %ld)\n", lError); + bResult = FALSE; + goto done; + } + + *Sid = AppendRidToSid(AccountDomainSid, ulUserRid); + +done: + if (hNamesKey != NULL) + RegCloseKey(hNamesKey); + + if (AccountDomainSid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, AccountDomainSid); + + return bResult; +} + + static PTOKEN_GROUPS AllocateGroupSids(OUT PSID *PrimaryGroupSid, OUT PSID *OwnerSid) @@ -419,7 +470,7 @@ if (!NT_SUCCESS(Status)) return NULL; - if (!GetDomainSid(&DomainSid)) + if (!GetAccountDomainSid(&DomainSid)) return NULL; TokenGroups = RtlAllocateHeap( @@ -669,7 +720,7 @@ ExpirationTime.QuadPart = -1; /* Get the user SID from the registry */ - if (!SamGetUserSid (lpszUsername, &UserSid)) + if (!GetUserSid (lpszUsername, &UserSid)) { ERR("SamGetUserSid() failed\n"); return FALSE; 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] Thu May 31 14:02:19 2012 @@ -36,286 +36,6 @@ /* FUNCTIONS *****************************************************************/ -/* - * ERROR_USER_EXISTS - */ -BOOL WINAPI -SamCreateUser (PWSTR UserName, - PWSTR UserPassword, - PSID UserSid) -{ - DWORD dwDisposition; - HKEY hUsersKey; - HKEY hUserKey; - - TRACE("SamCreateUser() called\n"); - - /* FIXME: Check whether the SID is a real user sid */ - - /* Open the Users key */ - if (RegOpenKeyExW (HKEY_LOCAL_MACHINE, - L"SAM\\SAM\\Domains\\Account\\Users", - 0, - KEY_ALL_ACCESS, - &hUsersKey)) - { - ERR("Failed to open Account key! (Error %lu)\n", GetLastError()); - return FALSE; - } - - /* Create user name key */ - if (RegCreateKeyExW (hUsersKey, - UserName, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hUserKey, - &dwDisposition)) - { - ERR("Failed to create/open the user key! (Error %lu)\n", GetLastError()); - RegCloseKey (hUsersKey); - return FALSE; - } - - RegCloseKey (hUsersKey); - - if (dwDisposition == REG_OPENED_EXISTING_KEY) - { - ERR("User already exists!\n"); - RegCloseKey (hUserKey); - SetLastError (ERROR_USER_EXISTS); - return FALSE; - } - - - /* Set 'Name' value */ - if (RegSetValueExW (hUserKey, - L"Name", - 0, - REG_SZ, - (LPBYTE)UserName, - (wcslen (UserName) + 1) * sizeof (WCHAR))) - { - ERR("Failed to set the user name value! (Error %lu)\n", GetLastError()); - RegCloseKey (hUserKey); - return FALSE; - } - - /* Set 'Password' value */ - if (RegSetValueExW (hUserKey, - L"Password", - 0, - REG_SZ, - (LPBYTE)UserPassword, - (wcslen (UserPassword) + 1) * sizeof (WCHAR))) - { - ERR("Failed to set the user name value! (Error %lu)\n", GetLastError()); - RegCloseKey (hUserKey); - return FALSE; - } - - /* Set 'Sid' value */ - if (RegSetValueExW (hUserKey, - L"Sid", - 0, - REG_BINARY, - (LPBYTE)UserSid, - RtlLengthSid (UserSid))) - { - ERR("Failed to set the user SID value! (Error %lu)\n", GetLastError()); - RegCloseKey (hUserKey); - return FALSE; - } - - RegCloseKey (hUserKey); - - TRACE("SamCreateUser() done\n"); - - return TRUE; -} - - -/* - * ERROR_WRONG_PASSWORD - * ERROR_NO_SUCH_USER - */ -BOOL WINAPI -SamCheckUserPassword (PWSTR UserName, - PWSTR UserPassword) -{ - WCHAR szPassword[256]; - DWORD dwLength; - HKEY hUsersKey; - HKEY hUserKey; - - TRACE("SamCheckUserPassword() called\n"); - - /* Open the Users key */ - if (RegOpenKeyExW (HKEY_LOCAL_MACHINE, - L"SAM\\SAM\\Domains\\Account\\Users", - 0, - KEY_READ, - &hUsersKey)) - { - ERR("Failed to open Users key! (Error %lu)\n", GetLastError()); - return FALSE; - } - - /* Open the user key */ - if (RegOpenKeyExW (hUsersKey, - UserName, - 0, - KEY_READ, - &hUserKey)) - { - if (GetLastError () == ERROR_FILE_NOT_FOUND) - { - ERR("Invalid user name!\n"); - SetLastError (ERROR_NO_SUCH_USER); - } - else - { - ERR("Failed to open user key! (Error %lu)\n", GetLastError()); - } - - RegCloseKey (hUsersKey); - return FALSE; - } - - RegCloseKey (hUsersKey); - - /* Get the password */ - dwLength = 256 * sizeof(WCHAR); - if (RegQueryValueExW (hUserKey, - L"Password", - NULL, - NULL, - (LPBYTE)szPassword, - &dwLength)) - { - ERR("Failed to read the password! (Error %lu)\n", GetLastError()); - RegCloseKey (hUserKey); - return FALSE; - } - - RegCloseKey (hUserKey); - - /* Compare passwords */ - if ((wcslen (szPassword) != wcslen (UserPassword)) || - (wcscmp (szPassword, UserPassword) != 0)) - { - ERR("Wrong password!\n"); - SetLastError (ERROR_WRONG_PASSWORD); - return FALSE; - } - - TRACE("SamCheckUserPassword() done\n"); - - return TRUE; -} - - -BOOL WINAPI -SamGetUserSid (PWSTR UserName, - PSID *Sid) -{ - PSID lpSid; - DWORD dwLength; - HKEY hUsersKey; - HKEY hUserKey; - - TRACE("SamGetUserSid() called\n"); - - if (Sid != NULL) - *Sid = NULL; - - /* Open the Users key */ - if (RegOpenKeyExW (HKEY_LOCAL_MACHINE, - L"SAM\\SAM\\Domains\\Account\\Users", - 0, - KEY_READ, - &hUsersKey)) - { - ERR("Failed to open Users key! (Error %lu)\n", GetLastError()); - return FALSE; - } - - /* Open the user key */ - if (RegOpenKeyExW (hUsersKey, - UserName, - 0, - KEY_READ, - &hUserKey)) - { - if (GetLastError () == ERROR_FILE_NOT_FOUND) - { - ERR("Invalid user name!\n"); - SetLastError (ERROR_NO_SUCH_USER); - } - else - { - ERR("Failed to open user key! (Error %lu)\n", GetLastError()); - } - - RegCloseKey (hUsersKey); - return FALSE; - } - - RegCloseKey (hUsersKey); - - /* Get SID size */ - dwLength = 0; - if (RegQueryValueExW (hUserKey, - L"Sid", - NULL, - NULL, - NULL, - &dwLength)) - { - ERR("Failed to read the SID size! (Error %lu)\n", GetLastError()); - RegCloseKey (hUserKey); - return FALSE; - } - - /* Allocate sid buffer */ - TRACE("Required SID buffer size: %lu\n", dwLength); - lpSid = (PSID)RtlAllocateHeap (RtlGetProcessHeap (), - 0, - dwLength); - if (lpSid == NULL) - { - ERR("Failed to allocate SID buffer!\n"); - RegCloseKey (hUserKey); - return FALSE; - } - - /* Read sid */ - if (RegQueryValueExW (hUserKey, - L"Sid", - NULL, - NULL, - (LPBYTE)lpSid, - &dwLength)) - { - ERR("Failed to read the SID! (Error %lu)\n", GetLastError()); - RtlFreeHeap (RtlGetProcessHeap (), - 0, - lpSid); - RegCloseKey (hUserKey); - return FALSE; - } - - RegCloseKey (hUserKey); - - *Sid = lpSid; - - TRACE("SamGetUserSid() done\n"); - - return TRUE; -} - void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); 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] Thu May 31 14:02:19 2012 @@ -63,7 +63,3 @@ @ stub SamiSetBootKeyInformation @ stub SamiSetDSRMPassword @ stub SamiSetDSRMPasswordOWF - -@ stdcall SamCreateUser(wstr wstr ptr) -@ stdcall SamCheckUserPassword(wstr wstr) -@ stdcall SamGetUserSid(wstr ptr) Modified: trunk/reactos/dll/win32/syssetup/globals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/globals… ============================================================================== --- trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] Thu May 31 14:02:19 2012 @@ -64,7 +64,6 @@ /* security.c */ NTSTATUS SetAccountDomain(LPCWSTR DomainName, PSID DomainSid); -NTSTATUS GetAccountDomainInfo(PPOLICY_ACCOUNT_DOMAIN_INFO *AccountDomainInfo); VOID InstallSecurity(VOID); /* wizard.c */ Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Thu May 31 14:02:19 2012 @@ -224,40 +224,6 @@ return CreateDirectory(szPath, NULL) || GetLastError()==ERROR_ALREADY_EXISTS; } -static VOID -AppendRidToSid( - OUT PSID *Dst, - IN PSID Src, - IN ULONG NewRid) -{ - ULONG Rid[8] = {0, 0, 0, 0, 0, 0, 0, 0}; - UCHAR RidCount; - ULONG i; - - RidCount = *RtlSubAuthorityCountSid (Src); - - for (i = 0; i < RidCount; i++) - Rid[i] = *RtlSubAuthoritySid (Src, i); - - if (RidCount < 8) - { - Rid[RidCount] = NewRid; - RidCount++; - } - - RtlAllocateAndInitializeSid( - RtlIdentifierAuthoritySid(Src), - RidCount, - Rid[0], - Rid[1], - Rid[2], - Rid[3], - Rid[4], - Rid[5], - Rid[6], - Rid[7], - Dst); -} static VOID CreateTempDir( @@ -848,10 +814,7 @@ DWORD WINAPI InstallReactOS(HINSTANCE hInstance) { - PPOLICY_ACCOUNT_DOMAIN_INFO AccountDomainInfo = NULL; - PSID AdminSid = NULL; TCHAR szBuffer[MAX_PATH]; - DWORD LastError; HANDLE token; TOKEN_PRIVILEGES privs; HKEY hKey; @@ -864,18 +827,6 @@ FatalError("InitializeProfiles() failed"); return 0; } - - /* Get account domain information */ - if (GetAccountDomainInfo(&AccountDomainInfo) != STATUS_SUCCESS) - { - FatalError("GetAccountDomainInfo() failed!"); - return 0; - } - - /* Append the Admin-RID */ - AppendRidToSid(&AdminSid, AccountDomainInfo->DomainSid, DOMAIN_USER_RID_ADMIN); - - LsaFreeMemory(AccountDomainInfo); CreateTempDir(L"TEMP"); CreateTempDir(L"TMP"); @@ -916,25 +867,6 @@ InstallWizard(); InstallSecurity(); - - /* Create the Administrator account */ - if (!SamCreateUser(L"Administrator", L"", AdminSid)) - { - /* Check what the error was. - * If the Admin Account already exists, then it means Setup - * wasn't allowed to finish properly. Instead of rebooting - * and not completing it, let it restart instead - */ - LastError = GetLastError(); - if (LastError != ERROR_USER_EXISTS) - { - FatalError("SamCreateUser() failed!"); - RtlFreeSid(AdminSid); - return 0; - } - } - - RtlFreeSid(AdminSid); if (!CreateShortcuts()) { Modified: trunk/reactos/dll/win32/syssetup/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/securit… ============================================================================== --- trunk/reactos/dll/win32/syssetup/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/security.c [iso-8859-1] Thu May 31 14:02:19 2012 @@ -82,38 +82,6 @@ if (OrigInfo != NULL) LsaFreeMemory(OrigInfo); - - LsaClose(PolicyHandle); - - return Status; -} - - -NTSTATUS -GetAccountDomainInfo(PPOLICY_ACCOUNT_DOMAIN_INFO *AccountDomainInfo) -{ - LSA_OBJECT_ATTRIBUTES ObjectAttributes; - LSA_HANDLE PolicyHandle; - NTSTATUS Status; - - DPRINT1("SYSSETUP: GetAccountDomain\n"); - - memset(&ObjectAttributes, 0, sizeof(LSA_OBJECT_ATTRIBUTES)); - ObjectAttributes.Length = sizeof(LSA_OBJECT_ATTRIBUTES); - - Status = LsaOpenPolicy(NULL, - &ObjectAttributes, - POLICY_TRUST_ADMIN, - &PolicyHandle); - if (Status != STATUS_SUCCESS) - { - DPRINT("LsaOpenPolicy failed (Status: 0x%08lx)\n", Status); - return Status; - } - - Status = LsaQueryInformationPolicy(PolicyHandle, - PolicyAccountDomainInformation, - (PVOID *)AccountDomainInfo); LsaClose(PolicyHandle);

1 0

[ekohl] 56679: [SAMLIB] - Implement SamOpenUser and SamSetInformationUser. - Add SamQueryInformationUser stub. [SAMSRV] - Implement SamrOpenUser. - Add a hack to SamrSetInformationUser that enables...
by ekohl＠svn.reactos.org 31 May '12

31 May '12

Author: ekohl Date: Thu May 31 11:07:51 2012 New Revision: 56679 URL: http://svn.reactos.org/svn/reactos?rev=56679&view=rev Log: [SAMLIB] - Implement SamOpenUser and SamSetInformationUser. - Add SamQueryInformationUser stub. [SAMSRV] - Implement SamrOpenUser. - Add a hack to SamrSetInformationUser that enables us to store a users password (as plain-text) in the registry. - SamrCreateUserInDomain: Fix the creation of user account key names and start counting user RIDs at 1000. - Clean-up the SAM registry setup code. - Assingn SIDs to the BUILTIN and Account domains. - Create the Administrator and Guest accounts in the SAM setup. Modified: trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samlib/samlib.spec trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/dll/win32/samsrv/setup.c 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] Thu May 31 11:07:51 2012 @@ -404,6 +404,7 @@ return Status; } + NTSTATUS NTAPI SamConnect(IN OUT PUNICODE_STRING ServerName, @@ -430,6 +431,7 @@ return Status; } + NTSTATUS NTAPI @@ -461,6 +463,7 @@ return Status; } + NTSTATUS NTAPI SamOpenDomain(IN SAM_HANDLE ServerHandle, @@ -489,6 +492,74 @@ return Status; } + +NTSTATUS +NTAPI +SamOpenUser(IN SAM_HANDLE DomainHandle, + IN ACCESS_MASK DesiredAccess, + IN ULONG UserId, + OUT PSAM_HANDLE UserHandle) +{ + NTSTATUS Status; + + TRACE("SamOpenUser(%p,0x%08x,%lx,%p)\n", + DomainHandle, DesiredAccess, UserId, UserHandle); + + RpcTryExcept + { + Status = SamrOpenUser((SAMPR_HANDLE)DomainHandle, + DesiredAccess, + UserId, + (SAMPR_HANDLE *)UserHandle); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +NTSTATUS +NTAPI +SamQueryInformationUser(IN SAM_HANDLE UserHandle, + IN USER_INFORMATION_CLASS UserInformationClass, + OUT PVOID *Buffer) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +NTAPI +SamSetInformationUser(IN SAM_HANDLE UserHandle, + IN USER_INFORMATION_CLASS UserInformationClass, + IN PVOID Buffer) +{ + NTSTATUS Status; + + TRACE("SamSetInformationUser(%p %lu %p)\n", + UserHandle, UserInformationClass, Buffer); + + RpcTryExcept + { + Status = SamrSetInformationUser((SAMPR_HANDLE)UserHandle, + UserInformationClass, + Buffer); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + NTSTATUS NTAPI SamShutdownSamServer(IN SAM_HANDLE ServerHandle) 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] Thu May 31 11:07:51 2012 @@ -31,12 +31,12 @@ @ stub SamOpenAlias @ stdcall SamOpenDomain(ptr long ptr ptr) @ stub SamOpenGroup -@ stub SamOpenUser +@ stdcall SamOpenUser(ptr long long ptr) @ stub SamQueryDisplayInformation @ stub SamQueryInformationAlias @ stub SamQueryInformationDomain @ stub SamQueryInformationGroup -@ stub SamQueryInformationUser +@ stdcall SamQueryInformationUser(ptr long ptr) @ stub SamQuerySecurityObject @ stub SamRemoveMemberFromAlias @ stub SamRemoveMemberFromForeignDomain @@ -46,7 +46,7 @@ @ stub SamSetInformationAlias @ stub SamSetInformationDomain @ stub SamSetInformationGroup -@ stub SamSetInformationUser +@ stdcall SamSetInformationUser(ptr long ptr) @ stub SamSetMemberAttributesOfGroup @ stub SamSetSecurityObject @ stdcall SamShutdownSamServer(ptr) 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] Thu May 31 11:07:51 2012 @@ -337,12 +337,12 @@ (LPVOID)&ulRid, &ulSize); if (!NT_SUCCESS(Status)) - ulRid = DOMAIN_USER_RID_MAX; + ulRid = DOMAIN_USER_RID_MAX + 1; TRACE("RID: %lx\n", ulRid); /* Convert the RID into a string (hex) */ - _ultow(ulRid, szRid, 16); + swprintf(szRid, L"%08lX", ulRid); /* Check whether the user name is already in use */ Status = SampCheckDbObjectNameAlias(DomainObject, @@ -385,9 +385,9 @@ return Status; } - /* Set the account name attribute */ + /* Set the name attribute */ Status = SampSetObjectAttribute(UserObject, - L"AccountName", + L"Name", REG_SZ, (LPVOID)Name->Buffer, Name->MaximumLength); @@ -658,12 +658,48 @@ NTSTATUS NTAPI SamrOpenUser(IN SAMPR_HANDLE DomainHandle, - IN unsigned long DesiredAccess, + IN ACCESS_MASK DesiredAccess, IN unsigned long UserId, OUT SAMPR_HANDLE *UserHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT DomainObject; + PSAM_DB_OBJECT UserObject; + WCHAR szRid[9]; + NTSTATUS Status; + + TRACE("SamrOpenUser(%p %lx %lx %p)\n", + DomainHandle, DesiredAccess, UserId, UserHandle); + + /* Validate the domain handle */ + Status = SampValidateDbObject(DomainHandle, + SamDbDomainObject, + DOMAIN_LOOKUP, + &DomainObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Convert the RID into a string (hex) */ + swprintf(szRid, L"%08lX", UserId); + + /* Create the user object */ + Status = SampOpenDbObject(DomainObject, + L"Users", + szRid, + SamDbUserObject, + DesiredAccess, + &UserObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + *UserHandle = (SAMPR_HANDLE)UserObject; + + return STATUS_SUCCESS; } /* Function 35 */ @@ -686,6 +722,27 @@ return STATUS_NOT_IMPLEMENTED; } + +static +NTSTATUS +SampSetPasswordInformation(PSAM_DB_OBJECT UserObject, + PSAMPR_USER_SET_PASSWORD_INFORMATION PasswordInfo) +{ + NTSTATUS Status; + + TRACE("Password: %S\n", PasswordInfo->Password.Buffer); + TRACE("PasswordExpired: %d\n", PasswordInfo->PasswordExpired); + + Status = SampSetObjectAttribute(UserObject, + L"Password", + REG_SZ, + PasswordInfo->Password.Buffer, + PasswordInfo->Password.MaximumLength); + + return Status; +} + + /* Function 37 */ NTSTATUS NTAPI @@ -693,8 +750,36 @@ IN USER_INFORMATION_CLASS UserInformationClass, IN PSAMPR_USER_INFO_BUFFER Buffer) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT UserObject; + NTSTATUS Status; + + TRACE("SamrSetInformationUser(%p %lu %p)\n", + UserHandle, UserInformationClass, Buffer); + + /* Validate the domain handle */ + Status = SampValidateDbObject(UserHandle, + SamDbUserObject, + USER_FORCE_PASSWORD_CHANGE, + &UserObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + switch (UserInformationClass) + { + case UserSetPasswordInformation: + Status = SampSetPasswordInformation(UserObject, + (PSAMPR_USER_SET_PASSWORD_INFORMATION)Buffer); + break; + + default: + Status = STATUS_INVALID_INFO_CLASS; + break; + } + + return Status; } /* Function 38 */ @@ -848,7 +933,7 @@ SamrCreateUser2InDomain(IN SAMPR_HANDLE DomainHandle, IN PRPC_UNICODE_STRING Name, IN unsigned long AccountType, - IN unsigned long DesiredAccess, + IN ACCESS_MASK DesiredAccess, OUT SAMPR_HANDLE *UserHandle, OUT unsigned long *GrantedAccess, OUT unsigned long *RelativeId) 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] Thu May 31 11:07:51 2012 @@ -7,7 +7,7 @@ * PROGRAMMERS: Eric Kohl */ -#include <stdlib.h> +#include <stdio.h> #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER @@ -16,6 +16,7 @@ #include <ndk/rtlfuncs.h> #include <ndk/umtypes.h> #include <ddk/ntsam.h> +#include <ntsecapi.h> #include <samsrv/samsrv.h> Modified: trunk/reactos/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/setup.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] Thu May 31 11:07:51 2012 @@ -13,6 +13,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(samsrv); +/* GLOBALS *****************************************************************/ + +SID_IDENTIFIER_AUTHORITY SecurityNtAuthority = {SECURITY_NT_AUTHORITY}; /* FUNCTIONS ***************************************************************/ @@ -56,60 +59,220 @@ static BOOL -CreateNamesKey(HKEY hParentKey) +SampCreateUserAccount(HKEY hDomainKey, + LPCWSTR lpAccountName, + ULONG ulRelativeId) { DWORD dwDisposition; - HKEY hNamesKey; - - if (RegCreateKeyExW(hParentKey, - L"Names", + WCHAR szUserKeyName[32]; + HKEY hUserKey = NULL; + HKEY hNamesKey = NULL; + + swprintf(szUserKeyName, L"Users\\%08lX", ulRelativeId); + + if (!RegCreateKeyExW(hDomainKey, + szUserKeyName, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hUserKey, + &dwDisposition)) + { + RegSetValueEx(hUserKey, + L"Name", + 0, + REG_SZ, + (LPVOID)lpAccountName, + (wcslen(lpAccountName) + 1) * sizeof(WCHAR)); + + RegCloseKey(hUserKey); + } + + if (!RegOpenKeyExW(hDomainKey, + L"Users\\Names", + 0, + KEY_ALL_ACCESS, + &hNamesKey)) + { + RegSetValueEx(hNamesKey, + lpAccountName, + 0, + REG_DWORD, + (LPVOID)&ulRelativeId, + sizeof(ULONG)); + + RegCloseKey(hNamesKey); + } + + return TRUE; +} + + +static BOOL +SampCreateDomain(IN HKEY hDomainsKey, + IN LPCWSTR lpDomainName, + IN PSID lpDomainSid, + OUT PHKEY lpDomainKey) +{ + DWORD dwDisposition; + HKEY hDomainKey = NULL; + HKEY hAliasKey = NULL; + HKEY hGroupsKey = NULL; + HKEY hUsersKey = NULL; + HKEY hNamesKey = NULL; + + if (lpDomainKey != NULL) + *lpDomainKey = NULL; + + if (RegCreateKeyExW(hDomainsKey, + lpDomainName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, - &hNamesKey, + &hDomainKey, &dwDisposition)) return FALSE; - RegCloseKey(hNamesKey); + if (lpDomainSid != NULL) + { + RegSetValueEx(hDomainKey, + L"SID", + 0, + REG_BINARY, + (LPVOID)lpDomainSid, + RtlLengthSid(lpDomainSid)); + } + + /* Create the Alias container */ + if (!RegCreateKeyExW(hDomainKey, + L"Alias", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hAliasKey, + &dwDisposition)) + { + if (!RegCreateKeyExW(hAliasKey, + L"Names", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hNamesKey, + &dwDisposition)) + RegCloseKey(hNamesKey); + + RegCloseKey(hAliasKey); + } + + /* Create the Groups container */ + if (!RegCreateKeyExW(hDomainKey, + L"Groups", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hGroupsKey, + &dwDisposition)) + { + if (!RegCreateKeyExW(hGroupsKey, + L"Names", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hNamesKey, + &dwDisposition)) + RegCloseKey(hNamesKey); + + RegCloseKey(hGroupsKey); + } + + + /* Create the Users container */ + if (!RegCreateKeyExW(hDomainKey, + L"Users", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hUsersKey, + &dwDisposition)) + { + if (!RegCreateKeyExW(hUsersKey, + L"Names", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hNamesKey, + &dwDisposition)) + RegCloseKey(hNamesKey); + + RegCloseKey(hUsersKey); + } + + if (lpDomainKey != NULL) + *lpDomainKey = hDomainKey; + return TRUE; } -static BOOL -CreateBuiltinAliases(HKEY hAliasesKey) -{ - return TRUE; -} - - -static BOOL -CreateBuiltinGroups(HKEY hGroupsKey) -{ - return TRUE; -} - - -static BOOL -CreateBuiltinUsers(HKEY hUsersKey) -{ - return TRUE; +NTSTATUS +SampGetAccountDomainInfo(PPOLICY_ACCOUNT_DOMAIN_INFO *AccountDomainInfo) +{ + LSA_OBJECT_ATTRIBUTES ObjectAttributes; + LSA_HANDLE PolicyHandle; + NTSTATUS Status; + + TRACE("SampGetAccountDomainInfo\n"); + + memset(&ObjectAttributes, 0, sizeof(LSA_OBJECT_ATTRIBUTES)); + ObjectAttributes.Length = sizeof(LSA_OBJECT_ATTRIBUTES); + + Status = LsaOpenPolicy(NULL, + &ObjectAttributes, + POLICY_TRUST_ADMIN, + &PolicyHandle); + if (Status != STATUS_SUCCESS) + { + ERR("LsaOpenPolicy failed (Status: 0x%08lx)\n", Status); + return Status; + } + + Status = LsaQueryInformationPolicy(PolicyHandle, + PolicyAccountDomainInformation, + (PVOID *)AccountDomainInfo); + + LsaClose(PolicyHandle); + + return Status; } BOOL SampInitializeSAM(VOID) { + PPOLICY_ACCOUNT_DOMAIN_INFO AccountDomainInfo = NULL; DWORD dwDisposition; HKEY hSamKey = NULL; HKEY hDomainsKey = NULL; - HKEY hAccountKey = NULL; - HKEY hBuiltinKey = NULL; - HKEY hAliasesKey = NULL; - HKEY hGroupsKey = NULL; - HKEY hUsersKey = NULL; + HKEY hDomainKey = NULL; + PSID pBuiltinSid = NULL; BOOL bResult = TRUE; + NTSTATUS Status; TRACE("SampInitializeSAM() called\n"); @@ -145,237 +308,60 @@ RegCloseKey(hSamKey); hSamKey = NULL; - /* Create the 'Domains\\Account' key */ - if (RegCreateKeyExW(hDomainsKey, - L"Account", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hAccountKey, - &dwDisposition)) - { - ERR("Failed to create 'Domains\\Account' key! (Error %lu)\n", GetLastError()); + /* Create and initialize the Builtin Domain SID */ + pBuiltinSid = RtlAllocateHeap(RtlGetProcessHeap(), 0, RtlLengthRequiredSid(1)); + if (pBuiltinSid == NULL) + { + ERR("Failed to alloacte the Builtin Domain SID\n"); bResult = FALSE; goto done; } - - /* Create the 'Account\Aliases' key */ - if (RegCreateKeyExW(hAccountKey, - L"Aliases", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hAliasesKey, - &dwDisposition)) - { - ERR("Failed to create 'Account\\Aliases' key! (Error %lu)\n", GetLastError()); + RtlInitializeSid(pBuiltinSid, &SecurityNtAuthority, 1); + *(RtlSubAuthoritySid(pBuiltinSid, 0)) = SECURITY_BUILTIN_DOMAIN_RID; + + /* Get account domain information */ + Status = SampGetAccountDomainInfo(&AccountDomainInfo); + if (!NT_SUCCESS(Status)) + { + ERR("SampGetAccountDomainInfo failed (Status %08lx)\n", Status); bResult = FALSE; goto done; } - if (!CreateNamesKey(hAliasesKey)) - { - ERR("Failed to create 'Account\\Aliases\\Names' key! (Error %lu)\n", GetLastError()); - bResult = FALSE; - goto done; - } - - RegCloseKey(hAliasesKey); - hAliasesKey = NULL; - - /* Create the 'Account\Groups' key */ - if (RegCreateKeyExW(hAccountKey, - L"Groups", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hGroupsKey, - &dwDisposition)) - { - ERR("Failed to create 'Account\\Groups' key! (Error %lu)\n", GetLastError()); - bResult = FALSE; - goto done; - } - - if (!CreateNamesKey(hGroupsKey)) - { - ERR("Failed to create 'Account\\Groups\\Names' key! (Error %lu)\n", GetLastError()); - bResult = FALSE; - goto done; - } - - RegCloseKey(hGroupsKey); - hGroupsKey = NULL; - - - /* Create the 'Account\Users' key */ - if (RegCreateKeyExW(hAccountKey, - L"Users", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hUsersKey, - &dwDisposition)) - { - ERR("Failed to create 'Account\\Users' key! (Error %lu)\n", GetLastError()); - bResult = FALSE; - goto done; - } - - if (!CreateNamesKey(hUsersKey)) - { - ERR("Failed to create 'Account\\Aliases\\Users' key! (Error %lu)\n", GetLastError()); - bResult = FALSE; - goto done; - } - - RegCloseKey(hUsersKey); - hUsersKey = NULL; - - RegCloseKey(hAccountKey); - hAccountKey = NULL; - - /* Create the 'Domains\\Builtin' */ - if (RegCreateKeyExW(hDomainsKey, - L"Builtin", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hBuiltinKey, - &dwDisposition)) - { - ERR("Failed to create Builtin key! (Error %lu)\n", GetLastError()); - bResult = FALSE; - goto done; - } - - - /* Create the 'Builtin\Aliases' key */ - if (RegCreateKeyExW(hBuiltinKey, - L"Aliases", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hAliasesKey, - &dwDisposition)) - { - ERR("Failed to create 'Builtin\\Aliases' key! (Error %lu)\n", GetLastError()); - bResult = FALSE; - goto done; - } - - if (!CreateNamesKey(hAliasesKey)) - { - ERR("Failed to create 'Builtin\\Aliases\\Names' key! (Error %lu)\n", GetLastError()); - bResult = FALSE; - goto done; - } - - /* Create builtin aliases */ - if (!CreateBuiltinAliases(hAliasesKey)) - { - ERR("Failed to create builtin aliases!\n"); - bResult = FALSE; - goto done; - } - - RegCloseKey(hAliasesKey); - hAliasesKey = NULL; - - /* Create the 'Builtin\Groups' key */ - if (RegCreateKeyExW(hBuiltinKey, - L"Groups", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hGroupsKey, - &dwDisposition)) - { - ERR("Failed to create 'Builtin\\Groups' key! (Error %lu)\n", GetLastError()); - bResult = FALSE; - goto done; - } - - if (!CreateNamesKey(hGroupsKey)) - { - ERR("Failed to create 'Builtin\\Groups\\Names' key! (Error %lu)\n", GetLastError()); - bResult = FALSE; - goto done; - } - - /* Create builtin groups */ - if (!CreateBuiltinGroups(hGroupsKey)) - { - ERR("Failed to create builtin groups!\n"); - bResult = FALSE; - goto done; - } - - RegCloseKey(hGroupsKey); - hGroupsKey = NULL; - - - /* Create the 'Builtin\Users' key */ - if (RegCreateKeyExW(hBuiltinKey, - L"Users", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hUsersKey, - &dwDisposition)) - { - ERR("Failed to create 'Builtin\\Users' key! (Error %lu)\n", GetLastError()); - bResult = FALSE; - goto done; - } - - if (!CreateNamesKey(hUsersKey)) - { - ERR("Failed to create 'Builtin\\Users\\Names' key! (Error %lu)\n", GetLastError()); - bResult = FALSE; - goto done; - } - - /* Create builtin users */ - if (!CreateBuiltinUsers(hUsersKey)) - { - ERR("Failed to create builtin users!\n"); - bResult = FALSE; - goto done; + /* Create the Builtin domain */ + if (SampCreateDomain(hDomainsKey, + L"Builtin", + pBuiltinSid, + &hDomainKey)) + { + + RegCloseKey(hDomainKey); + } + + /* Create the Account domain */ + if (SampCreateDomain(hDomainsKey, + L"Account", + AccountDomainInfo->DomainSid, //NULL, + &hDomainKey)) + { + SampCreateUserAccount(hDomainKey, + L"Administrator", + DOMAIN_USER_RID_ADMIN); + + SampCreateUserAccount(hDomainKey, + L"Guest", + DOMAIN_USER_RID_GUEST); + + RegCloseKey(hDomainKey); } done: - if (hAliasesKey) - RegCloseKey(hAliasesKey); - - if (hGroupsKey) - RegCloseKey(hGroupsKey); - - if (hUsersKey) - RegCloseKey(hUsersKey); - - if (hAccountKey) - RegCloseKey(hAccountKey); - - if (hBuiltinKey) - RegCloseKey(hBuiltinKey); + if (AccountDomainInfo) + LsaFreeMemory(AccountDomainInfo); + + if (pBuiltinSid) + RtlFreeHeap(RtlGetProcessHeap(), 0, pBuiltinSid); if (hDomainsKey) RegCloseKey(hDomainsKey); Modified: trunk/reactos/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntsam.h?rev=56… ============================================================================== --- trunk/reactos/include/ddk/ntsam.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntsam.h [iso-8859-1] Thu May 31 11:07:51 2012 @@ -25,8 +25,59 @@ #define SAM_SERVER_ENUMERATE_DOMAINS 16 #define SAM_SERVER_LOOKUP_DOMAIN 32 +#define USER_READ_GENERAL 1 +#define USER_READ_PREFERENCES 2 +#define USER_WRITE_PREFERENCES 4 +#define USER_READ_LOGON 8 +#define USER_READ_ACCOUNT 16 +#define USER_WRITE_ACCOUNT 32 +#define USER_CHANGE_PASSWORD 64 +#define USER_FORCE_PASSWORD_CHANGE 128 +#define USER_LIST_GROUPS 256 +#define USER_READ_GROUP_INFORMATION 512 +#define USER_WRITE_GROUP_INFORMATION 1024 typedef PVOID SAM_HANDLE, *PSAM_HANDLE; + +typedef enum _USER_INFORMATION_CLASS +{ + UserGeneralInformation = 1, + UserPreferencesInformation, + UserLogonInformation, + UserLogonHoursInformation, + UserAccountInformation, + UserNameInformation, + UserAccountNameInformation, + UserFullNameInformation, + UserPrimaryGroupInformation, + UserHomeInformation, + UserScriptInformation, + UserProfileInformation, + UserAdminCommentInformation, + UserWorkStationsInformation, + UserSetPasswordInformation, + UserControlInformation, + UserExpiresInformation, + UserInternal1Information, + UserInternal2Information, + UserParametersInformation, + UserAllInformation, + UserInternal3Information, + UserInternal4Information, + UserInternal5Information, + UserInternal4InformationNew, + UserInternal5InformationNew, + UserInternal6Information, + UserExtendedInformation, + UserLogonUIInformation, +} USER_INFORMATION_CLASS, *PUSER_INFORMATION_CLASS; + +typedef struct _USER_SET_PASSWORD_INFORMATION +{ + UNICODE_STRING Password; + BOOLEAN PasswordExpired; +} USER_SET_PASSWORD_INFORMATION, *PUSER_SET_PASSWORD_INFORMATION; + NTSTATUS NTAPI @@ -56,6 +107,25 @@ NTSTATUS NTAPI +SamOpenUser(IN SAM_HANDLE DomainHandle, + IN ACCESS_MASK DesiredAccess, + IN ULONG UserId, + OUT PSAM_HANDLE UserHandle); + +NTSTATUS +NTAPI +SamQueryInformationUser(IN SAM_HANDLE UserHandle, + IN USER_INFORMATION_CLASS UserInformationClass, + OUT PVOID *Buffer); + +NTSTATUS +NTAPI +SamSetInformationUser(IN SAM_HANDLE UserHandle, + IN USER_INFORMATION_CLASS UserInformationClass, + IN PVOID Buffer); + +NTSTATUS +NTAPI SamShutdownSamServer(IN SAM_HANDLE ServerHandle); 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] Thu May 31 11:07:51 2012 @@ -152,6 +152,7 @@ DomainServerRolePrimary = 3 } DOMAIN_SERVER_ROLE, *PDOMAIN_SERVER_ROLE; +cpp_quote("#ifndef _NTSECAPI_H") typedef struct _DOMAIN_PASSWORD_INFORMATION { unsigned short MinPasswordLength; @@ -160,6 +161,7 @@ OLD_LARGE_INTEGER MaxPasswordAge; OLD_LARGE_INTEGER MinPasswordAge; } DOMAIN_PASSWORD_INFORMATION, *PDOMAIN_PASSWORD_INFORMATION; +cpp_quote("#endif") typedef struct _DOMAIN_LOGOFF_INFORMATION { @@ -600,6 +602,13 @@ RPC_UNICODE_STRING WorkStations; } SAMPR_USER_WORKSTATIONS_INFORMATION, *PSAMPR_USER_WORKSTATIONS_INFORMATION; +typedef struct _SAMPR_USER_SET_PASSWORD_INFORMATION +{ +// SAMPR_ENCRYPTED_USER_PASSWORD Password; + RPC_UNICODE_STRING Password; + BOOLEAN PasswordExpired; +} SAMPR_USER_SET_PASSWORD_INFORMATION, *PSAMPR_USER_SET_PASSWORD_INFORMATION; + typedef struct _SAMPR_USER_LOGON_HOURS_INFORMATION { SAMPR_LOGON_HOURS LogonHours; @@ -638,6 +647,7 @@ unsigned char PasswordExpired; } SAMPR_USER_INTERNAL5_INFORMATION_NEW, *PSAMPR_USER_INTERNAL5_INFORMATION_NEW; +cpp_quote("#ifndef _NTSAM_") typedef enum _USER_INFORMATION_CLASS { UserGeneralInformation = 1, @@ -654,16 +664,23 @@ UserProfileInformation = 12, UserAdminCommentInformation = 13, UserWorkStationsInformation = 14, + UserSetPasswordInformation = 15, /* This is missing from the SAM RPC documentation */ UserControlInformation = 16, UserExpiresInformation = 17, UserInternal1Information = 18, + UserInternal2Information = 19, /* This is missing from the SAM RPC documentation */ UserParametersInformation = 20, UserAllInformation = 21, + UserInternal3Information = 22, /* This is missing from the SAM RPC documentation */ UserInternal4Information = 23, UserInternal5Information = 24, UserInternal4InformationNew = 25, UserInternal5InformationNew = 26, + UserInternal6Information, /* This is missing from the SAM RPC documentation */ + UserExtendedInformation, /* This is missing from the SAM RPC documentation */ + UserLogonUIInformation, /* This is missing from the SAM RPC documentation */ } USER_INFORMATION_CLASS, *PUSER_INFORMATION_CLASS; +cpp_quote("#endif") typedef [switch_type(USER_INFORMATION_CLASS)] union _SAMPR_USER_INFO_BUFFER { @@ -681,6 +698,7 @@ [case(UserProfileInformation)] SAMPR_USER_PROFILE_INFORMATION Profile; [case(UserAdminCommentInformation)] SAMPR_USER_ADMIN_COMMENT_INFORMATION AdminComment; [case(UserWorkStationsInformation)] SAMPR_USER_WORKSTATIONS_INFORMATION WorkStations; + [case(UserSetPasswordInformation)] SAMPR_USER_SET_PASSWORD_INFORMATION SetPassword; [case(UserControlInformation)] USER_CONTROL_INFORMATION Control; [case(UserExpiresInformation)] USER_EXPIRES_INFORMATION Expires; [case(UserInternal1Information)] SAMPR_USER_INTERNAL1_INFORMATION Internal1; @@ -1015,7 +1033,7 @@ __stdcall SamrOpenAlias( [in] SAMPR_HANDLE DomainHandle, - [in] unsigned long DesiredAccess, + [in] ACCESS_MASK DesiredAccess, [in] unsigned long AliasId, [out] SAMPR_HANDLE *AliasHandle); @@ -1067,7 +1085,7 @@ __stdcall SamrOpenUser( [in] SAMPR_HANDLE DomainHandle, - [in] unsigned long DesiredAccess, + [in] ACCESS_MASK DesiredAccess, [in] unsigned long UserId, [out] SAMPR_HANDLE *UserHandle); @@ -1209,7 +1227,7 @@ [in] SAMPR_HANDLE DomainHandle, [in] PRPC_UNICODE_STRING Name, [in] unsigned long AccountType, - [in] unsigned long DesiredAccess, + [in] ACCESS_MASK DesiredAccess, [out] SAMPR_HANDLE *UserHandle, [out] unsigned long *GrantedAccess, [out] unsigned long *RelativeId);

1 0

[ekohl] 56678: [LSASRV][SYSSETUP] Move the creation of the random account domain SID from syssetup.dll to lsasrv.dll. This change is required because the account domain SID must be stored in the LS...
by ekohl＠svn.reactos.org 30 May '12

30 May '12

Author: ekohl Date: Wed May 30 22:53:37 2012 New Revision: 56678 URL: http://svn.reactos.org/svn/reactos?rev=56678&view=rev Log: [LSASRV][SYSSETUP] Move the creation of the random account domain SID from syssetup.dll to lsasrv.dll. This change is required because the account domain SID must be stored in the LSA database before the SAM database initializes. Syssetup.dll created the account domain SID much too late. Modified: trunk/reactos/dll/win32/lsasrv/database.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/syssetup/globals.h trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/security.c Modified: trunk/reactos/dll/win32/lsasrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/database.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] Wed May 30 22:53:37 2012 @@ -200,10 +200,40 @@ static NTSTATUS +LsapCreateRandomDomainSid(OUT PSID *Sid) +{ + SID_IDENTIFIER_AUTHORITY SystemAuthority = {SECURITY_NT_AUTHORITY}; + LARGE_INTEGER SystemTime; + PULONG Seed; + + NtQuerySystemTime(&SystemTime); + Seed = &SystemTime.u.LowPart; + + return RtlAllocateAndInitializeSid(&SystemAuthority, + 4, + SECURITY_NT_NON_UNIQUE, + RtlUniform(Seed), + RtlUniform(Seed), + RtlUniform(Seed), + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + Sid); +} + + +static NTSTATUS LsapCreateDatabaseObjects(VOID) { - PLSA_DB_OBJECT PolicyObject; - NTSTATUS Status; + PLSA_DB_OBJECT PolicyObject = NULL; + PSID AccountDomainSid = NULL; + NTSTATUS Status; + + /* Create a random domain SID */ + Status = LsapCreateRandomDomainSid(&AccountDomainSid); + if (!NT_SUCCESS(Status)) + return Status; /* Open the 'Policy' object */ Status = LsapOpenDbObject(NULL, @@ -212,7 +242,7 @@ 0, &PolicyObject); if (!NT_SUCCESS(Status)) - return Status; + goto done; LsapSetObjectAttribute(PolicyObject, L"PolPrDmN", @@ -231,13 +261,17 @@ LsapSetObjectAttribute(PolicyObject, L"PolAcDmS", - NULL, - 0); - - /* Close the 'Policy' object */ - LsapCloseDbObject(PolicyObject); - - return STATUS_SUCCESS; + AccountDomainSid, + RtlLengthSid(AccountDomainSid)); + +done: + if (PolicyObject != NULL) + LsapCloseDbObject(PolicyObject); + + if (AccountDomainSid != NULL) + RtlFreeSid(AccountDomainSid); + + 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] Wed May 30 22:53:37 2012 @@ -11,6 +11,7 @@ #include <windows.h> #define NTOS_MODE_USER #include <ndk/cmfuncs.h> +#include <ndk/kefuncs.h> #include <ndk/lpctypes.h> #include <ndk/lpcfuncs.h> #include <ndk/obfuncs.h> Modified: trunk/reactos/dll/win32/syssetup/globals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/globals… ============================================================================== --- trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] Wed May 30 22:53:37 2012 @@ -64,6 +64,7 @@ /* security.c */ NTSTATUS SetAccountDomain(LPCWSTR DomainName, PSID DomainSid); +NTSTATUS GetAccountDomainInfo(PPOLICY_ACCOUNT_DOMAIN_INFO *AccountDomainInfo); VOID InstallSecurity(VOID); /* wizard.c */ Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Wed May 30 22:53:37 2012 @@ -36,9 +36,6 @@ /* GLOBALS ******************************************************************/ -PSID DomainSid = NULL; -PSID AdminSid = NULL; - HINF hSysSetupInf = INVALID_HANDLE_VALUE; /* FUNCTIONS ****************************************************************/ @@ -225,33 +222,6 @@ _tcscpy(p, pszName); return CreateDirectory(szPath, NULL) || GetLastError()==ERROR_ALREADY_EXISTS; -} - -static BOOL -CreateRandomSid( - OUT PSID *Sid) -{ - SID_IDENTIFIER_AUTHORITY SystemAuthority = {SECURITY_NT_AUTHORITY}; - LARGE_INTEGER SystemTime; - PULONG Seed; - NTSTATUS Status; - - NtQuerySystemTime(&SystemTime); - Seed = &SystemTime.u.LowPart; - - Status = RtlAllocateAndInitializeSid( - &SystemAuthority, - 4, - SECURITY_NT_NON_UNIQUE, - RtlUniform(Seed), - RtlUniform(Seed), - RtlUniform(Seed), - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - Sid); - return NT_SUCCESS(Status); } static VOID @@ -878,6 +848,8 @@ DWORD WINAPI InstallReactOS(HINSTANCE hInstance) { + PPOLICY_ACCOUNT_DOMAIN_INFO AccountDomainInfo = NULL; + PSID AdminSid = NULL; TCHAR szBuffer[MAX_PATH]; DWORD LastError; HANDLE token; @@ -893,23 +865,17 @@ return 0; } - /* Create the semi-random Domain-SID */ - if (!CreateRandomSid(&DomainSid)) - { - FatalError("Domain-SID creation failed!"); + /* Get account domain information */ + if (GetAccountDomainInfo(&AccountDomainInfo) != STATUS_SUCCESS) + { + FatalError("GetAccountDomainInfo() failed!"); return 0; } - /* Set the Domain SID (aka Computer SID) */ - if (SetAccountDomain(NULL, DomainSid) != STATUS_SUCCESS) - { - FatalError("SetAccountDomain() failed!"); - RtlFreeSid(DomainSid); - return 0; - } - /* Append the Admin-RID */ - AppendRidToSid(&AdminSid, DomainSid, DOMAIN_USER_RID_ADMIN); + AppendRidToSid(&AdminSid, AccountDomainInfo->DomainSid, DOMAIN_USER_RID_ADMIN); + + LsaFreeMemory(AccountDomainInfo); CreateTempDir(L"TEMP"); CreateTempDir(L"TMP"); @@ -964,13 +930,11 @@ { FatalError("SamCreateUser() failed!"); RtlFreeSid(AdminSid); - RtlFreeSid(DomainSid); return 0; } } RtlFreeSid(AdminSid); - RtlFreeSid(DomainSid); if (!CreateShortcuts()) { Modified: trunk/reactos/dll/win32/syssetup/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/securit… ============================================================================== --- trunk/reactos/dll/win32/syssetup/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/security.c [iso-8859-1] Wed May 30 22:53:37 2012 @@ -26,6 +26,8 @@ LSA_HANDLE PolicyHandle; NTSTATUS Status; + DPRINT1("SYSSETUP: SetAccountDomain\n"); + memset(&ObjectAttributes, 0, sizeof(LSA_OBJECT_ATTRIBUTES)); ObjectAttributes.Length = sizeof(LSA_OBJECT_ATTRIBUTES); @@ -80,6 +82,38 @@ if (OrigInfo != NULL) LsaFreeMemory(OrigInfo); + + LsaClose(PolicyHandle); + + return Status; +} + + +NTSTATUS +GetAccountDomainInfo(PPOLICY_ACCOUNT_DOMAIN_INFO *AccountDomainInfo) +{ + LSA_OBJECT_ATTRIBUTES ObjectAttributes; + LSA_HANDLE PolicyHandle; + NTSTATUS Status; + + DPRINT1("SYSSETUP: GetAccountDomain\n"); + + memset(&ObjectAttributes, 0, sizeof(LSA_OBJECT_ATTRIBUTES)); + ObjectAttributes.Length = sizeof(LSA_OBJECT_ATTRIBUTES); + + Status = LsaOpenPolicy(NULL, + &ObjectAttributes, + POLICY_TRUST_ADMIN, + &PolicyHandle); + if (Status != STATUS_SUCCESS) + { + DPRINT("LsaOpenPolicy failed (Status: 0x%08lx)\n", Status); + return Status; + } + + Status = LsaQueryInformationPolicy(PolicyHandle, + PolicyAccountDomainInformation, + (PVOID *)AccountDomainInfo); LsaClose(PolicyHandle);

1 0

[tkreuzer] 56677: [NTDLL_APITEST] rename rtl bitmap tests
by tkreuzer＠svn.reactos.org 30 May '12

30 May '12

Author: tkreuzer Date: Wed May 30 21:16:24 2012 New Revision: 56677 URL: http://svn.reactos.org/svn/reactos?rev=56677&view=rev Log: [NTDLL_APITEST] rename rtl bitmap tests Modified: trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Wed May 30 21:16:24 2012 @@ -25,7 +25,7 @@ { "NtAllocateVirtualMemory", func_NtAllocateVirtualMemory }, { "NtFreeVirtualMemory", func_NtFreeVirtualMemory }, { "NtSystemInformation", func_NtSystemInformation }, - { "RtlBitmap", func_RtlBitmap }, + { "RtlBitmapApi", func_RtlBitmap }, { "RtlDetermineDosPathNameType", func_RtlDetermineDosPathNameType }, { "RtlDoesFileExists", func_RtlDoesFileExists }, { "RtlDosSearchPath_U", func_RtlDosSearchPath_U },

1 0

[jimtabor] 56676: [Win32k] - Users are not allowed to set null desktops. Fixes bug 6759.
by jimtabor＠svn.reactos.org 29 May '12

29 May '12

Author: jimtabor Date: Tue May 29 21:34:06 2012 New Revision: 56676 URL: http://svn.reactos.org/svn/reactos?rev=56676&view=rev Log: [Win32k] - Users are not allowed to set null desktops. Fixes bug 6759. Modified: trunk/reactos/win32ss/user/ntuser/desktop.c 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] Tue May 29 21:34:06 2012 @@ -1889,11 +1889,15 @@ BOOL APIENTRY NtUserSetThreadDesktop(HDESK hDesktop) { - BOOL ret; + BOOL ret = FALSE; UserEnterExclusive(); - ret = IntSetThreadDesktop(hDesktop, FALSE); + // FIXME: IntSetThreadDesktop validates the desktop handle, it should happen + // here too and set the NT error level. Q. Is it necessary to have the validation + // in IntSetThreadDesktop? Is it needed there too? + if (hDesktop || (!hDesktop && CsrProcess == PsGetCurrentProcess())) + ret = IntSetThreadDesktop(hDesktop, FALSE); UserLeave();

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