Ros-diffs May 2012

ros-diffs@reactos.org

12 participants
227 discussions

[jimtabor] 56531: [Win32k] - Fix crash when pcti is null. See bug 6759.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon May 7 06:00:08 2012 New Revision: 56531 URL: http://svn.reactos.org/svn/reactos?rev=56531&view=rev Log: [Win32k] - Fix crash when pcti is null. See bug 6759. Modified: trunk/reactos/win32ss/user/ntuser/desktop.c Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Mon May 7 06:00:08 2012 @@ -1821,7 +1821,10 @@ pdeskOld = pti->rpdesk; hdeskOld = pti->hdesk; - pctiOld = pti->pcti; + if (pti->pcti != &pti->cti) + pctiOld = pti->pcti; + else + pctiOld = NULL; /* do the switch */ if(pdesk != NULL) @@ -1850,7 +1853,7 @@ pti->rpdesk = NULL; pti->hdesk = NULL; pti->pDeskInfo = NULL; - pti->pcti = NULL; + pti->pcti = &pti->cti; // Always point inside so there will be no crash when posting or sending msg's! pci->ulClientDelta = 0; pci->pDeskInfo = NULL; pci->pClientThreadInfo = NULL; @@ -1860,7 +1863,7 @@ if(pdeskOld != NULL) { RemoveEntryList(&pti->PtiLink); - DesktopHeapFree(pdeskOld, pctiOld); + if (pctiOld) DesktopHeapFree(pdeskOld, pctiOld); IntUnmapDesktopView(pdeskOld); ObDereferenceObject(pdeskOld); ZwClose(hdeskOld);

12 years, 5 months

[ekohl] 56530: [ADVAPI32] Fix broken commit.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun May 6 23:01:39 2012 New Revision: 56530 URL: http://svn.reactos.org/svn/reactos?rev=56530&view=rev Log: [ADVAPI32] Fix broken commit. Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Sun May 6 23:01:39 2012 @@ -213,7 +213,7 @@ { NTSTATUS Status; - TRACE("(%p,%p,0x%08x,%p)\n", PolicyHandle, AccountSid, Flags, AccountHandle); + TRACE("(%p,%p,0x%08x,%p)\n", PolicyHandle, AccountSid, DesiredAccess, AccountHandle); RpcTryExcept {

12 years, 5 months

[cgutman] 56529: [LWIP] - Use ULONG_PTR instead of ULONG for pointer types - Dedicated to Timo

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun May 6 22:59:42 2012 New Revision: 56529 URL: http://svn.reactos.org/svn/reactos?rev=56529&view=rev Log: [LWIP] - Use ULONG_PTR instead of ULONG for pointer types - Dedicated to Timo Modified: trunk/reactos/lib/drivers/lwip/src/include/arch/cc.h Modified: trunk/reactos/lib/drivers/lwip/src/include/arch/cc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/include/arch/cc.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/include/arch/cc.h [iso-8859-1] Sun May 6 22:59:42 2012 @@ -28,7 +28,7 @@ typedef signed long s32_t; /* Memory pointer */ -typedef u32_t mem_ptr_t; +typedef ULONG_PTR mem_ptr_t; /* Printf/DPRINT formatters */ #define U16_F "hu"

12 years, 5 months

[ekohl] 56528: [ADVAPI32] The third parameter of LsaCreateAccount and LsaOpenAccount is an ACCESS_MASK.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun May 6 22:29:46 2012 New Revision: 56528 URL: http://svn.reactos.org/svn/reactos?rev=56528&view=rev Log: [ADVAPI32] The third parameter of LsaCreateAccount and LsaOpenAccount is an ACCESS_MASK. Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/include/psdk/ntsecapi.h Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Sun May 6 22:29:46 2012 @@ -208,7 +208,7 @@ WINAPI LsaCreateAccount(IN LSA_HANDLE PolicyHandle, IN PSID AccountSid, - IN ULONG Flags, + IN ACCESS_MASK DesiredAccess, OUT PLSA_HANDLE AccountHandle) { NTSTATUS Status; @@ -219,7 +219,7 @@ { Status = LsarCreateAccount((LSAPR_HANDLE)PolicyHandle, AccountSid, - Flags, + DesiredAccess, AccountHandle); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -697,18 +697,18 @@ WINAPI LsaOpenAccount(IN LSA_HANDLE PolicyHandle, IN PSID AccountSid, - IN ULONG Flags, + IN ACCESS_MASK DesiredAccess, OUT PLSA_HANDLE AccountHandle) { NTSTATUS Status; - TRACE("(%p,%p,0x%08x,%p)\n", PolicyHandle, AccountSid, Flags, AccountHandle); + TRACE("(%p,%p,0x%08lx,%p)\n", PolicyHandle, AccountSid, DesiredAccess, AccountHandle); RpcTryExcept { Status = LsarOpenAccount((LSAPR_HANDLE)PolicyHandle, AccountSid, - Flags, + DesiredAccess, AccountHandle); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) Modified: trunk/reactos/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] Sun May 6 22:29:46 2012 @@ -678,7 +678,7 @@ PULONG,PNTSTATUS); NTSTATUS NTAPI LsaClose(LSA_HANDLE); NTSTATUS NTAPI LsaConnectUntrusted(PHANDLE); -NTSTATUS NTAPI LsaCreateAccount(LSA_HANDLE, PSID, ULONG, PLSA_HANDLE); +NTSTATUS NTAPI LsaCreateAccount(LSA_HANDLE, PSID, ACCESS_MASK, PLSA_HANDLE); NTSTATUS NTAPI LsaCreateTrustedDomain(LSA_HANDLE, PLSA_TRUST_INFORMATION, ACCESS_MASK, PLSA_HANDLE); NTSTATUS NTAPI LsaCreateTrustedDomainEx(LSA_HANDLE, PTRUSTED_DOMAIN_INFORMATION_EX, @@ -708,7 +708,7 @@ NTSTATUS NTAPI LsaLookupSids(LSA_HANDLE,ULONG,PSID*, PLSA_REFERENCED_DOMAIN_LIST*,PLSA_TRANSLATED_NAME*); ULONG NTAPI LsaNtStatusToWinError(NTSTATUS); -NTSTATUS NTAPI LsaOpenAccount(LSA_HANDLE, PSID, ULONG, PLSA_HANDLE); +NTSTATUS NTAPI LsaOpenAccount(LSA_HANDLE, PSID, ACCESS_MASK, PLSA_HANDLE); NTSTATUS NTAPI LsaOpenPolicy(PLSA_UNICODE_STRING,PLSA_OBJECT_ATTRIBUTES, ACCESS_MASK,PLSA_HANDLE); NTSTATUS NTAPI LsaOpenTrustedDomainByName(LSA_HANDLE, PLSA_UNICODE_STRING,

12 years, 5 months

