提交 a54f035f 编写于 作者: M Mike Beaton

ocvalidate: Allow same tool with different nvram access

上级 6455230f
......@@ -4,6 +4,7 @@ OpenCore Changelog
- Updated underlying EDK II package to edk2-stable202211
- Updated AppleKeyboardLayouts.txt from macOS 13.1
- Updated builtin firmware versions for SMBIOS and the rest
- Updated ocvalidate to allow duplicate tool if FullNvramAccess is different
#### v0.8.7
- Removed unwanted clear screen when launching non-text boot entry
......
......@@ -89,6 +89,8 @@ MiscToolsHasDuplication (
CONST CHAR8 *MiscToolsSecondaryArgumentsString;
CONST CHAR8 *MiscToolsPrimaryPathString;
CONST CHAR8 *MiscToolsSecondaryPathString;
BOOLEAN MiscToolsPrimaryFullNvramAccess;
BOOLEAN MiscToolsSecondaryFullNvramAccess;
MiscToolsPrimaryEntry = *(CONST OC_MISC_TOOLS_ENTRY **)PrimaryEntry;
MiscToolsSecondaryEntry = *(CONST OC_MISC_TOOLS_ENTRY **)SecondaryEntry;
......@@ -96,13 +98,16 @@ MiscToolsHasDuplication (
MiscToolsSecondaryArgumentsString = OC_BLOB_GET (&MiscToolsSecondaryEntry->Arguments);
MiscToolsPrimaryPathString = OC_BLOB_GET (&MiscToolsPrimaryEntry->Path);
MiscToolsSecondaryPathString = OC_BLOB_GET (&MiscToolsSecondaryEntry->Path);
MiscToolsPrimaryFullNvramAccess = MiscToolsPrimaryEntry->FullNvramAccess;
MiscToolsSecondaryFullNvramAccess = MiscToolsSecondaryEntry->FullNvramAccess;
if (!MiscToolsPrimaryEntry->Enabled || !MiscToolsSecondaryEntry->Enabled) {
return FALSE;
}
if ( (AsciiStrCmp (MiscToolsPrimaryArgumentsString, MiscToolsSecondaryArgumentsString) == 0)
&& (AsciiStrCmp (MiscToolsPrimaryPathString, MiscToolsSecondaryPathString) == 0))
&& (AsciiStrCmp (MiscToolsPrimaryPathString, MiscToolsSecondaryPathString) == 0)
&& MiscToolsPrimaryFullNvramAccess == MiscToolsSecondaryFullNvramAccess)
{
DEBUG ((DEBUG_WARN, "Misc->Tools->Path: %a is duplicated ", MiscToolsPrimaryPathString));
return TRUE;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册