[ros-diffs] 01/01: [WINLOGON] Move the system shutdown code into a separate file

[Eric Kohl]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f50d7749d0209a3335867…

commit f50d7749d0209a333586724e1a270ce7328a3297
Author:     Eric Kohl <eric.kohl(a)reactos.org>
AuthorDate: Mon Apr 2 00:38:18 2018 +0200
Commit:     Eric Kohl <eric.kohl(a)reactos.org>
CommitDate: Mon Apr 2 00:38:52 2018 +0200

    [WINLOGON] Move the system shutdown code into a separate file
---
 base/system/winlogon/rpcserver.c | 157 ++------------------------------
 base/system/winlogon/shutdown.c  | 189 +++++++++++++++++++++++++++++++++++++++
 base/system/winlogon/winlogon.h  |  12 +++
 3 files changed, 208 insertions(+), 150 deletions(-)

diff --git a/base/system/winlogon/rpcserver.c b/base/system/winlogon/rpcserver.c
index bbf8e54aa6..1fc6c0dfad 100644
--- a/base/system/winlogon/rpcserver.c
+++ b/base/system/winlogon/rpcserver.c
@@ -10,31 +10,9 @@
 
 #include "winlogon.h"
 
-#include <ntstrsafe.h>
 #include <rpc.h>
 #include <winreg_s.h>
 
-/* DEFINES *******************************************************************/
-
-#define IDT_SYSSHUTDOWN 2000
-
-/* STRUCTS *******************************************************************/
-
-typedef struct _SYS_SHUTDOWN_PARAMS
-{
-    UNICODE_STRING usMessage;
-    ULONG dwTimeout;
-    BOOLEAN bRebootAfterShutdown;
-    BOOLEAN bForceAppsClosed;
-    DWORD dwReason;
-} SYS_SHUTDOWN_PARAMS, *PSYS_SHUTDOWN_PARAMS;
-
-/* GLOBALS *******************************************************************/
-
-HWND g_hShutdownDialog = NULL;
-BOOLEAN g_bShuttingDown = FALSE;
-SYS_SHUTDOWN_PARAMS g_ShutdownParams;
-
 /* FUNCTIONS *****************************************************************/
 
 BOOL
@@ -455,9 +433,7 @@ BaseAbortSystemShutdown(
 
     //FIXME: Verify that the caller actually has the correct privileges
 
-    if (g_bShuttingDown == FALSE)
-        return ERROR_NO_SHUTDOWN_IN_PROGRESS;
-    return PostMessage(g_hShutdownDialog, WM_CLOSE, 0, 0) ? ERROR_SUCCESS :
GetLastError();
+    return TerminateSystemShutdown();
 }
 
 
@@ -511,92 +487,6 @@ BaseRegQueryMultipleValues(
     return ERROR_SUCCESS;
 }
 