[ekohl] 56527: [ADVAPI32/LSASRV] - Implement LsaEnumeratePrivilegesOfAccount and LsarEnumeratePrivilegesAccount. - Implement parts of LsarAddPrivilegesToAccount.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun May 6 20:57:21 2012 New Revision: 56527 URL: http://svn.reactos.org/svn/reactos?rev=56527&view=rev Log: [ADVAPI32/LSASRV] - Implement LsaEnumeratePrivilegesOfAccount and LsarEnumeratePrivilegesAccount. - Implement parts of LsarAddPrivilegesToAccount. Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/include/psdk/ntsecapi.h Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Sun May 6 20:57:21 2012 @@ -358,7 +358,7 @@ @ stub LsaEnumerateAccounts @ stdcall LsaEnumerateAccountsWithUserRight(ptr ptr ptr ptr) @ stub LsaEnumeratePrivileges -@ stub LsaEnumeratePrivilegesOfAccount +@ stdcall LsaEnumeratePrivilegesOfAccount(ptr ptr) @ stdcall LsaEnumerateTrustedDomains(ptr ptr ptr long ptr) @ stdcall LsaEnumerateTrustedDomainsEx(ptr ptr ptr long ptr) @ stdcall LsaFreeMemory(ptr) Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Sun May 6 20:57:21 2012 @@ -366,6 +366,34 @@ return STATUS_NO_MORE_ENTRIES; } + +/* + * @implemented + */ +NTSTATUS +WINAPI +LsaEnumeratePrivilegesOfAccount(IN LSA_HANDLE AccountHandle, + OUT PPRIVILEGE_SET *Privileges) +{ + NTSTATUS Status; + + TRACE("(%p,%p) stub\n", AccountHandle, Privileges); + + RpcTryExcept + { + Status = LsarEnumeratePrivilegesAccount((LSAPR_HANDLE)AccountHandle, + (LSAPR_PRIVILEGE_SET **)Privileges); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + /* * @unimplemented */ @@ -380,7 +408,7 @@ { FIXME("(%p,%p,%p,0x%08x,%p) stub\n", PolicyHandle, EnumerationContext, Buffer, PreferedMaximumLength, CountReturned); - + if (CountReturned) *CountReturned = 0; return STATUS_SUCCESS; } Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sun May 6 20:57:21 2012 @@ -723,8 +723,52 @@ LSAPR_HANDLE AccountHandle, PLSAPR_PRIVILEGE_SET *Privileges) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PLSA_DB_OBJECT AccountObject; + ULONG PrivilegeSetSize = 0; + PLSAPR_PRIVILEGE_SET PrivilegeSet = NULL; + NTSTATUS Status; + + *Privileges = NULL; + + /* Validate the AccountHandle */ + Status = LsapValidateDbObject(AccountHandle, + LsaDbAccountObject, + 0, + &AccountObject); + if (!NT_SUCCESS(Status)) + { + ERR("LsapValidateDbObject returned 0x%08lx\n", Status); + return Status; + } + + /* Get the size of the privilege set */ + Status = LsapGetObjectAttribute(AccountObject, + L"Privilgs", + NULL, + &PrivilegeSetSize); + if (!NT_SUCCESS(Status)) + return Status; + + /* Allocate a buffer for the privilege set */ + PrivilegeSet = MIDL_user_allocate(PrivilegeSetSize); + if (PrivilegeSet == NULL) + return STATUS_NO_MEMORY; + + /* Get the privilege set */ + Status = LsapGetObjectAttribute(AccountObject, + L"Privilgs", + PrivilegeSet, + &PrivilegeSetSize); + if (!NT_SUCCESS(Status)) + { + MIDL_user_free(PrivilegeSet); + return Status; + } + + /* Return a pointer to the privilege set */ + *Privileges = PrivilegeSet; + + return STATUS_SUCCESS; } @@ -733,8 +777,44 @@ LSAPR_HANDLE AccountHandle, PLSAPR_PRIVILEGE_SET Privileges) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PLSA_DB_OBJECT AccountObject; + ULONG PrivilegeSetSize = 0; + NTSTATUS Status; + + /* Validate the AccountHandle */ + Status = LsapValidateDbObject(AccountHandle, + LsaDbAccountObject, + 0, + &AccountObject); + if (!NT_SUCCESS(Status)) + { + ERR("LsapValidateDbObject returned 0x%08lx\n", Status); + return Status; + } + + Status = LsapGetObjectAttribute(AccountObject, + L"Privilgs", + NULL, + &PrivilegeSetSize); + if (!NT_SUCCESS(Status) || PrivilegeSetSize == 0) + { + /* The Privilgs attribute does not exist */ + + PrivilegeSetSize = sizeof(PRIVILEGE_SET) + + (Privileges->PrivilegeCount - 1) * sizeof(LUID_AND_ATTRIBUTES); + Status = LsapSetObjectAttribute(AccountObject, + L"Privilgs", + Privileges, + PrivilegeSetSize); + } + else + { + /* The Privilgs attribute exists */ + + Status = STATUS_NOT_IMPLEMENTED; + } + + return Status; } Modified: trunk/reactos/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] Sun May 6 20:57:21 2012 @@ -688,6 +688,7 @@ NTSTATUS NTAPI LsaEnumerateAccountRights(LSA_HANDLE,PSID,PLSA_UNICODE_STRING*,PULONG); NTSTATUS NTAPI LsaEnumerateAccountsWithUserRight(LSA_HANDLE,PLSA_UNICODE_STRING, PVOID*,PULONG); +NTSTATUS NTAPI LsaEnumeratePrivilegesOfAccount(LSA_HANDLE, PPRIVILEGE_SET*); NTSTATUS NTAPI LsaEnumerateTrustedDomains(LSA_HANDLE,PLSA_ENUMERATION_HANDLE, PVOID*,ULONG,PULONG); NTSTATUS NTAPI LsaEnumerateTrustedDomainsEx(LSA_HANDLE,PLSA_ENUMERATION_HANDLE,

12 years, 5 months

[ekohl] 56526: [LSASRV] Implement LsarOpenAccount.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun May 6 12:08:51 2012 New Revision: 56526 URL: http://svn.reactos.org/svn/reactos?rev=56526&view=rev Log: [LSASRV] Implement LsarOpenAccount. Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sun May 6 12:08:51 2012 @@ -641,8 +641,80 @@ ACCESS_MASK DesiredAccess, LSAPR_HANDLE *AccountHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PLSA_DB_OBJECT PolicyObject; + PLSA_DB_OBJECT AccountsObject = NULL; + PLSA_DB_OBJECT AccountObject = NULL; + LPWSTR SidString = NULL; + NTSTATUS Status = STATUS_SUCCESS; + + /* Validate the PolicyHandle */ + Status = LsapValidateDbObject(PolicyHandle, + LsaDbPolicyObject, + POLICY_CREATE_ACCOUNT, + &PolicyObject); + if (!NT_SUCCESS(Status)) + { + ERR("LsapValidateDbObject returned 0x%08lx\n", Status); + return Status; + } + + /* Open the Accounts object */ + Status = LsapOpenDbObject(PolicyObject, + L"Accounts", + LsaDbContainerObject, + 0, + &AccountsObject); + if (!NT_SUCCESS(Status)) + { + ERR("LsapCreateDbObject (Accounts) failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Create SID string */ + if (!ConvertSidToStringSid((PSID)AccountSid, + &SidString)) + { + ERR("ConvertSidToStringSid failed\n"); + Status = STATUS_INVALID_PARAMETER; + goto done; + } + + /* Create the Account object */ + Status = LsapOpenDbObject(AccountsObject, + SidString, + LsaDbAccountObject, + DesiredAccess, + &AccountObject); + if (!NT_SUCCESS(Status)) + { + ERR("LsapOpenDbObject (Account) failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Set the Sid attribute */ + Status = LsapSetObjectAttribute(AccountObject, + L"Sid", + (PVOID)AccountSid, + GetLengthSid(AccountSid)); + +done: + if (SidString != NULL) + LocalFree(SidString); + + if (!NT_SUCCESS(Status)) + { + if (AccountObject != NULL) + LsapCloseDbObject(AccountObject); + } + else + { + *AccountHandle = (LSAPR_HANDLE)AccountObject; + } + + if (AccountsObject != NULL) + LsapCloseDbObject(AccountsObject); + + return STATUS_SUCCESS; }

