Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 56819: [SAMSRV] - Implement missing cases of SamrSetInformationDomain. - Use the fixed domain data to assign new RIDs in SamrCreateAliasInDomain and SamrCreateUserInDomain.
by ekohl＠svn.reactos.org 01 Jul '12

01 Jul '12

Author: ekohl Date: Sun Jul 1 19:50:08 2012 New Revision: 56819 URL: http://svn.reactos.org/svn/reactos?rev=56819&view=rev Log: [SAMSRV] - Implement missing cases of SamrSetInformationDomain. - Use the fixed domain data to assign new RIDs in SamrCreateAliasInDomain and SamrCreateUserInDomain. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sun Jul 1 19:50:08 2012 @@ -1413,6 +1413,166 @@ return Status; } + +static NTSTATUS +SampSetDomainPassword(PSAM_DB_OBJECT DomainObject, + PSAMPR_DOMAIN_INFO_BUFFER Buffer) +{ + SAM_DOMAIN_FIXED_DATA FixedData; + ULONG Length = 0; + NTSTATUS Status; + + Length = sizeof(SAM_DOMAIN_FIXED_DATA); + Status = SampGetObjectAttribute(DomainObject, + L"F", + NULL, + (PVOID)&FixedData, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + FixedData.MinPasswordLength = Buffer->Password.MinPasswordLength; + FixedData.PasswordHistoryLength = Buffer->Password.PasswordHistoryLength; + FixedData.PasswordProperties = Buffer->Password.PasswordProperties; + FixedData.MaxPasswordAge.LowPart = Buffer->Password.MaxPasswordAge.LowPart; + FixedData.MaxPasswordAge.HighPart = Buffer->Password.MaxPasswordAge.HighPart; + FixedData.MinPasswordAge.LowPart = Buffer->Password.MinPasswordAge.LowPart; + FixedData.MinPasswordAge.HighPart = Buffer->Password.MinPasswordAge.HighPart; + + Status = SampSetObjectAttribute(DomainObject, + L"F", + REG_BINARY, + &FixedData, + Length); + +done: + return Status; +} + + +static NTSTATUS +SampSetDomainLogoff(PSAM_DB_OBJECT DomainObject, + PSAMPR_DOMAIN_INFO_BUFFER Buffer) +{ + SAM_DOMAIN_FIXED_DATA FixedData; + ULONG Length = 0; + NTSTATUS Status; + + Length = sizeof(SAM_DOMAIN_FIXED_DATA); + Status = SampGetObjectAttribute(DomainObject, + L"F", + NULL, + (PVOID)&FixedData, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + FixedData.ForceLogoff.LowPart = Buffer->Logoff.ForceLogoff.LowPart; + FixedData.ForceLogoff.HighPart = Buffer->Logoff.ForceLogoff.HighPart; + + Status = SampSetObjectAttribute(DomainObject, + L"F", + REG_BINARY, + &FixedData, + Length); + +done: + return Status; +} + + +static NTSTATUS +SampSetDomainServerRole(PSAM_DB_OBJECT DomainObject, + PSAMPR_DOMAIN_INFO_BUFFER Buffer) +{ + SAM_DOMAIN_FIXED_DATA FixedData; + ULONG Length = 0; + NTSTATUS Status; + + Length = sizeof(SAM_DOMAIN_FIXED_DATA); + Status = SampGetObjectAttribute(DomainObject, + L"F", + NULL, + (PVOID)&FixedData, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + FixedData.DomainServerRole = Buffer->Role.DomainServerRole; + + Status = SampSetObjectAttribute(DomainObject, + L"F", + REG_BINARY, + &FixedData, + Length); + +done: + return Status; +} + + +static NTSTATUS +SampSetDomainState(PSAM_DB_OBJECT DomainObject, + PSAMPR_DOMAIN_INFO_BUFFER Buffer) +{ + SAM_DOMAIN_FIXED_DATA FixedData; + ULONG Length = 0; + NTSTATUS Status; + + Length = sizeof(SAM_DOMAIN_FIXED_DATA); + Status = SampGetObjectAttribute(DomainObject, + L"F", + NULL, + (PVOID)&FixedData, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + FixedData.DomainServerState = Buffer->State.DomainServerState; + + Status = SampSetObjectAttribute(DomainObject, + L"F", + REG_BINARY, + &FixedData, + Length); + +done: + return Status; +} + + +static NTSTATUS +SampSetDomainLockout(PSAM_DB_OBJECT DomainObject, + PSAMPR_DOMAIN_INFO_BUFFER Buffer) +{ + SAM_DOMAIN_FIXED_DATA FixedData; + ULONG Length = 0; + NTSTATUS Status; + + Length = sizeof(SAM_DOMAIN_FIXED_DATA); + Status = SampGetObjectAttribute(DomainObject, + L"F", + NULL, + (PVOID)&FixedData, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + FixedData.LockoutDuration = Buffer->Lockout.LockoutDuration; + FixedData.LockoutObservationWindow = Buffer->Lockout.LockoutObservationWindow; + FixedData.LockoutThreshold = Buffer->Lockout.LockoutThreshold; + + Status = SampSetObjectAttribute(DomainObject, + L"F", + REG_BINARY, + &FixedData, + Length); + +done: + return Status; +} + + /* Function 9 */ NTSTATUS NTAPI @@ -1461,9 +1621,13 @@ switch (DomainInformationClass) { case DomainPasswordInformation: + Status = SampSetDomainPassword(DomainObject, + DomainInformation); break; case DomainLogoffInformation: + Status = SampSetDomainLogoff(DomainObject, + DomainInformation); break; case DomainOemInformation: @@ -1491,12 +1655,18 @@ break; case DomainServerRoleInformation: + Status = SampSetDomainServerRole(DomainObject, + DomainInformation); break; case DomainStateInformation: + Status = SampSetDomainState(DomainObject, + DomainInformation); break; case DomainLockoutInformation: + Status = SampSetDomainLockout(DomainObject, + DomainInformation); break; default: @@ -1541,6 +1711,7 @@ OUT SAMPR_HANDLE *UserHandle, OUT unsigned long *RelativeId) { + SAM_DOMAIN_FIXED_DATA FixedDomainData; PSAM_DB_OBJECT DomainObject; PSAM_DB_OBJECT UserObject; ULONG ulSize; @@ -1563,15 +1734,34 @@ return Status; } - /* Get the NextRID attribute */ - ulSize = sizeof(ULONG); + /* Get the fixed domain attributes */ + ulSize = sizeof(SAM_DOMAIN_FIXED_DATA); Status = SampGetObjectAttribute(DomainObject, - L"NextRID", - NULL, - (LPVOID)&ulRid, + L"F", + NULL, + (PVOID)&FixedDomainData, &ulSize); if (!NT_SUCCESS(Status)) - ulRid = DOMAIN_USER_RID_MAX + 1; + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Increment the NextRid attribute */ + ulRid = FixedDomainData.NextRid; + FixedDomainData.NextRid++; + + /* Store the fixed domain attributes */ + Status = SampSetObjectAttribute(DomainObject, + L"F", + REG_BINARY, + &FixedDomainData, + ulSize); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } TRACE("RID: %lx\n", ulRid); @@ -1639,15 +1829,6 @@ *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; @@ -1676,6 +1857,7 @@ OUT SAMPR_HANDLE *AliasHandle, OUT unsigned long *RelativeId) { + SAM_DOMAIN_FIXED_DATA FixedDomainData; PSAM_DB_OBJECT DomainObject; PSAM_DB_OBJECT AliasObject; UNICODE_STRING EmptyString = RTL_CONSTANT_STRING(L""); @@ -1699,15 +1881,34 @@ return Status; } - /* Get the NextRID attribute */ - ulSize = sizeof(ULONG); + /* Get the fixed domain attributes */ + ulSize = sizeof(SAM_DOMAIN_FIXED_DATA); Status = SampGetObjectAttribute(DomainObject, - L"NextRID", - NULL, - (LPVOID)&ulRid, + L"F", + NULL, + (PVOID)&FixedDomainData, &ulSize); if (!NT_SUCCESS(Status)) - ulRid = DOMAIN_USER_RID_MAX + 1; + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Increment the NextRid attribute */ + ulRid = FixedDomainData.NextRid; + FixedDomainData.NextRid++; + + /* Store the fixed domain attributes */ + Status = SampSetObjectAttribute(DomainObject, + L"F", + REG_BINARY, + &FixedDomainData, + ulSize); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } TRACE("RID: %lx\n", ulRid); @@ -1784,15 +1985,6 @@ *AliasHandle = (SAMPR_HANDLE)AliasObject; *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);

1 0

[ekohl] 56818: [SAMSRV] - Implement all cases of SamrQueryInformationDomain. - Store all fixed size domain attributes in the registry value "F". - Initialize all domain attribute in SampCreateDomain.
by ekohl＠svn.reactos.org 01 Jul '12

01 Jul '12

