Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-12 23:55:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[KERNEL32]

Browse source 
Code formatting only + member variable type fix.

svn path=/trunk/; revision=59211
This commit is contained in:
Hermès Bélusca-Maïto 2013-06-14 01:00:49 +00:00
parent e3115fafaf
commit 3ada1fe593
2 changed files with 23 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
reactos/dll/win32/kernel32/client/console/console.c
View file

@ -1958,17 +1958,15 @@ GetConsoleCP(VOID)
CONSOLE_API_MESSAGE ApiMessage; CONSOLE_API_MESSAGE ApiMessage;
/* Get the Input Code Page */ /* 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, Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
NULL, NULL,
CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetCP), CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetCP),
sizeof(CONSOLE_GETSETINPUTOUTPUTCP)); sizeof(CONSOLE_GETSETINPUTOUTPUTCP));
if (!NT_SUCCESS(Status))
{ if (!NT_SUCCESS(Status)) BaseSetLastNTError(Status);
BaseSetLastNTError(Status);
return 0;
}
return ApiMessage.Data.ConsoleCPRequest.CodePage; return ApiMessage.Data.ConsoleCPRequest.CodePage;
} }
@ -1987,17 +1985,15 @@ SetConsoleCP(UINT wCodePageID)
CONSOLE_API_MESSAGE ApiMessage; CONSOLE_API_MESSAGE ApiMessage;
/* Set the Input Code Page */ /* Set the Input Code Page */
ApiMessage.Data.ConsoleCPRequest.InputCP = TRUE; ApiMessage.Data.ConsoleCPRequest.InputCP = TRUE;
ApiMessage.Data.ConsoleCPRequest.CodePage = wCodePageID; ApiMessage.Data.ConsoleCPRequest.CodePage = wCodePageID;
Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
NULL, NULL,
CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetCP), CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetCP),
sizeof(CONSOLE_GETSETINPUTOUTPUTCP)); sizeof(CONSOLE_GETSETINPUTOUTPUTCP));
if (!NT_SUCCESS(Status))
{ if (!NT_SUCCESS(Status)) BaseSetLastNTError(Status);
BaseSetLastNTError(Status);
}
return NT_SUCCESS(Status); return NT_SUCCESS(Status);
} }
@ -2016,17 +2012,15 @@ GetConsoleOutputCP(VOID)
CONSOLE_API_MESSAGE ApiMessage; CONSOLE_API_MESSAGE ApiMessage;
/* Get the Output Code Page */ /* 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, Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
NULL, NULL,
CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetCP), CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetCP),
sizeof(CONSOLE_GETSETINPUTOUTPUTCP)); sizeof(CONSOLE_GETSETINPUTOUTPUTCP));
if (!NT_SUCCESS(Status))
{ if (!NT_SUCCESS(Status)) BaseSetLastNTError(Status);
BaseSetLastNTError (Status);
return 0;
}
return ApiMessage.Data.ConsoleCPRequest.CodePage; return ApiMessage.Data.ConsoleCPRequest.CodePage;
} }
@ -2045,17 +2039,15 @@ SetConsoleOutputCP(UINT wCodePageID)
CONSOLE_API_MESSAGE ApiMessage; CONSOLE_API_MESSAGE ApiMessage;
/* Set the Output Code Page */ /* Set the Output Code Page */
ApiMessage.Data.ConsoleCPRequest.InputCP = FALSE; ApiMessage.Data.ConsoleCPRequest.InputCP = FALSE;
ApiMessage.Data.ConsoleCPRequest.CodePage = wCodePageID; ApiMessage.Data.ConsoleCPRequest.CodePage = wCodePageID;
Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
NULL, NULL,
CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetCP), CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetCP),
sizeof(CONSOLE_GETSETINPUTOUTPUTCP)); sizeof(CONSOLE_GETSETINPUTOUTPUTCP));
if (!NT_SUCCESS(Status))
{ if (!NT_SUCCESS(Status)) BaseSetLastNTError(Status);
BaseSetLastNTError(Status);
}
return NT_SUCCESS(Status); return NT_SUCCESS(Status);
} }

19
reactos/include/reactos/subsys/win/conmsg.h
View file

@ -361,10 +361,10 @@ typedef struct
CODE_TYPE CodeType; CODE_TYPE CodeType;
union union
{ {
PVOID pCode; PVOID pCode;
PCHAR AsciiChar; PCHAR AsciiChar;
PWCHAR UnicodeChar; PWCHAR UnicodeChar;
PWORD Attribute; PWORD Attribute;
} pCode; // Either a pointer to a character or to an attribute. } pCode; // Either a pointer to a character or to an attribute.
} CONSOLE_READOUTPUTCODE, *PCONSOLE_READOUTPUTCODE; } CONSOLE_READOUTPUTCODE, *PCONSOLE_READOUTPUTCODE;
@ -379,14 +379,13 @@ typedef struct
ULONG NrCharactersWritten; ULONG NrCharactersWritten;
USHORT CodeType; CODE_TYPE CodeType;
union union
{ {
// PVOID String; PVOID pCode;
PVOID pCode; PCHAR AsciiChar;
PCHAR AsciiChar;
PWCHAR UnicodeChar; PWCHAR UnicodeChar;
PWORD Attribute; PWORD Attribute;
} pCode; // Either a pointer to a character or to an attribute. } pCode; // Either a pointer to a character or to an attribute.
} CONSOLE_WRITEOUTPUTCODE, *PCONSOLE_WRITEOUTPUTCODE; } CONSOLE_WRITEOUTPUTCODE, *PCONSOLE_WRITEOUTPUTCODE;
@ -397,9 +396,9 @@ typedef struct
CODE_TYPE CodeType; CODE_TYPE CodeType;
union union
{ {
CHAR AsciiChar; CHAR AsciiChar;
WCHAR UnicodeChar; WCHAR UnicodeChar;
WORD Attribute; WORD Attribute;
} Code; // Either a character or an attribute. } Code; // Either a character or an attribute.
COORD Coord; COORD Coord;