gMuEventPreExitBootServicesGuid has been depreciated in favor of the …

…EDK2 standard gEfiEventBeforeExitBootServicesGuid. gEfiEventBeforeExitBootServicesGuid can be signed multiple times, when gMuEventPreExitBootServicesGuid was only signaled once. As part of adopting gEfiEventBeforeExitBootServicesGuid, events that relied on PreExitBootServices were modified to close the event.
microsoft · Jul 25, 2024 · 46218e4 · 46218e4
1 parent cc6c823
commit 46218e4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/MsGraphicsPkg/OnScreenKeyboardDxe/OnScreenKeyboardDriver.c b/MsGraphicsPkg/OnScreenKeyboardDxe/OnScreenKeyboardDriver.c
@@ -3262,6 +3262,7 @@ OnPreExitBootServicesNotification (
 {
   ShowKeyboardIcon (FALSE);
   ShowKeyboard (FALSE);
+  gBS->CloseEvent (Event);
 }
 
 EFI_STATUS
@@ -3394,7 +3395,7 @@ OSKDriverEntryPoint (
                   TPL_CALLBACK,
                   OnPreExitBootServicesNotification,
                   gImageHandle,
-                  &gMuEventPreExitBootServicesGuid,
+                  &gEfiEventBeforeExitBootServicesGuid,
                   &InitEvent
                   );
 

diff --git a/MsGraphicsPkg/OnScreenKeyboardDxe/OnScreenKeyboardDxe.inf b/MsGraphicsPkg/OnScreenKeyboardDxe/OnScreenKeyboardDxe.inf
@@ -47,7 +47,7 @@
 [Guids]
   gEfiConsoleInDeviceGuid
   gOSKDevicePathGuid
-  gMuEventPreExitBootServicesGuid
+  gEfiEventBeforeExitBootServicesGuid
 
 
 [Protocols]

diff --git a/MsGraphicsPkg/RenderingEngineDxe/RenderingEngine.c b/MsGraphicsPkg/RenderingEngineDxe/RenderingEngine.c
@@ -1478,6 +1478,7 @@ OnPreExitBootServicesNotification (
   )
 {
   mPreExitBootServices = TRUE;
+  gBS->CloseEvent (Event);
 }
 
 /**
@@ -1527,7 +1528,7 @@ DriverInit (
                   TPL_NOTIFY,
                   OnPreExitBootServicesNotification,
                   gImageHandle,
-                  &gMuEventPreExitBootServicesGuid,
+                  &gEfiEventBeforeExitBootServicesGuid,
                   &InitEvent
                   );
 

diff --git a/MsGraphicsPkg/RenderingEngineDxe/RenderingEngineDxe.inf b/MsGraphicsPkg/RenderingEngineDxe/RenderingEngineDxe.inf
@@ -43,7 +43,7 @@
   gEfiGraphicsOutputProtocolGuid      # PRODUCES
 
 [Guids]
-  gMuEventPreExitBootServicesGuid
+  gEfiEventBeforeExitBootServicesGuid
 
 [Pcd]
   gMsGraphicsPkgTokenSpaceGuid.PcdMsGopOverrideProtocolGuid