Replace
POBJECT_TYPE ExPortType
with
OBJECT_TYPE LpcPortObjectType
and export it. Modified: trunk/reactos/ntoskrnl/include/internal/port.h Modified: trunk/reactos/ntoskrnl/lpc/complete.c Modified: trunk/reactos/ntoskrnl/lpc/connect.c Modified: trunk/reactos/ntoskrnl/lpc/create.c Modified: trunk/reactos/ntoskrnl/lpc/port.c Modified: trunk/reactos/ntoskrnl/lpc/query.c Modified: trunk/reactos/ntoskrnl/lpc/reply.c Modified: trunk/reactos/ntoskrnl/lpc/send.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ps/process.c _____
Modified: trunk/reactos/ntoskrnl/include/internal/port.h --- trunk/reactos/ntoskrnl/include/internal/port.h 2005-01-02 16:24:32 UTC (rev 12719) +++ trunk/reactos/ntoskrnl/include/internal/port.h 2005-01-02 16:45:50 UTC (rev 12720) @@ -140,7 +140,7 @@
NTSTATUS NiInitPort (VOID);
-extern POBJECT_TYPE ExPortType; +extern OBJECT_TYPE LpcPortObjectType; extern ULONG LpcpNextMessageId; extern FAST_MUTEX LpcpLock;
_____
Modified: trunk/reactos/ntoskrnl/lpc/complete.c --- trunk/reactos/ntoskrnl/lpc/complete.c 2005-01-02 16:24:32 UTC (rev 12719) +++ trunk/reactos/ntoskrnl/lpc/complete.c 2005-01-02 16:45:50 UTC (rev 12720) @@ -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 @@ */ Status = ObReferenceObjectByHandle (hServerSideCommPort, PORT_ALL_ACCESS, - ExPortType, + & LpcPortObjectType, UserMode, (PVOID*)&ReplyPort, NULL); _____
Modified: trunk/reactos/ntoskrnl/lpc/connect.c --- trunk/reactos/ntoskrnl/lpc/connect.c 2005-01-02 16:24:32 UTC (rev 12719) +++ trunk/reactos/ntoskrnl/lpc/connect.c 2005-01-02 16:45:50 UTC (rev 12720) @@ -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 @@ * Create a port to represent our side of the connection */ Status = ObCreateObject (KernelMode, - ExPortType, + & LpcPortObjectType, NULL, KernelMode, NULL, @@ -333,7 +333,7 @@ 0, NULL, PORT_ALL_ACCESS, /* DesiredAccess */ - ExPortType, + & LpcPortObjectType, UserMode, NULL, (PVOID*)&NamedPort); @@ -547,7 +547,7 @@
Status = ObReferenceObjectByHandle(NamedPortHandle, PORT_ALL_ACCESS, - ExPortType, + & LpcPortObjectType, UserMode, (PVOID*)&NamedPort, NULL); @@ -563,7 +563,7 @@ if (AcceptIt) { Status = ObCreateObject(ExGetPreviousMode(), - ExPortType, + & LpcPortObjectType, NULL, ExGetPreviousMode(), NULL, _____
Modified: trunk/reactos/ntoskrnl/lpc/create.c --- trunk/reactos/ntoskrnl/lpc/create.c 2005-01-02 16:24:32 UTC (rev 12719) +++ trunk/reactos/ntoskrnl/lpc/create.c 2005-01-02 16:45:50 UTC (rev 12720) @@ -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 @@
/* Ask Ob to create the object */ Status = ObCreateObject (ExGetPreviousMode(), - ExPortType, + & LpcPortObjectType, ObjectAttributes, ExGetPreviousMode(), NULL, _____
Modified: trunk/reactos/ntoskrnl/lpc/port.c --- trunk/reactos/ntoskrnl/lpc/port.c 2005-01-02 16:24:32 UTC (rev 12719) +++ trunk/reactos/ntoskrnl/lpc/port.c 2005-01-02 16:45:50 UTC (rev 12720) @@ -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 @@ 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;
_____
Modified: trunk/reactos/ntoskrnl/lpc/query.c --- trunk/reactos/ntoskrnl/lpc/query.c 2005-01-02 16:24:32 UTC (rev 12719) +++ trunk/reactos/ntoskrnl/lpc/query.c 2005-01-02 16:45:50 UTC (rev 12720) @@ -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 @@
Status = ObReferenceObjectByHandle (PortHandle, PORT_ALL_ACCESS, /* AccessRequired */ - ExPortType, + & LpcPortObjectType, UserMode, (PVOID *) & Port, NULL); _____
Modified: trunk/reactos/ntoskrnl/lpc/reply.c --- trunk/reactos/ntoskrnl/lpc/reply.c 2005-01-02 16:24:32 UTC (rev 12719) +++ trunk/reactos/ntoskrnl/lpc/reply.c 2005-01-02 16:45:50 UTC (rev 12720) @@ -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 @@
Status = ObReferenceObjectByHandle(PortHandle, PORT_ALL_ACCESS, /* AccessRequired */ - ExPortType, + & LpcPortObjectType, UserMode, (PVOID*)&Port, NULL); @@ -154,7 +154,7 @@
Status = ObReferenceObjectByHandle(PortHandle, PORT_ALL_ACCESS, - ExPortType, + & LpcPortObjectType, UserMode, (PVOID*)&Port, NULL); _____
Modified: trunk/reactos/ntoskrnl/lpc/send.c --- trunk/reactos/ntoskrnl/lpc/send.c 2005-01-02 16:24:32 UTC (rev 12719) +++ trunk/reactos/ntoskrnl/lpc/send.c 2005-01-02 16:45:50 UTC (rev 12720) @@ -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 @@
Status = ObReferenceObjectByHandle(PortHandle, PORT_ALL_ACCESS, - ExPortType, + & LpcPortObjectType, UserMode, (PVOID*)&Port, NULL); @@ -231,7 +231,7 @@
Status = ObReferenceObjectByHandle(PortHandle, PORT_ALL_ACCESS, - ExPortType, + & LpcPortObjectType, UserMode, (PVOID*)&Port, NULL); _____
Modified: trunk/reactos/ntoskrnl/ntoskrnl.def --- trunk/reactos/ntoskrnl/ntoskrnl.def 2005-01-02 16:24:32 UTC (rev 12719) +++ trunk/reactos/ntoskrnl/ntoskrnl.def 2005-01-02 16:45:50 UTC (rev 12720) @@ -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 @@ LdrEnumResources@20 LdrFindResourceDirectory_U@16 LdrFindResource_U@16 +LpcPortObjectType DATA LpcRequestPort@8 LpcRequestWaitReplyPort@12 LsaCallAuthenticationPackage@28 _____
Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-01-02 16:24:32 UTC (rev 12719) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-01-02 16:45:50 UTC (rev 12720) @@ -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 @@
Status = ObReferenceObjectByHandle(PortHandle, PORT_ALL_ACCESS, - ExPortType, + & LpcPortObjectType,
KeGetCurrentThread()->PreviousMode, (PVOID*)&TerminationPort, NULL); _____
Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-01-02 16:24:32 UTC (rev 12719) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-01-02 16:45:50 UTC (rev 12720) @@ -743,7 +743,7 @@
{ Status = ObReferenceObjectByHandle(DebugPort, PORT_ALL_ACCESS, - ExPortType, + & LpcPortObjectType, UserMode, (PVOID*)&pDebugPort, NULL); @@ -765,7 +765,7 @@ { Status = ObReferenceObjectByHandle(ExceptionPort, PORT_ALL_ACCESS, - ExPortType, + & LpcPortObjectType, UserMode, (PVOID*)&pExceptionPort, NULL);
-
ea＠svn.reactos.com