jh163888/UEFITool
1
0
Fork 0
mirror of https://github.com/LongSoft/UEFITool.git synced 2024-11-22 07:58:22 +08:00
Code Issues Projects Releases Wiki Activity

Fix wrong GUIDs and release build

Browse Source
This commit is contained in:
Nikolaj Schlej 2016-03-21 10:19:02 +01:00
parent 36c26595a0
commit 95e5ee2496
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/ffsparser.cpp
View File

@ -2895,7 +2895,9 @@ STATUS FfsParser::parseNvarStorage(const QByteArray & data, const QModelIndex &
bool hasExtendedHeader = false; bool hasExtendedHeader = false;
bool hasChecksum = false; bool hasChecksum = false;
bool hasTimestampAndHash = false; bool hasTimestampAndHash = false;
bool hasGuidIndex = false;
UINT32 guidIndex = 0;
UINT8 storedChecksum = 0; UINT8 storedChecksum = 0;
UINT8 calculatedChecksum = 0; UINT8 calculatedChecksum = 0;
UINT16 extendedHeaderSize = 0; UINT16 extendedHeaderSize = 0;
@ -3093,13 +3095,14 @@ STATUS FfsParser::parseNvarStorage(const QByteArray & data, const QModelIndex &
} }
// GUID is stored in GUID list at the end of the storage // GUID is stored in GUID list at the end of the storage
else { else {
UINT32 guidIndex = *(UINT8*)(variableHeader + 1); guidIndex = *(UINT8*)(variableHeader + 1);
if (guidsInStorage < guidIndex + 1) if (guidsInStorage < guidIndex + 1)
guidsInStorage = guidIndex + 1; guidsInStorage = guidIndex + 1;
// The list begins at the end of the storage and goes backwards // The list begins at the end of the storage and goes backwards
const EFI_GUID* guidPtr = (const EFI_GUID*)(data.constData() + data.size()) - guidIndex; const EFI_GUID* guidPtr = (const EFI_GUID*)(data.constData() + data.size()) - 1 - guidIndex;
name = guidToQString(*guidPtr); name = guidToQString(*guidPtr);
hasGuidIndex = true;
} }
// Include variable name and GUID into the header and remove them from body // Include variable name and GUID into the header and remove them from body
@ -3122,6 +3125,10 @@ parsing_done:
else // Add GUID info for valid variables else // Add GUID info for valid variables
info += QObject::tr("Variable GUID: %1\n").arg(name); info += QObject::tr("Variable GUID: %1\n").arg(name);
// Add GUID index information
if (hasGuidIndex)
info += QObject::tr("GUID index: %1\n").arg(guidIndex);
// Add header, body and extended data info // Add header, body and extended data info
info += QObject::tr("Full size: %1h (%2)\nHeader size %3h (%4)\nBody size: %5h (%6)") info += QObject::tr("Full size: %1h (%2)\nHeader size %3h (%4)\nBody size: %5h (%6)")
.hexarg(variableHeader->Size).arg(variableHeader->Size) .hexarg(variableHeader->Size).arg(variableHeader->Size)
@ -3180,7 +3187,7 @@ parsing_done:
.hexarg(extendedData.size()), varIndex); .hexarg(extendedData.size()), varIndex);
// Check variable name to be in the list of nesting variables // Check variable name to be in the list of nesting variables
for (std::vector<CHAR8*>::const_iterator iter = nestingVariableNames.cbegin(); iter != nestingVariableNames.cend(); ++iter) for (std::vector<const CHAR8*>::const_iterator iter = nestingVariableNames.cbegin(); iter != nestingVariableNames.cend(); ++iter)
if (QString(*iter) == text.toLatin1()) { if (QString(*iter) == text.toLatin1()) {
STATUS result = parseNvarStorage(body, varIndex); STATUS result = parseNvarStorage(body, varIndex);
if (result) if (result)

2
common/nvram.cpp
View File

@ -41,7 +41,7 @@ QString variableAttributesToQstring(UINT8 attributes)
return str.mid(2); // Remove the first comma and space return str.mid(2); // Remove the first comma and space
} }
std::vector<CHAR8*> nestingVariableNames = { std::vector<const CHAR8*> nestingVariableNames = {
"StdDefaults", "StdDefaults",
"MfgDefaults" "MfgDefaults"
}; };

2
common/nvram.h
View File

@ -33,7 +33,7 @@ const QByteArray NVRAM_NVAR_EXTERNAL_DEFAULTS_FILE_GUID
extern QString variableAttributesToQstring(UINT8 attributes); extern QString variableAttributesToQstring(UINT8 attributes);
extern std::vector<CHAR8*> nestingVariableNames; extern std::vector<const CHAR8*> nestingVariableNames;
// Make sure we use right packing rules // Make sure we use right packing rules
#pragma pack(push,1) #pragma pack(push,1)