From bb665e58b7038bced14a24506c802dde2a0f4944 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Tue, 9 May 2000 21:31:01 +0000 Subject: [PATCH] Fixed some more ntoskrnl exports svn path=/trunk/; revision=1147 --- reactos/include/ddk/obfuncs.h | 38 ++++++++------- reactos/include/ddk/rtl.h | 14 +++++- reactos/include/ddk/sefuncs.h | 8 +-- reactos/include/internal/ob.h | 4 -- reactos/ntoskrnl/ntoskrnl.def | 92 +++++++++++++++++++++++++++++------ reactos/ntoskrnl/ntoskrnl.edf | 92 +++++++++++++++++++++++++++++------ reactos/ntoskrnl/ob/handle.c | 16 +++--- reactos/ntoskrnl/ob/namespc.c | 16 +++--- reactos/ntoskrnl/ob/ntobj.c | 3 +- reactos/ntoskrnl/ob/object.c | 10 ++-- reactos/ntoskrnl/rtl/regio.c | 14 +++++- reactos/ntoskrnl/se/token.c | 22 ++++++--- 12 files changed, 242 insertions(+), 87 deletions(-) diff --git a/reactos/include/ddk/obfuncs.h b/reactos/include/ddk/obfuncs.h index eec23d8f5ba..fada285e85d 100644 --- a/reactos/include/ddk/obfuncs.h +++ b/reactos/include/ddk/obfuncs.h @@ -22,12 +22,12 @@ VOID STDCALL ObDereferenceObject(PVOID Object); * information about the handle * RETURNS: Status */ -NTSTATUS ObReferenceObjectByHandle(HANDLE Handle, - ACCESS_MASK DesiredAccess, - POBJECT_TYPE ObjectType, - KPROCESSOR_MODE AccessMode, - PVOID* Object, - POBJECT_HANDLE_INFORMATION HandleInfo); +NTSTATUS STDCALL ObReferenceObjectByHandle(HANDLE Handle, + ACCESS_MASK DesiredAccess, + POBJECT_TYPE ObjectType, + KPROCESSOR_MODE AccessMode, + PVOID* Object, + POBJECT_HANDLE_INFORMATION HandleInfo); /* * FUNCTION: Increments the reference count for a given object @@ -43,16 +43,18 @@ NTSTATUS STDCALL ObReferenceObjectByPointer(PVOID Object, POBJECT_TYPE ObjectType, KPROCESSOR_MODE AccessMode); -NTSTATUS ObReferenceObjectByName(PUNICODE_STRING ObjectPath, - ULONG Attributes, - PACCESS_STATE PassedAccessState, - ACCESS_MASK DesiredAccess, - POBJECT_TYPE ObjectType, - KPROCESSOR_MODE AccessMode, - PVOID ParseContext, - PVOID* ObjectPtr); +NTSTATUS STDCALL ObReferenceObjectByName(PUNICODE_STRING ObjectPath, + ULONG Attributes, + PACCESS_STATE PassedAccessState, + ACCESS_MASK DesiredAccess, + POBJECT_TYPE ObjectType, + KPROCESSOR_MODE AccessMode, + PVOID ParseContext, + PVOID* ObjectPtr); -PVOID ObCreateObject(PHANDLE Handle, - ACCESS_MASK DesiredAccess, - POBJECT_ATTRIBUTES ObjectAttributes, - POBJECT_TYPE Type); +PVOID STDCALL ObCreateObject(PHANDLE Handle, + ACCESS_MASK DesiredAccess, + POBJECT_ATTRIBUTES ObjectAttributes, + POBJECT_TYPE Type); + +VOID STDCALL ObMakeTemporaryObject(PVOID ObjectBody); diff --git a/reactos/include/ddk/rtl.h b/reactos/include/ddk/rtl.h index c2b34966124..edc7c0b061a 100644 --- a/reactos/include/ddk/rtl.h +++ b/reactos/include/ddk/rtl.h @@ -1,4 +1,4 @@ -/* $Id: rtl.h,v 1.32 2000/04/15 23:12:26 ekohl Exp $ +/* $Id: rtl.h,v 1.33 2000/05/09 21:29:44 ekohl Exp $ * */ @@ -1339,21 +1339,25 @@ RtlxUnicodeStringToOemSize ( /* Register io functions */ UCHAR +STDCALL READ_REGISTER_UCHAR ( PUCHAR Register ); USHORT +STDCALL READ_REGISTER_USHORT ( PUSHORT Register ); ULONG +STDCALL READ_REGISTER_ULONG ( PULONG Register ); VOID +STDCALL READ_REGISTER_BUFFER_UCHAR ( PUCHAR Register, PUCHAR Buffer, @@ -1361,6 +1365,7 @@ READ_REGISTER_BUFFER_UCHAR ( ); VOID +STDCALL READ_REGISTER_BUFFER_USHORT ( PUSHORT Register, PUSHORT Buffer, @@ -1368,6 +1373,7 @@ READ_REGISTER_BUFFER_USHORT ( ); VOID +STDCALL READ_REGISTER_BUFFER_ULONG ( PULONG Register, PULONG Buffer, @@ -1375,24 +1381,28 @@ READ_REGISTER_BUFFER_ULONG ( ); VOID +STDCALL WRITE_REGISTER_UCHAR ( PUCHAR Register, UCHAR Value ); VOID +STDCALL WRITE_REGISTER_USHORT ( PUSHORT Register, USHORT Value ); VOID +STDCALL WRITE_REGISTER_ULONG ( PULONG Register, ULONG Value ); VOID +STDCALL WRITE_REGISTER_BUFFER_UCHAR ( PUCHAR Register, PUCHAR Buffer, @@ -1400,6 +1410,7 @@ WRITE_REGISTER_BUFFER_UCHAR ( ); VOID +STDCALL WRITE_REGISTER_BUFFER_USHORT ( PUSHORT Register, PUSHORT Buffer, @@ -1407,6 +1418,7 @@ WRITE_REGISTER_BUFFER_USHORT ( ); VOID +STDCALL WRITE_REGISTER_BUFFER_ULONG ( PULONG Register, PULONG Buffer, diff --git a/reactos/include/ddk/sefuncs.h b/reactos/include/ddk/sefuncs.h index dc408c6b23c..aed677852d1 100644 --- a/reactos/include/ddk/sefuncs.h +++ b/reactos/include/ddk/sefuncs.h @@ -1,6 +1,6 @@ #ifndef _INCLUDE_DDK_SEFUNCS_H #define _INCLUDE_DDK_SEFUNCS_H -/* $Id: sefuncs.h,v 1.10 2000/04/15 23:12:26 ekohl Exp $ */ +/* $Id: sefuncs.h,v 1.11 2000/05/09 21:29:44 ekohl Exp $ */ NTSTATUS STDCALL RtlCreateAcl(PACL Acl, ULONG AclSize, ULONG AclRevision); NTSTATUS STDCALL RtlQueryInformationAcl (PACL Acl, PVOID Information, ULONG InformationLength, ACL_INFORMATION_CLASS InformationClass); NTSTATUS STDCALL RtlSetInformationAcl (PACL Acl, PVOID Information, ULONG InformationLength, ACL_INFORMATION_CLASS InformationClass); @@ -88,10 +88,10 @@ NTSTATUS STDCALL SeAssignSecurity (PSECURITY_DESCRIPTOR ParentDescriptor, POOL_TYPE PoolType); NTSTATUS STDCALL SeDeassignSecurity (PSECURITY_DESCRIPTOR* SecurityDescriptor); BOOLEAN STDCALL SeSinglePrivilegeCheck (LUID PrivilegeValue, KPROCESSOR_MODE PreviousMode); -VOID SeImpersonateClient(PSE_SOME_STRUCT2 a, - PETHREAD Thread); +VOID STDCALL SeImpersonateClient(PSE_SOME_STRUCT2 a, + PETHREAD Thread); -NTSTATUS SeCreateClientSecurity(PETHREAD Thread, +NTSTATUS STDCALL SeCreateClientSecurity(PETHREAD Thread, PSECURITY_QUALITY_OF_SERVICE Qos, ULONG e, PSE_SOME_STRUCT2 f); diff --git a/reactos/include/internal/ob.h b/reactos/include/internal/ob.h index e2e33e9ce92..1e58c204f06 100644 --- a/reactos/include/internal/ob.h +++ b/reactos/include/internal/ob.h @@ -54,10 +54,6 @@ BOOL ObAddObjectToNameSpace(PUNICODE_STRING path, POBJECT_HEADER Object); VOID ObRegisterType(CSHORT id, OBJECT_TYPE* type); NTSTATUS ObLookupObject(HANDLE rootdir, PWSTR string, PVOID* Object, PWSTR* UnparsedSection, ULONG Attributes); -PVOID ObCreateObject(PHANDLE Handle, - ACCESS_MASK DesiredAccess, - POBJECT_ATTRIBUTES ObjectAttributes, - POBJECT_TYPE Type); VOID ObRemoveEntry(POBJECT_HEADER Header); NTSTATUS ObPerformRetentionChecks(POBJECT_HEADER Header); diff --git a/reactos/ntoskrnl/ntoskrnl.def b/reactos/ntoskrnl/ntoskrnl.def index 06ac55e506d..ad0fd1d8c60 100644 --- a/reactos/ntoskrnl/ntoskrnl.def +++ b/reactos/ntoskrnl/ntoskrnl.def @@ -1,4 +1,4 @@ -; $Id: ntoskrnl.def,v 1.70 2000/05/09 16:16:07 ekohl Exp $ +; $Id: ntoskrnl.def,v 1.71 2000/05/09 21:31:01 ekohl Exp $ ; ; reactos/ntoskrnl/ntoskrnl.def ; @@ -168,6 +168,8 @@ FsRtlUninitializeFileLock@4 FsRtlUninitializeLargeMcb@4 FsRtlUninitializeMcb@4 FsRtlUninitializeOplock@4 +;HalDispatchTable DATA +;HalPrivateDispatchTable DATA IoAcquireCancelSpinLock@4 IoAcquireVpbSpinLock@4 IoAdapterObjectType DATA @@ -301,6 +303,7 @@ KeSetEvent KeSetTimer KeSynchronizeExecution KeWaitForSingleObject +LdrLoadModule MmAdjustWorkingSetSize@12 MmAllocateContiguousMemory@12 MmAllocateNonCachedMemory@4 @@ -403,16 +406,39 @@ NtUnlockFile@20 ;NtVdmControl@8 <--- ? NtWaitForSingleObject@12 NtWriteFile@36 -ObReferenceObjectByHandle +;ObAssignSecurity@16 +;ObCheckCreateObjectAccess@28 +;ObCheckObjectAccess@20 +;ObCreateObject@36 +ObCreateObject@16 +ObDereferenceObject@4 +;ObFindHandleForObject@20 +;ObGetObjectPointerCount@4 +;ObGetObjectSecurity@12 +;ObInsertObject@24 +ObMakeTemporaryObject@4 +;ObOpenObjectByName@28 +;ObOpenObjectByPointer@28 +;ObQueryNameString@16 +;ObQueryObjectAuditingByHandle@8 +ObReferenceObjectByHandle@24 +ObReferenceObjectByName@32 +ObReferenceObjectByPointer@16 +;ObReleaseObjectSecurity@8 +;ObSetSecurityDescriptorInfo@24 +;@ObfDereferenceObject@4 +ObfDereferenceObject@4 +;@ObfReferenceObject@4 +ObfReferenceObject@4 PoQueryPowerSequence@0 PoRequestPowerChange@12 PoSetDeviceIdleDetection@8 -READ_REGISTER_UCHAR -READ_REGISTER_ULONG -READ_REGISTER_USHORT -READ_REGISTER_BUFFER_UCHAR -READ_REGISTER_BUFFER_ULONG -READ_REGISTER_BUFFER_USHORT +READ_REGISTER_UCHAR@4 +READ_REGISTER_ULONG@4 +READ_REGISTER_USHORT@4 +READ_REGISTER_BUFFER_UCHAR@12 +READ_REGISTER_BUFFER_ULONG@12 +READ_REGISTER_BUFFER_USHORT@12 RtlAbsoluteToSelfRelativeSD@12 RtlAddAccessAllowedAce@16 RtlAddAce@20 @@ -602,13 +628,49 @@ RtlxAnsiStringToUnicodeSize@4 RtlxOemStringToUnicodeSize@4 RtlxUnicodeStringToAnsiSize@4 RtlxUnicodeStringToOemSize@4 -LdrLoadModule -WRITE_REGISTER_UCHAR -WRITE_REGISTER_ULONG -WRITE_REGISTER_USHORT -WRITE_REGISTER_BUFFER_UCHAR -WRITE_REGISTER_BUFFER_ULONG -WRITE_REGISTER_BUFFER_USHORT +SeAccessCheck@40 +;SeAppendPrivileges@8 +SeAssignSecurity@28 +;SeAuditingFileEvents@8 +;SeAuditingFileOrGlobalEvents@18 +;SeCaptureSecurityDescriptor@20 +SeCaptureSubjectContext@4 +;SeCloseObjectAuditAlarm@12 +;SeCreateAccessState@16 +SeCreateClientSecurity@16 +SeDeassignSecurity@4 +;SeDeleteAccessState@4 +;SeDeleteObjectAuditAlarm@8 +;SeExports DATA ??? +;SeFreePrivileges@4 +SeImpersonateClient@8 +;SeLockSubjectContext@4 +;SeMarkLogonSessionForTerminationNotification@4 +;SeOpenObjectAuditAlarm@36 +;SeOpenObjectForDeleteAuditAlarm@36 +SePrivilegeCheck@12 +;SePrivilegeObjectAuditAlarm@24 +;SePublicDefaultDacl DATA +;SeQueryAuthenticationIdToken@8 +;SeQuerySecurityDescriptorInfo@16 +;SeRegisterLogonSessionTerminatedRoutine@4 +;SeReleaseSecurityDescriptor@12 +SeReleaseSubjectContext@4 +;SeSetAccessStateGenericMapping@8 +;SeSetSecurityDescriptorInfo@24 +;SeSinglePrivilegeCheck@12 +;SeSystemDefaultDacl DATA +;SeTokenImpersonationLevel@4 +;SeTokenType@4 +;SeUnlockSubjectContext@4 +;SeUnregisterLogonSessionTerminatedRoutine@4 +;SeValidSecurityDescriptor@8 +WRITE_REGISTER_UCHAR@8 +WRITE_REGISTER_ULONG@8 +WRITE_REGISTER_USHORT@8 +WRITE_REGISTER_BUFFER_UCHAR@12 +WRITE_REGISTER_BUFFER_ULONG@12 +WRITE_REGISTER_BUFFER_USHORT@12 ZwAccessCheckAndAuditAlarm@44 ZwAlertThread@4 ZwAllocateVirtualMemory@24 diff --git a/reactos/ntoskrnl/ntoskrnl.edf b/reactos/ntoskrnl/ntoskrnl.edf index 0ce07c93881..0cb587ae2dd 100644 --- a/reactos/ntoskrnl/ntoskrnl.edf +++ b/reactos/ntoskrnl/ntoskrnl.edf @@ -1,4 +1,4 @@ -; $Id: ntoskrnl.edf,v 1.57 2000/05/09 16:16:07 ekohl Exp $ +; $Id: ntoskrnl.edf,v 1.58 2000/05/09 21:31:01 ekohl Exp $ ; ; reactos/ntoskrnl/ntoskrnl.def ; @@ -168,6 +168,8 @@ FsRtlUninitializeFileLock=FsRtlUninitializeFileLock@4 FsRtlUninitializeLargeMcb=FsRtlUninitializeLargeMcb@4 FsRtlUninitializeMcb=FsRtlUninitializeMcb@4 FsRtlUninitializeOplock=FsRtlUninitializeOplock@4 +;HalDispatchTable DATA +;HalPrivateDispatchTable DATA IoAcquireCancelSpinLock=IoAcquireCancelSpinLock@4 IoAcquireVpbSpinLock=IoAcquireVpbSpinLock@4 IoAdapterObjectType DATA @@ -301,6 +303,7 @@ KeSetEvent KeSetTimer KeSynchronizeExecution KeWaitForSingleObject +LdrLoadModule=LdrLoadModule MmAdjustWorkingSetSize=MmAdjustWorkingSetSize@12 MmAllocateContiguousMemory=MmAllocateContiguousMemory@12 MmAllocateNonCachedMemory=MmAllocateNonCachedMemory@4 @@ -403,16 +406,39 @@ NtUnlockFile=NtUnlockFile@20 ;NtVdmControl@8 <--- ? NtWaitForSingleObject=NtWaitForSingleObject@12 NtWriteFile=NtWriteFile@36 -ObReferenceObjectByHandle +;ObAssignSecurity=ObAssignSecurity@16 +;ObCheckCreateObjectAccess=ObCheckCreateObjectAccess@28 +;ObCheckObjectAccess=ObCheckObjectAccess@20 +;ObCreateObject=ObCreateObject@36 +ObCreateObject=ObCreateObject@16 +ObDereferenceObject=ObDereferenceObject@4 +;ObFindHandleForObject=ObFindHandleForObject@20 +;ObGetObjectPointerCount=ObGetObjectPointerCount@4 +;ObGetObjectSecurity=ObGetObjectSecurity@12 +;ObInsertObject=ObInsertObject@24 +ObMakeTemporaryObject=ObMakeTemporaryObject@4 +;ObOpenObjectByName=ObOpenObjectByName@28 +;ObOpenObjectByPointer=ObOpenObjectByPointer@28 +;ObQueryNameString=ObQueryNameString@16 +;ObQueryObjectAuditingByHandle=ObQueryObjectAuditingByHandle@8 +ObReferenceObjectByHandle=ObReferenceObjectByHandle@24 +ObReferenceObjectByName=ObReferenceObjectByName@32 +ObReferenceObjectByPointer=ObReferenceObjectByPointer@16 +;ObReleaseObjectSecurity=ObReleaseObjectSecurity@8 +;ObSetSecurityDescriptorInfo=ObSetSecurityDescriptorInfo@24 +;ObfDereferenceObject=@ObfDereferenceObject@4 +ObfDereferenceObject=ObfDereferenceObject@4 +;ObfReferenceObject=@ObfReferenceObject@4 +ObfReferenceObject=ObfReferenceObject@4 PoQueryPowerSequence=PoQueryPowerSequence@0 PoRequestPowerChange=PoRequestPowerChange@12 PoSetDeviceIdleDetection=PoSetDeviceIdleDetection@8 -READ_REGISTER_UCHAR -READ_REGISTER_ULONG -READ_REGISTER_USHORT -READ_REGISTER_BUFFER_UCHAR -READ_REGISTER_BUFFER_ULONG -READ_REGISTER_BUFFER_USHORT +READ_REGISTER_UCHAR=READ_REGISTER_UCHAR@4 +READ_REGISTER_ULONG=READ_REGISTER_ULONG@4 +READ_REGISTER_USHORT=READ_REGISTER_USHORT@4 +READ_REGISTER_BUFFER_UCHAR=READ_REGISTER_BUFFER_UCHAR@12 +READ_REGISTER_BUFFER_ULONG=READ_REGISTER_BUFFER_ULONG@12 +READ_REGISTER_BUFFER_USHORT=READ_REGISTER_BUFFER_USHORT@12 RtlAbsoluteToSelfRelativeSD=RtlAbsoluteToSelfRelativeSD@12 RtlAddAccessAllowedAce=RtlAddAccessAllowedAce@16 RtlAddAce=RtlAddAce@20 @@ -538,13 +564,49 @@ RtlxAnsiStringToUnicodeSize=RtlxAnsiStringToUnicodeSize@4 RtlxOemStringToUnicodeSize=RtlxOemStringToUnicodeSize@4 RtlxUnicodeStringToAnsiSize=RtlxUnicodeStringToAnsiSize@4 RtlxUnicodeStringToOemSize=RtlxUnicodeStringToOemSize@4 -LdrLoadModule=LdrLoadModule -WRITE_REGISTER_UCHAR -WRITE_REGISTER_ULONG -WRITE_REGISTER_USHORT -WRITE_REGISTER_BUFFER_UCHAR -WRITE_REGISTER_BUFFER_ULONG -WRITE_REGISTER_BUFFER_USHORT +SeAccessCheck=SeAccessCheck@40 +;SeAppendPrivileges=SeAppendPrivileges@8 +SeAssignSecurity=SeAssignSecurity@28 +;SeAuditingFileEvents=SeAuditingFileEvents@8 +;SeAuditingFileOrGlobalEvents=SeAuditingFileOrGlobalEvents@18 +;SeCaptureSecurityDescriptor=SeCaptureSecurityDescriptor@20 +SeCaptureSubjectContext=SeCaptureSubjectContext@4 +;SeCloseObjectAuditAlarm=SeCloseObjectAuditAlarm@12 +;SeCreateAccessState=SeCreateAccessState@16 +SeCreateClientSecurity=SeCreateClientSecurity@16 +SeDeassignSecurity=SeDeassignSecurity@4 +;SeDeleteAccessState=SeDeleteAccessState@4 +;SeDeleteObjectAuditAlarm=SeDeleteObjectAuditAlarm@8 +;SeExports DATA +;SeFreePrivileges=SeFreePrivileges@4 +SeImpersonateClient=SeImpersonateClient@8 +;SeLockSubjectContext=SeLockSubjectContext@4 +;SeMarkLogonSessionForTerminationNotification=SeMarkLogonSessionForTerminationNotification@4 +;SeOpenObjectAuditAlarm=SeOpenObjectAuditAlarm@36 +;SeOpenObjectForDeleteAuditAlarm=SeOpenObjectForDeleteAuditAlarm@36 +SePrivilegeCheck=SePrivilegeCheck@12 +;SePrivilegeObjectAuditAlarm=SePrivilegeObjectAuditAlarm@24 +;SePublicDefaultDacl DATA +;SeQueryAuthenticationIdToken=SeQueryAuthenticationIdToken@8 +;SeQuerySecurityDescriptorInfo=SeQuerySecurityDescriptorInfo@16 +;SeRegisterLogonSessionTerminatedRoutine=SeRegisterLogonSessionTerminatedRoutine@4 +;SeReleaseSecurityDescriptor=SeReleaseSecurityDescriptor@12 +SeReleaseSubjectContext=SeReleaseSubjectContext@4 +;SeSetAccessStateGenericMapping=SeSetAccessStateGenericMapping@8 +;SeSetSecurityDescriptorInfo=SeSetSecurityDescriptorInfo@24 +;SeSinglePrivilegeCheck=SeSinglePrivilegeCheck@12 +;SeSystemDefaultDacl DATA +;SeTokenImpersonationLevel=SeTokenImpersonationLevel@4 +;SeTokenType=SeTokenType@4 +;SeUnlockSubjectContext=SeUnlockSubjectContext@4 +;SeUnregisterLogonSessionTerminatedRoutine=SeUnregisterLogonSessionTerminatedRoutine@4 +;SeValidSecurityDescriptor=SeValidSecurityDescriptor@8 +WRITE_REGISTER_UCHAR=WRITE_REGISTER_UCHAR@8 +WRITE_REGISTER_ULONG=WRITE_REGISTER_ULONG@8 +WRITE_REGISTER_USHORT=WRITE_REGISTER_USHORT@8 +WRITE_REGISTER_BUFFER_UCHAR=WRITE_REGISTER_BUFFER_UCHAR@12 +WRITE_REGISTER_BUFFER_ULONG=WRITE_REGISTER_BUFFER_ULONG@12 +WRITE_REGISTER_BUFFER_USHORT=WRITE_REGISTER_BUFFER_USHORT@12 ZwAccessCheckAndAuditAlarm=ZwAccessCheckAndAuditAlarm@44 ZwAlertThread=ZwAlertThread@4 ZwAllocateVirtualMemory=ZwAllocateVirtualMemory@24 diff --git a/reactos/ntoskrnl/ob/handle.c b/reactos/ntoskrnl/ob/handle.c index 9a8cb2e18ed..90f7be93570 100644 --- a/reactos/ntoskrnl/ob/handle.c +++ b/reactos/ntoskrnl/ob/handle.c @@ -1,4 +1,4 @@ -/* $Id: handle.c,v 1.20 2000/04/03 21:54:40 dwelch Exp $ +/* $Id: handle.c,v 1.21 2000/05/09 21:30:06 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -434,13 +434,13 @@ NTSTATUS ObCreateHandle(PEPROCESS Process, } -NTSTATUS ObReferenceObjectByHandle(HANDLE Handle, - ACCESS_MASK DesiredAccess, - POBJECT_TYPE ObjectType, - KPROCESSOR_MODE AccessMode, - PVOID* Object, - POBJECT_HANDLE_INFORMATION - HandleInformationPtr) +NTSTATUS STDCALL ObReferenceObjectByHandle(HANDLE Handle, + ACCESS_MASK DesiredAccess, + POBJECT_TYPE ObjectType, + KPROCESSOR_MODE AccessMode, + PVOID* Object, + POBJECT_HANDLE_INFORMATION + HandleInformationPtr) /* * FUNCTION: Increments the reference count for an object and returns a * pointer to its body diff --git a/reactos/ntoskrnl/ob/namespc.c b/reactos/ntoskrnl/ob/namespc.c index 8912d1b2d45..e6dab5056eb 100644 --- a/reactos/ntoskrnl/ob/namespc.c +++ b/reactos/ntoskrnl/ob/namespc.c @@ -27,14 +27,14 @@ PDIRECTORY_OBJECT NameSpaceRoot = NULL; /* FUNCTIONS **************************************************************/ -NTSTATUS ObReferenceObjectByName(PUNICODE_STRING ObjectPath, - ULONG Attributes, - PACCESS_STATE PassedAccessState, - ACCESS_MASK DesiredAccess, - POBJECT_TYPE ObjectType, - KPROCESSOR_MODE AccessMode, - PVOID ParseContext, - PVOID* ObjectPtr) +NTSTATUS STDCALL ObReferenceObjectByName(PUNICODE_STRING ObjectPath, + ULONG Attributes, + PACCESS_STATE PassedAccessState, + ACCESS_MASK DesiredAccess, + POBJECT_TYPE ObjectType, + KPROCESSOR_MODE AccessMode, + PVOID ParseContext, + PVOID* ObjectPtr) { PVOID Object; PWSTR RemainingPath; diff --git a/reactos/ntoskrnl/ob/ntobj.c b/reactos/ntoskrnl/ob/ntobj.c index f9203ba5c3c..685fd050af5 100644 --- a/reactos/ntoskrnl/ob/ntobj.c +++ b/reactos/ntoskrnl/ob/ntobj.c @@ -1,4 +1,4 @@ -/* $Id: ntobj.c,v 1.5 1999/08/29 06:59:11 ea Exp $ +/* $Id: ntobj.c,v 1.6 2000/05/09 21:30:06 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -49,6 +49,7 @@ NtQueryObject ( VOID +STDCALL ObMakeTemporaryObject ( PVOID ObjectBody ) diff --git a/reactos/ntoskrnl/ob/object.c b/reactos/ntoskrnl/ob/object.c index 4080edb0cd7..07162647e50 100644 --- a/reactos/ntoskrnl/ob/object.c +++ b/reactos/ntoskrnl/ob/object.c @@ -1,4 +1,4 @@ -/* $Id: object.c,v 1.22 2000/04/03 21:54:40 dwelch Exp $ +/* $Id: object.c,v 1.23 2000/05/09 21:30:06 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -163,10 +163,10 @@ NTSTATUS ObFindObject(POBJECT_ATTRIBUTES ObjectAttributes, * * RETURN VALUE */ -PVOID ObCreateObject(PHANDLE Handle, - ACCESS_MASK DesiredAccess, - POBJECT_ATTRIBUTES ObjectAttributes, - POBJECT_TYPE Type) +PVOID STDCALL ObCreateObject(PHANDLE Handle, + ACCESS_MASK DesiredAccess, + POBJECT_ATTRIBUTES ObjectAttributes, + POBJECT_TYPE Type) { PVOID Parent = NULL; PWSTR RemainingPath = NULL; diff --git a/reactos/ntoskrnl/rtl/regio.c b/reactos/ntoskrnl/rtl/regio.c index ab9f0f67d1b..37e94d97091 100644 --- a/reactos/ntoskrnl/rtl/regio.c +++ b/reactos/ntoskrnl/rtl/regio.c @@ -1,4 +1,4 @@ -/* $Id: regio.c,v 1.1 1999/12/29 01:35:53 ekohl Exp $ +/* $Id: regio.c,v 1.2 2000/05/09 21:30:27 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -15,6 +15,7 @@ /* FUNCTIONS ***************************************************************/ UCHAR +STDCALL READ_REGISTER_UCHAR ( PUCHAR Register ) @@ -23,6 +24,7 @@ READ_REGISTER_UCHAR ( } USHORT +STDCALL READ_REGISTER_USHORT ( PUSHORT Register ) @@ -31,6 +33,7 @@ READ_REGISTER_USHORT ( } ULONG +STDCALL READ_REGISTER_ULONG ( PULONG Register ) @@ -39,6 +42,7 @@ READ_REGISTER_ULONG ( } VOID +STDCALL READ_REGISTER_BUFFER_UCHAR ( PUCHAR Register, PUCHAR Buffer, @@ -52,6 +56,7 @@ READ_REGISTER_BUFFER_UCHAR ( } VOID +STDCALL READ_REGISTER_BUFFER_USHORT ( PUSHORT Register, PUSHORT Buffer, @@ -65,6 +70,7 @@ READ_REGISTER_BUFFER_USHORT ( } VOID +STDCALL READ_REGISTER_BUFFER_ULONG ( PULONG Register, PULONG Buffer, @@ -78,6 +84,7 @@ READ_REGISTER_BUFFER_ULONG ( } VOID +STDCALL WRITE_REGISTER_UCHAR ( PUCHAR Register, UCHAR Value @@ -87,6 +94,7 @@ WRITE_REGISTER_UCHAR ( } VOID +STDCALL WRITE_REGISTER_USHORT ( PUSHORT Register, USHORT Value @@ -96,6 +104,7 @@ WRITE_REGISTER_USHORT ( } VOID +STDCALL WRITE_REGISTER_ULONG ( PULONG Register, ULONG Value @@ -105,6 +114,7 @@ WRITE_REGISTER_ULONG ( } VOID +STDCALL WRITE_REGISTER_BUFFER_UCHAR ( PUCHAR Register, PUCHAR Buffer, @@ -118,6 +128,7 @@ WRITE_REGISTER_BUFFER_UCHAR ( } VOID +STDCALL WRITE_REGISTER_BUFFER_USHORT ( PUSHORT Register, PUSHORT Buffer, @@ -131,6 +142,7 @@ WRITE_REGISTER_BUFFER_USHORT ( } VOID +STDCALL WRITE_REGISTER_BUFFER_ULONG ( PULONG Register, PULONG Buffer, diff --git a/reactos/ntoskrnl/se/token.c b/reactos/ntoskrnl/se/token.c index 685b7cd2ffc..53eb3d4dcf5 100644 --- a/reactos/ntoskrnl/se/token.c +++ b/reactos/ntoskrnl/se/token.c @@ -1,4 +1,4 @@ -/* $Id: token.c,v 1.4 2000/01/26 10:07:30 dwelch Exp $ +/* $Id: token.c,v 1.5 2000/05/09 21:30:39 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -91,10 +91,14 @@ NTSTATUS SeCopyClientToken(PACCESS_TOKEN Token, return(Status); } -NTSTATUS SeCreateClientSecurity(PETHREAD Thread, - PSECURITY_QUALITY_OF_SERVICE Qos, - ULONG e, - PSE_SOME_STRUCT2 f) +NTSTATUS +STDCALL +SeCreateClientSecurity ( + PETHREAD Thread, + PSECURITY_QUALITY_OF_SERVICE Qos, + ULONG e, + PSE_SOME_STRUCT2 f + ) { TOKEN_TYPE TokenType; UCHAR b; @@ -179,8 +183,12 @@ NTSTATUS SeCreateClientSecurity(PETHREAD Thread, } -VOID SeImpersonateClient(PSE_SOME_STRUCT2 a, - PETHREAD Thread) +VOID +STDCALL +SeImpersonateClient ( + PSE_SOME_STRUCT2 a, + PETHREAD Thread + ) { UCHAR b;