From 6c695c12a78c9d43ae7e80aac329e808a3557c2c Mon Sep 17 00:00:00 2001 From: Nikolaj Schlej Date: Sun, 19 Feb 2023 12:38:35 -0800 Subject: [PATCH] Fix meson builds --- common/meson.build | 1 + common/nvramparser.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/common/meson.build b/common/meson.build index 3d6c6cd..2945df4 100644 --- a/common/meson.build +++ b/common/meson.build @@ -31,6 +31,7 @@ uefitoolcommon = static_library('uefitoolcommon', 'treemodel.cpp', 'utility.cpp', 'ustring.cpp', + 'generated/ami_nvar.cpp', 'generated/intel_acbp_v1.cpp', 'generated/intel_acbp_v2.cpp', 'generated/intel_keym_v1.cpp', diff --git a/common/nvramparser.cpp b/common/nvramparser.cpp index 4fd3377..2b7fbee 100755 --- a/common/nvramparser.cpp +++ b/common/nvramparser.cpp @@ -130,7 +130,7 @@ USTATUS NvramParser::parseNvarStore(const UModelIndex & index) if (previousEntry == entry) break; - if (previousEntry->next() + previousEntry->offset() == entry->offset()) { // Previous link is present and valid + if ((UINT32)previousEntry->next() + (UINT32)previousEntry->offset() == (UINT32)entry->offset()) { // Previous link is present and valid prevEntryIndex = index.model()->index(i, 0, index); // Make sure that we are linking to a valid entry NVAR_ENTRY_PARSING_DATA pd = readUnaligned((NVAR_ENTRY_PARSING_DATA*)model->parsingData(prevEntryIndex).constData());