Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-06 20:55:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Simplify IopParseDevice by removing duplicate code.

Browse source 
svn path=/trunk/; revision=22869
This commit is contained in:
Alex Ionescu 2006-07-05 20:08:08 +00:00
parent 54c6ba2513
commit cca46c3214
3 changed files with 66 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/ntoskrnl/include/internal/io.h
View file

@ -1001,6 +1001,7 @@ extern PDEVICE_NODE IopRootDeviceNode;
extern ULONG IopTraceLevel;
extern NPAGED_LOOKASIDE_LIST IopMdlLookasideList;
extern GENERIC_MAPPING IopCompletionMapping;
extern GENERIC_MAPPING IopFileMapping;
//
// Inlined Functions

8
reactos/ntoskrnl/include/internal/se.h
View file

@ -256,6 +256,14 @@ SeDefaultObjectMethod(
PGENERIC_MAPPING GenericMapping
);
NTSTATUS
NTAPI
SeSetWorldSecurityDescriptor(
SECURITY_INFORMATION SecurityInformation,
PSECURITY_DESCRIPTOR SecurityDescriptor,
PULONG BufferLength
);
#define SepAcquireTokenLockExclusive(Token) \
do { \
KeEnterCriticalRegion(); \

130
reactos/ntoskrnl/io/iomgr/file.c
View file

@ -14,16 +14,6 @@
#define NDEBUG
#include <internal/debug.h>
/* GLOBALS *******************************************************************/
extern GENERIC_MAPPING IopFileMapping;
NTSTATUS
STDCALL
SeSetWorldSecurityDescriptor(SECURITY_INFORMATION SecurityInformation,
PSECURITY_DESCRIPTOR SecurityDescriptor,
PULONG BufferLength);
/* PRIVATE FUNCTIONS *********************************************************/
NTSTATUS
@ -53,79 +43,73 @@ IopParseDevice(IN PVOID ParseObject,
CompleteName,
RemainingName);
/* Create the actual file object */
Status = ObCreateObject(AccessMode,
IoFileObjectType,
NULL,
AccessMode,
NULL,
sizeof(FILE_OBJECT),
0,
0,
(PVOID*)&FileObject);
RtlZeroMemory(FileObject, sizeof(FILE_OBJECT));
/* Parent is a device object */
DeviceObject = IoGetAttachedDevice(ParseObject);
/* Check if we don't have a remaining name */
if (!*RemainingName->Buffer)
{
DeviceObject = ParseObject;
Status = IopReferenceDeviceObject(DeviceObject);
// fixme: NT wouldn't allow this
//if (!NT_SUCCESS(Status)) return Status;// KEBUGCHECK(0);
Status = ObCreateObject(AccessMode,
IoFileObjectType,
NULL,
AccessMode,
NULL,
sizeof(FILE_OBJECT),
0,
0,
(PVOID*)&FileObject);
/* Set File Object Data */
ASSERT(DeviceObject);
RtlZeroMemory(FileObject, sizeof(FILE_OBJECT));
FileObject->DeviceObject = IoGetAttachedDevice(DeviceObject);
DPRINT("DO. DRV Name: %p %wZ\n", DeviceObject, &DeviceObject->DriverObject->DriverName);
/* HACK */
/* Then this is a device */
FileObject->Flags |= FO_DIRECT_DEVICE_OPEN;
*Object = FileObject;
return STATUS_SUCCESS;
}
Status = ObCreateObject(AccessMode,
IoFileObjectType,
NULL,
AccessMode,
NULL,
sizeof(FILE_OBJECT),
0,
0,
(PVOID*)&FileObject);
RtlZeroMemory(FileObject, sizeof(FILE_OBJECT));
if (!Context)
{
/* Parent is a device object */
DeviceObject = IoGetAttachedDevice((PDEVICE_OBJECT)ParseObject);
/* Check if it has a VPB */
if (DeviceObject->Vpb)
{
/* Check if it's not already mounted */
if (!(DeviceObject->Vpb->Flags & VPB_MOUNTED))
{
Status = IopMountVolume(DeviceObject, FALSE, FALSE, FALSE, &Vpb);
if (!NT_SUCCESS(Status))
{
/* Couldn't mount, fail the lookup */
ObDereferenceObject(FileObject);
*Object = NULL;
return STATUS_UNSUCCESSFUL;
}
}
DeviceObject = DeviceObject->Vpb->DeviceObject;
}
}
else
{
FileObject->RelatedFileObject = OpenPacket->RelatedFileObject;
DeviceObject = OpenPacket->RelatedFileObject->DeviceObject;
/* Check if we don't have a related file object */
if (!Context)
{
/* Check if it has a VPB */
if (DeviceObject->Vpb)
{
/* Check if it's not already mounted */
if (!(DeviceObject->Vpb->Flags & VPB_MOUNTED))
{
/* Mount the volume */
Status = IopMountVolume(DeviceObject,
FALSE,
FALSE,
FALSE,
&Vpb);
if (!NT_SUCCESS(Status))
{
/* Couldn't mount, fail the lookup */
ObDereferenceObject(FileObject);
*Object = NULL;
return STATUS_UNSUCCESSFUL;
}
}
/* Get the VPB's device object */
DeviceObject = DeviceObject->Vpb->DeviceObject;
}
}
else
{
/* Otherwise, this is an open */
FileObject->RelatedFileObject = OpenPacket->RelatedFileObject;
DeviceObject = OpenPacket->RelatedFileObject->DeviceObject;
}
/* Create the name for the file object */
RtlCreateUnicodeString(&FileObject->FileName, RemainingName->Buffer);
}
/* Set the device object and reference it */
Status = IopReferenceDeviceObject(DeviceObject);
// fixme: NT wouldn't allow this
//if (!NT_SUCCESS(Status)) return Status;// KEBUGCHECK(0);
RtlCreateUnicodeString(&FileObject->FileName, RemainingName->Buffer);
FileObject->DeviceObject = DeviceObject;
/* Set the file object and return success */
*Object = FileObject;
return STATUS_SUCCESS;
}