-INT_PTR
-CALLBACK
-ShutdownDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-    switch (uMsg)
-    {
-        case WM_INITDIALOG:
-        {
-            g_hShutdownDialog = hwndDlg;
-            if (g_ShutdownParams.usMessage.Length)
-            {
-                SetDlgItemTextW(hwndDlg,
-                                IDC_SHUTDOWNCOMMENT,
-                                g_ShutdownParams.usMessage.Buffer);
-            }
-            RemoveMenu(GetSystemMenu(hwndDlg, FALSE), SC_CLOSE, MF_BYCOMMAND);
-            SetWindowPos(hwndDlg, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
-            PostMessage(hwndDlg, WM_TIMER, 0, 0);
-            SetTimer(hwndDlg, IDT_SYSSHUTDOWN, 1000, NULL);
-        break;
-        }
-        case WM_CLOSE:
-        {
-            g_hShutdownDialog = NULL;
-            g_bShuttingDown = FALSE;
-            KillTimer(hwndDlg, IDT_SYSSHUTDOWN);
-            if (g_ShutdownParams.usMessage.Buffer)
-            {
-                HeapFree(GetProcessHeap(), 0, g_ShutdownParams.usMessage.Buffer);
-                RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, NULL, 0);
-            }
-            EndDialog(hwndDlg, 0);
-            DestroyWindow(hwndDlg);
-        break;
-        }
-        case WM_TIMER:
-        {
-            WCHAR strbuf[34];
-            int seconds, minutes, hours;
-            seconds = (int)(g_ShutdownParams.dwTimeout);
-            hours = seconds/3600;
-            seconds -= hours*3600;
-            minutes = seconds/60;
-            seconds -= minutes*60;
-            ZeroMemory(strbuf, sizeof(strbuf));
-            //FIXME: Show time remaining according to the locale's format
-            RtlStringCbPrintfW(strbuf, sizeof(strbuf), L"%d:%d:%d", hours,
minutes, seconds);
-            SetDlgItemTextW(hwndDlg, IDC_SHUTDOWNTIMELEFT, strbuf);
-            if (g_ShutdownParams.dwTimeout == 0)
-            {
-                PostMessage(hwndDlg, WM_CLOSE, 0, 0);
-                ExitWindowsEx((g_ShutdownParams.bRebootAfterShutdown ? EWX_REBOOT :
EWX_SHUTDOWN) |
-                              (g_ShutdownParams.bForceAppsClosed ? EWX_FORCE : 0),
-                              g_ShutdownParams.dwReason);
-            }
-            g_ShutdownParams.dwTimeout--;
-        break;
-        }
-        default:
-            return FALSE;
-    }
-    return TRUE;
-}
-
-DWORD
-WINAPI
-InitiateSystemShutdownThread(LPVOID lpParameter)
-{
-    INT_PTR status;
-    status = DialogBoxW(hAppInstance, MAKEINTRESOURCEW(IDD_SYSSHUTDOWN),
-                        NULL, ShutdownDialogProc);
-    if (status >= 0)
-    {
-        return ERROR_SUCCESS;
-    }
-    else
-    {
-        if (g_ShutdownParams.usMessage.Buffer)
-        {
-            HeapFree(GetProcessHeap(), 0, g_ShutdownParams.usMessage.Buffer);
-            RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, NULL, 0);
-        }
-        g_bShuttingDown = FALSE;
-        return GetLastError();
-    }
-}
 
 /* Function 30 */
 ULONG
@@ -609,8 +499,6 @@ BaseInitiateSystemShutdownEx(
     BOOLEAN bRebootAfterShutdown,
     ULONG dwReason)
 {
-    HANDLE hThread;
-
     TRACE("BaseInitiateSystemShutdownEx()\n");
     TRACE("  Message: %wZ\n", lpMessage);
     TRACE("  Timeout: %lu\n", dwTimeout);
@@ -620,45 +508,14 @@ BaseInitiateSystemShutdownEx(
 
     //FIXME: Verify that the caller actually has the correct privileges
 
-    if (_InterlockedCompareExchange8((volatile char*)&g_bShuttingDown, TRUE, FALSE)
== TRUE)
-        return ERROR_SHUTDOWN_IN_PROGRESS;
-    if (lpMessage && lpMessage->Length && lpMessage->Buffer)
-    {
-        g_ShutdownParams.usMessage.Buffer = HeapAlloc(GetProcessHeap(), 0,
lpMessage->Length+sizeof(UNICODE_NULL));
-        if (g_ShutdownParams.usMessage.Buffer == NULL)
-        {
-            g_bShuttingDown = FALSE;
-            return GetLastError();
-        }
-        RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage,
g_ShutdownParams.usMessage.Buffer, lpMessage->Length+sizeof(UNICODE_NULL));
-        RtlCopyUnicodeString(&(g_ShutdownParams.usMessage),
(PUNICODE_STRING)lpMessage);
-    }
-    else
-    {
-        RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, NULL, 0);
-    }
-    g_ShutdownParams.dwTimeout = dwTimeout;
-    g_ShutdownParams.bForceAppsClosed = bForceAppsClosed;
-    g_ShutdownParams.bRebootAfterShutdown = bRebootAfterShutdown;
-    g_ShutdownParams.dwReason = dwReason;
-    hThread = CreateThread(NULL, 0, InitiateSystemShutdownThread, NULL, 0, NULL);
-    if (hThread)
-    {
-        CloseHandle(hThread);
-        return ERROR_SUCCESS;
-    }
-    else
-    {
-        if (g_ShutdownParams.usMessage.Buffer)
-        {
-            HeapFree(GetProcessHeap(), 0, g_ShutdownParams.usMessage.Buffer);
-            RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, NULL, 0);
-        }
-        g_bShuttingDown = FALSE;
-        return GetLastError();
-    }
+    return StartSystemShutdown((PUNICODE_STRING)lpMessage,
+                               dwTimeout,
+                               bForceAppsClosed,
+                               bRebootAfterShutdown,
+                               dwReason);
 }
 
