lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-06-09 17:33:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

[WINLOGON] Move WlxShutdown() GINA notification in HandleShutdown() (#8329)

Browse Source 
- Both 3rd-party modules and GINA shutdown notifications should be
  called just when shutdown is being started.

  Addendum to commit d3b9c68d22 (r66252)
  CORE-8322

- Factor the two `DisplayStatusMessage()` calls for shutdown vs. reboot.
This commit is contained in:
Hermès Bélusca-Maïto
2025-06-13 19:40:39 +02:00
parent 27e147a8ce
commit c29e4eb944
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
base/system/winlogon/sas.c
View File

@@ -1151,22 +1151,30 @@ HandleShutdown(
IN DWORD wlxAction)
{
NTSTATUS Status;
UINT uMsgId;
BOOLEAN Old;
// SwitchDesktop(Session->WinlogonDesktop);
/* If the system is rebooting, show the appropriate string */
/* Display the appropriate shutdown or reboot message */
if (wlxAction == WLX_SAS_ACTION_SHUTDOWN_REBOOT)
DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_REACTOSISRESTARTING);
uMsgId = IDS_REACTOSISRESTARTING;
else
DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_REACTOSISSHUTTINGDOWN);
uMsgId = IDS_REACTOSISSHUTTINGDOWN;
// SwitchDesktop(Session->WinlogonDesktop);
DisplayStatusMessage(Session, Session->WinlogonDesktop, uMsgId);
/* Invoke Shutdown notifications and notify GINA */
CallNotificationDlls(Session, ShutdownHandler);
Session->Gina.Functions.WlxShutdown(Session->Gina.Context, wlxAction);
/* Run the shutdown thread. *IGNORE* all failures as we want to force shutting down! */
Status = RunLogoffShutdownThread(Session, NULL, wlxAction);
if (!NT_SUCCESS(Status))
ERR("Failed to start the Shutdown thread, Status 0x%08lx\n", Status);
CallNotificationDlls(Session, ShutdownHandler);
/* Show again the shutdown message */
// SwitchDesktop(Session->WinlogonDesktop); // Re-enable if you notice the desktop may have switched to something else.
DisplayStatusMessage(Session, Session->WinlogonDesktop, uMsgId);
/* Destroy SAS window */
UninitializeSAS(Session);
@@ -1271,9 +1279,6 @@ DoGenericAction(
}
if (WLX_SHUTTINGDOWN(wlxAction))
{
// FIXME: WlxShutdown should be done from inside HandleShutdown,
// after having displayed "ReactOS is shutting down" message.
Session->Gina.Functions.WlxShutdown(Session->Gina.Context, wlxAction);
if (!NT_SUCCESS(HandleShutdown(Session, wlxAction)))
{
RemoveStatusMessage(Session);