Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-07 19:58:21 +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

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

@ -1959,16 +1959,14 @@ GetConsoleCP(VOID)
/* 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;
} }
@ -1994,10 +1992,8 @@ SetConsoleCP(UINT wCodePageID)
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);
} }
@ -2017,16 +2013,14 @@ GetConsoleOutputCP(VOID)
/* 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;
} }
@ -2052,10 +2046,8 @@ SetConsoleOutputCP(UINT wCodePageID)
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);
} }

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

@ -379,10 +379,9 @@ 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;