Make appveyor like artifacts

Travis Mac NE

.appveyor.yml

@@ -0,0 +1,28 @@
+image: Visual Studio 2015
+
+environment:
+  matrix:
+    - MSYS2_ARCH: i686
+      MSYSTEM: MINGW32
+
+clone_depth: 10
+
+build_script:
+  - cd %APPVEYOR_BUILD_FOLDER%
+  - set PATH=C:\msys64\mingw32\bin;C:\msys64\usr\bin;%PATH%
+  - bash ./unixbuild.sh
+
+deploy:
+  provider: GitHub
+  force_update: true
+  auth_token:
+    secure: zSJnpSnrKY1NO5RPVBaD/uq7UPyc+GW7ecjPFqEMsLjtnd6H+iNfROdoeuxJgt5T
+  artifact: Binaries
+  on:
+    appveyor_repo_tag: true
+
+artifacts:
+  - path: dist\**\*.zip
+    name: Binaries
+
+

.gitignore

@@ -231,3 +231,10 @@ pip-log.txt
 #############
 *.o
 Makefile
+
+UEFITool/uefitool_plugin_import.cpp
+UEFITool.app/
+.qmake.stash
+CMakeCache.txt
+CMakeFiles
+cmake_install.cmake

.travis.yml

@@ -1,28 +1,52 @@
 language: cpp
-compiler: gcc
+matrix:
-sudo: require
+  include:
-dist: trusty
+  - os: osx
+    osx_image: xcode9.2
 
-before_install:
+    compiler: clang
-    - sudo add-apt-repository ppa:beineri/opt-qt58-trusty -y
+
+    script:
+      - ./unixbuild.sh
+
+    deploy:
+      provider: releases
+      skip_cleanup: true
+      file: "dist/*.zip"
+      file_glob: true
+      api_key:
+        secure: "WjYd93lVLKHULBpUXS/WtGrkdXyAwxHOUnLJotyDmQipAQP5Ox7Kj12JwkSJGEmVOEdcbIQJyi0QxPjn1UYbYsAt6Op8zrjnYLS4G4fMdBtcxprWzid85uTW7oAAIFs7ygMVhpzxRKpu70yNb683vbThqNmaOu6RyG9aJOLtPAg="
+      on:
+        tags: true
+
+  - os: linux
+    dist: trusty
+    compiler: clang
+
+    before_install:
       - sudo apt-get update -qq
+      - sudo apt-get install -qq qt5-default qt5-qmake qtbase5-dev-tools cmake
 
-install: 
+    script:
-    - sudo apt-get -y install qt58base
+      - ./unixbuild.sh
-    - source /opt/qt58/bin/qt58-env.sh
 
