Ros-diffs June 2006

ros-diffs@reactos.org

19 participants
595 discussions

[turner] 22282: ReadConsole test to show how backspaces should be handled.
by turner＠svn.reactos.org 08 Jun '06

08 Jun '06

Author: turner Date: Thu Jun 8 16:59:32 2006 New Revision: 22282 URL: http://svn.reactos.ru/svn/reactos?rev=22282&view=rev Log: ReadConsole test to show how backspaces should be handled. Added: trunk/rosapps/tests/readconsole/ trunk/rosapps/tests/readconsole/main.c trunk/rosapps/tests/readconsole/readconsole.rbuild Modified: trunk/rosapps/tests/directory.xml Modified: trunk/rosapps/tests/directory.xml URL: http://svn.reactos.ru/svn/reactos/trunk/rosapps/tests/directory.xml?rev=222… ============================================================================== --- trunk/rosapps/tests/directory.xml (original) +++ trunk/rosapps/tests/directory.xml Thu Jun 8 16:59:32 2006 @@ -187,6 +187,10 @@ <xi:include href="p_dup_handle/p_dup_handle.xml" /> </directory> +<directory name="readconsole"> + <xi:include href="readconsole/readconsole.rbuild" /> +</directory> +  <directory name="regqueryvalue"> Added: trunk/rosapps/tests/readconsole/main.c URL: http://svn.reactos.ru/svn/reactos/trunk/rosapps/tests/readconsole/main.c?re… ============================================================================== --- trunk/rosapps/tests/readconsole/main.c (added) +++ trunk/rosapps/tests/readconsole/main.c Thu Jun 8 16:59:32 2006 @@ -1,0 +1,32 @@ +#include "stdio.h" +#include "Windows.h" + +int main() +{ + TCHAR Buffer = 0; + DWORD Count = 0; + + // + // We clear the mode, most importantly turn off ENABLE_ECHO_INPUT and ENABLE_LINE_INPUT + // This is the same mode as that is set up by getch() when trying to get a char + // + SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE),0); + + // + // We read one char from the input and then return + // + ReadConsole(GetStdHandle(STD_INPUT_HANDLE),&Buffer,1,&Count,NULL); + + // + // We print out this char as an int to show that infact a backspace does count as input + // + printf("You printed %c :: ", Buffer); + printf("With a value %d :: ", Buffer); + printf("Number of chars recieved %lu :: ", Count); + printf("Char equal to backspace %d \n", (Buffer == '\b')); + + // + // :) + // + return 0; +} Added: trunk/rosapps/tests/readconsole/readconsole.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/rosapps/tests/readconsole/readconso… ============================================================================== --- trunk/rosapps/tests/readconsole/readconsole.rbuild (added) +++ trunk/rosapps/tests/readconsole/readconsole.rbuild Thu Jun 8 16:59:32 2006 @@ -1,0 +1,5 @@ +<module name="readconsole" type="win32cui" installbase="bin" installname="readconsole.exe"> + <define name="__USE_W32API" /> + <library>kernel32</library> + <file>main.c</file> +</module>

1 0

[ion] 22281: - [FORMATTING] Add function comment headers.
by ion＠svn.reactos.org 08 Jun '06

08 Jun '06

Author: ion Date: Thu Jun 8 10:31:16 2006 New Revision: 22281 URL: http://svn.reactos.ru/svn/reactos?rev=22281&view=rev Log: - [FORMATTING] Add function comment headers. Modified: trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Jun 8 10:31:16 2006 @@ -351,6 +351,34 @@ return Status; } +/*++ +* @name ObpIncrementHandleCount +* +* The ObpIncrementHandleCount routine <FILLMEIN> +* +* @param Object +* <FILLMEIN>. +* +* @param AccessState +* <FILLMEIN>. +* +* @param AccessMode +* <FILLMEIN>. +* +* @param HandleAttributes +* <FILLMEIN>. +* +* @param Process +* <FILLMEIN>. +* +* @param OpenReason +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ NTSTATUS NTAPI ObpIncrementHandleCount(IN PVOID Object, @@ -453,14 +481,51 @@ return STATUS_SUCCESS; } +/*++ +* @name ObpCreateHandle +* +* The ObpCreateHandle routine <FILLMEIN> +* +* @param OpenReason +* <FILLMEIN>. +* +* @param Object +* <FILLMEIN>. +* +* @param Type +* <FILLMEIN>. +* +* @param AccessState +* <FILLMEIN>. +* +* @param AdditionalReferences +* <FILLMEIN>. +* +* @param HandleAttributes +* <FILLMEIN>. +* +* @param AccessMode +* <FILLMEIN>. +* +* @param ReturnedObject +* <FILLMEIN>. +* +* @param ReturnedHandle +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks Gloomy says OpenReason is "enables Security" if == 1. +* since this function *has* to call ObpIncrementHandleCount, +* which needs to somehow know the OpenReason, and since +* ObOpenHandle == 1, I'm guessing this is actually the +* OpenReason. Also makes sense since this function is shared +* by Duplication, Creation and Opening.. +* +*--*/ NTSTATUS NTAPI -ObpCreateHandle(IN OB_OPEN_REASON OpenReason, // Gloomy says this is "enables Security" if == 1. - // since this function *has* to call ObpIncrementHandleCount, - // which needs to somehow know the OpenReason, and since - // ObOpenHandle == 1, I'm guessing this is actually the - // OpenReason. Also makes sense since this function is shared - // by Duplication, Creation and Opening. +ObpCreateHandle(IN OB_OPEN_REASON OpenReason, IN PVOID Object, IN POBJECT_TYPE Type OPTIONAL, IN PACCESS_STATE AccessState, @@ -663,6 +728,28 @@ return TRUE; } +/*++ +* @name ObpCloseHandleCallback +* +* The ObpCloseHandleCallback routine <FILLMEIN> +* +* @param HandleTable +* <FILLMEIN>. +* +* @param Object +* <FILLMEIN>. +* +* @param GrantedAccess +* <FILLMEIN>. +* +* @param Context +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ VOID NTAPI ObpCloseHandleCallback(IN PHANDLE_TABLE HandleTable, @@ -678,6 +765,25 @@ GrantedAccess); } +/*++ +* @name ObpDuplicateHandleCallback +* +* The ObpDuplicateHandleCallback routine <FILLMEIN> +* +* @param HandleTable +* <FILLMEIN>. +* +* @param HandleTableEntry +* <FILLMEIN>. +* +* @param Context +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ BOOLEAN NTAPI ObpDuplicateHandleCallback(IN PHANDLE_TABLE HandleTable, @@ -723,6 +829,22 @@ return Ret; } +/*++ +* @name ObpCreateHandleTable +* +* The ObpCreateHandleTable routine <FILLMEIN> +* +* @param Parent +* <FILLMEIN>. +* +* @param Process +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ NTSTATUS NTAPI ObpCreateHandleTable(IN PEPROCESS Parent, @@ -754,6 +876,19 @@ return STATUS_SUCCESS; } +/*++ +* @name ObKillProcess +* +* The ObKillProcess routine <FILLMEIN> +* +* @param Process +* <FILLMEIN>. +* +* @return None. +* +* @remarks None. +* +*--*/ VOID NTAPI ObKillProcess(IN PEPROCESS Process) @@ -935,6 +1070,38 @@ /* PUBLIC FUNCTIONS *********************************************************/ +/*++ +* @name ObOpenObjectByName +* @implemented NT4 +* +* The ObOpenObjectByName routine <FILLMEIN> +* +* @param ObjectAttributes +* <FILLMEIN>. +* +* @param ObjectType +* <FILLMEIN>. +* +* @param AccessMode +* <FILLMEIN>. +* +* @param PassedAccessState +* <FILLMEIN>. +* +* @param DesiredAccess +* <FILLMEIN>. +* +* @param ParseContext +* <FILLMEIN>. +* +* @param Handle +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ NTSTATUS NTAPI ObOpenObjectByName(IN POBJECT_ATTRIBUTES ObjectAttributes, @@ -1047,9 +1214,38 @@ return Status; } -/* -* @implemented -*/ +/*++ +* @name ObOpenObjectByPointer +* @implemented NT4 +* +* The ObOpenObjectByPointer routine <FILLMEIN> +* +* @param Object +* <FILLMEIN>. +* +* @param HandleAttributes +* <FILLMEIN>. +* +* @param PassedAccessState +* <FILLMEIN>. +* +* @param DesiredAccess +* <FILLMEIN>. +* +* @param ObjectType +* <FILLMEIN>. +* +* @param AccessMode +* <FILLMEIN>. +* +* @param Handle +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ NTSTATUS NTAPI ObOpenObjectByPointer(IN PVOID Object, @@ -1149,16 +1345,42 @@ ObpSetPermanentObject (ObjectBody, FALSE); } -/* -* @implemented -*/ +/*++ +* @name ObInsertObject +* @implemented NT4 +* +* The ObInsertObject routine <FILLMEIN> +* +* @param Object +* <FILLMEIN>. +* +* @param PassedAccessState +* <FILLMEIN>. +* +* @param DesiredAccess +* <FILLMEIN>. +* +* @param AdditionalReferences +* <FILLMEIN>. +* +* @param ReferencedObject +* <FILLMEIN>. +* +* @param Handle +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ NTSTATUS NTAPI ObInsertObject(IN PVOID Object, IN PACCESS_STATE PassedAccessState OPTIONAL, IN ACCESS_MASK DesiredAccess, IN ULONG AdditionalReferences, - OUT PVOID* ReferencedObject OPTIONAL, + OUT PVOID *ReferencedObject OPTIONAL, OUT PHANDLE Handle) { POBJECT_CREATE_INFORMATION ObjectCreateInfo;

