From 9e1cd0b7ffdf21b741c83c6599b77910db5fa6cf Mon Sep 17 00:00:00 2001
From: James Tabor <james.tabor@reactos.org>
Date: Wed, 14 Sep 2016 14:15:46 +0000
Subject: [PATCH] [NtUser] - Fix recursion issues, CORE-8780 and CORE-11979.
 See CORE-11324 for breakage.

svn path=/trunk/; revision=72675
---
 reactos/win32ss/user/ntuser/focus.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/reactos/win32ss/user/ntuser/focus.c b/reactos/win32ss/user/ntuser/focus.c
index 82d64dff789..7b98458914d 100644
--- a/reactos/win32ss/user/ntuser/focus.c
+++ b/reactos/win32ss/user/ntuser/focus.c
@@ -577,6 +577,10 @@ co_IntSetActiveWindow(PWND Wnd OPTIONAL, BOOL bMouse, BOOL bFocus, BOOL Async)
       BOOL Ret, DoFG, AllowFG;
 
       if (Wnd->state & WNDS_BEINGACTIVATED) return TRUE;
+      if (Wnd == pWndChg)
+      {
+         return TRUE; // Fix CORE-8780 and CORE-11979. See CORE-11324 for breakage.
+      }
 
       if (ThreadQueue == Wnd->head.pti->MessageQueue)
       {