Multiple improvements and bugfixes

1. Fixes #158, UEFITool and UEFIFind failed to lookup pattern crossing header/body boundary 2. Fixes #159, filter out more symbols in fileanems, which are prohibited by different filesystems 3. Add more known file GUIDs 4. Add basic support for FMP images 5. Fix unaligned read in uint24ToUint32 6. Fix compilation with latest cmake requiring directory path
2024-11-21 23:48:22 +08:00 · 2019-01-20 13:23:28 +03:00 · 2019-01-20 13:23:28 +03:00 · 1ac6e6a4f0
commit 1ac6e6a4f0
parent 40b77a713f
13 changed files with 266 additions and 82 deletions
--- a/UEFIFind/CMakeLists.txt
+++ b/UEFIFind/CMakeLists.txt
@ -13,6 +13,7 @@ SET(PROJECT_SOURCES
 ../common/nvramparser.cpp
 ../common/ffsparser.cpp
 ../common/ffsreport.cpp
+ ../common/ffsutils.cpp
 ../common/peimage.cpp
 ../common/treeitem.cpp
 ../common/treemodel.cpp
@ -53,6 +54,7 @@ SET(PROJECT_HEADERS
 ../common/nvramparser.h
 ../common/ffsparser.h
 ../common/ffsreport.h
+ ../common/ffsutils.h
 ../common/peimage.h
 ../common/types.h
 ../common/treeitem.h
--- a/UEFIFind/uefifind.cpp
+++ b/UEFIFind/uefifind.cpp
@ -12,6 +12,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 */

 #include "uefifind.h"
+#include "../common/ffsutils.h"

 #include <fstream>

@ -52,7 +53,7 @@ USTATUS UEFIFind::find(const UINT8 mode, const bool count, const UString & hexPa

    result.clear();

-    USTATUS returned = findFileRecursive(root, hexPattern, mode, files);
+    USTATUS returned = FfsUtils::findFileRecursive(model, root, hexPattern, mode, files);
    if (returned)
        return returned;
    
@ -79,63 +80,3 @@ USTATUS UEFIFind::find(const UINT8 mode, const bool count, const UString & hexPa
    }
    return U_SUCCESS;
 }
-
-USTATUS UEFIFind::findFileRecursive(const UModelIndex index, const UString & hexPattern, const UINT8 mode, std::set<std::pair<UModelIndex, UModelIndex> > & files)
-{
-    if (!index.isValid())
-        return U_SUCCESS;
-
-    if (hexPattern.isEmpty())
-        return U_INVALID_PARAMETER;
-
-    const char *hexPatternRaw = hexPattern.toLocal8Bit();
-    std::vector<UINT8> pattern, patternMask;
-    if (!makePattern(hexPatternRaw, pattern, patternMask))
-        return U_INVALID_PARAMETER;
-
-    // Check for "all substrings" pattern
-    size_t count = 0;
-    for (size_t i = 0; i < patternMask.size(); i++)
-        if (patternMask[i] == 0)
-            count++;
-    if (count == patternMask.size())
-        return U_SUCCESS;
-
-
-
-    bool hasChildren = (model->rowCount(index) > 0);
-    for (int i = 0; i < model->rowCount(index); i++) {
-        findFileRecursive(index.child(i, index.column()), hexPattern, mode, files);
-    }
-
-    UByteArray data;
-    if (hasChildren) {
-        if (mode == SEARCH_MODE_HEADER || mode == SEARCH_MODE_ALL)
-            data += model->header(index);
-    }
-    else {
-        if (mode == SEARCH_MODE_HEADER)
-            data += model->header(index);
-        else if (mode == SEARCH_MODE_BODY)
-            data += model->body(index);
-        else
-            data += model->header(index) + model->body(index);
-    }
-
-    const UINT8 *rawData = reinterpret_cast<const UINT8 *>(data.constData());
-    INTN offset = findPattern(pattern.data(), patternMask.data(), pattern.size(), rawData, data.size(), 0);
-    if (offset >= 0) {
-        if (model->type(index) != Types::File) {
-            UModelIndex ffs = model->findParentOfType(index, Types::File);
-            if (model->type(index) == Types::Section && model->subtype(index) == EFI_SECTION_FREEFORM_SUBTYPE_GUID)
-                files.insert(std::pair<UModelIndex, UModelIndex>(ffs, index));
-            else
-                files.insert(std::pair<UModelIndex, UModelIndex>(ffs, UModelIndex()));
-        }
-        else
-            files.insert(std::pair<UModelIndex, UModelIndex>(index, UModelIndex()));
-
-    }
-
-    return U_SUCCESS;
-}
--- a/UEFIFind/uefifind.h
+++ b/UEFIFind/uefifind.h
@ -34,9 +34,6 @@ public:
    USTATUS find(const UINT8 mode, const bool count, const UString & hexPattern, UString & result);

 private:
-    USTATUS findFileRecursive(const UModelIndex index, const UString & hexPattern, const UINT8 mode, std::set<std::pair<UModelIndex, UModelIndex> > & files);
-    UString guidToQString(const UINT8* guid);
-
    FfsParser* ffsParser;
    TreeModel* model;
    bool initDone;
--- a/UEFITool/ffsfinder.cpp
+++ b/UEFITool/ffsfinder.cpp
@ -15,6 +15,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 USTATUS FfsFinder::findHexPattern(const UModelIndex & index, const UByteArray & hexPattern, const UINT8 mode)
 {
+    //TODO: use FfsUtils.
+
    if (!index.isValid())
        return U_SUCCESS;

@ -32,16 +34,18 @@ USTATUS FfsFinder::findHexPattern(const UModelIndex & index, const UByteArray &

    UByteArray data;
    if (hasChildren) {
-        if (mode != SEARCH_MODE_BODY)
+        if (mode == SEARCH_MODE_HEADER)
            data = model->header(index);
+        else if (mode == SEARCH_MODE_ALL)
+            data = model->header(index) + model->body(index);
    }
    else {
        if (mode == SEARCH_MODE_HEADER)
-            data.append(model->header(index));
+            data = model->header(index);
        else if (mode == SEARCH_MODE_BODY)
-            data.append(model->body(index));
+            data = model->body(index);
        else
-            data.append(model->header(index)).append(model->body(index));
+            data = model->header(index) + model->body(index);
    }

    UString hexBody = UString(data.toHex());
@ -49,11 +53,15 @@ USTATUS FfsFinder::findHexPattern(const UModelIndex & index, const UByteArray &
    INT32 offset = regexp.indexIn(hexBody);
    while (offset >= 0) {
        if (offset % 2 == 0) {
-            msg(UString("Hex pattern \"") + UString(hexPattern) 
-                + UString("\" found as \"") + hexBody.mid(offset, hexPattern.length()).toUpper() 
-                + UString("\" in ") + model->name(index) 
-                + usprintf(" at %s-offset %02Xh", mode == SEARCH_MODE_BODY ? "body" : "header", offset / 2),
-                index);
+            // For patterns that cross header|body boundary, skip patterns entirely located in body, since
+            // children search above has already found them.
+            if (!(hasChildren && mode == SEARCH_MODE_ALL && offset/2 >= model->header(index).size())) {
+                msg(UString("Hex pattern \"") + UString(hexPattern)
+                    + UString("\" found as \"") + hexBody.mid(offset, hexPattern.length()).toUpper()
+                    + UString("\" in ") + model->name(index)
+                    + usprintf(" at %s-offset %02Xh", mode == SEARCH_MODE_BODY ? "body" : "header", offset / 2),
+                    index);
+            }
        }
        offset = regexp.indexIn(hexBody, offset + 1);
    }
--- a/UEFITool/uefitool.pro
+++ b/UEFITool/uefitool.pro
@ -34,6 +34,7 @@ HEADERS += uefitool.h \
 ../common/ffsparser.h \
 ../common/ffsreport.h \
 ../common/treeitem.h \
+ ../common/ffsutils.h \
 ../common/treemodel.h \
 ../common/LZMA/LzmaCompress.h \
 ../common/LZMA/LzmaDecompress.h \
@ -78,6 +79,7 @@ SOURCES += uefitool_main.cpp \
 ../common/ffsbuilder.cpp \
 ../common/ffsparser.cpp \
 ../common/ffsreport.cpp \
+ ../common/ffsutils.cpp \
 ../common/treeitem.cpp \
 ../common/treemodel.cpp \
 ../common/LZMA/LzmaCompress.c \
--- a/common/ffs.cpp
+++ b/common/ffs.cpp
@ -46,7 +46,7 @@ VOID uint32ToUint24(UINT32 size, UINT8* ffsSize)

 UINT32 uint24ToUint32(const UINT8* ffsSize)
 {
-    return *(UINT32*)ffsSize & 0x00FFFFFF;
+    return readUnaligned((UINT32*)ffsSize) & 0x00FFFFFF;
 }

 UString guidToUString(const EFI_GUID & guid, bool convertToString)
--- a/common/ffs.h
+++ b/common/ffs.h
@ -44,6 +44,10 @@ typedef struct EFI_CAPSULE_HEADER_ {
 #define EFI_CAPSULE_HEADER_FLAG_PERSIST_ACROSS_RESET    0x00010000
 #define EFI_CAPSULE_HEADER_FLAG_POPULATE_SYSTEM_TABLE   0x00020000

+// Standard FMP capsule GUID
+const UByteArray EFI_FMP_CAPSULE_GUID // 6DCBD5ED-E82D-4C44-BDA1-7194199AD92A
+("\xED\xD5\xCB\x6D\x2D\xE8\x44\x4C\xBD\xA1\x71\x94\x19\x9A\xD9\x2A", 16);
+
 // Standard EFI capsule GUID
 const UByteArray EFI_CAPSULE_GUID
 ("\xBD\x86\x66\x3B\x76\x0D\x30\x40\xB7\x0E\xB5\x51\x9E\x2F\xC5\xA0", 16);
--- a/common/ffsparser.cpp
+++ b/common/ffsparser.cpp
@ -167,6 +167,7 @@ USTATUS FfsParser::parseCapsule(const UByteArray & capsule, const UINT32 localOf
    UINT32 capsuleHeaderSize = 0;
    // Check buffer for being normal EFI capsule header
    if (capsule.startsWith(EFI_CAPSULE_GUID)
+        || capsule.startsWith(EFI_FMP_CAPSULE_GUID)
        || capsule.startsWith(INTEL_CAPSULE_GUID)
        || capsule.startsWith(LENOVO_CAPSULE_GUID)
        || capsule.startsWith(LENOVO2_CAPSULE_GUID)) {
--- a/common/ffsutils.cpp
+++ b/common/ffsutils.cpp
@ -0,0 +1,88 @@
+/* ffsutils.cpp
+
+Copyright (c) 2019, 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
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+*/
+
+#include "ffsutils.h"
+#include "utility.h"
+#include "ffs.h"
+
+namespace FfsUtils {
+
+USTATUS findFileRecursive(TreeModel *model, const UModelIndex index, const UString & hexPattern, const UINT8 mode, std::set<std::pair<UModelIndex, UModelIndex> > & files)
+{
+    if (!index.isValid())
+        return U_SUCCESS;
+
+    if (hexPattern.isEmpty())
+        return U_INVALID_PARAMETER;
+
+    const char *hexPatternRaw = hexPattern.toLocal8Bit();
+    std::vector<UINT8> pattern, patternMask;
+    if (!makePattern(hexPatternRaw, pattern, patternMask))
+        return U_INVALID_PARAMETER;
+
+    // Check for "all substrings" pattern
+    size_t count = 0;
+    for (size_t i = 0; i < patternMask.size(); i++)
+        if (patternMask[i] == 0)
+            count++;
+    if (count == patternMask.size())
+        return U_SUCCESS;
+
+    bool hasChildren = (model->rowCount(index) > 0);
+    for (int i = 0; i < model->rowCount(index); i++) {
+        findFileRecursive(model, index.child(i, index.column()), hexPattern, mode, files);
+    }
+
+    UByteArray data;
+    if (hasChildren) {
+        if (mode == SEARCH_MODE_HEADER)
+            data = model->header(index);
+        else if (mode == SEARCH_MODE_ALL)
+            data = model->header(index) + model->body(index);
+    }
+    else {
+        if (mode == SEARCH_MODE_HEADER)
+            data = model->header(index);
+        else if (mode == SEARCH_MODE_BODY)
+            data = model->body(index);
+        else
+            data = model->header(index) + model->body(index);
+    }
+
+    const UINT8 *rawData = reinterpret_cast<const UINT8 *>(data.constData());
+    INTN offset = findPattern(pattern.data(), patternMask.data(), pattern.size(), rawData, data.size(), 0);
+
+    // For patterns that cross header|body boundary, skip patterns entirely located in body, since
+    // children search above has already found them.
+    if (hasChildren && mode == SEARCH_MODE_ALL && offset >= model->header(index).size()) {
+        offset = -1;
+    }
+
+    if (offset >= 0) {
+        if (model->type(index) != Types::File) {
+            UModelIndex ffs = model->findParentOfType(index, Types::File);
+            if (model->type(index) == Types::Section && model->subtype(index) == EFI_SECTION_FREEFORM_SUBTYPE_GUID)
+                files.insert(std::pair<UModelIndex, UModelIndex>(ffs, index));
+            else
+                files.insert(std::pair<UModelIndex, UModelIndex>(ffs, UModelIndex()));
+        }
+        else {
+            files.insert(std::pair<UModelIndex, UModelIndex>(index, UModelIndex()));
+        }
+
+    }
+
+    return U_SUCCESS;
+}
+
+};
--- a/common/ffsutils.h
+++ b/common/ffsutils.h
@ -0,0 +1,30 @@
+/* fssreport.h
+
+Copyright (c) 2019, 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
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+*/
+
+#ifndef FFSUTILS_H
+#define FFSUTILS_H
+
+#include <set>
+
+#include "basetypes.h"
+#include "ubytearray.h"
+#include "ustring.h"
+#include "treemodel.h"
+
+namespace FfsUtils {
+
+USTATUS findFileRecursive(TreeModel *model, const UModelIndex index, const UString & hexPattern, const UINT8 mode, std::set<std::pair<UModelIndex, UModelIndex> > & files);
+
+};
+
+#endif // FFSUTILS_H
--- a/common/guids.csv
+++ b/common/guids.csv
@ -11,6 +11,7 @@
 00CA959F-6CFA-4DB1-95BC-E46C47514390,EfiTlsProtocolGuid
 00D6B14B-7DD0-4062-8821-E5F96A2A1B00,FspReservedMemoryResourceHobMiscGuid
 00DBD91D-55E9-420F-9639-5E9F8437B44F,EfiExtendedSalStatusCodeServicesProtocolGuid
+010216CD-9C09-4EB5-B7DA-D0A2865092D4,ProjectDXE
 01359D99-9446-456D-ADA4-50A711C03ADA,CpuInitPei
 0154DD51-9079-4A10-895C-9C0772815788,PlatformBootManagerStringPackGuid
 01631791-F34E-4C0A-B15D-0B6CE22B27A8,TcgPeiAfterMem
@ -58,6 +59,7 @@
 056E7324-A718-465B-9A84-228F06642B4F,PlatformDxe
 057A449A-1FDC-4C06-BFC9-F53F6A99BB92,EfiPciCfg2PpiGuid
 0584FC67-72B9-4D46-AE3E-AD330452D9B4,InputDeviceAggregatorDxe
+05984E1A-D8BB-5D8A-A8E6-90E6FB2AB7DA,AlertUI
 05AD34BA-6F02-4214-952E-4DA0398E2BB9,EfiDxeServicesTableGuid
 05C99A21-C70F-4AD2-8A5F-35DF3343F51E,EfiDevicePathFromTextProtocolGuid
 060CC026-4C0D-4DDA-8F41-595FEF00A502,MemoryStatusCodeRecordGuid
@ -86,6 +88,7 @@
 08464531-4C99-4C4C-A887-8D8BA4BBB063,Ps2MouseDxe
 08497E75-0BF6-40E2-8ABF-B98DFB464C93,SpiFlashPeiLibNull
 085DDD80-CE41-4FA8-B298-6071E8F62BC5,SmcOobPlatformPolicyDxe
+08A92691-926C-414F-A0B5-E785D90B9853,Memory_OK_DXE
 08B2E586-35A8-4A3F-A9ED-E48134891601,SmcInBandSmm
 08B97689-86AF-4A36-9E35-117B4D2EF26A,AfscDxe
 08EFD15D-EC55-4023-B648-7BA40DF7D05D,PeiRamBoot
@ -116,6 +119,7 @@
 0B04B2ED-861C-42CD-A22F-C3AAFACCB896,BiosVideoDxe
 0B2CFBF2-3E08-4C4E-A74D-59748A9F930F,LegacyRegionDxe
 0B4AE6BE-6DA6-4908-8A71-7E6A8A33B11C,MeFwVersion
+0B4BDCFF-74B2-45AD-91E1-8F6634C8A1DC,SIOBasicIOPei
 0B64AAB0-5429-11D4-9816-00A0C91FADCF,EfiBisProtocolGuid
 0B6E5233-A65C-44C9-9407-D9AB83BFC8BD,EfiCertSha224Guid
 0B6F5CA7-4F53-445A-B76E-2E365B806366,ArmVirtTokenSpaceGuid
@ -124,6 +128,7 @@
 0C0F3B43-44DE-4907-B478-225F6F6289DC,UsbKeyboardLayoutPackageGuid
 0C34B372-2622-4A13-A46E-BFD0DEB48BFF,I2cBusDxe
 0C375A90-4C4C-4428-8EA0-531BE8959BF7,FlashDriverSmm
+0C3B7B59-28E5-4C99-85E5-D0116DBFAAF2,IsctWakeReason
 0C85DF8A-4212-4CC1-A4AA-1A7A36E8DA97,FpgaPlatformEarlyInit
 0C95A916-A006-11D4-BCFA-0080C73C8881,WinNtThunkDxe
 0C95A928-A006-11D4-BCFA-0080C73C8881,EfiWinNtVirtualDisksGuid
@ -150,6 +155,7 @@
 0DCE384D-007C-4BA5-94BD-0F6EB64D2AA9,PeiNtAutoScanPpiGuid
 0DCF3594-318C-4596-B00F-BE61842DE3E2,SystemBootTypePeiPei
 0DE2CE25-446A-45A7-BFC9-37DA26344B37,EfiPeiDeviceRecoveryModulePpiGuid
+0DED86EE-6E79-4764-AA83-37A472F48123,FtBbUpdate
 0E00B084-2D16-4A27-B172-B1F68C2CC55D,MicrocodeUpdates
 0E1D2972-65AF-4AC1-BFA3-CEF4AB0C38FE,EfiCapsuleCrashGuid
 0E2DAF63-8A4F-4026-A899-DE2D7F46E5EC,SgTpvPei
@ -234,6 +240,7 @@
 13C5506E-8231-415E-9EBC-88DD115E3818,SmbiosElog
 13F4EA8E-BFF1-43BF-8F44-80BCC96040F1,FpgaDxe
 13FA7698-C831-49C7-87EA-8F43FCC25196,EfiEventVirtualAddressChangeGuid
+1400F9E6-4BAB-4B68-A53F-58FD240818E6,Reset_Modify
 14045170-CA65-47BC-9C15-2DE36D44AEE9,SmcInBandDxe
 140E8004-16E1-4DE1-A352-C6EF51110ECF,ArmSmcLibNull
 1410C6AC-9F4B-495B-9C23-8A5AEB0165E9,SmmSwDispatch2OnSmmSwDispatchThunk
@ -253,6 +260,7 @@
 1547B4F3-3E8A-4FEF-81C8-328ED647AB1A,Csm16
 154CAB4A-52B5-46CD-99C3-4368ABBACFFD,MetronomeDxe
 1555ACF3-BD07-4685-B668-A86945A4124D,CpuPeiBeforeMem
+157C666C-7C74-4E4A-B639-7BBA21487CE1,QFanDXE
 15853D7C-3DDF-43E0-A1CB-EBF85B8F872C,EfiDeferredImageLoadProtocolGuid
 158DC712-F15A-44DC-93BB-1675045BE066,HashLibBaseCryptoRouterDxe
 158DEF5A-F656-419C-B027-7A3192C079D2,ShellVariableGuid
@ -277,7 +285,10 @@
 17088572-377F-44EF-8F4E-B09FFF46A070,Microcode
 170E13C0-BF1B-4218-871D-2ABDC6F887BC,EfiOEMBadgingProtocolGuid
 171E9188-31D3-40F5-B10C-539B2DB940CD,EfiShellPkgTokenSpaceGuid
+174CF46D-B167-4E6A-B1CD-D41E24EFA0F9,ASUSBackupSmm
+17689034-F11B-468B-8CC4-E114C77F41B1,AsusPTTDxe
 17772369-D262-4B90-9F31-BDC41F2663A5,mebx_main
+177B2C74-9674-45F4-AAEB-43F5506AE0FE,ASUSPOSTMessage
 17851FBF-45C4-4FF7-A2A0-C3B12D63C27E,SdBlockIoPei
 17985E6F-E778-4D94-AEFA-C5DD2B77E186,QemuFwCfgAcpiPlatform
 17A0A3D7-C0A5-4635-BBD5-072187DFE2EE,EmbeddedGpioProtocolGuid
@ -307,6 +318,8 @@
 1A6853C8-F362-4F68-A77E-0B304A194C05,UseSocketDxe
 1A7E4468-2F55-4A56-903C-01265EB7622B,TcpDxe
 1A819E49-D8EE-48CB-9A9C-0AA0D2810A38,DxePchPolicyUpdateProtocolGuid
+1A8E9D96-66E6-461B-95D6-882C984D0B00,TbtPei
+1A931FB8-C466-454A-B684-73ADA2CB050B,ASUSPOSTMessagePEI
 1AA6D900-89D1-4C21-9C50-EDC7390A67C3,SlotDataUpdateDxeNeonCityFPGA
 1ACED566-76ED-4218-BC81-767F1F977A89,1
 1B0FB9BF-699D-4FDD-A7C3-2546681BF63B,EfiWiFi2ProtocolGuid
@ -336,6 +349,7 @@
 1D85CD7F-F43D-11D2-9A0C-0090273FC14D,EfiUnicodeCollationProtocolGuid
 1D88C542-9DF7-424A-AA90-02B61F286938,WdtPei
 1DA97072-BDDC-4B30-99F1-72A0B56FFF2A,EfiMonotonicCounterArchProtocolGuid
+1DACE8EE-CD97-491E-8A0C-305D6437323C,OnBrdDevDXE
 1DB29AE0-9DCB-43BC-8D87-5DA14964DDE2,EfiUserInfoAccessSetupNormalGuid
 1DB43EC9-DF5F-4CF5-AAF0-0E85DB4E149A,BootGuardDxe
 1DCFF17C-AA53-4B78-B234-864027555035,LibUefi
@ -376,12 +390,14 @@
 20B181E2-33E8-4211-B9D7-9B8696764E66,WheaElog
 20D8FFFE-15C3-4EA9-9D28-CFE2745D78F3,CryptoDxe
 21094ECB-9F20-4781-AE4B-50728B389A6E,IchInit
+210DCB72-BC14-4A19-A29B-F696EB7DE12B,EzSetup
 2119BBD7-9432-4F47-B5E2-5C4EA31B6BDC,DxeIpl
 21429B90-5F67-4E93-AF55-1D314D646E12,MemoryProfileInfo
 2145F72F-E6F1-4440-A828-59DC9AAB5F89,EmmcDxe
 215FDD18-BD50-4FEB-890B-58CA0B4739E9,EfiSioProtocolGuid
 21AF95E1-371F-4712-9C07-798E3CB019E4,LockSMRAMEntryDxe
 21CCF0B7-246B-412C-A334-0B65A07B28DF,SmmBaseOnSmmBase2Thunk
+21E34727-3881-4DEE-8020-D8908A980311,EpuHwModeDxe
 21F302AD-6E94-471B-84BC-B14800403A1D,EfiSmmCpuSaveStateProtocolGuid
 21FF1FEE-D33A-4FCE-A65E-955EA3C41F40,QNCMemoryInitPpiGuid
 22046D50-F390-498C-92E5-5BA4F8E7F8B6,SBSATAIDE
@ -467,6 +483,7 @@
 29926D4A-E531-490C-A529-C05E8A1D60D3,FwhFlashLibNull
 299D6F8B-2EC9-4E40-9EC6-DDAA7EBF5FD9,SiInit
 29B3C4C6-E5AA-49E4-8CE0-2772F782DDC2,WinNtGopDxe
+29BE380A-FBC0-462B-A6C2-5C5A076CAFDE,ProjectPEI
 29CBB005-C972-49F3-960F-292E2202CECD,FspNotifyPhasePeim
 29CF55F8-B675-4F5D-8F2F-B87A3ECFD063,CsmVideo
 29E0564F-B702-4352-A3A1-15FABD4A4E4A,IioCfgUpdateDxeLightningRidgeEXECB3
@ -485,6 +502,7 @@
 2AB86EF5-ECB5-4134-B556-3854CA1FE1B4,EfiPeiReadOnlyVariable2PpiGuid
 2AD0FC59-2314-4BF3-8633-13FA22A624A0,PlatformPei
 2AD511C7-1B60-4002-841D-2998DDC138EE,CryptoSMM
+2ADB8F5B-C7D4-4E7E-BE2A-23634DF668A1,MouseDriver
 2AE9D80F-3FB2-4095-B7B1-E93157B946B6,EfiHashAlgorithmSha1Guid
 2B1D0832-2184-4C8F-A90D-8E4AF9DE5BCD,BootModePeim
 2B2F68D6-0CD2-44CF-8E8B-BBA20B1B5B75,EfiUsbIoProtocolGuid
@ -528,12 +546,14 @@
 2E8CD01A-BDB7-40B4-8376-E7C26EAC21FF,PciPlatform
 2EA77912-80A8-4947-BE69-CDD00AFBE556,EdkiiNonDiscoverableUfsDeviceGuid
 2EA84160-ABA0-11DF-9896-0002A5D5C51B,PL301Axi
+2EAA04AA-5EED-4C27-B9EE-26916EC25A8F,RtkUndiDxeX64_011
 2EBE0275-6458-4AF9-91ED-D3F4EDB100AA,SignOn
 2EC3760F-B7FC-4FC7-B8B4-CF371C9628FF,ThunderboltXDomainDevice
 2ECED69B-2793-4388-BA3C-823040EBCCD2,EfiOSInfo
 2EE72E7C-FB9E-4318-B888-33A315C7A91D,PpmPolicy
 2F240E12-E14D-475C-83B0-EFFF22D77BE7,EfiKmsFormatSha512512Guid
 2F3962B2-57C5-44EC-9EFC-A69FD302032B,TopOfTemporaryRamPpiGuid
+2F4DDD35-F8C0-46D2-B0E3-A701360D7499,PcieLaneDXE
 2F62A818-4A72-CD40-90B9-FF00DAABEE7B,EmuThunk
 2F707EBB-4A1A-11D4-9A38-0090273FC14D,EfiPciRootBridgeIoProtocolGuid
 2F87BA6A-5C04-4385-A780-F3BF78A97BEC,EfiBlockIoCryptoAlgoAesXtsGuid
@ -597,6 +617,7 @@
 33FB3535-F15E-4C17-B303-5EB94595ECB6,SmmLockBox
 340436B0-EBFA-408A-9B8B-565B1F77CF2C,Lpc47N20x
 345ECC0E-0CB6-4B75-BB57-1B129C47333E,EfiPlatformToDriverConfigurationClpGuid
+3470CCF0-6054-11DD-AD8B-0800200C9A66,EzFlash
 348C4D62-BFBD-4882-9ECE-C80BB1C4783B,HiiDatabase
 348CA223-637B-4430-BAF3-1CE5D322B3FD,SetupBoot
 34989D8E-930A-4A95-AB04-2E6CFDFF6631,TcgPei
@ -613,8 +634,10 @@
 35B72237-3926-CF4A-A7F3-1449F9E0E4BD,EmuSimpleFileSystem
 35B898CA-B6A9-49CE-8C72-904735CC49B7,DxeMainDxe
 35C0C168-2607-4E51-BB53-448E3ED1A87F,PciBusNoEnumerationDxe
+35D13CFD-0BAF-11E8-AE0A-B8E8562CBAFA,AppleHpetTimerDxe
 36164812-A023-44E5-BD85-05BF3C7700AA,EfiFindFvPpiGuid
 3629DDB1-228C-452E-B616-09ED316A9700,EfiPaddingNoneGuid
+362C7275-4D8F-4607-8D8F-28893A8ACD60,EpuHwModePei
 36544866-6D93-7A48-88FB-669582D2516B,ApplePlatformInfoDatabaseDxe
 3672557A-06A7-43EF-60C3-1964F3DD1198,SmcOutBand
 3677D529-326F-4603-A926-EAACE01DCBB0,EfiPciExpressBaseAddressGuid
@ -628,6 +651,7 @@
 378D7B65-8DA9-4773-B6E4-A47826A833E2,PcRtcSmm
 3792095A-E309-4C1E-AA01-85F5655A17F1,EfiSmmAccessProtocolGuid
 3792FF94-8614-45ED-902B-1207BF1490A8,PrintThunk
+37DA43A1-BB9A-4805-9B92-0BDE11191149,ACPIRAM
 3812723D-7E48-4E29-BC27-F5A39AC94EF1,ItkDataVarGuid
 38321DBA-4FE0-4E17-8AEC-413055EAEDC1,EfiLegacy8259ProtocolGuid
 3868FC3B-7E45-43A7-906C-4BA47DE1754D,EfiSmmFaultTolerantWriteProtocolGuid
@ -648,6 +672,7 @@
 39D1EDC0-C9ED-4663-90DB-7457FF0548C5,AmiErrorHandlerMain
 39E8CA1A-7A69-4A73-834A-D06381933286,UsbPei
 39F62CCE-6825-4669-BB56-541ABA753A07,EfiGraphicsInfoHobGuid
+39FD1631-64CB-410C-874D-240F88AED5F1,IGD
 3A3300AB-C929-487D-AB34-159BC13562C0,PchResetCallbackProtocolGuid
 3A4D7A7C-018A-4B42-81B3-DC10E3B591BD,UsbKeyboardLayoutKeyGuid
 3A61FD45-69A0-42AD-B261-24DA451BF442,ForceRecovery
@ -674,8 +699,10 @@
 3BF4AF16-AB7C-4B43-898D-AB26AC5DDC6C,SecSMIFlash
 3BF66866-3F8B-4CD8-B74C-B994111F535F,FfsIntegrityCheckDxe
 3C1DE39F-D207-408A-AACC-731CFB7F1DD7,PciBus
+3C35B99D-D4B7-4885-ABD9-2BEA4B9F3A01,ASUSFTMDXE
 3C485EA4-449A-46CE-BB08-2A336EA96B4E,EfiCk505ClockPlatformInfoGuid
 3C5766E8-269C-4E34-AA14-ED776E85B3B6,EfiCertRsa2048Guid
+3C5C631D-7995-4415-8B16-9F4A8AD36FCF,Int10ToSmi
 3C699197-093C-4C69-B06B-128AE3481DC9,EfiAcpiDescriptionGuid
 3C7200E9-005F-4EA4-87DE-A3DFAC8A27C3,EfiShellDynamicCommandProtocolGuid
 3C7D193C-682C-4C14-A68F-552DEA4F437E,PcdDataBaseSignatureGuid
@ -700,9 +727,12 @@
 3E625104-1920-44B1-AE2C-1BDA57ED73EA,KtiRas
 3E745226-9818-45B6-A2AC-D7CD0E8BA2BC,EfiUsb2HcProtocolGuid
 3EB9F0D3-40D0-435B-B692-809151807FF4,TCM_MPDriver
+3EBD8C7C-733B-4667-8FD1-4ABEA366C95B,ASUSDirectKeyPEI
 3EBD9E82-2C78-4DE6-9786-8D4BFCB7C881,EfiFaultTolerantWriteProtocolGuid
 3EBFA8E6-511D-4B5B-A95F-FB38260F1C27,DeviceManagerFormSetGuid
 3F7753EF-D36F-45CC-8A1A-2EAAFF1038B6,PciPlatform
+3F78CB8D-72EE-414E-B023-DACA003BDDF5,ProjectSxSMI
+3F78CB8D-72EE-414E-B023-DACA003EFCDE,APM
 3FA0BB4A-180B-4458-9F12-6EA68F69E6CC,PxeRomB571699
 3FA4F847-D8EB-4DF4-BD49-103A0A847BBC,EfiKmsFormatMdc4128Guid
 3FD1D3A2-99F7-420B-BC69-8BB1D492A332,Fid
@ -740,6 +770,7 @@
 42881C98-A4F3-44B0-A39D-DFA18667D8CD,EfiHashServiceBindingProtocolGuid
 42BB673D-09F3-4E2E-9FEE-D081131DED5B,BootScriptSaveDxe
 42C078EF-14A8-4E30-9329-6F12D796E54A,LibWchar
+42EF76CE-A606-4881-BEA6-AD3F3EC9F754,Memory_OK_PEI
 42F58B27-5DC3-4FA7-844D-5A7DBFF06432,Enquire
 430AC2F7-EEC6-4093-94F7-9F825A7C1C40,SdDxe
 43172851-CF7E-4345-9FE0-D7012BB17B88,iFfsSmm
@ -791,6 +822,7 @@
 46E44855-BD60-4AB7-AB0D-A679B9447D77,EfiTcp6ProtocolGuid
 470CB248-E8AC-473C-BB4F-81069A1FE6FD,SmmFaultTolerantWriteDxe
 470E1529-B79E-4E32-A0FE-6A156D29F9B2,EfiBootScriptSaveProtocolGuid
+472A583E-70CF-465A-BB77-53ADFCDB5883,OCMR_DXE
 4776E33F-DB47-479A-A25F-A1CD0AFAB38B,EfiKmsFormatAesxts128Guid
 47889FB2-D671-4FAB-A0CA-DF0E44DF70D6,EfiPkcs7VerifyProtocolGuid
 47970A28-8F4A-4CB2-91DE-BF344153189A,AmiCspFlashLibNull
@ -799,6 +831,7 @@
 47C7B221-C42A-11D2-8E57-00A0C969723B,EfiShellEnvironment2Guid
 47C7B223-C42A-11D2-8E57-00A0C969723B,EfiShellInterfaceGuid
 480F8AE9-0C46-4AA9-BC89-DB9FBA619806,EfiDpcProtocolGuid
+4839023B-4C12-4EB2-B2B8-C91B42D878A0,IsctAcpi
 4862AFF3-667C-5458-B274-A1C62DF8BA80,HeciInit
 4896840D-46BB-412B-A30A-A62ABFB3682F,SpsAcpiSsdt
 48AB7F57-DC34-4F6C-A7D3-B0B5B0A74314,EfiIa32X64ErrorTypeMsCheckGuid
@ -818,6 +851,7 @@
 49EA041E-6752-42CA-B0B1-7344FE2546B7,ArmTimerDxe
 49EDB1C1-BF21-4761-BB12-EB0031AABB39,EfiPeiFirmwareVolumeInfoPpiGuid
 4A3602BC-1A05-4C82-99B4-588CD2A32CD5,LEGACYSREDIR
+4A37320B-3FB3-4365-9730-9E89C600395D,SmmDispatcher
 4A538818-5AE0-4EB2-B2EB-488B23657022,FvMainCompact
 4A9B9DB8-EC62-4A92-818F-8AA0246D246E,MiscSubclassDxe
 4AAFD29D-68DF-49EE-8AA9-347D375665A7,EfiCertPkcs7Guid
@ -839,6 +873,7 @@
 4C6E0267-C77D-410D-8100-1495911A989D,MetronomeDxe
 4C862FC6-0E54-4E36-8C8F-FF6F3167951F,FtwLiteDxe
 4C8A2451-C207-405B-9694-99EA13251341,EfiDebugMaskProtocolGuid
+4CC14F19-C626-4AB6-9DEA-CA6C01FD10CD,ASUSHeaderPEI
 4CE9D7AE-61B2-4461-9446-AB0376B4A7F7,FboSce
 4CEC368E-8E8E-4D71-8BE1-958C45FC8A53,EfiSmmPeriodicTimerDispatch2ProtocolGuid
 4CEF31DA-8682-4274-9CC4-AEE7516A5E7B,CapsuleApp
@ -907,8 +942,10 @@
 51C4C059-67F0-4E3C-9A55-FF42A8291C8C,PeiSmbusLibSmbusPpi
 51C9F40C-5243-4473-B265-B3C8FFAFF9FA,Crc32SectionExtractDxe
 51CCF399-4FDF-4E55-A45B-E123F84D456A,ConPlatformDxe
+523FA0E8-8639-47BB-B859-939A450DBF77,EnhancedFat
 5242AADB-BDAB-4B92-B7D5-A58B6E0EEE6B,IchSmbusArpDisabledPei
 524685A0-89A0-11E3-9D4D-BFA9F6A40308,AndroidFastbootPlatformProtocolGuid
+52715B77-04A5-487A-B980-CDC371B5BEC8,AsusPostErrPei
 529D3F93-E8E9-4E73-B1E1-BDF6A9D50113,ArpDxe
 52C05B14-0B98-496C-BC3B-04B50211D680,PeiCore
 52C78312-8EDC-4233-98F2-1A1AA5E388A5,EfiNvmExpressPassThruProtocolGuid
@ -932,6 +969,7 @@
 547C5CAE-2640-4ACF-9532-0E25B3F03F05,WheaDxe
 54891A9E-763E-4377-8841-8D5C90D88CDE,TerminalSrc
 54975633-0945-4D9C-97C2-E0CC6469A5A3,MeLibPei
+54AB7A17-AD08-4F86-83C2-4CF398EBC0AD,AsusPostErrDxe
 54D2878F-25CD-4A2B-8420-EBD18E609C76,OemHookStatusCodeLibNull
 54FCC43E-AA89-4333-9A85-CDEA24051E9E,EfiSupplicantProtocolGuid
 5507247A-846B-4F22-B55F-72B4049435EF,AmtLockKBD
@ -996,6 +1034,7 @@
 5BE3BDF4-53CF-46A3-A6A9-73C34A6E5EE3,NvmExpressDxe
 5BE40F57-FA68-4610-BBBF-E9C5FCDAD365,GetPcdInfoProtocolGuid
 5BEDB5CC-D830-4EB2-8742-2D4CC9B54F2C,Ip6Dxe
+5C0FB3B9-F7BB-467B-A4DC-89D7D5A58432,ResLoader
 5C198761-16A8-4E69-972C-89D67954F81D,EfiDriverSupportedEfiVersionProtocolGuid
 5C1997D7-8D45-4F21-AF3C-2206B8ED8BEC,PL061GpioDxe
 5C266089-E103-4D43-9AB5-12D7095BE2AF,IntelSaGopDriver
@ -1025,11 +1064,13 @@
 5F05B20F-4A56-C231-FA0B-A7B1F110041D,EfiRegexSyntaxTypePosixExtendedGuid
 5F439A0B-45D8-4682-A4F4-F0576B513441,EfiSmmCpuIoGuid
 5F5F605D-1583-4A2D-A6B2-EB12DAB4A2B6,ShellBcfgHiiGuid
+5F6A843E-D188-41A3-BA3C-A83D8997DC7F,BootPriority
 5F82BC22-85E1-489D-93A1-42BBD664B434,IioCfgUpdateDxeLightningRidgeEXECB1
 5FAD2389-2BC7-4BD2-83D3-429FB6AEA33F,EfiSerialPortTokenSpaceGuid
 5FB81FA3-BF65-43AD-A47B-DF70C3112B5A,SvSmmHandler
 5FCEA791-516E-4B61-892C-7229D4FF23D4,Int15ActiveLFP
 6010BEA0-A051-408D-9A6E-B744D468A05D,WinCapsuleUpdate
+602160C7-E080-4AFE-BE4A-BB5D9B87042D,AcpiTableDxe
 6046E678-24EF-4005-BA39-BDA11F6D555D,AmtInt16_csm
 6048B8EC-6D17-45C0-9BCF-63D164B41AB3,LanRom
 605EA650-C65C-42E1-BA80-91A52AB618C6,EfiEndOfPeiSignalPpiGuid
@ -1102,6 +1143,7 @@
 65A18235-5096-4032-8C63-214F0249CE8D,BaseMemoryLibSse2
 65E5746E-9C14-467D-B5B3-932A66D59F79,XhciPei
 6653876C-F6A1-45BB-A027-20455093BC6D,SecPeiFspPlatformSecLibVlv2
+66595A32-1877-4AE1-8748-809666EDADC7,AppleVTdDxe
 665E3FF5-46CC-11D4-9A38-0090273FC14D,EfiWatchdogTimerArchProtocolGuid
 665E3FF6-46CC-11D4-9A38-0090273FC14D,EfiBdsArchProtocolGuid
 667A8B1C-9C97-4B2A-AE7E-568772FE45F3,BaseResetSystemLibNull
@ -1144,6 +1186,7 @@
 6987936E-ED34-44DB-AE97-1FA5E4ED2116,HelloWorld
 69A79759-1373-4367-A6C4-C7F59EFD986E,FspReservedMemoryResourceHobGuid
 69D13BF0-AF91-4D96-AA9F-2184C5CE3BC0,PlatformModuleTokenSpaceGuid
+69E1A19F-BC8C-4021-B3D9-E0B2545092C6,OC_Tuner
 69E6DD6D-F09E-485F-9627-EB70E9CFC82A,UbaInitDxe
 69FD8E47-A161-4550-B01A-5594CEB2B2B2,IdeBusDxe
 6A056C67-3128-4102-9EC7-265E73AAB860,GopCardEnabler
@ -1207,6 +1250,7 @@
 6F71926E-60CE-428D-AA58-A3D9FB879429,IfConfig6
 6F871ADD-9D86-4676-8BAD-68E2E451FC5B,MicrocodeFlashAccessLibNull
 6F8C2B35-FEF4-448D-8256-E11B19D61077,EfiSecPlatformInformationPpiGuid
+6FD1DCC5-B5B9-4A82-8728-8D854428A4A3,DxeFfsGfxDriver
 6FD5B00C-D426-4283-9887-6CF5CF1CB1FE,EfiUserManagerProtocolGuid
 6FE38843-6500-42C2-A535-7769DEA56AA4,FpgaLoaderPeim
 6FF23F1D-877C-4B1B-93FC-F142B2EEA6A7,EfiGopDisplayBrightnessProtocolGuid
@ -1258,6 +1302,7 @@
 7462660F-1CBD-48DA-AD11-91717913831C,EfiPciOptionRomTableGuid
 7474A4C6-7F30-4DE1-BC68-DA5EFE615B52,SmbiosDataUpdateDxeNeonCityEPRP
 748221BC-2BA9-1545-8AA9-A03A8591999E,AppleNetVolume
+7497B957-20C3-4E47-A2C0-594966FD28FD,UefiDriverPolicyDXE
 74BD9FE0-8902-11E3-B9D3-F72238FC9A31,AndroidFastbootTransportProtocolGuid
 74D3B506-EE9C-47ED-B749-41261401DA78,QNCInitDxe
 75032015-D156-423E-BFA3-7A65ABA47105,EfiI2cBusConfigurationManagementProtocolGuid
@ -1269,6 +1314,7 @@
 7585C771-3CE4-41FE-B780-845CD85BA444,FirmwarePassword
 75FBCDBA-28C4-455A-A71D-536C9AB65093,SmcSetupModify
 7671D9D0-53DB-4173-AA69-2327F21F0BC7,EfiAuthenticationInfoProtocolGuid
+768BEDFD-7B4B-4C9F-B2FF-6377E3387243,NTFS
 76A7B4FC-C8D5-462D-A4D2-6E88338A772A,PlatformCpuPolicy
 76B6BDFA-2ACD-4462-9E3F-CB58C969D937,PerformanceProtocolGuid
 7701D7E5-7D1D-4432-A468-673DAB8ADE60,LdrMemoryDescriptorGuid
@ -1276,10 +1322,13 @@
 772484B2-7482-4B91-9F9A-AD43F81C5881,EfiMiscSubClassGuid
 7739F24C-93D7-11D4-9A3A-0090273FC14D,EfiHobListGuid
 773CB08B-511A-4BD5-85AD-41D4F4B64A52,AmtSetup
+77A6009E-116E-464D-8EF8-B35201A022DD,DigitalThermalSensorSmm
 77AB535A-45FC-624B-5560-F7B281D1F96E,EfiVirtualDiskGuid
+77B35E10-AC21-4DFB-B094-DDA8878A6521,ASM1061Pei
 77CB5A2E-59C8-490E-B69D-A3862BE5B3A0,EobonPriorityMap
 77EB6C06-FD48-488B-A1B3-AE0A70801369,CryptoDXE
 78247C57-63DB-4708-99C2-A8B4A9A61F6B,EfiMtftp4ProtocolGuid
+7827D4B0-926E-48F9-8ABD-69816EF86D16,AppleDmgBootDxe
 7833616E-AE0D-594F-870C-80E68682D587,ThunkProtocolList
 783658A3-4172-4421-A299-E009079C0CB4,EfiLegacyBiosPlatformProtocolGuid
 783AA974-DFB0-487B-906F-120FB9486E88,SetupConfigUpdateDxeLightningRidgeEXECB4
@ -1306,6 +1355,7 @@
 79E4A61C-ED73-4312-94FE-E3E7563362A9,PrintDxe
 7A08CB98-E9BC-41C3-BE19-B302F3F1F595,Terminal
 7A1CC2C0-7AF6-4F68-A564-CC03558FC3C5,SuperMDxe
+7A54B36F-F745-462C-B11F-16E03E52B617,AsusSpdTransfer
 7A59B29B-910B-4171-8242-A85A0DF25B5B,EfiHttpProtocolGuid
 7A5DBC75-5B2B-4E67-BDE1-D48EEE761562,EfiSmmSpiReadyProtocolGuid
 7A6CA3B8-EE1B-489C-B300-24544A7BD418,ShellCTestApp
@ -1343,6 +1393,7 @@
 7D84B2C2-22A1-4372-B12C-EBB232D3A6A3,VlvPolicyPpiGuid
 7D916D80-5BB1-458C-A48F-E25FDD51EF94,EfiTtyTermGuid
 7D9DDBFB-FB67-4303-90B0-9A7A7FF29B57,OpromUpdateDxeLightningRidgeEXECB1
+7DADBC98-6489-4D1C-907A-8EE243AF805B,ASUS_EUPPEI
 7E0C6E3E-C80F-47D1-8ADA-554926B2B6B3,GenericMemoryTestDxe
 7E1F0D85-04FF-4BB2-866A-31A2996A48A8,EfiPeiFvFileLoaderPpiGuid
 7E374E25-8E01-4FEE-87F2-390C23C606CD,PlatformAcpiTable
@ -1364,6 +1415,7 @@
 7FD082A9-3D6B-44E3-9C31-74D6B80F965C,SetupConfigUpdateDxeLightningRidgeEXECB1
 7FED72EE-0170-4814-9878-A8FB1864DFAF,SmmRelocateDxe
 7FFF52C8-82DE-4820-8960-5093102E484D,IncompatiblePciDevice
+80023209-6386-4C1D-909B-63506A2146FF,HWM_SetupDXE
 801ADCA0-815E-46A4-84F7-657F53621A57,SectionExtractionDxe
 805B032B-6A00-46F5-8501-CB88A21D5321,BcmDhd
 80897901-91F6-4EFE-9579-3353A0C02DAB,SDMediaDevice
@ -1385,6 +1437,7 @@
 82805649-7247-4DA4-8643-C8144D27E2E5,ProcMemErrReporting
 8296AF37-D183-4416-B3B6-19D2A80AD4A8,EbcDebugger
 82ECEE48-9571-4427-8485-85A5A45A0F39,DxeSmmReadyToLockOnExitPmAuthThunk
+82EF44E3-2C70-11E7-8DF1-B8E8562CBAFA,AppleVariableRuntimeDxe
 83381B06-2EEA-4CF3-9B5F-D75B9B5C93DE,GetServByPort
 834C0C5F-ADB3-4372-AEEB-03E4E9E6C591,IntelFspPkgTokenSpaceGuid
 8378AB1E-4147-400A-8D84-E3DE981C0453,TamperResistantBoot
@ -1395,18 +1448,22 @@
 83FA5AED-5171-4949-BDC9-0CBC9E123663,FwCapsuleRecoveryPPI
 8401A045-6F70-4505-8471-7015B40355E3,UsbBusPei
 8401A046-6F70-4505-8471-7015B40355E3,UsbBotPei
+842A454A-75E5-408B-8B1C-36420E4E3F21,NvramSmi
 843DC720-AB1E-42CB-9357-8A0078F3561B,EfiSmmControl2ProtocolGuid
 847BC3FE-B974-446D-9449-5AD5412E993B,BootManagerFormSetGuid
 8489334D-4219-4CA1-9B42-1D46B0B75861,TcgPpVendorLibNull
 848E908E-BD11-428E-94F9-7A0EEFCD37A6,BaseCsrToPcieLibNull
+84DDA68C-CA5A-4C30-9261-DD6DE7E45A95,EzSetupPortingDxe
 84E7016D-1EB8-4637-B01E-9EED018C7AE0,BiosGuardNvs
 84FA65AF-21BC-43BE-85FF-8AA7E7832A1D,AmiPciExpressLibNull
+855328E7-F96F-4398-9E7F-1F0A8C014E2C,AppleMeDriverDxe
 85768E4A-6CDC-444E-93DF-936685B5DFCC,VlvRefCodePkgTokenSpaceGuid
 858031F3-96A2-406E-ABCC-ED264A3A31D6,CryptRuntimeDxe
 858EBE6F-360F-415B-B7DC-463AAEB03412,TcgLegacy
 85A084FA-6B0E-BD4C-A20E-156E46103155,Legacy8259
 85A8AB57-0644-4110-850F-981322047070,EdkiiSmmLegacyBootProtocolGuid
 85B75607-F7CE-471E-B7E4-2AEA5F7232EE,EfiUserInfoAccessSetupAdminGuid
+8600C3A8-4213-456E-832A-D51E8E5F4AB1,AppleHeciDxe
 8614567D-35BE-4415-8D88-BD7D0C9C70C0,PlatformOverridesManagerGuid
 86212936-0E76-41C8-A03A-2AF2FC1C39E2,EfiRscHandlerProtocolGuid
 8628752A-6CB7-4814-96FC-24A815AC2226,EfiHashAlgorithmSha256NoPadGuid
@ -1420,6 +1477,7 @@
 86C77A67-0B97-4633-A187-49104D0685C7,EfiFirmwareManagementProtocolGuid
 86CDDF93-4872-4597-8AF9-A35AE4D3725F,IScsiDxe
 86D70125-BAA3-4296-A62F-602BEBBB9081,DxeIplPei
+86F61BDF-5BFD-46D3-B0F9-E43728DA1D2E,OCMR_CPU_POWER_MANAGEMENT_DXE
 870E0F5A-1981-45F6-AE26-0391425CC46F,CpuCsrAccessSMM
 8714C537-6D4B-4247-AA6C-29E8495F9100,FspNotifyDxe
 87438836-AD8D-4E3E-9249-895120A67240,DebugCommunicationLibUsb
@ -1494,6 +1552,7 @@
 8DFAE5D4-B50E-4C10-96E6-F2C266CACBB6,VideoRom
 8E325979-3FE1-4927-AAE2-8F5C4BD2AF0D,SdMmcPciHcDxe
 8E61FD6B-7A8B-404F-B83F-AA90A47CABDF,SmmSmbiosElog
+8E68E3C5-FC59-4280-8467-3800D31A8162,IccOverClocking9_5
 8EB48F19-CC92-4031-8D3D-EE473CCC87EB,SystemPrivateKey
 8EE41730-CD91-FE40-A83A-F60F1ECB492D,IcnsConvert
 8EEF9AD2-463E-425F-A4FE-2F6783D6F97E,GenericSio
@ -1541,6 +1600,7 @@
 921CD783-3E22-4579-A71F-00D74197FCC8,HeciSmm
 921CD783-3E22-4579-A71F-00D74197FCC9,SpsSmm
 9221315B-30BB-46B5-813E-1B1BF4712BD3,Defaults
+9257B1B6-82DF-4B69-A83B-C16D671B9A9F,ScreenCap
 92685943-D810-47FF-A112-CC8490776A1F,CORE_PEI
 926C9CD0-4BB8-479B-9AC4-8A2A23F85307,BaseIoLibIntrinsic
 9282ED2E-F8CE-CA47-AF50-3542332F7D53,AppleDnsResolver
@ -1603,10 +1663,12 @@
 9737D7CA-D869-45E5-A5EF-75D9438688DE,PlatformGOPPolicy
 978D7247-98EA-4A14-BF98-32A35F34566B,AcpiPowerButton
 978FE043-D7AF-422E-8A92-2B48E463BDE6,EfiKmsFormatGeneric512Guid
+97AF1D95-203C-42DE-8D6B-D13EB7E5A55A,PEfirmwareupdateEfi
 97CC7188-79C9-449F-B969-065B64BF9C69,BiosExtensionLoader
 97CDCF04-4C8E-42FE-8015-11CC8A6E9D81,Tpm2DeviceLibRouterPei
 982C298B-F4FA-41CB-B838-77AA688FB839,EfiUgaDrawProtocolGuid
 9842073D-95D9-9F49-BD3F-2E29525125DF,EmuBusDriver
+98584C0B-49D6-4BAF-B542-ECEE2582409C,ASUSBackup
 9876CCAD-47B4-4BDB-B65E-16F193C4F3DB,EfiProcessorGenericErrorSectionGuid
 98948C4A-70F2-4035-8E9F-5927493CFC07,FaultTolerantWriteSmmDxe
 989B6C1C-6FE1-D64E-A292-1313C410F0F2,Ip4Config
@ -1665,6 +1727,7 @@
 9E5628D5-ECD5-41A2-868B-99EB933A326E,AhciRom
 9E58292B-7C68-497D-A0CE-6500FD9F1B95,EdkiiWorkingBlockSignatureGuid
 9E625A27-4840-47CC-A6B5-1E9311CFC60E,Pkpub
+9E6584F1-FB33-4BD0-922D-47E5B7F5DBF1,GMUXDriver
 9E66F251-727C-418C-BFD6-C2B4252818EA,EfiHiiImageDecoderProtocolGuid
 9E7C00CF-355A-4D4E-BF60-0428CFF95540,BaseSerialPortLib16550
 9E863906-A40F-4875-977F-5B93FF237FC6,TerminalDxe
@ -1692,6 +1755,7 @@
 9FE7DE69-0AEA-470A-B50A-139813649189,KekVar
 A00490BA-3F1A-4B4C-AB90-4FA99726A1E8,EfiBlockIoCryptoProtocolGuid
 A01E498C-96E8-2A4C-95F4-85248F989753,FwBlockService
+A023D4A1-05A1-4797-B84F-03B854FD05F1,EneDXE
 A030D115-54DD-447B-9064-F206883D7CCC,PeiTpmInitializationDonePpiGuid
 A03A9429-C570-4EF9-9E00-C7A673976E5F,SmmControlDxe
 A04A27F4-DF00-4D42-B552-39511302113D,DriverSampleFormSetGuid
@ -1699,7 +1763,9 @@ A0534D92-9776-4E4E-9234-C9DC1849DBB5,PlatformFlashAccessLibNull
 A053F561-F56B-4140-8901-B4CB5D70929E,BootScriptThunkGuid
 A05B6FFD-87AF-4E42-95C9-6228B63CF3F3,EfiSmmUsbDispatchProtocolGuid
 A05ECE52-15A8-424E-BFD3-FCF3D566A09C,AmtPeiPolicyInit
+A05F5C06-1782-48AA-962A-86A0892022B6,ASM1061Dxe
 A062CF1F-8473-4AA3-8793-600BC4FFE9A8,CsmDxe
+A071C476-F78C-41C2-A173-B43D699A2C80,AppleEfiSocShutdown
 A08276EC-A0FE-4E06-8670-385336C7D093,x86Thunk
 A0BAD9F7-AB78-491B-B583-C52B7F84B9E0,SmmControl
 A0C0B7EF-99FF-417F-8B9F-5AD4701D90D6,Tpm12DeviceLibAtmelI2c
@ -1711,6 +1777,7 @@ A1147A20-3144-4F8D-8295-B48311C8E4A4,ArmJunoTokenSpaceGuid
 A14694E4-78DF-4EF1-A118-7654FF6CFA9D,IpmiSdrReader
 A17F4A89-5F19-444F-B7BE-48195E0575DB,SmbiosGenDxe
 A18596AC-1FC5-478D-BF14-0B415813D71F,Ohci
+A1902AB9-5394-45F2-857A-12824213EEFB,MSOA
 A19832B9-AC25-11D3-9A2D-0090273FC14D,EfiSimpleNetworkProtocolGuid
 A19A6C36-7053-4E2C-8BD0-E8286230E473,PciHostBridgeLibNull
 A19B1FE7-C1BC-49F8-875F-54A5D542443F,CpuIo2Dxe
@ -1740,6 +1807,7 @@ A3CD8EAC-B4E6-4B68-9641-0D3763799890,Int15Backlight
 A3F436EA-A127-4EF8-957C-8048606FF670,BCDxe
 A3FF0EF5-0C28-42F5-B544-8C7DE1E80014,PiSmmCpuDxeSmm
 A40DAE55-2F33-42F5-B064-C8D62CCF3B87,AppleSystemInitialization
+A42F4ACF-5A88-4DE3-A54D-EE7CA94C1246,AppleSpiIoCnl
 A45E60D1-C719-44AA-B07A-AA777F85906D,PeiAtaControllerPpiGuid
 A46423E3-4617-49F1-B9FF-D1BFA9115839,EfiSecurityArchProtocolGuid
 A469DDBD-16D0-4535-BAE3-77274BD70B4C,FwBlockServiceSmm
@ -1755,6 +1823,7 @@ A5288050-8828-46C4-8F72-1CD735A56520,Slp20Dxe
 A55701F5-E3EF-43DE-AC72-249B573FAD2C,EfiIa32X64ErrorTypeCacheCheckGuid
 A56074DB-65FE-45F7-BD21-2D2BDD8E9652,EfiLegacyDevOrderVariableGuid
 A5683620-7998-4BB2-A377-1C1E31E1E215,TcgDxe
+A58C5D1D-C22B-4845-90BC-8C94FCE96457,FastBootOption
 A59A0056-3341-44B5-9C9C-6D76F7673817,SignOn
 A59E8FCF-BDA0-43BB-90B1-D3732ECAA877,EfiScsiPassThruProtocolGuid
 A5AAB9E3-C727-48CD-8BBF-427233854948,EfiI2cHostProtocolGuid
@ -1824,6 +1893,7 @@ ABD42895-78CF-4872-8444-1B5C180BFBFF,EfiPeiBootScriptExecuterPpiGuid
 AC05BF33-995A-4ED4-AAB8-EF7AE80F5CB0,UefiCpuPkgTokenSpaceGuid
 AC3435BB-B1D3-4EF8-957C-8048606FF671,FrameworkHiiOnUefiHiiThunk
 AC5E14DD-4567-41F7-9E29-5F52CD314214,X11DPHSmmDriver
+AC874606-8727-41A0-BCCD-43A4237466DD,EneUpdDXE
 AC95AD3D-4366-44BF-9A62-E4B29D7A2206,SmmAccess2Dxe
 ACA24109-6C7A-4CEC-9133-5FB9D8274910,IntelLtsxFit
 ACAEAA7A-C039-4424-88DA-F42212EA0E55,PchPcieSmm
@ -1858,6 +1928,7 @@ AEC4159D-F2FC-4090-95CE-38317A8ED64C,FirmwarePerformanceTable
 AED6AA78-D5BF-4BC5-8CC5-F9EE47CF9299,CapsuleRuntimeDxe
 AEDA2428-9A22-4637-9B21-545E28FBB829,EfiEblAddCommandProtocolGuid
 AEE17FF6-B810-4A8A-9D4D-8B9C3289C1AC,SmcSwSMI
+AEF82756-87F2-4CF6-BE80-E59055295AA1,PEbiosinterface
 AEFAF26C-FB6D-4FEF-AF7A-9D78FF201FCA,FirmwareUpdate
 AF060190-5E3A-4025-AFBD-E1F905BFAA4C,EfiHiiImageDecoderNamePngGuid
 AF23B340-97B4-4685-8D4F-A3F28169B21D,EdkiiVarCheckProtocolGuid
@ -1921,6 +1992,7 @@ B422FB70-E835-448D-A921-EBA460E105B6,SmmIpmiLibSmmIpmiProtocol
 B47417C7-E21F-4AC9-B0A2-7A158223A137,SetupConfigUpdateDxeNeonCityEPECB
 B494DF39-A5F8-48A1-B2D0-EF523AD91C55,PeiPolicyInit
 B4C26857-8FE5-42BE-968B-39F45E921D45,AppleDxePState
+B4DE05C0-1BD0-11E1-8F0E-77F34724019B,TbtOemBoard
 B4E0CDFC-30CD-4B29-A445-B0AA95A532E4,SmmAccessPei
 B50AB2CA-48D0-11E4-A6D3-B8E8562CBAFA,SerialMojoDxe
 B55A4515-5895-4EA8-845B-75B7480F6502,SmmControl2OnSmmControlThunk
@ -1950,6 +2022,7 @@ B7A5041A-78BA-49E3-B73B-54C757811FB6,IdeBusPei
 B7A5041B-78BA-48E3-B63B-44C7578113B6,FloppyPeimPei
 B7BC0E96-57D2-4310-AEEF-74AC77DF0DAF,SetupXpBoot
 B7D19491-E55A-470D-8508-85A5DFA41974,SBDXE
+B7D9F0D7-EBDB-4EE4-AB77-B30C4B9093CC,TbtSmm
 B7DDFF7A-1726-11E6-B12F-B8E8562CBAFA,WiFiPlatformDxe
 B7DFB4E1-052F-449F-87BE-9818FC91B733,EfiRuntimeArchProtocolGuid
 B7EE4835-84CE-4B15-BF52-2D11574CE470,HardwareSignatureEntry
@ -1961,11 +2034,13 @@ B8969637-81DE-43AF-BC9A-24D98913F2F6,HandleParsingHiiGuid
 B8AC7FB2-4211-4C2B-B62F-504421666C87,RngTest
 B8D9777E-D72A-451F-9BDB-BAFB52A68415,ArmCpuDxe
 B8E62775-BB0A-43F0-A843-5BE8B14F8CCD,BootGraphicsResourceTableDxe
+B90510C4-A6DE-4E45-A50C-A46CCAFEEF91,BaseBoardDXE
 B912F198-7F0E-4803-B908-B757B806EC83,AppleImg4VerificationDxe
 B91978DF-9FC1-427D-BB05-4C828455CA27,EfiSioControlProtocolGuid
 B9237513-6C44-4411-A990-21E556E05ADE,EfiKmsFormatGeneric3072Guid
 B95E9FDA-26DE-48D2-8807-1F9107AC5E3A,UefiPxeBcDxe
 B981A835-6EE8-4F4C-AE0B-210AA0BFBF01,RngDxe
+B9846521-FF99-4953-8FA2-85C9ADCCE5AF,PeiGfxDriver
 B98999A4-E96F-475A-99FC-762126F50F5A,SMBIOSUpdateData
 B9B20B00-2FE5-8445-ACC5-8E29EF01A3E6,AppleMemoryTest
 B9D4C360-BCFB-4F9B-9298-53C136982258,EfiFormBrowser2ProtocolGuid
@ -1986,6 +2061,7 @@ BB11ECFE-820F-4968-BBA6-F76AFE302596,ArmTokenSpaceGuid
 BB1FBD4F-2E30-4793-9BED-74F672BC8FFE,PchResetRuntime
 BB25CF6F-F1D4-11D2-9A0C-0090273FC1FD,EfiSerialIoProtocolGuid
 BB2F0636-B0DD-489B-ADB6-606FE3A47258,CpuHotAdd
+BB3BF734-D640-4CF5-AFEA-CA8CFA6020D1,ASUS_USBFLASHBACK
 BB62E663-625D-40B2-A088-BBE83623A245,EfiEapManagementProtocolGuid
 BB65942B-521F-4EC3-BAF9-A92540CF60D2,SataController
 BB83F95F-EDBC-4884-A520-CD42AF388FAE,BaseDebugLibSerialPort
@ -2030,7 +2106,9 @@ BDFE430E-8F2A-4DB0-9991-6F856594777E,EhciDxe
 BDFE5FAA-2A35-44BB-B17A-8084D4E2B9E9,FvbServicesRuntimeDxe
 BE0FEABA-3443-4919-9F3A-2D4216329EA9,WinNtAutoScan
 BE189D38-C963-41CF-B695-D90E9E545A13,UfsBlockIoPei
+BE216BA8-38C4-4535-A6CA-5DCA5B43ADDF,SmiVariable
 BE731247-5FA2-4D5B-9DB6-5385CCCD59E1,UsbOcUpdateDxeLightningRidgeEXECB3
+BEA39084-044A-4C88-8763-2BFAFFA8950C,LTEB
 BF0A78BA-EC29-49CF-A1C9-7AE54EAB6A51,EfiMtftp6ProtocolGuid
 BF4B9D10-13EC-43DD-8880-E90B718F27DE,EmbeddedDeviceGuid
 BF89F10D-B205-474F-96E3-7A7BB1B4A407,VgaClassDxe
@ -2104,11 +2182,13 @@ C6760651-A38D-5F4F-AEAF-F6661549DF75,EmuBlockIo
 C68DAA4E-7AB5-41E8-A91D-5954421053F3,CbSupportDxe
 C68ED8E2-9DC6-4CBD-9D94-DB65ACC5C332,EfiSmmCommunicationProtocolGuid
 C6BB86C0-16F5-4535-953E-E6C7CB6E4CB6,FpgaErrorHandler
+C7542254-A8F7-40BA-9BB9-390D31977775,OCMR_PEI
 C7735A2F-88F5-4882-AE63-FAAC8C8B86B3,EfiVgaMiniPortProtocolGuid
 C776AEA2-AA27-446E-975B-E0BEA9078BD9,BiosGuardPeiApRecoveryCapsule
 C779F6D8-7113-4AA1-9648-EB1633C7D53B,CapsulePei
 C7B7070B-E5A8-4B86-9110-BDCA1095F496,PeiFspHobProcessLibSample
 C7D35798-E4D2-4A93-B145-54889F02584B,EdkiiNonDiscoverableAhciDeviceGuid
+C7D4BBCF-EB0A-4C91-BD8B-FCA99F28B011,AmiTxtPei
 C7E6800D-9566-1143-81A8-B8C566AF3556,SNP
 C7EA9787-CA0A-43B4-B1E5-25EF87391F8D,QncS3Support
 C810485E-D0EC-4E98-AAB5-120C7E554428,TdtAm
@ -2135,6 +2215,7 @@ CA515306-00CE-4032-874E-11B755FF6866,DataHubStdErrDxe
 CA5627C4-51BA-4DCB-AC62-C076EBD37DDB,Python
 CA599759-90A7-4FE4-BC8B-4B71C350DCAC,LibGen
 CA5A1928-6523-409D-A9FE-5DCC87387222,TrEEPei
+CA5D7EB0-1B67-4B0B-964A-F2A861F0D640,IccOverclockingDxe
 CA5E3DF0-940A-48F1-8C14-DB2FB5998B36,TdtWrapper
 CA9D8617-D652-403B-B6C5-BA47570116AD,TxtPei
 CAA4381E-750C-4770-B870-7A23B4E42130,EfiHashAlgorithmSha512Guid
@ -2183,6 +2264,7 @@ CEAB683C-EC56-4A2D-A906-4053FA4E9C16,EfiTemporaryRamDonePpiGuid
 CEEC2EE9-BF2D-45D9-B96A-1144B062395D,UsraQuiesceLibNull
 CEF5B9A3-476D-497F-9FDC-E98143E0422C,NVRAM
 CEF68C66-06AB-4FB3-A3ED-5FFA885B5725,SMBiosBoard
+CF2F5574-3C73-4D2F-976D-665CAD2E5381,ASUSDirectKeyDXE
 CF31FAC5-C24E-11D2-85F3-00A0C93EC93B,BlockIoVendorGuid
 CF569F50-DE44-4F54-B4D7-F4AE25CDA599,XenIoPciDxe
 CF6BCADD-D4C4-4095-B2BC-417D7247890A,StaticSkuDataDxeNeonCityFPGA
@ -2195,6 +2277,7 @@ D00752EA-A49C-40AD-A6DA-921C030C4B2F,DxeIchInitDxe
 D024BCD2-59EA-48AC-A17F-B3221EC23A11,Int15GetMisc
 D038747C-D00C-4980-B319-490199A47D55,FspReservedMemoryResourceHobTsegGuid
 D04159DC-E15F-11E3-B261-B8E8562CBAFA,EfiBootManagerPolicyNetworkGuid
+D0632C90-AFD7-4492-B186-257C63143C61,SmmBase
 D083E94C-6560-42E4-B6D4-2DF75ADF6A2A,EfiDataHubStatusCodeRecordGuid
 D0849ED1-A88C-4BA6-B1D6-AB50E280B7A9,UsbCredentialProviderGuid
 D088A413-0A70-4217-BA55-9A3CB65C41B3,ExitPmAuthProtocolGuid
@ -2217,10 +2300,12 @@ D2B2B828-0826-48A7-B3DF-983C006024F0,EfiStatusCodeRuntimeProtocolGuid
 D2C18636-40E5-4EB5-A31B-36695FD42C87,EfiShellEnvironment2ExtGuid
 D2C69B26-82E1-4A1B-AD35-ED0261B9F347,MemoryInitPei
 D317F29B-A325-4712-9BF1-C61954DC198C,EfiSmartCardEdgeProtocolGuid
+D31EAA20-8436-4E34-9A06-C47C78E19F18,SIOBasicIODxe
 D31F0400-7D16-4316-BF88-6065883B402B,EfiPchInfoProtocolGuid
 D3231048-B7D7-46FC-80F8-2F7B229586C5,UTDMUIApp
 D326D041-BD31-4C01-B5A8-628BE87F0653,EfiSmmFirmwareVolumeBlockProtocolGuid
 D3300D09-B70F-4315-9785-FE37209EFDCB,HddSecurityBdsCall
+D36DDD2D-1C66-4210-B77A-2FD9F920E51F,ASUS_EUPSxSMI
 D3705011-BC19-4AF7-BE16-F68030378C15,EfiIntelFrameworkModulePkgTokenSpaceGuid
 D3709BB4-B194-4B71-B9C0-DBD8D2DA97AD,IntelIchLegacyInterruptDxe
 D3790CB3-A890-4A5A-A42E-ECB6B140D814,UHESerial
@ -2247,6 +2332,7 @@ D57C852E-809F-45CF-A377-D77BC0CB78EE,IdeSmart
 D58EBCE1-AF26-488D-BE66-C164417F8C13,PciHostBridge
 D5B06D16-2EA1-4DEF-98D0-A05D40728417,EfiWatchdogTimerDriverProtocolGuid
 D5B366C7-DB85-455F-B50B-900A694E4C8C,SlingShot
+D5D52FED-F8A6-49AC-97AC-7291A60405A6,FsIso9660
 D5E606EB-83DF-4E90-81E8-C3DB2F77179A,rmHwA15x2A7x3Guid
 D6062B50-15CA-11DA-9219-001083FFCA4D,EfiAuthenticationChapRadiusGuid
 D6099B94-CD97-4CC5-8714-7F6312701A8A,VirtioGpuDxe
@ -2263,6 +2349,7 @@ D6D2FBA6-EF60-4C38-A83E-6769814D23B0,CryptoPei
 D6F43B1B-0F21-462B-B8B7-A033C3EB4261,BaseMemoryLibOptPei
 D719B2CB-3D3A-4596-A3BC-DAD00E67656F,EfiImageSecurityDatabaseGuid
 D71C8BA4-4AF2-4D0D-B1BA-F2409F0C20D3,UncoreInitPeim
+D71C9263-2E64-40F9-82B8-F25B27069D4F,EnePEI
 D739F969-FB2D-4BC2-AFE7-081327D3FEDE,AMTDxe
 D74CC5E6-B169-456E-91D2-BE2C2D1343A6,SpiFlashLibNull
 D77C900D-A1C7-41C5-B989-0C3D37FCA432,AmtWrapperDxe
@ -2270,6 +2357,7 @@ D79DF6B0-EF44-43BD-9797-43E93BCF5FA8,VlanConfigFormSetGuid
 D7AD636E-B997-459B-BF3F-8846897980E1,EfiHiiProtocolGuid
 D7B10D4E-67E6-4C74-83E9-F9AF0ACC33CC,PchInitSmm
 D7C74207-A831-4A26-B1F5-D193065CE8B6,EfiAdapterInfoMediaStateGuid
+D7E31ECB-0A17-4529-9B84-C529DE8E1C0E,AcpiFvi
 D7E69789-1F68-45E8-96EF-3B6407A5B2DC,EfiKmsFormatAescbc256Guid
 D8117CFE-94A6-11D4-9A3A-0090273FC14D,EfiDecompressProtocolGuid
 D8A6F4A6-0E97-4A8B-A475-39F1B28B5AEC,Fv2OnFvThunk
@ -2305,6 +2393,7 @@ DB8AF09A-34E3-4A7B-8225-8C5B0C059EB8,AppleSmc
 DB9A1E3D-45CB-4ABB-853B-E5387FDB2E2D,EfiLegacyBiosProtocolGuid
 DBA6A7E3-BB57-4BE7-8AF8-D578DB7E5687,EfiTscFrequencyGuid
 DBC6381F-5554-4D14-8FFD-76D787B8ACBF,IpmiProtocolGuid
+DBD5B6BA-6734-4C5D-BF53-2C210D93A012,IsctSmm
 DBE23AA9-A345-4B97-85B6-B226F1617389,EfiTemporaryRamSupportPpiGuid
 DBE37563-AFEF-4B41-BDCE-B01B6D1E8690,Tpm12DeviceLibInfineonI2c
 DBFF9D55-89B7-46DA-BDDF-677D3DC0241D,EfiAcpiSupportProtocolGuid
@ -2339,6 +2428,7 @@ DE28BC59-6228-41BD-BDF6-A3B9ADB58DA1,FramerworkEfiFirmwareVolumeBlockProtocolGui
 DE371F7C-DEC4-4D21-ADF1-593ABCC15882,ArmGicDxe
 DE3E049C-A218-4891-8658-5FC06A84C783,SBCbsPEIEntryPei
 DE3E049C-A218-4891-8658-5FC0FA84C788,AmdProcessorInitPeimPei
+DE498C70-1EDA-466B-ABCF-DD3ABC3D24B4,DummyMSOA
 DE5FC8BF-06ED-4DC5-BA9D-29F711699A85,TraceHubStatusCodeHandlerRuntimeDxe
 DEA652B0-D587-4C54-B5B4-C682E7A0AA3D,AcpiS3IdtrProfileGuid
 DEB0EE00-18DF-415C-AF03-74D09B0AAD87,JedecNvDimm
@ -2374,6 +2464,7 @@ E1475E0C-1746-4802-862E-011C2C2D9D86,EfiRuntimeCryptProtocolGuid
 E1628C66-2A2D-4DC5-BD41-B20F3538AAF7,BootPicker
 E18541CD-F755-4F73-928D-643C8A79B229,EfiNetworkInterfaceIdentifierProtocolGuid
 E19E3D16-BC11-11E4-9CAA-C2051D5D46B0,EfiArmProcessorErrorSectionGuid
+E1AF9F5B-7CDE-4F98-91ED-5E67868282B8,BBVideo
 E1C1D0A9-40B1-4632-BDCC-D9D6E5295631,EfiPaddingRsaesPkcs1V1P5Guid
 E1CD9D21-0FC2-438D-9703-04E66D961E57,EfiExtendedSalPalServicesProtocolGuid
 E1E1685A-7ABC-450F-882A-4E692CC6AF7E,FpgaConfigDataDxeNeonCityFPGA
@ -2441,6 +2532,7 @@ E72527CF-505B-4B50-99CD-A32467FA4AA4,AsfTable
 E764500B-E398-4AB7-BBBC-99A8E683681F,MeSmbios
 E767BF7F-4DB6-5B34-1011-4FBE4CA7AFD2,VlvMmioPolicyPpiGuid
 E7884BF4-51A1-485B-982A-FF89129983BC,BaseMemoryLibRepStr
+E79A7050-8109-40D1-B3C0-2A3C74C40204,AGI
 E7D9CAE1-6930-46E3-BDF9-0027446E7DF2,Gpio
 E7E1EFA6-7607-4A78-A7DD-43E4BD72C099,AppPkgTokenSpaceGuid
 E7E96F88-017B-417C-8DC8-B84C2B877020,BaseFspWrapperApiTestLibNull
@ -2539,6 +2631,7 @@ EF7BF7D6-F8FF-4A76-8247-C0D0D1CC49C0,EfiSmbiosSlotPopulationGuid
 EF9AEFE5-2BD3-4031-AF7D-5EFE5ABB9A0D,PeiLockPhysicalPresencePpiGuid
 EF9FC172-A1B2-4693-B327-6D32FC416042,EfiHiiDatabaseProtocolGuid
 EFA96432-DE33-4DD2-AEE6-328C33DF777A,EfiHashAlgorithmSha384Guid
+EFB7F614-BC8B-4DDD-B09A-22079FC1512F,TbtDxe
 EFD652CC-0E99-40F0-96C0-E08C089070FC,S3Restore
 EFEFD093-0D9B-46EB-A856-48350700C908,EfiHiiImageDecoderNameJpegGuid
 EFFC8F05-B526-4EB5-B36B-8CD889923C0C,LegacyRegion
@ -2559,6 +2652,7 @@ F16BDBF0-3A61-11DE-8A39-0800200C9A66,PerfTuneDxe
 F18BA2F3-053D-408D-9E28-96CDA65272A8,FfsIntegrityCheckPei
 F19E8ED6-442B-4194-AF8E-C91435E36320,SmcTpmProvisionDxe
 F1EFB523-3D59-4888-BB71-EAA5A96628FA,SecurityStubDxe
+F2074EA5-B8C9-4EBC-881E-30102260703E,ACPI_FACS_MODIFY
 F22FC20C-8CF4-45EB-8E06-AD4E50B95DD3,EfiHiiDriverHealthFormsetGuid
 F24643C2-C622-494E-8A0D-4632579C2D5B,EfiTrEEPhysicalPresenceGuid
 F2765DEC-6B41-11D5-8E71-00902707B35E,Timer
@ -2608,9 +2702,11 @@ F6697AC4-A776-4EE1-B643-1FEFF2B615BB,IncompatiblePciDeviceSupportDxe
 F672AE85-3769-4FB8-A5A0-70B38FB0A7C4,DxeTimerLibEsal
 F6937495-1F44-4A8A-8A1B-5A669F9396F6,DevConsole
 F6994CBA-2351-4EBC-A2DA-20BAC2FE2CF3,SmmPciLibPciRootBridgeIo
+F6A59595-BB9F-415B-A7F3-DC7C09387BE6,SmBusMemoryDown
 F6BEC3FE-88FB-11E3-AE84-E73B77561C35,FastbootTransportUsbDxe
 F6EE6DBB-D67F-4EA0-8B96-6A71B19D84AD,EdkiiStatusCodeDataTypeVariableGuid
 F74D20EE-37E7-48FC-97F7-9B1047749C69,LogoDxe
+F75BD2CD-F473-4BA1-89B3-1E69EFC8BA70,ASUS_HW_FastBootDXE
 F76E0A70-B5ED-4C38-AC9A-E5F54BF16E34,DriverHealthFormSetGuid
 F7731B4C-58A2-4DF4-8980-5645D39ECE58,PowerMgmtDxe
 F7763316-8C04-41D8-A87D-45B73C13C43C,BltLibSample
@ -2618,6 +2714,7 @@ F78153D0-870D-4EEE-A684-741499C9A8CE,EistDxe
 F78285FD-121E-49F4-9716-44E307656586,Python2710
 F7A1F48E-0F6A-4F12-A74D-ED6F5B6B00F2,OpromUpdateDxeLightningRidgeEXECB4
 F7AD60F8-EFA8-44A3-9113-231F399EB4C7,EfiKmsFormatMdc2128Guid
+F7D22BCA-1BCA-5591-CC8B-1CA98F2890FE,AmiCpuS3Pei
 F7D6D25E-6243-4D5C-9BA5-C2DC48F003B0,AmiFlashLibPei
 F7D9FD14-9335-4389-80C5-334D6ABFCCED,ArmVirtPrePiUniCoreRelocatable
 F7FDE4A6-294C-493C-B50F-9734553BB757,CapsuleX64
@ -2625,6 +2722,7 @@ F80697E9-7FD6-4665-8646-88E33EF71DFC,SecurityStubDxe
 F84CFFF4-511E-41C8-B829-519F5152F444,LegacyBiosPlatformDxe
 F8626165-6CEB-924A-BAFC-F13AB9D65728,EmuSystemConfigGuid
 F866226A-EAA5-4F5A-A90A-6CFBA57C588E,SmmPerformanceProtocolGuid
+F88BB993-9230-4CDF-916A-7A2D3BDEE690,AppleStartupManagerPolicyDxe
 F894643D-C449-42D1-8EA8-85BDD8C65BDE,EfiPeiMemoryDiscoveredPpiGuid
 F8BFF014-18FB-4EF9-B10C-AE22738DBEED,DxePlatformSeCPolicyGuid
 F8C6FEDE-EE15-47ED-99A4-60798A3C7DC4,StaticSkuDataDxeLightningRidgeEXECB3
@ -2663,8 +2761,10 @@ FC1D4706-88FB-42B0-98B0-A4B2E607EBAA,LibErr
 FC4285A7-EBB5-45D2-8541-EBA3318FC2C2,UsbOcUpdateDxeLightningRidgeEXECB1
 FC510EE7-FFDC-11D4-BD41-0080C73C8881,AprioriDxe
 FC5C7020-1A48-4198-9BE2-EAD5ABC8CF2F,BdsDxe
+FC63ED62-949D-4FB0-B754-D558A6367C56,EzFlashDxe
 FC90EB7A-3E0A-483C-A26C-484D36593FF4,AcpiPlatform
 FCABE6A7-7953-4A84-B7EC-D29E89B62E87,EmbeddedMonotonicCounter
+FCCCE259-07E1-417A-A755-E0F2CF39295E,CpuInitDxe
 FCD337AB-B1D3-4EF8-957C-8048606FF670,HiiDatabaseDxe
 FCD6562A-253A-40D7-87DE-28CFF25898C6,InsideHT
 FCF94301-9763-4A64-AA84-7892C4712367,IpSecDxe
@ -2698,6 +2798,7 @@ FEDE0A1B-BCA2-4A9F-BB2B-D9FD7DEC2E9F,StatusCodeRuntimeDxe
 FEDF8E0C-E147-11E3-9903-B8E8562CBAFA,EfiBootManagerPolicyProtocolGuid
 FF259F16-18D1-4298-8DD2-BD87FF2894A9,PchResetPeim
 FF3E5307-9FD0-48C9-85F1-8AD56C701E01,EfiCertSha384Guid
+FF456B9C-0DC7-4682-9E92-0DE84B6E4067,PeiSmmControl
 FF917E22-A228-448D-BDAA-68EFCCDDA5D3,TxtDxe
 FFE06BDD-6107-46A6-7BB2-5A9C7EC5275C,EfiAcpiTableProtocolGuid
 FFF12B8D-7696-4C8B-A985-2747075B4F50,EfiSystemNvDataFvGuid
--- a/common/utility.cpp
+++ b/common/utility.cpp
@ -38,7 +38,6 @@ UString uniqueItemName(const UModelIndex & index)
    UString itemText = model->text(index);

    // Default name
-
    UString name = itemName;
    switch (model->type(index)) {
    case Types::NvarEntry:
@ -70,10 +69,21 @@ UString uniqueItemName(const UModelIndex & index)
        + (subtypeString.length() ? ('_' + subtypeString) : UString())
        + '_' + name;

-    // Replace some symbols with underscopes for better readability
-    name.findreplace(' ', '_');
-    name.findreplace('/', '_');
-    name.findreplace('\\', '_');
+    // Replace some symbols with underscores for compatibility
+    const char table[] = {
+        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, // ASCII control characters, banned in Windows, hard to work with in *nix
+        '/', // Banned in *nix and Windows
+        '<', '>', ':', '\"', '\\', '|', '?', '*', // Banned in Windows
+        ' ' // Provides better readability
+    };
+    int nameLength = name.length(); // Note: Qt uses int for whatever reason.
+    for (int i = 0; i < nameLength; i++) {
+        for (size_t j = 0; j < sizeof(table); j++) {
+            if (name[i] == table[j]) {
+                name[i] = '_';
+            }
+        }
+    }

    return name;
 }
--- a/unixbuild.sh
+++ b/unixbuild.sh
@ -88,11 +88,11 @@ build_tool() {
      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
+        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
+        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
+        cmake -G "Unix Makefiles" -DCMAKE_CXX_FLAGS="-Os" -DCMAKE_C_FLAGS="-Os" . || exit 1
      fi
    fi
  fi