1 0

[ion] 22280: - ObFindObject should return the actual object being inserted, in the insert case (otherwise it always returns the root-directory instead...) - Add check for optimized case for objects with no name and no security, but not implemented (ObpIncrementUnnamedHandleCount in Gl00my docs), since I need a better translation then babelfish's. - Fix ObInsertObject to save the Security Descriptor in the Access State structure. Gl00my mentions this isn't absorbed by SeCreateAccessCheck and I ju
by ion＠svn.reactos.org 08 Jun '06

08 Jun '06

Author: ion Date: Thu Jun 8 10:17:46 2006 New Revision: 22280 URL: http://svn.reactos.ru/svn/reactos?rev=22280&view=rev Log: - ObFindObject should return the actual object being inserted, in the insert case (otherwise it always returns the root-directory instead...) - Add check for optimized case for objects with no name and no security, but not implemented (ObpIncrementUnnamedHandleCount in Gl00my docs), since I need a better translation then babelfish's. - Fix ObInsertObject to save the Security Descriptor in the Access State structure. Gl00my mentions this isn't absorbed by SeCreateAccessCheck and I just noticed that too. - We only need to perform security checks for a new object, in ObInsertObject, not if the object already existed. - Added proper backout+failure code in ObInsertObject if lookup failed, and also look out for mismatch/exists/collision cases (implemented using simple logic). Modified: trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Jun 8 10:17:46 2006 @@ -1175,6 +1175,7 @@ AUX_DATA AuxData; BOOLEAN IsNamed = FALSE; OB_OPEN_REASON OpenReason = ObCreateHandle; + static int LostOptimizations = 0; PAGED_CODE(); /* Get the Header and Create Info */ @@ -1182,6 +1183,22 @@ ObjectCreateInfo = Header->ObjectCreateInfo; ObjectNameInfo = OBJECT_HEADER_TO_NAME_INFO(Header); ObjectType = Header->Type; + + /* Check if this is an named object */ + if ((ObjectNameInfo) && (ObjectNameInfo->Name.Buffer)) IsNamed = TRUE; + + /* Check if the object is unnamed and also doesn't have security */ + if ((!ObjectType->TypeInfo.SecurityRequired) && !(IsNamed)) + { + /* + * FIXME: TODO (Optimized path through ObpIncrement*UnNamed*HandleCount). + * Described in chapter 6 of Gl00my, but babelfish translation isn't fully + * clear, so waiting on Aleksey's translation. Currently just profiling. + * (about ~500 calls per boot - not critical atm). + */ + ++LostOptimizations; + DPRINT("Optimized case could've be taken: %d times!\n", LostOptimizations); + } /* Check if we didn't get an access state */ if (!PassedAccessState) @@ -1200,8 +1217,9 @@ } } - /* Check if this is an named object */ - if ((ObjectNameInfo) && (ObjectNameInfo->Name.Buffer)) IsNamed = TRUE; + /* Save the security descriptor */ + PassedAccessState->SecurityDescriptor = + ObjectCreateInfo->SecurityDescriptor; /* Check if the object is named */ if (IsNamed) @@ -1218,12 +1236,48 @@ ObjectCreateInfo->SecurityQos, ObjectCreateInfo->ParseContext, Object); - if (!NT_SUCCESS(Status)) return Status; - - if (FoundObject) - { - DPRINT("Getting header: %x\n", FoundObject); + /* Check if we found an object that doesn't match the one requested */ + if ((NT_SUCCESS(Status)) && (FoundObject) && (Object != FoundObject)) + { + /* This means we're opening an object, not creating a new one */ FoundHeader = OBJECT_TO_OBJECT_HEADER(FoundObject); + OpenReason = ObOpenHandle; + + /* Make sure the caller said it's OK to do this */ + if (ObjectCreateInfo->Attributes & OBJ_OPENIF) + { + /* He did, but did he want this type? */ + if (ObjectType != FoundHeader->Type) + { + /* Wrong type, so fail */ + Status = STATUS_OBJECT_TYPE_MISMATCH; + } + else + { + /* Right type, so warn */ + Status = STATUS_OBJECT_NAME_EXISTS; + } + } + else + { + /* Caller wanted to create a new object, fail */ + Status = STATUS_OBJECT_NAME_COLLISION; + } + } + + /* Check if anything until now failed */ + if (!NT_SUCCESS(Status)) + { + /* We failed, dereference the object and delete the access state */ + ObDereferenceObject(Object); + if (PassedAccessState == &AccessState) + { + /* We used a local one; delete it */ + SeDeleteAccessState(PassedAccessState); + } + + /* Return failure code */ + return Status; } } else @@ -1252,57 +1306,60 @@ } } - /* Check if it's named or forces security */ - if ((IsNamed) || (ObjectType->TypeInfo.SecurityRequired)) - { - /* Make sure it's inserted into an object directory */ - if ((ObjectNameInfo) && (ObjectNameInfo->Directory)) - { - /* Get the current descriptor */ - ObGetObjectSecurity(ObjectNameInfo->Directory, - &DirectorySd, - &SdAllocated); - } - - /* Now assign it */ - Status = ObAssignSecurity(PassedAccessState, - DirectorySd, - Object, - ObjectType); - - /* Check if we captured one */ - if (DirectorySd) - { - /* We did, release it */ - DPRINT1("Here\n"); - ObReleaseObjectSecurity(DirectorySd, SdAllocated); - } - else if (NT_SUCCESS(Status)) - { - /* Other we didn't, but we were able to use the current SD */ - SeReleaseSecurityDescriptor(ObjectCreateInfo->SecurityDescriptor, - ObjectCreateInfo->ProbeMode, - TRUE); - - /* Clear the current one */ - PassedAccessState->SecurityDescriptor = - ObjectCreateInfo->SecurityDescriptor = NULL; - } - } - - /* Check if anything until now failed */ - if (!NT_SUCCESS(Status)) - { - /* We failed, dereference the object and delete the access state */ - ObDereferenceObject(Object); - if (PassedAccessState == &AccessState) - { - /* We used a local one; delete it */ - SeDeleteAccessState(PassedAccessState); - } - - /* Return failure code */ - return Status; + /* Now check if this object is being created */ + if (FoundObject == Object) + { + /* Check if it's named or forces security */ + if ((IsNamed) || (ObjectType->TypeInfo.SecurityRequired)) + { + /* Make sure it's inserted into an object directory */ + if ((ObjectNameInfo) && (ObjectNameInfo->Directory)) + { + /* Get the current descriptor */ + ObGetObjectSecurity(ObjectNameInfo->Directory, + &DirectorySd, + &SdAllocated); + } + + /* Now assign it */ + Status = ObAssignSecurity(PassedAccessState, + DirectorySd, + Object, + ObjectType); + + /* Check if we captured one */ + if (DirectorySd) + { + /* We did, release it */ + ObReleaseObjectSecurity(DirectorySd, SdAllocated); + } + else if (NT_SUCCESS(Status)) + { + /* Other we didn't, but we were able to use the current SD */ + SeReleaseSecurityDescriptor(ObjectCreateInfo->SecurityDescriptor, + ObjectCreateInfo->ProbeMode, + TRUE); + + /* Clear the current one */ + PassedAccessState->SecurityDescriptor = + ObjectCreateInfo->SecurityDescriptor = NULL; + } + } + + /* Check if anything until now failed */ + if (!NT_SUCCESS(Status)) + { + /* We failed, dereference the object and delete the access state */ + ObDereferenceObject(Object); + if (PassedAccessState == &AccessState) + { + /* We used a local one; delete it */ + SeDeleteAccessState(PassedAccessState); + } + + /* Return failure code */ + return Status; + } } /* HACKHACK: Because of ROS's incorrect startup, this can be called Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Thu Jun 8 10:17:46 2006 @@ -310,6 +310,7 @@ } } RtlFreeUnicodeString(RemainingPath); + *ReturnedObject = Insert; } else {

