From 28c174051d120b21c40d7b8e265ab89a57cfef7d Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Mon, 21 Jan 2002 11:42:04 +0000 Subject: [PATCH] Fixed some function declarations. svn path=/trunk/; revision=2534 --- reactos/include/ddk/iodef.h | 2 +- reactos/include/ddk/iofuncs.h | 60 ++++++++++++++---------------- reactos/include/napi/types.h | 2 +- reactos/ntoskrnl/io/share.c | 69 +++++++++++++++++------------------ 4 files changed, 62 insertions(+), 71 deletions(-) diff --git a/reactos/include/ddk/iodef.h b/reactos/include/ddk/iodef.h index 59b4c51c9d0..4529d88cd11 100644 --- a/reactos/include/ddk/iodef.h +++ b/reactos/include/ddk/iodef.h @@ -372,7 +372,7 @@ enum #define FILE_VALID_SET_FLAGS 0x00001036 -typedef ULONG FS_INFORMATION_CLASS; +typedef ULONG FS_INFORMATION_CLASS, *PFS_INFORMATION_CLASS; /* * file system information class values diff --git a/reactos/include/ddk/iofuncs.h b/reactos/include/ddk/iofuncs.h index 30bffe8b0a7..5f1aa463c1b 100644 --- a/reactos/include/ddk/iofuncs.h +++ b/reactos/include/ddk/iofuncs.h @@ -1,6 +1,6 @@ #ifndef _INCLUDE_DDK_IOFUNCS_H #define _INCLUDE_DDK_IOFUNCS_H -/* $Id: iofuncs.h,v 1.27 2001/12/05 12:13:12 ekohl Exp $ */ +/* $Id: iofuncs.h,v 1.28 2002/01/21 11:41:05 ekohl Exp $ */ /* --- EXPORTED BY NTOSKRNL --- */ @@ -376,29 +376,24 @@ STDCALL IoCancelIrp ( PIRP Irp ); -VOID -STDCALL -IoCheckDesiredAccess ( - DWORD Unknown0, - DWORD Unknown1 - ); -NTSTATUS -STDCALL -IoCheckEaBufferValidity ( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2 - ); -NTSTATUS -STDCALL -IoCheckFunctionAccess ( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5 - ); + +NTSTATUS STDCALL +IoCheckDesiredAccess(IN OUT PACCESS_MASK DesiredAccess, + IN ACCESS_MASK GrantedAccess); + +NTSTATUS STDCALL +IoCheckEaBufferValidity(IN PFILE_FULL_EA_INFORMATION EaBuffer, + IN ULONG EaLength, + OUT PULONG ErrorOffset); + +NTSTATUS STDCALL +IoCheckFunctionAccess(IN ACCESS_MASK GrantedAccess, + IN UCHAR MajorFunction, + IN UCHAR MinorFunction, + IN ULONG IoControlCode, + IN PFILE_INFORMATION_CLASS FileInformationClass OPTIONAL, + IN PFS_INFORMATION_CLASS FsInformationClass OPTIONAL); + NTSTATUS STDCALL IoCheckShareAccess ( @@ -560,15 +555,14 @@ STDCALL IoEnqueueIrp ( PIRP Irp ); -VOID -STDCALL -IoFastQueryNetworkAttributes ( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4 - ); + +BOOLEAN STDCALL +IoFastQueryNetworkAttributes(IN POBJECT_ATTRIBUTES ObjectAttributes, + IN ACCESS_MASK DesiredAccess, + IN ULONG OpenOptions, + OUT PIO_STATUS_BLOCK IoStatus, + OUT PFILE_NETWORK_OPEN_INFORMATION Buffer); + VOID STDCALL IoFreeController ( diff --git a/reactos/include/napi/types.h b/reactos/include/napi/types.h index 93f2651c059..694ae40f5ce 100644 --- a/reactos/include/napi/types.h +++ b/reactos/include/napi/types.h @@ -90,7 +90,7 @@ typedef enum _FILE_INFORMATION_CLASS FileInheritContentIndexInformation, FileOleInformation, FileMaximumInformation, -} FILE_INFORMATION_CLASS; +} FILE_INFORMATION_CLASS, *PFILE_INFORMATION_CLASS; typedef ULONG WAIT_TYPE; typedef USHORT CSHORT; diff --git a/reactos/ntoskrnl/io/share.c b/reactos/ntoskrnl/io/share.c index a2d2d9d4329..1cdf6488632 100644 --- a/reactos/ntoskrnl/io/share.c +++ b/reactos/ntoskrnl/io/share.c @@ -1,4 +1,4 @@ -/* $Id: share.c,v 1.4 2001/08/14 21:05:10 hbirr Exp $ +/* $Id: share.c,v 1.5 2002/01/21 11:42:04 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -263,61 +263,58 @@ IoSetShareAccess(ACCESS_MASK DesiredAccess, } -VOID STDCALL -IoCheckDesiredAccess(DWORD Unknown0, - DWORD Unknown1) +NTSTATUS STDCALL +IoCheckDesiredAccess(IN OUT PACCESS_MASK DesiredAccess, + IN ACCESS_MASK GrantedAccess) { - UNIMPLEMENTED; + UNIMPLEMENTED; + return(STATUS_NOT_IMPLEMENTED); } NTSTATUS STDCALL -IoCheckEaBufferValidity(DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) +IoCheckEaBufferValidity(IN PFILE_FULL_EA_INFORMATION EaBuffer, + IN ULONG EaLength, + OUT PULONG ErrorOffset) { - UNIMPLEMENTED; - return (STATUS_NOT_IMPLEMENTED); + UNIMPLEMENTED; + return(STATUS_NOT_IMPLEMENTED); } NTSTATUS STDCALL -IoCheckFunctionAccess(DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5) +IoCheckFunctionAccess(IN ACCESS_MASK GrantedAccess, + IN UCHAR MajorFunction, + IN UCHAR MinorFunction, + IN ULONG IoControlCode, + IN PFILE_INFORMATION_CLASS FileInformationClass OPTIONAL, + IN PFS_INFORMATION_CLASS FsInformationClass OPTIONAL) { - UNIMPLEMENTED; - return (STATUS_NOT_IMPLEMENTED); + UNIMPLEMENTED; + return(STATUS_NOT_IMPLEMENTED); } NTSTATUS STDCALL -IoSetInformation ( - IN PFILE_OBJECT FileObject, - IN FILE_INFORMATION_CLASS FileInformationClass, - IN ULONG Length, - OUT PVOID FileInformation - ) +IoSetInformation(IN PFILE_OBJECT FileObject, + IN FILE_INFORMATION_CLASS FileInformationClass, + IN ULONG Length, + OUT PVOID FileInformation) { - UNIMPLEMENTED; - return (STATUS_NOT_IMPLEMENTED); + UNIMPLEMENTED; + return(STATUS_NOT_IMPLEMENTED); } -VOID STDCALL -IoFastQueryNetworkAttributes ( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4 - ) +BOOLEAN STDCALL +IoFastQueryNetworkAttributes(IN POBJECT_ATTRIBUTES ObjectAttributes, + IN ACCESS_MASK DesiredAccess, + IN ULONG OpenOptions, + OUT PIO_STATUS_BLOCK IoStatus, + OUT PFILE_NETWORK_OPEN_INFORMATION Buffer) { - UNIMPLEMENTED; + UNIMPLEMENTED; + return(FALSE); } - /* EOF */