remove whitespace from end of lines Modified: trunk/reactos/subsys/csrss/api/handle.c Modified: trunk/reactos/subsys/csrss/api/process.c Modified: trunk/reactos/subsys/csrss/api/wapi.c Modified: trunk/reactos/subsys/csrss/csrss.c Modified: trunk/reactos/subsys/csrss/include/api.h Modified: trunk/reactos/subsys/csrss/init.c Modified: trunk/reactos/subsys/csrss/print.c Modified: trunk/reactos/subsys/csrss/video.c Modified: trunk/reactos/subsys/csrss/win32csr/conio.c Modified: trunk/reactos/subsys/csrss/win32csr/dllmain.c Modified: trunk/reactos/subsys/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsys/csrss/win32csr/tuiconsole.c Modified: trunk/reactos/subsys/ntvdm/ntvdm.c Modified: trunk/reactos/subsys/smss/init.c Modified: trunk/reactos/subsys/smss/smapi.c Modified: trunk/reactos/subsys/smss/smss.c Modified: trunk/reactos/subsys/smss/smss.h Modified: trunk/reactos/subsys/system/autochk/autochk.c Modified: trunk/reactos/subsys/system/cmd/alias.c Modified: trunk/reactos/subsys/system/cmd/attrib.c Modified: trunk/reactos/subsys/system/cmd/batch.c Modified: trunk/reactos/subsys/system/cmd/beep.c Modified: trunk/reactos/subsys/system/cmd/call.c Modified: trunk/reactos/subsys/system/cmd/chcp.c Modified: trunk/reactos/subsys/system/cmd/choice.c Modified: trunk/reactos/subsys/system/cmd/cls.c Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/cmdinput.c Modified: trunk/reactos/subsys/system/cmd/cmdtable.c Modified: trunk/reactos/subsys/system/cmd/color.c Modified: trunk/reactos/subsys/system/cmd/console.c Modified: trunk/reactos/subsys/system/cmd/copy.c Modified: trunk/reactos/subsys/system/cmd/date.c Modified: trunk/reactos/subsys/system/cmd/del.c Modified: trunk/reactos/subsys/system/cmd/delay.c Modified: trunk/reactos/subsys/system/cmd/dir.c Modified: trunk/reactos/subsys/system/cmd/dirstack.c Modified: trunk/reactos/subsys/system/cmd/echo.c Modified: trunk/reactos/subsys/system/cmd/error.c Modified: trunk/reactos/subsys/system/cmd/for.c Modified: trunk/reactos/subsys/system/cmd/free.c Modified: trunk/reactos/subsys/system/cmd/goto.c Modified: trunk/reactos/subsys/system/cmd/history.c Modified: trunk/reactos/subsys/system/cmd/if.c Modified: trunk/reactos/subsys/system/cmd/internal.c Modified: trunk/reactos/subsys/system/cmd/label.c Modified: trunk/reactos/subsys/system/cmd/memory.c Modified: trunk/reactos/subsys/system/cmd/misc.c Modified: trunk/reactos/subsys/system/cmd/move.c Modified: trunk/reactos/subsys/system/cmd/msgbox.c Modified: trunk/reactos/subsys/system/cmd/path.c Modified: trunk/reactos/subsys/system/cmd/pause.c Modified: trunk/reactos/subsys/system/cmd/prompt.c Modified: trunk/reactos/subsys/system/cmd/ren.c Modified: trunk/reactos/subsys/system/cmd/screen.c Modified: trunk/reactos/subsys/system/cmd/set.c Modified: trunk/reactos/subsys/system/cmd/shift.c Modified: trunk/reactos/subsys/system/cmd/start.c Modified: trunk/reactos/subsys/system/cmd/strtoclr.c Modified: trunk/reactos/subsys/system/cmd/time.c Modified: trunk/reactos/subsys/system/cmd/timer.c Modified: trunk/reactos/subsys/system/cmd/title.c Modified: trunk/reactos/subsys/system/cmd/type.c Modified: trunk/reactos/subsys/system/cmd/ver.c Modified: trunk/reactos/subsys/system/cmd/verify.c Modified: trunk/reactos/subsys/system/cmd/vol.c Modified: trunk/reactos/subsys/system/cmd/window.c Modified: trunk/reactos/subsys/system/dhcp/adapter.c Modified: trunk/reactos/subsys/system/dhcp/api.c Modified: trunk/reactos/subsys/system/dhcp/dhclient.c Modified: trunk/reactos/subsys/system/dhcp/dhcpmain.c Modified: trunk/reactos/subsys/system/dhcp/dispatch.c Modified: trunk/reactos/subsys/system/dhcp/memory.c Modified: trunk/reactos/subsys/system/dhcp/pipe.c Modified: trunk/reactos/subsys/system/dhcp/socket.c Modified: trunk/reactos/subsys/system/dhcp/tree.c Modified: trunk/reactos/subsys/system/dhcp/util.c Modified: trunk/reactos/subsys/system/explorer/explorer_intres.h Modified: trunk/reactos/subsys/system/explorer/i386-stub-win32.c Modified: trunk/reactos/subsys/system/explorer/shell/pane.h Modified: trunk/reactos/subsys/system/explorer/shell/webchild.h Modified: trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.h Modified: trunk/reactos/subsys/system/explorer/taskbar/taskbar.h Modified: trunk/reactos/subsys/system/explorer/utility/dragdropimpl.h Modified: trunk/reactos/subsys/system/explorer/utility/shellclasses.h Modified: trunk/reactos/subsys/system/explorer/utility/window.h Modified: trunk/reactos/subsys/system/format/format.c Modified: trunk/reactos/subsys/system/ibrowser/utility/window.h Modified: trunk/reactos/subsys/system/ibrowser/webchild.h Modified: trunk/reactos/subsys/system/lsass/lsass.c Modified: trunk/reactos/subsys/system/notepad/dialog.c Modified: trunk/reactos/subsys/system/notepad/main.c Modified: trunk/reactos/subsys/system/regedit/childwnd.c Modified: trunk/reactos/subsys/system/regedit/edit.c Modified: trunk/reactos/subsys/system/regedit/framewnd.c Modified: trunk/reactos/subsys/system/regedit/hexedit.c Modified: trunk/reactos/subsys/system/regedit/listview.c Modified: trunk/reactos/subsys/system/regedit/main.c Modified: trunk/reactos/subsys/system/regedit/security.c Modified: trunk/reactos/subsys/system/regedit/security.h [truncated at 100 lines; 57 more skipped] _____
Modified: trunk/reactos/subsys/csrss/api/handle.c --- trunk/reactos/subsys/csrss/api/handle.c 2005-05-08 03:09:14 UTC (rev 15110) +++ trunk/reactos/subsys/csrss/api/handle.c 2005-05-08 04:07:56 UTC (rev 15111) @@ -150,18 +150,18 @@
} NewBlock = RtlAllocateHeap(CsrssApiHeap, HEAP_ZERO_MEMORY, - (ProcessData->HandleTableSize + 64) * + (ProcessData->HandleTableSize + 64) * sizeof(HANDLE)); if (NewBlock == NULL) { return(STATUS_UNSUCCESSFUL); } - RtlCopyMemory(NewBlock, + RtlCopyMemory(NewBlock, ProcessData->HandleTable, ProcessData->HandleTableSize * sizeof(HANDLE)); RtlFreeHeap( CsrssApiHeap, 0, ProcessData->HandleTable ); ProcessData->HandleTable = (Object_t **)NewBlock; - ProcessData->HandleTable[i] = Object; + ProcessData->HandleTable[i] = Object; *Handle = (HANDLE)(((i + 1) << 2) | 0x3); InterlockedIncrement( &Object->ReferenceCount ); ProcessData->HandleTableSize = ProcessData->HandleTableSize + 64; _____
Modified: trunk/reactos/subsys/csrss/api/process.c --- trunk/reactos/subsys/csrss/api/process.c 2005-05-08 03:09:14 UTC (rev 15110) +++ trunk/reactos/subsys/csrss/api/process.c 2005-05-08 04:07:56 UTC (rev 15111) @@ -42,7 +42,7 @@
PCSRSS_PROCESS_DATA pProcessData;
hash = (ULONG_PTR)ProcessId % (sizeof(ProcessData) / sizeof(*ProcessData)); - + LOCK;
pProcessData = ProcessData[hash]; @@ -64,7 +64,7 @@ NTSTATUS Status;
hash = (ULONG_PTR)ProcessId % (sizeof(ProcessData) / sizeof(*ProcessData)); - + LOCK;
pProcessData = ProcessData[hash]; @@ -123,9 +123,9 @@ ULONG hash; int c; PCSRSS_PROCESS_DATA pProcessData, pPrevProcessData = NULL; - + hash = (ULONG_PTR)Pid % (sizeof(ProcessData) / sizeof(*ProcessData)); - + LOCK;
pProcessData = ProcessData[hash]; @@ -304,7 +304,7 @@ { return(Reply->Status = STATUS_INVALID_PARAMETER); } - + Reply->Data.GetShutdownParametersReply.Level = ProcessData->ShutdownLevel; Reply->Data.GetShutdownParametersReply.Flags = ProcessData->ShutdownFlags;
@@ -322,7 +322,7 @@ { return(Reply->Status = STATUS_INVALID_PARAMETER); } - + ProcessData->ShutdownLevel = Request->Data.SetShutdownParametersRequest.Level; ProcessData->ShutdownFlags = Request->Data.SetShutdownParametersRequest.Flags;
_____
Modified: trunk/reactos/subsys/csrss/api/wapi.c --- trunk/reactos/subsys/csrss/api/wapi.c 2005-05-08 03:09:14 UTC (rev 15110) +++ trunk/reactos/subsys/csrss/api/wapi.c 2005-05-08 04:07:56 UTC (rev 15111) @@ -1,5 +1,5 @@
/* $Id$ - * + * * reactos/subsys/csrss/api/wapi.c * * CSRSS port message processing @@ -113,11 +113,11 @@ PCSRSS_API_REQUEST Request; PCSRSS_PROCESS_DATA ProcessData; PCSRSS_API_REPLY Reply; - + DPRINT("CSR: %s called", __FUNCTION__);
Reply = NULL; - + for (;;) { Status = NtReplyWaitReceivePort(ServerPort, @@ -129,7 +129,7 @@ DPRINT1("CSR: NtReplyWaitReceivePort failed\n"); break; } - + if (LpcRequest.Header.MessageType == LPC_PORT_CLOSED) { CsrFreeProcessData( LpcRequest.Header.ClientId.UniqueProcess ); @@ -138,14 +138,14 @@
Request = (PCSRSS_API_REQUEST)&LpcRequest; Reply = (PCSRSS_API_REPLY)&LpcReply; - + ProcessData = CsrGetProcessData(LpcRequest.Header.ClientId.UniqueProcess); if (ProcessData == NULL) { DPRINT1("CSR: Message %d: Unable to find data for process 0x%x\n", LpcRequest.Header.MessageType, LpcRequest.Header.ClientId.UniqueProcess); break; - } + }
CsrApiCallHandler(ProcessData, Request, Reply); @@ -171,9 +171,9 @@ HANDLE ServerPort = (HANDLE) 0; HANDLE ServerThread = (HANDLE) 0; PCSRSS_PROCESS_DATA ProcessData = NULL; - + CsrInitProcessData(); - + DPRINT("CSR: %s called", __FUNCTION__);
for (;;) @@ -207,18 +207,18 @@ Status = STATUS_UNSUCCESSFUL; break; } -
+ ProcessData->CsrSectionViewBase = LpcRead.ViewBase; ProcessData->CsrSectionViewSize = LpcRead.ViewSize; - + Status = NtCompleteConnectPort(ServerPort); if (!NT_SUCCESS(Status)) { DPRINT1("CSR: NtCompleteConnectPort() failed\n"); break; } - + Status = RtlCreateUserThread(NtCurrentProcess(), NULL, FALSE, @@ -292,7 +292,7 @@ } else { DPRINT("-- 3\n"); PLPC_MESSAGE Reply = NULL; - /* + /* * Tell the init thread the SM gave the * green light for boostrapping. */ _____
Modified: trunk/reactos/subsys/csrss/csrss.c --- trunk/reactos/subsys/csrss/csrss.c 2005-05-08 03:09:14 UTC (rev 15110) +++ trunk/reactos/subsys/csrss/csrss.c 2005-05-08 04:07:56 UTC (rev 15111) @@ -1,9 +1,9 @@
/* $Id$ * * csrss.c - Client/Server Runtime subsystem - * + * * ReactOS Operating System - * + * * -------------------------------------------------------------------- * * This software is free software; you can redistribute it and/or @@ -19,10 +19,10 @@ * You should have received a copy of the GNU General Public License * along with this software; see the file COPYING.LIB. If not, write * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. + * MA 02139, USA. * * -------------------------------------------------------------------- - * + * * 19990417 (Emanuele Aliberti) * Do nothing native application skeleton * 19990528 (Emanuele Aliberti) @@ -64,7 +64,7 @@ INT i = 0; INT afterlastspace = 0;
- + DPRINT("CSR: %s called\n", __FUNCTION__);
RtlZeroMemory (Argument, sizeof (COMMAND_LINE_ARGUMENT)); @@ -123,20 +123,20 @@ Argument->Vector [Argument->Count - 1] = & (Argument->Buffer.Buffer [afterlastspace]); }
- return STATUS_SUCCESS; + return STATUS_SUCCESS; }
/********************************************************************** * NAME PRIVATE * CsrpFreeCommandLine/2 */ - + static VOID STDCALL CsrpFreeCommandLine (HANDLE ProcessHeap, PCOMMAND_LINE_ARGUMENT Argument) { DPRINT("CSR: %s called\n", __FUNCTION__); - + RtlFreeHeap (ProcessHeap, 0, Argument->Vector); @@ -177,7 +177,7 @@ *================================================================*/ if (CsrServerInitialization (CmdLineArg.Count, CmdLineArg.Vector) == TRUE) { - CsrpFreeCommandLine (Peb->ProcessHeap, & CmdLineArg); + CsrpFreeCommandLine (Peb->ProcessHeap, & CmdLineArg); /* * Terminate the current thread only. */ @@ -187,7 +187,7 @@ { DisplayString (L"CSR: CsrServerInitialization failed.\n");
- CsrpFreeCommandLine (Peb->ProcessHeap, & CmdLineArg); + CsrpFreeCommandLine (Peb->ProcessHeap, & CmdLineArg); /* * Tell the SM we failed. */ _____
Modified: trunk/reactos/subsys/csrss/include/api.h --- trunk/reactos/subsys/csrss/include/api.h 2005-05-08 03:09:14 UTC (rev 15110) +++ trunk/reactos/subsys/csrss/include/api.h 2005-05-08 04:07:56 UTC (rev 15111) @@ -47,7 +47,7 @@
LIST_ENTRY ProcessEntry; PCONTROLDISPATCHER CtrlDispatcher; } CSRSS_PROCESS_DATA, *PCSRSS_PROCESS_DATA; - + typedef VOID (STDCALL *CSR_CLEANUP_OBJECT_PROC)(Object_t *Object);
typedef struct tagCSRSS_OBJECT_DEFINITION _____
Modified: trunk/reactos/subsys/csrss/init.c --- trunk/reactos/subsys/csrss/init.c 2005-05-08 03:09:14 UTC (rev 15110) +++ trunk/reactos/subsys/csrss/init.c 2005-05-08 04:07:56 UTC (rev 15111) @@ -1,5 +1,5 @@
/* $Id$ - * + * * reactos/subsys/csrss/init.c * * Initialize the CSRSS subsystem server process. @@ -397,7 +397,7 @@ FALSE, NULL); NtClose (hBootstrapOk); - return Status; + return Status; }
/********************************************************************** @@ -533,7 +533,7 @@ Status = InitRoutine[i].EntryPoint(ArgumentCount,ArgumentArray); if(!NT_SUCCESS(Status)) { - DPRINT1("CSR: %s: failed to %s (Status=%08lx)\n", + DPRINT1("CSR: %s: failed to %s (Status=%08lx)\n", __FUNCTION__, InitRoutine[i].ErrorMessage, Status); _____
Modified: trunk/reactos/subsys/csrss/print.c --- trunk/reactos/subsys/csrss/print.c 2005-05-08 03:09:14 UTC (rev 15110) +++ trunk/reactos/subsys/csrss/print.c 2005-05-08 04:07:56 UTC (rev 15111) @@ -1,9 +1,9 @@
/* $Id$ * * smss.c - Session Manager - * + * * ReactOS Operating System - * + * * -------------------------------------------------------------------- * * This software is free software; you can redistribute it and/or @@ -19,10 +19,10 @@ * You should have received a copy of the GNU General Public License * along with this software; see the file COPYING.LIB. If not, write * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. + * MA 02139, USA. * * -------------------------------------------------------------------- - * + * * 19990529 (Emanuele Aliberti) * Compiled successfully with egcs 1.1.2 */ @@ -34,7 +34,7 @@ VOID STDCALL DisplayString(LPCWSTR lpwString) { UNICODE_STRING us; - + RtlInitUnicodeString (&us, lpwString); ZwDisplayString (&us); } @@ -45,11 +45,11 @@ va_list ap; UNICODE_STRING UnicodeString; ANSI_STRING AnsiString; - + va_start(ap, fmt); vsprintf(buffer, fmt, ap); va_end(ap); - + RtlInitAnsiString (&AnsiString, buffer); RtlAnsiStringToUnicodeString (&UnicodeString, &AnsiString, _____
Modified: trunk/reactos/subsys/csrss/video.c --- trunk/reactos/subsys/csrss/video.c 2005-05-08 03:09:14 UTC (rev 15110) +++ trunk/reactos/subsys/csrss/video.c 2005-05-08 04:07:56 UTC (rev 15111) @@ -31,7 +31,7 @@
0, NULL, NULL); - Status = ZwOpenSection(&PhysMemHandle, SECTION_ALL_ACCESS, + Status = ZwOpenSection(&PhysMemHandle, SECTION_ALL_ACCESS, &ObjectAttributes); if (!NT_SUCCESS(Status)) { @@ -102,13 +102,13 @@ DbgPrint("NtVdmControl failed (status %x)\n", Status); return(0); } - + /* * Copy the real mode IVT into the right place */ NullAddress = (PVOID)0x0; /* Workaround for GCC 3.4 */ memcpy(NullAddress, IVT, 1024); - + /* * Get the BDA from the kernel */ @@ -118,7 +118,7 @@ DbgPrint("NtVdmControl failed (status %x)\n", Status); return(0); } - + /* * Copy the BDA into the right place */ _____
Modified: trunk/reactos/subsys/csrss/win32csr/conio.c --- trunk/reactos/subsys/csrss/win32csr/conio.c 2005-05-08 03:09:14 UTC (rev 15110) +++ trunk/reactos/subsys/csrss/win32csr/conio.c 2005-05-08 04:07:56 UTC (rev 15111) @@ -75,7 +75,7 @@
ConioConsoleCtrlEvent(DWORD Event, PCSRSS_PROCESS_DATA ProcessData) { HANDLE Thread; - + DPRINT("ConioConsoleCtrlEvent Parent ProcessId = %x\n", ProcessData->ProcessId);
if (ProcessData->CtrlDispatcher) @@ -105,7 +105,7 @@ { DWORD Offset = 2 * (Buff->CurrentY * Buff->MaxX); UINT Pos; - + for (Pos = 0; Pos < Buff->MaxX; Pos++) { /* Fill the cell: Offset is incremented by the macro */ @@ -154,9 +154,9 @@
Console->Title.MaximumLength = Console->Title.Length = 0; Console->Title.Buffer = NULL; - + RtlCreateUnicodeString(&Console->Title, L"Command Prompt"); - + Console->Header.ReferenceCount = 0; Console->WaitingChars = 0; Console->WaitingLines = 0; @@ -302,7 +302,7 @@ return Status; } ProcessData->CtrlDispatcher = Request->Data.AllocConsoleRequest.CtrlDispatcher; - DPRINT("CSRSS:CtrlDispatcher address: %x\n", ProcessData->CtrlDispatcher); + DPRINT("CSRSS:CtrlDispatcher address: %x\n", ProcessData->CtrlDispatcher); InsertHeadList(&ProcessData->Console->ProcessList, &ProcessData->ProcessEntry);
return STATUS_SUCCESS; @@ -329,7 +329,7 @@ { ConioDeleteConsole((Object_t *) Console); } - + return STATUS_SUCCESS; }
@@ -513,9 +513,9 @@ ULONG nNumberOfCharsToRead, CharSize; PCSRSS_CONSOLE Console; NTSTATUS Status; - + DPRINT("CsrReadConsole\n"); - + CharSize = (Request->Data.ReadConsoleRequest.Unicode ? sizeof(WCHAR) : sizeof(CHAR));
/* truncate length to CSRSS_MAX_READ_CONSOLE_REQUEST */ @@ -785,7 +785,7 @@ DstY = (DstRegion->top + ScreenBuffer->ShowY) % ScreenBuffer->MaxY; SrcOffset = (SrcY * ScreenBuffer->MaxX + SrcRegion->left + ScreenBuffer->ShowX) * 2; DstOffset = (DstY * ScreenBuffer->MaxX + DstRegion->left + ScreenBuffer->ShowX) * 2; - + for (i = SrcRegion->top; i <= SrcRegion->bottom; i++) { RtlCopyMemory( @@ -827,7 +827,7 @@ DWORD Delta; ULONG i; CHAR Char; - + if(bUnicode) ConsoleUnicodeCharToAnsiChar(Console, &Char, &CharInfo->Char.UnicodeChar); else @@ -875,7 +875,7 @@ ULONG CharSize = (Request->Data.WriteConsoleRequest.Unicode ? sizeof(WCHAR) : sizeof(CHAR));
DPRINT("CsrWriteConsole\n"); - + Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - LPC_MESSAGE_BASE_SIZE;
@@ -997,7 +997,7 @@ /* process Ctrl-C and Ctrl-Break */ if (Console->Mode & ENABLE_PROCESSED_INPUT && KeyEventRecord->InputEvent.Event.KeyEvent.bKeyDown && - ((KeyEventRecord->InputEvent.Event.KeyEvent.wVirtualKeyCode == VK_PAUSE) || + ((KeyEventRecord->InputEvent.Event.KeyEvent.wVirtualKeyCode == VK_PAUSE) || (KeyEventRecord->InputEvent.Event.KeyEvent.wVirtualKeyCode == 'C')) && (KeyEventRecord->InputEvent.Event.KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED))) { @@ -1043,10 +1043,10 @@ else if (Console->ActiveBuffer->ShowY != Console->ActiveBuffer->CurrentY) /* only scroll down if there is room to scroll down into */ { - if (Console->ActiveBuffer->ShowY % Console->ActiveBuffer->MaxY != + if (Console->ActiveBuffer->ShowY % Console->ActiveBuffer->MaxY != Console->ActiveBuffer->CurrentY) { - if (((Console->ActiveBuffer->CurrentY + 1) % Console->ActiveBuffer->MaxY) != + if (((Console->ActiveBuffer->CurrentY + 1) % Console->ActiveBuffer->MaxY) != (Console->ActiveBuffer->ShowY + Console->ActiveBuffer->MaxY) % Console->ActiveBuffer->MaxY) { @@ -1222,7 +1222,7 @@
RepeatCount = 1; VirtualScanCode = (msg->lParam >> 16) & 0xff; - Down = msg->message == WM_KEYDOWN || msg->message == WM_CHAR || + Down = msg->message == WM_KEYDOWN || msg->message == WM_CHAR || msg->message == WM_SYSKEYDOWN || msg->message == WM_SYSCHAR;
GetKeyboardState(KeyState); @@ -1232,9 +1232,9 @@ { VirtualKeyCode = LastVirtualKey; UnicodeChar = msg->wParam; - } + } else - { + { WCHAR Chars[2]; INT RetChars = 0;
@@ -1253,7 +1253,7 @@ { AsciiChar = 0; } - + er.EventType = KEY_EVENT; er.Event.KeyEvent.bKeyDown = Down; er.Event.KeyEvent.wRepeatCount = RepeatCount; @@ -1263,7 +1263,7 @@ er.Event.KeyEvent.wVirtualScanCode = VirtualScanCode;
if (TextMode) - { + { if (0 != (ShiftState & (RIGHT_ALT_PRESSED | LEFT_ALT_PRESSED)) && VK_TAB == VirtualKeyCode) { @@ -1283,7 +1283,7 @@ } }
- if (NULL == Console) + if (NULL == Console) { return; } @@ -1294,9 +1294,9 @@ { return; } - + ConInRec->InputEvent = er; - ConInRec->Fake = UnicodeChar && + ConInRec->Fake = UnicodeChar && (msg->message != WM_CHAR && msg->message != WM_SYSCHAR && msg->message != WM_KEYUP && msg->message != WM_SYSKEYUP); ConInRec->NotChar = (msg->message != WM_CHAR && msg->message != WM_SYSCHAR); @@ -1314,7 +1314,7 @@ VirtualKeyCode, (AsciiChar >= ' ') ? AsciiChar : '.', ShiftState); - + if (! ConInRec->Fake || ! ConInRec->NotChar) { /* FIXME - convert to ascii */ @@ -1339,7 +1339,7 @@ PrivateCsrssRegisterPrimitive(); /* This call turns on the input system in win32k */ PrivateCsrssAcquireOrReleaseInputOwnership(FALSE); - + while (TRUE) { GetMessageW(&msg, 0, 0, 0); @@ -1362,7 +1362,7 @@ NTSTATUS Status; PCSRSS_SCREEN_BUFFER Buff; PCONSOLE_SCREEN_BUFFER_INFO pInfo; - + DPRINT("CsrGetScreenBufferInfo\n");
Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); @@ -1399,7 +1399,7 @@ PCSRSS_SCREEN_BUFFER Buff; LONG OldCursorX, OldCursorY; LONG NewCursorX, NewCursorY; - + DPRINT("CsrSetCursor\n");
Status = ConioConsoleFromProcessData(ProcessData, &Console); @@ -1491,7 +1491,7 @@
Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - LPC_MESSAGE_BASE_SIZE; - + CharSize = (Request->Data.WriteConsoleOutputCharRequest.Unicode ? sizeof(WCHAR) : sizeof(CHAR));
if (Request->Header.DataSize @@ -1576,7 +1576,7 @@ RECT UpdateRect;
DPRINT("CsrFillOutputChar\n"); - + Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - LPC_MESSAGE_BASE_SIZE;
@@ -1643,13 +1643,13 @@ NTSTATUS Status; BOOLEAN Done = FALSE; ConsoleInput *Input; - + DPRINT("CsrReadInputEvent\n");
Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - LPC_MESSAGE_BASE_SIZE; Reply->Data.ReadInputReply.Event = ProcessData->ConsoleEvent; - + Status = ConioLockConsole(ProcessData, Request->Data.ReadInputRequest.ConsoleHandle, &Console); if (! NT_SUCCESS(Status)) { @@ -1668,7 +1668,7 @@ Reply->Data.ReadInputReply.MoreEvents = TRUE; break; } - + RemoveEntryList(&Input->ListEntry);
if (!Done && !Input->Fake) @@ -1693,7 +1693,7 @@ } HeapFree(Win32CsrApiHeap, 0, Input); } - + if (Done) { Status = STATUS_SUCCESS; @@ -1725,7 +1725,7 @@ RECT UpdateRect;
DPRINT("CsrWriteConsoleOutputAttrib\n"); - + Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - LPC_MESSAGE_BASE_SIZE;
@@ -1812,7 +1812,7 @@ { return Reply->Status = Status; } - + Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - LPC_MESSAGE_BASE_SIZE; Status = ConioLockScreenBuffer(ProcessData, Request->Data.FillOutputAttribRequest.ConsoleHandle, &Buff); @@ -1866,7 +1866,7 @@ { PCSRSS_SCREEN_BUFFER Buff; NTSTATUS Status; - + DPRINT("CsrGetCursorInfo\n");
Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); @@ -1890,7 +1890,7 @@ DWORD Size; BOOL Visible; NTSTATUS Status; - + DPRINT("CsrSetCursorInfo\n");
Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); @@ -1951,7 +1951,7 @@ NTSTATUS Status; PCSRSS_CONSOLE Console; PCSRSS_SCREEN_BUFFER Buff; - LONG OldCursorX, OldCursorY; + LONG OldCursorX, OldCursorY;
DPRINT("CsrSetTextAttrib\n");
@@ -2069,7 +2069,7 @@ PCSRSS_CONSOLE Console; PCSRSS_SCREEN_BUFFER Buff; NTSTATUS Status; - + DPRINT("CsrCreateScreenBuffer\n");
if (ProcessData == NULL) @@ -2186,7 +2186,7 @@ Status = ConioLockConsole(ProcessData, Request->Data.SetTitleRequest.Console, &Console); if(! NT_SUCCESS(Status)) { - Reply->Status = Status; + Reply->Status = Status; } else { @@ -2211,7 +2211,7 @@ { NTSTATUS Status; PCSRSS_CONSOLE Console; - + DPRINT("CsrGetTitle\n");
Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); @@ -2224,7 +2224,7 @@ DPRINT1("Can't get console\n"); return Reply->Status = Status; } - + /* Copy title of the console to the user title buffer */ RtlZeroMemory(&Reply->Data.GetTitleReply, sizeof(CSRSS_GET_TITLE_REPLY)); Reply->Data.GetTitleReply.ConsoleHandle = Request->Data.GetTitleRequest.ConsoleHandle; @@ -2281,7 +2281,7 @@ BufferCoord = Request->Data.WriteConsoleOutputRequest.BufferCoord; CharInfo = Request->Data.WriteConsoleOutputRequest.CharInfo; if (((PVOID)CharInfo < ProcessData->CsrSectionViewBase) || - (((PVOID)CharInfo + PSize) > + (((PVOID)CharInfo + PSize) > (ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize))) { ConioUnlockScreenBuffer(Buff); @@ -2510,9 +2510,9 @@ Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = Reply->Header.MessageSize - LPC_MESSAGE_BASE_SIZE; ReadBuffer = Reply->Data.ReadConsoleOutputCharReply.String; - + CharSize = (Request->Data.ReadConsoleOutputCharRequest.Unicode ? sizeof(WCHAR) : sizeof(CHAR)); - + Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { @@ -2531,7 +2531,7 @@ for (i = 0; i < Request->Data.ReadConsoleOutputCharRequest.NumCharsToRead; ++i) { Char = Buff->Buffer[(Xpos * 2) + (Ypos * 2 * Buff->MaxX)]; - + if(Request->Data.ReadConsoleOutputCharRequest.Unicode) { ConsoleAnsiCharToUnicodeChar(Console, (WCHAR*)ReadBuffer, &Char); @@ -2566,7 +2566,7 @@ { ConioUnlockConsole(Console); } - + Reply->Data.ReadConsoleOutputCharReply.CharsRead = (DWORD)((ULONG_PTR)ReadBuffer - (ULONG_PTR)Reply->Data.ReadConsoleOutputCharReply.String) / CharSize;
return Reply->Status; @@ -2636,7 +2636,7 @@ PLIST_ENTRY CurrentItem; DWORD NumEvents; ConsoleInput *Input; - + DPRINT("CsrGetNumberOfConsoleInputEvents\n");
Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); @@ -2647,10 +2647,10 @@ { return Reply->Status = Status; } - + CurrentItem = Console->InputEvents.Flink; NumEvents = 0; - + /* If there are any events ... */ while (CurrentItem != &Console->InputEvents) { @@ -2663,10 +2663,10 @@ }
ConioUnlockConsole(Console); - + Reply->Status = STATUS_SUCCESS; Reply->Data.GetNumInputEventsReply.NumInputEvents = NumEvents; - + return Reply->Status; }
@@ -2681,22 +2681,22 @@ PINPUT_RECORD InputRecord; ConsoleInput* Item; UINT NumItems; - + DPRINT("CsrPeekConsoleInput\n");
Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - LPC_MESSAGE_BASE_SIZE; - + Status = ConioLockConsole(ProcessData, Request->Data.GetNumInputEventsRequest.ConsoleHandle, &Console); if(! NT_SUCCESS(Status)) { return Reply->Status = Status; } - + InputRecord = Request->Data.PeekConsoleInputRequest.InputRecord; Length = Request->Data.PeekConsoleInputRequest.Length; Size = Length * sizeof(INPUT_RECORD); - + if (((PVOID)InputRecord < ProcessData->CsrSectionViewBase) || (((PVOID)InputRecord + Size) > (ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize))) { @@ -2704,13 +2704,13 @@ Reply->Status = STATUS_ACCESS_VIOLATION; return Reply->Status ; } - + NumItems = 0; - + if (! IsListEmpty(&Console->InputEvents)) { CurrentItem = Console->InputEvents.Flink; - + while (CurrentItem != &Console->InputEvents && NumItems < Length) { Item = CONTAINING_RECORD(CurrentItem, ConsoleInput, ListEntry); @@ -2720,7 +2720,7 @@ CurrentItem = CurrentItem->Flink; continue; } - + ++NumItems; *InputRecord = Item->InputEvent;
@@ -2728,7 +2728,7 @@ { ConioInputEventToAnsi(Console, InputRecord); } - + InputRecord++; CurrentItem = CurrentItem->Flink; } @@ -2758,18 +2758,18 @@ RECT ScreenRect; DWORD i, Y, X, Offset; UINT CodePage; - + DPRINT("CsrReadConsoleOutput\n");
Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - LPC_MESSAGE_BASE_SIZE; - + Status = ConioLockScreenBuffer(ProcessData, Request->Data.ReadConsoleOutputRequest.ConsoleHandle, &Buff); if (! NT_SUCCESS(Status)) { return Reply->Status = Status; } - + CharInfo = Request->Data.ReadConsoleOutputRequest.CharInfo; ReadRegion.left = Request->Data.ReadConsoleOutputRequest.ReadRegion.Left; ReadRegion.top = Request->Data.ReadConsoleOutputRequest.ReadRegion.Top; @@ -2782,7 +2782,7 @@
/* FIXME: Is this correct? */ CodePage = ProcessData->Console->OutputCodePage; - + if (((PVOID)CharInfo < ProcessData->CsrSectionViewBase) || (((PVOID)CharInfo + Size) > (ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize))) { @@ -2790,7 +2790,7 @@ Reply->Status = STATUS_ACCESS_VIOLATION; return Reply->Status ; } - + SizeY = RtlRosMin(BufferSize.Y - BufferCoord.Y, ConioRectHeight(&ReadRegion)); SizeX = RtlRosMin(BufferSize.X - BufferCoord.X, ConioRectWidth(&ReadRegion)); ReadRegion.bottom = ReadRegion.top + SizeY; @@ -2807,7 +2807,7 @@ for (i = 0, Y = ReadRegion.top; Y < ReadRegion.bottom; ++i, ++Y) { CurCharInfo = CharInfo + (i * BufferSize.X); - + Offset = (((Y + Buff->ShowY) % Buff->MaxY) * Buff->MaxX + ReadRegion.left) * 2; for (X = ReadRegion.left; X < ReadRegion.right; ++X) { @@ -2827,13 +2827,13 @@ }
ConioUnlockScreenBuffer(Buff); - + Reply->Status = STATUS_SUCCESS; Reply->Data.ReadConsoleOutputReply.ReadRegion.Right = ReadRegion.left + SizeX - 1; Reply->Data.ReadConsoleOutputReply.ReadRegion.Bottom = ReadRegion.top + SizeY - 1; Reply->Data.ReadConsoleOutputReply.ReadRegion.Left = ReadRegion.left; Reply->Data.ReadConsoleOutputReply.ReadRegion.Top = ReadRegion.top; - + return Reply->Status; }
@@ -2847,22 +2847,22 @@ DWORD Size; DWORD i; ConsoleInput* Record; - + DPRINT("CsrWriteConsoleInput\n");
Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - LPC_MESSAGE_BASE_SIZE; - + Status = ConioLockConsole(ProcessData, Request->Data.WriteConsoleInputRequest.ConsoleHandle, &Console); if (! NT_SUCCESS(Status)) { return Reply->Status = Status; } - + InputRecord = Request->Data.WriteConsoleInputRequest.InputRecord; Length = Request->Data.WriteConsoleInputRequest.Length; Size = Length * sizeof(INPUT_RECORD); - + if (((PVOID)InputRecord < ProcessData->CsrSectionViewBase) || (((PVOID)InputRecord + Size) > (ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize))) { @@ -2870,7 +2870,7 @@ Reply->Status = STATUS_ACCESS_VIOLATION; return Reply->Status ; } - + for (i = 0; i < Length; i++) { Record = HeapAlloc(Win32CsrApiHeap, 0, sizeof(ConsoleInput)); @@ -2892,7 +2892,7 @@ }
ConioUnlockConsole(Console); - + Reply->Status = STATUS_SUCCESS; Reply->Data.WriteConsoleInputReply.Length = i;
@@ -2928,7 +2928,7 @@ Console->HardwareState = ConsoleHwState; }
- return STATUS_SUCCESS; + return STATUS_SUCCESS; }
return STATUS_INVALID_PARAMETER_3; /* Client: (handle, set_get, [mode]) */ @@ -2938,12 +2938,12 @@ { PCSRSS_CONSOLE Console; NTSTATUS Status; - + DPRINT("CsrHardwareStateProperty\n");
Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - LPC_MESSAGE_BASE_SIZE; - + Status = ConioLockConsole(ProcessData,
Request->Data.ConsoleHardwareStateRequest.ConsoleHandle, &Console); @@ -2958,7 +2958,7 @@ case CONSOLE_HARDWARE_STATE_GET: Reply->Data.ConsoleHardwareStateReply.State = Console->HardwareState; break; [truncated at 1000 lines; 10086 more skipped]
-
sedwards＠svn.reactos.com