1 0

[ion] 22279: - Fix ObGetObjectSecurity to use the object type's pool type instead of assuming PagedPool. - Re-wrote the way ObInsertObject handles security as described in Chapters 6 and 9 of Gl00my (ie: made it use ObGetObjectSecurity and ObAssignObjectSecurity; ironically, these functions already existed/are exported and could've been used since the start instead of duplicating code). - Fix ObpReferenceCachedSecurityDescriptor only to touch the cached entry if it actually gets a non-NULL descr
by ion＠svn.reactos.org 08 Jun '06

08 Jun '06

Author: ion Date: Thu Jun 8 09:41:39 2006 New Revision: 22279 URL: http://svn.reactos.ru/svn/reactos?rev=22279&view=rev Log: - Fix ObGetObjectSecurity to use the object type's pool type instead of assuming PagedPool. - Re-wrote the way ObInsertObject handles security as described in Chapters 6 and 9 of Gl00my (ie: made it use ObGetObjectSecurity and ObAssignObjectSecurity; ironically, these functions already existed/are exported and could've been used since the start instead of duplicating code). - Fix ObpReferenceCachedSecurityDescriptor only to touch the cached entry if it actually gets a non-NULL descriptor. Also improved it to return the referenced SD, instead of requiring the caller to do it manually. Modified: trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/sdcache.c trunk/reactos/ntoskrnl/ob/security.c Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/o… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Thu Jun 8 09:41:39 2006 @@ -172,9 +172,11 @@ NTAPI ObpRemoveSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor); -VOID -NTAPI -ObpReferenceCachedSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor); +PSECURITY_DESCRIPTOR +NTAPI +ObpReferenceCachedSecurityDescriptor( + IN PSECURITY_DESCRIPTOR SecurityDescriptor +); VOID NTAPI Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Jun 8 09:41:39 2006 @@ -1167,8 +1167,8 @@ PVOID FoundObject = NULL; POBJECT_HEADER FoundHeader = NULL; NTSTATUS Status = STATUS_SUCCESS; - PSECURITY_DESCRIPTOR NewSecurityDescriptor = NULL; - SECURITY_SUBJECT_CONTEXT SubjectContext; + PSECURITY_DESCRIPTOR DirectorySd = NULL; + BOOLEAN SdAllocated; OBP_LOOKUP_CONTEXT Context; POBJECT_HEADER_NAME_INFO ObjectNameInfo; ACCESS_STATE AccessState; @@ -1252,48 +1252,58 @@ } } - DPRINT("Security Assignment in progress\n"); - SeCaptureSubjectContext(&SubjectContext); - - /* Build the new security descriptor */ - Status = SeAssignSecurity((FoundHeader != NULL) ? FoundHeader->SecurityDescriptor : NULL, - (ObjectCreateInfo != NULL) ? ObjectCreateInfo->SecurityDescriptor : NULL, - &NewSecurityDescriptor, - (Header->Type == ObDirectoryType), - &SubjectContext, - &Header->Type->TypeInfo.GenericMapping, - PagedPool); - - if (NT_SUCCESS(Status)) - { - DPRINT("NewSecurityDescriptor %p\n", NewSecurityDescriptor); - - if (Header->Type->TypeInfo.SecurityProcedure != NULL) - { - /* Call the security method */ - Status = Header->Type->TypeInfo.SecurityProcedure(&Header->Body, - AssignSecurityDescriptor, - 0, - NewSecurityDescriptor, - NULL, - NULL, - NonPagedPool, - NULL); - } - else - { - /* Assign the security descriptor to the object header */ - Status = ObpAddSecurityDescriptor(NewSecurityDescriptor, - &Header->SecurityDescriptor); - DPRINT("Object security descriptor %p\n", Header->SecurityDescriptor); - } - - /* Release the new security descriptor */ - SeDeassignSecurity(&NewSecurityDescriptor); - } - - DPRINT("Security Complete\n"); - SeReleaseSubjectContext(&SubjectContext); + /* Check if it's named or forces security */ + if ((IsNamed) || (ObjectType->TypeInfo.SecurityRequired)) + { + /* Make sure it's inserted into an object directory */ + if ((ObjectNameInfo) && (ObjectNameInfo->Directory)) + { + /* Get the current descriptor */ + ObGetObjectSecurity(ObjectNameInfo->Directory, + &DirectorySd, + &SdAllocated); + } + + /* Now assign it */ + Status = ObAssignSecurity(PassedAccessState, + DirectorySd, + Object, + ObjectType); + + /* Check if we captured one */ + if (DirectorySd) + { + /* We did, release it */ + DPRINT1("Here\n"); + ObReleaseObjectSecurity(DirectorySd, SdAllocated); + } + else if (NT_SUCCESS(Status)) + { + /* Other we didn't, but we were able to use the current SD */ + SeReleaseSecurityDescriptor(ObjectCreateInfo->SecurityDescriptor, + ObjectCreateInfo->ProbeMode, + TRUE); + + /* Clear the current one */ + PassedAccessState->SecurityDescriptor = + ObjectCreateInfo->SecurityDescriptor = NULL; + } + } + + /* Check if anything until now failed */ + if (!NT_SUCCESS(Status)) + { + /* We failed, dereference the object and delete the access state */ + ObDereferenceObject(Object); + if (PassedAccessState == &AccessState) + { + /* We used a local one; delete it */ + SeDeleteAccessState(PassedAccessState); + } + + /* Return failure code */ + return Status; + } /* HACKHACK: Because of ROS's incorrect startup, this can be called * without a valid Process until I finalize the startup patch, @@ -1301,8 +1311,7 @@ * a handle if Handle is NULL when the Registry Code calls it, because * the registry code totally bastardizes the Ob and needs to be fixed */ - DPRINT("Creating handle\n"); - if (Handle != NULL) + if (Handle) { /* Create the handle */ Status = ObpCreateHandle(OpenReason, @@ -1338,7 +1347,6 @@ } /* Return failure code */ - DPRINT("Status %x\n", Status); return Status; } Modified: trunk/reactos/ntoskrnl/ob/sdcache.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/sdcache.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/sdcache.c (original) +++ trunk/reactos/ntoskrnl/ob/sdcache.c Thu Jun 8 09:41:39 2006 @@ -306,30 +306,34 @@ return STATUS_SUCCESS; } +PSECURITY_DESCRIPTOR +NTAPI +ObpReferenceCachedSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor) +{ + PSD_CACHE_ENTRY CacheEntry; + + /* Lock the cache */ + ObpSdCacheLock(); + + /* Make sure we got a descriptor */ + if (SecurityDescriptor) + { + /* Get the entry */ + CacheEntry = (PSD_CACHE_ENTRY)((ULONG_PTR)SecurityDescriptor - + sizeof(SD_CACHE_ENTRY)); + + /* Reference it */ + CacheEntry->RefCount++; + DPRINT("RefCount %lu\n", CacheEntry->RefCount); + } + + /* Unlock the cache and return the descriptor */ + ObpSdCacheUnlock(); + return SecurityDescriptor; +} VOID NTAPI -ObpReferenceCachedSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor) -{ - PSD_CACHE_ENTRY CacheEntry; - - DPRINT("ObpReferenceCachedSecurityDescriptor() called\n"); - - ObpSdCacheLock(); - - CacheEntry = (PSD_CACHE_ENTRY)((ULONG_PTR)SecurityDescriptor - sizeof(SD_CACHE_ENTRY)); - - CacheEntry->RefCount++; - DPRINT("RefCount %lu\n", CacheEntry->RefCount); - - ObpSdCacheUnlock(); - - DPRINT("ObpReferenceCachedSecurityDescriptor() done\n"); -} - - -VOID -NTAPI ObpDereferenceCachedSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor) { DPRINT("ObpDereferenceCachedSecurityDescriptor() called\n"); Modified: trunk/reactos/ntoskrnl/ob/security.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/security.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/security.c (original) +++ trunk/reactos/ntoskrnl/ob/security.c Thu Jun 8 09:41:39 2006 @@ -117,9 +117,9 @@ /* Check if the object uses default security */ if (Type->TypeInfo.SecurityProcedure == SeDefaultObjectMethod) { - /* Reference the descriptor and return it */ - ObpReferenceCachedSecurityDescriptor(Header->SecurityDescriptor); - *SecurityDescriptor = Header->SecurityDescriptor; + /* Reference the descriptor */ + *SecurityDescriptor = + ObpReferenceCachedSecurityDescriptor(Header->SecurityDescriptor); /* Tell the caller that we didn't have to allocate anything */ *MemoryAllocated = FALSE; @@ -134,10 +134,10 @@ GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION, - NULL, + *SecurityDescriptor, &Length, &Header->SecurityDescriptor, - PagedPool, + Type->TypeInfo.PoolType, &Type->TypeInfo.GenericMapping); if (Status != STATUS_BUFFER_TOO_SMALL) return Status; @@ -158,7 +158,7 @@ *SecurityDescriptor, &Length, &Header->SecurityDescriptor, - PagedPool, + Type->TypeInfo.PoolType, &Type->TypeInfo.GenericMapping); if (!NT_SUCCESS(Status)) {