Author: ekohl Date: Sun Jul 1 16:51:10 2012 New Revision: 56818 URL: http://svn.reactos.org/svn/reactos?rev=56818&view=rev Log: [SAMSRV] - Implement all cases of SamrQueryInformationDomain. - Store all fixed size domain attributes in the registry value "F". - Initialize all domain attribute in SampCreateDomain. Modified: 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/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sun Jul 1 16:51:10 2012 @@ -540,6 +540,290 @@ static NTSTATUS +SampQueryDomainPassword(PSAM_DB_OBJECT DomainObject, + PSAMPR_DOMAIN_INFO_BUFFER *Buffer) +{ + PSAMPR_DOMAIN_INFO_BUFFER InfoBuffer = NULL; + SAM_DOMAIN_FIXED_DATA FixedData; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_DOMAIN_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Length = sizeof(SAM_DOMAIN_FIXED_DATA); + Status = SampGetObjectAttribute(DomainObject, + L"F", + NULL, + (PVOID)&FixedData, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + InfoBuffer->Password.MinPasswordLength = FixedData.MinPasswordLength; + InfoBuffer->Password.PasswordHistoryLength = FixedData.PasswordHistoryLength; + InfoBuffer->Password.PasswordProperties = FixedData.PasswordProperties; + InfoBuffer->Password.MaxPasswordAge.LowPart = FixedData.MaxPasswordAge.LowPart; + InfoBuffer->Password.MaxPasswordAge.HighPart = FixedData.MaxPasswordAge.HighPart; + InfoBuffer->Password.MinPasswordAge.LowPart = FixedData.MinPasswordAge.LowPart; + InfoBuffer->Password.MinPasswordAge.HighPart = FixedData.MinPasswordAge.HighPart; + + *Buffer = InfoBuffer; + +done: + if (!NT_SUCCESS(Status)) + { + if (InfoBuffer != NULL) + { + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + +static NTSTATUS +SampQueryDomainGeneral(PSAM_DB_OBJECT DomainObject, + PSAMPR_DOMAIN_INFO_BUFFER *Buffer) +{ + PSAMPR_DOMAIN_INFO_BUFFER InfoBuffer = NULL; + SAM_DOMAIN_FIXED_DATA FixedData; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_DOMAIN_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Length = sizeof(SAM_DOMAIN_FIXED_DATA); + Status = SampGetObjectAttribute(DomainObject, + L"F", + NULL, + (PVOID)&FixedData, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + InfoBuffer->General.ForceLogoff.LowPart = FixedData.ForceLogoff.LowPart; + InfoBuffer->General.ForceLogoff.HighPart = FixedData.ForceLogoff.HighPart; + InfoBuffer->General.DomainModifiedCount.LowPart = FixedData.DomainModifiedCount.LowPart; + InfoBuffer->General.DomainModifiedCount.HighPart = FixedData.DomainModifiedCount.HighPart; + InfoBuffer->General.DomainServerState = FixedData.DomainServerState; + InfoBuffer->General.DomainServerRole = FixedData.DomainServerRole; + InfoBuffer->General.UasCompatibilityRequired = FixedData.UasCompatibilityRequired; + + Length = 0; + Status = SampGetObjectAttribute(DomainObject, + L"OemInformation", + NULL, + NULL, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + InfoBuffer->General.OemInformation.Length = Length - sizeof(WCHAR); + InfoBuffer->General.OemInformation.MaximumLength = Length; + InfoBuffer->General.OemInformation.Buffer = midl_user_allocate(Length); + if (InfoBuffer->General.OemInformation.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = SampGetObjectAttribute(DomainObject, + L"OemInformation", + NULL, + (PVOID)InfoBuffer->General.OemInformation.Buffer, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + Length = 0; + Status = SampGetObjectAttribute(DomainObject, + L"Name", + NULL, + NULL, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + InfoBuffer->General.DomainName.Length = Length - sizeof(WCHAR); + InfoBuffer->General.DomainName.MaximumLength = Length; + InfoBuffer->General.DomainName.Buffer = midl_user_allocate(Length); + if (InfoBuffer->General.DomainName.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = SampGetObjectAttribute(DomainObject, + L"Name", + NULL, + (PVOID)InfoBuffer->General.DomainName.Buffer, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + Length = 0; + Status = SampGetObjectAttribute(DomainObject, + L"ReplicaSourceNodeName", + NULL, + NULL, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + InfoBuffer->General.ReplicaSourceNodeName.Length = Length - sizeof(WCHAR); + InfoBuffer->General.ReplicaSourceNodeName.MaximumLength = Length; + InfoBuffer->General.ReplicaSourceNodeName.Buffer = midl_user_allocate(Length); + if (InfoBuffer->General.ReplicaSourceNodeName.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = SampGetObjectAttribute(DomainObject, + L"ReplicaSourceNodeName", + NULL, + (PVOID)InfoBuffer->General.ReplicaSourceNodeName.Buffer, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + InfoBuffer->General.UserCount = 0; /* FIXME */ + InfoBuffer->General.GroupCount = 0; /* FIXME */ + InfoBuffer->General.AliasCount = 0; /* FIXME */ + + *Buffer = InfoBuffer; + +done: + if (!NT_SUCCESS(Status)) + { + if (InfoBuffer != NULL) + { + if (InfoBuffer->General.OemInformation.Buffer != NULL) + midl_user_free(InfoBuffer->General.OemInformation.Buffer); + + if (InfoBuffer->General.DomainName.Buffer != NULL) + midl_user_free(InfoBuffer->General.DomainName.Buffer); + + if (InfoBuffer->General.ReplicaSourceNodeName.Buffer != NULL) + midl_user_free(InfoBuffer->General.ReplicaSourceNodeName.Buffer); + + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + +static NTSTATUS +SampQueryDomainLogoff(PSAM_DB_OBJECT DomainObject, + PSAMPR_DOMAIN_INFO_BUFFER *Buffer) +{ + PSAMPR_DOMAIN_INFO_BUFFER InfoBuffer = NULL; + SAM_DOMAIN_FIXED_DATA FixedData; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_DOMAIN_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Length = sizeof(SAM_DOMAIN_FIXED_DATA); + Status = SampGetObjectAttribute(DomainObject, + L"F", + NULL, + (PVOID)&FixedData, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + InfoBuffer->Logoff.ForceLogoff.LowPart = FixedData.ForceLogoff.LowPart; + InfoBuffer->Logoff.ForceLogoff.HighPart = FixedData.ForceLogoff.HighPart; + + *Buffer = InfoBuffer; + +done: + if (!NT_SUCCESS(Status)) + { + if (InfoBuffer != NULL) + { + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + +static NTSTATUS +SampQueryDomainOem(PSAM_DB_OBJECT DomainObject, + PSAMPR_DOMAIN_INFO_BUFFER *Buffer) +{ + PSAMPR_DOMAIN_INFO_BUFFER InfoBuffer = NULL; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_DOMAIN_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Status = SampGetObjectAttribute(DomainObject, + L"OemInformation", + NULL, + NULL, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + InfoBuffer->Oem.OemInformation.Length = Length - sizeof(WCHAR); + InfoBuffer->Oem.OemInformation.MaximumLength = Length; + InfoBuffer->Oem.OemInformation.Buffer = midl_user_allocate(Length); + if (InfoBuffer->Oem.OemInformation.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = SampGetObjectAttribute(DomainObject, + L"OemInformation", + NULL, + (PVOID)InfoBuffer->Oem.OemInformation.Buffer, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + *Buffer = InfoBuffer; + +done: + if (!NT_SUCCESS(Status)) + { + if (InfoBuffer != NULL) + { + if (InfoBuffer->Oem.OemInformation.Buffer != NULL) + midl_user_free(InfoBuffer->Oem.OemInformation.Buffer); + + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + +static NTSTATUS SampQueryDomainName(PSAM_DB_OBJECT DomainObject, PSAMPR_DOMAIN_INFO_BUFFER *Buffer) { @@ -596,6 +880,420 @@ } +static NTSTATUS +SampQueryDomainReplication(PSAM_DB_OBJECT DomainObject, + PSAMPR_DOMAIN_INFO_BUFFER *Buffer) +{ + PSAMPR_DOMAIN_INFO_BUFFER InfoBuffer = NULL; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_DOMAIN_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Status = SampGetObjectAttribute(DomainObject, + L"ReplicaSourceNodeName", + NULL, + NULL, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + InfoBuffer->Replication.ReplicaSourceNodeName.Length = Length - sizeof(WCHAR); + InfoBuffer->Replication.ReplicaSourceNodeName.MaximumLength = Length; + InfoBuffer->Replication.ReplicaSourceNodeName.Buffer = midl_user_allocate(Length); + if (InfoBuffer->Replication.ReplicaSourceNodeName.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = SampGetObjectAttribute(DomainObject, + L"ReplicaSourceNodeName", + NULL, + (PVOID)InfoBuffer->Replication.ReplicaSourceNodeName.Buffer, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + *Buffer = InfoBuffer; + +done: + if (!NT_SUCCESS(Status)) + { + if (InfoBuffer != NULL) + { + if (InfoBuffer->Replication.ReplicaSourceNodeName.Buffer != NULL) + midl_user_free(InfoBuffer->Replication.ReplicaSourceNodeName.Buffer); + + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + +static NTSTATUS +SampQueryDomainServerRole(PSAM_DB_OBJECT DomainObject, + PSAMPR_DOMAIN_INFO_BUFFER *Buffer) +{ + PSAMPR_DOMAIN_INFO_BUFFER InfoBuffer = NULL; + SAM_DOMAIN_FIXED_DATA FixedData; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_DOMAIN_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Length = sizeof(SAM_DOMAIN_FIXED_DATA); + Status = SampGetObjectAttribute(DomainObject, + L"F", + NULL, + (PVOID)&FixedData, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + InfoBuffer->Role.DomainServerRole = FixedData.DomainServerRole; + + *Buffer = InfoBuffer; + +done: + if (!NT_SUCCESS(Status)) + { + if (InfoBuffer != NULL) + { + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + +static NTSTATUS +SampQueryDomainModified(PSAM_DB_OBJECT DomainObject, + PSAMPR_DOMAIN_INFO_BUFFER *Buffer) +{ + PSAMPR_DOMAIN_INFO_BUFFER InfoBuffer = NULL; + SAM_DOMAIN_FIXED_DATA FixedData; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_DOMAIN_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Length = sizeof(SAM_DOMAIN_FIXED_DATA); + Status = SampGetObjectAttribute(DomainObject, + L"F", + NULL, + (PVOID)&FixedData, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + InfoBuffer->Modified.DomainModifiedCount.LowPart = FixedData.DomainModifiedCount.LowPart; + InfoBuffer->Modified.DomainModifiedCount.HighPart = FixedData.DomainModifiedCount.HighPart; + InfoBuffer->Modified.CreationTime.LowPart = FixedData.CreationTime.LowPart; + InfoBuffer->Modified.CreationTime.HighPart = FixedData.CreationTime.HighPart; + + *Buffer = InfoBuffer; + +done: + if (!NT_SUCCESS(Status)) + { + if (InfoBuffer != NULL) + { + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + +static NTSTATUS +SampQueryDomainState(PSAM_DB_OBJECT DomainObject, + PSAMPR_DOMAIN_INFO_BUFFER *Buffer) +{ + PSAMPR_DOMAIN_INFO_BUFFER InfoBuffer = NULL; + SAM_DOMAIN_FIXED_DATA FixedData; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_DOMAIN_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Length = sizeof(SAM_DOMAIN_FIXED_DATA); + Status = SampGetObjectAttribute(DomainObject, + L"F", + NULL, + (PVOID)&FixedData, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + InfoBuffer->State.DomainServerState = FixedData.DomainServerState; + + *Buffer = InfoBuffer; + +done: + if (!NT_SUCCESS(Status)) + { + if (InfoBuffer != NULL) + { + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + +static NTSTATUS +SampQueryDomainGeneral2(PSAM_DB_OBJECT DomainObject, + PSAMPR_DOMAIN_INFO_BUFFER *Buffer) +{ + PSAMPR_DOMAIN_INFO_BUFFER InfoBuffer = NULL; + SAM_DOMAIN_FIXED_DATA FixedData; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_DOMAIN_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Length = sizeof(SAM_DOMAIN_FIXED_DATA); + Status = SampGetObjectAttribute(DomainObject, + L"F", + NULL, + (PVOID)&FixedData, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + InfoBuffer->General2.I1.ForceLogoff.LowPart = FixedData.ForceLogoff.LowPart; + InfoBuffer->General2.I1.ForceLogoff.HighPart = FixedData.ForceLogoff.HighPart; + InfoBuffer->General2.I1.DomainModifiedCount.LowPart = FixedData.DomainModifiedCount.LowPart; + InfoBuffer->General2.I1.DomainModifiedCount.HighPart = FixedData.DomainModifiedCount.HighPart; + InfoBuffer->General2.I1.DomainServerState = FixedData.DomainServerState; + InfoBuffer->General2.I1.DomainServerRole = FixedData.DomainServerRole; + InfoBuffer->General2.I1.UasCompatibilityRequired = FixedData.UasCompatibilityRequired; + + InfoBuffer->General2.LockoutDuration = FixedData.LockoutDuration; + InfoBuffer->General2.LockoutObservationWindow = FixedData.LockoutObservationWindow; + InfoBuffer->General2.LockoutThreshold = FixedData.LockoutThreshold; + + Length = 0; + Status = SampGetObjectAttribute(DomainObject, + L"OemInformation", + NULL, + NULL, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + InfoBuffer->General2.I1.OemInformation.Length = Length - sizeof(WCHAR); + InfoBuffer->General2.I1.OemInformation.MaximumLength = Length; + InfoBuffer->General2.I1.OemInformation.Buffer = midl_user_allocate(Length); + if (InfoBuffer->General2.I1.OemInformation.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = SampGetObjectAttribute(DomainObject, + L"OemInformation", + NULL, + (PVOID)InfoBuffer->General2.I1.OemInformation.Buffer, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + Length = 0; + Status = SampGetObjectAttribute(DomainObject, + L"Name", + NULL, + NULL, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + InfoBuffer->General2.I1.DomainName.Length = Length - sizeof(WCHAR); + InfoBuffer->General2.I1.DomainName.MaximumLength = Length; + InfoBuffer->General2.I1.DomainName.Buffer = midl_user_allocate(Length); + if (InfoBuffer->General2.I1.DomainName.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = SampGetObjectAttribute(DomainObject, + L"Name", + NULL, + (PVOID)InfoBuffer->General2.I1.DomainName.Buffer, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + Length = 0; + Status = SampGetObjectAttribute(DomainObject, + L"ReplicaSourceNodeName", + NULL, + NULL, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + InfoBuffer->General2.I1.ReplicaSourceNodeName.Length = Length - sizeof(WCHAR); + InfoBuffer->General2.I1.ReplicaSourceNodeName.MaximumLength = Length; + InfoBuffer->General2.I1.ReplicaSourceNodeName.Buffer = midl_user_allocate(Length); + if (InfoBuffer->General2.I1.ReplicaSourceNodeName.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = SampGetObjectAttribute(DomainObject, + L"ReplicaSourceNodeName", + NULL, + (PVOID)InfoBuffer->General2.I1.ReplicaSourceNodeName.Buffer, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + InfoBuffer->General2.I1.UserCount = 0; /* FIXME */ + InfoBuffer->General2.I1.GroupCount = 0; /* FIXME */ + InfoBuffer->General2.I1.AliasCount = 0; /* FIXME */ + + *Buffer = InfoBuffer; + +done: + if (!NT_SUCCESS(Status)) + { + if (InfoBuffer != NULL) + { + if (InfoBuffer->General2.I1.OemInformation.Buffer != NULL) + midl_user_free(InfoBuffer->General2.I1.OemInformation.Buffer); + + if (InfoBuffer->General2.I1.DomainName.Buffer != NULL) + midl_user_free(InfoBuffer->General2.I1.DomainName.Buffer); + + if (InfoBuffer->General2.I1.ReplicaSourceNodeName.Buffer != NULL) + midl_user_free(InfoBuffer->General2.I1.ReplicaSourceNodeName.Buffer); + + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + +static NTSTATUS +SampQueryDomainLockout(PSAM_DB_OBJECT DomainObject, + PSAMPR_DOMAIN_INFO_BUFFER *Buffer) +{ + PSAMPR_DOMAIN_INFO_BUFFER InfoBuffer = NULL; + SAM_DOMAIN_FIXED_DATA FixedData; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_DOMAIN_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Length = sizeof(SAM_DOMAIN_FIXED_DATA); + Status = SampGetObjectAttribute(DomainObject, + L"F", + NULL, + (PVOID)&FixedData, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + InfoBuffer->Lockout.LockoutDuration = FixedData.LockoutDuration; + InfoBuffer->Lockout.LockoutObservationWindow = FixedData.LockoutObservationWindow; + InfoBuffer->Lockout.LockoutThreshold = FixedData.LockoutThreshold; + + *Buffer = InfoBuffer; + +done: + if (!NT_SUCCESS(Status)) + { + if (InfoBuffer != NULL) + { + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + +static NTSTATUS +SampQueryDomainModified2(PSAM_DB_OBJECT DomainObject, + PSAMPR_DOMAIN_INFO_BUFFER *Buffer) +{ + PSAMPR_DOMAIN_INFO_BUFFER InfoBuffer = NULL; + SAM_DOMAIN_FIXED_DATA FixedData; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_DOMAIN_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Length = sizeof(SAM_DOMAIN_FIXED_DATA); + Status = SampGetObjectAttribute(DomainObject, + L"F", + NULL, + (PVOID)&FixedData, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + InfoBuffer->Modified2.DomainModifiedCount.LowPart = FixedData.DomainModifiedCount.LowPart; + InfoBuffer->Modified2.DomainModifiedCount.HighPart = FixedData.DomainModifiedCount.HighPart; + InfoBuffer->Modified2.CreationTime.LowPart = FixedData.CreationTime.LowPart; + InfoBuffer->Modified2.CreationTime.HighPart = FixedData.CreationTime.HighPart; + InfoBuffer->Modified2.ModifiedCountAtLastPromotion.LowPart = FixedData.ModifiedCountAtLastPromotion.LowPart; + InfoBuffer->Modified2.ModifiedCountAtLastPromotion.HighPart = FixedData.ModifiedCountAtLastPromotion.HighPart; + + *Buffer = InfoBuffer; + +done: + if (!NT_SUCCESS(Status)) + { + if (InfoBuffer != NULL) + { + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + /* Function 8 */ NTSTATUS NTAPI @@ -604,44 +1302,113 @@ OUT PSAMPR_DOMAIN_INFO_BUFFER *Buffer) { PSAM_DB_OBJECT DomainObject; + ACCESS_MASK DesiredAccess; NTSTATUS Status; TRACE("SamrQueryInformationDomain(%p %lu %p)\n", DomainHandle, DomainInformationClass, Buffer); + + switch (DomainInformationClass) + { + case DomainPasswordInformation: + case DomainLockoutInformation: + DesiredAccess = DOMAIN_READ_PASSWORD_PARAMETERS; + break; + + case DomainGeneralInformation: + case DomainLogoffInformation: + case DomainOemInformation: + case DomainNameInformation: + case DomainReplicationInformation: + case DomainServerRoleInformation: + case DomainModifiedInformation: + case DomainStateInformation: + case DomainModifiedInformation2: + DesiredAccess = DOMAIN_READ_OTHER_PARAMETERS; + break; + + case DomainGeneralInformation2: + DesiredAccess = DOMAIN_READ_PASSWORD_PARAMETERS | + DOMAIN_READ_OTHER_PARAMETERS; + break; + + default: + return STATUS_INVALID_INFO_CLASS; + } /* Validate the server handle */ Status = SampValidateDbObject(DomainHandle, SamDbDomainObject, - DOMAIN_READ_OTHER_PARAMETERS, + DesiredAccess, &DomainObject); if (!NT_SUCCESS(Status)) return Status; switch (DomainInformationClass) { + case DomainPasswordInformation: + Status = SampQueryDomainPassword(DomainObject, + Buffer); + break; + + case DomainGeneralInformation: + Status = SampQueryDomainGeneral(DomainObject, + Buffer); + break; + + case DomainLogoffInformation: + Status = SampQueryDomainLogoff(DomainObject, + Buffer); + break; + + case DomainOemInformation: + Status = SampQueryDomainOem(DomainObject, + Buffer); + break; + case DomainNameInformation: Status = SampQueryDomainName(DomainObject, Buffer); break; + case DomainReplicationInformation: + Status = SampQueryDomainReplication(DomainObject, + Buffer); + break; + + case DomainServerRoleInformation: + Status = SampQueryDomainServerRole(DomainObject, + Buffer); + break; + + case DomainModifiedInformation: + Status = SampQueryDomainModified(DomainObject, + Buffer); + break; + + case DomainStateInformation: + Status = SampQueryDomainState(DomainObject, + Buffer); + break; + + case DomainGeneralInformation2: + Status = SampQueryDomainGeneral2(DomainObject, + Buffer); + break; + + case DomainLockoutInformation: + Status = SampQueryDomainLockout(DomainObject, + Buffer); + break; + + case DomainModifiedInformation2: + Status = SampQueryDomainModified2(DomainObject, + Buffer); + break; + default: Status = STATUS_NOT_IMPLEMENTED; } - - return Status; -} - -static NTSTATUS -SampSetDomainName(PSAM_DB_OBJECT DomainObject, - PSAMPR_DOMAIN_NAME_INFORMATION DomainNameInfo) -{ - NTSTATUS Status; - - Status = SampSetObjectAttribute(DomainObject, - L"Name", - REG_SZ, - DomainNameInfo->DomainName.Buffer, - DomainNameInfo->DomainName.Length + sizeof(WCHAR)); return Status; } @@ -654,24 +1421,82 @@ IN PSAMPR_DOMAIN_INFO_BUFFER DomainInformation) { PSAM_DB_OBJECT DomainObject; + ACCESS_MASK DesiredAccess; NTSTATUS Status; TRACE("SamrSetInformationDomain(%p %lu %p)\n", DomainHandle, DomainInformationClass, DomainInformation); + + switch (DomainInformationClass) + { + case DomainPasswordInformation: + case DomainLockoutInformation: + DesiredAccess = DOMAIN_WRITE_PASSWORD_PARAMS; + break; + + case DomainLogoffInformation: + case DomainOemInformation: + case DomainNameInformation: + DesiredAccess = DOMAIN_WRITE_OTHER_PARAMETERS; + break; + + case DomainReplicationInformation: + case DomainServerRoleInformation: + case DomainStateInformation: + DesiredAccess = DOMAIN_ADMINISTER_SERVER; + break; + + default: + return STATUS_INVALID_INFO_CLASS; + } /* Validate the server handle */ Status = SampValidateDbObject(DomainHandle, SamDbDomainObject, - DOMAIN_WRITE_OTHER_PARAMETERS, + DesiredAccess, &DomainObject); if (!NT_SUCCESS(Status)) return Status; switch (DomainInformationClass) { + case DomainPasswordInformation: + break; + + case DomainLogoffInformation: + break; + + case DomainOemInformation: + Status = SampSetObjectAttribute(DomainObject, + L"OemInformation", + REG_SZ, + DomainInformation->Oem.OemInformation.Buffer, + DomainInformation->Oem.OemInformation.Length + sizeof(WCHAR)); + break; + case DomainNameInformation: - Status = SampSetDomainName(DomainObject, - &DomainInformation->Name); + Status = SampSetObjectAttribute(DomainObject, + L"Name", + REG_SZ, + DomainInformation->Name.DomainName.Buffer, + DomainInformation->Name.DomainName.Length + sizeof(WCHAR)); + break; + + case DomainReplicationInformation: + Status = SampSetObjectAttribute(DomainObject, + L"ReplicaSourceNodeName", + REG_SZ, + DomainInformation->Replication.ReplicaSourceNodeName.Buffer, + DomainInformation->Replication.ReplicaSourceNodeName.Length + sizeof(WCHAR)); + break; + + case DomainServerRoleInformation: + break; + + case DomainStateInformation: + break; + + case DomainLockoutInformation: break; default: @@ -1800,37 +2625,6 @@ return Status; } - -static NTSTATUS -SampSetAliasName(PSAM_DB_OBJECT AliasObject, - PSAMPR_ALIAS_INFO_BUFFER Buffer) -{ - NTSTATUS Status; - - Status = SampSetObjectAttribute(AliasObject, - L"Name", - REG_SZ, - Buffer->Name.Name.Buffer, - Buffer->Name.Name.Length + sizeof(WCHAR)); - - return Status; -} - -static NTSTATUS -SampSetAliasAdminComment(PSAM_DB_OBJECT AliasObject, - PSAMPR_ALIAS_INFO_BUFFER Buffer) -{ - NTSTATUS Status; - - Status = SampSetObjectAttribute(AliasObject, - L"Description", - REG_SZ, - Buffer->AdminComment.AdminComment.Buffer, - Buffer->AdminComment.AdminComment.Length + sizeof(WCHAR)); - - return Status; -} - /* Function 29 */ NTSTATUS NTAPI @@ -1855,13 +2649,19 @@ switch (AliasInformationClass) { case AliasNameInformation: - Status = SampSetAliasName(AliasObject, - Buffer); + Status = SampSetObjectAttribute(AliasObject, + L"Name", + REG_SZ, + Buffer->Name.Name.Buffer, + Buffer->Name.Name.Length + sizeof(WCHAR)); break; case AliasAdminCommentInformation: - Status = SampSetAliasAdminComment(AliasObject, - Buffer); + Status = SampSetObjectAttribute(AliasObject, + L"Description", + REG_SZ, + Buffer->AdminComment.AdminComment.Buffer, + Buffer->AdminComment.AdminComment.Length + sizeof(WCHAR)); break; default: @@ -2166,6 +2966,15 @@ return STATUS_NOT_IMPLEMENTED; } +static +NTSTATUS +SampQueryUserName(PSAM_DB_OBJECT UserObject, + PSAMPR_USER_INFO_BUFFER *Buffer) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + /* Function 36 */ NTSTATUS NTAPI @@ -2173,8 +2982,52 @@ IN USER_INFORMATION_CLASS UserInformationClass, OUT PSAMPR_USER_INFO_BUFFER *Buffer) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT UserObject; + ACCESS_MASK DesiredAccess; + NTSTATUS Status; + + TRACE("SamrQueryInformationUser(%p %lu %p)\n", + UserHandle, UserInformationClass, Buffer); + + switch (UserInformationClass) + { + case UserGeneralInformation: + case UserNameInformation: + case UserAccountNameInformation: + case UserFullNameInformation: + case UserPrimaryGroupInformation: + case UserAdminCommentInformation: + DesiredAccess = USER_READ_GENERAL; + break; + + + default: + return STATUS_INVALID_INFO_CLASS; + } + + /* Validate the domain handle */ + Status = SampValidateDbObject(UserHandle, + SamDbUserObject, + DesiredAccess, + &UserObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + switch (UserInformationClass) + { + case UserNameInformation: + Status = SampQueryUserName(UserObject, + Buffer); + break; + + default: + Status = STATUS_INVALID_INFO_CLASS; + } + + return Status; } /* Function 37 */ Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Sun Jul 1 16:51:10 2012 @@ -12,6 +12,7 @@ #include <windows.h> #define NTOS_MODE_USER #include <ndk/cmfuncs.h> +#include <ndk/kefuncs.h> #include <ndk/obfuncs.h> #include <ndk/rtlfuncs.h> #include <ndk/umtypes.h> @@ -49,6 +50,28 @@ } SAM_DB_OBJECT, *PSAM_DB_OBJECT; #define SAMP_DB_SIGNATURE 0x87654321 + +typedef struct _SAM_DOMAIN_FIXED_DATA +{ + ULONG Version; + ULONG Reserved; + LARGE_INTEGER CreationTime; + LARGE_INTEGER DomainModifiedCount; + LARGE_INTEGER MaxPasswordAge; + LARGE_INTEGER MinPasswordAge; + LARGE_INTEGER ForceLogoff; + LARGE_INTEGER LockoutDuration; + LARGE_INTEGER LockoutObservationWindow; + LARGE_INTEGER ModifiedCountAtLastPromotion; + ULONG NextRid; + ULONG PasswordProperties; + USHORT MinPasswordLength; + USHORT PasswordHistoryLength; + USHORT LockoutThreshold; + DOMAIN_SERVER_ENABLE_STATE DomainServerState; + DOMAIN_SERVER_ROLE DomainServerRole; + BOOLEAN UasCompatibilityRequired; +} SAM_DOMAIN_FIXED_DATA, *PSAM_DOMAIN_FIXED_DATA; /* database.c */ 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] Sun Jul 1 16:51:10 2012 @@ -277,6 +277,8 @@ IN PSID lpDomainSid, OUT PHKEY lpDomainKey) { + SAM_DOMAIN_FIXED_DATA FixedData; + LPWSTR lpEmptyString = L""; DWORD dwDisposition; HKEY hDomainKey = NULL; HKEY hAliasesKey = NULL; @@ -286,6 +288,26 @@ if (lpDomainKey != NULL) *lpDomainKey = NULL; + + /* Initialize the fixed domain data */ + memset(&FixedData, 0, sizeof(SAM_DOMAIN_FIXED_DATA)); + FixedData.Version = 1; + NtQuerySystemTime(&FixedData.CreationTime); + FixedData.DomainModifiedCount.QuadPart = 0; +// FixedData.MaxPasswordAge // 6 Weeks + FixedData.MinPasswordAge.QuadPart = 0; // Now +// FixedData.ForceLogoff +// FixedData.LockoutDuration // 30 minutes +// FixedData.LockoutObservationWindow // 30 minutes + FixedData.ModifiedCountAtLastPromotion.QuadPart = 0; + FixedData.NextRid = 1000; + FixedData.PasswordProperties = 0; + FixedData.MinPasswordLength = 0; + FixedData.PasswordHistoryLength = 0; + FixedData.LockoutThreshold = 0; + FixedData.DomainServerState = DomainServerEnabled; + FixedData.DomainServerRole = DomainServerRolePrimary; + FixedData.UasCompatibilityRequired = TRUE; if (RegCreateKeyExW(hDomainsKey, lpKeyName, @@ -298,6 +320,15 @@ &dwDisposition)) return FALSE; + /* Set the fixed data value */ + if (RegSetValueEx(hDomainKey, + L"F", + 0, + REG_BINARY, + (LPVOID)&FixedData, + sizeof(SAM_DOMAIN_FIXED_DATA))) + return FALSE; + if (lpDomainSid != NULL) { RegSetValueEx(hDomainKey, @@ -314,6 +345,20 @@ (LPVOID)lpDomainSid, RtlLengthSid(lpDomainSid)); } + + RegSetValueEx(hDomainKey, + L"OemInformation", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hDomainKey, + L"ReplicaSourceNodeName", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); /* Create the Alias container */ if (!RegCreateKeyExW(hDomainKey, @@ -507,22 +552,22 @@ { SampCreateAliasAccount(hDomainKey, L"Administrators", - L"", + L"Testabc1234567890", DOMAIN_ALIAS_RID_ADMINS); SampCreateAliasAccount(hDomainKey, L"Users", - L"", + L"Users Group", DOMAIN_ALIAS_RID_USERS); SampCreateAliasAccount(hDomainKey, L"Guests", - L"", + L"Guests Group", DOMAIN_ALIAS_RID_GUESTS); SampCreateAliasAccount(hDomainKey, L"Power Users", - L"", + L"Power Users Group", DOMAIN_ALIAS_RID_POWER_USERS); 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] Sun Jul 1 16:51:10 2012 @@ -219,6 +219,18 @@ DomainLockoutInformation, DomainModifiedInformation2 } DOMAIN_INFORMATION_CLASS; + +typedef enum _DOMAIN_SERVER_ENABLE_STATE +{ + DomainServerEnabled = 1, + DomainServerDisabled +} DOMAIN_SERVER_ENABLE_STATE, *PDOMAIN_SERVER_ENABLE_STATE; + +typedef enum _DOMAIN_SERVER_ROLE +{ + DomainServerRoleBackup = 2, + DomainServerRolePrimary +} DOMAIN_SERVER_ROLE, *PDOMAIN_SERVER_ROLE; typedef struct _DOMAIN_NAME_INFORMATION { @@ -386,6 +398,11 @@ NTSTATUS NTAPI +SamRemoveMemberFromAlias(IN SAM_HANDLE AliasHandle, + IN PSID MemberId); + +NTSTATUS +NTAPI SamSetInformationAlias(IN SAM_HANDLE AliasHandle, IN ALIAS_INFORMATION_CLASS AliasInformationClass, IN PVOID Buffer); 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] Sun Jul 1 16:51:10 2012 @@ -135,22 +135,26 @@ unsigned long PasswordProperties; } USER_DOMAIN_PASSWORD_INFORMATION, *PUSER_DOMAIN_PASSWORD_INFORMATION; +cpp_quote("#ifndef _NTSAM_") typedef enum _DOMAIN_SERVER_ENABLE_STATE { DomainServerEnabled = 1, DomainServerDisabled } DOMAIN_SERVER_ENABLE_STATE, *PDOMAIN_SERVER_ENABLE_STATE; +cpp_quote("#endif") typedef struct _DOMAIN_STATE_INFORMATION { DOMAIN_SERVER_ENABLE_STATE DomainServerState; } DOMAIN_STATE_INFORMATION, *PDOMAIN_STATE_INFORMATION; +cpp_quote("#ifndef _NTSAM_") typedef enum _DOMAIN_SERVER_ROLE { DomainServerRoleBackup = 2, DomainServerRolePrimary = 3 } DOMAIN_SERVER_ROLE, *PDOMAIN_SERVER_ROLE; +cpp_quote("#endif") cpp_quote("#ifndef _NTSECAPI_H") typedef struct _DOMAIN_PASSWORD_INFORMATION

