From 589dbd5719ce492d9531c9c7af96eaa6d84dedfc Mon Sep 17 00:00:00 2001 From: Nikolaj Schlej Date: Sat, 9 Jul 2016 10:42:49 +0200 Subject: [PATCH] UT NE A30, UE 0.12.1, UD 0.1.0 - engine modifications require to make a new release of UT and UE - UEFIDump 0.1.0 with Qt-free engine, at last --- UEFIExtract/uefiextract_main.cpp | 4 ++-- UEFITool/uefitool.cpp | 2 +- common/ffsparser.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/UEFIExtract/uefiextract_main.cpp b/UEFIExtract/uefiextract_main.cpp index 1cc57ef..7782d8d 100644 --- a/UEFIExtract/uefiextract_main.cpp +++ b/UEFIExtract/uefiextract_main.cpp @@ -136,12 +136,12 @@ int main(int argc, char *argv[]) return 0; } else { // Show version and usage information - std::cout << "UEFIExtract 0.12.0" << std::endl << std::endl + std::cout << "UEFIExtract 0.12.1" << std::endl << std::endl << "Usage: UEFIExtract imagefile - generate report and dump only leaf tree items into .dump folder" << std::endl << " UEFIExtract imagefile all - generate report and dump all tree items" << std::endl << " UEFIExtract imagefile none - only generate report, no dump needed" << std::endl << " UIFIExtract imagefile GUID_1 GUID_2 ... GUID_31 - dump only FFS file(s) with specific GUID(s)" << std::endl - << "Return value is a bit mask where 0 at position N means that file with GUID_N was found and unpacked, 1 otherwise" << std::endl; + << "Return value is a bit mask where 0 at position N means that file with GUID_N was found and unpacked, 1 otherwise" << std::endl << std::endl; return 1; } diff --git a/UEFITool/uefitool.cpp b/UEFITool/uefitool.cpp index 2b5e6d3..88321f2 100644 --- a/UEFITool/uefitool.cpp +++ b/UEFITool/uefitool.cpp @@ -17,7 +17,7 @@ UEFITool::UEFITool(QWidget *parent) : QMainWindow(parent), ui(new Ui::UEFITool), -version(tr("0.30.0_alpha29")) +version(tr("NE Alpha30")) { clipboard = QApplication::clipboard(); diff --git a/common/ffsparser.cpp b/common/ffsparser.cpp index aacc1d3..5a46605 100644 --- a/common/ffsparser.cpp +++ b/common/ffsparser.cpp @@ -1028,9 +1028,9 @@ USTATUS FfsParser::parseVolumeHeader(const UByteArray & volume, const UINT32 par UINT32 alignment = 65536; // Default volume alignment is 64K if (volumeHeader->Revision == 1) { // Acquire alignment capability bit - BOOLEAN alignmentCap = volumeHeader->Attributes & EFI_FVB_ALIGNMENT_CAP; + bool alignmentCap = (volumeHeader->Attributes & EFI_FVB_ALIGNMENT_CAP) != 0; if (!alignmentCap) { - if ((volumeHeader->Attributes & 0xFFFF0000)) + if (volumeHeader->Attributes & 0xFFFF0000) msgAlignmentBitsSet = true; } // Do not check for volume alignment on revision 1 volumes