1 0

[ion] 22278: - I just noticed that ObInsertObject never got updated to deal with the improvements in ObFindObject and ACCESS_STATE usage, so made the following fixes: * Create the ACCESS_STATE structure much earlier. * Actually send the access state and parse context to ObFindObject, when called from ObInsertObject (this should fix some hidden regressions, since they finally get an access state with access masks now). * Remove some deprecated hacks. * If inserting the handle failed, cleanup the
by ion＠svn.reactos.org 08 Jun '06

08 Jun '06

Author: ion Date: Thu Jun 8 06:56:59 2006 New Revision: 22278 URL: http://svn.reactos.ru/svn/reactos?rev=22278&view=rev Log: - I just noticed that ObInsertObject never got updated to deal with the improvements in ObFindObject and ACCESS_STATE usage, so made the following fixes: * Create the ACCESS_STATE structure much earlier. * Actually send the access state and parse context to ObFindObject, when called from ObInsertObject (this should fix some hidden regressions, since they finally get an access state with access masks now). * Remove some deprecated hacks. * If inserting the handle failed, cleanup the name and remove it from the directory entry. * Fix a memory leak because we weren't deleting the access state. Modified: trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Jun 8 06:56:59 2006 @@ -1152,8 +1152,8 @@ /* * @implemented */ -NTSTATUS -STDCALL +NTSTATUS +NTAPI ObInsertObject(IN PVOID Object, IN PACCESS_STATE PassedAccessState OPTIONAL, IN ACCESS_MASK DesiredAccess, @@ -1163,6 +1163,7 @@ { POBJECT_CREATE_INFORMATION ObjectCreateInfo; POBJECT_HEADER Header; + POBJECT_TYPE ObjectType; PVOID FoundObject = NULL; POBJECT_HEADER FoundHeader = NULL; NTSTATUS Status = STATUS_SUCCESS; @@ -1172,27 +1173,51 @@ POBJECT_HEADER_NAME_INFO ObjectNameInfo; ACCESS_STATE AccessState; AUX_DATA AuxData; + BOOLEAN IsNamed = FALSE; + OB_OPEN_REASON OpenReason = ObCreateHandle; PAGED_CODE(); /* Get the Header and Create Info */ Header = OBJECT_TO_OBJECT_HEADER(Object); ObjectCreateInfo = Header->ObjectCreateInfo; ObjectNameInfo = OBJECT_HEADER_TO_NAME_INFO(Header); - - /* First try to find the Object */ - if (ObjectNameInfo && ObjectNameInfo->Name.Buffer) - { + ObjectType = Header->Type; + + /* Check if we didn't get an access state */ + if (!PassedAccessState) + { + /* Use our built-in access state */ + PassedAccessState = &AccessState; + Status = SeCreateAccessState(&AccessState, + &AuxData, + DesiredAccess, + &ObjectType->TypeInfo.GenericMapping); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + ObDereferenceObject(Object); + return Status; + } + } + + /* Check if this is an named object */ + if ((ObjectNameInfo) && (ObjectNameInfo->Name.Buffer)) IsNamed = TRUE; + + /* Check if the object is named */ + if (IsNamed) + { + /* Look it up */ Status = ObFindObject(ObjectCreateInfo->RootDirectory, - &ObjectNameInfo->Name, - ObjectCreateInfo->Attributes, - KernelMode, - &FoundObject, - Header->Type, - &Context, - NULL, - ObjectCreateInfo->SecurityQos, - NULL, - Object); + &ObjectNameInfo->Name, + ObjectCreateInfo->Attributes, + KernelMode, + &FoundObject, + ObjectType, + &Context, + PassedAccessState, + ObjectCreateInfo->SecurityQos, + ObjectCreateInfo->ParseContext, + Object); if (!NT_SUCCESS(Status)) return Status; if (FoundObject) @@ -1211,8 +1236,7 @@ * called ObFindObject which already has this code. * We basically kill 3-4 hacks and add 2 new ones. */ - if ((Header->Type == IoFileObjectType) || - (Header->Type->TypeInfo.OpenProcedure != NULL)) + if (Header->Type == IoFileObjectType) { DPRINT("About to call Open Routine\n"); if (Header->Type == IoFileObjectType) @@ -1225,22 +1249,6 @@ NULL); DPRINT("Called IopCreateFile: %x\n", Status); } - else if (Header->Type->TypeInfo.OpenProcedure) - { - DPRINT("Calling %x\n", Header->Type->TypeInfo.OpenProcedure); - Status = Header->Type->TypeInfo.OpenProcedure(ObCreateHandle, - NULL, - &Header->Body, - 0, - 0); - } - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Create Failed\n"); - if (FoundObject) ObDereferenceObject(FoundObject); - return Status; - } } } @@ -1287,24 +1295,6 @@ DPRINT("Security Complete\n"); SeReleaseSubjectContext(&SubjectContext); - /* Check if we didn't get an access state */ - if (!PassedAccessState) - { - /* Use our built-in access state */ - PassedAccessState = &AccessState; - Status = SeCreateAccessState(&AccessState, - &AuxData, - DesiredAccess, - &Header->Type->TypeInfo.GenericMapping); - if (!NT_SUCCESS(Status)) - { - /* Fail */ - ObDereferenceObject(Object); - return Status; - } - } - - /* Create the Handle */ /* HACKHACK: Because of ROS's incorrect startup, this can be called * without a valid Process until I finalize the startup patch, * so don't create a handle if this is the case. We also don't create @@ -1314,7 +1304,8 @@ DPRINT("Creating handle\n"); if (Handle != NULL) { - Status = ObpCreateHandle(ObCreateHandle, + /* Create the handle */ + Status = ObpCreateHandle(OpenReason, &Header->Body, NULL, PassedAccessState, @@ -1329,6 +1320,24 @@ Header->ObjectCreateInfo = NULL; ObpFreeAndReleaseCapturedAttributes(ObjectCreateInfo); + /* Check if creating the handle failed */ + if (!NT_SUCCESS(Status)) + { + /* If the object had a name, backout everything */ + if (IsNamed) ObpDeleteNameCheck(Object); + } + + /* Remove the extra keep-alive reference */ + //ObDereferenceObject(Object); FIXME: Will require massive changes + + /* Check if we created our own access state */ + if (PassedAccessState == &AccessState) + { + /* We used a local one; delete it */ + SeDeleteAccessState(PassedAccessState); + } + + /* Return failure code */ DPRINT("Status %x\n", Status); return Status; }

