Author: hbelusca
Date: Sat Sep 17 23:07:46 2016
New Revision: 72721

URL: http://svn.reactos.org/svn/reactos?rev=72721&view=rev
Log:
[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).

Modified:
    trunk/reactos/dll/win32/msgina/shutdown.c
    trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp

Modified: trunk/reactos/dll/win32/msgina/shutdown.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/shutdown.c?rev=72721&r1=72720&r2=72721&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msgina/shutdown.c   [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msgina/shutdown.c   [iso-8859-1] Sat Sep 17 
23:07:46 2016
@@ -299,12 +299,14 @@
             return TRUE;
         }
 
+#if 0
         case WM_ACTIVATE:
         {
             if (LOWORD(wParam) == WA_INACTIVE)
                 EndDialog(hWnd, 0);
             return FALSE;
         }
+#endif
 
         case WM_PAINT:
         {

Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp?rev=72721&r1=72720&r2=72721&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] Sat Sep 17 
23:07:46 2016
@@ -900,12 +900,14 @@
             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))


Reply via email to