Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-12 17:16:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make NtUserSetFocus accept NULL window.

Browse source 
svn path=/trunk/; revision=25410
This commit is contained in:
Timo Kreuzer 2007-01-10 04:23:33 +00:00
parent 78749a977a
commit d8160f0676
1 changed files with 34 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
reactos/subsystems/win32/win32k/ntuser/focus.c
View file

@ -304,27 +304,37 @@ co_IntSetActiveWindow(PWINDOW_OBJECT Window OPTIONAL)
static static
HWND FASTCALL HWND FASTCALL
co_IntSetFocusWindow(PWINDOW_OBJECT Window) co_IntSetFocusWindow(PWINDOW_OBJECT Window OPTIONAL)
{ {
HWND hWndPrev = 0; HWND hWndPrev = 0;
PUSER_MESSAGE_QUEUE ThreadQueue; PUSER_MESSAGE_QUEUE ThreadQueue;
ASSERT_REFS_CO(Window); if (Window)
ASSERT_REFS_CO(Window);
ThreadQueue = (PUSER_MESSAGE_QUEUE)PsGetCurrentThreadWin32Thread()->MessageQueue; ThreadQueue = (PUSER_MESSAGE_QUEUE)PsGetCurrentThreadWin32Thread()->MessageQueue;
ASSERT(ThreadQueue != 0); ASSERT(ThreadQueue != 0);
hWndPrev = ThreadQueue->FocusWindow; hWndPrev = ThreadQueue->FocusWindow;
if (hWndPrev == Window->hSelf)
if (Window != 0)
{ {
return hWndPrev; if (hWndPrev == Window->hSelf)
{
return hWndPrev;
}
ThreadQueue->FocusWindow = Window->hSelf;
co_IntSendKillFocusMessages(hWndPrev, Window->hSelf);
co_IntSendSetFocusMessages(hWndPrev, Window->hSelf);
}
else
{
ThreadQueue->FocusWindow = 0;
co_IntSendKillFocusMessages(hWndPrev, 0);
} }
ThreadQueue->FocusWindow = Window->hSelf;
co_IntSendKillFocusMessages(hWndPrev, Window->hSelf);
co_IntSendSetFocusMessages(hWndPrev, Window->hSelf);
return hWndPrev; return hWndPrev;
} }
@ -562,16 +572,23 @@ NtUserSetFocus(HWND hWnd)
DPRINT("Enter NtUserSetFocus(%x)\n", hWnd); DPRINT("Enter NtUserSetFocus(%x)\n", hWnd);
UserEnterExclusive(); UserEnterExclusive();
if (!(Window = UserGetWindowObject(hWnd))) if (hWnd)
{ {
RETURN(NULL); if (!(Window = UserGetWindowObject(hWnd)))
} {
RETURN(NULL);
}
UserRefObjectCo(Window, &Ref); UserRefObjectCo(Window, &Ref);
ret = co_UserSetFocus(Window); ret = co_UserSetFocus(Window);
UserDerefObjectCo(Window); UserDerefObjectCo(Window);
RETURN(ret); RETURN(ret);
}
else
{
RETURN( co_UserSetFocus(0));
}
CLEANUP: CLEANUP:
DPRINT("Leave NtUserSetFocus, ret=%i\n",_ret_); DPRINT("Leave NtUserSetFocus, ret=%i\n",_ret_);