From 6299fc118649988184468293e5ae3fd8d519a055 Mon Sep 17 00:00:00 2001 From: Emanuele Aliberti Date: Sun, 2 Jan 2005 16:45:50 +0000 Subject: [PATCH] Replace POBJECT_TYPE ExPortType with OBJECT_TYPE LpcPortObjectType and export it. svn path=/trunk/; revision=12720 --- reactos/ntoskrnl/include/internal/port.h | 2 +- reactos/ntoskrnl/lpc/complete.c | 4 +-- reactos/ntoskrnl/lpc/connect.c | 10 +++--- reactos/ntoskrnl/lpc/create.c | 4 +-- reactos/ntoskrnl/lpc/port.c | 46 ++++++++++++------------ reactos/ntoskrnl/lpc/query.c | 4 +-- reactos/ntoskrnl/lpc/reply.c | 6 ++-- reactos/ntoskrnl/lpc/send.c | 6 ++-- reactos/ntoskrnl/ntoskrnl.def | 3 +- reactos/ntoskrnl/ps/kill.c | 4 +-- reactos/ntoskrnl/ps/process.c | 4 +-- 11 files changed, 47 insertions(+), 46 deletions(-) diff --git a/reactos/ntoskrnl/include/internal/port.h b/reactos/ntoskrnl/include/internal/port.h index a7a7652bef4..fada5b8365b 100644 --- a/reactos/ntoskrnl/include/internal/port.h +++ b/reactos/ntoskrnl/include/internal/port.h @@ -140,7 +140,7 @@ NiInitializePort (IN OUT PEPORT Port, NTSTATUS NiInitPort (VOID); -extern POBJECT_TYPE ExPortType; +extern OBJECT_TYPE LpcPortObjectType; extern ULONG LpcpNextMessageId; extern FAST_MUTEX LpcpLock; diff --git a/reactos/ntoskrnl/lpc/complete.c b/reactos/ntoskrnl/lpc/complete.c index 8e8828f6be0..3b7f67a020d 100644 --- a/reactos/ntoskrnl/lpc/complete.c +++ b/reactos/ntoskrnl/lpc/complete.c @@ -1,4 +1,4 @@ -/* $Id: complete.c,v 1.12 2004/08/15 16:39:06 chorns Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -46,7 +46,7 @@ NtCompleteConnectPort (HANDLE hServerSideCommPort) */ Status = ObReferenceObjectByHandle (hServerSideCommPort, PORT_ALL_ACCESS, - ExPortType, + & LpcPortObjectType, UserMode, (PVOID*)&ReplyPort, NULL); diff --git a/reactos/ntoskrnl/lpc/connect.c b/reactos/ntoskrnl/lpc/connect.c index 938651ef44c..4df287118c4 100644 --- a/reactos/ntoskrnl/lpc/connect.c +++ b/reactos/ntoskrnl/lpc/connect.c @@ -1,4 +1,4 @@ -/* $Id: connect.c,v 1.27 2004/08/15 16:39:06 chorns Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -66,7 +66,7 @@ EiConnectPort(IN PEPORT* ConnectedPort, * Create a port to represent our side of the connection */ Status = ObCreateObject (KernelMode, - ExPortType, + & LpcPortObjectType, NULL, KernelMode, NULL, @@ -333,7 +333,7 @@ NtConnectPort (PHANDLE UnsafeConnectedPortHandle, 0, NULL, PORT_ALL_ACCESS, /* DesiredAccess */ - ExPortType, + & LpcPortObjectType, UserMode, NULL, (PVOID*)&NamedPort); @@ -547,7 +547,7 @@ NtAcceptConnectPort (PHANDLE ServerPortHandle, Status = ObReferenceObjectByHandle(NamedPortHandle, PORT_ALL_ACCESS, - ExPortType, + & LpcPortObjectType, UserMode, (PVOID*)&NamedPort, NULL); @@ -563,7 +563,7 @@ NtAcceptConnectPort (PHANDLE ServerPortHandle, if (AcceptIt) { Status = ObCreateObject(ExGetPreviousMode(), - ExPortType, + & LpcPortObjectType, NULL, ExGetPreviousMode(), NULL, diff --git a/reactos/ntoskrnl/lpc/create.c b/reactos/ntoskrnl/lpc/create.c index 1e3b024de42..e24ed62e53d 100644 --- a/reactos/ntoskrnl/lpc/create.c +++ b/reactos/ntoskrnl/lpc/create.c @@ -1,4 +1,4 @@ -/* $Id: create.c,v 1.18 2004/10/31 20:27:08 ea Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -134,7 +134,7 @@ NtCreatePort (PHANDLE PortHandle, /* Ask Ob to create the object */ Status = ObCreateObject (ExGetPreviousMode(), - ExPortType, + & LpcPortObjectType, ObjectAttributes, ExGetPreviousMode(), NULL, diff --git a/reactos/ntoskrnl/lpc/port.c b/reactos/ntoskrnl/lpc/port.c index 2b8a283b863..b21e6f994e1 100644 --- a/reactos/ntoskrnl/lpc/port.c +++ b/reactos/ntoskrnl/lpc/port.c @@ -1,4 +1,4 @@ -/* $Id: port.c,v 1.20 2004/10/31 20:27:08 ea Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -21,7 +21,7 @@ /* GLOBALS *******************************************************************/ -POBJECT_TYPE ExPortType = NULL; +OBJECT_TYPE LpcPortObjectType = {0, }; ULONG LpcpNextMessageId = 0; /* 0 is not a valid ID */ FAST_MUTEX LpcpLock; /* global internal sync in LPC facility */ @@ -37,30 +37,30 @@ static GENERIC_MAPPING ExpPortMapping = { NTSTATUS INIT_FUNCTION NiInitPort (VOID) { - ExPortType = ExAllocatePoolWithTag(NonPagedPool,sizeof(OBJECT_TYPE),TAG_OBJECT_TYPE); + RtlZeroMemory (& LpcPortObjectType, sizeof (OBJECT_TYPE)); - RtlRosInitUnicodeStringFromLiteral(&ExPortType->TypeName,L"Port"); + RtlRosInitUnicodeStringFromLiteral(&LpcPortObjectType.TypeName,L"Port"); - ExPortType->Tag = TAG('L', 'P', 'R', 'T'); - ExPortType->MaxObjects = ULONG_MAX; - ExPortType->MaxHandles = ULONG_MAX; - ExPortType->TotalObjects = 0; - ExPortType->TotalHandles = 0; - ExPortType->PagedPoolCharge = 0; - ExPortType->NonpagedPoolCharge = sizeof(EPORT); - ExPortType->Mapping = &ExpPortMapping; - ExPortType->Dump = NULL; - ExPortType->Open = NULL; - ExPortType->Close = NiClosePort; - ExPortType->Delete = NiDeletePort; - ExPortType->Parse = NULL; - ExPortType->Security = NULL; - ExPortType->QueryName = NULL; - ExPortType->OkayToClose = NULL; - ExPortType->Create = NiCreatePort; - ExPortType->DuplicationNotify = NULL; + LpcPortObjectType.Tag = TAG('L', 'P', 'R', 'T'); + LpcPortObjectType.MaxObjects = ULONG_MAX; + LpcPortObjectType.MaxHandles = ULONG_MAX; + LpcPortObjectType.TotalObjects = 0; + LpcPortObjectType.TotalHandles = 0; + LpcPortObjectType.PagedPoolCharge = 0; + LpcPortObjectType.NonpagedPoolCharge = sizeof(EPORT); + LpcPortObjectType.Mapping = &ExpPortMapping; + LpcPortObjectType.Dump = NULL; + LpcPortObjectType.Open = NULL; + LpcPortObjectType.Close = NiClosePort; + LpcPortObjectType.Delete = NiDeletePort; + LpcPortObjectType.Parse = NULL; + LpcPortObjectType.Security = NULL; + LpcPortObjectType.QueryName = NULL; + LpcPortObjectType.OkayToClose = NULL; + LpcPortObjectType.Create = NiCreatePort; + LpcPortObjectType.DuplicationNotify = NULL; - ObpCreateTypeObject(ExPortType); + ObpCreateTypeObject(& LpcPortObjectType); LpcpNextMessageId = 0; diff --git a/reactos/ntoskrnl/lpc/query.c b/reactos/ntoskrnl/lpc/query.c index 9bfa62ffd06..456acd3300d 100644 --- a/reactos/ntoskrnl/lpc/query.c +++ b/reactos/ntoskrnl/lpc/query.c @@ -1,4 +1,4 @@ -/* $Id: query.c,v 1.9 2004/08/15 16:39:06 chorns Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -50,7 +50,7 @@ NtQueryInformationPort (IN HANDLE PortHandle, Status = ObReferenceObjectByHandle (PortHandle, PORT_ALL_ACCESS, /* AccessRequired */ - ExPortType, + & LpcPortObjectType, UserMode, (PVOID *) & Port, NULL); diff --git a/reactos/ntoskrnl/lpc/reply.c b/reactos/ntoskrnl/lpc/reply.c index b3c2010b37b..c66312a478a 100644 --- a/reactos/ntoskrnl/lpc/reply.c +++ b/reactos/ntoskrnl/lpc/reply.c @@ -1,4 +1,4 @@ -/* $Id: reply.c,v 1.24 2004/12/24 17:06:59 navaraf Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -88,7 +88,7 @@ NtReplyPort (IN HANDLE PortHandle, Status = ObReferenceObjectByHandle(PortHandle, PORT_ALL_ACCESS, /* AccessRequired */ - ExPortType, + & LpcPortObjectType, UserMode, (PVOID*)&Port, NULL); @@ -154,7 +154,7 @@ NtReplyWaitReceivePortEx(IN HANDLE PortHandle, Status = ObReferenceObjectByHandle(PortHandle, PORT_ALL_ACCESS, - ExPortType, + & LpcPortObjectType, UserMode, (PVOID*)&Port, NULL); diff --git a/reactos/ntoskrnl/lpc/send.c b/reactos/ntoskrnl/lpc/send.c index 2627539cfa3..bb89dbcbc12 100644 --- a/reactos/ntoskrnl/lpc/send.c +++ b/reactos/ntoskrnl/lpc/send.c @@ -1,4 +1,4 @@ -/* $Id: send.c,v 1.20 2004/11/13 22:27:16 hbirr Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -180,7 +180,7 @@ NTSTATUS STDCALL NtRequestPort (IN HANDLE PortHandle, Status = ObReferenceObjectByHandle(PortHandle, PORT_ALL_ACCESS, - ExPortType, + & LpcPortObjectType, UserMode, (PVOID*)&Port, NULL); @@ -231,7 +231,7 @@ NtRequestWaitReplyPort (IN HANDLE PortHandle, Status = ObReferenceObjectByHandle(PortHandle, PORT_ALL_ACCESS, - ExPortType, + & LpcPortObjectType, UserMode, (PVOID*)&Port, NULL); diff --git a/reactos/ntoskrnl/ntoskrnl.def b/reactos/ntoskrnl/ntoskrnl.def index ed41c9bd746..565050d4985 100644 --- a/reactos/ntoskrnl/ntoskrnl.def +++ b/reactos/ntoskrnl/ntoskrnl.def @@ -1,4 +1,4 @@ -; $Id: ntoskrnl.def,v 1.206 2004/12/26 17:48:19 navaraf Exp $ +; $Id$ ; ; reactos/ntoskrnl/ntoskrnl.def ; @@ -680,6 +680,7 @@ LdrAccessResource@16 LdrEnumResources@20 LdrFindResourceDirectory_U@16 LdrFindResource_U@16 +LpcPortObjectType DATA LpcRequestPort@8 LpcRequestWaitReplyPort@12 LsaCallAuthenticationPackage@28 diff --git a/reactos/ntoskrnl/ps/kill.c b/reactos/ntoskrnl/ps/kill.c index 33b0209cb66..253aa789ce5 100644 --- a/reactos/ntoskrnl/ps/kill.c +++ b/reactos/ntoskrnl/ps/kill.c @@ -1,4 +1,4 @@ -/* $Id: kill.c,v 1.91 2004/12/24 17:07:00 navaraf Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -448,7 +448,7 @@ NtRegisterThreadTerminatePort(HANDLE PortHandle) Status = ObReferenceObjectByHandle(PortHandle, PORT_ALL_ACCESS, - ExPortType, + & LpcPortObjectType, KeGetCurrentThread()->PreviousMode, (PVOID*)&TerminationPort, NULL); diff --git a/reactos/ntoskrnl/ps/process.c b/reactos/ntoskrnl/ps/process.c index 89a0d927632..d3d7c5415ce 100644 --- a/reactos/ntoskrnl/ps/process.c +++ b/reactos/ntoskrnl/ps/process.c @@ -743,7 +743,7 @@ NtCreateProcess(OUT PHANDLE ProcessHandle, { Status = ObReferenceObjectByHandle(DebugPort, PORT_ALL_ACCESS, - ExPortType, + & LpcPortObjectType, UserMode, (PVOID*)&pDebugPort, NULL); @@ -765,7 +765,7 @@ NtCreateProcess(OUT PHANDLE ProcessHandle, { Status = ObReferenceObjectByHandle(ExceptionPort, PORT_ALL_ACCESS, - ExPortType, + & LpcPortObjectType, UserMode, (PVOID*)&pExceptionPort, NULL);