12 years, 5 months

[tkreuzer] 56525: [WIN32K] Do not ASSERT that the object is not exclusively locked in GDIOBJ_vDereferenceObject. The idea behind this was to easily detect cases where someone would accidentally der...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 6 11:51:57 2012 New Revision: 56525 URL: http://svn.reactos.org/svn/reactos?rev=56525&view=rev Log: [WIN32K] Do not ASSERT that the object is not exclusively locked in GDIOBJ_vDereferenceObject. The idea behind this was to easily detect cases where someone would accidentally dereference an object, instead of unlocking it. But this function is used from other functions, that can definately deal with exclusively locked objects. Changing this would leat to code duplication / more complex code. Forgetting to unlock an object will still be detected by the kernel, when returning to user mode, since APC would still be disabled. Should fix failed assertion when running dx9 setup. Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Sun May 6 11:51:57 2012 @@ -476,9 +476,7 @@ { ULONG cRefs, ulIndex; - /* Must not be exclusively locked */ - ASSERT(pobj->cExclusiveLock == 0); - + /* Log the event */ DBG_LOGEVENT(&pobj->slhLog, EVENT_DEREFERENCE, cRefs); /* Check if the object has a handle */ @@ -489,10 +487,10 @@ /* Decrement reference count */ ASSERT((gpaulRefCount[ulIndex] & REF_MASK_COUNT) > 0); - cRefs = InterlockedDecrement((LONG*)&gpaulRefCount[ulIndex]) & REF_MASK_INUSE; + cRefs = InterlockedDecrement((LONG*)&gpaulRefCount[ulIndex]); /* Check if we reached 0 and handle bit is not set */ - if (cRefs == 0) + if ((cRefs & REF_MASK_INUSE) == 0) { /* Make sure it's ok to delete the object */ ASSERT(pobj->BaseFlags & BASEFLAG_READY_TO_DIE);

12 years, 5 months