1 0

[ekohl] 56817: [USETUP] Fix a little layout issue.
by ekohl＠svn.reactos.org 01 Jul '12

01 Jul '12

Author: ekohl Date: Sun Jul 1 15:55:14 2012 New Revision: 56817 URL: http://svn.reactos.org/svn/reactos?rev=56817&view=rev Log: [USETUP] Fix a little layout issue. Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Sun Jul 1 15:55:14 2012 @@ -28,7 +28,7 @@ TEXT_STYLE_NORMAL }, { - 8, + 11, 11, "wollen. Dann drcken Sie ENTER.", TEXT_STYLE_NORMAL

1 0

[tkreuzer] 56816: [WIN32K] - Implement SURFACE_vSetPalette and use it everywhere to set the palette for a surface. Make SURFACE::ppal const, so noone accidentally modifies it without properly handl...
by tkreuzer＠svn.reactos.org 01 Jul '12

01 Jul '12

Author: tkreuzer Date: Sun Jul 1 13:43:33 2012 New Revision: 56816 URL: http://svn.reactos.org/svn/reactos?rev=56816&view=rev Log: [WIN32K] - Implement SURFACE_vSetPalette and use it everywhere to set the palette for a surface. Make SURFACE::ppal const, so noone accidentally modifies it without properly handling the references. Modified: trunk/reactos/win32ss/gdi/eng/surface.c trunk/reactos/win32ss/gdi/eng/surface.h trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/surface.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] Sun Jul 1 13:43:33 2012 @@ -267,8 +267,7 @@ } /* Assign a default palette and increment its reference count */ - psurf->ppal = appalSurfaceDefault[iFormat]; - GDIOBJ_vReferenceObjectByPointer(&psurf->ppal->BaseObject); + SURFACE_vSetPalette(psurf, appalSurfaceDefault[iFormat]); return psurf; } @@ -399,6 +398,7 @@ SURFOBJ *pso; PSURFACE psurf; PDEVOBJ* ppdev; + PPALETTE ppal; ppdev = (PDEVOBJ*)hdev; @@ -418,8 +418,10 @@ psurf->flags &= ~HOOK_FLAGS; psurf->flags |= (flHooks & HOOK_FLAGS); - /* Get palette */ - psurf->ppal = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault); + /* Assign the PDEV's palette */ + ppal = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault); + SURFACE_vSetPalette(psurf, ppal); + PALETTE_ShareUnlockPalette(ppal); SURFACE_ShareUnlockSurface(psurf); @@ -441,6 +443,7 @@ SURFOBJ *pso; PSURFACE psurf; PDEVOBJ* ppdev; + PPALETTE ppal; psurf = SURFACE_ShareLockSurface(hsurf); if (psurf == NULL) @@ -462,8 +465,10 @@ psurf->flags &= ~HOOK_FLAGS; psurf->flags |= (flHooks & HOOK_FLAGS); - /* Get palette */ - psurf->ppal = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault); + /* Assign the PDEV's palette */ + ppal = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault); + SURFACE_vSetPalette(psurf, ppal); + PALETTE_ShareUnlockPalette(ppal); SURFACE_ShareUnlockSurface(psurf); Modified: trunk/reactos/win32ss/gdi/eng/surface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/surface.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/surface.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/surface.h [iso-8859-1] Sun Jul 1 13:43:33 2012 @@ -10,7 +10,7 @@ SURFOBJ SurfObj; //XDCOBJ * pdcoAA; FLONG flags; - struct _PALETTE *ppal; + struct _PALETTE * const ppal; // Use SURFACE_vSetPalette to assign a palette //UINT unk_050; union @@ -123,3 +123,17 @@ _In_ ULONG fjBitmap, _In_opt_ ULONG cjWidth, _In_opt_ PVOID pvBits); + +VOID +FORCEINLINE +SURFACE_vSetPalette( + _Inout_ PSURFACE psurf, + _In_ PPALETTE ppal) +{ + if (psurf->ppal) + GDIOBJ_vDereferenceObject((POBJ)psurf->ppal); + if (ppal) + GDIOBJ_vReferenceObjectByPointer((POBJ)ppal); + *(PVOID*)&psurf->ppal = ppal; +} + Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitmaps.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] Sun Jul 1 13:43:33 2012 @@ -223,6 +223,7 @@ INT Height) { HBITMAP Bmp = NULL; + PPALETTE ppal; /* MS doc says if width or height is 0, return 1-by-1 pixel, monochrome bitmap */ if (0 == Width || 0 == Height) @@ -241,8 +242,13 @@ NULL); psurf = SURFACE_ShareLockSurface(Bmp); ASSERT(psurf); - /* Set palette */ - psurf->ppal = PALETTE_ShareLockPalette(Dc->ppdev->devinfo.hpalDefault); + + /* Dereference old palette and set new palette */ + ppal = PALETTE_ShareLockPalette(Dc->ppdev->devinfo.hpalDefault); + ASSERT(ppal); + SURFACE_vSetPalette(psurf, ppal); + PALETTE_ShareUnlockPalette(ppal); + /* Set flags */ psurf->flags = API_BITMAP; psurf->hdc = NULL; // FIXME: @@ -266,9 +272,10 @@ NULL); psurfBmp = SURFACE_ShareLockSurface(Bmp); ASSERT(psurfBmp); - /* Assign palette */ - psurfBmp->ppal = psurf->ppal; - GDIOBJ_vReferenceObjectByPointer((POBJ)psurf->ppal); + + /* Dereference old palette and set new palette */ + SURFACE_vSetPalette(psurfBmp, psurf->ppal); + /* Set flags */ psurfBmp->flags = API_BITMAP; psurfBmp->hdc = NULL; // FIXME: @@ -622,12 +629,9 @@ psurfSrc->SurfObj.pvBits, psurfNew->SurfObj.cjBits); - /* Dereference the new bitmaps palette, we will use a different */ - GDIOBJ_vDereferenceObject(&psurfNew->ppal->BaseObject); /* Reference the palette of the source bitmap and use it */ - GDIOBJ_vReferenceObjectByPointer(&psurfSrc->ppal->BaseObject); - psurfNew->ppal = psurfSrc->ppal; + SURFACE_vSetPalette(psurfNew, psurfSrc->ppal); /* Unlock the new surface */ SURFACE_ShareUnlockSurface(psurfNew); Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Sun Jul 1 13:43:33 2012 @@ -1599,8 +1599,8 @@ ppalDIB = CreateDIBPalette(bmi, dc, usage); if (ppalDIB) { - if (bmp->ppal) PALETTE_ShareUnlockPalette(bmp->ppal); - bmp->ppal = ppalDIB; + SURFACE_vSetPalette(bmp, ppalDIB); + PALETTE_ShareUnlockPalette(ppalDIB); } // Clean up in case of errors

