[MSGINA][SHELL32]: Now that CORE-11979 is fixed, automatically close the logoff/shutd...

svn path=/trunk/; revision=72720

diff --git a/reactos/dll/win32/msgina/shutdown.c b/reactos/dll/win32/msgina/shutdown.c
index a515f2f..0eb6f6c 100644 (file)
--- a/reactos/dll/win32/msgina/shutdown.c
+++ b/reactos/dll/win32/msgina/shutdown.c
@@ -299,6 +299,13 @@ ExitWindowsDialogShellProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
             return TRUE;
         }
 
+        case WM_ACTIVATE:
+        {
+            if (LOWORD(wParam) == WA_INACTIVE)
+                EndDialog(hWnd, 0);
+            return FALSE;
+        }
+
         case WM_PAINT:
         {
             PAINTSTRUCT ps;

diff --git a/reactos/dll/win32/shell32/dialogs/dialogs.cpp b/reactos/dll/win32/shell32/dialogs/dialogs.cpp
index 99f49eb..d1990dd 100644 (file)
--- a/reactos/dll/win32/shell32/dialogs/dialogs.cpp
+++ b/reactos/dll/win32/shell32/dialogs/dialogs.cpp
@@ -900,6 +900,13 @@ INT_PTR CALLBACK LogOffDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP
             EndDialog(hwnd, IDCANCEL);
             break;
 
+        case WM_ACTIVATE:
+        {
+            if (LOWORD(wParam) == WA_INACTIVE)
+                EndDialog(hwnd, 0);
+            return FALSE;
+        }
+
         case WM_COMMAND:
             switch (LOWORD(wParam))
             {