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

UE 0.11.0

Browse Source 
- default behavior changed to only generate header.bin and body.bin for
leaf items, add "all" after file name to extract everything
This commit is contained in:
Nikolaj Schlej 2016-06-20 21:20:47 +02:00
parent ee3a256206
commit eb2d7c36f5
3 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
UEFIExtract/ffsdumper.cpp
View File

@ -22,10 +22,10 @@ FfsDumper::~FfsDumper()
{ {
} }
STATUS FfsDumper::dump(const QModelIndex & root, const QString & path, const QString & guid) STATUS FfsDumper::dump(const QModelIndex & root, const QString & path, const bool dumpAll, const QString & guid)
{ {
dumped = false; dumped = false;
UINT8 result = recursiveDump(root, path, guid); UINT8 result = recursiveDump(root, path, dumpAll, guid);
if (result) if (result)
return result; return result;
else if (!dumped) else if (!dumped)
@ -33,7 +33,7 @@ STATUS FfsDumper::dump(const QModelIndex & root, const QString & path, const QSt
return ERR_SUCCESS; return ERR_SUCCESS;
} }
STATUS FfsDumper::recursiveDump(const QModelIndex & index, const QString & path, const QString & guid) STATUS FfsDumper::recursiveDump(const QModelIndex & index, const QString & path, const bool dumpAll, const QString & guid)
{ {
if (!index.isValid()) if (!index.isValid())
return ERR_INVALID_PARAMETER; return ERR_INVALID_PARAMETER;
@ -50,6 +50,7 @@ STATUS FfsDumper::recursiveDump(const QModelIndex & index, const QString & path,
return ERR_DIR_CREATE; return ERR_DIR_CREATE;
QFile file; QFile file;
if (dumpAll || model->rowCount(index) == 0) { // Dump if leaf item or dumpAll is true
if (!model->header(index).isEmpty()) { if (!model->header(index).isEmpty()) {
file.setFileName(QObject::tr("%1/header.bin").arg(path)); file.setFileName(QObject::tr("%1/header.bin").arg(path));
if (!file.open(QFile::WriteOnly)) if (!file.open(QFile::WriteOnly))
@ -67,7 +68,9 @@ STATUS FfsDumper::recursiveDump(const QModelIndex & index, const QString & path,
file.write(model->body(index)); file.write(model->body(index));
file.close(); file.close();
} }
}
// Always dump info
QString info = QObject::tr("Type: %1\nSubtype: %2\n%3%4\n") QString info = QObject::tr("Type: %1\nSubtype: %2\n%3%4\n")
.arg(itemTypeToQString(model->type(index))) .arg(itemTypeToQString(model->type(index)))
.arg(itemSubtypeToQString(model->type(index), model->subtype(index))) .arg(itemSubtypeToQString(model->type(index), model->subtype(index)))
@ -90,7 +93,7 @@ STATUS FfsDumper::recursiveDump(const QModelIndex & index, const QString & path,
useText = !model->text(childIndex).isEmpty(); useText = !model->text(childIndex).isEmpty();
QString childPath = QString("%1/%2 %3").arg(path).arg(i).arg(useText ? model->text(childIndex) : model->name(childIndex)); QString childPath = QString("%1/%2 %3").arg(path).arg(i).arg(useText ? model->text(childIndex) : model->name(childIndex));
result = recursiveDump(childIndex, childPath, guid); result = recursiveDump(childIndex, childPath, dumpAll, guid);
if (result) if (result)
return result; return result;
} }

4
UEFIExtract/ffsdumper.h
View File

@ -30,10 +30,10 @@ public:
explicit FfsDumper(TreeModel * treeModel); explicit FfsDumper(TreeModel * treeModel);
~FfsDumper(); ~FfsDumper();
STATUS dump(const QModelIndex & root, const QString & path, const QString & guid = QString()); STATUS dump(const QModelIndex & root, const QString & path, const bool dumpAll = false, const QString & guid = QString());
private: private:
STATUS recursiveDump(const QModelIndex & root, const QString & path, const QString & guid); STATUS recursiveDump(const QModelIndex & root, const QString & path, const bool dumpAll, const QString & guid);
TreeModel* model; TreeModel* model;
bool dumped; bool dumped;
}; };

13
UEFIExtract/uefiextract_main.cpp
View File

@ -97,14 +97,17 @@ int main(int argc, char *argv[])
// Create ffsDumper // Create ffsDumper
FfsDumper ffsDumper(&model); FfsDumper ffsDumper(&model);
// Dump everyting // Dump all non-leaf elements
if (a.arguments().length() == 2) { if (a.arguments().length() == 2) {
return (ffsDumper.dump(model.index(0, 0), fileInfo.fileName().append(".dump")) != ERR_SUCCESS); return (ffsDumper.dump(model.index(0, 0), fileInfo.fileName().append(".dump")) != ERR_SUCCESS);
} }
else if (a.arguments().length() == 3 && a.arguments().at(2) == QString("all")) { // Dump everything
return (ffsDumper.dump(model.index(0, 0), fileInfo.fileName().append(".dump"), true) != ERR_SUCCESS);
}
else { // Dump specific files else { // Dump specific files
UINT32 returned = 0; UINT32 returned = 0;
for (int i = 2; i < a.arguments().length(); i++) { for (int i = 2; i < a.arguments().length(); i++) {
result = ffsDumper.dump(model.index(0, 0), fileInfo.fileName().append(".dump"), a.arguments().at(i)); result = ffsDumper.dump(model.index(0, 0), fileInfo.fileName().append(".dump"), true, a.arguments().at(i));
if (result) if (result)
returned |= (1 << (i - 1)); returned |= (1 << (i - 1));
} }
@ -112,8 +115,10 @@ int main(int argc, char *argv[])
} }
} }
else { // Show version and usage information else { // Show version and usage information
std::cout << "UEFIExtract 0.10.9" << std::endl << std::endl std::cout << "UEFIExtract 0.11.0" << std::endl << std::endl
<< "Usage: UEFIExtract imagefile [FileGUID_1 FileGUID_2 ... FileGUID_31]" << std::endl << "Usage: UEFIExtract imagefile - dumps only leaf tree items into .dump folder" << std::endl
<< " UEFIExtract imagefile all - dumps all tree items"
<< " UIFIExtract imagefile GUID_1 GUID_2 ... GUID_31 - dumps an FFS file(s) with specific GUID(s)"
<< "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;
return 1; return 1;
} }