1 0

[ekohl] 56815: [SAMSRV] SamrSetInformationUser: Implement most information classes.
by ekohl＠svn.reactos.org 30 Jun '12

30 Jun '12

Author: ekohl Date: Sat Jun 30 21:10:39 2012 New Revision: 56815 URL: http://svn.reactos.org/svn/reactos?rev=56815&view=rev Log: [SAMSRV] SamrSetInformationUser: Implement most information classes. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sat Jun 30 21:10:39 2012 @@ -2177,27 +2177,6 @@ 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 @@ -2206,15 +2185,40 @@ IN PSAMPR_USER_INFO_BUFFER Buffer) { PSAM_DB_OBJECT UserObject; + ACCESS_MASK DesiredAccess; NTSTATUS Status; TRACE("SamrSetInformationUser(%p %lu %p)\n", UserHandle, UserInformationClass, Buffer); + + switch (UserInformationClass) + { + case UserNameInformation: + case UserAccountNameInformation: + case UserFullNameInformation: + case UserPrimaryGroupInformation: + case UserHomeInformation: + case UserScriptInformation: + case UserProfileInformation: + case UserAdminCommentInformation: + case UserWorkStationsInformation: + case UserControlInformation: + case UserExpiresInformation: + DesiredAccess = USER_WRITE_ACCOUNT; + break; + + case UserSetPasswordInformation: + DesiredAccess = USER_FORCE_PASSWORD_CHANGE; + break; + + default: + return STATUS_INVALID_INFO_CLASS; + } /* Validate the domain handle */ Status = SampValidateDbObject(UserHandle, SamDbUserObject, - USER_FORCE_PASSWORD_CHANGE, + DesiredAccess, &UserObject); if (!NT_SUCCESS(Status)) { @@ -2224,14 +2228,135 @@ switch (UserInformationClass) { +// case UserGeneralInformation: +// case UserPreferencesInformation: +// case UserLogonHoursInformation: + + case UserNameInformation: + Status = SampSetObjectAttribute(UserObject, + L"Name", + REG_SZ, + Buffer->Name.UserName.Buffer, + Buffer->Name.UserName.MaximumLength); + if (!NT_SUCCESS(Status)) + break; + + Status = SampSetObjectAttribute(UserObject, + L"FullName", + REG_SZ, + Buffer->Name.FullName.Buffer, + Buffer->Name.FullName.MaximumLength); + break; + + case UserAccountNameInformation: + Status = SampSetObjectAttribute(UserObject, + L"Name", + REG_SZ, + Buffer->AccountName.UserName.Buffer, + Buffer->AccountName.UserName.MaximumLength); + break; + + case UserFullNameInformation: + Status = SampSetObjectAttribute(UserObject, + L"FullName", + REG_SZ, + Buffer->FullName.FullName.Buffer, + Buffer->FullName.FullName.MaximumLength); + break; + + case UserPrimaryGroupInformation: + Status = SampSetObjectAttribute(UserObject, + L"PrimaryGroupId", + REG_DWORD, + &Buffer->PrimaryGroup.PrimaryGroupId, + sizeof(ULONG)); + break; + + case UserHomeInformation: + Status = SampSetObjectAttribute(UserObject, + L"HomeDirectory", + REG_SZ, + Buffer->Home.HomeDirectory.Buffer, + Buffer->Home.HomeDirectory.MaximumLength); + if (!NT_SUCCESS(Status)) + break; + + Status = SampSetObjectAttribute(UserObject, + L"HomeDirectoryDrive", + REG_SZ, + Buffer->Home.HomeDirectoryDrive.Buffer, + Buffer->Home.HomeDirectoryDrive.MaximumLength); + break; + + case UserScriptInformation: + Status = SampSetObjectAttribute(UserObject, + L"ScriptPath", + REG_SZ, + Buffer->Script.ScriptPath.Buffer, + Buffer->Script.ScriptPath.MaximumLength); + break; + + case UserProfileInformation: + Status = SampSetObjectAttribute(UserObject, + L"ProfilePath", + REG_SZ, + Buffer->Profile.ProfilePath.Buffer, + Buffer->Profile.ProfilePath.MaximumLength); + break; + + case UserAdminCommentInformation: + Status = SampSetObjectAttribute(UserObject, + L"AdminComment", + REG_SZ, + Buffer->AdminComment.AdminComment.Buffer, + Buffer->AdminComment.AdminComment.MaximumLength); + break; + + case UserWorkStationsInformation: + Status = SampSetObjectAttribute(UserObject, + L"WorkStations", + REG_SZ, + Buffer->WorkStations.WorkStations.Buffer, + Buffer->WorkStations.WorkStations.MaximumLength); + break; + case UserSetPasswordInformation: - Status = SampSetPasswordInformation(UserObject, - (PSAMPR_USER_SET_PASSWORD_INFORMATION)Buffer); - break; + TRACE("Password: %S\n", Buffer->SetPassword.Password.Buffer); + TRACE("PasswordExpired: %d\n", Buffer->SetPassword.PasswordExpired); + + Status = SampSetObjectAttribute(UserObject, + L"Password", + REG_SZ, + Buffer->SetPassword.Password.Buffer, + Buffer->SetPassword.Password.MaximumLength); + break; + + case UserControlInformation: + Status = SampSetObjectAttribute(UserObject, + L"UserAccountControl", + REG_DWORD, + &Buffer->Control.UserAccountControl, + sizeof(ULONG)); + break; + + case UserExpiresInformation: + Status = SampSetObjectAttribute(UserObject, + L"AccountExpires", + REG_BINARY, + &Buffer->Expires.AccountExpires, + sizeof(OLD_LARGE_INTEGER)); + break; + +// case UserInternal1Information: +// case UserParametersInformation: +// case UserAllInformation: +// case UserInternal4Information: +// case UserInternal5Information: +// case UserInternal4InformationNew: +// case UserInternal5InformationNew: default: Status = STATUS_INVALID_INFO_CLASS; - break; } return Status;

