mirror of
https://github.com/reactos/reactos.git
synced 2024-10-06 01:13:38 +00:00
[NtUser]
- This should fix dialog breakage due to r66237. svn path=/trunk/; revision=66241
This commit is contained in:
parent
fc6cd9e51d
commit
cc64141e3f
|
@ -379,13 +379,13 @@ static void IntSendDestroyMsg(HWND hWnd)
|
|||
* be destroying.
|
||||
*/
|
||||
// Rule #1
|
||||
if ( ti->MessageQueue->spwndActive == Window || // Fixes CORE-106 RegSrv32 exit and return focus to CMD.
|
||||
if ( ti->MessageQueue->spwndActive == Window || // Fixes CORE-106 RegSvr32 exit and return focus to CMD.
|
||||
(ti->MessageQueue->spwndActive == NULL && ti->MessageQueue == IntGetFocusMessageQueue()) )
|
||||
{
|
||||
co_WinPosActivateOtherWindow(Window);
|
||||
}
|
||||
|
||||
/* Fixes dialog test test_focus breakage due to r66237 and CMD properties closing and returning focus to CMD */
|
||||
/* Fixes CMD properties closing and returning focus to CMD */
|
||||
if (ti->MessageQueue->spwndFocus == Window)
|
||||
{
|
||||
if ((Window->style & (WS_CHILD | WS_POPUP)) == WS_CHILD)
|
||||
|
@ -560,6 +560,13 @@ LRESULT co_UserFreeWindow(PWND Window,
|
|||
ThreadData->rpdesk->rpwinstaParent->ShellListView = NULL;
|
||||
}
|
||||
|
||||
/* Fixes dialog test_focus breakage due to r66237. */
|
||||
if (ThreadData->MessageQueue->spwndFocus == Window)
|
||||
ThreadData->MessageQueue->spwndFocus = NULL;
|
||||
|
||||
if (ThreadData->MessageQueue->spwndActive == Window)
|
||||
ThreadData->MessageQueue->spwndActive = NULL;
|
||||
|
||||
if (ThreadData->MessageQueue->spwndCapture == Window)
|
||||
{
|
||||
IntReleaseCapture();
|
||||
|
|
Loading…
Reference in a new issue