[hbelusca] 59211: [KERNEL32] Code formatting only + member variable type fix.

Author: hbelusca
Date: Fri Jun 14 01:00:49 2013
New Revision: 59211

URL: http://svn.reactos.org/svn/reactos?rev=59211&view=rev
Log:
[KERNEL32]
Code formatting only + member variable type fix.

Modified:
    trunk/reactos/dll/win32/kernel32/client/console/console.c
    trunk/reactos/include/reactos/subsys/win/conmsg.h

Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/c...
==============================================================================
--- trunk/reactos/dll/win32/kernel32/client/console/console.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/client/console/console.c	[iso-8859-1] Fri Jun 14 01:00:49 2013
@@ -1958,17 +1958,15 @@
     CONSOLE_API_MESSAGE ApiMessage;

/* Get the Input Code Page */
-    ApiMessage.Data.ConsoleCPRequest.InputCP = TRUE;
+    ApiMessage.Data.ConsoleCPRequest.InputCP  = TRUE;
+    ApiMessage.Data.ConsoleCPRequest.CodePage = 0;

Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetCP),
                                  sizeof(CONSOLE_GETSETINPUTOUTPUTCP));
-    if (!NT_SUCCESS(Status))
-    {
-        BaseSetLastNTError(Status);
-        return 0;
-    }
+
+    if (!NT_SUCCESS(Status)) BaseSetLastNTError(Status);

return ApiMessage.Data.ConsoleCPRequest.CodePage;
 }
@@ -1987,17 +1985,15 @@
     CONSOLE_API_MESSAGE ApiMessage;

/* Set the Input Code Page */
-    ApiMessage.Data.ConsoleCPRequest.InputCP = TRUE;
+    ApiMessage.Data.ConsoleCPRequest.InputCP  = TRUE;
     ApiMessage.Data.ConsoleCPRequest.CodePage = wCodePageID;

Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetCP),
                                  sizeof(CONSOLE_GETSETINPUTOUTPUTCP));
-    if (!NT_SUCCESS(Status))
-    {
-        BaseSetLastNTError(Status);
-    }
+
+    if (!NT_SUCCESS(Status)) BaseSetLastNTError(Status);

return NT_SUCCESS(Status);
 }
@@ -2016,17 +2012,15 @@
     CONSOLE_API_MESSAGE ApiMessage;

/* Get the Output Code Page */
-    ApiMessage.Data.ConsoleCPRequest.InputCP = FALSE;
+    ApiMessage.Data.ConsoleCPRequest.InputCP  = FALSE;
+    ApiMessage.Data.ConsoleCPRequest.CodePage = 0;

Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetCP),
                                  sizeof(CONSOLE_GETSETINPUTOUTPUTCP));
-    if (!NT_SUCCESS(Status))
-    {
-        BaseSetLastNTError (Status);
-        return 0;
-    }
+
+    if (!NT_SUCCESS(Status)) BaseSetLastNTError(Status);

return ApiMessage.Data.ConsoleCPRequest.CodePage;
 }
@@ -2045,17 +2039,15 @@
     CONSOLE_API_MESSAGE ApiMessage;

/* Set the Output Code Page */
-    ApiMessage.Data.ConsoleCPRequest.InputCP = FALSE;
+    ApiMessage.Data.ConsoleCPRequest.InputCP  = FALSE;
     ApiMessage.Data.ConsoleCPRequest.CodePage = wCodePageID;

Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetCP),
                                  sizeof(CONSOLE_GETSETINPUTOUTPUTCP));
-    if (!NT_SUCCESS(Status))
-    {
-        BaseSetLastNTError(Status);
-    }
+
+    if (!NT_SUCCESS(Status)) BaseSetLastNTError(Status);

return NT_SUCCESS(Status);
 }

Modified: trunk/reactos/include/reactos/subsys/win/conmsg.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win/...
==============================================================================
--- trunk/reactos/include/reactos/subsys/win/conmsg.h	[iso-8859-1] (original)
+++ trunk/reactos/include/reactos/subsys/win/conmsg.h	[iso-8859-1] Fri Jun 14 01:00:49 2013
@@ -361,10 +361,10 @@
     CODE_TYPE CodeType;
     union
     {
-        PVOID pCode;
-        PCHAR AsciiChar;
+        PVOID  pCode;
+        PCHAR  AsciiChar;
         PWCHAR UnicodeChar;
-        PWORD Attribute;
+        PWORD  Attribute;
     } pCode;    // Either a pointer to a character or to an attribute.
 } CONSOLE_READOUTPUTCODE, *PCONSOLE_READOUTPUTCODE;

@@ -379,27 +379,26 @@

ULONG NrCharactersWritten;

-    USHORT CodeType;
-    union
-    {
-        // PVOID String;
-        PVOID pCode;
-        PCHAR AsciiChar;
-        PWCHAR UnicodeChar;
-        PWORD Attribute;
-    } pCode;    // Either a pointer to a character or to an attribute.
-} CONSOLE_WRITEOUTPUTCODE, *PCONSOLE_WRITEOUTPUTCODE;
-
-typedef struct
-{
-    HANDLE OutputHandle;
-
     CODE_TYPE CodeType;
     union
     {
-        CHAR AsciiChar;
+        PVOID  pCode;
+        PCHAR  AsciiChar;
+        PWCHAR UnicodeChar;
+        PWORD  Attribute;
+    } pCode;    // Either a pointer to a character or to an attribute.
+} CONSOLE_WRITEOUTPUTCODE, *PCONSOLE_WRITEOUTPUTCODE;
+
+typedef struct
+{
+    HANDLE OutputHandle;
+
+    CODE_TYPE CodeType;
+    union
+    {
+        CHAR  AsciiChar;
         WCHAR UnicodeChar;
-        WORD Attribute;
+        WORD  Attribute;
     } Code; // Either a character or an attribute.

COORD Coord;