-script:
+  - os: linux
-  - cd UEFITool
+    dist: trusty
-  - qmake PREFIX=/usr
+    compiler: gcc
-  - make -j4
+
-  - mkdir -p appdir/usr/bin ; mkdir -p appdir/usr/share/{applications,icons} ; cd appdir
+    before_install:
-  - cp ../UEFITool usr/bin/uefitool
+      - sudo apt-get update -qq
-  - cp ../uefitool.desktop .
+      - sudo apt-get install -qq qt5-default qt5-qmake qtbase5-dev-tools cmake
-  - cp ../icons/uefitool_256x256.png uefitool.png
+
-  - cd .. 
+    script:
-  - wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/3/linuxdeployqt-3-x86_64.AppImage" 
+      - ./unixbuild.sh
-  - chmod a+x linuxdeployqt*.AppImage
+
-  - unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
+    deploy:
-  - ./linuxdeployqt*.AppImage ./appdir/usr/bin/* -bundle-non-qt-libs
+      provider: releases
-  - ./linuxdeployqt*.AppImage ./appdir/usr/bin/* -appimage 
+      skip_cleanup: true
-  - curl --upload-file ./UEFITool-*.AppImage https://transfer.sh/UEFITool-git.$(git rev-parse --short HEAD)-x86_64.AppImage 
+      file: "dist/*.zip"
+      file_glob: true
+      api_key:
+        secure: "WjYd93lVLKHULBpUXS/WtGrkdXyAwxHOUnLJotyDmQipAQP5Ox7Kj12JwkSJGEmVOEdcbIQJyi0QxPjn1UYbYsAt6Op8zrjnYLS4G4fMdBtcxprWzid85uTW7oAAIFs7ygMVhpzxRKpu70yNb683vbThqNmaOu6RyG9aJOLtPAg="
+      on:
+        tags: true

UEFIDump/uefidump_main.cpp

@@ -1,6 +1,6 @@
 /* uefidump_main.cpp
 
-Copyright (c) 2017, LongSoft. All rights reserved.
+Copyright (c) 2018, LongSoft. All rights reserved.
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -29,7 +29,7 @@ int main(int argc, char *argv[])
         return (uefidumper.dump(buffer, UString(argv[1])) != U_SUCCESS);
     }
 
-    std::cout << "UEFIDump 0.1.6" << std::endl << std::endl
+    std::cout << "UEFIDump 0.1.9" << std::endl << std::endl
               << "Usage: UEFIDump imagefile" << std::endl;
     return 0;
 }

UEFIExtract/uefiextract.pro

@@ -25,7 +25,7 @@ SOURCES += \
  ../common/LZMA/LzmaDecompress.c \
  ../common/LZMA/SDK/C/LzmaDec.c \
  ../common/Tiano/EfiTianoDecompress.c \
- ../common/ustring.cpp
+ ../common/ustring.cpp \
  ../common/sha256.c
 
 HEADERS += \

UEFIExtract/uefiextract_main.cpp

@@ -1,5 +1,5 @@
 /* uefiextract_main.cpp
-Copyright (c) 2017, LongSoft. All rights reserved.
+Copyright (c) 2018, LongSoft. All rights reserved.
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -121,7 +121,7 @@ int main(int argc, char *argv[])
         }
     }
     // If parameters are different, show version and usage information
-    std::cout << "UEFIExtract 0.13.5" << std::endl << std::endl
+    std::cout << "UEFIExtract 0.13.8" << 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 dump   - only generate dump, no report needed." << std::endl

UEFIFind/uefifind_main.cpp

@@ -1,6 +1,6 @@
 /* uefifind_main.cpp
 
-Copyright (c) 2017, LongSoft. All rights reserved.
+Copyright (c) 2018, LongSoft. All rights reserved.
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -148,7 +148,7 @@ int main(int argc, char *argv[])
         return U_SUCCESS;
     }
     else {
-        std::cout << "UEFIFind 0.10.10" << std::endl << std::endl <<
+        std::cout << "UEFIFind 0.10.13" << std::endl << std::endl <<
             "Usage: UEFIFind {header | body | all} {list | count} pattern imagefile" << std::endl <<
             "    or UEFIFind file patternsfile imagefile" << std::endl;
         return U_INVALID_PARAMETER;

UEFITool/hexviewdialog.cpp

@@ -47,8 +47,8 @@ void HexViewDialog::setItem(const UModelIndex & index, bool bodyOnly)
     setWindowTitle(UString("Hex view: ") + (itemText.isEmpty() ? itemName : itemName + " | " + itemText));
     
     // Set hex data
-    QByteArray data;
+    QByteArray hexdata;
-    if (bodyOnly) data = model->body(index);
+    if (bodyOnly) hexdata = model->body(index);
-    else data = model->header(index) + model->body(index) + model->tail(index);
+    else hexdata = model->header(index) + model->body(index) + model->tail(index);
-    hexView->setData(data);
+    hexView->setData(hexdata);
 }

UEFITool/qhexedit2/qhexedit.cpp

@@ -165,7 +165,7 @@ void QHexEdit::setCursorPosition(qint64 position)
 
     // 3. Calc new position of cursor
     _bPosCurrent = position / 2;
-    _pxCursorY = ((position / 2 - _bPosFirst) / _bytesPerLine + 1) * _pxCharHeight;
+    _pxCursorY = (int)((position / 2 - _bPosFirst) / _bytesPerLine + 1) * _pxCharHeight;
     int x = (position % (2 * _bytesPerLine));
     if (_editAreaIsAscii)
     {
@@ -341,7 +341,7 @@ void QHexEdit::insert(qint64 pos, const QByteArray &ba)
 
 void QHexEdit::replace(qint64 pos, qint64 len, const QByteArray &ba)
 {
-    _undoStack->overwrite(pos, len, ba);
+    _undoStack->overwrite(pos, (int)len, ba);
     refresh();
 }
 

UEFITool/uefitool.cpp

@@ -17,7 +17,7 @@
 UEFITool::UEFITool(QWidget *parent) :
 QMainWindow(parent),
 ui(new Ui::UEFITool),
-version(tr("NE alpha 45"))
+version(tr("NE alpha 50"))
 {
     clipboard = QApplication::clipboard();
 
@@ -32,6 +32,7 @@ version(tr("NE alpha 45"))
     ffsFinder = NULL;
     ffsOps = NULL;
     ffsBuilder = NULL;
+    ffsReport = NULL;
 
     // Connect signals to slots
     connect(ui->actionOpenImageFile, SIGNAL(triggered()), this, SLOT(openImageFile()));
@@ -60,35 +61,21 @@ version(tr("NE alpha 45"))
     connect(ui->actionGoToOffset, SIGNAL(triggered()), this, SLOT(goToOffset()));
     connect(ui->actionGoToAddress, SIGNAL(triggered()), this, SLOT(goToAddress()));
     connect(ui->actionLoadGuidDatabase, SIGNAL(triggered()), this, SLOT(loadGuidDatabase()));
+	connect(ui->actionUnloadGuidDatabase, SIGNAL(triggered()), this, SLOT(unloadGuidDatabase()));
+	connect(ui->actionLoadDefaultGuidDatabase, SIGNAL(triggered()), this, SLOT(loadDefaultGuidDatabase()));
+    connect(ui->actionGenerateReport, SIGNAL(triggered()), this, SLOT(generateReport()));
     connect(ui->actionToggleBootGuardMarking, SIGNAL(toggled(bool)), this, SLOT(toggleBootGuardMarking(bool)));
     connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(writeSettings()));
 
     // Enable Drag-and-Drop actions
     setAcceptDrops(true);
 
+    // Disable Builder tab, doesn't work right now
+    ui->messagesTabWidget->setTabEnabled(4, false);
+
     // Set current directory
     currentDir = ".";
 
-    // Set monospace font for some controls
-    QFont font("Courier New", 10);
-#if defined Q_OS_OSX
-    font = QFont("Menlo", 10);
-#elif defined Q_OS_WIN
-    font = QFont("Consolas", 9);
-#endif
-    ui->infoEdit->setFont(font);
-    ui->parserMessagesListWidget->setFont(font);
-    ui->finderMessagesListWidget->setFont(font);
-    ui->builderMessagesListWidget->setFont(font);
-    ui->fitTableWidget->setFont(font);
-    ui->bootGuardEdit->setFont(font);
-    ui->structureTreeView->setFont(font);
-    searchDialog->ui->guidEdit->setFont(font);
-    searchDialog->ui->hexEdit->setFont(font);
-    hexViewDialog->setFont(font);
-    goToOffsetDialog->ui->hexSpinBox->setFont(font);
-    goToAddressDialog->ui->hexSpinBox->setFont(font);
-
     // Load built-in GUID database
     initGuidDatabase(":/guids.csv");
 
@@ -105,6 +92,7 @@ UEFITool::~UEFITool()
     delete ffsOps;
     delete ffsFinder;
     delete ffsParser;
+    delete ffsReport;
     delete model;
     delete hexViewDialog;
     delete searchDialog;
@@ -171,8 +159,9 @@ void UEFITool::init()
 
 void UEFITool::populateUi(const QItemSelection &selected)
 {
-    if (selected.isEmpty())
+    if (selected.isEmpty()) {
         return;
+    }
 
     populateUi(selected.indexes().at(0));
 }
@@ -180,8 +169,9 @@ void UEFITool::populateUi(const QItemSelection &selected)
 void UEFITool::populateUi(const QModelIndex &current)
 {
     // Check sanity
-    if (!current.isValid())
+    if (!current.isValid()) {
         return;
+    }
 
     UINT8 type = model->type(current);
     UINT8 subtype = model->subtype(current);
@@ -364,7 +354,7 @@ void UEFITool::goToAddress()
         return;
 
     UINT32 address = (UINT32)goToAddressDialog->ui->hexSpinBox->value();
-    QModelIndex index = model->findByOffset(address - ffsParser->getAddressDiff());
+    QModelIndex index = model->findByOffset(address - (UINT32)ffsParser->getAddressDiff());
     if (index.isValid()) {
         ui->structureTreeView->scrollTo(index, QAbstractItemView::PositionAtCenter);
         ui->structureTreeView->selectionModel()->select(index, QItemSelectionModel::Select | QItemSelectionModel::Rows | QItemSelectionModel::Clear);
@@ -384,8 +374,8 @@ void UEFITool::goToData()
         if (model->hasEmptyParsingData(index))
             continue;
 
-        UByteArray data = model->parsingData(index);
+        UByteArray rdata = model->parsingData(index);
-        const NVAR_ENTRY_PARSING_DATA* pdata = (const NVAR_ENTRY_PARSING_DATA*)data.constData();
+        const NVAR_ENTRY_PARSING_DATA* pdata = (const NVAR_ENTRY_PARSING_DATA*)rdata.constData();
         UINT32 lastVariableFlag = pdata->emptyByte ? 0xFFFFFF : 0;
         UINT32 offset = model->offset(index);
         if (pdata->next == lastVariableFlag) {
@@ -622,75 +612,75 @@ void UEFITool::extract(const UINT8 mode)
     QString path;
     if (mode == EXTRACT_MODE_AS_IS) {
         switch (type) {
-        case Types::Capsule:        path = QFileDialog::getSaveFileName(this, tr("Save capsule to file"),          name + ".cap",  "Capsule files (*.cap *.bin);;All files (*)");          break;
+        case Types::Capsule:        path = QFileDialog::getSaveFileName(this, tr("Save capsule to file"),          name + ".cap",  tr("Capsule files (*.cap *.bin);;All files (*)"));          break;
-        case Types::Image:          path = QFileDialog::getSaveFileName(this, tr("Save image to file"),            name + ".rom",  "Image files (*.rom *.bin);;All files (*)");            break;
+        case Types::Image:          path = QFileDialog::getSaveFileName(this, tr("Save image to file"),            name + ".rom",  tr("Image files (*.rom *.bin);;All files (*)"));            break;
-        case Types::Region:         path = QFileDialog::getSaveFileName(this, tr("Save region to file"),           name + ".rgn",  "Region files (*.rgn *.bin);;All files (*)");           break;
+        case Types::Region:         path = QFileDialog::getSaveFileName(this, tr("Save region to file"),           name + ".rgn",  tr("Region files (*.rgn *.bin);;All files (*)"));           break;
-        case Types::Padding:        path = QFileDialog::getSaveFileName(this, tr("Save padding to file"),          name + ".pad",  "Padding files (*.pad *.bin);;All files (*)");          break;
+        case Types::Padding:        path = QFileDialog::getSaveFileName(this, tr("Save padding to file"),          name + ".pad",  tr("Padding files (*.pad *.bin);;All files (*)"));          break;
-        case Types::Volume:         path = QFileDialog::getSaveFileName(this, tr("Save volume to file"),           name + ".vol",  "Volume files (*.vol *.bin);;All files (*)");           break;
+        case Types::Volume:         path = QFileDialog::getSaveFileName(this, tr("Save volume to file"),           name + ".vol",  tr("Volume files (*.vol *.bin);;All files (*)"));           break;
-        case Types::File:           path = QFileDialog::getSaveFileName(this, tr("Save FFS file to file"),         name + ".ffs",  "FFS files (*.ffs *.bin);;All files (*)");              break;
+        case Types::File:           path = QFileDialog::getSaveFileName(this, tr("Save FFS file to file"),         name + ".ffs",  tr("FFS files (*.ffs *.bin);;All files (*)"));              break;
-        case Types::Section:        path = QFileDialog::getSaveFileName(this, tr("Save section to file"),          name + ".sct",  "Section files (*.sct *.bin);;All files (*)");          break;
+        case Types::Section:        path = QFileDialog::getSaveFileName(this, tr("Save section to file"),          name + ".sct",  tr("Section files (*.sct *.bin);;All files (*)"));          break;
-        case Types::NvarEntry:      path = QFileDialog::getSaveFileName(this, tr("Save NVAR entry to file"),       name + ".nvar", "NVAR entry files (*.nvar *.bin);;All files (*)");      break;
+        case Types::NvarEntry:      path = QFileDialog::getSaveFileName(this, tr("Save NVAR entry to file"),       name + ".nvar", tr("NVAR entry files (*.nvar *.bin);;All files (*)"));      break;
-        case Types::VssEntry:       path = QFileDialog::getSaveFileName(this, tr("Save VSS entry to file"),        name + ".vss",  "VSS entry files (*.vss *.bin);;All files (*)");        break;
+        case Types::VssEntry:       path = QFileDialog::getSaveFileName(this, tr("Save VSS entry to file"),        name + ".vss",  tr("VSS entry files (*.vss *.bin);;All files (*)"));        break;
-        case Types::FsysEntry:      path = QFileDialog::getSaveFileName(this, tr("Save Fsys entry to file"),       name + ".fse",  "Fsys entry files (*.fse *.bin);;All files (*)");       break;
+        case Types::FsysEntry:      path = QFileDialog::getSaveFileName(this, tr("Save Fsys entry to file"),       name + ".fse",  tr("Fsys entry files (*.fse *.bin);;All files (*)"));       break;
-        case Types::EvsaEntry:      path = QFileDialog::getSaveFileName(this, tr("Save EVSA entry to file"),       name + ".evse", "EVSA entry files (*.evse *.bin);;All files (*)");      break;
+        case Types::EvsaEntry:      path = QFileDialog::getSaveFileName(this, tr("Save EVSA entry to file"),       name + ".evse", tr("EVSA entry files (*.evse *.bin);;All files (*)"));      break;
-        case Types::FlashMapEntry:  path = QFileDialog::getSaveFileName(this, tr("Save FlashMap entry to file"),   name + ".fme",  "FlashMap entry files (*.fme *.bin);;All files (*)");   break;
+        case Types::FlashMapEntry:  path = QFileDialog::getSaveFileName(this, tr("Save FlashMap entry to file"),   name + ".fme",  tr("FlashMap entry files (*.fme *.bin);;All files (*)"));   break;
-        case Types::VssStore:       path = QFileDialog::getSaveFileName(this, tr("Save VSS store to file"),        name + ".vss",  "VSS store files (*.vss *.bin);;All files (*)");        break;
+        case Types::VssStore:       path = QFileDialog::getSaveFileName(this, tr("Save VSS store to file"),        name + ".vss",  tr("VSS store files (*.vss *.bin);;All files (*)"));        break;
-        case Types::Vss2Store:      path = QFileDialog::getSaveFileName(this, tr("Save VSS2 store to file"),       name + ".vss2", "VSS2 store files (*.vss2 *.bin);;All files (*)");      break;
+        case Types::Vss2Store:      path = QFileDialog::getSaveFileName(this, tr("Save VSS2 store to file"),       name + ".vss2", tr("VSS2 store files (*.vss2 *.bin);;All files (*)"));      break;
-        case Types::FdcStore:       path = QFileDialog::getSaveFileName(this, tr("Save FDC store to file"),        name + ".fdc",  "FDC store files (*.fdc *.bin);;All files (*)");        break;
+        case Types::FdcStore:       path = QFileDialog::getSaveFileName(this, tr("Save FDC store to file"),        name + ".fdc",  tr("FDC store files (*.fdc *.bin);;All files (*)"));        break;
-        case Types::FsysStore:      path = QFileDialog::getSaveFileName(this, tr("Save Fsys store to file"),       name + ".fsys", "Fsys store files (*.fsys *.bin);;All files (*)");      break;
+        case Types::FsysStore:      path = QFileDialog::getSaveFileName(this, tr("Save Fsys store to file"),       name + ".fsys", tr("Fsys store files (*.fsys *.bin);;All files (*)"));      break;
-        case Types::EvsaStore:      path = QFileDialog::getSaveFileName(this, tr("Save EVSA store to file"),       name + ".evsa", "EVSA store files (*.evsa *.bin);;All files (*)");      break;
+        case Types::EvsaStore:      path = QFileDialog::getSaveFileName(this, tr("Save EVSA store to file"),       name + ".evsa", tr("EVSA store files (*.evsa *.bin);;All files (*)"));      break;
-        case Types::FtwStore:       path = QFileDialog::getSaveFileName(this, tr("Save FTW store to file"),        name + ".ftw",  "FTW store files (*.ftw *.bin);;All files (*)");        break;
+        case Types::FtwStore:       path = QFileDialog::getSaveFileName(this, tr("Save FTW store to file"),        name + ".ftw",  tr("FTW store files (*.ftw *.bin);;All files (*)"));        break;
-        case Types::FlashMapStore:  path = QFileDialog::getSaveFileName(this, tr("Save FlashMap store to file"),   name + ".fmap", "FlashMap store files (*.fmap *.bin);;All files (*)");  break;
+        case Types::FlashMapStore:  path = QFileDialog::getSaveFileName(this, tr("Save FlashMap store to file"),   name + ".fmap", tr("FlashMap store files (*.fmap *.bin);;All files (*)"));  break;
-        case Types::CmdbStore:      path = QFileDialog::getSaveFileName(this, tr("Save CMDB store to file"),       name + ".cmdb", "CMDB store files (*.cmdb *.bin);;All files (*)");      break;
+        case Types::CmdbStore:      path = QFileDialog::getSaveFileName(this, tr("Save CMDB store to file"),       name + ".cmdb", tr("CMDB store files (*.cmdb *.bin);;All files (*)"));      break;
-        case Types::Microcode:      path = QFileDialog::getSaveFileName(this, tr("Save microcode binary to file"), name + ".ucd",  "Microcode binary files (*.ucd *.bin);;All files (*)"); break;
+        case Types::Microcode:      path = QFileDialog::getSaveFileName(this, tr("Save microcode binary to file"), name + ".ucd",  tr("Microcode binary files (*.ucd *.bin);;All files (*)")); break;
         case Types::SlicData:
-            if (subtype == Subtypes::PubkeySlicData) path = QFileDialog::getSaveFileName(this, tr("Save SLIC pubkey to file"), name + ".spk", "SLIC pubkey files (*.spk *.bin);;All files (*)");
+            if (subtype == Subtypes::PubkeySlicData) path = QFileDialog::getSaveFileName(this, tr("Save SLIC pubkey to file"), name + ".spk", tr("SLIC pubkey files (*.spk *.bin);;All files (*)"));
-            else                                     path = QFileDialog::getSaveFileName(this, tr("Save SLIC marker to file"), name + ".smk", "SLIC marker files (*.smk *.bin);;All files (*)");
+            else                                     path = QFileDialog::getSaveFileName(this, tr("Save SLIC marker to file"), name + ".smk", tr("SLIC marker files (*.smk *.bin);;All files (*)"));
             break;
-        default:                   path = QFileDialog::getSaveFileName(this, tr("Save object to file"), name + ".bin", "Binary files (*.bin);;All files (*)");
+        default:                   path = QFileDialog::getSaveFileName(this, tr("Save object to file"), name + ".bin", tr("Binary files (*.bin);;All files (*)"));
         }
     }
     else if (mode == EXTRACT_MODE_BODY || mode == EXTRACT_MODE_BODY_UNCOMPRESSED) {
         switch (type) {
-        case Types::Capsule:                         path = QFileDialog::getSaveFileName(this, tr("Save capsule body to image file"), name + ".rom", "Image files (*.rom *.bin);;All files (*)");       break;
+        case Types::Capsule:                         path = QFileDialog::getSaveFileName(this, tr("Save capsule body to image file"), name + ".rom", tr("Image files (*.rom *.bin);;All files (*)"));       break;
-        case Types::Volume:                          path = QFileDialog::getSaveFileName(this, tr("Save volume body to file"),        name + ".vbd", "Volume body files (*.vbd *.bin);;All files (*)"); break;
+        case Types::Volume:                          path = QFileDialog::getSaveFileName(this, tr("Save volume body to file"),        name + ".vbd", tr("Volume body files (*.vbd *.bin);;All files (*)")); break;
         case Types::File: 
             if (subtype    == EFI_FV_FILETYPE_ALL
-                || subtype == EFI_FV_FILETYPE_RAW)   path = QFileDialog::getSaveFileName(this, tr("Save FFS file body to raw file"),  name + ".raw", "Raw files (*.raw *.bin);;All files (*)");
+                || subtype == EFI_FV_FILETYPE_RAW)   path = QFileDialog::getSaveFileName(this, tr("Save FFS file body to raw file"),  name + ".raw", tr("Raw files (*.raw *.bin);;All files (*)"));
-            else                                     path = QFileDialog::getSaveFileName(this, tr("Save FFS file body to file"),      name + ".fbd", "FFS file body files (*.fbd *.bin);;All files (*)");
+            else                                     path = QFileDialog::getSaveFileName(this, tr("Save FFS file body to file"),      name + ".fbd", tr("FFS file body files (*.fbd *.bin);;All files (*)"));
             break;
         case Types::Section: 
             if (subtype    == EFI_SECTION_COMPRESSION
                 || subtype == EFI_SECTION_GUID_DEFINED
-                || subtype == EFI_SECTION_DISPOSABLE)              path = QFileDialog::getSaveFileName(this, tr("Save encapsulation section body to FFS body file"), name + ".fbd", "FFS file body files (*.fbd *.bin);;All files (*)");
+                || subtype == EFI_SECTION_DISPOSABLE)              path = QFileDialog::getSaveFileName(this, tr("Save encapsulation section body to FFS body file"), name + ".fbd", tr("FFS file body files (*.fbd *.bin);;All files (*)"));
-            else if (subtype == EFI_SECTION_FIRMWARE_VOLUME_IMAGE) path = QFileDialog::getSaveFileName(this, tr("Save section body to volume file"),                 name + ".vol", "Volume files (*.vol *.bin);;All files (*)");
+            else if (subtype == EFI_SECTION_FIRMWARE_VOLUME_IMAGE) path = QFileDialog::getSaveFileName(this, tr("Save section body to volume file"),                 name + ".vol", tr("Volume files (*.vol *.bin);;All files (*)"));
-            else if (subtype == EFI_SECTION_RAW)                   path = QFileDialog::getSaveFileName(this, tr("Save section body to raw file"),                    name + ".raw", "Raw files (*.raw *.bin);;All files (*)");
+            else if (subtype == EFI_SECTION_RAW)                   path = QFileDialog::getSaveFileName(this, tr("Save section body to raw file"),                    name + ".raw", tr("Raw files (*.raw *.bin);;All files (*)"));
             else if (subtype == EFI_SECTION_PE32
                 || subtype == EFI_SECTION_TE
-                || subtype == EFI_SECTION_PIC)                     path = QFileDialog::getSaveFileName(this, tr("Save section body to EFI executable file"),         name + ".efi", "EFI executable files (*.efi *.bin);;All files (*)");
+                || subtype == EFI_SECTION_PIC)                     path = QFileDialog::getSaveFileName(this, tr("Save section body to EFI executable file"),         name + ".efi", tr("EFI executable files (*.efi *.bin);;All files (*)"));
-            else                                                   path = QFileDialog::getSaveFileName(this, tr("Save section body to file"),                        name + ".bin", "Binary files (*.bin);;All files (*)");
+            else                                                   path = QFileDialog::getSaveFileName(this, tr("Save section body to file"),                        name + ".bin", tr("Binary files (*.bin);;All files (*)"));
            break;
         case Types::NvarEntry:
         case Types::VssEntry:
         case Types::EvsaEntry:
         case Types::FlashMapEntry:
-        case Types::FsysEntry:                       path = QFileDialog::getSaveFileName(this, tr("Save entry body to file"),       name + ".bin", "Binary files (*.bin);;All files (*)"); break;
+        case Types::FsysEntry:                       path = QFileDialog::getSaveFileName(this, tr("Save entry body to file"),       name + ".bin", tr("Binary files (*.bin);;All files (*)")); break;
         case Types::VssStore:
         case Types::Vss2Store:
         case Types::FtwStore:
         case Types::FdcStore:
         case Types::FsysStore:
         case Types::FlashMapStore:
-        case Types::CmdbStore:                       path = QFileDialog::getSaveFileName(this, tr("Save store body to file"),       name + ".bin", "Binary files (*.bin);;All files (*)");                   break;
+        case Types::CmdbStore:                       path = QFileDialog::getSaveFileName(this, tr("Save store body to file"),       name + ".bin", tr("Binary files (*.bin);;All files (*)")); break;
-        case Types::Microcode:                       path = QFileDialog::getSaveFileName(this, tr("Save microcode body to file"),   name + ".ucb", "Microcode body files (*.ucb *.bin);;All files (*)"); break;
+        case Types::Microcode:                       path = QFileDialog::getSaveFileName(this, tr("Save microcode body to file"),   name + ".ucb", tr("Microcode body files (*.ucb *.bin);;All files (*)")); break;
         case Types::SlicData:
-            if (subtype == Subtypes::PubkeySlicData) path = QFileDialog::getSaveFileName(this, tr("Save SLIC pubkey body to file"), name + ".spb", "SLIC pubkey body files (*.spb *.bin);;All files (*)");
+            if (subtype == Subtypes::PubkeySlicData) path = QFileDialog::getSaveFileName(this, tr("Save SLIC pubkey body to file"), name + ".spb", tr("SLIC pubkey body files (*.spb *.bin);;All files (*)"));
-            else                                     path = QFileDialog::getSaveFileName(this, tr("Save SLIC marker body to file"), name + ".smb", "SLIC marker body files (*.smb *.bin);;All files (*)");
+            else                                     path = QFileDialog::getSaveFileName(this, tr("Save SLIC marker body to file"), name + ".smb", tr("SLIC marker body files (*.smb *.bin);;All files (*)"));
             break;
-        default:                                     path = QFileDialog::getSaveFileName(this, tr("Save object to file"),           name + ".bin", "Binary files (*.bin);;All files (*)");
+        default:                                     path = QFileDialog::getSaveFileName(this, tr("Save object to file"),           name + ".bin", tr("Binary files (*.bin);;All files (*)"));
         }
     }
-    else                                             path = QFileDialog::getSaveFileName(this, tr("Save object to file"),           name + ".bin", "Binary files (*.bin);;All files (*)");
+    else                                             path = QFileDialog::getSaveFileName(this, tr("Save object to file"),           name + ".bin", tr("Binary files (*.bin);;All files (*)"));
 
     if (path.trimmed().isEmpty())
         return;
@@ -733,7 +723,7 @@ void UEFITool::remove()
 void UEFITool::about()
 {
     QMessageBox::about(this, tr("About UEFITool"), tr(
-        "Copyright (c) 2016, Nikolaj Schlej aka <b>CodeRush</b>.<br>"
+        "Copyright (c) 2018, LongSoft"
         "Program icon made by <a href=https://www.behance.net/alzhidkov>Alexander Zhidkov</a>.<br>"
         "The program uses QHexEdit2 library made by <a href=https://github.com/Simsys/>Simsys</a>.<br>"
         "Qt-less engine is using Bstrlib made by <a href=https://github.com/websnarf/>Paul Hsieh</a>.<br><br>"
@@ -757,7 +747,7 @@ void UEFITool::exit()
 
 void UEFITool::saveImageFile()
 {
-    /*QString path = QFileDialog::getSaveFileName(this, tr("Save BIOS image file"), currentDir, "BIOS image files (*.rom *.bin *.cap *.scap *.bio *.fd *.wph *.dec);;All files (*)");
+    /*QString path = QFileDialog::getSaveFileName(this, tr("Save BIOS image file"), currentDir, tr("BIOS image files (*.rom *.bin *.cap *.scap *.bio *.fd *.wph *.dec);;All files (*)"));
 
     if (path.isEmpty())
         return;
@@ -790,13 +780,13 @@ void UEFITool::saveImageFile()
 
 void UEFITool::openImageFile()
 {
-    QString path = QFileDialog::getOpenFileName(this, tr("Open BIOS image file"), currentDir, "BIOS image files (*.rom *.bin *.cap *scap *.bio *.fd *.wph *.dec);;All files (*)");
+    QString path = QFileDialog::getOpenFileName(this, tr("Open BIOS image file"), currentDir, tr("BIOS image files (*.rom *.bin *.cap *scap *.bio *.fd *.wph *.dec);;All files (*)"));
     openImageFile(path);
 }
 
 void UEFITool::openImageFileInNewWindow()
 {
-    QString path = QFileDialog::getOpenFileName(this, tr("Open BIOS image file in new window"), currentDir, "BIOS image files (*.rom *.bin *.cap *scap *.bio *.fd *.wph *.dec);;All files (*)");
+    QString path = QFileDialog::getOpenFileName(this, tr("Open BIOS image file in new window"), currentDir, tr("BIOS image files (*.rom *.bin *.cap *scap *.bio *.fd *.wph *.dec);;All files (*)"));
     if (path.trimmed().isEmpty())
         return;
     QProcess::startDetached(currentProgramPath, QStringList(path));
@@ -848,12 +838,18 @@ void UEFITool::openImageFile(QString path)
     // ... and other operations
     delete ffsOps;
     ffsOps = new FfsOperations(model);
+    // ... and reports
+    delete ffsReport;
+    ffsReport = new FfsReport(model);
 
     // Enable goToOffset and goToAddress
     ui->actionGoToOffset->setEnabled(true);
     if (ffsParser->getAddressDiff() < 0xFFFFFFFFUL)
         ui->actionGoToAddress->setEnabled(true);
 
+    // Enable generateReport
+    ui->actionGenerateReport->setEnabled(true);
+
     // Set current directory
     currentDir = fileInfo.absolutePath();
 
@@ -1023,13 +1019,15 @@ void UEFITool::contextMenuEvent(QContextMenuEvent* event)
         return;
     }
 
-    if (!ui->structureTreeView->underMouse())
+    if (!ui->structureTreeView->underMouse()) {
         return;
+    }
 
     QPoint pt = event->pos();
     QModelIndex index = ui->structureTreeView->indexAt(ui->structureTreeView->viewport()->mapFrom(this, pt));
-    if (!index.isValid())
+    if (!index.isValid()) {
         return;
+    }
 
     switch (model->type(index))
     {
@@ -1075,6 +1073,34 @@ void UEFITool::readSettings()
     ui->structureTreeView->setColumnWidth(2, settings.value("tree/columnWidth2", ui->structureTreeView->columnWidth(2)).toInt());
     ui->structureTreeView->setColumnWidth(3, settings.value("tree/columnWidth3", ui->structureTreeView->columnWidth(3)).toInt());
     markingEnabled = settings.value("tree/markingEnabled", true).toBool();
+	ui->actionToggleBootGuardMarking->setChecked(markingEnabled);
+
+    // Set monospace font for some controls
+    QString fontName;
+    int fontSize;
+#if defined Q_OS_OSX
+    fontName = settings.value("mainWindow/fontName", QString("Menlo")).toString();
+    fontSize = settings.value("mainWindow/fontSize", 10).toInt();
+#elif defined Q_OS_WIN
+    fontName = settings.value("mainWindow/fontName", QString("Consolas")).toString();
+    fontSize = settings.value("mainWindow/fontSize", 9).toInt();
+#else
+    fontName = settings.value("mainWindow/fontName", QString("Courier New")).toString();
+    fontSize = settings.value("mainWindow/fontSize", 10).toInt();
+#endif
+    currentFont = QFont(fontName, fontSize);
+    ui->infoEdit->setFont(currentFont);
+    ui->parserMessagesListWidget->setFont(currentFont);
+    ui->finderMessagesListWidget->setFont(currentFont);
+    ui->builderMessagesListWidget->setFont(currentFont);
+    ui->fitTableWidget->setFont(currentFont);
+    ui->bootGuardEdit->setFont(currentFont);
+    ui->structureTreeView->setFont(currentFont);
+    searchDialog->ui->guidEdit->setFont(currentFont);
+    searchDialog->ui->hexEdit->setFont(currentFont);
+    hexViewDialog->setFont(currentFont);
+    goToOffsetDialog->ui->hexSpinBox->setFont(currentFont);
+    goToAddressDialog->ui->hexSpinBox->setFont(currentFont);
 }
 
 void UEFITool::writeSettings()
@@ -1091,6 +1117,8 @@ void UEFITool::writeSettings()
     settings.setValue("tree/columnWidth2", ui->structureTreeView->columnWidth(2));
     settings.setValue("tree/columnWidth3", ui->structureTreeView->columnWidth(3));
     settings.setValue("tree/markingEnabled", markingEnabled);
+    settings.setValue("mainWindow/fontName", currentFont.family());
+    settings.setValue("mainWindow/fontSize", currentFont.pointSize());
 }
 
 void UEFITool::showFitTable()
@@ -1155,10 +1183,44 @@ void UEFITool::currentTabChanged(int index)
 
 void UEFITool::loadGuidDatabase()
 {
-    QString path = QFileDialog::getOpenFileName(this, tr("Select GUID database file to load"), currentDir, "GUID database files (*.gdb);;All files (*)");
+    QString path = QFileDialog::getOpenFileName(this, tr("Select GUID database file to load"), currentDir, tr("Comma-separated values files (*.csv);;All files (*)"));
     if (!path.isEmpty()) {
         initGuidDatabase(path);
         if (!currentPath.isEmpty() && QMessageBox::Yes == QMessageBox::information(this, tr("New GUID database loaded"), tr("Apply new GUID database on the opened file?\nUnsaved changes and tree position will be lost."), QMessageBox::Yes, QMessageBox::No))
             openImageFile(currentPath);
     }
 }
+
+void UEFITool::unloadGuidDatabase()
+{
+	initGuidDatabase();
+	if (!currentPath.isEmpty() && QMessageBox::Yes == QMessageBox::information(this, tr("GUID database unloaded"), tr("Apply changes on the opened file?\nUnsaved changes and tree position will be lost."), QMessageBox::Yes, QMessageBox::No))
+		openImageFile(currentPath);
+}
+
+void UEFITool::loadDefaultGuidDatabase()
+{
+	initGuidDatabase(":/guids.csv");
+	if (!currentPath.isEmpty() && QMessageBox::Yes == QMessageBox::information(this, tr("Default GUID database loaded"), tr("Apply default GUID database on the opened file?\nUnsaved changes and tree position will be lost."), QMessageBox::Yes, QMessageBox::No))
+		openImageFile(currentPath);
+}
+
+
+
+void UEFITool::generateReport()
+{
+    QString path = QFileDialog::getSaveFileName(this, tr("Save report to text file"), currentPath + ".report.txt", tr("Text files (*.txt);;All files (*)"));
+    if (!path.isEmpty()) {
+        std::vector<QString> report = ffsReport->generate();
+        if (report.size()) {
+            QFile file;
+            file.setFileName(path);
+            if (file.open(QFile::Text | QFile::WriteOnly)) {
+                for (size_t i = 0; i < report.size(); i++) {
+                    file.write(report[i].toLatin1().append('\n'));
+                }
+                file.close();
+            }
+        }
+    }
+}

UEFITool/uefitool.h

@@ -22,6 +22,7 @@
 #include <QFile>
 #include <QFileDialog>
 #include <QFileInfo>
+#include <QFont>
 #include <QListWidget>
 #include <QMenu>
 #include <QMessageBox>
@@ -41,6 +42,7 @@
 #include "../common/ffsparser.h"
 #include "../common/ffsops.h"
 #include "../common/ffsbuilder.h"
+#include "../common/ffsreport.h"
 #include "../common/guiddatabase.h"
 
 #include "searchdialog.h"
@@ -115,6 +117,9 @@ private slots:
     void writeSettings();
 
     void loadGuidDatabase();
+	void unloadGuidDatabase();
+	void loadDefaultGuidDatabase();
+    void generateReport();
 
     void currentTabChanged(int index);
 
@@ -123,6 +128,7 @@ private:
     TreeModel* model;
     FfsParser* ffsParser;
     FfsFinder* ffsFinder;
+    FfsReport* ffsReport;
     FfsOperations* ffsOps;
     FfsBuilder* ffsBuilder;
     SearchDialog* searchDialog;
@@ -133,6 +139,7 @@ private:
     QString currentDir;
     QString currentPath;
     QString currentProgramPath;
+    QFont currentFont;
     const QString version;
     bool markingEnabled;
 

UEFITool/uefitool.pro

@@ -32,6 +32,7 @@ HEADERS += uefitool.h \
  ../common/parsingdata.h \
  ../common/ffsbuilder.h \
  ../common/ffsparser.h \
+ ../common/ffsreport.h \
  ../common/treeitem.h \
  ../common/treemodel.h \
  ../common/LZMA/LzmaCompress.h \
@@ -64,6 +65,7 @@ SOURCES += uefitool_main.cpp \
  ../common/utility.cpp \
  ../common/ffsbuilder.cpp \
  ../common/ffsparser.cpp \
+ ../common/ffsreport.cpp \
  ../common/treeitem.cpp \
  ../common/treemodel.cpp \
  ../common/LZMA/LzmaCompress.c \

UEFITool/uefitool.ui

@@ -322,7 +322,11 @@
     <addaction name="actionOpenImageFileInNewWindow"/>
     <addaction name="actionSaveImageFile"/>
     <addaction name="separator"/>
+    <addaction name="actionGenerateReport"/>
+    <addaction name="separator"/>
     <addaction name="actionLoadGuidDatabase"/>
+    <addaction name="actionLoadDefaultGuidDatabase"/>
+    <addaction name="actionUnloadGuidDatabase"/>
     <addaction name="separator"/>
     <addaction name="actionQuit"/>
    </widget>
@@ -473,7 +477,7 @@
       <bool>false</bool>
      </property>
      <property name="title">
-      <string>Entry</string>
+      <string>&amp;Entry</string>
      </property>
      <addaction name="actionHexView"/>
      <addaction name="actionBodyHexView"/>
@@ -532,7 +536,7 @@
     <addaction name="separator"/>
     <addaction name="menuMessageActions"/>
    </widget>
-   <widget class="QMenu" name="menu_View">
+   <widget class="QMenu" name="menuView">
     <property name="title">
      <string>&amp;View</string>
     </property>
@@ -540,7 +544,7 @@
    </widget>
    <addaction name="menuFile"/>
    <addaction name="menuAction"/>
-   <addaction name="menu_View"/>
+   <addaction name="menuView"/>
    <addaction name="menuHelp"/>
   </widget>
   <action name="actionInsertAfter">
@@ -718,7 +722,7 @@
     <bool>false</bool>
    </property>
    <property name="text">
-    <string>Sear&amp;ch...</string>
+    <string>Searc&amp;h...</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+F</string>
@@ -867,12 +871,42 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>&amp;BootGuard marking</string>
+    <string>BootGuard &amp;markings</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+Shift+B</string>
    </property>
   </action>
+  <action name="actionGenerateReport">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Generate &amp;report...</string>
+   </property>
+   <property name="toolTip">
+    <string>Generate report</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Alt+R</string>
+   </property>
+  </action>
+  <action name="actionUnloadGuidDatabase">
+   <property name="text">
+    <string>&amp;Unload GUID database</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Alt+U</string>
+   </property>
+  </action>
+  <action name="actionLoadDefaultGuidDatabase">
+   <property name="text">
+    <string>Load &amp;default GUID database</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Alt+D</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources/>

UEFITool/uefitool_main.cpp

@@ -1,6 +1,6 @@
 /* uefitool_main.cpp
 
-  Copyright (c) 2014, Nikolaj Schlej. All rights reserved.
+  Copyright (c) 2018, LongSoft. All rights reserved.
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at

common/LZMA/LzmaCompress.c

@@ -25,7 +25,7 @@ static ISzAlloc SzAllocForLzma = { &AllocForLzma, &FreeForLzma };
 
 SRes OnProgress(void *p, UInt64 inSize, UInt64 outSize)
 {
-    (void)p; (void) inSize; (void) outSize;
+    (void)p; (void)inSize; (void)outSize;
     return SZ_OK;
 }
 
@@ -34,9 +34,9 @@ static ICompressProgress g_ProgressCallback = { &OnProgress };
 STATIC
 UINT64
 EFIAPI
-RShiftU64(
+RShiftU64 (
-UINT64                    Operand,
+    UINT64 Operand,
-UINT32                     Count
+    UINT32 Count
 )
 {
     return Operand >> Count;
@@ -44,8 +44,8 @@ UINT32                     Count
 
 VOID
 SetEncodedSizeOfBuf(
-UINT64 EncodedSize,
+    UINT64 EncodedSize,
-UINT8 *EncodedData
+    UINT8* EncodedData
 )
 {
     INT32   Index;
@@ -58,13 +58,13 @@ UINT8 *EncodedData
     }
 }
 
-INT32
+USTATUS
 EFIAPI
-LzmaCompress(
+LzmaCompress (
-CONST UINT8  *Source,
+    CONST UINT8  *Source,
-UINT32       SourceSize,
+    UINT32       SourceSize,
-UINT8    *Destination,
+    UINT8        *Destination,
-UINT32   *DestinationSize
+    UINT32       *DestinationSize
 )
 {
     SRes              LzmaResult;
@@ -72,13 +72,14 @@ UINT32   *DestinationSize
     SizeT propsSize = LZMA_PROPS_SIZE;
     SizeT destLen = SourceSize + SourceSize / 3 + 128;
 
-    if (*DestinationSize < destLen)
+    if (*DestinationSize < (UINT32)destLen)
     {
         *DestinationSize = (UINT32)destLen;
         return EFI_BUFFER_TOO_SMALL;
     }
 
     LzmaEncProps_Init(&props);
+    // TODO: need to detect this instead of hardcoding
     props.dictSize = LZMA_DICTIONARY_SIZE;
     props.level = 9;
     props.fb = 273;
@@ -87,7 +88,7 @@ UINT32   *DestinationSize
         (Byte*)((UINT8*)Destination + LZMA_HEADER_SIZE),
         &destLen,
         Source,
-        SourceSize,
+        (SizeT)SourceSize,
         &props,
         (UINT8*)Destination,
         &propsSize,
@@ -98,7 +99,7 @@ UINT32   *DestinationSize
 
     *DestinationSize = (UINT32)(destLen + LZMA_HEADER_SIZE);
 
-    SetEncodedSizeOfBuf((UINT64)SourceSize, Destination);
+    SetEncodedSizeOfBuf(SourceSize, Destination);
 
     if (LzmaResult == SZ_OK) {
         return EFI_SUCCESS;

common/LZMA/LzmaCompress.h

@@ -24,9 +24,9 @@ extern "C" {
 #define LZMA_DICTIONARY_SIZE 0x800000
 #define _LZMA_SIZE_OPT
 
-    INT32
+    USTATUS
         EFIAPI
-        LzmaCompress(
+        LzmaCompress (
             const UINT8  *Source,
             UINT32       SourceSize,
             UINT8        *Destination,

common/LZMA/LzmaDecompress.c

@@ -19,10 +19,10 @@ WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 UINT64
 EFIAPI
-LShiftU64(
+LShiftU64 (
-UINT64                    Operand,
+    UINT64 Operand,
-UINT32                     Count
+    UINT32 Count
-)
+    )
 {
     return Operand << Count;
 }
@@ -39,9 +39,9 @@ Get the size of the uncompressed buffer by parsing EncodeData header.
 @return The size of the uncompressed buffer.
 */
 UINT64
