Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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 06 May '12

06 May '12

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);

1 0

[ekohl] 56524: [LSASRV] - Clean up the LSA database APIs. - Fix database object reference counting.
by ekohl＠svn.reactos.org 06 May '12

06 May '12

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;

1 0

[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 06 May '12

06 May '12

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());

1 0

[arty] 56522: [NTOSKRNL] Formatting.
by arty＠svn.reactos.org 06 May '12

06 May '12

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);

1 0

[tkreuzer] 56521: [WIN32K] Fix regression of gdi32_winetest palette
by tkreuzer＠svn.reactos.org 05 May '12

05 May '12

Author: tkreuzer Date: Sat May 5 22:50:47 2012 New Revision: 56521 URL: http://svn.reactos.org/svn/reactos?rev=56521&view=rev Log: [WIN32K] Fix regression of gdi32_winetest palette Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c 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] Sat May 5 22:50:47 2012 @@ -148,9 +148,12 @@ /* Loop all color indices in the DIB */ for (i = 0; i < cColors; i++) { - /* Get the RGB value from the DC palette, indexed by the DIB - color table value */ - crColor = PALETTE_ulGetRGBColorFromIndex(ppalDC, pwColors[i]); + /* Get the palette index and handle wraparound when exceeding + the number of colors in the DC palette */ + WORD wIndex = pwColors[i] % ppalDC->NumColors; + + /* USe the RGB value from the DC palette */ + crColor = PALETTE_ulGetRGBColorFromIndex(ppalDC, wIndex); PALETTE_vSetRGBColorForIndex(ppal, i, crColor); } }

1 0

[tkreuzer] 56520: [WIN32K] Someone passes iUsage == 2, so don't assert in that case, but ignore it as long as it's not supported.
by tkreuzer＠svn.reactos.org 05 May '12

05 May '12

Author: tkreuzer Date: Sat May 5 22:06:15 2012 New Revision: 56520 URL: http://svn.reactos.org/svn/reactos?rev=56520&view=rev Log: [WIN32K] Someone passes iUsage == 2, so don't assert in that case, but ignore it as long as it's not supported. Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c 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] Sat May 5 22:06:15 2012 @@ -171,11 +171,11 @@ /* Mark the palette as a brush hack palette */ ppal->flFlags |= PAL_BRUSHHACK; } - else if (iUsage == 2) - { +// else if (iUsage == 2) +// { // FIXME: this one is undocumented - ASSERT(FALSE); - } +// ASSERT(FALSE); +// } else // if (iUsage == DIB_RGB_COLORS) { /* The colors are an array of RGBQUAD values */

1 0

[tkreuzer] 56519: fix build
by tkreuzer＠svn.reactos.org 05 May '12

05 May '12

Author: tkreuzer Date: Sat May 5 21:43:39 2012 New Revision: 56519 URL: http://svn.reactos.org/svn/reactos?rev=56519&view=rev Log: fix build Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c 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] Sat May 5 21:43:39 2012 @@ -1140,7 +1140,6 @@ PDC pdc; HBITMAP hbmTmp = 0; PSURFACE psurfTmp = 0, psurfDst = 0; - HPALETTE hpalDIB = 0; PPALETTE ppalDIB = 0; EXLATEOBJ exlo; PVOID pvBits;

1 0

[tkreuzer] 56518: [WIN32K] Implement CreateDIBPalette(), replacing BuildDIBPalette. It creates a palette without a handle and handles DIB_PAL_COLORS as well as DIB_RGB_COLORS. Additionally it now h...
by tkreuzer＠svn.reactos.org 05 May '12

05 May '12

