Update for v0.14.2.AD Release

Author: dakanji

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -52,7 +52,7 @@ body:
       description: Which version of RefindPlus is affected?
       type: choice
       options:
-        - 'Official v0.14.2.AC Release'
+        - 'Official v0.14.2.AD Release'
         - 'Official Older Released Version'
         - 'Official Pre-Release Code Build'
         - 'Unofficially Modified Code Build'

.github/workflows/labels.yml

@@ -4,13 +4,10 @@ name: 'Auto Labels'
 on:
   issues:
     types: [labeled, unlabeled]
-  pull_request:
-    types: [labeled, unlabeled]
 
 permissions:
   contents: read
   issues: write
-  pull-requests: write
 
 jobs:
 

BootMaster/icns.c

@@ -56,7 +56,7 @@
 
 
 BOOLEAN          UsingAltImg = FALSE;
-extern BOOLEAN   BootLogoFlag;
+extern BOOLEAN   ExitLogoFlag;
 
 //
 // well-known icons
@@ -226,7 +226,7 @@ INTN UpdateBaseIcon (
     #if REFIT_DEBUG > 0
     ALT_LOG(1, LOG_LINE_NORMAL,
         L"Find %s Img: '%s.xyz'",
-        (BootLogoFlag) ? L"ExitLogo" : L"Icon",
+        (ExitLogoFlag) ? L"ExitLogo" : L"Icon",
         BaseName
     );
     #endif

BootMaster/launch_efi.c

@@ -100,7 +100,7 @@
 
 CHAR16         *BootSelection = NULL;
 CHAR16         *ValidText     = L"Invalid Loader";
-BOOLEAN         BootLogoFlag  = FALSE;
+BOOLEAN         ExitLogoFlag  = FALSE;
 extern BOOLEAN  IsBoot;
 extern BOOLEAN  ShimFound;
 extern BOOLEAN  SecureFlag;
@@ -893,8 +893,8 @@ EFI_STATUS StartEFIImage (
                     !(GlobalConfig.DisableBootLogo & DISABLE_BOOTLOGO_WIN)
                 );
 
-                BootLogoFlag = (ShowLogoLin || ShowLogoWin);
-                if (BootLogoFlag) {
+                ExitLogoFlag = (ShowLogoLin || ShowLogoWin);
+                if (ExitLogoFlag) {
                     if (ScreenW > 1024 && ScreenH > 1024) {
                         // Stash current size
                         OrigIconBig = GlobalConfig.IconSizes[ICON_SIZE_BIG];
@@ -964,8 +964,8 @@ EFI_STATUS StartEFIImage (
                         GlobalConfig.IconSizes[ICON_SIZE_BIG] = OrigIconBig;
                     }
 
-                    BootLogoFlag = FALSE;
-                } // if BootLogoFlag
+                    ExitLogoFlag = FALSE;
+                } // if ExitLogoFlag
 
                 if (GlobalConfig.WriteSystemdVars && OSType == 'L') {
                     // Inform SystemD of RefindPlus ESP
@@ -1133,6 +1133,9 @@ EFI_STATUS StartEFIImage (
     // DA-TAG: bailout:
     MY_FREE_POOL(FullLoadOptions);
 
+    // Free BootLogoImage on bailout
+    MY_FREE_IMAGE(BootLogoImage);
+
     if (!IsDriver) {
         FinishExternalScreen();
     }

BootMaster/main.c

@@ -230,7 +230,6 @@ UINTN                  EfiMajorVersion      =                     0;
 UINT32                 AccessFlagsBoot      =     ACCESS_FLAGS_BOOT;
 UINT32                 AccessFlagsFull      =     ACCESS_FLAGS_FULL;
 CHAR16                *ArchType             =                  NULL;
-CHAR16                *ArchBits             =                  NULL;
 CHAR16                *OurToolTag           =                  NULL;
 CHAR16                *OurTypeTag           =                  NULL;
 CHAR16                *VendorInfo           =                  NULL;
@@ -3886,39 +3885,20 @@ EFI_STATUS EFIAPI efi_main (
     #endif
 
     /* Architecture */
-#if defined(EFIX64)
+    #if defined(EFIX64)
     ArchType = L"x86_64";
-    ArchBits = L"64 bit";
-#elif defined(EFI32)
+    #elif defined(EFI32)
     ArchType = L"x86_32";
-    ArchBits = L"32 bit";
-#elif defined(EFIAARCH64)
+    #elif defined(EFIAARCH64)
     ArchType = L"ARM_64";
-    ArchBits = L"64 bit";
-#else
+    #else
     ArchType = LABEL_UNKNOWN;
-#endif
-
-#if REFIT_DEBUG > 0
-    if (ArchBits == NULL) {
-        LOG_MSG("Arch/Type:- '%s'", ArchType);
-    }
-    else {
-        LOG_MSG("Arch/Type:- '%s' (%s)", ArchType, ArchBits);
-    }
-    LOG_MSG("\n");
+    #endif
 
-    /* Build Engine */
-    LOG_MSG("Made With:- ");
-#   if defined(__MAKEWITH_TIANO)
-    LOG_MSG("'TianoCore EDK II'");
-#   elif defined(__MAKEWITH_GNUEFI)
-    LOG_MSG("'GNU-EFI'");
-#   else
-    LOG_MSG("Unknown DevKit");
-#   endif
+    #if REFIT_DEBUG > 0
+    LOG_MSG("Arch/Type:- '%s'", ArchType);
     LOG_MSG("\n");
-#endif
+    #endif
 
     /* Toolchain */
     OurTypeTag = L" (Local)";
@@ -3942,18 +3922,29 @@ EFI_STATUS EFIAPI efi_main (
         OurToolTag = L"Other/Unknown";
     #endif
 
-#if REFIT_DEBUG > 0
+    #if REFIT_DEBUG > 0
     LOG_MSG("Toolchain:- '%s'%s", OurToolTag, OurTypeTag);
     LOG_MSG("\n");
 
+    /* Build Engine */
+    LOG_MSG("Made With:- ");
+    #if defined(__MAKEWITH_TIANO)
+    LOG_MSG("'TianoCore EDK II'");
+    #elif defined(__MAKEWITH_GNUEFI)
+    LOG_MSG("'GNU-EFI'");
+    #else
+    LOG_MSG("Unknown DevKit");
+    #endif
+    LOG_MSG("\n");
+
     /* TimeStamp */
     LOG_MSG(
-        "Timestamp:- '%d-%02d-%02d %02d:%02d:%02d' (Base)",
+        "Timestamp:- '%d-%02d-%02d %02d:%02d:%02d'",
         NowYear, NowMonth,
         NowDay, NowHour,
         NowMinute, NowSecond
     );
-#endif
+    #endif
 
     /* Run Secure Boot Update and Proceed Accordingly */
     MokProtocol = SecureBootSetup();
@@ -3980,16 +3971,16 @@ EFI_STATUS EFIAPI efi_main (
     #if REFIT_DEBUG > 0
     /* Log System Details */
     LogBasicInfo (MokProtocol);
-    #endif
 
     // First scan volumes by calling ScanVolumes() to find "SelfVolume",
     //    SelfVolume is required by LoadDrivers() and ReadConfig();
     // A second call is needed later to enumerate volumes as well as
     //    to register new filesystem(s) accessed by drivers.
-    #if REFIT_DEBUG > 0
     MY_MUTELOGGER_SET;
     #endif
+
     ScanVolumes();
+
     #if REFIT_DEBUG > 0
     MY_MUTELOGGER_OFF;
     if (!SelfVolSet) {
@@ -4067,28 +4058,40 @@ EFI_STATUS EFIAPI efi_main (
     #ifdef __MAKEWITH_TIANO
     Status = CheckStatusOC();
     if (Status == EFI_ALREADY_STARTED) {
+        #if REFIT_DEBUG > 0
+        LOG_MSG("** WARN: RefindPlus Chainload via OpenCore Detected\n");
+        LOG_MSG("      1. Some Features *MAY NOT* Function As Expected\n");
+        LOG_MSG("      2. ");
+        #endif
+
         // Disable 'NvramProtect' and 'NvramProtectEx' if chainloaded via OpenCore
         if (GlobalConfig.NvramProtect ||
             GlobalConfig.NvramProtectEx
         ) {
-            WarnOC                      =  TRUE;
             GlobalConfig.NvramProtect   = FALSE;
             GlobalConfig.NvramProtectEx = FALSE;
 
             #if REFIT_DEBUG > 0
-            LOG_MSG("** WARN: RefindPlus Chainload via OpenCore Detected\n");
-            LOG_MSG("      1. Some Features *MAY NOT* Function as Expected\n");
-            if (!AppleFirmware) {
-                LOG_MSG("      2. ");
-            }
-            else {
-                LOG_MSG("      2. The 'NvramProtect' Feature Has Been Disabled\n");
+            // DA-TAG: WarnOC for convenience here
+            //         Proper 'TRUE' tag set later
+            WarnOC = (
+                GlobalConfig.EnableTouch ||
+                GlobalConfig.EnableMouse
+            );
+
+            if (AppleFirmware && WarnOC) {
+                LOG_MSG("The 'NvramProtect' Feature Has Been Disabled\n");
                 LOG_MSG("      3. ");
             }
-            LOG_MSG("RefindPlus Pointer Device Settings are Ignored");
-            LOG_MSG("\n\n");
             #endif
         }
+
+        #if REFIT_DEBUG > 0
+        LOG_MSG("RefindPlus Pointer Device Settings Are Ignored");
+        LOG_MSG("\n\n");
+        #endif
+
+        WarnOC = TRUE;
     }
 
     /* Unlock partitions if required */

CHANGELOG.txt

@@ -1,4 +1,4 @@
-0.14.2.AD (PRE-RELEASE):
+0.14.2.AD (11 NOV 2025):
 -----------------------
 - Adds Full `Linux EFI Bootable Kernel` Support
   * Now fully supports booting `Linux Unified Kernel` images
@@ -10,6 +10,8 @@
 - Fixes Issues with Using the `banner_scale` Setting. Thanks @Mardekaar
 - Fixes `Auto Defined BadRAM` Handling
   * This element of the `TagBadRAM` feature was previously a `NOOP`
+- Improves Image Scaling Handling. Thanks @emperor06
+  * Now uses floating-point arithmetic on 64-bit architectures
 - Improves `FollowSymlinks` Handling
   * Can now be targeted at specific volumes
     - Removes impacts on other installed instances
@@ -35,7 +37,7 @@
 - Amends Feature: `BootLogo` to `ExitLogo`
   * Renamed to distinguish from inherited `BootLogo` feature
     - That applied to Legacy BIOS Boot items
-    - `BootLogo` and `ExitLogo` may be fully merged later 
+    - `BootLogo` and `ExitLogo` may be fully merged later
   * Auto scaling of ExitLogo image can now be skipped
     - Via a new `disable_exitlogo_scale` configuration token
   * Final clearing of ExitLogo image can now be skipped

README.md

@@ -18,9 +18,9 @@ A Boot Manager for Mac and PC
 
 ## Overview
 
-RefindPlus builds on _`rEFInd`_ to extend its functionality with enhancements and fixes that include several Apple Mac and UEFI-PC related items that may be of interest to anyone requiring a capable boot manager.
+RefindPlus is a fork of _`rEFInd`_ that provides extended functionality via enhancements and fixes that include several Apple Mac and UEFI-PC related items that may be of interest to anyone requiring a boot manager for Mac and PC.
 
-RefindPlus is particularly useful for those with additional configuration needs or that require advanced or otherwise non-typical options for running operating systems and uEFI utilities on Mac and PC.
+RefindPlus is particularly useful for those with additional configuration needs or that require advanced or otherwise non-typical (hence typically unavailable) options for running operating systems and uEFI utilities on Mac and PC.
 
 Some features:
 - Maintains feature and configuration parity with `Upstream v0.14.2` base.
@@ -54,7 +54,9 @@ Some features:
 
 ## Installation
 
-[MyBootMgr](https://www.dakanji.com/creations/index.html) is recommended to automate installing RefindPlus when running Mac OS on Intel-based Macs. Alternatively, as the RefindPlus efi file can function as a drop-in replacement for the upstream efi file, the [rEFInd package](https://www.rodsbooks.com/refind/installing.html) can be installed first and its efi file replaced with the RefindPlus efi file (Rename RefindPlus file to match). This allows installing RefindPlus on other compatible operating systems supported upstream. See `UEFI Secure Boot` under the [Divergence Section](https://github.com/RefindPlusRepo/RefindPlus#divergence) for how to enable this if required.
+A straightforward way is to make the RefindPlus efi file a `UEFI Fallback File` by naming it accordingly, `BOOTx64.efi`, and placing this in the `UEFI Fallback Path` of a disk, `/EFI/BOOT`.
+
+[MyBootMgr](https://www.dakanji.com/creations/index.html) is recommended to automate installing RefindPlus when running Mac OS on Intel-based Macs. Alternatively, as the RefindPlus efi file can function as a drop-in replacement for the upstream efi file, the [rEFInd package](https://www.rodsbooks.com/refind/installing.html) can be installed first and its efi file replaced with the RefindPlus efi file (rename RefindPlus file to match). This allows installing RefindPlus on other compatible operating systems supported upstream. See `UEFI Secure Boot` under the [Divergence Section](https://github.com/RefindPlusRepo/RefindPlus#divergence) for how to enable this if required.
 
 > [!NOTE]
 >
@@ -97,10 +99,12 @@ decline_help_size     |Disables feature that sets additional UI scaling for very
 decline_help_text     |Disables feature that sets screen text to complementary colours
 decouple_key_f10      |Unmaps the `F10` key from native screenshots (the `\` key remains mapped)
 disable_apfs_load     |Disables inbuilt provision of APFS filesystem capability
-disable_apfs_sync     |Disables feature allowing direct APFS/FileVault boot (Without "PreBoot")
-disable_bootlogo      |Disables display of boot logos on loading some items if required
-disable_check_amfi    |Disables AMFI Checks on Mac OS if required
-disable_check_compat  |Disables Mac version compatibility checks if required
+disable_apfs_sync     |Disables feature allowing direct APFS/FileVault boot (without "PreBoot")
+disable_check_amfi    |Disables AMFI Checks on Mac OS
+disable_check_compat  |Disables Mac version compatibility checks
+disable_exitlogo_clear|Disables clearing displayed exit logo images on exit screens
+disable_exitlogo_image|Disables display of exit logo images on exit screens
+disable_exitlogo_scale|Disables scaling displayed exit logo images on exit screens
 disable_pass_gop_thru |Disables feature that provides GOP instance on UGA for some loading screens
 disable_legacy_sync   |Disables detailed indentification of Mac legacy BIOS boot capability
 disable_nvram_paniclog|Disables logging Mac OS kernel panics to nvRAM
@@ -110,7 +114,7 @@ disable_rescan_dxe    |Disables scanning for newly revealed DXE drivers when con
 disable_set_applefb   |Disables provision, under some circumstances, of missing Apple Framebuffers
 disable_set_consolegop|Disables feature that fixes some issues with GOP graphics on legacy units
 enable_esp_filter     |Prevents other ESPs other than the RefindPlus ESP being scanned for loaders
-force_trim            |Forces `TRIM` on Third-Party SSDs on Macs if required
+force_trim            |Allows forcing `TRIM` on Third-Party SSDs on Macs
 hidden_icons_external |Allows scanning for `.VolumeIcon` icons on external volumes
 hidden_icons_ignore   |Disables scanning for `.VolumeIcon` image icons if not required
 hidden_icons_prefer   |Prioritises `.VolumeIcon` and `.VolumeBadge` image icons when available
@@ -144,12 +148,17 @@ In addition to the new functionality listed above, the following upstream tokens
   - `tools` option to _enable_ graphics mode loading for such.
   - `none` option to _disable_ graphics mode loading for everything.
   - `everything` option to _enable_ graphics mode loading for everything.
-  - `OpenCore` and `Clover` can be specifically set to load in graphics mode.
-- **"showtools":** Additional tool added:
+  - `SystemD`, `OpenCore`, and `Clover` can be set to load in graphics mode.
+- **"showtools":** Defaults changed and additional tool added:
   - `clean_nvram` : Allows resetting nvRAM directly from RefindPlus.
     - When run on Apple firmware, RefindPlus will additionally trigger nvRAM garbage collection
 - **menuentry:** Additional OSTypes added for manual stanzas:
-  - `RefitVariant`, `OpenCore`, and `Clover` can be additionally defined
+  - `RefitVariant`, `SystemD`, `OpenCore`, and `Clover` can be additionally defined
+- **"follow_symlinks":** Accepts optional additional parameters
+    - `follow_symlinks ON` : Symlinks always followed
+    - `follow_symlinks OFF` : Symlinks never followed
+    - `follow_symlinks OFF "Vol_1,Vol_2"`: Symlinks followed unless on list
+    - `follow_symlinks ON "Vol_9,Vol_10"`: Symlinks followed only if listed
 - **"csr_values":** A value of `0` can be set as the `Enabled` value to allow `Over The Air (OTA)` updates when running Mac OS 11.x (Big Sur) or newer with SIP enabled.
   - This is equivalent to activating the `csr_normalise` token.
 - **"log_level":** Controls the native log format and an implementation of the upstream format.
@@ -173,8 +182,8 @@ In addition to the new functionality listed above, the following upstream tokens
 ## Divergence
 
 Significant visible implementation differences vis-a-vis the upstream base are:
-- **UEFI Secure Boot:** RefindPlus binaries are currently not signed for secure boot support and do not include the `Secure Boot Advanced Targeting (SBAT)` sections required by Shim v15.3/newer.
-  - > The process [outlined here](https://www.rodsbooks.com/refind/secureboot.html#installation) for signing self built upstream binaries can be followed to enable suport.
+- **UEFI Secure Boot:** RefindPlus binaries as from v0.14.2.AD include `Secure Boot Advanced Targeting (SBAT)` sections required by Shim v15.3/newer for secure boot support but require users to self-sign the binaries and to enroll the certificate.
+  - > The process [outlined upstream](https://www.rodsbooks.com/refind/secureboot.html#installation) for self-signing can be followed to enable support.
   - > An adaptation of the process for RefindPlus is [provided here](https://github.com/RefindPlusRepo/RefindPlus/discussions/190#discussioncomment-10130431). Modify for newer releases as required.
   - > Refer to [this summation](https://forum.manjaro.org/t/howto-enable-secure-boot-with-refind/121403/6) for futher insight.
 - **GZipped Loaders:** RefindPlus only provides stub support for handling GZipped loaders as this is largely only relevant for units on the ARM architecture.
@@ -195,15 +204,15 @@ Significant visible implementation differences vis-a-vis the upstream base are:
   - > Activate the RefindPlus-specific `disable_apfs_load` setting to switch this feature off.
 - **APFS PreBoot Volumes:** RefindPlus always synchronises APFS System and PreBoot partitions transparently such that the Preboot partitions of APFS volumes are always used to boot APFS formatted Mac OS. Hence, a single option for booting Mac OS on APFS volumes is presented in RefindPlus to provide maximum APFS compatibility. This is done using an inbuilt `SyncAPFS` feature.
   - > Activate the RefindPlus-specific `disable_apfs_sync` setting to switch this feature off.
-- **Mac nvRAM Protection:** RefindPlus always prevents UEFI Windows Secure Boot from saving certificates to Mac nvRAM as this can result in damage and, ultimately, an inability to boot anything on some Macs (Typically Pre 2013 Vintage). Blocking these certificates does not impact the operation of UEFI Windows on such Macs. This filtering only happens when Mac firmware is detected and is not applied to other types of firmware. This is done using an inbuilt `ProtectNVRAM` feature.
+- **Mac nvRAM Protection:** RefindPlus always prevents UEFI Windows Secure Boot from saving certificates to Mac nvRAM as this can result in damage and, ultimately, an inability to boot anything on some Macs (typically Pre 2013 Vintage). Blocking these certificates does not impact the operation of UEFI Windows on such Macs. This filtering only happens when Mac firmware is detected and is not applied to other types of firmware. This is done using an inbuilt `ProtectNVRAM` feature.
   - > Activate the RefindPlus-specific `disable_nvram_protect` setting to switch this feature off.
 - **Mac Legacy BIOS Boot:** RefindPlus originally assumed all Macs were capable of legacy BIOS boot based on code that went in upstream back in 2012 when this was a reasonable default. However, some later Intel Macs do not support legacy BIOS boot and RefindPlus now attempts to categorise Macs to enable/disable legacy boot accordingly.
   - > Activate the RefindPlus-specific `disable_legacy_sync` setting to keep the old assumption.
 - **Secondary Configuration Files:** While the upstream documentation prohibits including tertiary configuration files from secondary configuration files, there is no mechanism enforcing this prohibition. Hence, tertiary, quaternary, quinary, and more, configuration files can in fact be included.
   - > RefindPlus enforces the limitation for inclusion to secondary configuration files.
 - **Shortcut Keys:** RefindPlus does not allocate shortcut keys based on the operating system type/name as there is no way of knowing what would actually be loaded in many cases.
   - > Keys are allocated based on display position in the order of `Key 1` to `Key Z`.
-  - > Alphabetic `Keys I and O` are not used while Numeric `Key 0` is reserved for internal use.
+  - > Alphabetic `Keys I and O` are not used, while Numeric `Key 0` is reserved for internal use.
   - > Keys are not allocated to `Tools` apart from `Key A` for `About Refindplus` and `Key Z` for `System Shutdown`.
 - **Disabled Manual Stanzas:** The processing of a user configured boot stanza is halted, and the `Entry` object immediately discarded, once a `Disabled` setting is encountered. The outcome is the same as upstream, which always continues to create and return a fully built object that is later discarded in such cases. The approach adopted in RefindPlus allows for an optimised loading process particularly when such `Disabled` tokens are placed immediately after the `menuentry` line (see examples near the bottom of the `config.conf-sample` file).
   - > This also applies to `submenuentry` items which can be enabled or disabled separately.