Ros-diffs May 2012

ros-diffs@reactos.org

12 participants
227 discussions

[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

[tkreuzer] 56675: [NTDLL_APITEST] Add tests for rtl bitmap function
by tkreuzer＠svn.reactos.org 29 May '12

29 May '12

Author: tkreuzer Date: Tue May 29 18:46:25 2012 New Revision: 56675 URL: http://svn.reactos.org/svn/reactos?rev=56675&view=rev Log: [NTDLL_APITEST] Add tests for rtl bitmap function Added: trunk/rostests/apitests/ntdll/RtlBitmap.c (with props) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Tue May 29 18:46:25 2012 @@ -2,6 +2,7 @@ list(APPEND SOURCE NtAllocateVirtualMemory.c NtFreeVirtualMemory.c + RtlBitmap.c RtlDetermineDosPathNameType.c RtlDoesFileExists.c RtlDosSearchPath_U.c Added: trunk/rostests/apitests/ntdll/RtlBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlBitmap.… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlBitmap.c (added) +++ trunk/rostests/apitests/ntdll/RtlBitmap.c [iso-8859-1] Tue May 29 18:46:25 2012 @@ -1,0 +1,512 @@ + +#define WIN32_NO_STATUS +#include <stdio.h> +#include <wine/test.h> +#include <ndk/rtlfuncs.h> +#include <pseh/pseh2.h> + +void +Test_RtlFindMostSignificantBit(void) +{ + ok_int(RtlFindMostSignificantBit(0), -1); + + ok_int(RtlFindMostSignificantBit(0x0000000000000001ULL), 0); + ok_int(RtlFindMostSignificantBit(0x0000000000000002ULL), 1); + ok_int(RtlFindMostSignificantBit(0x1000000000000000ULL), 60); + ok_int(RtlFindMostSignificantBit(0x8000000000000000ULL), 63); + ok_int(RtlFindMostSignificantBit(0x8000000000000001ULL), 63); + ok_int(RtlFindMostSignificantBit(0xFFFFFFFFFFFFFFFFULL), 63); + ok_int(RtlFindMostSignificantBit(0x0000000070000000ULL), 30); +} + +void +Test_RtlFindLeastSignificantBit(void) +{ + ok_int(RtlFindLeastSignificantBit(0), -1); + + ok_int(RtlFindLeastSignificantBit(0x0000000000000001ULL), 0); + ok_int(RtlFindLeastSignificantBit(0x0000000000000002ULL), 1); + ok_int(RtlFindLeastSignificantBit(0x1000000000000000ULL), 60); + ok_int(RtlFindLeastSignificantBit(0x8000000000000000ULL), 63); + ok_int(RtlFindLeastSignificantBit(0x8000000000000000ULL), 63); + ok_int(RtlFindLeastSignificantBit(0xFFFFFFFFFFFFFFFFULL), 0); + ok_int(RtlFindLeastSignificantBit(0x0000000070000000ULL), 28); +} + +void +Test_RtlInitializeBitMap(void) +{ + RTL_BITMAP BitMapHeader; + ULONG Buffer[2]; + BOOLEAN Exception = FALSE; + + _SEH2_TRY + { + RtlInitializeBitMap(NULL, NULL, 0); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Exception = TRUE; + } + _SEH2_END; + ok_int(Exception, 1); + + memset(Buffer, 0xcc, sizeof(Buffer)); + RtlInitializeBitMap(&BitMapHeader, Buffer, 0); + ok_int(BitMapHeader.SizeOfBitMap, 0); + ok_ptr(BitMapHeader.Buffer, Buffer); + ok_hex(Buffer[0], 0xcccccccc); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 8); + ok_int(BitMapHeader.SizeOfBitMap, 8); + ok_hex(Buffer[0], 0xcccccccc); +} + +void +Test_RtlClearAllBits(void) +{ + RTL_BITMAP BitMapHeader; + ULONG Buffer[2]; + + RtlInitializeBitMap(&BitMapHeader, Buffer, 19); + memset(Buffer, 0xcc, sizeof(Buffer)); + RtlClearAllBits(&BitMapHeader); + ok_hex(Buffer[0], 0x00000000); + ok_hex(Buffer[1], 0xcccccccc); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 0); + memset(Buffer, 0xcc, sizeof(Buffer)); + RtlClearAllBits(&BitMapHeader); + ok_hex(Buffer[0], 0xcccccccc); + ok_hex(Buffer[1], 0xcccccccc); +} + +void +Test_RtlSetAllBits(void) +{ + RTL_BITMAP BitMapHeader; + ULONG Buffer[2]; + + RtlInitializeBitMap(&BitMapHeader, Buffer, 19); + memset(Buffer, 0xcc, sizeof(Buffer)); + RtlSetAllBits(&BitMapHeader); + ok_hex(Buffer[0], 0xffffffff); + ok_hex(Buffer[1], 0xcccccccc); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 0); + memset(Buffer, 0xcc, sizeof(Buffer)); + RtlSetAllBits(&BitMapHeader); + ok_hex(Buffer[0], 0xcccccccc); + ok_hex(Buffer[1], 0xcccccccc); +} + +void +Test_RtlClearBits(void) +{ + RTL_BITMAP BitMapHeader; + ULONG Buffer[2]; + + RtlInitializeBitMap(&BitMapHeader, Buffer, 19); + + memset(Buffer, 0xff, sizeof(Buffer)); + RtlClearBits(&BitMapHeader, 0, 0); + ok_hex(Buffer[0], 0xffffffff); + ok_hex(Buffer[1], 0xffffffff); + + memset(Buffer, 0xff, sizeof(Buffer)); + RtlClearBits(&BitMapHeader, 0, 1); + ok_hex(Buffer[0], 0xfffffffe); + ok_hex(Buffer[1], 0xffffffff); + + memset(Buffer, 0xff, sizeof(Buffer)); + RtlClearBits(&BitMapHeader, 21, 1); + ok_hex(Buffer[0], 0xffdfffff); + ok_hex(Buffer[1], 0xffffffff); + + memset(Buffer, 0xff, sizeof(Buffer)); + RtlClearBits(&BitMapHeader, 7, 9); + ok_hex(Buffer[0], 0xffff007f); + ok_hex(Buffer[1], 0xffffffff); + + memset(Buffer, 0xff, sizeof(Buffer)); + RtlClearBits(&BitMapHeader, 13, 22); + ok_hex(Buffer[0], 0x00001fff); + ok_hex(Buffer[1], 0xfffffff8); + + memset(Buffer, 0xcc, sizeof(Buffer)); + RtlClearBits(&BitMapHeader, 3, 6); + RtlClearBits(&BitMapHeader, 11, 5); + RtlClearBits(&BitMapHeader, 21, 7); + RtlClearBits(&BitMapHeader, 37, 4); + ok_hex(Buffer[0], 0xc00c0404); + ok_hex(Buffer[1], 0xcccccc0c); +} + +void +Test_RtlSetBits(void) +{ + RTL_BITMAP BitMapHeader; + ULONG Buffer[2]; + + RtlInitializeBitMap(&BitMapHeader, Buffer, 19); + + memset(Buffer, 0x00, sizeof(Buffer)); + RtlSetBits(&BitMapHeader, 0, 0); + ok_hex(Buffer[0], 0x00000000); + ok_hex(Buffer[1], 0x00000000); + + memset(Buffer, 0x00, sizeof(Buffer)); + RtlSetBits(&BitMapHeader, 0, 1); + ok_hex(Buffer[0], 0x00000001); + ok_hex(Buffer[1], 0x00000000); + + memset(Buffer, 0x00, sizeof(Buffer)); + RtlSetBits(&BitMapHeader, 21, 1); + ok_hex(Buffer[0], 0x00200000); + ok_hex(Buffer[1], 0x00000000); + + memset(Buffer, 0x00, sizeof(Buffer)); + RtlSetBits(&BitMapHeader, 7, 9); + ok_hex(Buffer[0], 0x0000ff80); + ok_hex(Buffer[1], 0x00000000); + + memset(Buffer, 0x00, sizeof(Buffer)); + RtlSetBits(&BitMapHeader, 13, 22); + ok_hex(Buffer[0], 0xffffe000); + ok_hex(Buffer[1], 0x00000007); + + memset(Buffer, 0xcc, sizeof(Buffer)); + RtlSetBits(&BitMapHeader, 3, 6); + RtlSetBits(&BitMapHeader, 11, 5); + RtlSetBits(&BitMapHeader, 21, 7); + RtlSetBits(&BitMapHeader, 37, 4); + ok_hex(Buffer[0], 0xcfecfdfc); + ok_hex(Buffer[1], 0xcccccdec); +} + +void +Test_RtlAreBitsClear(void) +{ + RTL_BITMAP BitMapHeader; + ULONG Buffer[2]; + + RtlInitializeBitMap(&BitMapHeader, Buffer, 19); + Buffer[0] = 0x00ff00ff; + Buffer[1] = 0xc0cfc0cf; + + ok_hex(RtlAreBitsClear(&BitMapHeader, 0, 8), FALSE); + ok_hex(RtlAreBitsClear(&BitMapHeader, 8, 8), TRUE); + ok_hex(RtlAreBitsClear(&BitMapHeader, 7, 8), FALSE); + ok_hex(RtlAreBitsClear(&BitMapHeader, 8, 9), FALSE); + ok_hex(RtlAreBitsClear(&BitMapHeader, 24, 1), FALSE); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 31); + ok_hex(RtlAreBitsClear(&BitMapHeader, 24, 1), TRUE); + ok_hex(RtlAreBitsClear(&BitMapHeader, 24, 7), TRUE); + ok_hex(RtlAreBitsClear(&BitMapHeader, 24, 8), FALSE); + +} + +void +Test_RtlAreBitsSet(void) +{ + RTL_BITMAP BitMapHeader; + ULONG Buffer[2]; + + RtlInitializeBitMap(&BitMapHeader, Buffer, 19); + Buffer[0] = 0xff00ff00; + Buffer[1] = 0x3F303F30; + + ok_hex(RtlAreBitsSet(&BitMapHeader, 0, 8), FALSE); + ok_hex(RtlAreBitsSet(&BitMapHeader, 8, 8), TRUE); + ok_hex(RtlAreBitsSet(&BitMapHeader, 7, 8), FALSE); + ok_hex(RtlAreBitsSet(&BitMapHeader, 8, 9), FALSE); + ok_hex(RtlAreBitsSet(&BitMapHeader, 24, 1), FALSE); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 31); + ok_hex(RtlAreBitsSet(&BitMapHeader, 24, 1), TRUE); + ok_hex(RtlAreBitsSet(&BitMapHeader, 24, 7), TRUE); + ok_hex(RtlAreBitsSet(&BitMapHeader, 24, 8), FALSE); + +} + +void +Test_RtlNumberOfSetBits(void) +{ + RTL_BITMAP BitMapHeader; + ULONG Buffer[2]; + + Buffer[0] = 0xff00ff0f; + Buffer[1] = 0x3F303F30; + + RtlInitializeBitMap(&BitMapHeader, Buffer, 0); + ok_int(RtlNumberOfSetBits(&BitMapHeader), 0); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 4); + ok_int(RtlNumberOfSetBits(&BitMapHeader), 4); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 31); + ok_int(RtlNumberOfSetBits(&BitMapHeader), 19); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 56); + ok_int(RtlNumberOfSetBits(&BitMapHeader), 30); +} + +void +Test_RtlNumberOfClearBits(void) +{ + RTL_BITMAP BitMapHeader; + ULONG Buffer[2]; + + Buffer[0] = 0xff00fff0; + Buffer[1] = 0x3F303F30; + + RtlInitializeBitMap(&BitMapHeader, Buffer, 0); + ok_int(RtlNumberOfClearBits(&BitMapHeader), 0); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 4); + ok_int(RtlNumberOfClearBits(&BitMapHeader), 4); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 31); + ok_int(RtlNumberOfClearBits(&BitMapHeader), 12); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 56); + ok_int(RtlNumberOfClearBits(&BitMapHeader), 26); +} + +void +Test_RtlFindClearBits(void) +{ + RTL_BITMAP BitMapHeader; + ULONG Buffer[2]; + + Buffer[0] = 0x060F874D; + Buffer[1] = 0x3F303F30; + + RtlInitializeBitMap(&BitMapHeader, Buffer, 0); + ok_int(RtlFindClearBits(&BitMapHeader, 0, 0), 0); + ok_int(RtlFindClearBits(&BitMapHeader, 0, 3), 0); + ok_int(RtlFindClearBits(&BitMapHeader, 1, 0), -1); + ok_int(RtlFindClearBits(&BitMapHeader, 1, 1), -1); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 8); + ok_int(RtlFindClearBits(&BitMapHeader, 1, 0), 1); + ok_int(RtlFindClearBits(&BitMapHeader, 1, 1), 1); + ok_int(RtlFindClearBits(&BitMapHeader, 1, 2), 4); + + ok_int(RtlFindClearBits(&BitMapHeader, 2, 0), 4); + ok_int(RtlFindClearBits(&BitMapHeader, 3, 0), -1); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 32); + ok_int(RtlFindClearBits(&BitMapHeader, 4, 0), 11); + ok_int(RtlFindClearBits(&BitMapHeader, 5, 0), 20); + ok_int(RtlFindClearBits(&BitMapHeader, 4, 11), 11); + ok_int(RtlFindClearBits(&BitMapHeader, 4, 12), 20); + ok_int(RtlFindClearBits(&BitMapHeader, 2, 11), 11); + ok_int(RtlFindClearBits(&BitMapHeader, 2, 12), 12); + ok_int(RtlFindClearBits(&BitMapHeader, 0, 12), 8); + ok_int(RtlFindClearBits(&BitMapHeader, 0, 39), 0); + +} + +void +Test_RtlFindSetBits(void) +{ + RTL_BITMAP BitMapHeader; + ULONG Buffer[2]; + + Buffer[0] = 0xF9F078B2; + Buffer[1] = 0x3F303F30; + + RtlInitializeBitMap(&BitMapHeader, Buffer, 0); + ok_int(RtlFindSetBits(&BitMapHeader, 0, 0), 0); + ok_int(RtlFindSetBits(&BitMapHeader, 0, 3), 0); + ok_int(RtlFindSetBits(&BitMapHeader, 1, 0), -1); + ok_int(RtlFindSetBits(&BitMapHeader, 1, 1), -1); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 8); + ok_int(RtlFindSetBits(&BitMapHeader, 1, 0), 1); + ok_int(RtlFindSetBits(&BitMapHeader, 1, 1), 1); + ok_int(RtlFindSetBits(&BitMapHeader, 1, 2), 4); + + ok_int(RtlFindSetBits(&BitMapHeader, 2, 0), 4); + ok_int(RtlFindSetBits(&BitMapHeader, 3, 0), -1); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 32); + ok_int(RtlFindSetBits(&BitMapHeader, 4, 0), 11); + ok_int(RtlFindSetBits(&BitMapHeader, 5, 0), 20); + ok_int(RtlFindSetBits(&BitMapHeader, 4, 11), 11); + ok_int(RtlFindSetBits(&BitMapHeader, 4, 12), 20); + ok_int(RtlFindSetBits(&BitMapHeader, 2, 11), 11); + ok_int(RtlFindSetBits(&BitMapHeader, 2, 12), 12); + ok_int(RtlFindSetBits(&BitMapHeader, 0, 12), 8); + ok_int(RtlFindSetBits(&BitMapHeader, 0, 39), 0); + +} + +void +Test_RtlFindClearBitsAndSet(void) +{ + RTL_BITMAP BitMapHeader; + ULONG Buffer[2]; + + Buffer[0] = 0x060F874D; + Buffer[1] = 0x3F303F30; + + RtlInitializeBitMap(&BitMapHeader, Buffer, 0); + ok_int(RtlFindClearBitsAndSet(&BitMapHeader, 0, 0), 0); + ok_int(RtlFindClearBitsAndSet(&BitMapHeader, 0, 3), 0); + ok_int(RtlFindClearBitsAndSet(&BitMapHeader, 1, 0), -1); + ok_int(RtlFindClearBitsAndSet(&BitMapHeader, 1, 1), -1); + ok_hex(Buffer[0], 0x060F874D); + + Buffer[0] = 0x060F874D; + RtlInitializeBitMap(&BitMapHeader, Buffer, 8); + ok_int(RtlFindClearBitsAndSet(&BitMapHeader, 1, 0), 1); + ok_hex(Buffer[0], 0x60f874f); + ok_int(RtlFindClearBitsAndSet(&BitMapHeader, 1, 1), 4); + ok_hex(Buffer[0], 0x60f875f); + ok_int(RtlFindClearBitsAndSet(&BitMapHeader, 1, 2), 5); + ok_hex(Buffer[0], 0x60f877f); + ok_int(RtlFindClearBitsAndSet(&BitMapHeader, 2, 0), -1); + ok_hex(Buffer[0], 0x60f877f); + + Buffer[0] = 0x060F874D; + RtlInitializeBitMap(&BitMapHeader, Buffer, 32); + ok_int(RtlFindClearBitsAndSet(&BitMapHeader, 4, 0), 11); + ok_hex(Buffer[0], 0x60fff4d); + ok_int(RtlFindClearBitsAndSet(&BitMapHeader, 5, 0), 20); + ok_hex(Buffer[0], 0x7ffff4d); + ok_int(RtlFindClearBitsAndSet(&BitMapHeader, 4, 11), 27); + ok_hex(Buffer[0], 0x7fffff4d); + + Buffer[0] = 0x060F874D; + ok_int(RtlFindClearBitsAndSet(&BitMapHeader, 4, 12), 20); + ok_hex(Buffer[0], 0x6ff874d); + ok_int(RtlFindClearBitsAndSet(&BitMapHeader, 2, 11), 11); + ok_hex(Buffer[0], 0x6ff9f4d); + ok_int(RtlFindClearBitsAndSet(&BitMapHeader, 2, 12), 13); + ok_hex(Buffer[0], 0x6ffff4d); +} + +void +Test_RtlFindSetBitsAndClear(void) +{ + RTL_BITMAP BitMapHeader; + ULONG Buffer[2]; + + Buffer[0] = 0xF9F078B2; + Buffer[1] = 0x3F303F30; + + RtlInitializeBitMap(&BitMapHeader, Buffer, 0); + ok_int(RtlFindSetBitsAndClear(&BitMapHeader, 0, 0), 0); + ok_int(RtlFindSetBitsAndClear(&BitMapHeader, 0, 3), 0); + ok_int(RtlFindSetBitsAndClear(&BitMapHeader, 1, 0), -1); + ok_int(RtlFindSetBitsAndClear(&BitMapHeader, 1, 1), -1); + ok_hex(Buffer[0], 0xF9F078B2); + + Buffer[0] = 0xF9F078B2; + RtlInitializeBitMap(&BitMapHeader, Buffer, 8); + ok_int(RtlFindSetBitsAndClear(&BitMapHeader, 1, 0), 1); + ok_hex(Buffer[0], 0xf9f078b0); + ok_int(RtlFindSetBitsAndClear(&BitMapHeader, 1, 1), 4); + ok_hex(Buffer[0], 0xf9f078a0); + ok_int(RtlFindSetBitsAndClear(&BitMapHeader, 1, 2), 5); + ok_hex(Buffer[0], 0xf9f07880); + ok_int(RtlFindSetBitsAndClear(&BitMapHeader, 2, 0), -1); + ok_hex(Buffer[0], 0xf9f07880); + + Buffer[0] = 0xF9F078B2; + RtlInitializeBitMap(&BitMapHeader, Buffer, 32); + ok_int(RtlFindSetBitsAndClear(&BitMapHeader, 4, 0), 11); + ok_hex(Buffer[0], 0xf9f000b2); + ok_int(RtlFindSetBitsAndClear(&BitMapHeader, 5, 0), 20); + ok_hex(Buffer[0], 0xf80000b2); + ok_int(RtlFindSetBitsAndClear(&BitMapHeader, 4, 11), 27); + ok_hex(Buffer[0], 0x800000b2); + + Buffer[0] = 0xF9F078B2; + ok_int(RtlFindSetBitsAndClear(&BitMapHeader, 4, 12), 20); + ok_hex(Buffer[0], 0xf90078b2); + ok_int(RtlFindSetBitsAndClear(&BitMapHeader, 2, 11), 11); + ok_hex(Buffer[0], 0xf90060b2); + ok_int(RtlFindSetBitsAndClear(&BitMapHeader, 2, 12), 13); + ok_hex(Buffer[0], 0xf90000b2); + +} + +void +Test_RtlFindNextForwardRunClear(void) +{ + RTL_BITMAP BitMapHeader; + ULONG Buffer[2]; + ULONG Index; + + Buffer[0] = 0xF9F078B2; + Buffer[1] = 0x3F303F30; + + RtlInitializeBitMap(&BitMapHeader, Buffer, 0); + ok_int(RtlFindNextForwardRunClear(&BitMapHeader, 0, &Index), 0); + ok_int(Index, 0); + ok_int(RtlFindNextForwardRunClear(&BitMapHeader, 1, &Index), 0); + ok_int(Index, 1); + + Index = -1; + RtlInitializeBitMap(&BitMapHeader, Buffer, 8); + ok_int(RtlFindNextForwardRunClear(&BitMapHeader, 0, &Index), 1); + ok_int(Index, 0); + ok_int(RtlFindNextForwardRunClear(&BitMapHeader, 1, &Index), 2); + ok_int(Index, 2); + ok_int(RtlFindNextForwardRunClear(&BitMapHeader, 7, &Index), 0); + ok_int(Index, 8); + ok_int(RtlFindNextForwardRunClear(&BitMapHeader, 17, &Index), 0); + ok_int(Index, 17); + ok_int(RtlFindNextForwardRunClear(&BitMapHeader, 39, &Index), 0); + ok_int(Index, 39); +} + +void +Test_RtlFindFirstRunClear(void) +{ +} + +void +Test_RtlFindLastBackwardRunClear(void) +{ +} + +void +Test_RtlFindClearRuns(void) +{ +} + +void +Test_RtlFindLongestRunClear(void) +{ +} + + +START_TEST(RtlBitmap) +{ + Test_RtlFindMostSignificantBit(); + Test_RtlFindLeastSignificantBit(); + Test_RtlInitializeBitMap(); + Test_RtlClearAllBits(); + Test_RtlSetAllBits(); + Test_RtlClearBits(); + Test_RtlSetBits(); + Test_RtlAreBitsClear(); + Test_RtlAreBitsSet(); + Test_RtlNumberOfSetBits(); + Test_RtlNumberOfClearBits(); + Test_RtlFindClearBits(); + Test_RtlFindSetBits(); + Test_RtlFindClearBitsAndSet(); + Test_RtlFindSetBitsAndClear(); + Test_RtlFindNextForwardRunClear(); + Test_RtlFindFirstRunClear(); + Test_RtlFindLastBackwardRunClear(); + Test_RtlFindClearRuns(); + Test_RtlFindLongestRunClear(); +} + Propchange: trunk/rostests/apitests/ntdll/RtlBitmap.c ------------------------------------------------------------------------------ svn:eol-style = native 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] Tue May 29 18:46:25 2012 @@ -8,6 +8,7 @@ extern void func_NtAllocateVirtualMemory(void); extern void func_NtFreeVirtualMemory(void); extern void func_NtSystemInformation(void); +extern void func_RtlBitmap(void); extern void func_RtlDetermineDosPathNameType(void); extern void func_RtlDoesFileExists(void); extern void func_RtlDosSearchPath_U(void); @@ -24,6 +25,7 @@ { "NtAllocateVirtualMemory", func_NtAllocateVirtualMemory }, { "NtFreeVirtualMemory", func_NtFreeVirtualMemory }, { "NtSystemInformation", func_NtSystemInformation }, + { "RtlBitmap", func_RtlBitmap }, { "RtlDetermineDosPathNameType", func_RtlDetermineDosPathNameType }, { "RtlDoesFileExists", func_RtlDoesFileExists }, { "RtlDosSearchPath_U", func_RtlDosSearchPath_U },

1 0

[tkreuzer] 56674: [NDK] Add missing rtl bitmap functions
by tkreuzer＠svn.reactos.org 29 May '12

29 May '12

Author: tkreuzer Date: Tue May 29 18:40:41 2012 New Revision: 56674 URL: http://svn.reactos.org/svn/reactos?rev=56674&view=rev Log: [NDK] Add missing rtl bitmap functions Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Tue May 29 18:40:41 2012 @@ -2872,6 +2872,13 @@ NTSYSAPI VOID NTAPI +RtlClearAllBits( + IN OUT PRTL_BITMAP BitMapHeader +); + +NTSYSAPI +VOID +NTAPI RtlClearBits( IN PRTL_BITMAP BitMapHeader, IN ULONG StartingIndex, @@ -2897,6 +2904,20 @@ ); NTSYSAPI +CCHAR +NTAPI +RtlFindLeastSignificantBit( + IN ULONGLONG Value +); + +NTSYSAPI +CCHAR +NTAPI +RtlFindMostSignificantBit( + IN ULONGLONG Value +); + +NTSYSAPI ULONG NTAPI RtlFindNextForwardRunClear( @@ -2906,12 +2927,46 @@ ); NTSYSAPI +ULONG +NTAPI +RtlFindNextForwardRunSet( + IN PRTL_BITMAP BitMapHeader, + IN ULONG FromIndex, + IN PULONG StartingRunIndex +); + +NTSYSAPI +ULONG +NTAPI +RtlFindSetBits( + IN PRTL_BITMAP BitMapHeader, + IN ULONG NumberToFind, + IN ULONG HintIndex +); + +NTSYSAPI +ULONG +NTAPI +RtlFindSetBitsAndClear( + IN PRTL_BITMAP BitMapHeader, + IN ULONG NumberToFind, + IN ULONG HintIndex +); + +NTSYSAPI VOID NTAPI RtlInitializeBitMap( IN PRTL_BITMAP BitMapHeader, IN PULONG BitMapBuffer, IN ULONG SizeOfBitMap +); + +NTSYSAPI +ULONG +NTAPI +RtlNumberOfClearBits( + IN PRTL_BITMAP BitMapHeader ); NTSYSAPI

1 0

[jimtabor] 56673: [Win32k] - Don't check for send nonclient paint messages and bump up the paint count. This may spell the end of the PAINTING BUG spam.
by jimtabor＠svn.reactos.org 29 May '12

29 May '12

Author: jimtabor Date: Tue May 29 11:57:24 2012 New Revision: 56673 URL: http://svn.reactos.org/svn/reactos?rev=56673&view=rev Log: [Win32k] - Don't check for send nonclient paint messages and bump up the paint count. This may spell the end of the PAINTING BUG spam. Modified: trunk/reactos/win32ss/user/ntuser/painting.c Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Tue May 29 11:57:24 2012 @@ -594,8 +594,7 @@ { return ( Wnd->style & WS_VISIBLE && ( Wnd->hrgnUpdate != NULL || - Wnd->state & WNDS_INTERNALPAINT || - Wnd->state & WNDS_SENDNCPAINT ) ); + Wnd->state & WNDS_INTERNALPAINT ) ); } PWND FASTCALL

1 0

[ekohl] 56672: [SAMLIB][SAMSRV] - Implement SamCreateUserInDomain and SamrCreateUserInDomain. - SamOpenDomain: Use the correct object types when trying to open a domain object.
by ekohl＠svn.reactos.org 28 May '12

28 May '12

Author: ekohl Date: Mon May 28 22:47:52 2012 New Revision: 56672 URL: http://svn.reactos.org/svn/reactos?rev=56672&view=rev Log: [SAMLIB][SAMSRV] - Implement SamCreateUserInDomain and SamrCreateUserInDomain. - SamOpenDomain: Use the correct object types when trying to open a domain object. Modified: trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samlib/samlib.spec trunk/reactos/dll/win32/samsrv/database.c trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/include/ddk/ntsam.h 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] Mon May 28 22:47:52 2012 @@ -433,6 +433,36 @@ NTSTATUS NTAPI +SamCreateUserInDomain(IN SAM_HANDLE DomainHandle, + IN PUNICODE_STRING AccountName, + IN ACCESS_MASK DesiredAccess, + OUT PSAM_HANDLE UserHandle, + OUT PULONG RelativeId) +{ + NTSTATUS Status; + + TRACE("SamCreateUserInDomain(%p,%p,0x%08x,%p,%p)\n", + DomainHandle, AccountName, DesiredAccess, UserHandle, RelativeId); + + RpcTryExcept + { + Status = SamrCreateUserInDomain((SAMPR_HANDLE)DomainHandle, + (PRPC_UNICODE_STRING)AccountName, + DesiredAccess, + (SAMPR_HANDLE *)UserHandle, + RelativeId); + } + 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] Mon May 28 22:47:52 2012 @@ -10,7 +10,7 @@ @ stub SamCreateAliasInDomain @ stub SamCreateGroupInDomain @ stub SamCreateUser2InDomain -@ stub SamCreateUserInDomain +@ stdcall SamCreateUserInDomain(ptr ptr long ptr ptr) @ stub SamDeleteAlias @ stub SamDeleteGroup @ stub SamDeleteUser Modified: trunk/reactos/dll/win32/samsrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/database.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] Mon May 28 22:47:52 2012 @@ -603,6 +603,151 @@ NTSTATUS +SampSetDbObjectNameAlias(IN PSAM_DB_OBJECT DomainObject, + IN LPCWSTR lpContainerName, + IN LPCWSTR lpAliasName, + IN ULONG ulAliasValue) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + UNICODE_STRING ValueName; + HANDLE ContainerKeyHandle = NULL; + HANDLE NamesKeyHandle = NULL; + NTSTATUS Status; + + /* Open the container key */ + RtlInitUnicodeString(&KeyName, lpContainerName); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + DomainObject->KeyHandle, + NULL); + + Status = NtOpenKey(&ContainerKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + return Status; + + /* Open the 'Names' key */ + RtlInitUnicodeString(&KeyName, L"Names"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ContainerKeyHandle, + NULL); + + Status = NtOpenKey(&NamesKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the alias value */ + RtlInitUnicodeString(&ValueName, lpAliasName); + + Status = NtSetValueKey(NamesKeyHandle, + &ValueName, + 0, + REG_DWORD, + (LPVOID)&ulAliasValue, + sizeof(ULONG)); + +done: + if (NamesKeyHandle) + NtClose(NamesKeyHandle); + + if (ContainerKeyHandle) + NtClose(ContainerKeyHandle); + + return Status; +} + + +NTSTATUS +SampCheckDbObjectNameAlias(IN PSAM_DB_OBJECT DomainObject, + IN LPCWSTR lpContainerName, + IN LPCWSTR lpAliasName, + OUT PBOOL bAliasExists) +{ + PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + UNICODE_STRING ValueName; + HANDLE ContainerKeyHandle = NULL; + HANDLE NamesKeyHandle = NULL; + ULONG BufferLength = sizeof(ULONG); + NTSTATUS Status; + + /* Open the container key */ + RtlInitUnicodeString(&KeyName, lpContainerName); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + DomainObject->KeyHandle, + NULL); + + Status = NtOpenKey(&ContainerKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + return Status; + + /* Open the 'Names' key */ + RtlInitUnicodeString(&KeyName, L"Names"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ContainerKeyHandle, + NULL); + + Status = NtOpenKey(&NamesKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + goto done; + + /* Get the alias value */ + RtlInitUnicodeString(&ValueName, lpAliasName); + + 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(NamesKeyHandle, + &ValueName, + KeyValuePartialInformation, + ValueInfo, + BufferLength, + &BufferLength); + + *bAliasExists = (Status != STATUS_OBJECT_NAME_NOT_FOUND); + + Status = STATUS_SUCCESS; + + /* Free the memory and return status */ + RtlFreeHeap(RtlGetProcessHeap(), 0, ValueInfo); + +done: + if (NamesKeyHandle) + NtClose(NamesKeyHandle); + + if (ContainerKeyHandle) + NtClose(ContainerKeyHandle); + + return Status; +} + + +NTSTATUS SampSetObjectAttribute(PSAM_DB_OBJECT DbObject, LPWSTR AttributeName, ULONG AttributeType, 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] Mon May 28 22:47:52 2012 @@ -193,6 +193,7 @@ TRACE("SamrOpenDomain(%p %lx %p %p)\n", ServerHandle, DesiredAccess, DomainId, DomainHandle); + /* Validate the server handle */ Status = SampValidateDbObject(ServerHandle, SamDbServerObject, SAM_SERVER_LOOKUP_DOMAIN, @@ -216,7 +217,7 @@ Status = SampOpenDbObject(ServerObject, L"Domains", L"Builtin", - SamDbServerObject, + SamDbDomainObject, DesiredAccess, &DomainObject); } @@ -231,7 +232,7 @@ Status = SampOpenDbObject(ServerObject, L"Domains", L"Account", - SamDbServerObject, + SamDbDomainObject, DesiredAccess, &DomainObject); } @@ -306,8 +307,116 @@ OUT SAMPR_HANDLE *UserHandle, OUT unsigned long *RelativeId) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT DomainObject; + PSAM_DB_OBJECT UserObject; + ULONG ulSize; + ULONG ulRid; + WCHAR szRid[9]; + BOOL bAliasExists = FALSE; + NTSTATUS Status; + + TRACE("SamrCreateUserInDomain(%p %p %lx %p %p)\n", + DomainHandle, Name, DesiredAccess, UserHandle, RelativeId); + + /* Validate the domain handle */ + Status = SampValidateDbObject(DomainHandle, + SamDbDomainObject, + DOMAIN_CREATE_USER, + &DomainObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Get the NextRID attribute */ + ulSize = sizeof(ULONG); + Status = SampGetObjectAttribute(DomainObject, + L"NextRID", + NULL, + (LPVOID)&ulRid, + &ulSize); + if (!NT_SUCCESS(Status)) + ulRid = DOMAIN_USER_RID_MAX; + + TRACE("RID: %lx\n", ulRid); + + /* Convert the RID into a string (hex) */ + _ultow(ulRid, szRid, 16); + + /* Check whether the user name is already in use */ + Status = SampCheckDbObjectNameAlias(DomainObject, + L"Users", + Name->Buffer, + &bAliasExists); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + if (bAliasExists) + { + TRACE("The user account %S already exists!\n", Name->Buffer); + return STATUS_USER_EXISTS; + } + + /* Create the user object */ + Status = SampCreateDbObject(DomainObject, + L"Users", + szRid, + SamDbUserObject, + DesiredAccess, + &UserObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Add the name alias for the user object */ + Status = SampSetDbObjectNameAlias(DomainObject, + L"Users", + Name->Buffer, + ulRid); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Set the account name attribute */ + Status = SampSetObjectAttribute(UserObject, + L"AccountName", + REG_SZ, + (LPVOID)Name->Buffer, + Name->MaximumLength); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* FIXME: Set default user attributes */ + + if (NT_SUCCESS(Status)) + { + *UserHandle = (SAMPR_HANDLE)UserObject; + *RelativeId = ulRid; + } + + /* Increment the NextRID attribute */ + ulRid++; + ulSize = sizeof(ULONG); + SampSetObjectAttribute(DomainObject, + L"NextRID", + REG_DWORD, + (LPVOID)&ulRid, + ulSize); + + TRACE("returns with status 0x%08lx\n", Status); + + return Status; } /* Function 13 */ 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] Mon May 28 22:47:52 2012 @@ -7,6 +7,7 @@ * PROGRAMMERS: Eric Kohl */ +#include <stdlib.h> #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER @@ -76,6 +77,18 @@ SampCloseDbObject(PSAM_DB_OBJECT DbObject); NTSTATUS +SampSetDbObjectNameAlias(IN PSAM_DB_OBJECT DomainObject, + IN LPCWSTR lpContainerName, + IN LPCWSTR lpAliasName, + IN DWORD dwAliasValue); + +NTSTATUS +SampCheckDbObjectNameAlias(IN PSAM_DB_OBJECT DomainObject, + IN LPCWSTR lpContainerName, + IN LPCWSTR lpAliasName, + OUT PBOOL bAliasExists); + +NTSTATUS SampSetObjectAttribute(PSAM_DB_OBJECT DbObject, LPWSTR AttributeName, ULONG AttributeType, 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] Mon May 28 22:47:52 2012 @@ -5,6 +5,18 @@ #ifdef __cplusplus extern "C" { #endif + +#define DOMAIN_READ_PASSWORD_PARAMETERS 1 +#define DOMAIN_WRITE_PASSWORD_PARAMS 2 +#define DOMAIN_READ_OTHER_PARAMETERS 4 +#define DOMAIN_WRITE_OTHER_PARAMETERS 8 +#define DOMAIN_CREATE_USER 16 +#define DOMAIN_CREATE_GROUP 32 +#define DOMAIN_CREATE_ALIAS 64 +#define DOMAIN_GET_ALIAS_MEMBERSHIP 128 +#define DOMAIN_LIST_ACCOUNTS 256 +#define DOMAIN_LOOKUP 512 +#define DOMAIN_ADMINISTER_SERVER 1024 #define SAM_SERVER_CONNECT 1 #define SAM_SERVER_SHUTDOWN 2

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2012