Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-31 10:01:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SETUPLIB] Make the settings' Process* functions take an actual value instead of a GENERIC_LIST

Browse source 
The reason is to avoid enforcing the usage of a specific list
container by the users of the setup library. This is a departure
of what I originally thought would be the best, in commits
92692eae3 (r74553), 8f2c4f7a6 (r75700)

This should actually make some parts of the GUI setup code simpler
(e.g. using the win32 comboboxes to store the list contents).
This commit is contained in:
Hermès Bélusca-Maïto 2024-02-15 23:10:55 +01:00
parent fc3eeb61f3
commit b02dd8eb22
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
5 changed files with 79 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

65
base/setup/lib/settings.c
View file

@ -785,33 +785,29 @@ CreateDisplayDriverList(
BOOLEAN
ProcessComputerFiles(
IN HINF InfFile,
IN PGENERIC_LIST List,
OUT PWSTR* AdditionalSectionName)
_In_ HINF InfFile,
_In_ PCWSTR ComputerType,
_Out_ PWSTR* AdditionalSectionName)
{
PGENERIC_LIST_ENTRY Entry;
static WCHAR SectionName[128];
DPRINT("ProcessComputerFiles() called\n");
DPRINT("ProcessComputerFiles(%S) called\n", ComputerType);
Entry = GetCurrentListEntry(List);
if (Entry == NULL)
return FALSE;
RtlStringCchPrintfW(SectionName, ARRAYSIZE(SectionName),
L"Files.%s", ((PGENENTRY)GetListEntryData(Entry))->Id);
RtlStringCchPrintfW(SectionName, _countof(SectionName),
L"Files.%s", ComputerType);
*AdditionalSectionName = SectionName;
// TODO: More things to do?
return TRUE;
}
BOOLEAN
ProcessDisplayRegistry(
IN HINF InfFile,
IN PGENERIC_LIST List)
_In_ HINF InfFile,
_In_ PCWSTR DisplayType)
{
NTSTATUS Status;
PGENERIC_LIST_ENTRY Entry;
INFCONTEXT Context;
PCWSTR Buffer;
PCWSTR ServiceName;
@ -822,15 +818,9 @@ ProcessDisplayRegistry(
HANDLE KeyHandle;
WCHAR RegPath[255];
DPRINT("ProcessDisplayRegistry() called\n");
DPRINT("ProcessDisplayRegistry(%S) called\n", DisplayType);
Entry = GetCurrentListEntry(List);
if (Entry == NULL)
return FALSE;
if (!SpInfFindFirstLine(InfFile, L"Display",
((PGENENTRY)GetListEntryData(Entry))->Id,
&Context))
if (!SpInfFindFirstLine(InfFile, L"Display", DisplayType, &Context))
{
DPRINT1("SpInfFindFirstLine() failed\n");
return FALSE;
@ -935,7 +925,7 @@ ProcessDisplayRegistry(
return FALSE;
}
Height = wcstoul(Buffer, 0, 0);
Height = wcstoul(Buffer, NULL, 10);
Status = RtlWriteRegistryValue(RTL_REGISTRY_HANDLE, KeyHandle,
L"DefaultSettings.YResolution",
REG_DWORD,
@ -955,7 +945,7 @@ ProcessDisplayRegistry(
return FALSE;
}
Bpp = wcstoul(Buffer, 0, 0);
Bpp = wcstoul(Buffer, NULL, 10);
Status = RtlWriteRegistryValue(RTL_REGISTRY_HANDLE, KeyHandle,
L"DefaultSettings.BitsPerPel",
REG_DWORD,
@ -977,25 +967,14 @@ ProcessDisplayRegistry(
BOOLEAN
ProcessLocaleRegistry(
IN PGENERIC_LIST List)
_In_ PCWSTR LanguageId)
{
PGENERIC_LIST_ENTRY Entry;
PCWSTR LanguageId;
OBJECT_ATTRIBUTES ObjectAttributes;
UNICODE_STRING KeyName;
UNICODE_STRING ValueName;
HANDLE KeyHandle;
NTSTATUS Status;
Entry = GetCurrentListEntry(List);
if (Entry == NULL)
return FALSE;
LanguageId = ((PGENENTRY)GetListEntryData(Entry))->Id;
if (LanguageId == NULL)
return FALSE;
DPRINT("LanguageId: %S\n", LanguageId);
/* Open the default users locale key */
@ -1286,22 +1265,15 @@ CreateKeyboardLayoutList(
BOOLEAN
ProcessKeyboardLayoutRegistry(
IN PGENERIC_LIST List,
IN PCWSTR LanguageId)
_In_ PCWSTR pszLayoutId,
_In_ PCWSTR LanguageId)
{
PGENERIC_LIST_ENTRY Entry;
PCWSTR pszLayoutId;
KLID LayoutId;
const MUI_LAYOUTS* LayoutsList;
MUI_LAYOUTS NewLayoutsList[20]; // HACK: Hardcoded fixed size "20" is a hack. Please verify against lang/*.h
ULONG uIndex;
ULONG uOldPos = 0;
Entry = GetCurrentListEntry(List);
if (Entry == NULL)
return FALSE;
pszLayoutId = ((PGENENTRY)GetListEntryData(Entry))->Id;
LayoutId = (KLID)(pszLayoutId ? wcstoul(pszLayoutId, NULL, 16) : 0);
if (LayoutId == 0)
return FALSE;
@ -1394,10 +1366,9 @@ SetGeoID(
return TRUE;
}
BOOLEAN
SetDefaultPagefile(
IN WCHAR Drive)
_In_ WCHAR Drive)
{
NTSTATUS Status;
HANDLE KeyHandle;