mirrors/UEFITool
1
0
Fork 0
mirror of https://github.com/LongSoft/UEFITool.git synced 2025-05-18 00:54:47 -04:00
Code Issues Projects Releases Packages Wiki Activity

Improve DVAR parser output to be consistent with other NVRAM parsers

Browse source
This commit is contained in:
Nikolaj Schlej 2025-05-05 11:34:35 +07:00
parent a9e89129f8
commit 7073cad165
2 changed files with 32 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

34
common/ffsparser.cpp
View file

@ -1148,6 +1148,7 @@ USTATUS FfsParser::parseRawArea(const UModelIndex & index)
UModelIndex headerIndex = model->addItem(headerSize + itemOffset, Types::DellDvarStore, 0, name, UString(), info, header, body, UByteArray(), Fixed, index); UModelIndex headerIndex = model->addItem(headerSize + itemOffset, Types::DellDvarStore, 0, name, UString(), info, header, body, UByteArray(), Fixed, index);
// Add entries // Add entries
std::map<UINT16, EFI_GUID> guidMap;
UINT32 entryOffset = parsed.data_offset(); UINT32 entryOffset = parsed.data_offset();
for (const auto & entry : *parsed.entries()) { for (const auto & entry : *parsed.entries()) {
// This is the terminating entry, needs special processing // This is the terminating entry, needs special processing
@ -1245,8 +1246,8 @@ USTATUS FfsParser::parseRawArea(const UModelIndex & index)
header = dvar.mid(entryOffset, headerSize); header = dvar.mid(entryOffset, headerSize);
body = dvar.mid(entryOffset + headerSize, bodySize); body = dvar.mid(entryOffset + headerSize, bodySize);
name = usprintf("%X:%X", entry->namespace_id(), nameId); name = guidToUString(guid);
text = guidToUString(guid); text = usprintf("%X", nameId);
info = usprintf("Full size: %Xh (%u)\nHeader size: %Xh (%u)\nBody size: %Xh (%u)\nState: %02Xh\nFlags: %02Xh\nType: %02Xh\nNamespaceId: %Xh\nNameId: %Xh\n", info = usprintf("Full size: %Xh (%u)\nHeader size: %Xh (%u)\nBody size: %Xh (%u)\nState: %02Xh\nFlags: %02Xh\nType: %02Xh\nNamespaceId: %Xh\nNameId: %Xh\n",
entrySize, entrySize, entrySize, entrySize,
(UINT32)header.size(), (UINT32)header.size(), (UINT32)header.size(), (UINT32)header.size(),
@ -1257,6 +1258,8 @@ USTATUS FfsParser::parseRawArea(const UModelIndex & index)
entry->namespace_id(), entry->namespace_id(),
nameId) nameId)
+ UString("NamespaceGuid: ") + guidToUString(guid, false); + UString("NamespaceGuid: ") + guidToUString(guid, false);
guidMap.insert(std::pair<UINT8, EFI_GUID>(entry->namespace_id(), guid));
} }
// NameId entry // NameId entry
else { else {
@ -1282,7 +1285,7 @@ USTATUS FfsParser::parseRawArea(const UModelIndex & index)
header = dvar.mid(entryOffset, headerSize); header = dvar.mid(entryOffset, headerSize);
body = dvar.mid(entryOffset + headerSize, bodySize); body = dvar.mid(entryOffset + headerSize, bodySize);
name = usprintf("%X:%X", entry->namespace_id(), nameId); text = usprintf("%X", nameId);
info = usprintf("Full size: %Xh (%u)\nHeader size: %Xh (%u)\nBody size: %Xh (%u)\nState: %02Xh\nFlags: %02Xh\nType: %02Xh\nNamespaceId: %Xh\nNameId: %Xh\n", info = usprintf("Full size: %Xh (%u)\nHeader size: %Xh (%u)\nBody size: %Xh (%u)\nState: %02Xh\nFlags: %02Xh\nType: %02Xh\nNamespaceId: %Xh\nNameId: %Xh\n",
entrySize, entrySize, entrySize, entrySize,
(UINT32)header.size(), (UINT32)header.size(), (UINT32)header.size(), (UINT32)header.size(),
@ -1310,6 +1313,31 @@ USTATUS FfsParser::parseRawArea(const UModelIndex & index)
entryOffset += entrySize; entryOffset += entrySize;
} }
} }
// Reparse all NameId variables to detect invalid ones and assign name and text to valid ones
for (int i = 0; i < model->rowCount(headerIndex); i++) {
UModelIndex current = headerIndex.model()->index(i, 0, headerIndex);
if (model->subtype(current) == Subtypes::NameIdDvarEntry) {
UByteArray header = model->header(current);
const DVAR_ENTRY_HEADER* nameIdHeader = (const DVAR_ENTRY_HEADER*)header.constData();
UINT8 id = 0xFF - nameIdHeader->NamespaceIdC;
UString guid;
if (guidMap.count(id))
guid = guidToUString(guidMap[id]);
// Check for variable validity
if (guid.isEmpty()) { // Guid not found
model->setName(current, UString("Invalid"));
model->setText(current, UString());
msg(usprintf("%s: NameId variable with invalid NamespaceGuid", __FUNCTION__), current);
}
else { // Variable is OK, rename it
model->setName(current, guid);
model->addInfo(current, UString("NamespaceGuid: ") + guidToUString(guidMap[id], false));
}
}
}
} }
catch (...) { catch (...) {
// Parsing failed, need to add the candidate as Padding // Parsing failed, need to add the candidate as Padding

2
common/nvramparser.cpp
View file

@ -1223,7 +1223,7 @@ not_flm:
entryOffset += entrySize; entryOffset += entrySize;
} }
// Reparse all data variables to detect invalid ones and assign name and test to valid ones // Reparse all data variables to detect invalid ones and assign name and text to valid ones
for (int i = 0; i < model->rowCount(headerIndex); i++) { for (int i = 0; i < model->rowCount(headerIndex); i++) {
UModelIndex current = headerIndex.model()->index(i, 0, headerIndex); UModelIndex current = headerIndex.model()->index(i, 0, headerIndex);