OpenCore: Fix previous commit

Changelog.md

@@ -28,7 +28,7 @@ OpenCore Changelog
 - Fixed assertions on log exhaustion causing boot failures
 - Fixed builtin text renderer failing to provide ConsoleControl
 - Fixed compatibility with blit-only GOP (e.g. OVMF Bochs)
-- Fixed ignoring `#` in DeviceProperty `Add` and `Block`
+- Fixed ignoring `#` in DeviceProperty and NVRAM `Block`
 
 #### v0.5.8
 - Fixed invalid CPU object reference in SSDT-PLUG

Platform/OpenCore/OpenCoreDevProps.c

@@ -51,12 +51,7 @@ OcLoadDevPropsSupport (
   }
 
   for (DeviceIndex = 0; DeviceIndex < Config->DeviceProperties.Block.Count; ++DeviceIndex) {
-    AsciiDevicePath = OC_BLOB_GET (Config->DeviceProperties.Block.Keys[DeviceIndex]);
-    if (AsciiDevicePath[0] == '#') {
-      DEBUG ((DEBUG_INFO, "OC: Device property skip blocking %a\n", AsciiDevicePath));
-      continue;
-    }
-
+    AsciiDevicePath   = OC_BLOB_GET (Config->DeviceProperties.Block.Keys[DeviceIndex]);
     UnicodeDevicePath = AsciiStrCopyToUnicode (AsciiDevicePath, 0);
     DevicePath        = NULL;
 
@@ -72,6 +67,9 @@ OcLoadDevPropsSupport (
 
     for (PropertyIndex = 0; PropertyIndex < Config->DeviceProperties.Block.Values[DeviceIndex]->Count; ++PropertyIndex) {
       AsciiProperty = OC_BLOB_GET (Config->DeviceProperties.Block.Values[DeviceIndex]->Values[PropertyIndex]);
+      //
+      // '#' is filtered in all keys, but for values we need to do it ourselves.
+      //
       if (AsciiProperty[0] == '#') {
         DEBUG ((DEBUG_INFO, "OC: Device property skip blocking %a\n", AsciiProperty));
         continue;
@@ -107,11 +105,6 @@ OcLoadDevPropsSupport (
   for (DeviceIndex = 0; DeviceIndex < Config->DeviceProperties.Add.Count; ++DeviceIndex) {
     PropertyMap       = Config->DeviceProperties.Add.Values[DeviceIndex];
     AsciiDevicePath   = OC_BLOB_GET (Config->DeviceProperties.Add.Keys[DeviceIndex]);
-    if (AsciiDevicePath[0] == '#') {
-      DEBUG ((DEBUG_INFO, "OC: Device property skip adding %a\n", AsciiDevicePath));
-      continue;
-    }
-
     UnicodeDevicePath = AsciiStrCopyToUnicode (AsciiDevicePath, 0);
     DevicePath        = NULL;
 
@@ -127,11 +120,6 @@ OcLoadDevPropsSupport (
 
     for (PropertyIndex = 0; PropertyIndex < PropertyMap->Count; ++PropertyIndex) {
       AsciiProperty = OC_BLOB_GET (PropertyMap->Keys[PropertyIndex]);
-      if (AsciiProperty[0] == '#') {
-        DEBUG ((DEBUG_INFO, "OC: Device property skip adding %a\n", AsciiProperty));
-        continue;
-      }
-
       UnicodeProperty = AsciiStrCopyToUnicode (AsciiProperty, 0);
       if (UnicodeProperty == NULL) {
         DEBUG ((DEBUG_WARN, "OC: Failed to convert %a property\n", AsciiProperty));

Platform/OpenCore/OpenCoreNvram.c

@@ -381,6 +381,15 @@ OcBlockNvram (
 
     for (BlockVariableIndex = 0; BlockVariableIndex < Config->Nvram.Block.Values[BlockGuidIndex]->Count; ++BlockVariableIndex) {
       AsciiVariableName   = OC_BLOB_GET (Config->Nvram.Block.Values[BlockGuidIndex]->Values[BlockVariableIndex]);
+
+      //
+      // '#' is filtered in all keys, but for values we need to do it ourselves.
+      //
+      if (AsciiVariableName[0] == '#') {
+        DEBUG ((DEBUG_INFO, "OC: Variable skip blocking %a\n", AsciiVariableName));
+        continue;
+      }
+
       UnicodeVariableName = AsciiStrCopyToUnicode (AsciiVariableName, 0);
 
       if (UnicodeVariableName == NULL) {