From 9210f167f7eb12efaaafa6404162bc9d9f3ee014 Mon Sep 17 00:00:00 2001 From: Dmitry Frolov Date: Wed, 29 Aug 2018 07:06:19 +0300 Subject: [PATCH] fixes --- UEFIExtract/CMakeLists.txt | 6 ++++++ UEFIFind/CMakeLists.txt | 6 ++++++ UEFITool/uefitool.cpp | 4 ++-- common/ffsbuilder.cpp | 1 + common/ffsparser.cpp | 1 + 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/UEFIExtract/CMakeLists.txt b/UEFIExtract/CMakeLists.txt index 7c059d0..0fd6f39 100644 --- a/UEFIExtract/CMakeLists.txt +++ b/UEFIExtract/CMakeLists.txt @@ -21,6 +21,10 @@ SET(PROJECT_SOURCES ../common/LZMA/LzmaDecompress.c ../common/LZMA/SDK/C/LzmaDec.c ../common/Tiano/EfiTianoDecompress.c + ../common/LZMA/LzmaCompress.c + ../common/LZMA/SDK/C/LzmaEnc.c + ../common/Tiano/EfiTianoCompress.c + ../common/Tiano/EfiTianoCompressLegacy.c ../common/ustring.cpp ../common/sha256.c ../common/bstrlib/bstrlib.c @@ -47,6 +51,8 @@ SET(PROJECT_HEADERS ../common/utility.h ../common/LZMA/LzmaDecompress.h ../common/Tiano/EfiTianoDecompress.h + ../common/LZMA/LzmaCompress.h + ../common/Tiano/EfiTianoCompress.h ../common/ubytearray.h ../common/ustring.h ../common/bootguard.h diff --git a/UEFIFind/CMakeLists.txt b/UEFIFind/CMakeLists.txt index 1755d8b..a5484b8 100644 --- a/UEFIFind/CMakeLists.txt +++ b/UEFIFind/CMakeLists.txt @@ -20,6 +20,10 @@ SET(PROJECT_SOURCES ../common/LZMA/LzmaDecompress.c ../common/LZMA/SDK/C/LzmaDec.c ../common/Tiano/EfiTianoDecompress.c + ../common/LZMA/LzmaCompress.c + ../common/LZMA/SDK/C/LzmaEnc.c + ../common/Tiano/EfiTianoCompress.c + ../common/Tiano/EfiTianoCompressLegacy.c ../common/ustring.cpp ../common/sha256.c ../common/bstrlib/bstrlib.c @@ -45,6 +49,8 @@ SET(PROJECT_HEADERS ../common/utility.h ../common/LZMA/LzmaDecompress.h ../common/Tiano/EfiTianoDecompress.h + ../common/LZMA/LzmaCompress.h + ../common/Tiano/EfiTianoCompress.h ../common/ubytearray.h ../common/ustring.h ../common/bootguard.h diff --git a/UEFITool/uefitool.cpp b/UEFITool/uefitool.cpp index 28dc62e..731dd5b 100644 --- a/UEFITool/uefitool.cpp +++ b/UEFITool/uefitool.cpp @@ -947,7 +947,7 @@ void UEFITool::specifyPathIDA32() #if defined Q_OS_WIN path = QFileDialog::getOpenFileName(this, tr("Specify path to ida.exe"), "ida.exe", tr("IDA Pro executable (ida.exe);;All files (*)")); #else - path = QFileDialog::getOpenFileName(this, tr("Specify path to ida.exe"), "ida.exe", tr("IDA Pro executable (ida);;All files (*)")); + path = QFileDialog::getOpenFileName(this, tr("Specify path to ida binary"), "ida", tr("IDA Pro executable (ida);;All files (*)")); #endif if (path.trimmed().isEmpty()) @@ -962,7 +962,7 @@ void UEFITool::specifyPathIDA64() #if defined Q_OS_WIN path = QFileDialog::getOpenFileName(this, tr("Specify path to ida64.exe"), "ida64.exe", tr("IDA Pro 64 executable (ida64.exe);;All files (*)")); #else - path = QFileDialog::getOpenFileName(this, tr("Specify path to ida64.exe"), "ida64.exe", tr("IDA Pro 64 executable (ida64);;All files (*)")); + path = QFileDialog::getOpenFileName(this, tr("Specify path to ida64 binary"), "ida64", tr("IDA Pro 64 executable (ida64);;All files (*)")); #endif if (path.trimmed().isEmpty()) diff --git a/common/ffsbuilder.cpp b/common/ffsbuilder.cpp index acb2caf..81be6dc 100644 --- a/common/ffsbuilder.cpp +++ b/common/ffsbuilder.cpp @@ -641,6 +641,7 @@ out: // Parse non-empty pad file if (model->rowCount(index.child(i, 0))) { //TODO: handle it + msg("buildVolume: non-empty pad-file contents will be destroyed after volume modifications"); continue; } // Skip empty pad-file diff --git a/common/ffsparser.cpp b/common/ffsparser.cpp index 72eab21..359d3bb 100644 --- a/common/ffsparser.cpp +++ b/common/ffsparser.cpp @@ -1727,6 +1727,7 @@ USTATUS FfsParser::parsePadFileBody(const UModelIndex & index) // Show message msg(usprintf("%s: non-UEFI data found in pad-file", __FUNCTION__), dataIndex); + msg(usprintf("%s: non-empty pad-file contents will be destroyed after volume modifications", __FUNCTION__), dataIndex); // Rename the file model->setName(index, UString("Non-empty pad-file"));