1 0

[ekohl] 56814: [DDK] - Add generic rights for aliases, domains, SAM server and users. - Add generic and specific rights for groups.
by ekohl＠svn.reactos.org 30 Jun '12

30 Jun '12

Author: ekohl Date: Sat Jun 30 14:16:38 2012 New Revision: 56814 URL: http://svn.reactos.org/svn/reactos?rev=56814&view=rev Log: [DDK] - Add generic rights for aliases, domains, SAM server and users. - Add generic and specific rights for groups. Modified: trunk/reactos/include/ddk/ntsam.h 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] Sat Jun 30 14:16:38 2012 @@ -6,42 +6,162 @@ extern "C" { #endif -#define ALIAS_ADD_MEMBER 1 -#define ALIAS_REMOVE_MEMBER 2 -#define ALIAS_LIST_MEMBERS 4 -#define ALIAS_READ_INFORMATION 8 -#define ALIAS_WRITE_ACCOUNT 16 - -#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 -#define SAM_SERVER_INITIALIZE 4 -#define SAM_SERVER_CREATE_DOMAIN 8 -#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 +#define ALIAS_ADD_MEMBER 0x00000001 +#define ALIAS_REMOVE_MEMBER 0x00000002 +#define ALIAS_LIST_MEMBERS 0x00000004 +#define ALIAS_READ_INFORMATION 0x00000008 +#define ALIAS_WRITE_ACCOUNT 0x00000010 + +#define ALIAS_READ (STANDARD_RIGHTS_READ |\ + ALIAS_LIST_MEMBERS) + +#define ALIAS_WRITE (STANDARD_RIGHTS_WRITE |\ + ALIAS_ADD_MEMBER |\ + ALIAS_REMOVE_MEMBER |\ + ALIAS_WRITE_ACCOUNT) + +#define ALIAS_EXECUTE (STANDARD_RIGHTS_EXECUTE |\ + ALIAS_READ_INFORMATION) + +#define ALIAS_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED |\ + ALIAS_ADD_MEMBER |\ + ALIAS_REMOVE_MEMBER |\ + ALIAS_LIST_MEMBERS |\ + ALIAS_READ_INFORMATION |\ + ALIAS_WRITE_ACCOUNT) + +#define DOMAIN_READ_PASSWORD_PARAMETERS 0x00000001 +#define DOMAIN_WRITE_PASSWORD_PARAMS 0x00000002 +#define DOMAIN_READ_OTHER_PARAMETERS 0x00000004 +#define DOMAIN_WRITE_OTHER_PARAMETERS 0x00000008 +#define DOMAIN_CREATE_USER 0x00000010 +#define DOMAIN_CREATE_GROUP 0x00000020 +#define DOMAIN_CREATE_ALIAS 0x00000040 +#define DOMAIN_GET_ALIAS_MEMBERSHIP 0x00000080 +#define DOMAIN_LIST_ACCOUNTS 0x00000100 +#define DOMAIN_LOOKUP 0x00000200 +#define DOMAIN_ADMINISTER_SERVER 0x00000400 + +#define DOMAIN_READ (STANDARD_RIGHTS_READ |\ + DOMAIN_READ_OTHER_PARAMETERS |\ + DOMAIN_GET_ALIAS_MEMBERSHIP) + +#define DOMAIN_WRITE (STANDARD_RIGHTS_WRITE |\ + DOMAIN_WRITE_PASSWORD_PARAMS |\ + DOMAIN_WRITE_OTHER_PARAMETERS |\ + DOMAIN_CREATE_USER |\ + DOMAIN_CREATE_GROUP |\ + DOMAIN_CREATE_ALIAS |\ + DOMAIN_ADMINISTER_SERVER) + +#define DOMAIN_EXECUTE (STANDARD_RIGHTS_EXECUTE |\ + DOMAIN_READ_PASSWORD_PARAMETERS |\ + DOMAIN_LIST_ACCOUNTS |\ + DOMAIN_LOOKUP) + +#define DOMAIN_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED |\ + DOMAIN_READ_PASSWORD_PARAMETERS |\ + DOMAIN_WRITE_PASSWORD_PARAMS |\ + DOMAIN_READ_OTHER_PARAMETERS |\ + DOMAIN_WRITE_OTHER_PARAMETERS |\ + DOMAIN_CREATE_USER |\ + DOMAIN_CREATE_GROUP |\ + DOMAIN_CREATE_ALIAS |\ + DOMAIN_GET_ALIAS_MEMBERSHIP |\ + DOMAIN_LIST_ACCOUNTS |\ + DOMAIN_LOOKUP |\ + DOMAIN_ADMINISTER_SERVER) + +#define GROUP_READ_INFORMATION 0x00000001 +#define GROUP_WRITE_ACCOUNT 0x00000002 +#define GROUP_ADD_MEMBER 0x00000004 +#define GROUP_REMOVE_MEMBER 0x00000008 +#define GROUP_LIST_MEMBERS 0x00000010 + +#define GROUP_READ (STANDARD_RIGHTS_READ |\ + GROUP_LIST_MEMBERS) + +#define GROUP_WRITE (STANDARD_RIGHTS_WRITE |\ + GROUP_WRITE_ACCOUNT |\ + GROUP_ADD_MEMBER |\ + GROUP_REMOVE_MEMBER) + +#define GROUP_EXECUTE (STANDARD_RIGHTS_EXECUTE |\ + GROUP_READ_INFORMATION) + +#define GROUP_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED |\ + GROUP_READ_INFORMATION |\ + GROUP_WRITE_ACCOUNT |\ + GROUP_ADD_MEMBER |\ + GROUP_REMOVE_MEMBER |\ + GROUP_LIST_MEMBERS) + +#define SAM_SERVER_CONNECT 0x00000001 +#define SAM_SERVER_SHUTDOWN 0x00000002 +#define SAM_SERVER_INITIALIZE 0x00000004 +#define SAM_SERVER_CREATE_DOMAIN 0x00000008 +#define SAM_SERVER_ENUMERATE_DOMAINS 0x00000010 +#define SAM_SERVER_LOOKUP_DOMAIN 0x00000020 + +#define SAM_SERVER_READ (STANDARD_RIGHTS_READ |\ + SAM_SERVER_ENUMERATE_DOMAINS) + +#define SAM_SERVER_WRITE (STANDARD_RIGHTS_WRITE |\ + SAM_SERVER_SHUTDOWN |\ + SAM_SERVER_INITIALIZE |\ + SAM_SERVER_CREATE_DOMAIN) + +#define SAM_SERVER_EXECUTE (STANDARD_RIGHTS_EXECUTE |\ + SAM_SERVER_CONNECT |\ + SAM_SERVER_LOOKUP_DOMAIN) + +#define SAM_SERVER_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED |\ + SAM_SERVER_CONNECT |\ + SAM_SERVER_SHUTDOWN |\ + SAM_SERVER_INITIALIZE |\ + SAM_SERVER_CREATE_DOMAIN |\ + SAM_SERVER_ENUMERATE_DOMAINS |\ + SAM_SERVER_LOOKUP_DOMAIN) + +#define USER_READ_GENERAL 0x00000001 +#define USER_READ_PREFERENCES 0x00000002 +#define USER_WRITE_PREFERENCES 0x00000004 +#define USER_READ_LOGON 0x00000008 +#define USER_READ_ACCOUNT 0x00000010 +#define USER_WRITE_ACCOUNT 0x00000020 +#define USER_CHANGE_PASSWORD 0x00000040 +#define USER_FORCE_PASSWORD_CHANGE 0x00000080 +#define USER_LIST_GROUPS 0x00000100 +#define USER_READ_GROUP_INFORMATION 0x00000200 +#define USER_WRITE_GROUP_INFORMATION 0x00000400 + +#define USER_READ (STANDARD_RIGHTS_READ |\ + USER_READ_PREFERENCES |\ + USER_READ_LOGON |\ + USER_READ_ACCOUNT |\ + USER_LIST_GROUPS |\ + USER_READ_GROUP_INFORMATION) + +#define USER_WRITE (STANDARD_RIGHTS_WRITE |\ + USER_WRITE_PREFERENCES |\ + USER_CHANGE_PASSWORD) + +#define USER_EXECUTE (STANDARD_RIGHTS_EXECUTE |\ + USER_READ_GENERAL |\ + USER_CHANGE_PASSWORD) + +#define USER_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED |\ + USER_READ_GENERAL |\ + USER_READ_PREFERENCES |\ + USER_WRITE_PREFERENCES |\ + USER_READ_LOGON |\ + USER_READ_ACCOUNT |\ + USER_WRITE_ACCOUNT |\ + USER_CHANGE_PASSWORD |\ + USER_FORCE_PASSWORD_CHANGE |\ + USER_LIST_GROUPS |\ + USER_READ_GROUP_INFORMATION |\ + USER_WRITE_GROUP_INFORMATION) typedef PVOID SAM_HANDLE, *PSAM_HANDLE; typedef ULONG SAM_ENUMERATE_HANDLE, *PSAM_ENUMERATE_HANDLE;

1 0

[tkreuzer] 56813: [CRT] Add startup code to CRT
by tkreuzer＠svn.reactos.org 30 Jun '12

30 Jun '12

Author: tkreuzer Date: Sat Jun 30 14:04:19 2012 New Revision: 56813 URL: http://svn.reactos.org/svn/reactos?rev=56813&view=rev Log: [CRT] Add startup code to CRT Modified: trunk/reactos/lib/sdk/crt/crt.cmake Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Sat Jun 30 14:04:19 2012 @@ -175,6 +175,32 @@ search/lsearch.c signal/signal.c signal/xcptinfo.c + startup/crtexe.c + startup/wcrtexe.c + startup/crt_handler.c + startup/crtdll.c + startup/_newmode.c + startup/wildcard.c + startup/tlssup.c + startup/mingw_helpers.c + startup/natstart.c + startup/charmax.c + startup/merr.c + startup/atonexit.c + startup/txtmode.c + startup/pesect.c + startup/tlsmcrt.c + startup/tlsthrd.c + startup/tlsmthread.c + startup/cinitexe.c + startup/gs_support.c + startup/dll_argv.c + startup/dllargv.c + startup/wdllargv.c + startup/crt0_c.c + startup/crt0_w.c + startup/dllentry.c + startup/reactos.c stdio/_flsbuf.c stdio/_flswbuf.c stdio/access.c

1 0

[spetreolle] 56812: [ROSAPPS] Add notevil, ctm, kill and tlist to build. Patch by Hermes Belusca. Bug 7150.
by spetreolle＠svn.reactos.org 30 Jun '12

30 Jun '12