-GetDecodedSizeOfBuf(
+GetDecodedSizeOfBuf (
-UINT8 *EncodedData
+    UINT8 *EncodedData
-)
+    )
 {
     UINT64 DecodedSize;
     INT32  Index;
@@ -85,22 +85,27 @@ DestinationSize and the size of the scratch
 buffer was returned ScratchSize.
 
 */
-INT32
+USTATUS
 EFIAPI
-LzmaGetInfo(
+LzmaGetInfo (
-CONST VOID  *Source,
+    CONST VOID  *Source,
-UINT32      SourceSize,
+    UINT32       SourceSize,
-UINT32      *DestinationSize
+    UINT32       *DestinationSize
-)
+    )
 {
-    UInt64  DecodedSize;
+    UINT64 DecodedSize;
-
+    ASSERT(SourceSize >= LZMA_HEADER_SIZE);
-    ASSERT(SourceSize >= LZMA_HEADER_SIZE); (void)SourceSize;
+    (void)SourceSize;
 
     DecodedSize = GetDecodedSizeOfBuf((UINT8*)Source);
 
+    if (DecodedSize <= UINT32_MAX) {
         *DestinationSize = (UINT32)DecodedSize;
         return U_SUCCESS;
+    }
+    else {
+        return U_INVALID_PARAMETER;
+    }
 }
 
 /*
@@ -122,13 +127,13 @@ the uncompressed buffer is returned Destination.
 The source buffer specified by Source is corrupted
 (not a valid compressed format).
 */
-INT32
+USTATUS
 EFIAPI
-LzmaDecompress(
+LzmaDecompress (
-CONST VOID  *Source,
+    CONST VOID  *Source,
-UINT32       SourceSize,
+    UINT32      SourceSize,
-VOID    *Destination
+    VOID        *Destination
-)
+    )
 {
     SRes              LzmaResult;
     ELzmaStatus       Status;

common/LZMA/LzmaDecompress.h

@@ -23,13 +23,6 @@ extern "C" {
 
 #define LZMA_HEADER_SIZE (LZMA_PROPS_SIZE + 8)
 
-    UINT64
-        EFIAPI
-        LShiftU64(
-        UINT64                    Operand,
-        UINT32                    Count
-        );
-
     /*
       Given a Lzma compressed source buffer, this function retrieves the size of
       the uncompressed buffer and the size of the scratch buffer required
@@ -57,10 +50,10 @@ extern "C" {
       buffer was returned ScratchSize.
 
       */
-    INT32
+    USTATUS
         EFIAPI
-        LzmaGetInfo(
+        LzmaGetInfo (
-        const VOID  *Source,
+            CONST VOID  *Source,
             UINT32       SourceSize,
             UINT32       *DestinationSize
         );
@@ -84,10 +77,10 @@ extern "C" {
       The source buffer specified by Source is corrupted
       (not a valid compressed format).
       */
-    INT32
+    USTATUS
         EFIAPI
-        LzmaDecompress(
+        LzmaDecompress (
-        const VOID  *Source,
+            CONST VOID  *Source,
             UINT32        SourceSize,
             VOID         *Destination
         );

common/Tiano/EfiTianoCompress.c

@@ -69,18 +69,15 @@ PutDword(
 
 STATIC
 EFI_STATUS 
-AllocateMemory (
+AllocateMemory (VOID);
-  );
 
 STATIC
 VOID
-FreeMemory (
+FreeMemory (VOID);
-  );
 
 STATIC 
 VOID 
-InitSlide (
+InitSlide (VOID);
-  );
 
 STATIC 
 NODE 
@@ -105,28 +102,23 @@ Split (
 
 STATIC 
 VOID 
-InsertNode (
+InsertNode (VOID);
-  );
   
 STATIC 
 VOID 
-DeleteNode (
+DeleteNode (VOID);
-  );
 
 STATIC 
 VOID 
-GetNextMatch (
+GetNextMatch (VOID);
-  );
   
 STATIC 
 EFI_STATUS 
-Encode (
+Encode (VOID);
-  );
 
 STATIC 
 VOID 
-CountTFreq (
+CountTFreq (VOID);
-  );
 
 STATIC 
 VOID 
@@ -138,8 +130,7 @@ WritePTLen (
 
 STATIC 
 VOID 
-WriteCLen (
+WriteCLen (VOID);
-  );
   
 STATIC 
 VOID 
@@ -155,8 +146,7 @@ EncodeP (
 
 STATIC 
 VOID 
-SendBlock (
+SendBlock (VOID);
-  );
   
 STATIC 
 VOID 
@@ -167,18 +157,15 @@ Output (
 
 STATIC 
 VOID 
-HufEncodeStart (
+HufEncodeStart (VOID);
-  );
   
 STATIC 
 VOID 
-HufEncodeEnd (
+HufEncodeEnd (VOID);
-  );
   
 STATIC 
 VOID 
-MakeCrcTable (
+MakeCrcTable (VOID);
-  );
   
 STATIC 
 VOID 
@@ -196,8 +183,7 @@ FreadCrc (
   
 STATIC 
 VOID 
-InitPutBits (
+InitPutBits (VOID);
-  );
   
 STATIC 
 VOID 

common/Tiano/EfiTianoCompress.h

@@ -56,13 +56,12 @@ extern "C" {
 
     --*/
     EFI_STATUS
-        TianoCompress(
+        TianoCompress (
-        CONST VOID   *SrcBuffer,
+            IN      CONST VOID   *SrcBuffer,
-        UINT32  SrcSize,
+            IN      UINT32       SrcSize,
-        VOID   *DstBuffer,
+            IN      VOID         *DstBuffer,
-        UINT32  *DstSize
+            IN OUT  UINT32       *DstSize
-        )
+        );
-        ;
 
     EFI_STATUS
         TianoCompressLegacy(
@@ -70,8 +69,7 @@ extern "C" {
             UINT32        SrcSize,
             VOID          *DstBuffer,
             UINT32        *DstSize
-        )
+        );
-        ;
     /*++
 
     Routine Description:
@@ -96,21 +94,20 @@ extern "C" {
 
     --*/
     EFI_STATUS
-        EfiCompress(
+        EfiCompress (
-        CONST VOID   *SrcBuffer,
+            IN CONST VOID   *SrcBuffer,
-        UINT32  SrcSize,
+            IN UINT32       SrcSize,
-        VOID   *DstBuffer,
+            IN VOID         *DstBuffer,
-        UINT32  *DstSize
+            IN OUT UINT32   *DstSize
-        )
+        );
-        ;
+
     EFI_STATUS
         EfiCompressLegacy(
             CONST VOID   *SrcBuffer,
             UINT32       SrcSize,
             VOID         *DstBuffer,
             UINT32       *DstSize
-        )
+        );
-        ;
 
 #ifdef __cplusplus
 }

common/Tiano/EfiTianoDecompress.c

@@ -79,12 +79,6 @@ typedef struct {
     UINT8   mPBit;
 } SCRATCH_DATA;
 
-STATIC
-VOID
-FillBuf(
-IN  SCRATCH_DATA  *Sd,
-IN  UINT16        NumOfBits
-)
 /*++
 
 Routine Description:
@@ -99,11 +93,17 @@ NumOfBits  - The number of bits to shift and read.
 Returns: (VOID)
 
 --*/
+STATIC
+VOID
+FillBuf (
+    IN  SCRATCH_DATA  *Sd,
+    IN  UINT16        NumOfBits
+    )
 {
-    Sd->mBitBuf = (UINT32)(Sd->mBitBuf << NumOfBits);
+    Sd->mBitBuf = (UINT32) (((UINT64)Sd->mBitBuf) << NumOfBits);
 
     while (NumOfBits > Sd->mBitCount) {
-        Sd->mBitBuf |= (UINT32)(Sd->mSubBitBuf << (NumOfBits = (UINT16)(NumOfBits - Sd->mBitCount)));
+        Sd->mBitBuf |= (UINT32) (((UINT64)Sd->mSubBitBuf) << (NumOfBits = (UINT16) (NumOfBits - Sd->mBitCount)));
 
         if (Sd->mCompSize > 0) {
             //
@@ -127,12 +127,6 @@ Returns: (VOID)
     Sd->mBitBuf |= Sd->mSubBitBuf >> Sd->mBitCount;
 }
 
-STATIC
-UINT32
-GetBits(
-IN  SCRATCH_DATA  *Sd,
-IN  UINT16        NumOfBits
-)
 /*++
 
 Routine Description:
@@ -151,6 +145,12 @@ Returns:
 The bits that are popped out.
 
 --*/
+STATIC
+UINT32
+GetBits (
+    IN  SCRATCH_DATA  *Sd,
+    IN  UINT16        NumOfBits
+    )
 {
     UINT32  OutBits;
 
@@ -161,15 +161,6 @@ The bits that are popped out.
     return OutBits;
 }
 
-STATIC
-UINT16
-MakeTable(
-IN  SCRATCH_DATA  *Sd,
-IN  UINT16        NumOfChar,
-IN  UINT8         *BitLen,
-IN  UINT16        TableBits,
-OUT UINT16        *Table
-)
 /*++
 
 Routine Description:
@@ -190,6 +181,15 @@ Returns:
 BAD_TABLE - The table is corrupted.
 
 --*/
+STATIC
+UINT16
+MakeTable (
+    IN  SCRATCH_DATA  *Sd,
+    IN  UINT16        NumOfChar,
+    IN  UINT8         *BitLen,
+    IN  UINT16        TableBits,
+    OUT UINT16        *Table
+)
 {
     UINT16  Count[17];
     UINT16  Weight[17];
@@ -321,11 +321,6 @@ BAD_TABLE - The table is corrupted.
     return 0;
 }
 
-STATIC
-UINT32
-DecodeP(
-IN  SCRATCH_DATA  *Sd
-)
 /*++
 
 Routine Description:
@@ -341,6 +336,11 @@ Returns:
 The position value decoded.
 
 --*/
+STATIC
+UINT32
+DecodeP (
+    IN  SCRATCH_DATA  *Sd
+    )
 {
     UINT16  Val;
     UINT32  Mask;
@@ -375,14 +375,6 @@ The position value decoded.
     return Pos;
 }
 
-STATIC
-UINT16
-ReadPTLen(
-IN  SCRATCH_DATA  *Sd,
-IN  UINT16        nn,
-IN  UINT16        nbit,
-IN  UINT16        Special
-)
 /*++
 
 Routine Description:
@@ -402,6 +394,14 @@ Returns:
 BAD_TABLE - Table is corrupted.
 
 --*/
+STATIC
+UINT16
+ReadPTLen (
+    IN  SCRATCH_DATA  *Sd,
+    IN  UINT16        nn,
+    IN  UINT16        nbit,
+    IN  UINT16        Special
+)
 {
     UINT16  Number;
     UINT16  CharC;
@@ -469,11 +469,6 @@ BAD_TABLE - Table is corrupted.
     return MakeTable(Sd, nn, Sd->mPTLen, 8, Sd->mPTTable);
 }
 
-STATIC
-VOID
-ReadCLen(
-SCRATCH_DATA  *Sd
-)
 /*++
 
 Routine Description:
@@ -487,6 +482,11 @@ Sd    - the global scratch data
 Returns: (VOID)
 
 --*/
+STATIC
+VOID
+ReadCLen (
+    SCRATCH_DATA  *Sd
+    )
 {
     UINT16  Number;
     UINT16  CharC;
@@ -560,11 +560,6 @@ Returns: (VOID)
     return;
 }
 
-STATIC
-UINT16
-DecodeC(
-SCRATCH_DATA  *Sd
-)
 /*++
 
 Routine Description:
@@ -580,6 +575,11 @@ Returns:
 The value decoded.
 
 --*/
+STATIC
+UINT16
+DecodeC (
+    SCRATCH_DATA  *Sd
+    )
 {
     UINT16  Index2;
     UINT32  Mask;
@@ -627,11 +627,6 @@ The value decoded.
     return Index2;
 }
 
-STATIC
-VOID
-Decode(
-SCRATCH_DATA  *Sd
-)
 /*++
 
 Routine Description:
@@ -645,6 +640,11 @@ Sd            - The global scratch data
 Returns: (VOID)
 
 --*/
+STATIC
+VOID
+Decode (
+    SCRATCH_DATA  *Sd
+)
 {
     UINT16  BytesRemain;
     UINT32  DataIdx;
@@ -700,13 +700,6 @@ Returns: (VOID)
     }
 }
 
-EFI_STATUS
-GetInfo(
-IN      const VOID    *Source,
-IN      UINT32        SrcSize,
-OUT     UINT32        *DstSize,
-OUT     UINT32        *ScratchSize
-)
 /*++
 
 Routine Description:
@@ -726,6 +719,13 @@ EFI_SUCCESS           - The size of destination buffer and the size of scratch b
 EFI_INVALID_PARAMETER - The source data is corrupted
 
 --*/
+EFI_STATUS
+GetInfo(
+    IN      const VOID    *Source,
+    IN      UINT32        SrcSize,
+    OUT     UINT32        *DstSize,
+    OUT     UINT32        *ScratchSize
+)
 {
     const UINT8 *Src;
 
@@ -740,16 +740,6 @@ EFI_INVALID_PARAMETER - The source data is corrupted
     return EFI_SUCCESS;
 }
 
-EFI_STATUS
-Decompress(
-IN      const VOID *Source,
-IN      UINT32     SrcSize,
-IN OUT  VOID       *Destination,
-IN      UINT32     DstSize,
-IN OUT  VOID       *Scratch,
-IN      UINT32     ScratchSize,
-IN      UINT8      Version
-)
 /*++
 
 Routine Description:
@@ -774,6 +764,16 @@ EFI_SUCCESS           - Decompression is successful
 EFI_INVALID_PARAMETER - The source data is corrupted
 
 --*/
+EFI_STATUS
+Decompress (
+    IN      CONST VOID *Source,
+    IN      UINT32     SrcSize,
+    IN OUT  VOID       *Destination,
+    IN      UINT32     DstSize,
+    IN OUT  VOID       *Scratch,
+    IN      UINT32     ScratchSize,
+    IN      UINT8      Version
+)
 {
     UINT32        Index;
     UINT32        CompSize;
@@ -866,14 +866,6 @@ EFI_INVALID_PARAMETER - The source data is corrupted
     return Status;
 }
 
-EFI_STATUS
-EFIAPI
-EfiTianoGetInfo(
-IN      const VOID              *Source,
-IN      UINT32                  SrcSize,
-OUT     UINT32                  *DstSize,
-OUT     UINT32                  *ScratchSize
-)
 /*++
 
 Routine Description:
@@ -894,25 +886,18 @@ EFI_SUCCESS           - The size of destination buffer and the size of scratch b
 EFI_INVALID_PARAMETER - The source data is corrupted
 
 --*/
-{
-    return GetInfo(
-        Source,
-        SrcSize,
-        DstSize,
-        ScratchSize
-        );
-}
-
 EFI_STATUS
 EFIAPI
-EfiDecompress(
+EfiTianoGetInfo(
-IN      const VOID              *Source,
+    IN      CONST VOID *Source,
-IN      UINT32                  SrcSize,
+    IN      UINT32      SrcSize,
-IN OUT  VOID                    *Destination,
+    OUT     UINT32      *DstSize,
-IN      UINT32                  DstSize,
+    OUT     UINT32      *ScratchSize
-IN OUT  VOID                    *Scratch,
+    )
-IN      UINT32                  ScratchSize
+{
-)
+    return GetInfo (Source, SrcSize, DstSize, ScratchSize);
+}
+
 /*++
 
 Routine Description:
@@ -935,11 +920,21 @@ EFI_SUCCESS           - Decompression is successful
 EFI_INVALID_PARAMETER - The source data is corrupted
 
 --*/
+EFI_STATUS
+EFIAPI
+EfiDecompress (
+    IN      CONST VOID *Source,
+    IN      UINT32     SrcSize,
+    IN OUT  VOID       *Destination,
+    IN      UINT32     DstSize,
+    IN OUT  VOID       *Scratch,
+    IN      UINT32     ScratchSize
+    )
 {
     //
     // For EFI 1.1 de/compression algorithm, the version is 1.
     //
-    return Decompress(
+    return Decompress (
         Source,
         SrcSize,
         Destination,
@@ -950,16 +945,6 @@ EFI_INVALID_PARAMETER - The source data is corrupted
         );
 }
 
-EFI_STATUS
-EFIAPI
-TianoDecompress(
-IN      const VOID                    *Source,
-IN      UINT32                        SrcSize,
-IN OUT  VOID                          *Destination,
-IN      UINT32                        DstSize,
-IN OUT  VOID                          *Scratch,
-IN      UINT32                        ScratchSize
-)
 /*++
 
 Routine Description:
@@ -982,11 +967,21 @@ EFI_SUCCESS           - Decompression is successful
 EFI_INVALID_PARAMETER - The source data is corrupted
 
 --*/
+EFI_STATUS
+EFIAPI
+TianoDecompress (
+    IN      CONST VOID *Source,
+    IN      UINT32     SrcSize,
+    IN OUT  VOID       *Destination,
+    IN      UINT32     DstSize,
+    IN OUT  VOID       *Scratch,
+    IN      UINT32     ScratchSize
+)
 {
     //
     // For Tiano de/compression algorithm, the version is 2.
     //
-    return Decompress(
+    return Decompress (
         Source,
         SrcSize,
         Destination,

common/Tiano/EfiTianoDecompress.h

@@ -37,14 +37,6 @@ typedef struct EFI_TIANO_HEADER_ {
     UINT32 OrigSize;
 } EFI_TIANO_HEADER;
 
-EFI_STATUS
-EFIAPI
-EfiTianoGetInfo(
-        const VOID              *Source,
-        UINT32                  SrcSize,
-        UINT32                  *DstSize,
-        UINT32                  *ScratchSize
-        )
 /*++
 
 Routine Description:
@@ -64,18 +56,16 @@ EFI_SUCCESS           - The size of destination buffer and the size of scratch b
 EFI_INVALID_PARAMETER - The source data is corrupted
 
 --*/
-;
-
 EFI_STATUS
 EFIAPI
-EfiDecompress(
+EfiTianoGetInfo (
-        const VOID              *Source,
+    IN      CONST VOID *Source,
-        UINT32                  SrcSize,
+    IN      UINT32      SrcSize,
-        VOID                    *Destination,
+    OUT     UINT32      *DstSize,
-        UINT32                  DstSize,
+    OUT     UINT32      *ScratchSize
-        VOID                    *Scratch,
-        UINT32                  ScratchSize
     );
+
+
 /*++
 
 Routine Description:
@@ -97,18 +87,17 @@ EFI_SUCCESS           - Decompression is successful
 EFI_INVALID_PARAMETER - The source data is corrupted
 
 --*/
-;
-
 EFI_STATUS
 EFIAPI
-TianoDecompress(
+EfiDecompress(
-        const VOID                    *Source,
+    IN      CONST VOID *Source,
-        UINT32                        SrcSize,
+    IN      UINT32     SrcSize,
-        VOID                          *Destination,
+    IN OUT  VOID       *Destination,
-        UINT32                        DstSize,
+    IN      UINT32     DstSize,
-        VOID                          *Scratch,
+    IN OUT  VOID       *Scratch,
-        UINT32                        ScratchSize
+    IN      UINT32     ScratchSize
-        )
+);
+
 /*++
 
 Routine Description:
@@ -130,7 +119,16 @@ EFI_SUCCESS           - Decompression is successful
 EFI_INVALID_PARAMETER - The source data is corrupted
 
 --*/
-;
+EFI_STATUS
+EFIAPI
+TianoDecompress(
+    IN      CONST VOID *Source,
+    IN      UINT32     SrcSize,
+    IN OUT  VOID       *Destination,
+    IN      UINT32     DstSize,
+    IN OUT  VOID       *Scratch,
+    IN      UINT32     ScratchSize
+    );
 
 #ifdef __cplusplus
 }

common/basetypes.h

@@ -16,8 +16,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include <stdarg.h>
 #include <stdint.h>
+#include <stddef.h>
 
-typedef uint8_t USTATUS;
+typedef size_t USTATUS;
 #define U_SUCCESS                         0
 #define U_INVALID_PARAMETER               1
 #define U_BUFFER_TOO_SMALL                2
@@ -79,7 +80,7 @@ typedef int64_t      INT64;
 typedef uint64_t     UINT64;
 typedef char         CHAR8;
 typedef uint16_t     CHAR16;
-typedef unsigned int UINTN;
+typedef size_t       UINTN;
 
 #define CONST  const
 #define VOID   void
@@ -161,11 +162,11 @@ typedef struct EFI_TIME_ {
     UINT8   Hour;       // Hour:       0 - 23
     UINT8   Minute;     // Minute:     0 - 59
     UINT8   Second;     // Second:     0 - 59
-    UINT8   : 8;
+    UINT8   Reserved0;
     UINT32  Nanosecond; // Nanosecond: 0 - 999,999,999
     INT16   TimeZone;   // TimeZone:   -1440 to 1440 or UNSPECIFIED (0x07FF)
     UINT8   Daylight;   // Daylight:   ADJUST_DAYLIGHT (1) or IN_DAYLIGHT (2) 
-    UINT8   : 8;
+    UINT8   Reserved1;
 } EFI_TIME;
 
 // Align to 4 or 8 bytes

common/descriptor.cpp

@@ -25,13 +25,13 @@ const UINT8* calculateAddress16(const UINT8* baseAddress, const UINT16 baseOrLim
     return baseAddress + baseOrLimit * 0x1000;
 }
 
-// Calculate offset of region using it's base
+// Calculate offset of region using its base
 UINT32 calculateRegionOffset(const UINT16 base)
 {
     return base * 0x1000;
 }
 
-//Calculate size of region using it's base and limit
+//Calculate size of region using its base and limit
 UINT32 calculateRegionSize(const UINT16 base, const UINT16 limit)
 {
     if (limit)
@@ -114,6 +114,14 @@ UString jedecIdToUString(UINT8 vendorId, UINT8 deviceId0, UINT8 deviceId1)
     case 0x20BB19: return UString("Micron MT25Q256");
     case 0x20BB20: return UString("Micron MT25Q512");
 
+    // Intel
+    case 0x898911: return UString("Intel 25F160S33B8");
+    case 0x898912: return UString("Intel 25F320S33B8");
+    case 0x898913: return UString("Intel 25F640S33B8");
+    case 0x898915: return UString("Intel 25F160S33T8");
+    case 0x898916: return UString("Intel 25F320S33T8");
+    case 0x898917: return UString("Intel 25F640S33T8");
+
     // Atmel
     case 0x1F4500: return UString("Atmel AT26DF081");
     case 0x1F4501: return UString("Atmel AT26DF081A");
@@ -177,11 +185,15 @@ UString jedecIdToUString(UINT8 vendorId, UINT8 deviceId0, UINT8 deviceId1)
     case 0x374016: return UString("Amic A25L032A");
 
     // PMC
-    case 0x7F9D13: return UString("PMC Pm25LV080B");
+    case 0x9DF713: return UString("PMC Pm25LV080B");
-    case 0x7F9D14: return UString("PMC Pm25LV016B");
+    case 0x9DF714: return UString("PMC Pm25LV016B");
-    case 0x7F9D44: return UString("PMC Pm25LQ080C");
+    case 0x9DF744: return UString("PMC Pm25LQ080C");
-    case 0x7F9D45: return UString("PMC Pm25LQ016C");
+    case 0x9DF745: return UString("PMC Pm25LQ016C");
-    case 0x7F9D46: return UString("PMC Pm25LQ032C");
+    case 0x9DF746: return UString("PMC Pm25LQ032C");
+    case 0x9DF77B: return UString("PMC Pm25LV512A");
+    case 0x9DF77C: return UString("PMC Pm25LV010A");
+    case 0x9DF77D: return UString("PMC Pm25LV020");
+    case 0x9DF77E: return UString("PMC Pm25LV040");
 
     // ISSI
     case 0x9D6017: return UString("ISSI Ix25LP064");

common/descriptor.h

@@ -34,6 +34,19 @@ typedef struct FLASH_DESCRIPTOR_HEADER_ {
 // Maximum base value in descriptor map
 #define FLASH_DESCRIPTOR_MAX_BASE  0xE0
 
+// Descriptor version was reserved in older firmware
+#define FLASH_DESCRIPTOR_VERSION_INVALID 0xFFFFFFFF
+// The only known version found in Coffee Lake
+#define FLASH_DESCRIPTOR_VERSION_MAJOR   1
+#define FLASH_DESCRIPTOR_VERSION_MINOR   0
+
+// Descriptor version present in Coffee Lake and newer
+typedef struct _FLASH_DESCRIPTOR_VERSION {
+    UINT32 Reserved : 14;
+    UINT32 Minor : 7;
+    UINT32 Major : 11;
+} FLASH_DESCRIPTOR_VERSION;
+
 // Descriptor map
 // Base fields are storing bits [11:4] of actual base addresses, all other bits are 0
 typedef struct FLASH_DESCRIPTOR_MAP_ {
@@ -54,6 +67,8 @@ typedef struct FLASH_DESCRIPTOR_MAP_ {
     UINT32 ProcStrapsBase : 8;
     UINT32 NumberOfProcStraps : 8;      // One-based number of UINT32s to read as processor straps, min=0, max=255 (1 Kb)
     UINT32 : 16;
+    // FLMAP 3
+    UINT32 DescriptorVersion;           // Reserved prior to Coffee Lake
 } FLASH_DESCRIPTOR_MAP;
 
 // Component section

common/ffsops.cpp

@@ -21,10 +21,6 @@ USTATUS FfsOperations::extract(const UModelIndex & index, UString & name, UByteA
     if (!index.isValid())
         return U_INVALID_PARAMETER;
 
-    // Construct a name for extracted data
-    UString itemName = model->name(index);
-    UString itemText = model->text(index);
-
     // Default name
     name = uniqueItemName(index);
 
@@ -77,10 +73,8 @@ USTATUS FfsOperations::replace(const UModelIndex & index, const UString & data,
     else if (mode == REPLACE_MODE_BODY) {
         return U_NOT_IMPLEMENTED;
     }
-    else 
-        return U_UNKNOWN_REPLACE_MODE;
     
-    return U_NOT_IMPLEMENTED;
+     return U_UNKNOWN_REPLACE_MODE;
 }
 
 USTATUS FfsOperations::remove(const UModelIndex & index)

common/ffsparser.h

@@ -66,7 +66,7 @@ public:
 private:
     TreeModel *model;
     std::vector<std::pair<UString, UModelIndex> > messagesVector;
-    void msg(const UString message, const UModelIndex index = UModelIndex()) {
+    void msg(const UString & message, const UModelIndex & index = UModelIndex()) {
         messagesVector.push_back(std::pair<UString, UModelIndex>(message, index));
     };
 
@@ -75,7 +75,7 @@ private:
  
     UByteArray openedImage;
     UModelIndex lastVtf;
-    UINT32 capsuleOffsetFixup;
+    UINT32 imageBase;
     UINT64 addressDiff;
     std::vector<std::pair<std::vector<UString>, UModelIndex> > fitTable;
     
@@ -93,6 +93,10 @@ private:
     // First pass
     USTATUS performFirstPass(const UByteArray & imageFile, UModelIndex & index);
 
+    USTATUS parseCapsule(const UByteArray & capsule, UModelIndex & index);
+    USTATUS parseIntelImage(const UByteArray & intelImage, const UINT32 localOffset, const UModelIndex & parent, UModelIndex & index);
+    USTATUS parseGenericImage(const UByteArray & intelImage, const UINT32 localOffset, const UModelIndex & parent, UModelIndex & index);
+
     USTATUS parseRawArea(const UModelIndex & index);
     USTATUS parseVolumeHeader(const UByteArray & volume, const UINT32 localOffset, const UModelIndex & parent, UModelIndex & index);
     USTATUS parseVolumeBody(const UModelIndex & index);
@@ -101,7 +105,6 @@ private:
     USTATUS parseSectionHeader(const UByteArray & section, const UINT32 localOffset, const UModelIndex & parent, UModelIndex & index, const bool insertIntoTree);
     USTATUS parseSectionBody(const UModelIndex & index);
 
-    USTATUS parseIntelImage(const UByteArray & intelImage, const UINT32 localOffset, const UModelIndex & parent, UModelIndex & root);
     USTATUS parseGbeRegion(const UByteArray & gbe, const UINT32 localOffset, const UModelIndex & parent, UModelIndex & index);
     USTATUS parseMeRegion(const UByteArray & me, const UINT32 localOffset, const UModelIndex & parent, UModelIndex & index);
     USTATUS parseBiosRegion(const UByteArray & bios, const UINT32 localOffset, const UModelIndex & parent, UModelIndex & index);
@@ -129,7 +132,7 @@ private:
     USTATUS parseTeImageSectionBody(const UModelIndex & index);
 
     USTATUS parseAprioriRawSection(const UByteArray & body, UString & parsed);
-    USTATUS findNextVolume(const UModelIndex & index, const UByteArray & bios, const UINT32 localOffset, const UINT32 volumeOffset, UINT32 & nextVolumeOffset);
+    USTATUS findNextVolume(const UModelIndex & index, const UByteArray & bios, const UINT32 globalOffset, const UINT32 volumeOffset, UINT32 & nextVolumeOffset);
     USTATUS getVolumeSize(const UByteArray & bios, const UINT32 volumeOffset, UINT32 & volumeSize, UINT32 & bmVolumeSize);
     UINT32  getFileSize(const UByteArray & volume, const UINT32 fileOffset, const UINT8 ffsVersion);
     UINT32  getSectionSize(const UByteArray & file, const UINT32 sectionOffset, const UINT8 ffsVersion);

common/ffsreport.cpp

@@ -21,31 +21,31 @@ std::vector<UString> FfsReport::generate()
     
     // Check model pointer
     if (!model) {
-        report.push_back(UString("ERROR: Invalid model pointer provided"));
+        report.push_back(usprintf("%s: invalid model pointer provided", __FUNCTION__));
         return report;
     }
 
     // Check root index to be valid
     UModelIndex root = model->index(0,0);
     if (!root.isValid()) {
-        report.push_back(UString("ERROR: Model root index is invalid"));
+        report.push_back(usprintf("%s: model root index is invalid", __FUNCTION__));
         return report;
     }
 
     // Generate report recursive
-    report.push_back(UString("      Type       |        Subtype        |   Size   |  CRC32   |   Name "));
+    report.push_back(UString("      Type       |        Subtype        |  Offset  |   Size   |  CRC32   |   Name "));
     USTATUS result = generateRecursive(report, root);
     if (result) {
-        report.push_back(UString("ERROR: generateRecursive returned ") + errorCodeToUString(result));
+        report.push_back(usprintf("%s: generateRecursive returned ", __FUNCTION__) + errorCodeToUString(result));
     }
 
     return report;
 }
 
-USTATUS FfsReport::generateRecursive(std::vector<UString> & report, UModelIndex index, UINT32 level)
+USTATUS FfsReport::generateRecursive(std::vector<UString> & report, const UModelIndex & index, const UINT32 level)
 {
     if (!index.isValid())
-        return U_SUCCESS; //Nothing to report for invalid index
+        return U_SUCCESS; // Nothing to report for invalid index
     
     // Calculate item CRC32
     UByteArray data = model->header(index) + model->body(index) + model->tail(index);
@@ -53,11 +53,17 @@ USTATUS FfsReport::generateRecursive(std::vector<UString> & report, UModelIndex
 
     // Information on current item
     UString text = model->text(index);
+    UString offset = "|   N/A    ";
+    if ((!model->compressed(index)) || (index.parent().isValid() && !model->compressed(index.parent()))) {
+        offset = usprintf("| %08X ", model->offset(index));
+    }
+
     report.push_back(
         UString(" ") + itemTypeToUString(model->type(index)).leftJustified(16) 
         + UString("| ") + itemSubtypeToUString(model->type(index), model->subtype(index)).leftJustified(22)
+        + offset
         + usprintf("| %08X | %08X | ", data.size(), crc) 
-        + urepeated('-', level) + UString(" ") + model->name(index) + (text.isEmpty() ? UString("") : UString(" | ") + text)
+        + urepeated('-', level) + UString(" ") + model->name(index) + (text.isEmpty() ? UString() : UString(" | ") + text)
         );
 
     // Information on child items

common/ffsreport.h

@@ -34,7 +34,7 @@ public:
 private:
     TreeModel* model;
     
-    USTATUS generateRecursive(std::vector<UString> & report, UModelIndex index, UINT32 level = 0);
+    USTATUS generateRecursive(std::vector<UString> & report, const UModelIndex & index, const UINT32 level = 0);
 };
 
 #endif // FFSREPORT_H

common/guiddatabase.cpp

@@ -56,7 +56,7 @@ void initGuidDatabase(const UString & path, UINT32* numEntries)
     }
 
     if (numEntries)
-        *numEntries = gGuidToUStringMap.size();
+        *numEntries = (UINT32)gGuidToUStringMap.size();
 }
 
 UString guidDatabaseLookup(const EFI_GUID & guid)

common/nvramparser.cpp

@@ -12,6 +12,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 */
 
+// A workaround for compilers not supporting c++11 and c11
+// for using PRIX64.
+#define __STDC_FORMAT_MACROS
+
 #include <inttypes.h>
 #include <map>
 
@@ -102,7 +106,7 @@ USTATUS NvramParser::parseNvarStore(const UModelIndex & index)
             else {
                 // Nothing is parsed yet, but the file is not empty 
                 if (!offset) {
-                    msg(UString("parseNvarStore: file can't be parsed as NVAR variables store"), index);
+                    msg(usprintf("%s: file can't be parsed as NVAR variables store", __FUNCTION__), index);
                     return U_SUCCESS;
                 }
 
@@ -225,7 +229,8 @@ USTATUS NvramParser::parseNvarStore(const UModelIndex & index)
             isInvalidLink = true;
             UModelIndex nvarIndex;
             // Search prevously added entries for a link to this variable
-            for (int i = 0; i < model->rowCount(index); i++) {
+            // WARNING: O(n^2), may be very slow
+            for (int i = model->rowCount(index) - 1; i >= 0; i--) {
                 nvarIndex = index.child(i, 0);
                 if (model->hasEmptyParsingData(nvarIndex) == false) {
                     UByteArray nvarData = model->parsingData(nvarIndex);
@@ -352,10 +357,10 @@ USTATUS NvramParser::parseNvarStore(const UModelIndex & index)
         model->setParsingData(varIndex, UByteArray((const char*)&pdata, sizeof(pdata)));
 
         // Show messages
-        if (msgUnknownExtDataFormat) msg(UString("parseNvarStore: unknown extended data format"), varIndex);
+        if (msgUnknownExtDataFormat) msg(usprintf("%s: unknown extended data format", __FUNCTION__), varIndex);
-        if (msgExtHeaderTooLong)     msg(usprintf("parseNvarStore: extended header size (%Xh) is greater than body size (%Xh)",
+        if (msgExtHeaderTooLong)     msg(usprintf("%s: extended header size (%Xh) is greater than body size (%Xh)", __FUNCTION__,
             extendedHeaderSize, body.size()), varIndex);
-        if (msgExtDataTooShort)      msg(usprintf("parseNvarStore: extended header size (%Xh) is too small for timestamp and hash",
+        if (msgExtDataTooShort)      msg(usprintf("%s: extended header size (%Xh) is too small for timestamp and hash", __FUNCTION__,
             tail.size()), varIndex);
 
         // Try parsing the entry data as NVAR storage if it begins with NVAR signature
@@ -433,7 +438,7 @@ USTATUS NvramParser::parseNvramVolumeBody(const UModelIndex & index)
         UINT32 storeSize = 0;
         result = getStoreSize(data, storeOffset, storeSize);
         if (result) {
-            msg(UString("parseNvramVolumeBody: getStoreSize failed with error ") + errorCodeToUString(result), index);
+            msg(usprintf("%s: getStoreSize failed with error ", __FUNCTION__) + errorCodeToUString(result), index);
             return result;
         }
 
@@ -448,7 +453,7 @@ USTATUS NvramParser::parseNvramVolumeBody(const UModelIndex & index)
 
             // Add tree item
             UModelIndex paddingIndex = model->addItem(localOffset + storeOffset, Types::Padding, getPaddingType(padding), name, UString(), info, UByteArray(), padding, UByteArray(), Fixed, index);
-            msg(UString("parseNvramVolumeBody: one of stores inside overlaps the end of data"), paddingIndex);
+            msg(usprintf("%s: one of stores inside overlaps the end of data", __FUNCTION__), paddingIndex);
 
             // Update variables
             prevStoreOffset = storeOffset;
@@ -461,7 +466,7 @@ USTATUS NvramParser::parseNvramVolumeBody(const UModelIndex & index)
         UByteArray store = data.mid(storeOffset, storeSize);
         result = parseStoreHeader(store, localOffset + storeOffset, index, storeIndex);
         if (result)
-            msg(UString("parseNvramVolumeBody: store header parsing failed with error ") + errorCodeToUString(result), index);
+            msg(usprintf("%s: store header parsing failed with error ", __FUNCTION__) + errorCodeToUString(result), index);
 
         // Go to next store
         prevStoreOffset = storeOffset;
@@ -483,7 +488,7 @@ USTATUS NvramParser::parseNvramVolumeBody(const UModelIndex & index)
         else {
             // Nothing is parsed yet, but the file is not empty 
             if (!storeOffset) {
-                msg(UString("parseNvramVolumeBody: can't be parsed as NVRAM volume"), index);
+                msg(usprintf("%s: can't be parsed as NVRAM volume", __FUNCTION__), index);
                 return U_SUCCESS;
             }
 
@@ -521,11 +526,11 @@ USTATUS NvramParser::findNextStore(const UModelIndex & index, const UByteArray &
         if (*currentPos == NVRAM_VSS_STORE_SIGNATURE || *currentPos == NVRAM_APPLE_SVS_STORE_SIGNATURE) { //$VSS or $SVS signatures found, perform checks
             const VSS_VARIABLE_STORE_HEADER* vssHeader = (const VSS_VARIABLE_STORE_HEADER*)currentPos;
             if (vssHeader->Format != NVRAM_VSS_VARIABLE_STORE_FORMATTED) {
-                msg(usprintf("findNextStore: VSS store candidate at offset %Xh skipped, has invalid format %02Xh", localOffset + offset, vssHeader->Format), index);
+                msg(usprintf("%s: VSS store candidate at offset %Xh skipped, has invalid format %02Xh", __FUNCTION__, localOffset + offset, vssHeader->Format), index);
                 continue;
             }
             if (vssHeader->Size == 0 || vssHeader->Size == 0xFFFFFFFF) {
-                msg(usprintf("findNextStore: VSS store candidate at offset %Xh skipped, has invalid size %Xh", localOffset + offset, vssHeader->Size), index);
+                msg(usprintf("%s: VSS store candidate at offset %Xh skipped, has invalid size %Xh", __FUNCTION__, localOffset + offset, vssHeader->Size), index);
                 continue;
             }
             // All checks passed, store found
@@ -538,11 +543,11 @@ USTATUS NvramParser::findNextStore(const UModelIndex & index, const UByteArray &
 
             const VSS2_VARIABLE_STORE_HEADER* vssHeader = (const VSS2_VARIABLE_STORE_HEADER*)currentPos;
             if (vssHeader->Format != NVRAM_VSS_VARIABLE_STORE_FORMATTED) {
-                msg(usprintf("findNextStore: VSS2 store candidate at offset %Xh skipped, has invalid format %02Xh", localOffset + offset, vssHeader->Format), index);
+                msg(usprintf("%s: VSS2 store candidate at offset %Xh skipped, has invalid format %02Xh", __FUNCTION__, localOffset + offset, vssHeader->Format), index);
                 continue;
             }
             if (vssHeader->Size == 0 || vssHeader->Size == 0xFFFFFFFF) {
-                msg(usprintf("findNextStore: VSS2 store candidate at offset %Xh skipped, has invalid size %Xh", localOffset + offset, vssHeader->Size), index);
+                msg(usprintf("%s: VSS2 store candidate at offset %Xh skipped, has invalid size %Xh", __FUNCTION__, localOffset + offset, vssHeader->Size), index);
                 continue;
             }
             // All checks passed, store found
@@ -551,7 +556,7 @@ USTATUS NvramParser::findNextStore(const UModelIndex & index, const UByteArray &
         else if (*currentPos == NVRAM_FDC_VOLUME_SIGNATURE) { //FDC signature found
             const FDC_VOLUME_HEADER* fdcHeader = (const FDC_VOLUME_HEADER*)currentPos;
             if (fdcHeader->Size == 0 || fdcHeader->Size == 0xFFFFFFFF) {
-                msg(usprintf("findNextStore: FDC store candidate at offset %Xh skipped, has invalid size %Xh", localOffset + offset, fdcHeader->Size), index);
+                msg(usprintf("%s: FDC store candidate at offset %Xh skipped, has invalid size %Xh", __FUNCTION__, localOffset + offset, fdcHeader->Size), index);
                 continue;
             }
             // All checks passed, store found
@@ -560,7 +565,7 @@ USTATUS NvramParser::findNextStore(const UModelIndex & index, const UByteArray &
         else if (*currentPos == NVRAM_APPLE_FSYS_STORE_SIGNATURE || *currentPos == NVRAM_APPLE_GAID_STORE_SIGNATURE) { //Fsys or Gaid signature found
             const APPLE_FSYS_STORE_HEADER* fsysHeader = (const APPLE_FSYS_STORE_HEADER*)currentPos;
             if (fsysHeader->Size == 0 || fsysHeader->Size == 0xFFFF) {
-                msg(usprintf("findNextStore: Fsys store candidate at offset %Xh skipped, has invalid size %Xh", localOffset + offset, fsysHeader->Size), index);
+                msg(usprintf("%s: Fsys store candidate at offset %Xh skipped, has invalid size %Xh", __FUNCTION__, localOffset + offset, fsysHeader->Size), index);
                 continue;
             }
             // All checks passed, store found
@@ -572,11 +577,11 @@ USTATUS NvramParser::findNextStore(const UModelIndex & index, const UByteArray &
 
             const EVSA_STORE_ENTRY* evsaHeader = (const EVSA_STORE_ENTRY*)(currentPos - 1);
             if (evsaHeader->Header.Type != NVRAM_EVSA_ENTRY_TYPE_STORE) {
-                msg(usprintf("findNextStore: EVSA store candidate at offset %Xh skipped, has invalid type %02Xh", localOffset + offset - 4, evsaHeader->Header.Type), index);
+                msg(usprintf("%s: EVSA store candidate at offset %Xh skipped, has invalid type %02Xh", __FUNCTION__, localOffset + offset - 4, evsaHeader->Header.Type), index);
                 continue;
             }
             if (evsaHeader->StoreSize == 0 || evsaHeader->StoreSize == 0xFFFFFFFF) {
-                msg(usprintf("findNextStore: EVSA store candidate at offset %Xh skipped, has invalid size %Xh", localOffset + offset, evsaHeader->StoreSize), index);
+                msg(usprintf("%s: EVSA store candidate at offset %Xh skipped, has invalid size %Xh", __FUNCTION__, localOffset + offset, evsaHeader->StoreSize), index);
                 continue;
             }
             // All checks passed, store found
@@ -592,14 +597,14 @@ USTATUS NvramParser::findNextStore(const UModelIndex & index, const UByteArray &
             const EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER32* ftwHeader = (const EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER32*)currentPos;
             if (ftwHeader->WriteQueueSize % 0x10 == 0x04) { // Header with 32 bit WriteQueueSize
                 if (ftwHeader->WriteQueueSize == 0 || ftwHeader->WriteQueueSize == 0xFFFFFFFF) {
-                    msg(usprintf("findNextStore: FTW block candidate at offset %Xh skipped, has invalid body size %Xh", localOffset + offset, ftwHeader->WriteQueueSize), index);
+                    msg(usprintf("%s: FTW block candidate at offset %Xh skipped, has invalid body size %Xh", __FUNCTION__, localOffset + offset, ftwHeader->WriteQueueSize), index);
                     continue;
                 }
             }
             else if (ftwHeader->WriteQueueSize % 0x10 == 0x00) { // Header with 64 bit WriteQueueSize
                 const EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER64* ftw64Header = (const EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER64*)currentPos;
                 if (ftw64Header->WriteQueueSize == 0 || ftw64Header->WriteQueueSize >= 0xFFFFFFFF) {
-                    msg(usprintf("findNextStore: FTW block candidate at offset %Xh skipped, has invalid body size %Xh", localOffset + offset, ftw64Header->WriteQueueSize), index);
+                    msg(usprintf("%s: FTW block candidate at offset %Xh skipped, has invalid body size %Xh", __FUNCTION__, localOffset + offset, ftw64Header->WriteQueueSize), index);
                     continue;
                 }
             }
@@ -750,7 +755,7 @@ USTATUS NvramParser::parseVssStoreHeader(const UByteArray & store, const UINT32
 
     // Check store size
     if (dataSize < sizeof(VSS_VARIABLE_STORE_HEADER)) {
-        msg(UString("parseVssStoreHeader: volume body is too small even for VSS store header"), parent);
+        msg(usprintf("%s: volume body is too small even for VSS store header", __FUNCTION__), parent);
         return U_SUCCESS;
     }
 
@@ -765,7 +770,7 @@ USTATUS NvramParser::parseVssStoreHeader(const UByteArray & store, const UINT32
 
     // Check store size
     if (dataSize < storeSize) {
-        msg(usprintf("parseVssStoreHeader: VSS store size %Xh (%u) is greater than volume body size %Xh (%u)",
+        msg(usprintf("%s: VSS store size %Xh (%u) is greater than volume body size %Xh (%u)", __FUNCTION__,
             storeSize, storeSize,
             dataSize, dataSize), parent);
         return U_SUCCESS;
@@ -799,7 +804,7 @@ USTATUS NvramParser::parseVss2StoreHeader(const UByteArray & store, const UINT32
 
     // Check store size
     if (dataSize < sizeof(VSS2_VARIABLE_STORE_HEADER)) {
-        msg(UString("parseVss2StoreHeader: volume body is too small even for VSS2 store header"), parent);
+        msg(usprintf("%s: volume body is too small even for VSS2 store header", __FUNCTION__), parent);
         return U_SUCCESS;
     }
 
@@ -814,7 +819,7 @@ USTATUS NvramParser::parseVss2StoreHeader(const UByteArray & store, const UINT32
 
     // Check store size
     if (dataSize < storeSize) {
-        msg(usprintf("parseVssStoreHeader: VSS2 store size %Xh (%u) is greater than volume body size %Xh (%u)",
+        msg(usprintf("%s: VSS2 store size %Xh (%u) is greater than volume body size %Xh (%u)", __FUNCTION__,
             storeSize, storeSize,
             dataSize, dataSize), parent);
         return U_SUCCESS;
@@ -847,13 +852,13 @@ USTATUS NvramParser::parseFtwStoreHeader(const UByteArray & store, const UINT32
 
     // Check store size
     if (dataSize < sizeof(EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER64)) {
-        msg(UString("parseFtwStoreHeader: volume body is too small even for FTW store header"), parent);
+        msg(usprintf("%s: volume body is too small even for FTW store header", __FUNCTION__), parent);
         return U_SUCCESS;
     }
 
     // Obtain required information from parent volume
     UINT8 emptyByte = 0xFF;
-    UModelIndex parentVolumeIndex = model->findParentOfType(index, Types::Volume);
+    UModelIndex parentVolumeIndex = model->findParentOfType(parent, Types::Volume);
     if (parentVolumeIndex.isValid() && model->hasEmptyParsingData(parentVolumeIndex) == false) {
         UByteArray data = model->parsingData(parentVolumeIndex);
         const VOLUME_PARSING_DATA* pdata = (const VOLUME_PARSING_DATA*)data.constData();
@@ -876,7 +881,7 @@ USTATUS NvramParser::parseFtwStoreHeader(const UByteArray & store, const UINT32
         has32bitHeader = false;
     }
     if (dataSize < ftwBlockSize) {
-        msg(usprintf("parseFtwStoreHeader: FTW store size %Xh (%u) is greater than volume body size %Xh (%u)",
+        msg(usprintf("%s: FTW store size %Xh (%u) is greater than volume body size %Xh (%u)", __FUNCTION__,
             ftwBlockSize, ftwBlockSize,
             dataSize, dataSize), parent);
         return U_SUCCESS;
@@ -917,7 +922,7 @@ USTATUS NvramParser::parseFdcStoreHeader(const UByteArray & store, const UINT32
 
     // Check store size
     if (dataSize < sizeof(FDC_VOLUME_HEADER)) {
-        msg(UString("parseFdcStoreHeader: volume body is too small even for FDC store header"), parent);
+        msg(usprintf("%s: volume body is too small even for FDC store header", __FUNCTION__), parent);
         return U_SUCCESS;
     }
 
@@ -926,24 +931,15 @@ USTATUS NvramParser::parseFdcStoreHeader(const UByteArray & store, const UINT32
 
     // Check store size
     if (dataSize < fdcStoreHeader->Size) {
-        msg(usprintf("parseFdcStoreHeader: FDC store size %Xh (%u) is greater than volume body size %Xh (%u)",
+        msg(usprintf("%s: FDC store size %Xh (%u) is greater than volume body size %Xh (%u)", __FUNCTION__,
-            fdcStoreHeader->Size, fdcStoreHeader->Size,
-            dataSize, dataSize), parent);
-        return U_SUCCESS;
-    }
-
-    // Check header size
-    UINT32 headerSize = sizeof(FDC_VOLUME_HEADER);
-    if (dataSize < headerSize) {
-        msg(usprintf("parseFdcStoreHeader: FDC store header size %Xh (%u) is greater than volume body size %Xh (%u)",
             fdcStoreHeader->Size, fdcStoreHeader->Size,
             dataSize, dataSize), parent);
         return U_SUCCESS;
     }
 
     // Construct header and body
-    UByteArray header = store.left(headerSize);
+    UByteArray header = store.left(sizeof(FDC_VOLUME_HEADER));
-    UByteArray body = store.mid(headerSize, fdcStoreHeader->Size - headerSize);
+    UByteArray body = store.mid(sizeof(FDC_VOLUME_HEADER), fdcStoreHeader->Size - sizeof(FDC_VOLUME_HEADER));
 
     // Add info
     UString name("FDC store");
@@ -964,7 +960,7 @@ USTATUS NvramParser::parseFsysStoreHeader(const UByteArray & store, const UINT32
 
     // Check store size
     if (dataSize < sizeof(APPLE_FSYS_STORE_HEADER)) {
-        msg(UString("parseFsysStoreHeader: volume body is too small even for Fsys store header"), parent);
+        msg(usprintf("%s: volume body is too small even for Fsys store header", __FUNCTION__), parent);
         return U_SUCCESS;
     }
 
@@ -973,7 +969,7 @@ USTATUS NvramParser::parseFsysStoreHeader(const UByteArray & store, const UINT32
 
     // Check store size
     if (dataSize < fsysStoreHeader->Size) {
-        msg(usprintf("parseFsysStoreHeader: Fsys store size %Xh (%u) is greater than volume body size %Xh (%u)",
+        msg(usprintf("%s: Fsys store size %Xh (%u) is greater than volume body size %Xh (%u)", __FUNCTION__,
             fsysStoreHeader->Size, fsysStoreHeader->Size,
             dataSize, dataSize), parent);
         return U_SUCCESS;
@@ -1011,7 +1007,7 @@ USTATUS NvramParser::parseEvsaStoreHeader(const UByteArray & store, const UINT32
 
     // Check dataSize
     if (dataSize < sizeof(EVSA_STORE_ENTRY)) {
-        msg(UString("parseEvsaStoreHeader: volume body is too small even for EVSA store header"), parent);
+        msg(usprintf("%s: volume body is too small even for EVSA store header", __FUNCTION__), parent);
         return U_SUCCESS;
     }
 
@@ -1020,7 +1016,7 @@ USTATUS NvramParser::parseEvsaStoreHeader(const UByteArray & store, const UINT32
 
     // Check store size
     if (dataSize < evsaStoreHeader->StoreSize) {
-        msg(usprintf("parseEvsaStoreHeader: EVSA store size %Xh (%u) is greater than volume body size %Xh (%u)",
+        msg(usprintf("%s: EVSA store size %Xh (%u) is greater than volume body size %Xh (%u)", __FUNCTION__,
             evsaStoreHeader->StoreSize, evsaStoreHeader->StoreSize,
             dataSize, dataSize), parent);
         return U_SUCCESS;
@@ -1056,7 +1052,7 @@ USTATUS NvramParser::parseFlashMapStoreHeader(const UByteArray & store, const UI
 
     // Check data size
     if (dataSize < sizeof(PHOENIX_FLASH_MAP_HEADER)) {
-        msg(UString("parseFlashMapStoreHeader: volume body is too small even for FlashMap block header"), parent);
+        msg(usprintf("%s: volume body is too small even for FlashMap block header", __FUNCTION__), parent);
         return U_SUCCESS;
     }
 
@@ -1066,7 +1062,7 @@ USTATUS NvramParser::parseFlashMapStoreHeader(const UByteArray & store, const UI
     // Check store size
     UINT32 flashMapSize = sizeof(PHOENIX_FLASH_MAP_HEADER) + flashMapHeader->NumEntries * sizeof(PHOENIX_FLASH_MAP_ENTRY);
     if (dataSize < flashMapSize) {
-        msg(usprintf("parseFlashMapStoreHeader: FlashMap block size %Xh (%u) is greater than volume body size %Xh (%u)",
+        msg(usprintf("%s: FlashMap block size %Xh (%u) is greater than volume body size %Xh (%u)", __FUNCTION__,
             flashMapSize, flashMapSize,
             dataSize, dataSize), parent);
         return U_SUCCESS;
@@ -1096,13 +1092,13 @@ USTATUS NvramParser::parseCmdbStoreHeader(const UByteArray & store, const UINT32
 
     // Check store size
     if (dataSize < sizeof(PHOENIX_CMDB_HEADER)) {
-        msg(UString("parseCmdbStoreHeader: volume body is too small even for CMDB store header"), parent);
+        msg(usprintf("%s: volume body is too small even for CMDB store header", __FUNCTION__), parent);
         return U_SUCCESS;
     }
 
     UINT32 cmdbSize = NVRAM_PHOENIX_CMDB_SIZE;
     if (dataSize < cmdbSize) {
-        msg(usprintf("parseCmdbStoreHeader: CMDB store size %Xh (%u) is greater than volume body size %Xh (%u)",
+        msg(usprintf("%s: CMDB store size %Xh (%u) is greater than volume body size %Xh (%u)", __FUNCTION__,
             cmdbSize, cmdbSize,
             dataSize, dataSize), parent);
         return U_SUCCESS;
@@ -1134,7 +1130,7 @@ USTATUS NvramParser::parseSlicPubkeyHeader(const UByteArray & store, const UINT3
 
     // Check data size
     if (dataSize < sizeof(OEM_ACTIVATION_PUBKEY)) {
-        msg(UString("parseSlicPubkeyHeader: volume body is too small even for SLIC pubkey header"), parent);
+        msg(usprintf("%s: volume body is too small even for SLIC pubkey header", __FUNCTION__), parent);
         return U_SUCCESS;
     }
 
@@ -1143,7 +1139,7 @@ USTATUS NvramParser::parseSlicPubkeyHeader(const UByteArray & store, const UINT3
 
     // Check store size
     if (dataSize < pubkeyHeader->Size) {
-        msg(usprintf("parseSlicPubkeyHeader: SLIC pubkey size %Xh (%u) is greater than volume body size %Xh (%u)",
+        msg(usprintf("%s: SLIC pubkey size %Xh (%u) is greater than volume body size %Xh (%u)", __FUNCTION__,
             pubkeyHeader->Size, pubkeyHeader->Size,
             dataSize, dataSize), parent);
         return U_SUCCESS;
@@ -1176,7 +1172,7 @@ USTATUS NvramParser::parseSlicMarkerHeader(const UByteArray & store, const UINT3
 
     // Check data size
     if (dataSize < sizeof(OEM_ACTIVATION_MARKER)) {
-        msg(UString("parseSlicMarkerHeader: volume body is too small even for SLIC marker header"), parent);
+        msg(usprintf("%s: volume body is too small even for SLIC marker header", __FUNCTION__), parent);
         return U_SUCCESS;
     }
 
@@ -1185,7 +1181,7 @@ USTATUS NvramParser::parseSlicMarkerHeader(const UByteArray & store, const UINT3
 
     // Check store size
     if (dataSize < markerHeader->Size) {
-        msg(usprintf("parseSlicMarkerHeader: SLIC marker size %Xh (%u) is greater than volume body size %Xh (%u)",
+        msg(usprintf("%s: SLIC marker size %Xh (%u) is greater than volume body size %Xh (%u)", __FUNCTION__,
             markerHeader->Size, markerHeader->Size,
             dataSize, dataSize), parent);
         return U_SUCCESS;
@@ -1218,7 +1214,7 @@ USTATUS NvramParser::parseIntelMicrocodeHeader(const UByteArray & store, const U
 
     // Check data size
     if (dataSize < sizeof(INTEL_MICROCODE_HEADER)) {
-        msg(UString("parseIntelMicrocodeHeader: volume body is too small even for Intel microcode header"), parent);
+        msg(usprintf("%s: volume body is too small even for Intel microcode header", __FUNCTION__), parent);
         return U_SUCCESS;
     }
 
@@ -1227,7 +1223,7 @@ USTATUS NvramParser::parseIntelMicrocodeHeader(const UByteArray & store, const U
 
     // Check store size
     if (dataSize < ucodeHeader->TotalSize) {
-        msg(usprintf("parseIntelMicrocodeHeader: Intel microcode size %Xh (%u) is greater than volume body size %Xh (%u)",
+        msg(usprintf("%s: Intel microcode size %Xh (%u) is greater than volume body size %Xh (%u)", __FUNCTION__,
             ucodeHeader->TotalSize, ucodeHeader->TotalSize,
             dataSize, dataSize), parent);
         return U_SUCCESS;
@@ -1267,7 +1263,7 @@ USTATUS NvramParser::parseStoreHeader(const UByteArray & store, const UINT32 loc
     const UINT32* signature = (const UINT32*)store.constData();
     // Check store size
     if (dataSize < sizeof(UINT32)) {
-        msg(UString("parseStoreHeader: volume body is too small even for store signature"), parent);
+        msg(usprintf("%s: volume body is too small even for a store signature", __FUNCTION__), parent);
         return U_SUCCESS;
     }
 
@@ -1288,7 +1284,7 @@ USTATUS NvramParser::parseStoreHeader(const UByteArray & store, const UINT32 loc
     else if (*signature == NVRAM_APPLE_FSYS_STORE_SIGNATURE || *signature == NVRAM_APPLE_GAID_STORE_SIGNATURE)
         return parseFsysStoreHeader(store, localOffset, parent, index);
     // EVSA store
-    else if (*(signature + 1) == NVRAM_EVSA_STORE_SIGNATURE)
+    else if (dataSize >= 2 * sizeof(UINT32) && *(signature + 1) == NVRAM_EVSA_STORE_SIGNATURE)
         return parseEvsaStoreHeader(store, localOffset, parent, index);
     // Phoenix SCT flash map
     else if (*signature == NVRAM_PHOENIX_FLASH_MAP_SIGNATURE_PART1)
@@ -1297,10 +1293,10 @@ USTATUS NvramParser::parseStoreHeader(const UByteArray & store, const UINT32 loc
     else if (*signature == NVRAM_PHOENIX_CMDB_HEADER_SIGNATURE)
         return parseCmdbStoreHeader(store, localOffset, parent, index);
     // SLIC pubkey
-    else if (*(signature + 4) == OEM_ACTIVATION_PUBKEY_MAGIC)
+    else if (dataSize >= 5 * sizeof(UINT32) && *(signature + 4) == OEM_ACTIVATION_PUBKEY_MAGIC)
         return parseSlicPubkeyHeader(store, localOffset, parent, index);
     // SLIC marker
-    else if (*(const UINT64*)(store.constData() + 26) == OEM_ACTIVATION_MARKER_WINDOWS_FLAG)
+    else if (dataSize >= 34 && *(const UINT64*)(store.constData() + 26) == OEM_ACTIVATION_MARKER_WINDOWS_FLAG)
         return parseSlicMarkerHeader(store, localOffset, parent, index);
     // Intel microcode
     // Must be checked after SLIC marker because of the same *signature values
@@ -1327,20 +1323,20 @@ USTATUS NvramParser::parseFdcStoreBody(const UModelIndex & index)
     UModelIndex volumeIndex;
     USTATUS status = ffsParser->parseVolumeHeader(data, localOffset, index, volumeIndex);
     if (status || !volumeIndex.isValid()) {
-        msg(UString("parseFdcStoreBody: store can't be parsed as FDC store"), index);
+        msg(usprintf("%s: store can't be parsed as FDC store", __FUNCTION__), index);
         return U_SUCCESS;
     }
 
     // Determine if it's a VSS or VSS2 store inside
     UByteArray store = model->body(volumeIndex);
-    if (store.size() >= sizeof(UINT32) && *(const UINT32*)store.constData() == NVRAM_VSS_STORE_SIGNATURE) {
+    if ((UINT32)store.size() >= sizeof(UINT32) && *(const UINT32*)store.constData() == NVRAM_VSS_STORE_SIGNATURE) {
         UModelIndex vssIndex;
         status = parseVssStoreHeader(store, localOffset + model->header(volumeIndex).size(), true, volumeIndex, vssIndex);
         if (status)
             return status;
         return parseVssStoreBody(vssIndex, 0);
     }
-    else if (store.size() >= sizeof(EFI_GUID) && store.left(sizeof(EFI_GUID)) == NVRAM_FDC_STORE_GUID) {
+    else if ((UINT32)store.size() >= sizeof(EFI_GUID) && store.left(sizeof(EFI_GUID)) == NVRAM_FDC_STORE_GUID) {
         UModelIndex vss2Index;
         status = parseVss2StoreHeader(store, localOffset + model->header(volumeIndex).size(), true, volumeIndex, vss2Index);
         if (status)
@@ -1348,7 +1344,7 @@ USTATUS NvramParser::parseFdcStoreBody(const UModelIndex & index)
         return parseVssStoreBody(vss2Index, 0);
     }
     else {
-        msg(UString("parseFdcStoreBody: internal volume can't be parsed as VSS/VSS2 store"), index);
+        msg(usprintf("%s: internal volume can't be parsed as VSS/VSS2 store", __FUNCTION__), index);
         return U_SUCCESS;
     }
 
@@ -1378,7 +1374,7 @@ USTATUS NvramParser::parseVssStoreBody(const UModelIndex & index, UINT8 alignmen
     // Check that the is enough space for variable header
     const UINT32 dataSize = (UINT32)data.size();
     if (dataSize < sizeof(VSS_VARIABLE_HEADER)) {
-        msg(UString("parseVssStoreBody: store body is too small even for VSS variable header"), index);
+        msg(usprintf("%s: store body is too small even for VSS variable header", __FUNCTION__), index);
         return U_SUCCESS;
     }
 
@@ -1386,7 +1382,7 @@ USTATUS NvramParser::parseVssStoreBody(const UModelIndex & index, UINT8 alignmen
 
     // Parse all variables
     while (1) {
-        bool isInvalid = false;
+        bool isInvalid = true;
         bool isAuthenticated = false;
         bool isAppleCrc32 = false;
         bool isIntelSpecial = false;
@@ -1394,13 +1390,13 @@ USTATUS NvramParser::parseVssStoreBody(const UModelIndex & index, UINT8 alignmen
         UINT32 storedCrc32 = 0;
         UINT32 calculatedCrc32 = 0;
         UINT64 monotonicCounter = 0;
-        EFI_TIME timestamp = { 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+        EFI_TIME timestamp = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
         UINT32 pubKeyIndex = 0;
 
         UINT8 subtype = 0;
         UString name;
         UString text;
-        EFI_GUID* variableGuid;
+        EFI_GUID* variableGuid = NULL;
         CHAR16*   variableName = (CHAR16*)L"";
         UByteArray header;
         UByteArray body;
@@ -1460,7 +1456,8 @@ USTATUS NvramParser::parseVssStoreBody(const UModelIndex & index, UINT8 alignmen
             }
 
             // Intel special variable
-            else if (variableHeader->State == NVRAM_VSS_INTEL_VARIABLE_VALID || variableHeader->State == NVRAM_VSS_INTEL_VARIABLE_INVALID) {
+            else if (variableHeader->State == NVRAM_VSS_INTEL_VARIABLE_VALID
+                || variableHeader->State == NVRAM_VSS_INTEL_VARIABLE_INVALID) {
                 isIntelSpecial = true;
                 const VSS_INTEL_VARIABLE_HEADER* intelVariableHeader = (const VSS_INTEL_VARIABLE_HEADER*)variableHeader;
                 variableSize = intelVariableHeader->TotalSize;
@@ -1478,7 +1475,7 @@ USTATUS NvramParser::parseVssStoreBody(const UModelIndex & index, UINT8 alignmen
             }
 
             // Normal VSS variable
-            if (!isAuthenticated && !isAppleCrc32 && !isIntelSpecial) {
+            else {
                 variableSize = sizeof(VSS_VARIABLE_HEADER) + variableHeader->NameSize + variableHeader->DataSize;
                 variableGuid = (EFI_GUID*)&variableHeader->VendorGuid;
                 variableName = (CHAR16*)(variableHeader + 1);
@@ -1488,8 +1485,10 @@ USTATUS NvramParser::parseVssStoreBody(const UModelIndex & index, UINT8 alignmen
             }
 
             // Check variable state
-            if (variableHeader->State != NVRAM_VSS_INTEL_VARIABLE_VALID && variableHeader->State != NVRAM_VSS_VARIABLE_ADDED && variableHeader->State != NVRAM_VSS_VARIABLE_HEADER_VALID) {
+            if (variableHeader->State == NVRAM_VSS_INTEL_VARIABLE_VALID
-                isInvalid = true;
+                || variableHeader->State == NVRAM_VSS_VARIABLE_ADDED
+                || variableHeader->State == NVRAM_VSS_VARIABLE_HEADER_VALID) {
+                isInvalid = false;
             }
 
             // Check variable size
@@ -1512,7 +1511,7 @@ USTATUS NvramParser::parseVssStoreBody(const UModelIndex & index, UINT8 alignmen
             else { // Padding
                 // Nothing is parsed yet, but the store is not empty 
                 if (!offset) {
-                    msg(UString("parseVssStoreBody: store can't be parsed as VSS store"), index);
+                    msg(usprintf("%s: store can't be parsed as VSS store", __FUNCTION__), index);
                     return U_SUCCESS;
                 }
 
@@ -1526,7 +1525,8 @@ USTATUS NvramParser::parseVssStoreBody(const UModelIndex & index, UINT8 alignmen
         UString info;
 
         // Rename invalid variables
-        if (isInvalid) {
+        if (isInvalid || !variableGuid) {
+            isInvalid = true;
             name = UString("Invalid");
         }
         else { // Add GUID and text for valid variables
@@ -1560,8 +1560,9 @@ USTATUS NvramParser::parseVssStoreBody(const UModelIndex & index, UINT8 alignmen
         else if (isIntelSpecial) {
             subtype = Subtypes::IntelVssEntry;
         }
-        else
+        else {
             subtype = Subtypes::StandardVssEntry;
+        }
 
         // Add tree item
         model->addItem(localOffset + offset, Types::VssEntry, subtype, name, text, info, header, body, UByteArray(), Movable, index);
@@ -1591,12 +1592,12 @@ USTATUS NvramParser::parseFsysStoreBody(const UModelIndex & index)
     const UByteArray data = model->body(index);
 
     // Check that the is enough space for variable header
-    const UINT32 dataSize = (UINT32)data.size();
+    const UINT32 storeDataSize = (UINT32)data.size();
     UINT32 offset = 0;
 
     // Parse all variables
     while (1) {
-        UINT32 unparsedSize = dataSize - offset;
+        UINT32 unparsedSize = storeDataSize - offset;
         UINT32 variableSize = 0;
 
         // Get nameSize and name of the variable
@@ -1647,7 +1648,7 @@ USTATUS NvramParser::parseFsysStoreBody(const UModelIndex & index)
             model->addItem(localOffset + offset, Types::Padding, getPaddingType(body), UString("Padding"), UString(), info, UByteArray(), body, UByteArray(), Fixed, index);
 
             // Show message
-            msg(UString("parseFsysStoreBody: next variable appears too big, added as padding"), index);
+            msg(usprintf("%s: next variable appears too big, added as padding", __FUNCTION__), index);
 
             return U_SUCCESS;
         }
@@ -1694,14 +1695,14 @@ USTATUS NvramParser::parseEvsaStoreBody(const UModelIndex & index)
     const UByteArray data = model->body(index);
 
     // Check that the is enough space for entry header
-    const UINT32 dataSize = (UINT32)data.size();
+    const UINT32 storeDataSize = (UINT32)data.size();
     UINT32 offset = 0;
 
     std::map<UINT16, EFI_GUID> guidMap;
     std::map<UINT16, UString> nameMap;
 
     // Parse all entries
-    UINT32 unparsedSize = dataSize;
+    UINT32 unparsedSize = storeDataSize;
     while (unparsedSize) {
         UINT32 variableSize = 0;
         UString name;
@@ -1716,8 +1717,8 @@ USTATUS NvramParser::parseEvsaStoreBody(const UModelIndex & index)
         // Check entry size
         variableSize = sizeof(EVSA_ENTRY_HEADER);
         if (unparsedSize < variableSize || unparsedSize < entryHeader->Size) {
-            UByteArray body = data.mid(offset);
+            body = data.mid(offset);
-            UString info = usprintf("Full size: %Xh (%u)", body.size(), body.size());
+            info = usprintf("Full size: %Xh (%u)", body.size(), body.size());
 
             if (body.count(emptyByte) == body.size()) { // Free space
                 // Add free space tree item
@@ -1728,7 +1729,7 @@ USTATUS NvramParser::parseEvsaStoreBody(const UModelIndex & index)
                 UModelIndex itemIndex = model->addItem(localOffset + offset, Types::Padding, getPaddingType(body), UString("Padding"), UString(), info, UByteArray(), body, UByteArray(), Fixed, index);
 
                 // Show message
-                msg(UString("parseEvsaStoreBody: variable parsing failed, the rest of unparsed store added as padding"), itemIndex);
+                msg(usprintf("%s: variable parsing failed, the rest of unparsed store added as padding", __FUNCTION__), itemIndex);
             }
             break;
         }
@@ -1808,8 +1809,8 @@ USTATUS NvramParser::parseEvsaStoreBody(const UModelIndex & index)
         }
         // Unknown entry or free space
         else {
-            UByteArray body = data.mid(offset);
+            body = data.mid(offset);
-            UString info = usprintf("Full size: %Xh (%u)", body.size(), body.size());
+            info = usprintf("Full size: %Xh (%u)", body.size(), body.size());
 
             if (body.count(emptyByte) == body.size()) { // Free space
                 // Add free space tree item
@@ -1820,7 +1821,7 @@ USTATUS NvramParser::parseEvsaStoreBody(const UModelIndex & index)
                 UModelIndex itemIndex = model->addItem(localOffset + offset, Types::Padding, getPaddingType(body), UString("Padding"), UString(), info, UByteArray(), body, UByteArray(), Fixed, index);
 
                 // Show message
-                msg(usprintf("parseEvsaStoreBody: unknown variable of type %02Xh found at offset %Xh, the rest of unparsed store added as padding", entryHeader->Type, offset), itemIndex);
+                msg(usprintf("%s: unknown variable of type %02Xh found at offset %Xh, the rest of unparsed store added as padding", __FUNCTION__, entryHeader->Type, offset), itemIndex);
             }
             break;
         }
@@ -1830,7 +1831,7 @@ USTATUS NvramParser::parseEvsaStoreBody(const UModelIndex & index)
 
         // Move to next variable
         offset += variableSize;
-        unparsedSize = dataSize - offset;
+        unparsedSize = storeDataSize - offset;
     }
 
     // Reparse all data variables to detect invalid ones and assign name and test to valid ones
@@ -1850,17 +1851,17 @@ USTATUS NvramParser::parseEvsaStoreBody(const UModelIndex & index)
             if (guid.isEmpty() && name.isEmpty()) { // Both name and guid aren't found
                 model->setSubtype(current, Subtypes::InvalidEvsaEntry);
                 model->setName(current, UString("Invalid"));
-                msg(UString("parseEvsaStoreBody: data variable with invalid GuidId and invalid VarId"), current);
+                msg(usprintf("%s: data variable with invalid GuidId and invalid VarId", __FUNCTION__), current);
             }
             else if (guid.isEmpty()) { // Guid not found
                 model->setSubtype(current, Subtypes::InvalidEvsaEntry);
                 model->setName(current, UString("Invalid"));
-                msg(UString("parseEvsaStoreBody: data variable with invalid GuidId"), current);
+                msg(usprintf("%s: data variable with invalid GuidId", __FUNCTION__), current);
             }
             else if (name.isEmpty()) { // Name not found
                 model->setSubtype(current, Subtypes::InvalidEvsaEntry);
                 model->setName(current, UString("Invalid"));
-                msg(UString("parseEvsaStoreBody: data variable with invalid VarId"), current);
+                msg(usprintf("%s: data variable with invalid VarId", __FUNCTION__), current);
             }
             else { // Variable is OK, rename it
                 if (dataHeader->Header.Type == NVRAM_EVSA_ENTRY_TYPE_DATA_INVALID) {
@@ -1909,7 +1910,7 @@ USTATUS NvramParser::parseFlashMapBody(const UModelIndex & index)
 
             // Show message
             if (unparsedSize < entryHeader->Size)
-                msg(UString("parseFlashMapBody: next entry appears too big, added as padding"), index);
+                msg(usprintf("%s: next entry appears too big, added as padding", __FUNCTION__), index);
 
             break;
         }

common/nvramparser.h

@@ -44,7 +44,7 @@ private:
     TreeModel *model;
     FfsParser *ffsParser;
     std::vector<std::pair<UString, UModelIndex> > messagesVector;
-    void msg(const UString message, const UModelIndex index = UModelIndex()) {
+    void msg(const UString & message, const UModelIndex & index = UModelIndex()) {
         messagesVector.push_back(std::pair<UString, UModelIndex>(message, index));
     };
 

common/parsingdata.h

@@ -20,16 +20,16 @@ routines without the need of backward traversal
 #include "basetypes.h"
 
 typedef struct VOLUME_PARSING_DATA_ {
-    UINT8    ffsVersion;
-    UINT8    emptyByte;
     EFI_GUID extendedHeaderGuid;
     UINT32   alignment;
+    UINT32   usedSpace;
+    BOOLEAN  hasValidUsedSpace;
+    UINT8    ffsVersion;
+    UINT8    emptyByte;
     UINT8    revision;
     BOOLEAN  hasExtendedHeader;
     BOOLEAN  hasAppleCrc32;
     BOOLEAN  isWeakAligned;
-    BOOLEAN  hasValidUsedSpace;
-    UINT32   usedSpace;
 } VOLUME_PARSING_DATA;
 
 typedef struct FILE_PARSING_DATA_ {

common/peimage.h

@@ -586,8 +586,8 @@ typedef struct {
 } EFI_IMAGE_THUNK_DATA;
 
 #define EFI_IMAGE_ORDINAL_FLAG              0x80000000 // Flag for PE32.
-#define EFI_IMAGE_SNAP_BY_ORDINAL(Ordinal)  ((Ordinal & EFI_IMAGE_ORDINAL_FLAG) != 0)
+#define EFI_IMAGE_SNAP_BY_ORDINAL(Ordinal)  (((Ordinal) & EFI_IMAGE_ORDINAL_FLAG) != 0)
-#define EFI_IMAGE_ORDINAL(Ordinal)          (Ordinal & 0xffff)
+#define EFI_IMAGE_ORDINAL(Ordinal)          ((Ordinal) & 0xffff)
 
 //
 // Import Directory Table

common/treeitem.cpp

@@ -23,6 +23,7 @@ TreeItem::TreeItem(const UINT32 offset, const UINT8 type, const UINT8 subtype,
     itemAction(Actions::NoAction),
     itemType(type),
     itemSubtype(subtype),
+    itemMarking(0),
     itemName(name),
     itemText(text),
     itemInfo(info),
@@ -31,7 +32,6 @@ TreeItem::TreeItem(const UINT32 offset, const UINT8 type, const UINT8 subtype,
     itemTail(tail),
     itemFixed(fixed),
     itemCompressed(compressed),
-    itemMarking(0),
     parentItem(parent)
 {
 }

common/ustring.cpp

@@ -40,7 +40,7 @@ not recommended that bformat be used at all. */
 #define START_VSNBUFF (256)
 #else
 
-#if defined (__GNUC__) && !defined (__PPC__)
+#if defined (__GNUC__) && !defined (__PPC__) && !defined(__WIN32__)
 /* Something is making gcc complain about this prototype not being here, so
 I've just gone ahead and put it in. */
 extern "C" {

common/utility.cpp

@@ -34,6 +34,7 @@ UString uniqueItemName(const UModelIndex & index)
     UString itemText = model->text(index);
 
     // Default name
+
     UString name = itemName;
     switch (model->type(index)) {
     case Types::NvarEntry:
@@ -49,17 +50,26 @@ UString uniqueItemName(const UModelIndex & index)
         UModelIndex fileIndex = model->findParentOfType(index, Types::File);
         UString fileText = model->text(fileIndex);
         name = fileText.isEmpty() ? model->name(fileIndex) : model->name(fileIndex) + '_' + fileText;
+
+        // Special case of GUIDed sections
+        if (model->subtype(index) == EFI_SECTION_GUID_DEFINED || model->subtype(index) == EFI_SECTION_FREEFORM_SUBTYPE_GUID) {
+            name = model->name(index) +'_' + name;
+        }
     } break;
     }
 
+    // Populate subtypeString
     UString subtypeString = itemSubtypeToUString(model->type(index), model->subtype(index));
+
+    // Create final name
     name = itemTypeToUString(model->type(index))
         + (subtypeString.length() ? ('_' + subtypeString) : UString())
         + '_' + name;
 
+    // Replace some symbols with underscopes for better readability
     name.findreplace(' ', '_');
     name.findreplace('/', '_');
-    name.findreplace('-', '_');
+    name.findreplace('\\', '_');
 
     return name;
 }
@@ -225,18 +235,25 @@ USTATUS decompress(const UByteArray & compressedData, const UINT8 compressionTyp
         // Try EFI 1.1
         USTATUS EfiResult = EfiDecompress(data, dataSize, efiDecompressed, decompressedSize, scratch, scratchSize);
 
+        if (decompressedSize > INT32_MAX) {
+            free(decompressed);
+            free(efiDecompressed);
+            free(scratch);
+            return U_STANDARD_DECOMPRESSION_FAILED;
+        }
+
         if (EfiResult == U_SUCCESS && TianoResult == U_SUCCESS) { // Both decompressions are OK 
             algorithm = COMPRESSION_ALGORITHM_UNDECIDED;
-            decompressedData = UByteArray((const char*)decompressed, decompressedSize);
+            decompressedData = UByteArray((const char*)decompressed, (int)decompressedSize);
-            efiDecompressedData = UByteArray((const char*)efiDecompressed, decompressedSize);
+            efiDecompressedData = UByteArray((const char*)efiDecompressed, (int)decompressedSize);
         }
         else if (TianoResult == U_SUCCESS) { // Only Tiano is OK
             algorithm = COMPRESSION_ALGORITHM_TIANO;
-            decompressedData = UByteArray((const char*)decompressed, decompressedSize);
+            decompressedData = UByteArray((const char*)decompressed, (int)decompressedSize);
         }
         else if (EfiResult == U_SUCCESS) { // Only EFI 1.1 is OK
             algorithm = COMPRESSION_ALGORITHM_EFI11;
-            decompressedData = UByteArray((const char*)efiDecompressed, decompressedSize);
+            decompressedData = UByteArray((const char*)efiDecompressed, (int)decompressedSize);
         }
         else { // Both decompressions failed
             result = U_STANDARD_DECOMPRESSION_FAILED;
@@ -283,13 +300,21 @@ USTATUS decompress(const UByteArray & compressedData, const UINT8 compressionTyp
                 return U_CUSTOMIZED_DECOMPRESSION_FAILED;
             }
             else {
+                if (decompressedSize > INT32_MAX) {
+                    free(decompressed);
+                    return U_CUSTOMIZED_DECOMPRESSION_FAILED;
+                }
                 algorithm = COMPRESSION_ALGORITHM_IMLZMA;
-                decompressedData = UByteArray((const char*)decompressed, decompressedSize);
+                decompressedData = UByteArray((const char*)decompressed, (int)decompressedSize);
             }
         }
         else {
+            if (decompressedSize > INT32_MAX) {
+                free(decompressed);
+                return U_CUSTOMIZED_DECOMPRESSION_FAILED;
+            }
             algorithm = COMPRESSION_ALGORITHM_LZMA;
-            decompressedData = UByteArray((const char*)decompressed, decompressedSize);
+            decompressedData = UByteArray((const char*)decompressed, (int)decompressedSize);
         }
 
         free(decompressed);
@@ -320,7 +345,7 @@ UINT8 calculateChecksum8(const UINT8* buffer, UINT32 bufferSize)
     if (!buffer)
         return 0;
 
-    return (UINT8)0x100 - calculateSum8(buffer, bufferSize);
+    return (UINT8)(0x100U - calculateSum8(buffer, bufferSize));
 }
 
 // 16bit checksum calculation routine
@@ -341,6 +366,7 @@ UINT16 calculateChecksum16(const UINT16* buffer, UINT32 bufferSize)
     return (UINT16)(0x10000 - counter);
 }
 
+// Get padding type for a given padding
 UINT8 getPaddingType(const UByteArray & padding)
 {
     if (padding.count('\x00') == padding.size())

unixbuild.sh

@@ -0,0 +1,123 @@
+#!/bin/bash
+
+UTARGET=$(uname)
+BINSUFFIX=""
+
+if [ "$UTARGET" = "Darwin" ]; then
+  export UPLATFORM="mac"
+elif [ "$UTARGET" = "Linux" ]; then
+  export UPLATFORM="linux_$(uname -m)"
+elif [ "${UTARGET/MINGW32/}" != "$UTARGET" ]; then
+  export UPLATFORM="win32"
+  export BINSUFFIX=".exe"
+else
+  # Fallback to something...
+  export UPLATFORM="$UTARGET"
+fi
+
+if [ "$UPLATFORM" = "mac" ]; then
+  if [ ! -d /opt/qt56sm ]; then
+    curl -L -o /tmp/qt-5.6.3-static-mac.zip https://github.com/distdb/qtbuilds/blob/master/qt-5.6.3-static-mac.zip?raw=true || exit 1
+    qtsum=$(shasum -a 256 /tmp/qt-5.6.3-static-mac.zip | cut -f1 -d' ')
+    qtexpsum="214d22d8572ea6162753c8dd251d79275f3b22d49204718c637d722409e0cfcb"
+    if [ "$qtsum" != "$qtexpsum" ]; then
+      echo "Qt hash $qtsum does not match $qtexpsum"
+      exit 1
+    fi
+    sudo mkdir -p /opt || exit 1
+    cd /opt || exit 1
+    sudo unzip -q /tmp/qt-5.6.3-static-mac.zip || exit 1
+    cd - || exit 1
+  fi
+
+  export PATH="/opt/qt56sm/bin:$PATH"
+elif [ "$UPLATFORM" = "win32" ]; then
+  # Install missing dependencies
+  pacman -S --noconfirm --needed zip unzip curl perl mingw-w64-i686-toolchain mingw-w64-i686-cmake || exit 1
+
+  # Fix PATH to support running shasum.
+  export PATH="/usr/bin/core_perl:$PATH"
+
+  if [ ! -d "/c/Qt/5.6/mingw49_32_release_static/" ]; then
+    curl -L -o /tmp/qt-5.6.3-static-win32.zip https://github.com/distdb/qtbuilds/blob/master/qt-5.6.3-static-win32.zip?raw=true || exit 1
+    qtsum=$(shasum -a 256 /tmp/qt-5.6.3-static-win32.zip | cut -f1 -d' ')
+    qtexpsum="bcd85145d6fed00da37498c08c49d763c6fa883337f754880b5c786899e6bb1d"
+    if [ "$qtsum" != "$qtexpsum" ]; then
+      echo "Qt hash $qtsum does not match $qtexpsum"
+      exit 1
+    fi
+    mkdir -p /c/Qt/5.6 || exit 1
+    cd /c/Qt/5.6 || exit 1
+    unzip -q /tmp/qt-5.6.3-static-win32.zip || exit 1
+    cd - || exit 1
+  fi
+
+  export PATH="/c/Qt/5.6/mingw49_32_release_static/bin:$PATH"
+fi
+
+echo "Attempting to build UEFITool NE for ${UPLATFORM}..."
+
+UEFITOOL_VER=$(cat UEFITool/uefitool.cpp               | grep ^version             | cut -d'"' -f2 | sed 's/NE alpha /A/')
+UEFIDUMP_VER=$(cat UEFIDump/uefidump_main.cpp          | grep '"UEFIDump [0-9]'    | cut -d'"' -f2 | cut -d' ' -f2)
+UEFIEXTRACT_VER=$(cat UEFIExtract/uefiextract_main.cpp | grep '"UEFIExtract [0-9]' | cut -d'"' -f2 | cut -d' ' -f2)
+UEFIFIND_VER=$(cat UEFIFind/uefifind_main.cpp          | grep '"UEFIFind [0-9]'    | cut -d'"' -f2 | cut -d' ' -f2)
+
+build_tool() {
+  echo "Building $1 $2"
+  # Check version
+  if [ "$(echo "$2" | grep '^[0-9]*\.[0-9]*\.[0-9]*$')" != "$2" ] && [ "$(echo "$2" | grep '^A[0-9]*$')" != "$2" ]; then
+    echo "Invalid $1 version!"
+    exit 1
+  fi
+  # Tools are in subdirectories
+  cd "$1" || exit 1
+
+  # Build
+  if [ "$3" != "" ]; then
+    # -flto is flawed on CI atm
+    if [ "$UPLATFORM" = "mac" ]; then
+      qmake $3 QMAKE_CXXFLAGS+=-flto QMAKE_LFLAGS+=-flto CONFIG+=optimize_size || exit 1
+    elif [ "$UPLATFORM" = "win32" ]; then
+      qmake $3 QMAKE_CXXFLAGS="-static -flto -Os" QMAKE_LFLAGS="-static -flto -Os" CONFIG+=optimize_size CONFIG+=staticlib CONFIG+=static || exit 1
+    else
+      qmake $3 CONFIG+=optimize_size || exit 1
+    fi
+  else
+    if [ "$UPLATFORM" = "mac" ]; then
+      cmake -G "Unix Makefiles" -DCMAKE_CXX_FLAGS="-stdlib=libc++ -flto -Os -mmacosx-version-min=10.7" -DCMAKE_C_FLAGS="-flto -Os -mmacosx-version-min=10.7" || exit 1
+    elif [ "$UPLATFORM" = "win32" ]; then
+      cmake -G "Unix Makefiles" -DCMAKE_CXX_FLAGS="-static -Os" -DCMAKE_C_FLAGS="-static -Os" || exit 1
+    else
+      cmake -G "Unix Makefiles" -DCMAKE_CXX_FLAGS="-Os" -DCMAKE_C_FLAGS="-Os" || exit 1
+    fi
+  fi
+
+  make || exit 1
+
+  # Move the binary out of the dir
+  if [ "$UPLATFORM" = "win32" ] && [ -f "release/${1}${BINSUFFIX}" ]; then
+    mv "release/${1}${BINSUFFIX}" "${1}${BINSUFFIX}" || exit 1
+  fi
+
+  # Archive
+  if [ "$1" = "UEFITool" ] && [ "$UPLATFORM" = "mac" ]; then
+    strip -x UEFITool.app/Contents/MacOS/UEFITool || exit 1
+    zip -qry ../dist/"${1}_NE_${2}_${UPLATFORM}.zip" UEFITool.app ${4} || exit 1
+  else
+    strip -x "${1}${BINSUFFIX}" || exit 1
+    zip -qry ../dist/"${1}_NE_${2}_${UPLATFORM}.zip" "${1}${BINSUFFIX}" ${4} || exit 1
+  fi
+
+  # Return to parent
+  cd - || exit 1
+}
+
+rm -rf dist
+mkdir -p dist || exit 1
+
+build_tool UEFITool    "$UEFITOOL_VER"     uefitool.pro
+build_tool UEFIDump    "$UEFIDUMP_VER"     ""
+build_tool UEFIExtract "$UEFIEXTRACT_VER"  uefiextract.pro
+build_tool UEFIFind    "$UEFIFIND_VER"     uefifind.pro
+
+exit 0