diff --git a/reactos/subsystems/win32/win32k/include/win32kdebug.h b/reactos/subsystems/win32/win32k/include/win32kdebug.h index 8831bd37569..fed5af164b3 100644 --- a/reactos/subsystems/win32/win32k/include/win32kdebug.h +++ b/reactos/subsystems/win32/win32k/include/win32kdebug.h @@ -97,7 +97,6 @@ DbgChUserMisc, DbgChUserMonitor, DbgChUserMsg, - DbgChUserMsgCall, DbgChUserMsgQ, DbgChUserObj, DbgChUserPainting, diff --git a/reactos/subsystems/win32/win32k/ntuser/callback.c b/reactos/subsystems/win32/win32k/ntuser/callback.c index c60faefef88..eec6a54591b 100644 --- a/reactos/subsystems/win32/win32k/ntuser/callback.c +++ b/reactos/subsystems/win32/win32k/ntuser/callback.c @@ -174,8 +174,6 @@ co_IntCallWindowProc(WNDPROC Proc, ULONG ArgumentLength; LRESULT Result; - TRACE_CH(UserMsgCall,"hwnd:0x%x, msg:%d, wparam:%d, lparam:%d\n", Wnd, Message, wParam, lParam); - if (0 < lParamBufferSize) { ArgumentLength = sizeof(WINDOWPROC_CALLBACK_ARGUMENTS) + lParamBufferSize; diff --git a/reactos/subsystems/win32/win32k/ntuser/focus.c b/reactos/subsystems/win32/win32k/ntuser/focus.c index a4d4373419b..e2bb1be0c26 100644 --- a/reactos/subsystems/win32/win32k/ntuser/focus.c +++ b/reactos/subsystems/win32/win32k/ntuser/focus.c @@ -164,9 +164,8 @@ co_IntSendKillFocusMessages(HWND hWndPrev, HWND hWnd) { if (hWndPrev) { - TRACE("sending WM_KILLFOCUS to hwnd 0x%x\n", hWndPrev); IntNotifyWinEvent(EVENT_OBJECT_FOCUS, NULL, OBJID_CLIENT, CHILDID_SELF, 0); - co_IntSendMessage(hWndPrev, WM_KILLFOCUS, (WPARAM)hWnd, 0); + co_IntPostOrSendMessage(hWndPrev, WM_KILLFOCUS, (WPARAM)hWnd, 0); } } @@ -177,7 +176,7 @@ co_IntSendSetFocusMessages(HWND hWndPrev, HWND hWnd) { PWND pWnd = UserGetWindowObject(hWnd); IntNotifyWinEvent(EVENT_OBJECT_FOCUS, pWnd, OBJID_CLIENT, CHILDID_SELF, 0); - co_IntSendMessage(hWnd, WM_SETFOCUS, (WPARAM)hWndPrev, 0); + co_IntPostOrSendMessage(hWnd, WM_SETFOCUS, (WPARAM)hWndPrev, 0); } } @@ -403,14 +402,13 @@ co_IntSetFocusWindow(PWND Window OPTIONAL) return 0; } ThreadQueue->FocusWindow = Window->head.h; - TRACE("Focus: 0x%x -> 0x%x\n", hWndPrev, Window->head.h); + TRACE("Focus: %d -> %d\n", hWndPrev, Window->head.h); co_IntSendKillFocusMessages(hWndPrev, Window->head.h); co_IntSendSetFocusMessages(hWndPrev, Window->head.h); } else { - TRACE("Focus: 0x%x -> 0x%x\n", hWndPrev, 0); ThreadQueue->FocusWindow = 0; if (co_HOOK_CallHooks( WH_CBT, HCBT_SETFOCUS, (WPARAM)0, (LPARAM)hWndPrev)) { @@ -699,7 +697,7 @@ NtUserSetFocus(HWND hWnd) DECLARE_RETURN(HWND); HWND ret; - TRACE("Enter NtUserSetFocus(0x%x)\n", hWnd); + TRACE("Enter NtUserSetFocus(%x)\n", hWnd); UserEnterExclusive(); if (hWnd) diff --git a/reactos/subsystems/win32/win32k/ntuser/message.c b/reactos/subsystems/win32/win32k/ntuser/message.c index cba1a3b3a6a..56ee7e57ec8 100644 --- a/reactos/subsystems/win32/win32k/ntuser/message.c +++ b/reactos/subsystems/win32/win32k/ntuser/message.c @@ -1182,7 +1182,6 @@ co_IntSendMessageTimeoutSingle( HWND hWnd, if (!(Window = UserGetWindowObject(hWnd))) { - ERR("UserGetWindowObject filed!\n"); RETURN( FALSE); } @@ -1197,7 +1196,6 @@ co_IntSendMessageTimeoutSingle( HWND hWnd, { if (Win32Thread->TIF_flags & TIF_INCLEANUP) { - ERR("Trying to send message to a thread in cleanup\n"); /* Never send messages to exiting threads */ RETURN( FALSE); } diff --git a/reactos/subsystems/win32/win32k/objects/gdidbg.c b/reactos/subsystems/win32/win32k/objects/gdidbg.c index 0d26ef42584..54b711faf61 100644 --- a/reactos/subsystems/win32/win32k/objects/gdidbg.c +++ b/reactos/subsystems/win32/win32k/objects/gdidbg.c @@ -78,7 +78,6 @@ DBG_CHANNEL DbgChannels[DbgChCount]={ {L"UserMisc", DbgChUserMisc}, {L"UserMonitor", DbgChUserMonitor}, {L"UserMsg", DbgChUserMsg}, - {L"UserMsgCall", DbgChUserMsgCall}, {L"UserMsgQ", DbgChUserMsgQ}, {L"UserObj", DbgChUserObj}, {L"UserPainting", DbgChUserPainting},