OpenCorePlatform: Include UEFI Windows bit in AdviseWindows

Changelog.md

@@ -10,6 +10,8 @@ OpenCore Changelog
 - Improved driver connection performance on APTIO IV
 - Fixed boot option saving in LogoutHook.command
 - Added support for OEM information in `ExposeSensitiveData`
+- Improved `SanitiseClearScreen` to avoid mode switching
+- Replaced `SupportsCsm` with `AdviseWindows` enabling UEFI mode
 
 #### v0.5.4
 - Added Enter key handling in boot menu for quick proceed

Docs/Configuration.tex

@@ -3072,15 +3072,22 @@ be used. Version with macOS specific enhancements can be downloaded from
   in \texttt{SystemManufacturer} description. However, certain firmwares
   may not provide valid values otherwise, which could break some software.
 \item
-  \texttt{SupportsCsm}\\
+  \texttt{AdviseWindows}\\
   \textbf{Type}: \texttt{plist\ boolean}\\
   \textbf{Failsafe}: \texttt{false}\\
-  \textbf{Description}: Forces CSM support in \texttt{FirmwareFeatures}.
+  \textbf{Description}: Forces Windows support in \texttt{FirmwareFeatures}.
+
+  Added bits to \texttt{FirmwareFeatures}:
+
+  \begin{itemize}
+    \item \texttt{FW\_FEATURE\_SUPPORTS\_CSM\_LEGACY\_MODE} (\texttt{0x1})
+    - Without this bit it is not possible to reboot to Windows installed on
+      a drive with EFI partition being not the first partition on the disk.
+    \item \texttt{FW\_FEATURE\_SUPPORTS\_UEFI\_WINDOWS\_BOOT} (\texttt{0x20000000})
+    - Without this bit it is not possible to reboot to Windows installed on
+      a drive with EFI partition being the first partition on the disk.
+  \end{itemize}
 
-  Without this bit it is not possible to reboot to Windows installed on
-  a drive with EFI partition being not the first partition on the disk.
-  
-  \emph{Note}: This was enabled unconditionally in older OpenCore versions.
 \item
   \texttt{SystemProductName}\\
   \textbf{Type}: \texttt{plist\ string}\\

Docs/Differences/Differences.tex

 \documentclass[]{article}
 %DIF LATEXDIFF DIFFERENCE FILE
 %DIF DEL PreviousConfiguration.tex   Fri Jan 17 12:56:17 2020
-%DIF ADD ../Configuration.tex        Sat Jan 25 12:18:44 2020
+%DIF ADD ../Configuration.tex        Sat Jan 25 14:22:59 2020
 
 \usepackage{lmodern}
 \usepackage{amssymb,amsmath}
@@ -3134,16 +3134,27 @@ be used. Version with macOS specific enhancements can be downloaded from
   in \texttt{SystemManufacturer} description. However, certain firmwares
   may not provide valid values otherwise, which could break some software.
 \item
-  \texttt{SupportsCsm}\\
+  \texttt{\DIFdelbegin \DIFdel{SupportsCsm}\DIFdelend \DIFaddbegin \DIFadd{AdviseWindows}\DIFaddend }\\
   \textbf{Type}: \texttt{plist\ boolean}\\
   \textbf{Failsafe}: \texttt{false}\\
-  \textbf{Description}: Forces CSM support in \texttt{FirmwareFeatures}.
+  \textbf{Description}: Forces \DIFdelbegin \DIFdel{CSM }\DIFdelend \DIFaddbegin \DIFadd{Windows }\DIFaddend support in \texttt{FirmwareFeatures}.
 
-  Without this bit it is not possible to reboot to Windows installed on
-  a drive with EFI partition being not the first partition on the disk.
+  \DIFaddbegin \DIFadd{Added bits to }\texttt{\DIFadd{FirmwareFeatures}}\DIFadd{:
+}
 
-  \emph{Note}: This was enabled unconditionally in older OpenCore versions.
-\item
+  \begin{itemize}
+    \item \texttt{\DIFadd{FW\_FEATURE\_SUPPORTS\_CSM\_LEGACY\_MODE}} \DIFadd{(}\texttt{\DIFadd{0x1}}\DIFadd{)
+    - }\DIFaddend Without this bit it is not possible to reboot to Windows installed on
+      a drive with EFI partition being not the first partition on the disk.
+    \DIFaddbegin \item \texttt{\DIFadd{FW\_FEATURE\_SUPPORTS\_UEFI\_WINDOWS\_BOOT}} \DIFadd{(}\texttt{\DIFadd{0x20000000}}\DIFadd{)
+    - Without this bit it is not possible to reboot to Windows installed on
+      a drive with EFI partition being the first partition on the disk.
+  }\end{itemize}
+\DIFaddend 
+
+\DIFdelbegin \emph{\DIFdel{Note}}%DIFAUXCMD
+\DIFdel{: This was enabled unconditionally in older OpenCore versions.
+  }\DIFdelend \item
   \texttt{SystemProductName}\\
   \textbf{Type}: \texttt{plist\ string}\\
   \textbf{Failsafe}: \texttt{MacPro6,1}\\

Docs/Sample.plist

@@ -717,14 +717,14 @@
 		<true/>
 		<key>Generic</key>
 		<dict>
+			<key>AdviseWindows</key>
+			<false/>
 			<key>MLB</key>
 			<string>M000000000001</string>
 			<key>ROM</key>
 			<data>ESIzAAAA</data>
 			<key>SpoofVendor</key>
 			<true/>
-			<key>SupportsCsm</key>
-			<false/>
 			<key>SystemProductName</key>
 			<string>MacPro5,1</string>
 			<key>SystemSerialNumber</key>

Docs/SampleFull.plist

@@ -748,14 +748,14 @@
 		</dict>
 		<key>Generic</key>
 		<dict>
+			<key>AdviseWindows</key>
+			<false/>
 			<key>MLB</key>
 			<string>M000000000001</string>
 			<key>ROM</key>
 			<data>ESIzAAAA</data>
 			<key>SpoofVendor</key>
 			<true/>
-			<key>SupportsCsm</key>
-			<false/>
 			<key>SystemProductName</key>
 			<string>MacPro5,1</string>
 			<key>SystemSerialNumber</key>

Platform/OpenCore/OpenCorePlatform.c

@@ -347,9 +347,9 @@ OcPlatformUpdateSmbios (
     // https://github.com/acidanthera/bugtracker/issues/327
     // https://sourceforge.net/p/cloverefiboot/tickets/435
     //
-    if (Config->PlatformInfo.Generic.SupportsCsm) {
-      Data.FirmwareFeatures     |= FW_FEATURE_SUPPORTS_CSM_LEGACY_MODE;
-      Data.FirmwareFeaturesMask |= FW_FEATURE_SUPPORTS_CSM_LEGACY_MODE;
+    if (Config->PlatformInfo.Generic.AdviseWindows) {
+      Data.FirmwareFeatures     |= FW_FEATURE_SUPPORTS_CSM_LEGACY_MODE | FW_FEATURE_SUPPORTS_UEFI_WINDOWS_BOOT;
+      Data.FirmwareFeaturesMask |= FW_FEATURE_SUPPORTS_CSM_LEGACY_MODE | FW_FEATURE_SUPPORTS_UEFI_WINDOWS_BOOT;
     }
 
     Data.ProcessorType        = NULL;