diff --git a/reactos/ChangeLog b/reactos/ChangeLog index 87c9dfa1670..b6b70151e38 100644 --- a/reactos/ChangeLog +++ b/reactos/ChangeLog @@ -1,3 +1,23 @@ +2002-11-03 Casper S. Hornstrup + + * apps/tests/lpc/lpcclt.c: Change LPC_MESSAGE_HEADER to LPC_MESSAGE. + * include/csrss/csrss.h: Ditto. + * include/lsass/lsass.h: Ditto. + * include/napi/dbg.h: Ditto. + * include/napi/lpc.h: Ditto. + * lib/kernel32/misc/console.c: Ditto. + * lib/ntdll/csr/lpc.c: Ditto. + * lib/ntdll/dbg/debug.c: Ditto. + * lib/secur32/lsa.c: Ditto. + * ntoskrnl/dbg/user.c: Ditto. + * ntoskrnl/include/internal/port.h: Ditto. + * ntoskrnl/lpc/connect.c: Ditto. + * ntoskrnl/lpc/reply.c: Ditto. + * ntoskrnl/ps/process.c: Ditto. + * subsys/csrss/api/conio.c: Ditto. + * subsys/csrss/api/process.c: Ditto. + * subsys/csrss/api/user.c: Ditto. + 2002-10-26 Casper S. Hornstrup * lib/msvcrt/except/seh.s: Fix end-of-line formatting. diff --git a/reactos/apps/tests/lpc/lpcclt.c b/reactos/apps/tests/lpc/lpcclt.c index 0782a5d36a9..8cdd636dc99 100644 --- a/reactos/apps/tests/lpc/lpcclt.c +++ b/reactos/apps/tests/lpc/lpcclt.c @@ -1,4 +1,4 @@ -/* $Id: lpcclt.c,v 1.11 2002/09/08 10:21:58 chorns Exp $ +/* $Id: lpcclt.c,v 1.12 2002/11/03 20:01:04 chorns Exp $ * * DESCRIPTION: Simple LPC Client * PROGRAMMER: David Welch @@ -63,7 +63,7 @@ int main(int argc, char* argv[]) ZeroMemory(& Request, sizeof Request); strcpy(Request.Data, GetCommandLineA()); Request.Header.DataSize = strlen(Request.Data); - Request.Header.MessageSize = sizeof(LPC_MESSAGE_HEADER) + + Request.Header.MessageSize = sizeof(LPC_MESSAGE) + Request.Header.DataSize; printf("%s: Sending to port 0x%x message \"%s\"...\n", diff --git a/reactos/include/csrss/csrss.h b/reactos/include/csrss/csrss.h index 9b3efe0e55c..4b1115a10eb 100644 --- a/reactos/include/csrss/csrss.h +++ b/reactos/include/csrss/csrss.h @@ -315,7 +315,7 @@ typedef struct #define CSRSS_MAX_WRITE_CONSOLE_REQUEST \ (MAX_MESSAGE_DATA - sizeof(ULONG) - sizeof(CSRSS_WRITE_CONSOLE_REQUEST)) -#define CSRSS_MAX_SET_TITLE_REQUEST (MAX_MESSAGE_DATA - sizeof( HANDLE ) - sizeof( DWORD ) - sizeof( ULONG ) - sizeof( LPC_MESSAGE_HEADER )) +#define CSRSS_MAX_SET_TITLE_REQUEST (MAX_MESSAGE_DATA - sizeof( HANDLE ) - sizeof( DWORD ) - sizeof( ULONG ) - sizeof( LPC_MESSAGE )) #define CSRSS_MAX_WRITE_CONSOLE_OUTPUT_CHAR (MAX_MESSAGE_DATA - sizeof( ULONG ) - sizeof( CSRSS_WRITE_CONSOLE_OUTPUT_CHAR_REQUEST )) @@ -367,11 +367,11 @@ typedef struct /* Keep in sync with definition below. */ -#define CSRSS_REQUEST_HEADER_SIZE (sizeof(LPC_MESSAGE_HEADER) + sizeof(ULONG)) +#define CSRSS_REQUEST_HEADER_SIZE (sizeof(LPC_MESSAGE) + sizeof(ULONG)) typedef struct { - LPC_MESSAGE_HEADER Header; + LPC_MESSAGE Header; ULONG Type; union { @@ -411,7 +411,7 @@ typedef struct typedef struct { - LPC_MESSAGE_HEADER Header; + LPC_MESSAGE Header; NTSTATUS Status; union { diff --git a/reactos/include/lsass/lsass.h b/reactos/include/lsass/lsass.h index b5c303adcc9..7af40d4d8fa 100644 --- a/reactos/include/lsass/lsass.h +++ b/reactos/include/lsass/lsass.h @@ -1,4 +1,4 @@ -/* $Id: lsass.h,v 1.3 2002/09/08 10:22:30 chorns Exp $ +/* $Id: lsass.h,v 1.4 2002/11/03 20:01:05 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries @@ -98,7 +98,7 @@ typedef struct _LSASS_REGISTER_LOGON_PROCESS_REPLY typedef struct _LSASS_REQUEST { - LPC_MESSAGE_HEADER Header; + LPC_MESSAGE Header; ULONG Type; union { @@ -114,7 +114,7 @@ typedef struct _LSASS_REQUEST typedef struct _LSASS_REPLY { - LPC_MESSAGE_HEADER Header; + LPC_MESSAGE Header; NTSTATUS Status; union { diff --git a/reactos/include/napi/dbg.h b/reactos/include/napi/dbg.h index e2a51a6a1d7..8745c55a2d8 100644 --- a/reactos/include/napi/dbg.h +++ b/reactos/include/napi/dbg.h @@ -13,7 +13,7 @@ typedef struct _LPC_DBG_MESSAGE { - LPC_MESSAGE_HEADER Header; + LPC_MESSAGE Header; ULONG Type; ULONG Status; union diff --git a/reactos/include/napi/lpc.h b/reactos/include/napi/lpc.h index 2ee48ceb24b..a99c919e06a 100644 --- a/reactos/include/napi/lpc.h +++ b/reactos/include/napi/lpc.h @@ -50,17 +50,17 @@ typedef struct _LPC_MESSAGE_HEADER CLIENT_ID Cid; ULONG MessageId; ULONG SharedSectionSize; -} LPC_MESSAGE_HEADER, *PLPC_MESSAGE_HEADER; +} LPC_MESSAGE, *PLPC_MESSAGE; typedef struct _LPC_TERMINATION_MESSAGE { - LPC_MESSAGE_HEADER Header; + LPC_MESSAGE Header; TIME CreationTime; } LPC_TERMINATION_MESSAGE, *PLPC_TERMINATION_MESSAGE; typedef struct _LPC_DEBUG_MESSAGE { - LPC_MESSAGE_HEADER Header; + LPC_MESSAGE Header; ULONG EventCode; ULONG Status; union { @@ -103,11 +103,9 @@ typedef struct _LPC_DEBUG_MESSAGE #endif } LPC_DEBUG_MESSAGE, * PLPC_DEBUG_MESSAGE; -typedef LPC_MESSAGE_HEADER LPC_MESSAGE, *PLPC_MESSAGE; - typedef struct _LPC_MAX_MESSAGE { - LPC_MESSAGE_HEADER Header; + LPC_MESSAGE Header; BYTE Data[MAX_MESSAGE_DATA]; } LPC_MAX_MESSAGE, *PLPC_MAX_MESSAGE; diff --git a/reactos/lib/kernel32/misc/console.c b/reactos/lib/kernel32/misc/console.c index 9f7bec4abfd..c75707f742e 100644 --- a/reactos/lib/kernel32/misc/console.c +++ b/reactos/lib/kernel32/misc/console.c @@ -1,4 +1,4 @@ -/* $Id: console.c,v 1.46 2002/10/29 03:49:31 mdill Exp $ +/* $Id: console.c,v 1.47 2002/11/03 20:01:05 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries @@ -2052,7 +2052,7 @@ GetConsoleTitleW( & Re.quest, & Re.ply, (sizeof (CSRSS_GET_TITLE_REQUEST) + - sizeof (LPC_MESSAGE_HEADER) + + sizeof (LPC_MESSAGE) + sizeof (ULONG)), sizeof (CSRSS_API_REPLY) ); @@ -2169,7 +2169,7 @@ SetConsoleTitleW( &Reply, sizeof(CSRSS_SET_TITLE_REQUEST) + c + - sizeof( LPC_MESSAGE_HEADER ) + + sizeof( LPC_MESSAGE ) + sizeof( ULONG ), sizeof(CSRSS_API_REPLY)); @@ -2222,7 +2222,7 @@ SetConsoleTitleA( &Reply, sizeof(CSRSS_SET_TITLE_REQUEST) + c + - sizeof( LPC_MESSAGE_HEADER ) + + sizeof( LPC_MESSAGE ) + sizeof( ULONG ), sizeof(CSRSS_API_REPLY)); diff --git a/reactos/lib/ntdll/csr/lpc.c b/reactos/lib/ntdll/csr/lpc.c index 4202bb73c74..3b87e1ab949 100644 --- a/reactos/lib/ntdll/csr/lpc.c +++ b/reactos/lib/ntdll/csr/lpc.c @@ -1,4 +1,4 @@ -/* $Id: lpc.c,v 1.8 2002/09/08 10:23:02 chorns Exp $ +/* $Id: lpc.c,v 1.9 2002/11/03 20:01:05 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -97,7 +97,7 @@ CsrClientCallServer(PCSRSS_API_REQUEST Request, return (STATUS_UNSUCCESSFUL); } - Request->Header.DataSize = Length - sizeof(LPC_MESSAGE_HEADER); + Request->Header.DataSize = Length - sizeof(LPC_MESSAGE); Request->Header.MessageSize = Length; Status = NtRequestWaitReplyPort(WindowsApiPort, diff --git a/reactos/lib/ntdll/dbg/debug.c b/reactos/lib/ntdll/dbg/debug.c index 4cb8ec399f1..393a9f0b9fd 100644 --- a/reactos/lib/ntdll/dbg/debug.c +++ b/reactos/lib/ntdll/dbg/debug.c @@ -1,4 +1,4 @@ -/* $Id: debug.c,v 1.6 2002/09/08 10:23:03 chorns Exp $ +/* $Id: debug.c,v 1.7 2002/11/03 20:01:06 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -24,7 +24,7 @@ static HANDLE DbgSsReplyPort = NULL; typedef struct _LPC_DBGSS_MESSAGE { - LPC_MESSAGE_HEADER Header; + LPC_MESSAGE Header; ULONG Unknown1; ULONG Unknown2; ULONG Unknown3; diff --git a/reactos/lib/secur32/lsa.c b/reactos/lib/secur32/lsa.c index 884d37da60d..986e8949414 100644 --- a/reactos/lib/secur32/lsa.c +++ b/reactos/lib/secur32/lsa.c @@ -1,4 +1,4 @@ -/* $Id: lsa.c,v 1.5 2002/09/08 10:23:08 chorns Exp $ +/* $Id: lsa.c,v 1.6 2002/11/03 20:01:06 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries @@ -74,9 +74,9 @@ LsaCallAuthenticationPackage(HANDLE LsaHandle, Reply = (PLSASS_REPLY)RawReply; Request->Header.DataSize = sizeof(LSASS_REQUEST) + SubmitBufferLength - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); Request->Header.MessageSize = - Request->Header.DataSize + sizeof(LPC_MESSAGE_HEADER); + Request->Header.DataSize + sizeof(LPC_MESSAGE); Request->Type = LSASS_REQUEST_CALL_AUTHENTICATION_PACKAGE; Request->d.CallAuthenticationPackageRequest.AuthenticationPackage = AuthenticationPackage; @@ -129,9 +129,9 @@ LsaLookupAuthenticationPackage(HANDLE LsaHandle, Request = (PLSASS_REQUEST)RawRequest; Request->Header.DataSize = sizeof(LSASS_REQUEST) + PackageName->Length - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); Request->Header.MessageSize = Request->Header.DataSize + - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); Request->Type = LSASS_REQUEST_LOOKUP_AUTHENTICATION_PACKAGE; Status = NtRequestWaitReplyPort(LsaHandle, @@ -175,7 +175,7 @@ LsaLogonUser(HANDLE LsaHandle, UCHAR RawReply[MAX_MESSAGE_DATA]; NTSTATUS Status; - RequestLength = sizeof(LSASS_REQUEST) - sizeof(LPC_MESSAGE_HEADER); + RequestLength = sizeof(LSASS_REQUEST) - sizeof(LPC_MESSAGE); RequestLength = RequestLength + (OriginName->Length * sizeof(WCHAR)); RequestLength = RequestLength + AuthenticationInformationLength; RequestLength = RequestLength + @@ -215,8 +215,8 @@ LsaLogonUser(HANDLE LsaHandle, Request->d.LogonUserRequest.SourceContext = *SourceContext; Request->Type = LSASS_REQUEST_LOGON_USER; - Request->Header.DataSize = RequestLength - sizeof(LPC_MESSAGE_HEADER); - Request->Header.MessageSize = RequestLength + sizeof(LPC_MESSAGE_HEADER); + Request->Header.DataSize = RequestLength - sizeof(LPC_MESSAGE); + Request->Header.MessageSize = RequestLength + sizeof(LPC_MESSAGE); Reply = (PLSASS_REPLY)RawReply; @@ -278,7 +278,7 @@ LsaRegisterLogonProcess(PLSA_STRING LsaLogonProcessName, Request.Type = LSASS_REQUEST_REGISTER_LOGON_PROCESS; Request.Header.DataSize = sizeof(LSASS_REQUEST) - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); Request.Header.MessageSize = sizeof(LSASS_REQUEST); Request.d.RegisterLogonProcessRequest.Length = LsaLogonProcessName->Length; diff --git a/reactos/ntoskrnl/dbg/user.c b/reactos/ntoskrnl/dbg/user.c index 3641fff758d..0c33105b73f 100644 --- a/reactos/ntoskrnl/dbg/user.c +++ b/reactos/ntoskrnl/dbg/user.c @@ -49,7 +49,7 @@ DbgkCreateThread(PVOID StartAddress) Message.Header.MessageSize = sizeof(LPC_DBG_MESSAGE); Message.Header.DataSize = sizeof(LPC_DBG_MESSAGE) - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); Message.Type = DBG_EVENT_CREATE_THREAD; Message.Status = STATUS_SUCCESS; Message.Data.CreateThread.Reserved = 0; @@ -85,7 +85,7 @@ DbgkForwardException(EXCEPTION_RECORD Er, ULONG FirstChance) Message.Header.MessageSize = sizeof(LPC_DBG_MESSAGE); Message.Header.DataSize = sizeof(LPC_DBG_MESSAGE) - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); Message.Type = DBG_EVENT_EXCEPTION; Message.Status = STATUS_SUCCESS; Message.Data.Exception.ExceptionRecord = Er; diff --git a/reactos/ntoskrnl/include/internal/port.h b/reactos/ntoskrnl/include/internal/port.h index b987c3bd04b..f73af613a47 100644 --- a/reactos/ntoskrnl/include/internal/port.h +++ b/reactos/ntoskrnl/include/internal/port.h @@ -43,7 +43,7 @@ typedef struct _EPORT_TERMINATION_REQUEST typedef struct _EPORT_CONNECT_REQUEST_MESSAGE { - LPC_MESSAGE_HEADER MessageHeader; + LPC_MESSAGE MessageHeader; PEPROCESS ConnectingProcess; struct _SECTION_OBJECT* SendSectionObject; LARGE_INTEGER SendSectionOffset; @@ -54,7 +54,7 @@ typedef struct _EPORT_CONNECT_REQUEST_MESSAGE typedef struct _EPORT_CONNECT_REPLY_MESSAGE { - LPC_MESSAGE_HEADER MessageHeader; + LPC_MESSAGE MessageHeader; PVOID SendServerViewBase; ULONG ReceiveClientViewSize; PVOID ReceiveClientViewBase; diff --git a/reactos/ntoskrnl/lpc/connect.c b/reactos/ntoskrnl/lpc/connect.c index ab8ac402f16..de5996fcbdf 100644 --- a/reactos/ntoskrnl/lpc/connect.c +++ b/reactos/ntoskrnl/lpc/connect.c @@ -1,4 +1,4 @@ -/* $Id: connect.c,v 1.12 2002/09/08 10:23:32 chorns Exp $ +/* $Id: connect.c,v 1.13 2002/11/03 20:01:06 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -90,7 +90,7 @@ EiConnectPort(IN PEPORT* ConnectedPort, */ RequestMessage->MessageHeader.DataSize = sizeof(EPORT_CONNECT_REQUEST_MESSAGE) + RequestConnectDataLength - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); RequestMessage->MessageHeader.MessageSize = sizeof(EPORT_CONNECT_REQUEST_MESSAGE) + RequestConnectDataLength; DPRINT("RequestMessageSize %d\n", @@ -568,20 +568,20 @@ NtAcceptConnectPort (PHANDLE ServerPortHandle, */ if (LpcMessage != NULL) { - memcpy(&CReply->MessageHeader, LpcMessage, sizeof(LPC_MESSAGE_HEADER)); + memcpy(&CReply->MessageHeader, LpcMessage, sizeof(LPC_MESSAGE)); memcpy(&CReply->ConnectData, (PVOID)(LpcMessage + 1), LpcMessage->DataSize); CReply->MessageHeader.MessageSize = sizeof(EPORT_CONNECT_REPLY_MESSAGE) + LpcMessage->DataSize; CReply->MessageHeader.DataSize = CReply->MessageHeader.MessageSize - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); CReply->ConnectDataLength = LpcMessage->DataSize; } else { CReply->MessageHeader.MessageSize = sizeof(EPORT_CONNECT_REPLY_MESSAGE); CReply->MessageHeader.DataSize = sizeof(EPORT_CONNECT_REPLY_MESSAGE) - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); CReply->ConnectDataLength = 0; } if (AcceptIt != 1) diff --git a/reactos/ntoskrnl/lpc/reply.c b/reactos/ntoskrnl/lpc/reply.c index bac3e6eae80..f06ef3eb43f 100644 --- a/reactos/ntoskrnl/lpc/reply.c +++ b/reactos/ntoskrnl/lpc/reply.c @@ -1,4 +1,4 @@ -/* $Id: reply.c,v 1.11 2002/09/08 10:23:32 chorns Exp $ +/* $Id: reply.c,v 1.12 2002/11/03 20:01:06 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -233,13 +233,13 @@ NtReplyWaitReceivePortEx(IN HANDLE PortHandle, if (Request->Message.MessageType == LPC_CONNECTION_REQUEST) { - LPC_MESSAGE_HEADER Header; + LPC_MESSAGE Header; PEPORT_CONNECT_REQUEST_MESSAGE CRequest; CRequest = (PEPORT_CONNECT_REQUEST_MESSAGE)&Request->Message; - memcpy(&Header, &Request->Message, sizeof(LPC_MESSAGE_HEADER)); + memcpy(&Header, &Request->Message, sizeof(LPC_MESSAGE)); Header.DataSize = CRequest->ConnectDataLength; - Header.MessageSize = Header.DataSize + sizeof(LPC_MESSAGE_HEADER); + Header.MessageSize = Header.DataSize + sizeof(LPC_MESSAGE); Status = MmCopyToCaller(LpcMessage, &Header, sizeof(LPC_MESSAGE)); if (!NT_SUCCESS(Status)) { diff --git a/reactos/ntoskrnl/ps/process.c b/reactos/ntoskrnl/ps/process.c index 469edc5df8c..eb78d239f47 100644 --- a/reactos/ntoskrnl/ps/process.c +++ b/reactos/ntoskrnl/ps/process.c @@ -1,4 +1,4 @@ -/* $Id: process.c,v 1.93 2002/10/01 19:27:25 chorns Exp $ +/* $Id: process.c,v 1.94 2002/11/03 20:01:07 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -694,7 +694,7 @@ NtCreateProcess(OUT PHANDLE ProcessHandle, Message.Header.MessageSize = sizeof(LPC_DBG_MESSAGE); Message.Header.DataSize = sizeof(LPC_DBG_MESSAGE) - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); Message.Type = DBG_EVENT_CREATE_PROCESS; Message.Data.CreateProcess.FileHandle = FileHandle; Message.Data.CreateProcess.Base = ImageBase; diff --git a/reactos/subsys/csrss/api/conio.c b/reactos/subsys/csrss/api/conio.c index 39a39b7d2a7..7e73b565a4f 100644 --- a/reactos/subsys/csrss/api/conio.c +++ b/reactos/subsys/csrss/api/conio.c @@ -1,4 +1,4 @@ -/* $Id: conio.c,v 1.36 2002/10/29 03:49:31 mdill Exp $ +/* $Id: conio.c,v 1.37 2002/11/03 20:01:07 chorns Exp $ * * reactos/subsys/csrss/api/conio.c * @@ -45,7 +45,7 @@ CSR_API(CsrAllocConsole) Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); if( ProcessData->Console ) { Reply->Status = STATUS_INVALID_PARAMETER; @@ -114,7 +114,7 @@ CSR_API(CsrFreeConsole) { Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); Reply->Status = STATUS_NOT_IMPLEMENTED; @@ -135,7 +135,7 @@ CSR_API(CsrReadConsole) nNumberOfCharsToRead = Request->Data.ReadConsoleRequest.NrCharactersToRead > CSRSS_MAX_READ_CONSOLE_REQUEST ? CSRSS_MAX_READ_CONSOLE_REQUEST : Request->Data.ReadConsoleRequest.NrCharactersToRead; Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = Reply->Header.MessageSize - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); Buffer = Reply->Data.ReadConsoleReply.Buffer; Reply->Data.ReadConsoleReply.EventHandle = ProcessData->ConsoleEvent; LOCK; @@ -614,7 +614,7 @@ CSR_API(CsrWriteConsole) Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); LOCK; if( !NT_SUCCESS( CsrGetObject( ProcessData, Request->Data.WriteConsoleRequest.ConsoleHandle, @@ -1116,7 +1116,7 @@ CSR_API(CsrGetScreenBufferInfo) Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); LOCK; if( !NT_SUCCESS( CsrGetObject( ProcessData, Request->Data.ScreenBufferInfoRequest.ConsoleHandle, @@ -1159,7 +1159,7 @@ CSR_API(CsrSetCursor) Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); LOCK; if( !NT_SUCCESS( CsrGetObject( ProcessData, Request->Data.SetCursorRequest.ConsoleHandle, @@ -1194,7 +1194,7 @@ CSR_API(CsrWriteConsoleOutputChar) Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); LOCK; if( !NT_SUCCESS( CsrGetObject( ProcessData, Request->Data.WriteConsoleOutputCharRequest.ConsoleHandle, (Object_t **)&Buff ) ) || Buff->Header.Type != CSRSS_SCREEN_BUFFER_MAGIC ) { @@ -1237,7 +1237,7 @@ CSR_API(CsrFillOutputChar) Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); LOCK; if( !NT_SUCCESS( CsrGetObject( ProcessData, Request->Data.FillOutputRequest.ConsoleHandle, (Object_t **)&Buff ) ) || Buff->Header.Type != CSRSS_SCREEN_BUFFER_MAGIC ) @@ -1273,7 +1273,7 @@ CSR_API(CsrReadInputEvent) Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); Reply->Data.ReadInputReply.Event = ProcessData->ConsoleEvent; LOCK; @@ -1323,7 +1323,7 @@ CSR_API(CsrWriteConsoleOutputAttrib) Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); LOCK; Status = CsrGetObject( ProcessData, Request->Data.WriteConsoleOutputAttribRequest.ConsoleHandle, (Object_t **)&Buff ); if( !NT_SUCCESS( Status ) || (Status = Buff->Header.Type == CSRSS_SCREEN_BUFFER_MAGIC ? 0 : STATUS_INVALID_HANDLE )) @@ -1381,7 +1381,7 @@ CSR_API(CsrFillOutputAttrib) Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); LOCK; Status = CsrGetObject( ProcessData, Request->Data.FillOutputAttribRequest.ConsoleHandle, (Object_t **)&Buff ); if( !NT_SUCCESS( Status ) || (Status = Buff->Header.Type == CSRSS_SCREEN_BUFFER_MAGIC ? 0 : STATUS_INVALID_HANDLE )) @@ -1436,7 +1436,7 @@ CSR_API(CsrGetCursorInfo) Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); LOCK; Status = CsrGetObject( ProcessData, Request->Data.GetCursorInfoRequest.ConsoleHandle, (Object_t **)&Buff ); if( !NT_SUCCESS( Status ) || (Status = Buff->Header.Type == CSRSS_SCREEN_BUFFER_MAGIC ? 0 : STATUS_INVALID_HANDLE )) @@ -1458,7 +1458,7 @@ CSR_API(CsrSetCursorInfo) Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); LOCK; Status = CsrGetObject( ProcessData, Request->Data.SetCursorInfoRequest.ConsoleHandle, (Object_t **)&Buff ); @@ -1492,7 +1492,7 @@ CSR_API(CsrSetTextAttrib) Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); LOCK; Status = CsrGetObject( ProcessData, Request->Data.SetAttribRequest.ConsoleHandle, (Object_t **)&Buff ); if( !NT_SUCCESS( Status ) || (Status = Buff->Header.Type == CSRSS_SCREEN_BUFFER_MAGIC ? 0 : STATUS_INVALID_HANDLE )) @@ -1526,7 +1526,7 @@ CSR_API(CsrSetConsoleMode) PCSRSS_SCREEN_BUFFER Buff; Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); - Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - sizeof(LPC_MESSAGE_HEADER); + Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - sizeof(LPC_MESSAGE); LOCK; Status = CsrGetObject( ProcessData, Request->Data.SetConsoleModeRequest.ConsoleHandle, @@ -1560,7 +1560,7 @@ CSR_API(CsrGetConsoleMode) PCSRSS_SCREEN_BUFFER Buff; /* gee, I really wish I could use an anonymous union here */ Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); - Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - sizeof(LPC_MESSAGE_HEADER); + Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - sizeof(LPC_MESSAGE); LOCK; Status = CsrGetObject( ProcessData, Request->Data.GetConsoleModeRequest.ConsoleHandle, @@ -1588,7 +1588,7 @@ CSR_API(CsrCreateScreenBuffer) NTSTATUS Status; Reply->Header.MessageSize = sizeof( CSRSS_API_REPLY ); - Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - sizeof(LPC_MESSAGE_HEADER); + Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - sizeof(LPC_MESSAGE); if( !Buff ) Reply->Status = STATUS_INSUFFICIENT_RESOURCES; LOCK; @@ -1611,7 +1611,7 @@ CSR_API(CsrSetScreenBuffer) PCSRSS_SCREEN_BUFFER Buff; Reply->Header.MessageSize = sizeof( CSRSS_API_REPLY ); - Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - sizeof(LPC_MESSAGE_HEADER); + Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - sizeof(LPC_MESSAGE); LOCK; Status = CsrGetObject( ProcessData, Request->Data.SetActiveScreenBufferRequest.OutputHandle, (Object_t **)&Buff ); if( !NT_SUCCESS( Status ) ) @@ -1639,7 +1639,7 @@ CSR_API(CsrSetTitle) PCSRSS_CONSOLE Console; Reply->Header.MessageSize = sizeof( CSRSS_API_REPLY ); - Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - sizeof(LPC_MESSAGE_HEADER); + Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - sizeof(LPC_MESSAGE); LOCK; Status = CsrGetObject( ProcessData, Request->Data.SetTitleRequest.Console, (Object_t **)&Console ); if( !NT_SUCCESS( Status ) ) @@ -1662,7 +1662,7 @@ CSR_API(CsrGetTitle) Reply->Header.MessageSize = sizeof (CSRSS_API_REPLY); Reply->Header.DataSize = sizeof (CSRSS_API_REPLY) - - sizeof(LPC_MESSAGE_HEADER); + - sizeof(LPC_MESSAGE); LOCK; Status = CsrGetObject ( ProcessData, @@ -1706,7 +1706,7 @@ CSR_API(CsrWriteConsoleOutput) DWORD PSize; Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); - Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - sizeof(LPC_MESSAGE_HEADER); + Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - sizeof(LPC_MESSAGE); LOCK; Status = CsrGetObject( ProcessData, Request->Data.WriteConsoleOutputRequest.ConsoleHandle, (Object_t **)&Buff ); if( !NT_SUCCESS( Status ) || (Status = Buff->Header.Type == CSRSS_SCREEN_BUFFER_MAGIC ? STATUS_SUCCESS : STATUS_INVALID_HANDLE )) @@ -1776,7 +1776,7 @@ CSR_API(CsrFlushInputBuffer) NTSTATUS Status; Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); - Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - sizeof(LPC_MESSAGE_HEADER); + Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - sizeof(LPC_MESSAGE); LOCK; Status = CsrGetObject( ProcessData, Request->Data.FlushInputBufferRequest.ConsoleInput, (Object_t **)&Console ); if( !NT_SUCCESS( Status ) || (Status = Console->Header.Type == CSRSS_CONSOLE_MAGIC ? STATUS_SUCCESS : STATUS_INVALID_HANDLE )) @@ -1825,7 +1825,7 @@ CSR_API(CsrScrollConsoleScreenBuffer) ALIAS(Fill,Request->Data.ScrollConsoleScreenBufferRequest.Fill); Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); - Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - sizeof(LPC_MESSAGE_HEADER); + Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - sizeof(LPC_MESSAGE); LOCK; Status = CsrGetObject( ProcessData, ConsoleHandle, (Object_t **)&Buff ); if( !NT_SUCCESS( Status ) || (Status = Buff->Header.Type == CSRSS_SCREEN_BUFFER_MAGIC ? STATUS_SUCCESS : STATUS_INVALID_HANDLE )) @@ -1911,7 +1911,7 @@ CSR_API(CsrReadConsoleOutputChar) DWORD i; Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); - Reply->Header.DataSize = Reply->Header.MessageSize - sizeof(LPC_MESSAGE_HEADER); + Reply->Header.DataSize = Reply->Header.MessageSize - sizeof(LPC_MESSAGE); ReadBuffer = Reply->Data.ReadConsoleOutputCharReply.String; LOCK; @@ -1974,7 +1974,7 @@ CSR_API(CsrReadConsoleOutputAttrib) DWORD i; Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); - Reply->Header.DataSize = Reply->Header.MessageSize - sizeof(LPC_MESSAGE_HEADER); + Reply->Header.DataSize = Reply->Header.MessageSize - sizeof(LPC_MESSAGE); ReadBuffer = Reply->Data.ReadConsoleOutputAttribReply.String; LOCK; @@ -2036,7 +2036,7 @@ CSR_API(CsrGetNumberOfConsoleInputEvents) DWORD NumEvents; Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); - Reply->Header.DataSize = Reply->Header.MessageSize - sizeof(LPC_MESSAGE_HEADER); + Reply->Header.DataSize = Reply->Header.MessageSize - sizeof(LPC_MESSAGE); LOCK; @@ -2090,7 +2090,7 @@ CSR_API(CsrPeekConsoleInput) UINT NumItems; Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); - Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - sizeof(LPC_MESSAGE_HEADER); + Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - sizeof(LPC_MESSAGE); LOCK; diff --git a/reactos/subsys/csrss/api/process.c b/reactos/subsys/csrss/api/process.c index 96c8b0ecc14..5ec5c3de66f 100644 --- a/reactos/subsys/csrss/api/process.c +++ b/reactos/subsys/csrss/api/process.c @@ -1,4 +1,4 @@ -/* $Id: process.c,v 1.21 2002/10/20 16:40:12 ekohl Exp $ +/* $Id: process.c,v 1.22 2002/11/03 20:01:07 chorns Exp $ * * reactos/subsys/csrss/api/process.c * @@ -124,7 +124,7 @@ CSR_API(CsrCreateProcess) HANDLE Process; Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); NewProcessData = CsrGetProcessData(Request->Data.CreateProcessRequest.NewProcessId); @@ -209,7 +209,7 @@ CSR_API(CsrTerminateProcess) NTSTATUS Status; Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY) - - sizeof(LPC_MESSAGE_HEADER); + - sizeof(LPC_MESSAGE); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY); Status = CsrFreeProcessData(ProcessData->ProcessId); @@ -222,7 +222,7 @@ CSR_API(CsrConnectProcess) { Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); Reply->Status = STATUS_SUCCESS; @@ -233,7 +233,7 @@ CSR_API(CsrGetShutdownParameters) { Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); Reply->Data.GetShutdownParametersReply.Level = ProcessData->ShutdownLevel; Reply->Data.GetShutdownParametersReply.Flags = ProcessData->ShutdownFlags; @@ -247,7 +247,7 @@ CSR_API(CsrSetShutdownParameters) { Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); ProcessData->ShutdownLevel = Request->Data.SetShutdownParametersRequest.Level; ProcessData->ShutdownFlags = Request->Data.SetShutdownParametersRequest.Flags; diff --git a/reactos/subsys/csrss/api/user.c b/reactos/subsys/csrss/api/user.c index 84f4a22ec69..df80679b79c 100644 --- a/reactos/subsys/csrss/api/user.c +++ b/reactos/subsys/csrss/api/user.c @@ -1,4 +1,4 @@ -/* $Id: user.c,v 1.1 2002/10/20 14:53:43 ekohl Exp $ +/* $Id: user.c,v 1.2 2002/11/03 20:01:07 chorns Exp $ * * reactos/subsys/csrss/api/user.c * @@ -33,7 +33,7 @@ CSR_API(CsrRegisterServicesProcess) Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE); if (ServicesProcessIdValid == TRUE) { @@ -57,7 +57,7 @@ CSR_API(CsrExitReactos) { Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - - sizeof(LPC_MESSAGE_HEADER); + sizeof(LPC_MESSAGE);