+
 /* Function 31 */
 error_status_t
 __stdcall
diff --git a/base/system/winlogon/shutdown.c b/base/system/winlogon/shutdown.c
new file mode 100644
index 0000000000..0472bdc269
--- /dev/null
+++ b/base/system/winlogon/shutdown.c
@@ -0,0 +1,189 @@
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS Winlogon
+ * FILE:            base/system/winlogon/shutdown.c
+ * PURPOSE:         System shutdown dialog
+ * PROGRAMMERS:     alpha5056 &lt;alpha5056(a)users.noreply.github.com&gt;
+ */
+
+/* INCLUDES ******************************************************************/
+
+#include "winlogon.h"
+
+#include <ntstrsafe.h>
+#include <rpc.h>
+#include <winreg_s.h>
+
+/* DEFINES *******************************************************************/
+
+#define IDT_SYSSHUTDOWN 2000
+
+/* STRUCTS *******************************************************************/
+
+typedef struct _SYS_SHUTDOWN_PARAMS
+{
+    UNICODE_STRING usMessage;
+    ULONG dwTimeout;
+    BOOLEAN bRebootAfterShutdown;
+    BOOLEAN bForceAppsClosed;
+    DWORD dwReason;
+} SYS_SHUTDOWN_PARAMS, *PSYS_SHUTDOWN_PARAMS;
+
+/* GLOBALS *******************************************************************/
+
+HWND g_hShutdownDialog = NULL;
+BOOLEAN g_bShuttingDown = FALSE;
+SYS_SHUTDOWN_PARAMS g_ShutdownParams;
+
+/* FUNCTIONS *****************************************************************/
+
+static
+INT_PTR
+CALLBACK
+ShutdownDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+    switch (uMsg)
+    {
+        case WM_INITDIALOG:
+        {
+            g_hShutdownDialog = hwndDlg;
+            if (g_ShutdownParams.usMessage.Length)
+            {
+                SetDlgItemTextW(hwndDlg,
+                                IDC_SHUTDOWNCOMMENT,
+                                g_ShutdownParams.usMessage.Buffer);
+            }
+            RemoveMenu(GetSystemMenu(hwndDlg, FALSE), SC_CLOSE, MF_BYCOMMAND);
+            SetWindowPos(hwndDlg, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
+            PostMessage(hwndDlg, WM_TIMER, 0, 0);
+            SetTimer(hwndDlg, IDT_SYSSHUTDOWN, 1000, NULL);
+        break;
+        }
+        case WM_CLOSE:
+        {
+            g_hShutdownDialog = NULL;
+            g_bShuttingDown = FALSE;
+            KillTimer(hwndDlg, IDT_SYSSHUTDOWN);
+            if (g_ShutdownParams.usMessage.Buffer)
+            {
+                HeapFree(GetProcessHeap(), 0, g_ShutdownParams.usMessage.Buffer);
+                RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, NULL, 0);
+            }
+            EndDialog(hwndDlg, 0);
+            DestroyWindow(hwndDlg);
+        break;
+        }
+        case WM_TIMER:
+        {
+            WCHAR strbuf[34];
+            int seconds, minutes, hours;
+            seconds = (int)(g_ShutdownParams.dwTimeout);
+            hours = seconds/3600;
+            seconds -= hours*3600;
+            minutes = seconds/60;
+            seconds -= minutes*60;
+            ZeroMemory(strbuf, sizeof(strbuf));
+            //FIXME: Show time remaining according to the locale's format
+            RtlStringCbPrintfW(strbuf, sizeof(strbuf), L"%d:%d:%d", hours,
minutes, seconds);
+            SetDlgItemTextW(hwndDlg, IDC_SHUTDOWNTIMELEFT, strbuf);
+            if (g_ShutdownParams.dwTimeout == 0)
+            {
+                PostMessage(hwndDlg, WM_CLOSE, 0, 0);
+                ExitWindowsEx((g_ShutdownParams.bRebootAfterShutdown ? EWX_REBOOT :
EWX_SHUTDOWN) |
+                              (g_ShutdownParams.bForceAppsClosed ? EWX_FORCE : 0),
+                              g_ShutdownParams.dwReason);
+            }
+            g_ShutdownParams.dwTimeout--;
+        break;
+        }
+        default:
+            return FALSE;
+    }
+    return TRUE;
+}
+
+
+static
+DWORD
+WINAPI
+InitiateSystemShutdownThread(LPVOID lpParameter)
+{
+    INT_PTR status;
+    status = DialogBoxW(hAppInstance, MAKEINTRESOURCEW(IDD_SYSSHUTDOWN),
+                        NULL, ShutdownDialogProc);
+    if (status >= 0)
+    {
+        return ERROR_SUCCESS;
+    }
+    else
+    {
+        if (g_ShutdownParams.usMessage.Buffer)
+        {
+            HeapFree(GetProcessHeap(), 0, g_ShutdownParams.usMessage.Buffer);
+            RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, NULL, 0);
+        }
+        g_bShuttingDown = FALSE;
+        return GetLastError();
+    }
+}
+
+
+DWORD
+TerminateSystemShutdown(VOID)
+{
+    if (g_bShuttingDown == FALSE)
+        return ERROR_NO_SHUTDOWN_IN_PROGRESS;
+    return PostMessage(g_hShutdownDialog, WM_CLOSE, 0, 0) ? ERROR_SUCCESS :
GetLastError();
+}
+
+
+DWORD
+StartSystemShutdown(
+    PUNICODE_STRING lpMessage,
+    ULONG dwTimeout,
+    BOOLEAN bForceAppsClosed,
+    BOOLEAN bRebootAfterShutdown,
+    ULONG dwReason)
+{
+    HANDLE hThread;
+
+    if (_InterlockedCompareExchange8((volatile char*)&g_bShuttingDown, TRUE, FALSE)
== TRUE)
+        return ERROR_SHUTDOWN_IN_PROGRESS;
+    if (lpMessage && lpMessage->Length && lpMessage->Buffer)
+    {
+        g_ShutdownParams.usMessage.Buffer = HeapAlloc(GetProcessHeap(), 0,
lpMessage->Length+sizeof(UNICODE_NULL));
+        if (g_ShutdownParams.usMessage.Buffer == NULL)
+        {
+            g_bShuttingDown = FALSE;
+            return GetLastError();
+        }
+        RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage,
g_ShutdownParams.usMessage.Buffer, lpMessage->Length+sizeof(UNICODE_NULL));
+        RtlCopyUnicodeString(&(g_ShutdownParams.usMessage),
(PUNICODE_STRING)lpMessage);
+    }
+    else
+    {
+        RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, NULL, 0);
+    }
+    g_ShutdownParams.dwTimeout = dwTimeout;
+    g_ShutdownParams.bForceAppsClosed = bForceAppsClosed;
+    g_ShutdownParams.bRebootAfterShutdown = bRebootAfterShutdown;
+    g_ShutdownParams.dwReason = dwReason;
+    hThread = CreateThread(NULL, 0, InitiateSystemShutdownThread, NULL, 0, NULL);
+    if (hThread)
+    {
+        CloseHandle(hThread);
+        return ERROR_SUCCESS;
+    }
+    else
+    {
+        if (g_ShutdownParams.usMessage.Buffer)
+        {
+            HeapFree(GetProcessHeap(), 0, g_ShutdownParams.usMessage.Buffer);
+            RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, NULL, 0);
+        }
+        g_bShuttingDown = FALSE;
+        return GetLastError();
+    }
+}
+
+/* EOF */
diff --git a/base/system/winlogon/winlogon.h b/base/system/winlogon/winlogon.h
index f54ac7a091..a27f1ed9f2 100644
--- a/base/system/winlogon/winlogon.h
+++ b/base/system/winlogon/winlogon.h
@@ -312,6 +312,18 @@ GetSetupType(VOID);
 BOOL
 RunSetup(VOID);
 
+/* shutdown.h*/
+DWORD
+TerminateSystemShutdown(VOID);
+
+DWORD
+StartSystemShutdown(
+    PUNICODE_STRING lpMessage,
+    ULONG dwTimeout,
+    BOOLEAN bForceAppsClosed,
+    BOOLEAN bRebootAfterShutdown,
+    ULONG dwReason);
+
 /* winlogon.c */
 BOOL
 PlaySoundRoutine(IN LPCWSTR FileName,