[ros-diffs] [jimtabor] 66074: [NtUser] - Finally fix ATI tests. Break through while testing User32:win.c:test_window_from_point. See CORE-6551. - If any trouble, please create a new Jira report.

Author: jimtabor
Date: Wed Jan 21 23:15:28 2015
New Revision: 66074

URL: http://svn.reactos.org/svn/reactos?rev=66074&view=rev
Log:
[NtUser]
- Finally fix ATI tests. Break through while testing User32:win.c:test_window_from_point.
See CORE-6551.
- If any trouble, please create a new Jira report.

Modified:
    trunk/reactos/win32ss/user/ntuser/focus.c
    trunk/reactos/win32ss/user/ntuser/message.c

Modified: trunk/reactos/win32ss/user/ntuser/focus.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/focus.…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/focus.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/focus.c	[iso-8859-1] Wed Jan 21 23:15:28 2015
@@ -150,7 +150,7 @@
          HWND *phwndTopLevel, *phwndCurrent;
          PWND pwndCurrent, pwndDesktop;
 
-         pwndDesktop = UserGetDesktopWindow();
+         pwndDesktop = co_GetDesktopWindow(Window);//UserGetDesktopWindow();
          if (Window->spwndParent == pwndDesktop )
          {
             phwndTopLevel = IntWinListChildren(pwndDesktop);
@@ -168,8 +168,9 @@
             ExFreePool(phwndTopLevel);
           }
       }
-   }
-   ////
+      ////
+   }
+
    OldTID = WindowPrev ? IntGetWndThreadId(WindowPrev) : NULL;
    NewTID = Window ? IntGetWndThreadId(Window) : NULL;
    ptiOld = WindowPrev ? WindowPrev->head.pti : NULL;
@@ -245,10 +246,10 @@
                               (WPARAM)(Window == (gpqForeground ?
gpqForeground->spwndActive : NULL)),
                                0); //(LPARAM)hWndPrev);
 
-      co_IntSendMessageNoWait( UserHMGetHandle(Window),
-                               WM_ACTIVATE,
-                               MAKEWPARAM(MouseActivate ? WA_CLICKACTIVE : WA_ACTIVE,
Window->style & WS_MINIMIZE),
-                              (LPARAM)(WindowPrev ? UserHMGetHandle(WindowPrev) : 0));
+      co_IntSendMessage( UserHMGetHandle(Window),
+                         WM_ACTIVATE,
+                         MAKEWPARAM(MouseActivate ? WA_CLICKACTIVE : WA_ACTIVE,
Window->style & WS_MINIMIZE),
+                        (LPARAM)(WindowPrev ? UserHMGetHandle(WindowPrev) : 0));
 
       if (Window->spwndParent == UserGetDesktopWindow() &&
           Window->spwndOwner == NULL &&
@@ -528,7 +529,7 @@
    else
    {
        //ERR("Activate Not same PQ and WQ and Wnd.\n");
-       co_IntSendMessageNoWait(hWnd, WM_ASYNC_SETACTIVEWINDOW, (WPARAM)Wnd,
(LPARAM)MouseActivate );
+       co_IntSendMessage(hWnd, WM_ASYNC_SETACTIVEWINDOW, (WPARAM)Wnd,
(LPARAM)MouseActivate );
        Ret = TRUE;
    }
    return Ret && fgRet;

Modified: trunk/reactos/win32ss/user/ntuser/message.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/message.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/message.c	[iso-8859-1] Wed Jan 21 23:15:28 2015
@@ -1111,7 +1111,7 @@
    if ( ptiCur )
    {
       if (!Window ||
-           Window->head.pti->MessageQueue == ptiCur->MessageQueue )
+           Window->head.pti == ptiCur )
       {
          return NULL;
       }