[ekohl] 56524: [LSASRV] - Clean up the LSA database APIs. - Fix database object reference counting.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun May 6 09:57:31 2012 New Revision: 56524 URL: http://svn.reactos.org/svn/reactos?rev=56524&view=rev Log: [LSASRV] - Clean up the LSA database APIs. - Fix database object reference counting. Modified: trunk/reactos/dll/win32/lsasrv/database.c trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/policy.c Modified: trunk/reactos/dll/win32/lsasrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/database.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] Sun May 6 09:57:31 2012 @@ -202,40 +202,40 @@ static NTSTATUS LsapCreateDatabaseObjects(VOID) { - PLSA_DB_OBJECT DbObject = NULL; + PLSA_DB_OBJECT PolicyObject; + NTSTATUS Status; /* Open the 'Policy' object */ - DbObject = (PLSA_DB_OBJECT)LsapCreateDbObject(NULL, - L"Policy", - TRUE, - LsaDbPolicyObject, - 0); - if (DbObject != NULL) - { - LsapSetObjectAttribute(DbObject, - L"PolPrDmN", - NULL, - 0); - - LsapSetObjectAttribute(DbObject, - L"PolPrDmS", - NULL, - 0); - - LsapSetObjectAttribute(DbObject, - L"PolAcDmN", - NULL, - 0); - - LsapSetObjectAttribute(DbObject, - L"PolAcDmS", - NULL, - 0); - - - /* Close the 'Policy' object */ - LsapCloseDbObject((LSAPR_HANDLE)DbObject); - } + Status = LsapOpenDbObject(NULL, + L"Policy", + LsaDbPolicyObject, + 0, + &PolicyObject); + if (!NT_SUCCESS(Status)) + return Status; + + LsapSetObjectAttribute(PolicyObject, + L"PolPrDmN", + NULL, + 0); + + LsapSetObjectAttribute(PolicyObject, + L"PolPrDmS", + NULL, + 0); + + LsapSetObjectAttribute(PolicyObject, + L"PolAcDmN", + NULL, + 0); + + LsapSetObjectAttribute(PolicyObject, + L"PolAcDmS", + NULL, + 0); + + /* Close the 'Policy' object */ + LsapCloseDbObject(PolicyObject); return STATUS_SUCCESS; } @@ -294,25 +294,27 @@ } -LSAPR_HANDLE -LsapCreateDbObject(LSAPR_HANDLE ParentHandle, - LPWSTR ObjectName, - BOOLEAN Open, - LSA_DB_OBJECT_TYPE ObjectType, - ACCESS_MASK DesiredAccess) -{ - PLSA_DB_OBJECT ParentObject = (PLSA_DB_OBJECT)ParentHandle; - PLSA_DB_OBJECT DbObject; +NTSTATUS +LsapCreateDbObject(IN PLSA_DB_OBJECT ParentObject, + IN LPWSTR ObjectName, + IN LSA_DB_OBJECT_TYPE ObjectType, + IN ACCESS_MASK DesiredAccess, + OUT PLSA_DB_OBJECT *DbObject) +{ + PLSA_DB_OBJECT NewObject; OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; HANDLE ParentKeyHandle; HANDLE ObjectKeyHandle; NTSTATUS Status; - if (ParentHandle != NULL) + if (DbObject == NULL) + return STATUS_INVALID_PARAMETER; + + if (ParentObject == NULL) + ParentKeyHandle = SecurityKeyHandle; + else ParentKeyHandle = ParentObject->KeyHandle; - else - ParentKeyHandle = SecurityKeyHandle; RtlInitUnicodeString(&KeyName, ObjectName); @@ -323,65 +325,122 @@ ParentKeyHandle, NULL); - if (Open == TRUE) - { - Status = NtOpenKey(&ObjectKeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes); - } - else - { - Status = NtCreateKey(&ObjectKeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes, - 0, - NULL, - 0, - NULL); - } - - if (!NT_SUCCESS(Status)) - { - return NULL; - } - - DbObject = (PLSA_DB_OBJECT)RtlAllocateHeap(RtlGetProcessHeap(), - 0, - sizeof(LSA_DB_OBJECT)); - if (DbObject == NULL) + Status = NtCreateKey(&ObjectKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + NewObject = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + sizeof(LSA_DB_OBJECT)); + if (NewObject == NULL) { NtClose(ObjectKeyHandle); - return NULL; - } - - DbObject->Signature = LSAP_DB_SIGNATURE; - DbObject->RefCount = 0; - DbObject->ObjectType = ObjectType; - DbObject->Access = DesiredAccess; - DbObject->KeyHandle = ObjectKeyHandle; - DbObject->ParentObject = ParentObject; + return STATUS_NO_MEMORY; + } + + NewObject->Signature = LSAP_DB_SIGNATURE; + NewObject->RefCount = 1; + NewObject->ObjectType = ObjectType; + NewObject->Access = DesiredAccess; + NewObject->KeyHandle = ObjectKeyHandle; + NewObject->ParentObject = ParentObject; if (ParentObject != NULL) ParentObject->RefCount++; - return (LSAPR_HANDLE)DbObject; + *DbObject = NewObject; + + return STATUS_SUCCESS; +} + + +NTSTATUS +LsapOpenDbObject(IN PLSA_DB_OBJECT ParentObject, + IN LPWSTR ObjectName, + IN LSA_DB_OBJECT_TYPE ObjectType, + IN ACCESS_MASK DesiredAccess, + OUT PLSA_DB_OBJECT *DbObject) +{ + PLSA_DB_OBJECT NewObject; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + HANDLE ParentKeyHandle; + HANDLE ObjectKeyHandle; + NTSTATUS Status; + + if (DbObject == NULL) + return STATUS_INVALID_PARAMETER; + + if (ParentObject == NULL) + ParentKeyHandle = SecurityKeyHandle; + else + ParentKeyHandle = ParentObject->KeyHandle; + + RtlInitUnicodeString(&KeyName, + ObjectName); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ParentKeyHandle, + NULL); + + Status = NtOpenKey(&ObjectKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + NewObject = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + sizeof(LSA_DB_OBJECT)); + if (NewObject == NULL) + { + NtClose(ObjectKeyHandle); + return STATUS_NO_MEMORY; + } + + NewObject->Signature = LSAP_DB_SIGNATURE; + NewObject->RefCount = 1; + NewObject->ObjectType = ObjectType; + NewObject->Access = DesiredAccess; + NewObject->KeyHandle = ObjectKeyHandle; + NewObject->ParentObject = ParentObject; + + if (ParentObject != NULL) + ParentObject->RefCount++; + + *DbObject = NewObject; + + return STATUS_SUCCESS; } NTSTATUS LsapValidateDbObject(LSAPR_HANDLE Handle, LSA_DB_OBJECT_TYPE ObjectType, - ACCESS_MASK GrantedAccess) -{ - PLSA_DB_OBJECT DbObject = (PLSA_DB_OBJECT)Handle; + ACCESS_MASK DesiredAccess, + PLSA_DB_OBJECT *DbObject) +{ + PLSA_DB_OBJECT LocalObject = (PLSA_DB_OBJECT)Handle; BOOLEAN bValid = FALSE; _SEH2_TRY { - if (DbObject->Signature == LSAP_DB_SIGNATURE) + if (LocalObject->Signature == LSAP_DB_SIGNATURE) { if ((ObjectType == LsaDbIgnoreObject) || - (DbObject->ObjectType == ObjectType)) + (LocalObject->ObjectType == ObjectType)) bValid = TRUE; } } @@ -394,32 +453,52 @@ if (bValid == FALSE) return STATUS_INVALID_HANDLE; - if (GrantedAccess != 0) - { - /* FIXME: Check for granted access rights */ - } + if (DesiredAccess != 0) + { + /* Check for granted access rights */ + if ((LocalObject->Access & DesiredAccess) != DesiredAccess) + { + ERR("LsapValidateDbObject access check failed %08lx %08lx\n", + LocalObject->Access, DesiredAccess); + return STATUS_ACCESS_DENIED; + } + } + + if (DbObject != NULL) + *DbObject = LocalObject; return STATUS_SUCCESS; } NTSTATUS -LsapCloseDbObject(LSAPR_HANDLE Handle) -{ - PLSA_DB_OBJECT DbObject = (PLSA_DB_OBJECT)Handle; - - if (DbObject->RefCount != 0) - return STATUS_UNSUCCESSFUL; - - if (DbObject->ParentObject != NULL) - DbObject->ParentObject->RefCount--; +LsapCloseDbObject(PLSA_DB_OBJECT DbObject) +{ + PLSA_DB_OBJECT ParentObject = NULL; + NTSTATUS Status = STATUS_SUCCESS; + + DbObject->RefCount--; + + if (DbObject->RefCount > 0) + return STATUS_SUCCESS; if (DbObject->KeyHandle != NULL) NtClose(DbObject->KeyHandle); + if (DbObject->ParentObject != NULL) + ParentObject = DbObject->ParentObject; + RtlFreeHeap(RtlGetProcessHeap(), 0, DbObject); - return STATUS_SUCCESS; + if (ParentObject != NULL) + { + ParentObject->RefCount--; + + if (ParentObject->RefCount == 0) + Status = LsapCloseDbObject(ParentObject); + } + + return Status; } Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sun May 6 09:57:31 2012 @@ -69,6 +69,7 @@ NTSTATUS WINAPI LsarClose( LSAPR_HANDLE *ObjectHandle) { + PLSA_DB_OBJECT DbObject; NTSTATUS Status = STATUS_SUCCESS; TRACE("0x%p\n", ObjectHandle); @@ -77,10 +78,11 @@ Status = LsapValidateDbObject(*ObjectHandle, LsaDbIgnoreObject, - 0); + 0, + &DbObject); if (Status == STATUS_SUCCESS) { - Status = LsapCloseDbObject(*ObjectHandle); + Status = LsapCloseDbObject(DbObject); *ObjectHandle = NULL; } @@ -154,21 +156,23 @@ ACCESS_MASK DesiredAccess, LSAPR_HANDLE *PolicyHandle) { - NTSTATUS Status = STATUS_SUCCESS; + PLSA_DB_OBJECT PolicyObject; + NTSTATUS Status; TRACE("LsarOpenPolicy called!\n"); RtlEnterCriticalSection(&PolicyHandleTableLock); - *PolicyHandle = LsapCreateDbObject(NULL, - L"Policy", - TRUE, - LsaDbPolicyObject, - DesiredAccess); - if (*PolicyHandle == NULL) - Status = STATUS_INSUFFICIENT_RESOURCES; + Status = LsapOpenDbObject(NULL, + L"Policy", + LsaDbPolicyObject, + DesiredAccess, + &PolicyObject); RtlLeaveCriticalSection(&PolicyHandleTableLock); + + if (NT_SUCCESS(Status)) + *PolicyHandle = (LSAPR_HANDLE)PolicyObject; TRACE("LsarOpenPolicy done!\n"); @@ -182,6 +186,7 @@ POLICY_INFORMATION_CLASS InformationClass, PLSAPR_POLICY_INFORMATION *PolicyInformation) { + PLSA_DB_OBJECT DbObject; NTSTATUS Status; TRACE("LsarQueryInformationPolicy(%p,0x%08x,%p)\n", @@ -194,7 +199,8 @@ Status = LsapValidateDbObject(PolicyHandle, LsaDbPolicyObject, - 0); /* FIXME */ + 0, /* FIXME */ + &DbObject); if (!NT_SUCCESS(Status)) return Status; @@ -244,6 +250,7 @@ POLICY_INFORMATION_CLASS InformationClass, PLSAPR_POLICY_INFORMATION PolicyInformation) { + PLSA_DB_OBJECT DbObject; NTSTATUS Status; TRACE("LsarSetInformationPolicy(%p,0x%08x,%p)\n", @@ -256,7 +263,8 @@ Status = LsapValidateDbObject(PolicyHandle, LsaDbPolicyObject, - 0); /* FIXME */ + 0, /* FIXME */ + &DbObject); if (!NT_SUCCESS(Status)) return Status; @@ -310,15 +318,17 @@ ACCESS_MASK DesiredAccess, LSAPR_HANDLE *AccountHandle) { - LSAPR_HANDLE AccountsHandle; - LSAPR_HANDLE Account; - LPWSTR SidString; - NTSTATUS Status; + PLSA_DB_OBJECT PolicyObject; + PLSA_DB_OBJECT AccountsObject = NULL; + PLSA_DB_OBJECT AccountObject = NULL; + LPWSTR SidString = NULL; + NTSTATUS Status = STATUS_SUCCESS; /* Validate the PolicyHandle */ Status = LsapValidateDbObject(PolicyHandle, LsaDbPolicyObject, - POLICY_CREATE_ACCOUNT); + POLICY_CREATE_ACCOUNT, + &PolicyObject); if (!NT_SUCCESS(Status)) { ERR("LsapValidateDbObject returned 0x%08lx\n", Status); @@ -326,15 +336,15 @@ } /* Open the Accounts object */ - AccountsHandle = LsapCreateDbObject(PolicyHandle, - L"Accounts", - TRUE, - LsaDbContainerObject, - 0); - if (AccountsHandle == NULL) - { - ERR("LsapCreateDbObject (Accounts) failed\n"); - return STATUS_UNSUCCESSFUL; + Status = LsapOpenDbObject(PolicyObject, + L"Accounts", + LsaDbContainerObject, + 0, + &AccountsObject); + if (!NT_SUCCESS(Status)) + { + ERR("LsapCreateDbObject (Accounts) failed (Status 0x%08lx)\n", Status); + goto done; } /* Create SID string */ @@ -342,31 +352,44 @@ &SidString)) { ERR("ConvertSidToStringSid failed\n"); - return STATUS_UNSUCCESSFUL; + Status = STATUS_INVALID_PARAMETER; + goto done; } /* Create the Account object */ - Account = LsapCreateDbObject(AccountsHandle, - SidString, - FALSE, - LsaDbAccountObject, - DesiredAccess); - if (Account != NULL) - { - /* Set the Sid attribute */ - Status = LsapSetObjectAttribute((PLSA_DB_OBJECT)Account, - L"Sid", - (PVOID)AccountSid, - GetLengthSid(AccountSid)); - if (NT_SUCCESS(Status)) - { - *AccountHandle = Account; - } - } - - LocalFree(SidString); - - LsapCloseDbObject(AccountsHandle); + Status = LsapCreateDbObject(AccountsObject, + SidString, + LsaDbAccountObject, + DesiredAccess, + &AccountObject); + if (!NT_SUCCESS(Status)) + { + ERR("LsapCreateDbObject (Account) failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Set the Sid attribute */ + Status = LsapSetObjectAttribute(AccountObject, + L"Sid", + (PVOID)AccountSid, + GetLengthSid(AccountSid)); + +done: + if (SidString != NULL) + LocalFree(SidString); + + if (!NT_SUCCESS(Status)) + { + if (AccountObject != NULL) + LsapCloseDbObject(AccountObject); + } + else + { + *AccountHandle = (LSAPR_HANDLE)AccountObject; + } + + if (AccountsObject != NULL) + LsapCloseDbObject(AccountsObject); return STATUS_SUCCESS; } @@ -777,7 +800,8 @@ Status = LsapValidateDbObject(PolicyHandle, LsaDbPolicyObject, - 0); /* FIXME */ + 0, /* FIXME */ + NULL); if (!NT_SUCCESS(Status)) { ERR("Invalid handle (Status %lx)\n", Status); @@ -806,7 +830,8 @@ Status = LsapValidateDbObject(PolicyHandle, LsaDbPolicyObject, - 0); /* FIXME */ + 0, /* FIXME */ + NULL); if (!NT_SUCCESS(Status)) { ERR("Invalid handle\n"); @@ -859,13 +884,15 @@ PRPC_SID AccountSid, PLSAPR_USER_RIGHT_SET UserRights) { + PLSA_DB_OBJECT PolicyObject; NTSTATUS Status; FIXME("(%p,%p,%p) stub\n", PolicyHandle, AccountSid, UserRights); Status = LsapValidateDbObject(PolicyHandle, LsaDbPolicyObject, - 0); /* FIXME */ + 0, /* FIXME */ + &PolicyObject); if (!NT_SUCCESS(Status)) return Status; Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Sun May 6 09:57:31 2012 @@ -59,20 +59,28 @@ NTSTATUS LsapInitDatabase(VOID); -LSAPR_HANDLE -LsapCreateDbObject(LSAPR_HANDLE ParentHandle, - LPWSTR ObjectName, - BOOLEAN Open, - LSA_DB_OBJECT_TYPE HandleType, - ACCESS_MASK DesiredAccess); +NTSTATUS +LsapCreateDbObject(IN PLSA_DB_OBJECT ParentObject, + IN LPWSTR ObjectName, + IN LSA_DB_OBJECT_TYPE HandleType, + IN ACCESS_MASK DesiredAccess, + OUT PLSA_DB_OBJECT *DbObject); NTSTATUS -LsapValidateDbObject(LSAPR_HANDLE Handle, - LSA_DB_OBJECT_TYPE HandleType, - ACCESS_MASK GrantedAccess); +LsapOpenDbObject(IN PLSA_DB_OBJECT ParentObject, + IN LPWSTR ObjectName, + IN LSA_DB_OBJECT_TYPE ObjectType, + IN ACCESS_MASK DesiredAccess, + OUT PLSA_DB_OBJECT *DbObject); NTSTATUS -LsapCloseDbObject(LSAPR_HANDLE Handle); +LsapValidateDbObject(IN LSAPR_HANDLE Handle, + IN LSA_DB_OBJECT_TYPE HandleType, + IN ACCESS_MASK GrantedAccess, + OUT PLSA_DB_OBJECT *DbObject); + +NTSTATUS +LsapCloseDbObject(IN PLSA_DB_OBJECT DbObject); NTSTATUS LsapGetObjectAttribute(PLSA_DB_OBJECT DbObject, @@ -92,31 +100,31 @@ /* policy.c */ NTSTATUS -LsarQueryAuditEvents(LSAPR_HANDLE PolicyHandle, +LsarQueryAuditEvents(PLSA_DB_OBJECT PolicyObject, PLSAPR_POLICY_INFORMATION *PolicyInformation); NTSTATUS -LsarQueryPrimaryDomain(LSAPR_HANDLE PolicyHandle, +LsarQueryPrimaryDomain(PLSA_DB_OBJECT PolicyObject, PLSAPR_POLICY_INFORMATION *PolicyInformation); NTSTATUS -LsarQueryAccountDomain(LSAPR_HANDLE PolicyHandle, +LsarQueryAccountDomain(PLSA_DB_OBJECT PolicyObject, PLSAPR_POLICY_INFORMATION *PolicyInformation); NTSTATUS -LsarQueryDnsDomain(LSAPR_HANDLE PolicyHandle, +LsarQueryDnsDomain(PLSA_DB_OBJECT PolicyObject, PLSAPR_POLICY_INFORMATION *PolicyInformation); NTSTATUS -LsarSetPrimaryDomain(LSAPR_HANDLE PolicyObject, +LsarSetPrimaryDomain(PLSA_DB_OBJECT PolicyObject, PLSAPR_POLICY_PRIMARY_DOM_INFO Info); NTSTATUS -LsarSetAccountDomain(LSAPR_HANDLE PolicyObject, +LsarSetAccountDomain(PLSA_DB_OBJECT PolicyObject, PLSAPR_POLICY_ACCOUNT_DOM_INFO Info); NTSTATUS -LsarSetDnsDomain(LSAPR_HANDLE PolicyObject, +LsarSetDnsDomain(PLSA_DB_OBJECT PolicyObject, PLSAPR_POLICY_DNS_DOMAIN_INFO Info); /* privileges.c */ Modified: trunk/reactos/dll/win32/lsasrv/policy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/policy.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/policy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/policy.c [iso-8859-1] Sun May 6 09:57:31 2012 @@ -16,7 +16,7 @@ /* FUNCTIONS ***************************************************************/ NTSTATUS -LsarSetPrimaryDomain(LSAPR_HANDLE PolicyHandle, +LsarSetPrimaryDomain(PLSA_DB_OBJECT PolicyObject, PLSAPR_POLICY_PRIMARY_DOM_INFO Info) { PUNICODE_STRING Buffer; @@ -24,7 +24,7 @@ NTSTATUS Status; LPWSTR Ptr; - TRACE("LsarSetPrimaryDomain(%p, %p)\n", PolicyHandle, Info); + TRACE("LsarSetPrimaryDomain(%p, %p)\n", PolicyObject, Info); Length = sizeof(UNICODE_STRING) + Info->Name.MaximumLength; Buffer = RtlAllocateHeap(RtlGetProcessHeap(), @@ -39,9 +39,10 @@ Ptr = (LPWSTR)((ULONG_PTR)Buffer + sizeof(UNICODE_STRING)); memcpy(Ptr, Info->Name.Buffer, Info->Name.MaximumLength); - Status = LsapSetObjectAttribute((PLSA_DB_OBJECT)PolicyHandle, + Status = LsapSetObjectAttribute(PolicyObject, L"PolPrDmN", - Buffer, Length); + Buffer, + Length); RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); @@ -52,7 +53,7 @@ if (Info->Sid != NULL) Length = RtlLengthSid(Info->Sid); - Status = LsapSetObjectAttribute((PLSA_DB_OBJECT)PolicyHandle, + Status = LsapSetObjectAttribute(PolicyObject, L"PolPrDmS", (LPBYTE)Info->Sid, Length); @@ -62,7 +63,7 @@ NTSTATUS -LsarSetAccountDomain(LSAPR_HANDLE PolicyHandle, +LsarSetAccountDomain(PLSA_DB_OBJECT PolicyObject, PLSAPR_POLICY_ACCOUNT_DOM_INFO Info) { PUNICODE_STRING Buffer; @@ -70,7 +71,7 @@ NTSTATUS Status; LPWSTR Ptr; - TRACE("LsarSetAccountDomain(%p, %p)\n", PolicyHandle, Info); + TRACE("LsarSetAccountDomain(%p, %p)\n", PolicyObject, Info); Length = sizeof(UNICODE_STRING) + Info->DomainName.MaximumLength; Buffer = RtlAllocateHeap(RtlGetProcessHeap(), @@ -85,9 +86,10 @@ Ptr = (LPWSTR)((ULONG_PTR)Buffer + sizeof(UNICODE_STRING)); memcpy(Ptr, Info->DomainName.Buffer, Info->DomainName.MaximumLength); - Status = LsapSetObjectAttribute((PLSA_DB_OBJECT)PolicyHandle, + Status = LsapSetObjectAttribute(PolicyObject, L"PolAcDmN", - Buffer, Length); + Buffer, + Length); RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); @@ -98,7 +100,7 @@ if (Info->Sid != NULL) Length = RtlLengthSid(Info->Sid); - Status = LsapSetObjectAttribute((PLSA_DB_OBJECT)PolicyHandle, + Status = LsapSetObjectAttribute(PolicyObject, L"PolAcDmS", (LPBYTE)Info->Sid, Length); @@ -108,7 +110,7 @@ NTSTATUS -LsarSetDnsDomain(LSAPR_HANDLE PolicyHandle, +LsarSetDnsDomain(PLSA_DB_OBJECT PolicyObject, PLSAPR_POLICY_DNS_DOMAIN_INFO Info) { @@ -117,7 +119,7 @@ NTSTATUS -LsarQueryAuditEvents(LSAPR_HANDLE PolicyHandle, +LsarQueryAuditEvents(PLSA_DB_OBJECT PolicyObject, PLSAPR_POLICY_INFORMATION *PolicyInformation) { PLSAPR_POLICY_AUDIT_EVENTS_INFO p = NULL; @@ -137,7 +139,7 @@ NTSTATUS -LsarQueryPrimaryDomain(LSAPR_HANDLE PolicyHandle, +LsarQueryPrimaryDomain(PLSA_DB_OBJECT PolicyObject, PLSAPR_POLICY_INFORMATION *PolicyInformation) { PLSAPR_POLICY_PRIMARY_DOM_INFO p = NULL; @@ -153,7 +155,7 @@ /* Domain Name */ AttributeSize = 0; - Status = LsapGetObjectAttribute((PLSA_DB_OBJECT)PolicyHandle, + Status = LsapGetObjectAttribute(PolicyObject, L"PolPrDmN", NULL, &AttributeSize); @@ -171,7 +173,7 @@ goto Done; } - Status = LsapGetObjectAttribute((PLSA_DB_OBJECT)PolicyHandle, + Status = LsapGetObjectAttribute(PolicyObject, L"PolPrDmN", DomainName, &AttributeSize); @@ -201,7 +203,7 @@ /* Domain SID */ AttributeSize = 0; - Status = LsapGetObjectAttribute((PLSA_DB_OBJECT)PolicyHandle, + Status = LsapGetObjectAttribute(PolicyObject, L"PolPrDmS", NULL, &AttributeSize); @@ -219,7 +221,7 @@ goto Done; } - Status = LsapGetObjectAttribute((PLSA_DB_OBJECT)PolicyHandle, + Status = LsapGetObjectAttribute(PolicyObject, L"PolPrDmS", p->Sid, &AttributeSize); @@ -247,7 +249,7 @@ NTSTATUS -LsarQueryAccountDomain(LSAPR_HANDLE PolicyHandle, +LsarQueryAccountDomain(PLSA_DB_OBJECT PolicyObject, PLSAPR_POLICY_INFORMATION *PolicyInformation) { PLSAPR_POLICY_ACCOUNT_DOM_INFO p = NULL; @@ -262,7 +264,7 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Domain Name */ - Status = LsapGetObjectAttribute((PLSA_DB_OBJECT)PolicyHandle, + Status = LsapGetObjectAttribute(PolicyObject, L"PolAcDmN", NULL, &AttributeSize); @@ -280,7 +282,7 @@ goto Done; } - Status = LsapGetObjectAttribute((PLSA_DB_OBJECT)PolicyHandle, + Status = LsapGetObjectAttribute(PolicyObject, L"PolAcDmN", DomainName, &AttributeSize); @@ -310,7 +312,7 @@ /* Domain SID */ AttributeSize = 0; - Status = LsapGetObjectAttribute((PLSA_DB_OBJECT)PolicyHandle, + Status = LsapGetObjectAttribute(PolicyObject, L"PolAcDmS", NULL, &AttributeSize); @@ -328,7 +330,7 @@ goto Done; } - Status = LsapGetObjectAttribute((PLSA_DB_OBJECT)PolicyHandle, + Status = LsapGetObjectAttribute(PolicyObject, L"PolAcDmS", p->Sid, &AttributeSize); @@ -356,7 +358,7 @@ NTSTATUS -LsarQueryDnsDomain(LSAPR_HANDLE PolicyHandle, +LsarQueryDnsDomain(PLSA_DB_OBJECT PolicyObject, PLSAPR_POLICY_INFORMATION *PolicyInformation) { PLSAPR_POLICY_DNS_DOMAIN_INFO p = NULL;

