OcMainLib: Process kext Patch after Add

Enables patching of force injected kexts

Changelog.md

@@ -7,6 +7,7 @@ OpenCore Changelog
 - Improved compatibility of `GopBurstMode` with some very non-standard GOP implementations
 - Fixed possible hang with `GopBurstMode` enabled on DEBUG builds
 - Enabled `GopBurstMode` even with natively supported cards, in EnableGop firmware driver
+- Fixed inability to patch force-injected kexts
 
 #### v0.9.1
 - Fixed long comment printing for ACPI patches, thx @corpnewt

Docs/Configuration.md5

-504af847fbf3c4f1f692c3c8e256afcb
+ec4a837996a6af94560b2068319823fe

Docs/Configuration.tex

@@ -1971,9 +1971,9 @@ Kernel and kext changes apply with the following effective order:
 \begin{itemize}
 \tightlist
 \item \texttt{Block} is processed.
+\item \texttt{Add} and \texttt{Force} are processed.
 \item \texttt{Emulate} and \texttt{Quirks} are processed.
 \item \texttt{Patch} is processed.
-\item \texttt{Add} and \texttt{Force} are processed.
 \end{itemize}
 
 \subsection{Properties}\label{kernelprops}

Docs/Differences/Differences.tex

 \documentclass[]{article}
 %DIF LATEXDIFF DIFFERENCE FILE
-%DIF DEL PreviousConfiguration.tex   Thu Apr  6 01:56:05 2023
-%DIF ADD ../Configuration.tex        Sun Apr  9 13:56:04 2023
+%DIF DEL PreviousConfiguration.tex   Tue Apr 11 18:01:28 2023
+%DIF ADD ../Configuration.tex        Tue Apr 11 18:01:33 2023
 
 \usepackage{lmodern}
 \usepackage{amssymb,amsmath}
@@ -118,7 +118,7 @@
 %DIF HYPERREF PREAMBLE %DIF PREAMBLE
 \providecommand{\DIFadd}[1]{\texorpdfstring{\DIFaddtex{#1}}{#1}} %DIF PREAMBLE
 \providecommand{\DIFdel}[1]{\texorpdfstring{\DIFdeltex{#1}}{}} %DIF PREAMBLE
-%DIF LISTINGS PREAMBLE %DIF PREAMBLE
+%DIF COLORLISTINGS PREAMBLE %DIF PREAMBLE
 \RequirePackage{listings} %DIF PREAMBLE
 \RequirePackage{color} %DIF PREAMBLE
 \lstdefinelanguage{DIFcode}{ %DIF PREAMBLE
@@ -2032,10 +2032,15 @@ Kernel and kext changes apply with the following effective order:
 \begin{itemize}
 \tightlist
 \item \texttt{Block} is processed.
-\item \texttt{Emulate} and \texttt{Quirks} are processed.
+\item \DIFaddbegin \texttt{\DIFadd{Add}} \DIFadd{and }\texttt{\DIFadd{Force}} \DIFadd{are processed.
+}\item \DIFaddend \texttt{Emulate} and \texttt{Quirks} are processed.
 \item \texttt{Patch} is processed.
-\item \texttt{Add} and \texttt{Force} are processed.
-\end{itemize}
+\DIFdelbegin %DIFDELCMD < \item %%%
+\item %DIFAUXCMD
+\texttt{\DIFdel{Add}} %DIFAUXCMD
+\DIFdel{and }\texttt{\DIFdel{Force}} %DIFAUXCMD
+\DIFdel{are processed.
+}\DIFdelend \end{itemize}
 
 \subsection{Properties}\label{kernelprops}
 

Library/OcMainLib/OpenCoreKernel.c

@@ -783,10 +783,10 @@ OcKernelProcessPrelinked (
   if (!EFI_ERROR (Status)) {
     OcKernelBlockKexts (Config, DarwinVersion, Is32Bit, CacheTypePrelinked, &Context);
 
-    OcKernelApplyPatches (Config, mOcCpuInfo, DarwinVersion, Is32Bit, CacheTypePrelinked, &Context, NULL, 0);
-
     OcKernelInjectKexts (Config, CacheTypePrelinked, &Context, DarwinVersion, Is32Bit, LinkedExpansion, ReservedExeSize);
 
+    OcKernelApplyPatches (Config, mOcCpuInfo, DarwinVersion, Is32Bit, CacheTypePrelinked, &Context, NULL, 0);
+
     *KernelSize = Context.PrelinkedSize;
 
     PrelinkedContextFree (&Context);
@@ -816,10 +816,10 @@ OcKernelProcessMkext (
 
   OcKernelBlockKexts (Config, DarwinVersion, Is32Bit, CacheTypeMkext, &Context);
 
-  OcKernelApplyPatches (Config, mOcCpuInfo, DarwinVersion, Is32Bit, CacheTypeMkext, &Context, NULL, 0);
-
   OcKernelInjectKexts (Config, CacheTypeMkext, &Context, DarwinVersion, Is32Bit, 0, 0);
 
+  OcKernelApplyPatches (Config, mOcCpuInfo, DarwinVersion, Is32Bit, CacheTypeMkext, &Context, NULL, 0);
+
   MkextInjectPatchComplete (&Context);
 
   *MkextSize = Context.MkextSize;
@@ -855,10 +855,10 @@ OcKernelInitCacheless (
 
   OcKernelBlockKexts (Config, DarwinVersion, Is32Bit, CacheTypeCacheless, Context);
 
-  OcKernelApplyPatches (Config, mOcCpuInfo, DarwinVersion, Is32Bit, CacheTypeCacheless, Context, NULL, 0);
-
   OcKernelInjectKexts (Config, CacheTypeCacheless, Context, DarwinVersion, Is32Bit, 0, 0);
 
+  OcKernelApplyPatches (Config, mOcCpuInfo, DarwinVersion, Is32Bit, CacheTypeCacheless, Context, NULL, 0);
+
   return CachelessContextOverlayExtensionsDir (Context, File);
 }