From b33dfb3edeb84d80e0123adcd726dd555f25ff6c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sat, 17 Sep 2016 23:07:46 +0000 Subject: [PATCH] [MSGINA][SHELL32]: Temporarily disable the WM_ACTIVATE check because it blocks for whatever reason the dialog to properly close and return its correct return value when the user selects e.g. "Shutdown" and validate by pressing "OK" (effectively disables commit r72720). svn path=/trunk/; revision=72721 --- reactos/dll/win32/msgina/shutdown.c | 2 ++ reactos/dll/win32/shell32/dialogs/dialogs.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/reactos/dll/win32/msgina/shutdown.c b/reactos/dll/win32/msgina/shutdown.c index 0eb6f6c9b66..1b1e48a79e3 100644 --- a/reactos/dll/win32/msgina/shutdown.c +++ b/reactos/dll/win32/msgina/shutdown.c @@ -299,12 +299,14 @@ ExitWindowsDialogShellProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TRUE; } +#if 0 case WM_ACTIVATE: { if (LOWORD(wParam) == WA_INACTIVE) EndDialog(hWnd, 0); return FALSE; } +#endif case WM_PAINT: { diff --git a/reactos/dll/win32/shell32/dialogs/dialogs.cpp b/reactos/dll/win32/shell32/dialogs/dialogs.cpp index d1990dd37d4..17ca8a96dcb 100644 --- a/reactos/dll/win32/shell32/dialogs/dialogs.cpp +++ b/reactos/dll/win32/shell32/dialogs/dialogs.cpp @@ -900,12 +900,14 @@ INT_PTR CALLBACK LogOffDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP EndDialog(hwnd, IDCANCEL); break; +#if 0 case WM_ACTIVATE: { if (LOWORD(wParam) == WA_INACTIVE) EndDialog(hwnd, 0); return FALSE; } +#endif case WM_COMMAND: switch (LOWORD(wParam)) -- 2.17.1