xt-sys/exectos
xt-sys/exectos
3
5
Fork 3
Code Issues 3 Pull Requests 1 Actions Projects 1 Releases Wiki Activity

Fix XTLDR configuration
All checks were successful
Builds / ExectOS (amd64) (push) Successful in 28s
Details
Builds / ExectOS (i686) (push) Successful in 29s
Details

Browse Source
This commit is contained in:
Rafal Kupiec 2023-12-22 23:36:09 +01:00
parent 32042ef643
commit 113a46ef10
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
4 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
xtldr2/config.c
View File

@ -30,26 +30,22 @@ BlGetConfigValue(IN CONST PWCHAR ConfigName)
/* Get config entry name length */ /* Get config entry name length */
Length = RtlWideStringLength(ConfigName, 0); Length = RtlWideStringLength(ConfigName, 0);
/* Make sure config list is not empty */ /* Iterate through config entries */
if(BlpConfig != NULL) ConfigListEntry = BlpConfig.Flink;
while(ConfigListEntry != &BlpConfig)
{ {
/* Iterate through config entries */ /* Get config entry */
ConfigListEntry = BlpConfig->Flink; ConfigEntry = CONTAIN_RECORD(ConfigListEntry, XTBL_CONFIG_ENTRY, Flink);
while(ConfigListEntry != BlpConfig)
/* Check if requested configuration found */
if(RtlCompareWideStringInsensitive(ConfigEntry->Name, ConfigName, Length) == 0)
{ {
/* Get config entry */ /* Return config value */
ConfigEntry = CONTAIN_RECORD(ConfigListEntry, XTBL_CONFIG_ENTRY, Flink); return ConfigEntry->Value;
/* Check if requested configuration found */
if(RtlCompareWideStringInsensitive(ConfigEntry->Name, ConfigName, Length) == 0)
{
/* Return config value */
return ConfigEntry->Value;
}
/* Move to the next config entry */
ConfigListEntry = ConfigListEntry->Flink;
} }
/* Move to the next config entry */
ConfigListEntry = ConfigListEntry->Flink;
} }
/* Config entry not found, return NULL */ /* Config entry not found, return NULL */
@ -82,8 +78,8 @@ BlSetConfigValue(IN CONST PWCHAR ConfigName,
Length = RtlWideStringLength(ConfigName, 0); Length = RtlWideStringLength(ConfigName, 0);
/* Iterate through config entries */ /* Iterate through config entries */
ConfigListEntry = BlpConfig->Flink; ConfigListEntry = BlpConfig.Flink;
while(ConfigListEntry != BlpConfig) while(ConfigListEntry != &BlpConfig)
{ {
/* Get config entry */ /* Get config entry */
ConfigEntry = CONTAIN_RECORD(ConfigListEntry, XTBL_CONFIG_ENTRY, Flink); ConfigEntry = CONTAIN_RECORD(ConfigListEntry, XTBL_CONFIG_ENTRY, Flink);
@ -564,8 +560,9 @@ BlpUpdateConfiguration(IN PLIST_ENTRY NewConfig)
/* Make sure config entry does not exist yet */ /* Make sure config entry does not exist yet */
if(BlGetConfigValue(ConfigEntry->Name) == NULL) if(BlGetConfigValue(ConfigEntry->Name) == NULL)
{ {
/* Put new config entry into global config list */ /* Remove new config entry from input list and put it into global config list */
RtlInsertTailList(BlpConfig, &ConfigEntry->Flink); RtlRemoveEntryList(&ConfigEntry->Flink);
RtlInsertTailList(&BlpConfig, &ConfigEntry->Flink);
} }
/* Move to the next new config entry */ /* Move to the next new config entry */

2
xtldr2/efiutils.c
View File

@ -144,7 +144,7 @@ BlpInitializeEfiBootLoader()
BlConsolePrint(L"XTLDR boot loader v%s\n", XTOS_VERSION); BlConsolePrint(L"XTLDR boot loader v%s\n", XTOS_VERSION);
/* Initialize XTLDR configuration list */ /* Initialize XTLDR configuration list */
RtlInitializeListHead(BlpConfig); RtlInitializeListHead(&BlpConfig);
/* Check if debug is enabled */ /* Check if debug is enabled */
if(DEBUG) if(DEBUG)

2
xtldr2/globals.c
View File

@ -10,7 +10,7 @@
/* XT Boot Loader configuration list */ /* XT Boot Loader configuration list */
PLIST_ENTRY BlpConfig; LIST_ENTRY BlpConfig;
/* XT Boot Loader loaded configuration */ /* XT Boot Loader loaded configuration */
LIST_ENTRY BlpConfigSections; LIST_ENTRY BlpConfigSections;

2
xtldr2/includes/globals.h
View File

@ -13,7 +13,7 @@
/* XT Boot Loader configuration list */ /* XT Boot Loader configuration list */
EXTERN PLIST_ENTRY BlpConfig; EXTERN LIST_ENTRY BlpConfig;
/* XT Boot Loader loaded configuration */ /* XT Boot Loader loaded configuration */
EXTERN LIST_ENTRY BlpConfigSections; EXTERN LIST_ENTRY BlpConfigSections;