Author: tkreuzer Date: Sat May 5 21:39:35 2012 New Revision: 56518 URL: http://svn.reactos.org/svn/reactos?rev=56518&view=rev Log: [WIN32K] Implement CreateDIBPalette(), replacing BuildDIBPalette. It creates a palette without a handle and handles DIB_PAL_COLORS as well as DIB_RGB_COLORS. Additionally it now handles DIB_PAL_BRUSHHACK, which is used for DIB brushes, when DIB_PAL_COLORS is passed to CreateDIBPatternBrush(). The palette is not created directly, but instead the indices into the DC palette are put into the palette and the real palette is created, when the brush is realized. The latter is not yet handled. Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.h trunk/reactos/win32ss/gdi/ntgdi/dib.h trunk/reactos/win32ss/gdi/ntgdi/dibobj.c trunk/reactos/win32ss/gdi/ntgdi/palette.c trunk/reactos/win32ss/gdi/ntgdi/palette.h 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] Sat May 5 21:39:35 2012 @@ -56,8 +56,8 @@ // DWORD dwUnknown30; SURFACE * psurfTrg; struct _PALETTE * ppalSurf; -// PALETTE * ppalDC; -// PALETTE * ppal3; + struct _PALETTE * ppalDC; + struct _PALETTE * ppalDIB; // DWORD dwUnknown44; BRUSH * pbrush; FLONG flattrs; Modified: trunk/reactos/win32ss/gdi/ntgdi/dib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dib.h?re… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dib.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dib.h [iso-8859-1] Sat May 5 21:39:35 2012 @@ -9,3 +9,5 @@ HPALETTE FASTCALL BuildDIBPalette (CONST BITMAPINFO *bmi); BITMAPINFO* FASTCALL DIB_ConvertBitmapInfo(CONST BITMAPINFO* bmi, DWORD Usage); VOID FASTCALL DIB_FreeConvertedBitmapInfo(BITMAPINFO* converted, BITMAPINFO* orig); + +#define DIB_PAL_BRUSHHACK 3 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] Sat May 5 21:39:35 2012 @@ -103,6 +103,157 @@ { 0xff, 0xff, 0xff } }; +PPALETTE +NTAPI +CreateDIBPalette( + _In_ const BITMAPINFO *pbmi, + _In_ PDC pdc, + _In_ ULONG iUsage) +{ + PPALETTE ppal; + ULONG i, cColors; + + /* Check if the colors are indexed */ + if (pbmi->bmiHeader.biBitCount <= 8) + { + /* We create a "full" palette */ + cColors = 1 << pbmi->bmiHeader.biBitCount; + + /* Allocate the palette */ + ppal = PALETTE_AllocPalette(PAL_INDEXED, + cColors, + NULL, + 0, + 0, + 0); + + /* Check if the BITMAPINFO specifies how many colors to use */ + if (pbmi->bmiHeader.biClrUsed != 0) + { + /* This is how many colors we can actually process */ + cColors = min(cColors, pbmi->bmiHeader.biClrUsed); + } + + /* Check how to use the colors */ + if (iUsage == DIB_PAL_COLORS) + { + COLORREF crColor; + + /* The colors are an array of WORD indices into the DC palette */ + PWORD pwColors = (PWORD)((PCHAR)pbmi + pbmi->bmiHeader.biSize); + + /* Use the DCs palette or, if no DC is given, the default one */ + PPALETTE ppalDC = pdc ? pdc->dclevel.ppal : gppalDefault; + + /* Loop all color indices in the DIB */ + for (i = 0; i < cColors; i++) + { + /* Get the RGB value from the DC palette, indexed by the DIB + color table value */ + crColor = PALETTE_ulGetRGBColorFromIndex(ppalDC, pwColors[i]); + PALETTE_vSetRGBColorForIndex(ppal, i, crColor); + } + } + else if (iUsage == DIB_PAL_BRUSHHACK) + { + /* The colors are an array of WORD indices into the DC palette */ + PWORD pwColors = (PWORD)((PCHAR)pbmi + pbmi->bmiHeader.biSize); + + /* Loop all color indices in the DIB */ + for (i = 0; i < cColors; i++) + { + /* Set the index directly as the RGB color, the real palette + containing RGB values will be calculated when the brush is + realized */ + PALETTE_vSetRGBColorForIndex(ppal, i, pwColors[i]); + } + + /* Mark the palette as a brush hack palette */ + ppal->flFlags |= PAL_BRUSHHACK; + } + else if (iUsage == 2) + { + // FIXME: this one is undocumented + ASSERT(FALSE); + } + else // if (iUsage == DIB_RGB_COLORS) + { + /* The colors are an array of RGBQUAD values */ + RGBQUAD *prgb = (RGBQUAD*)((PCHAR)pbmi + pbmi->bmiHeader.biSize); + + // FIXME: do we need to handle PALETTEINDEX / PALETTERGB macro? + + /* Loop all color indices in the DIB */ + for (i = 0; i < cColors; i++) + { + /* Get the color value and translate it to a COLORREF */ + RGBQUAD rgb = prgb[i]; + COLORREF crColor = RGB(rgb.rgbRed, rgb.rgbGreen, rgb.rgbBlue); + + /* Set the RGB value in the palette */ + PALETTE_vSetRGBColorForIndex(ppal, i, crColor); + } + } + } + else + { + /* This is a bitfield / RGB palette */ + ULONG flRedMask, flGreenMask, flBlueMask; + + /* Check if the DIB contains bitfield values */ + if (pbmi->bmiHeader.biCompression == BI_BITFIELDS) + { + /* Check if we have a v4/v5 header */ + if (pbmi->bmiHeader.biSize >= sizeof(BITMAPV4HEADER)) + { + /* The masks are dedicated fields in the header */ + PBITMAPV4HEADER pbmV4Header = (PBITMAPV4HEADER)&pbmi->bmiHeader; + flRedMask = pbmV4Header->bV4RedMask; + flGreenMask = pbmV4Header->bV4GreenMask; + flBlueMask = pbmV4Header->bV4BlueMask; + } + else + { + /* The masks are the first 3 values in the DIB color table */ + PDWORD pdwColors = (PVOID)((PCHAR)pbmi + pbmi->bmiHeader.biSize); + flRedMask = pdwColors[0]; + flGreenMask = pdwColors[1]; + flBlueMask = pdwColors[2]; + } + } + else + { + /* Check what bit depth we have. Note: optimization flags are + calculated in PALETTE_AllocPalette() */ + if (pbmi->bmiHeader.biBitCount == 16) + { + /* This is an RGB 555 palette */ + flRedMask = 0x7C00; + flGreenMask = 0x03E0; + flBlueMask = 0x001F; + } + else + { + /* This is an RGB 888 palette */ + flRedMask = 0xFF0000; + flGreenMask = 0x00FF00; + flBlueMask = 0x0000FF; + } + } + + /* Allocate the bitfield palette */ + ppal = PALETTE_AllocPalette(PAL_BITFIELDS, + 0, + NULL, + flRedMask, + flGreenMask, + flBlueMask); + } + + /* We're done, return the palette */ + return ppal; +} + UINT APIENTRY @@ -251,7 +402,6 @@ RECT rcDst; POINTL ptSrc; EXLATEOBJ exlo; - HPALETTE hpalDIB = 0; PPALETTE ppalDIB = 0; SourceBitmap = GreCreateBitmapEx(bmi->bmiHeader.biWidth, @@ -280,18 +430,10 @@ } /* Create a palette for the DIB */ - hpalDIB = BuildDIBPalette(bmi); - if (!hpalDIB) + ppalDIB = CreateDIBPalette(bmi, DC, ColorUse); + if (!ppalDIB) { EngSetLastError(ERROR_NO_SYSTEM_RESOURCES); - goto cleanup; - } - - /* Lock the DIB palette */ - ppalDIB = PALETTE_ShareLockPalette(hpalDIB); - if (!ppalDIB) - { - EngSetLastError(ERROR_INVALID_HANDLE); goto cleanup; } @@ -323,7 +465,6 @@ cleanup: if (ppalDIB) PALETTE_ShareUnlockPalette(ppalDIB); - if (hpalDIB) GreDeleteObject(hpalDIB); if(psurfSrc) SURFACE_ShareUnlockSurface(psurfSrc); if(psurfDst) SURFACE_ShareUnlockSurface(psurfDst); GreDeleteObject(SourceBitmap); @@ -364,7 +505,6 @@ SIZEL SourceSize; EXLATEOBJ exlo; PPALETTE ppalDIB = NULL; - HPALETTE hpalDIB = NULL; LPBITMAPINFO pbmiSafe; if (!Bits) return 0; @@ -455,20 +595,11 @@ ASSERT(pSurf->ppal); /* Create a palette for the DIB */ - hpalDIB = BuildDIBPalette(bmi); - if (!hpalDIB) + ppalDIB = CreateDIBPalette(bmi, pDC, ColorUse); + if (!ppalDIB) { EngSetLastError(ERROR_NO_SYSTEM_RESOURCES); Status = STATUS_NO_MEMORY; - goto Exit; - } - - /* Lock the DIB palette */ - ppalDIB = PALETTE_ShareLockPalette(hpalDIB); - if (!ppalDIB) - { - EngSetLastError(ERROR_INVALID_HANDLE); - Status = STATUS_UNSUCCESSFUL; goto Exit; } @@ -509,7 +640,6 @@ if (pSourceSurf) EngUnlockSurface(pSourceSurf); if (hSourceBitmap) EngDeleteSurface((HSURF)hSourceBitmap); - if (hpalDIB) GreDeleteObject(hpalDIB); DC_UnlockDc(pDC); Exit2: ExFreePool(pbmiSafe); @@ -1118,15 +1248,7 @@ } /* Create a palette for the DIB */ - hpalDIB = BuildDIBPalette(pbmi); - if (!hpalDIB) - { - bResult = FALSE; - goto cleanup; - } - - /* Lock the DIB palette */ - ppalDIB = PALETTE_ShareLockPalette(hpalDIB); + ppalDIB = CreateDIBPalette(pbmi, pdc, dwUsage); if (!ppalDIB) { bResult = FALSE; @@ -1162,7 +1284,6 @@ EXLATEOBJ_vCleanup(&exlo); cleanup: if (ppalDIB) PALETTE_ShareUnlockPalette(ppalDIB); - if (hpalDIB) GreDeleteObject(hpalDIB); if (psurfTmp) SURFACE_ShareUnlockSurface(psurfTmp); if (hbmTmp) GreDeleteObject(hbmTmp); if (pdc) DC_UnlockDc(pdc); @@ -1439,7 +1560,7 @@ HBITMAP res = 0; SURFACE *bmp = NULL; void *mapBits = NULL; - HPALETTE hpal ; + PPALETTE ppalDIB; // Fill BITMAP32 structure with DIB data CONST BITMAPINFOHEADER *bi = &bmi->bmiHeader; @@ -1534,33 +1655,6 @@ // hSecure = MmSecureVirtualMemory(bm.bmBits, totalSize, PAGE_READWRITE); hSecure = (HANDLE)0x1; // HACK OF UNIMPLEMENTED KERNEL STUFF !!!! - if (usage == DIB_PAL_COLORS) - { - if(dc) - { - PPALETTE ppalDc; - ppalDc = PALETTE_ShareLockPalette(dc->dclevel.hpal); - hpal = DIB_MapPaletteColors(ppalDc, bmi); - PALETTE_ShareUnlockPalette(ppalDc); - } - else - { - /* For DIB Brushes */ - DPRINT1("FIXME: Unsupported DIB_PAL_COLORS without a DC to map colors.\n"); - /* HACK */ - hpal = (HPALETTE) 0xFFFFFFFF; - } - } - else - { - hpal = BuildDIBPalette(bmi); - } - - if(!hpal) - { - DPRINT1("Error: Could not create a palette for the DIB.\n"); - goto cleanup; - } // Create Device Dependent Bitmap and add DIB pointer //Size.cx = bm.bmWidth; @@ -1598,19 +1692,12 @@ bmp->flags = API_BITMAP; bmp->biClrImportant = bi->biClrImportant; - /* HACK */ - if(hpal != (HPALETTE)0xFFFFFFFF) - { - PPALETTE ppal = PALETTE_ShareLockPalette(hpal); - - if (ppal) - { - if (bmp->ppal) PALETTE_ShareUnlockPalette(bmp->ppal); - bmp->ppal = ppal; - } - - /* Lazy delete hpal, it will be freed at surface release */ - GreDeleteObject(hpal); + /* Create a palette for the DIB */ + ppalDIB = CreateDIBPalette(bmi, dc, usage); + if (ppalDIB) + { + if (bmp->ppal) PALETTE_ShareUnlockPalette(bmp->ppal); + bmp->ppal = ppalDIB; } // Clean up in case of errors @@ -1774,112 +1861,6 @@ return hpal; } -HPALETTE -FASTCALL -BuildDIBPalette(CONST BITMAPINFO *bmi) -{ - WORD bits; - ULONG ColorCount; - HPALETTE hpal; - PPALETTE ppal; - ULONG RedMask = 0, GreenMask = 0, BlueMask = 0; - PDWORD pdwColors = (PDWORD)((PBYTE)bmi + bmi->bmiHeader.biSize); - ULONG paletteType, i; - - // Determine Bits Per Pixel - bits = bmi->bmiHeader.biBitCount; - - // Determine paletteType from Bits Per Pixel - if (bits <= 8) - { - paletteType = PAL_INDEXED; - RedMask = GreenMask = BlueMask = 0; - } - else if (bmi->bmiHeader.biCompression == BI_BITFIELDS) - { - paletteType = PAL_BITFIELDS; - if (bmi->bmiHeader.biSize >= sizeof(BITMAPV4HEADER)) - { - PBITMAPV4HEADER pV4Header = (PBITMAPV4HEADER)&bmi->bmiHeader; - RedMask = pV4Header->bV4RedMask; - GreenMask = pV4Header->bV4GreenMask; - BlueMask = pV4Header->bV4BlueMask; - } - else - { - RedMask = pdwColors[0]; - GreenMask = pdwColors[1]; - BlueMask = pdwColors[2]; - } - } - else - { - paletteType = PAL_BITFIELDS; - switch (bits) - { - case 16: - paletteType |= PAL_RGB16_555; - RedMask = 0x7C00; - GreenMask = 0x03E0; - BlueMask = 0x001F; - break; - - case 24: - case 32: - paletteType |= PAL_BGR; - RedMask = 0xFF0000; - GreenMask = 0x00FF00; - BlueMask = 0x0000FF; - break; - } - } - - if (bmi->bmiHeader.biClrUsed == 0) - { - ColorCount = 1 << bmi->bmiHeader.biBitCount; - } - else - { - ColorCount = bmi->bmiHeader.biClrUsed; - } - - if (paletteType == PAL_INDEXED) - { - RGBQUAD* pColors = (RGBQUAD*)((PBYTE)bmi + bmi->bmiHeader.biSize); - - /* Allocate a palette */ - ppal = PALETTE_AllocPalWithHandle(PAL_INDEXED, - ColorCount, - NULL, - 0, 0, 0); - if (!ppal) return NULL; - - /* Copy all colors */ - for (i = 0; i < ColorCount; i++) - { - ppal->IndexedColors[i].peRed = pColors[i].rgbRed; - ppal->IndexedColors[i].peGreen = pColors[i].rgbGreen; - ppal->IndexedColors[i].peBlue = pColors[i].rgbBlue; - ppal->IndexedColors[i].peFlags = 0; - } - - /* Get palette handle and unlock the palette */ - hpal = ppal->BaseObject.hHmgr; - PALETTE_UnlockPalette(ppal); - } - else - { - ppal = PALETTE_AllocPalWithHandle(paletteType, 0, - NULL, - RedMask, GreenMask, BlueMask); - - hpal = ppal->BaseObject.hHmgr; - PALETTE_UnlockPalette(ppal); - } - - return hpal; -} - /* Converts a BITMAPCOREINFO to a BITMAPINFO structure, * or does nothing if it's already a BITMAPINFO (or V4 or V5) */ BITMAPINFO* Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] Sat May 5 21:39:35 2012 @@ -151,7 +151,7 @@ PALETTE_AllocPalette( _In_ ULONG iMode, _In_ ULONG cColors, - _In_ PULONG pulColors, + _In_opt_ PULONG pulColors, _In_ FLONG flRed, _In_ FLONG flGreen, _In_ FLONG flBlue) Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] Sat May 5 21:39:35 2012 @@ -62,7 +62,7 @@ PALETTE_AllocPalette( _In_ ULONG iMode, _In_ ULONG cColors, - _In_ PULONG pulColors, + _In_opt_ PULONG pulColors, _In_ FLONG flRed, _In_ FLONG flGreen, _In_ FLONG flBlue); @@ -140,6 +140,16 @@ ppal->IndexedColors[ulIndex].peBlue); } +FORCEINLINE +VOID +PALETTE_vSetRGBColorForIndex(PPALETTE ppal, ULONG ulIndex, COLORREF crColor) +{ + if (ulIndex >= ppal->NumColors) return; + ppal->IndexedColors[ulIndex].peRed = GetRValue(crColor); + ppal->IndexedColors[ulIndex].peGreen = GetGValue(crColor); + ppal->IndexedColors[ulIndex].peBlue = GetBValue(crColor); +} + HPALETTE NTAPI GreCreatePaletteInternal(