Author: spetreolle Date: Sat Jun 30 11:33:33 2012 New Revision: 56812 URL: http://svn.reactos.org/svn/reactos?rev=56812&view=rev Log: [ROSAPPS] Add notevil, ctm, kill and tlist to build. Patch by Hermes Belusca. Bug 7150. Added: trunk/rosapps/applications/notevil/CMakeLists.txt (with props) trunk/rosapps/applications/sysutils/CMakeLists.txt (with props) trunk/rosapps/applications/sysutils/ctm/CMakeLists.txt (with props) trunk/rosapps/applications/sysutils/kill/CMakeLists.txt (with props) trunk/rosapps/applications/sysutils/tlist/CMakeLists.txt (with props) Modified: trunk/rosapps/applications/CMakeLists.txt Modified: trunk/rosapps/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/CMakeLists.tx… ============================================================================== --- trunk/rosapps/applications/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/CMakeLists.txt [iso-8859-1] Sat Jun 30 11:33:33 2012 @@ -2,7 +2,7 @@ #add_subdirectory(devutils) #add_subdirectory(fraginator) #add_subdirectory(net) -#add_subdirectory(notevil) +add_subdirectory(notevil) add_subdirectory(screensavers) -#add_subdirectory(sysutils) -#add_subdirectory(winfile) +add_subdirectory(sysutils) +#add_subdirectory(winfile) Added: trunk/rosapps/applications/notevil/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/notevil/CMake… ============================================================================== --- trunk/rosapps/applications/notevil/CMakeLists.txt (added) +++ trunk/rosapps/applications/notevil/CMakeLists.txt [iso-8859-1] Sat Jun 30 11:33:33 2012 @@ -1,0 +1,5 @@ + +add_executable(notevil notevil.c notevil.rc) +set_module_type(notevil win32cui) +add_importlibs(notevil user32 msvcrt kernel32) +add_cd_file(TARGET notevil DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/notevil/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/sysutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/CMak… ============================================================================== --- trunk/rosapps/applications/sysutils/CMakeLists.txt (added) +++ trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] Sat Jun 30 11:33:33 2012 @@ -1,0 +1,17 @@ +#add_subdirectory(chkdsk) +#add_subdirectory(chklib) +add_subdirectory(ctm) +#add_subdirectory(gettype) +add_subdirectory(kill) +#add_subdirectory(logevent) +#add_subdirectory(lsdd) +#add_subdirectory(man) +#add_subdirectory(mkdosfs) +#add_subdirectory(pedump) +#add_subdirectory(regexpl) +#add_subdirectory(rosddt) +#add_subdirectory(screenshot) +#add_subdirectory(systeminfo) +#add_subdirectory(tcat) +add_subdirectory(tlist) +#add_subdirectory(utils) Propchange: trunk/rosapps/applications/sysutils/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/sysutils/ctm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/ctm/… ============================================================================== --- trunk/rosapps/applications/sysutils/ctm/CMakeLists.txt (added) +++ trunk/rosapps/applications/sysutils/ctm/CMakeLists.txt [iso-8859-1] Sat Jun 30 11:33:33 2012 @@ -1,0 +1,6 @@ + +add_executable(ctm ctm.c ctm.rc) +set_module_type(ctm win32cui UNICODE) +target_link_libraries(ctm epsapi) +add_importlibs(ctm ntdll user32 msvcrt kernel32) +add_cd_file(TARGET ctm DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/sysutils/ctm/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/sysutils/kill/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/kill… ============================================================================== --- trunk/rosapps/applications/sysutils/kill/CMakeLists.txt (added) +++ trunk/rosapps/applications/sysutils/kill/CMakeLists.txt [iso-8859-1] Sat Jun 30 11:33:33 2012 @@ -1,0 +1,5 @@ + +add_executable(kill kill.c kill.rc) +set_module_type(kill win32cui) +add_importlibs(kill ntdll user32 msvcrt kernel32) +add_cd_file(TARGET kill DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/sysutils/kill/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/sysutils/tlist/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/tlis… ============================================================================== --- trunk/rosapps/applications/sysutils/tlist/CMakeLists.txt (added) +++ trunk/rosapps/applications/sysutils/tlist/CMakeLists.txt [iso-8859-1] Sat Jun 30 11:33:33 2012 @@ -1,0 +1,6 @@ + +add_executable(tlist tlist.c tlist.rc) +set_module_type(tlist win32cui) +target_link_libraries(tlist epsapi getopt) +add_importlibs(tlist ntdll user32 msvcrt kernel32) +add_cd_file(TARGET tlist DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/sysutils/tlist/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 56811: [PSDK/DDK] Add definitions for BitScanForward64
by tkreuzer＠svn.reactos.org 30 Jun '12

30 Jun '12

Author: tkreuzer Date: Sat Jun 30 11:19:28 2012 New Revision: 56811 URL: http://svn.reactos.org/svn/reactos?rev=56811&view=rev Log: [PSDK/DDK] Add definitions for BitScanForward64 Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/xdk/interlocked.h Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5681… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sat Jun 30 11:19:28 2012 @@ -264,6 +264,8 @@ #define InterlockedBitTestAndReset _interlockedbittestandreset #ifdef _M_AMD64 +#define BitScanForward64 _BitScanForward64 +#define BitScanReverse64 _BitScanReverse64 #define BitTest64 _bittest64 #define BitTestAndComplement64 _bittestandcomplement64 #define BitTestAndSet64 _bittestandset64 @@ -9757,6 +9759,7 @@ #define KeGetDcacheFillSize() 1L #define YieldProcessor _mm_pause +#define MemoryBarrier __faststorefence #define FastFence __faststorefence #define LoadFence _mm_lfence #define MemoryFence _mm_mfence @@ -10206,8 +10209,8 @@ } #endif +NTKERNELAPI DECLSPEC_NORETURN -NTKERNELAPI VOID NTAPI KeBugCheckEx( Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Jun 30 11:19:28 2012 @@ -5312,6 +5312,10 @@ #define BitScanForward _BitScanForward #define BitScanReverse _BitScanReverse +#ifdef _M_AMD64 +#define BitScanForward64 _BitScanForward64 +#define BitScanReverse64 _BitScanReverse64 +#endif /* TODO: Other architectures than X86 */ #if defined(_M_IX86) Modified: trunk/reactos/include/xdk/interlocked.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/interlocked.h?… ============================================================================== --- trunk/reactos/include/xdk/interlocked.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/interlocked.h [iso-8859-1] Sat Jun 30 11:19:28 2012 @@ -57,6 +57,8 @@ #define InterlockedBitTestAndReset _interlockedbittestandreset #ifdef _M_AMD64 +#define BitScanForward64 _BitScanForward64 +#define BitScanReverse64 _BitScanReverse64 #define BitTest64 _bittest64 #define BitTestAndComplement64 _bittestandcomplement64 #define BitTestAndSet64 _bittestandset64

1 0

[tfaber] 56810: [ADVAPI32_APITEST] - Use a define for the service name in QueryServiceConfig2 test. Patch by Hermes Belusca. Bug 7145. - Add LockDatabase test for Lock/UnlockServiceDatabase, QueryS...
by tfaber＠svn.reactos.org 29 Jun '12

29 Jun '12

