From bf74520cef547aac6ac225545d6c6c1247eeaadf Mon Sep 17 00:00:00 2001 From: jief666 Date: Wed, 19 May 2021 15:11:21 +0300 Subject: [PATCH 1/2] Deprecate FIX_HEADERS. --- Xcode/CloverConfigPlistValidator/src/main.cpp | 2 +- rEFIt_UEFI/Platform/AcpiPatcher.cpp | 4 +- rEFIt_UEFI/Platform/Settings.h | 2 +- rEFIt_UEFI/Settings/ConfigManager.cpp | 5 +- .../Settings/ConfigPlist/ConfigPlistClass.h | 22 +++++++++ rEFIt_UEFI/Settings/ConfigPlist/Config_ACPI.h | 3 ++ .../Settings/ConfigPlist/Config_ACPI_DSDT.cpp | 7 +++ .../Settings/ConfigPlist/Config_ACPI_DSDT.h | 47 +++++++++++++++---- rEFIt_UEFI/cpp_lib/XmlLiteSimpleTypes.h | 6 +-- rEFIt_UEFI/cpp_unit_test/xml_lite-test.cpp | 30 ++++++------ rEFIt_UEFI/include/DsdtFixList.h | 2 +- rEFIt_UEFI/refit/menu.cpp | 10 +++- 12 files changed, 106 insertions(+), 34 deletions(-) diff --git a/Xcode/CloverConfigPlistValidator/src/main.cpp b/Xcode/CloverConfigPlistValidator/src/main.cpp index a5e39698b..36242505e 100755 --- a/Xcode/CloverConfigPlistValidator/src/main.cpp +++ b/Xcode/CloverConfigPlistValidator/src/main.cpp @@ -61,7 +61,7 @@ extern "C" int main(int argc, const char * argv[]) //path = "/JiefLand/5.Devel/Clover/user config/BS.plist"; //path = "/JiefLand/5.Devel/Clover/user config/maclinuxG4/config.plist"; //path = "/JiefLand/5.Devel/Clover/user config/MICKHAEL/EFI_Github/CLOVER/config.plist"; - path = "/JiefLand/5.Devel/Clover/user config/Slice/2021-04-29/config.plist"; + path = "/JiefLand/5.Devel/Clover/user config/MacKonsti/2021-05-17/config-test.plist"; #endif if ( !path ) { diff --git a/rEFIt_UEFI/Platform/AcpiPatcher.cpp b/rEFIt_UEFI/Platform/AcpiPatcher.cpp index 5d83c91c1..9d27cd308 100644 --- a/rEFIt_UEFI/Platform/AcpiPatcher.cpp +++ b/rEFIt_UEFI/Platform/AcpiPatcher.cpp @@ -399,7 +399,7 @@ BOOLEAN FixAsciiTableHeader(UINT8 *Str, UINTN Len) BOOLEAN PatchTableHeader(EFI_ACPI_DESCRIPTION_HEADER *Header) { BOOLEAN Ret1, Ret2, Ret3; - if (!(gSettings.ACPI.DSDT.FixDsdt & FIX_HEADERS) && !gSettings.ACPI.FixHeaders) { + if ( !gSettings.ACPI.FixHeaders ) { return FALSE; } Ret1 = FixAsciiTableHeader((UINT8*)&Header->CreatorId, 4); @@ -438,7 +438,7 @@ void PatchAllTables() } EFI_ACPI_DESCRIPTION_HEADER* NewTable = (EFI_ACPI_DESCRIPTION_HEADER*)(UINTN)BufferPtr; CopyMem(NewTable, Table, Len); - if ((gSettings.ACPI.DSDT.FixDsdt & FIX_HEADERS) || gSettings.ACPI.FixHeaders) { + if ( gSettings.ACPI.FixHeaders ) { // Merged tables already have the header patched, so no need to do it again if (!IsXsdtEntryMerged(IndexFromXsdtEntryPtr(Ptr))) { // table header NOT already patched diff --git a/rEFIt_UEFI/Platform/Settings.h b/rEFIt_UEFI/Platform/Settings.h index 30e9be5cb..7b60c2933 100755 --- a/rEFIt_UEFI/Platform/Settings.h +++ b/rEFIt_UEFI/Platform/Settings.h @@ -1086,7 +1086,7 @@ public: ResetAddr = configPlist.dgetResetAddr(); ResetVal = configPlist.dgetResetVal(); SlpSmiEnable = configPlist.dgetSlpSmiEnable(); - FixHeaders = configPlist.dgetFixHeaders(); + FixHeaders = configPlist.dgetFixHeaders() || configPlist.DSDT.Fixes.dgetFixHeaders(); FixMCFG = configPlist.dgetFixMCFG(); NoASPM = configPlist.dgetNoASPM(); smartUPS = configPlist.dgetsmartUPS(); diff --git a/rEFIt_UEFI/Settings/ConfigManager.cpp b/rEFIt_UEFI/Settings/ConfigManager.cpp index 5b2555059..e00d198b6 100644 --- a/rEFIt_UEFI/Settings/ConfigManager.cpp +++ b/rEFIt_UEFI/Settings/ConfigManager.cpp @@ -883,7 +883,10 @@ EFI_STATUS ConfigManager::LoadConfig(const XStringW& ConfName) log_technical_bug("%s : !selfOem.isInitialized()", __PRETTY_FUNCTION__); } EFI_STATUS Status = LoadConfigPlist(ConfName); - if ( EFI_ERROR(Status) ) return Status; + if ( EFI_ERROR(Status) ) { + DBG("LoadConfigPlist return %s. Config not loaded\n", efiStrError(Status)); + return Status; + } /*Status = */ LoadSMBIOSPlist(L"smbios"_XSW); // we don't need Status. If not loaded correctly, smbiosPlist is !defined and will be ignored by AssignOldNewSettings() diff --git a/rEFIt_UEFI/Settings/ConfigPlist/ConfigPlistClass.h b/rEFIt_UEFI/Settings/ConfigPlist/ConfigPlistClass.h index c6ff9fb4f..20d95bae7 100755 --- a/rEFIt_UEFI/Settings/ConfigPlist/ConfigPlistClass.h +++ b/rEFIt_UEFI/Settings/ConfigPlist/ConfigPlistClass.h @@ -101,6 +101,28 @@ public: virtual void getFields(XmlDictField** fields, size_t* nb) override { *fields = m_fields; *nb = sizeof(m_fields)/sizeof(m_fields[0]); }; + virtual bool validate(XmlLiteParser* xmlLiteParser, const XString8& xmlPath, const XmlParserPosition& keyPos, bool generateErrors) override { + if ( !super::validate(xmlLiteParser, xmlPath, keyPos, generateErrors) ) return false; + if ( !isDefined() ) return true; + if ( LString8(ACPI.DSDT.Fixes.ACPI_DSDT_Fixe_Array[29].getNewName()) != "FixHeaders_20000000"_XS8 ) { + log_technical_bug("ACPI_DSDT_Fixe_Array[29].getNewName() != \"FixHeaders_20000000\""); + } + if ( ACPI.getFixHeaders().isDefined() && ACPI.DSDT.Fixes.ACPI_DSDT_Fixe_Array[29].isDefined() ) { + if ( ACPI.getFixHeaders().value() == ACPI.DSDT.Fixes.ACPI_DSDT_Fixe_Array[29].dgetEnabled() ) { + xmlLiteParser->addWarning(generateErrors, S8Printf("FixHeaders exists in ACPI and ACPI/DSDT/Fixes. Delete FixHeaders from ACPI/DSDT/Fixes.")); + }else{ + if ( ACPI.getFixHeaders().value() || ACPI.DSDT.Fixes.ACPI_DSDT_Fixe_Array[29].dgetEnabled() ) { + if ( ACPI.getFixHeaders().value() ) { + xmlLiteParser->addWarning(generateErrors, S8Printf("FixHeaders exists in ACPI and ACPI/DSDT/Fixes with a different value. Using value of ACPI/FixHeaders. Delete FixHeaders from ACPI/DSDT/Fixes.")); + }else{ + xmlLiteParser->addWarning(generateErrors, S8Printf("FixHeaders exists in ACPI and ACPI/DSDT/Fixes with a different value. Using value of ACPI/DSDT/Fixes/FixHeaders. Delete FixHeaders from ACPI/DSDT/Fixes and set ACPI/FixHeaders to true.")); + } + } + } + } + return true; + } + const decltype(DisableDrivers)::ValueType& dgetDisabledDriverArray() const { return DisableDrivers.isDefined() ? DisableDrivers.value() : DisableDrivers.nullValue; }; const decltype(SMBIOS)& getSMBIOS() const { return SMBIOS; }; diff --git a/rEFIt_UEFI/Settings/ConfigPlist/Config_ACPI.h b/rEFIt_UEFI/Settings/ConfigPlist/Config_ACPI.h index f183844d7..0f3234bf6 100755 --- a/rEFIt_UEFI/Settings/ConfigPlist/Config_ACPI.h +++ b/rEFIt_UEFI/Settings/ConfigPlist/Config_ACPI.h @@ -170,6 +170,9 @@ public: if ( dgetResetAddr() == 0xCF9) return 0x06; return 0; } + + const decltype(FixHeaders)& getFixHeaders() const { return FixHeaders; }; + bool dgetSlpSmiEnable() const { return HaltEnabler.isDefined() ? HaltEnabler.value() : false; }; bool dgetFixHeaders() const { return FixHeaders.isDefined() ? FixHeaders.value() : false; }; bool dgetFixMCFG() const { return FixMCFG.isDefined() ? FixMCFG.value() : false; }; diff --git a/rEFIt_UEFI/Settings/ConfigPlist/Config_ACPI_DSDT.cpp b/rEFIt_UEFI/Settings/ConfigPlist/Config_ACPI_DSDT.cpp index abfda3293..989f8299e 100644 --- a/rEFIt_UEFI/Settings/ConfigPlist/Config_ACPI_DSDT.cpp +++ b/rEFIt_UEFI/Settings/ConfigPlist/Config_ACPI_DSDT.cpp @@ -14,6 +14,11 @@ XmlAbstractType& ConfigPlistClass::ACPI_Class::DSDT_Class::ACPI_DSDT_Fixes_Class::parseValueFromXmlLite(XmlLiteParser* xmlLiteParser, const XString8& xmlPath, bool generateErrors, const XmlParserPosition &keyPos, const char *keyValue, size_t keyValueLength, bool* keyFound) { +#ifdef JIEF_DEBUG + if ( strncmp(keyValue, "FixHeaders", strlen("FixHeaders")) == 0 ) { + NOP; + } +#endif for ( size_t idx = 0 ; idx < sizeof(ACPI_DSDT_Fixe_Array)/sizeof(ACPI_DSDT_Fixe_Array[0]) ; idx++ ) { if ( ACPI_DSDT_Fixe_Array[idx].getNewName() && strnIsEqualIC(keyValue, keyValueLength, ACPI_DSDT_Fixe_Array[idx].getNewName()) ) { @@ -27,6 +32,7 @@ XmlAbstractType& ConfigPlistClass::ACPI_Class::DSDT_Class::ACPI_DSDT_Fixes_Class ACPI_DSDT_Fixe_Array[idx].newEnabled.reset(); } ACPI_DSDT_Fixe_Array[idx].newEnabled.parseFromXmlLite(xmlLiteParser, xmlPath, true); + ACPI_DSDT_Fixe_Array[idx].setDefined(); *keyFound = true; return ACPI_DSDT_Fixe_Array[idx].newEnabled; }else @@ -41,6 +47,7 @@ XmlAbstractType& ConfigPlistClass::ACPI_Class::DSDT_Class::ACPI_DSDT_Fixes_Class ACPI_DSDT_Fixe_Array[idx].oldEnabled.reset(); } ACPI_DSDT_Fixe_Array[idx].oldEnabled.parseFromXmlLite(xmlLiteParser, xmlPath, true); + ACPI_DSDT_Fixe_Array[idx].setDefined(); *keyFound = true; return ACPI_DSDT_Fixe_Array[idx].oldEnabled; } diff --git a/rEFIt_UEFI/Settings/ConfigPlist/Config_ACPI_DSDT.h b/rEFIt_UEFI/Settings/ConfigPlist/Config_ACPI_DSDT.h index fdaebb88f..9e3beada4 100644 --- a/rEFIt_UEFI/Settings/ConfigPlist/Config_ACPI_DSDT.h +++ b/rEFIt_UEFI/Settings/ConfigPlist/Config_ACPI_DSDT.h @@ -18,29 +18,33 @@ class DSDT_Class : public XmlDict public: class ACPI_DSDT_Fixes_Class; - class ACPI_DSDT_Fix : public XmlBool + class ACPI_DSDT_Fix : public XmlAbstractType { - using super = XmlBool; + using super = XmlAbstractType; friend class ACPI_DSDT_Fixes_Class; protected: const CHAR8* m_newName = NULL; const CHAR8* m_oldName = NULL; UINT32 m_bitData = 0; - XmlBool oldEnabled = XmlBool(); - XmlBool newEnabled = XmlBool(); + XmlBool oldEnabled {}; + XmlBool newEnabled {}; public: - ACPI_DSDT_Fix(const CHAR8* newName, const CHAR8* oldName, UINT32 bitData ) : XmlBool(), m_newName(newName), m_oldName(oldName), m_bitData(bitData) {}; + constexpr ACPI_DSDT_Fix(const CHAR8* newName, const CHAR8* oldName, UINT32 bitData ) : m_newName(newName), m_oldName(oldName), m_bitData(bitData), oldEnabled(), newEnabled() {}; ACPI_DSDT_Fix(const ACPI_DSDT_Fix&) { panic("copy ctor"); }; // can't do "=delete" because clang thinks it will be called at initialization "ACPI_DSDT_Fixes_Class Fixes = ACPI_DSDT_Fixes_Class();" ACPI_DSDT_Fix& operator = (const ACPI_DSDT_Fix&) = delete; // { panic("copy ctor"); }; // = delete; + virtual const char* getDescription() override { panic("not defined"); }; + virtual bool isTheNextTag(XmlLiteParser* xmlLiteParser) override { panic("not defined"); }; + virtual bool parseFromXmlLite(XmlLiteParser* xmlLiteParser, const XString8& xmlPath, bool generateErrors) override { panic("not defined"); }; + virtual void reset() override { super::reset(); oldEnabled.reset(); newEnabled.reset(); }; - const CHAR8* getNewName() const { return m_newName; } + constexpr const CHAR8* getNewName() const { return m_newName; } const CHAR8* getOldName() const { return m_oldName; } uint32_t getBitData() const { return m_bitData; } @@ -57,7 +61,7 @@ public: class ACPI_DSDT_Fixes_Class : public XmlDict { using super = XmlDict; - protected: + public: ACPI_DSDT_Fix ACPI_DSDT_Fixe_Array[31] = { // CAREFUL not to declare too much { "AddDTGP_0001", "AddDTGP", FIX_DTGP }, { "FixDarwin_0002", "FixDarwin", FIX_WARNING }, @@ -88,7 +92,7 @@ public: { "FIX_ACST_4000000", "FixACST", FIX_ACST }, { "AddHDMI_8000000", "AddHDMI", FIX_HDMI }, { "FixRegions_10000000", "FixRegions", FIX_REGIONS }, - { "FixHeaders_20000000", "FixHeaders", FIX_HEADERS }, + { "FixHeaders_20000000", "FixHeaders", FIX_HEADERS_DEPRECATED }, { NULL, "FixMutex", FIX_MUTEX } }; @@ -99,9 +103,31 @@ public: ACPI_DSDT_Fixe_Array[idx].reset(); } }; - // virtual bool parseFromXmlLite(XmlLiteParser* xmlLiteParser, const XString8& xmlPath, bool generateErrors) override; + virtual XmlAbstractType& parseValueFromXmlLite(XmlLiteParser* xmlLiteParser, const XString8& xmlPath, bool generateErrors, const XmlParserPosition &keyPos, const char *keyValue, size_t keyValueLength, bool* keyFound) override; + virtual bool validate(XmlLiteParser* xmlLiteParser, const XString8& xmlPath, const XmlParserPosition& keyPos, bool generateErrors) override { + if ( !super::validate(xmlLiteParser, xmlPath, keyPos, generateErrors) ) return false; + if ( !isDefined() ) return true; +// if ( LString8(ACPI_DSDT_Fixe_Array[29].getNewName()) != "FixHeaders_20000000"_XS8 ) { +// log_technical_bug("ACPI_DSDT_Fixe_Array[29].getNewName() != \"FixHeaders_20000000\""); +// return true; // Bug in ACPI_DSDT_Fixe_Array. We don't want to reset all the values, so return true. +// } +// if ( ACPI_DSDT_Fixe_Array[29].isDefined() ) { +// xmlLiteParser->addWarning(generateErrors, S8Printf("FixHeaders is ACPI/DSDT in deprecated. Move it to ACPI.")); +// return true; // return true because we handle this value anyway. +// } + return true; + } + + const ACPI_DSDT_Fix& getFixHeaders() const { + // FixHeaders is bit 29, but that's a coincidence with the index of the array. ACPI_DSDT_Fixe_Array[FIX_HEADERS_DEPRECATED] would be wrong. + if ( LString8(ACPI_DSDT_Fixe_Array[29].getNewName()) != "FixHeaders_20000000"_XS8 ) { + log_technical_bug("ACPI_DSDT_Fixe_Array[29].getNewName() != \"FixHeaders_20000000\""); + } + return ACPI_DSDT_Fixe_Array[29]; + } + uint32_t dgetFixBiosDsdt() const { uint32_t FixDsdt = 0; for (size_t Index = 0; Index < sizeof(ACPI_DSDT_Fixe_Array)/sizeof(ACPI_DSDT_Fixe_Array[0]); Index++) { @@ -109,6 +135,9 @@ public: } return FixDsdt; } + bool dgetFixHeaders() const { + return getFixHeaders().dgetEnabled(); + } }; class ACPI_DSDT_Patch_Class : public XmlDict diff --git a/rEFIt_UEFI/cpp_lib/XmlLiteSimpleTypes.h b/rEFIt_UEFI/cpp_lib/XmlLiteSimpleTypes.h index d23af9c67..5e6cf2adb 100755 --- a/rEFIt_UEFI/cpp_lib/XmlLiteSimpleTypes.h +++ b/rEFIt_UEFI/cpp_lib/XmlLiteSimpleTypes.h @@ -43,7 +43,7 @@ private: bool m_isDefined; public: - XmlAbstractType() : m_isDefined(false) {}; + constexpr XmlAbstractType() : m_isDefined(false) {}; virtual ~XmlAbstractType() {}; virtual const char* getDescription() = 0; @@ -98,8 +98,8 @@ public: protected: bool booll = false; public: - XmlStrictBool() : super() {}; - XmlStrictBool(bool b) : booll(b) { /*if (b) b = 1;*/ } + constexpr XmlStrictBool() : super() {}; + constexpr XmlStrictBool(bool b) : booll(b) { /*if (b) b = 1;*/ } virtual void reset() override { super::reset(); booll = 0; }; virtual const char* getDescription() override { return "boolean"; }; diff --git a/rEFIt_UEFI/cpp_unit_test/xml_lite-test.cpp b/rEFIt_UEFI/cpp_unit_test/xml_lite-test.cpp index 72be1c848..852035bf4 100755 --- a/rEFIt_UEFI/cpp_unit_test/xml_lite-test.cpp +++ b/rEFIt_UEFI/cpp_unit_test/xml_lite-test.cpp @@ -506,8 +506,8 @@ int documentation_test1() class MyDictClass : public XmlDict { public: - XmlBool aBool; - XmlInt32 anInt32; + XmlBool aBool {}; + XmlInt32 anInt32 {}; XmlDictField m_fields[2] = { {"KeyNameForBool", aBool}, @@ -548,8 +548,8 @@ int documentation_test2() class MyInsideDictClass : public XmlDict { public: - XmlBool aBool; - XmlInt32 anInt32; + XmlBool aBool {}; + XmlInt32 anInt32 {}; XmlDictField m_fields[2] = { {"KeyNameForBool", aBool}, @@ -561,7 +561,7 @@ int documentation_test2() class MyTopLevelDictClass : public ConfigPlistAbstractClass { public: - MyInsideDictClass inside1; + MyInsideDictClass inside1 {}; XmlDictField m_fields[1] = { {"KeyNameForInsideDict", inside1}, @@ -600,8 +600,8 @@ int documentation_test3() class MyPlist : public ConfigPlistAbstractClass { public: - XmlBool aBool; - XmlInt32 anInt32; + XmlBool aBool {}; + XmlInt32 anInt32 {}; class CountClass : public XmlInt64 { using super = XmlInt64; @@ -678,9 +678,9 @@ int documentation_test4() { using super = XmlDict; public: - MyXmlType type; // this is a subclass of XmlUInt8 that check that type is 1 or 2 - MyXmlSubType subType; // this is a subclass of XmlUInt8 that check that subtype is 11 or 12 - XmlString8 name; // as many other field that there is in this dict + MyXmlType type {}; // this is a subclass of XmlUInt8 that check that type is 1 or 2 + MyXmlSubType subType {}; // this is a subclass of XmlUInt8 that check that subtype is 11 or 12 + XmlString8 name {}; // as many other field that there is in this dict XmlDictField m_fields[2] = { {"Type", type}, @@ -737,9 +737,9 @@ int documentation_test5() { using super = XmlDict; public: - XmlUInt8 type; // no validation except that the value is an unsigned 8 bits int - XmlUInt8 subType; // no validation except that the value is an unsigned 8 bits int - XmlString8 name; // as many other field that there is in this dict + XmlUInt8 type {}; // no validation except that the value is an unsigned 8 bits int + XmlUInt8 subType {}; // no validation except that the value is an unsigned 8 bits int + XmlString8 name {}; // as many other field that there is in this dict XmlDictField m_fields[2] = { {"Type", type}, @@ -806,7 +806,7 @@ int documentation_test6() class MyDictClass : public ConfigPlistAbstractClass { public: - XmlArray aBoolArray; + XmlArray aBoolArray {}; XmlDictField m_fields[1] = { {"KeyNameForBoolArray", aBoolArray}, @@ -844,7 +844,7 @@ int documentation_test7() class MyDictClass : public ConfigPlistAbstractClass { public: - XmlRepeatingDict> keyIntPairs; + XmlRepeatingDict> keyIntPairs {}; XmlDictField m_fields[1] = { {"KeyNameForKeyIntPairs", keyIntPairs}, diff --git a/rEFIt_UEFI/include/DsdtFixList.h b/rEFIt_UEFI/include/DsdtFixList.h index 70415e8f8..ea40c76f8 100644 --- a/rEFIt_UEFI/include/DsdtFixList.h +++ b/rEFIt_UEFI/include/DsdtFixList.h @@ -45,7 +45,7 @@ #define FIX_ACST bit(26) #define FIX_HDMI bit(27) #define FIX_REGIONS bit(28) -#define FIX_HEADERS bit(29) +#define FIX_HEADERS_DEPRECATED bit(29) // deprecated !! #define FIX_MUTEX bit(30) diff --git a/rEFIt_UEFI/refit/menu.cpp b/rEFIt_UEFI/refit/menu.cpp index 02a73143c..cd405b725 100644 --- a/rEFIt_UEFI/refit/menu.cpp +++ b/rEFIt_UEFI/refit/menu.cpp @@ -448,6 +448,8 @@ void FillInputs(BOOLEAN New) InputItems[InputItemsCount++].SValue.SWPrintf("%04hhu", gSettings.Quirks.OcBooterQuirks.ProvideMaxSlide); InputItems[InputItemsCount].ItemType = BoolValue; //123 InputItems[InputItemsCount++].BValue = gSettings.GUI.ProvideConsoleGop; + InputItems[InputItemsCount].ItemType = BoolValue; //124 + InputItems[InputItemsCount++].BValue = gSettings.ACPI.FixHeaders; @@ -1067,6 +1069,11 @@ void ApplyInputs(void) gSettings.GUI.ProvideConsoleGop = InputItems[i].BValue; DBG("applied ConsoleGopEnable=%s\n", gSettings.GUI.ProvideConsoleGop ? "Y" : "N" ); } + i++; //124 + if (InputItems[i].Valid) { + gSettings.ACPI.FixHeaders = InputItems[i].BValue; + DBG("applied gSettings.ACPI.FixHeaders=%s\n", gSettings.ACPI.FixHeaders ? "Y" : "N" ); + } if (NeedSave) { @@ -2064,7 +2071,7 @@ REFIT_ABSTRACT_MENU_ENTRY* SubMenuDsdtFix() SubScreen->AddMenuCheck("Rename ACST", FIX_ACST, 67); SubScreen->AddMenuCheck("Add HDMI", FIX_HDMI, 67); SubScreen->AddMenuCheck("Fix Regions", FIX_REGIONS, 67); - SubScreen->AddMenuCheck("Fix Headers", FIX_HEADERS, 67); +// SubScreen->AddMenuCheck("Fix Headers", FIX_HEADERS_DEPRECATED, 67); SubScreen->AddMenuCheck("Fix Mutex", FIX_MUTEX, 67); SubScreen->AddMenuEntry(&MenuEntryReturn, false); @@ -2146,6 +2153,7 @@ REFIT_ABSTRACT_MENU_ENTRY* SubMenuACPI() SubScreen->AddMenuEntry(SubMenuDsdtFix(), true); SubScreen->AddMenuEntry(SubMenuDSDTPatches(), true); SubScreen->AddMenuItemInput(49, "Fix MCFG", FALSE); + SubScreen->AddMenuItemInput(124, "Fix Headers", gSettings.ACPI.FixHeaders); SubScreen->AddMenuEntry(&MenuEntryReturn, false); return Entry; From 2b84ee61a3f68aa312fb3babd266ab1c4819d68c Mon Sep 17 00:00:00 2001 From: jief666 Date: Wed, 19 May 2021 15:28:57 +0300 Subject: [PATCH 2/2] Crash in LoadLatestNvramPlist when EfiLibOpenRoot returns null. --- rEFIt_UEFI/Platform/Nvram.cpp | 14 +++++++++++--- rEFIt_UEFI/Settings/Self.cpp | 3 +++ rEFIt_UEFI/refit/main.cpp | 4 ++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/rEFIt_UEFI/Platform/Nvram.cpp b/rEFIt_UEFI/Platform/Nvram.cpp index 4e1c9cf75..5774c15a9 100755 --- a/rEFIt_UEFI/Platform/Nvram.cpp +++ b/rEFIt_UEFI/Platform/Nvram.cpp @@ -964,9 +964,17 @@ LoadLatestNvramPlist() if (!EFI_ERROR(Status) && HandleCount > 0) { for (UINTN indexHandle = 0; indexHandle < HandleCount; indexHandle++) { RootDir = EfiLibOpenRoot(Handles[indexHandle]); + if ( RootDir == NULL ) { + DBG(" - [%lld] cannot open - skipping!\n", indexHandle); + continue; + } Status = RootDir->Open(RootDir, &FileHandle, L"nvram.plist", EFI_FILE_MODE_READ, 0); if (EFI_ERROR(Status)) { - DBG(" - [%lld] no nvram.plist - skipping!\n", indexHandle); + if ( Status == EFI_NOT_FOUND ) { + DBG(" - [%lld] no nvram.plist\n", indexHandle); + }else{ + DBG(" - [%lld] Cannot open nvram.plist - %s\n", indexHandle, efiStrError(Status)); + } continue; } FileInfo = EfiLibFileInfo(FileHandle); @@ -1077,7 +1085,7 @@ LoadLatestNvramPlist() // DBG(" nvram.plist not found!\n"); // } #endif - DBG("loaded Status=%s\n", efiStrError(Status)); + DBG("LoadLatestNvramPlist loaded Status=%s\n", efiStrError(Status)); return Status; } @@ -1096,7 +1104,7 @@ PutNvramPlistToRtVars () if (gNvramDict == NULL) { /*Status = */LoadLatestNvramPlist(); if (gNvramDict == NULL) { - DBG("PutNvramPlistToRtVars: nvram.plist not found\n"); + DBG("PutNvramPlistToRtVars: no nvram.plist\n"); return; } } diff --git a/rEFIt_UEFI/Settings/Self.cpp b/rEFIt_UEFI/Settings/Self.cpp index d53c32f90..28df68047 100644 --- a/rEFIt_UEFI/Settings/Self.cpp +++ b/rEFIt_UEFI/Settings/Self.cpp @@ -83,6 +83,9 @@ EFI_STATUS Self::_initialize() } m_efiFileName = m_CloverDirFullPath.basename(); +#ifdef JIEF_DEBUG + DBG("m_efiFileName=%ls\n", m_efiFileName.wc_str()); +#endif // History : if this Clover was started as BootX64.efi, redirect to /EFI/CLOVER if ( m_CloverDirFullPath.isEqualIC("\\EFI\\Boot\\BootX64.efi") ) { diff --git a/rEFIt_UEFI/refit/main.cpp b/rEFIt_UEFI/refit/main.cpp index 9e216ab11..9ada1562d 100644 --- a/rEFIt_UEFI/refit/main.cpp +++ b/rEFIt_UEFI/refit/main.cpp @@ -193,9 +193,9 @@ static EFI_STATUS LoadEFIImageList(IN EFI_DEVICE_PATH **DevicePaths, #ifdef JIEF_DEBUG EFI_LOADED_IMAGE_PROTOCOL* loadedBootImage = NULL; if (!EFI_ERROR(Status = gBS->HandleProtocol(ChildImageHandle, &gEfiLoadedImageProtocolGuid, (void**)(&loadedBootImage)))) { - DBG("%ls : Image base = 0x%llx", ImageTitle.wc_str(), (uintptr_t)loadedBootImage->ImageBase); // Jief : Do not change this, it's used by grep to feed the debugger + DBG("%ls : Image base = 0x%llx\n", ImageTitle.wc_str(), (uintptr_t)loadedBootImage->ImageBase); // Jief : Do not change this, it's used by grep to feed the debugger }else{ - DBG("Can't get loaded image protocol"); + DBG("Can't get loaded image protocol\n"); } #endif goto bailout;