[ros-diffs] [gadamopoulos] 74968: [EXPLORER] -Revert a hack from r63304 that caused CORE-13388. This hid another bug and the correct way to fix this is to return MA_NOACTIVATE to WM_MOUSEACTIVATE.

Author: gadamopoulos
Date: Thu Jun  8 20:31:49 2017
New Revision: 74968

URL: http://svn.reactos.org/svn/reactos?rev=74968&view=rev
Log:
[EXPLORER] -Revert a hack from r63304 that caused CORE-13388. This hid another bug and the correct way to fix this is to return MA_NOACTIVATE to WM_MOUSEACTIVATE.

Modified:
    trunk/reactos/base/shell/explorer/taskswnd.cpp

Modified: trunk/reactos/base/shell/explorer/taskswnd.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskswn...
==============================================================================
--- trunk/reactos/base/shell/explorer/taskswnd.cpp	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/taskswnd.cpp	[iso-8859-1] Thu Jun  8 20:31:49 2017
@@ -1403,11 +1403,8 @@

case HSHELL_RUDEAPPACTIVATED:
         case HSHELL_WINDOWACTIVATED:
-            if (lParam)
-            {
-                ActivateTask((HWND) lParam);
-                Ret = TRUE;
-            }
+            ActivateTask((HWND) lParam);
+            Ret = TRUE;
             break;

case HSHELL_FLASH:
@@ -1797,6 +1794,11 @@
         return FALSE;
     }

+    LRESULT OnMouseActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+    {
+        return MA_NOACTIVATE;
+    }
+
     LRESULT OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
     {
 #if DUMP_TASKS != 0
@@ -1844,6 +1846,8 @@
         MESSAGE_HANDLER(WM_SETFONT, OnSetFont)
         MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChanged)
         MESSAGE_HANDLER(m_ShellHookMsg, HandleShellHookMsg)
+        MESSAGE_HANDLER(WM_MOUSEACTIVATE, OnMouseActivate)
+        MESSAGE_HANDLER(WM_KLUDGEMINRECT, OnKludgeItemRect)
     END_MSG_MAP()

HWND _Init(IN HWND hWndParent, IN OUT ITrayWindow *tray)