1 0

[tkreuzer] 56517: [WIN32K] When dereferencing an object without a handle, don't check for the ready-to-die flag
by tkreuzer＠svn.reactos.org 05 May '12

05 May '12

Author: tkreuzer Date: Sat May 5 21:09:08 2012 New Revision: 56517 URL: http://svn.reactos.org/svn/reactos?rev=56517&view=rev Log: [WIN32K] When dereferencing an object without a handle, don't check for the ready-to-die flag 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] Sat May 5 21:09:08 2012 @@ -479,6 +479,8 @@ /* Must not be exclusively locked */ ASSERT(pobj->cExclusiveLock == 0); + DBG_LOGEVENT(&pobj->slhLog, EVENT_DEREFERENCE, cRefs); + /* Check if the object has a handle */ if (GDI_HANDLE_GET_INDEX(pobj->hHmgr)) { @@ -492,6 +494,9 @@ /* Check if we reached 0 and handle bit is not set */ if (cRefs == 0) { + /* Make sure it's ok to delete the object */ + ASSERT(pobj->BaseFlags & BASEFLAG_READY_TO_DIE); + /* Check if the handle was process owned */ if (gpentHmgr[ulIndex].ObjectOwner.ulObj != GDI_OBJ_HMGR_PUBLIC && gpentHmgr[ulIndex].ObjectOwner.ulObj != GDI_OBJ_HMGR_NONE) @@ -504,6 +509,9 @@ /* Push entry to the free list */ ENTRY_vPushFreeEntry(&gpentHmgr[ulIndex]); + + /* Free the object */ + GDIOBJ_vFreeObject(pobj); } } else @@ -511,18 +519,13 @@ /* Decrement the objects reference count */ ASSERT(pobj->ulShareCount > 0); cRefs = InterlockedDecrement((LONG*)&pobj->ulShareCount); - } - - DBG_LOGEVENT(&pobj->slhLog, EVENT_DEREFERENCE, cRefs); - - /* Check if we reached 0 */ - if (cRefs == 0) - { - /* Make sure it's ok to delete the object */ - ASSERT(pobj->BaseFlags & BASEFLAG_READY_TO_DIE); - - /* Free the object */ - GDIOBJ_vFreeObject(pobj); + + /* Check if we reached 0 */ + if (cRefs == 0) + { + /* Free the object */ + GDIOBJ_vFreeObject(pobj); + } } }

