From b8d2bb2058bbcab561af90a808305673031a97a8 Mon Sep 17 00:00:00 2001 From: Gregor Schneider Date: Sat, 12 Dec 2009 15:21:56 +0000 Subject: [PATCH] [ntoskrnl] - Use the PORT_MESSAGE ZeroInit and Type fields the way they are supposed to be used - Ref: http://www.reactos.org/archives/public/ros-dev/2009-December/012466.html svn path=/trunk/; revision=44549 --- reactos/ntoskrnl/dbgk/dbgkobj.c | 6 ++++-- reactos/ntoskrnl/dbgk/dbgkutil.c | 21 ++++++++++++++------- reactos/ntoskrnl/ex/harderr.c | 3 ++- reactos/ntoskrnl/lpc/close.c | 3 ++- reactos/ntoskrnl/ps/kill.c | 3 ++- 5 files changed, 24 insertions(+), 12 deletions(-) diff --git a/reactos/ntoskrnl/dbgk/dbgkobj.c b/reactos/ntoskrnl/dbgk/dbgkobj.c index 6b509a05fcd..347a96d1057 100644 --- a/reactos/ntoskrnl/dbgk/dbgkobj.c +++ b/reactos/ntoskrnl/dbgk/dbgkobj.c @@ -331,7 +331,8 @@ DbgkForwardException(IN PEXCEPTION_RECORD ExceptionRecord, /* Setup the API Message */ ApiMessage.h.u1.Length = sizeof(DBGKM_MSG) << 16 | (8 + sizeof(DBGKM_EXCEPTION)); - ApiMessage.h.u2.ZeroInit = LPC_DEBUG_EVENT; + ApiMessage.h.u2.ZeroInit = 0; + ApiMessage.h.u2.s2.Type = LPC_DEBUG_EVENT; ApiMessage.ApiNumber = DbgKmExceptionApi; /* Check if this is to be sent on the debug port */ @@ -345,7 +346,8 @@ DbgkForwardException(IN PEXCEPTION_RECORD ExceptionRecord, { /* Otherwise, use the exception port */ Port = Process->ExceptionPort; - ApiMessage.h.u2.ZeroInit = LPC_EXCEPTION; + ApiMessage.h.u2.ZeroInit = 0; + ApiMessage.h.u2.s2.Type = LPC_EXCEPTION; UseLpc = TRUE; } diff --git a/reactos/ntoskrnl/dbgk/dbgkutil.c b/reactos/ntoskrnl/dbgk/dbgkutil.c index 2285c95a955..0d5d5713c09 100644 --- a/reactos/ntoskrnl/dbgk/dbgkutil.c +++ b/reactos/ntoskrnl/dbgk/dbgkutil.c @@ -209,7 +209,8 @@ DbgkCreateThread(IN PETHREAD Thread, /* Setup the API Message */ ApiMessage.h.u1.Length = sizeof(DBGKM_MSG) << 16 | (8 + sizeof(DBGKM_CREATE_PROCESS)); - ApiMessage.h.u2.ZeroInit = LPC_DEBUG_EVENT; + ApiMessage.h.u2.ZeroInit = 0; + ApiMessage.h.u2.s2.Type = LPC_DEBUG_EVENT; ApiMessage.ApiNumber = DbgKmCreateProcessApi; /* Send the message */ @@ -269,7 +270,8 @@ DbgkCreateThread(IN PETHREAD Thread, /* Setup the API Message */ ApiMessage.h.u1.Length = sizeof(DBGKM_MSG) << 16 | (8 + sizeof(DBGKM_LOAD_DLL)); - ApiMessage.h.u2.ZeroInit = LPC_DEBUG_EVENT; + ApiMessage.h.u2.ZeroInit = 0; + ApiMessage.h.u2.s2.Type = LPC_DEBUG_EVENT; ApiMessage.ApiNumber = DbgKmLoadDllApi; /* Send the message */ @@ -288,7 +290,8 @@ DbgkCreateThread(IN PETHREAD Thread, /* Setup the API Message */ ApiMessage.h.u1.Length = sizeof(DBGKM_MSG) << 16 | (8 + sizeof(DBGKM_CREATE_THREAD)); - ApiMessage.h.u2.ZeroInit = LPC_DEBUG_EVENT; + ApiMessage.h.u2.ZeroInit = 0; + ApiMessage.h.u2.s2.Type = LPC_DEBUG_EVENT; ApiMessage.ApiNumber = DbgKmCreateThreadApi; /* Send the message */ @@ -321,7 +324,8 @@ DbgkExitProcess(IN NTSTATUS ExitStatus) /* Setup the API Message */ ApiMessage.h.u1.Length = sizeof(DBGKM_MSG) << 16 | (8 + sizeof(DBGKM_EXIT_PROCESS)); - ApiMessage.h.u2.ZeroInit = LPC_DEBUG_EVENT; + ApiMessage.h.u2.ZeroInit = 0; + ApiMessage.h.u2.s2.Type = LPC_DEBUG_EVENT; ApiMessage.ApiNumber = DbgKmExitProcessApi; /* Set the current exit time */ @@ -357,7 +361,8 @@ DbgkExitThread(IN NTSTATUS ExitStatus) /* Setup the API Message */ ApiMessage.h.u1.Length = sizeof(DBGKM_MSG) << 16 | (8 + sizeof(DBGKM_EXIT_THREAD)); - ApiMessage.h.u2.ZeroInit = LPC_DEBUG_EVENT; + ApiMessage.h.u2.ZeroInit = 0; + ApiMessage.h.u2.s2.Type = LPC_DEBUG_EVENT; ApiMessage.ApiNumber = DbgKmExitThreadApi; /* Suspend the process */ @@ -414,7 +419,8 @@ DbgkMapViewOfSection(IN PVOID Section, /* Setup the API Message */ ApiMessage.h.u1.Length = sizeof(DBGKM_MSG) << 16 | (8 + sizeof(DBGKM_LOAD_DLL)); - ApiMessage.h.u2.ZeroInit = LPC_DEBUG_EVENT; + ApiMessage.h.u2.ZeroInit = 0; + ApiMessage.h.u2.s2.Type = LPC_DEBUG_EVENT; ApiMessage.ApiNumber = DbgKmLoadDllApi; /* Send the message */ @@ -449,7 +455,8 @@ DbgkUnMapViewOfSection(IN PVOID BaseAddress) /* Setup the API Message */ ApiMessage.h.u1.Length = sizeof(DBGKM_MSG) << 16 | (8 + sizeof(DBGKM_UNLOAD_DLL)); - ApiMessage.h.u2.ZeroInit = LPC_DEBUG_EVENT; + ApiMessage.h.u2.ZeroInit = 0; + ApiMessage.h.u2.s2.Type = LPC_DEBUG_EVENT; ApiMessage.ApiNumber = DbgKmUnloadDllApi; /* Send the message */ diff --git a/reactos/ntoskrnl/ex/harderr.c b/reactos/ntoskrnl/ex/harderr.c index 266fefc55e8..6166289d21c 100644 --- a/reactos/ntoskrnl/ex/harderr.c +++ b/reactos/ntoskrnl/ex/harderr.c @@ -234,7 +234,8 @@ ExpRaiseHardError(IN NTSTATUS ErrorStatus, /* Setup the LPC Message */ Message->h.u1.Length = (sizeof(HARDERROR_MSG) << 16) | (sizeof(HARDERROR_MSG) - sizeof(PORT_MESSAGE)); - Message->h.u2.ZeroInit = LPC_ERROR_EVENT; + Message->h.u2.ZeroInit = 0; + Message->h.u2.s2.Type = LPC_ERROR_EVENT; Message->Status = ErrorStatus &~ 0x10000000; Message->ValidResponseOptions = ValidResponseOptions; Message->UnicodeStringParameterMask = UnicodeStringParameterMask; diff --git a/reactos/ntoskrnl/lpc/close.c b/reactos/ntoskrnl/lpc/close.c index 173fcdf8794..1d37b593b5b 100644 --- a/reactos/ntoskrnl/lpc/close.c +++ b/reactos/ntoskrnl/lpc/close.c @@ -336,7 +336,8 @@ LpcpDeletePort(IN PVOID ObjectBody) /* Setup the client died message */ ClientDiedMsg.h.u1.s1.TotalLength = sizeof(ClientDiedMsg); ClientDiedMsg.h.u1.s1.DataLength = sizeof(ClientDiedMsg.CreateTime); - ClientDiedMsg.h.u2.ZeroInit = LPC_PORT_CLOSED; + ClientDiedMsg.h.u2.ZeroInit = 0; + ClientDiedMsg.h.u2.s2.Type = LPC_PORT_CLOSED; ClientDiedMsg.CreateTime = PsGetCurrentProcess()->CreateTime; /* Send it */ diff --git a/reactos/ntoskrnl/ps/kill.c b/reactos/ntoskrnl/ps/kill.c index f9337bdece7..b1ea95fb361 100644 --- a/reactos/ntoskrnl/ps/kill.c +++ b/reactos/ntoskrnl/ps/kill.c @@ -596,7 +596,8 @@ PspExitThread(IN NTSTATUS ExitStatus) if (TerminationPort) { /* Setup the message header */ - TerminationMsg.h.u2.ZeroInit = LPC_CLIENT_DIED; + TerminationMsg.h.u2.ZeroInit = 0; + TerminationMsg.h.u2.s2.Type = LPC_CLIENT_DIED; TerminationMsg.h.u1.s1.TotalLength = sizeof(TerminationMsg); TerminationMsg.h.u1.s1.DataLength = sizeof(TerminationMsg) - sizeof(PORT_MESSAGE); -- 2.17.1