From 99dcff252e20fab6c01c0bcb3f4afe81d4a03891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Sat, 17 Sep 2016 22:44:50 +0000
Subject: [PATCH] [MSGINA][SHELL32]: Now that CORE-11979 is fixed,
 automatically close the logoff/shutdown dialog as soon as the user
 deactivates the window (focus lost) by e.g. pressing Alt-Tab.

svn path=/trunk/; revision=72720
---
 reactos/dll/win32/msgina/shutdown.c           | 7 +++++++
 reactos/dll/win32/shell32/dialogs/dialogs.cpp | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/reactos/dll/win32/msgina/shutdown.c b/reactos/dll/win32/msgina/shutdown.c
index a515f2f08fa..0eb6f6c9b66 100644
--- 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 99f49eb3789..d1990dd37d4 100644
--- 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))
             {