Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 22:56:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FORMATTING]

Browse source 
Fix indentation and coding style. No code changes!

svn path=/trunk/; revision=63305
This commit is contained in:
Eric Kohl 2014-05-15 16:32:30 +00:00
parent 8afc11c2e4
commit ac2f92611e
5 changed files with 872 additions and 854 deletions
Download patch file Download diff file Expand all files Collapse all files

3
reactos/base/setup/usetup/native/console.c
View file

@ -1,8 +1,7 @@
#include <usetup.h> #include <usetup.h>
BOOLEAN BOOLEAN
NATIVE_InitConsole( NATIVE_InitConsole(VOID)
VOID)
{ {
return (BOOLEAN)AllocConsole(); return (BOOLEAN)AllocConsole();
} }

5
reactos/base/setup/usetup/native/fslist.c
View file

@ -11,6 +11,7 @@ NATIVE_CreateFileSystemList(
return TRUE; return TRUE;
} }
BOOLEAN BOOLEAN
NATIVE_FormatPartition( NATIVE_FormatPartition(
IN PFILE_SYSTEM_ITEM FileSystem, IN PFILE_SYSTEM_ITEM FileSystem,
@ -19,13 +20,11 @@ NATIVE_FormatPartition(
{ {
NTSTATUS Status; NTSTATUS Status;
Status = FileSystem->FormatFunc( Status = FileSystem->FormatFunc((PUNICODE_STRING)DriveRoot,
(PUNICODE_STRING)DriveRoot,
FMIFS_HARDDISK, /* MediaFlag */ FMIFS_HARDDISK, /* MediaFlag */
NULL, /* Label */ NULL, /* Label */
FileSystem->QuickFormat, /* QuickFormat */ FileSystem->QuickFormat, /* QuickFormat */
0, /* ClusterSize */ 0, /* ClusterSize */
Callback); /* Callback */ Callback); /* Callback */
return NT_SUCCESS(Status); return NT_SUCCESS(Status);
} }

133
reactos/base/setup/usetup/native/utils/console.c
View file

@ -36,7 +36,8 @@
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
BOOL WINAPI BOOL
WINAPI
AllocConsole(VOID) AllocConsole(VOID)
{ {
UNICODE_STRING ScreenName = RTL_CONSTANT_STRING(L"\\??\\BlueScreen"); UNICODE_STRING ScreenName = RTL_CONSTANT_STRING(L"\\??\\BlueScreen");
@ -46,14 +47,12 @@ AllocConsole(VOID)
NTSTATUS Status; NTSTATUS Status;
/* Open the screen */ /* Open the screen */
InitializeObjectAttributes( InitializeObjectAttributes(&ObjectAttributes,
&ObjectAttributes,
&ScreenName, &ScreenName,
0, 0,
NULL, NULL,
NULL); NULL);
Status = NtOpenFile( Status = NtOpenFile(&StdOutput,
&StdOutput,
FILE_ALL_ACCESS, FILE_ALL_ACCESS,
&ObjectAttributes, &ObjectAttributes,
&IoStatusBlock, &IoStatusBlock,
@ -63,14 +62,12 @@ AllocConsole(VOID)
return FALSE; return FALSE;
/* Open the keyboard */ /* Open the keyboard */
InitializeObjectAttributes( InitializeObjectAttributes(&ObjectAttributes,
&ObjectAttributes,
&KeyboardName, &KeyboardName,
0, 0,
NULL, NULL,
NULL); NULL);
Status = NtOpenFile( Status = NtOpenFile(&StdInput,
&StdInput,
FILE_ALL_ACCESS, FILE_ALL_ACCESS,
&ObjectAttributes, &ObjectAttributes,
&IoStatusBlock, &IoStatusBlock,
@ -82,14 +79,18 @@ AllocConsole(VOID)
return TRUE; return TRUE;
} }
BOOL WINAPI
BOOL
WINAPI
AttachConsole( AttachConsole(
IN DWORD dwProcessId) IN DWORD dwProcessId)
{ {
return FALSE; return FALSE;
} }
BOOL WINAPI
BOOL
WINAPI
FreeConsole(VOID) FreeConsole(VOID)
{ {
if (StdInput != INVALID_HANDLE_VALUE) if (StdInput != INVALID_HANDLE_VALUE)
@ -101,10 +102,12 @@ FreeConsole(VOID)
return TRUE; return TRUE;
} }
BOOL WINAPI
BOOL
WINAPI
WriteConsole( WriteConsole(
IN HANDLE hConsoleOutput, IN HANDLE hConsoleOutput,
IN const VOID* lpBuffer, IN const VOID *lpBuffer,
IN DWORD nNumberOfCharsToWrite, IN DWORD nNumberOfCharsToWrite,
OUT LPDWORD lpNumberOfCharsWritten, OUT LPDWORD lpNumberOfCharsWritten,
IN LPVOID lpReserved) IN LPVOID lpReserved)
@ -112,8 +115,7 @@ WriteConsole(
IO_STATUS_BLOCK IoStatusBlock; IO_STATUS_BLOCK IoStatusBlock;
NTSTATUS Status; NTSTATUS Status;
Status = NtWriteFile( Status = NtWriteFile(hConsoleOutput,
hConsoleOutput,
NULL, NULL,
NULL, NULL,
NULL, NULL,
@ -129,7 +131,9 @@ WriteConsole(
return TRUE; return TRUE;
} }
HANDLE WINAPI
HANDLE
WINAPI
GetStdHandle( GetStdHandle(
IN DWORD nStdHandle) IN DWORD nStdHandle)
{ {
@ -144,7 +148,9 @@ GetStdHandle(
} }
} }
BOOL WINAPI
BOOL
WINAPI
FlushConsoleInputBuffer( FlushConsoleInputBuffer(
IN HANDLE hConsoleInput) IN HANDLE hConsoleInput)
{ {
@ -156,8 +162,7 @@ FlushConsoleInputBuffer(
do do
{ {
Offset.QuadPart = 0; Offset.QuadPart = 0;
Status = NtReadFile( Status = NtReadFile(hConsoleInput,
hConsoleInput,
NULL, NULL,
NULL, NULL,
NULL, NULL,
@ -180,7 +185,9 @@ FlushConsoleInputBuffer(
return FALSE; return FALSE;
} }
BOOL WINAPI
BOOL
WINAPI
ReadConsoleInput( ReadConsoleInput(
IN HANDLE hConsoleInput, IN HANDLE hConsoleInput,
OUT PINPUT_RECORD lpBuffer, OUT PINPUT_RECORD lpBuffer,
@ -193,8 +200,7 @@ ReadConsoleInput(
NTSTATUS Status; NTSTATUS Status;
Offset.QuadPart = 0; Offset.QuadPart = 0;
Status = NtReadFile( Status = NtReadFile(hConsoleInput,
hConsoleInput,
NULL, NULL,
NULL, NULL,
NULL, NULL,
@ -220,7 +226,9 @@ ReadConsoleInput(
return TRUE; return TRUE;
} }
BOOL WINAPI
BOOL
WINAPI
WriteConsoleOutputCharacterA( WriteConsoleOutputCharacterA(
HANDLE hConsoleOutput, HANDLE hConsoleOutput,
IN LPCSTR lpCharacter, IN LPCSTR lpCharacter,
@ -234,8 +242,7 @@ WriteConsoleOutputCharacterA(
PCHAR pText; PCHAR pText;
NTSTATUS Status; NTSTATUS Status;
Buffer = (CHAR*) RtlAllocateHeap( Buffer = (CHAR*)RtlAllocateHeap(ProcessHeap,
ProcessHeap,
0, 0,
nLength + sizeof(COORD)); nLength + sizeof(COORD));
pCoord = (COORD *)Buffer; pCoord = (COORD *)Buffer;
@ -244,8 +251,7 @@ WriteConsoleOutputCharacterA(
*pCoord = dwWriteCoord; *pCoord = dwWriteCoord;
memcpy(pText, lpCharacter, nLength); memcpy(pText, lpCharacter, nLength);
Status = NtDeviceIoControlFile( Status = NtDeviceIoControlFile(hConsoleOutput,
hConsoleOutput,
NULL, NULL,
NULL, NULL,
NULL, NULL,
@ -256,10 +262,7 @@ WriteConsoleOutputCharacterA(
Buffer, Buffer,
nLength + sizeof(COORD)); nLength + sizeof(COORD));
RtlFreeHeap( RtlFreeHeap(ProcessHeap, 0, Buffer);
ProcessHeap,
0,
Buffer);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
return FALSE; return FALSE;
@ -267,7 +270,9 @@ WriteConsoleOutputCharacterA(
return TRUE; return TRUE;
} }
BOOL WINAPI
BOOL
WINAPI
WriteConsoleOutputCharacterW( WriteConsoleOutputCharacterW(
HANDLE hConsoleOutput, HANDLE hConsoleOutput,
IN LPCWSTR lpCharacter, IN LPCWSTR lpCharacter,
@ -282,8 +287,7 @@ WriteConsoleOutputCharacterW(
NTSTATUS Status; NTSTATUS Status;
ULONG i; ULONG i;
Buffer = (CHAR*) RtlAllocateHeap( Buffer = (CHAR*)RtlAllocateHeap(ProcessHeap,
ProcessHeap,
0, 0,
nLength + sizeof(COORD)); nLength + sizeof(COORD));
pCoord = (COORD *)Buffer; pCoord = (COORD *)Buffer;
@ -295,8 +299,7 @@ WriteConsoleOutputCharacterW(
for (i = 0; i < nLength; i++) for (i = 0; i < nLength; i++)
pText[i] = (CHAR)lpCharacter[i]; pText[i] = (CHAR)lpCharacter[i];
Status = NtDeviceIoControlFile( Status = NtDeviceIoControlFile(hConsoleOutput,
hConsoleOutput,
NULL, NULL,
NULL, NULL,
NULL, NULL,
@ -307,10 +310,7 @@ WriteConsoleOutputCharacterW(
Buffer, Buffer,
nLength + sizeof(COORD)); nLength + sizeof(COORD));
RtlFreeHeap( RtlFreeHeap(ProcessHeap, 0, Buffer);
ProcessHeap,
0,
Buffer);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
return FALSE; return FALSE;
@ -318,7 +318,9 @@ WriteConsoleOutputCharacterW(
return TRUE; return TRUE;
} }
BOOL WINAPI
BOOL
WINAPI
FillConsoleOutputAttribute( FillConsoleOutputAttribute(
IN HANDLE hConsoleOutput, IN HANDLE hConsoleOutput,
IN WORD wAttribute, IN WORD wAttribute,
@ -334,8 +336,7 @@ FillConsoleOutputAttribute(
Buffer.nLength = nLength; Buffer.nLength = nLength;
Buffer.dwCoord = dwWriteCoord; Buffer.dwCoord = dwWriteCoord;
Status = NtDeviceIoControlFile( Status = NtDeviceIoControlFile(hConsoleOutput,
hConsoleOutput,
NULL, NULL,
NULL, NULL,
NULL, NULL,
@ -345,7 +346,6 @@ FillConsoleOutputAttribute(
sizeof(OUTPUT_ATTRIBUTE), sizeof(OUTPUT_ATTRIBUTE),
&Buffer, &Buffer,
sizeof(OUTPUT_ATTRIBUTE)); sizeof(OUTPUT_ATTRIBUTE));
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
return FALSE; return FALSE;
@ -353,7 +353,9 @@ FillConsoleOutputAttribute(
return TRUE; return TRUE;
} }
BOOL WINAPI
BOOL
WINAPI
FillConsoleOutputCharacterA( FillConsoleOutputCharacterA(
IN HANDLE hConsoleOutput, IN HANDLE hConsoleOutput,
IN CHAR cCharacter, IN CHAR cCharacter,
@ -369,8 +371,7 @@ FillConsoleOutputCharacterA(
Buffer.nLength = nLength; Buffer.nLength = nLength;
Buffer.dwCoord = dwWriteCoord; Buffer.dwCoord = dwWriteCoord;
Status = NtDeviceIoControlFile( Status = NtDeviceIoControlFile(hConsoleOutput,
hConsoleOutput,
NULL, NULL,
NULL, NULL,
NULL, NULL,
@ -387,7 +388,9 @@ FillConsoleOutputCharacterA(
return TRUE; return TRUE;
} }
BOOL WINAPI
BOOL
WINAPI
GetConsoleScreenBufferInfo( GetConsoleScreenBufferInfo(
IN HANDLE hConsoleOutput, IN HANDLE hConsoleOutput,
OUT PCONSOLE_SCREEN_BUFFER_INFO lpConsoleScreenBufferInfo) OUT PCONSOLE_SCREEN_BUFFER_INFO lpConsoleScreenBufferInfo)
@ -395,8 +398,7 @@ GetConsoleScreenBufferInfo(
IO_STATUS_BLOCK IoStatusBlock; IO_STATUS_BLOCK IoStatusBlock;
NTSTATUS Status; NTSTATUS Status;
Status = NtDeviceIoControlFile( Status = NtDeviceIoControlFile(hConsoleOutput,
hConsoleOutput,
NULL, NULL,
NULL, NULL,
NULL, NULL,
@ -409,16 +411,17 @@ GetConsoleScreenBufferInfo(
return NT_SUCCESS(Status); return NT_SUCCESS(Status);
} }
BOOL WINAPI
BOOL
WINAPI
SetConsoleCursorInfo( SetConsoleCursorInfo(
IN HANDLE hConsoleOutput, IN HANDLE hConsoleOutput,
IN const CONSOLE_CURSOR_INFO* lpConsoleCursorInfo) IN const CONSOLE_CURSOR_INFO *lpConsoleCursorInfo)
{ {
IO_STATUS_BLOCK IoStatusBlock; IO_STATUS_BLOCK IoStatusBlock;
NTSTATUS Status; NTSTATUS Status;
Status = NtDeviceIoControlFile( Status = NtDeviceIoControlFile(hConsoleOutput,
hConsoleOutput,
NULL, NULL,
NULL, NULL,
NULL, NULL,
@ -431,7 +434,9 @@ SetConsoleCursorInfo(
return NT_SUCCESS(Status); return NT_SUCCESS(Status);
} }
BOOL WINAPI
BOOL
WINAPI
SetConsoleCursorPosition( SetConsoleCursorPosition(
IN HANDLE hConsoleOutput, IN HANDLE hConsoleOutput,
IN COORD dwCursorPosition) IN COORD dwCursorPosition)
@ -447,8 +452,7 @@ SetConsoleCursorPosition(
ConsoleScreenBufferInfo.dwCursorPosition.X = dwCursorPosition.X; ConsoleScreenBufferInfo.dwCursorPosition.X = dwCursorPosition.X;
ConsoleScreenBufferInfo.dwCursorPosition.Y = dwCursorPosition.Y; ConsoleScreenBufferInfo.dwCursorPosition.Y = dwCursorPosition.Y;
Status = NtDeviceIoControlFile( Status = NtDeviceIoControlFile(hConsoleOutput,
hConsoleOutput,
NULL, NULL,
NULL, NULL,
NULL, NULL,
@ -458,11 +462,12 @@ SetConsoleCursorPosition(
sizeof(CONSOLE_SCREEN_BUFFER_INFO), sizeof(CONSOLE_SCREEN_BUFFER_INFO),
NULL, NULL,
0); 0);
return NT_SUCCESS(Status); return NT_SUCCESS(Status);
} }
BOOL WINAPI
BOOL
WINAPI
SetConsoleTextAttribute( SetConsoleTextAttribute(
IN HANDLE hConsoleOutput, IN HANDLE hConsoleOutput,
IN WORD wAttributes) IN WORD wAttributes)
@ -470,8 +475,7 @@ SetConsoleTextAttribute(
IO_STATUS_BLOCK IoStatusBlock; IO_STATUS_BLOCK IoStatusBlock;
NTSTATUS Status; NTSTATUS Status;
Status = NtDeviceIoControlFile( Status = NtDeviceIoControlFile(hConsoleOutput,
hConsoleOutput,
NULL, NULL,
NULL, NULL,
NULL, NULL,
@ -484,7 +488,9 @@ SetConsoleTextAttribute(
return NT_SUCCESS(Status); return NT_SUCCESS(Status);
} }
BOOL WINAPI
BOOL
WINAPI
SetConsoleOutputCP( SetConsoleOutputCP(
IN UINT wCodepage) IN UINT wCodepage)
{ {
@ -494,8 +500,7 @@ SetConsoleOutputCP(
hConsoleOutput = GetStdHandle(STD_OUTPUT_HANDLE); hConsoleOutput = GetStdHandle(STD_OUTPUT_HANDLE);
Status = NtDeviceIoControlFile( Status = NtDeviceIoControlFile(hConsoleOutput,
hConsoleOutput,
NULL, NULL,
NULL, NULL,
NULL, NULL,

49
reactos/base/setup/usetup/native/utils/console.h
View file

@ -26,14 +26,17 @@
#pragma once #pragma once
BOOL WINAPI BOOL
WINAPI
AllocConsole(VOID); AllocConsole(VOID);
BOOL WINAPI BOOL
WINAPI
AttachConsole( AttachConsole(
IN DWORD dwProcessId); IN DWORD dwProcessId);
BOOL WINAPI BOOL
WINAPI
FillConsoleOutputAttribute( FillConsoleOutputAttribute(
IN HANDLE hConsoleOutput, IN HANDLE hConsoleOutput,
IN WORD wAttribute, IN WORD wAttribute,
@ -41,7 +44,8 @@ FillConsoleOutputAttribute(
IN COORD dwWriteCoord, IN COORD dwWriteCoord,
OUT LPDWORD lpNumberOfAttrsWritten); OUT LPDWORD lpNumberOfAttrsWritten);
BOOL WINAPI BOOL
WINAPI
FillConsoleOutputCharacterA( FillConsoleOutputCharacterA(
IN HANDLE hConsoleOutput, IN HANDLE hConsoleOutput,
IN CHAR cCharacter, IN CHAR cCharacter,
@ -49,49 +53,58 @@ FillConsoleOutputCharacterA(
IN COORD dwWriteCoord, IN COORD dwWriteCoord,
OUT LPDWORD lpNumberOfCharsWritten); OUT LPDWORD lpNumberOfCharsWritten);
BOOL WINAPI BOOL
WINAPI
FreeConsole(VOID); FreeConsole(VOID);
BOOL WINAPI BOOL
WINAPI
GetConsoleScreenBufferInfo( GetConsoleScreenBufferInfo(
IN HANDLE hConsoleOutput, IN HANDLE hConsoleOutput,
OUT PCONSOLE_SCREEN_BUFFER_INFO lpConsoleScreenBufferInfo); OUT PCONSOLE_SCREEN_BUFFER_INFO lpConsoleScreenBufferInfo);
HANDLE WINAPI HANDLE
WINAPI
GetStdHandle( GetStdHandle(
IN DWORD nStdHandle); IN DWORD nStdHandle);
BOOL WINAPI BOOL
WINAPI
ReadConsoleInput( ReadConsoleInput(
IN HANDLE hConsoleInput, IN HANDLE hConsoleInput,
OUT PINPUT_RECORD lpBuffer, OUT PINPUT_RECORD lpBuffer,
IN DWORD nLength, IN DWORD nLength,
OUT LPDWORD lpNumberOfEventsRead); OUT LPDWORD lpNumberOfEventsRead);
BOOL WINAPI BOOL
WINAPI
SetConsoleCursorInfo( SetConsoleCursorInfo(
IN HANDLE hConsoleOutput, IN HANDLE hConsoleOutput,
IN const CONSOLE_CURSOR_INFO* lpConsoleCursorInfo); IN const CONSOLE_CURSOR_INFO *lpConsoleCursorInfo);
BOOL WINAPI BOOL
WINAPI
SetConsoleCursorPosition( SetConsoleCursorPosition(
IN HANDLE hConsoleOutput, IN HANDLE hConsoleOutput,
IN COORD dwCursorPosition); IN COORD dwCursorPosition);
BOOL WINAPI BOOL
WINAPI
SetConsoleTextAttribute( SetConsoleTextAttribute(
IN HANDLE hConsoleOutput, IN HANDLE hConsoleOutput,
IN WORD wAttributes); IN WORD wAttributes);
BOOL WINAPI BOOL
WINAPI
WriteConsole( WriteConsole(
IN HANDLE hConsoleOutput, IN HANDLE hConsoleOutput,
IN const VOID* lpBuffer, IN const VOID *lpBuffer,
IN DWORD nNumberOfCharsToWrite, IN DWORD nNumberOfCharsToWrite,
OUT LPDWORD lpNumberOfCharsWritten, OUT LPDWORD lpNumberOfCharsWritten,
IN LPVOID lpReserved); IN LPVOID lpReserved);
BOOL WINAPI BOOL
WINAPI
WriteConsoleOutputCharacterA( WriteConsoleOutputCharacterA(
HANDLE hConsoleOutput, HANDLE hConsoleOutput,
IN LPCSTR lpCharacter, IN LPCSTR lpCharacter,
@ -99,7 +112,8 @@ WriteConsoleOutputCharacterA(
IN COORD dwWriteCoord, IN COORD dwWriteCoord,
OUT LPDWORD lpNumberOfCharsWritten); OUT LPDWORD lpNumberOfCharsWritten);
BOOL WINAPI BOOL
WINAPI
WriteConsoleOutputCharacterW( WriteConsoleOutputCharacterW(
HANDLE hConsoleOutput, HANDLE hConsoleOutput,
IN LPCSTR lpCharacter, IN LPCSTR lpCharacter,
@ -107,7 +121,8 @@ WriteConsoleOutputCharacterW(
IN COORD dwWriteCoord, IN COORD dwWriteCoord,
OUT LPDWORD lpNumberOfCharsWritten); OUT LPDWORD lpNumberOfCharsWritten);
BOOL WINAPI BOOL
WINAPI
SetConsoleOutputCP( SetConsoleOutputCP(
IN UINT wCodePageID IN UINT wCodePageID
); );