Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 06:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NtUser]

Browse source 
- 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.

svn path=/trunk/; revision=66074
This commit is contained in:
James Tabor 2015-01-21 23:15:28 +00:00
parent 571af394cd
commit 6362e14265
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
reactos/win32ss/user/ntuser/focus.c
View file

@ -150,7 +150,7 @@ co_IntSendActivateMessages(PWND WindowPrev, PWND Window, BOOL MouseActivate, BOO
HWND *phwndTopLevel, *phwndCurrent; HWND *phwndTopLevel, *phwndCurrent;
PWND pwndCurrent, pwndDesktop; PWND pwndCurrent, pwndDesktop;
pwndDesktop = UserGetDesktopWindow(); pwndDesktop = co_GetDesktopWindow(Window);//UserGetDesktopWindow();
if (Window->spwndParent == pwndDesktop ) if (Window->spwndParent == pwndDesktop )
{ {
phwndTopLevel = IntWinListChildren(pwndDesktop); phwndTopLevel = IntWinListChildren(pwndDesktop);
@ -168,8 +168,9 @@ co_IntSendActivateMessages(PWND WindowPrev, PWND Window, BOOL MouseActivate, BOO
ExFreePool(phwndTopLevel); ExFreePool(phwndTopLevel);
} }
} }
////
} }
////
OldTID = WindowPrev ? IntGetWndThreadId(WindowPrev) : NULL; OldTID = WindowPrev ? IntGetWndThreadId(WindowPrev) : NULL;
NewTID = Window ? IntGetWndThreadId(Window) : NULL; NewTID = Window ? IntGetWndThreadId(Window) : NULL;
ptiOld = WindowPrev ? WindowPrev->head.pti : NULL; ptiOld = WindowPrev ? WindowPrev->head.pti : NULL;
@ -245,10 +246,10 @@ co_IntSendActivateMessages(PWND WindowPrev, PWND Window, BOOL MouseActivate, BOO
(WPARAM)(Window == (gpqForeground ? gpqForeground->spwndActive : NULL)), (WPARAM)(Window == (gpqForeground ? gpqForeground->spwndActive : NULL)),
0); //(LPARAM)hWndPrev); 0); //(LPARAM)hWndPrev);
co_IntSendMessageNoWait( UserHMGetHandle(Window), co_IntSendMessage( UserHMGetHandle(Window),
WM_ACTIVATE, WM_ACTIVATE,
MAKEWPARAM(MouseActivate ? WA_CLICKACTIVE : WA_ACTIVE, Window->style & WS_MINIMIZE), MAKEWPARAM(MouseActivate ? WA_CLICKACTIVE : WA_ACTIVE, Window->style & WS_MINIMIZE),
(LPARAM)(WindowPrev ? UserHMGetHandle(WindowPrev) : 0)); (LPARAM)(WindowPrev ? UserHMGetHandle(WindowPrev) : 0));
if (Window->spwndParent == UserGetDesktopWindow() && if (Window->spwndParent == UserGetDesktopWindow() &&
Window->spwndOwner == NULL && Window->spwndOwner == NULL &&
@ -528,7 +529,7 @@ co_IntSetForegroundAndFocusWindow(
else else
{ {
//ERR("Activate Not same PQ and WQ and Wnd.\n"); //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; Ret = TRUE;
} }
return Ret && fgRet; return Ret && fgRet;

2
reactos/win32ss/user/ntuser/message.c
View file

@ -1111,7 +1111,7 @@ IntSendTo(PWND Window, PTHREADINFO ptiCur, UINT Msg)
if ( ptiCur ) if ( ptiCur )
{ {
if (!Window || if (!Window ||
Window->head.pti->MessageQueue == ptiCur->MessageQueue ) Window->head.pti == ptiCur )
{ {
return NULL; return NULL;
} }