From f89f1cdf72bddb774365b9ab9c4555523d0dff4f Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Sat, 27 Dec 2014 13:46:00 +0000 Subject: [PATCH] [NTOSKRNL] Rename IopSecurityFile() to IopGetSetSecurityObject() svn path=/trunk/; revision=65850 --- reactos/ntoskrnl/include/internal/io.h | 2 +- reactos/ntoskrnl/io/iomgr/file.c | 16 ++++++++-------- reactos/ntoskrnl/io/iomgr/iomgr.c | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/reactos/ntoskrnl/include/internal/io.h b/reactos/ntoskrnl/include/internal/io.h index 835e8d3b607..52a15e50575 100644 --- a/reactos/ntoskrnl/include/internal/io.h +++ b/reactos/ntoskrnl/include/internal/io.h @@ -1164,7 +1164,7 @@ IopDeleteFile( NTSTATUS NTAPI -IopSecurityFile( +IopGetSetSecurityObject( IN PVOID ObjectBody, IN SECURITY_OPERATION_CODE OperationCode, IN PSECURITY_INFORMATION SecurityInformation, diff --git a/reactos/ntoskrnl/io/iomgr/file.c b/reactos/ntoskrnl/io/iomgr/file.c index 1f8a76bfbba..a127d3ee176 100644 --- a/reactos/ntoskrnl/io/iomgr/file.c +++ b/reactos/ntoskrnl/io/iomgr/file.c @@ -1310,14 +1310,14 @@ IopDeleteFile(IN PVOID ObjectBody) NTSTATUS NTAPI -IopSecurityFile(IN PVOID ObjectBody, - IN SECURITY_OPERATION_CODE OperationCode, - IN PSECURITY_INFORMATION SecurityInformation, - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN OUT PULONG BufferLength, - IN OUT PSECURITY_DESCRIPTOR *OldSecurityDescriptor, - IN POOL_TYPE PoolType, - IN OUT PGENERIC_MAPPING GenericMapping) +IopGetSetSecurityObject(IN PVOID ObjectBody, + IN SECURITY_OPERATION_CODE OperationCode, + IN PSECURITY_INFORMATION SecurityInformation, + IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN OUT PULONG BufferLength, + IN OUT PSECURITY_DESCRIPTOR *OldSecurityDescriptor, + IN POOL_TYPE PoolType, + IN OUT PGENERIC_MAPPING GenericMapping) { IO_STATUS_BLOCK IoStatusBlock; PIO_STACK_LOCATION StackPtr; diff --git a/reactos/ntoskrnl/io/iomgr/iomgr.c b/reactos/ntoskrnl/io/iomgr/iomgr.c index b61e8e4fce1..16bd15762ea 100644 --- a/reactos/ntoskrnl/io/iomgr/iomgr.c +++ b/reactos/ntoskrnl/io/iomgr/iomgr.c @@ -273,7 +273,7 @@ IopCreateObjectTypes(VOID) ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(DEVICE_OBJECT); ObjectTypeInitializer.DeleteProcedure = IopDeleteDevice; ObjectTypeInitializer.ParseProcedure = IopParseDevice; - ObjectTypeInitializer.SecurityProcedure = IopSecurityFile; + ObjectTypeInitializer.SecurityProcedure = IopGetSetSecurityObject; ObjectTypeInitializer.CaseInsensitive = TRUE; if (!NT_SUCCESS(ObCreateObjectType(&Name, &ObjectTypeInitializer, @@ -312,7 +312,7 @@ IopCreateObjectTypes(VOID) ObjectTypeInitializer.GenericMapping = IopFileMapping; ObjectTypeInitializer.CloseProcedure = IopCloseFile; ObjectTypeInitializer.DeleteProcedure = IopDeleteFile; - ObjectTypeInitializer.SecurityProcedure = IopSecurityFile; + ObjectTypeInitializer.SecurityProcedure = IopGetSetSecurityObject; ObjectTypeInitializer.QueryNameProcedure = IopQueryNameFile; ObjectTypeInitializer.ParseProcedure = IopParseFile; ObjectTypeInitializer.UseDefaultObject = FALSE;