1 0

[ion] 22277: - Fixup some comments and add Eric Kohl's name to this file, since he had worked on some of the original calls. - Minor/trivial fixes to some Object Security APIs that were left in the dark: * Use PagedPool instead of NonPagedPool memory, and also tag the allocation for debugging. * Send needed data to the security procedure instead of NULL/0, including the Generic Mapping, and the actual Security Decriptor. * Only un-assign the descriptor in case of failure, not all the time (the w
by ion＠svn.reactos.org 08 Jun '06

08 Jun '06

Author: ion Date: Thu Jun 8 06:36:12 2006 New Revision: 22277 URL: http://svn.reactos.ru/svn/reactos?rev=22277&view=rev Log: - Fixup some comments and add Eric Kohl's name to this file, since he had worked on some of the original calls. - Minor/trivial fixes to some Object Security APIs that were left in the dark: * Use PagedPool instead of NonPagedPool memory, and also tag the allocation for debugging. * Send needed data to the security procedure instead of NULL/0, including the Generic Mapping, and the actual Security Decriptor. * Only un-assign the descriptor in case of failure, not all the time (the whole point of the API is to assign it!) * Tell the caller that memory was NOT allocated if we failed to get the security descriptor. Modified: trunk/reactos/ntoskrnl/ob/security.c Modified: trunk/reactos/ntoskrnl/ob/security.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/security.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/security.c (original) +++ trunk/reactos/ntoskrnl/ob/security.c Thu Jun 8 06:36:12 2006 @@ -4,6 +4,7 @@ * FILE: ntoskrnl/ob/security.c * PURPOSE: SRM Interface of the Object Manager * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) +* Eric Kohl */ /* INCLUDES *****************************************************************/ @@ -65,12 +66,15 @@ NewDescriptor, NULL, NULL, - NonPagedPool, - NULL); - - /* Release the new security descriptor */ - SeDeassignSecurity(&NewDescriptor); - + PagedPool, + &Type->TypeInfo.GenericMapping); + if (!NT_SUCCESS(Status)) + { + /* Release the new security descriptor */ + SeDeassignSecurity(&NewDescriptor); + } + + /* Return to caller */ return Status; } @@ -101,61 +105,70 @@ OUT PBOOLEAN MemoryAllocated) { POBJECT_HEADER Header; + POBJECT_TYPE Type; ULONG Length; NTSTATUS Status; PAGED_CODE(); + /* Get the object header and type */ Header = OBJECT_TO_OBJECT_HEADER(Object); - if (Header->Type == NULL) return STATUS_UNSUCCESSFUL; - - if (Header->Type->TypeInfo.SecurityProcedure == NULL) - { + Type = Header->Type; + + /* Check if the object uses default security */ + if (Type->TypeInfo.SecurityProcedure == SeDefaultObjectMethod) + { + /* Reference the descriptor and return it */ ObpReferenceCachedSecurityDescriptor(Header->SecurityDescriptor); *SecurityDescriptor = Header->SecurityDescriptor; + + /* Tell the caller that we didn't have to allocate anything */ *MemoryAllocated = FALSE; return STATUS_SUCCESS; } /* Get the security descriptor size */ Length = 0; - Status = Header->Type->TypeInfo.SecurityProcedure(Object, - QuerySecurityDescriptor, - OWNER_SECURITY_INFORMATION | - GROUP_SECURITY_INFORMATION | - DACL_SECURITY_INFORMATION | - SACL_SECURITY_INFORMATION, - NULL, - &Length, - NULL, - NonPagedPool, - NULL); + Status = Type->TypeInfo.SecurityProcedure(Object, + QuerySecurityDescriptor, + OWNER_SECURITY_INFORMATION | + GROUP_SECURITY_INFORMATION | + DACL_SECURITY_INFORMATION | + SACL_SECURITY_INFORMATION, + NULL, + &Length, + &Header->SecurityDescriptor, + PagedPool, + &Type->TypeInfo.GenericMapping); if (Status != STATUS_BUFFER_TOO_SMALL) return Status; /* Allocate security descriptor */ - *SecurityDescriptor = ExAllocatePool(NonPagedPool, Length); - if (*SecurityDescriptor == NULL) return STATUS_INSUFFICIENT_RESOURCES; + *SecurityDescriptor = ExAllocatePoolWithTag(PagedPool, + Length, + TAG('O', 'b', 'S', 'q')); + if (!(*SecurityDescriptor)) return STATUS_INSUFFICIENT_RESOURCES; /* Query security descriptor */ - Status = Header->Type->TypeInfo.SecurityProcedure(Object, - QuerySecurityDescriptor, - OWNER_SECURITY_INFORMATION | - GROUP_SECURITY_INFORMATION | - DACL_SECURITY_INFORMATION | - SACL_SECURITY_INFORMATION, - *SecurityDescriptor, - &Length, - NULL, - NonPagedPool, - NULL); + *MemoryAllocated = TRUE; + Status = Type->TypeInfo.SecurityProcedure(Object, + QuerySecurityDescriptor, + OWNER_SECURITY_INFORMATION | + GROUP_SECURITY_INFORMATION | + DACL_SECURITY_INFORMATION | + SACL_SECURITY_INFORMATION, + *SecurityDescriptor, + &Length, + &Header->SecurityDescriptor, + PagedPool, + &Type->TypeInfo.GenericMapping); if (!NT_SUCCESS(Status)) { + /* Free the descriptor and tell the caller we failed */ ExFreePool(*SecurityDescriptor); - return Status; - } - - *MemoryAllocated = TRUE; - - return STATUS_SUCCESS; + *MemoryAllocated = FALSE; + } + + /* Return status */ + return Status; } /*++ @@ -182,14 +195,18 @@ { PAGED_CODE(); - if (SecurityDescriptor == NULL) return; - + /* Nothing to do in this case */ + if (!SecurityDescriptor) return; + + /* Check if we had allocated it from memory */ if (MemoryAllocated) { + /* Free it */ ExFreePool(SecurityDescriptor); } else { + /* Otherwise this means we used an internal descriptor */ ObpDereferenceCachedSecurityDescriptor(SecurityDescriptor); } }

