Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-10 17:25:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FORMATTING]

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

svn path=/trunk/; revision=63259
This commit is contained in:
Eric Kohl 2014-05-12 16:14:19 +00:00
parent 5da1f1a63b
commit 3def58e0ff
8 changed files with 786 additions and 712 deletions
Download patch file Download diff file Expand all files Collapse all files

48
reactos/base/setup/usetup/progress.c
View file

@ -9,8 +9,10 @@
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/
static VOID static
DrawBorder(PPROGRESSBAR Bar) VOID
DrawBorder(
PPROGRESSBAR Bar)
{ {
COORD coPos; COORD coPos;
DWORD Written; DWORD Written;
@ -90,8 +92,11 @@ DrawBorder(PPROGRESSBAR Bar)
&Written); &Written);
} }
static VOID
DrawThickBorder(PPROGRESSBAR Bar) static
VOID
DrawThickBorder(
PPROGRESSBAR Bar)
{ {
COORD coPos; COORD coPos;
DWORD Written; DWORD Written;
@ -171,8 +176,11 @@ DrawThickBorder(PPROGRESSBAR Bar)
&Written); &Written);
} }
static VOID
DrawProgressBar(PPROGRESSBAR Bar) static
VOID
DrawProgressBar(
PPROGRESSBAR Bar)
{ {
CHAR TextBuffer[8]; CHAR TextBuffer[8];
COORD coPos; COORD coPos;
@ -222,20 +230,19 @@ DrawProgressBar(PPROGRESSBAR Bar)
coPos, coPos,
&Written); &Written);
} }
} }
PPROGRESSBAR PPROGRESSBAR
CreateProgressBar(SHORT Left, CreateProgressBar(
SHORT Left,
SHORT Top, SHORT Top,
SHORT Right, SHORT Right,
SHORT Bottom, SHORT Bottom,
SHORT TextTop, SHORT TextTop,
SHORT TextRight, SHORT TextRight,
IN BOOLEAN DoubleEdge, IN BOOLEAN DoubleEdge,
char* Text) CHAR *Text)
{ {
PPROGRESSBAR Bar; PPROGRESSBAR Bar;
@ -243,7 +250,7 @@ CreateProgressBar(SHORT Left,
0, 0,
sizeof(PROGRESSBAR)); sizeof(PROGRESSBAR));
if (Bar == NULL) if (Bar == NULL)
return(NULL); return NULL;
Bar->Left = Left; Bar->Left = Left;
Bar->Top = Top; Bar->Top = Top;
@ -264,20 +271,21 @@ CreateProgressBar(SHORT Left,
DrawProgressBar(Bar); DrawProgressBar(Bar);
return(Bar); return Bar;
} }
VOID VOID
DestroyProgressBar(PPROGRESSBAR Bar) DestroyProgressBar(
PPROGRESSBAR Bar)
{ {
RtlFreeHeap(ProcessHeap, RtlFreeHeap(ProcessHeap, 0, Bar);
0,
Bar);
} }
VOID VOID
ProgressSetStepCount(PPROGRESSBAR Bar, ProgressSetStepCount(
PPROGRESSBAR Bar,
ULONG StepCount) ULONG StepCount)
{ {
Bar->CurrentStep = 0; Bar->CurrentStep = 0;
@ -288,14 +296,16 @@ ProgressSetStepCount(PPROGRESSBAR Bar,
VOID VOID
ProgressNextStep(PPROGRESSBAR Bar) ProgressNextStep(
PPROGRESSBAR Bar)
{ {
ProgressSetStep(Bar, Bar->CurrentStep + 1); ProgressSetStep(Bar, Bar->CurrentStep + 1);
} }
VOID VOID
ProgressSetStep (PPROGRESSBAR Bar, ProgressSetStep(
PPROGRESSBAR Bar,
ULONG Step) ULONG Step)
{ {
CHAR TextBuffer[8]; CHAR TextBuffer[8];

17
reactos/base/setup/usetup/progress.h
View file

@ -50,27 +50,32 @@ typedef struct _PROGRESS
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/
PPROGRESSBAR PPROGRESSBAR
CreateProgressBar(SHORT Left, CreateProgressBar(
SHORT Left,
SHORT Top, SHORT Top,
SHORT Right, SHORT Right,
SHORT Bottom, SHORT Bottom,
SHORT TextTop, SHORT TextTop,
SHORT TextRight, SHORT TextRight,
BOOLEAN DoubleEdge, BOOLEAN DoubleEdge,
char* Text); CHAR *Text);
VOID VOID
DestroyProgressBar(PPROGRESSBAR Bar); DestroyProgressBar(
PPROGRESSBAR Bar);
VOID VOID
ProgressSetStepCount(PPROGRESSBAR Bar, ProgressSetStepCount(
PPROGRESSBAR Bar,
ULONG StepCount); ULONG StepCount);
VOID VOID
ProgressNextStep(PPROGRESSBAR Bar); ProgressNextStep(
PPROGRESSBAR Bar);
VOID VOID
ProgressSetStep (PPROGRESSBAR Bar, ProgressSetStep(
PPROGRESSBAR Bar,
ULONG Step); ULONG Step);
/* EOF */ /* EOF */

24
reactos/base/setup/usetup/registry.c
View file

@ -71,8 +71,10 @@ typedef struct _REG_DISK_MOUNT_INFO
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/
static BOOLEAN static
GetRootKey (PWCHAR Name) BOOLEAN
GetRootKey(
PWCHAR Name)
{ {
if (!_wcsicmp (Name, L"HKCR")) if (!_wcsicmp (Name, L"HKCR"))
{ {
@ -624,7 +626,8 @@ registry_callback (HINF hInf, PCWSTR Section, BOOLEAN Delete)
BOOLEAN BOOLEAN
ImportRegistryFile(PWSTR Filename, ImportRegistryFile(
PWSTR Filename,
PWSTR Section, PWSTR Section,
LCID LocaleId, LCID LocaleId,
BOOLEAN Delete) BOOLEAN Delete)
@ -638,8 +641,7 @@ ImportRegistryFile(PWSTR Filename,
wcscat(FileNameBuffer, L"\\"); wcscat(FileNameBuffer, L"\\");
wcscat(FileNameBuffer, Filename); wcscat(FileNameBuffer, Filename);
hInf = SetupOpenInfFileW( hInf = SetupOpenInfFileW(FileNameBuffer,
FileNameBuffer,
NULL, NULL,
INF_STYLE_WIN4, INF_STYLE_WIN4,
LocaleId, LocaleId,
@ -667,7 +669,8 @@ ImportRegistryFile(PWSTR Filename,
BOOLEAN BOOLEAN
SetInstallPathValue(PUNICODE_STRING InstallPath) SetInstallPathValue(
PUNICODE_STRING InstallPath)
{ {
OBJECT_ATTRIBUTES ObjectAttributes; OBJECT_ATTRIBUTES ObjectAttributes;
UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\HARDWARE"); UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\HARDWARE");
@ -706,8 +709,12 @@ SetInstallPathValue(PUNICODE_STRING InstallPath)
return TRUE; return TRUE;
} }
BOOLEAN BOOLEAN
SetMountedDeviceValue(CHAR Letter, ULONG Signature, LARGE_INTEGER StartingOffset) SetMountedDeviceValue(
CHAR Letter,
ULONG Signature,
LARGE_INTEGER StartingOffset)
{ {
OBJECT_ATTRIBUTES ObjectAttributes; OBJECT_ATTRIBUTES ObjectAttributes;
WCHAR ValueNameBuffer[16]; WCHAR ValueNameBuffer[16];
@ -765,7 +772,8 @@ SetMountedDeviceValue(CHAR Letter, ULONG Signature, LARGE_INTEGER StartingOffset
VOID VOID
SetDefaultPagefile(WCHAR Drive) SetDefaultPagefile(
WCHAR Drive)
{ {
OBJECT_ATTRIBUTES ObjectAttributes; OBJECT_ATTRIBUTES ObjectAttributes;
UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Memory Management"); UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Memory Management");

14
reactos/base/setup/usetup/registry.h
View file

@ -27,18 +27,24 @@
#pragma once #pragma once
BOOLEAN BOOLEAN
ImportRegistryFile(PWSTR Filename, ImportRegistryFile(
PWSTR Filename,
PWSTR Section, PWSTR Section,
LCID LocaleId, LCID LocaleId,
BOOLEAN Delete); BOOLEAN Delete);
BOOLEAN BOOLEAN
SetInstallPathValue(PUNICODE_STRING InstallPath); SetInstallPathValue(
PUNICODE_STRING InstallPath);
BOOLEAN BOOLEAN
SetMountedDeviceValue(CHAR Letter, ULONG Signature, LARGE_INTEGER StartingOffset); SetMountedDeviceValue(
CHAR Letter,
ULONG Signature,
LARGE_INTEGER StartingOffset);
VOID VOID
SetDefaultPagefile(WCHAR Drive); SetDefaultPagefile(
WCHAR Drive);
/* EOF */ /* EOF */

82
reactos/base/setup/usetup/settings.c
View file

@ -31,9 +31,14 @@
#define NDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
/* GLOBALS ******************************************************************/
ULONG DefaultLanguageIndex = 0;
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/
static BOOLEAN static
BOOLEAN
IsAcpiComputer(VOID) IsAcpiComputer(VOID)
{ {
UNICODE_STRING MultiKeyPathU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\MultifunctionAdapter"); UNICODE_STRING MultiKeyPathU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\MultifunctionAdapter");
@ -52,8 +57,14 @@ IsAcpiComputer(VOID)
NTSTATUS Status; NTSTATUS Status;
BOOLEAN ret = FALSE; BOOLEAN ret = FALSE;
InitializeObjectAttributes(&ObjectAttributes, &MultiKeyPathU, OBJ_CASE_INSENSITIVE, NULL, NULL); InitializeObjectAttributes(&ObjectAttributes,
Status = NtOpenKey(&hDevicesKey, KEY_ENUMERATE_SUB_KEYS, &ObjectAttributes); &MultiKeyPathU,
OBJ_CASE_INSENSITIVE,
NULL,
NULL);
Status = NtOpenKey(&hDevicesKey,
KEY_ENUMERATE_SUB_KEYS,
&ObjectAttributes);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT("NtOpenKey() failed with status 0x%08lx\n", Status); DPRINT("NtOpenKey() failed with status 0x%08lx\n", Status);
@ -170,8 +181,10 @@ cleanup:
} }
static BOOLEAN static
GetComputerIdentifier(PWSTR Identifier, BOOLEAN
GetComputerIdentifier(
PWSTR Identifier,
ULONG IdentifierLength) ULONG IdentifierLength)
{ {
OBJECT_ATTRIBUTES ObjectAttributes; OBJECT_ATTRIBUTES ObjectAttributes;
@ -212,14 +225,12 @@ GetComputerIdentifier(PWSTR Identifier,
} }
/* Get number of subkeys */ /* Get number of subkeys */
Status = NtQueryKey( Status = NtQueryKey(ProcessorsKey,
ProcessorsKey,
KeyFullInformation, KeyFullInformation,
pFullInfo, pFullInfo,
Size, Size,
&Size); &Size);
NtClose(ProcessorsKey); NtClose(ProcessorsKey);
if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW)
{ {
DPRINT("NtQueryKey() failed (Status 0x%lx)\n", Status); DPRINT("NtQueryKey() failed (Status 0x%lx)\n", Status);
@ -276,7 +287,8 @@ GetComputerIdentifier(PWSTR Identifier,
PGENERIC_LIST PGENERIC_LIST
CreateComputerTypeList(HINF InfFile) CreateComputerTypeList(
HINF InfFile)
{ {
CHAR Buffer[128]; CHAR Buffer[128];
PGENERIC_LIST List; PGENERIC_LIST List;
@ -364,8 +376,10 @@ CreateComputerTypeList(HINF InfFile)
} }
static BOOLEAN static
GetDisplayIdentifier(PWSTR Identifier, BOOLEAN
GetDisplayIdentifier(
PWSTR Identifier,
ULONG IdentifierLength) ULONG IdentifierLength)
{ {
OBJECT_ATTRIBUTES ObjectAttributes; OBJECT_ATTRIBUTES ObjectAttributes;
@ -530,7 +544,8 @@ GetDisplayIdentifier(PWSTR Identifier,
PGENERIC_LIST PGENERIC_LIST
CreateDisplayDriverList(HINF InfFile) CreateDisplayDriverList(
HINF InfFile)
{ {
CHAR Buffer[128]; CHAR Buffer[128];
PGENERIC_LIST List; PGENERIC_LIST List;
@ -630,8 +645,12 @@ CreateDisplayDriverList(HINF InfFile)
return List; return List;
} }
BOOLEAN BOOLEAN
ProcessComputerFiles(HINF InfFile, PGENERIC_LIST List, PWCHAR* AdditionalSectionName) ProcessComputerFiles(
HINF InfFile,
PGENERIC_LIST List,
PWCHAR *AdditionalSectionName)
{ {
PGENERIC_LIST_ENTRY Entry; PGENERIC_LIST_ENTRY Entry;
static WCHAR SectionName[128]; static WCHAR SectionName[128];
@ -654,7 +673,9 @@ ProcessComputerFiles(HINF InfFile, PGENERIC_LIST List, PWCHAR* AdditionalSection
BOOLEAN BOOLEAN
ProcessDisplayRegistry(HINF InfFile, PGENERIC_LIST List) ProcessDisplayRegistry(
HINF InfFile,
PGENERIC_LIST List)
{ {
PGENERIC_LIST_ENTRY Entry; PGENERIC_LIST_ENTRY Entry;
INFCONTEXT Context; INFCONTEXT Context;
@ -697,7 +718,6 @@ ProcessDisplayRegistry(HINF InfFile, PGENERIC_LIST List)
REG_DWORD, REG_DWORD,
&StartValue, &StartValue,
sizeof(ULONG)); sizeof(ULONG));
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status);
@ -771,7 +791,8 @@ ProcessDisplayRegistry(HINF InfFile, PGENERIC_LIST List)
BOOLEAN BOOLEAN
ProcessLocaleRegistry(PGENERIC_LIST List) ProcessLocaleRegistry(
PGENERIC_LIST List)
{ {
PGENERIC_LIST_ENTRY Entry; PGENERIC_LIST_ENTRY Entry;
PWCHAR LanguageId; PWCHAR LanguageId;
@ -807,7 +828,6 @@ ProcessLocaleRegistry(PGENERIC_LIST List)
Status = NtOpenKey(&KeyHandle, Status = NtOpenKey(&KeyHandle,
KEY_SET_VALUE, KEY_SET_VALUE,
&ObjectAttributes); &ObjectAttributes);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); DPRINT1("NtOpenKey() failed (Status %lx)\n", Status);
@ -851,7 +871,8 @@ ProcessLocaleRegistry(PGENERIC_LIST List)
PGENERIC_LIST PGENERIC_LIST
CreateKeyboardDriverList(HINF InfFile) CreateKeyboardDriverList(
HINF InfFile)
{ {
CHAR Buffer[128]; CHAR Buffer[128];
PGENERIC_LIST List; PGENERIC_LIST List;
@ -896,7 +917,6 @@ CreateKeyboardDriverList(HINF InfFile)
return List; return List;
} }
ULONG DefaultLanguageIndex = 0;
ULONG ULONG
GetDefaultLanguageIndex(VOID) GetDefaultLanguageIndex(VOID)
@ -904,8 +924,11 @@ GetDefaultLanguageIndex(VOID)
return DefaultLanguageIndex; return DefaultLanguageIndex;
} }
PGENERIC_LIST PGENERIC_LIST
CreateLanguageList(HINF InfFile, WCHAR * DefaultLanguage) CreateLanguageList(
HINF InfFile,
WCHAR *DefaultLanguage)
{ {
CHAR Buffer[128]; CHAR Buffer[128];
PGENERIC_LIST List; PGENERIC_LIST List;
@ -980,8 +1003,11 @@ CreateLanguageList(HINF InfFile, WCHAR * DefaultLanguage)
return List; return List;
} }
PGENERIC_LIST PGENERIC_LIST
CreateKeyboardLayoutList(HINF InfFile, WCHAR * DefaultKBLayout) CreateKeyboardLayoutList(
HINF InfFile,
WCHAR *DefaultKBLayout)
{ {
CHAR Buffer[128]; CHAR Buffer[128];
PGENERIC_LIST List; PGENERIC_LIST List;
@ -1031,7 +1057,6 @@ CreateKeyboardLayoutList(HINF InfFile, WCHAR * DefaultKBLayout)
UserData = (WCHAR*)RtlAllocateHeap(ProcessHeap, UserData = (WCHAR*)RtlAllocateHeap(ProcessHeap,
0, 0,
(wcslen(KeyName) + 1) * sizeof(WCHAR)); (wcslen(KeyName) + 1) * sizeof(WCHAR));
if (UserData == NULL) if (UserData == NULL)
{ {
/* FIXME: Handle error! */ /* FIXME: Handle error! */
@ -1067,8 +1092,10 @@ CreateKeyboardLayoutList(HINF InfFile, WCHAR * DefaultKBLayout)
return List; return List;
} }
BOOLEAN BOOLEAN
ProcessKeyboardLayoutRegistry(PGENERIC_LIST List) ProcessKeyboardLayoutRegistry(
PGENERIC_LIST List)
{ {
PGENERIC_LIST_ENTRY Entry; PGENERIC_LIST_ENTRY Entry;
PWCHAR LayoutId; PWCHAR LayoutId;
@ -1117,14 +1144,17 @@ ProcessKeyboardLayoutRegistry(PGENERIC_LIST List)
#if 0 #if 0
BOOLEAN BOOLEAN
ProcessKeyboardLayoutFiles(PGENERIC_LIST List) ProcessKeyboardLayoutFiles(
PGENERIC_LIST List)
{ {
return TRUE; return TRUE;
} }
#endif #endif
BOOLEAN BOOLEAN
SetGeoID(PWCHAR Id) SetGeoID(
PWCHAR Id)
{ {
OBJECT_ATTRIBUTES ObjectAttributes; OBJECT_ATTRIBUTES ObjectAttributes;
UNICODE_STRING KeyName; UNICODE_STRING KeyName;
@ -1133,6 +1163,7 @@ SetGeoID(PWCHAR Id)
WCHAR szKeyName[] = L"\\Registry\\User\\.DEFAULT\\Control Panel\\International\\Geo"; WCHAR szKeyName[] = L"\\Registry\\User\\.DEFAULT\\Control Panel\\International\\Geo";
WCHAR szValueName[] = L"Nation"; WCHAR szValueName[] = L"Nation";
NTSTATUS Status; NTSTATUS Status;
RtlInitUnicodeString(&KeyName, RtlInitUnicodeString(&KeyName,
szKeyName); szKeyName);
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
@ -1149,6 +1180,7 @@ SetGeoID(PWCHAR Id)
DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); DPRINT1("NtOpenKey() failed (Status %lx)\n", Status);
return FALSE; return FALSE;
} }
RtlInitUnicodeString(&ValueName, szValueName); RtlInitUnicodeString(&ValueName, szValueName);
Status = NtSetValueKey(KeyHandle, Status = NtSetValueKey(KeyHandle,
&ValueName, &ValueName,

35
reactos/base/setup/usetup/settings.h
View file

@ -27,42 +27,55 @@
#pragma once #pragma once
PGENERIC_LIST PGENERIC_LIST
CreateComputerTypeList(HINF InfFile); CreateComputerTypeList(
HINF InfFile);
PGENERIC_LIST PGENERIC_LIST
CreateDisplayDriverList(HINF InfFile); CreateDisplayDriverList(
HINF InfFile);
BOOLEAN BOOLEAN
ProcessComputerFiles(HINF InfFile, ProcessComputerFiles(
HINF InfFile,
PGENERIC_LIST List, PGENERIC_LIST List,
PWCHAR *AdditionalSectionName); PWCHAR *AdditionalSectionName);
BOOLEAN BOOLEAN
ProcessDisplayRegistry(HINF InfFile, ProcessDisplayRegistry(
HINF InfFile,
PGENERIC_LIST List); PGENERIC_LIST List);
PGENERIC_LIST PGENERIC_LIST
CreateKeyboardDriverList(HINF InfFile); CreateKeyboardDriverList(
HINF InfFile);
PGENERIC_LIST PGENERIC_LIST
CreateKeyboardLayoutList(HINF InfFile, WCHAR *DefaultKBLayout); CreateKeyboardLayoutList(
HINF InfFile,
WCHAR *DefaultKBLayout);
PGENERIC_LIST PGENERIC_LIST
CreateLanguageList(HINF InfFile, WCHAR * DefaultLanguage); CreateLanguageList(
HINF InfFile,
WCHAR *DefaultLanguage);
ULONG ULONG
GetDefaultLanguageIndex(VOID); GetDefaultLanguageIndex(VOID);
BOOLEAN BOOLEAN
ProcessLocaleRegistry(PGENERIC_LIST List); ProcessLocaleRegistry(
PGENERIC_LIST List);
BOOLEAN BOOLEAN
ProcessKeyboardLayoutRegistry(PGENERIC_LIST List); ProcessKeyboardLayoutRegistry(
PGENERIC_LIST List);
BOOLEAN BOOLEAN
ProcessKeyboardLayoutFiles(PGENERIC_LIST List); ProcessKeyboardLayoutFiles(
PGENERIC_LIST List);
BOOLEAN BOOLEAN
SetGeoID(PWCHAR Id); SetGeoID(
PWCHAR Id);
/* EOF */ /* EOF */