From 44a3fb63f0977646427584ad689f4a3e3e8eec6b Mon Sep 17 00:00:00 2001 From: Nikolaj Schlej Date: Sat, 31 Jan 2015 15:07:28 +0100 Subject: [PATCH] Some forgotten changes - must make sure subprojects are also compiling before commiting another big update --- UEFIFind/uefifind.cpp | 6 +++--- UEFIPatch/uefipatch.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/UEFIFind/uefifind.cpp b/UEFIFind/uefifind.cpp index 2ef611d..2a5d71b 100644 --- a/UEFIFind/uefifind.cpp +++ b/UEFIFind/uefifind.cpp @@ -86,8 +86,8 @@ UINT8 UEFIFind::find(const UINT8 mode, const bool count, const QString & hexPatt UINT8 u8_7 = *(UINT8*)(data.constData() + 14); UINT8 u8_8 = *(UINT8*)(data.constData() + 15); - QString guid = QString("%1-%2-%3-%4%5-%6%7%8%9%10%11\n").hexarg(u32, 8).hexarg(u16_1, 4).hexarg(u16_2, 4).hexarg(u8_1, 2).hexarg(u8_2, 2) - .hexarg(u8_3, 2).hexarg(u8_4, 2).hexarg(u8_5, 2).hexarg(u8_6, 2).hexarg(u8_7, 2).hexarg(u8_8, 2); + QString guid = QString("%1-%2-%3-%4%5-%6%7%8%9%10%11\n").hexarg2(u32, 8).hexarg2(u16_1, 4).hexarg2(u16_2, 4).hexarg2(u8_1, 2).hexarg2(u8_2, 2) + .hexarg2(u8_3, 2).hexarg2(u8_4, 2).hexarg2(u8_5, 2).hexarg2(u8_6, 2).hexarg2(u8_7, 2).hexarg2(u8_8, 2); result.append(guid); } @@ -122,7 +122,7 @@ UINT8 UEFIFind::findFileRecursive(const QModelIndex index, const QString & hexPa else if (mode == SEARCH_MODE_BODY) data.append(model->body(index)); else - data.append(model->header(index)).append(model->body(index)).append(model->tail(index)); + data.append(model->header(index)).append(model->body(index)); } QString hexBody = QString(data.toHex()); diff --git a/UEFIPatch/uefipatch.cpp b/UEFIPatch/uefipatch.cpp index c2e3a20..1b1537d 100644 --- a/UEFIPatch/uefipatch.cpp +++ b/UEFIPatch/uefipatch.cpp @@ -126,7 +126,7 @@ UINT8 UEFIPatch::patchFile(const QModelIndex & index, const QByteArray & fileGui if (!model || !index.isValid()) return ERR_INVALID_PARAMETER; - if (model->type(index) == Types::Section && model->subtype(index) == sectionType) { + if (model->type(index) == Types::Section && model->attributes(index) == sectionType) { QModelIndex fileIndex = model->findParentOfType(index, Types::File); if (model->type(fileIndex) == Types::File && model->header(fileIndex).left(sizeof(EFI_GUID)) == fileGuid)