Author: hbelusca
Date: Sun Aug 31 14:57:43 2014
New Revision: 64012
URL:
http://svn.reactos.org/svn/reactos?rev=64012&view=rev
Log:
Code formatting only.
Modified:
branches/condrv_restructure/win32ss/user/winsrv/consrv/alias.c
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c
branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h
branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h
branches/condrv_restructure/win32ss/user/winsrv/consrv/procinit.h
Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/alias.c
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user…
==============================================================================
--- branches/condrv_restructure/win32ss/user/winsrv/consrv/alias.c [iso-8859-1]
(original)
+++ branches/condrv_restructure/win32ss/user/winsrv/consrv/alias.c [iso-8859-1] Sun Aug 31
14:57:43 2014
@@ -474,7 +474,8 @@
lpTarget = (ConsoleAliasRequest->TargetLength != 0 ?
ConsoleAliasRequest->Target : NULL);
- Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process),
&Console, TRUE);
+ Status =
ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process),
+ &Console, TRUE);
if (!NT_SUCCESS(Status)) return Status;
Status = STATUS_SUCCESS;
@@ -570,7 +571,8 @@
return STATUS_INVALID_PARAMETER;
}
- Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process),
&Console, TRUE);
+ Status =
ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process),
+ &Console, TRUE);
if (!NT_SUCCESS(Status)) return Status;
Header = IntFindAliasHeader(Console,
@@ -647,7 +649,8 @@
return STATUS_INVALID_PARAMETER;
}
- Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process),
&Console, TRUE);
+ Status =
ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process),
+ &Console, TRUE);
if (!NT_SUCCESS(Status)) return Status;
Header = IntFindAliasHeader(Console,
@@ -747,7 +750,8 @@
return STATUS_INVALID_PARAMETER;
}
- Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process),
&Console, TRUE);
+ Status =
ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process),
+ &Console, TRUE);
if (!NT_SUCCESS(Status)) return Status;
Header = IntFindAliasHeader(Console,
@@ -787,7 +791,8 @@
return STATUS_INVALID_PARAMETER;
}
- Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process),
&Console, TRUE);
+ Status =
ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process),
+ &Console, TRUE);
if (!NT_SUCCESS(Status)) return Status;
if (IntGetConsoleAliasesExesLength(Console->Aliases,
GetAliasesExesRequest->Unicode) > GetAliasesExesRequest->Length)
@@ -864,7 +869,8 @@
DPRINT1("SrvGetConsoleAliasExesLength entered ApiMessage %p\n",
ApiMessage);
- Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process),
&Console, TRUE);
+ Status =
ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process),
+ &Console, TRUE);
if (!NT_SUCCESS(Status)) return Status;
GetAliasesExesLengthRequest->Length =
Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user…
==============================================================================
---
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c [iso-8859-1]
(original)
+++
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c [iso-8859-1]
Sun Aug 31 14:57:43 2014
@@ -137,7 +137,7 @@
* NOTE: Each entry of the table should be retrieved when loading a front-end
* (examples of the CSR servers which register some data for CSRSS).
*/
-struct
+static struct
{
CHAR FrontEndName[80];
FRONTEND_LOAD FrontEndLoad;
Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user…
==============================================================================
--- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1]
(original)
+++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1]
Sun Aug 31 14:57:43 2014
@@ -300,12 +300,13 @@
typedef struct _CONSOLE
{
/******************************* Console Set-up *******************************/
+
+#ifndef USE_NEW_CONSOLE_WAY
+ WINSRV_CONSOLE; // HACK HACK!!
+#endif
+
LONG ReferenceCount; /* Is incremented each time a handle to
something in the console (a screen-buffer or the input buffer of this console) gets
referenced */
CRITICAL_SECTION Lock;
-
-#ifndef USE_NEW_CONSOLE_WAY
- /**/WINSRV_CONSOLE;/**/ // HACK HACK!!
-#endif
CONSOLE_STATE State; /* State of the console */
TERMINAL TermIFace; /* Frontend-specific interface */
Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user…
==============================================================================
---
branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h [iso-8859-1]
(original)
+++
branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h [iso-8859-1]
Sun Aug 31 14:57:43 2014
@@ -131,7 +131,8 @@
/* This **MUST** be FIRST!! */
#ifdef USE_NEW_CONSOLE_WAY
CONSOLE;
- // PCONSOLE Console;
+ // CONSOLE Console;
+ // // PCONSOLE Console;
#endif
// LONG ReferenceCount; /* Is incremented each time a handle to
something in the console (a screen-buffer or the input buffer of this console) gets
referenced */
Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/procinit.h
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user…
==============================================================================
--- branches/condrv_restructure/win32ss/user/winsrv/consrv/procinit.h [iso-8859-1]
(original)
+++ branches/condrv_restructure/win32ss/user/winsrv/consrv/procinit.h [iso-8859-1] Sun Aug
31 14:57:43 2014
@@ -9,14 +9,14 @@
#pragma once
NTSTATUS ConSrvAllocateConsole(PCONSOLE_PROCESS_DATA ProcessData,
- PHANDLE pInputHandle,
- PHANDLE pOutputHandle,
- PHANDLE pErrorHandle,
- PCONSOLE_START_INFO ConsoleStartInfo);
+ PHANDLE pInputHandle,
+ PHANDLE pOutputHandle,
+ PHANDLE pErrorHandle,
+ PCONSOLE_START_INFO ConsoleStartInfo);
NTSTATUS ConSrvInheritConsole(PCONSOLE_PROCESS_DATA ProcessData,
- HANDLE ConsoleHandle,
- BOOLEAN CreateNewHandlesTable,
- PHANDLE pInputHandle,
- PHANDLE pOutputHandle,
- PHANDLE pErrorHandle);
+ HANDLE ConsoleHandle,
+ BOOLEAN CreateNewHandlesTable,
+ PHANDLE pInputHandle,
+ PHANDLE pOutputHandle,
+ PHANDLE pErrorHandle);
VOID ConSrvRemoveConsole(PCONSOLE_PROCESS_DATA ProcessData);