From e3ce00b76bb7bd23aa722975f059a2b1299b67c8 Mon Sep 17 00:00:00 2001
From: Giannis Adamopoulos <gadamopoulos@reactos.org>
Date: Wed, 5 May 2010 10:08:23 +0000
Subject: [PATCH] [win32k] -Fix sending WM_KILLFOCUS when we give focus to a
 window of a different thread

Fixes bugs 1546 and 1603

svn path=/trunk/; revision=47103
---
 reactos/subsystems/win32/win32k/ntuser/focus.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/reactos/subsystems/win32/win32k/ntuser/focus.c b/reactos/subsystems/win32/win32k/ntuser/focus.c
index 90702b41c00..9e309ac7dcd 100644
--- a/reactos/subsystems/win32/win32k/ntuser/focus.c
+++ b/reactos/subsystems/win32/win32k/ntuser/focus.c
@@ -227,6 +227,7 @@ co_IntSetForegroundAndFocusWindow(PWINDOW_OBJECT Window, PWINDOW_OBJECT FocusWin
    if (PrevForegroundQueue != 0)
    {
       hWndPrev = PrevForegroundQueue->ActiveWindow;
+      hWndFocusPrev = PrevForegroundQueue->FocusWindow;
    }
 
    if (hWndPrev == hWnd)
@@ -235,9 +236,6 @@ co_IntSetForegroundAndFocusWindow(PWINDOW_OBJECT Window, PWINDOW_OBJECT FocusWin
       return TRUE;
    }
 
-   hWndFocusPrev = (PrevForegroundQueue == FocusWindow->pti->MessageQueue
-                    ? FocusWindow->pti->MessageQueue->FocusWindow : NULL);
-
    /* FIXME: Call hooks. */
 
    co_IntSendDeactivateMessages(hWndPrev, hWnd);