12 years, 5 months

[tkreuzer] 56523: [WIN32K] - Create default hatch brush bitmaps on win32k init - After creating a PDEV fill the fields in the ahsurf array that are not filled by the driver with these bitmaps - don...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 6 08:17:48 2012 New Revision: 56523 URL: http://svn.reactos.org/svn/reactos?rev=56523&view=rev Log: [WIN32K] - Create default hatch brush bitmaps on win32k init - After creating a PDEV fill the fields in the ahsurf array that are not filled by the driver with these bitmaps - don't create a new bitmap when a hatch brush is created, instead only store the style and use the related bitmap from the PDEV when realizing the brush. - Fix the palette of DIB brushes, when realizing the brush - Don't leak the bitmaps for DIB brushes in BRUSH_Cleanup Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c trunk/reactos/win32ss/gdi/eng/pdevobj.c trunk/reactos/win32ss/gdi/ntgdi/brush.c trunk/reactos/win32ss/gdi/ntgdi/brush.h trunk/reactos/win32ss/user/ntuser/main.c Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engbrush.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] Sun May 6 08:17:48 2012 @@ -12,7 +12,41 @@ #define NDEBUG #include <debug.h> +static const ULONG gaulHatchBrushes[HS_DDI_MAX][8] = +{ + {0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF}, /* HS_HORIZONTAL */ + {0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7}, /* HS_VERTICAL */ + {0xFE, 0xFD, 0xFB, 0xF7, 0xEF, 0xDF, 0xBF, 0x7F}, /* HS_FDIAGONAL */ + {0x7F, 0xBF, 0xDF, 0xEF, 0xF7, 0xFB, 0xFD, 0xFE}, /* HS_BDIAGONAL */ + {0xF7, 0xF7, 0xF7, 0xF7, 0x00, 0xF7, 0xF7, 0xF7}, /* HS_CROSS */ + {0x7E, 0xBD, 0xDB, 0xE7, 0xE7, 0xDB, 0xBD, 0x7E} /* HS_DIAGCROSS */ +}; + +HSURF gahsurfHatch[HS_DDI_MAX]; + /** Internal functions ********************************************************/ + +INIT_FUNCTION +NTSTATUS +NTAPI +InitBrushImpl(VOID) +{ + ULONG i; + SIZEL sizl = {8, 8}; + + /* Loop all hatch styles */ + for (i = 0; i < HS_DDI_MAX; i++) + { + /* Create a default hatch bitmap */ + gahsurfHatch[i] = (HSURF)EngCreateBitmap(sizl, + 0, + BMF_1BPP, + 0, + (PVOID)gaulHatchBrushes[i]); + } + + return STATUS_SUCCESS; +} VOID NTAPI @@ -38,7 +72,8 @@ pebo->ppalSurf = pebo->psurfTrg->ppal; GDIOBJ_vReferenceObjectByPointer(&pebo->ppalSurf->BaseObject); - //pebo->ppalDC = pdc->dclevel.ppal; + pebo->ppalDC = pdc->dclevel.ppal; + GDIOBJ_vReferenceObjectByPointer(&pebo->ppalDC->BaseObject); if (pbrush->flAttrs & BR_IS_NULL) { @@ -111,7 +146,10 @@ pebo->BrushObject.pvRbrush = NULL; } + /* Dereference the palettes */ PALETTE_ShareUnlockPalette(pebo->ppalSurf); + PALETTE_ShareUnlockPalette(pebo->ppalDC); + if (pebo->ppalDIB) PALETTE_ShareUnlockPalette(pebo->ppalDIB); } VOID @@ -186,6 +224,41 @@ return TRUE; } +static +PPALETTE +FixupDIBBrushPalette( + _In_ PPALETTE ppalDIB, + _In_ PPALETTE ppalDC) +{ + PPALETTE ppalNew; + ULONG i, iPalIndex, crColor; + + /* Allocate a new palette */ + ppalNew = PALETTE_AllocPalette(PAL_INDEXED, + ppalDIB->NumColors, + NULL, + 0, + 0, + 0); + + /* Loop all colors */ + for (i = 0; i < ppalDIB->NumColors; i++) + { + /* Get the RGB color, which is the index into the DC palette */ + iPalIndex = PALETTE_ulGetRGBColorFromIndex(ppalDIB, i); + + /* Roll over when index is too big */ + iPalIndex %= ppalDC->NumColors; + + /* Set the indexed DC color as the new color */ + crColor = PALETTE_ulGetRGBColorFromIndex(ppalDC, iPalIndex); + PALETTE_vSetRGBColorForIndex(ppalNew, i, crColor); + } + + /* Return the new palette */ + return ppalNew; +} + BOOL NTAPI EBRUSHOBJ_bRealizeBrush(EBRUSHOBJ *pebo, BOOL bCallDriver) @@ -193,23 +266,40 @@ BOOL bResult; PFN_DrvRealizeBrush pfnRealzizeBrush = NULL; PSURFACE psurfPattern, psurfMask; - PPDEVOBJ ppdev = NULL; + PPDEVOBJ ppdev; EXLATEOBJ exlo; PPALETTE ppalPattern; + PBRUSH pbr = pebo->pbrush; + HBITMAP hbmPattern; + ULONG iHatch; /* All EBRUSHOBJs have a surface, see EBRUSHOBJ_vInit */ ASSERT(pebo->psurfTrg); ppdev = (PPDEVOBJ)pebo->psurfTrg->SurfObj.hdev; - - // FIXME: all SURFACEs need a PDEV - if (ppdev && bCallDriver) + if (!ppdev) ppdev = gppdevPrimary; + + if (bCallDriver) pfnRealzizeBrush = ppdev->DriverFunctions.RealizeBrush; if (!pfnRealzizeBrush) pfnRealzizeBrush = EngRealizeBrush; - psurfPattern = SURFACE_ShareLockSurface(pebo->pbrush->hbmPattern); + /* Check if this is a hatch brush */ + if (pbr->flAttrs & BR_IS_HATCH) + { + /* Get the hatch brush pattern from the PDEV */ + hbmPattern = (HBITMAP)ppdev->ahsurf[pbr->ulStyle]; + iHatch = pbr->ulStyle; + } + else + { + /* Use the brushes pattern */ + hbmPattern = pbr->hbmPattern; + iHatch = -1; + } + + psurfPattern = SURFACE_ShareLockSurface(hbmPattern); ASSERT(psurfPattern); ASSERT(psurfPattern->ppal); @@ -217,11 +307,11 @@ psurfMask = NULL; /* DIB brushes with DIB_PAL_COLORS usage need a new palette */ - if (pebo->pbrush->flAttrs & BR_IS_DIBPALCOLORS) + if (pbr->flAttrs & BR_IS_DIBPALCOLORS) { ASSERT(FALSE); - ppalPattern = 0; //CreateDIBPalette(psurfPattern->ppal, pebo->ppalDC); - // pebo->ppalDIB = ppalPattern; + ppalPattern = FixupDIBBrushPalette(psurfPattern->ppal, pebo->ppalDC); + pebo->ppalDIB = ppalPattern; } else { @@ -243,7 +333,7 @@ &psurfPattern->SurfObj, psurfMask ? &psurfMask->SurfObj : NULL, &exlo.xlo, - -1); // FIXME: what about hatch brushes? + iHatch); /* Cleanup the XLATEOBJ */ EXLATEOBJ_vCleanup(&exlo); Modified: trunk/reactos/win32ss/gdi/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/pdevobj.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] Sun May 6 08:17:48 2012 @@ -136,6 +136,7 @@ PWSTR pwszLogAddress) { PFN_DrvEnablePDEV pfnEnablePDEV; + ULONG i; DPRINT("PDEVOBJ_bEnablePDEV()\n"); @@ -164,6 +165,13 @@ /* Setup Palette */ ppdev->ppalSurf = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault); + + /* Setup hatch brushes */ + for (i = 0; i < HS_DDI_MAX; i++) + { + if (ppdev->ahsurf[i] == NULL) + ppdev->ahsurf[i] = gahsurfHatch[i]; + } DPRINT("PDEVOBJ_bEnablePDEV - dhpdev = %p\n", ppdev->dhpdev); Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.c [iso-8859-1] Sun May 6 08:17:48 2012 @@ -25,16 +25,6 @@ RGN_ATTR Attr[GDIOBJATTRFREE]; } GDI_OBJ_ATTR_ENTRY, *PGDI_OBJ_ATTR_ENTRY; -static const ULONG HatchBrushes[NB_HATCH_STYLES][8] = -{ - {0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF}, /* HS_HORIZONTAL */ - {0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7}, /* HS_VERTICAL */ - {0xFE, 0xFD, 0xFB, 0xF7, 0xEF, 0xDF, 0xBF, 0x7F}, /* HS_FDIAGONAL */ - {0x7F, 0xBF, 0xDF, 0xEF, 0xF7, 0xFB, 0xFD, 0xFE}, /* HS_BDIAGONAL */ - {0xF7, 0xF7, 0xF7, 0xF7, 0x00, 0xF7, 0xF7, 0xF7}, /* HS_CROSS */ - {0x7E, 0xBD, 0xDB, 0xE7, 0xE7, 0xDB, 0xBD, 0x7E} /* HS_DIAGCROSS */ -}; - BOOL FASTCALL IntGdiSetBrushOwner(PBRUSH pbr, ULONG ulOwner) @@ -129,9 +119,8 @@ BRUSH_Cleanup(PVOID ObjectBody) { PBRUSH pbrush = (PBRUSH)ObjectBody; - if (pbrush->flAttrs & (BR_IS_HATCH | BR_IS_BITMAP)) - { - ASSERT(pbrush->hbmPattern); + if (pbrush->hbmPattern) + { GreSetObjectOwner(pbrush->hbmPattern, GDI_OBJ_HMGR_POWNED); GreDeleteObject(pbrush->hbmPattern); } @@ -273,34 +262,23 @@ { HBRUSH hBrush; PBRUSH pbrush; - HBITMAP hPattern; if (Style < 0 || Style >= NB_HATCH_STYLES) { return 0; - } - - hPattern = GreCreateBitmap(8, 8, 1, 1, (LPBYTE)HatchBrushes[Style]); - if (hPattern == NULL) - { - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; } pbrush = BRUSH_AllocBrushWithHandle(); if (pbrush == NULL) { - GreDeleteObject(hPattern); EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); return NULL; } hBrush = pbrush->BaseObject.hHmgr; pbrush->flAttrs |= BR_IS_HATCH; - pbrush->hbmPattern = hPattern; pbrush->BrushAttr.lbColor = Color & 0xFFFFFF; - - GreSetObjectOwner(hPattern, GDI_OBJ_HMGR_PUBLIC); + pbrush->ulStyle = Style; GDIOBJ_vUnlockObject(&pbrush->BaseObject); Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] Sun May 6 08:17:48 2012 @@ -96,7 +96,14 @@ INT FASTCALL BRUSH_GetObject (PBRUSH GdiObject, INT Count, LPLOGBRUSH Buffer); BOOL NTAPI BRUSH_Cleanup(PVOID ObjectBody); +extern HSURF gahsurfHatch[HS_DDI_MAX]; + struct _DC; + +INIT_FUNCTION +NTSTATUS +NTAPI +InitBrushImpl(VOID); VOID NTAPI Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Sun May 6 08:17:48 2012 @@ -75,7 +75,7 @@ sizeof(PROCESSINFO), USERTAG_PROCESSINFO); - if (ppiCurrent == NULL) + if (ppiCurrent == NULL) { ERR_CH(UserProcess, "Failed to allocate ppi for PID:%d\n", Process->UniqueProcessId); RETURN( STATUS_NO_MEMORY); @@ -127,7 +127,7 @@ ppiCurrent->KeyboardLayout = W32kGetDefaultKeyLayout(); EngCreateEvent((PEVENT *)&ppiCurrent->InputIdleEvent); KeInitializeEvent(ppiCurrent->InputIdleEvent, NotificationEvent, FALSE); - + /* map the gdi handle table to user land */ Process->Peb->GdiSharedHandleTable = GDI_MapHandleTable(Process); @@ -163,7 +163,7 @@ TRACE_CH(UserProcess, "Destroying ppi 0x%x\n", ppiCurrent); ppiCurrent->W32PF_flags |= W32PF_TERMINATED; - if (ppiScrnSaver == ppiCurrent) + if (ppiScrnSaver == ppiCurrent) ppiScrnSaver = NULL; if (ppiCurrent->InputIdleEvent) @@ -244,7 +244,7 @@ } RtlZeroMemory(ptiCurrent, sizeof(THREADINFO)); - + PsSetThreadWin32Thread(Thread, ptiCurrent); pTeb->Win32ThreadInfo = ptiCurrent; ptiCurrent->pClientInfo = (PCLIENTINFO)pTeb->Win32ClientInfo; @@ -275,14 +275,14 @@ if (ptiCurrent->KeyboardLayout) UserReferenceObject(ptiCurrent->KeyboardLayout); ptiCurrent->TIF_flags &= ~TIF_INCLEANUP; - + /* Initialize the CLIENTINFO */ pci = (PCLIENTINFO)pTeb->Win32ClientInfo; RtlZeroMemory(pci, sizeof(CLIENTINFO)); pci->ppi = ptiCurrent->ppi; pci->fsHooks = ptiCurrent->fsHooks; pci->dwTIFlags = ptiCurrent->TIF_flags; - if (ptiCurrent->KeyboardLayout) + if (ptiCurrent->KeyboardLayout) pci->hKL = ptiCurrent->KeyboardLayout->hkl; /* Assign a default window station and desktop to the process */ @@ -614,6 +614,7 @@ CreateStockObjects(); CreateSysColorObjects(); + NT_ROF(InitBrushImpl()); NT_ROF(InitPDEVImpl()); NT_ROF(InitLDEVImpl()); NT_ROF(InitDeviceImpl());

