Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2025-03-16 14:00:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

RenameDevices can be an array

Browse Source 
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
This commit is contained in:
SergeySlice 2021-02-21 08:48:07 +03:00
parent e1a49a85b9
commit 3b1f57ba86
2 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
rEFIt_UEFI/Platform/Settings.cpp
View File

@ -938,9 +938,7 @@ FillinKextPatches (IN OUT KERNEL_AND_KEXT_PATCHES *Patches,
// KextsToPatch is an array of dict
arrayProp = DictPointer->arrayPropertyForKey("KextsToPatch");
if (arrayProp != NULL) {
INTN i;
INTN Count = arrayProp->arrayContent().size();
Patches->KextPatches.setEmpty();
if (Count > 0) {
@ -948,7 +946,7 @@ FillinKextPatches (IN OUT KERNEL_AND_KEXT_PATCHES *Patches,
const TagStruct* Dict = NULL;
DBG("KextsToPatch: %lld requested\n", Count);
for (i = 0; i < Count; i++) {
for (INTN i = 0; i < Count; i++) {
UINTN FindLen = 0, ReplaceLen = 0, MaskLen = 0;
Prop2 = arrayProp->dictElementAt(i);
if ( !Prop2->isDict() ) {
@ -2701,7 +2699,6 @@ EFI_STATUS GetEarlyUserSettings (
const TagArray* Dict2 = GraphicsDict->arrayPropertyForKey("PatchVBiosBytes"); // array of dict
if (Dict2 != NULL) {
INTN i;
INTN Count = Dict2->arrayContent().size();
if (Count > 0) {
VBIOS_PATCH_BYTES *VBiosPatch;
@ -2712,7 +2709,7 @@ EFI_STATUS GetEarlyUserSettings (
settingsData.PatchVBiosBytes = (__typeof__(settingsData.PatchVBiosBytes))AllocateZeroPool(Count * sizeof(VBIOS_PATCH_BYTES));
// get all entries
for (i = 0; i < Count; i++) {
for (INTN i = 0; i < Count; i++) {
const TagDict* dict3 = Dict2->dictElementAt(i, "Graphics/PatchVBiosBytes"_XS8);
Valid = TRUE;
// read entry
@ -3920,21 +3917,36 @@ static void getACPISettings(const TagDict *CfgDict)
}
}
}
const TagDict* RenameDevicesDict = ACPIDict->dictPropertyForKey("RenameDevices"); // dict of key/string
if ( RenameDevicesDict ) {
//arrayPropertyForKey
const TagDict* RenameDevicesDict = NULL;
INTN arraySize = 0;
const TagArray* RenameDevicesArray = ACPIDict->arrayPropertyForKey("RenameDevices");
bool RenDevIsArray = (RenameDevicesArray != NULL);
if (RenDevIsArray) {
arraySize = RenameDevicesArray->arrayContent().size();
} else {
RenameDevicesDict = ACPIDict->dictPropertyForKey("RenameDevices"); // dict of key/string
if (RenameDevicesDict) {
arraySize = 1;
}
}
if (arraySize > 0) {
gSettings.ACPI.DeviceRename.setEmpty(); //else will not change
}
for (INTN i = 0; i < arraySize; i++) {
if (RenDevIsArray) {
RenameDevicesDict = RenameDevicesArray->dictElementAt(i, "RenameDevices"_XS8);
}
if (!RenameDevicesDict) break;
INTN Count = RenameDevicesDict->dictKeyCount();
if (Count > 0) {
gSettings.ACPI.DeviceRename.setEmpty();
DBG("Devices to rename %lld\n", Count);
for (INTN i = 0; i < Count; i++) {
for (INTN j = 0; j < Count; j++) {
const TagKey* key;
const TagStruct* value;
if ( !EFI_ERROR(RenameDevicesDict->getKeyAndValueAtIndex(i, &key, &value)) ) {
if ( !EFI_ERROR(RenameDevicesDict->getKeyAndValueAtIndex(j, &key, &value)) ) {
ACPI_NAME_LIST* List = ParseACPIName(key->keyStringValue());
ACPI_NAME_LIST* List2 = (__typeof__(List2))AllocateZeroPool(sizeof(ACPI_NAME_LIST));
List2->Next = List;
// gSettings.ACPI.DeviceRename[gSettings.ACPI.DeviceRename.size()].Next = List;
gSettings.ACPI.DeviceRename.AddReference(List2, false);
while (List) {
DBG("%s:", List->Name);
@ -3945,9 +3957,9 @@ static void getACPISettings(const TagDict *CfgDict)
DBG("->will be renamed to %s\n", List2->Name);
}
}
}
} //for j < dict size
}
}
} //for i < array size
}
}

6
rEFIt_UEFI/Platform/plist/TagDict.cpp
View File

@ -167,7 +167,8 @@ const TagDict* TagDict::dictPropertyForKey(const CHAR8* key) const
const TagStruct* tag = propertyForKey(key);
if ( tag == NULL ) return NULL;
if ( !tag->isDict() ) {
panic("MALFORMED PLIST : Property value for key %s must be a dict\n", key);
// panic("MALFORMED PLIST : Property value for key %s must be a dict\n", key);
return NULL;
}
return tag->getDict();
}
@ -177,7 +178,8 @@ const TagArray* TagDict::arrayPropertyForKey(const CHAR8* key) const
const TagStruct* tag = propertyForKey(key);
if ( tag == NULL ) return NULL;
if ( !tag->isArray() ) {
panic("MALFORMED PLIST : Property value for key %s must be an array\n", key);
// panic("MALFORMED PLIST : Property value for key %s must be an array\n", key);
return NULL;
}
return tag->getArray();
}