1 0

[sir_richard] 56516: [NTOS]: Cleanup MiQueryAddressState.
by sir_richard＠svn.reactos.org 05 May '12

05 May '12

Author: sir_richard Date: Sat May 5 19:37:34 2012 New Revision: 56516 URL: http://svn.reactos.org/svn/reactos?rev=56516&view=rev Log: [NTOS]: Cleanup MiQueryAddressState. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sat May 5 19:37:34 2012 @@ -1308,7 +1308,7 @@ PMMPDE PointerPde; MMPTE TempPte; BOOLEAN DemandZeroPte = TRUE, ValidPte = FALSE; - ULONG State = MEM_RESERVE, Protect = 0, LockChange; + ULONG State = MEM_RESERVE, Protect = 0; ASSERT((Vad->StartingVpn <= ((ULONG_PTR)Va >> PAGE_SHIFT)) && (Vad->EndingVpn >= ((ULONG_PTR)Va >> PAGE_SHIFT))); @@ -1322,31 +1322,23 @@ /* Return the next range */ *NextVa = (PVOID)((ULONG_PTR)Va + PAGE_SIZE); - /* Loop to make sure the PDE is valid */ - do - { - /* Try again */ - LockChange = 0; - - /* Is the PDE empty? */ - if (!PointerPde->u.Long) - { - /* No address in this range used yet, move to the next PDE range */ - *NextVa = MiPdeToAddress(PointerPde + 1); - break; - } - - /* The PDE is not empty, but is it faulted in? */ - if (!PointerPde->u.Hard.Valid) - { - /* It isn't, go ahead and do the fault */ - LockChange = MiMakeSystemAddressValid(MiPdeToPte(PointerPde), - TargetProcess); - } - - /* Check if the PDE was faulted in, making the PTE readable */ - if (!LockChange) ValidPte = TRUE; - } while (LockChange); + /* Is the PDE demand-zero? */ + if (PointerPde->u.Long != 0) + { + /* It is not. Is it valid? */ + if (PointerPde->u.Hard.Valid == 0) + { + /* Is isn't, fault it in */ + PointerPte = MiPteToAddress(PointerPde); + MiMakeSystemAddressValid(PointerPte, TargetProcess); + ValidPte = TRUE; + } + } + else + { + /* It is, skip it and move to the next PDE */ + *NextVa = MiPdeToAddress(PointerPde + 1); + } /* Is it safe to try reading the PTE? */ if (ValidPte) @@ -1355,36 +1347,52 @@ /* Capture the PTE */ TempPte = *PointerPte; - if (TempPte.u.Long) + if (TempPte.u.Long != 0) { /* The PTE is valid, so it's not zeroed out */ DemandZeroPte = FALSE; - /* Check if it's valid or has a valid protection mask */ - ASSERT(TempPte.u.Soft.Prototype == 0); - if ((TempPte.u.Soft.Protection != MM_DECOMMIT) || - (TempPte.u.Hard.Valid == 1)) - { - /* This means it's committed */ - State = MEM_COMMIT; - - /* Get protection state of this page */ - Protect = MiGetPageProtection(PointerPte); - } - else + /* Is it a decommited, invalid, or faulted PTE? */ + if ((TempPte.u.Soft.Protection == MM_DECOMMIT) && + (TempPte.u.Hard.Valid == 0) && + ((TempPte.u.Soft.Prototype == 0) || + (TempPte.u.Soft.PageFileHigh == MI_PTE_LOOKUP_NEEDED))) { /* Otherwise our defaults should hold */ ASSERT(Protect == 0); ASSERT(State == MEM_RESERVE); } + else + { + /* This means it's committed */ + State = MEM_COMMIT; + + /* Get protection state of this page */ + Protect = MiGetPageProtection(PointerPte); + + /* Check if this is an image-backed VAD */ + if ((TempPte.u.Soft.Valid == 0) && + (TempPte.u.Soft.Prototype == 1) && + (Vad->u.VadFlags.PrivateMemory == 0) && + (Vad->ControlArea)) + { + DPRINT1("Not supported\n"); + ASSERT(FALSE); + } + } } } /* Check if this was a demand-zero PTE, since we need to find the state */ if (DemandZeroPte) { - /* Check if the VAD is for committed memory */ - if (Vad->u.VadFlags.MemCommit) + /* Check if this is private commited memory, or an image-backed VAD */ + if ((Vad->u.VadFlags.PrivateMemory == 0) && (Vad->ControlArea)) + { + DPRINT1("Not supported\n"); + ASSERT(FALSE); + } + else if (Vad->u.VadFlags.MemCommit) { /* This is committed memory */ State = MEM_COMMIT;

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