1 0

[ion] 22276: - Split ObpCreateHandle into two distinct operations: Incrementing and Creating (like we have Delete/Decrement). No code additions, just splitting. - Because of the split, we can now directly only do an Increment when duplicating the handle, since we don't need to create a brand new one. Also, when inheriting, we can now properly do an increment as well, instead of simply manually increasing the handle count (because for each inherited handle, access checks and openprocedure should'
by ion＠svn.reactos.org 07 Jun '06

07 Jun '06

Author: ion Date: Thu Jun 8 03:59:15 2006 New Revision: 22276 URL: http://svn.reactos.ru/svn/reactos?rev=22276&view=rev Log: - Split ObpCreateHandle into two distinct operations: Incrementing and Creating (like we have Delete/Decrement). No code additions, just splitting. - Because of the split, we can now directly only do an Increment when duplicating the handle, since we don't need to create a brand new one. Also, when inheriting, we can now properly do an increment as well, instead of simply manually increasing the handle count (because for each inherited handle, access checks and openprocedure should've still been called). Modified: trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Jun 8 03:59:15 2006 @@ -349,6 +349,108 @@ /* Leave the critical region and return the status */ KeLeaveCriticalRegion(); return Status; +} + +NTSTATUS +NTAPI +ObpIncrementHandleCount(IN PVOID Object, + IN PACCESS_STATE AccessState, + IN KPROCESSOR_MODE AccessMode, + IN ULONG HandleAttributes, + IN PEPROCESS Process, + IN OB_OPEN_REASON OpenReason) +{ + POBJECT_HEADER ObjectHeader; + POBJECT_TYPE ObjectType; + ULONG ProcessHandleCount; + + /* Get the object header and type */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); + ObjectType = ObjectHeader->Type; + OBTRACE("OBTRACE - %s - Incrementing count for: %p. Reason: %lx. HC LC %lx %lx\n", + __FUNCTION__, + Object, + OpenReason, + ObjectHeader->HandleCount, + ObjectHeader->PointerCount); + + /* Check if we're opening an existing handle */ + if (OpenReason == ObOpenHandle) + { + /* + * FIXME: Do validation as described in Chapter 8 + * of Windows Internals 4th. + */ +#if 0 + if (!ObCheckObjectAccess(Object, + AccessState, + TRUE, + AccessMode, + &Status)) + { + return Status; + } +#endif + } + else if (OpenReason == ObCreateHandle) + { + /* Convert MAXIMUM_ALLOWED to GENERIC_ALL */ + if (AccessState->RemainingDesiredAccess & MAXIMUM_ALLOWED) + { + /* Mask out MAXIMUM_ALLOWED and stick GENERIC_ALL instead */ + AccessState->RemainingDesiredAccess &= ~MAXIMUM_ALLOWED; + AccessState->RemainingDesiredAccess |= GENERIC_ALL; + } + + /* Check if we have to map the GENERIC mask */ + if (AccessState->RemainingDesiredAccess & GENERIC_ACCESS) + { + /* Map it to the correct access masks */ + RtlMapGenericMask(&AccessState->RemainingDesiredAccess, + &ObjectType->TypeInfo.GenericMapping); + } + } + + /* Increase the handle count */ + if(InterlockedIncrement(&ObjectHeader->HandleCount) == 1) + { + /* + * FIXME: Is really needed? Perhaps we should instead take + * advantage of the AddtionalReferences parameter to add the + * bias when required. This might be the source of the mysterious + * ReactOS bug where ObInsertObject *requires* an immediate dereference + * even in a success case. + * Will have to think more about this when doing the Increment/Create + * split later. + */ + ObReferenceObject(Object); + } + + /* FIXME: Use the Handle Database */ + ProcessHandleCount = 0; + + /* Check if we have an open procedure */ + if (ObjectType->TypeInfo.OpenProcedure) + { +#if 0 + /* Call it */ + ObjectType->TypeInfo.OpenProcedure(OpenReason, + Process, + Object, + AccessState->PreviouslyGrantedAccess, + ProcessHandleCount); +#endif + } + + /* Increase total number of handles */ + ObjectType->TotalNumberOfHandles++; + OBTRACE("OBTRACE - %s - Incremented count for: %p. Reason: %lx HC LC %lx %lx\n", + __FUNCTION__, + Object, + OpenReason, + ObjectHeader->HandleCount, + ObjectHeader->PointerCount); + return STATUS_SUCCESS; } NTSTATUS @@ -369,12 +471,14 @@ OUT PHANDLE ReturnedHandle) { HANDLE_TABLE_ENTRY NewEntry; - PVOID HandleTable; POBJECT_HEADER ObjectHeader; - POBJECT_TYPE ObjectType; HANDLE Handle; KAPC_STATE ApcState; BOOLEAN AttachedToProcess = FALSE; + POBJECT_TYPE ObjectType; + PVOID HandleTable; + NTSTATUS Status; + PAGED_CODE(); /* Get the object header and type */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); @@ -414,53 +518,22 @@ HandleTable = PsGetCurrentProcess()->ObjectTable; } - /* Convert MAXIMUM_ALLOWED to GENERIC_ALL */ - if (AccessState->RemainingDesiredAccess & MAXIMUM_ALLOWED) - { - /* Mask out MAXIMUM_ALLOWED and stick GENERIC_ALL instead */ - AccessState->RemainingDesiredAccess &= ~MAXIMUM_ALLOWED; - AccessState->RemainingDesiredAccess |= GENERIC_ALL; - } - - /* Check if we have to map the GENERIC mask */ - if (AccessState->RemainingDesiredAccess & GENERIC_ACCESS) - { - /* Map it to the correct access masks */ - RtlMapGenericMask(&AccessState->RemainingDesiredAccess, - &ObjectType->TypeInfo.GenericMapping); - } - - /* Increase the handle count */ - if(InterlockedIncrement(&ObjectHeader->HandleCount) == 1) + /* Increment the handle count */ + Status = ObpIncrementHandleCount(Object, + AccessState, + AccessMode, + HandleAttributes, + PsGetCurrentProcess(), + OpenReason); + if (!NT_SUCCESS(Status)) { /* - * FIXME: Is really needed? Perhaps we should instead take - * advantage of the AddtionalReferences parameter to add the - * bias when required. This might be the source of the mysterious - * ReactOS bug where ObInsertObject *requires* an immediate dereference - * even in a success case. - * Whill have to think more about this when doing the Increment/Create - * split later. + * We failed (meaning security failure, according to NT Internals) + * detach and return */ - ObReferenceObject(Object); - } - - /* Check if we have an open procedure */ -#if 0 - if (ObjectType->TypeInfo.OpenProcedure) - { - /* Call it */ - ObjectType->TypeInfo.OpenProcedure(OpenReason, - PsGetCurrentProcess(), - Object, - AccessState-> - PreviouslyGrantedAccess, - 0); - } -#endif - - /* Increase total number of handles */ - ObjectType->TotalNumberOfHandles++; + if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); + return Status; + } /* Save the object header (assert its validity too) */ ASSERT((ULONG_PTR)ObjectHeader & EX_HANDLE_ENTRY_LOCKED); @@ -472,7 +545,7 @@ EX_HANDLE_ENTRY_INHERITABLE | EX_HANDLE_ENTRY_AUDITONCLOSE); - /* Save the access mask */ + /* Save the access mask */ NewEntry.GrantedAccess = AccessState->RemainingDesiredAccess | AccessState->PreviouslyGrantedAccess; @@ -486,11 +559,11 @@ NewEntry.Object, NewEntry.ObAttributes & 3, NewEntry.GrantedAccess); Handle = ExCreateHandle(HandleTable, &NewEntry); - /* Detach it needed */ + /* Detach if needed */ if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); - /* Check if we got a handle */ - if(Handle) + /* Make sure we got a handle */ + if (Handle) { /* Handle extra references */ while (AdditionalReferences--) @@ -509,18 +582,15 @@ /* Return handle and object */ *ReturnedHandle = Handle; if (ReturnedObject) *ReturnedObject = Object; - - /* Return success */ - OBTRACE("OBTRACE - %s - Incremented count for: %p. Reason: %lx HC LC %lx %lx\n", + OBTRACE("OBTRACE - %s - Returning Handle: %lx HC LC %lx %lx\n", __FUNCTION__, - Object, - OpenReason, + Handle, ObjectHeader->HandleCount, ObjectHeader->PointerCount); return STATUS_SUCCESS; } - /* Decrement the handle count and fail */ + /* Decrement the handle count and detach */ ObpDecrementHandleCount(&ObjectHeader->Body, PsGetCurrentProcess(), NewEntry.GrantedAccess); @@ -617,6 +687,7 @@ POBJECT_HEADER ObjectHeader; BOOLEAN Ret = FALSE; ACCESS_STATE AccessState; + NTSTATUS Status; PAGED_CODE(); /* Make sure that the handle is inheritable */ @@ -629,9 +700,23 @@ /* Setup the access state */ AccessState.PreviouslyGrantedAccess = HandleTableEntry->GrantedAccess; - /* Get the object header and increment the handle and pointer counts */ - InterlockedIncrement(&ObjectHeader->HandleCount); - InterlockedIncrement(&ObjectHeader->PointerCount); + /* Call the shared routine for incrementing handles */ + Status = ObpIncrementHandleCount(&ObjectHeader->Body, + &AccessState, + KernelMode, + HandleTableEntry->ObAttributes, + PsGetCurrentProcess(), + ObInheritHandle); + if (!NT_SUCCESS(Status)) + { + /* Return failure */ + Ret = FALSE; + } + else + { + /* Otherwise increment the pointer count */ + InterlockedIncrement(&ObjectHeader->PointerCount); + } } /* Return duplication result */ @@ -1364,15 +1449,13 @@ DesiredAccess, &ObjectType->TypeInfo.GenericMapping); - Status = ObpCreateHandle(ObDuplicateHandle, - ObjectBody, - ObjectType, - PassedAccessState, - 0, - HandleAttributes, - PreviousMode, - NULL, - &hTarget); + /* Add a new handle */ + Status = ObpIncrementHandleCount(ObjectBody, + PassedAccessState, + PreviousMode, + HandleAttributes, + PsGetCurrentProcess(), + ObDuplicateHandle); if (AttachedToProcess) {

