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

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

View File

@ -30,12 +30,9 @@ BlGetConfigValue(IN CONST PWCHAR ConfigName)
/* Get config entry name length */
Length = RtlWideStringLength(ConfigName, 0);
/* Make sure config list is not empty */
if(BlpConfig != NULL)
{
/* Iterate through config entries */
ConfigListEntry = BlpConfig->Flink;
while(ConfigListEntry != BlpConfig)
ConfigListEntry = BlpConfig.Flink;
while(ConfigListEntry != &BlpConfig)
{
/* Get config entry */
ConfigEntry = CONTAIN_RECORD(ConfigListEntry, XTBL_CONFIG_ENTRY, Flink);
@ -50,7 +47,6 @@ BlGetConfigValue(IN CONST PWCHAR ConfigName)
/* Move to the next config entry */
ConfigListEntry = ConfigListEntry->Flink;
}
}
/* Config entry not found, return NULL */
return NULL;
@ -82,8 +78,8 @@ BlSetConfigValue(IN CONST PWCHAR ConfigName,
Length = RtlWideStringLength(ConfigName, 0);
/* Iterate through config entries */
ConfigListEntry = BlpConfig->Flink;
while(ConfigListEntry != BlpConfig)
ConfigListEntry = BlpConfig.Flink;
while(ConfigListEntry != &BlpConfig)
{
/* Get config entry */
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 */
if(BlGetConfigValue(ConfigEntry->Name) == NULL)
{
/* Put new config entry into global config list */
RtlInsertTailList(BlpConfig, &ConfigEntry->Flink);
/* Remove new config entry from input list and put it into global config list */
RtlRemoveEntryList(&ConfigEntry->Flink);
RtlInsertTailList(&BlpConfig, &ConfigEntry->Flink);
}
/* Move to the next new config entry */

View File

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

View File

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

View File

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