From f4b11d11112b86a7be585f9c517b5d9201e1a2b8 Mon Sep 17 00:00:00 2001 From: James Tabor Date: Thu, 7 Jun 2012 11:52:13 +0000 Subject: [PATCH 1/1] [Win32k] - Turn off a debug print. Fixed wine Edit test_edit_control_2 SetFocus return and one more in Msg test_SetFocus. svn path=/trunk/; revision=56705 --- reactos/win32ss/user/ntuser/focus.c | 7 ++----- reactos/win32ss/user/ntuser/window.c | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/reactos/win32ss/user/ntuser/focus.c b/reactos/win32ss/user/ntuser/focus.c index 6c3f0a876a4..65ebe51adb5 100644 --- a/reactos/win32ss/user/ntuser/focus.c +++ b/reactos/win32ss/user/ntuser/focus.c @@ -596,12 +596,9 @@ co_UserSetFocus(PWND Window) } // Check again! SetActiveWindow could have set the focus via WM_ACTIVATE. - if (ThreadQueue->spwndFocus && ThreadQueue->spwndFocus == Window) - { - hWndPrev = UserHMGetHandle(ThreadQueue->spwndFocus); - } + hWndPrev = ThreadQueue->spwndFocus ? UserHMGetHandle(ThreadQueue->spwndFocus) : 0; - /* check if the specified window can be set in the input data of a given queue */ + /* check if the specified window can be set in the input data of a given queue */ if (ThreadQueue == Window->head.pti->MessageQueue) /* set the current thread focus window */ ThreadQueue->spwndFocus = Window; diff --git a/reactos/win32ss/user/ntuser/window.c b/reactos/win32ss/user/ntuser/window.c index 3f110ce5b9d..dbe742123d0 100644 --- a/reactos/win32ss/user/ntuser/window.c +++ b/reactos/win32ss/user/ntuser/window.c @@ -2413,7 +2413,7 @@ BOOLEAN FASTCALL co_UserDestroyWindow(PWND Window) if (!co_WinPosShowWindow(Window, SW_HIDE)) { // Rule #1. if (ti->MessageQueue->spwndActive == Window && ti->MessageQueue == IntGetFocusMessageQueue()) - { ERR("DestroyWindow AOW\n"); + { //ERR("DestroyWindow AOW\n"); co_WinPosActivateOtherWindow(Window); } } -- 2.17.1