1 0

[hpoussin] 22275: Some 64 fixes
by hpoussin＠svn.reactos.org 07 Jun '06

07 Jun '06

Author: hpoussin Date: Wed Jun 7 21:33:57 2006 New Revision: 22275 URL: http://svn.reactos.ru/svn/reactos?rev=22275&view=rev Log: Some 64 fixes Modified: trunk/reactos/drivers/input/sermouse/detect.c trunk/reactos/drivers/input/sermouse/fdo.c trunk/reactos/drivers/input/sermouse/sermouse.h Modified: trunk/reactos/drivers/input/sermouse/detect.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/input/sermouse/dete… ============================================================================== --- trunk/reactos/drivers/input/sermouse/detect.c (original) +++ trunk/reactos/drivers/input/sermouse/detect.c Wed Jun 7 21:33:57 2006 @@ -20,9 +20,9 @@ IN PDEVICE_OBJECT DeviceObject, IN ULONG CtlCode, IN PVOID InputBuffer OPTIONAL, - IN ULONG InputBufferSize, + IN ULONG_PTR InputBufferSize, IN OUT PVOID OutputBuffer OPTIONAL, - IN OUT PULONG OutputBufferSize) + IN OUT PULONG_PTR OutputBufferSize) { KEVENT Event; PIRP Irp; @@ -106,7 +106,7 @@ IN PDEVICE_OBJECT LowerDevice, OUT PUCHAR Buffer, IN ULONG BufferSize, - OUT PULONG FilledBytes) + OUT PULONG_PTR FilledBytes) { PIRP Irp; IO_STATUS_BLOCK ioStatus; @@ -160,7 +160,7 @@ ULONG Command; SERIAL_TIMEOUTS Timeouts; SERIAL_LINE_CONTROL LCR; - ULONG i, Count = 0; + ULONG_PTR i, Count = 0; UCHAR Buffer[16]; SERMOUSE_MOUSE_TYPE MouseType = mtNone; NTSTATUS Status; Modified: trunk/reactos/drivers/input/sermouse/fdo.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/input/sermouse/fdo.… ============================================================================== --- trunk/reactos/drivers/input/sermouse/fdo.c (original) +++ trunk/reactos/drivers/input/sermouse/fdo.c Wed Jun 7 21:33:57 2006 @@ -139,7 +139,7 @@ { ULONG MinorFunction; PIO_STACK_LOCATION Stack; - ULONG Information = 0; + ULONG_PTR Information = 0; NTSTATUS Status; Stack = IoGetCurrentIrpStackLocation(Irp); Modified: trunk/reactos/drivers/input/sermouse/sermouse.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/input/sermouse/serm… ============================================================================== --- trunk/reactos/drivers/input/sermouse/sermouse.h (original) +++ trunk/reactos/drivers/input/sermouse/sermouse.h Wed Jun 7 21:33:57 2006 @@ -54,7 +54,7 @@ typedef struct _SERMOUSE_DRIVER_EXTENSION { - ULONG NumberOfButtons; + USHORT NumberOfButtons; } SERMOUSE_DRIVER_EXTENSION, *PSERMOUSE_DRIVER_EXTENSION; typedef struct _SERMOUSE_DEVICE_EXTENSION

1 0

[hpoussin] 22274: Replace STDCALL by NTAPI Some 64 bits fixes
by hpoussin＠svn.reactos.org 07 Jun '06

07 Jun '06