12 years, 5 months

[arty] 56522: [NTOSKRNL] Formatting.

by arty＠svn.reactos.org

Author: arty Date: Sun May 6 02:12:24 2012 New Revision: 56522 URL: http://svn.reactos.org/svn/reactos?rev=56522&view=rev Log: [NTOSKRNL] Formatting. Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun May 6 02:12:24 2012 @@ -2107,13 +2107,13 @@ MmInsertRmap(Page, Process, Address); - // If we got here, the previous entry should have been a wait + // If we got here, the previous entry should have been a wait Entry = MAKE_SSE(Page << PAGE_SHIFT, 1); - MmLockSectionSegment(Context.Segment); - OldEntry = MmGetPageEntrySectionSegment(Context.Segment, &Context.Offset); - ASSERT(OldEntry == 0 || OldEntry == MAKE_SWAP_SSE(MM_WAIT_ENTRY)); + MmLockSectionSegment(Context.Segment); + OldEntry = MmGetPageEntrySectionSegment(Context.Segment, &Context.Offset); + ASSERT(OldEntry == 0 || OldEntry == MAKE_SWAP_SSE(MM_WAIT_ENTRY)); MmSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry); - MmUnlockSectionSegment(Context.Segment); + MmUnlockSectionSegment(Context.Segment); } MmUnlockAddressSpace(AddressSpace); MiSetPageEvent(NULL, NULL);

12 years, 5 months

← Newer
1
...
13
14
15
16
17
18
19
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2012