Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 22297: Revert accidental change of ntfs.sys driver's Start value made in last commit
by fireball＠svn.reactos.org 10 Jun '06

10 Jun '06

Author: fireball Date: Sun Jun 11 00:32:25 2006 New Revision: 22297 URL: http://svn.reactos.ru/svn/reactos?rev=22297&view=rev Log: Revert accidental change of ntfs.sys driver's Start value made in last commit Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?r… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Sun Jun 11 00:32:25 2006 @@ -666,7 +666,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Group",0x00000000,"File System" HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","ImagePath",0x00020000,"system32\drivers\ntfs.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Type",0x00010001,0x00000002 ; Null device driver

1 0

[fireball] 22296: Add loading of kernel-mode regression testing driver into hivesys.inf (it's commented out of course by default). To run km regression tests under windows, one should use kmtloader.exe app To run them on reactos, one should copy kmtest.sys to reactos\system32\drivers, and uncomment entries in hivesys.inf
by fireball＠svn.reactos.org 10 Jun '06

10 Jun '06

Author: fireball Date: Sat Jun 10 22:05:44 2006 New Revision: 22296 URL: http://svn.reactos.ru/svn/reactos?rev=22296&view=rev Log: Add loading of kernel-mode regression testing driver into hivesys.inf (it's commented out of course by default). To run km regression tests under windows, one should use kmtloader.exe app To run them on reactos, one should copy kmtest.sys to reactos\system32\drivers, and uncomment entries in hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?r… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Sat Jun 10 22:05:44 2006 @@ -568,6 +568,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Type",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","BreakOnSysRq",0x00010001,0x00000001 +; Kernel-Mode Tests +;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","ErrorControl",0x00010001,0x00000000 +;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","Group",0x00000000,"Base" +;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","ImagePath",0x00020000,"system32\drivers\kmtest.sys" +;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","Start",0x00010001,0x00000001 +;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","Type",0x00010001,0x00000001 + ; Keyboard class driver HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Group",0x00000000,"Keyboard Class" @@ -659,7 +666,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Group",0x00000000,"File System" HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","ImagePath",0x00020000,"system32\drivers\ntfs.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Type",0x00010001,0x00000002 ; Null device driver

1 0

[fireball] 22295: - Add create/insert object tests - Add simple referencing tests (now disabled) - All tests pass currently on Windows 2003
by fireball＠svn.reactos.org 10 Jun '06

10 Jun '06

Author: fireball Date: Sat Jun 10 20:37:34 2006 New Revision: 22295 URL: http://svn.reactos.ru/svn/reactos?rev=22295&view=rev Log: - Add create/insert object tests - Add simple referencing tests (now disabled) - All tests pass currently on Windows 2003 Modified: trunk/reactos/drivers/test/kmtest/ntos_ob.c Modified: trunk/reactos/drivers/test/kmtest/ntos_ob.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/test/kmtest/ntos_ob… ============================================================================== --- trunk/reactos/drivers/test/kmtest/ntos_ob.c (original) +++ trunk/reactos/drivers/test/kmtest/ntos_ob.c Sat Jun 10 20:37:34 2006 @@ -60,6 +60,9 @@ PVOID ObBody[NUM_OBTYPES]; PMY_OBJECT1 ObObject1; PMY_OBJECT2 ObObject2; +HANDLE ObHandle1[NUM_OBTYPES]; +HANDLE ObHandle2[NUM_OBTYPES]; +HANDLE DirectoryHandle; /* PRIVATE FUNCTIONS **********************************************************/ @@ -70,30 +73,34 @@ DbgPrint("DumpProc() called\n"); } +// prototype doesn't match Win2003! (causes BSOD) VOID OpenProc(IN OB_OPEN_REASON OpenReason, - IN PEPROCESS Process, + IN PEPROCESS Process, + IN PVOID Object, + IN ACCESS_MASK GrantedAccess, + IN ULONG HandleCount) +{ + DbgPrint("OpenProc() called\n"); + DbgBreakPoint(); +} + +// Tested in Win2k3 +VOID +CloseProc(IN PEPROCESS Process, IN PVOID Object, IN ACCESS_MASK GrantedAccess, - IN ULONG HandleCount) -{ - DbgPrint("OpenProc() called\n"); -} - -VOID -CloseProc(IN PEPROCESS Process, - IN PVOID Object, - IN ACCESS_MASK GrantedAccess, - IN ULONG ProcessHandleCount, - IN ULONG SystemHandleCount) -{ - DbgPrint("CloseProc() called\n"); -} - + IN ULONG ProcessHandleCount, + IN ULONG SystemHandleCount) +{ + DPRINT("CloseProc() called for Object=0x%p\n", Object); +} + +// Tested in Win2k3 VOID DeleteProc(IN PVOID Object) { - DbgPrint("DeleteProc()called\n"); + DPRINT("DeleteProc() called for Object=0x%p\n", Object); } NTSTATUS @@ -115,7 +122,7 @@ VOID ObtCreateObjectTypes() { - UCHAR i; + USHORT i; NTSTATUS Status; for (i=0; i<NUM_OBTYPES; i++) @@ -135,11 +142,19 @@ ObTypeInitializer[i].MaintainHandleCount = TRUE; ObTypeInitializer[i].ValidAccessMask = OBJECT_TYPE_ALL_ACCESS; + // Test for invalid parameter + // FIXME: Make it more exact, to see which params Win2k3 checks + // existence of + Status = ObCreateObjectType(&ObTypeName[i], &ObTypeInitializer[i], + (PSECURITY_DESCRIPTOR)NULL, &ObTypes[i]); + ok(Status == STATUS_INVALID_PARAMETER, + "ObCreateObjectType returned 0x%lX", Status); + // Object procedures ObTypeInitializer[i].CloseProcedure = (OB_CLOSE_METHOD)CloseProc; ObTypeInitializer[i].DeleteProcedure = (OB_DELETE_METHOD)DeleteProc; ObTypeInitializer[i].DumpProcedure = (OB_DUMP_METHOD)DumpProc; - ObTypeInitializer[i].OpenProcedure = (OB_OPEN_METHOD)OpenProc; + //ObTypeInitializer[i].OpenProcedure = (OB_OPEN_METHOD)OpenProc; ObTypeInitializer[i].ParseProcedure = (OB_PARSE_METHOD)ParseProc; Status = ObCreateObjectType(&ObTypeName[i], &ObTypeInitializer[i], @@ -153,7 +168,6 @@ ObtCreateDirectory() { NTSTATUS Status; - HANDLE DirectoryHandle; // Directory will have permanent and case insensitive flags RtlInitUnicodeString(&ObDirectoryName, L"\\ObtDirectory"); @@ -163,17 +177,15 @@ Status = ZwCreateDirectoryObject(&DirectoryHandle, 0, &ObDirectoryAttributes); ok(Status == STATUS_SUCCESS, "Failed to create directory object with status=0x%lX", Status); - - Status = ZwClose(DirectoryHandle); - ok(Status == STATUS_SUCCESS, - "Failed to close handle with status=0x%lX", Status); } VOID ObtCreateObjects() { + PVOID ObBody1[2]; NTSTATUS Status; + // Create two objects RtlInitUnicodeString(&ObName[0], L"\\ObtDirectory\\MyObject1"); InitializeObjectAttributes(&ObAttributes[0], &ObName[0], OBJ_CASE_INSENSITIVE, NULL, NULL); @@ -187,20 +199,175 @@ (PVOID *)&ObBody[0]); ok(Status == STATUS_SUCCESS, "Failed to create object with status=0x%lX", Status); - DPRINT("Created Object 0\n"); Status = ObCreateObject(KernelMode, ObTypes[1], &ObAttributes[1], KernelMode, NULL, (ULONG)sizeof(MY_OBJECT2), 0L, 0L, (PVOID *)&ObBody[1]); ok(Status == STATUS_SUCCESS, "Failed to create object with status=0x%lX", Status); - DPRINT("Created Object 1\n"); + + // Insert them + Status = ObInsertObject(ObBody[0], NULL, STANDARD_RIGHTS_ALL, 0, + &ObBody[0], &ObHandle1[0]); + ok(Status == STATUS_SUCCESS, + "Failed to insert object 0 with status=0x%lX", Status); + ok(ObBody[0] != NULL, "Object body = NULL"); + ok(ObHandle1[0] != NULL, "Handle = NULL"); + + Status = ObInsertObject(ObBody[1], NULL, GENERIC_ALL, 0, + &ObBody[1], &ObHandle1[1]); + ok(Status == STATUS_SUCCESS, + "Failed to insert object 1 with status=0x%lX", Status); + ok(ObBody[1] != NULL, "Object body = NULL"); + ok(ObHandle1[1] != NULL, "Handle = NULL"); + + // Now create an object of type 0, of the same name and expect it to fail + // inserting, but success creation + RtlInitUnicodeString(&ObName[0], L"\\ObtDirectory\\MyObject1"); + InitializeObjectAttributes(&ObAttributes[0], &ObName[0], OBJ_OPENIF, + NULL, NULL); + + Status = ObCreateObject(KernelMode, ObTypes[0], &ObAttributes[0], KernelMode, + NULL, (ULONG)sizeof(MY_OBJECT1), 0L, 0L, (PVOID *)&ObBody1[0]); + ok(Status == STATUS_SUCCESS, + "Failed to create object with status=0x%lX", Status); + + Status = ObInsertObject(ObBody1[0], NULL, GENERIC_ALL, 0, + &ObBody1[1], &ObHandle2[0]); + ok(Status == STATUS_OBJECT_NAME_EXISTS, + "Object insertion should have failed, but got 0x%lX", Status); + ok(ObBody[0] == ObBody1[1], + "Object bodies doesn't match, 0x%p != 0x%p", ObBody[0], ObBody1[1]); + ok(ObHandle2[0] != NULL, "Bad handle returned 0x%lX", (ULONG)ObHandle2[0]); + + // Close its handle + Status = ZwClose(ObHandle2[0]); + ok(Status == STATUS_SUCCESS, + "Failed to close handle status=0x%lX", Status); + + // Object referenced 2 times: + // 1) ObInsertObject + // 2) AdditionalReferences + ObDereferenceObject(ObBody1[1]); } VOID ObtClose() { - // TODO: Close what we have opened and free what we allocated + PVOID DirObject; + NTSTATUS Status; + //PVOID TypeObject; + //USHORT i; + //UNICODE_STRING ObPathName[NUM_OBTYPES]; + + // Close what we have opened and free what we allocated + ZwClose(ObHandle1[0]); + ZwClose(ObHandle1[1]); + ZwClose(ObHandle2[0]); + ZwClose(ObHandle2[1]); + + // Now we have to get rid of a directory object + // Since it is permanent, we have to firstly make it temporary + // and only then kill + // (this procedure is described in DDK) + Status = ObReferenceObjectByHandle(DirectoryHandle, 0L, NULL, + KernelMode, &DirObject, NULL); + ok(Status == STATUS_SUCCESS, + "Failed to reference object by handle with status=0x%lX", Status); + + // Dereference 2 times - first for just previous referencing + // and 2nd time for creation of permanent object itself + ObDereferenceObject(DirObject); + ObDereferenceObject(DirObject); + + Status = ZwMakeTemporaryObject(DirectoryHandle); + ok(Status == STATUS_SUCCESS, + "Failed to make temp object with status=0x%lX", Status); + + // Close the handle now and we are done + Status = ZwClose(DirectoryHandle); + ok(Status == STATUS_SUCCESS, + "Failed to close handle with status=0x%lX", Status); + + // Now delete the last piece - object types + // FIXME: How to do this correctly? + /* + for (i=0; i<NUM_OBTYPES; i++) + { + ObDereferenceObject(ObTypes[i]); + }*/ + /* + RtlInitUnicodeString(&ObPathName[0], L"\\ObjectTypes\\MyObjectType1"); + RtlInitUnicodeString(&ObPathName[1], L"\\ObjectTypes\\MyObjectType2"); + + for (i=0; i<NUM_OBTYPES; i++) + { + Status = ObReferenceObjectByName(&ObPathName[i], + OBJ_CASE_INSENSITIVE, NULL, 0L, NULL, KernelMode, NULL, + &TypeObject); + + ObDereferenceObject(TypeObject); + ObDereferenceObject(TypeObject); + DPRINT("Reference Name %S = %p, ObTypes[%d] = %p\n", + ObPathName[i], TypeObject, i, ObTypes[i]); + }*/ +} + +VOID +ObtReferenceTests() +{ + USHORT i; + NTSTATUS Status; + UNICODE_STRING ObPathName[NUM_OBTYPES]; + + // Reference them by handle + for (i=0; i<NUM_OBTYPES; i++) + { + Status = ObReferenceObjectByHandle(ObHandle1[i], 0L, ObTypes[i], + KernelMode, &ObBody[i], NULL); + ok(Status == STATUS_SUCCESS, + "Failed to reference object by handle, status=0x%lX", Status); + DPRINT("Ref by handle %lx = %p\n", ObHandle1[i], ObBody[i]); + } + + // Reference them by pointer + for (i=0; i<NUM_OBTYPES; i++) + { + Status = ObReferenceObjectByPointer(ObBody[i], 0L, ObTypes[i], KernelMode); + ok(Status == STATUS_SUCCESS, + "Failed to reference object by pointer, status=0x%lX", Status); + } + + // Reference them by name + RtlInitUnicodeString(&ObPathName[0], L"\\ObtDirectory\\MyObject1"); + RtlInitUnicodeString(&ObPathName[1], L"\\ObtDirectory\\MyObject2"); + + for (i=0; i<NUM_OBTYPES; i++) + { + Status = ObReferenceObjectByName(&ObPathName[i], + OBJ_CASE_INSENSITIVE, NULL, 0L, ObTypes[i], KernelMode, NULL, + &ObBody[0]); + + DPRINT("Ref by name %S = %p\n", ObPathName[i], ObBody[i]); + } + + // Dereference now all of them + + // For ObInsertObject, AdditionalReference + ObDereferenceObject(ObBody[0]); + ObDereferenceObject(ObBody[1]); + + // For ByHandle + ObDereferenceObject(ObBody[0]); + ObDereferenceObject(ObBody[1]); + + // For ByPointer + ObDereferenceObject(ObBody[0]); + ObDereferenceObject(ObBody[1]); + + // For ByName + ObDereferenceObject(ObBody[0]); + ObDereferenceObject(ObBody[1]); } /* PUBLIC FUNCTIONS ***********************************************************/ @@ -223,7 +390,13 @@ ObtCreateObjects(); DPRINT("ObtCreateObjects() done\n"); + // Reference them in a variety of ways + // FIXME: Disabled due to ParseProcedure call + //ObtReferenceTests(); + // Clean up + // FIXME: Disabled to see results of creating objects in usermode + // and also due to problems with object types removal ObtClose(); DPRINT("Cleanup done\n");

1 0

[ion] 22294: - Update sweep callback to send the handle number. Patch by Thomas Weidenmueller (w3seek@reactos.org) - Export ObCloseHandle since it's implemented now - Implement ObpCreateUnnamedHandle and ObpIncrementUnnamedHandleCount as optimizations for ObInsertObject with unnamed objects.
by ion＠svn.reactos.org 10 Jun '06

10 Jun '06

Author: ion Date: Sat Jun 10 04:41:16 2006 New Revision: 22294 URL: http://svn.reactos.ru/svn/reactos?rev=22294&view=rev Log: - Update sweep callback to send the handle number. Patch by Thomas Weidenmueller (w3seek(a)reactos.org) - Export ObCloseHandle since it's implemented now - Implement ObpCreateUnnamedHandle and ObpIncrementUnnamedHandleCount as optimizations for ObInsertObject with unnamed objects. Modified: trunk/reactos/ntoskrnl/ex/handle.c trunk/reactos/ntoskrnl/include/internal/ex.h trunk/reactos/ntoskrnl/ntoskrnl.def trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c (original) +++ trunk/reactos/ntoskrnl/ex/handle.c Sat Jun 10 04:41:16 2006 @@ -168,6 +168,7 @@ IN PVOID Context OPTIONAL) { PHANDLE_TABLE_ENTRY **tlp, **lasttlp, *mlp, *lastmlp; + LONG ExHandle = 0; PAGED_CODE(); @@ -209,12 +210,18 @@ if(curee->Object != NULL && SweepHandleCallback != NULL) { curee->ObAttributes |= EX_HANDLE_ENTRY_LOCKED; - SweepHandleCallback(HandleTable, curee->Object, curee->GrantedAccess, Context); + SweepHandleCallback(curee, EX_HANDLE_TO_HANDLE(ExHandle), Context); } + + ExHandle++; } } - } - } + else + break; + } + } + else + break; } ExReleaseHandleLock(HandleTable); Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/e… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h Sat Jun 10 04:41:16 2006 @@ -160,9 +160,8 @@ EX_HANDLE_ENTRY_AUDITONCLOSE) typedef VOID (STDCALL PEX_SWEEP_HANDLE_CALLBACK)( - PHANDLE_TABLE HandleTable, - PVOID Object, - ULONG GrantedAccess, + PHANDLE_TABLE_ENTRY HandleTableEntry, + HANDLE Handle, PVOID Context ); Modified: trunk/reactos/ntoskrnl/ntoskrnl.def URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.def?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.def Sat Jun 10 04:41:16 2006 @@ -836,7 +836,7 @@ ObAssignSecurity@16 ;ObCheckCreateObjectAccess@28 ;ObCheckObjectAccess@20 -;ObCloseHandle@4 +ObCloseHandle@8 ObCreateObject@36 ObCreateObjectType@16 ObDereferenceObject@4 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 Sat Jun 10 04:41:16 2006 @@ -382,6 +382,270 @@ ObjectHeader->HandleCount, ObjectHeader->PointerCount); return STATUS_SUCCESS; +} + +/*++ +* @name ObpIncrementUnnamedHandleCount +* +* The ObpIncrementUnnamedHandleCount 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 +ObpIncrementUnnamedHandleCount(IN PVOID Object, + IN PACCESS_MASK DesiredAccess, + IN KPROCESSOR_MODE AccessMode, + IN ULONG HandleAttributes, + IN PEPROCESS Process) +{ + POBJECT_HEADER ObjectHeader; + POBJECT_TYPE ObjectType; + ULONG ProcessHandleCount; + NTSTATUS Status; + + /* Get the object header and type */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); + ObjectType = ObjectHeader->Type; + OBTRACE("OBTRACE - %s - Incrementing count for: %p. UNNAMED. HC LC %lx %lx\n", + __FUNCTION__, + Object, + ObjectHeader->HandleCount, + ObjectHeader->PointerCount); + + /* Charge quota and remove the creator info flag */ + Status = ObpChargeQuotaForObject(ObjectHeader, ObjectType); + if (!NT_SUCCESS(Status)) return Status; + + /* Convert MAXIMUM_ALLOWED to GENERIC_ALL */ + if (*DesiredAccess & MAXIMUM_ALLOWED) + { + /* Mask out MAXIMUM_ALLOWED and stick GENERIC_ALL instead */ + *DesiredAccess &= ~MAXIMUM_ALLOWED; + *DesiredAccess |= GENERIC_ALL; + } + + /* Check if we have to map the GENERIC mask */ + if (*DesiredAccess & GENERIC_ACCESS) + { + /* Map it to the correct access masks */ + RtlMapGenericMask(DesiredAccess, + &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) + { + /* Call it */ + ObjectType->TypeInfo.OpenProcedure(ObCreateHandle, + Process, + Object, + *DesiredAccess, + ProcessHandleCount); + } + + /* Increase total number of handles */ + ObjectType->TotalNumberOfHandles++; + OBTRACE("OBTRACE - %s - Incremented count for: %p. UNNAMED HC LC %lx %lx\n", + __FUNCTION__, + Object, + ObjectHeader->HandleCount, + ObjectHeader->PointerCount); + return STATUS_SUCCESS; +} + +/*++ +* @name ObpCreateUnnamedHandle +* +* The ObpCreateUnnamedHandle routine <FILLMEIN> +* +* @param Object +* <FILLMEIN>. +* +* @param DesiredAccess +* <FILLMEIN>. +* +* @param AdditionalReferences +* <FILLMEIN>. +* +* @param HandleAttributes +* <FILLMEIN>. +* +* @param AccessMode +* <FILLMEIN>. +* +* @param ReturnedObject +* <FILLMEIN>. +* +* @param ReturnedHandle +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ +NTSTATUS +NTAPI +ObpCreateUnnamedHandle(IN PVOID Object, + IN ACCESS_MASK DesiredAccess, + IN ULONG AdditionalReferences, + IN ULONG HandleAttributes, + IN KPROCESSOR_MODE AccessMode, + OUT PVOID *ReturnedObject, + OUT PHANDLE ReturnedHandle) +{ + HANDLE_TABLE_ENTRY NewEntry; + POBJECT_HEADER ObjectHeader; + HANDLE Handle; + KAPC_STATE ApcState; + BOOLEAN AttachedToProcess = FALSE; + PVOID HandleTable; + NTSTATUS Status; + PAGED_CODE(); + + /* Get the object header and type */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); + OBTRACE("OBTRACE - %s - Creating handle for: %p. UNNAMED. HC LC %lx %lx\n", + __FUNCTION__, + Object, + ObjectHeader->HandleCount, + ObjectHeader->PointerCount); + + /* Check if this is a kernel handle */ + if ((HandleAttributes & OBJ_KERNEL_HANDLE) && (AccessMode == KernelMode)) + { + /* Set the handle table */ + HandleTable = ObpKernelHandleTable; + + /* Check if we're not in the system process */ + if (PsGetCurrentProcess() != PsInitialSystemProcess) + { + /* Attach to the system process */ + KeStackAttachProcess(&PsInitialSystemProcess->Pcb, &ApcState); + AttachedToProcess = TRUE; + } + } + else + { + /* Get the current handle table */ + HandleTable = PsGetCurrentProcess()->ObjectTable; + } + + /* Increment the handle count */ + Status = ObpIncrementUnnamedHandleCount(Object, + &DesiredAccess, + AccessMode, + HandleAttributes, + PsGetCurrentProcess()); + if (!NT_SUCCESS(Status)) + { + /* + * We failed (meaning security failure, according to NT Internals) + * detach and return + */ + if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); + return Status; + } + + /* Save the object header (assert its validity too) */ + ASSERT((ULONG_PTR)ObjectHeader & EX_HANDLE_ENTRY_LOCKED); + NewEntry.Object = ObjectHeader; + + /* Mask out the internal attributes */ + NewEntry.ObAttributes |= HandleAttributes & + (EX_HANDLE_ENTRY_PROTECTFROMCLOSE | + EX_HANDLE_ENTRY_INHERITABLE | + EX_HANDLE_ENTRY_AUDITONCLOSE); + + /* Save the access mask */ + NewEntry.GrantedAccess = DesiredAccess; + + /* + * Create the actual handle. We'll need to do this *after* calling + * ObpIncrementHandleCount to make sure that Object Security is valid + * (specified in Gl00my documentation on Ob) + */ + OBTRACE("OBTRACE - %s - Handle Properties: [%p-%lx-%lx]\n", + __FUNCTION__, + NewEntry.Object, NewEntry.ObAttributes & 3, NewEntry.GrantedAccess); + Handle = ExCreateHandle(HandleTable, &NewEntry); + + /* Detach if needed */ + if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); + + /* Make sure we got a handle */ + if (Handle) + { + /* Handle extra references */ + while (AdditionalReferences--) + { + /* Increment the count */ + InterlockedIncrement(&ObjectHeader->PointerCount); + } + + /* Check if this was a kernel handle */ + if (HandleAttributes & OBJ_KERNEL_HANDLE) + { + /* Set the kernel handle bit */ + Handle = ObMarkHandleAsKernelHandle(Handle); + } + + /* Return handle and object */ + *ReturnedHandle = Handle; + if (ReturnedObject) *ReturnedObject = Object; + OBTRACE("OBTRACE - %s - Returning Handle: %lx HC LC %lx %lx\n", + __FUNCTION__, + Handle, + ObjectHeader->HandleCount, + ObjectHeader->PointerCount); + return STATUS_SUCCESS; + } + + /* Decrement the handle count and detach */ + ObpDecrementHandleCount(&ObjectHeader->Body, + PsGetCurrentProcess(), + NewEntry.GrantedAccess); + return STATUS_INSUFFICIENT_RESOURCES; } /*++ @@ -752,35 +1016,21 @@ * @remarks None. * *--*/ -#if 0 // waiting on thomas -BOOLEAN +VOID NTAPI ObpCloseHandleCallback(IN PHANDLE_TABLE_ENTRY HandleTableEntry, IN HANDLE Handle, IN PVOID Context) { +#if 0 POBP_CLOSE_HANDLE_CONTEXT CloseContext = (POBP_CLOSE_HANDLE_CONTEXT)Context; /* Simply decrement the handle count */ - ObpCloseHandleTableEntry(Context->HandleTable, + ObpCloseHandleTableEntry(CloseContext->HandleTable, HandleTableEntry, Handle, - Context->AccessMode, + CloseContext->AccessMode, TRUE); - - /* Return success */ - return TRUE; -#else -VOID -NTAPI -ObpCloseHandleCallback(IN PHANDLE_TABLE HandleTable, - IN PVOID Object, - IN ULONG GrantedAccess, - IN PVOID Context) -{ - ObpDecrementHandleCount(&EX_OBJ_TO_HDR(Object)->Body, - PsGetCurrentProcess(), - GrantedAccess); #endif } @@ -1409,7 +1659,6 @@ AUX_DATA AuxData; BOOLEAN IsNamed = FALSE; OB_OPEN_REASON OpenReason = ObCreateHandle; - static int LostOptimizations = 0; PAGED_CODE(); /* Get the Header and Create Info */ @@ -1424,14 +1673,31 @@ /* 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); + /* ReactOS HACK */ + if (Handle) + { + /* Assume failure */ + *Handle = NULL; + + /* Create the handle */ + Status = ObpCreateUnnamedHandle(Object, + DesiredAccess, + AdditionalReferences + 1, + ObjectCreateInfo->Attributes, + ExGetPreviousMode(), + ReferencedObject, + Handle); + } + + /* Free the create information */ + ObpFreeAndReleaseCapturedAttributes(ObjectCreateInfo); + Header->ObjectCreateInfo = NULL; + + /* Remove the extra keep-alive reference */ + //ObDereferenceObject(Object); FIXME: Will require massive changes + + /* Return */ + return Status; } /* Check if we didn't get an access state */

1 0

[turner] 22293: eol-style:native and some TCHAR fixes
by turner＠svn.reactos.org 09 Jun '06

09 Jun '06

Author: turner Date: Fri Jun 9 19:59:56 2006 New Revision: 22293 URL: http://svn.reactos.ru/svn/reactos?rev=22293&view=rev Log: eol-style:native and some TCHAR fixes Modified: trunk/rosapps/tests/readconsole/main.c trunk/rosapps/tests/readconsole/readconsole.rbuild (contents, props changed) Modified: 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 (original) +++ trunk/rosapps/tests/readconsole/main.c Fri Jun 9 19:59:56 2006 @@ -1,5 +1,6 @@ -#include "stdio.h" -#include "Windows.h" +#include <stdio.h> +#include <tchar.h> +#include <windows.h> int main() { @@ -20,10 +21,10 @@ // // 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')); + _tprintf(TEXT("You printed %c :: "), Buffer); + _tprintf(TEXT("With a value %d :: "), Buffer); + _tprintf(TEXT("Number of chars recieved %lu :: "), Count); + _tprintf(TEXT("Char equal to backspace %d \n"), (Buffer == TEXT('\b'))); // // :) Modified: trunk/rosapps/tests/readconsole/readconsole.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/rosapps/tests/readconsole/readconso… ============================================================================== --- trunk/rosapps/tests/readconsole/readconsole.rbuild (original) +++ trunk/rosapps/tests/readconsole/readconsole.rbuild Fri Jun 9 19:59:56 2006 @@ -1,5 +1,7 @@ -<module name="readconsole" type="win32cui" installbase="bin" installname="readconsole.exe"> - <define name="__USE_W32API" /> - <library>kernel32</library> - <file>main.c</file> -</module> +<module name="readconsole" type="win32cui" installbase="bin" installname="readconsole.exe"> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__USE_W32API" /> + <library>kernel32</library> + <file>main.c</file> +</module> Propchange: trunk/rosapps/tests/readconsole/readconsole.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hpoussin] 22292: Add documentation to SetupDiBuildClassInfoList/SetupDiBuildClassInfoListExA/W Patch by Christian Gmeiner on wine-patches ML
by hpoussin＠svn.reactos.org 09 Jun '06

09 Jun '06

Author: hpoussin Date: Fri Jun 9 18:16:39 2006 New Revision: 22292 URL: http://svn.reactos.ru/svn/reactos?rev=22292&view=rev Log: Add documentation to SetupDiBuildClassInfoList/SetupDiBuildClassInfoListExA/W Patch by Christian Gmeiner on wine-patches ML Modified: trunk/reactos/dll/win32/setupapi/devclass.c Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/devclass… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devclass.c (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c Fri Jun 9 18:16:39 2006 @@ -99,6 +99,19 @@ /*********************************************************************** * SetupDiBuildClassInfoList (SETUPAPI.@) + * + * Returns a list of setup class GUIDs that identify the classes + * that are installed on a local machine. + * + * PARAMS + * Flags [I] control exclusion of classes from the list. + * ClassGuidList [O] pointer to a GUID-typed array that receives a list of setup class GUIDs. + * ClassGuidListSize [I] The number of GUIDs in the array (ClassGuidList). + * RequiredSize [O] pointer, which receives the number of GUIDs that are returned. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE. */ BOOL WINAPI SetupDiBuildClassInfoList( @@ -115,6 +128,18 @@ /*********************************************************************** * SetupDiBuildClassInfoListExA (SETUPAPI.@) + * + * PARAMS + * Flags [I] control exclusion of classes from the list. + * ClassGuidList [O] pointer to a GUID-typed array that receives a list of setup class GUIDs. + * ClassGuidListSize [I] The number of GUIDs in the array (ClassGuidList). + * RequiredSize [O] pointer, which receives the number of GUIDs that are returned. + * MachineName [I] name of a remote machine. + * Reserved [I] must be NULL. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE. */ BOOL WINAPI SetupDiBuildClassInfoListExA( @@ -147,7 +172,22 @@ } /*********************************************************************** - * SetupDiBuildClassInfoListExW (SETUPAPI.@) + * SetupDiBuildClassInfoListExW (SETUPAPI.@) + * + * Returns a list of setup class GUIDs that identify the classes + * that are installed on a local or remote macine. + * + * PARAMS + * Flags [I] control exclusion of classes from the list. + * ClassGuidList [O] pointer to a GUID-typed array that receives a list of setup class GUIDs. + * ClassGuidListSize [I] The number of GUIDs in the array (ClassGuidList). + * RequiredSize [O] pointer, which receives the number of GUIDs that are returned. + * MachineName [I] name of a remote machine. + * Reserved [I] must be NULL. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE. */ BOOL WINAPI SetupDiBuildClassInfoListExW(

1 0

[ion] 22291: - Fix the CmpObjectDelete bugcheck by hacking away some code reponsible for it. The bugcheck is probably the result of the current ref-count bug. - Remove some more code in IoCreateFile/IopCreateFile to help with deprecating it later.
by ion＠svn.reactos.org 09 Jun '06

09 Jun '06

Author: ion Date: Fri Jun 9 12:49:03 2006 New Revision: 22291 URL: http://svn.reactos.ru/svn/reactos?rev=22291&view=rev Log: - Fix the CmpObjectDelete bugcheck by hacking away some code reponsible for it. The bugcheck is probably the result of the current ref-count bug. - Remove some more code in IoCreateFile/IopCreateFile to help with deprecating it later. Modified: trunk/reactos/ntoskrnl/cm/regobj.c trunk/reactos/ntoskrnl/io/file.c Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Fri Jun 9 12:49:03 2006 @@ -491,9 +491,9 @@ KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); - if (!NT_SUCCESS(CmiRemoveKeyFromList(KeyObject))) - { - DPRINT1("Key not found in parent list ???\n"); + //if (!NT_SUCCESS(CmiRemoveKeyFromList(KeyObject))) + { + // DPRINT1("Key not found in parent list ???\n"); } RemoveEntryList(&KeyObject->ListEntry); @@ -525,7 +525,7 @@ if (KeyObject->NumberOfSubKeys) { - KEBUGCHECK(REGISTRY_ERROR); + //KEBUGCHECK(REGISTRY_ERROR); } if (KeyObject->SizeOfSubKeys) Modified: trunk/reactos/ntoskrnl/io/file.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/io/file.c?rev=2229… ============================================================================== --- trunk/reactos/ntoskrnl/io/file.c (original) +++ trunk/reactos/ntoskrnl/io/file.c Fri Jun 9 12:49:03 2006 @@ -130,19 +130,11 @@ POBJECT_TYPE ParentObjectType; NTSTATUS Status; - DPRINT("IopCreateFile(ObjectBody 0x%p, Parent 0x%p, RemainingPath %S)\n", - ObjectBody, - Parent, - RemainingPath); - ParentObjectType = OBJECT_TO_OBJECT_HEADER(Parent)->Type; - if (ParentObjectType == IoDeviceObjectType) { - /* Parent is a devce object */ + /* Parent is a device object */ DeviceObject = IoGetAttachedDevice((PDEVICE_OBJECT)Parent); - DPRINT1("DeviceObject 0x%p\n", DeviceObject); - if (DeviceObject->Vpb) { if (!(DeviceObject->Vpb->Flags & VPB_MOUNTED)) @@ -153,23 +145,30 @@ } DeviceObject = DeviceObject->Vpb->DeviceObject; } - - DPRINT("FsDeviceObject %lx\n", DeviceObject); - RtlCreateUnicodeString(&FileObject->FileName, RemainingPath); } else { DeviceObject = ((PFILE_OBJECT)Parent)->DeviceObject; - DPRINT("DeviceObject 0x%p\n", DeviceObject); - FileObject->RelatedFileObject = (PFILE_OBJECT)Parent; - - RtlCreateUnicodeString(&FileObject->FileName, RemainingPath); - } - + } + +#if 0 + DbgPrint("--------------------- Creating File ---------------------\n"); + DbgPrint("Parent ObjectType: %wZ\n" + "Device Object: %p\n" + "File Object: %p\n" + "Device Name: %wZ\n" + "Remaining Path: %S\n", + &ParentObjectType->Name, + DeviceObject, + FileObject, + &DeviceObject->DriverObject->DriverName, + RemainingPath); + DbgPrint("--------------------- Created File ----------------------\n"); +#endif + + RtlCreateUnicodeString(&FileObject->FileName, RemainingPath); FileObject->DeviceObject = DeviceObject; - FileObject->Vpb = DeviceObject->Vpb; - FileObject->Type = IO_TYPE_FILE; return STATUS_SUCCESS; } @@ -949,107 +948,72 @@ NULL, &LocalHandle); - if (NT_SUCCESS(Status)) - { - OBJECT_CREATE_INFORMATION ObjectCreateInfo; - OBJECT_ATTRIBUTES tmpObjectAttributes; - UNICODE_STRING ObjectName; - - DPRINT1("FileExisted: %wZ %lx\n", ObjectAttributes->ObjectName, LocalHandle); - Status = ObReferenceObjectByHandle(LocalHandle, - DesiredAccess, - NULL, - KernelMode, - (PVOID*)&DeviceObject, - NULL); - ZwClose(LocalHandle); - if (!NT_SUCCESS(Status)) - { - return Status; - } - if (OBJECT_TO_OBJECT_HEADER(DeviceObject)->Type != IoDeviceObjectType) - { - ObDereferenceObject (DeviceObject); - return STATUS_OBJECT_NAME_COLLISION; - } - - Status = ObpCaptureObjectAttributes(ObjectAttributes, - AccessMode, - FALSE, - &ObjectCreateInfo, - &ObjectName); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject (DeviceObject); - return Status; - } - - InitializeObjectAttributes(&tmpObjectAttributes, - NULL, - ObjectCreateInfo.Attributes & OBJ_INHERIT, - 0, - NULL); - ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName); - - - /* FIXME: wt... */ - Status = ObCreateObject(KernelMode, - IoFileObjectType, - &tmpObjectAttributes, - KernelMode, - NULL, - sizeof(FILE_OBJECT), - 0, - 0, - (PVOID*)&FileObject); - - - /* Set File Object Data */ - FileObject->DeviceObject = IoGetAttachedDevice(DeviceObject); - FileObject->Vpb = FileObject->DeviceObject->Vpb; - - /* HACK */ - FileObject->Flags |= FO_DIRECT_DEVICE_OPEN; - DPRINT("%wZ\n", ObjectAttributes->ObjectName); - - ObDereferenceObject (DeviceObject); - } - - - if (FileObject == NULL) - { - Status = ObCreateObject(AccessMode, - IoFileObjectType, - ObjectAttributes, - AccessMode, - NULL, - sizeof(FILE_OBJECT), - 0, - 0, - (PVOID*)&FileObject); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObCreateObject() failed! (Status %lx)\n", Status); - return Status; - } - } - RtlMapGenericMask(&DesiredAccess, - &OBJECT_TO_OBJECT_HEADER(FileObject)->Type->TypeInfo.GenericMapping); - - Status = ObInsertObject ((PVOID)FileObject, - NULL, - DesiredAccess, - 0, - NULL, - &LocalHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObInsertObject() failed! (Status %lx)\n", Status); - ObMakeTemporaryObject(FileObject); - ObDereferenceObject (FileObject); - return Status; - } + // + // start stuff that should be in IopParseDevice + // + if (NT_SUCCESS(Status)) + { + Status = ObReferenceObjectByHandle(LocalHandle, + DesiredAccess, + NULL, + KernelMode, + (PVOID*)&DeviceObject, + NULL); + DPRINT("FileExisted: %wZ %lx %p\n", ObjectAttributes->ObjectName, LocalHandle, DeviceObject); + ZwClose(LocalHandle); + + /* FIXME: wt... */ + Status = ObCreateObject(KernelMode, + IoFileObjectType, + NULL, + KernelMode, + NULL, + sizeof(FILE_OBJECT), + 0, + 0, + (PVOID*)&FileObject); + + /* Set File Object Data */ + FileObject->DeviceObject = IoGetAttachedDevice(DeviceObject); + + /* HACK */ + FileObject->Flags |= FO_DIRECT_DEVICE_OPEN; + DPRINT("%p\n", FileObject->DeviceObject); + ObDereferenceObject (DeviceObject); + } + + if (FileObject == NULL) + { + Status = ObCreateObject(AccessMode, + IoFileObjectType, + ObjectAttributes, + AccessMode, + NULL, + sizeof(FILE_OBJECT), + 0, + 0, + (PVOID*)&FileObject); + } + + RtlMapGenericMask(&DesiredAccess, + &OBJECT_TO_OBJECT_HEADER(FileObject)->Type->TypeInfo.GenericMapping); + + Status = ObInsertObject ((PVOID)FileObject, + NULL, + DesiredAccess, + 0, + NULL, + &LocalHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObInsertObject() failed! (Status %lx)\n", Status); + ObMakeTemporaryObject(FileObject); + ObDereferenceObject (FileObject); + return Status; + } + // + // stop stuff that should be in IopParseDevice + // if (CreateOptions & FILE_SYNCHRONOUS_IO_ALERT) {

1 0

[ion] 22290: - Add the OPEN_PACKET structure to internal headers. Used for the I/O Parse Routine. - Gut down IopCreateFile to the strict minimum so that only the critical parts remain. - NT Compatiblity fix in ObFindObject: stop parsing if remaining path is null, this means that the parse routine is done parsing and that -this- is the final object.
by ion＠svn.reactos.org 09 Jun '06

09 Jun '06

Author: ion Date: Fri Jun 9 11:28:26 2006 New Revision: 22290 URL: http://svn.reactos.ru/svn/reactos?rev=22290&view=rev Log: - Add the OPEN_PACKET structure to internal headers. Used for the I/O Parse Routine. - Gut down IopCreateFile to the strict minimum so that only the critical parts remain. - NT Compatiblity fix in ObFindObject: stop parsing if remaining path is null, this means that the parse routine is done parsing and that -this- is the final object. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/file.c trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/i… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Fri Jun 9 11:28:26 2006 @@ -65,6 +65,44 @@ IO_STATUS_BLOCK IoStatus; } IO_COMPLETION_PACKET, *PIO_COMPLETION_PACKET; +typedef struct _DUMMY_FILE_OBJECT +{ + OBJECT_HEADER ObjectHeader; + CHAR FileObjectBody[sizeof(FILE_OBJECT)]; +} DUMMY_FILE_OBJECT, *PDUMMY_FILE_OBJECT; + +typedef struct _OPEN_PACKET +{ + CSHORT Type; + CSHORT Size; + PFILE_OBJECT FileObject; + NTSTATUS FinalStatus; + ULONG_PTR Information; + ULONG ParseCheck; + PFILE_OBJECT RelatedFileObject; + OBJECT_ATTRIBUTES OriginalAttributes; + LARGE_INTEGER AllocationSize; + ULONG CreateOptions; + USHORT FileAttributes; + USHORT ShareAccess; + PVOID EaBuffer; + ULONG EaLength; + ULONG Options; + ULONG Disposition; + PFILE_BASIC_INFORMATION BasicInformation; + PFILE_NETWORK_OPEN_INFORMATION NetworkInformation; + CREATE_FILE_TYPE CreateFileType; + PVOID MailslotOrPipeParameters; + BOOLEAN Override; + BOOLEAN QueryOnly; + BOOLEAN DeleteOnly; + BOOLEAN FullAttributes; + PDUMMY_FILE_OBJECT DummyFileObject; + ULONG InternalFlags; + //PIO_DRIVER_CREATE_CONTEXT DriverCreateContext; Vista only, needs ROS DDK Update +} OPEN_PACKET, *POPEN_PACKET; + + /* List of Bus Type GUIDs */ typedef struct _IO_BUS_TYPE_GUID_LIST { Modified: trunk/reactos/ntoskrnl/io/file.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/io/file.c?rev=2229… ============================================================================== --- trunk/reactos/ntoskrnl/io/file.c (original) +++ trunk/reactos/ntoskrnl/io/file.c Fri Jun 9 11:28:26 2006 @@ -125,120 +125,52 @@ PWSTR RemainingPath, POBJECT_CREATE_INFORMATION ObjectCreateInfo) { - PDEVICE_OBJECT DeviceObject; - PFILE_OBJECT FileObject = (PFILE_OBJECT) ObjectBody; - POBJECT_TYPE ParentObjectType; - NTSTATUS Status; - - DPRINT("IopCreateFile(ObjectBody 0x%p, Parent 0x%p, RemainingPath %S)\n", - ObjectBody, - Parent, - RemainingPath); - - if (NULL == Parent) - { - /* This is probably an attempt to create a meta fileobject (eg. for FAT) - for the cache manager, so return STATUS_SUCCESS */ - DPRINT("Parent object was NULL\n"); - return(STATUS_SUCCESS); - } - - ParentObjectType = OBJECT_TO_OBJECT_HEADER(Parent)->Type; - - if (ParentObjectType != IoDeviceObjectType && - ParentObjectType != IoFileObjectType) - { - DPRINT("Parent [%wZ] is a %S which is neither a file type nor a device type ; remaining path = %S\n", - &OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(Parent))->Name, - OBJECT_TO_OBJECT_HEADER(Parent)->Type->Name.Buffer, - RemainingPath); - return(STATUS_UNSUCCESSFUL); - } - - Status = ObReferenceObjectByPointer(Parent, - STANDARD_RIGHTS_REQUIRED, - ParentObjectType, - UserMode); - if (!NT_SUCCESS(Status)) - { - CPRINT("Failed to reference parent object 0x%p\n", Parent); - return(Status); - } - - if (ParentObjectType == IoDeviceObjectType) - { - /* Parent is a devce object */ - DeviceObject = IoGetAttachedDevice((PDEVICE_OBJECT)Parent); - DPRINT("DeviceObject 0x%p\n", DeviceObject); - - if (RemainingPath == NULL) - { - FileObject->Flags = FileObject->Flags | FO_DIRECT_DEVICE_OPEN; - FileObject->FileName.Buffer = 0; - FileObject->FileName.Length = FileObject->FileName.MaximumLength = 0; - } - else - { - if ((DeviceObject->DeviceType != FILE_DEVICE_FILE_SYSTEM) - && (DeviceObject->DeviceType != FILE_DEVICE_DISK) - && (DeviceObject->DeviceType != FILE_DEVICE_CD_ROM) - && (DeviceObject->DeviceType != FILE_DEVICE_TAPE) - && (DeviceObject->DeviceType != FILE_DEVICE_NETWORK) - && (DeviceObject->DeviceType != FILE_DEVICE_NAMED_PIPE) - && (DeviceObject->DeviceType != FILE_DEVICE_MAILSLOT)) + PDEVICE_OBJECT DeviceObject; + PFILE_OBJECT FileObject = (PFILE_OBJECT) ObjectBody; + POBJECT_TYPE ParentObjectType; + NTSTATUS Status; + + DPRINT("IopCreateFile(ObjectBody 0x%p, Parent 0x%p, RemainingPath %S)\n", + ObjectBody, + Parent, + RemainingPath); + + ParentObjectType = OBJECT_TO_OBJECT_HEADER(Parent)->Type; + + if (ParentObjectType == IoDeviceObjectType) + { + /* Parent is a devce object */ + DeviceObject = IoGetAttachedDevice((PDEVICE_OBJECT)Parent); + DPRINT1("DeviceObject 0x%p\n", DeviceObject); + + if (DeviceObject->Vpb) + { + if (!(DeviceObject->Vpb->Flags & VPB_MOUNTED)) { - CPRINT("Device was wrong type\n"); - return(STATUS_UNSUCCESSFUL); + DPRINT1("Mount the logical volume\n"); + Status = IoMountVolume(DeviceObject, FALSE); + DPRINT1("Status %x\n", Status); } - - if (DeviceObject->DeviceType != FILE_DEVICE_NETWORK - && (DeviceObject->DeviceType != FILE_DEVICE_NAMED_PIPE) - && (DeviceObject->DeviceType != FILE_DEVICE_MAILSLOT)) - { - if (!(DeviceObject->Vpb->Flags & VPB_MOUNTED)) - { - DPRINT("Mount the logical volume\n"); - Status = IoMountVolume(DeviceObject, FALSE); - DPRINT("Status %x\n", Status); - if (!NT_SUCCESS(Status)) - { - CPRINT("Failed to mount logical volume (Status %x)\n", Status); - return(Status); - } - } - DeviceObject = DeviceObject->Vpb->DeviceObject; - DPRINT("FsDeviceObject %lx\n", DeviceObject); - } - RtlCreateUnicodeString(&FileObject->FileName, RemainingPath); - } - } - else - { - /* Parent is a file object */ - if (RemainingPath == NULL) - { - CPRINT("Device is unnamed\n"); - return STATUS_UNSUCCESSFUL; - } - - DeviceObject = ((PFILE_OBJECT)Parent)->DeviceObject; - DPRINT("DeviceObject 0x%p\n", DeviceObject); - - FileObject->RelatedFileObject = (PFILE_OBJECT)Parent; - - RtlCreateUnicodeString(&FileObject->FileName, RemainingPath); - } - - DPRINT("FileObject->FileName %wZ\n", - &FileObject->FileName); - FileObject->DeviceObject = DeviceObject; - DPRINT("FileObject 0x%p DeviceObject 0x%p\n", - FileObject, - DeviceObject); - FileObject->Vpb = DeviceObject->Vpb; - FileObject->Type = IO_TYPE_FILE; - - return(STATUS_SUCCESS); + DeviceObject = DeviceObject->Vpb->DeviceObject; + } + + DPRINT("FsDeviceObject %lx\n", DeviceObject); + RtlCreateUnicodeString(&FileObject->FileName, RemainingPath); + } + else + { + DeviceObject = ((PFILE_OBJECT)Parent)->DeviceObject; + DPRINT("DeviceObject 0x%p\n", DeviceObject); + + FileObject->RelatedFileObject = (PFILE_OBJECT)Parent; + + RtlCreateUnicodeString(&FileObject->FileName, RemainingPath); + } + + FileObject->DeviceObject = DeviceObject; + FileObject->Vpb = DeviceObject->Vpb; + FileObject->Type = IO_TYPE_FILE; + return STATUS_SUCCESS; } VOID @@ -1023,6 +955,7 @@ OBJECT_ATTRIBUTES tmpObjectAttributes; UNICODE_STRING ObjectName; + DPRINT1("FileExisted: %wZ %lx\n", ObjectAttributes->ObjectName, LocalHandle); Status = ObReferenceObjectByHandle(LocalHandle, DesiredAccess, NULL, 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 Fri Jun 9 11:28:26 2006 @@ -288,6 +288,7 @@ } ObDereferenceObject(CurrentObject); CurrentObject = NextObject; + if (!current) break; } if (current)

1 0

[fireball] 22289: - Added DPRINT logic in all files (to be used as "TRACE" to aid in debugging of tests) - Added initial part of Ob tests which uses ObCreateObjectType, NtCreateDirectoryObject, ObCreateObject exported APIs.
by fireball＠svn.reactos.org 08 Jun '06

08 Jun '06

Author: fireball Date: Fri Jun 9 01:39:51 2006 New Revision: 22289 URL: http://svn.reactos.ru/svn/reactos?rev=22289&view=rev Log: - Added DPRINT logic in all files (to be used as "TRACE" to aid in debugging of tests) - Added initial part of Ob tests which uses ObCreateObjectType, NtCreateDirectoryObject, ObCreateObject exported APIs. Added: trunk/reactos/drivers/test/kmtest/ntos_ob.c Modified: trunk/reactos/drivers/test/kmtest/deviface.c trunk/reactos/drivers/test/kmtest/deviface_test.c trunk/reactos/drivers/test/kmtest/kmtest.c trunk/reactos/drivers/test/kmtest/kmtest.h trunk/reactos/drivers/test/kmtest/kmtest.rbuild trunk/reactos/drivers/test/kmtest/ntos_io.c Modified: trunk/reactos/drivers/test/kmtest/deviface.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/test/kmtest/devifac… ============================================================================== --- trunk/reactos/drivers/test/kmtest/deviface.c (original) +++ trunk/reactos/drivers/test/kmtest/deviface.c Fri Jun 9 01:39:51 2006 @@ -25,6 +25,9 @@ #include <ddk/ntddk.h> #include "kmtest.h" + +//#define NDEBUG +#include "debug.h" /* PUBLIC FUNCTIONS ***********************************************************/ Modified: trunk/reactos/drivers/test/kmtest/deviface_test.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/test/kmtest/devifac… ============================================================================== --- trunk/reactos/drivers/test/kmtest/deviface_test.c (original) +++ trunk/reactos/drivers/test/kmtest/deviface_test.c Fri Jun 9 01:39:51 2006 @@ -24,6 +24,9 @@ #include <ddk/ntddk.h> #include "kmtest.h" + +//#define NDEBUG +#include "debug.h" /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/drivers/test/kmtest/kmtest.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/test/kmtest/kmtest.… ============================================================================== --- trunk/reactos/drivers/test/kmtest/kmtest.c (original) +++ trunk/reactos/drivers/test/kmtest/kmtest.c Fri Jun 9 01:39:51 2006 @@ -105,6 +105,7 @@ */ VOID FASTCALL DeviceInterfaceTest(); VOID FASTCALL NtoskrnlIoMdlTest(); +VOID FASTCALL NtoskrnlObTest(); /* * DriverEntry @@ -114,9 +115,10 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) { - DbgPrint("Kernel Mode Regression Test driver starting...\n"); + DbgPrint("\n===============================================\nKernel Mode Regression Test driver starting...\n"); //DeviceInterfaceTest(); NtoskrnlIoMdlTest(); + NtoskrnlObTest(); return STATUS_UNSUCCESSFUL; } Modified: trunk/reactos/drivers/test/kmtest/kmtest.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/test/kmtest/kmtest.… ============================================================================== --- trunk/reactos/drivers/test/kmtest/kmtest.h (original) +++ trunk/reactos/drivers/test/kmtest/kmtest.h Fri Jun 9 01:39:51 2006 @@ -9,12 +9,6 @@ Wine regression tests Copyright (C) 2002 Alexandre Julliard. Everything else is done by Aleksey Bragin based on PnPTest by Filip Navara */ - -#if 0 -#define DPRINT DbgPrint("%s:%d ", __FILE__, __LINE__), DbgPrint -#else -#define DPRINT DbgPrint -#endif extern ULONG successes; /* number of successful tests */ extern ULONG failures; /* number of failures */ Modified: trunk/reactos/drivers/test/kmtest/kmtest.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/test/kmtest/kmtest.… ============================================================================== --- trunk/reactos/drivers/test/kmtest/kmtest.rbuild (original) +++ trunk/reactos/drivers/test/kmtest/kmtest.rbuild Fri Jun 9 01:39:51 2006 @@ -8,5 +8,6 @@ <file>deviface.c</file> <file>deviface_test.c</file> <file>ntos_io.c</file> + <file>ntos_ob.c</file> <file>kmtest.rc</file> </module> Modified: trunk/reactos/drivers/test/kmtest/ntos_io.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/test/kmtest/ntos_io… ============================================================================== --- trunk/reactos/drivers/test/kmtest/ntos_io.c (original) +++ trunk/reactos/drivers/test/kmtest/ntos_io.c Fri Jun 9 01:39:51 2006 @@ -24,6 +24,9 @@ #include <ddk/ntddk.h> #include "kmtest.h" + +#define NDEBUG +#include "debug.h" /* PUBLIC FUNCTIONS ***********************************************************/ Added: trunk/reactos/drivers/test/kmtest/ntos_ob.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/test/kmtest/ntos_ob… ============================================================================== --- trunk/reactos/drivers/test/kmtest/ntos_ob.c (added) +++ trunk/reactos/drivers/test/kmtest/ntos_ob.c Fri Jun 9 01:39:51 2006 @@ -1,0 +1,231 @@ +/* + * NTOSKRNL Ob Regressions KM-Test + * ReactOS Kernel Mode Regression Testing framework + * + * Copyright 2006 Aleksey Bragin <aleksey(a)reactos.org> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; see the file COPYING.LIB. + * If not, write to the Free Software Foundation, + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +/* INCLUDES *******************************************************************/ + +#include <ddk/ntddk.h> +#include "kmtest.h" + +//#define NDEBUG +#include "debug.h" + +#include "ndk/obtypes.h" +#include "ndk/obfuncs.h" + +#include "ndk/ifssupp.h" +#include "ndk/setypes.h" +#include "ndk/sefuncs.h" + +// I ment to make this test scalable, but for now +// we work with two object types only +#define NUM_OBTYPES 2 + +typedef struct _MY_OBJECT1 +{ + ULONG Something1; +} MY_OBJECT1, *PMY_OBJECT1; + +typedef struct _MY_OBJECT2 +{ + ULONG Something1; + ULONG SomeLong[10]; +} MY_OBJECT2, *PMY_OBJECT2; + +POBJECT_TYPE ObTypes[NUM_OBTYPES]; +UNICODE_STRING ObTypeName[NUM_OBTYPES]; +UNICODE_STRING ObName[NUM_OBTYPES]; +OBJECT_TYPE_INITIALIZER ObTypeInitializer[NUM_OBTYPES]; +UNICODE_STRING ObDirectoryName; +OBJECT_ATTRIBUTES ObDirectoryAttributes; +OBJECT_ATTRIBUTES ObAttributes[NUM_OBTYPES]; +PVOID ObBody[NUM_OBTYPES]; +PMY_OBJECT1 ObObject1; +PMY_OBJECT2 ObObject2; + +/* PRIVATE FUNCTIONS **********************************************************/ + +VOID +DumpProc(IN PVOID Object, + IN POB_DUMP_CONTROL DumpControl) +{ + DbgPrint("DumpProc() called\n"); +} + +VOID +OpenProc(IN OB_OPEN_REASON OpenReason, + IN PEPROCESS Process, + IN PVOID Object, + IN ACCESS_MASK GrantedAccess, + IN ULONG HandleCount) +{ + DbgPrint("OpenProc() called\n"); +} + +VOID +CloseProc(IN PEPROCESS Process, + IN PVOID Object, + IN ACCESS_MASK GrantedAccess, + IN ULONG ProcessHandleCount, + IN ULONG SystemHandleCount) +{ + DbgPrint("CloseProc() called\n"); +} + +VOID +DeleteProc(IN PVOID Object) +{ + DbgPrint("DeleteProc()called\n"); +} + +NTSTATUS +ParseProc(IN PVOID ParseObject, + IN PVOID ObjectType, + IN OUT PACCESS_STATE AccessState, + IN KPROCESSOR_MODE AccessMode, + IN ULONG Attributes, + IN OUT PUNICODE_STRING CompleteName, + IN OUT PUNICODE_STRING RemainingName, + IN OUT PVOID Context OPTIONAL, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, + OUT PVOID *Object) +{ + DbgPrint("ParseProc() called\n"); + return STATUS_SUCCESS; +} + +VOID +ObtCreateObjectTypes() +{ + UCHAR i; + NTSTATUS Status; + + for (i=0; i<NUM_OBTYPES; i++) + { + // Prepare object type name + // TODO: Generate type names and don't use this unprofessional, + // ugly looking, and otherwise bad if-condition + if (i == 0) + RtlInitUnicodeString(&ObTypeName[i], L"MyObjectType1"); + else + RtlInitUnicodeString(&ObTypeName[i], L"MyObjectType2"); + + // Prepare initializer + RtlZeroMemory(&ObTypeInitializer[i], sizeof(ObTypeInitializer[i])); + ObTypeInitializer[i].Length = sizeof(ObTypeInitializer[i]); + ObTypeInitializer[i].PoolType = NonPagedPool; + ObTypeInitializer[i].MaintainHandleCount = TRUE; + ObTypeInitializer[i].ValidAccessMask = OBJECT_TYPE_ALL_ACCESS; + + // Object procedures + ObTypeInitializer[i].CloseProcedure = (OB_CLOSE_METHOD)CloseProc; + ObTypeInitializer[i].DeleteProcedure = (OB_DELETE_METHOD)DeleteProc; + ObTypeInitializer[i].DumpProcedure = (OB_DUMP_METHOD)DumpProc; + ObTypeInitializer[i].OpenProcedure = (OB_OPEN_METHOD)OpenProc; + ObTypeInitializer[i].ParseProcedure = (OB_PARSE_METHOD)ParseProc; + + Status = ObCreateObjectType(&ObTypeName[i], &ObTypeInitializer[i], + (PSECURITY_DESCRIPTOR)NULL, &ObTypes[i]); + ok(Status == STATUS_SUCCESS, + "Failed to create object type with status=0x%lX", Status); + } +} + +VOID +ObtCreateDirectory() +{ + NTSTATUS Status; + HANDLE DirectoryHandle; + + // Directory will have permanent and case insensitive flags + RtlInitUnicodeString(&ObDirectoryName, L"\\ObtDirectory"); + InitializeObjectAttributes(&ObDirectoryAttributes, &ObDirectoryName, + OBJ_PERMANENT | OBJ_CASE_INSENSITIVE, NULL, NULL); + + Status = ZwCreateDirectoryObject(&DirectoryHandle, 0, &ObDirectoryAttributes); + ok(Status == STATUS_SUCCESS, + "Failed to create directory object with status=0x%lX", Status); + + Status = ZwClose(DirectoryHandle); + ok(Status == STATUS_SUCCESS, + "Failed to close handle with status=0x%lX", Status); +} + +VOID +ObtCreateObjects() +{ + NTSTATUS Status; + + RtlInitUnicodeString(&ObName[0], L"\\ObtDirectory\\MyObject1"); + InitializeObjectAttributes(&ObAttributes[0], &ObName[0], + OBJ_CASE_INSENSITIVE, NULL, NULL); + + RtlInitUnicodeString(&ObName[1], L"\\ObtDirectory\\MyObject2"); + InitializeObjectAttributes(&ObAttributes[1], &ObName[1], + OBJ_CASE_INSENSITIVE, NULL, NULL); + + Status = ObCreateObject(KernelMode, ObTypes[0], &ObAttributes[0], + KernelMode, NULL, (ULONG)sizeof(MY_OBJECT1), 0L, 0L, + (PVOID *)&ObBody[0]); + ok(Status == STATUS_SUCCESS, + "Failed to create object with status=0x%lX", Status); + DPRINT("Created Object 0\n"); + + Status = ObCreateObject(KernelMode, ObTypes[1], &ObAttributes[1], + KernelMode, NULL, (ULONG)sizeof(MY_OBJECT2), 0L, 0L, + (PVOID *)&ObBody[1]); + ok(Status == STATUS_SUCCESS, + "Failed to create object with status=0x%lX", Status); + DPRINT("Created Object 1\n"); +} + +VOID +ObtClose() +{ + // TODO: Close what we have opened and free what we allocated +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +VOID +FASTCALL +NtoskrnlObTest() +{ + StartTest(); + + // Create object-types to use in tests + ObtCreateObjectTypes(); + DPRINT("ObtCreateObjectTypes() done\n"); + + // Create Directory + ObtCreateDirectory(); + DPRINT("ObtCreateDirectory() done\n"); + + // Create and insert objects + ObtCreateObjects(); + DPRINT("ObtCreateObjects() done\n"); + + // Clean up + ObtClose(); + DPRINT("Cleanup done\n"); + + FinishTest("NTOSKRNL Ob Manager"); +}

1 0

[ion] 22288: - Remove the heart (but not the brain) of the IopCreateFile hack. A much 'nicer' hack now detects if a filename can't be found, and instead of inserting it into the object directory (wrong!), calling IopCreateFile (wrong!), then having it fail, only to then remove the newly inserted object entry (wrong wrong wrong!), IopCreateFile is now *only* called for real files, otherwise Ob detects the invalid name and fails nicely and quickly.
by ion＠svn.reactos.org 08 Jun '06

08 Jun '06

Author: ion Date: Fri Jun 9 01:36:44 2006 New Revision: 22288 URL: http://svn.reactos.ru/svn/reactos?rev=22288&view=rev Log: - Remove the heart (but not the brain) of the IopCreateFile hack. A much 'nicer' hack now detects if a filename can't be found, and instead of inserting it into the object directory (wrong!), calling IopCreateFile (wrong!), then having it fail, only to then remove the newly inserted object entry (wrong wrong wrong!), IopCreateFile is now *only* called for real files, otherwise Ob detects the invalid name and fails nicely and quickly. Modified: trunk/reactos/ntoskrnl/ob/obname.c 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 Fri Jun 9 01:36:44 2006 @@ -310,7 +310,6 @@ PVOID FoundObject = NULL; POBJECT_HEADER Header = OBJECT_TO_OBJECT_HEADER(Insert); POBJECT_HEADER FoundHeader = NULL; - BOOLEAN ObjectAttached = FALSE; FoundObject = *ReturnedObject; if (FoundObject) { @@ -322,6 +321,29 @@ DPRINT("Object exists\n"); ObDereferenceObject(FoundObject); return STATUS_OBJECT_NAME_COLLISION; + } + + /* + * MiniHack + * If we still have a remaining path on a directory object, but we are + * a file object, then fail, because this means the file doesn't exist + */ + if ((RemainingPath->Buffer) && + (FoundHeader && FoundHeader->Type == ObDirectoryType) && + (Header->Type == IoFileObjectType)) + { + /* Hack */ + RtlFreeUnicodeString(RemainingPath); + *ReturnedObject = NULL; + return STATUS_OBJECT_PATH_NOT_FOUND; + } + else if (Header->Type == IoFileObjectType) + { + /* Otherwise, call the hacked parse routine which will go away soon */ + Status = IopCreateFile(&Header->Body, + FoundObject, + RemainingPath->Buffer, + NULL); } if (FoundHeader && FoundHeader->Type == ObDirectoryType && @@ -347,34 +369,8 @@ ObjectNameInfo->Name.Length = RemainingPath->Length - Delta; ObjectNameInfo->Name.MaximumLength = RemainingPath->MaximumLength - Delta; ObpInsertEntryDirectory(FoundObject, Context, Header); - ObjectAttached = TRUE; - } - - if (Header->Type == IoFileObjectType) - { - /* TEMPORARY HACK. DO NOT TOUCH -- Alex */ - DPRINT("Calling IopCreateFile: %p %p %wZ\n", &Header->Body, FoundObject, RemainingPath); - Status = IopCreateFile(&Header->Body, - FoundObject, - RemainingPath->Buffer, - NULL); - DPRINT("Called IopCreateFile: %x\n", Status); - } - - if (!NT_SUCCESS(Status)) - { - DPRINT("Create Failed\n"); - if (ObjectAttached == TRUE) - { - ObpDeleteEntryDirectory(Context); - } - if (FoundObject) - { - ObDereferenceObject(FoundObject); - } - RtlFreeUnicodeString(RemainingPath); - return Status; - } + } + RtlFreeUnicodeString(RemainingPath); *ReturnedObject = Insert; }

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