Author: hpoussin Date: Wed Jun 7 21:31:43 2006 New Revision: 22274 URL: http://svn.reactos.ru/svn/reactos?rev=22274&view=rev Log: Replace STDCALL by NTAPI Some 64 bits fixes Modified: trunk/reactos/drivers/bus/serenum/detect.c trunk/reactos/drivers/bus/serenum/fdo.c trunk/reactos/drivers/bus/serenum/misc.c trunk/reactos/drivers/bus/serenum/serenum.c trunk/reactos/drivers/bus/serenum/serenum.h Modified: trunk/reactos/drivers/bus/serenum/detect.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/bus/serenum/detect.… ============================================================================== --- trunk/reactos/drivers/bus/serenum/detect.c (original) +++ trunk/reactos/drivers/bus/serenum/detect.c Wed Jun 7 21:31:43 2006 @@ -17,9 +17,9 @@ IN PDEVICE_OBJECT DeviceObject, IN ULONG CtlCode, IN PVOID InputBuffer OPTIONAL, - IN ULONG InputBufferSize, + IN ULONG_PTR InputBufferSize, IN OUT PVOID OutputBuffer OPTIONAL, - IN OUT PULONG OutputBufferSize) + IN OUT PULONG_PTR OutputBufferSize) { KEVENT Event; PIRP Irp; @@ -103,7 +103,7 @@ IN PDEVICE_OBJECT LowerDevice, OUT PUCHAR Buffer, IN ULONG BufferSize, - OUT PULONG FilledBytes) + OUT PULONG_PTR FilledBytes) { PIRP Irp; IO_STATUS_BLOCK ioStatus; @@ -258,8 +258,8 @@ { UCHAR Buffer[256]; ULONG BaudRate; - ULONG TotalBytesReceived = 0; - ULONG Size; + ULONG_PTR TotalBytesReceived = 0; + ULONG_PTR Size; ULONG Msr, Purge; ULONG i; BOOLEAN BufferContainsBeginId = FALSE; Modified: trunk/reactos/drivers/bus/serenum/fdo.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/bus/serenum/fdo.c?r… ============================================================================== --- trunk/reactos/drivers/bus/serenum/fdo.c (original) +++ trunk/reactos/drivers/bus/serenum/fdo.c Wed Jun 7 21:31:43 2006 @@ -10,7 +10,7 @@ #define NDEBUG #include "serenum.h" -NTSTATUS STDCALL +NTSTATUS NTAPI SerenumAddDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT Pdo) @@ -68,7 +68,7 @@ return STATUS_SUCCESS; } -static NTSTATUS STDCALL +static NTSTATUS NTAPI SerenumFdoStartDevice( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) Modified: trunk/reactos/drivers/bus/serenum/misc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/bus/serenum/misc.c?… ============================================================================== --- trunk/reactos/drivers/bus/serenum/misc.c (original) +++ trunk/reactos/drivers/bus/serenum/misc.c Wed Jun 7 21:31:43 2006 @@ -86,7 +86,7 @@ return Status; } -static NTSTATUS STDCALL +static NTSTATUS NTAPI ForwardIrpAndWaitCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -128,7 +128,7 @@ return Status; } -NTSTATUS STDCALL +NTSTATUS NTAPI ForwardIrpToLowerDeviceAndForget( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -147,7 +147,7 @@ return IoCallDriver(LowerDevice, Irp); } -NTSTATUS STDCALL +NTSTATUS NTAPI ForwardIrpToAttachedFdoAndForget( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -166,7 +166,7 @@ return IoCallDriver(Fdo, Irp); } -NTSTATUS STDCALL +NTSTATUS NTAPI ForwardIrpAndForget( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) Modified: trunk/reactos/drivers/bus/serenum/serenum.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/bus/serenum/serenum… ============================================================================== --- trunk/reactos/drivers/bus/serenum/serenum.c (original) +++ trunk/reactos/drivers/bus/serenum/serenum.c Wed Jun 7 21:31:43 2006 @@ -11,7 +11,7 @@ #define INITGUID #include "serenum.h" -static NTSTATUS STDCALL +static NTSTATUS NTAPI SerenumPnp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -22,13 +22,13 @@ return SerenumPdoPnp(DeviceObject, Irp); } -static VOID STDCALL +static VOID NTAPI DriverUnload(IN PDRIVER_OBJECT DriverObject) { // nothing to do here yet } -static NTSTATUS STDCALL +static NTSTATUS NTAPI IrpStub( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -90,7 +90,7 @@ /* * Standard DriverEntry method. */ -NTSTATUS STDCALL +NTSTATUS NTAPI DriverEntry( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegPath) Modified: trunk/reactos/drivers/bus/serenum/serenum.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/bus/serenum/serenum… ============================================================================== --- trunk/reactos/drivers/bus/serenum/serenum.h (original) +++ trunk/reactos/drivers/bus/serenum/serenum.h Wed Jun 7 21:31:43 2006 @@ -15,8 +15,6 @@ #if defined(__GNUC__) #include <debug.h> #elif defined(_MSC_VER) - #define STDCALL - #define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint #define CHECKPOINT1 DbgPrint("(%s:%d)\n", __FILE__, __LINE__) #define DPRINT DPRINT1 @@ -88,7 +86,7 @@ /************************************ fdo.c */ -NTSTATUS STDCALL +NTSTATUS NTAPI SerenumAddDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT Pdo); @@ -110,17 +108,17 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS STDCALL +NTSTATUS NTAPI ForwardIrpToLowerDeviceAndForget( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS STDCALL +NTSTATUS NTAPI ForwardIrpToAttachedFdoAndForget( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS STDCALL +NTSTATUS NTAPI ForwardIrpAndForget( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); @@ -134,7 +132,7 @@ /************************************ serenum.c */ -NTSTATUS STDCALL +NTSTATUS NTAPI DriverEntry( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegPath);

1 0

[hpoussin] 22273: Allocate buffer for system directory on heap instead of stack
by hpoussin＠svn.reactos.org 07 Jun '06

07 Jun '06

Author: hpoussin Date: Wed Jun 7 21:30:06 2006 New Revision: 22273 URL: http://svn.reactos.ru/svn/reactos?rev=22273&view=rev Log: Allocate buffer for system directory on heap instead of stack Modified: trunk/reactos/dll/win32/setupapi/devinst.c Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Wed Jun 7 21:30:06 2006 @@ -409,9 +409,6 @@ DWORD i; BOOL ret = FALSE; - TRACE("%s %p 0x%x 0x%x\n", - debugstr_w(SectionName), PlatformInfo, ProductType, SuiteMask); - static const WCHAR ExtensionPlatformNone[] = {'.',0}; static const WCHAR ExtensionPlatformNT[] = {'.','N','T',0}; static const WCHAR ExtensionPlatformWindows[] = {'.','W','i','n',0}; @@ -423,6 +420,9 @@ static const WCHAR ExtensionArchitecturemips[] = {'m','i','p','s',0}; static const WCHAR ExtensionArchitectureppc[] = {'p','p','c',0}; static const WCHAR ExtensionArchitecturex86[] = {'x','8','6',0}; + + TRACE("%s %p 0x%x 0x%x\n", + debugstr_w(SectionName), PlatformInfo, ProductType, SuiteMask); *ScorePlatform = *ScoreMajorVersion = *ScoreMinorVersion = *ScoreProductType = *ScoreSuiteMask = 0; @@ -3198,12 +3198,20 @@ } else { - WCHAR Windir[MAX_PATH + 1 + strlenW(InfDirectory)]; + LPWSTR Windir; UINT ret; + + Windir = MyMalloc((MAX_PATH + 1 + strlenW(InfDirectory)) * sizeof(WCHAR)); + if (!Windir) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } ret = GetSystemWindowsDirectoryW(Windir, MAX_PATH); if (ret == 0 || ret > MAX_PATH) { + MyFree(Windir); SetLastError(ERROR_GEN_FAILURE); return FALSE; } @@ -3221,6 +3229,7 @@ /* The file is in another place */ *IsOEMLocation = TRUE; } + MyFree(Windir); } return TRUE; }

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
60
Older →

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 June 2006