Author: tfaber Date: Fri Jun 29 11:48:35 2012 New Revision: 56810 URL: http://svn.reactos.org/svn/reactos?rev=56810&view=rev Log: [ADVAPI32_APITEST] - Use a define for the service name in QueryServiceConfig2 test. Patch by Hermes Belusca. Bug 7145. - Add LockDatabase test for Lock/UnlockServiceDatabase, QueryServiceLockStatus. Patch by Hermes Belusca. Bug 7146. Added: trunk/rostests/apitests/advapi32/LockDatabase.c (with props) Modified: trunk/rostests/apitests/advapi32/CMakeLists.txt trunk/rostests/apitests/advapi32/QueryServiceConfig2.c trunk/rostests/apitests/advapi32/testlist.c Modified: trunk/rostests/apitests/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/CMakeLists.txt [iso-8859-1] Fri Jun 29 11:48:35 2012 @@ -1,6 +1,7 @@ list(APPEND SOURCE CreateService.c + LockDatabase.c QueryServiceConfig2.c testlist.c) Added: trunk/rostests/apitests/advapi32/LockDatabase.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/LockDat… ============================================================================== --- trunk/rostests/apitests/advapi32/LockDatabase.c (added) +++ trunk/rostests/apitests/advapi32/LockDatabase.c [iso-8859-1] Fri Jun 29 11:48:35 2012 @@ -1,0 +1,760 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Tests for Lock/UnlockServiceDatabase and QueryServiceLockStatusA/W + * PROGRAMMER: HermÃ¨s BÃLUSCA - MAÃTO + */ + +#include <wine/test.h> +#include <windows.h> +#include <strsafe.h> + +#define TESTING_SERVICE L"Spooler" + +static void Test_LockUnlockServiceDatabase(void) +{ + BOOL bError = FALSE; + + SC_HANDLE hScm = NULL; + SC_LOCK hLock = NULL; + + /* First of all, try to lock / unlock the services database with invalid handles */ + SetLastError(0xdeadbeef); + hScm = NULL; + hLock = LockServiceDatabase(hScm); + ok(hLock == NULL, "hLock = 0x%p, expected 0\n", hLock); + ok_err(ERROR_INVALID_HANDLE); + + SetLastError(0xdeadbeef); + hScm = (SC_HANDLE)0xdeadbeef; + hLock = LockServiceDatabase(hScm); + ok(hLock == NULL, "hLock = 0x%p, expected 0\n", hLock); + ok_err(ERROR_INVALID_HANDLE); + +/** This test seems to make this application crash on Windows 7... I do not know why... **/ + SetLastError(0xdeadbeef); + hLock = NULL; + bError = UnlockServiceDatabase(hLock); + ok(bError == FALSE, "bError = %u, expected FALSE\n", bError); + ok_err(ERROR_INVALID_SERVICE_LOCK); +/*****************************************************************************************/ + + SetLastError(0xdeadbeef); + hLock = (SC_LOCK)0xdeadbeef; + bError = UnlockServiceDatabase(hLock); + ok(bError == FALSE, "bError = %u, expected FALSE\n", bError); + ok_err(ERROR_INVALID_SERVICE_LOCK); + + + /* Then, try to lock the services database without having rights */ + SetLastError(0xdeadbeef); + hScm = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); + ok(hScm != NULL, "Failed to open service manager, error=0x%08lx\n", GetLastError()); + if (!hScm) + { + skip("No service control manager; cannot proceed with LockUnlockServiceDatabase test\n"); + goto cleanup; + } + ok_err(ERROR_SUCCESS); + + SetLastError(0xdeadbeef); + hLock = LockServiceDatabase(hScm); + ok(hLock == NULL, "hLock = 0x%p, expected 0\n", hLock); + ok_err(ERROR_ACCESS_DENIED); + + if (hLock) + UnlockServiceDatabase(hLock); + CloseServiceHandle(hScm); + + /* Try to lock the services database with good rights */ + SetLastError(0xdeadbeef); + hScm = OpenSCManagerW(NULL, NULL, SC_MANAGER_LOCK); + ok(hScm != NULL, "Failed to open service manager, error=0x%08lx\n", GetLastError()); + if (!hScm) + { + skip("No service control manager; cannot proceed with LockUnlockServiceDatabase test\n"); + goto cleanup; + } + ok_err(ERROR_SUCCESS); + + SetLastError(0xdeadbeef); + hLock = LockServiceDatabase(hScm); + ok(hLock != NULL, "hLock = 0x%p, expected non-zero\n", hLock); + ok_err(ERROR_SUCCESS); + + /* Now unlock it */ + if (hLock) + { + SetLastError(0xdeadbeef); + bError = UnlockServiceDatabase(hLock); + ok(bError == TRUE, "bError = %u, expected TRUE\n", bError); + ok_err(ERROR_SUCCESS); + } + + +cleanup: + if (hScm) + CloseServiceHandle(hScm); + + return; +} + +static void Test_LockUnlockServiceDatabaseWithServiceStart(void) +{ + BOOL bError = FALSE; + + SC_HANDLE hScm = NULL; + SC_HANDLE hSvc = NULL; + SC_LOCK hLock = NULL; + + LPQUERY_SERVICE_CONFIGW lpConfig = NULL; + DWORD dwRequiredSize = 0; + SERVICE_STATUS status; + BOOL bWasRunning = FALSE; + DWORD dwOldStartType = 0; + + /* Open the services database */ + SetLastError(0xdeadbeef); + hScm = OpenSCManagerW(NULL, NULL, SC_MANAGER_LOCK); + ok(hScm != NULL, "Failed to open service manager, error=0x%08lx\n", GetLastError()); + if (!hScm) + { + skip("No service control manager; cannot proceed with LockUnlockServiceDatabaseWithServiceStart test\n"); + goto cleanup; + } + ok_err(ERROR_SUCCESS); + + /* Grab a handle to the testing service */ + SetLastError(0xdeadbeef); + hSvc = OpenServiceW(hScm, TESTING_SERVICE, SERVICE_START | SERVICE_STOP | SERVICE_CHANGE_CONFIG | SERVICE_QUERY_CONFIG | SERVICE_QUERY_STATUS); + ok(hSvc != NULL, "hSvc = 0x%p, expected non-null, error=0x%08lx\n", hSvc, GetLastError()); + if (!hSvc) + { + skip("Cannot open a handle to service %S; cannot proceed with LockUnlockServiceDatabaseWithServiceStart test\n", TESTING_SERVICE); + goto cleanup; + } + ok_err(ERROR_SUCCESS); + + /* Lock the services database */ + SetLastError(0xdeadbeef); + hLock = LockServiceDatabase(hScm); + ok(hLock != NULL, "hLock = 0x%p, expected non-zero, error=0x%08lx\n", hLock, GetLastError()); + if (!hLock) + { + skip("Cannot lock the services database; cannot proceed with LockUnlockServiceDatabaseWithServiceStart test\n"); + goto cleanup; + } + ok_err(ERROR_SUCCESS); + + /* To proceed further, firstly attempt to stop the testing service */ + QueryServiceConfigW(hSvc, NULL, 0, &dwRequiredSize); + lpConfig = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwRequiredSize); + QueryServiceConfigW(hSvc, lpConfig, dwRequiredSize, &dwRequiredSize); + dwOldStartType = lpConfig->dwStartType; + HeapFree(GetProcessHeap(), 0, lpConfig); + if (dwOldStartType == SERVICE_DISABLED) + { + ChangeServiceConfigW(hSvc, + SERVICE_NO_CHANGE, + SERVICE_DEMAND_START, + SERVICE_NO_CHANGE, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL); + } + QueryServiceStatus(hSvc, &status); + bWasRunning = (status.dwCurrentState != SERVICE_STOPPED); + if (bWasRunning) + { + ControlService(hSvc, SERVICE_CONTROL_STOP, &status); + Sleep(1000); /* Wait 1 second for the service to stop */ + } + + /* Now try to start it (this test won't work under Windows Vista / 7 / 8) */ + SetLastError(0xdeadbeef); + bError = StartServiceW(hSvc, 0, NULL); + ok(bError == FALSE, "bError = %u, expected FALSE\n", bError); + ok_err(ERROR_SERVICE_DATABASE_LOCKED); + Sleep(1000); /* Wait 1 second for the service to start */ + + /* Stop the testing service */ + ControlService(hSvc, SERVICE_CONTROL_STOP, &status); + Sleep(1000); /* Wait 1 second for the service to stop */ + + /* Now unlock the services database */ + SetLastError(0xdeadbeef); + bError = UnlockServiceDatabase(hLock); + ok(bError == TRUE, "bError = %u, expected TRUE\n", bError); + ok_err(ERROR_SUCCESS); + + /* Try to start again the service, this time the database unlocked */ + SetLastError(0xdeadbeef); + bError = StartServiceW(hSvc, 0, NULL); + ok(bError == TRUE, "bError = %u, expected TRUE\n", bError); + ok_err(ERROR_SUCCESS); + Sleep(1000); /* Wait 1 second for the service to start */ + + /* Stop the testing service */ + ControlService(hSvc, SERVICE_CONTROL_STOP, &status); + Sleep(1000); /* Wait 1 second for the service to stop */ + + /* Restore its original state */ + if (bWasRunning) + { + StartServiceW(hSvc, 0, NULL); + } + + if (dwOldStartType == SERVICE_DISABLED) + { + ChangeServiceConfigW(hSvc, + SERVICE_NO_CHANGE, + SERVICE_DISABLED, + SERVICE_NO_CHANGE, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL); + } + + +cleanup: + if (hSvc) + CloseServiceHandle(hSvc); + + if (hScm) + CloseServiceHandle(hScm); + + return; +} + +static void Test_QueryLockStatusW(void) +{ + BOOL bError = FALSE; + + SC_HANDLE hScm = NULL; + SC_LOCK hLock = NULL; + LPQUERY_SERVICE_LOCK_STATUSW lpLockStatus = NULL; + DWORD dwRequiredSize = 0; + + /* Firstly try to get lock status with invalid handles */ + SetLastError(0xdeadbeef); + bError = QueryServiceLockStatusW(hScm, + NULL, + 0, + &dwRequiredSize); + ok(bError == FALSE && GetLastError() == ERROR_INVALID_HANDLE, "(bError, GetLastError()) = (%u, 0x%08lx), expected (FALSE, 0x%08lx)\n", bError, GetLastError(), (DWORD)ERROR_INVALID_HANDLE); + ok(dwRequiredSize == 0, "dwRequiredSize is non-zero, expected zero\n"); + + /* Open the services database without having rights */ + SetLastError(0xdeadbeef); + hScm = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); + ok(hScm != NULL, "Failed to open service manager, error=0x%08lx\n", GetLastError()); + if (!hScm) + { + skip("No service control manager; cannot proceed with QueryLockStatusW test\n"); + goto cleanup; + } + ok_err(ERROR_SUCCESS); + + /* Try to get lock status */ + SetLastError(0xdeadbeef); + bError = QueryServiceLockStatusW(hScm, + NULL, + 0, + &dwRequiredSize); + ok(bError == FALSE && GetLastError() == ERROR_ACCESS_DENIED, "(bError, GetLastError()) = (%u, 0x%08lx), expected (FALSE, 0x%08lx)\n", bError, GetLastError(), (DWORD)ERROR_ACCESS_DENIED); + ok(dwRequiredSize == 0, "dwRequiredSize is non-zero, expected zero\n"); + + CloseServiceHandle(hScm); + + + /* + * Query only the lock status. + */ + + SetLastError(0xdeadbeef); + hScm = OpenSCManagerW(NULL, NULL, SC_MANAGER_QUERY_LOCK_STATUS); + ok(hScm != NULL, "Failed to open service manager, error=0x%08lx\n", GetLastError()); + if (!hScm) + { + skip("No service control manager; cannot proceed with QueryLockStatusW test\n"); + goto cleanup; + } + ok_err(ERROR_SUCCESS); + + /* Get the needed size */ + SetLastError(0xdeadbeef); + bError = QueryServiceLockStatusW(hScm, + NULL, + 0, + &dwRequiredSize); + ok(bError == FALSE && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "(bError, GetLastError()) = (%u, 0x%08lx), expected (FALSE, 0x%08lx)\n", bError, GetLastError(), (DWORD)ERROR_INSUFFICIENT_BUFFER); + ok(dwRequiredSize != 0, "dwRequiredSize is zero, expected non-zero\n"); + if (dwRequiredSize == 0) + { + skip("Required size is null; cannot proceed with QueryLockStatusW test\n"); + goto cleanup; + } + + /* Allocate memory */ + lpLockStatus = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwRequiredSize); + if (lpLockStatus == NULL) + { + skip("Cannot allocate %lu bytes of memory\n", dwRequiredSize); + goto cleanup; + } + + /* Get the actual value */ + SetLastError(0xdeadbeef); + bError = QueryServiceLockStatusW(hScm, + lpLockStatus, + dwRequiredSize, + &dwRequiredSize); + ok(bError, "bError = %u, expected TRUE\n", bError); + + /* These conditions must be verified iff the services database wasn't previously locked */ + ok(lpLockStatus->fIsLocked == 0, "lpLockStatus->fIsLocked = %lu, expected 0\n", lpLockStatus->fIsLocked); + ok(lpLockStatus->lpLockOwner != NULL, "lpLockStatus->lpLockOwner is null, expected non-null\n"); + ok(lpLockStatus->lpLockOwner && *lpLockStatus->lpLockOwner == 0, "*lpLockStatus->lpLockOwner != \"\\0\", expected \"\\0\"\n"); + ok(lpLockStatus->dwLockDuration == 0, "lpLockStatus->dwLockDuration = %lu, expected 0\n", lpLockStatus->dwLockDuration); + + HeapFree(GetProcessHeap(), 0, lpLockStatus); + + CloseServiceHandle(hScm); + + + /* + * Now, try to lock the database and check its lock status. + */ + + SetLastError(0xdeadbeef); + hScm = OpenSCManagerW(NULL, NULL, SC_MANAGER_LOCK | SC_MANAGER_QUERY_LOCK_STATUS); + ok(hScm != NULL, "Failed to open service manager, error=0x%08lx\n", GetLastError()); + if (!hScm) + { + skip("No service control manager; cannot proceed with QueryLockStatusW test\n"); + goto cleanup; + } + ok_err(ERROR_SUCCESS); + + /* Get the needed size */ + SetLastError(0xdeadbeef); + bError = QueryServiceLockStatusW(hScm, + NULL, + 0, + &dwRequiredSize); + ok(bError == FALSE && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "(bError, GetLastError()) = (%u, 0x%08lx), expected (FALSE, 0x%08lx)\n", bError, GetLastError(), (DWORD)ERROR_INSUFFICIENT_BUFFER); + ok(dwRequiredSize != 0, "dwRequiredSize is zero, expected non-zero\n"); + if (dwRequiredSize == 0) + { + skip("Required size is null; cannot proceed with QueryLockStatusW test\n"); + goto cleanup; + } + + /* Allocate memory */ + lpLockStatus = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwRequiredSize); + if (lpLockStatus == NULL) + { + skip("Cannot allocate %lu bytes of memory\n", dwRequiredSize); + goto cleanup; + } + + /* Get the actual value */ + SetLastError(0xdeadbeef); + bError = QueryServiceLockStatusW(hScm, + lpLockStatus, + dwRequiredSize, + &dwRequiredSize); + ok(bError, "bError = %u, expected TRUE\n", bError); + + /* These conditions must be verified iff the services database wasn't previously locked */ + ok(lpLockStatus->fIsLocked == 0, "lpLockStatus->fIsLocked = %lu, expected 0\n", lpLockStatus->fIsLocked); + ok(lpLockStatus->lpLockOwner != NULL, "lpLockStatus->lpLockOwner is null, expected non-null\n"); + ok(lpLockStatus->lpLockOwner && *lpLockStatus->lpLockOwner == 0, "*lpLockStatus->lpLockOwner != \"\\0\", expected \"\\0\"\n"); + ok(lpLockStatus->dwLockDuration == 0, "lpLockStatus->dwLockDuration = %lu, expected 0\n", lpLockStatus->dwLockDuration); + + HeapFree(GetProcessHeap(), 0, lpLockStatus); + + + /* + * Try again, this time with the database locked. + */ + + SetLastError(0xdeadbeef); + hLock = LockServiceDatabase(hScm); + ok(hLock != NULL, "hLock = 0x%p, expected non-zero\n", hLock); + ok_err(ERROR_SUCCESS); + + Sleep(1000); /* Wait 1 second to let lpLockStatus->dwLockDuration increment */ + + /* Get the needed size */ + SetLastError(0xdeadbeef); + bError = QueryServiceLockStatusW(hScm, + NULL, + 0, + &dwRequiredSize); + ok(bError == FALSE && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "(bError, GetLastError()) = (%u, 0x%08lx), expected (FALSE, 0x%08lx)\n", bError, GetLastError(), (DWORD)ERROR_INSUFFICIENT_BUFFER); + ok(dwRequiredSize != 0, "dwRequiredSize is zero, expected non-zero\n"); + if (dwRequiredSize == 0) + { + skip("Required size is null; cannot proceed with QueryLockStatusW test\n"); + goto cleanup; + } + + /* Allocate memory */ + lpLockStatus = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwRequiredSize); + if (lpLockStatus == NULL) + { + skip("Cannot allocate %lu bytes of memory\n", dwRequiredSize); + goto cleanup; + } + + /* Get the actual value */ + SetLastError(0xdeadbeef); + bError = QueryServiceLockStatusW(hScm, + lpLockStatus, + dwRequiredSize, + &dwRequiredSize); + ok(bError, "bError = %u, expected TRUE\n", bError); + + /* These conditions must be verified iff the services database is locked */ + ok(lpLockStatus->fIsLocked != 0, "lpLockStatus->fIsLocked = %lu, expected non-zero\n", lpLockStatus->fIsLocked); + ok(lpLockStatus->lpLockOwner != NULL, "lpLockStatus->lpLockOwner is null, expected non-null\n"); + ok(lpLockStatus->lpLockOwner && *lpLockStatus->lpLockOwner != 0, "*lpLockStatus->lpLockOwner = \"\\0\", expected non-zero\n"); + ok(lpLockStatus->dwLockDuration != 0, "lpLockStatus->dwLockDuration = %lu, expected non-zero\n", lpLockStatus->dwLockDuration); + + HeapFree(GetProcessHeap(), 0, lpLockStatus); + + + /* + * Last try, with the database again unlocked. + */ + + SetLastError(0xdeadbeef); + bError = UnlockServiceDatabase(hLock); + ok(bError == TRUE, "bError = %u, expected TRUE\n", bError); + ok_err(ERROR_SUCCESS); + hLock = NULL; + + /* Get the needed size */ + SetLastError(0xdeadbeef); + bError = QueryServiceLockStatusW(hScm, + NULL, + 0, + &dwRequiredSize); + ok(bError == FALSE && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "(bError, GetLastError()) = (%u, 0x%08lx), expected (FALSE, 0x%08lx)\n", bError, GetLastError(), (DWORD)ERROR_INSUFFICIENT_BUFFER); + ok(dwRequiredSize != 0, "dwRequiredSize is zero, expected non-zero\n"); + if (dwRequiredSize == 0) + { + skip("Required size is null; cannot proceed with QueryLockStatusW test\n"); + goto cleanup; + } + + /* Allocate memory */ + lpLockStatus = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwRequiredSize); + if (lpLockStatus == NULL) + { + skip("Cannot allocate %lu bytes of memory\n", dwRequiredSize); + goto cleanup; + } + + /* Get the actual value */ + SetLastError(0xdeadbeef); + bError = QueryServiceLockStatusW(hScm, + lpLockStatus, + dwRequiredSize, + &dwRequiredSize); + ok(bError, "bError = %u, expected TRUE\n", bError); + + /* These conditions must be verified iff the services database is unlocked */ + ok(lpLockStatus->fIsLocked == 0, "lpLockStatus->fIsLocked = %lu, expected 0\n", lpLockStatus->fIsLocked); + ok(lpLockStatus->lpLockOwner != NULL, "lpLockStatus->lpLockOwner is null, expected non-null\n"); + ok(lpLockStatus->lpLockOwner && *lpLockStatus->lpLockOwner == 0, "*lpLockStatus->lpLockOwner != \"\\0\", expected \"\\0\"\n"); + ok(lpLockStatus->dwLockDuration == 0, "lpLockStatus->dwLockDuration = %lu, expected 0\n", lpLockStatus->dwLockDuration); + + HeapFree(GetProcessHeap(), 0, lpLockStatus); + + +cleanup: + if (hLock) + UnlockServiceDatabase(hLock); + + if (hScm) + CloseServiceHandle(hScm); + + return; +} + +static void Test_QueryLockStatusA(void) +{ + BOOL bError = FALSE; + + SC_HANDLE hScm = NULL; + SC_LOCK hLock = NULL; + LPQUERY_SERVICE_LOCK_STATUSA lpLockStatus = NULL; + DWORD dwRequiredSize = 0; + + /* Firstly try to get lock status with invalid handles */ + SetLastError(0xdeadbeef); + bError = QueryServiceLockStatusA(hScm, + NULL, + 0, + &dwRequiredSize); + ok(bError == FALSE && GetLastError() == ERROR_INVALID_HANDLE, "(bError, GetLastError()) = (%u, 0x%08lx), expected (FALSE, 0x%08lx)\n", bError, GetLastError(), (DWORD)ERROR_INVALID_HANDLE); + ok(dwRequiredSize == 0, "dwRequiredSize is non-zero, expected zero\n"); + + /* Open the services database without having rights */ + SetLastError(0xdeadbeef); + hScm = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT); + ok(hScm != NULL, "Failed to open service manager, error=0x%08lx\n", GetLastError()); + if (!hScm) + { + skip("No service control manager; cannot proceed with QueryLockStatusA test\n"); + goto cleanup; + } + ok_err(ERROR_SUCCESS); + + /* Try to get lock status */ + SetLastError(0xdeadbeef); + bError = QueryServiceLockStatusA(hScm, + NULL, + 0, + &dwRequiredSize); + ok(bError == FALSE && GetLastError() == ERROR_ACCESS_DENIED, "(bError, GetLastError()) = (%u, 0x%08lx), expected (FALSE, 0x%08lx)\n", bError, GetLastError(), (DWORD)ERROR_ACCESS_DENIED); + ok(dwRequiredSize == 0, "dwRequiredSize is non-zero, expected zero\n"); + + CloseServiceHandle(hScm); + + + /* + * Query only the lock status. + */ + + SetLastError(0xdeadbeef); + hScm = OpenSCManagerA(NULL, NULL, SC_MANAGER_QUERY_LOCK_STATUS); + ok(hScm != NULL, "Failed to open service manager, error=0x%08lx\n", GetLastError()); + if (!hScm) + { + skip("No service control manager; cannot proceed with QueryLockStatusA test\n"); + goto cleanup; + } + ok_err(ERROR_SUCCESS); + + /* Get the needed size */ + SetLastError(0xdeadbeef); + bError = QueryServiceLockStatusA(hScm, + NULL, + 0, + &dwRequiredSize); + ok(bError == FALSE && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "(bError, GetLastError()) = (%u, 0x%08lx), expected (FALSE, 0x%08lx)\n", bError, GetLastError(), (DWORD)ERROR_INSUFFICIENT_BUFFER); + ok(dwRequiredSize != 0, "dwRequiredSize is zero, expected non-zero\n"); + if (dwRequiredSize == 0) + { + skip("Required size is null; cannot proceed with QueryLockStatusA test\n"); + goto cleanup; + } + + /* Allocate memory */ + lpLockStatus = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwRequiredSize); + if (lpLockStatus == NULL) + { + skip("Cannot allocate %lu bytes of memory\n", dwRequiredSize); + goto cleanup; + } + + /* Get the actual value */ + SetLastError(0xdeadbeef); + bError = QueryServiceLockStatusA(hScm, + lpLockStatus, + dwRequiredSize, + &dwRequiredSize); + ok(bError, "bError = %u, expected TRUE\n", bError); + + /* These conditions must be verified iff the services database wasn't previously locked */ + ok(lpLockStatus->fIsLocked == 0, "lpLockStatus->fIsLocked = %lu, expected 0\n", lpLockStatus->fIsLocked); + ok(lpLockStatus->lpLockOwner != NULL, "lpLockStatus->lpLockOwner is null, expected non-null\n"); + ok(lpLockStatus->lpLockOwner && *lpLockStatus->lpLockOwner == 0, "*lpLockStatus->lpLockOwner != \"\\0\", expected \"\\0\"\n"); + ok(lpLockStatus->dwLockDuration == 0, "lpLockStatus->dwLockDuration = %lu, expected 0\n", lpLockStatus->dwLockDuration); + + HeapFree(GetProcessHeap(), 0, lpLockStatus); + + CloseServiceHandle(hScm); + + + /* + * Now, try to lock the database and check its lock status. + */ + + SetLastError(0xdeadbeef); + hScm = OpenSCManagerA(NULL, NULL, SC_MANAGER_LOCK | SC_MANAGER_QUERY_LOCK_STATUS); + ok(hScm != NULL, "Failed to open service manager, error=0x%08lx\n", GetLastError()); + if (!hScm) + { + skip("No service control manager; cannot proceed with QueryLockStatusA test\n"); + goto cleanup; + } + ok_err(ERROR_SUCCESS); + + /* Get the needed size */ + SetLastError(0xdeadbeef); + bError = QueryServiceLockStatusA(hScm, + NULL, + 0, + &dwRequiredSize); + ok(bError == FALSE && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "(bError, GetLastError()) = (%u, 0x%08lx), expected (FALSE, 0x%08lx)\n", bError, GetLastError(), (DWORD)ERROR_INSUFFICIENT_BUFFER); + ok(dwRequiredSize != 0, "dwRequiredSize is zero, expected non-zero\n"); + if (dwRequiredSize == 0) + { + skip("Required size is null; cannot proceed with QueryLockStatusA test\n"); + goto cleanup; + } + + /* Allocate memory */ + lpLockStatus = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwRequiredSize); + if (lpLockStatus == NULL) + { + skip("Cannot allocate %lu bytes of memory\n", dwRequiredSize); + goto cleanup; + } + + /* Get the actual value */ + SetLastError(0xdeadbeef); + bError = QueryServiceLockStatusA(hScm, + lpLockStatus, + dwRequiredSize, + &dwRequiredSize); + ok(bError, "bError = %u, expected TRUE\n", bError); + + /* These conditions must be verified iff the services database wasn't previously locked */ + ok(lpLockStatus->fIsLocked == 0, "lpLockStatus->fIsLocked = %lu, expected 0\n", lpLockStatus->fIsLocked); + ok(lpLockStatus->lpLockOwner != NULL, "lpLockStatus->lpLockOwner is null, expected non-null\n"); + ok(lpLockStatus->lpLockOwner && *lpLockStatus->lpLockOwner == 0, "*lpLockStatus->lpLockOwner != \"\\0\", expected \"\\0\"\n"); + ok(lpLockStatus->dwLockDuration == 0, "lpLockStatus->dwLockDuration = %lu, expected 0\n", lpLockStatus->dwLockDuration); + + HeapFree(GetProcessHeap(), 0, lpLockStatus); + + + /* + * Try again, this time with the database locked. + */ + + SetLastError(0xdeadbeef); + hLock = LockServiceDatabase(hScm); + ok(hLock != NULL, "hLock = 0x%p, expected non-zero\n", hLock); + ok_err(ERROR_SUCCESS); + + Sleep(1000); /* Wait 1 second to let lpLockStatus->dwLockDuration increment */ + + /* Get the needed size */ + SetLastError(0xdeadbeef); + bError = QueryServiceLockStatusA(hScm, + NULL, + 0, + &dwRequiredSize); + ok(bError == FALSE && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "(bError, GetLastError()) = (%u, 0x%08lx), expected (FALSE, 0x%08lx)\n", bError, GetLastError(), (DWORD)ERROR_INSUFFICIENT_BUFFER); + ok(dwRequiredSize != 0, "dwRequiredSize is zero, expected non-zero\n"); + if (dwRequiredSize == 0) + { + skip("Required size is null; cannot proceed with QueryLockStatusA test\n"); + goto cleanup; + } + + /* Allocate memory */ + lpLockStatus = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwRequiredSize); + if (lpLockStatus == NULL) + { + skip("Cannot allocate %lu bytes of memory\n", dwRequiredSize); + goto cleanup; + } + + /* Get the actual value */ + SetLastError(0xdeadbeef); + bError = QueryServiceLockStatusA(hScm, + lpLockStatus, + dwRequiredSize, + &dwRequiredSize); + ok(bError, "bError = %u, expected TRUE\n", bError); + + /* These conditions must be verified iff the services database is locked */ + ok(lpLockStatus->fIsLocked != 0, "lpLockStatus->fIsLocked = %lu, expected non-zero\n", lpLockStatus->fIsLocked); + ok(lpLockStatus->lpLockOwner != NULL, "lpLockStatus->lpLockOwner is null, expected non-null\n"); + ok(lpLockStatus->lpLockOwner && *lpLockStatus->lpLockOwner != 0, "*lpLockStatus->lpLockOwner = \"\\0\", expected non-zero\n"); + ok(lpLockStatus->dwLockDuration != 0, "lpLockStatus->dwLockDuration = %lu, expected non-zero\n", lpLockStatus->dwLockDuration); + + HeapFree(GetProcessHeap(), 0, lpLockStatus); + + + /* + * Last try, with the database again unlocked. + */ + + SetLastError(0xdeadbeef); + bError = UnlockServiceDatabase(hLock); + ok(bError == TRUE, "bError = %u, expected TRUE\n", bError); + ok_err(ERROR_SUCCESS); + hLock = NULL; + + /* Get the needed size */ + SetLastError(0xdeadbeef); + bError = QueryServiceLockStatusA(hScm, + NULL, + 0, + &dwRequiredSize); + ok(bError == FALSE && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "(bError, GetLastError()) = (%u, 0x%08lx), expected (FALSE, 0x%08lx)\n", bError, GetLastError(), (DWORD)ERROR_INSUFFICIENT_BUFFER); + ok(dwRequiredSize != 0, "dwRequiredSize is zero, expected non-zero\n"); + if (dwRequiredSize == 0) + { + skip("Required size is null; cannot proceed with QueryLockStatusA test\n"); + goto cleanup; + } + + /* Allocate memory */ + lpLockStatus = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwRequiredSize); + if (lpLockStatus == NULL) + { + skip("Cannot allocate %lu bytes of memory\n", dwRequiredSize); + goto cleanup; + } + + /* Get the actual value */ + SetLastError(0xdeadbeef); + bError = QueryServiceLockStatusA(hScm, + lpLockStatus, + dwRequiredSize, + &dwRequiredSize); + ok(bError, "bError = %u, expected TRUE\n", bError); + + /* These conditions must be verified iff the services database is unlocked */ + ok(lpLockStatus->fIsLocked == 0, "lpLockStatus->fIsLocked = %lu, expected 0\n", lpLockStatus->fIsLocked); + ok(lpLockStatus->lpLockOwner != NULL, "lpLockStatus->lpLockOwner is null, expected non-null\n"); + ok(lpLockStatus->lpLockOwner && *lpLockStatus->lpLockOwner == 0, "*lpLockStatus->lpLockOwner != \"\\0\", expected \"\\0\"\n"); + ok(lpLockStatus->dwLockDuration == 0, "lpLockStatus->dwLockDuration = %lu, expected 0\n", lpLockStatus->dwLockDuration); + + HeapFree(GetProcessHeap(), 0, lpLockStatus); + + +cleanup: + if (hLock) + UnlockServiceDatabase(hLock); + + if (hScm) + CloseServiceHandle(hScm); + + return; +} + + +START_TEST(LockDatabase) +{ + Test_LockUnlockServiceDatabase(); + Test_LockUnlockServiceDatabaseWithServiceStart(); + Test_QueryLockStatusW(); + Test_QueryLockStatusA(); +} Propchange: trunk/rostests/apitests/advapi32/LockDatabase.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/advapi32/QueryServiceConfig2.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/QuerySe… ============================================================================== --- trunk/rostests/apitests/advapi32/QueryServiceConfig2.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/QueryServiceConfig2.c [iso-8859-1] Fri Jun 29 11:48:35 2012 @@ -2,12 +2,15 @@ * PROJECT: ReactOS api tests * LICENSE: GPLv2+ - See COPYING in the top level directory * PURPOSE: Test for QueryServiceConfig2A/W - * PROGRAMMER: Hermès BÉLUSCA - MAÏTO + * PROGRAMMER: HermÃ¨s BÃLUSCA - MAÃTO */ #include <wine/test.h> #include <windows.h> #include <strsafe.h> + +#define TESTING_SERVICEW L"Spooler" +#define TESTING_SERVICEA "Spooler" /* * Taken from base/system/services/config.c and adapted. @@ -495,7 +498,7 @@ ok_err(ERROR_SUCCESS); SetLastError(0xdeadbeef); - hService = OpenServiceW(hScm, L"Spooler", SERVICE_QUERY_CONFIG); + hService = OpenServiceW(hScm, TESTING_SERVICEW, SERVICE_QUERY_CONFIG); ok(hService != NULL, "Failed to open service handle, error=0x%08lx\n", GetLastError()); if (!hService) { @@ -505,10 +508,10 @@ ok_err(ERROR_SUCCESS); - if (QueryConfig2W(hService, L"Spooler", SERVICE_CONFIG_DESCRIPTION) != 0) - goto cleanup; - - if (QueryConfig2W(hService, L"Spooler", SERVICE_CONFIG_FAILURE_ACTIONS) != 0) + if (QueryConfig2W(hService, TESTING_SERVICEW, SERVICE_CONFIG_DESCRIPTION) != 0) + goto cleanup; + + if (QueryConfig2W(hService, TESTING_SERVICEW, SERVICE_CONFIG_FAILURE_ACTIONS) != 0) goto cleanup; cleanup: @@ -536,7 +539,7 @@ ok_err(ERROR_SUCCESS); SetLastError(0xdeadbeef); - hService = OpenServiceA(hScm, "Spooler", SERVICE_QUERY_CONFIG); + hService = OpenServiceA(hScm, TESTING_SERVICEA, SERVICE_QUERY_CONFIG); ok(hService != NULL, "Failed to open service handle, error=0x%08lx\n", GetLastError()); if (!hService) { @@ -546,10 +549,10 @@ ok_err(ERROR_SUCCESS); - if (QueryConfig2A(hService, "Spooler", SERVICE_CONFIG_DESCRIPTION) != 0) - goto cleanup; - - if (QueryConfig2A(hService, "Spooler", SERVICE_CONFIG_FAILURE_ACTIONS) != 0) + if (QueryConfig2A(hService, TESTING_SERVICEA, SERVICE_CONFIG_DESCRIPTION) != 0) + goto cleanup; + + if (QueryConfig2A(hService, TESTING_SERVICEA, SERVICE_CONFIG_FAILURE_ACTIONS) != 0) goto cleanup; cleanup: Modified: trunk/rostests/apitests/advapi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/testlis… ============================================================================== --- trunk/rostests/apitests/advapi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/testlist.c [iso-8859-1] Fri Jun 29 11:48:35 2012 @@ -6,11 +6,13 @@ #include "wine/test.h" extern void func_CreateService(void); +extern void func_LockDatabase(void); extern void func_QueryServiceConfig2(void); const struct test winetest_testlist[] = { { "CreateService", func_CreateService }, + { "LockDatabase" , func_LockDatabase }, { "QueryServiceConfig2", func_QueryServiceConfig2 }, { 0, 0 }

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