From 1914d86bac73f9f448d6bb0ee02970afee5626b8 Mon Sep 17 00:00:00 2001 From: Jeffrey Morlan Date: Sat, 2 Aug 2008 22:09:22 +0000 Subject: [PATCH] - Remove some redundant ProcessData == NULL checks - ClientConnectionThread already checks this for every request. - CsrApiCallHandler: Get rid of "Found" variable and just return when the right definition is found. - Make CsrApiCallHandler use the return value from the function (previously unused) to set Request->Status, and trim the now-redundant Request->Status setting from tons of CSR_API functions. - CsrCreateProcess: Don't set shutdown parameters again - already set in CsrCreateProcessData. svn path=/trunk/; revision=35049 --- reactos/subsystems/win32/csrss/api/handle.c | 21 +- reactos/subsystems/win32/csrss/api/process.c | 79 +---- reactos/subsystems/win32/csrss/api/user.c | 10 +- reactos/subsystems/win32/csrss/api/wapi.c | 18 +- .../subsystems/win32/csrss/win32csr/alias.c | 67 ++-- .../subsystems/win32/csrss/win32csr/conio.c | 298 ++++++++---------- .../win32/csrss/win32csr/desktopbg.c | 34 +- .../subsystems/win32/csrss/win32csr/exitros.c | 32 +- 8 files changed, 193 insertions(+), 366 deletions(-) diff --git a/reactos/subsystems/win32/csrss/api/handle.c b/reactos/subsystems/win32/csrss/api/handle.c index 6b468fd5950..5a9efda16ff 100644 --- a/reactos/subsystems/win32/csrss/api/handle.c +++ b/reactos/subsystems/win32/csrss/api/handle.c @@ -66,10 +66,6 @@ NTSTATUS STDCALL CsrGetObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle, O ULONG h = (ULONG)Handle >> 2; DPRINT("CsrGetObject, Object: %x, %x, %x\n", Object, Handle, ProcessData ? ProcessData->HandleTableSize : 0); - if (ProcessData == NULL) - { - return STATUS_INVALID_PARAMETER; - } RtlEnterCriticalSection(&ProcessData->HandleTableLock); if (!CsrIsConsoleHandle(Handle) || h >= ProcessData->HandleTableSize || (*Object = ProcessData->HandleTable[h].Object) == NULL @@ -117,10 +113,6 @@ CsrReleaseObject(PCSRSS_PROCESS_DATA ProcessData, ULONG h = (ULONG)Handle >> 2; Object_t *Object; - if (ProcessData == NULL) - { - return STATUS_INVALID_PARAMETER; - } RtlEnterCriticalSection(&ProcessData->HandleTableLock); if (h >= ProcessData->HandleTableSize || (Object = ProcessData->HandleTable[h].Object) == NULL) @@ -143,11 +135,6 @@ NTSTATUS STDCALL CsrInsertObject(PCSRSS_PROCESS_DATA ProcessData, ULONG i; PVOID* Block; - if (ProcessData == NULL) - { - return STATUS_INVALID_PARAMETER; - } - RtlEnterCriticalSection(&ProcessData->HandleTableLock); for (i = 0; i < ProcessData->HandleTableSize; i++) @@ -188,9 +175,7 @@ NTSTATUS STDCALL CsrDuplicateHandleTable(PCSRSS_PROCESS_DATA SourceProcessData, { ULONG i; - if (SourceProcessData == NULL || - TargetProcessData == NULL || - TargetProcessData->HandleTableSize) + if (TargetProcessData->HandleTableSize) { return STATUS_INVALID_PARAMETER; } @@ -225,10 +210,6 @@ NTSTATUS STDCALL CsrVerifyObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle { ULONG h = (ULONG)Handle >> 2; - if (ProcessData == NULL) - { - return STATUS_INVALID_PARAMETER; - } if (h >= ProcessData->HandleTableSize || ProcessData->HandleTable[h].Object == NULL) { diff --git a/reactos/subsystems/win32/csrss/api/process.c b/reactos/subsystems/win32/csrss/api/process.c index 1c439fc8ab3..b3d954d9e95 100644 --- a/reactos/subsystems/win32/csrss/api/process.c +++ b/reactos/subsystems/win32/csrss/api/process.c @@ -228,7 +228,6 @@ CSR_API(CsrCreateProcess) NewProcessData = CsrCreateProcessData(Request->Data.CreateProcessRequest.NewProcessId); if (NewProcessData == NULL) { - Request->Status = STATUS_NO_MEMORY; return(STATUS_NO_MEMORY); } @@ -251,11 +250,6 @@ CSR_API(CsrCreateProcess) NewProcessData->ProcessGroup = ProcessData->ProcessGroup; } - /* Set default shutdown parameters */ - NewProcessData->ShutdownLevel = 0x280; - NewProcessData->ShutdownFlags = 0; - - Request->Status = STATUS_SUCCESS; return(STATUS_SUCCESS); } @@ -264,13 +258,7 @@ CSR_API(CsrTerminateProcess) Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if (ProcessData == NULL) - { - return(Request->Status = STATUS_INVALID_PARAMETER); - } - ProcessData->Terminated = TRUE; - Request->Status = STATUS_SUCCESS; return STATUS_SUCCESS; } @@ -279,8 +267,6 @@ CSR_API(CsrConnectProcess) Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Request->Status = STATUS_SUCCESS; - return(STATUS_SUCCESS); } @@ -289,16 +275,9 @@ CSR_API(CsrGetShutdownParameters) Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if (ProcessData == NULL) - { - return(Request->Status = STATUS_INVALID_PARAMETER); - } - Request->Data.GetShutdownParametersRequest.Level = ProcessData->ShutdownLevel; Request->Data.GetShutdownParametersRequest.Flags = ProcessData->ShutdownFlags; - Request->Status = STATUS_SUCCESS; - return(STATUS_SUCCESS); } @@ -307,16 +286,9 @@ CSR_API(CsrSetShutdownParameters) Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if (ProcessData == NULL) - { - return(Request->Status = STATUS_INVALID_PARAMETER); - } - ProcessData->ShutdownLevel = Request->Data.SetShutdownParametersRequest.Level; ProcessData->ShutdownFlags = Request->Data.SetShutdownParametersRequest.Flags; - Request->Status = STATUS_SUCCESS; - return(STATUS_SUCCESS); } @@ -325,12 +297,7 @@ CSR_API(CsrGetInputHandle) Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if (ProcessData == NULL) - { - Request->Data.GetInputHandleRequest.InputHandle = INVALID_HANDLE_VALUE; - Request->Status = STATUS_INVALID_PARAMETER; - } - else if (ProcessData->Console) + if (ProcessData->Console) { Request->Status = CsrInsertObject(ProcessData, &Request->Data.GetInputHandleRequest.InputHandle, @@ -352,12 +319,7 @@ CSR_API(CsrGetOutputHandle) Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if (ProcessData == NULL) - { - Request->Data.GetOutputHandleRequest.OutputHandle = INVALID_HANDLE_VALUE; - Request->Status = STATUS_INVALID_PARAMETER; - } - else if (ProcessData->Console) + if (ProcessData->Console) { RtlEnterCriticalSection(&ProcessDataLock); Request->Status = CsrInsertObject(ProcessData, @@ -381,15 +343,7 @@ CSR_API(CsrCloseHandle) Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if (ProcessData == NULL) - { - Request->Status = STATUS_INVALID_PARAMETER; - } - else - { - Request->Status = CsrReleaseObject(ProcessData, Request->Data.CloseHandleRequest.Handle); - } - return Request->Status; + return CsrReleaseObject(ProcessData, Request->Data.CloseHandleRequest.Handle); } CSR_API(CsrVerifyHandle) @@ -415,22 +369,14 @@ CSR_API(CsrDuplicateHandle) Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if (NULL == ProcessData) - { - DPRINT1("Invalid source process\n"); - Request->Status = STATUS_INVALID_PARAMETER; - return Request->Status; - } - Index = (ULONG)Request->Data.DuplicateHandleRequest.Handle >> 2; RtlEnterCriticalSection(&ProcessData->HandleTableLock); if (Index >= ProcessData->HandleTableSize || (Entry = &ProcessData->HandleTable[Index])->Object == NULL) { DPRINT1("Couldn't dup invalid handle %p\n", Request->Data.DuplicateHandleRequest.Handle); - Request->Status = STATUS_INVALID_HANDLE; RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - return Request->Status; + return STATUS_INVALID_HANDLE; } if (Request->Data.DuplicateHandleRequest.Options & DUPLICATE_SAME_ACCESS) @@ -445,9 +391,8 @@ CSR_API(CsrDuplicateHandle) { DPRINT1("Handle %p only has access %X; requested %X\n", Request->Data.DuplicateHandleRequest.Handle, Entry->Access, DesiredAccess); - Request->Status = STATUS_INVALID_PARAMETER; RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - return Request->Status; + return STATUS_INVALID_PARAMETER; } } @@ -473,18 +418,8 @@ CSR_API(CsrGetInputWaitHandle) Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if (ProcessData == NULL) - { - - Request->Data.GetConsoleInputWaitHandle.InputWaitHandle = INVALID_HANDLE_VALUE; - Request->Status = STATUS_INVALID_PARAMETER; - } - else - { - Request->Data.GetConsoleInputWaitHandle.InputWaitHandle = ProcessData->ConsoleEvent; - Request->Status = STATUS_SUCCESS; - } - return Request->Status; + Request->Data.GetConsoleInputWaitHandle.InputWaitHandle = ProcessData->ConsoleEvent; + return STATUS_SUCCESS; } /* EOF */ diff --git a/reactos/subsystems/win32/csrss/api/user.c b/reactos/subsystems/win32/csrss/api/user.c index cb9724fda80..de963da0a9a 100644 --- a/reactos/subsystems/win32/csrss/api/user.c +++ b/reactos/subsystems/win32/csrss/api/user.c @@ -26,26 +26,20 @@ static ULONG ServicesProcessId; CSR_API(CsrRegisterServicesProcess) { - NTSTATUS Status; - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); if (ServicesProcessIdValid == TRUE) { /* Only accept a single call */ - Status = STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PARAMETER; } else { ServicesProcessId = (ULONG)Request->Data.RegisterServicesProcessRequest.ProcessId; ServicesProcessIdValid = TRUE; - Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } - - Request->Status = Status; - - return(Status); } /* EOF */ diff --git a/reactos/subsystems/win32/csrss/api/wapi.c b/reactos/subsystems/win32/csrss/api/wapi.c index bd1c365c5fb..1261bc79b09 100644 --- a/reactos/subsystems/win32/csrss/api/wapi.c +++ b/reactos/subsystems/win32/csrss/api/wapi.c @@ -70,7 +70,6 @@ FASTCALL CsrApiCallHandler(PCSRSS_PROCESS_DATA ProcessData, PCSR_API_MESSAGE Request) { - BOOL Found = FALSE; unsigned DefIndex; ULONG Type; @@ -79,7 +78,7 @@ CsrApiCallHandler(PCSRSS_PROCESS_DATA ProcessData, DPRINT("CSR: API Number: %x ServerID: %x\n",Type, Request->Type >> 16); /* FIXME: Extract DefIndex instead of looping */ - for (DefIndex = 0; ! Found && DefIndex < ApiDefinitionsCount; DefIndex++) + for (DefIndex = 0; DefIndex < ApiDefinitionsCount; DefIndex++) { if (ApiDefinitions[DefIndex].Type == Type) { @@ -92,18 +91,15 @@ CsrApiCallHandler(PCSRSS_PROCESS_DATA ProcessData, } else { - (ApiDefinitions[DefIndex].Handler)(ProcessData, Request); - Found = TRUE; + Request->Status = (ApiDefinitions[DefIndex].Handler)(ProcessData, Request); } + return; } } - if (! Found) - { - DPRINT1("CSR: Unknown request type 0x%x\n", Request->Type); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Request->Status = STATUS_INVALID_SYSTEM_SERVICE; - } + DPRINT1("CSR: Unknown request type 0x%x\n", Request->Type); + Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); + Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); + Request->Status = STATUS_INVALID_SYSTEM_SERVICE; } BOOL diff --git a/reactos/subsystems/win32/csrss/win32csr/alias.c b/reactos/subsystems/win32/csrss/win32csr/alias.c index 8b3254bc66b..79d927fdcd9 100644 --- a/reactos/subsystems/win32/csrss/win32csr/alias.c +++ b/reactos/subsystems/win32/csrss/win32csr/alias.c @@ -312,8 +312,7 @@ CSR_API(CsrAddConsoleAlias) if (lpExeName == NULL || lpSource == NULL) { - Request->Status = STATUS_INVALID_PARAMETER; - return Request->Status; + return STATUS_INVALID_PARAMETER; } Request->Status = ConioConsoleFromProcessData(ProcessData, &Console); @@ -328,9 +327,8 @@ CSR_API(CsrAddConsoleAlias) Header = IntCreateAliasHeader(lpExeName); if (!Header) { - Request->Status = STATUS_INSUFFICIENT_RESOURCES; ConioUnlockConsole(Console); - return Request->Status; + return STATUS_INSUFFICIENT_RESOURCES; } IntInsertAliasHeader(&Console->Aliases, Header); } @@ -355,15 +353,13 @@ CSR_API(CsrAddConsoleAlias) if (!Entry) { - Request->Status = STATUS_INSUFFICIENT_RESOURCES; ConioUnlockConsole(Console); - return Request->Status; + return STATUS_INSUFFICIENT_RESOURCES; } IntInsertAliasEntry(Header, Entry); - Request->Status = STATUS_SUCCESS; ConioUnlockConsole(Console); - return Request->Status; + return STATUS_SUCCESS; } CSR_API(CsrGetConsoleAlias) @@ -387,8 +383,7 @@ CSR_API(CsrGetConsoleAlias) if (Request->Data.GetConsoleAlias.ExeLength == 0 || lpTarget == NULL || Request->Data.GetConsoleAlias.TargetBufferLength == 0 || Request->Data.GetConsoleAlias.SourceLength == 0) { - Request->Status = STATUS_INVALID_PARAMETER; - return Request->Status; + return STATUS_INVALID_PARAMETER; } Request->Status = ConioConsoleFromProcessData(ProcessData, &Console); @@ -400,39 +395,34 @@ CSR_API(CsrGetConsoleAlias) Header = IntFindAliasHeader(Console->Aliases, lpExeName); if (!Header) { - Request->Status = STATUS_INVALID_PARAMETER; ConioUnlockConsole(Console); - return Request->Status; + return STATUS_INVALID_PARAMETER; } Entry = IntGetAliasEntry(Header, lpSource); if (!Entry) { - Request->Status = STATUS_INVALID_PARAMETER; ConioUnlockConsole(Console); - return Request->Status; + return STATUS_INVALID_PARAMETER; } Length = (wcslen(Entry->lpTarget)+1) * sizeof(WCHAR); if (Length > Request->Data.GetConsoleAlias.TargetBufferLength) { - Request->Status = STATUS_BUFFER_TOO_SMALL; ConioUnlockConsole(Console); - return Request->Status; + return STATUS_BUFFER_TOO_SMALL; } if (!ValidateBuffer(ProcessData, lpTarget, Request->Data.GetConsoleAlias.TargetBufferLength)) { - Request->Status = STATUS_ACCESS_VIOLATION; ConioUnlockConsole(Console); - return Request->Status; + return STATUS_ACCESS_VIOLATION; } wcscpy(lpTarget, Entry->lpTarget); Request->Data.GetConsoleAlias.BytesWritten = Length; - Request->Status = STATUS_SUCCESS; ConioUnlockConsole(Console); - return Request->Status; + return STATUS_SUCCESS; } CSR_API(CsrGetAllConsoleAliases) @@ -443,8 +433,7 @@ CSR_API(CsrGetAllConsoleAliases) if (Request->Data.GetAllConsoleAlias.lpExeName == NULL) { - Request->Status = STATUS_INVALID_PARAMETER; - return Request->Status; + return STATUS_INVALID_PARAMETER; } Request->Status = ConioConsoleFromProcessData(ProcessData, &Console); @@ -456,25 +445,22 @@ CSR_API(CsrGetAllConsoleAliases) Header = IntFindAliasHeader(Console->Aliases, Request->Data.GetAllConsoleAlias.lpExeName); if (!Header) { - Request->Status = STATUS_INVALID_PARAMETER; ConioUnlockConsole(Console); - return Request->Status; + return STATUS_INVALID_PARAMETER; } if (IntGetAllConsoleAliasesLength(Header) > Request->Data.GetAllConsoleAlias.AliasBufferLength) { - Request->Status = STATUS_BUFFER_OVERFLOW; ConioUnlockConsole(Console); - return Request->Status; + return STATUS_BUFFER_OVERFLOW; } if (!ValidateBuffer(ProcessData, Request->Data.GetAllConsoleAlias.AliasBuffer, Request->Data.GetAllConsoleAlias.AliasBufferLength)) { - Request->Status = STATUS_ACCESS_VIOLATION; ConioUnlockConsole(Console); - return Request->Status; + return STATUS_ACCESS_VIOLATION; } BytesWritten = IntGetAllConsoleAliases(Header, @@ -482,9 +468,8 @@ CSR_API(CsrGetAllConsoleAliases) Request->Data.GetAllConsoleAlias.AliasBufferLength); Request->Data.GetAllConsoleAlias.BytesWritten = BytesWritten; - Request->Status = STATUS_SUCCESS; ConioUnlockConsole(Console); - return Request->Status; + return STATUS_SUCCESS; } CSR_API(CsrGetAllConsoleAliasesLength) @@ -495,8 +480,7 @@ CSR_API(CsrGetAllConsoleAliasesLength) if (Request->Data.GetAllConsoleAliasesLength.lpExeName == NULL) { - Request->Status = STATUS_INVALID_PARAMETER; - return Request->Status; + return STATUS_INVALID_PARAMETER; } Request->Status = ConioConsoleFromProcessData(ProcessData, &Console); @@ -508,17 +492,14 @@ CSR_API(CsrGetAllConsoleAliasesLength) Header = IntFindAliasHeader(Console->Aliases, Request->Data.GetAllConsoleAliasesLength.lpExeName); if (!Header) { - Request->Status = STATUS_INVALID_PARAMETER; ConioUnlockConsole(Console); - return Request->Status; + return STATUS_INVALID_PARAMETER; } Length = IntGetAllConsoleAliasesLength(Header); Request->Data.GetAllConsoleAliasesLength.Length = Length; - Request->Status = STATUS_SUCCESS; ConioUnlockConsole(Console); - return Request->Status; - + return STATUS_SUCCESS; } CSR_API(CsrGetConsoleAliasesExes) @@ -539,25 +520,22 @@ CSR_API(CsrGetConsoleAliasesExes) if (ExesLength > Request->Data.GetConsoleAliasesExes.Length) { - Request->Status = STATUS_BUFFER_OVERFLOW; ConioUnlockConsole(Console); - return Request->Status; + return STATUS_BUFFER_OVERFLOW; } if (Request->Data.GetConsoleAliasesExes.ExeNames == NULL) { - Request->Status = STATUS_INVALID_PARAMETER; ConioUnlockConsole(Console); - return Request->Status; + return STATUS_INVALID_PARAMETER; } if (!ValidateBuffer(ProcessData, Request->Data.GetConsoleAliasesExes.ExeNames, Request->Data.GetConsoleAliasesExes.Length)) { - Request->Status = STATUS_ACCESS_VIOLATION; ConioUnlockConsole(Console); - return Request->Status; + return STATUS_ACCESS_VIOLATION; } BytesWritten = IntGetConsoleAliasesExes(Console->Aliases, @@ -565,9 +543,8 @@ CSR_API(CsrGetConsoleAliasesExes) Request->Data.GetConsoleAliasesExes.Length); Request->Data.GetConsoleAliasesExes.BytesWritten = BytesWritten; - Request->Status = STATUS_SUCCESS; ConioUnlockConsole(Console); - return Request->Status; + return STATUS_SUCCESS; } CSR_API(CsrGetConsoleAliasesExesLength) diff --git a/reactos/subsystems/win32/csrss/win32csr/conio.c b/reactos/subsystems/win32/csrss/win32csr/conio.c index d1a7d222ac4..19223ad0c20 100644 --- a/reactos/subsystems/win32/csrss/win32csr/conio.c +++ b/reactos/subsystems/win32/csrss/win32csr/conio.c @@ -245,22 +245,12 @@ CSR_API(CsrAllocConsole) Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if (ProcessData == NULL) - { - DPRINT1("No process data\n"); - return Request->Status = STATUS_INVALID_PARAMETER; - } - if (ProcessData->Console) { DPRINT1("Process already has a console\n"); - Request->Status = STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER; } - /* Assume success */ - Request->Status = STATUS_SUCCESS; - /* If we don't need a console, then get out of here */ if (!Request->Data.AllocConsoleRequest.ConsoleNeeded) { @@ -278,7 +268,6 @@ CSR_API(CsrAllocConsole) if (NULL == Console) { DPRINT1("Not enough memory for console\n"); - Request->Status = STATUS_NO_MEMORY; return STATUS_NO_MEMORY; } /* initialize list head */ @@ -286,12 +275,12 @@ CSR_API(CsrAllocConsole) /* insert process data required for GUI initialization */ InsertHeadList(&Console->ProcessList, &ProcessData->ProcessEntry); /* Initialize the Console */ - Request->Status = CsrInitConsole(Console); - if (!NT_SUCCESS(Request->Status)) + Status = CsrInitConsole(Console); + if (!NT_SUCCESS(Status)) { DPRINT1("Console init failed\n"); HeapFree(Win32CsrApiHeap, 0, Console); - return Request->Status; + return Status; } } else @@ -322,7 +311,7 @@ CSR_API(CsrAllocConsole) DPRINT1("Failed to insert object\n"); ConioDeleteConsole((Object_t *) Console); ProcessData->Console = 0; - return Request->Status = Status; + return Status; } Status = Win32CsrInsertObject(ProcessData, @@ -337,7 +326,7 @@ CSR_API(CsrAllocConsole) Win32CsrReleaseObject(ProcessData, Request->Data.AllocConsoleRequest.InputHandle); ProcessData->Console = 0; - return Request->Status = Status; + return Status; } } @@ -360,7 +349,7 @@ CSR_API(CsrAllocConsole) Request->Data.AllocConsoleRequest.InputHandle); } ProcessData->Console = 0; - return Request->Status = Status; + return Status; } /* Set the Ctrl Dispatcher */ @@ -384,9 +373,9 @@ CSR_API(CsrFreeConsole) Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if (ProcessData == NULL || ProcessData->Console == NULL) + if (ProcessData->Console == NULL) { - return Request->Status = STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PARAMETER; } Console = ProcessData->Console; @@ -576,7 +565,7 @@ CSR_API(CsrReadConsole) &Console, GENERIC_READ); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Request->Data.ReadConsoleRequest.EventHandle = ProcessData->ConsoleEvent; for (i = 0; i < nNumberOfCharsToRead && Console->InputEvents.Flink != &Console->InputEvents; i++) @@ -619,7 +608,6 @@ CSR_API(CsrReadConsole) ConioUnlockConsole(Console); HeapFree(Win32CsrApiHeap, 0, Input); Request->Data.ReadConsoleRequest.NrCharactersRead = 0; - Request->Status = STATUS_NOTIFY_CLEANUP; return STATUS_NOTIFY_CLEANUP; } @@ -653,27 +641,27 @@ CSR_API(CsrReadConsole) Request->Data.ReadConsoleRequest.NrCharactersRead = i; if (0 == i) { - Request->Status = STATUS_PENDING; /* we didn't read anything */ + Status = STATUS_PENDING; /* we didn't read anything */ } else if (0 != (Console->Mode & ENABLE_LINE_INPUT)) { if (0 == Console->WaitingLines || (Request->Data.ReadConsoleRequest.Unicode ? (L'\n' != UnicodeBuffer[i - 1]) : ('\n' != Buffer[i - 1]))) { - Request->Status = STATUS_PENDING; /* line buffered, didn't get a complete line */ + Status = STATUS_PENDING; /* line buffered, didn't get a complete line */ } else { Console->WaitingLines--; - Request->Status = STATUS_SUCCESS; /* line buffered, did get a complete line */ + Status = STATUS_SUCCESS; /* line buffered, did get a complete line */ } } else { - Request->Status = STATUS_SUCCESS; /* not line buffered, did read something */ + Status = STATUS_SUCCESS; /* not line buffered, did read something */ } - if (Request->Status == STATUS_PENDING) + if (Status == STATUS_PENDING) { Console->EchoCount = nNumberOfCharsToRead - i; } @@ -690,7 +678,7 @@ CSR_API(CsrReadConsole) Request->Header.u1.s1.DataLength = Request->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); } - return Request->Status; + return Status; } BOOLEAN __inline ConioGetIntersection( @@ -846,7 +834,7 @@ CSR_API(CsrWriteConsole) DPRINT1("Invalid request size\n"); Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - return Request->Status = STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PARAMETER; } Status = ConioConsoleFromProcessData(ProcessData, &Console); @@ -855,7 +843,7 @@ CSR_API(CsrWriteConsole) if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } if(Request->Data.WriteConsoleRequest.Unicode) @@ -887,8 +875,8 @@ CSR_API(CsrWriteConsole) Status = ConioLockScreenBuffer(ProcessData, Request->Data.WriteConsoleRequest.ConsoleHandle, &Buff, GENERIC_WRITE); if (NT_SUCCESS(Status)) { - Request->Status = ConioWriteConsole(Console, Buff, Buffer, - Request->Data.WriteConsoleRequest.NrCharactersToWrite, TRUE); + Status = ConioWriteConsole(Console, Buff, Buffer, + Request->Data.WriteConsoleRequest.NrCharactersToWrite, TRUE); if (NT_SUCCESS(Status)) { Written = Request->Data.WriteConsoleRequest.NrCharactersToWrite; @@ -904,7 +892,7 @@ CSR_API(CsrWriteConsole) Request->Data.WriteConsoleRequest.NrCharactersWritten = Written; - return Request->Status = Status; + return Status; } VOID STDCALL @@ -1304,13 +1292,13 @@ CSR_API(CsrGetScreenBufferInfo) Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Status = ConioLockScreenBuffer(ProcessData, Request->Data.ScreenBufferInfoRequest.ConsoleHandle, &Buff, GENERIC_READ); if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); - return Request->Status = Status; + return Status; } pInfo = &Request->Data.ScreenBufferInfoRequest.Info; pInfo->dwSize.X = Buff->MaxX; @@ -1327,9 +1315,7 @@ CSR_API(CsrGetScreenBufferInfo) ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); - Request->Status = STATUS_SUCCESS; - - return Request->Status; + return STATUS_SUCCESS; } CSR_API(CsrSetCursor) @@ -1345,7 +1331,7 @@ CSR_API(CsrSetCursor) Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); @@ -1355,7 +1341,7 @@ CSR_API(CsrSetCursor) if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); - return Request->Status = Status; + return Status; } NewCursorX = Request->Data.SetCursorRequest.Position.X; @@ -1365,7 +1351,7 @@ CSR_API(CsrSetCursor) { ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); - return Request->Status = STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PARAMETER; } OldCursorX = Buff->CurrentX; OldCursorY = Buff->CurrentY; @@ -1377,14 +1363,14 @@ CSR_API(CsrSetCursor) { ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); - return Request->Status = STATUS_UNSUCCESSFUL; + return STATUS_UNSUCCESSFUL; } } ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } static VOID FASTCALL @@ -1435,7 +1421,7 @@ CSR_API(CsrWriteConsoleOutputChar) DPRINT1("Invalid request size\n"); Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - return Request->Status = STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PARAMETER; } Status = ConioConsoleFromProcessData(ProcessData, &Console); @@ -1514,7 +1500,7 @@ CSR_API(CsrWriteConsoleOutputChar) ConioUnlockConsole(Console); } Request->Data.WriteConsoleOutputCharRequest.NrCharactersWritten = Written; - return Request->Status = Status; + return Status; } CSR_API(CsrFillOutputChar) @@ -1535,14 +1521,14 @@ CSR_API(CsrFillOutputChar) Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Status = ConioLockScreenBuffer(ProcessData, Request->Data.FillOutputRequest.ConsoleHandle, &Buff, GENERIC_WRITE); if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); - return Request->Status = Status; + return Status; } X = Request->Data.FillOutputRequest.Position.X; @@ -1580,7 +1566,7 @@ CSR_API(CsrFillOutputChar) ConioUnlockConsole(Console); Length = Request->Data.FillOutputRequest.Length; Request->Data.FillOutputRequest.NrCharactersWritten = Length; - return Request->Status; + return STATUS_SUCCESS; } CSR_API(CsrReadInputEvent) @@ -1600,7 +1586,7 @@ CSR_API(CsrReadInputEvent) Status = ConioLockConsole(ProcessData, Request->Data.ReadInputRequest.ConsoleHandle, &Console, GENERIC_READ); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } /* only get input if there is any */ @@ -1659,7 +1645,7 @@ CSR_API(CsrReadInputEvent) ConioUnlockConsole(Console); - return Request->Status = Status; + return Status; } CSR_API(CsrWriteConsoleOutputAttrib) @@ -1681,7 +1667,7 @@ CSR_API(CsrWriteConsoleOutputAttrib) DPRINT1("Invalid request size\n"); Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - return Request->Status = STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PARAMETER; } Status = ConioConsoleFromProcessData(ProcessData, &Console); @@ -1689,7 +1675,7 @@ CSR_API(CsrWriteConsoleOutputAttrib) Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Status = ConioLockScreenBuffer(ProcessData, @@ -1699,7 +1685,7 @@ CSR_API(CsrWriteConsoleOutputAttrib) if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); - return Request->Status = Status; + return Status; } X = Request->Data.WriteConsoleOutputAttribRequest.Coord.X; @@ -1736,7 +1722,7 @@ CSR_API(CsrWriteConsoleOutputAttrib) ConioUnlockScreenBuffer(Buff); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } CSR_API(CsrFillOutputAttrib) @@ -1754,7 +1740,7 @@ CSR_API(CsrFillOutputAttrib) Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); @@ -1763,7 +1749,7 @@ CSR_API(CsrFillOutputAttrib) if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); - return Request->Status = Status; + return Status; } X = Request->Data.FillOutputAttribRequest.Coord.X; @@ -1796,7 +1782,7 @@ CSR_API(CsrFillOutputAttrib) ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } @@ -1813,13 +1799,13 @@ CSR_API(CsrGetCursorInfo) Status = ConioLockScreenBuffer(ProcessData, Request->Data.GetCursorInfoRequest.ConsoleHandle, &Buff, GENERIC_READ); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Request->Data.GetCursorInfoRequest.Info.bVisible = Buff->CursorInfo.bVisible; Request->Data.GetCursorInfoRequest.Info.dwSize = Buff->CursorInfo.dwSize; ConioUnlockScreenBuffer(Buff); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } CSR_API(CsrSetCursorInfo) @@ -1838,14 +1824,14 @@ CSR_API(CsrSetCursorInfo) Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Status = ConioLockScreenBuffer(ProcessData, Request->Data.SetCursorInfoRequest.ConsoleHandle, &Buff, GENERIC_WRITE); if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); - return Request->Status = Status; + return Status; } Size = Request->Data.SetCursorInfoRequest.Info.dwSize; @@ -1869,14 +1855,14 @@ CSR_API(CsrSetCursorInfo) { ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); - return Request->Status = STATUS_UNSUCCESSFUL; + return STATUS_UNSUCCESSFUL; } } ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } CSR_API(CsrSetTextAttrib) @@ -1890,14 +1876,14 @@ CSR_API(CsrSetTextAttrib) Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Status = ConioLockScreenBuffer(ProcessData, Request->Data.SetCursorRequest.ConsoleHandle, &Buff, GENERIC_WRITE); if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); - return Request->Status = Status; + return Status; } Buff->DefaultAttrib = Request->Data.SetAttribRequest.Attrib; @@ -1907,14 +1893,14 @@ CSR_API(CsrSetTextAttrib) { ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); - return Request->Status = STATUS_UNSUCCESSFUL; + return STATUS_UNSUCCESSFUL; } } ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } CSR_API(CsrSetConsoleMode) @@ -1932,7 +1918,7 @@ CSR_API(CsrSetConsoleMode) (Object_t **) &Console, GENERIC_WRITE); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Buff = (PCSRSS_SCREEN_BUFFER)Console; @@ -1951,7 +1937,7 @@ CSR_API(CsrSetConsoleMode) Win32CsrReleaseObjectByPointer((Object_t *)Console); - return Request->Status = Status; + return Status; } CSR_API(CsrGetConsoleMode) @@ -1968,9 +1954,9 @@ CSR_API(CsrGetConsoleMode) (Object_t **) &Console, GENERIC_READ); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } - Request->Status = STATUS_SUCCESS; + Status = STATUS_SUCCESS; Buff = (PCSRSS_SCREEN_BUFFER) Console; if (CONIO_CONSOLE_MAGIC == Console->Header.Type) { @@ -1982,11 +1968,11 @@ CSR_API(CsrGetConsoleMode) } else { - Request->Status = STATUS_INVALID_HANDLE; + Status = STATUS_INVALID_HANDLE; } Win32CsrReleaseObjectByPointer((Object_t *)Console); - return Request->Status; + return Status; } CSR_API(CsrCreateScreenBuffer) @@ -1997,15 +1983,10 @@ CSR_API(CsrCreateScreenBuffer) DPRINT("CsrCreateScreenBuffer\n"); - if (ProcessData == NULL) - { - return Request->Status = STATUS_INVALID_PARAMETER; - } - Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); @@ -2039,13 +2020,9 @@ CSR_API(CsrCreateScreenBuffer) } Status = CsrInitConsoleScreenBuffer(Console, Buff); - if(! NT_SUCCESS(Status)) + if(NT_SUCCESS(Status)) { - Request->Status = Status; - } - else - { - Request->Status = Win32CsrInsertObject(ProcessData, + Status = Win32CsrInsertObject(ProcessData, &Request->Data.CreateScreenBufferRequest.OutputHandle, &Buff->Header, Request->Data.CreateScreenBufferRequest.Access, @@ -2054,11 +2031,11 @@ CSR_API(CsrCreateScreenBuffer) } else { - Request->Status = STATUS_INSUFFICIENT_RESOURCES; + Status = STATUS_INSUFFICIENT_RESOURCES; } ConioUnlockConsole(Console); - return Request->Status; + return Status; } CSR_API(CsrSetScreenBuffer) @@ -2072,7 +2049,7 @@ CSR_API(CsrSetScreenBuffer) Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); @@ -2082,14 +2059,14 @@ CSR_API(CsrSetScreenBuffer) if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); - return Request->Status = Status; + return Status; } if (Buff == Console->ActiveBuffer) { ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } /* drop reference to old buffer, maybe delete */ @@ -2107,7 +2084,7 @@ CSR_API(CsrSetScreenBuffer) ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } CSR_API(CsrSetTitle) @@ -2125,17 +2102,13 @@ CSR_API(CsrSetTitle) DPRINT1("Invalid request size\n"); Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - return Request->Status = STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PARAMETER; } Status = ConioConsoleFromProcessData(ProcessData, &Console); Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if(! NT_SUCCESS(Status)) - { - Request->Status = Status; - } - else + if(NT_SUCCESS(Status)) { Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, Request->Data.SetTitleRequest.Length); if (Buffer) @@ -2147,21 +2120,21 @@ CSR_API(CsrSetTitle) memcpy(Console->Title.Buffer, Request->Data.SetTitleRequest.Title, Console->Title.Length); if (! ConioChangeTitle(Console)) { - Request->Status = STATUS_UNSUCCESSFUL; + Status = STATUS_UNSUCCESSFUL; } else { - Request->Status = STATUS_SUCCESS; + Status = STATUS_SUCCESS; } } else { - Request->Status = STATUS_NO_MEMORY; + Status = STATUS_NO_MEMORY; } ConioUnlockConsole(Console); } - return Request->Status; + return Status; } CSR_API(CsrGetTitle) @@ -2178,7 +2151,7 @@ CSR_API(CsrGetTitle) if (! NT_SUCCESS(Status)) { DPRINT1("Can't get console\n"); - return Request->Status = Status; + return Status; } /* Copy title of the console to the user title buffer */ @@ -2195,9 +2168,7 @@ CSR_API(CsrGetTitle) Request->Header.u1.s1.TotalLength = Length; Request->Header.u1.s1.DataLength = Length - sizeof(PORT_MESSAGE); } - Request->Status = STATUS_SUCCESS; - - return Request->Status; + return STATUS_SUCCESS; } CSR_API(CsrWriteConsoleOutput) @@ -2220,7 +2191,7 @@ CSR_API(CsrWriteConsoleOutput) Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); @@ -2232,7 +2203,7 @@ CSR_API(CsrWriteConsoleOutput) if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); - return Request->Status = Status; + return Status; } BufferSize = Request->Data.WriteConsoleOutputRequest.BufferSize; @@ -2245,7 +2216,7 @@ CSR_API(CsrWriteConsoleOutput) { ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); - return Request->Status = STATUS_ACCESS_VIOLATION; + return STATUS_ACCESS_VIOLATION; } WriteRegion.left = Request->Data.WriteConsoleOutputRequest.WriteRegion.Left; WriteRegion.top = Request->Data.WriteConsoleOutputRequest.WriteRegion.Top; @@ -2266,7 +2237,7 @@ CSR_API(CsrWriteConsoleOutput) /* It is okay to have a WriteRegion completely outside the screen buffer. No data is written then. */ - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } for (i = 0, Y = WriteRegion.top; Y <= WriteRegion.bottom; i++, Y++) @@ -2300,7 +2271,7 @@ CSR_API(CsrWriteConsoleOutput) Request->Data.WriteConsoleOutputRequest.WriteRegion.Left = WriteRegion.left; Request->Data.WriteConsoleOutputRequest.WriteRegion.Top = WriteRegion.top; - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } CSR_API(CsrFlushInputBuffer) @@ -2320,7 +2291,7 @@ CSR_API(CsrFlushInputBuffer) GENERIC_WRITE); if(! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } /* Discard all entries in the input event queue */ @@ -2336,7 +2307,7 @@ CSR_API(CsrFlushInputBuffer) ConioUnlockConsole(Console); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } CSR_API(CsrScrollConsoleScreenBuffer) @@ -2366,7 +2337,7 @@ CSR_API(CsrScrollConsoleScreenBuffer) Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); @@ -2375,7 +2346,7 @@ CSR_API(CsrScrollConsoleScreenBuffer) if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); - return Request->Status = Status; + return Status; } ScrollRectangle.left = Request->Data.ScrollConsoleScreenBufferRequest.ScrollRectangle.Left; @@ -2389,7 +2360,7 @@ CSR_API(CsrScrollConsoleScreenBuffer) { ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } /* If the source was clipped on the left or top, adjust the destination accordingly */ @@ -2412,7 +2383,7 @@ CSR_API(CsrScrollConsoleScreenBuffer) { ConioUnlockConsole(Console); ConioUnlockScreenBuffer(Buff); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } } else @@ -2446,7 +2417,7 @@ CSR_API(CsrScrollConsoleScreenBuffer) ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } CSR_API(CsrReadConsoleOutputChar) @@ -2471,14 +2442,14 @@ CSR_API(CsrReadConsoleOutputChar) Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Status = ConioLockScreenBuffer(ProcessData, Request->Data.ReadConsoleOutputCharRequest.ConsoleHandle, &Buff, GENERIC_READ); if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); - return Request->Status = Status; + return Status; } Xpos = Request->Data.ReadConsoleOutputCharRequest.ReadCoord.X; @@ -2511,7 +2482,6 @@ CSR_API(CsrReadConsoleOutputChar) } *ReadBuffer = 0; - Request->Status = STATUS_SUCCESS; Request->Data.ReadConsoleOutputCharRequest.EndCoord.X = Xpos; Request->Data.ReadConsoleOutputCharRequest.EndCoord.Y = (Ypos - Buff->VirtualY + Buff->MaxY) % Buff->MaxY; @@ -2525,7 +2495,7 @@ CSR_API(CsrReadConsoleOutputChar) Request->Header.u1.s1.DataLength = Request->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); } - return Request->Status; + return STATUS_SUCCESS; } @@ -2547,7 +2517,7 @@ CSR_API(CsrReadConsoleOutputAttrib) Status = ConioLockScreenBuffer(ProcessData, Request->Data.ReadConsoleOutputAttribRequest.ConsoleHandle, &Buff, GENERIC_READ); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Xpos = Request->Data.ReadConsoleOutputAttribRequest.ReadCoord.X; @@ -2574,7 +2544,6 @@ CSR_API(CsrReadConsoleOutputAttrib) *ReadBuffer = 0; - Request->Status = STATUS_SUCCESS; Request->Data.ReadConsoleOutputAttribRequest.EndCoord.X = Xpos; Request->Data.ReadConsoleOutputAttribRequest.EndCoord.Y = (Ypos - Buff->VirtualY + Buff->MaxY) % Buff->MaxY; @@ -2588,7 +2557,7 @@ CSR_API(CsrReadConsoleOutputAttrib) Request->Header.u1.s1.DataLength = CurrentLength - sizeof(PORT_MESSAGE); } - return Request->Status; + return STATUS_SUCCESS; } @@ -2608,7 +2577,7 @@ CSR_API(CsrGetNumberOfConsoleInputEvents) Status = ConioLockConsole(ProcessData, Request->Data.GetNumInputEventsRequest.ConsoleHandle, &Console, GENERIC_READ); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } CurrentItem = Console->InputEvents.Flink; @@ -2627,10 +2596,9 @@ CSR_API(CsrGetNumberOfConsoleInputEvents) ConioUnlockConsole(Console); - Request->Status = STATUS_SUCCESS; Request->Data.GetNumInputEventsRequest.NumInputEvents = NumEvents; - return Request->Status; + return STATUS_SUCCESS; } @@ -2653,7 +2621,7 @@ CSR_API(CsrPeekConsoleInput) Status = ConioLockConsole(ProcessData, Request->Data.GetNumInputEventsRequest.ConsoleHandle, &Console, GENERIC_READ); if(! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } InputRecord = Request->Data.PeekConsoleInputRequest.InputRecord; @@ -2664,8 +2632,7 @@ CSR_API(CsrPeekConsoleInput) || (((ULONG_PTR)InputRecord + Size) > ((ULONG_PTR)ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize))) { ConioUnlockConsole(Console); - Request->Status = STATUS_ACCESS_VIOLATION; - return Request->Status ; + return STATUS_ACCESS_VIOLATION; } NumItems = 0; @@ -2699,10 +2666,9 @@ CSR_API(CsrPeekConsoleInput) ConioUnlockConsole(Console); - Request->Status = STATUS_SUCCESS; Request->Data.PeekConsoleInputRequest.Length = NumItems; - return Request->Status; + return STATUS_SUCCESS; } @@ -2732,7 +2698,7 @@ CSR_API(CsrReadConsoleOutput) Status = ConioLockScreenBuffer(ProcessData, Request->Data.ReadConsoleOutputRequest.ConsoleHandle, &Buff, GENERIC_READ); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } CharInfo = Request->Data.ReadConsoleOutputRequest.CharInfo; @@ -2752,8 +2718,7 @@ CSR_API(CsrReadConsoleOutput) || (((ULONG_PTR)CharInfo + Size) > ((ULONG_PTR)ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize))) { ConioUnlockScreenBuffer(Buff); - Request->Status = STATUS_ACCESS_VIOLATION; - return Request->Status ; + return STATUS_ACCESS_VIOLATION; } SizeY = min(BufferSize.Y - BufferCoord.Y, ConioRectHeight(&ReadRegion)); @@ -2765,8 +2730,7 @@ CSR_API(CsrReadConsoleOutput) if (! ConioGetIntersection(&ReadRegion, &ScreenRect, &ReadRegion)) { ConioUnlockScreenBuffer(Buff); - Request->Status = STATUS_SUCCESS; - return Request->Status; + return STATUS_SUCCESS; } for (i = 0, Y = ReadRegion.top; Y < ReadRegion.bottom; ++i, ++Y) @@ -2793,13 +2757,12 @@ CSR_API(CsrReadConsoleOutput) ConioUnlockScreenBuffer(Buff); - Request->Status = STATUS_SUCCESS; Request->Data.ReadConsoleOutputRequest.ReadRegion.Right = ReadRegion.left + SizeX - 1; Request->Data.ReadConsoleOutputRequest.ReadRegion.Bottom = ReadRegion.top + SizeY - 1; Request->Data.ReadConsoleOutputRequest.ReadRegion.Left = ReadRegion.left; Request->Data.ReadConsoleOutputRequest.ReadRegion.Top = ReadRegion.top; - return Request->Status; + return STATUS_SUCCESS; } @@ -2821,7 +2784,7 @@ CSR_API(CsrWriteConsoleInput) Status = ConioLockConsole(ProcessData, Request->Data.WriteConsoleInputRequest.ConsoleHandle, &Console, GENERIC_WRITE); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } InputRecord = Request->Data.WriteConsoleInputRequest.InputRecord; @@ -2832,8 +2795,7 @@ CSR_API(CsrWriteConsoleInput) || (((ULONG_PTR)InputRecord + Size) > ((ULONG_PTR)ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize))) { ConioUnlockConsole(Console); - Request->Status = STATUS_ACCESS_VIOLATION; - return Request->Status ; + return STATUS_ACCESS_VIOLATION; } for (i = 0; i < Length; i++) @@ -2842,8 +2804,7 @@ CSR_API(CsrWriteConsoleInput) if (NULL == Record) { ConioUnlockConsole(Console); - Request->Status = STATUS_INSUFFICIENT_RESOURCES; - return Request->Status; + return STATUS_INSUFFICIENT_RESOURCES; } Record->Echoed = FALSE; @@ -2859,10 +2820,9 @@ CSR_API(CsrWriteConsoleInput) ConioUnlockConsole(Console); - Request->Status = STATUS_SUCCESS; Request->Data.WriteConsoleInputRequest.Length = i; - return Request->Status; + return STATUS_SUCCESS; } /********************************************************************** @@ -2917,7 +2877,7 @@ CSR_API(CsrHardwareStateProperty) if (! NT_SUCCESS(Status)) { DPRINT1("Failed to get console handle in SetConsoleHardwareState\n"); - return Request->Status = Status; + return Status; } switch (Request->Data.ConsoleHardwareStateRequest.SetGet) @@ -2928,17 +2888,17 @@ CSR_API(CsrHardwareStateProperty) case CONSOLE_HARDWARE_STATE_SET: DPRINT("Setting console hardware state.\n"); - Request->Status = SetConsoleHardwareState(Console, Request->Data.ConsoleHardwareStateRequest.State); + Status = SetConsoleHardwareState(Console, Request->Data.ConsoleHardwareStateRequest.State); break; default: - Request->Status = STATUS_INVALID_PARAMETER_2; /* Client: (handle, [set_get], mode) */ + Status = STATUS_INVALID_PARAMETER_2; /* Client: (handle, [set_get], mode) */ break; } ConioUnlockConsole(Console); - return Request->Status; + return Status; } CSR_API(CsrGetConsoleWindow) @@ -2954,13 +2914,13 @@ CSR_API(CsrGetConsoleWindow) Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Request->Data.GetConsoleWindowRequest.WindowHandle = Console->hWindow; ConioUnlockConsole(Console); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } CSR_API(CsrSetConsoleIcon) @@ -2976,14 +2936,14 @@ CSR_API(CsrSetConsoleIcon) Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } - Request->Status = (ConioChangeIcon(Console, Request->Data.SetConsoleIconRequest.WindowIcon) - ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); + Status = (ConioChangeIcon(Console, Request->Data.SetConsoleIconRequest.WindowIcon) + ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); ConioUnlockConsole(Console); - return Request->Status; + return Status; } CSR_API(CsrGetConsoleCodePage) @@ -2996,14 +2956,14 @@ CSR_API(CsrGetConsoleCodePage) Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Request->Data.GetConsoleCodePage.CodePage = Console->CodePage; ConioUnlockConsole(Console); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } CSR_API(CsrSetConsoleCodePage) @@ -3016,7 +2976,7 @@ CSR_API(CsrSetConsoleCodePage) Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); @@ -3025,10 +2985,10 @@ CSR_API(CsrSetConsoleCodePage) { Console->CodePage = Request->Data.SetConsoleCodePage.CodePage; ConioUnlockConsole(Console); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } ConioUnlockConsole(Console); - return Request->Status = STATUS_UNSUCCESSFUL; + return STATUS_UNSUCCESSFUL; } CSR_API(CsrGetConsoleOutputCodePage) @@ -3041,14 +3001,14 @@ CSR_API(CsrGetConsoleOutputCodePage) Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Request->Data.GetConsoleOutputCodePage.CodePage = Console->OutputCodePage; ConioUnlockConsole(Console); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } CSR_API(CsrSetConsoleOutputCodePage) @@ -3061,7 +3021,7 @@ CSR_API(CsrSetConsoleOutputCodePage) Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); @@ -3070,10 +3030,10 @@ CSR_API(CsrSetConsoleOutputCodePage) { Console->OutputCodePage = Request->Data.SetConsoleOutputCodePage.CodePage; ConioUnlockConsole(Console); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } ConioUnlockConsole(Console); - return Request->Status = STATUS_UNSUCCESSFUL; + return STATUS_UNSUCCESSFUL; } CSR_API(CsrGetProcessList) @@ -3098,7 +3058,7 @@ CSR_API(CsrGetProcessList) Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } DPRINT1("Console_Api Ctrl-C\n"); @@ -3126,7 +3086,7 @@ CSR_API(CsrGetProcessList) Request->Header.u1.s1.TotalLength = Length; Request->Header.u1.s1.DataLength = Length - sizeof(PORT_MESSAGE); } - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } CSR_API(CsrGenerateCtrlEvent) @@ -3143,7 +3103,7 @@ CSR_API(CsrGenerateCtrlEvent) Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Group = Request->Data.GenerateCtrlEvent.ProcessGroup; @@ -3162,7 +3122,7 @@ CSR_API(CsrGenerateCtrlEvent) ConioUnlockConsole(Console); - return Request->Status = Status; + return Status; } /* EOF */ diff --git a/reactos/subsystems/win32/csrss/win32csr/desktopbg.c b/reactos/subsystems/win32/csrss/win32csr/desktopbg.c index 79efe582a97..a8ddd0ef537 100644 --- a/reactos/subsystems/win32/csrss/win32csr/desktopbg.c +++ b/reactos/subsystems/win32/csrss/win32csr/desktopbg.c @@ -209,7 +209,7 @@ CSR_API(CsrCreateDesktop) BgInitialized = TRUE; if (! DtbgInit()) { - return Request->Status = STATUS_UNSUCCESSFUL; + return STATUS_UNSUCCESSFUL; } } @@ -222,7 +222,7 @@ CSR_API(CsrCreateDesktop) if (NULL == ThreadData.Event) { DPRINT1("Failed to create event (error %d)\n", GetLastError()); - return Request->Status = STATUS_UNSUCCESSFUL; + return STATUS_UNSUCCESSFUL; } ThreadHandle = CreateThread(NULL, 0, @@ -234,16 +234,14 @@ CSR_API(CsrCreateDesktop) { CloseHandle(ThreadData.Event); DPRINT1("Failed to create desktop window thread.\n"); - return Request->Status = STATUS_UNSUCCESSFUL; + return STATUS_UNSUCCESSFUL; } CloseHandle(ThreadHandle); WaitForSingleObject(ThreadData.Event, INFINITE); CloseHandle(ThreadData.Event); - Request->Status = ThreadData.Status; - - return Request->Status; + return ThreadData.Status; } CSR_API(CsrShowDesktop) @@ -261,13 +259,11 @@ CSR_API(CsrShowDesktop) nmh.ShowDesktop.Width = (int)Request->Data.ShowDesktopRequest.Width; nmh.ShowDesktop.Height = (int)Request->Data.ShowDesktopRequest.Height; - Request->Status = SendMessageW(Request->Data.ShowDesktopRequest.DesktopWindow, - WM_NOTIFY, - (WPARAM)nmh.hdr.hwndFrom, - (LPARAM)&nmh) - ? STATUS_UNSUCCESSFUL : STATUS_SUCCESS; - - return Request->Status; + return SendMessageW(Request->Data.ShowDesktopRequest.DesktopWindow, + WM_NOTIFY, + (WPARAM)nmh.hdr.hwndFrom, + (LPARAM)&nmh) + ? STATUS_UNSUCCESSFUL : STATUS_SUCCESS; } CSR_API(CsrHideDesktop) @@ -282,13 +278,11 @@ CSR_API(CsrHideDesktop) nmh.hdr.idFrom = 0; nmh.hdr.code = PM_HIDE_DESKTOP; - Request->Status = SendMessageW(Request->Data.ShowDesktopRequest.DesktopWindow, - WM_NOTIFY, - (WPARAM)nmh.hdr.hwndFrom, - (LPARAM)&nmh) - ? STATUS_UNSUCCESSFUL : STATUS_SUCCESS; - - return Request->Status; + return SendMessageW(Request->Data.ShowDesktopRequest.DesktopWindow, + WM_NOTIFY, + (WPARAM)nmh.hdr.hwndFrom, + (LPARAM)&nmh) + ? STATUS_UNSUCCESSFUL : STATUS_SUCCESS; } BOOL FASTCALL diff --git a/reactos/subsystems/win32/csrss/win32csr/exitros.c b/reactos/subsystems/win32/csrss/win32csr/exitros.c index b13502cfa88..e3dc47a0c81 100644 --- a/reactos/subsystems/win32/csrss/win32csr/exitros.c +++ b/reactos/subsystems/win32/csrss/win32csr/exitros.c @@ -27,8 +27,7 @@ CSR_API(CsrRegisterLogonProcess) { if (0 != LogonProcess) { - Request->Status = STATUS_LOGON_SESSION_EXISTS; - return Request->Status; + return STATUS_LOGON_SESSION_EXISTS; } LogonProcess = Request->Data.RegisterLogonProcessRequest.ProcessId; } @@ -38,15 +37,12 @@ CSR_API(CsrRegisterLogonProcess) { DPRINT1("Current logon process 0x%x, can't deregister from process 0x%x\n", LogonProcess, Request->Header.ClientId.UniqueProcess); - Request->Status = STATUS_NOT_LOGON_PROCESS; - return Request->Status; + return STATUS_NOT_LOGON_PROCESS; } LogonProcess = 0; } - Request->Status = STATUS_SUCCESS; - - return Request->Status; + return STATUS_SUCCESS; } CSR_API(CsrSetLogonNotifyWindow) @@ -61,21 +57,17 @@ CSR_API(CsrSetLogonNotifyWindow) &WindowCreator)) { DPRINT1("Can't get window creator\n"); - Request->Status = STATUS_INVALID_HANDLE; - return Request->Status; + return STATUS_INVALID_HANDLE; } if (WindowCreator != (DWORD)LogonProcess) { DPRINT1("Trying to register window not created by winlogon as notify window\n"); - Request->Status = STATUS_ACCESS_DENIED; - return Request->Status; + return STATUS_ACCESS_DENIED; } LogonNotifyWindow = Request->Data.SetLogonNotifyWindowRequest.LogonNotifyWindow; - Request->Status = STATUS_SUCCESS; - - return Request->Status; + return STATUS_SUCCESS; } typedef struct tagSHUTDOWN_SETTINGS @@ -938,17 +930,15 @@ CSR_API(CsrExitReactos) if (0 == (Request->Data.ExitReactosRequest.Flags & EWX_INTERNAL_FLAG)) { - Request->Status = UserExitReactos((DWORD) Request->Header.ClientId.UniqueProcess, - Request->Data.ExitReactosRequest.Flags); + return UserExitReactos((DWORD) Request->Header.ClientId.UniqueProcess, + Request->Data.ExitReactosRequest.Flags); } else { - Request->Status = InternalExitReactos((DWORD) Request->Header.ClientId.UniqueProcess, - (DWORD) Request->Header.ClientId.UniqueThread, - Request->Data.ExitReactosRequest.Flags); + return InternalExitReactos((DWORD) Request->Header.ClientId.UniqueProcess, + (DWORD) Request->Header.ClientId.UniqueThread, + Request->Data.ExitReactosRequest.Flags); } - - return Request->Status; } /* EOF */