[jimtabor] 66241: [NtUser] - This should fix dialog breakage due to r66237.

Author: jimtabor
Date: Fri Feb 13 01:03:38 2015
New Revision: 66241

URL: http://svn.reactos.org/svn/reactos?rev=66241&view=rev
Log:
[NtUser]
- This should fix dialog breakage due to r66237.

Modified:
    trunk/reactos/win32ss/user/ntuser/window.c

Modified: trunk/reactos/win32ss/user/ntuser/window.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/window.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/window.c	[iso-8859-1] Fri Feb 13 01:03:38 2015
@@ -379,13 +379,13 @@
        * 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)
@@ -559,6 +559,13 @@
       if (Window->head.h ==
ThreadData->rpdesk->rpwinstaParent->ShellListView)
          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)
    {