This commit is contained in:
Dmitry Frolov 2018-08-29 07:06:19 +03:00
parent e516450fa8
commit 9210f167f7
5 changed files with 16 additions and 2 deletions

View file

@ -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

View file

@ -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

View file

@ -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())

View file

@ -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

View file

@ -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"));